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

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

@@ -10,12 +10,17 @@ const config_1 = __importDefault(require("@/config"));
 const db_1 = require("@/db");
 const utils_1 = require("@/utils");
 const constants_1 = require("@/constants");
+const gnosis_1 = require("@/gnosis");
 class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
     constructor(libp2p) {
         super(libp2p, '/interop-x/signatures');
         this.timeout = 30000;
     }
     async response(data) {
+        console.log({
+            tag: 'SignatureDialProtocol',
+            data
+        });
         const signer = config_1.default.wallet;
         let transaction;
         let maxTimeout = 20000;
@@ -33,17 +38,11 @@ class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
                 error: 'Event not found'
             };
         }
-        console.log("signing:", {
-            to: constants_1.addresses[transaction.targetChainId].multisend,
-            data: await (0, utils_1.buildDataForTransaction)(transaction, data.type),
-            chainId: transaction.targetChainId,
-            safeTxGas: data.safeTxGas,
-            nonce: data.safeNonce,
-        });
+        const { data: gnosisData } = await (0, gnosis_1.buildGnosisAction)(transaction, data.type);
         const signedData = await (0, utils_1.signGnosisSafeTx)({
-            to: constants_1.addresses[transaction.targetChainId].multisend,
-            data: await (0, utils_1.buildDataForTransaction)(transaction, data.type),
-            chainId: transaction.targetChainId,
+            to: constants_1.addresses[data.chainId].multisend,
+            data: gnosisData,
+            chainId: data.chainId,
             safeTxGas: data.safeTxGas,
             nonce: data.safeNonce,
         }, { signer });

package/dist/src/net/protocol/dial/{SignatureDialProtocol.1.js → TransactionStatusDialProtocol.js}

@@ -18,9 +18,11 @@ class TransactionStatusDialProtocol extends BaseDialProtocol_1.BaseDialProtocol
             sourceStatus: transaction.sourceStatus,
             sourceTransactionHash: transaction.sourceTransactionHash,
             sourceErrors: transaction.sourceErrors,
+            sourceLogs: transaction.sourceLogs,
             targetStatus: transaction.targetStatus,
             targetTransactionHash: transaction.targetTransactionHash,
             targetErrors: transaction.targetErrors,
+            targetLogs: transaction.targetLogs,
             status: transaction.status,
         };
     }

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

@@ -10,7 +10,7 @@ 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");
+const TransactionStatusDialProtocol_1 = require("./dial/TransactionStatusDialProtocol");
 class Protocol extends stream_1.EventEmitter {
     constructor() {
         super(...arguments);
@@ -31,21 +31,31 @@ 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)) : [],
+                    transaction.sourceLogs ? transaction.sourceLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
                     Buffer.from(transaction.targetStatus),
-                    Buffer.from(transaction.targetTransactionHash),
+                    Buffer.from(transaction.targetTransactionHash || ''),
                     transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
+                    transaction.targetLogs ? transaction.targetLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
                     Buffer.from(transaction.status),
                 ],
-                decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]) => ({
+                decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, sourceLogs, targetStatus, targetTransactionHash, targetErrors, targetLogs, status]) => ({
                     transactionHash: transactionHash.toString(),
                     sourceStatus: sourceStatus.toString(),
-                    sourceTransactionHash: sourceTransactionHash.toString(),
+                    sourceTransactionHash: sourceTransactionHash.toString() || null,
                     sourceErrors: sourceErrors.map((e) => e.toString()),
+                    sourceLogs: sourceLogs.map(e => ({
+                        type: e[0].toString(),
+                        message: e[1].toString(),
+                    })),
                     targetStatus: targetStatus.toString(),
-                    targetTransactionHash: targetTransactionHash.toString(),
+                    targetTransactionHash: targetTransactionHash.toString() || null,
                     targetErrors: targetErrors.map((e) => e.toString()),
+                    targetLogs: targetLogs.map(e => ({
+                        type: e[0].toString(),
+                        message: e[1].toString(),
+                    })),
                     status: status.toString(),
                 }),
             },
@@ -65,7 +75,7 @@ class Protocol extends stream_1.EventEmitter {
             });
         });
         this.signature = new SignatureDialProtocol_1.SignatureDialProtocol(this.libp2p);
