@instadapp/interop-x 0.0.0-dev.9387bd9 → 0.0.0-dev.a8594f9

package/dist/src/constants/tokens.js

@@ -0,0 +1,107 @@
+"use strict";
+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,
+        },
+    ],
+    137: [
+        {
+            symbol: "ETH",
+            name: "Ethereum",
+            address: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
+            decimals: 18,
+        },
+        {
+            symbol: "DAI",
+            name: "DAI Stable",
+            address: "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063",
+            decimals: 18,
+        },
+        {
+            symbol: "USDC",
+            name: "USD Coin",
+            address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
+            decimals: 6,
+        },
+        {
+            symbol: "USDT",
+            name: "Tether USD Coin",
+            address: "0xc2132D05D31c914a87C6611C10748AEb04B58e8F",
+            decimals: 6,
+        },
+        {
+            symbol: "WBTC",
+            name: "Wrapped BTC",
+            address: "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6",
+            decimals: 8,
+        },
+        {
+            symbol: "AVAX",
+            name: "Avalanche Token",
+            address: "0x2C89bbc92BD86F8075d1DEcc58C7F4E0107f286b",
+            decimals: 18,
+        },
+    ],
+    43114: [
+        {
+            symbol: "ETH",
+            name: "Ethereum",
+            address: "0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB",
+            decimals: 18,
+        },
+        {
+            symbol: "DAI",
+            name: "DAI Stable",
+            address: "0xd586E7F844cEa2F87f50152665BCbc2C279D8d70",
+            decimals: 18,
+        },
+        {
+            symbol: "USDC",
+            name: "USD Coin",
+            address: "0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664",
+            decimals: 6,
+        },
+        {
+            symbol: "USDT",
+            name: "Tether USD Coin",
+            address: "0xc7198437980c041c805A1EDcbA50c1Ce5db95118",
+            decimals: 6,
+        },
+        {
+            symbol: "WBTC",
+            name: "Wrapped BTC",
+            address: "0x50b7545627a5162F82A992c33b87aDc75187B218",
+            decimals: 8,
+        },
+    ],
+};

package/dist/{db → src/db}/models/index.js

@@ -14,4 +14,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./execution"), exports);
+__exportStar(require("./transaction"), exports);

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

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Transaction = void 0;
+const sequelize_1 = require("@/db/sequelize");
+const sequelize_2 = require("sequelize");
+class Transaction extends sequelize_2.Model {
+}
+exports.Transaction = Transaction;
+Transaction.init({
+    id: {
+        type: sequelize_2.DataTypes.INTEGER,
+        autoIncrement: true,
+        primaryKey: true
+    },
+    submitTransactionHash: sequelize_2.DataTypes.NUMBER,
+    submitBlockNumber: sequelize_2.DataTypes.NUMBER,
+    transactionHash: sequelize_2.DataTypes.STRING,
+    action: sequelize_2.DataTypes.STRING,
+    from: sequelize_2.DataTypes.STRING,
+    to: sequelize_2.DataTypes.STRING,
+    sourceChainId: sequelize_2.DataTypes.NUMBER,
+    sourceTransactionHash: sequelize_2.DataTypes.STRING,
+    sourceBlockNumber: sequelize_2.DataTypes.NUMBER,
+    sourceStatus: sequelize_2.DataTypes.STRING,
+    sourceErrors: {
+        type: sequelize_2.DataTypes.JSON,
+        // defaultValue: [],
+    },
+    sourceCreatedAt: {
+        type: sequelize_2.DataTypes.DATE,
+        defaultValue: Date.now()
+    },
+    sourceDelayUntil: sequelize_2.DataTypes.STRING,
+    targetChainId: sequelize_2.DataTypes.NUMBER,
+    targetTransactionHash: sequelize_2.DataTypes.STRING,
+    targetBlockNumber: sequelize_2.DataTypes.NUMBER,
+    targetStatus: sequelize_2.DataTypes.STRING,
+    targetErrors: {
+        type: sequelize_2.DataTypes.JSON,
+        // defaultValue: [],
+    },
+    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,
+    status: {
+        type: sequelize_2.DataTypes.STRING,
+        defaultValue: 'pending'
+    },
+    createdAt: sequelize_2.DataTypes.DATE,
+    updatedAt: sequelize_2.DataTypes.DATE,
+}, { sequelize: sequelize_1.sequelize, tableName: 'transactions' });

