@instadapp/interop-x 0.0.0-dev.326bdca → 0.0.0-dev.32db40c

package/dist/src/typechain/factories/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InteropXContract__factory = exports.GnosisSafe__factory = exports.Erc20__factory = void 0;
+exports.InteropX__factory = exports.GnosisSafe__factory = exports.Erc20__factory = void 0;
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
@@ -8,5 +8,5 @@ var Erc20__factory_1 = require("./Erc20__factory");
 Object.defineProperty(exports, "Erc20__factory", { enumerable: true, get: function () { return Erc20__factory_1.Erc20__factory; } });
 var GnosisSafe__factory_1 = require("./GnosisSafe__factory");
 Object.defineProperty(exports, "GnosisSafe__factory", { enumerable: true, get: function () { return GnosisSafe__factory_1.GnosisSafe__factory; } });
-var InteropXContract__factory_1 = require("./InteropXContract__factory");
-Object.defineProperty(exports, "InteropXContract__factory", { enumerable: true, get: function () { return InteropXContract__factory_1.InteropXContract__factory; } });
+var InteropX__factory_1 = require("./InteropX__factory");
+Object.defineProperty(exports, "InteropX__factory", { enumerable: true, get: function () { return InteropX__factory_1.InteropX__factory; } });

package/dist/src/typechain/index.js

@@ -23,11 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InteropXContract__factory = exports.GnosisSafe__factory = exports.Erc20__factory = exports.factories = void 0;
+exports.InteropX__factory = exports.GnosisSafe__factory = exports.Erc20__factory = exports.factories = void 0;
 exports.factories = __importStar(require("./factories"));
 var Erc20__factory_1 = require("./factories/Erc20__factory");
 Object.defineProperty(exports, "Erc20__factory", { enumerable: true, get: function () { return Erc20__factory_1.Erc20__factory; } });
 var GnosisSafe__factory_1 = require("./factories/GnosisSafe__factory");
 Object.defineProperty(exports, "GnosisSafe__factory", { enumerable: true, get: function () { return GnosisSafe__factory_1.GnosisSafe__factory; } });
-var InteropXContract__factory_1 = require("./factories/InteropXContract__factory");
-Object.defineProperty(exports, "InteropXContract__factory", { enumerable: true, get: function () { return InteropXContract__factory_1.InteropXContract__factory; } });
+var InteropX__factory_1 = require("./factories/InteropX__factory");
+Object.defineProperty(exports, "InteropX__factory", { enumerable: true, get: function () { return InteropX__factory_1.InteropX__factory; } });

package/dist/src/utils/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateGnosisTransaction = exports.getContract = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.shortenHash = exports.http = void 0;
+exports.encodeConnectorMethod = exports.LiquidityError = exports.generateGnosisTransaction = exports.getContract = exports.ContractError = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.shortenHash = exports.http = void 0;
 /**
  * @module util
  */
@@ -11,6 +11,9 @@ const axios_1 = __importDefault(require("axios"));
 const axios_retry_1 = __importDefault(require("axios-retry"));
 const constants_1 = require("@/constants");
 const ethers_1 = require("ethers");
