@instadapp/interop-x 0.0.0-dev.c696e38 → 0.0.0-dev.cdc0510

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

@@ -16,6 +16,8 @@ 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");
+const providers_1 = require("@/providers");
 class ProcessValidateEvents extends BaseTask_1.BaseTask {
     constructor({ chainId }) {
         super({
@@ -57,7 +59,7 @@ class ProcessValidateEvents extends BaseTask_1.BaseTask {
         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 targetProvider = new providers_1.JsonRpcRetryProvider((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();
@@ -68,7 +70,7 @@ class ProcessValidateEvents extends BaseTask_1.BaseTask {
             ({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction, "target"));
         }
         catch (error) {
-            if (error instanceof utils_1.LiquidityError) {
+            if (error instanceof errors_1.LiquidityError) {
                 await transaction.save();
                 transaction.targetDelayUntil = new Date(Date.now() + 60 * 5 * 1000);
                 transaction.targetStatus = "pending";
@@ -97,14 +99,18 @@ class ProcessValidateEvents extends BaseTask_1.BaseTask {
             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);
+        const ownerPeerIds = await (0, utils_1.getGnosisOwnerPeerIds)({
+            gnosisContract: targetGnosisContract,
+        });
         console.log(`Collecting signatures for execution ${transaction.transactionHash}`);
         console.log(ownerPeerIds);
+        const message = (0, utils_1.generateGnosisSignatureMessage)({
+            to: constants_1.addresses[data.chainId].multisend,
+            data,
+            chainId: this.chainId,
+            safeTxGas: gnosisTx.safeTxGas,
+            nonce: gnosisTx.safeNonce,
+        });
         const signatures = await net_1.protocol.requestSignatures({
             type: "target",
             transactionHash: transaction.transactionHash,
@@ -112,7 +118,21 @@ class ProcessValidateEvents extends BaseTask_1.BaseTask {
             safeNonce: gnosisTx.nonce,
             chainId: targetChainId,
         }, ownerPeerIds);
-        const validSignatures = signatures.filter((s) => !!s.data && s.data !== "0x");
+        const validSignatures = signatures
+            .filter((s) => !!s.data && s.data !== "0x")
+            .filter((s) => {
+            try {
+                const address = (0, utils_1.getGnosisSignatureAddress)({
+                    message,
+                    signature: s.data,
+                    chainId: this.chainId,
+                });
+                return (address === null || address === void 0 ? void 0 : address.toLowerCase()) === s.signer.toLowerCase();
+            }
+            catch (error) {
+                return false;
+            }
+        });
         console.log({
             signatures,
             validSignatures,
@@ -176,7 +196,7 @@ class ProcessValidateEvents extends BaseTask_1.BaseTask {
     }
     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.sourceProvider = new providers_1.JsonRpcRetryProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
         await super.start();
     }
 }

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

@@ -0,0 +1,113 @@
+"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 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 providers_1.JsonRpcRetryProvider((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

@@ -11,6 +11,7 @@ const db_1 = require("@/db");
 const utils_1 = require("@/utils");
 const constants_1 = require("@/constants");
 const config_1 = __importDefault(require("@/config"));
+const providers_1 = require("@/providers");
 class SyncLogSubmitEvents extends BaseTask_1.BaseTask {
     constructor({ chainId }) {
         super({
@@ -79,7 +80,7 @@ class SyncLogSubmitEvents extends BaseTask_1.BaseTask {
     }
     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.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();
     }

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

@@ -12,6 +12,7 @@ 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({
@@ -57,7 +58,7 @@ class SyncLogValidateEvents extends BaseTask_1.BaseTask {
                 transaction.sourceTransactionHash = event.transactionHash;
                 transaction.sourceBlockNumber = event.blockNumber;
                 transaction.sourceLogs = [];
-                (transaction.validateEvent = {
+                transaction.validateEvent = {
                     actionId,
                     actionIdHashHash: actionIdHash,
                     actionIdHash,
@@ -84,8 +85,8 @@ class SyncLogValidateEvents extends BaseTask_1.BaseTask {
                     sourceDsaId: sourceDsaId.toString(),
                     targetDsaId: targetDsaId.toString(),
                     metadata,
-                }),
-                    await transaction.save();
+                };
+                await transaction.save();
                 this.logger.info(`New InteropX tranaction: ${transactionHash} `);
             }
             catch (error) {
@@ -97,7 +98,7 @@ class SyncLogValidateEvents extends BaseTask_1.BaseTask {
     }
     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.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();
     }

package/dist/src/tasks/index.js

@@ -8,23 +8,25 @@ 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 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(),
             // 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 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(),
         ];
     }
@@ -32,7 +34,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/AaveV2Resolver.js

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

package/dist/src/typechain/AaveV3Resolver.js

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

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 });