@instadapp/interop-x 0.0.0-dev.285d847 → 0.0.0-dev.28f049d

package/src/tasks/AutoUpdateTask.ts

@@ -1,13 +1,16 @@
 import { BaseTask } from "./BaseTask";
 import Logger from '@/logger';
-import packageJson from '../../package.json'
-import { http } from "@/utils";
-import { spawn } from 'child_process';
+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 * 1000
+    pollIntervalMs: number = 60 * 10 * 1000
 
     constructor() {
         super({
@@ -15,16 +18,32 @@ class AutoUpdateTask extends BaseTask {
         })
     }
 
-
     prePollHandler(): boolean {
         return config.autoUpdate && !config.isLeadNode();
     }
 
-    async pollHandler() {
+    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
+        }
+    }
 
-        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
+    async pollHandler() {
+        const version = await this.getLatestVersion()
 
         if (version === currentVersion) {
             return;
@@ -32,22 +51,31 @@ class AutoUpdateTask extends BaseTask {
 
         this.logger.warn(`New version ${version} available.`)
 
+        this.logger.info('Updating...')
 
-        const update = spawn('npm', ['-g', 'install', '@instadapp/interop-x']);
+        await spawnAsync('npm', ['-g', 'install', `@instadapp/interop-x@${tag}`, '-f']);
 
-        update.on("close", () => {
-            this.logger.warn(`Installed version ${version}`)
-            this.logger.warn(`Restarting...`)
+        await wait(5000)
 
-            spawn(process.argv[0], process.argv.slice(1), {
-                cwd: process.cwd(),
-                env: Object.create(process.env),
-                detached: true,
-                stdio: "inherit"
-            });
+        if (version !== await this.getInstalledVersion()) {
+            this.logger.warn(`failed to install ${version}, retrying in 5 minutes`)
+            return;
+        }
 
-            process.exit()
-        })
+        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()
     }
 }
 

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 → InteropXContract/ProcessBridgeRequestEvents.ts}

@@ -1,66 +1,33 @@
 import { BaseTask } from "../BaseTask";
 import Logger from '@/logger';
-import { BigNumber, ethers } from "ethers";
+import { ethers, Wallet } from "ethers";
 import abi from "@/abi";
 import { Transaction } from "@/db";
-import { buildDataForTransaction, buildSignatureBytes, getContract, getRpcProviderUrl, Signature } from "@/utils";
+import { buildSignatureBytes, generateGnosisTransaction, generateInteropTransactionHash, getContract, getRpcProviderUrl, Signature } from "@/utils";
 import { addresses } from "@/constants";
+import { Op } from "sequelize";
 import { ChainId } from "@/types";
 import config from "@/config";
-import { GnosisSafe, InteropXGateway } from "@/typechain";
-import { Op } from "sequelize";
+import { GnosisSafe, InteropXContract } from "@/typechain";
 import wait from "waait";
+import { buildGnosisAction } from "@/gnosis";
 import { peerPool, protocol } from "@/net";
 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,
