@instadapp/interop-x 0.0.0-dev.868731f → 0.0.0-dev.8965b57

package/dist/src/tasks/AutoUpdateTask.js

@@ -0,0 +1,70 @@
+"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 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 * 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 version = await this.getLatestVersion();
+        if (version === currentVersion) {
+            return;
+        }
+        this.logger.warn(`New version ${version} available.`);
+        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/InteropXContract/ProcessBridgeRequestEvents.js

@@ -0,0 +1,152 @@
+"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 sequelize_1 = require("sequelize");
+const config_1 = __importDefault(require("@/config"));
+const waait_1 = __importDefault(require("waait"));
+const gnosis_1 = require("@/gnosis");
+const net_1 = require("@/net");
+class ProccessBridgeRequestEvents extends BaseTask_1.BaseTask {
+    constructor({ chainId }) {
+        super({
+            logger: new logger_1.default("InteropXContract::ProccessBridgeRequestEvents"),
+        });
+        this.leadNodeOnly = true;
+        this.chainId = chainId;
+    }
+    async pollHandler() {
+        var _a;
+        const blockNumber = await this.provider.getBlockNumber();
+        const transaction = await db_1.Transaction.findOne({
+            where: {
+                status: 'pending',
+                sourceStatus: 'uninitialised',
+                createdAt: {
+                    [sequelize_1.Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
+                },
+                sourceDelayUntil: {
+                    [sequelize_1.Op.or]: {
+                        [sequelize_1.Op.is]: null,
+                        [sequelize_1.Op.lt]: new Date(),
+                    }
+                },
+                requestBlockNumber: {
+                    [sequelize_1.Op.lt]: blockNumber - 12,
+                },
+                sourceChainId: this.chainId,
+            }
+        });
+        if (!transaction) {
+            return;
+        }
+        console.log(`Processing transaction ${transaction.transactionHash}`);
+        transaction.targetStatus = 'pending';
+        await transaction.save();
+        const ownersThreshold = await this.safeContract.getThreshold();
+        await (0, waait_1.default)(10000);
+        let data, logs = [];
+        try {
+            ({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction, 'source'));
+        }
+        catch (error) {
+            console.log(error);
+            transaction.sourceStatus = 'failed';
+            transaction.sourceErrors = [error.message];
+            transaction.targetStatus = 'failed';
+            transaction.status = 'failed';
+            await transaction.save();
+            net_1.protocol.sendTransaction(transaction);
+            return;
+        }
+        let gnosisTx = await (0, utils_1.generateGnosisTransaction)({
+            baseGas: "0",
+            data,
+            gasPrice: "0",
+            gasToken: "0x0000000000000000000000000000000000000000",
+            nonce: '0',
+            operation: "1",
+            refundReceiver: "0x0000000000000000000000000000000000000000",
+            safeAddress: this.safeContractAddress,
+            safeTxGas: "79668",
+            to: constants_1.addresses[transaction.sourceChainId].multisend,
+            value: "0",
+        }, this.safeContract);
+        const owners = await this.safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
+        const ownerPeerIds = net_1.peerPool.activePeers.filter(peer => owners.includes(peer.publicAddress.toLowerCase())).map(peer => peer.id);
+        console.log(`Collecting signatures for execution ${transaction.transactionHash}`);
+        console.log(ownerPeerIds);
+        const signatures = await net_1.protocol.requestSignatures({
+            type: 'source',
+            transactionHash: transaction.transactionHash,
+            safeTxGas: gnosisTx.safeTxGas,
+            safeNonce: gnosisTx.nonce
+        }, ownerPeerIds);
+        const validSignatures = signatures.filter(s => !!s.data && s.data !== '0x');
+        console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
+        if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
+            await transaction.save();
+            transaction.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
+            transaction.sourceStatus = 'uninitialised';
+            await transaction.save();
+            const errorMessage = (_a = signatures.find(s => !!s.error)) === null || _a === void 0 ? void 0 : _a.error;
+            throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ''));
+        }
+        console.log(`Executing transaction for execution ${transaction.transactionHash}`);
+        const { data: txData } = await this.safeContract.populateTransaction.execTransaction(gnosisTx.to, gnosisTx.value, gnosisTx.data, gnosisTx.operation, gnosisTx.safeTxGas, gnosisTx.baseGas, gnosisTx.gasPrice, gnosisTx.gasToken, gnosisTx.refundReceiver, (0, utils_1.buildSignatureBytes)(validSignatures));
+        const txSent = await this.sourceWallet.sendTransaction({
+            from: this.sourceWallet.address,
+            gasPrice: ethers_1.ethers.BigNumber.from(120 * 10 ** 9),
+            to: this.safeContractAddress,
+            data: txData,
+        });
+        console.log(txSent);
+        const receipt = await txSent.wait();
+        const parsedLogs = [];
+        receipt.logs.forEach((log) => {
+            try {
+                parsedLogs.push(this.safeContract.interface.parseLog(log));
+            }
+            catch (e) { }
+        });
+        if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
+            console.log('ExecutionSuccess');
+            transaction.sourceStatus = 'success';
+            if (txSent.blockNumber)
+                transaction.sourceBlockNumber = txSent.blockNumber;
+            transaction.sourceTransactionHash = txSent.hash;
+            transaction.sourceLogs = logs;
+            transaction.status = 'success';
+            await transaction.save();
+        }
+        else {
+            console.log('ExecutionFailure');
+            transaction.sourceStatus = 'failed';
+            if (txSent.blockNumber)
+                transaction.sourceBlockNumber = txSent.blockNumber;
+            transaction.sourceTransactionHash = txSent.hash;
+            transaction.sourceTransactionHash = txSent.hash;
+            transaction.status = 'failed';
+            await transaction.save();
+        }
+        net_1.protocol.sendTransaction(transaction);
+    }
+    async start() {
+        this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
+        this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
+        this.sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider);
+        this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXContract, this.sourceWallet);
+        this.safeContractAddress = constants_1.addresses[this.chainId].gnosisSafe;
+        this.safeContract = (0, utils_1.getContract)(this.safeContractAddress, abi_1.default.gnosisSafe, this.sourceWallet);
+        await super.start();
+    }
+}
+exports.default = ProccessBridgeRequestEvents;

