v10.18.4: fix estimateEvm for tuple params

DePayFi · Sep 15, 2023 · e72e6d0 · e72e6d0
1 parent 720d337
commit e72e6d0
Show file tree

Hide file tree

Showing 10 changed files with 143 additions and 17 deletions.
diff --git a/dist/esm/index.evm.js b/dist/esm/index.evm.js
@@ -15,6 +15,18 @@ const getContractArguments = ({ contract, method, params })=>{
   }
 };
 
+const tupleParamsToMethodSignature = (components) =>{
+  return `(${
+    components.map((component)=>{
+      if(component.type === 'tuple') {
+        return tupleParamsToMethodSignature(component.components)
+      } else {
+        return component.type 
+      }
+    }).join(',')
+  })`
+};
+
 var estimateEVM = ({ provider, from, to, value, method, api, params }) => {
   if(typeof api == "undefined"){
     return provider.estimateGas({ from, to, value })
@@ -23,10 +35,16 @@ var estimateEVM = ({ provider, from, to, value, method, api, params }) => {
     let fragment = contract.interface.fragments.find((fragment) => {
       return fragment.name == method
     });
+    let contractArguments = getContractArguments({ contract, method, params });
     if(contract[method] === undefined) {
-      method = `${method}(${fragment.inputs.map((input)=>input.type).join(',')})`;
+      method = `${method}(${fragment.inputs.map((input)=>{
+        if(input.type === 'tuple') {
+          return tupleParamsToMethodSignature(input.components)
+        } else {
+          return input.type
+        }
+      }).join(',')})`;
     }
-    let contractArguments = getContractArguments({ contract, method, params });
     let contractMethod = contract.estimateGas[method];
     if(contractArguments) {
       return contractMethod(...contractArguments, { from, value })

diff --git a/dist/esm/index.js b/dist/esm/index.js
@@ -693,6 +693,18 @@ const getContractArguments = ({ contract, method, params })=>{
   }
 };
 
+const tupleParamsToMethodSignature = (components) =>{
+  return `(${
+    components.map((component)=>{
+      if(component.type === 'tuple') {
+        return tupleParamsToMethodSignature(component.components)
+      } else {
+        return component.type 
+      }
+    }).join(',')
+  })`
+};
+
 var estimateEVM = ({ provider, from, to, value, method, api, params }) => {
   if(typeof api == "undefined"){
     return provider.estimateGas({ from, to, value })
@@ -701,10 +713,16 @@ var estimateEVM = ({ provider, from, to, value, method, api, params }) => {
     let fragment = contract.interface.fragments.find((fragment) => {
       return fragment.name == method
     });
+    let contractArguments = getContractArguments({ contract, method, params });
     if(contract[method] === undefined) {
-      method = `${method}(${fragment.inputs.map((input)=>input.type).join(',')})`;
+      method = `${method}(${fragment.inputs.map((input)=>{
+        if(input.type === 'tuple') {
+          return tupleParamsToMethodSignature(input.components)
+        } else {
+          return input.type
+        }
+      }).join(',')})`;
     }
-    let contractArguments = getContractArguments({ contract, method, params });
     let contractMethod = contract.estimateGas[method];
     if(contractArguments) {
       return contractMethod(...contractArguments, { from, value })

diff --git a/dist/esm/index.solana.js b/dist/esm/index.solana.js
@@ -451,6 +451,18 @@ const getContractArguments = ({ contract, method, params })=>{
   }
 };
 
+const tupleParamsToMethodSignature = (components) =>{
+  return `(${
+    components.map((component)=>{
+      if(component.type === 'tuple') {
+        return tupleParamsToMethodSignature(component.components)
+      } else {
+        return component.type 
+      }
+    }).join(',')
+  })`
+};
+
 var estimateEVM = ({ provider, from, to, value, method, api, params }) => {
   if(typeof api == "undefined"){
     return provider.estimateGas({ from, to, value })
@@ -459,10 +471,16 @@ var estimateEVM = ({ provider, from, to, value, method, api, params }) => {
     let fragment = contract.interface.fragments.find((fragment) => {
       return fragment.name == method
     });
+    let contractArguments = getContractArguments({ contract, method, params });
     if(contract[method] === undefined) {
-      method = `${method}(${fragment.inputs.map((input)=>input.type).join(',')})`;
+      method = `${method}(${fragment.inputs.map((input)=>{
+        if(input.type === 'tuple') {
+          return tupleParamsToMethodSignature(input.components)
+        } else {
+          return input.type
+        }
+      }).join(',')})`;
     }
-    let contractArguments = getContractArguments({ contract, method, params });
     let contractMethod = contract.estimateGas[method];
     if(contractArguments) {
       return contractMethod(...contractArguments, { from, value })

diff --git a/dist/umd/index.evm.js b/dist/umd/index.evm.js
@@ -22,6 +22,18 @@
     }
   };
 
+  const tupleParamsToMethodSignature = (components) =>{
+    return `(${
+    components.map((component)=>{
+      if(component.type === 'tuple') {
+        return tupleParamsToMethodSignature(component.components)
+      } else {
+        return component.type 
+      }
+    }).join(',')
+  })`
+  };
+
   var estimateEVM = ({ provider, from, to, value, method, api, params }) => {
     if(typeof api == "undefined"){
       return provider.estimateGas({ from, to, value })
@@ -30,10 +42,16 @@
       let fragment = contract.interface.fragments.find((fragment) => {
         return fragment.name == method
       });
+      let contractArguments = getContractArguments({ contract, method, params });
       if(contract[method] === undefined) {
-        method = `${method}(${fragment.inputs.map((input)=>input.type).join(',')})`;
+        method = `${method}(${fragment.inputs.map((input)=>{
+        if(input.type === 'tuple') {
+          return tupleParamsToMethodSignature(input.components)
+        } else {
+          return input.type
+        }
+      }).join(',')})`;
       }
-      let contractArguments = getContractArguments({ contract, method, params });
       let contractMethod = contract.estimateGas[method];
       if(contractArguments) {
         return contractMethod(...contractArguments, { from, value })

diff --git a/dist/umd/index.js b/dist/umd/index.js
@@ -699,6 +699,18 @@
     }
   };
 
+  const tupleParamsToMethodSignature = (components) =>{
+    return `(${
+    components.map((component)=>{
+      if(component.type === 'tuple') {
+        return tupleParamsToMethodSignature(component.components)
+      } else {
+        return component.type 
+      }
+    }).join(',')
+  })`
+  };
+
   var estimateEVM = ({ provider, from, to, value, method, api, params }) => {
     if(typeof api == "undefined"){
       return provider.estimateGas({ from, to, value })
@@ -707,10 +719,16 @@
       let fragment = contract.interface.fragments.find((fragment) => {
         return fragment.name == method
       });
+      let contractArguments = getContractArguments({ contract, method, params });
       if(contract[method] === undefined) {
-        method = `${method}(${fragment.inputs.map((input)=>input.type).join(',')})`;
+        method = `${method}(${fragment.inputs.map((input)=>{
+        if(input.type === 'tuple') {
+          return tupleParamsToMethodSignature(input.components)
+        } else {
+          return input.type
+        }
+      }).join(',')})`;
       }
-      let contractArguments = getContractArguments({ contract, method, params });
       let contractMethod = contract.estimateGas[method];
       if(contractArguments) {
         return contractMethod(...contractArguments, { from, value })

diff --git a/dist/umd/index.solana.js b/dist/umd/index.solana.js
@@ -457,6 +457,18 @@
     }
   };
 
+  const tupleParamsToMethodSignature = (components) =>{
+    return `(${
+    components.map((component)=>{
+      if(component.type === 'tuple') {
+        return tupleParamsToMethodSignature(component.components)
+      } else {
+        return component.type 
+      }
+    }).join(',')
+  })`
+  };
+
   var estimateEVM = ({ provider, from, to, value, method, api, params }) => {
     if(typeof api == "undefined"){
       return provider.estimateGas({ from, to, value })
@@ -465,10 +477,16 @@
       let fragment = contract.interface.fragments.find((fragment) => {
         return fragment.name == method
       });
+      let contractArguments = getContractArguments({ contract, method, params });
       if(contract[method] === undefined) {
-        method = `${method}(${fragment.inputs.map((input)=>input.type).join(',')})`;
+        method = `${method}(${fragment.inputs.map((input)=>{
+        if(input.type === 'tuple') {
+          return tupleParamsToMethodSignature(input.components)
+        } else {
+          return input.type
+        }
+      }).join(',')})`;
       }
-      let contractArguments = getContractArguments({ contract, method, params });
       let contractMethod = contract.estimateGas[method];
       if(contractArguments) {
         return contractMethod(...contractArguments, { from, value })

diff --git a/package.evm.json b/package.evm.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-client-evm",
   "moduleName": "Web3Client",
-  "version": "10.18.3",
+  "version": "10.18.4",
   "description": "A web3 client to fetch blockchain data just like you are used to with HTTP clients.",
   "main": "dist/umd/index.evm.js",
   "module": "dist/esm/index.evm.js",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-client",
   "moduleName": "Web3Client",
-  "version": "10.18.3",
+  "version": "10.18.4",
   "description": "A web3 client to fetch blockchain data just like you are used to with HTTP clients.",
   "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/web3-client-solana",
   "moduleName": "Web3Client",
-  "version": "10.18.3",
+  "version": "10.18.4",
   "description": "A web3 client to fetch blockchain data just like you are used to with HTTP clients.",
   "main": "dist/umd/index.solana.js",
   "module": "dist/esm/index.solana.js",

diff --git a/src/platforms/evm/estimate.js b/src/platforms/evm/estimate.js
@@ -14,6 +14,18 @@ const getContractArguments = ({ contract, method, params })=>{
   }
 }
 
+const tupleParamsToMethodSignature = (components) =>{
+  return `(${
+    components.map((component)=>{
+      if(component.type === 'tuple') {
+        return tupleParamsToMethodSignature(component.components)
+      } else {
+        return component.type 
+      }
+    }).join(',')
+  })`
+}
+
 export default ({ provider, from, to, value, method, api, params }) => {
   if(typeof api == "undefined"){
     return provider.estimateGas({ from, to, value })
@@ -22,10 +34,16 @@ export default ({ provider, from, to, value, method, api, params }) => {
     let fragment = contract.interface.fragments.find((fragment) => {
       return fragment.name == method
     })
+    let contractArguments = getContractArguments({ contract, method, params })
     if(contract[method] === undefined) {
-      method = `${method}(${fragment.inputs.map((input)=>input.type).join(',')})`
+      method = `${method}(${fragment.inputs.map((input)=>{
+        if(input.type === 'tuple') {
+          return tupleParamsToMethodSignature(input.components)
+        } else {
+          return input.type
+        }
+      }).join(',')})`
     }
-    let contractArguments = getContractArguments({ contract, method, params })
     let contractMethod = contract.estimateGas[method]
     if(contractArguments) {
       return contractMethod(...contractArguments, { from, value })