@instadapp/interop-x 0.0.0-dev.a168c79 → 0.0.0-dev.adea608

package/bin/interop-x

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('../dist/index')
+require('../dist/src/index')

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.a168c79",
+    "version": "0.0.0-dev.adea608",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {
@@ -12,7 +12,8 @@
         "build": "yarn generate-abi-types && export GIT_REF=$(git rev-parse --short HEAD) && rimraf ./dist && tsc -p tsconfig.json && replace-in-file '@GIT_SHORT_HASH@' $GIT_REF ./dist/**/*.js",
         "dev": "yarn generate-abi-types && NODE_ENV=development nodemon",
         "generate-abi-types": "typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
-        "prepublishOnly": "yarn build"
+        "prepublishOnly": "yarn build",
+        "postinstall": "patch-package"
     },
     "nodemonConfig": {
         "watch": [
@@ -45,7 +46,7 @@
         "libp2p-websockets": "^0.16.2",
         "luxon": "^2.3.2",
         "module-alias": "^2.2.2",
-        "sequelize": "^6.19.0",
+        "sequelize": "6.18.0",
         "sqlite3": "^5.0.5",
         "waait": "^1.0.5"
     },
@@ -59,6 +60,8 @@
         "@types/fs-extra": "^9.0.13",
         "@types/node": "^17.0.17",
         "nodemon": "^2.0.15",
+        "patch-package": "^6.4.7",
+        "postinstall-postinstall": "^2.1.0",
         "replace-in-file": "^6.3.2",
         "rimraf": "^3.0.2",
         "ts-node": "^10.5.0",

package/dist/src/constants/itokens.js

@@ -5,7 +5,7 @@ exports.itokens = {
     1: [],
     137: [
         {
-            address: '0x6c20F03598d5ABF729348E2868b0ff5e8A48aB1F',
+            address: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
             symbol: 'USDC',
         }
     ],

package/dist/src/index.js

@@ -40,15 +40,33 @@ catch (e) {
     logger.error('Invalid private key');
     process.exit(1);
 }
-logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.a168c79)`);
+logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.adea608)`);
 const tasks_1 = require("@/tasks");
 const net_1 = require("@/net");
 const api_1 = require("@/api");
