@instadapp/interop-x 0.0.0-dev.bfeca30 → 0.0.0-dev.c279cb8

package/src/tasks/InteropXContract/ProcessBridgeRequestEvents.ts

@@ -1,216 +0,0 @@
-import { BaseTask } from "../BaseTask";
-import Logger from '@/logger';
-import { ethers, Wallet } from "ethers";
-import abi from "@/abi";
-import { Transaction } from "@/db";
-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, InteropXContract } from "@/typechain";
-import wait from "waait";
-import { buildGnosisAction } from "@/gnosis";
-import { peerPool, protocol } from "@/net";
-import { LogDescription } from "ethers/lib/utils";
-
-class ProccessBridgeRequestEvents extends BaseTask {
-    contractAddress: string;
-    safeContractAddress: string;
-    provider: ethers.providers.JsonRpcProvider;
-    contract: InteropXContract;
-    safeContract: GnosisSafe;
-    chainId: ChainId;
-    sourceWallet: Wallet;
-
-    leadNodeOnly: boolean = true;
-
-    constructor({ chainId }: { chainId: ChainId }) {
-        super({
-            logger: new Logger("InteropXContract::ProccessBridgeRequestEvents"),
-        })
-        this.chainId = chainId;
-    }
-
-    async pollHandler() {
-        const blockNumber = await this.provider.getBlockNumber()
-
-        const transaction = await Transaction.findOne({
-            where: {
-                status: 'pending',
-                sourceStatus: 'uninitialised',
-                createdAt: {
-                    [Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
-                },
-                sourceDelayUntil: {
-                    [Op.or]: {
-                        [Op.is]: null,
-                        [Op.lt]: new Date(),
-                    }
-                },
-                requestBlockNumber: {
-                    [Op.lt]: blockNumber - 12,
-                },
-                sourceChainId: this.chainId,
-            }
-        })
-
-        if (!transaction) {
-            return;
-        }
-
-        console.log(`Processing transaction ${transaction.transactionHash}`);
-
-        transaction.targetStatus = 'pending';
-        await transaction.save();
-
-        const ownersThreshold = await this.safeContract.getThreshold();
-        await wait(10000);
-
-
-        let data, logs = [];
-
-        try {
-            ({ data, logs } = await buildGnosisAction(transaction, 'source'));
-
-        } catch (error) {
-            console.log(error);
-            transaction.sourceStatus = 'failed';
-            transaction.sourceErrors = [error.message];
-            transaction.targetStatus = 'failed';
-
-            transaction.status = 'failed'
-            await transaction.save();
-            protocol.sendTransaction(transaction)
-            return;
-        }
-
-        let gnosisTx = await generateGnosisTransaction({
-            baseGas: "0",
-            data,
-            gasPrice: "0",
-            gasToken: "0x0000000000000000000000000000000000000000",
-            nonce: '0',
-            operation: "1",
-            refundReceiver: "0x0000000000000000000000000000000000000000",
-            safeAddress: this.safeContractAddress,
-            safeTxGas: "79668",
-            to: addresses[transaction.sourceChainId].multisend,
-            value: "0",
-        }, this.safeContract);
-
-        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,
-            safeTxGas: gnosisTx.safeTxGas,
-            safeNonce: gnosisTx.nonce
-        }, ownerPeerIds)
-
-
-        const validSignatures = signatures.filter(s => !!s.data && s.data !== '0x') as Signature[];
-
-        console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
-
-        if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
-            await transaction.save();
-            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 this.safeContract.populateTransaction.execTransaction(
-            gnosisTx.to,
-            gnosisTx.value,
-            gnosisTx.data,
-            gnosisTx.operation,
-            gnosisTx.safeTxGas,
-            gnosisTx.baseGas,
-            gnosisTx.gasPrice,
-            gnosisTx.gasToken,
-            gnosisTx.refundReceiver,
-            buildSignatureBytes(validSignatures)
-        );
-
-        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 receipt = await txSent.wait();
-
-        const parsedLogs: LogDescription[] = [];
-
-        receipt.logs.forEach((log) => {
-            try {
-                parsedLogs.push(this.safeContract.interface.parseLog(log));
-            } catch (e) { }
-        });
-
-        if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
-            console.log('ExecutionSuccess')
-            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.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.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 ProccessBridgeRequestEvents;

package/src/tasks/InteropXContract/SyncBridgeCommittedEvents.ts

@@ -1,124 +0,0 @@
-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 SyncBridgeCommittedEvents extends BaseTask {
-    contractAddress: string;
-    provider: ethers.providers.JsonRpcProvider;
-    contract: InteropXContract;
-    chainId: ChainId;
-
-    constructor({ chainId }: { chainId: ChainId }) {
-        super({
-            logger: new Logger("InteropXContract::SyncBridgeCommittedEvents"),
-        })
-        this.chainId = chainId;
-    }
-
-    async pollHandler() {
-        const currentBlock = await this.provider.getBlockNumber();
-
-        const events = await this.contract.queryFilter(
-            this.contract.filters.LogBridgeCommitted(),
-            currentBlock - 2000,
-            currentBlock,
-        );
-
-        let processedEvents = 0;
-
-        for (const event of events) {
-
-            try {
-                if (!event.args) {
-                    continue;
-                }
-
-                const { actionId, bridger, position, sourceChainId, targetChainId, requestTransactionHash, metadata } = event.args;
-
-                const uniqueIdentifier = {
-                    actionId,
-                    bridger,
-                    requestTransactionHash,
-                    sourceChainId: sourceChainId,
-                    targetChainId: targetChainId,
-                }
-
-                let transactionHash = generateInteropTransactionHash(uniqueIdentifier);
-
-                const transaction = await Transaction.findOne({
-                    where: {
-                        transactionHash, 
-                        committedEvent: {
-                            [Op.eq]: null,
-                        }
-                    }
-                });
-
-                if (!transaction) {
-                    continue;
-                }
-                transaction.targetStatus = 'success'
-                transaction.targetBlockNumber = event.blockNumber;
-                transaction.targetTransactionHash = event.transactionHash
-                transaction.committedEvent = {
-                    actionId,
-                    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,
-                }
-
-                transaction.status = 'success';
-                await transaction.save()
-
-                this.logger.info(
-                    `New bridge committed 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 SyncBridgeCommittedEvents;

package/src/tasks/InteropXContract/SyncBridgeRequestEvents.ts

@@ -1,115 +0,0 @@
-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 { actionId, bridger, position, sourceChainId, targetChainId, metadata } = event.args;
-
-                const uniqueIdentifier = {
-                    actionId,
-                    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,
-                    requestBlockNumber: event.blockNumber,
-                    requestEvent: {
-                        actionId,
-                        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

@@ -1,121 +0,0 @@
-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 { actionId, bridger, position, sourceChainId, targetChainId, requestTransactionHash, metadata } = event.args;
-
-                const uniqueIdentifier = {
-                    actionId,
-                    bridger,
-                    requestTransactionHash,
-                    sourceChainId: sourceChainId,
-                    targetChainId: targetChainId,
-                }
-
-                let transactionHash = generateInteropTransactionHash(uniqueIdentifier);
-
-                const transaction = await Transaction.findOne({
-                    where: {
-                        transactionHash, requestSentEvent: {
-                            [Op.eq]: null,
-                        }
-                    }
-                });
-
-                if (!transaction) {
-                    continue;
-                }
-                transaction.sourceStatus = 'success'
-                transaction.sourceBlockNumber = event.blockNumber;
-                transaction.sourceTransactionHash = event.transactionHash
-                transaction.requestSentEvent = {
-                    actionId,
-                    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;