package/dist/src/tasks/InteropXContract/SyncBridgeRequestEvents.js

@@ -0,0 +1,77 @@
+"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 SyncBridgeRequestEvents extends BaseTask_1.BaseTask {
+    constructor({ chainId }) {
+        super({
+            logger: new logger_1.default("InteropXContract::SyncBridgeRequestEvents"),
+        });
+        this.chainId = chainId;
+    }
+    async pollHandler() {
+        const currentBlock = await this.provider.getBlockNumber();
+        const events = await this.contract.queryFilter(this.contract.filters.LogBridgeRequest(), currentBlock - 2000, currentBlock);
+        let processedEvents = 0;
+        for (const event of events) {
+            try {
+                if (!event.args) {
+                    continue;
+                }
+                const { bridger, position, sourceChainId, targetChainId, metadata } = event.args;
+                const uniqueIdentifier = {
+                    action: 'withdraw',
+                    bridger,
+                    requestTransactionHash: event.transactionHash,
+                    sourceChainId: sourceChainId.toNumber(),
+                    targetChainId: targetChainId.toNumber(),
+                };
+                let transactionHash = (0, utils_1.generateInteropTransactionHash)(uniqueIdentifier);
+                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,
+                        position: {
+                            withdraw: position.withdraw.map((v) => ({
+                                sourceToken: v.sourceToken,
+                                targetToken: v.targetToken,
+                                amount: v.amount.toString()
+                            })),
+                            supply: position.supply.map((v) => ({
+                                sourceToken: v.sourceToken,
+                                targetToken: v.targetToken,
+                                amount: v.amount.toString()
+                            })),
+                        },
+                        sourceChainId: sourceChainId.toNumber(),
+                        targetChainId: targetChainId.toNumber(),
+                        metadata,
+                    } }));
+                this.logger.info(`New bridge request received: ${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].interopXContract;
+        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));
+        await super.start();
+    }
+}
+exports.default = SyncBridgeRequestEvents;

package/dist/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.js

@@ -0,0 +1,89 @@
+"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"));
+const sequelize_1 = require("sequelize");
+class SyncBridgeRequestSentEvents extends BaseTask_1.BaseTask {
+    constructor({ chainId }) {
+        super({
+            logger: new logger_1.default("InteropXContract::SyncBridgeRequestSentEvents"),
+        });
+        this.chainId = chainId;
+    }
+    async pollHandler() {
+        const currentBlock = await this.provider.getBlockNumber();
+        const events = await this.contract.queryFilter(this.contract.filters.LogBridgeRequestSent(), currentBlock - 2000, currentBlock);
+        let processedEvents = 0;
+        for (const event of events) {
+            try {
+                if (!event.args) {
+                    continue;
+                }
+                const { bridger, position, sourceChainId, targetChainId, requestTransactionHash, metadata } = event.args;
+                const uniqueIdentifier = {
+                    action: 'withdraw',
+                    bridger,
+                    requestTransactionHash,
+                    sourceChainId: sourceChainId,
+                    targetChainId: targetChainId,
+                };
+                let transactionHash = (0, utils_1.generateInteropTransactionHash)(uniqueIdentifier);
+                const transaction = await db_1.Transaction.findOne({
+                    where: {
+                        transactionHash, sourceStatus: {
+                            [sequelize_1.Op.ne]: 'success',
+                        }
+                    }
+                });
+                if (!transaction) {
+                    continue;
+                }
+                transaction.sourceStatus = 'success';
+                transaction.sourceBlockNumber = event.blockNumber;
+                transaction.sourceTransactionHash = event.transactionHash;
+                transaction.requestSentEvent = {
+                    bridger,
+                    position: {
+                        withdraw: position.withdraw.map((v) => ({
+                            sourceToken: v.sourceToken,
+                            targetToken: v.targetToken,
+                            amount: v.amount.toString()
+                        })),
+                        supply: position.supply.map((v) => ({
+                            sourceToken: v.sourceToken,
+                            targetToken: v.targetToken,
+                            amount: v.amount.toString()
+                        })),
+                    },
+                    sourceChainId: sourceChainId,
+                    targetChainId: targetChainId,
+                    metadata,
+                    requestTransactionHash,
+                };
+                await transaction.save();
+                this.logger.info(`New bridge request sent received: ${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].interopXContract;
+        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));
+        await super.start();
+    }
+}
+exports.default = SyncBridgeRequestSentEvents;

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

@@ -0,0 +1,55 @@
+"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.sourceLogs = transactionStatus.sourceLogs;
+        transaction.targetStatus = transactionStatus.targetStatus;
+        transaction.targetTransactionHash = transactionStatus.targetTransactionHash;
+        transaction.targetErrors = transactionStatus.targetErrors;
+        transaction.targetLogs = transactionStatus.targetLogs;
+        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

@@ -4,23 +4,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 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 waait_1 = __importDefault(require("waait"));
+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"));
 class Tasks {
     constructor() {
         this.tasks = [
-            new SyncDepositEvents_1.default({
-                chainId: 43114
-            }),
-            new ProcessDepositEvents_1.default({
-                chainId: 43114
-            })
+            // 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 }),
         ];
     }
     async start() {
         for (const task of this.tasks) {
             try {
                 task.start();
+                await (0, waait_1.default)(1000);
             }
             catch (error) {
                 console.error(`Error starting task: ${task.constructor.name}`);