@instadapp/interop-x 0.0.0-dev.234b8be → 0.0.0-dev.30b0db0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.234b8be",
+    "version": "0.0.0-dev.30b0db0",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {
@@ -28,6 +28,7 @@
         "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",
@@ -35,7 +36,6 @@
         "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/api/index.js

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

package/dist/src/config/index.js

@@ -1,22 +1,16 @@
 "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 = 20;
+        this.maxPeers = 10;
         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;
@@ -24,8 +18,5 @@ 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/index.js

@@ -4,8 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const module_alias_1 = __importDefault(require("module-alias"));
-const expand_home_dir_1 = __importDefault(require("expand-home-dir"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
 module_alias_1.default.addAliases({
     "@/": __dirname + "/",
     "@/logger": __dirname + "/logger",
@@ -39,18 +37,7 @@ 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);
-}
-const GIT_SHORT_HASH = '234b8be';
+const GIT_SHORT_HASH = '30b0db0';
 if (process.argv.at(-1) === 'version') {
     console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
     process.exit(0);

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

@@ -23,7 +23,6 @@ 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
@@ -78,7 +77,7 @@ const startPeer = async ({}) => {
             persistence: true,
         },
     });
-    logger.info("Peer ID:", chalk_1.default.bold(node.peerId.toB58String()));
+    logger.info("Peer ID:", node.peerId.toB58String());
     await node.start();
     net_1.protocol.start({
         libp2p: node

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

@@ -9,7 +9,6 @@ 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() {
@@ -73,7 +72,7 @@ class PeerPool {
             peer.pooled = true;
             if (newPeer) {
                 config_1.default.events.emit(types_1.Event.POOL_PEER_ADDED, peer);
-                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`);
+                logger.info(`Peer ${peer.id} with address ${(0, utils_2.shortenHash)(peer.publicAddress)} added to pool`);
             }
         }
     }
@@ -87,7 +86,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 ${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`);
+                logger.info(`Peer ${peer.id} with address ${(0, utils_2.shortenHash)(peer.publicAddress)} removed from pool`);
             }
         }
     }

package/dist/src/tasks/AutoUpdateTask.js

@@ -5,64 +5,43 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const BaseTask_1 = require("./BaseTask");
 const logger_1 = __importDefault(require("@/logger"));
+const utils_1 = require("@/utils");
 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 * 10 * 1000;
+        this.pollIntervalMs = 60 * 5 * 1000;
     }
     prePollHandler() {
         return config_1.default.autoUpdate && !config_1.default.isLeadNode();
     }
-    async getInstalledVersion() {
-        try {
-            const stdout = await (0, await_spawn_1.default)('npm', ['-g', 'ls', '--depth=0', '--json']);
-            return JSON.parse(stdout.toString()).dependencies[package_json_1.default.name].version;
-        }
-        catch (error) {
-            this.logger.error(error);
-            return currentVersion;
-        }
-    }
-    async getLatestVersion() {
-        try {
-            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);
-            return currentVersion;
-        }
+    getCurrentVersion() {
+        return require('../../package.json').version;
     }
     async pollHandler() {
-        const version = await this.getLatestVersion();
+        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@${tag}`, '-f']);
+        await (0, await_spawn_1.default)('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
         await (0, waait_1.default)(5000);
-        if (version !== await this.getInstalledVersion()) {
+        if (currentVersion === this.getCurrentVersion()) {
             this.logger.warn(`failed to install ${version}, retrying in 5 minutes`);
             return;
         }
         this.logger.warn(`Installed version ${version}`);
         this.logger.warn(`Restarting...`);
-        const subprocess = (0, child_process_1.spawn)(process.argv[0], process.argv.slice(1), {
+        (0, await_spawn_1.default)(process.argv[0], process.argv.slice(1), {
             cwd: process.cwd(),
-            stdio: "inherit",
-            shell: process.env.SHELL,
+            stdio: "inherit"
         });
-        subprocess.unref();
         process.exit();
     }
 }

package/dist/src/tasks/BaseTask.js

@@ -35,10 +35,6 @@ 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();
         }

package/dist/src/utils/index.js

@@ -22,7 +22,7 @@ function shortenHash(hash, length = 4) {
     if (hash.length < 12)
         return hash;
     const beginningChars = hash.startsWith("0x") ? length + 2 : length;
-    const shortened = hash.substr(0, beginningChars) + "…" + hash.substr(-length);
+    const shortened = hash.substring(0, beginningChars) + "…" + hash.substring(-length);
     return shortened;
 }
 exports.shortenHash = shortenHash;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.234b8be",
+  "version": "0.0.0-dev.30b0db0",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -28,6 +28,7 @@
     "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",
@@ -35,7 +36,6 @@
     "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/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.message)
+        logger.error(err)
         process.exit(1)
     }
 }

package/src/config/index.ts

@@ -1,7 +1,5 @@
 import { ethers, Wallet } from "ethers"
 import { EventBus, EventBusType } from "@/types"
-import fs from 'fs-extra'
-import expandHomeDir from "expand-home-dir";
 
 class Config {
     public readonly events: EventBusType
@@ -11,17 +9,15 @@ class Config {
     public readonly wallet: Wallet
     public readonly staging: boolean
     public readonly autoUpdate: boolean
-    public readonly baseConfigPath: string
 
     constructor() {
         this.events = new EventBus()  as EventBusType
-        this.maxPeers = 20
+        this.maxPeers = 10
         this.privateKey = process.env.PRIVATE_KEY as string;
         this.staging = !! process.env.STAGING && process.env.STAGING === 'true';
         this.autoUpdate = !! process.env.AUTO_UPDATE && process.env.AUTO_UPDATE === 'true';
         this.wallet = new Wallet(this.privateKey);
         this.leadNodeAddress = '0x910E413DBF3F6276Fe8213fF656726bDc142E08E'
-        this.baseConfigPath = expandHomeDir(`~/.interop-x`);
     }
 
     get publicAddress(){
@@ -31,10 +27,6 @@ class Config {
     isLeadNode() {
         return ethers.utils.getAddress(this.leadNodeAddress) === ethers.utils.getAddress(this.wallet.address)
     }
-
-    isMaintenanceMode(){
-        return fs.existsSync(this.baseConfigPath + '/maintenance')
-    }
 }
 
 export default new Config()

package/src/index.ts

@@ -1,6 +1,5 @@
 import moduleAlias from 'module-alias';
-import expandHomeDir from "expand-home-dir";
-import fs from 'fs-extra'
+
 moduleAlias.addAliases({
     "@/": __dirname + "/",
     "@/logger": __dirname + "/logger",
@@ -39,21 +38,6 @@ if (process.argv.at(-1) === 'help') {
     process.exit(0)
 }
 
-const basePath = expandHomeDir(`~/.interop-x`);
-
-if (process.argv.at(-1) === 'down') {
-    fs.outputFileSync(basePath + '/maintenance', Date.now().toString())
-    console.log(chalk.red('Maintenance mode enabled'))
-    process.exit(0)
-}
-
-if (process.argv.at(-1) === 'up') {
-    fs.removeSync(basePath + '/maintenance')
-    console.log(chalk.green('Maintenance mode disabled'))
-    process.exit(0)
-}
-
-
 const GIT_SHORT_HASH = '@GIT_SHORT_HASH@';
 
 if (process.argv.at(-1) === 'version') {
@@ -61,7 +45,7 @@ if (process.argv.at(-1) === 'version') {
     process.exit(0)
 }
 
-if (!process.env.PRIVATE_KEY) {
+if(! process.env.PRIVATE_KEY) {
     console.error(chalk.bgRed.white.bold('Please provide a private key\n'))
     printUsage()
     process.exit(1)
@@ -96,10 +80,10 @@ async function main() {
         if (!peerPool.isLeadNode(payload.peerId)) {
             const peer = peerPool.getPeer(payload.peerId)
 
-            if (!peer) {
+            if(! peer) {
                 return;
             }
-
+            
             logger.info(`ignored transaction status from ${payload.peerId} ${shortenHash(peer.publicAddress)} `)
             return;
         }

package/src/net/peer/index.ts

@@ -17,7 +17,6 @@ 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");
 
@@ -81,7 +80,7 @@ export const startPeer = async ({ }: IPeerOptions) => {
     },
   });
 
-  logger.info("Peer ID:", chalk.bold(node.peerId.toB58String()));
+  logger.info("Peer ID:", node.peerId.toB58String());
 
   await node.start();
 

package/src/net/pool/index.ts

@@ -3,7 +3,6 @@ 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')
@@ -89,7 +88,7 @@ export class PeerPool {
 
             if (newPeer) {
                 config.events.emit(Event.POOL_PEER_ADDED, peer)
-                logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} added to pool`)
+                logger.info(`Peer ${peer.id} with address ${shortenHash(peer.publicAddress)} added to pool`)
             }
         }
     }
