v10.18.12: fix estimate (overloaded method names)

DePayFi · Aug 26, 2024 · 0e08b48 · 0e08b48
1 parent d76006e
commit 0e08b48
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 66 deletions.
diff --git a/dist/esm/index.evm.js b/dist/esm/index.evm.js
@@ -1,10 +1,17 @@
 import { ethers } from 'ethers';
 import Blockchains from '@depay/web3-blockchains';
 
+const findFragment = ({ fragments, method, params })=>{
+  return contract.interface.fragments.find((fragment) => {
+    return(
+      fragment.name == method &&
+      (fragment.inputs && params && typeof(params) === 'object' ? fragment.inputs.length == Object.keys(params).length : true)
+    )
+  })
+};
+
 const getContractArguments = ({ contract, method, params })=>{
-  let fragment = contract.interface.fragments.find((fragment) => {
-    return fragment.name == method
-  });
+  let fragment = findFragment({ fragments: contract.interface.fragments, method, params });
 
   if(params instanceof Array) {
     return params
@@ -32,12 +39,7 @@ var estimateEVM = ({ provider, from, to, value, method, api, params }) => {
     return provider.estimateGas({ from, to, value })
   } else {
     let contract = new ethers.Contract(to, api, provider);
-    let fragment = contract.interface.fragments.find((fragment) => {
-      return(
-        fragment.name == method &&
-        (fragment.inputs && params && typeof(params) === 'object' ? fragment.inputs.length == Object.keys(params).length : true)
-      )
-    });
+    let fragment = findFragment({ fragments: contract.interface.fragments, method, params });
     let contractArguments = getContractArguments({ contract, method, params });
     if(contract[method] === undefined) {
       method = `${method}(${fragment.inputs.map((input)=>{

diff --git a/dist/esm/index.js b/dist/esm/index.js
@@ -724,10 +724,17 @@ let simulate = async function ({ blockchain, from, to, keys, api, params }) {
   })
 };
 
+const findFragment = ({ fragments, method, params })=>{
+  return contract.interface.fragments.find((fragment) => {
+    return(
+      fragment.name == method &&
+      (fragment.inputs && params && typeof(params) === 'object' ? fragment.inputs.length == Object.keys(params).length : true)
+    )
+  })
+};
+
 const getContractArguments = ({ contract, method, params })=>{
-  let fragment = contract.interface.fragments.find((fragment) => {
-    return fragment.name == method
-  });
+  let fragment = findFragment({ fragments: contract.interface.fragments, method, params });
 
   if(params instanceof Array) {
     return params
@@ -755,12 +762,7 @@ var estimateEVM = ({ provider, from, to, value, method, api, params }) => {
     return provider.estimateGas({ from, to, value })
   } else {
     let contract = new ethers.Contract(to, api, provider);
-    let fragment = contract.interface.fragments.find((fragment) => {
-      return(
-        fragment.name == method &&
-        (fragment.inputs && params && typeof(params) === 'object' ? fragment.inputs.length == Object.keys(params).length : true)
-      )
-    });
+    let fragment = findFragment({ fragments: contract.interface.fragments, method, params });
     let contractArguments = getContractArguments({ contract, method, params });
     if(contract[method] === undefined) {
       method = `${method}(${fragment.inputs.map((input)=>{

diff --git a/dist/esm/index.solana.js b/dist/esm/index.solana.js
@@ -475,10 +475,17 @@ let simulate = async function ({ blockchain, from, to, keys, api, params }) {
   })
 };
 
+const findFragment = ({ fragments, method, params })=>{
+  return contract.interface.fragments.find((fragment) => {
+    return(
+      fragment.name == method &&
+      (fragment.inputs && params && typeof(params) === 'object' ? fragment.inputs.length == Object.keys(params).length : true)
+    )
+  })
+};
+
 const getContractArguments = ({ contract, method, params })=>{
-  let fragment = contract.interface.fragments.find((fragment) => {
-    return fragment.name == method
-  });
+  let fragment = findFragment({ fragments: contract.interface.fragments, method, params });
 
   if(params instanceof Array) {
     return params
@@ -506,12 +513,7 @@ var estimateEVM = ({ provider, from, to, value, method, api, params }) => {
     return provider.estimateGas({ from, to, value })
   } else {
     let contract = new ethers.Contract(to, api, provider);
-    let fragment = contract.interface.fragments.find((fragment) => {
-      return(
-        fragment.name == method &&
-        (fragment.inputs && params && typeof(params) === 'object' ? fragment.inputs.length == Object.keys(params).length : true)
-      )
-    });
+    let fragment = findFragment({ fragments: contract.interface.fragments, method, params });
     let contractArguments = getContractArguments({ contract, method, params });
     if(contract[method] === undefined) {
       method = `${method}(${fragment.inputs.map((input)=>{

diff --git a/dist/umd/index.evm.js b/dist/umd/index.evm.js
@@ -8,10 +8,17 @@
 
   var Blockchains__default = /*#__PURE__*/_interopDefaultLegacy(Blockchains);
 
+  const findFragment = ({ fragments, method, params })=>{
+    return contract.interface.fragments.find((fragment) => {
+      return(
+        fragment.name == method &&
+        (fragment.inputs && params && typeof(params) === 'object' ? fragment.inputs.length == Object.keys(params).length : true)
+      )
+    })
+  };
+
   const getContractArguments = ({ contract, method, params })=>{
-    let fragment = contract.interface.fragments.find((fragment) => {
-      return fragment.name == method
-    });
+    let fragment = findFragment({ fragments: contract.interface.fragments, method, params });
 
     if(params instanceof Array) {
       return params
@@ -39,12 +46,7 @@
       return provider.estimateGas({ from, to, value })
     } else {
       let contract = new ethers.ethers.Contract(to, api, provider);
-      let fragment = contract.interface.fragments.find((fragment) => {
-        return(
-          fragment.name == method &&
-          (fragment.inputs && params && typeof(params) === 'object' ? fragment.inputs.length == Object.keys(params).length : true)
-        )
-      });
+      let fragment = findFragment({ fragments: contract.interface.fragments, method, params });
       let contractArguments = getContractArguments({ contract, method, params });
       if(contract[method] === undefined) {
         method = `${method}(${fragment.inputs.map((input)=>{

diff --git a/dist/umd/index.js b/dist/umd/index.js
@@ -730,10 +730,17 @@
     })
   };
 
+  const findFragment = ({ fragments, method, params })=>{
+    return contract.interface.fragments.find((fragment) => {
+      return(
+        fragment.name == method &&
+        (fragment.inputs && params && typeof(params) === 'object' ? fragment.inputs.length == Object.keys(params).length : true)
+      )
+    })
+  };
+
   const getContractArguments = ({ contract, method, params })=>{
-    let fragment = contract.interface.fragments.find((fragment) => {
-      return fragment.name == method
-    });
+    let fragment = findFragment({ fragments: contract.interface.fragments, method, params });
 
     if(params instanceof Array) {
       return params
@@ -761,12 +768,7 @@
       return provider.estimateGas({ from, to, value })
     } else {
       let contract = new ethers.ethers.Contract(to, api, provider);
-      let fragment = contract.interface.fragments.find((fragment) => {
-        return(
-          fragment.name == method &&
-          (fragment.inputs && params && typeof(params) === 'object' ? fragment.inputs.length == Object.keys(params).length : true)
-        )
-      });
+      let fragment = findFragment({ fragments: contract.interface.fragments, method, params });
       let contractArguments = getContractArguments({ contract, method, params });
       if(contract[method] === undefined) {
         method = `${method}(${fragment.inputs.map((input)=>{

diff --git a/dist/umd/index.solana.js b/dist/umd/index.solana.js
@@ -481,10 +481,17 @@
     })
   };
 
+  const findFragment = ({ fragments, method, params })=>{
+    return contract.interface.fragments.find((fragment) => {
+      return(
+        fragment.name == method &&
+        (fragment.inputs && params && typeof(params) === 'object' ? fragment.inputs.length == Object.keys(params).length : true)
+      )
+    })
+  };
+
   const getContractArguments = ({ contract, method, params })=>{
-    let fragment = contract.interface.fragments.find((fragment) => {
-      return fragment.name == method
-    });
+    let fragment = findFragment({ fragments: contract.interface.fragments, method, params });
 
     if(params instanceof Array) {
       return params
@@ -512,12 +519,7 @@
       return provider.estimateGas({ from, to, value })
     } else {
       let contract = new ethers.ethers.Contract(to, api, provider);
-      let fragment = contract.interface.fragments.find((fragment) => {
-        return(
-          fragment.name == method &&
-          (fragment.inputs && params && typeof(params) === 'object' ? fragment.inputs.length == Object.keys(params).length : true)
-        )
-      });
+      let fragment = findFragment({ fragments: contract.interface.fragments, method, params });
       let contractArguments = getContractArguments({ contract, method, params });
       if(contract[method] === undefined) {
         method = `${method}(${fragment.inputs.map((input)=>{

diff --git a/package.evm.json b/package.evm.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/web3-client-evm",
   "moduleName": "Web3Client",
-  "version": "10.18.11",
+  "version": "10.18.12",
   "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.11",
+  "version": "10.18.12",
   "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.11",
+  "version": "10.18.12",
   "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
@@ -1,9 +1,16 @@
 import { ethers } from 'ethers'
 
-const getContractArguments = ({ contract, method, params })=>{
-  let fragment = contract.interface.fragments.find((fragment) => {
-    return fragment.name == method
+const findFragment = ({ fragments, method, params })=>{
+  return contract.interface.fragments.find((fragment) => {
+    return(
+      fragment.name == method &&
+      (fragment.inputs && params && typeof(params) === 'object' ? fragment.inputs.length == Object.keys(params).length : true)
+    )
   })
+}
+
+const getContractArguments = ({ contract, method, params })=>{
+  let fragment = findFragment({ fragments: contract.interface.fragments, method, params })
 
   if(params instanceof Array) {
     return params
@@ -31,12 +38,7 @@ export default ({ provider, from, to, value, method, api, params }) => {
     return provider.estimateGas({ from, to, value })
   } else {
     let contract = new ethers.Contract(to, api, provider)
-    let fragment = contract.interface.fragments.find((fragment) => {
-      return(
-        fragment.name == method &&
-        (fragment.inputs && params && typeof(params) === 'object' ? fragment.inputs.length == Object.keys(params).length : true)
-      )
-    })
+    let fragment = findFragment({ fragments: contract.interface.fragments, method, params })
     let contractArguments = getContractArguments({ contract, method, params })
     if(contract[method] === undefined) {
       method = `${method}(${fragment.inputs.map((input)=>{