@instadapp/interop-x 0.0.0-dev.dc4f10a → 0.0.0-dev.e69b5e8

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.dc4f10a",
+    "version": "0.0.0-dev.e69b5e8",
     "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,6 @@
         "ethers-multisend": "^2.1.1",
         "expand-home-dir": "^0.0.3",
         "fastify": "^3.28.0",
-        "fastify-cors": "^6.0.3",
         "libp2p": "^0.36.2",
         "libp2p-bootstrap": "^0.14.0",
         "libp2p-kad-dht": "^0.28.6",
@@ -46,6 +46,8 @@
         "libp2p-websockets": "^0.16.2",
         "luxon": "^2.3.2",
         "module-alias": "^2.2.2",
+        "patch-package": "^6.4.7",
+        "postinstall-postinstall": "^2.1.0",
         "sequelize": "6.18.0",
         "sqlite3": "^5.0.5",
         "waait": "^1.0.5"
@@ -60,8 +62,6 @@
         "@types/fs-extra": "^9.0.13",
         "@types/node": "^17.0.17",
         "nodemon": "^2.0.15",
-        "patch-package": "^6.4.7",
-        "postinstall-postinstall": "^2.1.0",
         "replace-in-file": "^6.3.2",
         "rimraf": "^3.0.2",
         "ts-node": "^10.5.0",

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

@@ -8,6 +8,7 @@ class Config {
         this.maxPeers = 10;
         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';
     }

package/dist/src/index.js

@@ -19,36 +19,75 @@ module_alias_1.default.addAliases({
     "@/typechain": __dirname + "/typechain"
 });
 (0, module_alias_1.default)();
-const assert_1 = __importDefault(require("assert"));
 const dotenv_1 = __importDefault(require("dotenv"));
+const chalk_1 = __importDefault(require("chalk"));
 const ethers_1 = require("ethers");
 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');
-if (process.argv.at(-1) === 'help') {
+const printUsage = () => {
     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');
+};
+if (process.argv.at(-1) === 'help') {
+    printUsage();
     process.exit(0);
 }
-(0, assert_1.default)(process.env.PRIVATE_KEY, "PRIVATE_KEY is not defined");
+const GIT_SHORT_HASH = 'e69b5e8';
+if (process.argv.at(-1) === 'version') {
+    console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
+    process.exit(0);
+}
+if (!process.env.PRIVATE_KEY) {
+    console.error(chalk_1.default.bgRed.white.bold('Please provide a private key\n'));
+    printUsage();
+    process.exit(1);
+}
 try {
     new ethers_1.ethers.Wallet(process.env.PRIVATE_KEY);
 }
 catch (e) {
-    logger.error('Invalid private key');
+    console.error(chalk_1.default.bgRed.white('Invalid private key\n'));
+    printUsage();
     process.exit(1);
 }
-logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.dc4f10a)`);
+logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
 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();
     tasks.start();
     (0, api_1.startApiServer)();
+    net_1.protocol.on('TransactionStatus', async (payload) => {
+        if (!net_1.peerPool.isLeadNode(payload.peerId)) {
+            const peer = net_1.peerPool.getPeer(payload.peerId);
+            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 } });
+        if (!transaction) {
+            return;
+        }
+        transaction.sourceStatus = payload.data.sourceStatus;
+        transaction.sourceTransactionHash = payload.data.sourceTransactionHash;
+        transaction.sourceErrors = payload.data.sourceErrors;
+        transaction.targetStatus = payload.data.targetStatus;
+        transaction.targetTransactionHash = payload.data.targetTransactionHash;
+        transaction.targetErrors = payload.data.targetErrors;
+        transaction.status = payload.data.status;
+        await transaction.save();
+    });
 }
 main()
     .then(() => {

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

@@ -7,6 +7,9 @@ exports.peerPool = exports.PeerPool = void 0;
 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() {
@@ -70,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`);
             }
         }
     }