package/dist/{db → src/db}/sequelize.js

@@ -5,9 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sequelize = void 0;
 //@ts-ignore
+const config_1 = __importDefault(require("@/config"));
 const expand_home_dir_1 = __importDefault(require("expand-home-dir"));
 const sequelize_1 = require("sequelize");
-const basePath = (0, expand_home_dir_1.default)('~/.interop-x/data');
+const basePath = (0, expand_home_dir_1.default)(`~/.interop-x/data/${config_1.default.publicAddress}/${config_1.default.staging ? 'staging' : ''}`);
 exports.sequelize = new sequelize_1.Sequelize({
     dialect: 'sqlite',
     storage: `${basePath}/localDB.sqlite`,

package/dist/{index.js → src/index.js}

@@ -3,12 +3,35 @@ 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)();
 const assert_1 = __importDefault(require("assert"));
 const dotenv_1 = __importDefault(require("dotenv"));
-const logger_1 = __importDefault(require("./logger"));
 const ethers_1 = require("ethers");
+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');
+if (process.argv.at(-1) === 'help') {
+    console.log('Usage:');
+    console.log('   PRIVATE_KEY=abcd1234 interop-x');
+    console.log('   PRIVATE_KEY=abcd1234 STAGING=true interop-x');
+    process.exit(0);
+}
 (0, assert_1.default)(process.env.PRIVATE_KEY, "PRIVATE_KEY is not defined");
 try {
     new ethers_1.ethers.Wallet(process.env.PRIVATE_KEY);
@@ -17,12 +40,15 @@ catch (e) {
     logger.error('Invalid private key');
     process.exit(1);
 }
-const tasks_1 = require("./tasks");
-const net_1 = require("./net");
+logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.a8594f9)`);
+const tasks_1 = require("@/tasks");
+const net_1 = require("@/net");
+const api_1 = require("@/api");
 async function main() {
     (0, net_1.startPeer)({});
     const tasks = new tasks_1.Tasks();
     tasks.start();
+    (0, api_1.startApiServer)();
 }
 main()
     .then(() => {

package/dist/{net → src/net}/peer/index.js

@@ -11,7 +11,7 @@ const libp2p_websockets_1 = __importDefault(require("libp2p-websockets"));
 //@ts-ignore
 const libp2p_mplex_1 = __importDefault(require("libp2p-mplex"));
 const libp2p_noise_1 = require("libp2p-noise");
-const logger_1 = __importDefault(require("../../logger"));
+const logger_1 = __importDefault(require("@/logger"));
 const libp2p_bootstrap_1 = __importDefault(require("libp2p-bootstrap"));
 const waait_1 = __importDefault(require("waait"));
 const libp2p_gossipsub_1 = __importDefault(require("@achingbrain/libp2p-gossipsub"));
@@ -21,8 +21,8 @@ const libp2p_mdns_1 = __importDefault(require("libp2p-mdns"));
 const libp2p_kad_dht_1 = __importDefault(require("libp2p-kad-dht"));
 //@ts-ignore
 const libp2p_pubsub_peer_discovery_1 = __importDefault(require("libp2p-pubsub-peer-discovery"));
-const protocol_1 = require("../protocol");
-const config_1 = __importDefault(require("../../config"));
+const net_1 = require("@/net");
+const config_1 = __importDefault(require("@/config"));
 const logger = new logger_1.default("Peer");
 let node;
 // Known peers addresses
@@ -79,14 +79,18 @@ const startPeer = async ({}) => {
     });
     logger.info("Peer ID:", node.peerId.toB58String());
     await node.start();
-    protocol_1.protocol.start({
+    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(() => protocol_1.protocol.sendPeerInfo({
+    setInterval(() => net_1.protocol.sendPeerInfo({
         publicAddress: config_1.default.wallet.address,
     }), 5000);
 };

package/dist/{net → src/net}/pool/index.js

@@ -4,8 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.peerPool = exports.PeerPool = void 0;
-const types_1 = require("../../types");
-const config_1 = __importDefault(require("../../config"));
+const types_1 = require("@/types");
+const config_1 = __importDefault(require("@/config"));
+const logger_1 = __importDefault(require("@/logger"));
+const logger = new logger_1.default('PeerPool');
 class PeerPool {
     constructor() {
         this.PEERS_CLEANUP_TIME_LIMIT = 1;
@@ -62,10 +64,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 +84,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`);
             }
         }
     }
