@instadapp/interop-x 0.0.0-dev.098229d → 0.0.0-dev.14afa72

package/src/net/peer/index.ts

@@ -17,6 +17,7 @@ import KadDHT from "libp2p-kad-dht";
 import PubsubPeerDiscovery from "libp2p-pubsub-peer-discovery";
 import { protocol } from "@/net";
 import config from "@/config";
+import chalk from "chalk";
 
 const logger = new Logger("Peer");
 
@@ -80,7 +81,7 @@ export const startPeer = async ({ }: IPeerOptions) => {
     },
   });
 
-  logger.info("Peer ID:", node.peerId.toB58String());
+  logger.info("Peer ID:", chalk.bold(node.peerId.toB58String()));
 
   await node.start();
 

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

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

@@ -2,12 +2,13 @@ import { BaseDialProtocol } from "./BaseDialProtocol";
 import wait from "waait";
 import config from "@/config";
 import { Transaction } from "@/db";
-import { buildDataForTransaction, signGnosisSafeTx } from "@/utils";
+import { signGnosisSafeTx } from "@/utils";
 import { addresses } from "@/constants";
 import { ChainId } from "@/types";
+import { buildGnosisAction } from "@/gnosis";
 
 export interface ISignatureRequest {
-    type: 'source' | 'target' ,
+    type: 'source' | 'target',
     transactionHash: string
     safeTxGas: string
     safeNonce: string
@@ -46,18 +47,11 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
                 error: 'Event not found'
             };
         }
