@instadapp/interop-x 0.0.0-dev.f0a6281 → 0.0.0-dev.fabee70

package/src/abi/interopBridgeToken.json

@@ -46,17 +46,11 @@
         "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",
@@ -79,20 +73,14 @@
       },
       {
         "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"
       }
     ],
@@ -176,7 +164,7 @@
     "inputs": [
       { "internalType": "address", "name": "to", "type": "address" },
       { "internalType": "uint256", "name": "amount", "type": "uint256" },
-      { "internalType": "uint32", "name": "chainId", "type": "uint32" }
+      { "internalType": "uint256", "name": "chainId", "type": "uint256" }
     ],
     "name": "burn",
     "outputs": [],
@@ -218,7 +206,7 @@
     "inputs": [
       { "internalType": "address", "name": "to", "type": "address" },
       { "internalType": "uint256", "name": "amount", "type": "uint256" },
-      { "internalType": "uint32", "name": "chainId", "type": "uint32" },
+      { "internalType": "uint256", "name": "chainId", "type": "uint256" },
       {
         "internalType": "bytes32",
         "name": "transactionHash",

package/src/abi/interopXGateway.json

@@ -35,15 +35,15 @@
       },
       {
         "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",
@@ -72,15 +72,15 @@
       },
       {
         "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,
@@ -122,7 +122,7 @@
     "inputs": [
       { "internalType": "address", "name": "token_", "type": "address" },
       { "internalType": "uint256", "name": "amount_", "type": "uint256" },
-      { "internalType": "uint32", "name": "chainId_", "type": "uint32" }
+      { "internalType": "uint256", "name": "chainId_", "type": "uint256" }
     ],
     "name": "deposit",
     "outputs": [],
@@ -134,7 +134,7 @@
       { "internalType": "address", "name": "to_", "type": "address" },
       { "internalType": "address", "name": "token_", "type": "address" },
       { "internalType": "uint256", "name": "amount_", "type": "uint256" },
-      { "internalType": "uint32", "name": "chainId_", "type": "uint32" }
+      { "internalType": "uint256", "name": "chainId_", "type": "uint256" }
     ],
     "name": "depositFor",
     "outputs": [],
@@ -160,7 +160,7 @@
       { "internalType": "uint256", "name": "amount_", "type": "uint256" },
       { "internalType": "address", "name": "user_", "type": "address" },
       { "internalType": "address", "name": "token_", "type": "address" },
-      { "internalType": "uint32", "name": "chainId_", "type": "uint32" },
+      { "internalType": "uint256", "name": "chainId_", "type": "uint256" },
       {
         "internalType": "bytes32",
         "name": "transactionHash_",

package/src/config/index.ts

@@ -1,7 +1,5 @@
 import { ethers, Wallet } from "ethers"
 import { EventBus, EventBusType } from "@/types"
-import fs from 'fs-extra'
-import expandHomeDir from "expand-home-dir";
 
 class Config {
     public readonly events: EventBusType
@@ -11,17 +9,15 @@ class Config {
     public readonly wallet: Wallet
     public readonly staging: boolean
     public readonly autoUpdate: boolean
-    public readonly baseConfigPath: string
 
     constructor() {
         this.events = new EventBus()  as EventBusType
-        this.maxPeers = 20
+        this.maxPeers = 10
         this.privateKey = process.env.PRIVATE_KEY as string;
         this.staging = !! process.env.STAGING && process.env.STAGING === 'true';
         this.autoUpdate = !! process.env.AUTO_UPDATE && process.env.AUTO_UPDATE === 'true';
         this.wallet = new Wallet(this.privateKey);
         this.leadNodeAddress = '0x910E413DBF3F6276Fe8213fF656726bDc142E08E'
-        this.baseConfigPath = expandHomeDir(`~/.interop-x`);
     }
 
     get publicAddress(){
@@ -31,10 +27,6 @@ class Config {
     isLeadNode() {
         return ethers.utils.getAddress(this.leadNodeAddress) === ethers.utils.getAddress(this.wallet.address)
     }
-
-    isMaintenanceMode(){
-        return fs.existsSync(this.baseConfigPath + '/maintenance')
-    }
 }
 
 export default new Config()

package/src/constants/addresses.ts

@@ -12,6 +12,6 @@ export const addresses = {
   43114: {
     gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
     multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-    interopXGateway: '0xF0317C5Bc206F2291dd2f3eE9C4cDB5Bbb25418d',
+    interopXGateway: '0x8D27758751BA488690974B6Ccfcda771D462945f',
   }
 }

package/src/constants/itokens.ts

@@ -2,7 +2,7 @@ export const itokens = {
   1: [],
   137: [
     {
-      address: '0x62C0045f3277E7067cAcad3c8038eEaBB1Bd92D1',
+      address: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
       symbol: 'USDC',
     }
   ],

package/src/index.ts

@@ -1,6 +1,5 @@
 import moduleAlias from 'module-alias';
-import expandHomeDir from "expand-home-dir";
-import fs from 'fs-extra'
+
 moduleAlias.addAliases({
     "@/": __dirname + "/",
     "@/logger": __dirname + "/logger",
@@ -26,30 +25,12 @@ dotenv.config();
 import Logger from "@/logger";
 const logger = new Logger('Process')
 
-const GIT_SHORT_HASH = '@GIT_SHORT_HASH@';
-
 const printUsage = () => {
-    console.log()
-    console.log(`Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
-    console.log()
-
     console.log('Usage:')
-    console.log('   interop-x help                                                              Show this message')
-    console.log('   interop-x version                                                           Print out the installed version of Interop X')
-
-    console.log()
-
-    console.log('   interop-x down                                                              Put the node into maintenance mode')
-    console.log('   interop-x up                                                                Take the node out of maintenance mode')
-
-    console.log()
-
-    console.log('   PRIVATE_KEY=abcd1234 interop-x                                              Start the node with the given private key')
-    console.log('   PRIVATE_KEY=abcd1234 STAGING=true interop-x                                 Start the node in staging mode')
-    console.log('   PRIVATE_KEY=abcd1234 AUTO_UPDATE=true interop-x                             Start the node in auto update mode')
-    console.log('   PRIVATE_KEY=abcd1234 API_HOST=0.0.0.0 API_PORT=8080 interop-x               Start the node with custom API host and port')
-    console.log()
-
+    console.log('   PRIVATE_KEY=abcd1234 interop-x')
+    console.log('   PRIVATE_KEY=abcd1234 STAGING=true interop-x')
+    console.log('   PRIVATE_KEY=abcd1234 AUTO_UPDATE=true interop-x')
+    console.log('   PRIVATE_KEY=abcd1234 API_HOST=0.0.0.0 API_PORT=8080 interop-x')
 }
 
 if (process.argv.at(-1) === 'help') {
@@ -57,27 +38,14 @@ if (process.argv.at(-1) === 'help') {
     process.exit(0)
 }
 
-const basePath = expandHomeDir(`~/.interop-x`);
-
-if (process.argv.at(-1) === 'down') {
-    fs.outputFileSync(basePath + '/maintenance', Date.now().toString())
-    console.log(chalk.red('Maintenance mode enabled'))
-    process.exit(0)
-}
-
-if (process.argv.at(-1) === 'up') {
-    fs.removeSync(basePath + '/maintenance')
-    console.log(chalk.green('Maintenance mode disabled'))
-    process.exit(0)
-}
-
+const GIT_SHORT_HASH = '@GIT_SHORT_HASH@';
 
 if (process.argv.at(-1) === 'version') {
     console.log(`Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
     process.exit(0)
 }
 
-if (!process.env.PRIVATE_KEY) {
+if(! process.env.PRIVATE_KEY) {
     console.error(chalk.bgRed.white.bold('Please provide a private key\n'))
     printUsage()
     process.exit(1)
@@ -112,10 +80,10 @@ async function main() {
         if (!peerPool.isLeadNode(payload.peerId)) {
             const peer = peerPool.getPeer(payload.peerId)
 
-            if (!peer) {
+            if(! peer) {
                 return;
             }
-
+            
             logger.info(`ignored transaction status from ${payload.peerId} ${shortenHash(peer.publicAddress)} `)
             return;
         }

package/src/net/protocol/index.ts

@@ -6,7 +6,7 @@ import { IPeerInfo, peerPool } from "..";
 import config from "@/config";
 import { Event } from "@/types";
 import { Transaction } from "@/db";
-import { TransactionStatusDialProtocol } from "./dial/TransactionStatusDialProtocol";
+import { TransactionStatusDialProtocol } from "./dial/SignatureDialProtocol.1";
 
 export interface ProtocolOptions {
     /* Handshake timeout in ms (default: 8000) */

package/src/tasks/AutoUpdateTask.ts

@@ -1,16 +1,15 @@
 import { BaseTask } from "./BaseTask";
 import Logger from '@/logger';
-import spawnAsync from 'await-spawn';
-import { spawn } from 'child_process'
+import { http } from "@/utils";
+import spawn from 'await-spawn';
 import config from "@/config";
 import wait from "waait";
 import packageJson from "../../package.json";
 
 const currentVersion = packageJson.version;
-const tag = config.staging ? 'dev' : 'latest';
 
 class AutoUpdateTask extends BaseTask {
-    pollIntervalMs: number = 60 * 10 * 1000
+    pollIntervalMs: number = 60 * 5 * 1000
 
     constructor() {
         super({
@@ -24,26 +23,22 @@ class AutoUpdateTask extends BaseTask {
 
     async getInstalledVersion() {
         try {
-            const stdout = await spawnAsync('npm', ['-g', 'ls', '--depth=0', '--json'])
-            return JSON.parse(stdout.toString()).dependencies[packageJson.name].version
-        } catch (error) {
-            this.logger.error(error)
-            return currentVersion
-        }
-    }
+            const stdout = await spawn('npm', ['-g', 'ls', '--depth=0', '--json'])
 
-    async getLatestVersion() {
-        try {
-            const stdout = await spawnAsync('npm', ['view', `${packageJson.name}@${tag}`, 'version'])
-            return stdout.toString().trim()
+
+            return JSON.parse(stdout.toString()).dependencies[packageJson.name].version
         } catch (error) {
             this.logger.error(error)
+            
             return currentVersion
         }
     }
 
     async pollHandler() {
-        const version = await this.getLatestVersion()
+
+        const { data } = await http.get('https://registry.npmjs.org/@instadapp/interop-x')
+
+        const version = data['dist-tags'].latest
 
         if (version === currentVersion) {
             return;
@@ -51,9 +46,10 @@ class AutoUpdateTask extends BaseTask {
 
         this.logger.warn(`New version ${version} available.`)
 
+
         this.logger.info('Updating...')
 
-        await spawnAsync('npm', ['-g', 'install', `@instadapp/interop-x@${tag}`, '-f']);
+        await spawn('npm', ['-g', 'install', '@instadapp/interop-x', '-f']);
 
         await wait(5000)
 
@@ -65,16 +61,11 @@ class AutoUpdateTask extends BaseTask {
         this.logger.warn(`Installed version ${version}`)
         this.logger.warn(`Restarting...`)
 
-
-        // TODO: its restarting in the bg, but it should be in the fg
-        const subprocess = spawn(process.argv[0], process.argv.slice(1), {
+        spawn(process.argv[0], process.argv.slice(1), {
             cwd: process.cwd(),
-            stdio: "inherit",
-            // shell: process.env.SHELL, 
+            stdio: "inherit"
         });
 
-        subprocess.unref();
-
         process.exit()
     }
 }

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/SyncWithdrawEvents.ts

@@ -41,13 +41,13 @@ class SyncWithdrawEvents 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 SyncWithdrawEvents 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",
                 })

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,22 +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];
-            await transaction.save();
-            protocol.sendTransaction(transaction)
-            return;
-        }
-
         let gnosisTx = await generateGnosisTransaction({
             baseGas: "0",
-            data,
+            data: await buildDataForTransaction(transaction),
             gasPrice: "0",
             gasToken: "0x0000000000000000000000000000000000000000",
             nonce: '0',
@@ -155,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/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,