@@ -94,13 +101,13 @@ class PeerPool {
         return this.activePeers.map((p) => p.id);
     }
     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/{net → src/net}/protocol/dial/BaseDialProtocol.js

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseDialProtocol = void 0;
 const it_pipe_1 = __importDefault(require("it-pipe"));
 const peer_id_1 = __importDefault(require("peer-id"));
-const utils_1 = require("../../../utils");
+const utils_1 = require("@/utils");
 const waait_1 = __importDefault(require("waait"));
 class BaseDialProtocol {
     constructor(libp2p, protocol) {

package/dist/{net → src/net}/protocol/dial/SignatureDialProtocol.js

@@ -4,44 +4,52 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SignatureDialProtocol = void 0;
-const utils_1 = require("../../../utils");
 const BaseDialProtocol_1 = require("./BaseDialProtocol");
 const waait_1 = __importDefault(require("waait"));
-const config_1 = __importDefault(require("../../../config"));
-const constants_1 = require("../../../constants");
-const db_1 = require("db");
+const config_1 = __importDefault(require("@/config"));
+const db_1 = require("@/db");
+const utils_1 = require("@/utils");
+const constants_1 = require("@/constants");
 class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
     constructor(libp2p) {
-        super(libp2p, '/signatures');
+        super(libp2p, '/interop-x/signatures');
         this.timeout = 30000;
     }
     async response(data) {
         const signer = config_1.default.wallet;
-        let event;
+        let transaction;
         let maxTimeout = 20000;
         do {
-            event = await db_1.Execution.findOne({ where: { vnonce: data.vnonce.toString() } });
-            if (!event) {
+            transaction = await db_1.Transaction.findOne({ where: { transactionHash: data.transactionHash } });
+            if (!transaction) {
                 await (0, waait_1.default)(1000);
                 maxTimeout -= 1000;
             }
-        } while (!event && maxTimeout > 0);
-        if (!event) {
+        } while (!transaction && maxTimeout > 0);
+        if (!transaction) {
             return {
                 signer: signer.address,
                 data: null,
                 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)({
-            to: constants_1.addresses[event.chainId].multisend,
-            data: 'TODO',
-            chainId: event.chainId,
+            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,
-            data: signedData,
+            data: signedData
         };
     }
 }

package/dist/{net → src/net}/protocol/index.js

@@ -8,8 +8,8 @@ const stream_1 = require("stream");
 const ethereumjs_util_1 = require("ethereumjs-util");
 const SignatureDialProtocol_1 = require("./dial/SignatureDialProtocol");
 const __1 = require("..");
-const config_1 = __importDefault(require("config"));
-const types_1 = require("types");
+const config_1 = __importDefault(require("@/config"));
+const types_1 = require("@/types");
 class Protocol extends stream_1.EventEmitter {
     constructor() {
         super(...arguments);
@@ -28,7 +28,7 @@ class Protocol extends stream_1.EventEmitter {
     }
     start({ libp2p, topic = null, }) {
         this.libp2p = libp2p;
-        this.topic = topic || 'protocol';
+        this.topic = topic || 'itnerop-x-protocol';
         if (this.libp2p.isStarted())
             this.init();
         this.on('PeerInfo', (payload) => {

package/dist/{tasks → src/tasks}/BaseTask.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseTask = void 0;
-const config_1 = __importDefault(require("config"));
+const config_1 = __importDefault(require("@/config"));
 const events_1 = __importDefault(require("events"));
 const waait_1 = __importDefault(require("waait"));
-const logger_1 = __importDefault(require("../logger"));
+const logger_1 = __importDefault(require("@/logger"));
 class BaseTask extends events_1.default {
     constructor({ logger }) {
         super();
@@ -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,145 @@
+"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.status = 'success';
+            await transaction.save();
+        }
+        else {
+            console.log('ExecutionFailure');
+            transaction.targetStatus = 'failed';
+            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;