@instadapp/interop-x 0.0.0-dev.f39d622 → 0.0.0-dev.f45bd03

package/dist/src/constants/addresses.js

@@ -8,7 +8,8 @@ exports.addresses = {
         interopX: '0xDB6083df37C5F224a3dF84A4B5f9fB60b6c8670a',
         dsaAddress: '0x9Fbd453a8e7a158510fBae5D9935958507cf4b19',
         instList: "0x839c2D3aDe63DF5b0b8F3E57D5e145057Ab41556",
-        aaveResolver: "0x0731c1d0154C2bE74d50e2083Df10aa531AAbb10",
+        aaveV2Resolver: "0x0731c1d0154C2bE74d50e2083Df10aa531AAbb10",
+        aaveV3Resolver: "0x1bD311bd5aD4DCfE18bCb55d42F0a3c714E2bfDe",
         balanceResolver: "0xecc3991846bB21717B95A593Fd86C5930A491F95",
     },
     43114: {
@@ -17,7 +18,8 @@ exports.addresses = {
         interopX: '0xA82A87096709E3D8648c9d9a22f31133bC4B6d32',
         dsaAddress: '0x995e67a652d2be45a8bff438b3dfac66dfff1c46',
         instList: "0x9926955e0Dd681Dc303370C52f4Ad0a4dd061687",
-        aaveResolver: "0x7C5C59944263311a1e350E3B871B0d1d8E9A513E",
+        aaveV2Resolver: "0x7C5C59944263311a1e350E3B871B0d1d8E9A513E",
+        aaveV3Resolver: "0xB0862d7dB941698A0A92F8dF6672F4B56A5F5b02",
         balanceResolver: "0xD45dFA34cEeAB567208041331F5ed9916C23b1E8",
     }
 };

package/dist/src/db/models/transaction.js

@@ -40,7 +40,7 @@ Transaction.init({
         type: sequelize_2.DataTypes.DATE,
         defaultValue: Date.now(),
     },
-    sourceDelayUntil: sequelize_2.DataTypes.STRING,
+    sourceDelayUntil: sequelize_2.DataTypes.DATE,
     targetChainId: sequelize_2.DataTypes.NUMBER,
     targetDsaId: sequelize_2.DataTypes.STRING,
     targetTransactionHash: sequelize_2.DataTypes.STRING,

package/dist/src/gnosis/actions/aaveV2/source.js

@@ -6,19 +6,44 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const abi_1 = __importDefault(require("@/abi"));
 const config_1 = __importDefault(require("@/config"));
 const constants_1 = require("@/constants");
+const providers_1 = require("@/providers");
 const utils_1 = require("@/utils");
 const ethers_1 = require("ethers");
 const ethers_multisend_1 = require("ethers-multisend");
+const safeUserRatioGap = "800000000000000000";
 async function default_1(transaction) {
     const transactions = [];
     const logs = [];
     const { position, actionId, actionIdHashHash, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata, } = transaction.submitEvent;
-    const sourceChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(sourceChainId));
+    const sourceChainProvider = new providers_1.JsonRpcRetryProvider((0, utils_1.getRpcProviderUrl)(sourceChainId));
     const sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, sourceChainProvider);
+    const targetChainProvider = new providers_1.JsonRpcRetryProvider((0, utils_1.getRpcProviderUrl)(targetChainId));
+    const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
     const dsaAddress = constants_1.addresses[sourceChainId].dsaAddress;
     const sourceUserAddress = Number(sourceDsaId) == 0 ? sourceSender : dsaAddress;
     const interopAddress = constants_1.addresses[sourceChainId].interopX;
     const contract = (0, utils_1.getContract)(interopAddress, abi_1.default.interopX, sourceWallet);
