@instadapp/interop-x 0.0.0-dev.285d847 → 0.0.0-dev.28f049d

package/dist/src/gnosis/index.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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);
+        return {
+            data: (0, ethers_multisend_1.encodeMulti)(transactions).data,
+            logs
+        };
+    }
+    throw new Error(`Unknown action: ${transaction.action}`);
+};
+exports.buildGnosisAction = buildGnosisAction;

package/dist/src/index.js

@@ -3,22 +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"));
-module_alias_1.default.addAliases({
-    "@/": __dirname + "/",
-    "@/logger": __dirname + "/logger",
-    "@/tasks": __dirname + "/tasks",
-    "@/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)();
+require("./alias");
+const expand_home_dir_1 = __importDefault(require("expand-home-dir"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const dotenv_1 = __importDefault(require("dotenv"));
 const chalk_1 = __importDefault(require("chalk"));
 const ethers_1 = require("ethers");
@@ -26,19 +13,41 @@ 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 = '28f049d';
 const printUsage = () => {
+    console.log();
+    console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
+    console.log();
     console.log('Usage:');
-    console.log('   PRIVATE_KEY=abcd1234 interop-x');
-    console.log('   PRIVATE_KEY=abcd1234 STAGING=true interop-x');
-    console.log('   PRIVATE_KEY=abcd1234 AUTO_UPDATE=true interop-x');
-    console.log('   PRIVATE_KEY=abcd1234 API_HOST=0.0.0.0 API_PORT=8080 interop-x');
+    console.log('   interop-x help                                                              Show this message');
+    console.log('   interop-x version                                                           Print out the installed version of Interop X');
+    console.log();
+    console.log('   interop-x down                                                              Put the node into maintenance mode');
+    console.log('   interop-x up                                                                Take the node out of maintenance mode');
+    console.log();
+    console.log('   PRIVATE_KEY=abcd1234 interop-x                                              Start the node with the given private key');
+    console.log('   PRIVATE_KEY=abcd1234 STAGING=true interop-x                                 Start the node in staging mode');
+    console.log('   PRIVATE_KEY=abcd1234 AUTO_UPDATE=true interop-x                             Start the node in auto update mode');
+    console.log('   PRIVATE_KEY=abcd1234 API_HOST=0.0.0.0 API_PORT=8080 interop-x               Start the node with custom API host and port');
+    console.log();
 };
 if (process.argv.at(-1) === 'help') {
     printUsage();
     process.exit(0);
 }
+const basePath = (0, expand_home_dir_1.default)(`~/.interop-x`);
+if (process.argv.at(-1) === 'down') {
+    fs_extra_1.default.outputFileSync(basePath + '/maintenance', Date.now().toString());
+    console.log(chalk_1.default.red('Maintenance mode enabled'));
+    process.exit(0);
+}
+if (process.argv.at(-1) === 'up') {
+    fs_extra_1.default.removeSync(basePath + '/maintenance');
+    console.log(chalk_1.default.green('Maintenance mode disabled'));
+    process.exit(0);
+}
 if (process.argv.at(-1) === 'version') {
-    console.log(`Interop X Node (v${package_json_1.default.version} - rev.285d847)`);
+    console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
     process.exit(0);
 }
 if (!process.env.PRIVATE_KEY) {
@@ -54,11 +63,12 @@ catch (e) {
     printUsage();
     process.exit(1);
 }
-logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.@GIT_SHORT_HASH@)`);
+logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
 const tasks_1 = require("@/tasks");
 const net_1 = require("@/net");
 const api_1 = require("@/api");
 const db_1 = require("./db");
+const utils_1 = require("./utils");
 async function main() {
     (0, net_1.startPeer)({});
     const tasks = new tasks_1.Tasks();
@@ -67,7 +77,10 @@ async function main() {
     net_1.protocol.on('TransactionStatus', async (payload) => {
         if (!net_1.peerPool.isLeadNode(payload.peerId)) {
             const peer = net_1.peerPool.getPeer(payload.peerId);
-            logger.info(`ignored transaction status from ${payload.peerId} ${peer === null || peer === void 0 ? void 0 : peer.publicAddress} `);
+            if (!peer) {
+                return;
+            }
+            logger.info(`ignored transaction status from ${payload.peerId} ${(0, utils_1.shortenHash)(peer.publicAddress)} `);
             return;
         }
         const transaction = await db_1.Transaction.findOne({ where: { transactionHash: payload.data.transactionHash } });
@@ -77,9 +90,11 @@ async function main() {
         transaction.sourceStatus = payload.data.sourceStatus;
         transaction.sourceTransactionHash = payload.data.sourceTransactionHash;
         transaction.sourceErrors = payload.data.sourceErrors;
+        transaction.sourceLogs = payload.data.sourceLogs;
         transaction.targetStatus = payload.data.targetStatus;
         transaction.targetTransactionHash = payload.data.targetTransactionHash;
         transaction.targetErrors = payload.data.targetErrors;
+        transaction.targetLogs = payload.data.targetLogs;
         transaction.status = payload.data.status;
         await transaction.save();
     });

package/dist/src/net/peer/index.js

@@ -23,6 +23,7 @@ const libp2p_kad_dht_1 = __importDefault(require("libp2p-kad-dht"));
 const libp2p_pubsub_peer_discovery_1 = __importDefault(require("libp2p-pubsub-peer-discovery"));
 const net_1 = require("@/net");
 const config_1 = __importDefault(require("@/config"));
+const chalk_1 = __importDefault(require("chalk"));
 const logger = new logger_1.default("Peer");
 let node;
 // Known peers addresses
@@ -77,7 +78,7 @@ const startPeer = async ({}) => {
             persistence: true,
         },
     });
-    logger.info("Peer ID:", node.peerId.toB58String());
+    logger.info("Peer ID:", chalk_1.default.bold(node.peerId.toB58String()));
     await node.start();
     net_1.protocol.start({
         libp2p: node

package/dist/src/net/pool/index.js

@@ -8,6 +8,8 @@ const types_1 = require("@/types");
 const config_1 = __importDefault(require("@/config"));
 const logger_1 = __importDefault(require("@/logger"));
 const utils_1 = require("ethers/lib/utils");
+const utils_2 = require("@/utils");
+const chalk_1 = __importDefault(require("chalk"));
 const logger = new logger_1.default('PeerPool');
 class PeerPool {
     constructor() {
@@ -71,7 +73,7 @@ class PeerPool {
             peer.pooled = true;
             if (newPeer) {
                 config_1.default.events.emit(types_1.Event.POOL_PEER_ADDED, peer);
-                logger.info(`Peer ${peer.id} with address ${peer.publicAddress} added to pool`);
+                logger.info(`Peer ${chalk_1.default.bold((0, utils_2.shortenHash)(peer.id, 16))} with address ${chalk_1.default.bold((0, utils_2.shortenHash)(peer.publicAddress))} added to pool`);
             }
         }
     }
@@ -85,7 +87,7 @@ class PeerPool {
             if (this.pool.delete(peer.id)) {
                 peer.pooled = false;
                 config_1.default.events.emit(types_1.Event.POOL_PEER_REMOVED, peer);
-                logger.info(`Peer ${peer.id} with address ${peer.publicAddress} removed from pool`);
+                logger.info(`Peer ${chalk_1.default.bold((0, utils_2.shortenHash)(peer.id, 16))} with address ${chalk_1.default.bold((0, utils_2.shortenHash)(peer.publicAddress))} removed from pool`);
             }
         }
     }
@@ -111,6 +113,9 @@ class PeerPool {
         }
         return (0, utils_1.getAddress)(peer.publicAddress) === (0, utils_1.getAddress)(config_1.default.leadNodeAddress);
     }
+    getLeadPeer() {
+        return this.peers.find((p) => this.isLeadNode(p.id));
+    }
     cleanup() {
         // let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
         // this.peers.forEach((peerInfo) => {

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

@@ -10,6 +10,7 @@ const config_1 = __importDefault(require("@/config"));
 const db_1 = require("@/db");
 const utils_1 = require("@/utils");
 const constants_1 = require("@/constants");
+const gnosis_1 = require("@/gnosis");
 class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
     constructor(libp2p) {
         super(libp2p, '/interop-x/signatures');
@@ -33,16 +34,10 @@ class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
                 error: 'Event not found'
             };
         }
-        console.log("signing:", {
-            to: constants_1.addresses[transaction.targetChainId].multisend,
-            data: await (0, utils_1.buildDataForTransaction)(transaction, data.type),
-            chainId: transaction.targetChainId,
-            safeTxGas: data.safeTxGas,
-            nonce: data.safeNonce,
-        });
+        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,
-            data: await (0, utils_1.buildDataForTransaction)(transaction, data.type),
+            data: gnosisData,
             chainId: transaction.targetChainId,
             safeTxGas: data.safeTxGas,
             nonce: data.safeNonce,

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

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransactionStatusDialProtocol = void 0;
+const BaseDialProtocol_1 = require("./BaseDialProtocol");
+const db_1 = require("@/db");
+class TransactionStatusDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
+    constructor(libp2p) {
+        super(libp2p, '/interop-x/transaction-status');
+        this.timeout = 30000;
+    }
+    async response(transactionHash) {
+        const transaction = await db_1.Transaction.findOne({ where: { transactionHash } });
+        if (!transaction) {
+            return null;
+        }
+        return {
+            transactionHash: transaction.transactionHash,
+            sourceStatus: transaction.sourceStatus,
+            sourceTransactionHash: transaction.sourceTransactionHash,
+            sourceErrors: transaction.sourceErrors,
+            sourceLogs: transaction.sourceLogs,
+            targetStatus: transaction.targetStatus,
+            targetTransactionHash: transaction.targetTransactionHash,
+            targetErrors: transaction.targetErrors,
+            targetLogs: transaction.targetLogs,
+            status: transaction.status,
+        };
+    }
+}
+exports.TransactionStatusDialProtocol = TransactionStatusDialProtocol;

package/dist/src/net/protocol/index.js

@@ -10,6 +10,7 @@ const SignatureDialProtocol_1 = require("./dial/SignatureDialProtocol");
 const __1 = require("..");
 const config_1 = __importDefault(require("@/config"));
 const types_1 = require("@/types");
+const TransactionStatusDialProtocol_1 = require("./dial/TransactionStatusDialProtocol");
 class Protocol extends stream_1.EventEmitter {
     constructor() {
         super(...arguments);
@@ -30,21 +31,31 @@ class Protocol extends stream_1.EventEmitter {
                 encode: (transaction) => [
                     Buffer.from(transaction.transactionHash),
                     Buffer.from(transaction.sourceStatus),
-                    Buffer.from(transaction.sourceTransactionHash),
+                    Buffer.from(transaction.sourceTransactionHash || ''),
                     transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
+                    transaction.sourceLogs ? transaction.sourceLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
                     Buffer.from(transaction.targetStatus),
-                    Buffer.from(transaction.targetTransactionHash),
+                    Buffer.from(transaction.targetTransactionHash || ''),
                     transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
+                    transaction.targetLogs ? transaction.targetLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
                     Buffer.from(transaction.status),
                 ],
-                decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]) => ({
+                decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, sourceLogs, targetStatus, targetTransactionHash, targetErrors, targetLogs, status]) => ({
                     transactionHash: transactionHash.toString(),
                     sourceStatus: sourceStatus.toString(),
-                    sourceTransactionHash: sourceTransactionHash.toString(),
+                    sourceTransactionHash: sourceTransactionHash.toString() || null,
                     sourceErrors: sourceErrors.map((e) => e.toString()),
+                    sourceLogs: sourceLogs.map(e => ({
+                        type: e[0].toString(),
+                        message: e[1].toString(),
+                    })),
                     targetStatus: targetStatus.toString(),
-                    targetTransactionHash: targetTransactionHash.toString(),
+                    targetTransactionHash: targetTransactionHash.toString() || null,
                     targetErrors: targetErrors.map((e) => e.toString()),
+                    targetLogs: targetLogs.map(e => ({
+                        type: e[0].toString(),
+                        message: e[1].toString(),
+                    })),
                     status: status.toString(),
                 }),
             },
@@ -64,6 +75,7 @@ class Protocol extends stream_1.EventEmitter {
             });
         });
         this.signature = new SignatureDialProtocol_1.SignatureDialProtocol(this.libp2p);
+        this.transactionStatus = new TransactionStatusDialProtocol_1.TransactionStatusDialProtocol(this.libp2p);
     }
     init() {
         this.libp2p.pubsub.subscribe(this.topic);
@@ -117,5 +129,14 @@ class Protocol extends stream_1.EventEmitter {
             return [];
         }
     }
+    async requestTransactionStatus(transactionHash, peerId) {
+        try {
+            return await this.transactionStatus.send(transactionHash, peerId);
+        }
+        catch (error) {
+            console.log(error);
+            return null;
+        }
+    }
 }
 exports.protocol = new Protocol();

package/dist/src/tasks/AutoUpdateTask.js

@@ -5,40 +5,66 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const BaseTask_1 = require("./BaseTask");
 const logger_1 = __importDefault(require("@/logger"));
-const package_json_1 = __importDefault(require("../../package.json"));
-const utils_1 = require("@/utils");
+const await_spawn_1 = __importDefault(require("await-spawn"));
 const child_process_1 = require("child_process");
 const config_1 = __importDefault(require("@/config"));
+const waait_1 = __importDefault(require("waait"));
+const package_json_1 = __importDefault(require("../../package.json"));
 const currentVersion = package_json_1.default.version;
+const tag = config_1.default.staging ? 'dev' : 'latest';
 class AutoUpdateTask extends BaseTask_1.BaseTask {
     constructor() {
         super({
             logger: new logger_1.default("AutoUpdateTask"),
         });
-        this.pollIntervalMs = 60 * 1000;
+        this.pollIntervalMs = 60 * 10 * 1000;
     }
     prePollHandler() {
         return config_1.default.autoUpdate && !config_1.default.isLeadNode();
     }
+    async getInstalledVersion() {
+        try {
+            const stdout = await (0, await_spawn_1.default)('npm', ['-g', 'ls', '--depth=0', '--json']);
+            return JSON.parse(stdout.toString()).dependencies[package_json_1.default.name].version;
+        }
+        catch (error) {
+            this.logger.error(error);
+            return currentVersion;
+        }
+    }
+    async getLatestVersion() {
+        try {
+            const stdout = await (0, await_spawn_1.default)('npm', ['view', `${package_json_1.default.name}@${tag}`, 'version']);
+            return stdout.toString().trim();
+        }
+        catch (error) {
+            this.logger.error(error);
+            return currentVersion;
+        }
+    }
     async pollHandler() {
-        const { data } = await utils_1.http.get('https://registry.npmjs.org/@instadapp/interop-x');
-        const version = data['dist-tags'].latest;
+        const version = await this.getLatestVersion();
         if (version === currentVersion) {
             return;
         }
         this.logger.warn(`New version ${version} available.`);
-        const update = (0, child_process_1.spawn)('npm', ['-g', 'install', '@instadapp/interop-x']);
-        update.on("close", () => {
-            this.logger.warn(`Installed version ${version}`);
-            this.logger.warn(`Restarting...`);
-            (0, child_process_1.spawn)(process.argv[0], process.argv.slice(1), {
-                cwd: process.cwd(),
-                env: Object.create(process.env),
-                detached: true,
-                stdio: "inherit"
-            });
-            process.exit();
+        this.logger.info('Updating...');
+        await (0, await_spawn_1.default)('npm', ['-g', 'install', `@instadapp/interop-x@${tag}`, '-f']);
+        await (0, waait_1.default)(5000);
+        if (version !== await this.getInstalledVersion()) {
+            this.logger.warn(`failed to install ${version}, retrying in 5 minutes`);
+            return;
+        }
+        this.logger.warn(`Installed version ${version}`);
+        this.logger.warn(`Restarting...`);
+        // TODO: its restarting in the bg, but it should be in the fg
+        const subprocess = (0, child_process_1.spawn)(process.argv[0], process.argv.slice(1), {
+            cwd: process.cwd(),
+            stdio: "inherit",
+            // shell: process.env.SHELL, 
         });
+        subprocess.unref();
+        process.exit();
     }
 }
 exports.default = AutoUpdateTask;

package/dist/src/tasks/BaseTask.js

@@ -14,6 +14,7 @@ class BaseTask extends events_1.default {
         this.started = false;
         this.pollIntervalMs = 10 * 1000;
         this.leadNodeOnly = false;
+        this.exceptLeadNode = false;
         this.logger = logger !== null && logger !== void 0 ? logger : new logger_1.default('BaseTask');
     }
     async pollCheck() {
@@ -34,10 +35,17 @@ class BaseTask extends events_1.default {
         }
     }
     prePollHandler() {
-        if (!this.leadNodeOnly) {
-            return true;
+        if (config_1.default.isMaintenanceMode()) {
+            this.logger.warn('Maintenance mode is enabled. Skipping task.');
+            return false;
         }
-        return config_1.default.isLeadNode();
+        if (this.exceptLeadNode) {
+            return !config_1.default.isLeadNode();
+        }
+        if (this.leadNodeOnly) {
+            return config_1.default.isLeadNode();
+        }
+        return true;
     }
     async pollHandler() {
         this.logger.warn('pollHandler not implemented');

package/dist/src/tasks/{InteropXGateway/ProcessDepositEvents.js → InteropXContract/ProcessBridgeRequestEvents.js}

@@ -10,23 +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 gnosis_1 = require("@/gnosis");
 const net_1 = require("@/net");
-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 ProcessDepositEvents extends BaseTask_1.BaseTask {
+class ProccessBridgeRequestEvents extends BaseTask_1.BaseTask {
     constructor({ chainId }) {
         super({
-            logger: new logger_1.default("InteropXGateway::ProcessDepositEvents"),
+            logger: new logger_1.default("InteropXContract::ProccessBridgeRequestEvents"),
         });
         this.leadNodeOnly = true;
         this.chainId = chainId;
@@ -37,13 +29,11 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
         const transaction = await db_1.Transaction.findOne({
             where: {
                 status: 'pending',
-                sourceStatus: 'success',
-                targetStatus: 'uninitialised',
-                action: 'deposit',
+                sourceStatus: 'uninitialised',
                 sourceCreatedAt: {
                     [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(),
@@ -61,27 +51,36 @@ class ProcessDepositEvents 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 gnosisTx = await generateGnosisTransaction({
+        let data, logs = [];
+        try {
+            ({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction));
+        }
+        catch (error) {
+            console.log(error);
+            transaction.sourceStatus = 'failed';
+            transaction.sourceErrors = [error.message];
+            transaction.targetStatus = 'failed';
+            transaction.status = 'failed';
+            await transaction.save();
+            net_1.protocol.sendTransaction(transaction);
+            return;
+        }
+        let gnosisTx = await (0, utils_1.generateGnosisTransaction)({
             baseGas: "0",
-            data: await (0, utils_1.buildDataForTransaction)(transaction),
+            data,
             gasPrice: "0",
             gasToken: "0x0000000000000000000000000000000000000000",
             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);
@@ -95,31 +94,25 @@ class ProcessDepositEvents 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,
         });
         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) { }
         });
@@ -127,6 +120,7 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
             console.log('ExecutionSuccess');
             transaction.targetStatus = 'success';
             transaction.targetTransactionHash = txSent.hash;
+            transaction.targetLogs = logs;
             transaction.status = 'success';
             await transaction.save();
         }
@@ -140,11 +134,13 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
         net_1.protocol.sendTransaction(transaction);
     }
     async start() {
-        this.logger.info(`Starting execution watcher on interop chain`);
-        this.contractAddress = constants_1.addresses[this.chainId].interopXGateway;
+        this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
         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.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
+        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 = ProcessDepositEvents;
+exports.default = ProccessBridgeRequestEvents;