@instadapp/interop-x 0.0.0-dev.edef11e → 0.0.0-dev.ee3d74b

package/dist/src/alias.js

@@ -0,0 +1,10 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const module_alias_1 = __importDefault(require("module-alias"));
+module_alias_1.default.addAliases({
+    "@": __dirname,
+});
+(0, module_alias_1.default)();

package/dist/src/api/index.js

@@ -20,6 +20,9 @@ const startApiServer = async () => {
             return await db_1.Transaction.findAndCountAll({
                 limit: 20,
                 offset: 0,
+                order: [
+                    ['updatedAt', 'DESC']
+                ]
             });
         });
         await server.listen(PORT, HOST);

package/dist/src/constants/addresses.js

@@ -2,19 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addresses = void 0;
 exports.addresses = {
-    1: {
-        gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
-        multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-        interopXGateway: '',
-    },
     137: {
         gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
         multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-        interopXGateway: '',
+        interopX: '0xDB6083df37C5F224a3dF84A4B5f9fB60b6c8670a',
+        dsaAddress: '0x9Fbd453a8e7a158510fBae5D9935958507cf4b19',
     },
     43114: {
         gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
         multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-        interopXGateway: '0xF0317C5Bc206F2291dd2f3eE9C4cDB5Bbb25418d',
+        interopX: '0xd61f55C6d9deD35B9d13243b816c4BcC1d78592b',
+        dsaAddress: '0xFcB7d826E32081c4799de2f83b47b49df600dc8c',
     }
 };

package/dist/src/constants/blockConfirmations.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.blockConfirmations = void 0;
+exports.blockConfirmations = {
+    "1": 12,
+    "137": 32,
+    "43114": 12,
+};

package/dist/src/constants/index.js

@@ -16,4 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./addresses"), exports);
 __exportStar(require("./tokens"), exports);
-__exportStar(require("./itokens"), exports);
+__exportStar(require("./blockConfirmations"), exports);

package/dist/src/constants/tokens.js

