@instadapp/interop-x 0.0.0-dev.eb2b141 → 0.0.0-dev.f0a6281

package/src/net/pool/index.ts

@@ -2,6 +2,8 @@ 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')
@@ -87,7 +89,7 @@ export class PeerPool {
 
             if (newPeer) {
                 config.events.emit(Event.POOL_PEER_ADDED, peer)
-                logger.info(`Peer ${peer.id} with address ${peer.publicAddress} added to pool`)
+                logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} added to pool`)
             }
         }
     }
@@ -102,7 +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 ${peer.id} with address ${peer.publicAddress} removed from pool`)
+                logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} removed from pool`)
             }
         }
     }
@@ -123,7 +125,6 @@ export class PeerPool {
         return this.activePeers.map((p) => p.id)
     }
 
-
     getPeer(id: string){
      return this.pool.get(id);   
     }
@@ -138,6 +139,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/TransactionStatusDialProtocol.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/TransactionStatusDialProtocol";
 
 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

@@ -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() {

package/src/tasks/InteropBridge/ProcessWithdrawEvents.ts

@@ -220,8 +220,6 @@ class ProcessWithdrawEvents extends BaseTask {
     }
 
     async start(): Promise<void> {
-        this.logger.info(`Starting execution watcher on interop chain`);
-
         this.provider = new ethers.providers.JsonRpcProvider(
             getRpcProviderUrl(this.chainId)
         );

package/src/tasks/InteropBridge/SyncWithdrawEvents.ts

@@ -41,13 +41,13 @@ class SyncWithdrawEvents extends BaseTask {
                     continue;
                 }
 
-                const { to, amount, chainId } = event.args;
+                const { to, amount, sourceChainId, targetChainId } = event.args;
 
                 const uniqueIdentifier = {
                     action: 'withdraw',
                     submitTransactionHash: event.transactionHash,
-                    sourceChainId:this.chainId,
-                    targetChainId: chainId.toNumber(),
+                    sourceChainId: sourceChainId,
+                    targetChainId: targetChainId,
                 }
 
                 if (await Transaction.findOne({ where: uniqueIdentifier })) {
@@ -77,14 +77,16 @@ class SyncWithdrawEvents extends BaseTask {
                         to, 
                         amount: amount.toString(),
                         itoken: this.itokenAddress,
-                        chainId: chainId.toString()
+                        sourceChainId: sourceChainId,
+                        targetChainId: targetChainId,
                     },
 
                     sourceEvent: {
                         to, 
                         amount: amount.toString(), 
                         itoken: this.itokenAddress,
-                        chainId: chainId.toString(),
+                        sourceChainId: sourceChainId,
+                        targetChainId: targetChainId,
                     },
                     status: "pending",
                 })
@@ -102,8 +104,6 @@ class SyncWithdrawEvents extends BaseTask {
     }
 
     async start(): Promise<void> {
-        this.logger.info(`Starting execution watcher on interop chain`);
-
         this.provider = new ethers.providers.JsonRpcProvider(
             getRpcProviderUrl(this.chainId)
         );

package/src/tasks/InteropXGateway/ProcessDepositEvents.ts

@@ -15,7 +15,7 @@ import { LogDescription } from "ethers/lib/utils";
 
 const generateGnosisTransaction = async (transactionData: any, safeContract: GnosisSafe) => {
     console.log(transactionData);
-    
+
     let isExecuted = await safeContract.dataHashes(
         await safeContract.getTransactionHash(
             transactionData.to,
@@ -97,7 +97,7 @@ class ProcessDepositEvents extends BaseTask {
         }
 
         console.log(`Processing transaction ${transaction.transactionHash}`);
-        
+
         transaction.targetStatus = 'pending';
         await transaction.save();
 
@@ -121,9 +121,22 @@ class ProcessDepositEvents extends BaseTask {
         const ownersThreshold = await safeContract.getThreshold();
         await wait(10000);
 
+        let data;
+
+        try {
+            data = await buildDataForTransaction(transaction);
+        } catch (error) {
+            console.log(error);
+            transaction.targetStatus = 'failed';
+            transaction.targetErrors = [error.message];
+            await transaction.save();
+            protocol.sendTransaction(transaction)
+            return;
+        }
+
         let gnosisTx = await generateGnosisTransaction({
             baseGas: "0",
-            data: await buildDataForTransaction(transaction),
+            data,
             gasPrice: "0",
             gasToken: "0x0000000000000000000000000000000000000000",
             nonce: '0',
@@ -142,7 +155,7 @@ class ProcessDepositEvents extends BaseTask {
         console.log(`Collecting signatures for execution ${transaction.transactionHash}`)
 
         console.log(ownerPeerIds);
-        
+
         const signatures = await protocol.requestSignatures({
             type: 'source',
             transactionHash: transaction.transactionHash,
@@ -224,8 +237,6 @@ class ProcessDepositEvents extends BaseTask {
     }
 
     async start(): Promise<void> {
-        this.logger.info(`Starting execution watcher on interop chain`);
-
         this.contractAddress = addresses[this.chainId].interopXGateway;
 
         this.provider = new ethers.providers.JsonRpcProvider(

package/src/tasks/InteropXGateway/SyncDepositEvents.ts

@@ -45,8 +45,8 @@ class SyncDepositEvents extends BaseTask {
                 const uniqueIdentifier = {
                     action: 'deposit',
                     submitTransactionHash: event.transactionHash,
-                    sourceChainId: sourceChainId.toNumber(),
-                    targetChainId: targetChainId.toNumber(),
+                    sourceChainId: sourceChainId,
+                    targetChainId: targetChainId,
                 }
 
                 if (await Transaction.findOne({ where: uniqueIdentifier })) {
@@ -105,8 +105,6 @@ class SyncDepositEvents extends BaseTask {
     }
 
     async start(): Promise<void> {
-        this.logger.info(`Starting execution watcher on interop chain`);
-
         this.contractAddress = addresses[this.chainId].interopXGateway;
 
         this.provider = new ethers.providers.JsonRpcProvider(

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

@@ -4,10 +4,15 @@ 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({
             chainId: 43114
         }),

package/src/typechain/InteropBridgeToken.ts

@@ -31,11 +31,11 @@ export interface InteropBridgeTokenInterface extends utils.Interface {
     "allowance(address,address)": FunctionFragment;
     "approve(address,uint256)": FunctionFragment;
     "balanceOf(address)": FunctionFragment;
-    "burn(address,uint256,uint256)": FunctionFragment;
+    "burn(address,uint256,uint32)": FunctionFragment;
     "decimals()": FunctionFragment;
     "decreaseAllowance(address,uint256)": FunctionFragment;
     "increaseAllowance(address,uint256)": FunctionFragment;
-    "mint(address,uint256,uint256,bytes32)": FunctionFragment;
+    "mint(address,uint256,uint32,bytes32)": FunctionFragment;
     "name()": FunctionFragment;
     "owner()": FunctionFragment;
     "renounceOwnership()": FunctionFragment;
@@ -153,8 +153,8 @@ export interface InteropBridgeTokenInterface extends utils.Interface {
 
   events: {
     "Approval(address,address,uint256)": EventFragment;
-    "Burn(address,uint256,uint256)": EventFragment;
-    "Mint(address,uint256,uint256,bytes32)": EventFragment;
+    "Burn(address,uint256,uint32,uint32)": EventFragment;
+    "Mint(address,uint256,uint32,uint32,bytes32)": EventFragment;
     "OwnershipTransferred(address,address)": EventFragment;
     "Transfer(address,address,uint256)": EventFragment;
   };
@@ -181,10 +181,11 @@ export type ApprovalEventFilter = TypedEventFilter<ApprovalEvent>;
 export interface BurnEventObject {
   to: string;
   amount: BigNumber;
-  chainId: BigNumber;
+  sourceChainId: number;
+  targetChainId: number;
 }
 export type BurnEvent = TypedEvent<
-  [string, BigNumber, BigNumber],
+  [string, BigNumber, number, number],
   BurnEventObject
 >;
 
@@ -193,11 +194,12 @@ export type BurnEventFilter = TypedEventFilter<BurnEvent>;
 export interface MintEventObject {
   to: string;
   amount: BigNumber;
-  chainId: BigNumber;
-  transactionHash: string;
+  sourceChainId: number;
+  targetChainId: number;
+  submitTransactionHash: string;
 }
 export type MintEvent = TypedEvent<
-  [string, BigNumber, BigNumber, string],
+  [string, BigNumber, number, number, string],
   MintEventObject
 >;
 
@@ -486,28 +488,32 @@ export interface InteropBridgeToken extends BaseContract {
       value?: null
     ): ApprovalEventFilter;
 
-    "Burn(address,uint256,uint256)"(
+    "Burn(address,uint256,uint32,uint32)"(
       to?: string | null,
       amount?: null,
-      chainId?: BigNumberish | null
+      sourceChainId?: null,
+      targetChainId?: BigNumberish | null
     ): BurnEventFilter;
     Burn(
       to?: string | null,
       amount?: null,
-      chainId?: BigNumberish | null
+      sourceChainId?: null,
+      targetChainId?: BigNumberish | null
     ): BurnEventFilter;
 
-    "Mint(address,uint256,uint256,bytes32)"(
+    "Mint(address,uint256,uint32,uint32,bytes32)"(
       to?: string | null,
       amount?: null,
-      chainId?: BigNumberish | null,
-      transactionHash?: BytesLike | null
+      sourceChainId?: BigNumberish | null,
+      targetChainId?: null,
+      submitTransactionHash?: BytesLike | null
     ): MintEventFilter;
     Mint(
       to?: string | null,
       amount?: null,
-      chainId?: BigNumberish | null,
-      transactionHash?: BytesLike | null
+      sourceChainId?: BigNumberish | null,
+      targetChainId?: null,
+      submitTransactionHash?: BytesLike | null
     ): MintEventFilter;
 
     "OwnershipTransferred(address,address)"(

package/src/typechain/InteropXGateway.ts

@@ -29,11 +29,11 @@ import type {
 export interface InteropXGatewayInterface extends utils.Interface {
   functions: {
     "_vnonce()": FunctionFragment;
-    "deposit(address,uint256,uint256)": FunctionFragment;
-    "depositFor(address,address,uint256,uint256)": FunctionFragment;
+    "deposit(address,uint256,uint32)": FunctionFragment;
+    "depositFor(address,address,uint256,uint32)": FunctionFragment;
     "owner()": FunctionFragment;
     "renounceOwnership()": FunctionFragment;
-    "systemWithdraw(uint256,address,address,uint256,bytes32)": FunctionFragment;
+    "systemWithdraw(uint256,address,address,uint32,bytes32)": FunctionFragment;
     "transferOwnership(address)": FunctionFragment;
   };
 
@@ -89,8 +89,8 @@ export interface InteropXGatewayInterface extends utils.Interface {
   ): Result;
 
   events: {
-    "LogGatewayDeposit(address,address,uint256,uint256,uint256,uint256)": EventFragment;
-    "LogGatewayWithdraw(address,address,uint256,uint256,uint256,bytes32)": EventFragment;
+    "LogGatewayDeposit(address,address,uint256,uint256,uint32,uint32)": EventFragment;
+    "LogGatewayWithdraw(address,address,uint256,uint32,uint32,bytes32)": EventFragment;
     "OwnershipTransferred(address,address)": EventFragment;
   };
 
@@ -104,11 +104,11 @@ export interface LogGatewayDepositEventObject {
   token: string;
   amount: BigNumber;
   vnonce: BigNumber;
-  sourceChainId: BigNumber;
-  targetChainId: BigNumber;
+  sourceChainId: number;
+  targetChainId: number;
 }
 export type LogGatewayDepositEvent = TypedEvent<
-  [string, string, BigNumber, BigNumber, BigNumber, BigNumber],
+  [string, string, BigNumber, BigNumber, number, number],
   LogGatewayDepositEventObject
 >;
 
@@ -119,12 +119,12 @@ export interface LogGatewayWithdrawEventObject {
   user: string;
   token: string;
   amount: BigNumber;
-  sourceChainId: BigNumber;
-  targetChainId: BigNumber;
+  sourceChainId: number;
+  targetChainId: number;
   transactionHash: string;
 }
 export type LogGatewayWithdrawEvent = TypedEvent<
-  [string, string, BigNumber, BigNumber, BigNumber, string],
+  [string, string, BigNumber, number, number, string],
   LogGatewayWithdrawEventObject
 >;
 
@@ -283,7 +283,7 @@ export interface InteropXGateway extends BaseContract {
   };
 
   filters: {
-    "LogGatewayDeposit(address,address,uint256,uint256,uint256,uint256)"(
+    "LogGatewayDeposit(address,address,uint256,uint256,uint32,uint32)"(
       user?: null,
       token?: string | null,
       amount?: null,
@@ -300,7 +300,7 @@ export interface InteropXGateway extends BaseContract {
       targetChainId?: BigNumberish | null
     ): LogGatewayDepositEventFilter;
 
-    "LogGatewayWithdraw(address,address,uint256,uint256,uint256,bytes32)"(
+    "LogGatewayWithdraw(address,address,uint256,uint32,uint32,bytes32)"(
       user?: null,
       token?: string | null,
       amount?: null,