+    const sourceResolverContract = (0, utils_1.getContract)(constants_1.addresses[sourceChainId].aaveV2Resolver, abi_1.default.aaveV2Resolver, sourceWallet);
+    const targetResolverContract = (0, utils_1.getContract)(constants_1.addresses[targetChainId].aaveV2Resolver, abi_1.default.aaveV2Resolver, targetWallet);
+    const sourceAavePosition = await sourceResolverContract.checkAavePosition(sourceUserAddress, position, safeUserRatioGap, false);
+    const userSourceAaveIsOk = sourceAavePosition.isOk;
+    if (!userSourceAaveIsOk) {
+        throw new Error("Source chain aave position is not safe to migrate.");
+    }
+    const targetInstListContract = (0, utils_1.getContract)(constants_1.addresses[targetChainId].instList, abi_1.default.instList, targetChainProvider);
+    const targetDsaAddress = await targetInstListContract.accountAddr(targetDsaId);
+    const targetAavePosition = await targetResolverContract
+        .checkAavePosition(targetDsaAddress, position, safeUserRatioGap, true);
+    const userTargetAaveIsOk = targetAavePosition.isOk;
+    if (!userTargetAaveIsOk) {
+        throw new Error("Target chain aave position will not be safe after migration.");
+    }
+    const targetAavePositionWithFee = await targetResolverContract
+        .checkAavePosition(targetDsaAddress, position, safeUserRatioGap, true);
+    const userTargetAaveIsOkWithFee = targetAavePositionWithFee.isOk;
+    if (!userTargetAaveIsOkWithFee) {
+        throw new Error("Target chain aave position will not be safe after migration due to minimum fee.");
+    }
     const sourceSpells = [];
     const commonSpells = [];
     for (const withdraw of position.withdraw) {

package/dist/src/gnosis/actions/aaveV2/target.js

@@ -6,17 +6,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const abi_1 = __importDefault(require("@/abi"));
 const config_1 = __importDefault(require("@/config"));
 const constants_1 = require("@/constants");
+const providers_1 = require("@/providers");
 const utils_1 = require("@/utils");
 const ethers_1 = require("ethers");
 const ethers_multisend_1 = require("ethers-multisend");
+const safeUserRatioGap = "800000000000000000";
 async function default_1(transaction) {
     const transactions = [];
     const logs = [];
     const { sourceSpells, position, actionId, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata, } = transaction.validateEvent;
-    const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(targetChainId));
+    const targetChainProvider = new providers_1.JsonRpcRetryProvider((0, utils_1.getRpcProviderUrl)(targetChainId));
     const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
+    const targetResolverContract = (0, utils_1.getContract)(constants_1.addresses[targetChainId].aaveV2Resolver, abi_1.default.aaveV2Resolver, targetWallet);
     const targetInstListContract = (0, utils_1.getContract)(constants_1.addresses[targetChainId].instList, abi_1.default.instList, targetChainProvider);
     const targetDsaAddress = await targetInstListContract.accountAddr(targetDsaId);
+    const targetAavePosition = await targetResolverContract
+        .checkAavePosition(targetDsaAddress, position, safeUserRatioGap, true);
+    const userTargetAaveIsOk = targetAavePosition.isOk;
+    if (!userTargetAaveIsOk) {
+        throw new Error("Target chain aave position will not be safe after migration.");
+    }
+    const targetAavePositionWithFee = await targetResolverContract
+        .checkAavePosition(targetDsaAddress, position, safeUserRatioGap, true);
+    const userTargetAaveIsOkWithFee = targetAavePositionWithFee.isOk;
+    if (!userTargetAaveIsOkWithFee) {
+        throw new Error("Target chain aave position will not be safe after migration due to minimum fee.");
+    }
     const dsaAddress = constants_1.addresses[targetChainId].dsaAddress;
     const interopAddress = constants_1.addresses[targetChainId].interopX;
     const contract = (0, utils_1.getContract)(interopAddress, abi_1.default.interopX, targetWallet);

package/dist/src/gnosis/actions/aaveV3/index.js

@@ -0,0 +1,11 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const source_1 = __importDefault(require("./source"));
+const target_1 = __importDefault(require("./target"));
+async function default_1(transaction, type) {
+    return type === 'source' ? (0, source_1.default)(transaction) : (0, target_1.default)(transaction);
+}
+exports.default = default_1;

package/dist/src/gnosis/actions/aaveV3/source.js

@@ -0,0 +1,74 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const abi_1 = __importDefault(require("@/abi"));
+const config_1 = __importDefault(require("@/config"));
+const constants_1 = require("@/constants");
+const providers_1 = require("@/providers");
+const utils_1 = require("@/utils");
+const ethers_1 = require("ethers");
+const ethers_multisend_1 = require("ethers-multisend");
+async function default_1(transaction) {
+    const transactions = [];
+    const logs = [];
+    const { position, actionId, actionIdHashHash, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata, } = transaction.submitEvent;
+    const sourceChainProvider = new providers_1.JsonRpcRetryProvider((0, utils_1.getRpcProviderUrl)(sourceChainId));
+    const sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, sourceChainProvider);
+    const dsaAddress = constants_1.addresses[sourceChainId].dsaAddress;
+    const sourceUserAddress = Number(sourceDsaId) == 0 ? sourceSender : dsaAddress;
+    const interopAddress = constants_1.addresses[sourceChainId].interopX;
+    const contract = (0, utils_1.getContract)(interopAddress, abi_1.default.interopX, sourceWallet);
+    const sourceSpells = [];
+    const commonSpells = [];
+    for (const withdraw of position.withdraw) {
+        let spellData = {
+            connector: "AAVE-V3-A",
+            method: "payback",
+            args: [withdraw.sourceToken, withdraw.amount, "2", "0", "0"],
+        };
+        sourceSpells.push({
+            connector: spellData.connector,
+            data: (0, utils_1.encodeConnectorMethod)(spellData),
+        });
+        let spellDataBasicWithdraw = {
+            connector: "BASIC-A",
+            method: "withdraw",
+            args: [withdraw.sourceToken, withdraw.amount, sourceUserAddress, "0", "0"],
+        };
+        commonSpells.push({
+            connector: spellDataBasicWithdraw.connector,
+            data: (0, utils_1.encodeConnectorMethod)(spellDataBasicWithdraw),
+        });
+    }
+    for (const supply of position.supply) {
+        let spellDataWithdraw = {
+            connector: "AAVE-V3-A",
+            method: "withdraw",
+            args: [supply.sourceToken, supply.amount, "0", "0"],
+        };
+        sourceSpells.push({
+            connector: spellDataWithdraw.connector,
+            data: (0, utils_1.encodeConnectorMethod)(spellDataWithdraw),
+        });
+        let spellDataBasicWithdraw = {
+            connector: "BASIC-A",
+            method: "withdraw",
+            args: [supply.sourceToken, supply.amount, dsaAddress, "0", "0"],
+        };
+        sourceSpells.push({
+            connector: spellDataBasicWithdraw.connector,
+            data: (0, utils_1.encodeConnectorMethod)(spellDataBasicWithdraw),
+        });
+    }
+    const { data } = await contract.populateTransaction.sourceAction(sourceSpells, commonSpells, position, actionId, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata);
+    transactions.push({
+        to: interopAddress,
+        data: data,
+        value: "0",
+        operation: ethers_multisend_1.OperationType.Call,
+    });
+    return { transactions, logs };
+}
+exports.default = default_1;

