@instadapp/interop-x 0.0.0-dev.8965b57 → 0.0.0-dev.8a9ef54

package/dist/src/api/index.js

@@ -21,7 +21,7 @@ const startApiServer = async () => {
                 limit: 20,
                 offset: 0,
                 order: [
-                    ['createdAt', 'DESC']
+                    ['updatedAt', 'DESC']
                 ]
             });
         });

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',
-        interopXContract: '',
-    },
     137: {
         gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
         multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-        interopXContract: '0x2189741c8cAc1cf51570932817A7d6390646C80e',
+        interopX: '0xDB6083df37C5F224a3dF84A4B5f9fB60b6c8670a',
+        dsaAddress: '0x9Fbd453a8e7a158510fBae5D9935958507cf4b19',
     },
     43114: {
         gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
         multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-        interopXContract: '0x1867DF97Ec24bb0bbD4AD464F0Be9C6713422EAE',
+        interopX: '0xd61f55C6d9deD35B9d13243b816c4BcC1d78592b',
+        dsaAddress: '0xFcB7d826E32081c4799de2f83b47b49df600dc8c',
     }
 };

package/dist/src/constants/tokens.js

@@ -2,50 +2,50 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tokens = void 0;
 exports.tokens = {
-    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,
-        },
-    ],
+    // 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'],
@@ -82,13 +82,6 @@ exports.tokens = {
             address: "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6",
             decimals: 8,
         },
