@instadapp/interop-x 0.0.0-dev.2c0a756 → 0.0.0-dev.30b0db0

package/src/tasks/BaseTask.ts

@@ -46,11 +46,6 @@ export class BaseTask extends EventEmitter implements IBaseTask {
     }
 
     prePollHandler(): boolean {
-        if(config.isMaintenanceMode()){
-            this.logger.warn('Maintenance mode is enabled. Skipping task.')
-            return false
-        }
-
         if (this.exceptLeadNode) {
             return !config.isLeadNode();
         }

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

@@ -8,7 +8,7 @@ import { ChainId } from "@/types";
 import config from "@/config";
 import { InteropBridgeToken } from "@/typechain";
 
-class SyncBurnEvents extends BaseTask {
+class SyncWithdrawEvents extends BaseTask {
     contractAddress: string;
     provider: ethers.providers.JsonRpcProvider;
     contract: InteropBridgeToken;
@@ -17,7 +17,7 @@ class SyncBurnEvents extends BaseTask {
 
     constructor({ chainId, itokenAddress }: { chainId: ChainId, itokenAddress: string }) {
         super({
-            logger: new Logger("InteropBridgeToken::SyncBurnEvents"),
+            logger: new Logger("InteropBridgeToken::SyncWithdrawEvents"),
         })
         this.chainId = chainId;
         this.itokenAddress = itokenAddress;
@@ -41,13 +41,13 @@ class SyncBurnEvents extends BaseTask {
                     continue;
                 }
 
-                const { to, amount, sourceChainId, targetChainId } = event.args;
+                const { to, amount, chainId } = event.args;
 
                 const uniqueIdentifier = {
                     action: 'withdraw',
                     submitTransactionHash: event.transactionHash,
-                    sourceChainId: sourceChainId,
-                    targetChainId: targetChainId,
+                    sourceChainId:this.chainId,
+                    targetChainId: chainId.toNumber(),
                 }
 
                 if (await Transaction.findOne({ where: uniqueIdentifier })) {
@@ -77,16 +77,14 @@ class SyncBurnEvents extends BaseTask {
                         to, 
                         amount: amount.toString(),
                         itoken: this.itokenAddress,
-                        sourceChainId: sourceChainId,
-                        targetChainId: targetChainId,
+                        chainId: chainId.toString()
                     },
 
                     sourceEvent: {
                         to, 
                         amount: amount.toString(), 
                         itoken: this.itokenAddress,
-                        sourceChainId: sourceChainId,
-                        targetChainId: targetChainId,
+                        chainId: chainId.toString(),
                     },
                     status: "pending",
                 })
@@ -118,4 +116,4 @@ class SyncBurnEvents extends BaseTask {
     }
 }
 
-export default SyncBurnEvents;
+export default SyncWithdrawEvents;

package/src/tasks/InteropXGateway/ProcessDepositEvents.ts

@@ -15,7 +15,7 @@ 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,
@@ -97,7 +97,7 @@ class ProcessDepositEvents extends BaseTask {
         }
 
         console.log(`Processing transaction ${transaction.transactionHash}`);
-
+        
         transaction.targetStatus = 'pending';
         await transaction.save();
 
@@ -121,23 +121,9 @@ class ProcessDepositEvents extends BaseTask {
         const ownersThreshold = await safeContract.getThreshold();
         await wait(10000);
 
-        let data;
-
-        try {
-            data = await buildDataForTransaction(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,
+            data: await buildDataForTransaction(transaction),
             gasPrice: "0",
             gasToken: "0x0000000000000000000000000000000000000000",
             nonce: '0',
@@ -156,7 +142,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,

package/src/tasks/InteropXGateway/SyncDepositEvents.ts

@@ -45,8 +45,8 @@ class SyncDepositEvents extends BaseTask {
                 const uniqueIdentifier = {
                     action: 'deposit',
                     submitTransactionHash: event.transactionHash,
-                    sourceChainId: sourceChainId,
-                    targetChainId: targetChainId,
+                    sourceChainId: sourceChainId.toNumber(),
+                    targetChainId: targetChainId.toNumber(),
                 }
 
                 if (await Transaction.findOne({ where: uniqueIdentifier })) {

package/src/tasks/index.ts

@@ -1,15 +1,11 @@
 import { BaseTask } from "./BaseTask";
 import InteropXGatewayProcessDepositEvents from "./InteropXGateway/ProcessDepositEvents";
 import InteropXGatewaySyncDepositEvents from "./InteropXGateway/SyncDepositEvents";
-import InteropXGatewaySyncWithdrawEvents from "./InteropXGateway/SyncWithdrawtEvents";
-
-import InteropBridgeSyncWithdrawEvents from "./InteropBridge/SyncBurnEvents";
-import InteropBridgeSyncBurnEvents from "./InteropBridge/SyncBurnEvents";
-import InteropBridgeSyncMintEvents from "./InteropBridge/SyncMintEvents";
-
-import SyncTransactionStatusTask from "./Transactions/SyncTransactionStatusTask";
 
+import InteropBridgeSyncWithdrawEvents from "./InteropBridge/SyncWithdrawEvents";
+import InteropBridgeProcessWithdrawEvents from "./InteropBridge/ProcessWithdrawEvents";
 import AutoUpdateTask from "./AutoUpdateTask";
+import SyncTransactionStatusTask from "./Transactions/SyncTransactionStatusTask";
 
 export class Tasks {
     
@@ -17,8 +13,6 @@ export class Tasks {
         new SyncTransactionStatusTask(),
         new AutoUpdateTask(),
 
-        // InteropXGateway
-
         new InteropXGatewaySyncDepositEvents({
             chainId: 43114
         }),
@@ -27,27 +21,13 @@ export class Tasks {
             chainId: 43114
         }),
 
-
-        new InteropXGatewaySyncWithdrawEvents({
-            chainId: 43114
-        }),
-
-
-        // InteropBridge
-
         new InteropBridgeSyncWithdrawEvents({
             chainId: 137,
             itokenAddress: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
         }),
 
-        new InteropBridgeSyncMintEvents({
-            chainId: 137,
-            itokenAddress: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
-        }),
-
-        new InteropBridgeSyncBurnEvents({
+        new InteropBridgeProcessWithdrawEvents({
             chainId: 137,
-            itokenAddress: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
         })
     ];
 

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,uint32)": FunctionFragment;
+    "burn(address,uint256,uint256)": FunctionFragment;
     "decimals()": FunctionFragment;
     "decreaseAllowance(address,uint256)": FunctionFragment;
     "increaseAllowance(address,uint256)": FunctionFragment;
-    "mint(address,uint256,uint32,bytes32)": FunctionFragment;
+    "mint(address,uint256,uint256,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,uint32,uint32)": EventFragment;
-    "Mint(address,uint256,uint32,uint32,bytes32)": EventFragment;
+    "Burn(address,uint256,uint256)": EventFragment;
+    "Mint(address,uint256,uint256,bytes32)": EventFragment;
     "OwnershipTransferred(address,address)": EventFragment;
     "Transfer(address,address,uint256)": EventFragment;
   };
@@ -181,11 +181,10 @@ export type ApprovalEventFilter = TypedEventFilter<ApprovalEvent>;
 export interface BurnEventObject {
   to: string;
   amount: BigNumber;
-  sourceChainId: number;
-  targetChainId: number;
+  chainId: BigNumber;
 }
 export type BurnEvent = TypedEvent<
-  [string, BigNumber, number, number],
+  [string, BigNumber, BigNumber],
   BurnEventObject
 >;
 
@@ -194,12 +193,11 @@ export type BurnEventFilter = TypedEventFilter<BurnEvent>;
 export interface MintEventObject {
   to: string;
   amount: BigNumber;
-  sourceChainId: number;
-  targetChainId: number;
-  submitTransactionHash: string;
+  chainId: BigNumber;
+  transactionHash: string;
 }
 export type MintEvent = TypedEvent<
-  [string, BigNumber, number, number, string],
+  [string, BigNumber, BigNumber, string],
   MintEventObject
 >;
 
@@ -488,32 +486,28 @@ export interface InteropBridgeToken extends BaseContract {
       value?: null
     ): ApprovalEventFilter;
 
-    "Burn(address,uint256,uint32,uint32)"(
+    "Burn(address,uint256,uint256)"(
       to?: string | null,
       amount?: null,
-      sourceChainId?: null,
-      targetChainId?: BigNumberish | null
+      chainId?: BigNumberish | null
     ): BurnEventFilter;
     Burn(
       to?: string | null,
       amount?: null,
-      sourceChainId?: null,
-      targetChainId?: BigNumberish | null
+      chainId?: BigNumberish | null
     ): BurnEventFilter;
 
-    "Mint(address,uint256,uint32,uint32,bytes32)"(
+    "Mint(address,uint256,uint256,bytes32)"(
       to?: string | null,
       amount?: null,
-      sourceChainId?: BigNumberish | null,
-      targetChainId?: null,
-      submitTransactionHash?: BytesLike | null
+      chainId?: BigNumberish | null,
+      transactionHash?: BytesLike | null
     ): MintEventFilter;
     Mint(
       to?: string | null,
       amount?: null,
-      sourceChainId?: BigNumberish | null,
-      targetChainId?: null,
-      submitTransactionHash?: BytesLike | null
+      chainId?: BigNumberish | null,
+      transactionHash?: 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,uint32)": FunctionFragment;
-    "depositFor(address,address,uint256,uint32)": FunctionFragment;
+    "deposit(address,uint256,uint256)": FunctionFragment;
+    "depositFor(address,address,uint256,uint256)": FunctionFragment;
     "owner()": FunctionFragment;
     "renounceOwnership()": FunctionFragment;
-    "systemWithdraw(uint256,address,address,uint32,bytes32)": FunctionFragment;
+    "systemWithdraw(uint256,address,address,uint256,bytes32)": FunctionFragment;
     "transferOwnership(address)": FunctionFragment;
   };
 
@@ -89,8 +89,8 @@ export interface InteropXGatewayInterface extends utils.Interface {
   ): Result;
 
   events: {
-    "LogGatewayDeposit(address,address,uint256,uint256,uint32,uint32)": EventFragment;
-    "LogGatewayWithdraw(address,address,uint256,uint32,uint32,bytes32)": EventFragment;
+    "LogGatewayDeposit(address,address,uint256,uint256,uint256,uint256)": EventFragment;
+    "LogGatewayWithdraw(address,address,uint256,uint256,uint256,bytes32)": EventFragment;
     "OwnershipTransferred(address,address)": EventFragment;
   };
 
@@ -104,11 +104,11 @@ export interface LogGatewayDepositEventObject {
   token: string;
   amount: BigNumber;
   vnonce: BigNumber;
-  sourceChainId: number;
-  targetChainId: number;
+  sourceChainId: BigNumber;
+  targetChainId: BigNumber;
 }
 export type LogGatewayDepositEvent = TypedEvent<
-  [string, string, BigNumber, BigNumber, number, number],
+  [string, string, BigNumber, BigNumber, BigNumber, BigNumber],
   LogGatewayDepositEventObject
 >;
 
@@ -119,12 +119,12 @@ export interface LogGatewayWithdrawEventObject {
   user: string;
   token: string;
   amount: BigNumber;
-  sourceChainId: number;
-  targetChainId: number;
+  sourceChainId: BigNumber;
+  targetChainId: BigNumber;
   transactionHash: string;
 }
 export type LogGatewayWithdrawEvent = TypedEvent<
-  [string, string, BigNumber, number, number, string],
+  [string, string, BigNumber, BigNumber, BigNumber, string],
   LogGatewayWithdrawEventObject
 >;
 
@@ -283,7 +283,7 @@ export interface InteropXGateway extends BaseContract {
   };
 
   filters: {
-    "LogGatewayDeposit(address,address,uint256,uint256,uint32,uint32)"(
+    "LogGatewayDeposit(address,address,uint256,uint256,uint256,uint256)"(
       user?: null,
       token?: string | null,
       amount?: null,
@@ -300,7 +300,7 @@ export interface InteropXGateway extends BaseContract {
       targetChainId?: BigNumberish | null
     ): LogGatewayDepositEventFilter;
 
-    "LogGatewayWithdraw(address,address,uint256,uint32,uint32,bytes32)"(
+    "LogGatewayWithdraw(address,address,uint256,uint256,uint256,bytes32)"(
       user?: null,
       token?: string | null,
       amount?: null,

package/src/typechain/factories/InteropBridgeToken__factory.ts

@@ -61,17 +61,11 @@ const _abi = [
         name: "amount",
         type: "uint256",
       },
-      {
-        indexed: false,
-        internalType: "uint32",
-        name: "sourceChainId",
-        type: "uint32",
-      },
       {
         indexed: true,
-        internalType: "uint32",
-        name: "targetChainId",
-        type: "uint32",
+        internalType: "uint256",
+        name: "chainId",
+        type: "uint256",
       },
     ],
     name: "Burn",
@@ -94,20 +88,14 @@ const _abi = [
       },
       {
         indexed: true,
-        internalType: "uint32",
-        name: "sourceChainId",
-        type: "uint32",
-      },
-      {
-        indexed: false,
-        internalType: "uint32",
-        name: "targetChainId",
-        type: "uint32",
+        internalType: "uint256",
+        name: "chainId",
+        type: "uint256",
       },
       {
         indexed: true,
         internalType: "bytes32",
-        name: "submitTransactionHash",
+        name: "transactionHash",
         type: "bytes32",
       },
     ],
@@ -238,9 +226,9 @@ const _abi = [
         type: "uint256",
       },
       {
-        internalType: "uint32",
+        internalType: "uint256",
         name: "chainId",
-        type: "uint32",
+        type: "uint256",
       },
     ],
     name: "burn",
@@ -322,9 +310,9 @@ const _abi = [
         type: "uint256",
       },
       {
-        internalType: "uint32",
+        internalType: "uint256",
         name: "chainId",
-        type: "uint32",
+        type: "uint256",
       },
       {
         internalType: "bytes32",

package/src/typechain/factories/InteropXGateway__factory.ts

@@ -50,15 +50,15 @@ const _abi = [
       },
       {
         indexed: false,
-        internalType: "uint32",
+        internalType: "uint256",
         name: "sourceChainId",
-        type: "uint32",
+        type: "uint256",
       },
       {
         indexed: true,
-        internalType: "uint32",
+        internalType: "uint256",
         name: "targetChainId",
-        type: "uint32",
+        type: "uint256",
       },
     ],
     name: "LogGatewayDeposit",
@@ -87,15 +87,15 @@ const _abi = [
       },
       {
         indexed: true,
-        internalType: "uint32",
+        internalType: "uint256",
         name: "sourceChainId",
-        type: "uint32",
+        type: "uint256",
       },
       {
         indexed: false,
-        internalType: "uint32",
+        internalType: "uint256",
         name: "targetChainId",
-        type: "uint32",
+        type: "uint256",
       },
       {
         indexed: true,
@@ -152,9 +152,9 @@ const _abi = [
         type: "uint256",
       },
       {
-        internalType: "uint32",
+        internalType: "uint256",
         name: "chainId_",
-        type: "uint32",
+        type: "uint256",
       },
     ],
     name: "deposit",
@@ -180,9 +180,9 @@ const _abi = [
         type: "uint256",
       },
       {
-        internalType: "uint32",
+        internalType: "uint256",
         name: "chainId_",
-        type: "uint32",
+        type: "uint256",
       },
     ],
     name: "depositFor",
@@ -228,9 +228,9 @@ const _abi = [
         type: "address",
       },
       {
-        internalType: "uint32",
+        internalType: "uint256",
         name: "chainId_",
-        type: "uint32",
+        type: "uint256",
       },
       {
         internalType: "bytes32",

package/src/utils/index.ts

@@ -24,7 +24,7 @@ export function shortenHash(hash: string, length: number = 4) {
 
   const beginningChars = hash.startsWith("0x") ? length + 2 : length;
 
-  const shortened = hash.substr(0, beginningChars) + "…" + hash.substr(-length);
+  const shortened = hash.substring(0, beginningChars) + "…" + hash.substring(-length);
 
   return shortened;
 }
@@ -222,30 +222,30 @@ export const buildWithdrawDataForTransaction = async (transaction: Transaction,
     throw Error('Cannot build data for transaction without submitEvent');
   }
 
-  const { to, amount, sourceChainId, targetChainId, itoken: itokenAddress } = transaction.submitEvent;
+  const { to, amount, chainId, itoken: itokenAddress } = transaction.submitEvent;
 
-  const itoken = itokens[sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
+  const itoken = itokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
 
   if (!itoken) {
     throw Error('Cannot build data for transaction without itoken');
   }
 
-  const token = tokens[targetChainId].find(t => t.symbol.toLowerCase() === itoken.symbol.toLowerCase());
+  const token = tokens[chainId].find(t => t.symbol.toLowerCase() === itoken.symbol.toLowerCase());
 
   if (!token) {
     throw Error('Cannot build data for transaction without token');
   }
 
-  const targetChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(targetChainId as ChainId));
+  const targetChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(transaction.targetChainId as ChainId));
   const targetWallet = new ethers.Wallet(config.privateKey, targetChainProvider);
-  const gatewayAddress = addresses[targetChainId].interopXGateway;
+  const gatewayAddress = addresses[chainId].interopXGateway;
   const interopBridgeContract = getContract<InteropXGateway>(gatewayAddress, abi.interopXGateway, targetWallet);
 
   const { data } = await interopBridgeContract.populateTransaction.systemWithdraw(
     ethers.BigNumber.from(amount.toString()),
     to,
     token.address,
-    ethers.BigNumber.from(sourceChainId.toString()),
+    ethers.BigNumber.from(transaction.sourceChainId.toString()),
     transaction.submitTransactionHash,
   );
 

package/dist/src/tasks/InteropBridge/SyncMintEvents.js

@@ -1,66 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const BaseTask_1 = require("../BaseTask");
-const logger_1 = __importDefault(require("@/logger"));
-const ethers_1 = require("ethers");
-const abi_1 = __importDefault(require("@/abi"));
-const db_1 = require("@/db");
-const utils_1 = require("@/utils");
-const config_1 = __importDefault(require("@/config"));
-class SyncMintEvents extends BaseTask_1.BaseTask {
-    constructor({ chainId, itokenAddress }) {
-        super({
-            logger: new logger_1.default("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 - 300, 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,
-                };
-                const transaction = await db_1.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() {
-        this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
-        this.contract = (0, utils_1.getContract)(this.itokenAddress, abi_1.default.interopBridgeToken, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
-        await super.start();
-    }
-}
-exports.default = SyncMintEvents;