@instadapp/interop-x 0.0.0-dev.d71f27e → 0.0.0-dev.e33810b

package/src/typechain/factories/InteropXContract__factory.ts

@@ -13,6 +13,12 @@ const _abi = [
   {
     anonymous: false,
     inputs: [
+      {
+        indexed: false,
+        internalType: "string",
+        name: "actionId",
+        type: "string",
+      },
       {
         indexed: true,
         internalType: "address",
@@ -102,6 +108,12 @@ const _abi = [
   {
     anonymous: false,
     inputs: [
+      {
+        indexed: false,
+        internalType: "string",
+        name: "actionId",
+        type: "string",
+      },
       {
         indexed: true,
         internalType: "address",
@@ -197,6 +209,12 @@ const _abi = [
   {
     anonymous: false,
     inputs: [
+      {
+        indexed: false,
+        internalType: "string",
+        name: "actionId",
+        type: "string",
+      },
       {
         indexed: true,
         internalType: "address",
@@ -280,6 +298,12 @@ const _abi = [
   {
     anonymous: false,
     inputs: [
+      {
+        indexed: false,
+        internalType: "string",
+        name: "actionId",
+        type: "string",
+      },
       {
         indexed: true,
         internalType: "address",
@@ -367,20 +391,12 @@ const _abi = [
     type: "event",
   },
   {
-    inputs: [],
-    name: "_vnonce",
-    outputs: [
+    inputs: [
       {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
+        internalType: "string",
+        name: "actionId",
+        type: "string",
       },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
       {
         internalType: "address",
         name: "to_",
@@ -403,7 +419,7 @@ const _abi = [
       },
       {
         internalType: "uint32",
-        name: "targetChainId_",
+        name: "sourceChainId_",
         type: "uint32",
       },
       {
@@ -424,6 +440,47 @@ const _abi = [
   },
   {
     inputs: [
+      {
+        internalType: "address",
+        name: "user",
+        type: "address",
+      },
+      {
+        internalType: "address[]",
+        name: "tokens",
+        type: "address[]",
+      },
+    ],
+    name: "getBridgeAmounts",
+    outputs: [
+      {
+        components: [
+          {
+            internalType: "uint256",
+            name: "deposit",
+            type: "uint256",
+          },
+          {
+            internalType: "uint256",
+            name: "withdraw",
+            type: "uint256",
+          },
+        ],
+        internalType: "struct InteropXContractBeta.UserData[]",
+        name: "userData",
+        type: "tuple[]",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "string",
+        name: "actionId",
+        type: "string",
+      },
       {
         internalType: "address",
         name: "sourceToken_",
@@ -455,6 +512,24 @@ const _abi = [
     stateMutability: "nonpayable",
     type: "function",
   },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "token",
+        type: "address",
+      },
+      {
+        internalType: "bool",
+        name: "toggle",
+        type: "bool",
+      },
+    ],
+    name: "toggleWhitelist",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function",
+  },
   {
     inputs: [
       {
@@ -462,20 +537,54 @@ const _abi = [
         name: "",
         type: "address",
       },
+      {
+        internalType: "address",
+        name: "",
+        type: "address",
+      },
     ],
-    name: "whitelistedMapping",
+    name: "userMapping",
     outputs: [
       {
         internalType: "uint256",
-        name: "",
+        name: "deposit",
         type: "uint256",
       },
+      {
+        internalType: "uint256",
+        name: "withdraw",
+        type: "uint256",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "",
+        type: "address",
+      },
+    ],
+    name: "whitelistedTokens",
+    outputs: [
+      {
+        internalType: "bool",
+        name: "",
+        type: "bool",
+      },
     ],
     stateMutability: "view",
     type: "function",
   },
   {
     inputs: [
+      {
+        internalType: "string",
+        name: "actionId",
+        type: "string",
+      },
       {
         internalType: "address",
         name: "user_",

package/src/utils/index.ts

@@ -7,6 +7,8 @@ import { addresses } from '@/constants';
 import { ChainId } from '@/types'
 import { ethers } from 'ethers';
 import { GnosisSafe } from '@/typechain';
+import retry from 'async-retry'
+
 export const http = axios.create();
 
 axiosRetry(http, { retries: 3, retryDelay: axiosRetry.exponentialDelay });
@@ -131,9 +133,9 @@ export const asyncCallWithTimeout = async <T>(asyncPromise: Promise<T>, timeout:
 }
 
 
-export const generateInteropTransactionHash = (data: { action: string, bridger: string, requestTransactionHash: string, sourceChainId: string | number, targetChainId: string | number }) => {
+export const generateInteropTransactionHash = (data: { actionId: string, bridger: string, requestTransactionHash: string, sourceChainId: string | number, targetChainId: string | number }) => {
   return ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string', 'string'], [
-    String(data.action),
+    String(data.actionId),
     String(data.bridger),
     String(data.requestTransactionHash),
     String(data.sourceChainId),
@@ -141,6 +143,13 @@ export const generateInteropTransactionHash = (data: { action: string, bridger:
   ]);
 }
 
+
+export class ContractError extends Error {
+  method: string;
+  address: string;
+  args: any[];
+}
+
 export function getContract<TContract extends ethers.Contract>(address: string, contractInterface: ethers.ContractInterface | any, signerOrProvider?: ethers.Signer | ethers.providers.Provider) {
   if (!ethers.utils.getAddress(address) || address === ethers.constants.AddressZero) {
     throw Error(`Invalid 'address' parameter '${address}'.`)
@@ -164,11 +173,24 @@ export function getContract<TContract extends ethers.Contract>(address: string,
       const value = Reflect.get(target, prop, receiver);
 
       if (typeof value === 'function' && (contract.functions.hasOwnProperty(prop) || ['queryFilter'].includes(String(prop)))) {
+        let isConstant = false;
+
+        try {
+          isConstant = contract.interface.getFunction(String(prop)).constant
+        } catch (error) {
+        }
+
         return async (...args: any[]) => {
           try {
-            return await value.bind(contract)(...args);
+            return await retry(async () => await value.bind(contract)(...args), { retries: isConstant ? 1 : 3 });
           } catch (error) {
-            throw new Error(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`)
+            const err = new ContractError(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`)
+
+            err.method = String(prop)
+            err.address = address
+            err.args = [...args]
+
+            throw err
           }
         }
       }
@@ -184,9 +206,15 @@ export function getContract<TContract extends ethers.Contract>(address: string,
             if (typeof value === 'function') {
               return async (...args: any[]) => {
                 try {
-                  return await value.bind(contract)(...args);
+                  return await retry(async () => await value.bind(contract)(...args), { retries: parentProp === 'callStatic' ? 3 : 1 });
                 } catch (error) {
-                  throw new Error(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`)
+                  const err = new ContractError(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`)
+
+                  err.method = String(prop)
+                  err.address = address
+                  err.args = [...args]
+
+                  throw err
                 }
               }
             }
@@ -203,37 +231,37 @@ export const generateGnosisTransaction = async (transactionData: any, safeContra
   console.log(transactionData);
 
   let isExecuted = await safeContract.dataHashes(
-      await safeContract.getTransactionHash(
-          transactionData.to,
-          transactionData.value,
-          transactionData.data,
-          transactionData.operation,
-          transactionData.safeTxGas,
-          transactionData.baseGas,
-          transactionData.gasPrice,
-          transactionData.gasToken,
-          transactionData.refundReceiver,
-          transactionData.nonce
-      )
+    await safeContract.getTransactionHash(
+      transactionData.to,
+      transactionData.value,
+      transactionData.data,
+      transactionData.operation,
+      transactionData.safeTxGas,
+      transactionData.baseGas,
+      transactionData.gasPrice,
+      transactionData.gasToken,
+      transactionData.refundReceiver,
+      transactionData.nonce
+    )
   )
 
   while (isExecuted == 1) {
-      transactionData.safeTxGas = ethers.BigNumber.from(String(transactionData.safeTxGas)).add(1).toString()
-
-      isExecuted = await safeContract.dataHashes(
-          await safeContract.getTransactionHash(
-              transactionData.to,
-              transactionData.value,
-              transactionData.data,
-              transactionData.operation,
-              transactionData.safeTxGas,
-              transactionData.baseGas,
-              transactionData.gasPrice,
-              transactionData.gasToken,
-              transactionData.refundReceiver,
-              transactionData.nonce
-          )
+    transactionData.safeTxGas = ethers.BigNumber.from(String(transactionData.safeTxGas)).add(1).toString()
+
+    isExecuted = await safeContract.dataHashes(
+      await safeContract.getTransactionHash(
+        transactionData.to,
+        transactionData.value,
+        transactionData.data,
+        transactionData.operation,
+        transactionData.safeTxGas,
+        transactionData.baseGas,
+        transactionData.gasPrice,
+        transactionData.gasToken,
+        transactionData.refundReceiver,
+        transactionData.nonce
       )
+    )
   }
 
   return transactionData