@instadapp/interop-x 0.0.0-dev.b5a9a93 → 0.0.0-dev.b660e0a

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.b5a9a93",
+    "version": "0.0.0-dev.b660e0a",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {
@@ -24,8 +24,6 @@
     },
     "dependencies": {
         "@achingbrain/libp2p-gossipsub": "^0.12.2",
-        "@fastify/cors": "^7.0.0",
-        "await-spawn": "^4.0.2",
         "axios": "^0.27.1",
         "axios-retry": "^3.2.4",
         "bignumber.js": "^9.0.2",
@@ -36,6 +34,7 @@
         "ethers-multisend": "^2.1.1",
         "expand-home-dir": "^0.0.3",
         "fastify": "^3.28.0",
+        "fastify-cors": "^6.0.3",
         "libp2p": "^0.36.2",
         "libp2p-bootstrap": "^0.14.0",
         "libp2p-kad-dht": "^0.28.6",

package/dist/src/api/index.js

@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startApiServer = void 0;
 const fastify_1 = __importDefault(require("fastify"));
-const cors_1 = __importDefault(require("@fastify/cors"));
+const fastify_cors_1 = __importDefault(require("fastify-cors"));
 const logger_1 = __importDefault(require("@/logger"));
 const db_1 = require("@/db");
 const logger = new logger_1.default("RPC");
 const server = (0, fastify_1.default)({ logger: false });
-server.register(cors_1.default, {});
+server.register(fastify_cors_1.default, {});
 server.get('/', async () => 'Interop X API');
 const startApiServer = async () => {
     const HOST = process.env.API_HOST || '0.0.0.0';

package/dist/src/config/index.js

@@ -8,7 +8,6 @@ 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

@@ -20,7 +20,6 @@ module_alias_1.default.addAliases({
 });
 (0, module_alias_1.default)();
 const dotenv_1 = __importDefault(require("dotenv"));
-const chalk_1 = __importDefault(require("chalk"));
 const ethers_1 = require("ethers");
 const package_json_1 = __importDefault(require("../package.json"));
 dotenv_1.default.config();
@@ -30,20 +29,14 @@ 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 = 'b5a9a93';
-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'));
+    console.error('Please provide a private key\n\n');
     printUsage();
     process.exit(1);
 }
@@ -51,11 +44,10 @@ try {
     new ethers_1.ethers.Wallet(process.env.PRIVATE_KEY);
 }
 catch (e) {
-    console.error(chalk_1.default.bgRed.white('Invalid private key\n'));
-    printUsage();
+    logger.error('Invalid private key');
     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.b660e0a)`);
 const tasks_1 = require("@/tasks");
 const net_1 = require("@/net");
 const api_1 = require("@/api");
@@ -67,8 +59,6 @@ async function main() {
     (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} `);
             return;
         }
         const transaction = await db_1.Transaction.findOne({ where: { transactionHash: payload.data.transactionHash } });

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

@@ -101,9 +101,6 @@ class PeerPool {
     get activePeerIds() {
         return this.activePeers.map((p) => p.id);
     }
-    getPeer(id) {
-        return this.pool.get(id);
-    }
     isLeadNode(id) {
         const peer = this.pool.get(id);
         if (!peer) {

package/dist/src/tasks/index.js

@@ -8,11 +8,9 @@ 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.b5a9a93",
+  "version": "0.0.0-dev.b660e0a",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -24,8 +24,6 @@
   },
   "dependencies": {
     "@achingbrain/libp2p-gossipsub": "^0.12.2",
-    "@fastify/cors": "^7.0.0",
-    "await-spawn": "^4.0.2",
     "axios": "^0.27.1",
     "axios-retry": "^3.2.4",
     "bignumber.js": "^9.0.2",
@@ -36,6 +34,7 @@
     "ethers-multisend": "^2.1.1",
     "expand-home-dir": "^0.0.3",
     "fastify": "^3.28.0",
+    "fastify-cors": "^6.0.3",
     "libp2p": "^0.36.2",
     "libp2p-bootstrap": "^0.14.0",
     "libp2p-kad-dht": "^0.28.6",

package/src/api/index.ts

@@ -1,5 +1,5 @@
 import fastify from "fastify"
-import cors from '@fastify/cors'
+import cors from 'fastify-cors'
 import Logger from "@/logger"
 import { Transaction } from "@/db";
 

package/src/config/index.ts

@@ -8,14 +8,12 @@ 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

@@ -17,7 +17,6 @@ moduleAlias.addAliases({
 
 moduleAlias();
 import dotenv from "dotenv";
-import chalk from 'chalk';
 import { ethers } from "ethers";
 import packageJson from '../package.json'
 dotenv.config();
@@ -29,7 +28,6 @@ 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')
 }
 
@@ -38,27 +36,20 @@ 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'))
+    console.error('Please provide a private key\n\n')
     printUsage()
     process.exit(1)
 }
 try {
     new ethers.Wallet(process.env.PRIVATE_KEY!)
 } catch (e) {
-    console.error(chalk.bgRed.white('Invalid private key\n'))
-    printUsage()
+    logger.error('Invalid private key')
     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";
@@ -77,8 +68,6 @@ 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} `)
             return;
         }
 

package/src/net/pool/index.ts

@@ -124,10 +124,6 @@ export class PeerPool {
     }
 
 
-    getPeer(id: string){
-     return this.pool.get(id);   
-    }
-
     isLeadNode(id: string) {
         const peer = this.pool.get(id);
 

package/src/tasks/index.ts

@@ -4,13 +4,10 @@ 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
         }),

package/dist/src/tasks/AutoUpdateTask.js

@@ -1,48 +0,0 @@
-"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 utils_1 = require("@/utils");
-const await_spawn_1 = __importDefault(require("await-spawn"));
-const config_1 = __importDefault(require("@/config"));
-const waait_1 = __importDefault(require("waait"));
-class AutoUpdateTask extends BaseTask_1.BaseTask {
-    constructor() {
-        super({
-            logger: new logger_1.default("AutoUpdateTask"),
-        });
-        this.pollIntervalMs = 60 * 5 * 1000;
-    }
-    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.`);
-        await (0, await_spawn_1.default)('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
-        await (0, waait_1.default)(5000);
-        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...`);
-        (0, await_spawn_1.default)(process.argv[0], process.argv.slice(1), {
-            cwd: process.cwd(),
-            stdio: "inherit"
-        });
-        process.exit();
-    }
-}
-exports.default = AutoUpdateTask;

package/src/tasks/AutoUpdateTask.ts

@@ -1,60 +0,0 @@
-import { BaseTask } from "./BaseTask";
-import Logger from '@/logger';
-import { http } from "@/utils";
-import spawn from 'await-spawn';
-import config from "@/config";
-import wait from "waait";
-
-class AutoUpdateTask extends BaseTask {
-    pollIntervalMs: number = 60 * 5 * 1000
-
-    constructor() {
-        super({
-            logger: new Logger("AutoUpdateTask"),
-        })
-    }
-
-    prePollHandler(): boolean {
-        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;
-        }
-
-        this.logger.warn(`New version ${version} available.`)
-
-
-        await spawn('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
-
-
-        await wait(5000)
-
-        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...`)
-
-        spawn(process.argv[0], process.argv.slice(1), {
-            cwd: process.cwd(),
-            stdio: "inherit"
-        });
-
-        process.exit()
-    }
-}
-
-export default AutoUpdateTask;