@instadapp/interop-x 0.0.0-dev.96eff6f → 0.0.0-dev.982e230

package/dist/src/api/index.js

@@ -21,7 +21,7 @@ const startApiServer = async () => {
                 limit: 20,
                 offset: 0,
                 order: [
-                    ['createdAt', 'DESC']
+                    ['updatedAt', 'DESC']
                 ]
             });
         });

package/dist/src/constants/addresses.js

@@ -2,19 +2,16 @@
 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',
     },
     43114: {
         gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
         multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-        interopXContract: '0xCF391A3057eDba541c80307aC5E3Bc1E4a9471b7',
+        interopX: '0xd61f55C6d9deD35B9d13243b816c4BcC1d78592b',
+        dsaAddress: '0xFcB7d826E32081c4799de2f83b47b49df600dc8c',
     }
 };

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/index.js

@@ -16,3 +16,4 @@ 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);

package/dist/src/constants/tokens.js

@@ -2,50 +2,50 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tokens = void 0;
 exports.tokens = {
-    1: [
-        {
-            aliases: ['eth'],
-            symbol: "ETH",
-            name: "Ethereum",
-            address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-            decimals: 18,
-        },
-        {
-            aliases: ['weth'],
-            symbol: "WETH",
-            name: "Wrapped Ethereum",
-            address: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-            decimals: 18,
-        },
-        {
-            aliases: ['dai'],
-            symbol: "DAI",
-            name: "DAI Stable",
-            address: "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-            decimals: 18,
-        },
-        {
-            aliases: ['usdc'],
-            symbol: "USDC",
-            name: "USD Coin",
-            address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-            decimals: 6,
-        },
-        {
-            aliases: ['usdt'],
-            symbol: "USDT",
-            name: "Tether USD Coin",
-            address: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
-            decimals: 6,
-        },
-        {
-            aliases: ['wbtc'],
-            symbol: "WBTC",
-            name: "Wrapped BTC",
-            address: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
-            decimals: 8,
-        },
-    ],
+    // 1: [
+    //   {
+    //     aliases: ['eth'],
+    //     symbol: "ETH",
+    //     name: "Ethereum",
+    //     address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+    //     decimals: 18,
+    //   },
+    //   {
+    //     aliases: ['weth'],
+    //     symbol: "WETH",
+    //     name: "Wrapped Ethereum",
+    //     address: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
+    //     decimals: 18,
+    //   },
+    //   {
+    //     aliases: ['dai'],
+    //     symbol: "DAI",
+    //     name: "DAI Stable",
+    //     address: "0x6B175474E89094C44Da98b954EedeAC495271d0F",
+    //     decimals: 18,
+    //   },
+    //   {
+    //     aliases: ['usdc'],
+    //     symbol: "USDC",
+    //     name: "USD Coin",
+    //     address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+    //     decimals: 6,
+    //   },
+    //   {
+    //     aliases: ['usdt'],
+    //     symbol: "USDT",
+    //     name: "Tether USD Coin",
+    //     address: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+    //     decimals: 6,
+    //   },
+    //   {
+    //     aliases: ['wbtc'],
+    //     symbol: "WBTC",
+    //     name: "Wrapped BTC",
+    //     address: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
+    //     decimals: 8,
+    //   },
+    // ],
     137: [
         {
             aliases: ['eth', 'weth'],
@@ -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/db/models/transaction.js

@@ -12,17 +12,21 @@ Transaction.init({
         autoIncrement: 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,
@@ -38,11 +42,12 @@ Transaction.init({
     },
     sourceDelayUntil: sequelize_2.DataTypes.STRING,
     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,13 +59,10 @@ Transaction.init({
     },
     targetCreatedAt: sequelize_2.DataTypes.DATE,
     targetDelayUntil: sequelize_2.DataTypes.DATE,
-    requestEvent: {
+    submitEvent: {
         type: sequelize_2.DataTypes.JSON,
         allowNull: false
     },
-    requestSentEvent: sequelize_2.DataTypes.JSON,
-    committedEvent: sequelize_2.DataTypes.JSON,
-    completedEvent: sequelize_2.DataTypes.JSON,
     status: {
         type: sequelize_2.DataTypes.STRING,
         defaultValue: 'pending'

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,62 @@
+"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 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 ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(sourceChainId));
+    const sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, sourceChainProvider);
+    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-V2-A",
+            method: "payback",
+            args: [withdraw.sourceToken, withdraw.amount, "2", "0", "0"],
+        };
+        sourceSpells.push({
+            connector: spellData.method,
+            data: (0, utils_1.encodeConnectorMethod)(spellData),
+        });
+    }
+    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.method,
+            data: (0, utils_1.encodeConnectorMethod)(spellDataWithdraw),
+        });
+        let spellDataBasicWithdraw = {
+            connector: "BASIC-A",
+            method: "withdraw",
+            args: [supply.sourceToken, supply.amount, interopAddress, "0", "0"],
+        };
+        sourceSpells.push({
+            connector: spellDataBasicWithdraw.method,
+            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,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+async function default_1(transaction) {
+    const transactions = [];
+    const logs = [];
+    return { transactions, logs };
+}
+exports.default = default_1;

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

@@ -3,7 +3,7 @@ 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"));
 exports.default = {
-    withdraw: withdraw_1.default,
+    'A:AAVE-V2:AAVE-V2': aaveV2_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 = '96eff6f';
+const GIT_SHORT_HASH = '982e230';
 const printUsage = () => {
     console.log();
     console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);

package/dist/src/net/protocol/dial/SignatureDialProtocol.js

@@ -40,9 +40,9 @@ class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
         }
         const { data: gnosisData } = await (0, gnosis_1.buildGnosisAction)(transaction, data.type);
         const signedData = await (0, utils_1.signGnosisSafeTx)({
-            to: constants_1.addresses[transaction.sourceChainId].multisend,
+            to: constants_1.addresses[data.chainId].multisend,
             data: gnosisData,
-            chainId: transaction.sourceChainId,
+            chainId: data.chainId,
             safeTxGas: data.safeTxGas,
             nonce: data.safeNonce,
         }, { signer });

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

@@ -10,102 +10,124 @@ const abi_1 = __importDefault(require("@/abi"));
 const db_1 = require("@/db");
 const utils_1 = require("@/utils");
 const constants_1 = require("@/constants");
-const sequelize_1 = require("sequelize");
 const config_1 = __importDefault(require("@/config"));
-const waait_1 = __importDefault(require("waait"));
+const moment_1 = __importDefault(require("moment"));
+const sequelize_1 = require("sequelize");
 const gnosis_1 = require("@/gnosis");
 const net_1 = require("@/net");
-class ProccessBridgeRequestEvents extends BaseTask_1.BaseTask {
+const waait_1 = __importDefault(require("waait"));
+class ProcessSubmitSubmitEvents extends BaseTask_1.BaseTask {
     constructor({ chainId }) {
         super({
-            logger: new logger_1.default("InteropXContract::ProccessBridgeRequestEvents"),
+            logger: new logger_1.default("InteropX::ProcessSubmitSubmitEvents"),
         });
         this.leadNodeOnly = true;
+        this.blockConfirmationsCount = 12;
         this.chainId = chainId;
     }
     async pollHandler() {
         var _a;
-        const blockNumber = await this.provider.getBlockNumber();
+        const currentBlockNumber = await this.sourceProvider.getBlockNumber();
         const transaction = await db_1.Transaction.findOne({
             where: {
-                status: 'pending',
-                sourceStatus: 'uninitialised',
-                createdAt: {
-                    [sequelize_1.Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
+                status: "pending",
+                sourceStatus: "pending",
+                sourceChainId: this.chainId,
+                submitBlockNumber: {
+                    [sequelize_1.Op.lt]: currentBlockNumber - this.blockConfirmationsCount,
                 },
                 sourceDelayUntil: {
                     [sequelize_1.Op.or]: {
                         [sequelize_1.Op.is]: null,
                         [sequelize_1.Op.lt]: new Date(),
-                    }
+                    },
                 },
-                requestBlockNumber: {
-                    [sequelize_1.Op.lt]: blockNumber - 12,
+                submitEvent: { $ne: null },
+                createdAt: {
+                    [sequelize_1.Op.gt]: (0, moment_1.default)().subtract({ hours: 12 }).toDate(),
                 },
-                sourceChainId: this.chainId,
-            }
+            },
         });
         if (!transaction) {
             return;
         }
-        console.log(`Processing transaction ${transaction.transactionHash}`);
-        transaction.targetStatus = 'pending';
+        this.logger.debug(`Processing transaction ${transaction.transactionHash}`);
+        transaction.sourceStatus = "proccessing";
         await transaction.save();
-        const ownersThreshold = await this.safeContract.getThreshold();
+        const ownersThreshold = await this.sourceGnosisContract.getThreshold();
         await (0, waait_1.default)(10000);
+        this.logger.debug(`Build gnosis action for ${transaction.transactionHash}`);
         let data, logs = [];
         try {
-            ({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction, 'source'));
+            ({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction, "source"));
         }
         catch (error) {
-            console.log(error);
-            transaction.sourceStatus = 'failed';
+            if (error instanceof utils_1.LiquidityError) {
+                await transaction.save();
+                transaction.sourceDelayUntil = new Date(Date.now() + 60 * 5 * 1000);
+                transaction.sourceStatus = "pending";
+                await transaction.save();
+                throw error;
+                return;
+            }
+            transaction.sourceStatus = "failed";
             transaction.sourceErrors = [error.message];
-            transaction.targetStatus = 'failed';
-            transaction.status = 'failed';
+            transaction.targetStatus = "failed";
+            transaction.status = "failed";
             await transaction.save();
             net_1.protocol.sendTransaction(transaction);
             return;
         }
+        this.logger.debug(`Generating gnosis tx for ${transaction.transactionHash}`);
         let gnosisTx = await (0, utils_1.generateGnosisTransaction)({
             baseGas: "0",
             data,
             gasPrice: "0",
             gasToken: "0x0000000000000000000000000000000000000000",
-            nonce: '0',
+            nonce: "0",
             operation: "1",
             refundReceiver: "0x0000000000000000000000000000000000000000",
-            safeAddress: this.safeContractAddress,
+            safeAddress: this.sourceGnosisContract.address,
             safeTxGas: "79668",
             to: constants_1.addresses[transaction.sourceChainId].multisend,
             value: "0",
-        }, this.safeContract);
-        const owners = await this.safeContract.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);
+        }, 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}`);
         console.log(ownerPeerIds);
         const signatures = await net_1.protocol.requestSignatures({
-            type: 'source',
+            type: "source",
             transactionHash: transaction.transactionHash,
             safeTxGas: gnosisTx.safeTxGas,
-            safeNonce: gnosisTx.nonce
+            safeNonce: gnosisTx.nonce,
+            chainId: this.chainId,
         }, ownerPeerIds);
-        const validSignatures = signatures.filter(s => !!s.data && s.data !== '0x');
-        console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
-        if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
+        const validSignatures = signatures.filter((s) => !!s.data && s.data !== "0x");
+        console.log({
+            signatures,
+            validSignatures,
+            ownersThreshold: ownersThreshold.toString(),
+        });
+        if (validSignatures.length === 0 ||
+            ownersThreshold.gt(validSignatures.length)) {
             await transaction.save();
             transaction.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
-            transaction.sourceStatus = 'uninitialised';
+            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}` : ''));
+            const errorMessage = (_a = signatures.find((s) => !!s.error)) === null || _a === void 0 ? void 0 : _a.error;
+            throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ""));
         }
         console.log(`Executing transaction for execution ${transaction.transactionHash}`);
-        const { data: txData } = await this.safeContract.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));
+        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));
         const txSent = await this.sourceWallet.sendTransaction({
             from: this.sourceWallet.address,
             gasPrice: ethers_1.ethers.BigNumber.from(120 * 10 ** 9),
-            to: this.safeContractAddress,
+            to: this.sourceGnosisContract.address,
             data: txData,
         });
         console.log(txSent);