package/dist/src/gnosis/actions/aaveV3/target.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 abi_1 = __importDefault(require("@/abi"));
+const config_1 = __importDefault(require("@/config"));
+const constants_1 = require("@/constants");
+const providers_1 = require("@/providers");
+const utils_1 = require("@/utils");
+const ethers_1 = require("ethers");
+const ethers_multisend_1 = require("ethers-multisend");
+async function default_1(transaction) {
+    const transactions = [];
+    const logs = [];
+    const { sourceSpells, position, actionId, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata, } = transaction.validateEvent;
+    const targetChainProvider = new providers_1.JsonRpcRetryProvider((0, utils_1.getRpcProviderUrl)(targetChainId));
+    const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
+    const targetInstListContract = (0, utils_1.getContract)(constants_1.addresses[targetChainId].instList, abi_1.default.instList, targetChainProvider);
+    const targetDsaAddress = await targetInstListContract.accountAddr(targetDsaId);
+    const dsaAddress = constants_1.addresses[targetChainId].dsaAddress;
+    const interopAddress = constants_1.addresses[targetChainId].interopX;
+    const contract = (0, utils_1.getContract)(interopAddress, abi_1.default.interopX, targetWallet);
+    const targetSpells = [];
+    const commonSpells = [];
+    for (const supplyToken of position.supply) {
+        let spellData = {
+            connector: "AAVE-V3-A",
+            method: "deposit",
+            args: [supplyToken.targetToken, supplyToken.amount, "0", "0"],
+        };
+        targetSpells.push({
+            connector: spellData.connector,
+            data: (0, utils_1.encodeConnectorMethod)(spellData),
+        });
+        let spellDataBasicWithdraw = {
+            connector: "BASIC-A",
+            method: "withdraw",
+            args: [supplyToken.targetToken, supplyToken.amount, targetDsaAddress, "0", "0"],
+        };
+        commonSpells.push({
+            connector: spellDataBasicWithdraw.connector,
+            data: (0, utils_1.encodeConnectorMethod)(spellDataBasicWithdraw),
+        });
+    }
+    for (const withdrawToken of position.withdraw) {
+        let spellData = {
+            connector: "AAVE-V3-A",
+            method: "borrow",
+            args: [
+                withdrawToken.targetToken,
+                withdrawToken.amount,
+                "2",
+                "0",
+                "0",
+            ],
+        };
+        targetSpells.push({
+            connector: spellData.connector,
+            data: (0, utils_1.encodeConnectorMethod)(spellData),
+        });
+        let spellData2 = {
+            connector: "BASIC-A",
+            method: "withdraw",
+            args: [
+                withdrawToken.targetToken,
+                withdrawToken.amount,
+                dsaAddress,
+                "0",
+                "0",
+            ],
+        };
+        targetSpells.push({
+            connector: spellData.connector,
+            data: (0, utils_1.encodeConnectorMethod)(spellData2),
+        });
+    }
+    const { data } = await contract.populateTransaction.targetAction(sourceSpells, targetSpells, commonSpells, position, actionId, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata);
+    transactions.push({
+        to: interopAddress,
+        data: data,
+        value: "0",
+        operation: ethers_multisend_1.OperationType.Call,
+    });
+    return { transactions, logs };
+}
+exports.default = default_1;

