@instadapp/interop-x 0.0.0-dev.4887ba6 → 0.0.0-dev.4df5dc2

package/src/tasks/InteropBridge/ProcessWithdrawEvents.ts

@@ -1,233 +0,0 @@
-import { BaseTask } from "../BaseTask";
-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 { addresses } from "@/constants";
-import { ChainId } from "@/types";
-import config from "@/config";
-import { GnosisSafe, InteropXGateway } from "@/typechain";
-import { Op } from "sequelize";
-import wait from "waait";
-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 {
-    provider: ethers.providers.JsonRpcProvider;
-    chainId: ChainId;
-    leadNodeOnly = true
-
-    constructor({ chainId }: { chainId: ChainId }) {
-        super({
-            logger: new Logger("InteropXGateway::ProcessWithdrawEvents"),
-        })
-        this.chainId = chainId;
-    }
-
-    async pollHandler() {
-        const blockNumber = await this.provider.getBlockNumber()
-
-        const transaction = await Transaction.findOne({
-            where: {
-                status: 'pending',
-                sourceStatus: 'success',
-                targetStatus: 'uninitialised',
-                action: 'withdraw',
-                sourceCreatedAt: {
-                    [Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
-                },
-                targetDelayUntil: {
-                    [Op.or]: {
-                        [Op.is]: null,
-                        [Op.lt]: new Date(),
-                    }
-                },
-                sourceBlockNumber: {
-                    [Op.lt]: blockNumber - 12,
-                },
-                sourceChainId: this.chainId,
-            }
-        })
-
-        if (!transaction) {
-            return;
-        }
-
-        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 targetWallet = new ethers.Wallet(config.privateKey!, targetChainProvider);
-
-        const safeAddress = addresses[transaction.targetChainId].gnosisSafe;
-
-
-        const safeContract = getContract<GnosisSafe>(
-            safeAddress,
-            abi.gnosisSafe,
-            targetWallet
-        )
-
-        const ownersThreshold = await safeContract.getThreshold();
-        await wait(10000);
-
-        let gnosisTx = await generateGnosisTransaction({
-            baseGas: "0",
-            data: await buildDataForTransaction(transaction),
-            gasPrice: "0",
-            gasToken: "0x0000000000000000000000000000000000000000",
-            nonce: '0',
-            operation: "1",
-            refundReceiver: "0x0000000000000000000000000000000000000000",
-            safeAddress: safeAddress,
-            safeTxGas: "79668",
-            to: addresses[transaction.targetChainId].multisend,
-            value: "0",
-        }, safeContract);
-
-        const owners = await 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.targetDelayUntil = new Date(Date.now() + 30 * 1000);
-            transaction.targetStatus = '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(
-            gnosisTx.to,
-            gnosisTx.value,
-            gnosisTx.data,
-            gnosisTx.operation,
-            gnosisTx.safeTxGas,
-            gnosisTx.baseGas,
-            gnosisTx.gasPrice,
-            gnosisTx.gasToken,
-            gnosisTx.refundReceiver,
-            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,
-            data: txData,
-        })
-
-        const receipt = await txSent.wait();
-
-        const parsedLogs: LogDescription[] = [];
-
-        receipt.logs.forEach((log) => {
-            try {
-                parsedLogs.push(safeContract.interface.parseLog(log));
-            } catch (e) { }
-        });
-
-        if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
-            console.log('ExecutionSuccess')
-            transaction.targetStatus = 'success'
-            transaction.targetTransactionHash = txSent.hash
-            transaction.status = 'success'
-            await transaction.save();
-        } else {
-            console.log('ExecutionFailure')
-            transaction.targetStatus = 'failed'
-            transaction.targetTransactionHash = txSent.hash
-            transaction.status = 'failed'
-            await transaction.save();
-        }
-    }
-
-    async start(): Promise<void> {
-        this.logger.info(`Starting execution watcher on interop chain`);
-
-        this.provider = new ethers.providers.JsonRpcProvider(
-            getRpcProviderUrl(this.chainId)
-        );
-
-        await super.start()
-    }
-}
-
-export default ProcessWithdrawEvents;

