@instadapp/interop-x 0.0.0-dev.d2e8d37 → 0.0.0-dev.de23e71

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.d2e8d37",
+    "version": "0.0.0-dev.de23e71",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {
@@ -28,7 +28,6 @@
         "await-spawn": "^4.0.2",
         "axios": "^0.27.1",
         "axios-retry": "^3.2.4",
-        "bignumber.js": "^9.0.2",
         "chalk": "4.1.2",
         "dotenv": "^16.0.0",
         "ethereumjs-util": "^7.1.4",
@@ -36,6 +35,7 @@
         "ethers-multisend": "^2.1.1",
         "expand-home-dir": "^0.0.3",
         "fastify": "^3.28.0",
+        "fs-extra": "^10.1.0",
         "libp2p": "^0.36.2",
         "libp2p-bootstrap": "^0.14.0",
         "libp2p-kad-dht": "^0.28.6",

package/dist/src/abi/interopBridgeToken.json

@@ -46,11 +46,17 @@
                 "name": "amount",
                 "type": "uint256"
             },
+            {
+                "indexed": false,
+                "internalType": "uint32",
+                "name": "sourceChainId",
+                "type": "uint32"
+            },
             {
                 "indexed": true,
-                "internalType": "uint256",
-                "name": "chainId",
-                "type": "uint256"
+                "internalType": "uint32",
+                "name": "targetChainId",
+                "type": "uint32"
             }
         ],
         "name": "Burn",
@@ -73,14 +79,20 @@
             },
             {
                 "indexed": true,
-                "internalType": "uint256",
-                "name": "chainId",
-                "type": "uint256"
+                "internalType": "uint32",
+                "name": "sourceChainId",
+                "type": "uint32"
+            },
+            {
+                "indexed": false,
+                "internalType": "uint32",
+                "name": "targetChainId",
+                "type": "uint32"
             },
             {
                 "indexed": true,
                 "internalType": "bytes32",
-                "name": "transactionHash",
+                "name": "submitTransactionHash",
                 "type": "bytes32"
             }
         ],
@@ -164,7 +176,7 @@
         "inputs": [
             { "internalType": "address", "name": "to", "type": "address" },
             { "internalType": "uint256", "name": "amount", "type": "uint256" },
-            { "internalType": "uint256", "name": "chainId", "type": "uint256" }
+            { "internalType": "uint32", "name": "chainId", "type": "uint32" }
         ],
         "name": "burn",
         "outputs": [],
@@ -206,7 +218,7 @@
         "inputs": [
             { "internalType": "address", "name": "to", "type": "address" },
             { "internalType": "uint256", "name": "amount", "type": "uint256" },
-            { "internalType": "uint256", "name": "chainId", "type": "uint256" },
+            { "internalType": "uint32", "name": "chainId", "type": "uint32" },
             {
                 "internalType": "bytes32",
                 "name": "transactionHash",

package/dist/src/abi/interopXGateway.json

@@ -35,15 +35,15 @@
             },
             {
                 "indexed": false,
-                "internalType": "uint256",
+                "internalType": "uint32",
                 "name": "sourceChainId",
-                "type": "uint256"
+                "type": "uint32"
             },
             {
                 "indexed": true,
-                "internalType": "uint256",
+                "internalType": "uint32",
                 "name": "targetChainId",
-                "type": "uint256"
+                "type": "uint32"
             }
         ],
         "name": "LogGatewayDeposit",
@@ -72,15 +72,15 @@
             },
             {
                 "indexed": true,
-                "internalType": "uint256",
+                "internalType": "uint32",
                 "name": "sourceChainId",
-                "type": "uint256"
+                "type": "uint32"
             },
             {
                 "indexed": false,
-                "internalType": "uint256",
+                "internalType": "uint32",
                 "name": "targetChainId",
-                "type": "uint256"
+                "type": "uint32"
             },
             {
                 "indexed": true,
@@ -122,7 +122,7 @@
         "inputs": [
             { "internalType": "address", "name": "token_", "type": "address" },
             { "internalType": "uint256", "name": "amount_", "type": "uint256" },
-            { "internalType": "uint256", "name": "chainId_", "type": "uint256" }
+            { "internalType": "uint32", "name": "chainId_", "type": "uint32" }
         ],
         "name": "deposit",
         "outputs": [],
@@ -134,7 +134,7 @@
             { "internalType": "address", "name": "to_", "type": "address" },
             { "internalType": "address", "name": "token_", "type": "address" },
             { "internalType": "uint256", "name": "amount_", "type": "uint256" },
-            { "internalType": "uint256", "name": "chainId_", "type": "uint256" }
+            { "internalType": "uint32", "name": "chainId_", "type": "uint32" }
         ],
         "name": "depositFor",
         "outputs": [],
@@ -160,7 +160,7 @@
             { "internalType": "uint256", "name": "amount_", "type": "uint256" },
             { "internalType": "address", "name": "user_", "type": "address" },
             { "internalType": "address", "name": "token_", "type": "address" },