package/dist/src/gnosis/actions/index.js

@@ -4,6 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const aaveV2_1 = __importDefault(require("./aaveV2"));
+const aaveV3_1 = __importDefault(require("./aaveV3"));
 exports.default = {
     'A:AAVE-V2:AAVE-V2': aaveV2_1.default,
+    'A:AAVE-V3:AAVE-V3': aaveV3_1.default,
 };

package/dist/src/index.js

@@ -13,7 +13,7 @@ const package_json_1 = __importDefault(require("../package.json"));
 dotenv_1.default.config();
 const logger_1 = __importDefault(require("@/logger"));
 const logger = new logger_1.default('Process');
-const GIT_SHORT_HASH = 'f39d622';
+const GIT_SHORT_HASH = 'f45bd03';
 const printUsage = () => {
     console.log();
     console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);

package/dist/src/providers/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./retry-provider"), exports);

package/dist/src/providers/retry-provider.js

@@ -0,0 +1,45 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonRpcRetryProvider = exports.retryOperation = exports.promiseTimeout = void 0;
+const ethers_1 = require("ethers");
+const waait_1 = __importDefault(require("waait"));
+const bluebird_1 = __importDefault(require("bluebird"));
+function promiseTimeout(ms, promise) {
+    return bluebird_1.default.resolve(promise).timeout(ms);
+}
+exports.promiseTimeout = promiseTimeout;
+function retryOperation(retriesLeft, operation, options) {
+    return new Promise((resolve, reject) => {
+        const { timeouts } = options;
+        // Find the timeout for this specific iteration
+        const timeout = timeouts[timeouts.length - retriesLeft];
+        // Wrap the original operation in a timeout
+        const execution = promiseTimeout(timeout, operation());
+        // If the promise is successful, resolve it and bubble the result up
+        return execution.then(resolve).catch((reason) => {
+            // If there are any retries left, we call the same retryOperation function again,
+            // but decrementing the number of retries left by 1
+            if (retriesLeft - 1 > 0) {
+                // Delay the new attempt slightly
+                return (0, waait_1.default)(options.delay || 50)
+                    .then(retryOperation.bind(null, retriesLeft - 1, operation, options))
+                    .then(resolve)
+                    .catch(reject);
+            }
+            // Reject (and bubble the result up) if there are no more retries
+            return reject(reason);
+        });
+    });
+}
+exports.retryOperation = retryOperation;
+class JsonRpcRetryProvider extends ethers_1.ethers.providers.JsonRpcProvider {
+    perform(method, params) {
+        const timeouts = [5000, 10000];
+        const operation = () => super.perform(method, params);
+        return retryOperation(2, operation, { timeouts, delay: 50 });
+    }
+}
+exports.JsonRpcRetryProvider = JsonRpcRetryProvider;

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