@@ -2,102 +2,125 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tokens = void 0;
 exports.tokens = {
-    1: [
-        {
-            symbol: "ETH",
-            name: "Ethereum",
-            address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-            decimals: 18,
-        },
-        {
-            symbol: "DAI",
-            name: "DAI Stable",
-            address: "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-            decimals: 18,
-        },
-        {
-            symbol: "USDC",
-            name: "USD Coin",
-            address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-            decimals: 6,
-        },
-        {
-            symbol: "USDT",
-            name: "Tether USD Coin",
-            address: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
-            decimals: 6,
-        },
-        {
-            symbol: "WBTC",
-            name: "Wrapped BTC",
-            address: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
-            decimals: 8,
-        },
-    ],
+    // 1: [
+    //   {
+    //     aliases: ['eth'],
+    //     symbol: "ETH",
+    //     name: "Ethereum",
+    //     address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+    //     decimals: 18,
+    //   },
+    //   {
+    //     aliases: ['weth'],
+    //     symbol: "WETH",
+    //     name: "Wrapped Ethereum",
+    //     address: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
+    //     decimals: 18,
+    //   },
+    //   {
+    //     aliases: ['dai'],
+    //     symbol: "DAI",
+    //     name: "DAI Stable",
+    //     address: "0x6B175474E89094C44Da98b954EedeAC495271d0F",
+    //     decimals: 18,
+    //   },
+    //   {
+    //     aliases: ['usdc'],
+    //     symbol: "USDC",
+    //     name: "USD Coin",
+    //     address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+    //     decimals: 6,
+    //   },
+    //   {
+    //     aliases: ['usdt'],
+    //     symbol: "USDT",
+    //     name: "Tether USD Coin",
+    //     address: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+    //     decimals: 6,
+    //   },
+    //   {
+    //     aliases: ['wbtc'],
+    //     symbol: "WBTC",
+    //     name: "Wrapped BTC",
+    //     address: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
+    //     decimals: 8,
+    //   },
+    // ],
     137: [
         {
+            aliases: ['eth', 'weth'],
             symbol: "ETH",
             name: "Ethereum",
             address: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
             decimals: 18,
         },
         {
+            aliases: ['dai'],
             symbol: "DAI",
             name: "DAI Stable",
             address: "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063",
             decimals: 18,
         },
         {
+            aliases: ['usdc'],
             symbol: "USDC",
             name: "USD Coin",
             address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
             decimals: 6,
         },
         {
+            aliases: ['usdt'],
             symbol: "USDT",
             name: "Tether USD Coin",
             address: "0xc2132D05D31c914a87C6611C10748AEb04B58e8F",
             decimals: 6,
         },
         {
+            aliases: ['wbtc'],
             symbol: "WBTC",
             name: "Wrapped BTC",
             address: "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6",
             decimals: 8,
         },
-        {
-            symbol: "AVAX",
-            name: "Avalanche Token",
-            address: "0x2C89bbc92BD86F8075d1DEcc58C7F4E0107f286b",
-            decimals: 18,
-        },
     ],
     43114: [
         {
+            aliases: ['eth', 'weth'],
             symbol: "ETH",
             name: "Ethereum",
             address: "0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB",
             decimals: 18,
         },
         {
+            aliases: ['dai'],
             symbol: "DAI",
             name: "DAI Stable",
             address: "0xd586E7F844cEa2F87f50152665BCbc2C279D8d70",
             decimals: 18,
         },
         {
+            aliases: ['usdc'],
             symbol: "USDC",
             name: "USD Coin",
             address: "0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664",
             decimals: 6,
         },
         {
-            symbol: "USDT",
+            aliases: ['usdt'],
+            symbol: "USDt",
             name: "Tether USD Coin",
+            address: "0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7",
+            decimals: 6,
+        },
+        {
+            aliases: ['usdt'],
+            symbol: "USDT.e",
+            name: "Tether USD",
             address: "0xc7198437980c041c805A1EDcbA50c1Ce5db95118",
             decimals: 6,
         },
         {
+            aliases: ["wbtc"],
             symbol: "WBTC",
             name: "Wrapped BTC",
             address: "0x50b7545627a5162F82A992c33b87aDc75187B218",

package/dist/src/db/models/transaction.js

@@ -12,39 +12,57 @@ Transaction.init({
         autoIncrement: true,
         primaryKey: true
     },
-    submitTransactionHash: sequelize_2.DataTypes.NUMBER,
-    submitBlockNumber: sequelize_2.DataTypes.NUMBER,
     transactionHash: sequelize_2.DataTypes.STRING,
-    action: sequelize_2.DataTypes.STRING,
-    from: sequelize_2.DataTypes.STRING,
-    to: sequelize_2.DataTypes.STRING,
+    actionId: sequelize_2.DataTypes.STRING,
+    vnonce: sequelize_2.DataTypes.STRING,
+    sourceSender: sequelize_2.DataTypes.STRING,
+    submitChainId: sequelize_2.DataTypes.NUMBER,
+    submitTransactionHash: sequelize_2.DataTypes.STRING,
+    submitBlockNumber: sequelize_2.DataTypes.NUMBER,
+    submitCreatedAt: sequelize_2.DataTypes.DATE,
     sourceChainId: sequelize_2.DataTypes.NUMBER,
+    sourceDsaId: sequelize_2.DataTypes.STRING,
     sourceTransactionHash: sequelize_2.DataTypes.STRING,
     sourceBlockNumber: sequelize_2.DataTypes.NUMBER,
-    sourceStatus: sequelize_2.DataTypes.STRING,
+    sourceStatus: {
+        type: sequelize_2.DataTypes.STRING,
+        defaultValue: 'pending'
+    },
     sourceErrors: {
         type: sequelize_2.DataTypes.JSON,
         // defaultValue: [],
     },
+    sourceLogs: {
+        type: sequelize_2.DataTypes.JSON,
+        // defaultValue: [],
+    },
     sourceCreatedAt: {
         type: sequelize_2.DataTypes.DATE,
         defaultValue: Date.now()
     },
     sourceDelayUntil: sequelize_2.DataTypes.STRING,
     targetChainId: sequelize_2.DataTypes.NUMBER,
+    targetDsaId: sequelize_2.DataTypes.STRING,
     targetTransactionHash: sequelize_2.DataTypes.STRING,
     targetBlockNumber: sequelize_2.DataTypes.NUMBER,
-    targetStatus: sequelize_2.DataTypes.STRING,
+    targetStatus: {
+        type: sequelize_2.DataTypes.STRING,
+        defaultValue: 'pending'
+    },
     targetErrors: {
         type: sequelize_2.DataTypes.JSON,
         // defaultValue: [],
     },
+    targetLogs: {
+        type: sequelize_2.DataTypes.JSON,
+        // defaultValue: [],
+    },
     targetCreatedAt: sequelize_2.DataTypes.DATE,
     targetDelayUntil: sequelize_2.DataTypes.DATE,
-    submitEvent: sequelize_2.DataTypes.JSON,
-    sourceEvent: sequelize_2.DataTypes.JSON,
-    targetEvent: sequelize_2.DataTypes.JSON,
-    metadata: sequelize_2.DataTypes.JSON,
+    submitEvent: {
+        type: sequelize_2.DataTypes.JSON,
+        allowNull: false
+    },
     status: {
         type: sequelize_2.DataTypes.STRING,
         defaultValue: 'pending'

package/dist/src/gnosis/actions/aaveV2/index.js

@@ -0,0 +1,11 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const source_1 = __importDefault(require("./source"));
+const target_1 = __importDefault(require("./target"));
+async function default_1(transaction, type) {
+    return type === 'source' ? (0, source_1.default)(transaction) : (0, target_1.default)(transaction);
+}
+exports.default = default_1;

package/dist/src/gnosis/actions/aaveV2/source.js

@@ -0,0 +1,62 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const abi_1 = __importDefault(require("@/abi"));
+const config_1 = __importDefault(require("@/config"));
+const constants_1 = require("@/constants");
+const utils_1 = require("@/utils");
+const ethers_1 = require("ethers");
+const ethers_multisend_1 = require("ethers-multisend");
+async function default_1(transaction) {
+    const transactions = [];
+    const logs = [];
+    const { position, actionId, actionIdHashHash, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata, } = transaction.submitEvent;
+    const sourceChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(sourceChainId));
+    const sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, sourceChainProvider);
+    const interopAddress = constants_1.addresses[sourceChainId].interopX;
+    const contract = (0, utils_1.getContract)(interopAddress, abi_1.default.interopX, sourceWallet);
+    const sourceSpells = [];
+    const commonSpells = [];
+    for (const withdraw of position.withdraw) {
+        let spellData = {
+            connector: "AAVE-V2-A",
+            method: "payback",
+            args: [withdraw.sourceToken, withdraw.amount, "2", "0", "0"],
+        };
+        sourceSpells.push({
+            connector: spellData.method,
+            data: (0, utils_1.encodeConnectorMethod)(spellData),
+        });
+    }
+    for (const supply of position.supply) {
+        let spellDataWithdraw = {
+            connector: "AAVE-V2-A",
+            method: "withdraw",
+            args: [supply.sourceToken, supply.amount, "0", "0"],
+        };
+        sourceSpells.push({
+            connector: spellDataWithdraw.method,
+            data: (0, utils_1.encodeConnectorMethod)(spellDataWithdraw),
+        });
+        let spellDataBasicWithdraw = {
+            connector: "BASIC-A",
+            method: "withdraw",
+            args: [supply.sourceToken, supply.amount, interopAddress, "0", "0"],
+        };
+        sourceSpells.push({
+            connector: spellDataBasicWithdraw.method,
+            data: (0, utils_1.encodeConnectorMethod)(spellDataBasicWithdraw),
+        });
+    }
+    const { data } = await contract.populateTransaction.sourceAction(sourceSpells, commonSpells, position, actionId, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata);
+    transactions.push({
+        to: interopAddress,
+        data: data,
+        value: "0",
+        operation: ethers_multisend_1.OperationType.Call,
+    });
+    return { transactions, logs };
+}
+exports.default = default_1;

package/dist/src/gnosis/actions/aaveV2/target.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+async function default_1(transaction) {
+    const transactions = [];
+    const logs = [];
+    return { transactions, logs };
+}
+exports.default = default_1;

package/dist/src/gnosis/actions/index.js

@@ -0,0 +1,9 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const aaveV2_1 = __importDefault(require("./aaveV2"));
+exports.default = {
+    'A:AAVE-V2:AAVE-V2': aaveV2_1.default,
+};

package/dist/src/gnosis/index.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildGnosisAction = void 0;
+const ethers_multisend_1 = require("ethers-multisend");
+const actions_1 = __importDefault(require("./actions"));
+const buildGnosisAction = async (transaction, type) => {
+    // type = type || (transaction.sourceStatus === 'success' ? 'target' : 'source')
+    if (actions_1.default.hasOwnProperty(transaction.actionId)) {
+        const { transactions, logs } = await actions_1.default[transaction.actionId](transaction, type);
+        return {
+            data: (0, ethers_multisend_1.encodeMulti)(transactions).data,
+            logs
+        };
+    }
+    throw new Error(`Unknown action: ${transaction.actionId}`);
+};
+exports.buildGnosisAction = buildGnosisAction;

package/dist/src/index.js

@@ -3,24 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const module_alias_1 = __importDefault(require("module-alias"));
+require("./alias");
 const expand_home_dir_1 = __importDefault(require("expand-home-dir"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-module_alias_1.default.addAliases({
-    "@/": __dirname + "/",
-    "@/logger": __dirname + "/logger",
-    "@/tasks": __dirname + "/tasks",
-    "@/utils": __dirname + "/utils",
-    "@/api": __dirname + "/api",
-    "@/net": __dirname + "/net",
-    "@/db": __dirname + "/db",
-    "@/config": __dirname + "/config",
-    "@/types": __dirname + "/types",
-    "@/abi": __dirname + "/abi",
-    "@/constants": __dirname + "/constants",
-    "@/typechain": __dirname + "/typechain"
-});
-(0, module_alias_1.default)();
 const dotenv_1 = __importDefault(require("dotenv"));
 const chalk_1 = __importDefault(require("chalk"));
 const ethers_1 = require("ethers");
@@ -28,7 +13,7 @@ const package_json_1 = __importDefault(require("../package.json"));
 dotenv_1.default.config();
 const logger_1 = __importDefault(require("@/logger"));
 const logger = new logger_1.default('Process');
-const GIT_SHORT_HASH = 'edef11e';
+const GIT_SHORT_HASH = 'ee3d74b';
 const printUsage = () => {
     console.log();
     console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
@@ -87,7 +72,9 @@ const utils_1 = require("./utils");
 async function main() {
     (0, net_1.startPeer)({});
     const tasks = new tasks_1.Tasks();
-    tasks.start();
+    setTimeout(() => {
+        tasks.start();
+    }, 10000);
     (0, api_1.startApiServer)();
     net_1.protocol.on('TransactionStatus', async (payload) => {
         if (!net_1.peerPool.isLeadNode(payload.peerId)) {
@@ -105,9 +92,11 @@ async function main() {
         transaction.sourceStatus = payload.data.sourceStatus;
         transaction.sourceTransactionHash = payload.data.sourceTransactionHash;
         transaction.sourceErrors = payload.data.sourceErrors;
+        transaction.sourceLogs = payload.data.sourceLogs;
         transaction.targetStatus = payload.data.targetStatus;
         transaction.targetTransactionHash = payload.data.targetTransactionHash;
         transaction.targetErrors = payload.data.targetErrors;
+        transaction.targetLogs = payload.data.targetLogs;
         transaction.status = payload.data.status;
         await transaction.save();
     });

package/dist/src/net/protocol/dial/SignatureDialProtocol.js

@@ -10,12 +10,17 @@ const config_1 = __importDefault(require("@/config"));
 const db_1 = require("@/db");
 const utils_1 = require("@/utils");
 const constants_1 = require("@/constants");
+const gnosis_1 = require("@/gnosis");
 class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
     constructor(libp2p) {
         super(libp2p, '/interop-x/signatures');
         this.timeout = 30000;
     }
     async response(data) {
+        console.log({
+            tag: 'SignatureDialProtocol',
+            data
+        });
         const signer = config_1.default.wallet;
         let transaction;
         let maxTimeout = 20000;
@@ -33,17 +38,11 @@ class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
                 error: 'Event not found'
             };
         }
-        console.log("signing:", {
-            to: constants_1.addresses[transaction.targetChainId].multisend,
-            data: await (0, utils_1.buildDataForTransaction)(transaction, data.type),
-            chainId: transaction.targetChainId,
-            safeTxGas: data.safeTxGas,
-            nonce: data.safeNonce,
-        });
+        const { data: gnosisData } = await (0, gnosis_1.buildGnosisAction)(transaction, data.type);
         const signedData = await (0, utils_1.signGnosisSafeTx)({
-            to: constants_1.addresses[transaction.targetChainId].multisend,
-            data: await (0, utils_1.buildDataForTransaction)(transaction, data.type),
-            chainId: transaction.targetChainId,
+            to: constants_1.addresses[data.chainId].multisend,
+            data: gnosisData,
+            chainId: data.chainId,
             safeTxGas: data.safeTxGas,
             nonce: data.safeNonce,
         }, { signer });

package/dist/src/net/protocol/dial/TransactionStatusDialProtocol.js

@@ -18,9 +18,11 @@ class TransactionStatusDialProtocol extends BaseDialProtocol_1.BaseDialProtocol
             sourceStatus: transaction.sourceStatus,
             sourceTransactionHash: transaction.sourceTransactionHash,
             sourceErrors: transaction.sourceErrors,
+            sourceLogs: transaction.sourceLogs,
             targetStatus: transaction.targetStatus,
             targetTransactionHash: transaction.targetTransactionHash,
             targetErrors: transaction.targetErrors,
+            targetLogs: transaction.targetLogs,
             status: transaction.status,
         };
     }

package/dist/src/net/protocol/index.js

@@ -31,21 +31,31 @@ class Protocol extends stream_1.EventEmitter {
                 encode: (transaction) => [
                     Buffer.from(transaction.transactionHash),
                     Buffer.from(transaction.sourceStatus),
-                    Buffer.from(transaction.sourceTransactionHash),
+                    Buffer.from(transaction.sourceTransactionHash || ''),
                     transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
+                    transaction.sourceLogs ? transaction.sourceLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
                     Buffer.from(transaction.targetStatus),
-                    Buffer.from(transaction.targetTransactionHash),
+                    Buffer.from(transaction.targetTransactionHash || ''),
                     transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
+                    transaction.targetLogs ? transaction.targetLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
                     Buffer.from(transaction.status),
                 ],
-                decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]) => ({
+                decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, sourceLogs, targetStatus, targetTransactionHash, targetErrors, targetLogs, status]) => ({
                     transactionHash: transactionHash.toString(),
                     sourceStatus: sourceStatus.toString(),
-                    sourceTransactionHash: sourceTransactionHash.toString(),
+                    sourceTransactionHash: sourceTransactionHash.toString() || null,
                     sourceErrors: sourceErrors.map((e) => e.toString()),
+                    sourceLogs: sourceLogs.map(e => ({
+                        type: e[0].toString(),
+                        message: e[1].toString(),
+                    })),
                     targetStatus: targetStatus.toString(),
-                    targetTransactionHash: targetTransactionHash.toString(),
+                    targetTransactionHash: targetTransactionHash.toString() || null,
                     targetErrors: targetErrors.map((e) => e.toString()),
+                    targetLogs: targetLogs.map(e => ({
+                        type: e[0].toString(),
+                        message: e[1].toString(),
+                    })),
                     status: status.toString(),
                 }),
             },