@instadapp/interop-x 0.0.0-dev.67e7c3a → 0.0.0-dev.733ff78

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,20 +3,26 @@
  */
 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 });
 
 
+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) + '...'
 }
@@ -76,11 +82,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}`);
   }
@@ -133,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}'.`)