@@ -19,6 +19,7 @@ const waait_1 = __importDefault(require("waait"));
 const errors_1 = require("@/errors");
 const bignumber_js_1 = require("bignumber.js");
 const dedent_1 = __importDefault(require("dedent"));
+const providers_1 = require("@/providers");
 class ProcessSubmitEvents extends BaseTask_1.BaseTask {
     constructor({ chainId }) {
         super({
@@ -113,6 +114,7 @@ class ProcessSubmitEvents extends BaseTask_1.BaseTask {
             }
             else {
                 transaction.sourceStatus = "pending";
+                transaction.sourceErrors = [error.message];
                 transaction.sourceDelayUntil = (0, moment_1.default)().add({ minutes: 5 }).toDate();
                 await transaction.save();
                 console.log("[validateSourceLiquidity][Warning]", error.message);
@@ -157,14 +159,26 @@ class ProcessSubmitEvents extends BaseTask_1.BaseTask {
             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}`);
+        async function getGnosisOwnerPeerIds({ gnosisContract }) {
+            const owners = await gnosisContract
+                .getOwners()
+                .then((owners) => owners.map((owner) => owner.toLowerCase()));
+            return net_1.peerPool.activePeers
+                .filter((peer) => owners.includes(peer.publicAddress.toLowerCase()))
+                .map((peer) => peer.id);
+        }
+        const ownerPeerIds = await getGnosisOwnerPeerIds({
+            gnosisContract: this.sourceGnosisContract,
+        });
+        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: "source",
             transactionHash: transaction.transactionHash,
@@ -172,7 +186,21 @@ class ProcessSubmitEvents extends BaseTask_1.BaseTask {
             safeNonce: gnosisTx.nonce,
             chainId: this.chainId,
         }, 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,
@@ -185,7 +213,7 @@ class ProcessSubmitEvents extends BaseTask_1.BaseTask {
             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}` : ""));
+            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));
@@ -235,7 +263,7 @@ class ProcessSubmitEvents 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));
         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();

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

@@ -17,6 +17,7 @@ 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({
@@ -58,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();
@@ -98,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,
@@ -113,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,
@@ -177,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

@@ -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 SyncLogExecuteEvents extends BaseTask_1.BaseTask {
     constructor({ targetChainId }) {
         super({
@@ -104,7 +105,7 @@ class SyncLogExecuteEvents extends BaseTask_1.BaseTask {
     }
     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.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();
     }

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({
@@ -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/typechain/AaveV3Resolver.js

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