-        {
-            aliases: ['avax'],
-            symbol: "AVAX",
-            name: "Avalanche Token",
-            address: "0x2C89bbc92BD86F8075d1DEcc58C7F4E0107f286b",
-            decimals: 18,
-        },
     ],
     43114: [
         {

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

@@ -12,17 +12,21 @@ Transaction.init({
         autoIncrement: true,
         primaryKey: true
     },
-    requestTransactionHash: sequelize_2.DataTypes.NUMBER,
-    requestBlockNumber: sequelize_2.DataTypes.NUMBER,
     transactionHash: sequelize_2.DataTypes.STRING,
-    action: sequelize_2.DataTypes.STRING,
-    bridger: 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: {
         type: sequelize_2.DataTypes.STRING,
-        defaultValue: 'uninitialised'
+        defaultValue: 'pending'
     },
     sourceErrors: {
         type: sequelize_2.DataTypes.JSON,
@@ -38,11 +42,12 @@ Transaction.init({
     },
     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: {
         type: sequelize_2.DataTypes.STRING,
-        defaultValue: 'uninitialised'
+        defaultValue: 'pending'
     },
     targetErrors: {
         type: sequelize_2.DataTypes.JSON,
@@ -54,13 +59,10 @@ Transaction.init({
     },
     targetCreatedAt: sequelize_2.DataTypes.DATE,
     targetDelayUntil: sequelize_2.DataTypes.DATE,
-    requestEvent: {
+    submitEvent: {
         type: sequelize_2.DataTypes.JSON,
         allowNull: false
     },
-    requestSentEvent: sequelize_2.DataTypes.JSON,
-    committedEvent: sequelize_2.DataTypes.JSON,
-    completedEvent: sequelize_2.DataTypes.JSON,
     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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const withdraw_1 = __importDefault(require("./withdraw"));
+const aaveV2_1 = __importDefault(require("./aaveV2"));
 exports.default = {
-    withdraw: withdraw_1.default,
+    'AAVE-V2:AAVE-V2': aaveV2_1.default,
 };

package/dist/src/gnosis/index.js

@@ -8,13 +8,13 @@ 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.action)) {
-        const { transactions, logs } = await actions_1.default[transaction.action](transaction, type);
+    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.action}`);
+    throw new Error(`Unknown action: ${transaction.actionId}`);
 };
 exports.buildGnosisAction = buildGnosisAction;

package/dist/src/index.js

@@ -13,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 = '8965b57';
+const GIT_SHORT_HASH = '8a9ef54';
 const printUsage = () => {
     console.log();
     console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);

package/dist/src/tasks/{InteropXContract/SyncBridgeRequestEvents.js → InteropX/SyncLogSubmitEvents.js}

@@ -11,54 +11,63 @@ const db_1 = require("@/db");
 const utils_1 = require("@/utils");
 const constants_1 = require("@/constants");
 const config_1 = __importDefault(require("@/config"));
-class SyncBridgeRequestEvents extends BaseTask_1.BaseTask {
+class SyncLogSubmitEvents extends BaseTask_1.BaseTask {
     constructor({ chainId }) {
         super({
-            logger: new logger_1.default("InteropXContract::SyncBridgeRequestEvents"),
+            logger: new logger_1.default("InteropX::SyncLogSubmitEvents"),
         });
         this.chainId = chainId;
     }
     async pollHandler() {
         const currentBlock = await this.provider.getBlockNumber();
-        const events = await this.contract.queryFilter(this.contract.filters.LogBridgeRequest(), currentBlock - 2000, currentBlock);
+        const events = await this.contract.queryFilter(this.contract.filters.LogSubmit(), 29429078, 29429078);
         let processedEvents = 0;
         for (const event of events) {
             try {
                 if (!event.args) {
                     continue;
                 }
-                const { bridger, position, sourceChainId, targetChainId, metadata } = event.args;
+                const { position, actionId, actionIdHashHash, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata, } = event.args;
                 const uniqueIdentifier = {
-                    action: 'withdraw',
-                    bridger,
-                    requestTransactionHash: event.transactionHash,
+                    actionId,
+                    vnonce: vnonce.toString(),
+                    sourceSender: sourceSender.toString(),
                     sourceChainId: sourceChainId.toNumber(),
                     targetChainId: targetChainId.toNumber(),
+                    sourceDsaId: sourceDsaId.toString(),
+                    targetDsaId: targetDsaId.toString(),
                 };
                 let transactionHash = (0, utils_1.generateInteropTransactionHash)(uniqueIdentifier);
-                const transaction = await db_1.Transaction.findOne({ where: { transactionHash } });
+                const transaction = await db_1.Transaction.findOne({
+                    where: { transactionHash },
+                });
                 if (transaction) {
                     continue;
                 }
-                await db_1.Transaction.create(Object.assign(Object.assign({ transactionHash }, uniqueIdentifier), { requestBlockNumber: event.blockNumber, requestEvent: {
-                        bridger,
+                await db_1.Transaction.create(Object.assign(Object.assign({ transactionHash }, uniqueIdentifier), { submitChainId: this.chainId, submitTransactionHash: event.transactionHash, submitBlockNumber: event.blockNumber, submitCreatedAt: new Date(), submitEvent: {
+                        actionId,
+                        actionIdHashHash,
+                        vnonce: vnonce.toString(),
                         position: {
                             withdraw: position.withdraw.map((v) => ({
                                 sourceToken: v.sourceToken,
                                 targetToken: v.targetToken,
-                                amount: v.amount.toString()
+                                amount: v.amount.toString(),
                             })),
                             supply: position.supply.map((v) => ({
                                 sourceToken: v.sourceToken,
                                 targetToken: v.targetToken,
-                                amount: v.amount.toString()
+                                amount: v.amount.toString(),
                             })),
                         },
                         sourceChainId: sourceChainId.toNumber(),
                         targetChainId: targetChainId.toNumber(),
+                        sourceSender,
+                        sourceDsaId: sourceDsaId.toString(),
+                        targetDsaId: targetDsaId.toString(),
                         metadata,
                     } }));
-                this.logger.info(`New bridge request received: ${transactionHash} `);
+                this.logger.info(`New InteropX tranaction: ${transactionHash} `);
             }
             catch (error) {
                 this.logger.error(error);
@@ -68,10 +77,10 @@ class SyncBridgeRequestEvents extends BaseTask_1.BaseTask {
             this.logger.info(`${processedEvents} events processed`);
     }
     async start() {
-        this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
+        this.contractAddress = constants_1.addresses[this.chainId].interopX;
         this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
-        this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXContract, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
+        this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopX, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
         await super.start();
     }
 }
-exports.default = SyncBridgeRequestEvents;
+exports.default = SyncLogSubmitEvents;

package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js

@@ -20,13 +20,16 @@ class SyncTransactionStatusTask extends BaseTask_1.BaseTask {
         // if transaction is pending for more than 1 hour, check lead node for status
         const leadNode = net_1.peerPool.getLeadPeer();
         if (!leadNode) {
+            console.log("No lead node found");
             return;
         }
         const transaction = await db_1.Transaction.findOne({
             where: {
-                status: 'pending',
-                sourceCreatedAt: {
-                    [sequelize_1.Op.gte]: new Date(Date.now() - 60 * 60 * 1000),
+                status: {
+                    [sequelize_1.Op.notIn]: ['success', 'failed'],
+                },
+                createdAt: {
+                    [sequelize_1.Op.lt]: new Date(Date.now() - 15 * 60 * 1000),
                 },
             }
         });

package/dist/src/tasks/index.js

@@ -5,22 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tasks = void 0;
 const waait_1 = __importDefault(require("waait"));
+const SyncTransactionStatusTask_1 = __importDefault(require("./Transactions/SyncTransactionStatusTask"));
 const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
-const SyncBridgeRequestEvents_1 = __importDefault(require("./InteropXContract/SyncBridgeRequestEvents"));
-const ProcessBridgeRequestEvents_1 = __importDefault(require("./InteropXContract/ProcessBridgeRequestEvents"));
-const SyncBridgeRequestSentEvents_1 = __importDefault(require("./InteropXContract/SyncBridgeRequestSentEvents"));
+const SyncLogSubmitEvents_1 = __importDefault(require("./InteropX/SyncLogSubmitEvents"));
 class Tasks {
     constructor() {
         this.tasks = [
             // new SyncTransactionStatusTask(),
             new AutoUpdateTask_1.default(),
-            // InteropXContract
-            new SyncBridgeRequestEvents_1.default({ chainId: 137 }),
-            new SyncBridgeRequestEvents_1.default({ chainId: 43114 }),
-            new SyncBridgeRequestSentEvents_1.default({ chainId: 137 }),
-            new SyncBridgeRequestSentEvents_1.default({ chainId: 43114 }),
-            new ProcessBridgeRequestEvents_1.default({ chainId: 137 }),
-            new ProcessBridgeRequestEvents_1.default({ chainId: 43114 }),
+            // InteropX
+            new SyncLogSubmitEvents_1.default({ chainId: 137 }),
+            new SyncLogSubmitEvents_1.default({ chainId: 43114 }),
+            new SyncTransactionStatusTask_1.default(),
         ];
     }
     async start() {