@instadapp/interop-x 0.0.0-dev.fd7fd6f → 0.0.0-dev.fded533

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.fd7fd6f",
+    "version": "0.0.0-dev.fded533",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {
@@ -24,9 +24,10 @@
     },
     "dependencies": {
         "@achingbrain/libp2p-gossipsub": "^0.12.2",
+        "@fastify/cors": "^7.0.0",
+        "await-spawn": "^4.0.2",
         "axios": "^0.27.1",
         "axios-retry": "^3.2.4",
-        "bignumber.js": "^9.0.2",
         "chalk": "4.1.2",
         "dotenv": "^16.0.0",
         "ethereumjs-util": "^7.1.4",
@@ -34,7 +35,7 @@
         "ethers-multisend": "^2.1.1",
         "expand-home-dir": "^0.0.3",
         "fastify": "^3.28.0",
-        "fastify-cors": "^6.0.3",
+        "fs-extra": "^10.1.0",
         "libp2p": "^0.36.2",
         "libp2p-bootstrap": "^0.14.0",
         "libp2p-kad-dht": "^0.28.6",

package/dist/src/abi/interopBridgeToken.json

@@ -46,11 +46,17 @@
                 "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",
@@ -73,14 +79,20 @@
             },
             {
                 "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"
             }
         ],
@@ -164,7 +176,7 @@
         "inputs": [
             { "internalType": "address", "name": "to", "type": "address" },
             { "internalType": "uint256", "name": "amount", "type": "uint256" },
-            { "internalType": "uint256", "name": "chainId", "type": "uint256" }
+            { "internalType": "uint32", "name": "chainId", "type": "uint32" }
         ],
         "name": "burn",
         "outputs": [],
@@ -206,7 +218,7 @@
         "inputs": [
             { "internalType": "address", "name": "to", "type": "address" },
             { "internalType": "uint256", "name": "amount", "type": "uint256" },
-            { "internalType": "uint256", "name": "chainId", "type": "uint256" },
+            { "internalType": "uint32", "name": "chainId", "type": "uint32" },
             {
                 "internalType": "bytes32",
                 "name": "transactionHash",

package/dist/src/abi/interopXGateway.json

@@ -35,15 +35,15 @@
             },
             {
                 "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",
@@ -72,15 +72,15 @@
             },
             {
                 "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,
@@ -122,7 +122,7 @@
         "inputs": [
             { "internalType": "address", "name": "token_", "type": "address" },
             { "internalType": "uint256", "name": "amount_", "type": "uint256" },
-            { "internalType": "uint256", "name": "chainId_", "type": "uint256" }
+            { "internalType": "uint32", "name": "chainId_", "type": "uint32" }
         ],
         "name": "deposit",
         "outputs": [],
@@ -134,7 +134,7 @@
             { "internalType": "address", "name": "to_", "type": "address" },
             { "internalType": "address", "name": "token_", "type": "address" },
             { "internalType": "uint256", "name": "amount_", "type": "uint256" },
-            { "internalType": "uint256", "name": "chainId_", "type": "uint256" }
+            { "internalType": "uint32", "name": "chainId_", "type": "uint32" }
         ],
         "name": "depositFor",
         "outputs": [],
@@ -160,7 +160,7 @@
             { "internalType": "uint256", "name": "amount_", "type": "uint256" },
             { "internalType": "address", "name": "user_", "type": "address" },
             { "internalType": "address", "name": "token_", "type": "address" },
-            { "internalType": "uint256", "name": "chainId_", "type": "uint256" },
+            { "internalType": "uint32", "name": "chainId_", "type": "uint32" },
             {
                 "internalType": "bytes32",
                 "name": "transactionHash_",

package/dist/src/api/index.js

@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startApiServer = void 0;
 const fastify_1 = __importDefault(require("fastify"));
-const fastify_cors_1 = __importDefault(require("fastify-cors"));
+const cors_1 = __importDefault(require("@fastify/cors"));
 const logger_1 = __importDefault(require("@/logger"));
 const db_1 = require("@/db");
 const logger = new logger_1.default("RPC");
 const server = (0, fastify_1.default)({ logger: false });
-server.register(fastify_cors_1.default, {});
+server.register(cors_1.default, {});
 server.get('/', async () => 'Interop X API');
 const startApiServer = async () => {
     const HOST = process.env.API_HOST || '0.0.0.0';
@@ -26,7 +26,7 @@ const startApiServer = async () => {
         logger.log(`RPC Server listening at http://${HOST}:${PORT}`);
     }
     catch (err) {
-        logger.error(err);
+        logger.error(err.message);
         process.exit(1);
     }
 };

package/dist/src/config/index.js

@@ -1,16 +1,22 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const types_1 = require("@/types");
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const expand_home_dir_1 = __importDefault(require("expand-home-dir"));
 class Config {
     constructor() {
         this.events = new types_1.EventBus();
-        this.maxPeers = 10;
+        this.maxPeers = 20;
         this.privateKey = process.env.PRIVATE_KEY;
         this.staging = !!process.env.STAGING && process.env.STAGING === 'true';
         this.autoUpdate = !!process.env.AUTO_UPDATE && process.env.AUTO_UPDATE === 'true';
         this.wallet = new ethers_1.Wallet(this.privateKey);
         this.leadNodeAddress = '0x910E413DBF3F6276Fe8213fF656726bDc142E08E';
+        this.baseConfigPath = (0, expand_home_dir_1.default)(`~/.interop-x`);
     }
     get publicAddress() {
         return this.wallet.address;
@@ -18,5 +24,8 @@ class Config {
     isLeadNode() {
         return ethers_1.ethers.utils.getAddress(this.leadNodeAddress) === ethers_1.ethers.utils.getAddress(this.wallet.address);
     }
+    isMaintenanceMode() {
+        return fs_extra_1.default.existsSync(this.baseConfigPath + '/maintenance');
+    }
 }
 exports.default = new Config();

package/dist/src/constants/addresses.js

@@ -15,6 +15,6 @@ exports.addresses = {
     43114: {
         gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
         multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-        interopXGateway: '0x8D27758751BA488690974B6Ccfcda771D462945f',
+        interopXGateway: '0xF0317C5Bc206F2291dd2f3eE9C4cDB5Bbb25418d',
     }
 };

package/dist/src/constants/itokens.js

@@ -5,7 +5,7 @@ exports.itokens = {
     1: [],
     137: [
         {
-            address: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
+            address: '0x62C0045f3277E7067cAcad3c8038eEaBB1Bd92D1',
             symbol: 'USDC',
         }
     ],

package/dist/src/index.js

@@ -4,6 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const module_alias_1 = __importDefault(require("module-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",
@@ -26,18 +28,39 @@ 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 = 'fded533';
 const printUsage = () => {
+    console.log();
+    console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
+    console.log();
     console.log('Usage:');
-    console.log('   PRIVATE_KEY=abcd1234 interop-x');
-    console.log('   PRIVATE_KEY=abcd1234 STAGING=true interop-x');
-    console.log('   PRIVATE_KEY=abcd1234 AUTO_UPDATE=true interop-x');
-    console.log('   PRIVATE_KEY=abcd1234 API_HOST=0.0.0.0 API_PORT=8080 interop-x');
+    console.log('   interop-x help                                                              Show this message');
+    console.log('   interop-x version                                                           Print out the installed version of Interop X');
+    console.log();
+    console.log('   interop-x down                                                              Put the node into maintenance mode');
+    console.log('   interop-x up                                                                Take the node out of maintenance mode');
+    console.log();
+    console.log('   PRIVATE_KEY=abcd1234 interop-x                                              Start the node with the given private key');
+    console.log('   PRIVATE_KEY=abcd1234 STAGING=true interop-x                                 Start the node in staging mode');
+    console.log('   PRIVATE_KEY=abcd1234 AUTO_UPDATE=true interop-x                             Start the node in auto update mode');
+    console.log('   PRIVATE_KEY=abcd1234 API_HOST=0.0.0.0 API_PORT=8080 interop-x               Start the node with custom API host and port');
+    console.log();
 };
 if (process.argv.at(-1) === 'help') {
     printUsage();
     process.exit(0);
 }
-const GIT_SHORT_HASH = 'fd7fd6f';
+const basePath = (0, expand_home_dir_1.default)(`~/.interop-x`);
+if (process.argv.at(-1) === 'down') {
+    fs_extra_1.default.outputFileSync(basePath + '/maintenance', Date.now().toString());
+    console.log(chalk_1.default.red('Maintenance mode enabled'));
+    process.exit(0);
+}
+if (process.argv.at(-1) === 'up') {
+    fs_extra_1.default.removeSync(basePath + '/maintenance');
+    console.log(chalk_1.default.green('Maintenance mode disabled'));
+    process.exit(0);
+}
 if (process.argv.at(-1) === 'version') {
     console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
     process.exit(0);
@@ -60,6 +83,7 @@ const tasks_1 = require("@/tasks");
 const net_1 = require("@/net");
 const api_1 = require("@/api");
 const db_1 = require("./db");
+const utils_1 = require("./utils");
 async function main() {
     (0, net_1.startPeer)({});
     const tasks = new tasks_1.Tasks();
@@ -68,7 +92,10 @@ async function main() {
     net_1.protocol.on('TransactionStatus', async (payload) => {
         if (!net_1.peerPool.isLeadNode(payload.peerId)) {
             const peer = net_1.peerPool.getPeer(payload.peerId);
-            logger.info(`ignored transaction status from ${payload.peerId} ${peer === null || peer === void 0 ? void 0 : peer.publicAddress} `);
+            if (!peer) {
+                return;
+            }
+            logger.info(`ignored transaction status from ${payload.peerId} ${(0, utils_1.shortenHash)(peer.publicAddress)} `);
             return;
         }
         const transaction = await db_1.Transaction.findOne({ where: { transactionHash: payload.data.transactionHash } });

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

@@ -23,6 +23,7 @@ const libp2p_kad_dht_1 = __importDefault(require("libp2p-kad-dht"));
 const libp2p_pubsub_peer_discovery_1 = __importDefault(require("libp2p-pubsub-peer-discovery"));
 const net_1 = require("@/net");
 const config_1 = __importDefault(require("@/config"));
+const chalk_1 = __importDefault(require("chalk"));
 const logger = new logger_1.default("Peer");
 let node;
 // Known peers addresses
@@ -77,7 +78,7 @@ const startPeer = async ({}) => {
             persistence: true,
         },
     });
-    logger.info("Peer ID:", node.peerId.toB58String());
+    logger.info("Peer ID:", chalk_1.default.bold(node.peerId.toB58String()));
     await node.start();
     net_1.protocol.start({
         libp2p: node

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

@@ -8,6 +8,8 @@ const types_1 = require("@/types");
 const config_1 = __importDefault(require("@/config"));
 const logger_1 = __importDefault(require("@/logger"));
 const utils_1 = require("ethers/lib/utils");
+const utils_2 = require("@/utils");
+const chalk_1 = __importDefault(require("chalk"));
 const logger = new logger_1.default('PeerPool');
 class PeerPool {
     constructor() {
@@ -71,7 +73,7 @@ class PeerPool {
             peer.pooled = true;
             if (newPeer) {
                 config_1.default.events.emit(types_1.Event.POOL_PEER_ADDED, peer);
-                logger.info(`Peer ${peer.id} with address ${peer.publicAddress} added to pool`);
+                logger.info(`Peer ${chalk_1.default.bold((0, utils_2.shortenHash)(peer.id, 16))} with address ${chalk_1.default.bold((0, utils_2.shortenHash)(peer.publicAddress))} added to pool`);
             }
         }
     }
@@ -85,7 +87,7 @@ class PeerPool {
             if (this.pool.delete(peer.id)) {
                 peer.pooled = false;
                 config_1.default.events.emit(types_1.Event.POOL_PEER_REMOVED, peer);
-                logger.info(`Peer ${peer.id} with address ${peer.publicAddress} removed from pool`);
+                logger.info(`Peer ${chalk_1.default.bold((0, utils_2.shortenHash)(peer.id, 16))} with address ${chalk_1.default.bold((0, utils_2.shortenHash)(peer.publicAddress))} removed from pool`);
             }
         }
     }
@@ -111,6 +113,9 @@ class PeerPool {
         }
         return (0, utils_1.getAddress)(peer.publicAddress) === (0, utils_1.getAddress)(config_1.default.leadNodeAddress);
     }
+    getLeadPeer() {
+        return this.peers.find((p) => this.isLeadNode(p.id));
+    }
     cleanup() {
         // let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
         // this.peers.forEach((peerInfo) => {

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

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransactionStatusDialProtocol = void 0;
+const BaseDialProtocol_1 = require("./BaseDialProtocol");
+const db_1 = require("@/db");
+class TransactionStatusDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
+    constructor(libp2p) {
+        super(libp2p, '/interop-x/transaction-status');
+        this.timeout = 30000;
+    }
+    async response(transactionHash) {
+        const transaction = await db_1.Transaction.findOne({ where: { transactionHash } });
+        if (!transaction) {
+            return null;
+        }
+        return {
+            transactionHash: transaction.transactionHash,
+            sourceStatus: transaction.sourceStatus,
+            sourceTransactionHash: transaction.sourceTransactionHash,
+            sourceErrors: transaction.sourceErrors,
+            targetStatus: transaction.targetStatus,
+            targetTransactionHash: transaction.targetTransactionHash,
+            targetErrors: transaction.targetErrors,
+            status: transaction.status,
+        };
+    }
+}
+exports.TransactionStatusDialProtocol = TransactionStatusDialProtocol;

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

@@ -10,6 +10,7 @@ const SignatureDialProtocol_1 = require("./dial/SignatureDialProtocol");
 const __1 = require("..");
 const config_1 = __importDefault(require("@/config"));
 const types_1 = require("@/types");
+const TransactionStatusDialProtocol_1 = require("./dial/TransactionStatusDialProtocol");
 class Protocol extends stream_1.EventEmitter {
     constructor() {
         super(...arguments);
@@ -30,20 +31,20 @@ 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)) : [],
                     Buffer.from(transaction.targetStatus),
-                    Buffer.from(transaction.targetTransactionHash),
+                    Buffer.from(transaction.targetTransactionHash || ''),
                     transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
                     Buffer.from(transaction.status),
                 ],
                 decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]) => ({
                     transactionHash: transactionHash.toString(),
                     sourceStatus: sourceStatus.toString(),
-                    sourceTransactionHash: sourceTransactionHash.toString(),
+                    sourceTransactionHash: sourceTransactionHash.toString() || null,
                     sourceErrors: sourceErrors.map((e) => e.toString()),
                     targetStatus: targetStatus.toString(),
-                    targetTransactionHash: targetTransactionHash.toString(),
+                    targetTransactionHash: targetTransactionHash.toString() || null,
                     targetErrors: targetErrors.map((e) => e.toString()),
                     status: status.toString(),
                 }),
@@ -64,6 +65,7 @@ class Protocol extends stream_1.EventEmitter {
             });
         });
         this.signature = new SignatureDialProtocol_1.SignatureDialProtocol(this.libp2p);
+        this.transactionStatus = new TransactionStatusDialProtocol_1.TransactionStatusDialProtocol(this.libp2p);
     }
     init() {
         this.libp2p.pubsub.subscribe(this.topic);
@@ -117,5 +119,14 @@ class Protocol extends stream_1.EventEmitter {
             return [];
         }
     }
+    async requestTransactionStatus(transactionHash, peerId) {
+        try {
+            return await this.transactionStatus.send(transactionHash, peerId);
+        }
+        catch (error) {
+            console.log(error);
+            return null;
+        }
+    }
 }
 exports.protocol = new Protocol();

package/dist/src/tasks/AutoUpdateTask.js

@@ -5,40 +5,66 @@ 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 package_json_1 = __importDefault(require("../../package.json"));
-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 * 1000;
+        this.pollIntervalMs = 60 * 10 * 1000;
     }
     prePollHandler() {
         return config_1.default.autoUpdate && !config_1.default.isLeadNode();
     }
+    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 version = await this.getLatestVersion();
         if (version === currentVersion) {
             return;
         }
         this.logger.warn(`New version ${version} available.`);
-        const update = (0, child_process_1.spawn)('npm', ['-g', 'install', '@instadapp/interop-x']);
-        update.on("close", () => {
-            this.logger.warn(`Installed version ${version}`);
-            this.logger.warn(`Restarting...`);
-            (0, child_process_1.spawn)(process.argv[0], process.argv.slice(1), {
-                cwd: process.cwd(),
-                env: Object.create(process.env),
-                detached: true,
-                stdio: "inherit"
-            });
-            process.exit();
+        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 (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...`);
+        // 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",
+            // shell: process.env.SHELL, 
         });
+        subprocess.unref();
+        process.exit();
     }
 }
 exports.default = AutoUpdateTask;

package/dist/src/tasks/BaseTask.js

@@ -14,6 +14,7 @@ class BaseTask extends events_1.default {
         this.started = false;
         this.pollIntervalMs = 10 * 1000;
         this.leadNodeOnly = false;
+        this.exceptLeadNode = false;
         this.logger = logger !== null && logger !== void 0 ? logger : new logger_1.default('BaseTask');
     }
     async pollCheck() {
@@ -34,10 +35,17 @@ class BaseTask extends events_1.default {
         }
     }
     prePollHandler() {
-        if (!this.leadNodeOnly) {
-            return true;
+        if (config_1.default.isMaintenanceMode()) {
+            this.logger.warn('Maintenance mode is enabled. Skipping task.');
+            return false;
         }
-        return config_1.default.isLeadNode();
+        if (this.exceptLeadNode) {
+            return !config_1.default.isLeadNode();
+        }
+        if (this.leadNodeOnly) {
+            return config_1.default.isLeadNode();
+        }
+        return true;
     }
     async pollHandler() {
         this.logger.warn('pollHandler not implemented');

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

@@ -139,7 +139,6 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
         }
     }
     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;