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

package/dist/src/tasks/AutoUpdateTask.js

@@ -6,16 +6,18 @@ 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 * 5 * 1000;
+        this.pollIntervalMs = 60 * 10 * 1000;
     }
     prePollHandler() {
         return config_1.default.autoUpdate && !config_1.default.isLeadNode();
@@ -32,7 +34,7 @@ class AutoUpdateTask extends BaseTask_1.BaseTask {
     }
     async getLatestVersion() {
         try {
-            const stdout = await (0, await_spawn_1.default)('npm', ['view', package_json_1.default.name, 'version']);
+            const stdout = await (0, await_spawn_1.default)('npm', ['view', `${package_json_1.default.name}@${tag}`, 'version']);
             return stdout.toString().trim();
         }
         catch (error) {
@@ -47,9 +49,7 @@ class AutoUpdateTask extends BaseTask_1.BaseTask {
         }
         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, 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`);
@@ -57,10 +57,13 @@ class AutoUpdateTask extends BaseTask_1.BaseTask {
         }
         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/InteropX/ProcessSubmitSubmitEvents.js

@@ -0,0 +1,168 @@
+"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 moment_1 = __importDefault(require("moment"));
+const sequelize_1 = require("sequelize");
+const gnosis_1 = require("@/gnosis");
+const net_1 = require("@/net");
+const waait_1 = __importDefault(require("waait"));
+class ProcessSubmitSubmitEvents extends BaseTask_1.BaseTask {
+    constructor({ chainId }) {
+        super({
+            logger: new logger_1.default("InteropX::ProcessSubmitSubmitEvents"),
+        });
+        this.leadNodeOnly = true;
+        this.blockConfirmationsCount = 12;
+        this.chainId = chainId;
+    }
+    async pollHandler() {
+        var _a;
+        const currentBlockNumber = await this.sourceProvider.getBlockNumber();
+        const transaction = await db_1.Transaction.findOne({
+            where: {
+                status: "pending",
+                sourceStatus: "pending",
+                sourceChainId: this.chainId,
+                submitBlockNumber: {
+                    [sequelize_1.Op.lt]: currentBlockNumber - this.blockConfirmationsCount,
+                },
+                sourceDelayUntil: {
+                    [sequelize_1.Op.or]: {
+                        [sequelize_1.Op.is]: null,
+                        [sequelize_1.Op.lt]: new Date(),
+                    },
+                },
+                submitEvent: { $ne: null },
+                createdAt: {
+                    [sequelize_1.Op.gt]: (0, moment_1.default)().subtract({ hours: 12 }).toDate(),
+                },
+            },
+        });
+        if (!transaction) {
+            return;
+        }
+        transaction.sourceStatus = "proccessing";
+        await transaction.save();
+        const ownersThreshold = await this.sourceGnosisContract.getThreshold();
+        await (0, waait_1.default)(10000);
+        let data, logs = [];
+        try {
+            ({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction, "source"));
+        }
+        catch (error) {
+            if (error instanceof utils_1.LiquidityError) {
+                await transaction.save();
+                transaction.sourceDelayUntil = new Date(Date.now() + 60 * 5 * 1000);
+                transaction.sourceStatus = "pending";
+                await transaction.save();
+                throw error;
+                return;
+            }
+            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.sourceGnosisContract.address,
+            safeTxGas: "79668",
+            to: constants_1.addresses[transaction.sourceChainId].multisend,
+            value: "0",
+        }, this.sourceGnosisContract);
+        const owners = await this.sourceGnosisContract
+            .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,
+            chainId: this.chainId,
+        }, 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 = "pending";
+            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.sourceGnosisContract.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.sourceGnosisContract.address,
+            data: txData,
+        });
+        console.log(txSent);
+        const receipt = await txSent.wait();
+        const parsedLogs = [];
+        receipt.logs.forEach((log) => {
+            try {
+                parsedLogs.push(this.sourceGnosisContract.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;
+            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.blockConfirmationsCount = constants_1.blockConfirmations[this.chainId] + 1;
+        this.sourceProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
+        this.sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, this.sourceProvider);
+        this.sourceGnosisContract = (0, utils_1.getContract)(constants_1.addresses[this.chainId].gnosisSafe, abi_1.default.gnosisSafe, this.sourceWallet);
+        await super.start();
+    }
+}
+exports.default = ProcessSubmitSubmitEvents;

package/dist/src/tasks/InteropX/SyncLogSubmitEvents.js

@@ -0,0 +1,86 @@
+"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 SyncLogSubmitEvents extends BaseTask_1.BaseTask {
+    constructor({ chainId }) {
+        super({
+            logger: new logger_1.default("InteropX::SyncLogSubmitEvents"),
+        });
+        this.chainId = chainId;
+    }
+    async pollHandler() {
+        const currentBlock = await this.provider.getBlockNumber();
+        const events = await this.contract.queryFilter(this.contract.filters.LogSubmit(), currentBlock - 2000, currentBlock);
+        let processedEvents = 0;
+        for (const event of events) {
+            try {
+                if (!event.args) {
+                    continue;
+                }
+                const { position, actionId, actionIdHashHash, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata, } = event.args;
+                const uniqueIdentifier = {
+                    actionId,
+                    vnonce: vnonce.toString(),
+                    sourceSender: sourceSender.toString(),
+                    sourceChainId: sourceChainId.toNumber(),
+                    targetChainId: targetChainId.toNumber(),
+                    sourceDsaId: sourceDsaId.toString(),
+                    targetDsaId: targetDsaId.toString(),
+                };
+                let transactionHash = (0, utils_1.generateInteropTransactionHash)(uniqueIdentifier);
+                const transaction = await db_1.Transaction.findOne({
+                    where: { transactionHash },
+                });
+                if (transaction) {
+                    continue;
+                }
+                await db_1.Transaction.create(Object.assign(Object.assign({ transactionHash }, uniqueIdentifier), { submitChainId: this.chainId, submitTransactionHash: event.transactionHash, submitBlockNumber: event.blockNumber, submitCreatedAt: new Date(), submitEvent: {
+                        actionId,
+                        actionIdHashHash,
+                        vnonce: vnonce.toString(),
+                        position: {
+                            withdraw: position.withdraw.map((v) => ({
+                                sourceToken: v.sourceToken,
+                                targetToken: v.targetToken,
+                                amount: v.amount.toString(),
+                            })),
+                            supply: position.supply.map((v) => ({
+                                sourceToken: v.sourceToken,
+                                targetToken: v.targetToken,
+                                amount: v.amount.toString(),
+                            })),
+                        },
+                        sourceChainId: sourceChainId.toNumber(),
+                        targetChainId: targetChainId.toNumber(),
+                        sourceSender,
+                        sourceDsaId: sourceDsaId.toString(),
+                        targetDsaId: targetDsaId.toString(),
+                        metadata,
+                    } }));
+                this.logger.info(`New InteropX tranaction: ${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].interopX;
+        this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
+        this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopX, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
+        await super.start();
+    }
+}
+exports.default = SyncLogSubmitEvents;

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

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

package/dist/src/tasks/index.js

@@ -4,36 +4,29 @@ 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 SyncWithdrawEvents_1 = __importDefault(require("./InteropBridge/SyncWithdrawEvents"));
-const ProcessWithdrawEvents_1 = __importDefault(require("./InteropBridge/ProcessWithdrawEvents"));
-const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
+const waait_1 = __importDefault(require("waait"));
 const SyncTransactionStatusTask_1 = __importDefault(require("./Transactions/SyncTransactionStatusTask"));
+const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
+const SyncLogSubmitEvents_1 = __importDefault(require("./InteropX/SyncLogSubmitEvents"));
+const ProcessSubmitSubmitEvents_1 = __importDefault(require("./InteropX/ProcessSubmitSubmitEvents"));
 class Tasks {
     constructor() {
         this.tasks = [
-            new SyncTransactionStatusTask_1.default(),
+            // new SyncTransactionStatusTask(),
             new AutoUpdateTask_1.default(),
-            new SyncDepositEvents_1.default({
-                chainId: 43114
-            }),
-            new ProcessDepositEvents_1.default({
-                chainId: 43114
-            }),
-            new SyncWithdrawEvents_1.default({
-                chainId: 137,
-                itokenAddress: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
-            }),
-            new ProcessWithdrawEvents_1.default({
-                chainId: 137,
-            })
+            // InteropX
+            new SyncLogSubmitEvents_1.default({ chainId: 137 }),
+            new SyncLogSubmitEvents_1.default({ chainId: 43114 }),
+            new ProcessSubmitSubmitEvents_1.default({ chainId: 137 }),
+            new ProcessSubmitSubmitEvents_1.default({ chainId: 43114 }),
+            new SyncTransactionStatusTask_1.default(),
         ];
     }
     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}`);