v12.10.8: fix some tracking edge-cases

DePayFi · Jun 14, 2024 · a3aba29 · a3aba29
1 parent 558da1c
commit a3aba29
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 23 deletions.
diff --git a/dev.html b/dev.html
@@ -696,17 +696,23 @@ <h5 class="px-4">Payment: with tracking/validation</h5>
                   button.addEventListener("click",function(e){
                     DePayWidgets.Payment({
                       accept: [{
-                        blockchain: 'ethereum',
-                        amount: 0.1,
-                        token: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
-                        receiver: '0x317D875cA3B9f8d14f960486C0d1D1913be74e90'
+                        blockchain: 'polygon',
+                        amount: 0.01,
+                        token: '0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359',
+                        receiver: '0x08B277154218CCF3380CAE48d630DA13462E3950'
                       }],
                       track: {
                         method: (payment)=>{
                           console.log('TRACK', payment)
                           return axios.post('/track', payment)
+                        },
+                        poll: {
+                          method: (data)=>{
+                            console.log('POLL', data)
+                            return new Promise((resolve)=>resolve)
+                          }
                         }
-                      }
+                      },
                     });
                   });
                 </script>

diff --git a/dist/esm/index.bundle.js b/dist/esm/index.bundle.js
diff --git a/dist/esm/index.evm.js b/dist/esm/index.evm.js
@@ -28493,7 +28493,7 @@ var PaymentTrackingProvider = (function (props) {
               case 0:
                 _context.t0 = JSON;
                 _context.t1 = transaction.blockchain;
-                _context.t2 = transaction.from;
+                _context.t2 = transaction.from || account;
                 _context.next = 5;
                 return getNonce({
                   transaction: transaction,
@@ -28974,6 +28974,7 @@ var PaymentTrackingProvider = (function (props) {
       return Promise.resolve();
     }
 
+    openSocket(transaction);
     return new Promise( /*#__PURE__*/function () {
       var _ref6 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee6(resolve, reject) {
         var _paymentRoute$feeAmou2;

diff --git a/dist/esm/index.evm.js.map b/dist/esm/index.evm.js.map
diff --git a/dist/esm/index.js b/dist/esm/index.js
@@ -28506,7 +28506,7 @@ var PaymentTrackingProvider = (function (props) {
               case 0:
                 _context.t0 = JSON;
                 _context.t1 = transaction.blockchain;
-                _context.t2 = transaction.from;
+                _context.t2 = transaction.from || account;
                 _context.next = 5;
                 return getNonce({
                   transaction: transaction,
@@ -28987,6 +28987,7 @@ var PaymentTrackingProvider = (function (props) {
       return Promise.resolve();
     }
 
+    openSocket(transaction);
     return new Promise( /*#__PURE__*/function () {
       var _ref6 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee6(resolve, reject) {
         var _paymentRoute$feeAmou2;

diff --git a/dist/esm/index.js.map b/dist/esm/index.js.map
diff --git a/dist/esm/index.solana.js b/dist/esm/index.solana.js
@@ -28544,7 +28544,7 @@ var PaymentTrackingProvider = (function (props) {
               case 0:
                 _context.t0 = JSON;
                 _context.t1 = transaction.blockchain;
-                _context.t2 = transaction.from;
+                _context.t2 = transaction.from || account;
                 _context.next = 5;
                 return getNonce({
                   transaction: transaction,
@@ -29025,6 +29025,7 @@ var PaymentTrackingProvider = (function (props) {
       return Promise.resolve();
     }
 
+    openSocket(transaction);
     return new Promise( /*#__PURE__*/function () {
       var _ref6 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee6(resolve, reject) {
         var _paymentRoute$feeAmou2;

diff --git a/dist/esm/index.solana.js.map b/dist/esm/index.solana.js.map
diff --git a/dist/umd/index.bundle.js b/dist/umd/index.bundle.js
diff --git a/dist/umd/index.evm.js b/dist/umd/index.evm.js
@@ -28491,7 +28491,7 @@
                 case 0:
                   _context.t0 = JSON;
                   _context.t1 = transaction.blockchain;
-                  _context.t2 = transaction.from;
+                  _context.t2 = transaction.from || account;
                   _context.next = 5;
                   return getNonce({
                     transaction: transaction,
@@ -28972,6 +28972,7 @@
         return Promise.resolve();
       }
 
+      openSocket(transaction);
       return new Promise( /*#__PURE__*/function () {
         var _ref6 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee6(resolve, reject) {
           var _paymentRoute$feeAmou2;

diff --git a/dist/umd/index.evm.js.map b/dist/umd/index.evm.js.map
diff --git a/dist/umd/index.js b/dist/umd/index.js
@@ -28502,7 +28502,7 @@
                 case 0:
                   _context.t0 = JSON;
                   _context.t1 = transaction.blockchain;
-                  _context.t2 = transaction.from;
+                  _context.t2 = transaction.from || account;
                   _context.next = 5;
                   return getNonce({
                     transaction: transaction,
@@ -28983,6 +28983,7 @@
         return Promise.resolve();
       }
 
+      openSocket(transaction);
       return new Promise( /*#__PURE__*/function () {
         var _ref6 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee6(resolve, reject) {
           var _paymentRoute$feeAmou2;

diff --git a/dist/umd/index.js.map b/dist/umd/index.js.map
diff --git a/dist/umd/index.solana.js b/dist/umd/index.solana.js
@@ -28542,7 +28542,7 @@
                 case 0:
                   _context.t0 = JSON;
                   _context.t1 = transaction.blockchain;
-                  _context.t2 = transaction.from;
+                  _context.t2 = transaction.from || account;
                   _context.next = 5;
                   return getNonce({
                     transaction: transaction,
@@ -29023,6 +29023,7 @@
         return Promise.resolve();
       }
 
+      openSocket(transaction);
       return new Promise( /*#__PURE__*/function () {
         var _ref6 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee6(resolve, reject) {
           var _paymentRoute$feeAmou2;

diff --git a/dist/umd/index.solana.js.map b/dist/umd/index.solana.js.map
diff --git a/package.evm.json b/package.evm.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/widgets-evm",
   "moduleName": "DePayWidgets",
-  "version": "12.10.7",
+  "version": "12.10.8",
   "description": "Web3 Payments with any token. DePay simplifies and improves Web3 Payments with the power of DeFi. Accept any token with on-the-fly conversion.",
   "main": "./dist/umd/index.js",
   "module": "./dist/esm/index.js",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/widgets",
   "moduleName": "DePayWidgets",
-  "version": "12.10.7",
+  "version": "12.10.8",
   "description": "Web3 Payments with any token. DePay simplifies and improves Web3 Payments with the power of DeFi. Accept any token with on-the-fly conversion.",
   "main": "./dist/umd/index.js",
   "module": "./dist/esm/index.js",

diff --git a/package.solana.json b/package.solana.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/widgets-solana",
   "moduleName": "DePayWidgets",
-  "version": "12.10.7",
+  "version": "12.10.8",
   "description": "Web3 Payments with any token. DePay simplifies and improves Web3 Payments with the power of DeFi. Accept any token with on-the-fly conversion.",
   "main": "./dist/umd/index.js",
   "module": "./dist/esm/index.js",

diff --git a/src/providers/PaymentTrackingProvider.jsx b/src/providers/PaymentTrackingProvider.jsx
@@ -62,7 +62,7 @@ export default (props)=>{
         command: 'subscribe',
         identifier: JSON.stringify({
           blockchain: transaction.blockchain,
-          sender: transaction.from,
+          sender: transaction.from || account,
           nonce: await getNonce({ transaction, account, wallet }),
           channel: 'PaymentChannel'
         }),
@@ -311,6 +311,7 @@ export default (props)=>{
   const trace = (afterBlock, paymentRoute, transaction, deadline)=>{
     setAttemptId() // reset attemptId in case payment is retried
     if(!synchronousTracking && !asynchronousTracking) { return Promise.resolve() }
+    openSocket(transaction)
     return new Promise(async(resolve, reject)=>{
       let performedPayment = {
         blockchain: paymentRoute.blockchain,