@instadapp/interop-x 0.0.0-dev.adea608 → 0.0.0-dev.b15abb5

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/TransactionStatusDialProtocol";
 
 export interface ProtocolOptions {
     /* Handshake timeout in ms (default: 8000) */
@@ -34,12 +35,12 @@ interface PeerInfoEvent extends BaseMessageEvent {
     data: Omit<IPeerInfo, 'id' | 'updated' | 'idle' | 'pooled'>
 }
 
-interface TransactionEvent extends BaseMessageEvent {
-    data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'status'>
+interface TransactionStatusEvent extends BaseMessageEvent {
+    data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'sourceLogs' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'targetLogs' | '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,37 +60,48 @@ class Protocol extends EventEmitter {
             }),
         },
         {
-            name: 'Transaction',
+            name: 'TransactionStatus',
             code: 0x02,
             encode: (transaction: Transaction) => [
                 Buffer.from(transaction.transactionHash),
 
                 Buffer.from(transaction.sourceStatus),
-                Buffer.from(transaction.sourceTransactionHash),
-                transaction.sourceErrors.map((e) => Buffer.from(e)),
+                Buffer.from(transaction.sourceTransactionHash || ''),
+                transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
+                transaction.sourceLogs ? transaction.sourceLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
 
                 Buffer.from(transaction.targetStatus),
-                Buffer.from(transaction.targetTransactionHash),
-                transaction.targetErrors.map((e) => Buffer.from(e)),
+                Buffer.from(transaction.targetTransactionHash || ''),
+                transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
+                transaction.targetLogs ? transaction.targetLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
 
                 Buffer.from(transaction.status),
             ],
-            decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]: [Buffer, Buffer, Buffer, Buffer[], Buffer, Buffer, Buffer[], Buffer]) => ({
+            decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, sourceLogs, targetStatus, targetTransactionHash, targetErrors, targetLogs, status]: [Buffer, Buffer, Buffer, Buffer[],[Buffer,Buffer][], Buffer, Buffer, Buffer[],[Buffer,Buffer][], Buffer]) => ({
                 transactionHash: transactionHash.toString(),
 
                 sourceStatus: sourceStatus.toString(),
-                sourceTransactionHash: sourceTransactionHash.toString(),
+                sourceTransactionHash: sourceTransactionHash.toString() || null,
                 sourceErrors: sourceErrors.map((e) => e.toString()),
+                sourceLogs: sourceLogs.map(e => ({
+                    type: e[0].toString(),
+                    message: e[1].toString(),
+                })),
 
                 targetStatus: targetStatus.toString(),
-                targetTransactionHash: targetTransactionHash.toString(),
+                targetTransactionHash: targetTransactionHash.toString() || null,
                 targetErrors: targetErrors.map((e) => e.toString()),
+                targetLogs: targetLogs.map(e => ({
+                    type: e[0].toString(),
+                    message: e[1].toString(),
+                })),
 
                 status: status.toString(),
             }),
         },
     ];
     private signature: SignatureDialProtocol;
+    private transactionStatus: TransactionStatusDialProtocol;
 
 
     start({ libp2p, topic = null, }) {
@@ -109,6 +121,7 @@ class Protocol extends EventEmitter {
         })
 
         this.signature = new SignatureDialProtocol(this.libp2p);
+        this.transactionStatus = new TransactionStatusDialProtocol(this.libp2p);
     }
 
 
@@ -158,7 +171,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)]);
 
@@ -177,6 +190,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/providers/index.ts

@@ -0,0 +1 @@
+export * from './retry-provider';

package/src/providers/retry-provider.ts

@@ -0,0 +1,51 @@
+import { ethers } from "ethers";
+import wait from "waait";
+import Bluebird from "bluebird";
+
+export interface RetryOptions {
+    delay?: number;
+    timeouts: number[];
+}
+
+export function promiseTimeout<T>(ms: number, promise: Promise<T>): Promise<T> {
+    return Bluebird.resolve(promise).timeout(ms);
+}
+
+export function retryOperation(
+    retriesLeft: number,
+    operation: () => Promise<any>,
+    options: RetryOptions
+) {
+    return new Promise((resolve, reject) => {
+        const { timeouts } = options;
+        // Find the timeout for this specific iteration
+        const timeout = timeouts[timeouts.length - retriesLeft];
+
+        // Wrap the original operation in a timeout
+        const execution = promiseTimeout(timeout, operation());
+
+        // If the promise is successful, resolve it and bubble the result up
+        return execution.then(resolve).catch((reason: any) => {
+            // If there are any retries left, we call the same retryOperation function again,
+            // but decrementing the number of retries left by 1
+            if (retriesLeft - 1 > 0) {
+                // Delay the new attempt slightly
+                return wait(options.delay || 50)
+                    .then(retryOperation.bind(null, retriesLeft - 1, operation, options))
+                    .then(resolve)
+                    .catch(reject);
+            }
+            // Reject (and bubble the result up) if there are no more retries
+            return reject(reason);
+        });
+    });
+}
+
+export class JsonRpcRetryProvider extends ethers.providers.JsonRpcProvider {
+    public perform(method: string, params: any): Promise<any> {
+        const timeouts = [5_000, 10_000];
+        const operation = () => super.perform(method, params);
+
+        return retryOperation(2, operation, { timeouts, delay: 50 });
+    }
+}

package/src/services/Prices.ts

