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

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

@@ -0,0 +1,184 @@
+"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"));
+const errors_1 = require("@/errors");
+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 errors_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;

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

@@ -47,6 +47,7 @@ class SyncLogSubmitEvents extends BaseTask_1.BaseTask {
                 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,
+                        actionIdHash: actionIdHashHash,
                         vnonce: vnonce.toString(),
                         position: {
                             withdraw: position.withdraw.map((v) => ({

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

@@ -0,0 +1,105 @@
+"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 SyncLogValidateEvents extends BaseTask_1.BaseTask {
+    constructor({ chainId }) {
+        super({
+            logger: new logger_1.default("InteropX::SyncLogValidateEvents"),
+        });
+        this.chainId = chainId;
+    }
+    async pollHandler() {
+        const currentBlock = await this.provider.getBlockNumber();
+        const events = await this.contract.queryFilter(this.contract.filters.LogValidate(), currentBlock - 2000, currentBlock);
+        let processedEvents = 0;
+        for (const event of events) {
+            try {
+                if (!event.args) {
+                    continue;
+                }
+                const { sourceSpells, 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,
+                        validateEvent: { [sequelize_1.Op.eq]: null },
+                    },
+                });
+                if (!transaction) {
+                    continue;
+                }
+                if (transaction.sourceStatus != "success") {
+                    transaction.sourceStatus = "success";
+                }
+                if (!transaction.sourceCreatedAt) {
+                    transaction.sourceCreatedAt = new Date();
+                }
+                transaction.sourceTransactionHash = event.transactionHash;
+                transaction.sourceBlockNumber = event.blockNumber;
+                transaction.sourceLogs = [];
+                transaction.validateEvent = {
+                    actionId,
+                    actionIdHashHash: actionIdHash,
+                    actionIdHash,
+                    vnonce: vnonce.toString(),
+                    sourceSpells: sourceSpells.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.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 = SyncLogValidateEvents;

package/dist/src/tasks/index.js

@@ -9,6 +9,9 @@ const SyncTransactionStatusTask_1 = __importDefault(require("./Transactions/Sync
 const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
 const SyncLogSubmitEvents_1 = __importDefault(require("./InteropX/SyncLogSubmitEvents"));
 const ProcessSubmitSubmitEvents_1 = __importDefault(require("./InteropX/ProcessSubmitSubmitEvents"));
+const SyncLogValidateEvents_1 = __importDefault(require("./InteropX/SyncLogValidateEvents"));
+const ProcessValidateEvents_1 = __importDefault(require("./InteropX/ProcessValidateEvents"));
+const SyncLogExecuteEvents_1 = __importDefault(require("./InteropX/SyncLogExecuteEvents"));
 class Tasks {
     constructor() {
         this.tasks = [
@@ -19,6 +22,12 @@ class Tasks {
             new SyncLogSubmitEvents_1.default({ chainId: 43114 }),
             new ProcessSubmitSubmitEvents_1.default({ chainId: 137 }),
             new ProcessSubmitSubmitEvents_1.default({ chainId: 43114 }),
+            new SyncLogValidateEvents_1.default({ chainId: 137 }),
+            new SyncLogValidateEvents_1.default({ chainId: 43114 }),
+            new ProcessValidateEvents_1.default({ chainId: 137 }),
+            new ProcessValidateEvents_1.default({ chainId: 43114 }),
+            new SyncLogExecuteEvents_1.default({ targetChainId: 137 }),
+            new SyncLogExecuteEvents_1.default({ targetChainId: 43114 }),
             new SyncTransactionStatusTask_1.default(),
         ];
     }
@@ -26,7 +35,7 @@ class Tasks {
         for (const task of this.tasks) {
             try {
                 task.start();
-                await (0, waait_1.default)(1000);
+                await (0, waait_1.default)(300);
             }
             catch (error) {
                 console.error(`Error starting task: ${task.constructor.name}`);

package/dist/src/typechain/InstList.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });