@instadapp/interop-x 0.0.0-dev.67e7c3a → 0.0.0-dev.733ff78

package/src/tasks/InteropBridge/{SyncWithdrawEvents.ts → SyncBurnEvents.ts}

@@ -8,7 +8,7 @@ import { ChainId } from "@/types";
 import config from "@/config";
 import { InteropBridgeToken } from "@/typechain";
 
-class SyncWithdrawEvents extends BaseTask {
+class SyncBurnEvents extends BaseTask {
     contractAddress: string;
     provider: ethers.providers.JsonRpcProvider;
     contract: InteropBridgeToken;
@@ -17,7 +17,7 @@ class SyncWithdrawEvents extends BaseTask {
 
     constructor({ chainId, itokenAddress }: { chainId: ChainId, itokenAddress: string }) {
         super({
-            logger: new Logger("InteropBridgeToken::SyncWithdrawEvents"),
+            logger: new Logger("InteropBridgeToken::SyncBurnEvents"),
         })
         this.chainId = chainId;
         this.itokenAddress = itokenAddress;
@@ -41,13 +41,13 @@ class SyncWithdrawEvents extends BaseTask {
                     continue;
                 }
 
-                const { to, amount, chainId } = event.args;
+                const { to, amount, sourceChainId, targetChainId } = event.args;
 
                 const uniqueIdentifier = {
                     action: 'withdraw',
                     submitTransactionHash: event.transactionHash,
-                    sourceChainId:this.chainId,
-                    targetChainId: chainId.toNumber(),
+                    sourceChainId: sourceChainId,
+                    targetChainId: targetChainId,
                 }
 
                 if (await Transaction.findOne({ where: uniqueIdentifier })) {
@@ -62,7 +62,6 @@ class SyncWithdrawEvents extends BaseTask {
                     from: tx.from,
                     to,
 
-                    
                     submitTransactionHash: event.transactionHash,
                     submitBlockNumber: event.blockNumber,
 
@@ -70,21 +69,22 @@ class SyncWithdrawEvents extends BaseTask {
                     sourceTransactionHash: event.transactionHash,
                     sourceBlockNumber: event.blockNumber,
                     sourceStatus: "success",
-
                     targetStatus: "uninitialised",
 
                     submitEvent: {
-                        to, 
+                        to,
                         amount: amount.toString(),
                         itoken: this.itokenAddress,
-                        chainId: chainId.toString()
+                        sourceChainId: sourceChainId,
+                        targetChainId: targetChainId,
                     },
 
                     sourceEvent: {
-                        to, 
-                        amount: amount.toString(), 
+                        to,
+                        amount: amount.toString(),
                         itoken: this.itokenAddress,
-                        chainId: chainId.toString(),
+                        sourceChainId: sourceChainId,
+                        targetChainId: targetChainId,
                     },
                     status: "pending",
                 })
@@ -102,8 +102,6 @@ class SyncWithdrawEvents extends BaseTask {
     }
 
     async start(): Promise<void> {
-        this.logger.info(`Starting execution watcher on interop chain`);
-
         this.provider = new ethers.providers.JsonRpcProvider(
             getRpcProviderUrl(this.chainId)
         );
@@ -118,4 +116,4 @@ class SyncWithdrawEvents extends BaseTask {
     }
 }
 
-export default SyncWithdrawEvents;
+export default SyncBurnEvents;

package/src/tasks/InteropBridge/SyncMintEvents.ts

@@ -0,0 +1,99 @@
+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 { ChainId } from "@/types";
+import config from "@/config";
+import { InteropBridgeToken } from "@/typechain";
+
+class SyncMintEvents 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::SyncMintEvents"),
+        })
+        this.chainId = chainId;
+        this.itokenAddress = itokenAddress;
+    }
+
+    async pollHandler() {
+        const currentBlock = await this.provider.getBlockNumber();
+
+        const events = await this.contract.queryFilter(
+            this.contract.filters.Mint(),
+            currentBlock - 500,
+            currentBlock,
+        );
+
+        for (const event of events) {
+
+            try {
+                if (!event.args) {
+                    continue;
+                }
+                
+                const { sourceChainId, targetChainId, amount, to, submitTransactionHash } = event.args;
+
+                const uniqueIdentifier = {
+                    action: 'deposit',
+                    submitTransactionHash: submitTransactionHash,
+                    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 = {
+                    sourceChainId, 
+                    targetChainId, 
+                    amount: amount.toString(), 
+                    to, 
+                    submitTransactionHash
+                }
+                transaction.status = 'success'
+
+                await transaction.save()
+
+                this.logger.info(
+                    `Mint confirmation received: ${transaction.transactionHash} `
+                );
+            } catch (error) {
+                this.logger.error(error);
+            }
+        }
+    }
+
+    async start(): Promise<void> {
+        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 SyncMintEvents;

package/src/tasks/InteropXGateway/ProcessDepositEvents.ts

@@ -3,7 +3,7 @@ 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 { buildSignatureBytes, getContract, getRpcProviderUrl, Signature } from "@/utils";
 import { addresses } from "@/constants";
 import { ChainId } from "@/types";
 import config from "@/config";
@@ -12,10 +12,11 @@ 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,
@@ -97,7 +98,7 @@ class ProcessDepositEvents extends BaseTask {
         }
 
         console.log(`Processing transaction ${transaction.transactionHash}`);
-        
+
         transaction.targetStatus = 'pending';
         await transaction.save();
 
@@ -121,9 +122,24 @@ class ProcessDepositEvents extends BaseTask {
         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: await buildDataForTransaction(transaction),
+            data,
             gasPrice: "0",
             gasToken: "0x0000000000000000000000000000000000000000",
             nonce: '0',
@@ -142,7 +158,7 @@ class ProcessDepositEvents extends BaseTask {
         console.log(`Collecting signatures for execution ${transaction.transactionHash}`)
 
         console.log(ownerPeerIds);
-        
+
         const signatures = await protocol.requestSignatures({
             type: 'source',
             transactionHash: transaction.transactionHash,
@@ -210,6 +226,7 @@ class ProcessDepositEvents extends BaseTask {
             console.log('ExecutionSuccess')
             transaction.targetStatus = 'success'
             transaction.targetTransactionHash = txSent.hash
+            transaction.targetLogs = logs;
             transaction.status = 'success'
             await transaction.save();
         } else {
@@ -224,8 +241,6 @@ class ProcessDepositEvents 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(

package/src/tasks/InteropXGateway/SyncDepositEvents.ts

@@ -45,8 +45,8 @@ class SyncDepositEvents extends BaseTask {
                 const uniqueIdentifier = {
                     action: 'deposit',
                     submitTransactionHash: event.transactionHash,
-                    sourceChainId: sourceChainId.toNumber(),
-                    targetChainId: targetChainId.toNumber(),
+                    sourceChainId: sourceChainId,
+                    targetChainId: targetChainId,
                 }
 
                 if (await Transaction.findOne({ where: uniqueIdentifier })) {
@@ -105,8 +105,6 @@ 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(

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,16 +1,24 @@
 import { BaseTask } from "./BaseTask";
 import InteropXGatewayProcessDepositEvents from "./InteropXGateway/ProcessDepositEvents";
 import InteropXGatewaySyncDepositEvents from "./InteropXGateway/SyncDepositEvents";
+import InteropXGatewaySyncWithdrawEvents from "./InteropXGateway/SyncWithdrawtEvents";
 
-import InteropBridgeSyncWithdrawEvents from "./InteropBridge/SyncWithdrawEvents";
 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 SyncTransactionStatusTask(),
         new AutoUpdateTask(),
 
+        // InteropXGateway
+
         new InteropXGatewaySyncDepositEvents({
             chainId: 43114
         }),
@@ -19,13 +27,26 @@ export class Tasks {
             chainId: 43114
         }),
 
-        new InteropBridgeSyncWithdrawEvents({
-            chainId: 137,
-            itokenAddress: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
+
+        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)"(

package/src/typechain/InteropXGateway.ts

@@ -29,11 +29,11 @@ import type {
 export interface InteropXGatewayInterface extends utils.Interface {
   functions: {
     "_vnonce()": FunctionFragment;
-    "deposit(address,uint256,uint256)": FunctionFragment;
-    "depositFor(address,address,uint256,uint256)": FunctionFragment;
+    "deposit(address,uint256,uint32)": FunctionFragment;
+    "depositFor(address,address,uint256,uint32)": FunctionFragment;
     "owner()": FunctionFragment;
     "renounceOwnership()": FunctionFragment;
-    "systemWithdraw(uint256,address,address,uint256,bytes32)": FunctionFragment;
+    "systemWithdraw(uint256,address,address,uint32,bytes32)": FunctionFragment;
     "transferOwnership(address)": FunctionFragment;
   };
 
@@ -89,8 +89,8 @@ export interface InteropXGatewayInterface extends utils.Interface {
   ): Result;
 
   events: {
-    "LogGatewayDeposit(address,address,uint256,uint256,uint256,uint256)": EventFragment;
-    "LogGatewayWithdraw(address,address,uint256,uint256,uint256,bytes32)": EventFragment;
+    "LogGatewayDeposit(address,address,uint256,uint256,uint32,uint32)": EventFragment;
+    "LogGatewayWithdraw(address,address,uint256,uint32,uint32,bytes32)": EventFragment;
     "OwnershipTransferred(address,address)": EventFragment;
   };
 
@@ -104,11 +104,11 @@ export interface LogGatewayDepositEventObject {
   token: string;
   amount: BigNumber;
   vnonce: BigNumber;
-  sourceChainId: BigNumber;
-  targetChainId: BigNumber;
+  sourceChainId: number;
+  targetChainId: number;
 }
 export type LogGatewayDepositEvent = TypedEvent<
-  [string, string, BigNumber, BigNumber, BigNumber, BigNumber],
+  [string, string, BigNumber, BigNumber, number, number],
   LogGatewayDepositEventObject
 >;
 
@@ -119,12 +119,12 @@ export interface LogGatewayWithdrawEventObject {
   user: string;
   token: string;
   amount: BigNumber;
-  sourceChainId: BigNumber;
-  targetChainId: BigNumber;
+  sourceChainId: number;
+  targetChainId: number;
   transactionHash: string;
 }
 export type LogGatewayWithdrawEvent = TypedEvent<
-  [string, string, BigNumber, BigNumber, BigNumber, string],
+  [string, string, BigNumber, number, number, string],
   LogGatewayWithdrawEventObject
 >;
 
@@ -283,7 +283,7 @@ export interface InteropXGateway extends BaseContract {
   };
 
   filters: {
-    "LogGatewayDeposit(address,address,uint256,uint256,uint256,uint256)"(
+    "LogGatewayDeposit(address,address,uint256,uint256,uint32,uint32)"(
       user?: null,
       token?: string | null,
       amount?: null,
@@ -300,7 +300,7 @@ export interface InteropXGateway extends BaseContract {
       targetChainId?: BigNumberish | null
     ): LogGatewayDepositEventFilter;
 
-    "LogGatewayWithdraw(address,address,uint256,uint256,uint256,bytes32)"(
+    "LogGatewayWithdraw(address,address,uint256,uint32,uint32,bytes32)"(
       user?: null,
       token?: string | null,
       amount?: null,