@instadapp/interop-x 0.0.0-dev.051cd4e → 0.0.0-dev.098229d

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.051cd4e",
+    "version": "0.0.0-dev.098229d",
     "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",

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/index.js

@@ -37,7 +37,7 @@ if (process.argv.at(-1) === 'help') {
     printUsage();
     process.exit(0);
 }
-const GIT_SHORT_HASH = '051cd4e';
+const GIT_SHORT_HASH = '098229d';
 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/pool/index.js

@@ -111,6 +111,9 @@ class PeerPool {
         }
         return (0, utils_1.getAddress)(peer.publicAddress) === (0, utils_1.getAddress)(config_1.default.leadNodeAddress);
     }
+    getLeadPeer() {
+        return this.peers.find((p) => this.isLeadNode(p.id));
+    }
     cleanup() {
         // let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
         // this.peers.forEach((peerInfo) => {

package/dist/src/net/protocol/dial/SignatureDialProtocol.1.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransactionStatusDialProtocol = void 0;
+const BaseDialProtocol_1 = require("./BaseDialProtocol");
+const db_1 = require("@/db");
+class TransactionStatusDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
+    constructor(libp2p) {
+        super(libp2p, '/interop-x/transaction-status');
+        this.timeout = 30000;
+    }
+    async response(transactionHash) {
+        const transaction = await db_1.Transaction.findOne({ where: { transactionHash } });
+        if (!transaction) {
+            return null;
+        }
+        return {
+            transactionHash: transaction.transactionHash,
+            sourceStatus: transaction.sourceStatus,
+            sourceTransactionHash: transaction.sourceTransactionHash,
+            sourceErrors: transaction.sourceErrors,
+            targetStatus: transaction.targetStatus,
+            targetTransactionHash: transaction.targetTransactionHash,
+            targetErrors: transaction.targetErrors,
+            status: transaction.status,
+        };
+    }
+}
+exports.TransactionStatusDialProtocol = TransactionStatusDialProtocol;

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

@@ -10,6 +10,7 @@ const SignatureDialProtocol_1 = require("./dial/SignatureDialProtocol");
 const __1 = require("..");
 const config_1 = __importDefault(require("@/config"));
 const types_1 = require("@/types");
+const SignatureDialProtocol_1_1 = require("./dial/SignatureDialProtocol.1");
 class Protocol extends stream_1.EventEmitter {
     constructor() {
         super(...arguments);
@@ -64,6 +65,7 @@ class Protocol extends stream_1.EventEmitter {
             });
         });
         this.signature = new SignatureDialProtocol_1.SignatureDialProtocol(this.libp2p);
+        this.transactionStatus = new SignatureDialProtocol_1_1.TransactionStatusDialProtocol(this.libp2p);
     }
     init() {
         this.libp2p.pubsub.subscribe(this.topic);
@@ -117,5 +119,14 @@ class Protocol extends stream_1.EventEmitter {
             return [];
         }
     }
+    async requestTransactionStatus(transactionHash, peerId) {
+        try {
+            return await this.transactionStatus.send(transactionHash, peerId);
+        }
+        catch (error) {
+            console.log(error);
+            return null;
+        }
+    }
 }
 exports.protocol = new Protocol();

package/dist/src/tasks/AutoUpdateTask.js

@@ -5,41 +5,44 @@ 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 package_json_1 = __importDefault(require("../../package.json"));
 const utils_1 = require("@/utils");
-const child_process_1 = require("child_process");
+const await_spawn_1 = __importDefault(require("await-spawn"));
 const config_1 = __importDefault(require("@/config"));