-
-        console.log("signing:", {
-            to: addresses[transaction.targetChainId].multisend,
-            data: await buildDataForTransaction(transaction, data.type),
-            chainId: transaction.targetChainId as ChainId,
-            safeTxGas: data.safeTxGas,
-            nonce: data.safeNonce,
-        });
+        const { data: gnosisData } = await buildGnosisAction(transaction, data.type);
 
         const signedData = await signGnosisSafeTx({
             to: addresses[transaction.targetChainId].multisend,
-            data: await buildDataForTransaction(transaction, data.type),
+            data: gnosisData,
             chainId: transaction.targetChainId as ChainId,
             safeTxGas: data.safeTxGas,
             nonce: data.safeNonce,

package/src/net/protocol/index.ts

@@ -6,7 +6,7 @@ import { IPeerInfo, peerPool } from "..";
 import config from "@/config";
 import { Event } from "@/types";
 import { Transaction } from "@/db";
-import { TransactionStatusDialProtocol } from "./dial/SignatureDialProtocol.1";
+import { TransactionStatusDialProtocol } from "./dial/TransactionStatusDialProtocol";
 
 export interface ProtocolOptions {
     /* Handshake timeout in ms (default: 8000) */
@@ -66,11 +66,11 @@ class Protocol extends EventEmitter {
                 Buffer.from(transaction.transactionHash),
 
                 Buffer.from(transaction.sourceStatus),
-                Buffer.from(transaction.sourceTransactionHash),
+                Buffer.from(transaction.sourceTransactionHash || ''),
                 transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
 
                 Buffer.from(transaction.targetStatus),
-                Buffer.from(transaction.targetTransactionHash),
+                Buffer.from(transaction.targetTransactionHash || ''),
                 transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
 
                 Buffer.from(transaction.status),
@@ -79,11 +79,11 @@ class Protocol extends EventEmitter {
                 transactionHash: transactionHash.toString(),
 
                 sourceStatus: sourceStatus.toString(),
-                sourceTransactionHash: sourceTransactionHash.toString(),
+                sourceTransactionHash: sourceTransactionHash.toString() || null,
                 sourceErrors: sourceErrors.map((e) => e.toString()),
 
                 targetStatus: targetStatus.toString(),
-                targetTransactionHash: targetTransactionHash.toString(),
+                targetTransactionHash: targetTransactionHash.toString()|| null,
                 targetErrors: targetErrors.map((e) => e.toString()),
 
                 status: status.toString(),

package/src/tasks/AutoUpdateTask.ts

@@ -1,12 +1,16 @@
 import { BaseTask } from "./BaseTask";
 import Logger from '@/logger';
-import { http } from "@/utils";
-import spawn from 'await-spawn';
+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 * 5 * 1000
+    pollIntervalMs: number = 60 * 10 * 1000
 
     constructor() {
         super({
@@ -18,15 +22,28 @@ class AutoUpdateTask extends BaseTask {
         return config.autoUpdate && !config.isLeadNode();
     }
 
-    getCurrentVersion() {
-        return require('../../package.json').version
+    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 pollHandler() {
 
-        const { data } = await http.get('https://registry.npmjs.org/@instadapp/interop-x')
+    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
+        }
+    }
 
-        const version = data['dist-tags'].latest
-        const currentVersion = this.getCurrentVersion()
+    async pollHandler() {
+        const version = await this.getLatestVersion()
 
         if (version === currentVersion) {
             return;
@@ -34,13 +51,13 @@ class AutoUpdateTask extends BaseTask {
 
         this.logger.warn(`New version ${version} available.`)
 
+        this.logger.info('Updating...')
 
-        await spawn('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
-
+        await spawnAsync('npm', ['-g', 'install', `@instadapp/interop-x@${tag}`, '-f']);
 
         await wait(5000)
 
-        if (currentVersion === this.getCurrentVersion()) {
+        if (version !== await this.getInstalledVersion()) {
             this.logger.warn(`failed to install ${version}, retrying in 5 minutes`)
             return;
         }
@@ -48,11 +65,16 @@ class AutoUpdateTask extends BaseTask {
         this.logger.warn(`Installed version ${version}`)
         this.logger.warn(`Restarting...`)
 
-        spawn(process.argv[0], process.argv.slice(1), {
+
+        // 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"
+            stdio: "inherit",
+            // shell: process.env.SHELL, 
         });
 
+        subprocess.unref();
+
         process.exit()
     }
 }

package/src/tasks/BaseTask.ts

@@ -46,6 +46,11 @@ export class BaseTask extends EventEmitter implements IBaseTask {
     }
 
     prePollHandler(): boolean {
+        if(config.isMaintenanceMode()){
+            this.logger.warn('Maintenance mode is enabled. Skipping task.')
+            return false
+        }
+
         if (this.exceptLeadNode) {
             return !config.isLeadNode();
         }

package/src/tasks/InteropBridge/ProcessWithdrawEvents.ts

@@ -3,19 +3,20 @@ import Logger from '@/logger';
 import { BigNumber, ethers } from "ethers";
 import abi from "@/abi";
 import { Transaction } from "@/db";
-import { buildDataForTransaction, buildSignatureBytes, getContract, getRpcProviderUrl, Signature } from "@/utils";
+import { buildSignatureBytes, getContract, getRpcProviderUrl, Signature } from "@/utils";
 import { addresses } from "@/constants";
 import { ChainId } from "@/types";
 import config from "@/config";
-import { GnosisSafe, InteropXGateway } from "@/typechain";
+import { GnosisSafe } from "@/typechain";
 import { Op } from "sequelize";
 import wait from "waait";
 import { peerPool, protocol } from "@/net";
 import { LogDescription } from "ethers/lib/utils";
+import { buildGnosisAction } from "@/gnosis";
 
 const generateGnosisTransaction = async (transactionData: any, safeContract: GnosisSafe) => {
     console.log(transactionData);
-    
+
     let isExecuted = await safeContract.dataHashes(
         await safeContract.getTransactionHash(
             transactionData.to,
@@ -95,7 +96,7 @@ class ProcessWithdrawEvents extends BaseTask {
         }
 
         console.log(`Processing transaction ${transaction.transactionHash}`);
-        
+
         transaction.targetStatus = 'pending';
         await transaction.save();
 
@@ -119,9 +120,23 @@ class ProcessWithdrawEvents extends BaseTask {
         const ownersThreshold = await safeContract.getThreshold();
         await wait(10000);
 
+        let data, logs = [];
+
+        try {
+            ({ data, logs } = await buildGnosisAction(transaction));
+        } catch (error) {
+            console.log(error);
+            transaction.targetStatus = 'failed';
+            transaction.targetErrors = [error.message];
+            transaction.status = 'failed'
+            await transaction.save();
+            protocol.sendTransaction(transaction)
+            return;
+        }
+
         let gnosisTx = await generateGnosisTransaction({
             baseGas: "0",
-            data: await buildDataForTransaction(transaction),
+            data,
             gasPrice: "0",
             gasToken: "0x0000000000000000000000000000000000000000",
             nonce: '0',
@@ -140,7 +155,7 @@ class ProcessWithdrawEvents extends BaseTask {
         console.log(`Collecting signatures for execution ${transaction.transactionHash}`)
 
         console.log(ownerPeerIds);
-        
+
         const signatures = await protocol.requestSignatures({
             type: 'source',
             transactionHash: transaction.transactionHash,
@@ -208,6 +223,7 @@ class ProcessWithdrawEvents extends BaseTask {
             console.log('ExecutionSuccess')
             transaction.targetStatus = 'success'
             transaction.targetTransactionHash = txSent.hash
+            transaction.targetLogs = logs
             transaction.status = 'success'
             await transaction.save();
         } else {
@@ -217,11 +233,11 @@ class ProcessWithdrawEvents extends BaseTask {
             transaction.status = 'failed'
             await transaction.save();
         }
+
+        protocol.sendTransaction(transaction)
     }
 
     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 → SyncBurnEvents.ts}

@@ -8,7 +8,7 @@ import { ChainId } from "@/types";
 import config from "@/config";
 import { InteropBridgeToken } from "@/typechain";
 
-class SyncWithdrawEvents extends BaseTask {
+class SyncBurnEvents extends BaseTask {
     contractAddress: string;
     provider: ethers.providers.JsonRpcProvider;
     contract: InteropBridgeToken;
@@ -17,7 +17,7 @@ class SyncWithdrawEvents extends BaseTask {
 
     constructor({ chainId, itokenAddress }: { chainId: ChainId, itokenAddress: string }) {
         super({
-            logger: new Logger("InteropBridgeToken::SyncWithdrawEvents"),
+            logger: new Logger("InteropBridgeToken::SyncBurnEvents"),
         })
         this.chainId = chainId;
         this.itokenAddress = itokenAddress;
@@ -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 })) {
@@ -62,7 +62,6 @@ class SyncWithdrawEvents extends BaseTask {
                     from: tx.from,
                     to,
 
-                    
                     submitTransactionHash: event.transactionHash,
                     submitBlockNumber: event.blockNumber,
 
@@ -70,21 +69,22 @@ class SyncWithdrawEvents extends BaseTask {
                     sourceTransactionHash: event.transactionHash,
                     sourceBlockNumber: event.blockNumber,
                     sourceStatus: "success",
-
                     targetStatus: "uninitialised",
 
                     submitEvent: {
-                        to, 
+                        to,
                         amount: amount.toString(),
                         itoken: this.itokenAddress,
-                        chainId: chainId.toString()
+                        sourceChainId: sourceChainId,
+                        targetChainId: targetChainId,
                     },
 
                     sourceEvent: {
-                        to, 
-                        amount: amount.toString(), 
+                        to,
+                        amount: amount.toString(),
                         itoken: this.itokenAddress,
-                        chainId: chainId.toString(),
+                        sourceChainId: sourceChainId,
+                        targetChainId: targetChainId,
                     },
                     status: "pending",
                 })
@@ -102,8 +102,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)
         );
@@ -118,4 +116,4 @@ class SyncWithdrawEvents extends BaseTask {
     }
 }
 
-export default SyncWithdrawEvents;
+export default SyncBurnEvents;

package/src/tasks/InteropBridge/SyncMintEvents.ts

@@ -0,0 +1,99 @@
+import { BaseTask } from "../BaseTask";
+import Logger from '@/logger';
+import { ethers } from "ethers";
+import abi from "@/abi";
+import { Transaction } from "@/db";
+import { getContract, getRpcProviderUrl } from "@/utils";
+import { ChainId } from "@/types";
+import config from "@/config";
+import { InteropBridgeToken } from "@/typechain";
+
+class SyncMintEvents extends BaseTask {
+    contractAddress: string;
+    provider: ethers.providers.JsonRpcProvider;
+    contract: InteropBridgeToken;
+    chainId: ChainId;
+    itokenAddress: string;
+
+    constructor({ chainId, itokenAddress }: { chainId: ChainId, itokenAddress: string }) {
+        super({
+            logger: new Logger("InteropBridgeToken::SyncMintEvents"),
+        })
+        this.chainId = chainId;
+        this.itokenAddress = itokenAddress;
+    }
+
+    async pollHandler() {
+        const currentBlock = await this.provider.getBlockNumber();
+
+        const events = await this.contract.queryFilter(
+            this.contract.filters.Mint(),
+            currentBlock - 500,
+            currentBlock,
+        );
+
+        for (const event of events) {
+
+            try {
+                if (!event.args) {
+                    continue;
+                }
+                
+                const { sourceChainId, targetChainId, amount, to, submitTransactionHash } = event.args;
+
+                const uniqueIdentifier = {
+                    action: 'deposit',
+                    submitTransactionHash: submitTransactionHash,
+                    sourceChainId: sourceChainId,
+                    targetChainId: targetChainId,
+
+                    targetEvent: null
+                }
+
+                const transaction = await Transaction.findOne({ where: uniqueIdentifier });
+
+                if(! transaction){
+                    return;
+                }
+
+                const tx = await event.getTransaction()
+
+                transaction.targetStatus = 'success'
+                transaction.targetErrors = []
+                transaction.targetTransactionHash = tx.hash
+                transaction.targetEvent = {
+                    sourceChainId, 
+                    targetChainId, 
+                    amount: amount.toString(), 
+                    to, 
+                    submitTransactionHash
+                }
+                transaction.status = 'success'
+
+                await transaction.save()
+
+                this.logger.info(
+                    `Mint confirmation received: ${transaction.transactionHash} `
+                );
+            } catch (error) {
+                this.logger.error(error);
+            }
+        }
+    }
+
+    async start(): Promise<void> {
+        this.provider = new ethers.providers.JsonRpcProvider(
+            getRpcProviderUrl(this.chainId)
+        );
+
+        this.contract = getContract<InteropBridgeToken>(
+            this.itokenAddress,
+            abi.interopBridgeToken,
+            new ethers.Wallet(config.privateKey!, this.provider)
+        );
+
+        await super.start()
+    }
+}
+
+export default SyncMintEvents;

package/src/tasks/InteropXGateway/ProcessDepositEvents.ts

@@ -3,7 +3,7 @@ import Logger from '@/logger';
 import { BigNumber, ethers } from "ethers";
 import abi from "@/abi";
 import { Transaction } from "@/db";
-import { buildDataForTransaction, buildSignatureBytes, getContract, getRpcProviderUrl, Signature } from "@/utils";
+import { buildSignatureBytes, getContract, getRpcProviderUrl, Signature } from "@/utils";
 import { addresses } from "@/constants";
 import { ChainId } from "@/types";
 import config from "@/config";
@@ -12,10 +12,11 @@ import { Op } from "sequelize";
 import wait from "waait";
 import { peerPool, protocol } from "@/net";
 import { LogDescription } from "ethers/lib/utils";
+import { buildGnosisAction } from "@/gnosis";
 
 const generateGnosisTransaction = async (transactionData: any, safeContract: GnosisSafe) => {
     console.log(transactionData);
-    
+
     let isExecuted = await safeContract.dataHashes(
         await safeContract.getTransactionHash(
             transactionData.to,
@@ -97,7 +98,7 @@ class ProcessDepositEvents extends BaseTask {
         }
 
         console.log(`Processing transaction ${transaction.transactionHash}`);
-        
+
         transaction.targetStatus = 'pending';
         await transaction.save();
 
@@ -121,9 +122,24 @@ class ProcessDepositEvents extends BaseTask {
         const ownersThreshold = await safeContract.getThreshold();
         await wait(10000);
 
+        let data, logs = [];
+
+        try {
+            ({ data, logs } = await buildGnosisAction(transaction));
+
+        } catch (error) {
+            console.log(error);
+            transaction.targetStatus = 'failed';
+            transaction.targetErrors = [error.message];
+            transaction.status = 'failed'
+            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 +158,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,
@@ -210,6 +226,7 @@ class ProcessDepositEvents extends BaseTask {
             console.log('ExecutionSuccess')
             transaction.targetStatus = 'success'
             transaction.targetTransactionHash = txSent.hash
+            transaction.targetLogs = logs;
             transaction.status = 'success'
             await transaction.save();
         } else {
@@ -224,8 +241,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(