@instadapp/interop-x 0.0.0-dev.eb2b141 → 0.0.0-dev.f0a6281

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

@@ -17,6 +17,18 @@ 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 +88,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}`);
   }
@@ -210,30 +222,30 @@ export const buildWithdrawDataForTransaction = async (transaction: Transaction,
     throw Error('Cannot build data for transaction without submitEvent');
   }
 
-  const { to, amount, chainId, itoken: itokenAddress } = transaction.submitEvent;
+  const { to, amount, sourceChainId, targetChainId, itoken: itokenAddress } = transaction.submitEvent;
 
-  const itoken = itokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
+  const itoken = itokens[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());
+  const token = tokens[targetChainId].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 targetChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(targetChainId as ChainId));
   const targetWallet = new ethers.Wallet(config.privateKey, targetChainProvider);
-  const gatewayAddress = addresses[chainId].interopXGateway;
+  const gatewayAddress = addresses[targetChainId].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()),
+    ethers.BigNumber.from(sourceChainId.toString()),
     transaction.submitTransactionHash,
   );