@@ -84,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`);
             }
         }
     }
@@ -100,6 +103,19 @@ class PeerPool {
     get activePeerIds() {
         return this.activePeers.map((p) => p.id);
     }
+    getPeer(id) {
+        return this.pool.get(id);
+    }
+    isLeadNode(id) {
+        const peer = this.pool.get(id);
+        if (!peer) {
+            return false;
+        }
+        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/SignatureDialProtocol.1.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,13 +10,14 @@ const SignatureDialProtocol_1 = require("./dial/SignatureDialProtocol");
 const __1 = require("..");
 const config_1 = __importDefault(require("@/config"));
 const types_1 = require("@/types");
+const SignatureDialProtocol_1_1 = require("./dial/SignatureDialProtocol.1");
 class Protocol extends stream_1.EventEmitter {
     constructor() {
         super(...arguments);
         this.protocolMessages = [
             {
                 name: 'PeerInfo',
-                code: 0x09,
+                code: 0x01,
                 encode: (info) => [
                     Buffer.from(info.publicAddress),
                 ],
@@ -24,6 +25,30 @@ class Protocol extends stream_1.EventEmitter {
                     publicAddress: publicAddress.toString(),
                 }),
             },
+            {
+                name: 'TransactionStatus',
+                code: 0x02,
+                encode: (transaction) => [
+                    Buffer.from(transaction.transactionHash),
+                    Buffer.from(transaction.sourceStatus),
+                    Buffer.from(transaction.sourceTransactionHash),
+                    transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
+                    Buffer.from(transaction.targetStatus),
+                    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(),
+                    sourceErrors: sourceErrors.map((e) => e.toString()),
+                    targetStatus: targetStatus.toString(),
+                    targetTransactionHash: targetTransactionHash.toString(),
+                    targetErrors: targetErrors.map((e) => e.toString()),
+                    status: status.toString(),
+                }),
+            },
         ];
     }
     start({ libp2p, topic = null, }) {
@@ -40,6 +65,7 @@ class Protocol extends stream_1.EventEmitter {
             });
         });
         this.signature = new SignatureDialProtocol_1.SignatureDialProtocol(this.libp2p);
+        this.transactionStatus = new SignatureDialProtocol_1_1.TransactionStatusDialProtocol(this.libp2p);
     }
     init() {
         this.libp2p.pubsub.subscribe(this.topic);
@@ -75,6 +101,11 @@ class Protocol extends stream_1.EventEmitter {
         const encoded = ethereumjs_util_1.rlp.encode([message.code, message.encode(data)]);
         this.libp2p.pubsub.publish(this.topic, encoded);
     }
+    sendTransaction(transaction) {
+        const message = this.protocolMessages.find((m) => m.name === 'TransactionStatus');
+        const encoded = ethereumjs_util_1.rlp.encode([message.code, message.encode(transaction)]);
+        this.libp2p.pubsub.publish(this.topic, encoded);
+    }
     async requestSignatures(data, peerIds) {
         try {
             peerIds = peerIds || __1.peerPool.activePeerIds;
@@ -88,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

@@ -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 await_spawn_1 = __importDefault(require("await-spawn"));
+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;
+class AutoUpdateTask extends BaseTask_1.BaseTask {
+    constructor() {
+        super({
+            logger: new logger_1.default("AutoUpdateTask"),
+        });
+        this.pollIntervalMs = 60 * 5 * 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, 'version']);
+            return stdout.toString().trim();
+        }
+        catch (error) {
+            this.logger.error(error);
+            return currentVersion;
+        }
+    }
+    async pollHandler() {
+        const version = await this.getLatestVersion();
+        if (version === currentVersion) {
+            return;
+        }
+        this.logger.warn(`New version ${version} available.`);
+        this.logger.info('Updating...');
+        const spawner = (0, await_spawn_1.default)('npm', ['-g', 'install', '@instadapp/interop-x@latest', '-f']);
+        spawner.child.on('data', console.log);
+        await spawner;
+        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...`);
+        (0, await_spawn_1.default)(process.argv[0], process.argv.slice(1), {
+            cwd: process.cwd(),
+            stdio: "inherit"
+        });
+        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,13 @@ class BaseTask extends events_1.default {
         }
     }
     prePollHandler() {
-        if (!this.leadNodeOnly) {
-            return true;
+        if (this.exceptLeadNode) {
+            return !config_1.default.isLeadNode();
         }
-        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

@@ -126,21 +126,20 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
         if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
             console.log('ExecutionSuccess');
             transaction.targetStatus = 'success';
+            transaction.targetTransactionHash = txSent.hash;
             transaction.status = 'success';
             await transaction.save();
         }
         else {
             console.log('ExecutionFailure');
             transaction.targetStatus = 'failed';
+            transaction.targetTransactionHash = txSent.hash;
             transaction.status = 'failed';
             await transaction.save();
         }
     }
     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));
         await super.start();
     }
 }

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

