@instadapp/interop-x 0.0.0-dev.6ea4ee5 → 0.0.0-dev.733ff78

package/src/tasks/InteropXGateway/ProcessDepositEvents.ts

@@ -0,0 +1,260 @@
+import { BaseTask } from "../BaseTask";
+import Logger from '@/logger';
+import { BigNumber, ethers } from "ethers";
+import abi from "@/abi";
+import { Transaction } from "@/db";
+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 { 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,
+            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 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,
+            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.targetLogs = logs;
+            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.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;

package/src/tasks/InteropXGateway/SyncDepositEvents.ts

@@ -3,7 +3,7 @@ import Logger from '@/logger';
 import { ethers } from "ethers";
 import abi from "@/abi";
 import { Transaction } from "@/db";
-import { generateInteropTransactionHash, getRpcProviderUrl } from "@/utils";
+import { generateInteropTransactionHash, getContract, getRpcProviderUrl } from "@/utils";
 import { addresses } from "@/constants";
 import { ChainId } from "@/types";
 import config from "@/config";
@@ -43,10 +43,10 @@ class SyncDepositEvents extends BaseTask {
                 const { sourceChainId, targetChainId, user, vnonce, amount, token } = event.args;
 
                 const uniqueIdentifier = {
-                    type: 'desposit',
-                    sourceTransactionHash: event.transactionHash,
-                    sourceChainId: sourceChainId.toNumber(),
-                    targetChainId: targetChainId.toNumber(),
+                    action: 'deposit',
+                    submitTransactionHash: event.transactionHash,
+                    sourceChainId: sourceChainId,
+                    targetChainId: targetChainId,
                 }
 
                 if (await Transaction.findOne({ where: uniqueIdentifier })) {
@@ -56,17 +56,20 @@ class SyncDepositEvents extends BaseTask {
                 const tx = await event.getTransaction()
 
                 await Transaction.create({
+                    ...uniqueIdentifier,
                     transactionHash: generateInteropTransactionHash(uniqueIdentifier),
-                    type: 'deposit',
                     from: tx.from,
                     to: user,
 
-                    sourceChainId: sourceChainId.toNumber(),
+                    
+                    submitTransactionHash: event.transactionHash,
+                    submitBlockNumber: event.blockNumber,
+
+                    // submit & source are the same
                     sourceTransactionHash: event.transactionHash,
                     sourceBlockNumber: event.blockNumber,
-                    sourceStatus: "uninitialised",
+                    sourceStatus: "success",
 
-                    targetChainId: targetChainId.toNumber(),
                     targetStatus: "uninitialised",
 
                     submitEvent: {
@@ -74,14 +77,23 @@ class SyncDepositEvents extends BaseTask {
                         sourceChainId: sourceChainId.toString(),
                         targetChainId: targetChainId.toString(),
                         token: token,
-                        ammout: amount.toString(),
+                        amount: amount.toString(),
+                        vnonce: vnonce.toString(),
+                    },
+
+                    sourceEvent: {
+                        user,
+                        sourceChainId: sourceChainId.toString(),
+                        targetChainId: targetChainId.toString(),
+                        token: token,
+                        amount: amount.toString(),
                         vnonce: vnonce.toString(),
                     },
                     status: "pending",
                 })
 
                 this.logger.info(
-                    `Execution queued: ${event.transactionHash} ${event.blockNumber}`
+                    `Deposit queued: ${event.transactionHash} ${event.blockNumber}`
                 );
             } catch (error) {
                 this.logger.error(error);
@@ -93,19 +105,17 @@ 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(
             getRpcProviderUrl(this.chainId)
         );
 
-        this.contract = new ethers.Contract(
+        this.contract = getContract<InteropXGateway>(
             this.contractAddress,
             abi.interopXGateway,
             new ethers.Wallet(config.privateKey!, this.provider)
-        ) as InteropXGateway;
+        );
 
         await super.start()
     }

package/src/tasks/InteropXGateway/SyncWithdrawtEvents.ts

@@ -0,0 +1,105 @@
+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 { addresses } from "@/constants";
+import { ChainId } from "@/types";
+import config from "@/config";
+import { InteropXGateway } from "@/typechain";
+
+class SyncWithdrawEvents extends BaseTask {
+    contractAddress: string;
+    provider: ethers.providers.JsonRpcProvider;
+    contract: InteropXGateway;
+    chainId: ChainId;
+
+    constructor({ chainId }: { chainId: ChainId }) {
+        super({
+            logger: new Logger("InteropXGateway::SyncWithdrawEvents"),
+        })
+        this.chainId = chainId;
+    }
+
+    async pollHandler() {
+        const currentBlock = await this.provider.getBlockNumber();
+
+        const events = await this.contract.queryFilter(
+            this.contract.filters.LogGatewayWithdraw(),
+            currentBlock - 500,
+            currentBlock,
+        );
+
+        let processedEvents = 0;
+
+        for (const event of events) {
+
+            try {
+                if (!event.args) {
+                    continue;
+                }
+
+                const { user, token, amount, sourceChainId, targetChainId, transactionHash } = event.args;
+
+                const uniqueIdentifier = {
+                    action: 'withdraw',
+                    submitTransactionHash: transactionHash,
+                    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 = {
+                    user, 
+                    token, 
+                    amount: amount.toString(), 
+                    sourceChainId, 
+                    targetChainId, 
+                    transactionHash,
+                }
+                transaction.status = 'success'
+
+                await transaction.save()
+
+                this.logger.info(
+                    `Witdraw confirmation received: ${transaction.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].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 SyncWithdrawEvents;

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,11 +1,52 @@
 import { BaseTask } from "./BaseTask";
-import SyncInteropXGatewayDepositEvents from "./InteropXGateway/SyncDepositEvents";
+import InteropXGatewayProcessDepositEvents from "./InteropXGateway/ProcessDepositEvents";
+import InteropXGatewaySyncDepositEvents from "./InteropXGateway/SyncDepositEvents";
+import InteropXGatewaySyncWithdrawEvents from "./InteropXGateway/SyncWithdrawtEvents";
+
+import InteropBridgeProcessWithdrawEvents from "./InteropBridge/ProcessWithdrawEvents";
+import InteropBridgeSyncBurnEvents from "./InteropBridge/SyncBurnEvents";
+import InteropBridgeSyncMintEvents from "./InteropBridge/SyncMintEvents";
+
+import SyncTransactionStatusTask from "./Transactions/SyncTransactionStatusTask";
+
+import AutoUpdateTask from "./AutoUpdateTask";
 
 export class Tasks {
     
     tasks: BaseTask[] = [
-        new SyncInteropXGatewayDepositEvents({
+        new SyncTransactionStatusTask(),
+        new AutoUpdateTask(),
+
+        // InteropXGateway
+
+        new InteropXGatewaySyncDepositEvents({
+            chainId: 43114
+        }),
+
+        new InteropXGatewayProcessDepositEvents({
             chainId: 43114
+        }),
+
+
+        new InteropXGatewaySyncWithdrawEvents({
+            chainId: 43114
+        }),
+
+
+        // InteropBridge
+
+        new InteropBridgeProcessWithdrawEvents({
+            chainId: 137,
+        }),
+
+        new InteropBridgeSyncMintEvents({
+            chainId: 137,
+            itokenAddress: '0x62c0045f3277e7067cacad3c8038eeabb1bd92d1',
+        }),
+
+        new InteropBridgeSyncBurnEvents({
+            chainId: 137,
+            itokenAddress: '0x62c0045f3277e7067cacad3c8038eeabb1bd92d1',
         })
     ];
 

package/src/typechain/InteropBridgeToken.ts

@@ -31,11 +31,11 @@ export interface InteropBridgeTokenInterface extends utils.Interface {
     "allowance(address,address)": FunctionFragment;
     "approve(address,uint256)": FunctionFragment;
     "balanceOf(address)": FunctionFragment;
-    "burn(address,uint256,uint256)": FunctionFragment;
+    "burn(address,uint256,uint32)": FunctionFragment;
     "decimals()": FunctionFragment;
     "decreaseAllowance(address,uint256)": FunctionFragment;
     "increaseAllowance(address,uint256)": FunctionFragment;
-    "mint(address,uint256,uint256,bytes32)": FunctionFragment;
+    "mint(address,uint256,uint32,bytes32)": FunctionFragment;
     "name()": FunctionFragment;
     "owner()": FunctionFragment;
     "renounceOwnership()": FunctionFragment;
@@ -153,8 +153,8 @@ export interface InteropBridgeTokenInterface extends utils.Interface {
 
   events: {
     "Approval(address,address,uint256)": EventFragment;
-    "Burn(address,uint256,uint256)": EventFragment;
-    "Mint(address,uint256,uint256,bytes32)": EventFragment;
+    "Burn(address,uint256,uint32,uint32)": EventFragment;
+    "Mint(address,uint256,uint32,uint32,bytes32)": EventFragment;
     "OwnershipTransferred(address,address)": EventFragment;
     "Transfer(address,address,uint256)": EventFragment;
   };
@@ -181,10 +181,11 @@ export type ApprovalEventFilter = TypedEventFilter<ApprovalEvent>;
 export interface BurnEventObject {
   to: string;
   amount: BigNumber;
-  chainId: BigNumber;
+  sourceChainId: number;
+  targetChainId: number;
 }
 export type BurnEvent = TypedEvent<
-  [string, BigNumber, BigNumber],
+  [string, BigNumber, number, number],
   BurnEventObject
 >;
 
@@ -193,11 +194,12 @@ export type BurnEventFilter = TypedEventFilter<BurnEvent>;
 export interface MintEventObject {
   to: string;
   amount: BigNumber;
-  chainId: BigNumber;
-  transactionHash: string;
+  sourceChainId: number;
+  targetChainId: number;
+  submitTransactionHash: string;
 }
 export type MintEvent = TypedEvent<
-  [string, BigNumber, BigNumber, string],
+  [string, BigNumber, number, number, string],
   MintEventObject
 >;
 
@@ -486,28 +488,32 @@ export interface InteropBridgeToken extends BaseContract {
       value?: null
     ): ApprovalEventFilter;
 
-    "Burn(address,uint256,uint256)"(
+    "Burn(address,uint256,uint32,uint32)"(
       to?: string | null,
       amount?: null,
-      chainId?: BigNumberish | null
+      sourceChainId?: null,
+      targetChainId?: BigNumberish | null
     ): BurnEventFilter;
     Burn(
       to?: string | null,
       amount?: null,
-      chainId?: BigNumberish | null
+      sourceChainId?: null,
+      targetChainId?: BigNumberish | null
     ): BurnEventFilter;
 
-    "Mint(address,uint256,uint256,bytes32)"(
+    "Mint(address,uint256,uint32,uint32,bytes32)"(
       to?: string | null,
       amount?: null,
-      chainId?: BigNumberish | null,
-      transactionHash?: BytesLike | null
+      sourceChainId?: BigNumberish | null,
+      targetChainId?: null,
+      submitTransactionHash?: BytesLike | null
     ): MintEventFilter;
     Mint(
       to?: string | null,
       amount?: null,
-      chainId?: BigNumberish | null,
-      transactionHash?: BytesLike | null
+      sourceChainId?: BigNumberish | null,
+      targetChainId?: null,
+      submitTransactionHash?: BytesLike | null
     ): MintEventFilter;
 
     "OwnershipTransferred(address,address)"(