@instadapp/interop-x 0.0.0-dev.d2e8d37 → 0.0.0-dev.de23e71

package/src/typechain/InteropBridgeToken.ts

@@ -31,11 +31,11 @@ export interface InteropBridgeTokenInterface extends utils.Interface {
     "allowance(address,address)": FunctionFragment;
     "approve(address,uint256)": FunctionFragment;
     "balanceOf(address)": FunctionFragment;
-    "burn(address,uint256,uint256)": FunctionFragment;
+    "burn(address,uint256,uint32)": FunctionFragment;
     "decimals()": FunctionFragment;
     "decreaseAllowance(address,uint256)": FunctionFragment;
     "increaseAllowance(address,uint256)": FunctionFragment;
-    "mint(address,uint256,uint256,bytes32)": FunctionFragment;
+    "mint(address,uint256,uint32,bytes32)": FunctionFragment;
     "name()": FunctionFragment;
     "owner()": FunctionFragment;
     "renounceOwnership()": FunctionFragment;
@@ -153,8 +153,8 @@ export interface InteropBridgeTokenInterface extends utils.Interface {
 
   events: {
     "Approval(address,address,uint256)": EventFragment;
-    "Burn(address,uint256,uint256)": EventFragment;
-    "Mint(address,uint256,uint256,bytes32)": EventFragment;
+    "Burn(address,uint256,uint32,uint32)": EventFragment;
+    "Mint(address,uint256,uint32,uint32,bytes32)": EventFragment;
     "OwnershipTransferred(address,address)": EventFragment;
     "Transfer(address,address,uint256)": EventFragment;
   };
@@ -181,10 +181,11 @@ export type ApprovalEventFilter = TypedEventFilter<ApprovalEvent>;
 export interface BurnEventObject {
   to: string;
   amount: BigNumber;
-  chainId: BigNumber;
+  sourceChainId: number;
+  targetChainId: number;
 }
 export type BurnEvent = TypedEvent<
-  [string, BigNumber, BigNumber],
+  [string, BigNumber, number, number],
   BurnEventObject
 >;
 
@@ -193,11 +194,12 @@ export type BurnEventFilter = TypedEventFilter<BurnEvent>;
 export interface MintEventObject {
   to: string;
   amount: BigNumber;
-  chainId: BigNumber;
-  transactionHash: string;
+  sourceChainId: number;
+  targetChainId: number;
+  submitTransactionHash: string;
 }
 export type MintEvent = TypedEvent<
-  [string, BigNumber, BigNumber, string],
+  [string, BigNumber, number, number, string],
   MintEventObject
 >;
 
@@ -486,28 +488,32 @@ export interface InteropBridgeToken extends BaseContract {
       value?: null
     ): ApprovalEventFilter;
 
-    "Burn(address,uint256,uint256)"(
+    "Burn(address,uint256,uint32,uint32)"(
       to?: string | null,
       amount?: null,
-      chainId?: BigNumberish | null
+      sourceChainId?: null,
+      targetChainId?: BigNumberish | null
     ): BurnEventFilter;
     Burn(
       to?: string | null,
       amount?: null,
-      chainId?: BigNumberish | null
+      sourceChainId?: null,
+      targetChainId?: BigNumberish | null
     ): BurnEventFilter;
 
-    "Mint(address,uint256,uint256,bytes32)"(
+    "Mint(address,uint256,uint32,uint32,bytes32)"(
       to?: string | null,
       amount?: null,
-      chainId?: BigNumberish | null,
-      transactionHash?: BytesLike | null
+      sourceChainId?: BigNumberish | null,
+      targetChainId?: null,
+      submitTransactionHash?: BytesLike | null
     ): MintEventFilter;
     Mint(
       to?: string | null,
       amount?: null,
-      chainId?: BigNumberish | null,
-      transactionHash?: BytesLike | null
+      sourceChainId?: BigNumberish | null,
+      targetChainId?: null,
+      submitTransactionHash?: BytesLike | null
     ): MintEventFilter;
 
     "OwnershipTransferred(address,address)"(

package/src/typechain/InteropXGateway.ts

@@ -29,11 +29,11 @@ import type {
 export interface InteropXGatewayInterface extends utils.Interface {
   functions: {
     "_vnonce()": FunctionFragment;
-    "deposit(address,uint256,uint256)": FunctionFragment;
-    "depositFor(address,address,uint256,uint256)": FunctionFragment;
+    "deposit(address,uint256,uint32)": FunctionFragment;
+    "depositFor(address,address,uint256,uint32)": FunctionFragment;
     "owner()": FunctionFragment;
     "renounceOwnership()": FunctionFragment;
-    "systemWithdraw(uint256,address,address,uint256,bytes32)": FunctionFragment;
+    "systemWithdraw(uint256,address,address,uint32,bytes32)": FunctionFragment;
     "transferOwnership(address)": FunctionFragment;
   };
 
@@ -89,8 +89,8 @@ export interface InteropXGatewayInterface extends utils.Interface {
   ): Result;
 
   events: {
-    "LogGatewayDeposit(address,address,uint256,uint256,uint256,uint256)": EventFragment;
-    "LogGatewayWithdraw(address,address,uint256,uint256,uint256,bytes32)": EventFragment;
+    "LogGatewayDeposit(address,address,uint256,uint256,uint32,uint32)": EventFragment;
+    "LogGatewayWithdraw(address,address,uint256,uint32,uint32,bytes32)": EventFragment;
     "OwnershipTransferred(address,address)": EventFragment;
   };
 
@@ -104,11 +104,11 @@ export interface LogGatewayDepositEventObject {
   token: string;
   amount: BigNumber;
   vnonce: BigNumber;
-  sourceChainId: BigNumber;
-  targetChainId: BigNumber;
+  sourceChainId: number;
+  targetChainId: number;
 }
 export type LogGatewayDepositEvent = TypedEvent<
-  [string, string, BigNumber, BigNumber, BigNumber, BigNumber],
+  [string, string, BigNumber, BigNumber, number, number],
   LogGatewayDepositEventObject
 >;
 
@@ -119,12 +119,12 @@ export interface LogGatewayWithdrawEventObject {
   user: string;
   token: string;
   amount: BigNumber;
-  sourceChainId: BigNumber;
-  targetChainId: BigNumber;
+  sourceChainId: number;
+  targetChainId: number;
   transactionHash: string;
 }
 export type LogGatewayWithdrawEvent = TypedEvent<
-  [string, string, BigNumber, BigNumber, BigNumber, string],
+  [string, string, BigNumber, number, number, string],
   LogGatewayWithdrawEventObject
 >;
 
@@ -283,7 +283,7 @@ export interface InteropXGateway extends BaseContract {
   };
 
   filters: {
-    "LogGatewayDeposit(address,address,uint256,uint256,uint256,uint256)"(
+    "LogGatewayDeposit(address,address,uint256,uint256,uint32,uint32)"(
       user?: null,
       token?: string | null,
       amount?: null,
@@ -300,7 +300,7 @@ export interface InteropXGateway extends BaseContract {
       targetChainId?: BigNumberish | null
     ): LogGatewayDepositEventFilter;
 
-    "LogGatewayWithdraw(address,address,uint256,uint256,uint256,bytes32)"(
+    "LogGatewayWithdraw(address,address,uint256,uint32,uint32,bytes32)"(
       user?: null,
       token?: string | null,
       amount?: null,

package/src/typechain/factories/InteropBridgeToken__factory.ts

@@ -61,11 +61,17 @@ const _abi = [
         name: "amount",
         type: "uint256",
       },
+      {
+        indexed: false,
+        internalType: "uint32",
+        name: "sourceChainId",
+        type: "uint32",
+      },
       {
         indexed: true,
-        internalType: "uint256",
-        name: "chainId",
-        type: "uint256",
+        internalType: "uint32",
+        name: "targetChainId",
+        type: "uint32",
       },
     ],
     name: "Burn",
@@ -88,14 +94,20 @@ const _abi = [
       },
       {
         indexed: true,
-        internalType: "uint256",
-        name: "chainId",
-        type: "uint256",
+        internalType: "uint32",
+        name: "sourceChainId",
+        type: "uint32",
+      },
+      {
+        indexed: false,
+        internalType: "uint32",
+        name: "targetChainId",
+        type: "uint32",
       },
       {
         indexed: true,
         internalType: "bytes32",
-        name: "transactionHash",
+        name: "submitTransactionHash",
         type: "bytes32",
       },
     ],
@@ -226,9 +238,9 @@ const _abi = [
         type: "uint256",
       },
       {
-        internalType: "uint256",
+        internalType: "uint32",
         name: "chainId",
-        type: "uint256",
+        type: "uint32",
       },
     ],
     name: "burn",
@@ -310,9 +322,9 @@ const _abi = [
         type: "uint256",
       },
       {
-        internalType: "uint256",
+        internalType: "uint32",
         name: "chainId",
-        type: "uint256",
+        type: "uint32",
       },
       {
         internalType: "bytes32",

package/src/typechain/factories/InteropXGateway__factory.ts

@@ -50,15 +50,15 @@ const _abi = [
       },
       {
         indexed: false,
-        internalType: "uint256",
+        internalType: "uint32",
         name: "sourceChainId",
-        type: "uint256",
+        type: "uint32",
       },
       {
         indexed: true,
-        internalType: "uint256",
+        internalType: "uint32",
         name: "targetChainId",
-        type: "uint256",
+        type: "uint32",
       },
     ],
     name: "LogGatewayDeposit",
@@ -87,15 +87,15 @@ const _abi = [
       },
       {
         indexed: true,
-        internalType: "uint256",
+        internalType: "uint32",
         name: "sourceChainId",
-        type: "uint256",
+        type: "uint32",
       },
       {
         indexed: false,
-        internalType: "uint256",
+        internalType: "uint32",
         name: "targetChainId",
-        type: "uint256",
+        type: "uint32",
       },
       {
         indexed: true,
@@ -152,9 +152,9 @@ const _abi = [
         type: "uint256",
       },
       {
-        internalType: "uint256",
+        internalType: "uint32",
         name: "chainId_",
-        type: "uint256",
+        type: "uint32",
       },
     ],
     name: "deposit",
@@ -180,9 +180,9 @@ const _abi = [
         type: "uint256",
       },
       {
-        internalType: "uint256",
+        internalType: "uint32",
         name: "chainId_",
-        type: "uint256",
+        type: "uint32",
       },
     ],
     name: "depositFor",
@@ -228,9 +228,9 @@ const _abi = [
         type: "address",
       },
       {
-        internalType: "uint256",
+        internalType: "uint32",
         name: "chainId_",
-        type: "uint256",
+        type: "uint32",
       },
       {
         internalType: "bytes32",

package/src/utils/index.ts

@@ -3,15 +3,9 @@
  */
 import axios from 'axios'
 import axiosRetry from "axios-retry";
-import { addresses, itokens, tokens } from '@/constants';
+import { addresses } from '@/constants';
 import { ChainId } from '@/types'
 import { ethers } from 'ethers';
-import { encodeMulti, MetaTransaction, OperationType } from 'ethers-multisend';
-import { Transaction } from '@/db';
-import config from '@/config';
-import abi from '@/abi';
-import { InteropBridgeToken, InteropXGateway } from '@/typechain';
-
 export const http = axios.create();
 
 axiosRetry(http, { retries: 3, retryDelay: axiosRetry.exponentialDelay });
@@ -145,121 +139,6 @@ export const generateInteropTransactionHash = (data: { action: string, submitTra
   ]);
 }
 
-export const buildDataForTransaction = async (transaction: Transaction, type?: 'source' | 'target') => {
-  type = type || transaction.sourceStatus === 'pending' ? 'source' : 'target';
-
-  switch (transaction.action) {
-    case "deposit":
-      return await buildDepositDataForTransaction(transaction, type);
-    case "withdraw":
-      return await buildWithdrawDataForTransaction(transaction, type);
-    default:
-      throw new Error(`Unknown action: ${transaction.action}`);
-  }
-}
-
-export const buildDepositDataForTransaction = async (transaction: Transaction, type: 'source' | 'target') => {
-  const transactions: MetaTransaction[] = [];
-
-  if (transaction.action !== 'deposit') {
-    throw new Error(`Invalid action: ${transaction.action}`)
-  }
-
-  if (transaction.action === 'deposit' && transaction.sourceStatus === 'pending') {
-    throw Error('Cannot build data for pending deposit transaction');
-  }
-
-  if (!transaction.submitEvent) {
-    throw Error('Cannot build data for transaction without submitEvent');
-  }
-
-
-  const token = tokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === transaction.submitEvent.token.toLowerCase());
-
-  if (!token) {
-    throw Error('Cannot build data for transaction without token');
-  }
-
-  const itoken = itokens[transaction.targetChainId].find(itoken => itoken.symbol.toLowerCase() === token.symbol.toLowerCase());
-
-  if (!itoken) {
-    throw Error('Cannot build data for transaction without itoken');
-  }
-
-  const targetChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(transaction.targetChainId as ChainId));
-  const targetWallet = new ethers.Wallet(config.privateKey, targetChainProvider);
-  const interopBridgeContract = getContract<InteropBridgeToken>(itoken.address, abi.interopBridgeToken, targetWallet);
-
-  const { data } = await interopBridgeContract.populateTransaction.mint(
-    transaction.submitEvent.user,
-    ethers.BigNumber.from(transaction.submitEvent.amount.toString()),
-    ethers.BigNumber.from(transaction.submitEvent.sourceChainId.toString()),
-    transaction.submitTransactionHash,
-  );
-
-  transactions.push({
-    to: itoken.address,
-    data: data!,
-    value: '0',
-    operation: OperationType.Call,
-  });
-
-  return encodeMulti(transactions).data
-}
-
-export const buildWithdrawDataForTransaction = async (transaction: Transaction, type: 'source' | 'target') => {
-  const transactions: MetaTransaction[] = [];
-
-  if (transaction.action !== 'withdraw') {
-    throw new Error(`Invalid action: ${transaction.action}`)
-  }
-
-  if (transaction.action === 'withdraw' && transaction.sourceStatus === 'pending') {
-    throw Error('Cannot build data for pending withdraw transaction');
-  }
-
-  if (!transaction.submitEvent) {
-    throw Error('Cannot build data for transaction without submitEvent');
-  }
-
-  const { to, amount, chainId, itoken: itokenAddress } = transaction.submitEvent;
-
-  const itoken = itokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
-
-  if (!itoken) {
-    throw Error('Cannot build data for transaction without itoken');
-  }
-
-  const token = tokens[chainId].find(t => t.symbol.toLowerCase() === itoken.symbol.toLowerCase());
-
-  if (!token) {
-    throw Error('Cannot build data for transaction without token');
-  }
-
-  const targetChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(transaction.targetChainId as ChainId));
-  const targetWallet = new ethers.Wallet(config.privateKey, targetChainProvider);
-  const gatewayAddress = addresses[chainId].interopXGateway;
-  const interopBridgeContract = getContract<InteropXGateway>(gatewayAddress, abi.interopXGateway, targetWallet);
-
-  const { data } = await interopBridgeContract.populateTransaction.systemWithdraw(
-    ethers.BigNumber.from(amount.toString()),
-    to,
-    token.address,
-    ethers.BigNumber.from(transaction.sourceChainId.toString()),
-    transaction.submitTransactionHash,
-  );
-
-  transactions.push({
-    to: gatewayAddress,
-    data: data!,
-    value: '0',
-    operation: OperationType.Call,
-  });
-
-  return encodeMulti(transactions).data
-}
-
-
 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}'.`)

package/tsconfig.json

@@ -16,8 +16,13 @@
     "noEmit": false,
     "outDir": "dist",
     "baseUrl": "src",
-    "paths": { 
-      "@/*" : ["./*" ]
+    "paths": {
+      "@/*": [
+        "*"
+      ],
+      "@": [
+        "/"
+      ]
     },
     "typeRoots": [
       "./node_modules/@types",