-const currentVersion = package_json_1.default.version;
+const waait_1 = __importDefault(require("waait"));
 class AutoUpdateTask extends BaseTask_1.BaseTask {
     constructor() {
         super({
             logger: new logger_1.default("AutoUpdateTask"),
         });
-        this.pollIntervalMs = 60 * 1000;
+        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.`);
-        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...`);
-            const restart = (0, child_process_1.spawn)(process.argv[0], process.argv.slice(1), {
-                cwd: process.cwd(),
-                detached: true,
-                stdio: "inherit"
-            });
-            restart.on("close", () => {
-                process.exit();
-            });
+        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/BaseTask.js

@@ -14,6 +14,7 @@ class BaseTask extends events_1.default {
         this.started = false;
         this.pollIntervalMs = 10 * 1000;
         this.leadNodeOnly = false;
+        this.exceptLeadNode = false;
         this.logger = logger !== null && logger !== void 0 ? logger : new logger_1.default('BaseTask');
     }
     async pollCheck() {
@@ -34,10 +35,13 @@ class BaseTask extends events_1.default {
         }
     }
     prePollHandler() {
-        if (!this.leadNodeOnly) {
-            return true;
+        if (this.exceptLeadNode) {
+            return !config_1.default.isLeadNode();
         }
-        return config_1.default.isLeadNode();
+        if (this.leadNodeOnly) {
+            return config_1.default.isLeadNode();
+        }
+        return true;
     }
     async pollHandler() {
         this.logger.warn('pollHandler not implemented');

package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js

@@ -0,0 +1,53 @@
+"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 net_1 = require("@/net");
+const db_1 = require("@/db");
+const sequelize_1 = require("sequelize");
+class SyncTransactionStatusTask extends BaseTask_1.BaseTask {
+    constructor() {
+        super({
+            logger: new logger_1.default("SyncTransactionStatusTask"),
+        });
+        this.pollIntervalMs = 60 * 1000;
+        this.exceptLeadNode = true;
+    }
+    async pollHandler() {
+        // if transaction is pending for more than 1 hour, check lead node for status
+        const leadNode = net_1.peerPool.getLeadPeer();
+        if (!leadNode) {
+            return;
+        }
+        const transaction = await db_1.Transaction.findOne({
+            where: {
+                status: 'pending',
+                sourceCreatedAt: {
+                    [sequelize_1.Op.gte]: new Date(Date.now() - 60 * 60 * 1000),
+                },
+            }
+        });
+        if (!transaction) {
+            return;
+        }
+        this.logger.info(`Requesting transaction status for ${transaction.transactionHash}`);
+        const transactionStatus = await net_1.protocol.requestTransactionStatus(transaction.transactionHash, leadNode.id);
+        if (!transactionStatus) {
+            return;
+        }
+        this.logger.info(`Received transaction status for ${transaction.transactionHash}`);
+        transaction.sourceStatus = transactionStatus.sourceStatus;
+        transaction.sourceTransactionHash = transactionStatus.sourceTransactionHash;
+        transaction.sourceErrors = transactionStatus.sourceErrors;
+        transaction.targetStatus = transactionStatus.targetStatus;
+        transaction.targetTransactionHash = transactionStatus.targetTransactionHash;
+        transaction.targetErrors = transactionStatus.targetErrors;
+        transaction.status = transactionStatus.status;
+        await transaction.save();
+        this.logger.info(`Updated transaction status for ${transaction.transactionHash}`);
+    }
+}
+exports.default = SyncTransactionStatusTask;

package/dist/src/tasks/index.js

@@ -9,9 +9,11 @@ const SyncDepositEvents_1 = __importDefault(require("./InteropXGateway/SyncDepos
 const SyncWithdrawEvents_1 = __importDefault(require("./InteropBridge/SyncWithdrawEvents"));
 const ProcessWithdrawEvents_1 = __importDefault(require("./InteropBridge/ProcessWithdrawEvents"));
 const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
+const SyncTransactionStatusTask_1 = __importDefault(require("./Transactions/SyncTransactionStatusTask"));
 class Tasks {
     constructor() {
         this.tasks = [
+            new SyncTransactionStatusTask_1.default(),
             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.051cd4e",
+  "version": "0.0.0-dev.098229d",
   "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",

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/net/pool/index.ts

@@ -123,7 +123,6 @@ export class PeerPool {
         return this.activePeers.map((p) => p.id)
     }
 
-
     getPeer(id: string){
      return this.pool.get(id);   
     }
@@ -138,6 +137,9 @@ export class PeerPool {
         return getAddress(peer.publicAddress) === getAddress(config.leadNodeAddress)
     }
 
+    getLeadPeer() {
+        return this.peers.find((p) => this.isLeadNode(p.id))
+    }
 
     cleanup() {
         // let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60

package/src/net/protocol/dial/SignatureDialProtocol.1.ts

@@ -0,0 +1,31 @@
+import { BaseDialProtocol } from "./BaseDialProtocol";
+import { Transaction } from "@/db";
+
+export class TransactionStatusDialProtocol extends BaseDialProtocol<string, Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'status'> | null> {
+    protected timeout = 30000;
+
+    constructor(libp2p) {
+        super(libp2p, '/interop-x/transaction-status')
+    }
+
+    async response(transactionHash: string){
+        const transaction = await Transaction.findOne({ where: { transactionHash } })
+
+        if(! transaction){
+            return null
+        }
+        return {
+            transactionHash: transaction.transactionHash,
+
+            sourceStatus: transaction.sourceStatus,
+            sourceTransactionHash: transaction.sourceTransactionHash,
+            sourceErrors: transaction.sourceErrors,
+
+            targetStatus: transaction.targetStatus,
+            targetTransactionHash: transaction.targetTransactionHash,
+            targetErrors: transaction.targetErrors,
+
+            status: transaction.status,
+        }
+    }
+}

package/src/net/protocol/index.ts

@@ -6,6 +6,7 @@ import { IPeerInfo, peerPool } from "..";
 import config from "@/config";
 import { Event } from "@/types";
 import { Transaction } from "@/db";
+import { TransactionStatusDialProtocol } from "./dial/SignatureDialProtocol.1";
 
 export interface ProtocolOptions {
     /* Handshake timeout in ms (default: 8000) */
@@ -90,6 +91,7 @@ class Protocol extends EventEmitter {
         },
     ];
     private signature: SignatureDialProtocol;
+    private transactionStatus: TransactionStatusDialProtocol;
 
 
     start({ libp2p, topic = null, }) {
@@ -109,6 +111,7 @@ class Protocol extends EventEmitter {
         })
 
         this.signature = new SignatureDialProtocol(this.libp2p);
+        this.transactionStatus = new TransactionStatusDialProtocol(this.libp2p);
     }
 
 
@@ -177,6 +180,15 @@ class Protocol extends EventEmitter {
             return []
         }
     }
+
+    async requestTransactionStatus(transactionHash: string, peerId: string) {
+        try {
+            return await this.transactionStatus.send(transactionHash, peerId);
+        } catch (error) {
+            console.log(error);
+            return null
+        }
+    }
 }
 
 export const protocol = new Protocol();

package/src/tasks/AutoUpdateTask.ts

@@ -1,13 +1,12 @@
 import { BaseTask } from "./BaseTask";
 import Logger from '@/logger';
-import packageJson from '../../package.json'
 import { http } from "@/utils";
-import { spawn } from 'child_process';
+import spawn from 'await-spawn';
 import config from "@/config";
-const currentVersion = packageJson.version;
+import wait from "waait";
 
 class AutoUpdateTask extends BaseTask {
-    pollIntervalMs: number = 60 * 1000
+    pollIntervalMs: number = 60 * 5 * 1000
 
     constructor() {
         super({
@@ -19,11 +18,15 @@ 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;
@@ -32,22 +35,25 @@ class AutoUpdateTask extends BaseTask {
         this.logger.warn(`New version ${version} available.`)
 
 
-        const update = spawn('npm', ['-g', 'install', '@instadapp/interop-x']);
+        await spawn('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
 
-        update.on("close", () => {
-            this.logger.warn(`Installed version ${version}`)
-            this.logger.warn(`Restarting...`)
 
-            const restart = spawn(process.argv[0], process.argv.slice(1), {
-                cwd: process.cwd(),
-                detached: true,
-                stdio: "inherit"
-            });
+        await wait(5000)
 
-            restart.on("close", () => {
-                process.exit()
-            })
-        })
+        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()
     }
 }
 

package/src/tasks/BaseTask.ts

@@ -19,6 +19,7 @@ export class BaseTask extends EventEmitter implements IBaseTask {
     started: boolean = false
     pollIntervalMs: number = 10 * 1000
     leadNodeOnly: boolean = false
+    exceptLeadNode: boolean = false
 
     public constructor({ logger }: { logger?: Logger }) {
         super()
@@ -45,11 +46,15 @@ export class BaseTask extends EventEmitter implements IBaseTask {
     }
 
     prePollHandler(): boolean {
-        if (!this.leadNodeOnly) {
-            return true
+        if (this.exceptLeadNode) {
+            return !config.isLeadNode();
         }
 
-        return config.isLeadNode()
+        if (this.leadNodeOnly) {
+            return config.isLeadNode()
+        }
+
+        return true
     }
 
     async pollHandler() {

package/src/tasks/Transactions/SyncTransactionStatusTask.ts

@@ -0,0 +1,65 @@
+import { BaseTask } from "../BaseTask";
+import Logger from '@/logger';
+import config from "@/config";
+import { peerPool, protocol } from "@/net";
+import { Transaction } from "@/db";
+import { Op } from "sequelize";
+
+class SyncTransactionStatusTask extends BaseTask {
+    pollIntervalMs: number = 60 * 1000
+    exceptLeadNode: boolean = true;
+
+    constructor() {
+        super({
+            logger: new Logger("SyncTransactionStatusTask"),
+        })
+    }
+    
+    async pollHandler() {
+        // if transaction is pending for more than 1 hour, check lead node for status
+        const leadNode = peerPool.getLeadPeer();
+
+        if (!leadNode) {
+            return;
+        }
+
+        const transaction = await Transaction.findOne({
+            where: {
+                status: 'pending',
+                sourceCreatedAt: {
+                    [Op.gte]: new Date(Date.now() - 60 * 60 * 1000),
+                },
+            }
+        })
+
+        if (!transaction) {
+            return;
+        }
+
+        this.logger.info(`Requesting transaction status for ${transaction.transactionHash}`)
+
+        const transactionStatus = await protocol.requestTransactionStatus(transaction.transactionHash, leadNode.id);
+
+        if (!transactionStatus) {
+            return;
+        }
+
+        this.logger.info(`Received transaction status for ${transaction.transactionHash}`)
+
+        transaction.sourceStatus = transactionStatus.sourceStatus
+        transaction.sourceTransactionHash = transactionStatus.sourceTransactionHash
+        transaction.sourceErrors = transactionStatus.sourceErrors
+
+        transaction.targetStatus = transactionStatus.targetStatus
+        transaction.targetTransactionHash = transactionStatus.targetTransactionHash
+        transaction.targetErrors = transactionStatus.targetErrors
+
+        transaction.status = transactionStatus.status
+
+        await transaction.save()
+
+        this.logger.info(`Updated transaction status for ${transaction.transactionHash}`)
+    }
+}
+
+export default SyncTransactionStatusTask;

package/src/tasks/index.ts

@@ -5,10 +5,12 @@ import InteropXGatewaySyncDepositEvents from "./InteropXGateway/SyncDepositEvent
 import InteropBridgeSyncWithdrawEvents from "./InteropBridge/SyncWithdrawEvents";
 import InteropBridgeProcessWithdrawEvents from "./InteropBridge/ProcessWithdrawEvents";
 import AutoUpdateTask from "./AutoUpdateTask";
+import SyncTransactionStatusTask from "./Transactions/SyncTransactionStatusTask";
 
 export class Tasks {
     
     tasks: BaseTask[] = [
+        new SyncTransactionStatusTask(),
         new AutoUpdateTask(),
 
         new InteropXGatewaySyncDepositEvents({