@instadapp/interop-x 0.0.0-dev.59f84ce → 0.0.0-dev.5a90c8d

package/dist/src/tasks/{InteropXContract/SyncBridgeRequestEvents.js → InteropX/SyncLogSubmitEvents.js}

@@ -11,55 +11,65 @@ const db_1 = require("@/db");
 const utils_1 = require("@/utils");
 const constants_1 = require("@/constants");
 const config_1 = __importDefault(require("@/config"));
-class SyncBridgeRequestEvents extends BaseTask_1.BaseTask {
+const providers_1 = require("@/providers");
+class SyncLogSubmitEvents extends BaseTask_1.BaseTask {
     constructor({ chainId }) {
         super({
-            logger: new logger_1.default("InteropXContract::SyncBridgeRequestEvents"),
+            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.LogBridgeRequest(), currentBlock - 2000, currentBlock);
+        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 { bridger, position, sourceChainId, targetChainId, metadata } = event.args;
+                const { position, actionId, actionIdHashHash, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata, } = event.args;
                 const uniqueIdentifier = {
-                    action: 'withdraw',
-                    bridger,
-                    requestTransactionHash: event.transactionHash,
+                    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 } });
+                const transaction = await db_1.Transaction.findOne({
+                    where: { transactionHash },
+                });
                 if (transaction) {
-                    return;
+                    continue;
                 }
-                await db_1.Transaction.create(Object.assign(Object.assign({ transactionHash }, uniqueIdentifier), { position,
-                    metadata, requestBlockNumber: event.blockNumber, requestEvent: {
-                        bridger,
+                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()
+                                amount: v.amount.toString(),
                             })),
                             supply: position.supply.map((v) => ({
                                 sourceToken: v.sourceToken,
                                 targetToken: v.targetToken,
-                                amount: v.amount.toString()
+                                amount: v.amount.toString(),
                             })),
                         },
                         sourceChainId: sourceChainId.toNumber(),
                         targetChainId: targetChainId.toNumber(),
+                        sourceSender,
+                        sourceDsaId: sourceDsaId.toString(),
+                        targetDsaId: targetDsaId.toString(),
                         metadata,
                     } }));
-                this.logger.info(`New bridge request received: ${transactionHash} `);
+                this.logger.info(`New InteropX tranaction: ${transactionHash} `);
             }
             catch (error) {
                 this.logger.error(error);
@@ -69,10 +79,10 @@ class SyncBridgeRequestEvents extends BaseTask_1.BaseTask {
             this.logger.info(`${processedEvents} events processed`);
     }
     async start() {
-        this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
-        this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
-        this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXContract, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
+        this.contractAddress = constants_1.addresses[this.chainId].interopX;
+        this.provider = new providers_1.JsonRpcRetryProvider((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 = SyncBridgeRequestEvents;
+exports.default = SyncLogSubmitEvents;

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

@@ -0,0 +1,106 @@
+"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");
+const providers_1 = require("@/providers");
+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 providers_1.JsonRpcRetryProvider((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),
                 },
             }
         });

package/dist/src/tasks/index.js

@@ -4,25 +4,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tasks = void 0;
+const waait_1 = __importDefault(require("waait"));
+const SyncTransactionStatusTask_1 = __importDefault(require("./Transactions/SyncTransactionStatusTask"));
 const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
-const SyncBridgeRequestEvents_1 = __importDefault(require("./InteropXContract/SyncBridgeRequestEvents"));
-const ProcessBridgeRequestEvents_1 = __importDefault(require("./InteropXContract/ProcessBridgeRequestEvents"));
+const SyncLogSubmitEvents_1 = __importDefault(require("./InteropX/SyncLogSubmitEvents"));
+const ProcessSubmitEvents_1 = __importDefault(require("./InteropX/ProcessSubmitEvents"));
+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(),
             new AutoUpdateTask_1.default(),
-            // InteropXContract
-            new SyncBridgeRequestEvents_1.default({ chainId: 137 }),
-            new SyncBridgeRequestEvents_1.default({ chainId: 43114 }),
-            new ProcessBridgeRequestEvents_1.default({ chainId: 137 }),
-            new ProcessBridgeRequestEvents_1.default({ chainId: 43114 }),
+            // InteropX
+            new SyncLogSubmitEvents_1.default({ chainId: 137 }),
+            new SyncLogSubmitEvents_1.default({ chainId: 43114 }),
+            new ProcessSubmitEvents_1.default({ chainId: 137 }),
+            new ProcessSubmitEvents_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/BalanceResolver.js

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

package/dist/src/typechain/InstList.js

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

package/dist/src/typechain/InteropX.js

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