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

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

@@ -0,0 +1,87 @@
+"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,
+                        actionIdHash: 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/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/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,38 @@ 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"));
+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 = [
-            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 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(),
         ];
     }
     async start() {
         for (const task of this.tasks) {
             try {
                 task.start();
+                await (0, waait_1.default)(300);
             }
             catch (error) {
                 console.error(`Error starting task: ${task.constructor.name}`);

package/dist/src/typechain/factories/InstList__factory.js

@@ -0,0 +1,249 @@
+"use strict";
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InstList__factory = void 0;
+const ethers_1 = require("ethers");
+const _abi = [
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "_instaIndex",
+                type: "address",
+            },
+        ],
+        stateMutability: "nonpayable",
+        type: "constructor",
+    },
+    {
+        inputs: [
+            {
+                internalType: "uint64",
+                name: "",
+                type: "uint64",
+            },
+        ],
+        name: "accountAddr",
+        outputs: [
+            {
+                internalType: "address",
+                name: "",
+                type: "address",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "",
+                type: "address",
+            },
+        ],
+        name: "accountID",
+        outputs: [
+            {
+                internalType: "uint64",
+                name: "",
+                type: "uint64",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "uint64",
+                name: "",
+                type: "uint64",
+            },
+        ],
+        name: "accountLink",
+        outputs: [
+            {
+                internalType: "address",
+                name: "first",
+                type: "address",
+            },
+            {
+                internalType: "address",
+                name: "last",
+                type: "address",
+            },
+            {
+                internalType: "uint64",
+                name: "count",
+                type: "uint64",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "uint64",
+                name: "",
+                type: "uint64",
+            },
+            {
+                internalType: "address",
+                name: "",
+                type: "address",
+            },
+        ],
+        name: "accountList",
+        outputs: [
+            {
+                internalType: "address",
+                name: "prev",
+                type: "address",
+            },
+            {
+                internalType: "address",
+                name: "next",
+                type: "address",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "accounts",
+        outputs: [
+            {
+                internalType: "uint64",
+                name: "",
+                type: "uint64",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "_owner",
+                type: "address",
+            },
+        ],
+        name: "addAuth",
+        outputs: [],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "_account",
+                type: "address",
+            },
+        ],
+        name: "init",
+        outputs: [],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "instaIndex",
+        outputs: [
+            {
+                internalType: "address",
+                name: "",
+                type: "address",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "_owner",
+                type: "address",
+            },
+        ],
+        name: "removeAuth",
+        outputs: [],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "",
+                type: "address",
+            },
+        ],
+        name: "userLink",
+        outputs: [
+            {
+                internalType: "uint64",
+                name: "first",
+                type: "uint64",
+            },
+            {
+                internalType: "uint64",
+                name: "last",
+                type: "uint64",
+            },
+            {
+                internalType: "uint64",
+                name: "count",
+                type: "uint64",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "",
+                type: "address",
+            },
+            {
+                internalType: "uint64",
+                name: "",
+                type: "uint64",
+            },
+        ],
+        name: "userList",
+        outputs: [
+            {
+                internalType: "uint64",
+                name: "prev",
+                type: "uint64",
+            },
+            {
+                internalType: "uint64",
+                name: "next",
+                type: "uint64",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+];
+class InstList__factory {
+    static createInterface() {
+        return new ethers_1.utils.Interface(_abi);
+    }
+    static connect(address, signerOrProvider) {
+        return new ethers_1.Contract(address, _abi, signerOrProvider);
+    }
+}
+exports.InstList__factory = InstList__factory;
+InstList__factory.abi = _abi;