@@ -61,7 +61,6 @@ 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();

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

@@ -126,18 +126,20 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
         if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
             console.log('ExecutionSuccess');
             transaction.targetStatus = 'success';
+            transaction.targetTransactionHash = txSent.hash;
             transaction.status = 'success';
             await transaction.save();
         }
         else {
             console.log('ExecutionFailure');
             transaction.targetStatus = 'failed';
+            transaction.targetTransactionHash = txSent.hash;
             transaction.status = 'failed';
             await transaction.save();
         }
+        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

@@ -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/Transactions/SyncTransactionStatusTask.js

@@ -0,0 +1,53 @@
+"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 net_1 = require("@/net");
+const db_1 = require("@/db");
+const sequelize_1 = require("sequelize");
+class SyncTransactionStatusTask extends BaseTask_1.BaseTask {
+    constructor() {
+        super({
+            logger: new logger_1.default("SyncTransactionStatusTask"),
+        });
+        this.pollIntervalMs = 60 * 1000;
+        this.exceptLeadNode = true;
+    }
+    async pollHandler() {
+        // if transaction is pending for more than 1 hour, check lead node for status
+        const leadNode = net_1.peerPool.getLeadPeer();
+        if (!leadNode) {
+            return;
+        }
+        const transaction = await db_1.Transaction.findOne({
+            where: {
+                status: 'pending',
+                sourceCreatedAt: {
+                    [sequelize_1.Op.gte]: new Date(Date.now() - 60 * 60 * 1000),
+                },
+            }
+        });
+        if (!transaction) {
+            return;
+        }
+        this.logger.info(`Requesting transaction status for ${transaction.transactionHash}`);
+        const transactionStatus = await net_1.protocol.requestTransactionStatus(transaction.transactionHash, leadNode.id);
+        if (!transactionStatus) {
+            return;
+        }
+        this.logger.info(`Received transaction status for ${transaction.transactionHash}`);
+        transaction.sourceStatus = transactionStatus.sourceStatus;
+        transaction.sourceTransactionHash = transactionStatus.sourceTransactionHash;
+        transaction.sourceErrors = transactionStatus.sourceErrors;
+        transaction.targetStatus = transactionStatus.targetStatus;
+        transaction.targetTransactionHash = transactionStatus.targetTransactionHash;
+        transaction.targetErrors = transactionStatus.targetErrors;
+        transaction.status = transactionStatus.status;
+        await transaction.save();
+        this.logger.info(`Updated transaction status for ${transaction.transactionHash}`);
+    }
+}
+exports.default = SyncTransactionStatusTask;

package/dist/src/tasks/index.js

