@instadapp/interop-x 0.0.0-dev.098229d → 0.0.0-dev.160118e

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.098229d",
+    "version": "0.0.0-dev.160118e",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {

package/dist/src/api/index.js

@@ -26,7 +26,7 @@ const startApiServer = async () => {
         logger.log(`RPC Server listening at http://${HOST}:${PORT}`);
     }
     catch (err) {
-        logger.error(err);
+        logger.error(err.message);
         process.exit(1);
     }
 };

package/dist/src/index.js

@@ -37,7 +37,7 @@ if (process.argv.at(-1) === 'help') {
     printUsage();
     process.exit(0);
 }
-const GIT_SHORT_HASH = '098229d';
+const GIT_SHORT_HASH = '160118e';
 if (process.argv.at(-1) === 'version') {
     console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
     process.exit(0);
@@ -60,6 +60,7 @@ 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();
@@ -68,7 +69,10 @@ async function main() {
     net_1.protocol.on('TransactionStatus', async (payload) => {
         if (!net_1.peerPool.isLeadNode(payload.peerId)) {
             const peer = net_1.peerPool.getPeer(payload.peerId);
-            logger.info(`ignored transaction status from ${payload.peerId} ${peer === null || peer === void 0 ? void 0 : peer.publicAddress} `);
+            if (!peer) {
+                return;
+            }
+            logger.info(`ignored transaction status from ${payload.peerId} ${(0, utils_1.shortenHash)(peer.publicAddress)} `);
             return;
         }
         const transaction = await db_1.Transaction.findOne({ where: { transactionHash: payload.data.transactionHash } });

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`);
             }
         }
     }

package/dist/src/tasks/AutoUpdateTask.js

@@ -9,6 +9,8 @@ const utils_1 = require("@/utils");
 const await_spawn_1 = __importDefault(require("await-spawn"));
 const config_1 = __importDefault(require("@/config"));
 const waait_1 = __importDefault(require("waait"));
+const getCurrentVersion = () => require('../../package.json').version;
+const currentVersion = getCurrentVersion();
 class AutoUpdateTask extends BaseTask_1.BaseTask {
     constructor() {
         super({
@@ -19,20 +21,17 @@ class AutoUpdateTask extends BaseTask_1.BaseTask {
     prePollHandler() {
         return config_1.default.autoUpdate && !config_1.default.isLeadNode();
     }
-    getCurrentVersion() {
-        return require('../../package.json').version;
-    }
     async pollHandler() {
         const { data } = await utils_1.http.get('https://registry.npmjs.org/@instadapp/interop-x');
         const version = data['dist-tags'].latest;
-        const currentVersion = this.getCurrentVersion();
         if (version === currentVersion) {
             return;
         }
         this.logger.warn(`New version ${version} available.`);
+        this.logger.info('Updating...');
         await (0, await_spawn_1.default)('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
         await (0, waait_1.default)(5000);
-        if (currentVersion === this.getCurrentVersion()) {
+        if (currentVersion === getCurrentVersion()) {
             this.logger.warn(`failed to install ${version}, retrying in 5 minutes`);
             return;
         }

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

@@ -139,7 +139,6 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
         }
     }
     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();
     }

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

@@ -61,7 +61,6 @@ class SyncWithdrawEvents extends BaseTask_1.BaseTask {
             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();

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

@@ -140,7 +140,6 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
         net_1.protocol.sendTransaction(transaction);
     }
     async start() {
-        this.logger.info(`Starting execution watcher on interop chain`);
         this.contractAddress = constants_1.addresses[this.chainId].interopXGateway;
         this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
         this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));

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

@@ -65,7 +65,6 @@ class SyncDepositEvents extends BaseTask_1.BaseTask {
             this.logger.info(`${processedEvents} events processed`);
     }
     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 = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));

package/dist/src/utils/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getContract = exports.buildWithdrawDataForTransaction = exports.buildDepositDataForTransaction = exports.buildDataForTransaction = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.http = void 0;
+exports.getContract = exports.buildWithdrawDataForTransaction = exports.buildDepositDataForTransaction = exports.buildDataForTransaction = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.shortenHash = exports.http = void 0;
 /**
  * @module util
  */
@@ -16,6 +16,16 @@ const config_1 = __importDefault(require("@/config"));
 const abi_1 = __importDefault(require("@/abi"));
 exports.http = axios_1.default.create();
 (0, axios_retry_1.default)(exports.http, { retries: 3, retryDelay: axios_retry_1.default.exponentialDelay });
+function shortenHash(hash, length = 4) {
+    if (!hash)
+        return;
+    if (hash.length < 12)
+        return hash;
+    const beginningChars = hash.startsWith("0x") ? length + 2 : length;
+    const shortened = hash.substr(0, beginningChars) + "…" + hash.substr(-length);
+    return shortened;
+}
+exports.shortenHash = shortenHash;
 function short(buffer) {
     return buffer.toString('hex').slice(0, 8) + '...';
 }
@@ -59,11 +69,11 @@ exports.signGnosisSafeTx = signGnosisSafeTx;
 const getRpcProviderUrl = (chainId) => {
     switch (chainId) {
         case 1:
-            return 'https://rpc.instadapp.io/mainnet';
+            return 'https://rpc.ankr.com/eth';
         case 137:
-            return 'https://rpc.instadapp.io/polygon';
+            return 'https://rpc.ankr.com/polygon';
         case 43114:
-            return 'https://rpc.instadapp.io/avalanche';
+            return 'https://rpc.ankr.com/avalanche';
         default:
             throw new Error(`Unknown chainId: ${chainId}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.098229d",
+  "version": "0.0.0-dev.160118e",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {

package/src/api/index.ts

@@ -27,7 +27,7 @@ export const startApiServer = async () => {
 
         logger.log(`RPC Server listening at http://${HOST}:${PORT}`)
     } catch (err) {
-        logger.error(err)
+        logger.error(err.message)
         process.exit(1)
     }
 }

package/src/index.ts

@@ -64,6 +64,7 @@ import { Tasks } from "@/tasks";
 import { startPeer, protocol, peerPool } from "@/net";
 import { startApiServer } from '@/api';
 import { Transaction } from './db';
+import { shortenHash } from './utils';
 
 async function main() {
 
@@ -78,7 +79,12 @@ async function main() {
     protocol.on('TransactionStatus', async (payload) => {
         if (!peerPool.isLeadNode(payload.peerId)) {
             const peer = peerPool.getPeer(payload.peerId)
-            logger.info(`ignored transaction status from ${payload.peerId} ${peer?.publicAddress} `)
+
+            if(! peer) {
+                return;
+            }
+            
+            logger.info(`ignored transaction status from ${payload.peerId} ${shortenHash(peer.publicAddress)} `)
             return;
         }
 

package/src/net/peer/index.ts

@@ -17,6 +17,7 @@ import KadDHT from "libp2p-kad-dht";
 import PubsubPeerDiscovery from "libp2p-pubsub-peer-discovery";
 import { protocol } from "@/net";
 import config from "@/config";
+import chalk from "chalk";
 
 const logger = new Logger("Peer");
 
@@ -80,7 +81,7 @@ export const startPeer = async ({ }: IPeerOptions) => {
     },
   });
 
-  logger.info("Peer ID:", node.peerId.toB58String());
+  logger.info("Peer ID:", chalk.bold(node.peerId.toB58String()));
 
   await node.start();
 

package/src/net/pool/index.ts

@@ -2,6 +2,8 @@ import { Event } from "@/types";
 import config from "@/config";
 import Logger from "@/logger";
 import { getAddress } from "ethers/lib/utils";
+import { shortenHash } from "@/utils";
+import chalk from "chalk";
 
 
 const logger = new Logger('PeerPool')
@@ -87,7 +89,7 @@ export class PeerPool {
 
             if (newPeer) {
                 config.events.emit(Event.POOL_PEER_ADDED, peer)
-                logger.info(`Peer ${peer.id} with address ${peer.publicAddress} added to pool`)
+                logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} added to pool`)
             }
         }
     }
@@ -102,7 +104,7 @@ export class PeerPool {
             if (this.pool.delete(peer.id)) {
                 peer.pooled = false
                 config.events.emit(Event.POOL_PEER_REMOVED, peer)
-                logger.info(`Peer ${peer.id} with address ${peer.publicAddress} removed from pool`)
+                logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} removed from pool`)
             }
         }
     }

package/src/tasks/AutoUpdateTask.ts

@@ -5,6 +5,10 @@ import spawn from 'await-spawn';
 import config from "@/config";
 import wait from "waait";
 
+const getCurrentVersion = () => require('../../package.json').version
+
+const currentVersion = getCurrentVersion()
+
 class AutoUpdateTask extends BaseTask {
     pollIntervalMs: number = 60 * 5 * 1000
 
@@ -18,15 +22,11 @@ class AutoUpdateTask extends BaseTask {
         return config.autoUpdate && !config.isLeadNode();
     }
 
-    getCurrentVersion() {
-        return require('../../package.json').version
-    }
     async pollHandler() {
 
         const { data } = await http.get('https://registry.npmjs.org/@instadapp/interop-x')
 
         const version = data['dist-tags'].latest
-        const currentVersion = this.getCurrentVersion()
 
         if (version === currentVersion) {
             return;
@@ -35,12 +35,13 @@ class AutoUpdateTask extends BaseTask {
         this.logger.warn(`New version ${version} available.`)
 
 
-        await spawn('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
+        this.logger.info('Updating...')
 
+        await spawn('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
 
         await wait(5000)
 
-        if (currentVersion === this.getCurrentVersion()) {
+        if (currentVersion === getCurrentVersion()) {
             this.logger.warn(`failed to install ${version}, retrying in 5 minutes`)
             return;
         }

package/src/tasks/InteropBridge/ProcessWithdrawEvents.ts

@@ -220,8 +220,6 @@ class ProcessWithdrawEvents extends BaseTask {
     }
 
     async start(): Promise<void> {
-        this.logger.info(`Starting execution watcher on interop chain`);
-
         this.provider = new ethers.providers.JsonRpcProvider(
             getRpcProviderUrl(this.chainId)
         );

package/src/tasks/InteropBridge/SyncWithdrawEvents.ts

@@ -102,8 +102,6 @@ class SyncWithdrawEvents extends BaseTask {
     }
 
     async start(): Promise<void> {
-        this.logger.info(`Starting execution watcher on interop chain`);
-
         this.provider = new ethers.providers.JsonRpcProvider(
             getRpcProviderUrl(this.chainId)
         );

package/src/tasks/InteropXGateway/ProcessDepositEvents.ts

@@ -224,8 +224,6 @@ class ProcessDepositEvents extends BaseTask {
     }
 
     async start(): Promise<void> {
-        this.logger.info(`Starting execution watcher on interop chain`);
-
         this.contractAddress = addresses[this.chainId].interopXGateway;
 
         this.provider = new ethers.providers.JsonRpcProvider(

package/src/tasks/InteropXGateway/SyncDepositEvents.ts

@@ -105,8 +105,6 @@ class SyncDepositEvents extends BaseTask {
     }
 
     async start(): Promise<void> {
-        this.logger.info(`Starting execution watcher on interop chain`);
-
         this.contractAddress = addresses[this.chainId].interopXGateway;
 
         this.provider = new ethers.providers.JsonRpcProvider(

package/src/utils/index.ts

@@ -17,6 +17,18 @@ export const http = axios.create();
 axiosRetry(http, { retries: 3, retryDelay: axiosRetry.exponentialDelay });
 
 
+export function shortenHash(hash: string, length: number = 4) {
+  if (!hash) return;
+
+  if (hash.length < 12) return hash;
+
+  const beginningChars = hash.startsWith("0x") ? length + 2 : length;
+
+  const shortened = hash.substr(0, beginningChars) + "…" + hash.substr(-length);
+
+  return shortened;
+}
+
 export function short(buffer: Buffer): string {
   return buffer.toString('hex').slice(0, 8) + '...'
 }
@@ -76,11 +88,11 @@ export const signGnosisSafeTx = async ({
 export const getRpcProviderUrl = (chainId: ChainId) => {
   switch (chainId) {
     case 1:
-      return 'https://rpc.instadapp.io/mainnet';
+      return 'https://rpc.ankr.com/eth';
     case 137:
-      return 'https://rpc.instadapp.io/polygon';
+      return 'https://rpc.ankr.com/polygon';
     case 43114:
-      return 'https://rpc.instadapp.io/avalanche';
+      return 'https://rpc.ankr.com/avalanche';
     default:
       throw new Error(`Unknown chainId: ${chainId}`);
   }