@instadapp/interop-x 0.0.0-dev.b8c571d → 0.0.0-dev.bfeca30

package/src/utils/index.ts

@@ -3,20 +3,29 @@
  */
 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';
+import { GnosisSafe } from '@/typechain';
+import retry from 'async-retry'
 
 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 +85,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}`);
   }
@@ -124,130 +133,23 @@ export const asyncCallWithTimeout = async <T>(asyncPromise: Promise<T>, timeout:
 }
 
 
-export const generateInteropTransactionHash = (data: { action: string, submitTransactionHash: string, sourceChainId: string | number, targetChainId: string | number }) => {
-  return ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string'], [
-    String(data.action),
-    String(data.submitTransactionHash),
+export const generateInteropTransactionHash = (data: { actionId: string, bridger: string, requestTransactionHash: string, sourceChainId: string | number, targetChainId: string | number }) => {
+  return ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string', 'string'], [
+    String(data.actionId),
+    String(data.bridger),
+    String(data.requestTransactionHash),
     String(data.sourceChainId),
     String(data.targetChainId),
   ]);
 }
 
-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 class ContractError extends Error {
+  method: string;
+  address: string;
+  args: any[];
 }
 
-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.submitEvent.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}'.`)
@@ -259,17 +161,36 @@ export function getContract<TContract extends ethers.Contract>(address: string,
     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)))) {
+        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
           }
         }
       }
@@ -285,9 +206,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
                 }
               }
             }
@@ -298,4 +225,44 @@ export function getContract<TContract extends ethers.Contract>(address: string,
       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
 }

package/tsconfig.json

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

package/dist/src/abi/interopBridgeToken.json

@@ -1,286 +0,0 @@
-[
-    {
-        "inputs": [
-            { "internalType": "address", "name": "__owner", "type": "address" }
-        ],
-        "stateMutability": "nonpayable",
-        "type": "constructor"
-    },
-    {
-        "anonymous": false,
-        "inputs": [
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "owner",
-                "type": "address"
-            },
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "spender",
-                "type": "address"
-            },
-            {
-                "indexed": false,
-                "internalType": "uint256",
-                "name": "value",
-                "type": "uint256"
-            }
-        ],
-        "name": "Approval",
-        "type": "event"
-    },
-    {
-        "anonymous": false,
-        "inputs": [
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "to",
-                "type": "address"
-            },
-            {
-                "indexed": false,
-                "internalType": "uint256",
-                "name": "amount",
-                "type": "uint256"
-            },
-            {
-                "indexed": true,
-                "internalType": "uint256",
-                "name": "chainId",
-                "type": "uint256"
-            }
-        ],
-        "name": "Burn",
-        "type": "event"
-    },
-    {
-        "anonymous": false,
-        "inputs": [
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "to",
-                "type": "address"
-            },
-            {
-                "indexed": false,
-                "internalType": "uint256",
-                "name": "amount",
-                "type": "uint256"
-            },
-            {
-                "indexed": true,
-                "internalType": "uint256",
-                "name": "chainId",
-                "type": "uint256"
-            },
-            {
-                "indexed": true,
-                "internalType": "bytes32",
-                "name": "transactionHash",
-                "type": "bytes32"
-            }
-        ],
-        "name": "Mint",
-        "type": "event"
-    },
-    {
-        "anonymous": false,
-        "inputs": [
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "previousOwner",
-                "type": "address"
-            },
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "newOwner",
-                "type": "address"
-            }
-        ],
-        "name": "OwnershipTransferred",
-        "type": "event"
-    },
-    {
-        "anonymous": false,
-        "inputs": [
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "from",
-                "type": "address"
-            },
-            {
-                "indexed": true,
-                "internalType": "address",
-                "name": "to",
-                "type": "address"
-            },
-            {
-                "indexed": false,
-                "internalType": "uint256",
-                "name": "value",
-                "type": "uint256"
-            }
-        ],
-        "name": "Transfer",
-        "type": "event"
-    },
-    {
-        "inputs": [
-            { "internalType": "address", "name": "owner", "type": "address" },
-            { "internalType": "address", "name": "spender", "type": "address" }
-        ],
-        "name": "allowance",
-        "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            { "internalType": "address", "name": "spender", "type": "address" },
-            { "internalType": "uint256", "name": "amount", "type": "uint256" }
-        ],
-        "name": "approve",
-        "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            { "internalType": "address", "name": "account", "type": "address" }
-        ],
-        "name": "balanceOf",
-        "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            { "internalType": "address", "name": "to", "type": "address" },
-            { "internalType": "uint256", "name": "amount", "type": "uint256" },
-            { "internalType": "uint256", "name": "chainId", "type": "uint256" }
-        ],
-        "name": "burn",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "decimals",
-        "outputs": [{ "internalType": "uint8", "name": "", "type": "uint8" }],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            { "internalType": "address", "name": "spender", "type": "address" },
-            {
-                "internalType": "uint256",
-                "name": "subtractedValue",
-                "type": "uint256"
-            }
-        ],
-        "name": "decreaseAllowance",
-        "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            { "internalType": "address", "name": "spender", "type": "address" },
-            { "internalType": "uint256", "name": "addedValue", "type": "uint256" }
-        ],
-        "name": "increaseAllowance",
-        "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            { "internalType": "address", "name": "to", "type": "address" },
-            { "internalType": "uint256", "name": "amount", "type": "uint256" },
-            { "internalType": "uint256", "name": "chainId", "type": "uint256" },
-            {
-                "internalType": "bytes32",
-                "name": "transactionHash",
-                "type": "bytes32"
-            }
-        ],
-        "name": "mint",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "name",
-        "outputs": [{ "internalType": "string", "name": "", "type": "string" }],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "owner",
-        "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "renounceOwnership",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "symbol",
-        "outputs": [{ "internalType": "string", "name": "", "type": "string" }],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "totalSupply",
-        "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            { "internalType": "address", "name": "to", "type": "address" },
-            { "internalType": "uint256", "name": "amount", "type": "uint256" }
-        ],
-        "name": "transfer",
-        "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            { "internalType": "address", "name": "from", "type": "address" },
-            { "internalType": "address", "name": "to", "type": "address" },
-            { "internalType": "uint256", "name": "amount", "type": "uint256" }
-        ],
-        "name": "transferFrom",
-        "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            { "internalType": "address", "name": "newOwner", "type": "address" }
-        ],
-        "name": "transferOwnership",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    }
-]