@@ -104,7 +103,7 @@ export class PeerPool {
             if (this.pool.delete(peer.id)) {
                 peer.pooled = false
                 config.events.emit(Event.POOL_PEER_REMOVED, peer)
-                logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} removed from pool`)
+                logger.info(`Peer ${peer.id} with address ${shortenHash(peer.publicAddress)} removed from pool`)
             }
         }
     }

package/src/tasks/AutoUpdateTask.ts

@@ -1,16 +1,12 @@
 import { BaseTask } from "./BaseTask";
 import Logger from '@/logger';
-import spawnAsync from 'await-spawn';
-import { spawn } from 'child_process'
+import { http } from "@/utils";
+import spawn from 'await-spawn';
 import config from "@/config";
 import wait from "waait";
-import packageJson from "../../package.json";
-
-const currentVersion = packageJson.version;
-const tag = config.staging ? 'dev' : 'latest';
 
 class AutoUpdateTask extends BaseTask {
-    pollIntervalMs: number = 60 * 10 * 1000
+    pollIntervalMs: number = 60 * 5 * 1000
 
     constructor() {
         super({
@@ -22,28 +18,15 @@ class AutoUpdateTask extends BaseTask {
         return config.autoUpdate && !config.isLeadNode();
     }
 
-    async getInstalledVersion() {
-        try {
-            const stdout = await spawnAsync('npm', ['-g', 'ls', '--depth=0', '--json'])
-            return JSON.parse(stdout.toString()).dependencies[packageJson.name].version
-        } catch (error) {
-            this.logger.error(error)
-            return currentVersion
-        }
+    getCurrentVersion() {
+        return require('../../package.json').version
     }
+    async pollHandler() {
 
-    async getLatestVersion() {
-        try {
-            const stdout = await spawnAsync('npm', ['view', `${packageJson.name}@${tag}`, 'version'])
-            return stdout.toString().trim()
-        } catch (error) {
-            this.logger.error(error)
-            return currentVersion
-        }
-    }
+        const { data } = await http.get('https://registry.npmjs.org/@instadapp/interop-x')
 
-    async pollHandler() {
-        const version = await this.getLatestVersion()
+        const version = data['dist-tags'].latest
+        const currentVersion = this.getCurrentVersion()
 
         if (version === currentVersion) {
             return;
@@ -51,13 +34,13 @@ class AutoUpdateTask extends BaseTask {
 
         this.logger.warn(`New version ${version} available.`)
 
-        this.logger.info('Updating...')
 
-        await spawnAsync('npm', ['-g', 'install', `@instadapp/interop-x@${tag}`, '-f']);
+        await spawn('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
+
 
         await wait(5000)
 
-        if (version !== await this.getInstalledVersion()) {
+        if (currentVersion === this.getCurrentVersion()) {
             this.logger.warn(`failed to install ${version}, retrying in 5 minutes`)
             return;
         }
@@ -65,14 +48,11 @@ class AutoUpdateTask extends BaseTask {
         this.logger.warn(`Installed version ${version}`)
         this.logger.warn(`Restarting...`)
 
-        const subprocess = spawn(process.argv[0], process.argv.slice(1), {
+        spawn(process.argv[0], process.argv.slice(1), {
             cwd: process.cwd(),
-            stdio: "inherit",
-            shell: process.env.SHELL,
+            stdio: "inherit"
         });
 
-        subprocess.unref();
-
         process.exit()
     }
 }

package/src/tasks/BaseTask.ts

@@ -46,11 +46,6 @@ export class BaseTask extends EventEmitter implements IBaseTask {
     }
 
     prePollHandler(): boolean {
-        if(config.isMaintenanceMode()){
-            this.logger.warn('Maintenance mode is enabled. Skipping task.')
-            return false
-        }
-
         if (this.exceptLeadNode) {
             return !config.isLeadNode();
         }

package/src/utils/index.ts

@@ -24,7 +24,7 @@ export function shortenHash(hash: string, length: number = 4) {
 
   const beginningChars = hash.startsWith("0x") ? length + 2 : length;
 
-  const shortened = hash.substr(0, beginningChars) + "…" + hash.substr(-length);
+  const shortened = hash.substring(0, beginningChars) + "…" + hash.substring(-length);
 
   return shortened;
 }