+const db_1 = require("./db");
 async function main() {
     (0, net_1.startPeer)({});
     const tasks = new tasks_1.Tasks();
     tasks.start();
     (0, api_1.startApiServer)();
+    net_1.protocol.on('Transaction', async (payload) => {
+        if (!net_1.peerPool.isLeadNode(payload.peerId)) {
+            return;
+        }
+        const transaction = await db_1.Transaction.findOne({ where: { transactionHash: payload.data.transactionHash } });
+        if (!transaction) {
+            return;
+        }
+        transaction.sourceStatus = payload.data.sourceStatus;
+        transaction.sourceTransactionHash = payload.data.sourceTransactionHash;
+        transaction.sourceErrors = payload.data.sourceErrors;
+        transaction.targetStatus = payload.data.targetStatus;
+        transaction.targetTransactionHash = payload.data.targetTransactionHash;
+        transaction.targetErrors = payload.data.targetErrors;
+        transaction.status = payload.data.status;
+        await transaction.save();
+    });
 }
 main()
     .then(() => {

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

@@ -82,8 +82,12 @@ const startPeer = async ({}) => {
     net_1.protocol.start({
         libp2p: node
     });
-    node.on("peer:discovery", (peer) => logger.log(`Discovered peer ${peer}`)); // peer disc.
-    node.connectionManager.on("peer:connect", (connection) => logger.log(`Connected to ${connection.remotePeer.toB58String()}`));
+    node.on("peer:discovery", (peer) => {
+        // logger.log(`Discovered peer ${peer}`)
+    }); // peer disc.
+    node.connectionManager.on("peer:connect", (connection) => {
+        // logger.log(`Connected to ${connection.remotePeer.toB58String()}`)
+    });
     logger.log("Peer discovery started");
     await (0, waait_1.default)(1000);
     setInterval(() => net_1.protocol.sendPeerInfo({

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

@@ -6,6 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.peerPool = exports.PeerPool = void 0;
 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 logger = new logger_1.default('PeerPool');
 class PeerPool {
     constructor() {
         this.PEERS_CLEANUP_TIME_LIMIT = 1;
@@ -62,10 +65,14 @@ class PeerPool {
      * @emits {@link Event.POOL_PEER_ADDED}
      */
     add(peer) {
-        if (peer && peer.id && !this.pool.get(peer.id)) {
+        if (peer && peer.id) {
+            const newPeer = !this.pool.get(peer.id);
             this.pool.set(peer.id, peer);
             peer.pooled = true;
-            config_1.default.events.emit(types_1.Event.POOL_PEER_ADDED, peer);
+            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`);
+            }
         }
     }
     /**
@@ -78,6 +85,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`);
             }
         }
     }
@@ -93,14 +101,21 @@ class PeerPool {
     get activePeerIds() {
         return this.activePeers.map((p) => p.id);
     }
+    isLeadNode(id) {
+        const peer = this.pool.get(id);
+        if (!peer) {
+            return false;
+        }
+        return (0, utils_1.getAddress)(peer.publicAddress) === (0, utils_1.getAddress)(config_1.default.leadNodeAddress);
+    }
     cleanup() {
-        let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60;
-        this.peers.forEach((peerInfo) => {
-            if (peerInfo.updated.getTime() < compDate) {
-                console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`);
-                this.remove(peerInfo);
-            }
-        });
+        // let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
+        // this.peers.forEach((peerInfo) => {
+        //     if (peerInfo.updated.getTime() < compDate) {
+        //         console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
+        //         this.remove(peerInfo)
+        //     }
+        // })
     }
 }
 exports.PeerPool = PeerPool;

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

@@ -33,12 +33,19 @@ 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 signedData = await (0, utils_1.signGnosisSafeTx)({
-            //TODO: chain id depends on event type
-            to: constants_1.addresses[transaction.sourceChainId].multisend,
-            data: (0, utils_1.buildDataForTransaction)(transaction, data.type),
-            chainId: transaction.sourceChainId,
+            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,
         }, { signer });
         return {
             signer: signer.address,

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

@@ -16,7 +16,7 @@ class Protocol extends stream_1.EventEmitter {
         this.protocolMessages = [
             {
                 name: 'PeerInfo',
-                code: 0x09,
+                code: 0x01,
                 encode: (info) => [
                     Buffer.from(info.publicAddress),
                 ],
@@ -24,6 +24,30 @@ class Protocol extends stream_1.EventEmitter {
                     publicAddress: publicAddress.toString(),
                 }),
             },
+            {
+                name: 'Transaction',
+                code: 0x02,
+                encode: (transaction) => [
+                    Buffer.from(transaction.transactionHash),
+                    Buffer.from(transaction.sourceStatus),
+                    Buffer.from(transaction.sourceTransactionHash),
+                    transaction.sourceErrors.map((e) => Buffer.from(e)),
+                    Buffer.from(transaction.targetStatus),
+                    Buffer.from(transaction.targetTransactionHash),
+                    transaction.targetErrors.map((e) => Buffer.from(e)),
+                    Buffer.from(transaction.status),
+                ],
+                decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]) => ({
+                    transactionHash: transactionHash.toString(),
+                    sourceStatus: sourceStatus.toString(),
+                    sourceTransactionHash: sourceTransactionHash.toString(),
+                    sourceErrors: sourceErrors.map((e) => e.toString()),
+                    targetStatus: targetStatus.toString(),
+                    targetTransactionHash: targetTransactionHash.toString(),
+                    targetErrors: targetErrors.map((e) => e.toString()),
+                    status: status.toString(),
+                }),
+            },
         ];
     }
     start({ libp2p, topic = null, }) {
@@ -75,6 +99,11 @@ class Protocol extends stream_1.EventEmitter {
         const encoded = ethereumjs_util_1.rlp.encode([message.code, message.encode(data)]);
         this.libp2p.pubsub.publish(this.topic, encoded);
     }
+    sendTransaction(transaction) {
+        const message = this.protocolMessages.find((m) => m.name === 'Transaction');
+        const encoded = ethereumjs_util_1.rlp.encode([message.code, message.encode(transaction)]);
+        this.libp2p.pubsub.publish(this.topic, encoded);
+    }
     async requestSignatures(data, peerIds) {
         try {
             peerIds = peerIds || __1.peerPool.activePeerIds;

package/dist/src/tasks/BaseTask.js

@@ -28,7 +28,7 @@ class BaseTask extends events_1.default {
                 }
             }
             catch (err) {
-                this.logger.error(`poll check error: ${err.message}\ntrace: ${err.stack}`);
+                this.logger.error(`poll check error:\n${err.message}\ntrace: ${err.stack}`);
             }
             await this.postPollHandler();
         }

package/dist/src/tasks/InteropBridge/ProcessWithdrawEvents.js

@@ -0,0 +1,147 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const BaseTask_1 = require("../BaseTask");
+const logger_1 = __importDefault(require("@/logger"));
+const ethers_1 = require("ethers");
+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 waait_1 = __importDefault(require("waait"));
+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 ProcessWithdrawEvents extends BaseTask_1.BaseTask {
+    constructor({ chainId }) {
+        super({
+            logger: new logger_1.default("InteropXGateway::ProcessWithdrawEvents"),
+        });
+        this.leadNodeOnly = true;
+        this.chainId = chainId;
+    }
+    async pollHandler() {
+        var _a;
+        const blockNumber = await this.provider.getBlockNumber();
+        const transaction = await db_1.Transaction.findOne({
+            where: {
+                status: 'pending',
+                sourceStatus: 'success',
+                targetStatus: 'uninitialised',
+                action: 'withdraw',
+                sourceCreatedAt: {
+                    [sequelize_1.Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
+                },
+                targetDelayUntil: {
+                    [sequelize_1.Op.or]: {
+                        [sequelize_1.Op.is]: null,
+                        [sequelize_1.Op.lt]: new Date(),
+                    }
+                },
+                sourceBlockNumber: {
+                    [sequelize_1.Op.lt]: blockNumber - 12,
+                },
+                sourceChainId: this.chainId,
+            }
+        });
+        if (!transaction) {
+            return;
+        }
+        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();
+        await (0, waait_1.default)(10000);
+        let gnosisTx = await generateGnosisTransaction({
+            baseGas: "0",
+            data: await (0, utils_1.buildDataForTransaction)(transaction),
+            gasPrice: "0",
+            gasToken: "0x0000000000000000000000000000000000000000",
+            nonce: '0',
+            operation: "1",
+            refundReceiver: "0x0000000000000000000000000000000000000000",
+            safeAddress: safeAddress,
+            safeTxGas: "79668",
+            to: constants_1.addresses[transaction.targetChainId].multisend,
+            value: "0",
+        }, safeContract);
+        const owners = await 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);
+        const signatures = await net_1.protocol.requestSignatures({
+            type: 'source',
+            transactionHash: transaction.transactionHash,
+            safeTxGas: gnosisTx.safeTxGas,
+            safeNonce: gnosisTx.nonce
+        }, 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)) {
+            await transaction.save();
+            transaction.targetDelayUntil = new Date(Date.now() + 30 * 1000);
+            transaction.targetStatus = '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,
+            data: txData,
+        });
+        const receipt = await txSent.wait();
+        const parsedLogs = [];
+        receipt.logs.forEach((log) => {
+            try {
+                parsedLogs.push(safeContract.interface.parseLog(log));
+            }
+            catch (e) { }
+        });
+        if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
+            console.log('ExecutionSuccess');
+            transaction.targetStatus = 'success';
+            transaction.targetTransactionHash = txSent.hash;
+            transaction.status = 'success';
+            await transaction.save();
+        }
+        else {
+            console.log('ExecutionFailure');
+            transaction.targetStatus = 'failed';
+            transaction.targetTransactionHash = txSent.hash;
+            transaction.status = 'failed';
+            await transaction.save();
+        }
+    }
+    async start() {
+        this.logger.info(`Starting execution watcher on interop chain`);
+        this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
+        await super.start();
+    }
+}
+exports.default = ProcessWithdrawEvents;

package/dist/src/tasks/InteropBridge/SyncWithdrawEvents.js

@@ -0,0 +1,70 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const BaseTask_1 = require("../BaseTask");
+const logger_1 = __importDefault(require("@/logger"));
+const ethers_1 = require("ethers");
+const abi_1 = __importDefault(require("@/abi"));
+const db_1 = require("@/db");
+const utils_1 = require("@/utils");
+const config_1 = __importDefault(require("@/config"));
+class SyncWithdrawEvents extends BaseTask_1.BaseTask {
+    constructor({ chainId, itokenAddress }) {
+        super({
+            logger: new logger_1.default("InteropBridgeToken::SyncWithdrawEvents"),
+        });
+        this.chainId = chainId;
+        this.itokenAddress = itokenAddress;
+    }
+    async pollHandler() {
+        const currentBlock = await this.provider.getBlockNumber();
+        const events = await this.contract.queryFilter(this.contract.filters.Burn(), currentBlock - 2000, currentBlock);
+        let processedEvents = 0;
+        for (const event of events) {
+            try {
+                if (!event.args) {
+                    continue;
+                }
+                const { to, amount, chainId } = event.args;
+                const uniqueIdentifier = {
+                    action: 'withdraw',
+                    submitTransactionHash: event.transactionHash,
+                    sourceChainId: this.chainId,
+                    targetChainId: chainId.toNumber(),
+                };
+                if (await db_1.Transaction.findOne({ where: uniqueIdentifier })) {
+                    continue;
+                }
+                const tx = await event.getTransaction();
+                await db_1.Transaction.create(Object.assign(Object.assign({}, uniqueIdentifier), { transactionHash: (0, utils_1.generateInteropTransactionHash)(uniqueIdentifier), from: tx.from, to, submitTransactionHash: event.transactionHash, submitBlockNumber: event.blockNumber, 
+                    // submit & source are the same
+                    sourceTransactionHash: event.transactionHash, sourceBlockNumber: event.blockNumber, sourceStatus: "success", targetStatus: "uninitialised", submitEvent: {
+                        to,
+                        amount: amount.toString(),
+                        itoken: this.itokenAddress,
+                        chainId: chainId.toString()
+                    }, sourceEvent: {
+                        to,
+                        amount: amount.toString(),
+                        itoken: this.itokenAddress,
+                        chainId: chainId.toString(),
+                    }, status: "pending" }));
+                this.logger.info(`Withdraw queued: ${event.transactionHash} ${event.blockNumber}`);
+            }
+            catch (error) {
+                this.logger.error(error);
+            }
+        }
+        if (processedEvents > 0)
+            this.logger.info(`${processedEvents} events processed`);
+    }
+    async start() {
+        this.logger.info(`Starting execution watcher on interop chain`);
+        this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
+        this.contract = (0, utils_1.getContract)(this.itokenAddress, abi_1.default.interopBridgeToken, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
+        await super.start();
+    }
+}
+exports.default = SyncWithdrawEvents;

package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js

@@ -15,6 +15,7 @@ const sequelize_1 = require("sequelize");
 const waait_1 = __importDefault(require("waait"));
 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();
@@ -37,30 +38,39 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
             where: {
                 status: 'pending',
                 sourceStatus: 'success',
+                targetStatus: 'uninitialised',
                 action: 'deposit',
                 sourceCreatedAt: {
                     [sequelize_1.Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
                 },
+                targetDelayUntil: {
+                    [sequelize_1.Op.or]: {
+                        [sequelize_1.Op.is]: null,
+                        [sequelize_1.Op.lt]: new Date(),
+                    }
+                },
                 sourceBlockNumber: {
                     [sequelize_1.Op.lt]: blockNumber - 12,
-                }
+                },
+                sourceChainId: this.chainId,
             }
         });
         if (!transaction) {
             return;
         }
-        transaction.sourceStatus = 'pending';
+        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 = new ethers_1.ethers.Contract(safeAddress, abi_1.default.gnosisSafe, targetWallet);
+        const safeContract = (0, utils_1.getContract)(safeAddress, abi_1.default.gnosisSafe, targetWallet);
         const ownersThreshold = await safeContract.getThreshold();
         await (0, waait_1.default)(10000);
         let gnosisTx = await generateGnosisTransaction({
             baseGas: "0",
-            data: (0, utils_1.buildDataForTransaction)(transaction),
+            data: await (0, utils_1.buildDataForTransaction)(transaction),
             gasPrice: "0",
             gasToken: "0x0000000000000000000000000000000000000000",
             nonce: '0',
@@ -74,6 +84,7 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
         const owners = await 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);
         const signatures = await net_1.protocol.requestSignatures({
             type: 'source',
             transactionHash: transaction.transactionHash,
@@ -84,33 +95,23 @@ 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.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
-            transaction.sourceStatus = 'pending';
+            transaction.targetDelayUntil = new Date(Date.now() + 30 * 1000);
+            transaction.targetStatus = '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}` : ''));
         }
-        const execTransactionParams = [
-            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(`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({
-            execTransactionParams
+            from: targetWallet.address,
+            gasPrice: ethers_1.BigNumber.from(120 * 10 ** 9).toString(),
+            to: safeAddress,
+            data: txData,
         });
-        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));
         const txSent = await targetWallet.sendTransaction({
             from: targetWallet.address,
             gasPrice: ethers_1.BigNumber.from(120 * 10 ** 9),
-            gasLimit: ethers_1.BigNumber.from(6000000),
             to: safeAddress,
             data: txData,
         });
@@ -124,16 +125,25 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
         });
         if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
             console.log('ExecutionSuccess');
+            transaction.targetStatus = 'success';
+            transaction.targetTransactionHash = txSent.hash;
+            transaction.status = 'success';
+            await transaction.save();
         }
         else {
             console.log('ExecutionFailure');
+            transaction.targetStatus = 'failed';
+            transaction.targetTransactionHash = txSent.hash;
+            transaction.status = 'failed';
+            await transaction.save();
         }
+        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.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
-        this.contract = new ethers_1.ethers.Contract(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
+        this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
         await super.start();
     }
 }

package/dist/src/tasks/InteropXGateway/SyncDepositEvents.js

@@ -45,17 +45,17 @@ class SyncDepositEvents extends BaseTask_1.BaseTask {
                         sourceChainId: sourceChainId.toString(),
                         targetChainId: targetChainId.toString(),
                         token: token,
-                        ammout: amount.toString(),
+                        amount: amount.toString(),
                         vnonce: vnonce.toString(),
                     }, sourceEvent: {
                         user,
                         sourceChainId: sourceChainId.toString(),
                         targetChainId: targetChainId.toString(),
                         token: token,
-                        ammout: amount.toString(),
+                        amount: amount.toString(),
                         vnonce: vnonce.toString(),
                     }, status: "pending" }));
-                this.logger.info(`Execution queued: ${event.transactionHash} ${event.blockNumber}`);
+                this.logger.info(`Deposit queued: ${event.transactionHash} ${event.blockNumber}`);
             }
             catch (error) {
                 this.logger.error(error);
@@ -68,7 +68,7 @@ class SyncDepositEvents extends BaseTask_1.BaseTask {
         this.logger.info(`Starting execution watcher on interop chain`);
         this.contractAddress = constants_1.addresses[this.chainId].interopXGateway;
         this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
-        this.contract = new ethers_1.ethers.Contract(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
+        this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
         await super.start();
     }
 }

package/dist/src/tasks/index.js

@@ -4,12 +4,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tasks = void 0;
+const ProcessDepositEvents_1 = __importDefault(require("./InteropXGateway/ProcessDepositEvents"));
 const SyncDepositEvents_1 = __importDefault(require("./InteropXGateway/SyncDepositEvents"));
+const SyncWithdrawEvents_1 = __importDefault(require("./InteropBridge/SyncWithdrawEvents"));
+const ProcessWithdrawEvents_1 = __importDefault(require("./InteropBridge/ProcessWithdrawEvents"));
 class Tasks {
     constructor() {
         this.tasks = [
             new SyncDepositEvents_1.default({
                 chainId: 43114
+            }),
+            new ProcessDepositEvents_1.default({
+                chainId: 43114
+            }),
+            new SyncWithdrawEvents_1.default({
+                chainId: 137,
+                itokenAddress: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
+            }),
+            new ProcessWithdrawEvents_1.default({
+                chainId: 137,
             })
         ];
     }