@instadapp/interop-x 0.0.0-dev.80722d6 → 0.0.0-dev.8965b57

package/src/typechain/factories/InteropXContract__factory.ts

@@ -0,0 +1,533 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from "ethers";
+import type { Provider } from "@ethersproject/providers";
+import type {
+  InteropXContract,
+  InteropXContractInterface,
+} from "../InteropXContract";
+
+const _abi = [
+  {
+    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",
+  },
+];
+
+export class InteropXContract__factory {
+  static readonly abi = _abi;
+  static createInterface(): InteropXContractInterface {
+    return new utils.Interface(_abi) as InteropXContractInterface;
+  }
+  static connect(
+    address: string,
+    signerOrProvider: Signer | Provider
+  ): InteropXContract {
+    return new Contract(address, _abi, signerOrProvider) as InteropXContract;
+  }
+}

package/src/typechain/factories/index.ts

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

package/src/typechain/index.ts

@@ -3,10 +3,8 @@
 /* eslint-disable */
 export type { Erc20 } from "./Erc20";
 export type { GnosisSafe } from "./GnosisSafe";
-export type { InteropBridgeToken } from "./InteropBridgeToken";
-export type { InteropXGateway } from "./InteropXGateway";
+export type { InteropXContract } from "./InteropXContract";
 export * as factories from "./factories";
 export { Erc20__factory } from "./factories/Erc20__factory";
 export { GnosisSafe__factory } from "./factories/GnosisSafe__factory";
-export { InteropBridgeToken__factory } from "./factories/InteropBridgeToken__factory";
-export { InteropXGateway__factory } from "./factories/InteropXGateway__factory";
+export { InteropXContract__factory } from "./factories/InteropXContract__factory";

package/src/utils/index.ts

@@ -6,12 +6,24 @@ import axiosRetry from "axios-retry";
 import { addresses } from '@/constants';
 import { ChainId } from '@/types'
 import { ethers } from 'ethers';
-
+import { GnosisSafe } from '@/typechain';
 export const http = axios.create();
 
 axiosRetry(http, { retries: 3, retryDelay: axiosRetry.exponentialDelay });
 
 
+export function shortenHash(hash: string, length: number = 4) {
+  if (!hash) return;
+
+  if (hash.length < 12) return hash;
+
+  const beginningChars = hash.startsWith("0x") ? length + 2 : length;
+
+  const shortened = hash.substr(0, beginningChars) + "…" + hash.substr(-length);
+
+  return shortened;
+}
+
 export function short(buffer: Buffer): string {
   return buffer.toString('hex').slice(0, 8) + '...'
 }
@@ -71,11 +83,11 @@ export const signGnosisSafeTx = async ({
 export const getRpcProviderUrl = (chainId: ChainId) => {
   switch (chainId) {
     case 1:
-      return 'https://rpc.instadapp.io/mainnet';
+      return 'https://rpc.ankr.com/eth';
     case 137:
-      return 'https://rpc.instadapp.io/polygon';
+      return 'https://rpc.ankr.com/polygon';
     case 43114:
-      return 'https://rpc.instadapp.io/avalanche';
+      return 'https://rpc.ankr.com/avalanche';
     default:
       throw new Error(`Unknown chainId: ${chainId}`);
   }
@@ -119,11 +131,110 @@ export const asyncCallWithTimeout = async <T>(asyncPromise: Promise<T>, timeout:
 }
 
 
-export const generateInteropTransactionHash = (data: { type: string, sourceTransactionHash: string, sourceChainId: string | number, targetChainId: string | number }) => {
-  return ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string'], [
-    String(data.type),
-    String(data.sourceTransactionHash),
+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),
   ]);
+}
+
+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}'.`)
+  }
+
+  const contract = new ethers.Contract(
+    address,
+    contractInterface,
+    signerOrProvider
+  ) as TContract
+
+  // Make sure the contract properties is writable
+  const desc = Object.getOwnPropertyDescriptor(contract, 'functions');
+
+  if (!desc || desc.writable !== true) {
+    return contract
+  }
+
+  return new Proxy(contract, {
+    get(target, prop, receiver) {
+      const value = Reflect.get(target, prop, receiver);
+
+      if (typeof value === 'function' && (contract.functions.hasOwnProperty(prop) || ['queryFilter'].includes(String(prop)))) {
+        return async (...args: any[]) => {
+          try {
+            return await value.bind(contract)(...args);
+          } catch (error) {
+            throw new Error(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`)
+          }
+        }
+      }
+
+
+      if (typeof value === 'object' && ['populateTransaction', 'estimateGas', 'functions', 'callStatic'].includes(String(prop))) {
+        const parentProp = String(prop);
+
+        return new Proxy(value, {
+          get(target, prop, receiver) {
+            const value = Reflect.get(target, prop, receiver);
+
+            if (typeof value === 'function') {
+              return async (...args: any[]) => {
+                try {
+                  return await value.bind(contract)(...args);
+                } catch (error) {
+                  throw new Error(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`)
+                }
+              }
+            }
+          }
+        })
+      }
+
+      return value;
+    },
+  });
+}
+
+export const generateGnosisTransaction = async (transactionData: any, safeContract: GnosisSafe) => {
+  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
+      )
+  )
+
+  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
+          )
+      )
+  }
+
+  return transactionData
 }