-            { "internalType": "uint256", "name": "chainId_", "type": "uint256" },
+            { "internalType": "uint32", "name": "chainId_", "type": "uint32" },
             {
                 "internalType": "bytes32",
                 "name": "transactionHash_",

package/dist/src/alias.js

@@ -0,0 +1,10 @@
+"use strict";
+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,
+});
+(0, module_alias_1.default)();

package/dist/src/api/index.js

@@ -20,6 +20,9 @@ const startApiServer = async () => {
             return await db_1.Transaction.findAndCountAll({
                 limit: 20,
                 offset: 0,
+                order: [
+                    ['createdAt', 'DESC']
+                ]
             });
         });
         await server.listen(PORT, HOST);

package/dist/src/config/index.js

@@ -1,16 +1,22 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const types_1 = require("@/types");
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const expand_home_dir_1 = __importDefault(require("expand-home-dir"));
 class Config {
     constructor() {
         this.events = new types_1.EventBus();
-        this.maxPeers = 10;
+        this.maxPeers = 20;
         this.privateKey = process.env.PRIVATE_KEY;
         this.staging = !!process.env.STAGING && process.env.STAGING === 'true';
         this.autoUpdate = !!process.env.AUTO_UPDATE && process.env.AUTO_UPDATE === 'true';
         this.wallet = new ethers_1.Wallet(this.privateKey);
         this.leadNodeAddress = '0x910E413DBF3F6276Fe8213fF656726bDc142E08E';
+        this.baseConfigPath = (0, expand_home_dir_1.default)(`~/.interop-x`);
     }
     get publicAddress() {
         return this.wallet.address;
@@ -18,5 +24,8 @@ class Config {
     isLeadNode() {
         return ethers_1.ethers.utils.getAddress(this.leadNodeAddress) === ethers_1.ethers.utils.getAddress(this.wallet.address);
     }
+    isMaintenanceMode() {
+        return fs_extra_1.default.existsSync(this.baseConfigPath + '/maintenance');
+    }
 }
 exports.default = new Config();

package/dist/src/constants/addresses.js

@@ -15,6 +15,6 @@ exports.addresses = {
     43114: {
         gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
         multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-        interopXGateway: '0x8D27758751BA488690974B6Ccfcda771D462945f',
+        interopXGateway: '0xF0317C5Bc206F2291dd2f3eE9C4cDB5Bbb25418d',
     }
 };

package/dist/src/constants/itokens.js

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

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

@@ -26,6 +26,10 @@ Transaction.init({
         type: sequelize_2.DataTypes.JSON,
         // defaultValue: [],
     },
+    sourceLogs: {
+        type: sequelize_2.DataTypes.JSON,
+        // defaultValue: [],
+    },
     sourceCreatedAt: {
         type: sequelize_2.DataTypes.DATE,
         defaultValue: Date.now()
@@ -39,6 +43,10 @@ Transaction.init({
         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,

package/dist/src/gnosis/actions/deposit.js

@@ -0,0 +1,48 @@
+"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");
+async function default_1(transaction, type) {
+    const transactions = [];
+    const logs = [];
+    if (transaction.sourceStatus === 'pending') {
+        throw Error('Cannot build data for pending deposit transaction');
+    }
+    if (!transaction.submitEvent) {
+        throw Error('Cannot build data for transaction without submitEvent');
+    }
+    const token = constants_1.tokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === transaction.submitEvent.token.toLowerCase());
+    if (!token) {
+        throw Error(`Unsupported token ${transaction.submitEvent.token}`);
+    }
+    const itoken = constants_1.itokens[transaction.targetChainId].find(t => t.symbol.toLowerCase() === token.symbol.toLowerCase());
+    if (!itoken) {
+        throw Error(`Unsupported itoken ${token.symbol}`);
+    }
+    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 interopBridgeContract = (0, utils_1.getContract)(itoken.address, abi_1.default.interopBridgeToken, targetWallet);
+    const { data } = await interopBridgeContract.populateTransaction.mint(transaction.submitEvent.user, ethers_1.ethers.BigNumber.from(transaction.submitEvent.amount.toString()), ethers_1.ethers.BigNumber.from(transaction.submitEvent.sourceChainId.toString()), transaction.submitTransactionHash);
+    transactions.push({
+        to: itoken.address,
+        data: data,
+        value: '0',
+        operation: ethers_multisend_1.OperationType.Call,
+    });
+    logs.push({
+        type: 'mint',
+        message: `Minted ${transaction.submitEvent.amount / 10 ** token.decimals} ${token.symbol} to ${transaction.submitEvent.user}`,
+    });
+    return {
+        transactions,
+        logs,
+    };
+}
+exports.default = default_1;

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

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

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

@@ -0,0 +1,50 @@
+"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");
+async function default_1(transaction, type) {
+    const transactions = [];
+    const logs = [];
+    if (transaction.action !== 'withdraw') {
+        throw new Error(`Invalid action: ${transaction.action}`);
+    }
+    if (transaction.action === 'withdraw' && transaction.sourceStatus === 'pending') {
+        throw Error('Cannot build data for pending withdraw transaction');
+    }
+    if (!transaction.submitEvent) {
+        throw Error('Cannot build data for transaction without submitEvent');
+    }
+    const { to, amount, sourceChainId, targetChainId, itoken: itokenAddress } = transaction.submitEvent;
+    const itoken = constants_1.itokens[sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
+    if (!itoken) {
+        throw Error(`Unsupported itoken ${itokenAddress}`);
+    }
+    const token = constants_1.tokens[targetChainId].find(t => t.symbol.toLowerCase() === itoken.symbol.toLowerCase());
+    if (!token) {
+        throw Error(`Unsupported token ${itoken.symbol}`);
+    }
+    const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(targetChainId));
+    const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
+    const gatewayAddress = constants_1.addresses[targetChainId].interopXGateway;
+    const interopBridgeContract = (0, utils_1.getContract)(gatewayAddress, abi_1.default.interopXGateway, targetWallet);
+    const { data } = await interopBridgeContract.populateTransaction.systemWithdraw(ethers_1.ethers.BigNumber.from(amount.toString()), to, token.address, ethers_1.ethers.BigNumber.from(sourceChainId.toString()), transaction.submitTransactionHash);
+    transactions.push({
+        to: gatewayAddress,
+        data: data,
+        value: '0',
+        operation: ethers_multisend_1.OperationType.Call,
+    });
+    logs.push({
+        type: 'transfer',
+        message: `Transfer ${amount / 10 ** token.decimals} ${token.symbol} to ${to}`,
+    });
+    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 === '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,18 +13,39 @@ 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 = 'de23e71';
 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 GIT_SHORT_HASH = 'd2e8d37';
+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.${GIT_SHORT_HASH})`);
     process.exit(0);
@@ -82,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/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/{SignatureDialProtocol.1.js → TransactionStatusDialProtocol.js}

@@ -18,9 +18,11 @@ class TransactionStatusDialProtocol extends BaseDialProtocol_1.BaseDialProtocol
             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,
         };
     }

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

@@ -10,7 +10,7 @@ const SignatureDialProtocol_1 = require("./dial/SignatureDialProtocol");
 const __1 = require("..");
 const config_1 = __importDefault(require("@/config"));
 const types_1 = require("@/types");
-const SignatureDialProtocol_1_1 = require("./dial/SignatureDialProtocol.1");
+const TransactionStatusDialProtocol_1 = require("./dial/TransactionStatusDialProtocol");
 class Protocol extends stream_1.EventEmitter {
     constructor() {
         super(...arguments);
@@ -31,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(),
                 }),
             },
@@ -65,7 +75,7 @@ class Protocol extends stream_1.EventEmitter {
             });
         });
         this.signature = new SignatureDialProtocol_1.SignatureDialProtocol(this.libp2p);
-        this.transactionStatus = new SignatureDialProtocol_1_1.TransactionStatusDialProtocol(this.libp2p);
+        this.transactionStatus = new TransactionStatusDialProtocol_1.TransactionStatusDialProtocol(this.libp2p);
     }
     init() {
         this.libp2p.pubsub.subscribe(this.topic);

package/dist/src/tasks/AutoUpdateTask.js

@@ -6,16 +6,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const BaseTask_1 = require("./BaseTask");
 const logger_1 = __importDefault(require("@/logger"));
 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 * 5 * 1000;
+        this.pollIntervalMs = 60 * 10 * 1000;
     }
     prePollHandler() {
         return config_1.default.autoUpdate && !config_1.default.isLeadNode();
@@ -32,8 +34,8 @@ class AutoUpdateTask extends BaseTask_1.BaseTask {
     }
     async getLatestVersion() {
         try {
-            const stdout = await (0, await_spawn_1.default)('npm', ['view', package_json_1.default.name, 'version']);
-            return stdout.toString();
+            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);
@@ -47,9 +49,7 @@ class AutoUpdateTask extends BaseTask_1.BaseTask {
         }
         this.logger.warn(`New version ${version} available.`);
         this.logger.info('Updating...');
-        const spawner = (0, await_spawn_1.default)('npm', ['-g', 'install', '@instadapp/interop-x@latest']);
-        spawner.child.on(console.log);
-        await spawner;
+        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`);
@@ -57,10 +57,13 @@ class AutoUpdateTask extends BaseTask_1.BaseTask {
         }
         this.logger.warn(`Installed version ${version}`);
         this.logger.warn(`Restarting...`);
-        (0, await_spawn_1.default)(process.argv[0], process.argv.slice(1), {
+        // 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"
+            stdio: "inherit",
+            // shell: process.env.SHELL, 
         });
+        subprocess.unref();
         process.exit();
     }
 }

package/dist/src/tasks/BaseTask.js

@@ -35,6 +35,10 @@ class BaseTask extends events_1.default {
         }
     }
     prePollHandler() {
+        if (config_1.default.isMaintenanceMode()) {
+            this.logger.warn('Maintenance mode is enabled. Skipping task.');
+            return false;
+        }
         if (this.exceptLeadNode) {
             return !config_1.default.isLeadNode();
         }