@@ -113,40 +135,37 @@ class ProccessBridgeRequestEvents extends BaseTask_1.BaseTask {
         const parsedLogs = [];
         receipt.logs.forEach((log) => {
             try {
-                parsedLogs.push(this.safeContract.interface.parseLog(log));
+                parsedLogs.push(this.sourceGnosisContract.interface.parseLog(log));
             }
             catch (e) { }
         });
-        if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
-            console.log('ExecutionSuccess');
-            transaction.sourceStatus = 'success';
+        if (parsedLogs.find((e) => e.name === "ExecutionSuccess")) {
+            console.log("ExecutionSuccess");
+            transaction.sourceStatus = "success";
             if (txSent.blockNumber)
                 transaction.sourceBlockNumber = txSent.blockNumber;
             transaction.sourceTransactionHash = txSent.hash;
             transaction.sourceLogs = logs;
-            transaction.status = 'success';
             await transaction.save();
         }
         else {
-            console.log('ExecutionFailure');
-            transaction.sourceStatus = 'failed';
+            console.log("ExecutionFailure");
+            transaction.sourceStatus = "failed";
             if (txSent.blockNumber)
                 transaction.sourceBlockNumber = txSent.blockNumber;
             transaction.sourceTransactionHash = txSent.hash;
             transaction.sourceTransactionHash = txSent.hash;
-            transaction.status = 'failed';
+            transaction.status = "failed";
             await transaction.save();
         }
         net_1.protocol.sendTransaction(transaction);
     }
     async start() {
-        this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
-        this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
-        this.sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider);
-        this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXContract, this.sourceWallet);
-        this.safeContractAddress = constants_1.addresses[this.chainId].gnosisSafe;
-        this.safeContract = (0, utils_1.getContract)(this.safeContractAddress, abi_1.default.gnosisSafe, this.sourceWallet);
+        this.blockConfirmationsCount = constants_1.blockConfirmations[this.chainId] + 1;
+        this.sourceProvider = new ethers_1.ethers.providers.JsonRpcProvider((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 = ProccessBridgeRequestEvents;
+exports.default = ProcessSubmitSubmitEvents;

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

@@ -11,55 +11,63 @@ const db_1 = require("@/db");
 const utils_1 = require("@/utils");
 const constants_1 = require("@/constants");
 const config_1 = __importDefault(require("@/config"));
-class SyncBridgeRequestEvents extends BaseTask_1.BaseTask {
+class SyncLogSubmitEvents extends BaseTask_1.BaseTask {
     constructor({ chainId }) {
         super({
-            logger: new logger_1.default("InteropXContract::SyncBridgeRequestEvents"),
+            logger: new logger_1.default("InteropX::SyncLogSubmitEvents"),
         });
         this.chainId = chainId;
     }
     async pollHandler() {
         const currentBlock = await this.provider.getBlockNumber();
-        const events = await this.contract.queryFilter(this.contract.filters.LogBridgeRequest(), currentBlock - 2000, currentBlock);
+        const events = await this.contract.queryFilter(this.contract.filters.LogSubmit(), currentBlock - 2000, currentBlock);
         let processedEvents = 0;
         for (const event of events) {
             try {
                 if (!event.args) {
                     continue;
                 }
-                const { actionId, bridger, position, sourceChainId, targetChainId, metadata } = event.args;
+                const { position, actionId, actionIdHashHash, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata, } = event.args;
                 const uniqueIdentifier = {
                     actionId,
-                    bridger,
-                    requestTransactionHash: event.transactionHash,
+                    vnonce: vnonce.toString(),
+                    sourceSender: sourceSender.toString(),
                     sourceChainId: sourceChainId.toNumber(),
                     targetChainId: targetChainId.toNumber(),
+                    sourceDsaId: sourceDsaId.toString(),
+                    targetDsaId: targetDsaId.toString(),
                 };
                 let transactionHash = (0, utils_1.generateInteropTransactionHash)(uniqueIdentifier);
-                const transaction = await db_1.Transaction.findOne({ where: { transactionHash } });
+                const transaction = await db_1.Transaction.findOne({
+                    where: { transactionHash },
+                });
                 if (transaction) {
                     continue;
                 }
-                await db_1.Transaction.create(Object.assign(Object.assign({ transactionHash }, uniqueIdentifier), { requestBlockNumber: event.blockNumber, requestEvent: {
+                await db_1.Transaction.create(Object.assign(Object.assign({ transactionHash }, uniqueIdentifier), { submitChainId: this.chainId, submitTransactionHash: event.transactionHash, submitBlockNumber: event.blockNumber, submitCreatedAt: new Date(), submitEvent: {
                         actionId,
-                        bridger,
+                        actionIdHashHash,
+                        vnonce: vnonce.toString(),
                         position: {
                             withdraw: position.withdraw.map((v) => ({
                                 sourceToken: v.sourceToken,
                                 targetToken: v.targetToken,
-                                amount: v.amount.toString()
+                                amount: v.amount.toString(),
                             })),
                             supply: position.supply.map((v) => ({
                                 sourceToken: v.sourceToken,
                                 targetToken: v.targetToken,
-                                amount: v.amount.toString()
+                                amount: v.amount.toString(),
                             })),
                         },
                         sourceChainId: sourceChainId.toNumber(),
                         targetChainId: targetChainId.toNumber(),
+                        sourceSender,
+                        sourceDsaId: sourceDsaId.toString(),
+                        targetDsaId: targetDsaId.toString(),
                         metadata,
                     } }));
-                this.logger.info(`New bridge request received: ${transactionHash} `);
+                this.logger.info(`New InteropX tranaction: ${transactionHash} `);
             }
             catch (error) {
                 this.logger.error(error);
@@ -69,10 +77,10 @@ class SyncBridgeRequestEvents extends BaseTask_1.BaseTask {
             this.logger.info(`${processedEvents} events processed`);
     }
     async start() {
-        this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
+        this.contractAddress = constants_1.addresses[this.chainId].interopX;
         this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
-        this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXContract, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
+        this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopX, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
         await super.start();
     }
 }
-exports.default = SyncBridgeRequestEvents;
+exports.default = SyncLogSubmitEvents;