@@ -8,9 +8,13 @@ const ProcessDepositEvents_1 = __importDefault(require("./InteropXGateway/Proces
 const SyncDepositEvents_1 = __importDefault(require("./InteropXGateway/SyncDepositEvents"));
 const SyncWithdrawEvents_1 = __importDefault(require("./InteropBridge/SyncWithdrawEvents"));
 const ProcessWithdrawEvents_1 = __importDefault(require("./InteropBridge/ProcessWithdrawEvents"));
+const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
+const SyncTransactionStatusTask_1 = __importDefault(require("./Transactions/SyncTransactionStatusTask"));
 class Tasks {
     constructor() {
         this.tasks = [
+            new SyncTransactionStatusTask_1.default(),
+            new AutoUpdateTask_1.default(),
             new SyncDepositEvents_1.default({
                 chainId: 43114
             }),

package/dist/src/utils/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 });
-exports.getContract = exports.buildWithdrawDataForTransaction = exports.buildDepositDataForTransaction = exports.buildDataForTransaction = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.http = void 0;
+exports.getContract = exports.buildWithdrawDataForTransaction = exports.buildDepositDataForTransaction = exports.buildDataForTransaction = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.shortenHash = exports.http = void 0;
 /**
  * @module util
  */
@@ -16,6 +16,16 @@ const config_1 = __importDefault(require("@/config"));
 const abi_1 = __importDefault(require("@/abi"));
 exports.http = axios_1.default.create();
 (0, axios_retry_1.default)(exports.http, { retries: 3, retryDelay: axios_retry_1.default.exponentialDelay });
+function shortenHash(hash, length = 4) {
+    if (!hash)
+        return;
+    if (hash.length < 12)
+        return hash;
+    const beginningChars = hash.startsWith("0x") ? length + 2 : length;
+    const shortened = hash.substr(0, beginningChars) + "…" + hash.substr(-length);
+    return shortened;
+}
+exports.shortenHash = shortenHash;
 function short(buffer) {
     return buffer.toString('hex').slice(0, 8) + '...';
 }
@@ -59,11 +69,11 @@ exports.signGnosisSafeTx = signGnosisSafeTx;
 const getRpcProviderUrl = (chainId) => {
     switch (chainId) {
         case 1:
-            return 'https://rpc.instadapp.io/mainnet';
+            return 'https://rpc.ankr.com/eth';
         case 137:
-            return 'https://rpc.instadapp.io/polygon';
+            return 'https://rpc.ankr.com/polygon';
         case 43114:
-            return 'https://rpc.instadapp.io/avalanche';
+            return 'https://rpc.ankr.com/avalanche';
         default:
             throw new Error(`Unknown chainId: ${chainId}`);
     }
@@ -157,7 +167,7 @@ const buildWithdrawDataForTransaction = async (transaction, type) => {
     if (!transaction.submitEvent) {
         throw Error('Cannot build data for transaction without submitEvent');
     }
-    const { to, amount, chainId, itokenAddress } = transaction.submitEvent;
+    const { to, amount, chainId, itoken: itokenAddress } = transaction.submitEvent;
     const itoken = constants_1.itokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
     if (!itoken) {
         throw Error('Cannot build data for transaction without itoken');
@@ -170,7 +180,7 @@ const buildWithdrawDataForTransaction = async (transaction, type) => {
     const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
     const gatewayAddress = constants_1.addresses[chainId].interopXGateway;
     const interopBridgeContract = getContract(gatewayAddress, abi_1.default.interopXGateway, targetWallet);
-    const { data } = await interopBridgeContract.populateTransaction.systemWithdraw(ethers_1.ethers.BigNumber.from(amount.toString()), to, token.address, ethers_1.ethers.BigNumber.from(transaction.submitEvent.sourceChainId.toString()), transaction.submitTransactionHash);
+    const { data } = await interopBridgeContract.populateTransaction.systemWithdraw(ethers_1.ethers.BigNumber.from(amount.toString()), to, token.address, ethers_1.ethers.BigNumber.from(transaction.sourceChainId.toString()), transaction.submitTransactionHash);
     transactions.push({
         to: gatewayAddress,
         data: data,
@@ -185,6 +195,11 @@ function getContract(address, contractInterface, signerOrProvider) {
         throw Error(`Invalid 'address' parameter '${address}'.`);
     }
     const contract = new ethers_1.ethers.Contract(address, contractInterface, signerOrProvider);
+    // Make sure the contract properties is writable
+    const desc = Object.getOwnPropertyDescriptor(contract, 'functions');
+    if (!desc || desc.writable !== true) {
+        return contract;
+    }
     return new Proxy(contract, {
         get(target, prop, receiver) {
             const value = Reflect.get(target, prop, receiver);