-        this.transactionStatus = new SignatureDialProtocol_1_1.TransactionStatusDialProtocol(this.libp2p);
+        this.transactionStatus = new TransactionStatusDialProtocol_1.TransactionStatusDialProtocol(this.libp2p);
     }
     init() {
         this.libp2p.pubsub.subscribe(this.topic);

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,179 @@
+"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;
+        }
+        this.logger.debug(`Processing transaction ${transaction.transactionHash}`);
+        transaction.sourceStatus = "proccessing";
+        await transaction.save();
+        const ownersThreshold = await this.sourceGnosisContract.getThreshold();
+        await (0, waait_1.default)(10000);
+        this.logger.debug(`Build gnosis action for ${transaction.transactionHash}`);
+        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;
+        }
+        this.logger.debug(`Generating gnosis tx for ${transaction.transactionHash}`);
+        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 [gasPrice, gasLimit] = await Promise.all([
+            this.sourceProvider.getGasPrice(),
+            this.sourceProvider.estimateGas({
+                from: this.sourceWallet.address,
+                to: this.sourceGnosisContract.address,
+                data: txData,
+            }),
+        ]);
+        const txSent = await this.sourceWallet.sendTransaction({
+            from: this.sourceWallet.address,
+            to: this.sourceGnosisContract.address,
+            gasPrice: gasPrice.mul(120).div(100),
+            gasLimit: 5000000,
+            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.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/ProcessValidateEvents.js

@@ -0,0 +1,183 @@
+"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 ProcessValidateEvents extends BaseTask_1.BaseTask {
+    constructor({ chainId }) {
+        super({
+            logger: new logger_1.default("InteropX::ProcessValidateEvents"),
+        });
+        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: "success",
+                targetStatus: "pending",
+                sourceChainId: this.chainId,
+                sourceBlockNumber: {
+                    [sequelize_1.Op.lt]: currentBlockNumber - this.blockConfirmationsCount,
+                },
+                targetDelayUntil: {
+                    [sequelize_1.Op.or]: {
+                        [sequelize_1.Op.is]: null,
+                        [sequelize_1.Op.lt]: new Date(),
+                    },
+                },
+                submitEvent: { $ne: null },
+                validateEvent: { $ne: null },
+                createdAt: {
+                    [sequelize_1.Op.gt]: (0, moment_1.default)().subtract({ hours: 12 }).toDate(),
+                },
+            },
+        });
+        if (!transaction) {
+            return;
+        }
+        this.logger.debug(`Processing transaction ${transaction.transactionHash}`);
+        transaction.targetStatus = "proccessing";
+        await transaction.save();
+        const { sourceChainId, targetChainId } = transaction.validateEvent;
+        const targetProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(targetChainId));
+        const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetProvider);
+        const targetGnosisContract = (0, utils_1.getContract)(constants_1.addresses[targetChainId].gnosisSafe, abi_1.default.gnosisSafe, targetWallet);
+        const ownersThreshold = await targetGnosisContract.getThreshold();
+        await (0, waait_1.default)(10000);
+        this.logger.debug(`Build gnosis action for ${transaction.transactionHash}`);
+        let data, logs = [];
+        try {
+            ({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction, "target"));
+        }
+        catch (error) {
+            if (error instanceof utils_1.LiquidityError) {
+                await transaction.save();
+                transaction.targetDelayUntil = new Date(Date.now() + 60 * 5 * 1000);
+                transaction.targetStatus = "pending";
+                await transaction.save();
+                throw error;
+                return;
+            }
+            transaction.targetStatus = "failed";
+            transaction.targetErrors = [error.message];
+            transaction.status = "failed";
+            await transaction.save();
+            net_1.protocol.sendTransaction(transaction);
+            return;
+        }
+        this.logger.debug(`Generating gnosis tx for ${transaction.transactionHash}`);
+        let gnosisTx = await (0, utils_1.generateGnosisTransaction)({
+            baseGas: "0",
+            data,
+            gasPrice: "0",
+            gasToken: "0x0000000000000000000000000000000000000000",
+            nonce: "0",
+            operation: "1",
+            refundReceiver: "0x0000000000000000000000000000000000000000",
+            safeAddress: targetGnosisContract.address,
+            safeTxGas: "79668",
+            to: constants_1.addresses[transaction.targetChainId].multisend,
+            value: "0",
+        }, targetGnosisContract);
+        const owners = await targetGnosisContract
+            .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: "target",
+            transactionHash: transaction.transactionHash,
+            safeTxGas: gnosisTx.safeTxGas,
+            safeNonce: gnosisTx.nonce,
+            chainId: targetChainId,
+        }, 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.targetDelayUntil = new Date(Date.now() + 30 * 1000);
+            transaction.targetStatus = "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 targetGnosisContract.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 [gasPrice, gasLimit] = await Promise.all([
+            targetProvider.getGasPrice(),
+            targetProvider.estimateGas({
+                from: targetWallet.address,
+                to: targetGnosisContract.address,
+                data: txData,
+            }),
+        ]);
+        const txSent = await targetWallet.sendTransaction({
+            from: targetWallet.address,
+            to: targetGnosisContract.address,
+            gasPrice: gasPrice.mul(120).div(100),
+            gasLimit: 5000000,
+            data: txData,
+        });
+        console.log(txSent);
+        const receipt = await txSent.wait();
+        const parsedLogs = [];
+        receipt.logs.forEach((log) => {
+            try {
+                parsedLogs.push(targetGnosisContract.interface.parseLog(log));
+            }
+            catch (e) { }
+        });
+        if (parsedLogs.find((e) => e.name === "ExecutionSuccess")) {
+            console.log("ExecutionSuccess");
+            transaction.targetStatus = "success";
+            transaction.status = "success";
+            if (txSent.blockNumber)
+                transaction.targetBlockNumber = txSent.blockNumber;
+            transaction.targetTransactionHash = txSent.hash;
+            transaction.targetLogs = logs;
+            await transaction.save();
+        }
+        else {
+            console.log("ExecutionFailure");
+            transaction.targetStatus = "failed";
+            if (txSent.blockNumber)
+                transaction.targetBlockNumber = txSent.blockNumber;
+            transaction.targetTransactionHash = 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));
+        await super.start();
+    }
+}
+exports.default = ProcessValidateEvents;

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

@@ -0,0 +1,112 @@
+"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 SyncLogExecuteEvents extends BaseTask_1.BaseTask {
+    constructor({ targetChainId }) {
+        super({
+            logger: new logger_1.default("InteropX::SyncLogExecuteEvents"),
+        });
+        this.targetChainId = targetChainId;
+    }
+    async pollHandler() {
+        const currentBlock = await this.provider.getBlockNumber();
+        const events = await this.contract.queryFilter(this.contract.filters.LogExecute(), currentBlock - 2000, currentBlock);
+        let processedEvents = 0;
+        for (const event of events) {
+            try {
+                if (!event.args) {
+                    continue;
+                }
+                const { sourceSpells, targetSpells, position, actionId, actionIdHash, 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,
+                        executeEvent: { [sequelize_1.Op.eq]: null },
+                    },
+                });
+                if (!transaction) {
+                    continue;
+                }
+                if (transaction.targetStatus != "success") {
+                    transaction.targetStatus = "success";
+                }
+                if (transaction.status != "success") {
+                    transaction.status = "success";
+                }
+                if (!transaction.targetCreatedAt) {
+                    transaction.targetCreatedAt = new Date();
+                }
+                transaction.targetTransactionHash = event.transactionHash;
+                transaction.targetBlockNumber = event.blockNumber;
+                transaction.targetLogs = [];
+                transaction.executeEvent = {
+                    actionId,
+                    actionIdHashHash: actionIdHash,
+                    actionIdHash,
+                    vnonce: vnonce.toString(),
+                    sourceSpells: sourceSpells.map(({ connector, data }) => ({
+                        connector,
+                        data,
+                    })),
+                    targetSpells: targetSpells.map(({ connector, data }) => ({
+                        connector,
+                        data,
+                    })),
+                    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,
+                };
+                await transaction.save();
+                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.targetChainId].interopX;
+        this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.targetChainId));
+        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 = SyncLogExecuteEvents;