-            transactionData.value,
-            transactionData.data,
-            transactionData.operation,
-            transactionData.safeTxGas,
-            transactionData.baseGas,
-            transactionData.gasPrice,
-            transactionData.gasToken,
-            transactionData.refundReceiver,
-            transactionData.nonce
-        )
-    )
-
-    while (isExecuted == 1) {
-        transactionData.safeTxGas = BigNumber.from(String(transactionData.safeTxGas)).add(1).toString()
-
-        isExecuted = await safeContract.dataHashes(
-            await safeContract.getTransactionHash(
-                transactionData.to,
-                transactionData.value,
-                transactionData.data,
-                transactionData.operation,
-                transactionData.safeTxGas,
-                transactionData.baseGas,
-                transactionData.gasPrice,
-                transactionData.gasToken,
-                transactionData.refundReceiver,
-                transactionData.nonce
-            )
-        )
-    }
-
-    return transactionData
-}
-
-class ProcessWithdrawEvents extends BaseTask {
+class ProccessBridgeRequestEvents extends BaseTask {
+    contractAddress: string;
+    safeContractAddress: string;
     provider: ethers.providers.JsonRpcProvider;
+    contract: InteropXContract;
+    safeContract: GnosisSafe;
     chainId: ChainId;
-    leadNodeOnly = true
+    sourceWallet: Wallet;
+
+    leadNodeOnly: boolean = true;
 
     constructor({ chainId }: { chainId: ChainId }) {
         super({
-            logger: new Logger("InteropXGateway::ProcessWithdrawEvents"),
+            logger: new Logger("InteropXContract::ProccessBridgeRequestEvents"),
         })
         this.chainId = chainId;
     }
@@ -71,13 +38,11 @@ class ProcessWithdrawEvents extends BaseTask {
         const transaction = await Transaction.findOne({
             where: {
                 status: 'pending',
-                sourceStatus: 'success',
-                targetStatus: 'uninitialised',
-                action: 'withdraw',
+                sourceStatus: 'uninitialised',
                 sourceCreatedAt: {
                     [Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
                 },
-                targetDelayUntil: {
+                sourceDelayUntil: {
                     [Op.or]: {
                         [Op.is]: null,
                         [Op.lt]: new Date(),
@@ -95,52 +60,53 @@ class ProcessWithdrawEvents extends BaseTask {
         }
 
         console.log(`Processing transaction ${transaction.transactionHash}`);
-        
+
         transaction.targetStatus = 'pending';
         await transaction.save();
 
-        // refresh event data?
-
-        const targetChainProvider = new ethers.providers.JsonRpcProvider(
-            getRpcProviderUrl(transaction.targetChainId as ChainId)
-        );
+        const ownersThreshold = await this.safeContract.getThreshold();
+        await wait(10000);
 
-        const targetWallet = new ethers.Wallet(config.privateKey!, targetChainProvider);
 
-        const safeAddress = addresses[transaction.targetChainId].gnosisSafe;
+        let data, logs = [];
 
+        try {
+            ({ data, logs } = await buildGnosisAction(transaction));
 
-        const safeContract = getContract<GnosisSafe>(
-            safeAddress,
-            abi.gnosisSafe,
-            targetWallet
-        )
+        } catch (error) {
+            console.log(error);
+            transaction.sourceStatus = 'failed';
+            transaction.sourceErrors = [error.message];
+            transaction.targetStatus = 'failed';
 
-        const ownersThreshold = await safeContract.getThreshold();
-        await wait(10000);
+            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',
             operation: "1",
             refundReceiver: "0x0000000000000000000000000000000000000000",
-            safeAddress: safeAddress,
+            safeAddress: this.safeContractAddress,
             safeTxGas: "79668",
-            to: addresses[transaction.targetChainId].multisend,
+            to: addresses[transaction.sourceChainId].multisend,
             value: "0",
-        }, safeContract);
+        }, this.safeContract);
 
-        const owners = await safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
+        const owners = await this.safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
 
         const ownerPeerIds = peerPool.activePeers.filter(peer => owners.includes(peer.publicAddress.toLowerCase())).map(peer => peer.id)
 
         console.log(`Collecting signatures for execution ${transaction.transactionHash}`)
 
         console.log(ownerPeerIds);
-        
+
         const signatures = await protocol.requestSignatures({
             type: 'source',
             transactionHash: transaction.transactionHash,
@@ -155,18 +121,17 @@ class ProcessWithdrawEvents extends BaseTask {
 
         if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
             await transaction.save();
-            transaction.targetDelayUntil = new Date(Date.now() + 30 * 1000);
-            transaction.targetStatus = 'uninitialised'
+            transaction.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
+            transaction.sourceStatus = 'uninitialised'
 
             await transaction.save();
             const errorMessage = signatures.find(s => !!s.error)?.error;
             throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ''));
         }
 
-
         console.log(`Executing transaction for execution ${transaction.transactionHash}`)
 
-        const { data: txData } = await safeContract.populateTransaction.execTransaction(
+        const { data: txData } = await this.safeContract.populateTransaction.execTransaction(
             gnosisTx.to,
             gnosisTx.value,
             gnosisTx.data,
@@ -179,18 +144,10 @@ class ProcessWithdrawEvents extends BaseTask {
             buildSignatureBytes(validSignatures)
         );
 
-        console.log({
-            from: targetWallet.address,
-            gasPrice: BigNumber.from(120 * 10 ** 9).toString(),
-            to: safeAddress,
-            data: txData,
-        })
-
-
-        const txSent = await targetWallet.sendTransaction({
-            from: targetWallet.address,
-            gasPrice: BigNumber.from(120 * 10 ** 9),
-            to: safeAddress,
+        const txSent = await this.sourceWallet.sendTransaction({
+            from: this.sourceWallet.address,
+            gasPrice: ethers.BigNumber.from(120 * 10 ** 9),
+            to: this.safeContractAddress,
             data: txData,
         })
 
@@ -200,7 +157,7 @@ class ProcessWithdrawEvents extends BaseTask {
 
         receipt.logs.forEach((log) => {
             try {
-                parsedLogs.push(safeContract.interface.parseLog(log));
+                parsedLogs.push(this.safeContract.interface.parseLog(log));
             } catch (e) { }
         });
 
@@ -208,6 +165,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,17 +175,34 @@ 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.contractAddress = addresses[this.chainId].interopXContract;
 
         this.provider = new ethers.providers.JsonRpcProvider(
             getRpcProviderUrl(this.chainId)
         );
 
+        this.sourceWallet = new ethers.Wallet(config.privateKey!, this.provider);
+
+        this.contract = getContract<InteropXContract>(
+            this.contractAddress,
+            abi.interopXContract,
+            this.sourceWallet
+        );
+
+        this.safeContractAddress = addresses[this.chainId].gnosisSafe;
+        this.safeContract = getContract<GnosisSafe>(
+            this.safeContractAddress,
+            abi.gnosisSafe,
+            this.sourceWallet
+        );
+
         await super.start()
     }
 }
 
-export default ProcessWithdrawEvents;
+export default ProccessBridgeRequestEvents;

package/src/tasks/InteropXContract/SyncBridgeRequestEvents.ts

@@ -0,0 +1,116 @@
+import { BaseTask } from "../BaseTask";
+import Logger from '@/logger';
+import { ethers } from "ethers";
+import abi from "@/abi";
+import { Transaction } from "@/db";
+import { generateInteropTransactionHash, getContract, getRpcProviderUrl } from "@/utils";
+import { addresses } from "@/constants";
+import { ChainId } from "@/types";
+import config from "@/config";
+import { InteropXContract } from "@/typechain";
+
+class SyncBridgeRequestEvents extends BaseTask {
+    contractAddress: string;
+    provider: ethers.providers.JsonRpcProvider;
+    contract: InteropXContract;
+    chainId: ChainId;
+
+    constructor({ chainId }: { chainId: ChainId }) {
+        super({
+            logger: new Logger("InteropXContract::SyncBridgeRequestEvents"),
+        })
+        this.chainId = chainId;
+    }
+
+    async pollHandler() {
+        const currentBlock = await this.provider.getBlockNumber();
+
+        const events = await this.contract.queryFilter(
+            this.contract.filters.LogBridgeRequest(),
+            currentBlock - 2000,
+            currentBlock,
+        );
+
+        let processedEvents = 0;
+
+        for (const event of events) {
+
+            try {
+                if (!event.args) {
+                    continue;
+                }
+
+                const { bridger, position, sourceChainId, targetChainId, metadata } = event.args;
+
+                const uniqueIdentifier = {
+                    action: 'withdraw', //todo
+                    bridger,
+                    requestTransactionHash: event.transactionHash,
+                    sourceChainId: sourceChainId.toNumber(),
+                    targetChainId: targetChainId.toNumber(),
+                }
+
+                let transactionHash = generateInteropTransactionHash(uniqueIdentifier);
+
+                const transaction = await Transaction.findOne({ where: { transactionHash } });
+
+                if (transaction) {
+                    return;
+                }
+
+                await Transaction.create({
+                    transactionHash,
+                    ...uniqueIdentifier,
+                    position,
+                    metadata,
+                    requestBlockNumber: event.blockNumber,
+                    requestEvent: {
+                        bridger,
+                        position: {
+                            withdraw: position.withdraw.map((v) => ({
+                                sourceToken: v.sourceToken,
+                                targetToken: v.targetToken,
+                                amount: v.amount.toString()
+                            })),
+                            supply: position.supply.map((v) => ({
+                                sourceToken: v.sourceToken,
+                                targetToken: v.targetToken,
+                                amount: v.amount.toString()
+                            })),
+                        },
+                        sourceChainId: sourceChainId.toNumber(),
+                        targetChainId: targetChainId.toNumber(),
+                        metadata,
+                    }
+                })
+
+                this.logger.info(
+                    `New bridge request received: ${transactionHash} `
+                );
+            } catch (error) {
+                this.logger.error(error);
+            }
+        }
+
+        if (processedEvents > 0)
+            this.logger.info(`${processedEvents} events processed`);
+    }
+
+    async start(): Promise<void> {
+        this.contractAddress = addresses[this.chainId].interopXContract;
+
+        this.provider = new ethers.providers.JsonRpcProvider(
+            getRpcProviderUrl(this.chainId)
+        );
+
+        this.contract = getContract<InteropXContract>(
+            this.contractAddress,
+            abi.interopXContract,
+            new ethers.Wallet(config.privateKey!, this.provider)
+        );
+
+        await super.start()
+    }
+}
+
+export default SyncBridgeRequestEvents;

package/src/tasks/Transactions/SyncTransactionStatusTask.ts

@@ -0,0 +1,67 @@
+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.sourceLogs = transactionStatus.sourceLogs
+
+        transaction.targetStatus = transactionStatus.targetStatus
+        transaction.targetTransactionHash = transactionStatus.targetTransactionHash
+        transaction.targetErrors = transactionStatus.targetErrors
+        transaction.targetLogs = transactionStatus.targetLogs
+
+        transaction.status = transactionStatus.status
+
+        await transaction.save()
+
+        this.logger.info(`Updated transaction status for ${transaction.transactionHash}`)
+    }
+}
+
+export default SyncTransactionStatusTask;

package/src/tasks/index.ts

@@ -1,32 +1,24 @@
 import { BaseTask } from "./BaseTask";
-import InteropXGatewayProcessDepositEvents from "./InteropXGateway/ProcessDepositEvents";
-import InteropXGatewaySyncDepositEvents from "./InteropXGateway/SyncDepositEvents";
+import SyncTransactionStatusTask from "./Transactions/SyncTransactionStatusTask";
 
-import InteropBridgeSyncWithdrawEvents from "./InteropBridge/SyncWithdrawEvents";
-import InteropBridgeProcessWithdrawEvents from "./InteropBridge/ProcessWithdrawEvents";
 import AutoUpdateTask from "./AutoUpdateTask";
 
+import SyncBridgeRequestEvents from "./InteropXContract/SyncBridgeRequestEvents";
+import ProccessBridgeRequestEvents from "./InteropXContract/ProcessBridgeRequestEvents";
+
 export class Tasks {
     
     tasks: BaseTask[] = [
+        // new SyncTransactionStatusTask(),
         new AutoUpdateTask(),
 
-        new InteropXGatewaySyncDepositEvents({
-            chainId: 43114
-        }),
-
-        new InteropXGatewayProcessDepositEvents({
-            chainId: 43114
-        }),
+        // InteropXContract
 
-        new InteropBridgeSyncWithdrawEvents({
-            chainId: 137,
-            itokenAddress: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
-        }),
+        new SyncBridgeRequestEvents({ chainId: 137 }),
+        new SyncBridgeRequestEvents({ chainId: 43114 }),
 
-        new InteropBridgeProcessWithdrawEvents({
-            chainId: 137,
-        })
+        new ProccessBridgeRequestEvents({ chainId: 137 }),
+        new ProccessBridgeRequestEvents({ chainId: 43114 }),
     ];
 
     async start() {