@instadapp/interop-x 0.0.0-dev.733ff78 → 0.0.0-dev.76d0265

package/dist/src/constants/tokens.js

@@ -2,102 +2,125 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tokens = void 0;
 exports.tokens = {
-    1: [
-        {
-            symbol: "ETH",
-            name: "Ethereum",
-            address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-            decimals: 18,
-        },
-        {
-            symbol: "DAI",
-            name: "DAI Stable",
-            address: "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-            decimals: 18,
-        },
-        {
-            symbol: "USDC",
-            name: "USD Coin",
-            address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-            decimals: 6,
-        },
-        {
-            symbol: "USDT",
-            name: "Tether USD Coin",
-            address: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
-            decimals: 6,
-        },
-        {
-            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'],
             symbol: "ETH",
             name: "Ethereum",
             address: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
             decimals: 18,
         },
         {
+            aliases: ['dai'],
             symbol: "DAI",
             name: "DAI Stable",
             address: "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063",
             decimals: 18,
         },
         {
+            aliases: ['usdc'],
             symbol: "USDC",
             name: "USD Coin",
             address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
             decimals: 6,
         },
         {
+            aliases: ['usdt'],
             symbol: "USDT",
             name: "Tether USD Coin",
             address: "0xc2132D05D31c914a87C6611C10748AEb04B58e8F",
             decimals: 6,
         },
         {
+            aliases: ['wbtc'],
             symbol: "WBTC",
             name: "Wrapped BTC",
             address: "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6",
             decimals: 8,
         },
-        {
-            symbol: "AVAX",
-            name: "Avalanche Token",
-            address: "0x2C89bbc92BD86F8075d1DEcc58C7F4E0107f286b",
-            decimals: 18,
-        },
     ],
     43114: [
         {
+            aliases: ['eth', 'weth'],
             symbol: "ETH",
             name: "Ethereum",
             address: "0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB",
             decimals: 18,
         },
         {
+            aliases: ['dai'],
             symbol: "DAI",
             name: "DAI Stable",
             address: "0xd586E7F844cEa2F87f50152665BCbc2C279D8d70",
             decimals: 18,
         },
         {
+            aliases: ['usdc'],
             symbol: "USDC",
             name: "USD Coin",
             address: "0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664",
             decimals: 6,
         },
         {
-            symbol: "USDT",
+            aliases: ['usdt'],
+            symbol: "USDt",
             name: "Tether USD Coin",
+            address: "0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7",
+            decimals: 6,
+        },
+        {
+            aliases: ['usdt'],
+            symbol: "USDT.e",
+            name: "Tether USD",
             address: "0xc7198437980c041c805A1EDcbA50c1Ce5db95118",
             decimals: 6,
         },
         {
+            aliases: ["wbtc"],
             symbol: "WBTC",
             name: "Wrapped BTC",
             address: "0x50b7545627a5162F82A992c33b87aDc75187B218",

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

@@ -12,16 +12,18 @@ Transaction.init({
         autoIncrement: true,
         primaryKey: true
     },
-    submitTransactionHash: sequelize_2.DataTypes.NUMBER,
-    submitBlockNumber: sequelize_2.DataTypes.NUMBER,
+    requestTransactionHash: sequelize_2.DataTypes.NUMBER,
+    requestBlockNumber: sequelize_2.DataTypes.NUMBER,
     transactionHash: sequelize_2.DataTypes.STRING,
-    action: sequelize_2.DataTypes.STRING,
-    from: sequelize_2.DataTypes.STRING,
-    to: sequelize_2.DataTypes.STRING,
+    actionId: sequelize_2.DataTypes.STRING,
+    bridger: sequelize_2.DataTypes.STRING,
     sourceChainId: sequelize_2.DataTypes.NUMBER,
     sourceTransactionHash: sequelize_2.DataTypes.STRING,
     sourceBlockNumber: sequelize_2.DataTypes.NUMBER,
-    sourceStatus: sequelize_2.DataTypes.STRING,
+    sourceStatus: {
+        type: sequelize_2.DataTypes.STRING,
+        defaultValue: 'uninitialised'
+    },
     sourceErrors: {
         type: sequelize_2.DataTypes.JSON,
         // defaultValue: [],
@@ -38,7 +40,10 @@ Transaction.init({
     targetChainId: sequelize_2.DataTypes.NUMBER,
     targetTransactionHash: sequelize_2.DataTypes.STRING,
     targetBlockNumber: sequelize_2.DataTypes.NUMBER,
-    targetStatus: sequelize_2.DataTypes.STRING,
+    targetStatus: {
+        type: sequelize_2.DataTypes.STRING,
+        defaultValue: 'uninitialised'
+    },
     targetErrors: {
         type: sequelize_2.DataTypes.JSON,
         // defaultValue: [],
@@ -49,10 +54,13 @@ Transaction.init({
     },
     targetCreatedAt: sequelize_2.DataTypes.DATE,
     targetDelayUntil: sequelize_2.DataTypes.DATE,
-    submitEvent: sequelize_2.DataTypes.JSON,
-    sourceEvent: sequelize_2.DataTypes.JSON,
-    targetEvent: sequelize_2.DataTypes.JSON,
-    metadata: sequelize_2.DataTypes.JSON,
+    requestEvent: {
+        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/index.js

@@ -3,9 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const deposit_1 = __importDefault(require("./deposit"));
 const withdraw_1 = __importDefault(require("./withdraw"));
 exports.default = {
-    deposit: deposit_1.default,
     withdraw: withdraw_1.default,
 };

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

@@ -0,0 +1,115 @@
+"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");
+const getBridgeAmounts = async (user, tokens, chainId) => {
+    const sourceChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(chainId));
+    const sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, sourceChainProvider);
+    const contractAddress = constants_1.addresses[chainId].interopXContract;
+    const contract = (0, utils_1.getContract)(contractAddress, abi_1.default.interopXContract, sourceWallet);
+    const data = await contract.getBridgeAmounts(user, tokens);
+    return data.map((item, index) => ({
+        token: tokens[index],
+        deposit: item.deposit,
+        withdraw: item.withdraw,
+    }));
+};
+async function default_1(transaction, type) {
+    const transactions = [];
+    const logs = [];
+    if (transaction.actionId !== 'withdraw') {
+        throw new Error(`Invalid action: ${transaction.actionId}`);
+    }
+    if (type !== 'source') {
+        throw new Error(`[WIP] Type not supported: ${type}`);
+    }
+    if (transaction.sourceStatus === 'pending') {
+        throw Error('Source transaction already processesing');
+    }
+    if (transaction.sourceStatus === 'pending') {
+        throw Error('Source transaction already processed');
+    }
+    if (!transaction.requestEvent) {
+        throw Error('Something went wrong, source transaction has no request event');
+    }
+    const { actionId, bridger, position, sourceChainId, targetChainId, metadata } = transaction.requestEvent;
+    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 contractAddress = constants_1.addresses[sourceChainId].interopXContract;
+    const contract = (0, utils_1.getContract)(contractAddress, abi_1.default.interopXContract, sourceWallet);
+    const sourceToken = constants_1.tokens[sourceChainId].find(t => t.address.toLowerCase() === position.withdraw[0].sourceToken.toLowerCase());
+    if (!sourceToken) {
+        throw Error('Source token not found');
+    }
+    const targetToken = constants_1.tokens[targetChainId].find(t => t.address.toLowerCase() === position.withdraw[0].targetToken.toLowerCase());
+    if (!targetToken) {
+        throw Error('Target token not found');
+    }
+    if (!sourceToken.aliases.some(alias => targetToken.aliases.includes(alias))) {
+        throw Error('Source and target token must be the same');
+    }
+    const networks = [137, 43114];
+    const networkUserData = {};
+    for (const network of networks) {
+        networkUserData[network] = await getBridgeAmounts(bridger, constants_1.tokens[network].map(t => t.address), network);
+    }
+    for (const tokenSymbol of ["dai", "usdc", "usdt", "eth", "wbtc"]) {
+        let totalDeposit = ethers_1.BigNumber.from(0);
+        let totalWithdraw = ethers_1.BigNumber.from(0);
+        for (const network of networks) {
+            // on avax might we have 2 usdc/usdt tokens
+            const matchedTokens = constants_1.tokens[network].filter(t => t.aliases.includes(tokenSymbol));
+            for (const matchedToken of matchedTokens) {
+                const data = networkUserData[network].find(t => t.token.toLowerCase() === matchedToken.address.toLowerCase());
+                if (data) {
+                    totalDeposit = totalDeposit.add(data.deposit);
+                    totalWithdraw = totalWithdraw.add(data.withdraw);
+                }
+            }
+            //  on Mainent add weth too
+            if (tokenSymbol === "eth" && network === 1) {
+                const weth = constants_1.tokens[1].find(t => t.symbol === 'WETH');
+                if (weth) {
+                    const data = networkUserData[1].find(t => t.token.toLowerCase() === weth.address.toLowerCase());
+                    if (data) {
+                        totalDeposit = totalDeposit.add(data.deposit);
+                        totalWithdraw = totalWithdraw.add(data.withdraw);
+                    }
+                }
+            }
+            if (totalWithdraw.gt(totalDeposit)) {
+                throw Error(`if withdraw > deposit, user has debt and we can't process the withdraw and reject it`);
+            }
+            if (totalWithdraw.lt(totalDeposit)) {
+                throw Error('Something went wrong');
+            }
+        }
+    }
+    let balance = ethers_1.BigNumber.from(0);
+    if (position.withdraw[0].sourceToken.toLowerCase() === '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE'.toLowerCase()) {
+        balance = await sourceChainProvider.getBalance(bridger);
+    }
+    else {
+        const erc20 = (0, utils_1.getContract)(position.withdraw[0].sourceToken, abi_1.default.erc20, sourceChainProvider);
+        balance = await erc20.balanceOf(constants_1.addresses[sourceChainId].gnosisSafe);
+    }
+    if (balance.lt(position.withdraw[0].amount)) {
+        throw new utils_1.LiquidityError();
+    }
+    const { data } = await contract.populateTransaction.withdrawRequested(actionId, bridger, position.withdraw[0].sourceToken, position.withdraw[0].targetToken, position.withdraw[0].amount, targetChainId, transaction.requestTransactionHash, metadata);
+    transactions.push({
+        to: contractAddress,
+        data: data,
+        value: '0',
+        operation: ethers_multisend_1.OperationType.Call,
+    });
+    return { transactions, logs };
+}
+exports.default = default_1;

package/dist/src/gnosis/index.js

@@ -7,14 +7,14 @@ exports.buildGnosisAction = void 0;
 const ethers_multisend_1 = require("ethers-multisend");
 const actions_1 = __importDefault(require("./actions"));
 const buildGnosisAction = async (transaction, type) => {
-    type = type || transaction.sourceStatus === 'pending' ? 'source' : 'target';
-    if (actions_1.default.hasOwnProperty(transaction.action)) {
-        const { transactions, logs } = await actions_1.default[transaction.action](transaction, type);
+    // type = type || (transaction.sourceStatus === 'success' ? 'target' : 'source')
+    if (actions_1.default.hasOwnProperty(transaction.actionId)) {
+        const { transactions, logs } = await actions_1.default[transaction.actionId](transaction, type);
         return {
             data: (0, ethers_multisend_1.encodeMulti)(transactions).data,
             logs
         };
     }
-    throw new Error(`Unknown action: ${transaction.action}`);
+    throw new Error(`Unknown action: ${transaction.actionId}`);
 };
 exports.buildGnosisAction = buildGnosisAction;

package/dist/src/index.js

@@ -3,25 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const module_alias_1 = __importDefault(require("module-alias"));
+require("./alias");
 const expand_home_dir_1 = __importDefault(require("expand-home-dir"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-module_alias_1.default.addAliases({
-    "@/": __dirname + "/",
-    "@/logger": __dirname + "/logger",
-    "@/tasks": __dirname + "/tasks",
-    "@/gnosis": __dirname + "/gnosis",
-    "@/utils": __dirname + "/utils",
-    "@/api": __dirname + "/api",
-    "@/net": __dirname + "/net",
-    "@/db": __dirname + "/db",
-    "@/config": __dirname + "/config",
-    "@/types": __dirname + "/types",
-    "@/abi": __dirname + "/abi",
-    "@/constants": __dirname + "/constants",
-    "@/typechain": __dirname + "/typechain"
-});
-(0, module_alias_1.default)();
 const dotenv_1 = __importDefault(require("dotenv"));
 const chalk_1 = __importDefault(require("chalk"));
 const ethers_1 = require("ethers");
@@ -29,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 = '733ff78';
+const GIT_SHORT_HASH = '76d0265';
 const printUsage = () => {
     console.log();
     console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
@@ -88,7 +72,9 @@ const utils_1 = require("./utils");
 async function main() {
     (0, net_1.startPeer)({});
     const tasks = new tasks_1.Tasks();
-    tasks.start();
+    setTimeout(() => {
+        tasks.start();
+    }, 10000);
     (0, api_1.startApiServer)();
     net_1.protocol.on('TransactionStatus', async (payload) => {
         if (!net_1.peerPool.isLeadNode(payload.peerId)) {

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

@@ -17,6 +17,10 @@ class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
         this.timeout = 30000;
     }
     async response(data) {
+        console.log({
+            tag: 'SignatureDialProtocol',
+            data
+        });
         const signer = config_1.default.wallet;
         let transaction;
         let maxTimeout = 20000;
@@ -36,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.targetChainId].multisend,
+            to: constants_1.addresses[transaction.sourceChainId].multisend,
             data: gnosisData,
-            chainId: transaction.targetChainId,
+            chainId: transaction.sourceChainId,
             safeTxGas: data.safeTxGas,
             nonce: data.safeNonce,
         }, { signer });

package/dist/src/tasks/{InteropBridge/ProcessWithdrawEvents.js → InteropXContract/ProcessBridgeRequestEvents.js}

@@ -10,24 +10,15 @@ const abi_1 = __importDefault(require("@/abi"));
 const db_1 = require("@/db");
 const utils_1 = require("@/utils");
 const constants_1 = require("@/constants");
-const config_1 = __importDefault(require("@/config"));
 const sequelize_1 = require("sequelize");
+const config_1 = __importDefault(require("@/config"));
 const waait_1 = __importDefault(require("waait"));
-const net_1 = require("@/net");
 const gnosis_1 = require("@/gnosis");
-const generateGnosisTransaction = async (transactionData, safeContract) => {
-    console.log(transactionData);
-    let isExecuted = await safeContract.dataHashes(await safeContract.getTransactionHash(transactionData.to, transactionData.value, transactionData.data, transactionData.operation, transactionData.safeTxGas, transactionData.baseGas, transactionData.gasPrice, transactionData.gasToken, transactionData.refundReceiver, transactionData.nonce));
-    while (isExecuted == 1) {
-        transactionData.safeTxGas = ethers_1.BigNumber.from(String(transactionData.safeTxGas)).add(1).toString();
-        isExecuted = await safeContract.dataHashes(await safeContract.getTransactionHash(transactionData.to, transactionData.value, transactionData.data, transactionData.operation, transactionData.safeTxGas, transactionData.baseGas, transactionData.gasPrice, transactionData.gasToken, transactionData.refundReceiver, transactionData.nonce));
-    }
-    return transactionData;
-};
-class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
+const net_1 = require("@/net");
+class ProccessBridgeRequestEvents extends BaseTask_1.BaseTask {
     constructor({ chainId }) {
         super({
-            logger: new logger_1.default("InteropXGateway::ProcessWithdrawEvents"),
+            logger: new logger_1.default("InteropXContract::ProccessBridgeRequestEvents"),
         });
         this.leadNodeOnly = true;
         this.chainId = chainId;
@@ -38,19 +29,17 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
         const transaction = await db_1.Transaction.findOne({
             where: {
                 status: 'pending',
-                sourceStatus: 'success',
-                targetStatus: 'uninitialised',
-                action: 'withdraw',
-                sourceCreatedAt: {
+                sourceStatus: 'uninitialised',
+                createdAt: {
                     [sequelize_1.Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
                 },
-                targetDelayUntil: {
+                sourceDelayUntil: {
                     [sequelize_1.Op.or]: {
                         [sequelize_1.Op.is]: null,
                         [sequelize_1.Op.lt]: new Date(),
                     }
                 },
-                sourceBlockNumber: {
+                requestBlockNumber: {
                     [sequelize_1.Op.lt]: blockNumber - 12,
                 },
                 sourceChainId: this.chainId,
@@ -62,27 +51,30 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
         console.log(`Processing transaction ${transaction.transactionHash}`);
         transaction.targetStatus = 'pending';
         await transaction.save();
-        // refresh event data?
-        const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(transaction.targetChainId));
-        const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
-        const safeAddress = constants_1.addresses[transaction.targetChainId].gnosisSafe;
-        const safeContract = (0, utils_1.getContract)(safeAddress, abi_1.default.gnosisSafe, targetWallet);
-        const ownersThreshold = await safeContract.getThreshold();
+        const ownersThreshold = await this.safeContract.getThreshold();
         await (0, waait_1.default)(10000);
         let data, logs = [];
         try {
-            ({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction));
+            ({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction, 'source'));
         }
         catch (error) {
-            console.log(error);
+            if (error instanceof utils_1.LiquidityError) {
+                await transaction.save();
+                transaction.sourceDelayUntil = new Date(Date.now() + 60 * 5 * 1000);
+                transaction.sourceStatus = 'uninitialised';
+                await transaction.save();
+                throw error;
+                return;
+            }
+            transaction.sourceStatus = 'failed';
+            transaction.sourceErrors = [error.message];
             transaction.targetStatus = 'failed';
-            transaction.targetErrors = [error.message];
             transaction.status = 'failed';
             await transaction.save();
             net_1.protocol.sendTransaction(transaction);
             return;
         }
-        let gnosisTx = await generateGnosisTransaction({
+        let gnosisTx = await (0, utils_1.generateGnosisTransaction)({
             baseGas: "0",
             data,
             gasPrice: "0",
@@ -90,12 +82,12 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
             nonce: '0',
             operation: "1",
             refundReceiver: "0x0000000000000000000000000000000000000000",
-            safeAddress: safeAddress,
+            safeAddress: this.safeContractAddress,
             safeTxGas: "79668",
-            to: constants_1.addresses[transaction.targetChainId].multisend,
+            to: constants_1.addresses[transaction.sourceChainId].multisend,
             value: "0",
-        }, safeContract);
-        const owners = await safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
+        }, 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);
         console.log(`Collecting signatures for execution ${transaction.transactionHash}`);
         console.log(ownerPeerIds);
@@ -109,54 +101,59 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
         console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
         if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
             await transaction.save();
-            transaction.targetDelayUntil = new Date(Date.now() + 30 * 1000);
-            transaction.targetStatus = 'uninitialised';
+            transaction.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
+            transaction.sourceStatus = 'uninitialised';
             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}` : ''));
         }
         console.log(`Executing transaction for execution ${transaction.transactionHash}`);
-        const { data: txData } = await 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));
-        console.log({
-            from: targetWallet.address,
-            gasPrice: ethers_1.BigNumber.from(120 * 10 ** 9).toString(),
-            to: safeAddress,
-            data: txData,
-        });
-        const txSent = await targetWallet.sendTransaction({
-            from: targetWallet.address,
-            gasPrice: ethers_1.BigNumber.from(120 * 10 ** 9),
-            to: safeAddress,
+        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 txSent = await this.sourceWallet.sendTransaction({
+            from: this.sourceWallet.address,
+            gasPrice: ethers_1.ethers.BigNumber.from(120 * 10 ** 9),
+            to: this.safeContractAddress,
             data: txData,
         });
+        console.log(txSent);
         const receipt = await txSent.wait();
         const parsedLogs = [];
         receipt.logs.forEach((log) => {
             try {
-                parsedLogs.push(safeContract.interface.parseLog(log));
+                parsedLogs.push(this.safeContract.interface.parseLog(log));
             }
             catch (e) { }
         });
         if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
             console.log('ExecutionSuccess');
-            transaction.targetStatus = 'success';
-            transaction.targetTransactionHash = txSent.hash;
-            transaction.targetLogs = logs;
+            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.targetStatus = 'failed';
-            transaction.targetTransactionHash = txSent.hash;
+            transaction.sourceStatus = 'failed';
+            if (txSent.blockNumber)
+                transaction.sourceBlockNumber = txSent.blockNumber;
+            transaction.sourceTransactionHash = txSent.hash;
+            transaction.sourceTransactionHash = txSent.hash;
             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);
         await super.start();
     }
 }
-exports.default = ProcessWithdrawEvents;
+exports.default = ProccessBridgeRequestEvents;