@instadapp/interop-x 0.0.0-dev.c3250d9 → 0.0.0-dev.d05464a

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.c3250d9",
+    "version": "0.0.0-dev.d05464a",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {
@@ -24,6 +24,8 @@
     },
     "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",
@@ -34,7 +36,6 @@
         "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",
@@ -46,6 +47,8 @@
         "libp2p-websockets": "^0.16.2",
         "luxon": "^2.3.2",
         "module-alias": "^2.2.2",
+        "patch-package": "^6.4.7",
+        "postinstall-postinstall": "^2.1.0",
         "sequelize": "6.18.0",
         "sqlite3": "^5.0.5",
         "waait": "^1.0.5"
@@ -60,8 +63,6 @@
         "@types/fs-extra": "^9.0.13",
         "@types/node": "^17.0.17",
         "nodemon": "^2.0.15",
-        "patch-package": "^6.4.7",
-        "postinstall-postinstall": "^2.1.0",
         "replace-in-file": "^6.3.2",
         "rimraf": "^3.0.2",
         "ts-node": "^10.5.0",

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 fastify_cors_1 = __importDefault(require("fastify-cors"));
+const 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(fastify_cors_1.default, {});
+server.register(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,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

@@ -19,28 +19,43 @@ module_alias_1.default.addAliases({
     "@/typechain": __dirname + "/typechain"
 });
 (0, module_alias_1.default)();
-const assert_1 = __importDefault(require("assert"));
 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();
 const logger_1 = __importDefault(require("@/logger"));
 const logger = new logger_1.default('Process');
-if (process.argv.at(-1) === 'help') {
+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);
 }
-(0, assert_1.default)(process.env.PRIVATE_KEY, "PRIVATE_KEY is not defined");
+const GIT_SHORT_HASH = 'd05464a';
+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();
+    process.exit(1);
+}
 try {
     new ethers_1.ethers.Wallet(process.env.PRIVATE_KEY);
 }
 catch (e) {
-    logger.error('Invalid private key');
+    console.error(chalk_1.default.bgRed.white('Invalid private key\n'));
+    printUsage();
     process.exit(1);
 }
-logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.c3250d9)`);
+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");
@@ -50,8 +65,10 @@ async function main() {
     const tasks = new tasks_1.Tasks();
     tasks.start();
     (0, api_1.startApiServer)();
-    net_1.protocol.on('Transaction', async (payload) => {
+    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,6 +101,9 @@ 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/net/protocol/index.js

@@ -25,7 +25,7 @@ class Protocol extends stream_1.EventEmitter {
                 }),
             },
             {
-                name: 'Transaction',
+                name: 'TransactionStatus',
                 code: 0x02,
                 encode: (transaction) => [
                     Buffer.from(transaction.transactionHash),
@@ -100,7 +100,7 @@ class Protocol extends stream_1.EventEmitter {
         this.libp2p.pubsub.publish(this.topic, encoded);
     }
     sendTransaction(transaction) {
-        const message = this.protocolMessages.find((m) => m.name === 'Transaction');
+        const message = this.protocolMessages.find((m) => m.name === 'TransactionStatus');
         const encoded = ethereumjs_util_1.rlp.encode([message.code, message.encode(transaction)]);
         this.libp2p.pubsub.publish(this.topic, encoded);
     }

package/dist/src/tasks/AutoUpdateTask.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 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/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/dist/src/utils/index.js

@@ -185,6 +185,11 @@ function getContract(address, contractInterface, signerOrProvider) {
         throw Error(`Invalid 'address' parameter '${address}'.`);
     }
     const contract = new ethers_1.ethers.Contract(address, contractInterface, signerOrProvider);
+    // Make sure the contract properties is writable
+    const desc = Object.getOwnPropertyDescriptor(contract, 'functions');
+    if (!desc || desc.writable !== true) {
+        return contract;
+    }
     return new Proxy(contract, {
         get(target, prop, receiver) {
             const value = Reflect.get(target, prop, receiver);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.c3250d9",
+  "version": "0.0.0-dev.d05464a",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -24,6 +24,8 @@
   },
   "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",
@@ -34,7 +36,6 @@
     "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",
@@ -46,6 +47,8 @@
     "libp2p-websockets": "^0.16.2",
     "luxon": "^2.3.2",
     "module-alias": "^2.2.2",
+    "patch-package": "^6.4.7",
+    "postinstall-postinstall": "^2.1.0",
     "sequelize": "6.18.0",
     "sqlite3": "^5.0.5",
     "waait": "^1.0.5"
@@ -60,8 +63,6 @@
     "@types/fs-extra": "^9.0.13",
     "@types/node": "^17.0.17",
     "nodemon": "^2.0.15",
-    "patch-package": "^6.4.7",
-    "postinstall-postinstall": "^2.1.0",
     "replace-in-file": "^6.3.2",
     "rimraf": "^3.0.2",
     "ts-node": "^10.5.0",

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,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

@@ -16,8 +16,8 @@ moduleAlias.addAliases({
 })
 
 moduleAlias();
-import assert from "assert";
 import dotenv from "dotenv";
+import chalk from 'chalk';
 import { ethers } from "ethers";
 import packageJson from '../package.json'
 dotenv.config();
@@ -25,24 +25,40 @@ dotenv.config();
 import Logger from "@/logger";
 const logger = new Logger('Process')
 
-
-if (process.argv.at(-1) === 'help') {
+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)
 }
 
-assert(process.env.PRIVATE_KEY, "PRIVATE_KEY is not defined");
+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'))
+    printUsage()
+    process.exit(1)
+}
 try {
     new ethers.Wallet(process.env.PRIVATE_KEY!)
 } catch (e) {
-    logger.error('Invalid private key')
+    console.error(chalk.bgRed.white('Invalid private key\n'))
+    printUsage()
     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";
@@ -59,8 +75,10 @@ async function main() {
 
     startApiServer()
 
-    protocol.on('Transaction', async (payload) => {
+    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,6 +124,10 @@ export class PeerPool {
     }
 
 
+    getPeer(id: string){
+     return this.pool.get(id);   
+    }
+
     isLeadNode(id: string) {
         const peer = this.pool.get(id);
 

package/src/net/protocol/index.ts

@@ -34,12 +34,12 @@ interface PeerInfoEvent extends BaseMessageEvent {
     data: Omit<IPeerInfo, 'id' | 'updated' | 'idle' | 'pooled'>
 }
 
-interface TransactionEvent extends BaseMessageEvent {
+interface TransactionStatusEvent extends BaseMessageEvent {
     data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'status'>
 }
 
 declare interface Protocol {
-    on(event: 'Transaction', listener: (payload: TransactionEvent) => void): this;
+    on(event: 'TransactionStatus', listener: (payload: TransactionStatusEvent) => void): this;
     on(event: 'PeerInfo', listener: (payload: PeerInfoEvent) => void): this;
     on(event: string, listener: (payload: BaseMessageEvent) => void): this;
 }
@@ -59,7 +59,7 @@ class Protocol extends EventEmitter {
             }),
         },
         {
-            name: 'Transaction',
+            name: 'TransactionStatus',
             code: 0x02,
             encode: (transaction: Transaction) => [
                 Buffer.from(transaction.transactionHash),
@@ -158,7 +158,7 @@ class Protocol extends EventEmitter {
     }
 
     public sendTransaction(transaction: Transaction) {
-        const message = this.protocolMessages.find((m) => m.name === 'Transaction')!
+        const message = this.protocolMessages.find((m) => m.name === 'TransactionStatus')!
 
         const encoded = rlp.encode([message.code, message.encode(transaction)]);
 

package/src/tasks/AutoUpdateTask.ts

@@ -0,0 +1,60 @@
+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;

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
         }),

package/src/utils/index.ts

@@ -259,6 +259,12 @@ export function getContract<TContract extends ethers.Contract>(address: string,
     signerOrProvider
   ) as TContract
 
+  // Make sure the contract properties is writable
+  const desc = Object.getOwnPropertyDescriptor(contract, 'functions');
+
+  if (!desc || desc.writable !== true) {
+    return contract
+  }
 
   return new Proxy(contract, {
     get(target, prop, receiver) {