@@ -0,0 +1,89 @@
+import Web3Utils from "web3-utils";
+import path from "path";
+import fs from "fs";
+import { tokens } from "@/constants";
+import expandHomeDir from "expand-home-dir";
+import config from "@/config";
+import { http } from "@/utils";
+
+const basePath = expandHomeDir(`~/.interop-x/data/${config.publicAddress}/${config.staging ? 'staging' : ''}`);
+const mainnetPricesFilePath = path.resolve(basePath, "./mainnetPrices.json");
+const networkTokenPricesFilePath = path.resolve(basePath, "./networkTokenPrices.json");
+
+class Prices {
+  private static mainnetPrices = {};
+
+  private static networkTokenPrices = {};
+
+  static async fetch() {
+
+    if (!fs.existsSync(mainnetPricesFilePath)) {
+      fs.writeFileSync(mainnetPricesFilePath, JSON.stringify({}));
+    }
+
+    if (!fs.existsSync(networkTokenPricesFilePath)) {
+      fs.writeFileSync(networkTokenPricesFilePath, JSON.stringify({}));
+    }
+
+    this.mainnetPrices = JSON.parse(fs.readFileSync(mainnetPricesFilePath, "utf8"));
+    this.networkTokenPrices = JSON.parse(fs.readFileSync(networkTokenPricesFilePath, "utf8"));
+
+    try {
+      const path = tokens["1"]
+        .filter((a) => a.symbol !== "ETH")
+        .map((token) => token.address)
+        .join(",");
+
+      const [response, ethResponse, avaxResponse, polygonResponse] =
+        await Promise.all([
+          http.get(
+            "https://api.coingecko.com/api/v3/simple/token_price/ethereum",
+            {
+              params: { contract_addresses: path, vs_currencies: "usd" },
+            }
+          ),
+          http.get("https://api.coingecko.com/api/v3/simple/price", {
+            params: { ids: "ethereum", vs_currencies: "usd" },
+          }),
+          http.get("https://api.coingecko.com/api/v3/simple/price", {
+            params: { ids: "avalanche-2", vs_currencies: "usd" },
+          }),
+          http.get("https://api.coingecko.com/api/v3/simple/price", {
+            params: { ids: "matic-network", vs_currencies: "usd" },
+          }),
+        ]);
+
+      this.networkTokenPrices = {
+        "1": ethResponse.data.ethereum.usd.toString(),
+        "137": polygonResponse.data["matic-network"].usd.toString(),
+        "43114": avaxResponse.data["avalanche-2"].usd.toString(),
+      };
+
+      const data = response.data;
+
+      for (const key in data) {
+        const _key = Web3Utils.toChecksumAddress(key);
+        if (!data[key].usd) continue;
+        this.mainnetPrices[_key] = data[key].usd.toString();
+      }
+
+      this.mainnetPrices["0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE"] =
+        ethResponse.data.ethereum.usd.toString();
+    } catch (error) { }
+
+    fs.writeFileSync(mainnetPricesFilePath, JSON.stringify(this.mainnetPrices));
+    fs.writeFileSync(networkTokenPricesFilePath, JSON.stringify(this.networkTokenPrices));
+
+    return this.mainnetPrices;
+  }
+
+  static getMainnetPrices() {
+    return this.mainnetPrices;
+  }
+
+  static getNetworkTokenPrices() {
+    return this.networkTokenPrices;
+  }
+}
+
+export default Prices;

package/src/services/index.ts

@@ -0,0 +1 @@
+export { default as Prices } from './Prices';

package/src/tasks/AutoUpdateTask.ts

@@ -0,0 +1,82 @@
+import { BaseTask } from "./BaseTask";
+import Logger from '@/logger';
+import spawnAsync from 'await-spawn';
+import { spawn } from 'child_process'
+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
+
+    constructor() {
+        super({
+            logger: new Logger("AutoUpdateTask"),
+        })
+    }
+
+    prePollHandler(): boolean {
+        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
+        }
+    }
+
+    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
+        }
+    }
+
+    async pollHandler() {
+        const version = await this.getLatestVersion()
+
+        if (version === currentVersion) {
+            return;
+        }
+
+        this.logger.warn(`New version ${version} available.`)
+
+        this.logger.info('Updating...')
+
+        await spawnAsync('npm', ['-g', 'install', `@instadapp/interop-x@${tag}`, '-f']);
+
+        await wait(5000)
+
+        if (version !== await this.getInstalledVersion()) {
+            this.logger.warn(`failed to install ${version}, retrying in 5 minutes`)
+            return;
+        }
+
+        this.logger.warn(`Installed version ${version}`)
+        this.logger.warn(`Restarting...`)
+
+
+        // TODO: its restarting in the bg, but it should be in the fg
+        const subprocess = spawn(process.argv[0], process.argv.slice(1), {
+            cwd: process.cwd(),
+            stdio: "inherit",
+            // shell: process.env.SHELL, 
+        });
+
+        subprocess.unref();
+
+        process.exit()
+    }
+}
+
+export default AutoUpdateTask;

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,20 @@ export class BaseTask extends EventEmitter implements IBaseTask {
     }
 
     prePollHandler(): boolean {
-        if (!this.leadNodeOnly) {
-            return true
+        if(config.isMaintenanceMode()){
+            this.logger.warn('Maintenance mode is enabled. Skipping task.')
+            return false
         }
 
-        return config.isLeadNode()
+        if (this.exceptLeadNode) {
+            return !config.isLeadNode();
+        }
+
+        if (this.leadNodeOnly) {
+            return config.isLeadNode()
+        }
+
+        return true
     }
 
     async pollHandler() {