+const async_retry_1 = __importDefault(require("async-retry"));
+const connectors_1 = require("@/abi/connectors");
+const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
 exports.http = axios_1.default.create();
 (0, axios_retry_1.default)(exports.http, { retries: 3, retryDelay: axios_retry_1.default.exponentialDelay });
 function shortenHash(hash, length = 4) {
@@ -24,10 +27,10 @@ function shortenHash(hash, length = 4) {
 }
 exports.shortenHash = shortenHash;
 function short(buffer) {
-    return buffer.toString('hex').slice(0, 8) + '...';
+    return buffer.toString("hex").slice(0, 8) + "...";
 }
 exports.short = short;
-const signGnosisSafeTx = async ({ to, data = null, value = '0', operation = '1', baseGas = '0', gasPrice = "0", gasToken = "0x0000000000000000000000000000000000000000", refundReceiver = "0x0000000000000000000000000000000000000000", safeTxGas = "79668", nonce = "0", chainId = 137, }, { signer }) => {
+const signGnosisSafeTx = async ({ to, data = null, value = "0", operation = "1", baseGas = "0", gasPrice = "0", gasToken = "0x0000000000000000000000000000000000000000", refundReceiver = "0x0000000000000000000000000000000000000000", safeTxGas = "79668", nonce = "0", chainId = 137, }, { signer }) => {
     const gnosisSafe = constants_1.addresses[chainId].gnosisSafe;
     const domain = {
         verifyingContract: gnosisSafe,
@@ -35,16 +38,16 @@ const signGnosisSafeTx = async ({ to, data = null, value = '0', operation = '1',
     };
     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" },
         ],
     };
     const message = {
@@ -66,11 +69,11 @@ exports.signGnosisSafeTx = signGnosisSafeTx;
 const getRpcProviderUrl = (chainId) => {
     switch (chainId) {
         case 1:
-            return 'https://rpc.ankr.com/eth';
+            return "https://rpc.ankr.com/eth";
         case 137:
-            return 'https://rpc.ankr.com/polygon';
+            return "https://rpc.ankr.com/polygon";
         case 43114:
-            return 'https://rpc.ankr.com/avalanche';
+            return "https://rpc.ankr.com/avalanche";
         default:
             throw new Error(`Unknown chainId: ${chainId}`);
     }
@@ -92,63 +95,90 @@ exports.buildSignatureBytes = buildSignatureBytes;
 const asyncCallWithTimeout = async (asyncPromise, timeout) => {
     let timeoutHandle;
     const timeoutPromise = new Promise((_resolve, reject) => {
-        timeoutHandle = setTimeout(() => reject(new Error('Async call timeout limit reached')), timeout);
+        timeoutHandle = setTimeout(() => 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;
     });
 };
 exports.asyncCallWithTimeout = asyncCallWithTimeout;
 const generateInteropTransactionHash = (data) => {
-    return ethers_1.ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string', 'string'], [
-        String(data.action),
-        String(data.bridger),
-        String(data.requestTransactionHash),
+    return ethers_1.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),
     ]);
 };
 exports.generateInteropTransactionHash = generateInteropTransactionHash;
+class ContractError extends Error {
+}
+exports.ContractError = ContractError;
 function getContract(address, contractInterface, signerOrProvider) {
-    if (!ethers_1.ethers.utils.getAddress(address) || address === ethers_1.ethers.constants.AddressZero) {
+    if (!ethers_1.ethers.utils.getAddress(address) ||
+        address === ethers_1.ethers.constants.AddressZero) {
         throw Error(`Invalid 'address' parameter '${address}'.`);
     }
     const contract = new ethers_1.ethers.Contract(address, contractInterface, signerOrProvider);
     // Make sure the contract properties is writable
-    const desc = Object.getOwnPropertyDescriptor(contract, 'functions');
+    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) => {
                     try {
-                        return await value.bind(contract)(...args);
+                        return await (0, async_retry_1.default)(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) => {
                                 try {
-                                    return await value.bind(contract)(...args);
+                                    return await (0, async_retry_1.default)(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;
@@ -160,9 +190,34 @@ const generateGnosisTransaction = async (transactionData, safeContract) => {
     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_1.ethers.BigNumber.from(String(transactionData.safeTxGas)).add(1).toString();
+        transactionData.safeTxGas = ethers_1.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;
 };
 exports.generateGnosisTransaction = generateGnosisTransaction;
+class LiquidityError extends Error {
+    constructor(message) {
+        super(message || "Not enough liquidity");
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}
+exports.LiquidityError = LiquidityError;
+const encodeConnectorMethod = (params) => {
+    const connectorInterface = getInterface(connectors_1.connectors.versions[2][params.connector], params.method);
+    if (!connectorInterface)
+        throw new Error(`ConnectorInterface '${params.method}' not found`);
+    //@ts-ignore
+    return web3_eth_abi_1.default.encodeFunctionCall(connectorInterface, params.args);
+};
+exports.encodeConnectorMethod = encodeConnectorMethod;
+const getInterface = (abiItems, method) => {
+    const abiItem = abiItems.find((abiItem) => abiItem.name === method);
+    if (!abiItem) {
+        console.error(`${method} is an invalid method.`);
+        return;
+    }
+    return abiItem;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.326bdca",
+  "version": "0.0.0-dev.32db40c",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -25,16 +25,17 @@
   "dependencies": {
     "@achingbrain/libp2p-gossipsub": "^0.12.2",
     "@fastify/cors": "^7.0.0",
+    "async-retry": "^1.3.3",
     "await-spawn": "^4.0.2",
-    "axios": "^0.27.1",
-    "axios-retry": "^3.2.4",
+    "axios": "^0.27.2",
+    "axios-retry": "^3.2.5",
     "chalk": "4.1.2",
-    "dotenv": "^16.0.0",
+    "dotenv": "^16.0.1",
     "ethereumjs-util": "^7.1.4",
-    "ethers": "^5.6.4",
+    "ethers": "^5.6.5",
     "ethers-multisend": "^2.1.1",
     "expand-home-dir": "^0.0.3",
-    "fastify": "^3.28.0",
+    "fastify": "^3.29.0",
     "fs-extra": "^10.1.0",
     "libp2p": "^0.36.2",
     "libp2p-bootstrap": "^0.14.0",
@@ -45,13 +46,15 @@
     "libp2p-pubsub-peer-discovery": "^4.0.0",
     "libp2p-tcp": "^0.17.2",
     "libp2p-websockets": "^0.16.2",
-    "luxon": "^2.3.2",
+    "luxon": "^2.4.0",
     "module-alias": "^2.2.2",
     "patch-package": "^6.4.7",
     "postinstall-postinstall": "^2.1.0",
     "sequelize": "6.18.0",
-    "sqlite3": "^5.0.5",
-    "waait": "^1.0.5"
+    "sqlite3": "^5.0.8",
+    "waait": "^1.0.5",
+    "web3-eth-abi": "^1.7.3",
+    "web3-utils": "^1.7.3"
   },
   "bin": {
     "interop-x": "bin/interop-x",
@@ -61,13 +64,13 @@
     "@typechain/ethers-v5": "^10.0.0",
     "@types/bn.js": "^5.1.0",
     "@types/fs-extra": "^9.0.13",
-    "@types/node": "^17.0.17",
-    "nodemon": "^2.0.15",
+    "@types/node": "^17.0.33",
+    "nodemon": "^2.0.16",
     "replace-in-file": "^6.3.2",
     "rimraf": "^3.0.2",
     "ts-node": "^10.5.0",
     "tsconfig-paths": "^3.12.0",
     "typechain": "^8.0.0",
-    "typescript": "^4.5.5"
+    "typescript": "^4.6.4"
   }
 }

package/src/abi/connectors/index.ts

@@ -0,0 +1,14 @@
+export * as connectorsV1 from './v1'
+export * as connectorsV2_M1 from './v2'
+
+import * as connectorsV1 from './v1'
+import { connectorsV2_M1 } from './v2'
+
+export type Connector = keyof typeof connectorsV1 | keyof typeof connectorsV2_M1 
+
+export const connectors = {
+    versions: {
+        1: connectorsV1,
+        2: connectorsV2_M1
+    }
+}

package/src/abi/connectors/v1/aave.ts

@@ -0,0 +1,147 @@
+import { AbiItem } from 'web3-utils'
+
+export const aave: AbiItem[] = [
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: 'token',
+        type: 'address',
+      },
+      {
+        internalType: 'uint256',
+        name: 'amt',
+        type: 'uint256',
+      },
+      {
+        internalType: 'uint256',
+        name: 'getId',
+        type: 'uint256',
+      },
+      {
+        internalType: 'uint256',
+        name: 'setId',
+        type: 'uint256',
+      },
+    ],
+    name: 'borrow',
+    outputs: [],
+    stateMutability: 'payable',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'connectorID',
+    outputs: [
+      {
+        internalType: 'uint256',
+        name: 'model',
+        type: 'uint256',
+      },
+      {
+        internalType: 'uint256',
+        name: 'id',
+        type: 'uint256',
+      },
+    ],
+    stateMutability: 'pure',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: 'token',
+        type: 'address',
+      },
+      {
+        internalType: 'uint256',
+        name: 'amt',
+        type: 'uint256',
+      },
+      {
+        internalType: 'uint256',
+        name: 'getId',
+        type: 'uint256',
+      },
+      {
+        internalType: 'uint256',
+        name: 'setId',
+        type: 'uint256',
+      },
+    ],
+    name: 'deposit',
+    outputs: [],
+    stateMutability: 'payable',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'name',
+    outputs: [
+      {
+        internalType: 'string',
+        name: '',
+        type: 'string',
+      },
+    ],
+    stateMutability: 'view',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: 'token',
+        type: 'address',
+      },
+      {
+        internalType: 'uint256',
+        name: 'amt',
+        type: 'uint256',
+      },
+      {
+        internalType: 'uint256',
+        name: 'getId',
+        type: 'uint256',
+      },
+      {
+        internalType: 'uint256',
+        name: 'setId',
+        type: 'uint256',
+      },
+    ],
+    name: 'payback',
+    outputs: [],
+    stateMutability: 'payable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'address',
+        name: 'token',
+        type: 'address',
+      },
+      {
+        internalType: 'uint256',
+        name: 'amt',
+        type: 'uint256',
+      },
+      {
+        internalType: 'uint256',
+        name: 'getId',
+        type: 'uint256',
+      },
+      {
+        internalType: 'uint256',
+        name: 'setId',
+        type: 'uint256',
+      },
+    ],
+    name: 'withdraw',
+    outputs: [],
+    stateMutability: 'payable',
+    type: 'function',
+  },
+]

package/src/abi/connectors/v1/aave_claim.ts

@@ -0,0 +1,3 @@
+import { AbiItem } from 'web3-utils';
+
+export const aave_claim: AbiItem[] = [{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address[]","name":"assets","type":"address[]"},{"indexed":false,"internalType":"uint256","name":"amt","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"getId","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"setId","type":"uint256"}],"name":"LogClaimed","type":"event"},{"inputs":[{"internalType":"address[]","name":"assets","type":"address[]"},{"internalType":"uint256","name":"amt","type":"uint256"},{"internalType":"uint256","name":"getId","type":"uint256"},{"internalType":"uint256","name":"setId","type":"uint256"}],"name":"claim","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[],"name":"connectorID","outputs":[{"internalType":"uint256","name":"_type","type":"uint256"},{"internalType":"uint256","name":"_id","type":"uint256"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"}]

package/src/abi/connectors/v1/aave_migrate.ts

@@ -0,0 +1,108 @@
+import { AbiItem } from 'web3-utils';
+
+export const aave_migrate: AbiItem[] = [
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: false,
+        internalType: 'address[]',
+        name: 'aTokens',
+        type: 'address[]',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256[]',
+        name: 'aTknBals',
+        type: 'uint256[]',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256[]',
+        name: 'borrowBals',
+        type: 'uint256[]',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256[]',
+        name: 'borrowBalsFee',
+        type: 'uint256[]',
+      },
+    ],
+    name: 'LogMigrate',
+    type: 'event',
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: false,
+        internalType: 'address',
+        name: 'user',
+        type: 'address',
+      },
+      {
+        indexed: false,
+        internalType: 'address[]',
+        name: 'aTokens',
+        type: 'address[]',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256[]',
+        name: 'aTknBals',
+        type: 'uint256[]',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256[]',
+        name: 'borrowBals',
+        type: 'uint256[]',
+      },
+      {
+        indexed: false,
+        internalType: 'uint256[]',
+        name: 'borrowBalsFee',
+        type: 'uint256[]',
+      },
+    ],
+    name: 'LogMigrateUser',
+    type: 'event',
+  },
+  {
+    inputs: [],
+    name: 'connectorID',
+    outputs: [
+      { internalType: 'uint256', name: 'model', type: 'uint256' },
+      { internalType: 'uint256', name: 'id', type: 'uint256' },
+    ],
+    stateMutability: 'pure',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address[]', name: 'tokens', type: 'address[]' },
+    ],
+    name: 'migrate',
+    outputs: [],
+    stateMutability: 'payable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      { internalType: 'address', name: 'userAccount', type: 'address' },
+      { internalType: 'address[]', name: 'tokens', type: 'address[]' },
+    ],
+    name: 'migrateUser',
+    outputs: [],
+    stateMutability: 'payable',
+    type: 'function',
+  },
+  {
+    inputs: [],
+    name: 'name',
+    outputs: [{ internalType: 'string', name: '', type: 'string' }],
+    stateMutability: 'view',
+    type: 'function',
+  },
+];