@instadapp/interop-x 0.0.0-dev.c2272fd → 0.0.0-dev.c279cb8

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 { InteropX__factory } from "./InteropX__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 { InteropX } from "./InteropX";
 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 { InteropX__factory } from "./factories/InteropX__factory";

package/src/utils/index.ts

@@ -1,39 +1,52 @@
 /**
  * @module util
  */
-import axios from 'axios'
+import axios from "axios";
 import axiosRetry from "axios-retry";
-import { addresses, itokens, tokens } 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 { addresses } from "@/constants";
+import { ChainId } from "@/types";
+import { ethers } from "ethers";
+import { GnosisSafe } from "@/typechain";
+import retry from "async-retry";
+import { connectors } from "@/abi/connectors";
+import Web3EthAbi from "web3-eth-abi";
 
 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) + '...'
+  return buffer.toString("hex").slice(0, 8) + "...";
 }
 
-export const signGnosisSafeTx = async ({
-  to,
-  data = null as any,
-  value = '0',
-  operation = '1',
-  baseGas = '0',
-  gasPrice = "0",
-  gasToken = "0x0000000000000000000000000000000000000000",
-  refundReceiver = "0x0000000000000000000000000000000000000000",
-  safeTxGas = "79668" as string | number,
-  nonce = "0",
-  chainId = 137 as ChainId,
-}, { signer }) => {
+export const signGnosisSafeTx = async (
+  {
+    to,
+    data = null as any,
+    value = "0",
+    operation = "1",
+    baseGas = "0",
+    gasPrice = "0",
+    gasToken = "0x0000000000000000000000000000000000000000",
+    refundReceiver = "0x0000000000000000000000000000000000000000",
+    safeTxGas = "79668" as string | number,
+    nonce = "0",
+    chainId = 137 as ChainId,
+  },
+  { signer }
+) => {
   const gnosisSafe = addresses[chainId].gnosisSafe;
 
   const domain = {
@@ -43,16 +56,16 @@ export const signGnosisSafeTx = async ({
 
   const types = {
     SafeTx: [
-      { type: 'address', name: 'to' },
-      { type: 'uint256', name: 'value' },
-      { type: 'bytes', name: 'data' },
-      { type: 'uint8', name: 'operation' },
-      { type: 'uint256', name: 'safeTxGas' },
-      { type: 'uint256', name: 'baseGas' },
-      { type: 'uint256', name: 'gasPrice' },
-      { type: 'address', name: 'gasToken' },
-      { type: 'address', name: 'refundReceiver' },
-      { type: 'uint256', name: 'nonce' },
+      { type: "address", name: "to" },
+      { type: "uint256", name: "value" },
+      { type: "bytes", name: "data" },
+      { type: "uint8", name: "operation" },
+      { type: "uint256", name: "safeTxGas" },
+      { type: "uint256", name: "baseGas" },
+      { type: "uint256", name: "gasPrice" },
+      { type: "address", name: "gasToken" },
+      { type: "address", name: "refundReceiver" },
+      { type: "uint256", name: "nonce" },
     ],
   };
 
@@ -70,21 +83,21 @@ export const signGnosisSafeTx = async ({
     value,
   };
 
-  return await signer._signTypedData(domain, types, message)
+  return await signer._signTypedData(domain, types, message);
 };
 
 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}`);
   }
-}
+};
 
 export interface Signature {
   signer: string;
@@ -107,195 +120,246 @@ export const buildSignatureBytes = (signatures: Signature[]): string => {
  * Call an async function with a maximum time limit (in milliseconds) for the timeout
  *  Resolved promise for async function call, or an error if time limit reached
  */
-export const asyncCallWithTimeout = async <T>(asyncPromise: Promise<T>, timeout: number) => {
+export const asyncCallWithTimeout = async <T>(
+  asyncPromise: Promise<T>,
+  timeout: number
+) => {
   let timeoutHandle;
 
   const timeoutPromise = new Promise((_resolve, reject) => {
     timeoutHandle = setTimeout(
-      () => reject(new Error('Async call timeout limit reached')),
+      () => reject(new Error("Async call timeout limit reached")),
       timeout
     );
   });
 
-  return Promise.race([asyncPromise, timeoutPromise]).then(result => {
+  return Promise.race([asyncPromise, timeoutPromise]).then((result) => {
     clearTimeout(timeoutHandle);
     return result;
-  }) as Promise<T>
-}
-
-
-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),
-    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 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');
-  }
+  }) as Promise<T>;
+};
 
-  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);
+type GenerateInteropTransactionHashParam = {
+  actionId: string;
+  vnonce: string;
+  sourceSender: string;
+  sourceChainId: string | number;
+  sourceDsaId: string;
+  targetChainId: string | number;
+  targetDsaId: string;
+};
 
-  const { data } = await interopBridgeContract.populateTransaction.systemWithdraw(
-    ethers.BigNumber.from(amount.toString()),
-    to,
-    token.address,
-    ethers.BigNumber.from(transaction.sourceChainId.toString()),
-    transaction.submitTransactionHash,
+export const generateInteropTransactionHash = (
+  data: GenerateInteropTransactionHashParam
+) => {
+  return ethers.utils.solidityKeccak256(
+    Array.from({ length: 7 }, () => "string"),
+    [
+      String(data.actionId),
+      String(data.vnonce),
+      String(data.sourceSender),
+      String(data.sourceChainId),
+      String(data.sourceDsaId),
+      String(data.targetChainId),
+      String(data.targetDsaId),
+    ]
   );
+};
 
-  transactions.push({
-    to: gatewayAddress,
-    data: data!,
-    value: '0',
-    operation: OperationType.Call,
-  });
-
-  return encodeMulti(transactions).data
+export class ContractError extends Error {
+  method: string;
+  address: string;
+  args: any[];
 }
 
-
-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}'.`)
+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
+  ) 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)))) {
+      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;
           }
-        }
+        };
       }
 
-
-      if (typeof value === 'object' && ['populateTransaction', 'estimateGas', 'functions', 'callStatic'].includes(String(prop))) {
+      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') {
+            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;
                 }
-              }
+              };
             }
-          }
-        })
+          },
+        });
       }
 
       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;
+};
+
+export class LiquidityError extends Error {
+  constructor(message?: string) {
+    super(message || "Not enough liquidity");
+    Object.setPrototypeOf(this, new.target.prototype);
+  }
+}
+
+export const encodeConnectorMethod = (params: {
+  connector: string;
+  method: string;
+  args: string[];
+}) => {
+  const connectorInterface = getInterface(
+    connectors.versions[2][params.connector],
+    params.method
+  );
+
+  if (!connectorInterface)
+    throw new Error(`ConnectorInterface '${params.method}' not found`);
+
+  //@ts-ignore
+  return Web3EthAbi.encodeFunctionCall(connectorInterface, params.args);
+};
+
+const getInterface = (abiItems: any[], method: string) => {
+  const abiItem = abiItems.find((abiItem) => abiItem.name === method);
+
+  if (!abiItem) {
+    console.error(`${method} is an invalid method.`);
+    return;
+  }
+
+  return abiItem;
+};

package/tsconfig.json

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