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

package/.github/workflows/ci.yml

@@ -0,0 +1,19 @@
+name: Interop X CI
+
+on:
+  push:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16
+      - name: Install dependencies
+        run: yarn --frozen-lockfile
+      - run: yarn run build

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.eb2b141",
+    "version": "0.0.0-dev.ef38dfb",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {
@@ -11,7 +11,7 @@
         "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'",
+        "generate-abi-types": "rimraf src/typechain && typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
         "prepublishOnly": "yarn build",
         "postinstall": "patch-package"
     },
@@ -24,17 +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.28.0",
-        "fastify-cors": "^6.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",
@@ -44,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",
@@ -58,15 +62,16 @@
     },
     "devDependencies": {
         "@typechain/ethers-v5": "^10.0.0",
+        "@types/async-retry": "^1.4.4",
         "@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/dist/src/abi/connectors/index.js

@@ -0,0 +1,36 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.connectors = exports.connectorsV2_M1 = exports.connectorsV1 = void 0;
+exports.connectorsV1 = __importStar(require("./v1"));
+exports.connectorsV2_M1 = __importStar(require("./v2"));
+const connectorsV1 = __importStar(require("./v1"));
+const v2_1 = require("./v2");
+exports.connectors = {
+    versions: {
+        1: connectorsV1,
+        2: v2_1.connectorsV2_M1
+    }
+};

package/dist/src/abi/connectors/v1/aave.js

@@ -0,0 +1,148 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.aave = void 0;
+exports.aave = [
+    {
+        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/dist/src/abi/connectors/v1/aave_claim.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.aave_claim = void 0;
+exports.aave_claim = [{ "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/dist/src/abi/connectors/v1/aave_migrate.js

@@ -0,0 +1,109 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.aave_migrate = void 0;
+exports.aave_migrate = [
+    {
+        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',
+    },
+];

package/dist/src/abi/connectors/v1/aave_polygon_migrate.js

@@ -0,0 +1,110 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.aave_polygon_migrate = void 0;
+exports.aave_polygon_migrate = [
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: true,
+                internalType: "address",
+                name: "user",
+                type: "address"
+            },
+            {
+                indexed: true,
+                internalType: "address",
+                name: "targetDsa",
+                type: "address"
+            },
+            {
+                indexed: false,
+                internalType: "address[]",
+                name: "supplyTokens",
+                type: "address[]"
+            },
+            {
+                indexed: false,
+                internalType: "address[]",
+                name: "borrowTokens",
+                type: "address[]"
+            }
+        ],
+        name: "LogAaveV2Migrate",
+        type: "event"
+    },
+    {
+        inputs: [],
+        name: "connectorID",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "_type",
+                type: "uint256"
+            },
+            {
+                internalType: "uint256",
+                name: "_id",
+                type: "uint256"
+            }
+        ],
+        stateMutability: "pure",
+        type: "function"
+    },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "targetDsa",
+                type: "address"
+            },
+            {
+                internalType: "address[]",
+                name: "supplyTokens",
+                type: "address[]"
+            },
+            {
+                internalType: "address[]",
+                name: "borrowTokens",
+                type: "address[]"
+            },
+            {
+                internalType: "uint256[]",
+                name: "variableBorrowAmts",
+                type: "uint256[]"
+            },
+            {
+                internalType: "uint256[]",
+                name: "stableBorrowAmts",
+                type: "uint256[]"
+            },
+            {
+                internalType: "uint256[]",
+                name: "supplyAmts",
+                type: "uint256[]"
+            },
+            {
+                internalType: "uint256",
+                name: "ethAmt",
+                type: "uint256"
+            }
+        ],
+        name: "migrate",
+        outputs: [],
+        stateMutability: "payable",
+        type: "function"
+    },
+    {
+        inputs: [],
+        name: "name",
+        outputs: [
+            {
+                internalType: "string",
+                name: "",
+                type: "string"
+            }
+        ],
+        stateMutability: "view",
+        type: "function"
+    }
+];

package/dist/src/abi/connectors/v1/aave_stake.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.aave_stake = void 0;
+exports.aave_stake = [{ "anonymous": false, "inputs": [{ "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": "LogClaim", "type": "event" }, { "anonymous": false, "inputs": [], "name": "LogCooldown", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": false, "internalType": "address", "name": "delegatee", "type": "address" }, { "indexed": false, "internalType": "bool", "name": "delegateAave", "type": "bool" }, { "indexed": false, "internalType": "bool", "name": "delegateStkAave", "type": "bool" }, { "indexed": false, "internalType": "uint8", "name": "aaveDelegationType", "type": "uint8" }, { "indexed": false, "internalType": "uint8", "name": "stkAaveDelegationType", "type": "uint8" }], "name": "LogDelegate", "type": "event" }, { "anonymous": false, "inputs": [{ "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": "LogRedeem", "type": "event" }, { "anonymous": false, "inputs": [{ "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": "LogStake", "type": "event" }, { "inputs": [{ "internalType": "uint256", "name": "amount", "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": "cooldown", "outputs": [], "stateMutability": "payable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "delegatee", "type": "address" }, { "internalType": "bool", "name": "delegateAave", "type": "bool" }, { "internalType": "bool", "name": "delegateStkAave", "type": "bool" }, { "internalType": "uint8", "name": "aaveDelegationType", "type": "uint8" }, { "internalType": "uint8", "name": "stkAaveDelegationType", "type": "uint8" }], "name": "delegate", "outputs": [], "stateMutability": "payable", "type": "function" }, { "inputs": [], "name": "name", "outputs": [{ "internalType": "string", "name": "", "type": "string" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "uint256", "name": "getId", "type": "uint256" }, { "internalType": "uint256", "name": "setId", "type": "uint256" }], "name": "redeem", "outputs": [], "stateMutability": "payable", "type": "function" }, { "inputs": [{ "internalType": "uint256", "name": "amount", "type": "uint256" }, { "internalType": "uint256", "name": "getId", "type": "uint256" }, { "internalType": "uint256", "name": "setId", "type": "uint256" }], "name": "stake", "outputs": [], "stateMutability": "payable", "type": "function" }];

package/dist/src/abi/connectors/v1/aave_v1_import.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.aave_v1_import = void 0;
+exports.aave_v1_import = [
+    {
+        inputs: [],
+        name: 'connectorID',
+        outputs: [
+            {
+                internalType: 'uint256',
+                name: 'model',
+                type: 'uint256',
+            },
+            {
+                internalType: 'uint256',
+                name: 'id',
+                type: 'uint256',
+            },
+        ],
+        stateMutability: 'pure',
+        type: 'function',
+    },
+    {
+        inputs: [
+            {
+                internalType: 'address',
+                name: 'userAccount',
+                type: 'address',
+            },
+            {
+                internalType: 'address[]',
+                name: 'tokens',
+                type: 'address[]',
+            },
+        ],
+        name: 'importAave',
+        outputs: [],
+        stateMutability: 'payable',
+        type: 'function',
+    },
+    {
+        inputs: [],
+        name: 'name',
+        outputs: [
+            {
+                internalType: 'string',
+                name: '',
+                type: 'string',
+            },
+        ],
+        stateMutability: 'view',
+        type: 'function',
+    },
+];