@instadapp/interop-x 0.0.0-dev.99c6cb0 → 0.0.0-dev.9d8d8b4

package/dist/src/api/index.js

@@ -21,10 +21,17 @@ const startApiServer = async () => {
                 limit: 20,
                 offset: 0,
                 order: [
-                    ['createdAt', 'DESC']
+                    ['updatedAt', 'DESC']
                 ]
             });
         });
+        server.get('/transactions/:transaction', async (req) => {
+            return await db_1.Transaction.findOne({
+                where: {
+                    transactionHash: req.params.transaction
+                }
+            });
+        });
         await server.listen(PORT, HOST);
         logger.log(`RPC Server listening at http://${HOST}:${PORT}`);
     }

package/dist/src/constants/addresses.js

@@ -2,19 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addresses = void 0;
 exports.addresses = {
-    1: {
-        gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
-        multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-        interopXContract: '',
-    },
     137: {
         gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
         multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-        interopXContract: '0x41bd77583674B3a5c073FBb4922C0C8dA91C43cF',
+        interopX: '0xDB6083df37C5F224a3dF84A4B5f9fB60b6c8670a',
+        dsaAddress: '0x9Fbd453a8e7a158510fBae5D9935958507cf4b19',
+        instList: "0x839c2D3aDe63DF5b0b8F3E57D5e145057Ab41556",
+        aaveV2Resolver: "0x0731c1d0154C2bE74d50e2083Df10aa531AAbb10",
+        aaveV3Resolver: "0x1bD311bd5aD4DCfE18bCb55d42F0a3c714E2bfDe",
+        balanceResolver: "0xecc3991846bB21717B95A593Fd86C5930A491F95",
     },
     43114: {
         gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
         multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-        interopXContract: '0xCF391A3057eDba541c80307aC5E3Bc1E4a9471b7',
+        interopX: '0xA82A87096709E3D8648c9d9a22f31133bC4B6d32',
+        dsaAddress: '0x995e67a652d2be45a8bff438b3dfac66dfff1c46',
+        instList: "0x9926955e0Dd681Dc303370C52f4Ad0a4dd061687",
+        aaveV2Resolver: "0x7C5C59944263311a1e350E3B871B0d1d8E9A513E",
+        aaveV3Resolver: "0xB0862d7dB941698A0A92F8dF6672F4B56A5F5b02",
+        balanceResolver: "0xD45dFA34cEeAB567208041331F5ed9916C23b1E8",
     }
 };

package/dist/src/constants/blockConfirmations.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.blockConfirmations = void 0;
+exports.blockConfirmations = {
+    "1": 12,
+    "137": 32,
+    "43114": 12,
+};

package/dist/src/constants/capPerChain.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.capPerChain = void 0;
+exports.capPerChain = {
+    "1": 100000000,
+    "137": 100000000,
+    "43114": 100000000,
+};

package/dist/src/constants/index.js

@@ -16,3 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./addresses"), exports);
 __exportStar(require("./tokens"), exports);
+__exportStar(require("./blockConfirmations"), exports);
+__exportStar(require("./wrappedNativeToken"), exports);
+__exportStar(require("./capPerChain"), exports);

package/dist/src/constants/tokens.js

@@ -82,13 +82,6 @@ exports.tokens = {
             address: "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6",
             decimals: 8,
         },
