@depay/web3-wallets-evm 14.6.2 → 14.6.4

package/README.md

@@ -224,29 +224,60 @@ await wallet.switchTo('bsc')
 
 ### Transaction
 
+### Data Structure
+
+`api: Array`: Api of the contract (e.g. abi for Ethereum).
+
+`blockchain: String`: Name of the blockchain e.g. 'ethereum'.
+
+`failed: Function (transaction, error)=>{}`: Callback to be executed if transaction failed (e.g. reverted).
+
+`from: String`: Address of the transaction sender.
+
+`id: String`: Identifier of the transaction.
+
+`instructions: Array`: List of instructions (e.g. Solana).
+
+`method: String`: Name of the contract method to be called.
+
+`nonce: Integer`: Nonce (number only used once) of the transaction.
+
+`params: Object or Array`: Parameters passed to the method.
+
+`sent: Function (transaction)=>{}`: Callback to be executed if transaction has been sent to the network.
+
+`succeeded: Function (transaction)=>{}`: Callback to be executed if transaction was successful and has been confirmed once by the network.
+
+`to String`: Address of the contract to be transacted with.
+
+`url String`: Url to open the transaction (e.g. in an explorer).
+
+`value: Number or BigNumber as String`: Value of the transaction (amount of the native blockchain currency sent along with the transaction).
+
 ### sendTransaction
 
 #### EVM: sendTransaction
 
 Available arguments for EVM blockchains:
 
-`blockchain: String`: Name of the blockchain e.g. 'ethereum'.
+`api: Array`: Api of the contract (e.g. abi for Ethereum).
 
-`to String`: Address of the contract to be transacted with.
+`blockchain: String`: Name of the blockchain e.g. 'ethereum'.
 
-`api: Array`: Api of the contract (e.g. abi for Ethereum).
+`failed: Function (transaction, error)=>{}`: Callback to be executed if transaction failed (e.g. reverted).
 
 `method: String`: Name of the contract method to be called.
 
 `params: Object or Array`: Parameters passed to the method.
 
-`value: Number or BigNumber as String`: Value of the transaction (amount of the native blockchain currency sent along with the transaction).
-
 `sent: Function (transaction)=>{}`: Callback to be executed if transaction has been sent to the network.
 
 `succeeded: Function (transaction)=>{}`: Callback to be executed if transaction was successful and has been confirmed once by the network.
 
-`failed: Function (transaction, error)=>{}`: Callback to be executed if transaction failed (e.g. reverted).
+`to String`: Address of the contract to be transacted with.
+
+`value: Number or BigNumber as String`: Value of the transaction (amount of the native blockchain currency sent along with the transaction).
+
 
 ##### EVM: Simple value transfer
 
@@ -292,12 +323,12 @@ Available arguments for Solana blockchains:
 
 `blockchain: String`: Name of the blockchain e.g. 'solana'.
 
+`failed: Function (transaction, error)=>{}`: Callback to be executed if transaction failed (e.g. reverted).
+
 `sent: Function (transaction)=>{}`: Callback to be executed if transaction has been sent to the network.
 
 `succeeded: Function (transaction)=>{}`: Callback to be executed if transaction was successful and has been confirmed once by the network.
 
-`failed: Function (transaction, error)=>{}`: Callback to be executed if transaction failed (e.g. reverted).
-
 ##### Solana: Simple value transfer
 
 e.g. send 0.01 SOL on Solana:

package/dist/esm/index.evm.js

