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

package/dist/src/errors/index.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LowLiquidityError = exports.InvalidChaindIdError = exports.LiquidityError = exports.UnsupportedChaindIdError = void 0;
+class UnsupportedChaindIdError extends Error {
+    constructor(chainId) {
+        super(`Unsupported chainId: ${chainId}`);
+    }
+}
+exports.UnsupportedChaindIdError = UnsupportedChaindIdError;
+class LiquidityError extends Error {
+    constructor(message) {
+        super(message || "Not enough liquidity");
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}
+exports.LiquidityError = LiquidityError;
+class InvalidChaindIdError extends Error {
+    constructor(message) {
+        super(message || "Invalid chain id");
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}
+exports.InvalidChaindIdError = InvalidChaindIdError;
+class LowLiquidityError extends Error {
+    constructor(message) {
+        super(message || "Low liquidity");
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}
+exports.LowLiquidityError = LowLiquidityError;

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

@@ -6,6 +6,7 @@ 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");
@@ -13,7 +14,7 @@ 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 dsaAddress = constants_1.addresses[sourceChainId].dsaAddress;
     const sourceUserAddress = Number(sourceDsaId) == 0 ? sourceSender : dsaAddress;

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

@@ -6,6 +6,7 @@ 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");
@@ -13,10 +14,11 @@ 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 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 sourceUserAddress = Number(sourceDsaId) == 0 ? sourceSender : dsaAddress;
     const interopAddress = constants_1.addresses[targetChainId].interopX;
     const contract = (0, utils_1.getContract)(interopAddress, abi_1.default.interopX, targetWallet);
     const targetSpells = [];
@@ -34,7 +36,7 @@ async function default_1(transaction) {
         let spellDataBasicWithdraw = {
             connector: "BASIC-A",
             method: "withdraw",
-            args: [supplyToken.targetToken, supplyToken.amount, sourceUserAddress, "0", "0"],
+            args: [supplyToken.targetToken, supplyToken.amount, targetDsaAddress, "0", "0"],
         };
         commonSpells.push({
             connector: spellDataBasicWithdraw.connector,

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 = 'c696e38';
+const GIT_SHORT_HASH = 'cdc0510';
 const printUsage = () => {
     console.log();
     console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
@@ -69,6 +69,7 @@ const net_1 = require("@/net");
 const api_1 = require("@/api");
 const db_1 = require("./db");
 const utils_1 = require("./utils");
+require("./crons");
 async function main() {
     (0, net_1.startPeer)({});
     const tasks = new tasks_1.Tasks();

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/services/Prices.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 web3_utils_1 = __importDefault(require("web3-utils"));
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const constants_1 = require("@/constants");
+const expand_home_dir_1 = __importDefault(require("expand-home-dir"));
+const config_1 = __importDefault(require("@/config"));
+const utils_1 = require("@/utils");
+const basePath = (0, expand_home_dir_1.default)(`~/.interop-x/data/${config_1.default.publicAddress}/${config_1.default.staging ? 'staging' : ''}`);
+const mainnetPricesFilePath = path_1.default.resolve(basePath, "./mainnetPrices.json");
+const networkTokenPricesFilePath = path_1.default.resolve(basePath, "./networkTokenPrices.json");
+class Prices {
+    static async fetch() {
+        if (!fs_1.default.existsSync(mainnetPricesFilePath)) {
+            fs_1.default.writeFileSync(mainnetPricesFilePath, JSON.stringify({}));
+        }
+        if (!fs_1.default.existsSync(networkTokenPricesFilePath)) {
+            fs_1.default.writeFileSync(networkTokenPricesFilePath, JSON.stringify({}));
+        }
+        this.mainnetPrices = JSON.parse(fs_1.default.readFileSync(mainnetPricesFilePath, "utf8"));
+        this.networkTokenPrices = JSON.parse(fs_1.default.readFileSync(networkTokenPricesFilePath, "utf8"));
+        try {
+            const path = constants_1.tokens["1"]
+                .filter((a) => a.symbol !== "ETH")
+                .map((token) => token.address)
+                .join(",");
+            const [response, ethResponse, avaxResponse, polygonResponse] = await Promise.all([
+                utils_1.http.get("https://api.coingecko.com/api/v3/simple/token_price/ethereum", {
+                    params: { contract_addresses: path, vs_currencies: "usd" },
+                }),
+                utils_1.http.get("https://api.coingecko.com/api/v3/simple/price", {
+                    params: { ids: "ethereum", vs_currencies: "usd" },
+                }),
+                utils_1.http.get("https://api.coingecko.com/api/v3/simple/price", {
+                    params: { ids: "avalanche-2", vs_currencies: "usd" },
+                }),
+                utils_1.http.get("https://api.coingecko.com/api/v3/simple/price", {
+                    params: { ids: "matic-network", vs_currencies: "usd" },
+                }),
+            ]);
+            this.networkTokenPrices = {
+                "1": ethResponse.data.ethereum.usd.toString(),
+                "137": polygonResponse.data["matic-network"].usd.toString(),
+                "43114": avaxResponse.data["avalanche-2"].usd.toString(),
+            };
+            const data = response.data;
+            for (const key in data) {
+                const _key = web3_utils_1.default.toChecksumAddress(key);
+                if (!data[key].usd)
+                    continue;
+                this.mainnetPrices[_key] = data[key].usd.toString();
+            }
+            this.mainnetPrices["0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE"] =
+                ethResponse.data.ethereum.usd.toString();
+        }
+        catch (error) { }
+        fs_1.default.writeFileSync(mainnetPricesFilePath, JSON.stringify(this.mainnetPrices));
+        fs_1.default.writeFileSync(networkTokenPricesFilePath, JSON.stringify(this.networkTokenPrices));
+        return this.mainnetPrices;
+    }
+    static getMainnetPrices() {
+        return this.mainnetPrices;
+    }
+    static getNetworkTokenPrices() {
+        return this.networkTokenPrices;
+    }
+}
+Prices.mainnetPrices = {};
+Prices.networkTokenPrices = {};
+exports.default = Prices;

package/dist/src/services/index.js

@@ -0,0 +1,8 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Prices = void 0;
+var Prices_1 = require("./Prices");
+Object.defineProperty(exports, "Prices", { enumerable: true, get: function () { return __importDefault(Prices_1).default; } });

package/dist/src/tasks/InteropX/{ProcessSubmitSubmitEvents.js → ProcessSubmitEvents.js}

@@ -16,10 +16,14 @@ const sequelize_1 = require("sequelize");
 const gnosis_1 = require("@/gnosis");
 const net_1 = require("@/net");
 const waait_1 = __importDefault(require("waait"));
-class ProcessSubmitSubmitEvents extends BaseTask_1.BaseTask {
+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({
-            logger: new logger_1.default("InteropX::ProcessSubmitSubmitEvents"),
+            logger: new logger_1.default("InteropX::ProcessSubmitEvents"),
         });
         this.leadNodeOnly = true;
         this.blockConfirmationsCount = 12;
@@ -54,6 +58,68 @@ class ProcessSubmitSubmitEvents extends BaseTask_1.BaseTask {
         this.logger.debug(`Processing transaction ${transaction.transactionHash}`);
         transaction.sourceStatus = "proccessing";
         await transaction.save();
+        const { submitEvent: { position, sourceChainId, targetChainId } } = transaction;
+        try {
+            (0, utils_1.validateChains)({ sourceChainId, targetChainId });
+        }
+        catch (error) {
+            transaction.sourceErrors = [error.message];
+            transaction.sourceStatus = "failed";
+            transaction.targetStatus = "failed";
+            transaction.status = "failed";
+            await transaction.save();
+            return;
+        }
+        const walletBalance = (await this.sourceWallet.getBalance()).toString();
+        const currentGasPrice = (await this.sourceWallet.getGasPrice()).toString();
+        const minBalanceRequired = new bignumber_js_1.BigNumber(currentGasPrice)
+            .multipliedBy(4000000)
+            .multipliedBy(2); // 2x balance
+        if (new bignumber_js_1.BigNumber(walletBalance).isLessThan(minBalanceRequired)) {
+            console.log((0, dedent_1.default) `Not enough balance in wallet ${(0, utils_1.getExplorerUrl)(sourceChainId, '/address/' + this.sourceWallet.address)} on ${(0, utils_1.chainIdToName)(sourceChainId)}
+        Balance: ${ethers_1.ethers.utils.parseEther(walletBalance)} ${(0, utils_1.getChainIdNativeSymbol)(sourceChainId)}
+        Required Balance: ${ethers_1.ethers.utils.parseEther(minBalanceRequired.toString())}
+        Require more: ${ethers_1.ethers.utils.parseEther(minBalanceRequired.minus(walletBalance).toString())}`);
+            transaction.sourceDelayUntil = (0, moment_1.default)().add({ minutes: 5 }).toDate();
+            transaction.sourceStatus = "pending";
+            await transaction.save();
+            return;
+        }
+        try {
+            await (0, utils_1.validateLiquidityCap)(position, sourceChainId, targetChainId);
+        }
+        catch (error) {
+            transaction.sourceErrors = [error.message];
+            transaction.sourceStatus = "failed";
+            transaction.targetStatus = "failed";
+            transaction.status = "failed";
+            await transaction.save();
+            return;
+        }
+        try {
+            await (0, utils_1.validateSourceLiquidity)({
+                position,
+                sourceChainId,
+                sourceProvider: this.sourceProvider,
+            });
+        }
+        catch (error) {
+            if (error instanceof errors_1.UnsupportedChaindIdError) {
+                console.log(`Dropping transaction ${transaction.transactionHash}`);
+                transaction.sourceErrors = [error.message];
+                transaction.sourceStatus = "failed";
+                transaction.targetStatus = "failed";
+                transaction.status = "failed";
+                await transaction.save();
+            }
+            else {
+                transaction.sourceStatus = "pending";
+                transaction.sourceDelayUntil = (0, moment_1.default)().add({ minutes: 5 }).toDate();
+                await transaction.save();
+                console.log("[validateSourceLiquidity][Warning]", error.message);
+                return;
+            }
+        }
         const ownersThreshold = await this.sourceGnosisContract.getThreshold();
         await (0, waait_1.default)(10000);
         this.logger.debug(`Build gnosis action for ${transaction.transactionHash}`);
@@ -62,7 +128,7 @@ class ProcessSubmitSubmitEvents extends BaseTask_1.BaseTask {
             ({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction, "source"));
         }
         catch (error) {
-            if (error instanceof utils_1.LiquidityError) {
+            if (error instanceof errors_1.LiquidityError) {
                 await transaction.save();
                 transaction.sourceDelayUntil = new Date(Date.now() + 60 * 5 * 1000);
                 transaction.sourceStatus = "pending";
@@ -92,14 +158,26 @@ class ProcessSubmitSubmitEvents 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,
@@ -107,7 +185,21 @@ class ProcessSubmitSubmitEvents 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,
@@ -120,7 +212,7 @@ class ProcessSubmitSubmitEvents 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));
@@ -170,10 +262,10 @@ class ProcessSubmitSubmitEvents 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();
     }
 }
-exports.default = ProcessSubmitSubmitEvents;
+exports.default = ProcessSubmitEvents;