package/src/tasks/InteropBridge/SyncWithdrawEvents.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 { ChainId } from "@/types";
-import config from "@/config";
-import { InteropBridgeToken } from "@/typechain";
-
-class SyncWithdrawEvents 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::SyncWithdrawEvents"),
-        })
-        this.chainId = chainId;
-        this.itokenAddress = itokenAddress;
-    }
-
-    async pollHandler() {
-        const currentBlock = await this.provider.getBlockNumber();
-
-        const events = await this.contract.queryFilter(
-            this.contract.filters.Burn(),
-            currentBlock - 2000,
-            currentBlock,
-        );
-
-        let processedEvents = 0;
-
-        for (const event of events) {
-
-            try {
-                if (!event.args) {
-                    continue;
-                }
-
-                const { to, amount, chainId } = event.args;
-
-                const uniqueIdentifier = {
-                    action: 'withdraw',
-                    submitTransactionHash: event.transactionHash,
-                    sourceChainId:this.chainId,
-                    targetChainId: chainId.toNumber(),
-                }
-
-                if (await Transaction.findOne({ where: uniqueIdentifier })) {
-                    continue;
-                }
-
-                const tx = await event.getTransaction()
-
-                await Transaction.create({
-                    ...uniqueIdentifier,
-                    transactionHash: generateInteropTransactionHash(uniqueIdentifier),
-                    from: tx.from,
-                    to,
-
-                    
-                    submitTransactionHash: event.transactionHash,
-                    submitBlockNumber: event.blockNumber,
-
-                    // submit & source are the same
-                    sourceTransactionHash: event.transactionHash,
-                    sourceBlockNumber: event.blockNumber,
-                    sourceStatus: "success",
-
-                    targetStatus: "uninitialised",
-
-                    submitEvent: {
-                        to, 
-                        amount: amount.toString(),
-                        itoken: this.itokenAddress,
-                        chainId: chainId.toString()
-                    },
-
-                    sourceEvent: {
-                        to, 
-                        amount: amount.toString(), 
-                        itoken: this.itokenAddress,
-                        chainId: chainId.toString(),
-                    },
-                    status: "pending",
-                })
-
-                this.logger.info(
-                    `Withdraw queued: ${event.transactionHash} ${event.blockNumber}`
-                );
-            } catch (error) {
-                this.logger.error(error);
-            }
-        }
-
-        if (processedEvents > 0)
-            this.logger.info(`${processedEvents} events processed`);
-    }
-
-    async start(): Promise<void> {
-        this.logger.info(`Starting execution watcher on interop chain`);
-
-        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 SyncWithdrawEvents;

package/src/tasks/InteropXGateway/ProcessDepositEvents.ts

@@ -1,245 +0,0 @@
-import { BaseTask } from "../BaseTask";
-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 { addresses } from "@/constants";
-import { ChainId } from "@/types";
-import config from "@/config";
-import { GnosisSafe, InteropXGateway } from "@/typechain";
-import { Op } from "sequelize";
-import wait from "waait";
-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 ProcessDepositEvents extends BaseTask {
-    contractAddress: string;
-    provider: ethers.providers.JsonRpcProvider;
-    contract: InteropXGateway;
-    chainId: ChainId;
-    leadNodeOnly = true
-
-    constructor({ chainId }: { chainId: ChainId }) {
-        super({
-            logger: new Logger("InteropXGateway::ProcessDepositEvents"),
-        })
-        this.chainId = chainId;
-    }
-
-    async pollHandler() {
-        const blockNumber = await this.provider.getBlockNumber()
-
-        const transaction = await Transaction.findOne({
-            where: {
-                status: 'pending',
-                sourceStatus: 'success',
-                targetStatus: 'uninitialised',
-                action: 'deposit',
-                sourceCreatedAt: {
-                    [Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
-                },
-                targetDelayUntil: {
-                    [Op.or]: {
-                        [Op.is]: null,
-                        [Op.lt]: new Date(),
-                    }
-                },
-                sourceBlockNumber: {
-                    [Op.lt]: blockNumber - 12,
-                },
-                sourceChainId: this.chainId,
-            }
-        })
-
-        if (!transaction) {
-            return;
-        }
-
-        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 targetWallet = new ethers.Wallet(config.privateKey!, targetChainProvider);
-
-        const safeAddress = addresses[transaction.targetChainId].gnosisSafe;
-
-
-        const safeContract = getContract<GnosisSafe>(
-            safeAddress,
-            abi.gnosisSafe,
-            targetWallet
-        )
-
-        const ownersThreshold = await safeContract.getThreshold();
-        await wait(10000);
-
-        let gnosisTx = await generateGnosisTransaction({
-            baseGas: "0",
-            data: await buildDataForTransaction(transaction),
-            gasPrice: "0",
-            gasToken: "0x0000000000000000000000000000000000000000",
-            nonce: '0',
-            operation: "1",
-            refundReceiver: "0x0000000000000000000000000000000000000000",
-            safeAddress: safeAddress,
-            safeTxGas: "79668",
-            to: addresses[transaction.targetChainId].multisend,
-            value: "0",
-        }, safeContract);
-
-        const owners = await 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.targetDelayUntil = new Date(Date.now() + 30 * 1000);
-            transaction.targetStatus = '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(
-            gnosisTx.to,
-            gnosisTx.value,
-            gnosisTx.data,
-            gnosisTx.operation,
-            gnosisTx.safeTxGas,
-            gnosisTx.baseGas,
-            gnosisTx.gasPrice,
-            gnosisTx.gasToken,
-            gnosisTx.refundReceiver,
-            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,
-            data: txData,
-        })
-
-        const receipt = await txSent.wait();
-
-        const parsedLogs: LogDescription[] = [];
-
-        receipt.logs.forEach((log) => {
-            try {
-                parsedLogs.push(safeContract.interface.parseLog(log));
-            } catch (e) { }
-        });
-
-        if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
-            console.log('ExecutionSuccess')
-            transaction.targetStatus = 'success'
-            transaction.targetTransactionHash = txSent.hash
-            transaction.status = 'success'
-            await transaction.save();
-        } else {
-            console.log('ExecutionFailure')
-            transaction.targetStatus = 'failed'
-            transaction.targetTransactionHash = 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].interopXGateway;
-
-        this.provider = new ethers.providers.JsonRpcProvider(
-            getRpcProviderUrl(this.chainId)
-        );
-
-        this.contract = getContract<InteropXGateway>(
-            this.contractAddress,
-            abi.interopXGateway,
-            new ethers.Wallet(config.privateKey!, this.provider)
-        );
-
-        await super.start()
-    }
-}
-
-export default ProcessDepositEvents;