@instadapp/interop-x 0.0.0-dev.5bcd66b → 0.0.0-dev.67e7c3a

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.5bcd66b",
+    "version": "0.0.0-dev.67e7c3a",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {

package/dist/src/config/index.js

@@ -8,6 +8,7 @@ class Config {
         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';
     }

package/dist/src/index.js

@@ -30,12 +30,18 @@ const printUsage = () => {
     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');
 };
 if (process.argv.at(-1) === 'help') {
     printUsage();
     process.exit(0);
 }
+const GIT_SHORT_HASH = '67e7c3a';
+if (process.argv.at(-1) === 'version') {
+    console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);
+    process.exit(0);
+}
 if (!process.env.PRIVATE_KEY) {
     console.error(chalk_1.default.bgRed.white.bold('Please provide a private key\n'));
     printUsage();
@@ -49,7 +55,7 @@ catch (e) {
     printUsage();
     process.exit(1);
 }
-logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.5bcd66b)`);
+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");

package/dist/src/tasks/AutoUpdateTask.js

@@ -0,0 +1,44 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const BaseTask_1 = require("./BaseTask");
+const logger_1 = __importDefault(require("@/logger"));
+const package_json_1 = __importDefault(require("../../package.json"));
+const utils_1 = require("@/utils");
+const child_process_1 = require("child_process");
+const config_1 = __importDefault(require("@/config"));
+const currentVersion = package_json_1.default.version;
+class AutoUpdateTask extends BaseTask_1.BaseTask {
+    constructor() {
+        super({
+            logger: new logger_1.default("AutoUpdateTask"),
+        });
+        this.pollIntervalMs = 60 * 1000;
+    }
+    prePollHandler() {
+        return config_1.default.autoUpdate && !config_1.default.isLeadNode();
+    }
+    async pollHandler() {
+        const { data } = await utils_1.http.get('https://registry.npmjs.org/@instadapp/interop-x');
+        const version = data['dist-tags'].latest;
+        if (version === currentVersion) {
+            return;
+        }
+        this.logger.warn(`New version ${version} available.`);
+        const update = (0, child_process_1.spawn)('npm', ['-g', 'install', '@instadapp/interop-x']);
+        update.on("close", () => {
+            this.logger.warn(`Installed version ${version}`);
+            this.logger.warn(`Restarting...`);
+            (0, child_process_1.spawn)(process.argv[0], process.argv.slice(1), {
+                cwd: process.cwd(),
+                env: Object.create(process.env),
+                detached: true,
+                stdio: "inherit"
+            });
+            process.exit();
+        });
+    }
+}
+exports.default = AutoUpdateTask;

package/dist/src/tasks/index.js

@@ -8,9 +8,11 @@ const ProcessDepositEvents_1 = __importDefault(require("./InteropXGateway/Proces
 const SyncDepositEvents_1 = __importDefault(require("./InteropXGateway/SyncDepositEvents"));
 const SyncWithdrawEvents_1 = __importDefault(require("./InteropBridge/SyncWithdrawEvents"));
 const ProcessWithdrawEvents_1 = __importDefault(require("./InteropBridge/ProcessWithdrawEvents"));
+const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
 class Tasks {
     constructor() {
         this.tasks = [
+            new AutoUpdateTask_1.default(),
             new SyncDepositEvents_1.default({
                 chainId: 43114
             }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.5bcd66b",
+  "version": "0.0.0-dev.67e7c3a",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {

package/src/config/index.ts

@@ -8,12 +8,14 @@ class Config {
     public readonly privateKey: string
     public readonly wallet: Wallet
     public readonly staging: boolean
+    public readonly autoUpdate: boolean
 
     constructor() {
         this.events = new EventBus()  as EventBusType
         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'
     }

package/src/index.ts

@@ -29,6 +29,7 @@ const printUsage = () => {
     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')
 }
 
@@ -37,6 +38,12 @@ if (process.argv.at(-1) === 'help') {
     process.exit(0)
 }
 
+const GIT_SHORT_HASH = '@GIT_SHORT_HASH@';
+
+if (process.argv.at(-1) === 'version') {
+    console.log(`Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
+    process.exit(0)
+}
 
 if(! process.env.PRIVATE_KEY) {
     console.error(chalk.bgRed.white.bold('Please provide a private key\n'))
@@ -51,7 +58,7 @@ try {
     process.exit(1)
 }
 
-logger.debug(`Starting Interop X Node (v${packageJson.version} - rev.@GIT_SHORT_HASH@)`)
+logger.debug(`Starting Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
 
 import { Tasks } from "@/tasks";
 import { startPeer, protocol, peerPool } from "@/net";

package/src/tasks/AutoUpdateTask.ts

@@ -0,0 +1,54 @@
+import { BaseTask } from "./BaseTask";
+import Logger from '@/logger';
+import packageJson from '../../package.json'
+import { http } from "@/utils";
+import { spawn } from 'child_process';
+import config from "@/config";
+const currentVersion = packageJson.version;
+
+class AutoUpdateTask extends BaseTask {
+    pollIntervalMs: number = 60 * 1000
+
+    constructor() {
+        super({
+            logger: new Logger("AutoUpdateTask"),
+        })
+    }
+
+
+    prePollHandler(): boolean {
+        return config.autoUpdate && !config.isLeadNode();
+    }
+
+    async pollHandler() {
+
+        const { data } = await http.get('https://registry.npmjs.org/@instadapp/interop-x')
+
+        const version = data['dist-tags'].latest
+
+        if (version === currentVersion) {
+            return;
+        }
+
+        this.logger.warn(`New version ${version} available.`)
+
+
+        const update = spawn('npm', ['-g', 'install', '@instadapp/interop-x']);
+
+        update.on("close", () => {
+            this.logger.warn(`Installed version ${version}`)
+            this.logger.warn(`Restarting...`)
+
+            spawn(process.argv[0], process.argv.slice(1), {
+                cwd: process.cwd(),
+                env: Object.create(process.env),
+                detached: true,
+                stdio: "inherit"
+            });
+
+            process.exit()
+        })
+    }
+}
+
+export default AutoUpdateTask;

package/src/tasks/index.ts

@@ -4,10 +4,13 @@ import InteropXGatewaySyncDepositEvents from "./InteropXGateway/SyncDepositEvent
 
 import InteropBridgeSyncWithdrawEvents from "./InteropBridge/SyncWithdrawEvents";
 import InteropBridgeProcessWithdrawEvents from "./InteropBridge/ProcessWithdrawEvents";
+import AutoUpdateTask from "./AutoUpdateTask";
 
 export class Tasks {
     
     tasks: BaseTask[] = [
+        new AutoUpdateTask(),
+
         new InteropXGatewaySyncDepositEvents({
             chainId: 43114
         }),