@instadapp/interop-x 0.0.0-dev.38887dd → 0.0.0-dev.40b2517

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,20 +12,26 @@ 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: [],
     },
+    sourceLogs: {
+        type: sequelize_2.DataTypes.JSON,
+        // defaultValue: [],
+    },
     sourceCreatedAt: {
         type: sequelize_2.DataTypes.DATE,
         defaultValue: Date.now()
@@ -34,17 +40,27 @@ 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: [],
     },
+    targetLogs: {
+        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,
+    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

@@ -0,0 +1,9 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const withdraw_1 = __importDefault(require("./withdraw"));
+exports.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

@@ -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 === '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.actionId}`);
+};
+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 = '40b2517';
 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.38887dd)`);
+    console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
     process.exit(0);
 }
 if (!process.env.PRIVATE_KEY) {
@@ -54,20 +63,26 @@ 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();
-    tasks.start();
+    setTimeout(() => {
+        tasks.start();
+    }, 10000);
     (0, api_1.startApiServer)();
     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 +92,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,12 +10,17 @@ 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');
         this.timeout = 30000;
     }
     async response(data) {
+        console.log({
+            tag: 'SignatureDialProtocol',
+            data
+        });
         const signer = config_1.default.wallet;
         let transaction;
         let maxTimeout = 20000;
@@ -33,17 +38,11 @@ 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),
-            chainId: transaction.targetChainId,
+            to: constants_1.addresses[transaction.sourceChainId].multisend,
+            data: gnosisData,
+            chainId: transaction.sourceChainId,
             safeTxGas: data.safeTxGas,
             nonce: data.safeNonce,
         }, { signer });

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;