@instadapp/interop-x 0.0.0-dev.d05464a → 0.0.0-dev.d71f27e

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

@@ -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,19 +38,17 @@ class ProcessWithdrawEvents extends BaseTask {
         const transaction = await Transaction.findOne({
             where: {
                 status: 'pending',
-                sourceStatus: 'success',
-                targetStatus: 'uninitialised',
-                action: 'withdraw',
-                sourceCreatedAt: {
+                sourceStatus: 'uninitialised',
+                createdAt: {
                     [Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
                 },
-                targetDelayUntil: {
+                sourceDelayUntil: {
                     [Op.or]: {
                         [Op.is]: null,
                         [Op.lt]: new Date(),
                     }
                 },
-                sourceBlockNumber: {
+                requestBlockNumber: {
                     [Op.lt]: blockNumber - 12,
                 },
                 sourceChainId: this.chainId,
@@ -95,52 +60,53 @@ class ProcessWithdrawEvents extends BaseTask {
         }
 
         console.log(`Processing transaction ${transaction.transactionHash}`);
-        
+
         transaction.targetStatus = 'pending';
         await transaction.save();
 
-        // refresh event data?
+        const ownersThreshold = await this.safeContract.getThreshold();
+        await wait(10000);
 
-        const targetChainProvider = new ethers.providers.JsonRpcProvider(
-            getRpcProviderUrl(transaction.targetChainId as ChainId)
-        );
 
-        const targetWallet = new ethers.Wallet(config.privateKey!, targetChainProvider);
+        let data, logs = [];
 
-        const safeAddress = addresses[transaction.targetChainId].gnosisSafe;
+        try {
+            ({ data, logs } = await buildGnosisAction(transaction, 'source'));
 
+        } catch (error) {
+            console.log(error);
+            transaction.sourceStatus = 'failed';
+            transaction.sourceErrors = [error.message];
+            transaction.targetStatus = 'failed';
 
-        const safeContract = getContract<GnosisSafe>(
-            safeAddress,
-            abi.gnosisSafe,
-            targetWallet
-        )
-
-        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,20 +144,15 @@ class ProcessWithdrawEvents extends BaseTask {
             buildSignatureBytes(validSignatures)
         );
 
-        console.log({
-            from: targetWallet.address,
-            gasPrice: BigNumber.from(120 * 10 ** 9).toString(),
-            to: safeAddress,
+        const txSent = await this.sourceWallet.sendTransaction({
+            from: this.sourceWallet.address,
+            gasPrice: ethers.BigNumber.from(120 * 10 ** 9),
+            to: this.safeContractAddress,
             data: txData,
         })
 
+        console.log(txSent);
 
-        const txSent = await targetWallet.sendTransaction({
-            from: targetWallet.address,
-            gasPrice: BigNumber.from(120 * 10 ** 9),
-            to: safeAddress,
-            data: txData,
-        })
 
         const receipt = await txSent.wait();
 
@@ -200,34 +160,57 @@ class ProcessWithdrawEvents extends BaseTask {
 
         receipt.logs.forEach((log) => {
             try {
-                parsedLogs.push(safeContract.interface.parseLog(log));
+                parsedLogs.push(this.safeContract.interface.parseLog(log));
             } catch (e) { }
         });
 
         if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
             console.log('ExecutionSuccess')
-            transaction.targetStatus = 'success'
-            transaction.targetTransactionHash = txSent.hash
+            transaction.sourceStatus = 'success'
+            if (txSent.blockNumber)
+                transaction.sourceBlockNumber = txSent.blockNumber;
+            transaction.sourceTransactionHash = txSent.hash
+            transaction.sourceLogs = logs;
             transaction.status = 'success'
             await transaction.save();
         } else {
             console.log('ExecutionFailure')
-            transaction.targetStatus = 'failed'
-            transaction.targetTransactionHash = txSent.hash
+            transaction.sourceStatus = 'failed'
+            if (txSent.blockNumber)
+            transaction.sourceBlockNumber = txSent.blockNumber;
+        transaction.sourceTransactionHash = txSent.hash
+            transaction.sourceTransactionHash = txSent.hash
             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) {
+                    continue;
+                }
+
+                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/InteropXContract/SyncBridgeRequestSentEvents.ts

@@ -0,0 +1,120 @@
+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";
+import { Op } from "sequelize";
+
+class SyncBridgeRequestSentEvents extends BaseTask {
+    contractAddress: string;
+    provider: ethers.providers.JsonRpcProvider;
+    contract: InteropXContract;
+    chainId: ChainId;
+
+    constructor({ chainId }: { chainId: ChainId }) {
+        super({
+            logger: new Logger("InteropXContract::SyncBridgeRequestSentEvents"),
+        })
+        this.chainId = chainId;
+    }
+
+    async pollHandler() {
+        const currentBlock = await this.provider.getBlockNumber();
+
+        const events = await this.contract.queryFilter(
+            this.contract.filters.LogBridgeRequestSent(),
+            currentBlock - 2000,
+            currentBlock,
+        );
+
+        let processedEvents = 0;
+
+        for (const event of events) {
+
+            try {
+                if (!event.args) {
+                    continue;
+                }
+
+                const { bridger, position, sourceChainId, targetChainId, requestTransactionHash, metadata } = event.args;
+
+                const uniqueIdentifier = {
+                    action: 'withdraw',
+                    bridger,
+                    requestTransactionHash,
+                    sourceChainId: sourceChainId,
+                    targetChainId: targetChainId,
+                }
+
+                let transactionHash = generateInteropTransactionHash(uniqueIdentifier);
+
+                const transaction = await Transaction.findOne({
+                    where: {
+                        transactionHash, sourceStatus: {
+                            [Op.ne]: 'success',
+                        }
+                    }
+                });
+
+                if (!transaction) {
+                    continue;
+                }
+                transaction.sourceStatus = 'success'
+                transaction.sourceBlockNumber = event.blockNumber;
+                transaction.sourceTransactionHash = event.transactionHash
+                transaction.requestSentEvent = {
+                    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,
+                    targetChainId: targetChainId,
+                    metadata,
+                    requestTransactionHash,
+                }
+                await transaction.save()
+
+                this.logger.info(
+                    `New bridge request sent 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 SyncBridgeRequestSentEvents;