@instadapp/interop-x 0.0.0-dev.098229d → 0.0.0-dev.14afa72

package/dist/src/tasks/AutoUpdateTask.js

@@ -5,43 +5,65 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const BaseTask_1 = require("./BaseTask");
 const logger_1 = __importDefault(require("@/logger"));
-const utils_1 = require("@/utils");
 const await_spawn_1 = __importDefault(require("await-spawn"));
+const child_process_1 = require("child_process");
 const config_1 = __importDefault(require("@/config"));
 const waait_1 = __importDefault(require("waait"));
+const package_json_1 = __importDefault(require("../../package.json"));
+const currentVersion = package_json_1.default.version;
+const tag = config_1.default.staging ? 'dev' : 'latest';
 class AutoUpdateTask extends BaseTask_1.BaseTask {
     constructor() {
         super({
             logger: new logger_1.default("AutoUpdateTask"),
         });
-        this.pollIntervalMs = 60 * 5 * 1000;
+        this.pollIntervalMs = 60 * 10 * 1000;
     }
     prePollHandler() {
         return config_1.default.autoUpdate && !config_1.default.isLeadNode();
     }
-    getCurrentVersion() {
-        return require('../../package.json').version;
+    async getInstalledVersion() {
+        try {
+            const stdout = await (0, await_spawn_1.default)('npm', ['-g', 'ls', '--depth=0', '--json']);
+            return JSON.parse(stdout.toString()).dependencies[package_json_1.default.name].version;
+        }
+        catch (error) {
+            this.logger.error(error);
+            return currentVersion;
+        }
+    }
+    async getLatestVersion() {
+        try {
+            const stdout = await (0, await_spawn_1.default)('npm', ['view', `${package_json_1.default.name}@${tag}`, 'version']);
+            return stdout.toString().trim();
+        }
+        catch (error) {
+            this.logger.error(error);
+            return currentVersion;
+        }
     }
     async pollHandler() {
-        const { data } = await utils_1.http.get('https://registry.npmjs.org/@instadapp/interop-x');
-        const version = data['dist-tags'].latest;
-        const currentVersion = this.getCurrentVersion();
+        const version = await this.getLatestVersion();
         if (version === currentVersion) {
             return;
         }
         this.logger.warn(`New version ${version} available.`);
-        await (0, await_spawn_1.default)('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
+        this.logger.info('Updating...');
+        await (0, await_spawn_1.default)('npm', ['-g', 'install', `@instadapp/interop-x@${tag}`, '-f']);
         await (0, waait_1.default)(5000);
-        if (currentVersion === this.getCurrentVersion()) {
+        if (version !== await this.getInstalledVersion()) {
             this.logger.warn(`failed to install ${version}, retrying in 5 minutes`);
             return;
         }
         this.logger.warn(`Installed version ${version}`);
         this.logger.warn(`Restarting...`);
-        (0, await_spawn_1.default)(process.argv[0], process.argv.slice(1), {
+        // TODO: its restarting in the bg, but it should be in the fg
+        const subprocess = (0, child_process_1.spawn)(process.argv[0], process.argv.slice(1), {
             cwd: process.cwd(),
-            stdio: "inherit"
+            stdio: "inherit",
+            // shell: process.env.SHELL, 
         });
+        subprocess.unref();
         process.exit();
     }
 }

package/dist/src/tasks/BaseTask.js

@@ -35,6 +35,10 @@ class BaseTask extends events_1.default {
         }
     }
     prePollHandler() {
+        if (config_1.default.isMaintenanceMode()) {
+            this.logger.warn('Maintenance mode is enabled. Skipping task.');
+            return false;
+        }
         if (this.exceptLeadNode) {
             return !config_1.default.isLeadNode();
         }

package/dist/src/tasks/InteropBridge/ProcessWithdrawEvents.js

@@ -14,6 +14,7 @@ const config_1 = __importDefault(require("@/config"));
 const sequelize_1 = require("sequelize");
 const waait_1 = __importDefault(require("waait"));
 const net_1 = require("@/net");
+const gnosis_1 = require("@/gnosis");
 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));
@@ -68,9 +69,22 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
         const safeContract = (0, utils_1.getContract)(safeAddress, abi_1.default.gnosisSafe, targetWallet);
         const ownersThreshold = await safeContract.getThreshold();
         await (0, waait_1.default)(10000);
+        let data, logs = [];
+        try {
+            ({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction));
+        }
+        catch (error) {
+            console.log(error);
+            transaction.targetStatus = 'failed';
+            transaction.targetErrors = [error.message];
+            transaction.status = 'failed';
+            await transaction.save();
+            net_1.protocol.sendTransaction(transaction);
+            return;
+        }
         let gnosisTx = await generateGnosisTransaction({
             baseGas: "0",
-            data: await (0, utils_1.buildDataForTransaction)(transaction),
+            data,
             gasPrice: "0",
             gasToken: "0x0000000000000000000000000000000000000000",
             nonce: '0',
@@ -127,6 +141,7 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
             console.log('ExecutionSuccess');
             transaction.targetStatus = 'success';
             transaction.targetTransactionHash = txSent.hash;
+            transaction.targetLogs = logs;
             transaction.status = 'success';
             await transaction.save();
         }
@@ -137,9 +152,9 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
             transaction.status = 'failed';
             await transaction.save();
         }
+        net_1.protocol.sendTransaction(transaction);
     }
     async start() {
-        this.logger.info(`Starting execution watcher on interop chain`);
         this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
         await super.start();
     }

package/dist/src/tasks/InteropBridge/{SyncWithdrawEvents.js → SyncBurnEvents.js}

@@ -10,10 +10,10 @@ const abi_1 = __importDefault(require("@/abi"));
 const db_1 = require("@/db");
 const utils_1 = require("@/utils");
 const config_1 = __importDefault(require("@/config"));
-class SyncWithdrawEvents extends BaseTask_1.BaseTask {
+class SyncBurnEvents extends BaseTask_1.BaseTask {
     constructor({ chainId, itokenAddress }) {
         super({
-            logger: new logger_1.default("InteropBridgeToken::SyncWithdrawEvents"),
+            logger: new logger_1.default("InteropBridgeToken::SyncBurnEvents"),
         });
         this.chainId = chainId;
         this.itokenAddress = itokenAddress;
@@ -27,12 +27,12 @@ class SyncWithdrawEvents extends BaseTask_1.BaseTask {
                 if (!event.args) {
                     continue;
                 }
-                const { to, amount, chainId } = event.args;
+                const { to, amount, sourceChainId, targetChainId } = event.args;
                 const uniqueIdentifier = {
                     action: 'withdraw',
                     submitTransactionHash: event.transactionHash,
-                    sourceChainId: this.chainId,
-                    targetChainId: chainId.toNumber(),
+                    sourceChainId: sourceChainId,
+                    targetChainId: targetChainId,
                 };
                 if (await db_1.Transaction.findOne({ where: uniqueIdentifier })) {
                     continue;
@@ -44,12 +44,14 @@ class SyncWithdrawEvents extends BaseTask_1.BaseTask {
                         to,
                         amount: amount.toString(),
                         itoken: this.itokenAddress,
-                        chainId: chainId.toString()
+                        sourceChainId: sourceChainId,
+                        targetChainId: targetChainId,
                     }, sourceEvent: {
                         to,
                         amount: amount.toString(),
                         itoken: this.itokenAddress,
-                        chainId: chainId.toString(),
+                        sourceChainId: sourceChainId,
+                        targetChainId: targetChainId,
                     }, status: "pending" }));
                 this.logger.info(`Withdraw queued: ${event.transactionHash} ${event.blockNumber}`);
             }
@@ -61,10 +63,9 @@ class SyncWithdrawEvents extends BaseTask_1.BaseTask {
             this.logger.info(`${processedEvents} events processed`);
     }
     async start() {
-        this.logger.info(`Starting execution watcher on interop chain`);
         this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
         this.contract = (0, utils_1.getContract)(this.itokenAddress, abi_1.default.interopBridgeToken, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
         await super.start();
     }
 }
-exports.default = SyncWithdrawEvents;
+exports.default = SyncBurnEvents;

package/dist/src/tasks/InteropBridge/SyncMintEvents.js

@@ -0,0 +1,67 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const BaseTask_1 = require("../BaseTask");
+const logger_1 = __importDefault(require("@/logger"));
+const ethers_1 = require("ethers");
+const abi_1 = __importDefault(require("@/abi"));
+const db_1 = require("@/db");
+const utils_1 = require("@/utils");
+const config_1 = __importDefault(require("@/config"));
+class SyncMintEvents extends BaseTask_1.BaseTask {
+    constructor({ chainId, itokenAddress }) {
+        super({
+            logger: new logger_1.default("InteropBridgeToken::SyncMintEvents"),
+        });
+        this.chainId = chainId;
+        this.itokenAddress = itokenAddress;
+    }
+    async pollHandler() {
+        const currentBlock = await this.provider.getBlockNumber();
+        const events = await this.contract.queryFilter(this.contract.filters.Mint(), currentBlock - 500, currentBlock);
+        for (const event of events) {
+            try {
+                if (!event.args) {
+                    continue;
+                }
+                const { sourceChainId, targetChainId, amount, to, submitTransactionHash } = event.args;
+                const uniqueIdentifier = {
+                    action: 'deposit',
+                    submitTransactionHash: submitTransactionHash,
+                    sourceChainId: sourceChainId,
+                    targetChainId: targetChainId,
+                    targetEvent: null
+                };
+                const transaction = await db_1.Transaction.findOne({ where: uniqueIdentifier });
+                if (!transaction) {
+                    return;
+                }
+                const tx = await event.getTransaction();
+                transaction.targetStatus = 'success';
+                transaction.targetErrors = [];
+                transaction.targetTransactionHash = tx.hash;
+                transaction.targetEvent = {
+                    sourceChainId,
+                    targetChainId,
+                    amount: amount.toString(),
+                    to,
+                    submitTransactionHash
+                };
+                transaction.status = 'success';
+                await transaction.save();
+                this.logger.info(`Mint confirmation received: ${transaction.transactionHash} `);
+            }
+            catch (error) {
+                this.logger.error(error);
+            }
+        }
+    }
+    async start() {
+        this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
+        this.contract = (0, utils_1.getContract)(this.itokenAddress, abi_1.default.interopBridgeToken, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
+        await super.start();
+    }
+}
+exports.default = SyncMintEvents;

package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js

@@ -14,6 +14,7 @@ const config_1 = __importDefault(require("@/config"));
 const sequelize_1 = require("sequelize");
 const waait_1 = __importDefault(require("waait"));
 const net_1 = require("@/net");
+const gnosis_1 = require("@/gnosis");
 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));
@@ -68,9 +69,22 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
         const safeContract = (0, utils_1.getContract)(safeAddress, abi_1.default.gnosisSafe, targetWallet);
         const ownersThreshold = await safeContract.getThreshold();
         await (0, waait_1.default)(10000);
+        let data, logs = [];
+        try {
+            ({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction));
+        }
+        catch (error) {
+            console.log(error);
+            transaction.targetStatus = 'failed';
+            transaction.targetErrors = [error.message];
+            transaction.status = 'failed';
+            await transaction.save();
+            net_1.protocol.sendTransaction(transaction);
+            return;
+        }
         let gnosisTx = await generateGnosisTransaction({
             baseGas: "0",
-            data: await (0, utils_1.buildDataForTransaction)(transaction),
+            data,
             gasPrice: "0",
             gasToken: "0x0000000000000000000000000000000000000000",
             nonce: '0',
@@ -127,6 +141,7 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
             console.log('ExecutionSuccess');
             transaction.targetStatus = 'success';
             transaction.targetTransactionHash = txSent.hash;
+            transaction.targetLogs = logs;
             transaction.status = 'success';
             await transaction.save();
         }
@@ -140,7 +155,6 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
         net_1.protocol.sendTransaction(transaction);
     }
     async start() {
-        this.logger.info(`Starting execution watcher on interop chain`);
         this.contractAddress = constants_1.addresses[this.chainId].interopXGateway;
         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.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));

package/dist/src/tasks/InteropXGateway/SyncDepositEvents.js

@@ -31,8 +31,8 @@ class SyncDepositEvents extends BaseTask_1.BaseTask {
                 const uniqueIdentifier = {
                     action: 'deposit',
                     submitTransactionHash: event.transactionHash,
-                    sourceChainId: sourceChainId.toNumber(),
-                    targetChainId: targetChainId.toNumber(),
+                    sourceChainId: sourceChainId,
+                    targetChainId: targetChainId,
                 };
                 if (await db_1.Transaction.findOne({ where: uniqueIdentifier })) {
                     continue;
@@ -65,7 +65,6 @@ class SyncDepositEvents extends BaseTask_1.BaseTask {
             this.logger.info(`${processedEvents} events processed`);
     }
     async start() {
-        this.logger.info(`Starting execution watcher on interop chain`);
         this.contractAddress = constants_1.addresses[this.chainId].interopXGateway;
         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.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));

package/dist/src/tasks/InteropXGateway/SyncWithdrawtEvents.js

@@ -0,0 +1,72 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const BaseTask_1 = require("../BaseTask");
+const logger_1 = __importDefault(require("@/logger"));
+const ethers_1 = require("ethers");
+const abi_1 = __importDefault(require("@/abi"));
+const db_1 = require("@/db");
+const utils_1 = require("@/utils");
+const constants_1 = require("@/constants");
+const config_1 = __importDefault(require("@/config"));
+class SyncWithdrawEvents extends BaseTask_1.BaseTask {
+    constructor({ chainId }) {
+        super({
+            logger: new logger_1.default("InteropXGateway::SyncWithdrawEvents"),
+        });
+        this.chainId = chainId;
+    }
+    async pollHandler() {
+        const currentBlock = await this.provider.getBlockNumber();
+        const events = await this.contract.queryFilter(this.contract.filters.LogGatewayWithdraw(), currentBlock - 500, currentBlock);
+        let processedEvents = 0;
+        for (const event of events) {
+            try {
+                if (!event.args) {
+                    continue;
+                }
+                const { user, token, amount, sourceChainId, targetChainId, transactionHash } = event.args;
+                const uniqueIdentifier = {
+                    action: 'withdraw',
+                    submitTransactionHash: transactionHash,
+                    sourceChainId: sourceChainId,
+                    targetChainId: targetChainId,
+                    targetEvent: null
+                };
+                const transaction = await db_1.Transaction.findOne({ where: uniqueIdentifier });
+                if (!transaction) {
+                    return;
+                }
+                const tx = await event.getTransaction();
+                transaction.targetStatus = 'success';
+                transaction.targetErrors = [];
+                transaction.targetTransactionHash = tx.hash;
+                transaction.targetEvent = {
+                    user,
+                    token,
+                    amount: amount.toString(),
+                    sourceChainId,
+                    targetChainId,
+                    transactionHash,
+                };
+                transaction.status = 'success';
+                await transaction.save();
+                this.logger.info(`Witdraw confirmation received: ${transaction.transactionHash} `);
+            }
+            catch (error) {
+                this.logger.error(error);
+            }
+        }
+        if (processedEvents > 0)
+            this.logger.info(`${processedEvents} events processed`);
+    }
+    async start() {
+        this.contractAddress = constants_1.addresses[this.chainId].interopXGateway;
+        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.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
+        await super.start();
+    }
+}
+exports.default = SyncWithdrawEvents;

package/dist/src/tasks/index.js

@@ -6,27 +6,38 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tasks = void 0;
 const ProcessDepositEvents_1 = __importDefault(require("./InteropXGateway/ProcessDepositEvents"));
 const SyncDepositEvents_1 = __importDefault(require("./InteropXGateway/SyncDepositEvents"));
-const SyncWithdrawEvents_1 = __importDefault(require("./InteropBridge/SyncWithdrawEvents"));
+const SyncWithdrawtEvents_1 = __importDefault(require("./InteropXGateway/SyncWithdrawtEvents"));
 const ProcessWithdrawEvents_1 = __importDefault(require("./InteropBridge/ProcessWithdrawEvents"));
-const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
+const SyncBurnEvents_1 = __importDefault(require("./InteropBridge/SyncBurnEvents"));
+const SyncMintEvents_1 = __importDefault(require("./InteropBridge/SyncMintEvents"));
 const SyncTransactionStatusTask_1 = __importDefault(require("./Transactions/SyncTransactionStatusTask"));
+const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
 class Tasks {
     constructor() {
         this.tasks = [
             new SyncTransactionStatusTask_1.default(),
             new AutoUpdateTask_1.default(),
+            // InteropXGateway
             new SyncDepositEvents_1.default({
                 chainId: 43114
             }),
             new ProcessDepositEvents_1.default({
                 chainId: 43114
             }),
-            new SyncWithdrawEvents_1.default({
-                chainId: 137,
-                itokenAddress: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
+            new SyncWithdrawtEvents_1.default({
+                chainId: 43114
             }),
+            // InteropBridge
             new ProcessWithdrawEvents_1.default({
                 chainId: 137,
+            }),
+            new SyncMintEvents_1.default({
+                chainId: 137,
+                itokenAddress: '0x62c0045f3277e7067cacad3c8038eeabb1bd92d1',
+            }),
+            new SyncBurnEvents_1.default({
+                chainId: 137,
+                itokenAddress: '0x62c0045f3277e7067cacad3c8038eeabb1bd92d1',
             })
         ];
     }

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

@@ -57,11 +57,17 @@ const _abi = [
                 name: "amount",
                 type: "uint256",
             },
+            {
+                indexed: false,
+                internalType: "uint32",
+                name: "sourceChainId",
+                type: "uint32",
+            },
             {
                 indexed: true,
-                internalType: "uint256",
-                name: "chainId",
-                type: "uint256",
+                internalType: "uint32",
+                name: "targetChainId",
+                type: "uint32",
             },
         ],
         name: "Burn",
@@ -84,14 +90,20 @@ const _abi = [
             },
             {
                 indexed: true,
-                internalType: "uint256",
-                name: "chainId",
-                type: "uint256",
+                internalType: "uint32",
+                name: "sourceChainId",
+                type: "uint32",
+            },
+            {
+                indexed: false,
+                internalType: "uint32",
+                name: "targetChainId",
+                type: "uint32",
             },
             {
                 indexed: true,
                 internalType: "bytes32",
-                name: "transactionHash",
+                name: "submitTransactionHash",
                 type: "bytes32",
             },
         ],
@@ -222,9 +234,9 @@ const _abi = [
                 type: "uint256",
             },
             {
-                internalType: "uint256",
+                internalType: "uint32",
                 name: "chainId",
-                type: "uint256",
+                type: "uint32",
             },
         ],
         name: "burn",
@@ -306,9 +318,9 @@ const _abi = [
                 type: "uint256",
             },
             {
-                internalType: "uint256",
+                internalType: "uint32",
                 name: "chainId",
-                type: "uint256",
+                type: "uint32",
             },
             {
                 internalType: "bytes32",

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

@@ -46,15 +46,15 @@ const _abi = [
             },
             {
                 indexed: false,
-                internalType: "uint256",
+                internalType: "uint32",
                 name: "sourceChainId",
-                type: "uint256",
+                type: "uint32",
             },
             {
                 indexed: true,
-                internalType: "uint256",
+                internalType: "uint32",
                 name: "targetChainId",
-                type: "uint256",
+                type: "uint32",
             },
         ],
         name: "LogGatewayDeposit",
@@ -83,15 +83,15 @@ const _abi = [
             },
             {
                 indexed: true,
-                internalType: "uint256",
+                internalType: "uint32",
                 name: "sourceChainId",
-                type: "uint256",
+                type: "uint32",
             },
             {
                 indexed: false,
-                internalType: "uint256",
+                internalType: "uint32",
                 name: "targetChainId",
-                type: "uint256",
+                type: "uint32",
             },
             {
                 indexed: true,
@@ -148,9 +148,9 @@ const _abi = [
                 type: "uint256",
             },
             {
-                internalType: "uint256",
+                internalType: "uint32",
                 name: "chainId_",
-                type: "uint256",
+                type: "uint32",
             },
         ],
         name: "deposit",
@@ -176,9 +176,9 @@ const _abi = [
                 type: "uint256",
             },
             {
-                internalType: "uint256",
+                internalType: "uint32",
                 name: "chainId_",
-                type: "uint256",
+                type: "uint32",
             },
         ],
         name: "depositFor",
@@ -224,9 +224,9 @@ const _abi = [
                 type: "address",
             },
             {
-                internalType: "uint256",
+                internalType: "uint32",
                 name: "chainId_",
-                type: "uint256",
+                type: "uint32",
             },
             {
                 internalType: "bytes32",