@instadapp/interop-x 0.0.0-dev.3e0fb42 → 0.0.0-dev.40b2517

package/src/net/pool/index.ts

@@ -1,5 +1,12 @@
-import { Event } from "../../types";
-import config from "../../config";
+import { Event } from "@/types";
+import config from "@/config";
+import Logger from "@/logger";
+import { getAddress } from "ethers/lib/utils";
+import { shortenHash } from "@/utils";
+import chalk from "chalk";
+
+
+const logger = new Logger('PeerPool')
 
 export interface IPeerInfo {
     id: string;
@@ -75,10 +82,15 @@ export class PeerPool {
      * @emits {@link Event.POOL_PEER_ADDED}
      */
     add(peer?: IPeerInfo) {
-        if (peer && peer.id && !this.pool.get(peer.id)) {
+        if (peer && peer.id) {
+            const newPeer = !this.pool.get(peer.id);
             this.pool.set(peer.id, peer)
             peer.pooled = true
-            config.events.emit(Event.POOL_PEER_ADDED, peer)
+
+            if (newPeer) {
+                config.events.emit(Event.POOL_PEER_ADDED, peer)
+                logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} added to pool`)
+            }
         }
     }
 
@@ -92,6 +104,7 @@ export class PeerPool {
             if (this.pool.delete(peer.id)) {
                 peer.pooled = false
                 config.events.emit(Event.POOL_PEER_REMOVED, peer)
+                logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} removed from pool`)
             }
         }
     }
@@ -100,7 +113,7 @@ export class PeerPool {
         this.cleanup()
 
         return this.peers.filter((p) => {
-            if(!p.pooled) return false;
+            if (!p.pooled) return false;
 
             const now = new Date()
 
@@ -112,16 +125,33 @@ export class PeerPool {
         return this.activePeers.map((p) => p.id)
     }
 
+    getPeer(id: string){
+     return this.pool.get(id);   
+    }
 
-    cleanup() {
-        let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
+    isLeadNode(id: string) {
+        const peer = this.pool.get(id);
 
-        this.peers.forEach((peerInfo) => {
-            if (peerInfo.updated.getTime() < compDate) {
-                console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
-                this.remove(peerInfo)
-            }
-        })
+        if (!peer) {
+            return false;
+        }
+
+        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
+
+        // this.peers.forEach((peerInfo) => {
+        //     if (peerInfo.updated.getTime() < compDate) {
+        //         console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
+        //         this.remove(peerInfo)
+        //     }
+        // })
     }
 }
 

package/src/net/protocol/dial/BaseDialProtocol.ts

@@ -1,7 +1,7 @@
 import pipe from 'it-pipe';
 import Libp2p from 'libp2p';
 import PeerId from 'peer-id';
-import { asyncCallWithTimeout } from '../../../utils';
+import { asyncCallWithTimeout } from '@/utils';
 import wait from 'waait';
 
 export class BaseDialProtocol<TRequest extends any, TResponse extends any> {

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

@@ -1,14 +1,15 @@
-import { signGnosisSafeTx } from "../../../utils";
 import { BaseDialProtocol } from "./BaseDialProtocol";
 import wait from "waait";
-import { ChainId } from "../../../types";
-import config from "config";
-import { addresses } from "../../../constants";
-import { Execution } from "db";
+import config from "@/config";
+import { Transaction } from "@/db";
+import { signGnosisSafeTx } from "@/utils";
+import { addresses } from "@/constants";
+import { ChainId } from "@/types";
+import { buildGnosisAction } from "@/gnosis";
 
 export interface ISignatureRequest {
-    type: string,
-    vnonce: string
+    type: 'source' | 'target',
+    transactionHash: string
     safeTxGas: string
     safeNonce: string
 }
@@ -21,42 +22,48 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
     protected timeout = 30000;
 
     constructor(libp2p) {
-        super(libp2p, '/signatures')
+        super(libp2p, '/interop-x/signatures')
     }
 
     async response(data: ISignatureRequest): Promise<ISignatureResponse> {
+        console.log({
+            tag: 'SignatureDialProtocol',
+            data
+        })
         const signer = config.wallet;
 
-        let event: Execution | null;
+        let transaction: Transaction | null;
         let maxTimeout = 20000;
 
         do {
-            event = await Execution.findOne({ where: { vnonce: data.vnonce.toString() } })
+            transaction = await Transaction.findOne({ where: { transactionHash: data.transactionHash } })
 
-            if (!event) {
+            if (!transaction) {
                 await wait(1000);
                 maxTimeout -= 1000;
             }
-        } while (!event && maxTimeout > 0)
+        } while (!transaction && maxTimeout > 0)
 
-        if (!event) {
+        if (!transaction) {
             return {
                 signer: signer.address,
                 data: null,
                 error: 'Event not found'
             };
         }
+        const { data: gnosisData } = await buildGnosisAction(transaction, data.type);
 
         const signedData = await signGnosisSafeTx({
-            to: addresses[event.chainId as ChainId].multisend,
-            data: 'TODO',
-            chainId: event.chainId as ChainId,
+            to: addresses[transaction.sourceChainId].multisend,
+            data: gnosisData,
+            chainId: transaction.sourceChainId as ChainId,
             safeTxGas: data.safeTxGas,
+            nonce: data.safeNonce,
         }, { signer });
 
         return {
             signer: signer.address,
-            data: signedData,
+            data: signedData
         }
     }
 }

package/src/net/protocol/dial/TransactionStatusDialProtocol.ts

@@ -0,0 +1,33 @@
+import { BaseDialProtocol } from "./BaseDialProtocol";
+import { Transaction } from "@/db";
+
+export class TransactionStatusDialProtocol extends BaseDialProtocol<string, Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'sourceLogs'  | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'targetLogs' | '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,
+            sourceLogs: transaction.sourceLogs,
+
+            targetStatus: transaction.targetStatus,
+            targetTransactionHash: transaction.targetTransactionHash,
+            targetErrors: transaction.targetErrors,
+            targetLogs: transaction.targetLogs,
+
+            status: transaction.status,
+        }
+    }
+}

package/src/net/protocol/index.ts

@@ -3,8 +3,10 @@ import Libp2p from 'libp2p';
 import { bufferToInt, rlp } from 'ethereumjs-util'
 import { SignatureDialProtocol, ISignatureRequest, ISignatureResponse } from "./dial/SignatureDialProtocol";
 import { IPeerInfo, peerPool } from "..";
-import config from "config";
-import { Event } from "types";
+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) */
@@ -33,7 +35,12 @@ interface PeerInfoEvent extends BaseMessageEvent {
     data: Omit<IPeerInfo, 'id' | 'updated' | 'idle' | 'pooled'>
 }
 
+interface TransactionStatusEvent extends BaseMessageEvent {
+    data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'sourceLogs' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'targetLogs' | 'status'>
+}
+
 declare interface Protocol {
+    on(event: 'TransactionStatus', listener: (payload: TransactionStatusEvent) => void): this;
     on(event: 'PeerInfo', listener: (payload: PeerInfoEvent) => void): this;
     on(event: string, listener: (payload: BaseMessageEvent) => void): this;
 }
@@ -44,7 +51,7 @@ class Protocol extends EventEmitter {
     private protocolMessages: Message[] = [
         {
             name: 'PeerInfo',
-            code: 0x09,
+            code: 0x01,
             encode: (info: Pick<IPeerInfo, 'publicAddress'>) => [
                 Buffer.from(info.publicAddress),
             ],
@@ -52,13 +59,54 @@ class Protocol extends EventEmitter {
                 publicAddress: publicAddress.toString(),
             }),
         },
+        {
+            name: 'TransactionStatus',
+            code: 0x02,
+            encode: (transaction: Transaction) => [
+                Buffer.from(transaction.transactionHash),
+
+                Buffer.from(transaction.sourceStatus),
+                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 ? 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, 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() || 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() || 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, }) {
         this.libp2p = libp2p
-        this.topic = topic || 'protocol'
+        this.topic = topic || 'itnerop-x-protocol'
 
         if (this.libp2p.isStarted()) this.init()
 
@@ -73,6 +121,7 @@ class Protocol extends EventEmitter {
         })
 
         this.signature = new SignatureDialProtocol(this.libp2p);
+        this.transactionStatus = new TransactionStatusDialProtocol(this.libp2p);
     }
 
 
@@ -113,7 +162,7 @@ class Protocol extends EventEmitter {
     }
 
 
-    public sendPeerInfo(data: Omit<IPeerInfo, 'peerId' | 'updated' | 'idle'>) {
+    public sendPeerInfo(data: Pick<IPeerInfo, 'publicAddress'>) {
         const message = this.protocolMessages.find((m) => m.name === 'PeerInfo')!
 
         const encoded = rlp.encode([message.code, message.encode(data)]);
@@ -121,6 +170,14 @@ class Protocol extends EventEmitter {
         this.libp2p.pubsub.publish(this.topic, encoded)
     }
 
+    public sendTransaction(transaction: Transaction) {
+        const message = this.protocolMessages.find((m) => m.name === 'TransactionStatus')!
+
+        const encoded = rlp.encode([message.code, message.encode(transaction)]);
+
+        this.libp2p.pubsub.publish(this.topic, encoded)
+    }
+
     async requestSignatures(data: ISignatureRequest, peerIds?: string[]) {
         try {
             peerIds = peerIds || peerPool.activePeerIds;
@@ -133,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/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

@@ -1,8 +1,7 @@
-import config from "config";
-import { ethers } from "ethers";
+import config from "@/config";
 import EventEmitter from "events";
 import wait from "waait";
-import Logger from "../logger";
+import Logger from "@/logger";
 
 export interface IBaseTask {
     pollCheck(): Promise<void>
@@ -20,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()
@@ -38,7 +38,7 @@ export class BaseTask extends EventEmitter implements IBaseTask {
                     await this.pollHandler()
                 }
             } catch (err) {
-                this.logger.error(`poll check error: ${err.message}\ntrace: ${err.stack}`)
+                this.logger.error(`poll check error:\n${err.message}\ntrace: ${err.stack}`)
             }
 
             await this.postPollHandler()
@@ -46,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() {