@instadapp/interop-x 0.0.0-dev.6ea4ee5 → 0.0.0-dev.7283125

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InteropX__factory = exports.GnosisSafe__factory = exports.Erc20__factory = void 0;
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+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 InteropX__factory_1 = require("./InteropX__factory");
+Object.defineProperty(exports, "InteropX__factory", { enumerable: true, get: function () { return InteropX__factory_1.InteropX__factory; } });

package/dist/{typechain → src/typechain}/index.js

@@ -23,13 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InteropXGateway__factory = exports.InteropBridgeToken__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 InteropBridgeToken__factory_1 = require("./factories/InteropBridgeToken__factory");
-Object.defineProperty(exports, "InteropBridgeToken__factory", { enumerable: true, get: function () { return InteropBridgeToken__factory_1.InteropBridgeToken__factory; } });
-var InteropXGateway__factory_1 = require("./factories/InteropXGateway__factory");
-Object.defineProperty(exports, "InteropXGateway__factory", { enumerable: true, get: function () { return InteropXGateway__factory_1.InteropXGateway__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

@@ -0,0 +1,223 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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
+ */
+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) {
+    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;
+}
+exports.shortenHash = shortenHash;
+function short(buffer) {
+    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 gnosisSafe = constants_1.addresses[chainId].gnosisSafe;
+    const domain = {
+        verifyingContract: gnosisSafe,
+        chainId,
+    };
+    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" },
+        ],
+    };
+    const message = {
+        baseGas,
+        data,
+        gasPrice,
+        gasToken,
+        nonce: Number(nonce),
+        operation,
+        refundReceiver,
+        safeAddress: gnosisSafe,
+        safeTxGas: String(safeTxGas),
+        to,
+        value,
+    };
+    return await signer._signTypedData(domain, types, message);
+};
+exports.signGnosisSafeTx = signGnosisSafeTx;
+const getRpcProviderUrl = (chainId) => {
+    switch (chainId) {
+        case 1:
+            return "https://rpc.ankr.com/eth";
+        case 137:
+            return "https://rpc.ankr.com/polygon";
+        case 43114:
+            return "https://rpc.ankr.com/avalanche";
+        default:
+            throw new Error(`Unknown chainId: ${chainId}`);
+    }
+};
+exports.getRpcProviderUrl = getRpcProviderUrl;
+const buildSignatureBytes = (signatures) => {
+    signatures.sort((left, right) => left.signer.toLowerCase().localeCompare(right.signer.toLowerCase()));
+    let signatureBytes = "0x";
+    for (const sig of signatures) {
+        signatureBytes += sig.data.slice(2);
+    }
+    return signatureBytes;
+};
+exports.buildSignatureBytes = buildSignatureBytes;
+/**
+ * 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
+ */
+const asyncCallWithTimeout = async (asyncPromise, timeout) => {
+    let timeoutHandle;
+    const timeoutPromise = new Promise((_resolve, reject) => {
+        timeoutHandle = setTimeout(() => reject(new Error("Async call timeout limit reached")), timeout);
+    });
+    return Promise.race([asyncPromise, timeoutPromise]).then((result) => {
+        clearTimeout(timeoutHandle);
+        return result;
+    });
+};
+exports.asyncCallWithTimeout = asyncCallWithTimeout;
+const generateInteropTransactionHash = (data) => {
+    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) {
+        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");
+    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) => {
+                    try {
+                        return await (0, async_retry_1.default)(async () => await value.bind(contract)(...args), { retries: isConstant ? 1 : 3 });
+                    }
+                    catch (error) {
+                        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))) {
+                const parentProp = String(prop);
+                return new Proxy(value, {
+                    get(target, prop, receiver) {
+                        const value = Reflect.get(target, prop, receiver);
+                        if (typeof value === "function") {
+                            return async (...args) => {
+                                try {
+                                    return await (0, async_retry_1.default)(async () => await value.bind(contract)(...args), { retries: parentProp === "callStatic" ? 3 : 1 });
+                                }
+                                catch (error) {
+                                    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;
+        },
+    });
+}
+exports.getContract = getContract;
+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();
+        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.6ea4ee5",
+  "version": "0.0.0-dev.7283125",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -11,8 +11,9 @@
     "start": "yarn build && node bin/interop-x",
     "build": "yarn generate-abi-types && export GIT_REF=$(git rev-parse --short HEAD) && rimraf ./dist && tsc -p tsconfig.json && replace-in-file '@GIT_SHORT_HASH@' $GIT_REF ./dist/**/*.js",
     "dev": "yarn generate-abi-types && NODE_ENV=development nodemon",
-    "generate-abi-types": "typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
-    "prepublishOnly": "yarn build"
+    "generate-abi-types": "rimraf src/typechain && typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
+    "prepublishOnly": "yarn build",
+    "postinstall": "patch-package"
   },
   "nodemonConfig": {
     "watch": [
@@ -23,15 +24,19 @@
   },
   "dependencies": {
     "@achingbrain/libp2p-gossipsub": "^0.12.2",
-    "axios": "^0.27.1",
-    "axios-retry": "^3.2.4",
-    "bignumber.js": "^9.0.2",
+    "@fastify/cors": "^7.0.0",
+    "async-retry": "^1.3.3",
+    "await-spawn": "^4.0.2",
+    "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.29.0",
+    "fs-extra": "^10.1.0",
     "libp2p": "^0.36.2",
     "libp2p-bootstrap": "^0.14.0",
     "libp2p-kad-dht": "^0.28.6",
@@ -41,26 +46,31 @@
     "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",
-    "sequelize": "^6.19.0",
-    "sqlite3": "^5.0.5",
-    "waait": "^1.0.5"
+    "patch-package": "^6.4.7",
+    "postinstall-postinstall": "^2.1.0",
+    "sequelize": "6.18.0",
+    "sqlite3": "^5.0.8",
+    "waait": "^1.0.5",
+    "web3-eth-abi": "^1.7.3",
+    "web3-utils": "^1.7.3"
   },
   "bin": {
-    "interop-node": "bin/interop-x"
+    "interop-x": "bin/interop-x",
+    "interopx": "bin/interop-x"
   },
   "devDependencies": {
     "@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/patches/@ethersproject+properties+5.6.0.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/@ethersproject/properties/lib/index.js b/node_modules/@ethersproject/properties/lib/index.js
+index 41e0b52..4c7a9e3 100644
+--- a/node_modules/@ethersproject/properties/lib/index.js
++++ b/node_modules/@ethersproject/properties/lib/index.js
+@@ -44,7 +44,7 @@ function defineReadOnly(object, name, value) {
+     Object.defineProperty(object, name, {
+         enumerable: true,
+         value: value,
+-        writable: false,
++        writable: true,
+     });
+ }
+ exports.defineReadOnly = defineReadOnly;

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',
+  },
+];