@@ -59923,12 +59923,21 @@ class Safe {
   }
 
   async transactionCount() {
-    return parseInt((await request({
-      blockchain: this.blockchain,
-      address: this.address,
-      api: [{"inputs":[],"name":"nonce","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
-      method: 'nonce',
-    })).toString(), 10)
+    let transactionCount;
+    let jsonResult = await fetch(`https://safe-transaction-${transactionApiBlockchainNames[blockchain]}.safe.global/api/v1/safes/${this.address}/`)
+      .then((response) => response.json())
+      .catch((error) => { console.error('Error:', error); });
+    if(jsonResult && jsonResult.nonce) {
+      transactionCount = jsonResult.nonce;
+    } else {
+      transactionCount = parseInt((await request({
+        blockchain: this.blockchain,
+        address: this.address,
+        api: [{"inputs":[],"name":"nonce","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
+        method: 'nonce',
+      })).toString(), 10);
+    }
+    return transactionCount
   }
 
   async retrieveTransaction({ blockchain, tx }) {
@@ -60006,34 +60015,35 @@ const sendTransaction$3 = async ({ transaction, wallet })=> {
   const smartContractWallet = await getSmartContractWallet(transaction.blockchain, transaction.from);
   const transactionCount = smartContractWallet ? await smartContractWallet.transactionCount() : await request({ blockchain: transaction.blockchain, method: 'transactionCount', address: transaction.from });
   transaction.nonce = transactionCount;
-  await submit$3({ transaction, wallet }).then(async (tx)=>{
+  await submit$3({ transaction, wallet }).then((tx)=>{
     if (tx) {
       let blockchain = Blockchain.findByName(transaction.blockchain);
       transaction.id = tx;
       transaction.url = smartContractWallet && smartContractWallet.explorerUrlFor ? smartContractWallet.explorerUrlFor({ transaction }) : blockchain.explorerUrlFor({ transaction });
       if (transaction.sent) transaction.sent(transaction);
-      let sentTransaction = await retrieveTransaction$1({ blockchain: transaction.blockchain, tx, smartContractWallet });
-      transaction.id = sentTransaction.hash || transaction.id;
-      transaction.url = blockchain.explorerUrlFor({ transaction });
-      transaction.nonce = sentTransaction.nonce || transactionCount;
-      sentTransaction.wait(1).then(() => {
-        transaction._succeeded = true;
-        if (transaction.succeeded) transaction.succeeded(transaction);
-      }).catch((error)=>{
-        if(error && error.code && error.code == 'TRANSACTION_REPLACED') {
-          if(error.replacement && error.replacement.hash && error.receipt && error.receipt.status == 1) {
-            transaction.id = error.replacement.hash;
-            transaction._succeeded = true;
-            if (transaction.succeeded) transaction.succeeded(transaction);
-          } else if(error.replacement && error.replacement.hash && error.receipt && error.receipt.status == 0) {
-            transaction.id = error.replacement.hash;
+      retrieveTransaction$1({ blockchain: transaction.blockchain, tx, smartContractWallet }).then((sentTransaction)=>{
+        transaction.id = sentTransaction.hash || transaction.id;
+        transaction.url = blockchain.explorerUrlFor({ transaction });
+        transaction.nonce = sentTransaction.nonce || transactionCount;
+        sentTransaction.wait(1).then(() => {
+          transaction._succeeded = true;
+          if (transaction.succeeded) transaction.succeeded(transaction);
+        }).catch((error)=>{
+          if(error && error.code && error.code == 'TRANSACTION_REPLACED') {
+            if(error.replacement && error.replacement.hash && error.receipt && error.receipt.status == 1) {
+              transaction.id = error.replacement.hash;
+              transaction._succeeded = true;
+              if (transaction.succeeded) transaction.succeeded(transaction);
+            } else if(error.replacement && error.replacement.hash && error.receipt && error.receipt.status == 0) {
+              transaction.id = error.replacement.hash;
+              transaction._failed = true;
+              if(transaction.failed) transaction.failed(transaction, error);  
+            }
+          } else {
             transaction._failed = true;
-            if(transaction.failed) transaction.failed(transaction, error);  
+            if(transaction.failed) transaction.failed(transaction, error);
           }
-        } else {
-          transaction._failed = true;
-          if(transaction.failed) transaction.failed(transaction, error);
-        }
+        });
       });
     } else {
       throw('Submitting transaction failed!')

package/dist/esm/index.js

@@ -1017,12 +1017,21 @@ class Safe {
   }
 
   async transactionCount() {
-    return parseInt((await request$1({
-      blockchain: this.blockchain,
-      address: this.address,
-      api: [{"inputs":[],"name":"nonce","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
-      method: 'nonce',
-    })).toString(), 10)
+    let transactionCount;
+    let jsonResult = await fetch(`https://safe-transaction-${transactionApiBlockchainNames[blockchain]}.safe.global/api/v1/safes/${this.address}/`)
+      .then((response) => response.json())
+      .catch((error) => { console.error('Error:', error); });
+    if(jsonResult && jsonResult.nonce) {
+      transactionCount = jsonResult.nonce;
+    } else {
+      transactionCount = parseInt((await request$1({
+        blockchain: this.blockchain,
+        address: this.address,
+        api: [{"inputs":[],"name":"nonce","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
+        method: 'nonce',
+      })).toString(), 10);
+    }
+    return transactionCount
   }
 
   async retrieveTransaction({ blockchain, tx }) {
@@ -1100,34 +1109,35 @@ const sendTransaction$2 = async ({ transaction, wallet })=> {
   const smartContractWallet = await getSmartContractWallet(transaction.blockchain, transaction.from);
   const transactionCount = smartContractWallet ? await smartContractWallet.transactionCount() : await request$1({ blockchain: transaction.blockchain, method: 'transactionCount', address: transaction.from });
   transaction.nonce = transactionCount;
-  await submit$2({ transaction, wallet }).then(async (tx)=>{
+  await submit$2({ transaction, wallet }).then((tx)=>{
     if (tx) {
       let blockchain = Blockchain.findByName(transaction.blockchain);
       transaction.id = tx;
       transaction.url = smartContractWallet && smartContractWallet.explorerUrlFor ? smartContractWallet.explorerUrlFor({ transaction }) : blockchain.explorerUrlFor({ transaction });
       if (transaction.sent) transaction.sent(transaction);
-      let sentTransaction = await retrieveTransaction$1({ blockchain: transaction.blockchain, tx, smartContractWallet });
-      transaction.id = sentTransaction.hash || transaction.id;
-      transaction.url = blockchain.explorerUrlFor({ transaction });
-      transaction.nonce = sentTransaction.nonce || transactionCount;
-      sentTransaction.wait(1).then(() => {
-        transaction._succeeded = true;
-        if (transaction.succeeded) transaction.succeeded(transaction);
-      }).catch((error)=>{
-        if(error && error.code && error.code == 'TRANSACTION_REPLACED') {
-          if(error.replacement && error.replacement.hash && error.receipt && error.receipt.status == 1) {
-            transaction.id = error.replacement.hash;
-            transaction._succeeded = true;
-            if (transaction.succeeded) transaction.succeeded(transaction);
-          } else if(error.replacement && error.replacement.hash && error.receipt && error.receipt.status == 0) {
-            transaction.id = error.replacement.hash;
+      retrieveTransaction$1({ blockchain: transaction.blockchain, tx, smartContractWallet }).then((sentTransaction)=>{
+        transaction.id = sentTransaction.hash || transaction.id;
+        transaction.url = blockchain.explorerUrlFor({ transaction });
+        transaction.nonce = sentTransaction.nonce || transactionCount;
+        sentTransaction.wait(1).then(() => {
+          transaction._succeeded = true;
+          if (transaction.succeeded) transaction.succeeded(transaction);
+        }).catch((error)=>{
+          if(error && error.code && error.code == 'TRANSACTION_REPLACED') {
+            if(error.replacement && error.replacement.hash && error.receipt && error.receipt.status == 1) {
+              transaction.id = error.replacement.hash;
+              transaction._succeeded = true;
+              if (transaction.succeeded) transaction.succeeded(transaction);
+            } else if(error.replacement && error.replacement.hash && error.receipt && error.receipt.status == 0) {
+              transaction.id = error.replacement.hash;
+              transaction._failed = true;
+              if(transaction.failed) transaction.failed(transaction, error);  
+            }
+          } else {
             transaction._failed = true;
-            if(transaction.failed) transaction.failed(transaction, error);  
+            if(transaction.failed) transaction.failed(transaction, error);
           }
-        } else {
-          transaction._failed = true;
-          if(transaction.failed) transaction.failed(transaction, error);
-        }
+        });
       });
     } else {
       throw('Submitting transaction failed!')

package/dist/umd/index.evm.js

@@ -59921,12 +59921,21 @@
     }
 
     async transactionCount() {
-      return parseInt((await request({
-        blockchain: this.blockchain,
-        address: this.address,
-        api: [{"inputs":[],"name":"nonce","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
-        method: 'nonce',
-      })).toString(), 10)
+      let transactionCount;
+      let jsonResult = await fetch(`https://safe-transaction-${transactionApiBlockchainNames[blockchain]}.safe.global/api/v1/safes/${this.address}/`)
+        .then((response) => response.json())
+        .catch((error) => { console.error('Error:', error); });
+      if(jsonResult && jsonResult.nonce) {
+        transactionCount = jsonResult.nonce;
+      } else {
+        transactionCount = parseInt((await request({
+          blockchain: this.blockchain,
+          address: this.address,
+          api: [{"inputs":[],"name":"nonce","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
+          method: 'nonce',
+        })).toString(), 10);
+      }
+      return transactionCount
     }
 
     async retrieveTransaction({ blockchain, tx }) {
@@ -60004,34 +60013,35 @@
     const smartContractWallet = await getSmartContractWallet(transaction.blockchain, transaction.from);
     const transactionCount = smartContractWallet ? await smartContractWallet.transactionCount() : await request({ blockchain: transaction.blockchain, method: 'transactionCount', address: transaction.from });
     transaction.nonce = transactionCount;
-    await submit$3({ transaction, wallet }).then(async (tx)=>{
+    await submit$3({ transaction, wallet }).then((tx)=>{
       if (tx) {
         let blockchain = web3Blockchains.Blockchain.findByName(transaction.blockchain);
         transaction.id = tx;
         transaction.url = smartContractWallet && smartContractWallet.explorerUrlFor ? smartContractWallet.explorerUrlFor({ transaction }) : blockchain.explorerUrlFor({ transaction });
         if (transaction.sent) transaction.sent(transaction);
-        let sentTransaction = await retrieveTransaction$1({ blockchain: transaction.blockchain, tx, smartContractWallet });
-        transaction.id = sentTransaction.hash || transaction.id;
-        transaction.url = blockchain.explorerUrlFor({ transaction });
-        transaction.nonce = sentTransaction.nonce || transactionCount;
-        sentTransaction.wait(1).then(() => {
-          transaction._succeeded = true;
-          if (transaction.succeeded) transaction.succeeded(transaction);
-        }).catch((error)=>{
-          if(error && error.code && error.code == 'TRANSACTION_REPLACED') {
-            if(error.replacement && error.replacement.hash && error.receipt && error.receipt.status == 1) {
-              transaction.id = error.replacement.hash;
-              transaction._succeeded = true;
-              if (transaction.succeeded) transaction.succeeded(transaction);
-            } else if(error.replacement && error.replacement.hash && error.receipt && error.receipt.status == 0) {
-              transaction.id = error.replacement.hash;
+        retrieveTransaction$1({ blockchain: transaction.blockchain, tx, smartContractWallet }).then((sentTransaction)=>{
+          transaction.id = sentTransaction.hash || transaction.id;
+          transaction.url = blockchain.explorerUrlFor({ transaction });
+          transaction.nonce = sentTransaction.nonce || transactionCount;
+          sentTransaction.wait(1).then(() => {
+            transaction._succeeded = true;
+            if (transaction.succeeded) transaction.succeeded(transaction);
+          }).catch((error)=>{
+            if(error && error.code && error.code == 'TRANSACTION_REPLACED') {
+              if(error.replacement && error.replacement.hash && error.receipt && error.receipt.status == 1) {
+                transaction.id = error.replacement.hash;
+                transaction._succeeded = true;
+                if (transaction.succeeded) transaction.succeeded(transaction);
+              } else if(error.replacement && error.replacement.hash && error.receipt && error.receipt.status == 0) {
+                transaction.id = error.replacement.hash;
+                transaction._failed = true;
+                if(transaction.failed) transaction.failed(transaction, error);  
+              }
+            } else {
               transaction._failed = true;
-              if(transaction.failed) transaction.failed(transaction, error);  
+              if(transaction.failed) transaction.failed(transaction, error);
             }
-          } else {
-            transaction._failed = true;
-            if(transaction.failed) transaction.failed(transaction, error);
-          }
+          });
         });
       } else {
         throw('Submitting transaction failed!')

package/dist/umd/index.js

@@ -1014,12 +1014,21 @@
     }
 
     async transactionCount() {
-      return parseInt((await web3Client.request({
-        blockchain: this.blockchain,
-        address: this.address,
-        api: [{"inputs":[],"name":"nonce","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
-        method: 'nonce',
-      })).toString(), 10)
+      let transactionCount;
+      let jsonResult = await fetch(`https://safe-transaction-${transactionApiBlockchainNames[blockchain]}.safe.global/api/v1/safes/${this.address}/`)
+        .then((response) => response.json())
+        .catch((error) => { console.error('Error:', error); });
+      if(jsonResult && jsonResult.nonce) {
+        transactionCount = jsonResult.nonce;
+      } else {
+        transactionCount = parseInt((await web3Client.request({
+          blockchain: this.blockchain,
+          address: this.address,
+          api: [{"inputs":[],"name":"nonce","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
+          method: 'nonce',
+        })).toString(), 10);
+      }
+      return transactionCount
     }
 
     async retrieveTransaction({ blockchain, tx }) {
@@ -1097,34 +1106,35 @@
     const smartContractWallet = await getSmartContractWallet(transaction.blockchain, transaction.from);
     const transactionCount = smartContractWallet ? await smartContractWallet.transactionCount() : await web3Client.request({ blockchain: transaction.blockchain, method: 'transactionCount', address: transaction.from });
     transaction.nonce = transactionCount;
-    await submit$2({ transaction, wallet }).then(async (tx)=>{
+    await submit$2({ transaction, wallet }).then((tx)=>{
       if (tx) {
         let blockchain = web3Blockchains.Blockchain.findByName(transaction.blockchain);
         transaction.id = tx;
         transaction.url = smartContractWallet && smartContractWallet.explorerUrlFor ? smartContractWallet.explorerUrlFor({ transaction }) : blockchain.explorerUrlFor({ transaction });
         if (transaction.sent) transaction.sent(transaction);
-        let sentTransaction = await retrieveTransaction$1({ blockchain: transaction.blockchain, tx, smartContractWallet });
-        transaction.id = sentTransaction.hash || transaction.id;
-        transaction.url = blockchain.explorerUrlFor({ transaction });
-        transaction.nonce = sentTransaction.nonce || transactionCount;
-        sentTransaction.wait(1).then(() => {
-          transaction._succeeded = true;
-          if (transaction.succeeded) transaction.succeeded(transaction);
-        }).catch((error)=>{
-          if(error && error.code && error.code == 'TRANSACTION_REPLACED') {
-            if(error.replacement && error.replacement.hash && error.receipt && error.receipt.status == 1) {
-              transaction.id = error.replacement.hash;
-              transaction._succeeded = true;
-              if (transaction.succeeded) transaction.succeeded(transaction);
-            } else if(error.replacement && error.replacement.hash && error.receipt && error.receipt.status == 0) {
-              transaction.id = error.replacement.hash;
+        retrieveTransaction$1({ blockchain: transaction.blockchain, tx, smartContractWallet }).then((sentTransaction)=>{
+          transaction.id = sentTransaction.hash || transaction.id;
+          transaction.url = blockchain.explorerUrlFor({ transaction });
+          transaction.nonce = sentTransaction.nonce || transactionCount;
+          sentTransaction.wait(1).then(() => {
+            transaction._succeeded = true;
+            if (transaction.succeeded) transaction.succeeded(transaction);
+          }).catch((error)=>{
+            if(error && error.code && error.code == 'TRANSACTION_REPLACED') {
+              if(error.replacement && error.replacement.hash && error.receipt && error.receipt.status == 1) {
+                transaction.id = error.replacement.hash;
+                transaction._succeeded = true;
+                if (transaction.succeeded) transaction.succeeded(transaction);
+              } else if(error.replacement && error.replacement.hash && error.receipt && error.receipt.status == 0) {
+                transaction.id = error.replacement.hash;
+                transaction._failed = true;
+                if(transaction.failed) transaction.failed(transaction, error);  
+              }
+            } else {
               transaction._failed = true;
-              if(transaction.failed) transaction.failed(transaction, error);  
+              if(transaction.failed) transaction.failed(transaction, error);
             }
-          } else {
-            transaction._failed = true;
-            if(transaction.failed) transaction.failed(transaction, error);
-          }
+          });
         });
       } else {
         throw('Submitting transaction failed!')

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-wallets-evm",
   "moduleName": "Web3Wallets",
-  "version": "14.6.2",
+  "version": "14.6.4",
   "description": "One-Stop-Shop JavaScript library to integrate various web3 crypto wallets and multiple blockchains at once with a single interface.",
   "main": "dist/umd/index.evm.js",
   "module": "dist/esm/index.evm.js",