@instadapp/interop-x 0.0.0-dev.a861339 → 0.0.0-dev.a9cd1d2

package/src/typechain/factories/index.ts

@@ -3,4 +3,4 @@
 /* eslint-disable */
 export { Erc20__factory } from "./Erc20__factory";
 export { GnosisSafe__factory } from "./GnosisSafe__factory";
-export { InteropXContract__factory } from "./InteropXContract__factory";
+export { InteropX__factory } from "./InteropX__factory";

package/src/typechain/index.ts

@@ -3,8 +3,8 @@
 /* eslint-disable */
 export type { Erc20 } from "./Erc20";
 export type { GnosisSafe } from "./GnosisSafe";
-export type { InteropXContract } from "./InteropXContract";
+export type { InteropX } from "./InteropX";
 export * as factories from "./factories";
 export { Erc20__factory } from "./factories/Erc20__factory";
 export { GnosisSafe__factory } from "./factories/GnosisSafe__factory";
-export { InteropXContract__factory } from "./factories/InteropXContract__factory";
+export { InteropX__factory } from "./factories/InteropX__factory";

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,14 +133,35 @@ 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 }) => {
-  return ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string', 'string'], [
-    String(data.action),
-    String(data.bridger),
-    String(data.requestTransactionHash),
-    String(data.sourceChainId),
-    String(data.targetChainId),
-  ]);
+type GenerateInteropTransactionHashParam = {
+  actionId: string,
+  vnonce: string,
+  sourceSender: string,
+  sourceChainId: string | number,
+  sourceDsaId: string,
+  targetChainId: string | number,
+  targetDsaId: string,
+};
+
+export const generateInteropTransactionHash = (data: GenerateInteropTransactionHashParam) => {
+  return ethers.utils.solidityKeccak256(
+    Array.from(Array(7), () => 'string'),
+    [
+      String(data.actionId),
+      String(data.vnonce),
+      String(data.sourceSender),
+      String(data.sourceChainId),
+      String(data.sourceDsaId),
+      String(data.targetChainId),
+      String(data.targetDsaId),
+    ]);
+}
+
+
+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) {
@@ -164,11 +187,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 +220,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,38 +245,45 @@ 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
+}
+
+export class LiquidityError extends Error {
+  constructor(message?: string) {
+    super(message || 'Not enough liquidity');
+    Object.setPrototypeOf(this, new.target.prototype);
+  }
 }

package/dist/src/abi/interopXContract.json