-        {
-            aliases: ['avax'],
-            symbol: "AVAX",
-            name: "Avalanche Token",
-            address: "0x2C89bbc92BD86F8075d1DEcc58C7F4E0107f286b",
-            decimals: 18,
-        },
     ],
     43114: [
         {

package/dist/src/constants/wrappedNativeToken.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.wrappedNativeToken = void 0;
+exports.wrappedNativeToken = {
+    "1": '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+    "137": '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270',
+    "43114": '0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7'
+};

package/dist/src/crons/index.js

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

package/dist/src/crons/prices.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const services_1 = require("@/services");
+const node_cron_1 = __importDefault(require("node-cron"));
+services_1.Prices.fetch().catch(console.log);
+node_cron_1.default.schedule(`* * * * *`, async () => {
+    try {
+        await services_1.Prices.fetch();
+    }
+    catch (error) {
+        console.log("Prices: ", error.message);
+    }
+});

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

@@ -10,19 +10,23 @@ Transaction.init({
     id: {
         type: sequelize_2.DataTypes.INTEGER,
         autoIncrement: true,
-        primaryKey: true
+        primaryKey: true,
     },
-    requestTransactionHash: sequelize_2.DataTypes.NUMBER,
-    requestBlockNumber: sequelize_2.DataTypes.NUMBER,
     transactionHash: sequelize_2.DataTypes.STRING,
     actionId: sequelize_2.DataTypes.STRING,
-    bridger: sequelize_2.DataTypes.STRING,
+    vnonce: sequelize_2.DataTypes.STRING,
+    sourceSender: sequelize_2.DataTypes.STRING,
+    submitChainId: sequelize_2.DataTypes.NUMBER,
+    submitTransactionHash: sequelize_2.DataTypes.STRING,
+    submitBlockNumber: sequelize_2.DataTypes.NUMBER,
+    submitCreatedAt: sequelize_2.DataTypes.DATE,
     sourceChainId: sequelize_2.DataTypes.NUMBER,
+    sourceDsaId: sequelize_2.DataTypes.STRING,
     sourceTransactionHash: sequelize_2.DataTypes.STRING,
     sourceBlockNumber: sequelize_2.DataTypes.NUMBER,
     sourceStatus: {
         type: sequelize_2.DataTypes.STRING,
-        defaultValue: 'uninitialised'
+        defaultValue: "pending",
     },
     sourceErrors: {
         type: sequelize_2.DataTypes.JSON,
@@ -34,15 +38,16 @@ Transaction.init({
     },
     sourceCreatedAt: {
         type: sequelize_2.DataTypes.DATE,
-        defaultValue: Date.now()
+        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,
     targetBlockNumber: sequelize_2.DataTypes.NUMBER,
     targetStatus: {
         type: sequelize_2.DataTypes.STRING,
-        defaultValue: 'uninitialised'
+        defaultValue: "pending",
     },
     targetErrors: {
         type: sequelize_2.DataTypes.JSON,
@@ -54,17 +59,22 @@ Transaction.init({
     },
     targetCreatedAt: sequelize_2.DataTypes.DATE,
     targetDelayUntil: sequelize_2.DataTypes.DATE,
-    requestEvent: {
+    submitEvent: {
         type: sequelize_2.DataTypes.JSON,
-        allowNull: false
+        allowNull: false,
+    },
+    validateEvent: {
+        type: sequelize_2.DataTypes.JSON,
+        allowNull: true,
+    },
+    executeEvent: {
+        type: sequelize_2.DataTypes.JSON,
+        allowNull: true,
     },
-    requestSentEvent: sequelize_2.DataTypes.JSON,
-    committedEvent: sequelize_2.DataTypes.JSON,
-    completedEvent: sequelize_2.DataTypes.JSON,
     status: {
         type: sequelize_2.DataTypes.STRING,
-        defaultValue: 'pending'
+        defaultValue: "pending",
     },
     createdAt: sequelize_2.DataTypes.DATE,
     updatedAt: sequelize_2.DataTypes.DATE,
-}, { sequelize: sequelize_1.sequelize, tableName: 'transactions' });
+}, { sequelize: sequelize_1.sequelize, tableName: "transactions" });

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/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/aaveV2/source.js

@@ -0,0 +1,98 @@
+"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");
+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 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 sourceDsaAddress = await (0, utils_1.getDsaAccountAddress)({ dsaId: sourceDsaId, chainId: sourceChainId, provider: sourceChainProvider });
+    const sourceAavePosition = await sourceResolverContract.checkAavePosition(sourceDsaAddress, position, safeUserRatioGap, false);
+    const userSourceAaveIsOk = sourceAavePosition.isOk;
+    if (!userSourceAaveIsOk) {
+        throw new Error("Source chain aave position is not safe to migrate.");
+    }
+    const targetDsaAddress = await (0, utils_1.getDsaAccountAddress)({ dsaId: targetDsaId, chainId: targetChainId, provider: targetChainProvider });
+    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) {
+        let spellData = {
+            connector: "AAVE-V2-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-V2-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/aaveV2/target.js

@@ -0,0 +1,100 @@
+"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");
+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 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 targetDsaAddress = await (0, utils_1.getDsaAccountAddress)({ dsaId: targetDsaId, chainId: targetChainId, provider: targetChainProvider });
+    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);
+    const targetSpells = [];
+    const commonSpells = [];
+    for (const supplyToken of position.supply) {
+        let spellData = {
+            connector: "AAVE-V2-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-V2-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/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

@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const withdraw_1 = __importDefault(require("./withdraw"));
+const aaveV2_1 = __importDefault(require("./aaveV2"));
+const aaveV3_1 = __importDefault(require("./aaveV3"));
 exports.default = {
-    withdraw: withdraw_1.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 = '99c6cb0';
+const GIT_SHORT_HASH = '9d8d8b4';
 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();