@@ -1,391 +0,0 @@
-[
-    {
-        "anonymous": false,
-        "inputs": [
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "bridger",
-                "type": "address"
-            },
-            {
-                "components": [
-                    {
-                        "components": [
-                            {
-                                "internalType": "address",
-                                "name": "sourceToken",
-                                "type": "address"
-                            },
-                            {
-                                "internalType": "address",
-                                "name": "targetToken",
-                                "type": "address"
-                            },
-                            { "internalType": "uint256", "name": "amount", "type": "uint256" }
-                        ],
-                        "internalType": "struct InteropXContractBeta.TokenInfo[]",
-                        "name": "supply",
-                        "type": "tuple[]"
-                    },
-                    {
-                        "components": [
-                            {
-                                "internalType": "address",
-                                "name": "sourceToken",
-                                "type": "address"
-                            },
-                            {
-                                "internalType": "address",
-                                "name": "targetToken",
-                                "type": "address"
-                            },
-                            { "internalType": "uint256", "name": "amount", "type": "uint256" }
-                        ],
-                        "internalType": "struct InteropXContractBeta.TokenInfo[]",
-                        "name": "withdraw",
-                        "type": "tuple[]"
-                    }
-                ],
-                "indexed": false,
-                "internalType": "struct InteropXContractBeta.Position",
-                "name": "position",
-                "type": "tuple"
-            },
-            {
-                "indexed": true,
-                "internalType": "uint32",
-                "name": "sourceChainId",
-                "type": "uint32"
-            },
-            {
-                "indexed": false,
-                "internalType": "uint32",
-                "name": "targetChainId",
-                "type": "uint32"
-            },
-            {
-                "indexed": true,
-                "internalType": "bytes32",
-                "name": "requestTransactionHash",
-                "type": "bytes32"
-            },
-            {
-                "indexed": false,
-                "internalType": "bytes",
-                "name": "metadata",
-                "type": "bytes"
-            }
-        ],
-        "name": "LogBridgeCommitted",
-        "type": "event"
-    },
-    {
-        "anonymous": false,
-        "inputs": [
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "bridger",
-                "type": "address"
-            },
-            {
-                "components": [
-                    {
-                        "components": [
-                            {
-                                "internalType": "address",
-                                "name": "sourceToken",
-                                "type": "address"
-                            },
-                            {
-                                "internalType": "address",
-                                "name": "targetToken",
-                                "type": "address"
-                            },
-                            { "internalType": "uint256", "name": "amount", "type": "uint256" }
-                        ],
-                        "internalType": "struct InteropXContractBeta.TokenInfo[]",
-                        "name": "supply",
-                        "type": "tuple[]"
-                    },
-                    {
-                        "components": [
-                            {
-                                "internalType": "address",
-                                "name": "sourceToken",
-                                "type": "address"
-                            },
-                            {
-                                "internalType": "address",
-                                "name": "targetToken",
-                                "type": "address"
-                            },
-                            { "internalType": "uint256", "name": "amount", "type": "uint256" }
-                        ],
-                        "internalType": "struct InteropXContractBeta.TokenInfo[]",
-                        "name": "withdraw",
-                        "type": "tuple[]"
-                    }
-                ],
-                "indexed": false,
-                "internalType": "struct InteropXContractBeta.Position",
-                "name": "position",
-                "type": "tuple"
-            },
-            {
-                "indexed": false,
-                "internalType": "uint256",
-                "name": "sourceChainId",
-                "type": "uint256"
-            },
-            {
-                "indexed": true,
-                "internalType": "uint256",
-                "name": "targetChainId",
-                "type": "uint256"
-            },
-            {
-                "indexed": true,
-                "internalType": "bytes32",
-                "name": "requestTransactionHash",
-                "type": "bytes32"
-            },
-            {
-                "indexed": false,
-                "internalType": "bytes32",
-                "name": "targetCommittedTransactionHash",
-                "type": "bytes32"
-            },
-            {
-                "indexed": false,
-                "internalType": "bytes",
-                "name": "metadata",
-                "type": "bytes"
-            }
-        ],
-        "name": "LogBridgeCompleted",
-        "type": "event"
-    },
-    {
-        "anonymous": false,
-        "inputs": [
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "bridger",
-                "type": "address"
-            },
-            {
-                "components": [
-                    {
-                        "components": [
-                            {
-                                "internalType": "address",
-                                "name": "sourceToken",
-                                "type": "address"
-                            },
-                            {
-                                "internalType": "address",
-                                "name": "targetToken",
-                                "type": "address"
-                            },
-                            { "internalType": "uint256", "name": "amount", "type": "uint256" }
-                        ],
-                        "internalType": "struct InteropXContractBeta.TokenInfo[]",
-                        "name": "supply",
-                        "type": "tuple[]"
-                    },
-                    {
-                        "components": [
-                            {
-                                "internalType": "address",
-                                "name": "sourceToken",
-                                "type": "address"
-                            },
-                            {
-                                "internalType": "address",
-                                "name": "targetToken",
-                                "type": "address"
-                            },
-                            { "internalType": "uint256", "name": "amount", "type": "uint256" }
-                        ],
-                        "internalType": "struct InteropXContractBeta.TokenInfo[]",
-                        "name": "withdraw",
-                        "type": "tuple[]"
-                    }
-                ],
-                "indexed": false,
-                "internalType": "struct InteropXContractBeta.Position",
-                "name": "position",
-                "type": "tuple"
-            },
-            {
-                "indexed": false,
-                "internalType": "uint256",
-                "name": "sourceChainId",
-                "type": "uint256"
-            },
-            {
-                "indexed": true,
-                "internalType": "uint256",
-                "name": "targetChainId",
-                "type": "uint256"
-            },
-            {
-                "indexed": false,
-                "internalType": "bytes",
-                "name": "metadata",
-                "type": "bytes"
-            }
-        ],
-        "name": "LogBridgeRequest",
-        "type": "event"
-    },
-    {
-        "anonymous": false,
-        "inputs": [
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "bridger",
-                "type": "address"
-            },
-            {
-                "components": [
-                    {
-                        "components": [
-                            {
-                                "internalType": "address",
-                                "name": "sourceToken",
-                                "type": "address"
-                            },
-                            {
-                                "internalType": "address",
-                                "name": "targetToken",
-                                "type": "address"
-                            },
-                            { "internalType": "uint256", "name": "amount", "type": "uint256" }
-                        ],
-                        "internalType": "struct InteropXContractBeta.TokenInfo[]",
-                        "name": "supply",
-                        "type": "tuple[]"
-                    },
-                    {
-                        "components": [
-                            {
-                                "internalType": "address",
-                                "name": "sourceToken",
-                                "type": "address"
-                            },
-                            {
-                                "internalType": "address",
-                                "name": "targetToken",
-                                "type": "address"
-                            },
-                            { "internalType": "uint256", "name": "amount", "type": "uint256" }
-                        ],
-                        "internalType": "struct InteropXContractBeta.TokenInfo[]",
-                        "name": "withdraw",
-                        "type": "tuple[]"
-                    }
-                ],
-                "indexed": false,
-                "internalType": "struct InteropXContractBeta.Position",
-                "name": "position",
-                "type": "tuple"
-            },
-            {
-                "indexed": false,
-                "internalType": "uint32",
-                "name": "sourceChainId",
-                "type": "uint32"
-            },
-            {
-                "indexed": true,
-                "internalType": "uint32",
-                "name": "targetChainId",
-                "type": "uint32"
-            },
-            {
-                "indexed": true,
-                "internalType": "bytes32",
-                "name": "requestTransactionHash",
-                "type": "bytes32"
-            },
-            {
-                "indexed": false,
-                "internalType": "bytes",
-                "name": "metadata",
-                "type": "bytes"
-            }
-        ],
-        "name": "LogBridgeRequestSent",
-        "type": "event"
-    },
-    {
-        "inputs": [],
-        "name": "_vnonce",
-        "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            { "internalType": "address", "name": "to_", "type": "address" },
-            { "internalType": "address", "name": "sourceToken_", "type": "address" },
-            { "internalType": "address", "name": "targetToken_", "type": "address" },
-            { "internalType": "uint256", "name": "amount_", "type": "uint256" },
-            { "internalType": "uint32", "name": "targetChainId_", "type": "uint32" },
-            {
-                "internalType": "bytes32",
-                "name": "transactionHash_",
-                "type": "bytes32"
-            },
-            { "internalType": "bytes", "name": "metadata_", "type": "bytes" }
-        ],
-        "name": "completeBridge",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            { "internalType": "address", "name": "sourceToken_", "type": "address" },
-            { "internalType": "address", "name": "targetToken_", "type": "address" },
-            { "internalType": "uint256", "name": "amount_", "type": "uint256" },
-            { "internalType": "uint32", "name": "targetChainId_", "type": "uint32" },
-            { "internalType": "bytes", "name": "metadata_", "type": "bytes" }
-        ],
-        "name": "requestWithdraw",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
-        "name": "whitelistedMapping",
-        "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            { "internalType": "address", "name": "user_", "type": "address" },
-            { "internalType": "address", "name": "sourceToken_", "type": "address" },
-            { "internalType": "address", "name": "targetToken_", "type": "address" },
-            { "internalType": "uint256", "name": "amount_", "type": "uint256" },
-            { "internalType": "uint32", "name": "chainId_", "type": "uint32" },
-            {
-                "internalType": "bytes32",
-                "name": "transactionHash_",
-                "type": "bytes32"
-            },
-            { "internalType": "bytes", "name": "metadata_", "type": "bytes" }
-        ],
-        "name": "withdrawRequested",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    }
-]