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

package/dist/src/typechain/factories/InteropBridgeToken__factory.js

@@ -57,17 +57,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",
@@ -90,20 +84,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",
             },
         ],
@@ -234,9 +222,9 @@ const _abi = [
                 type: "uint256",
             },
             {
-                internalType: "uint32",
+                internalType: "uint256",
                 name: "chainId",
-                type: "uint32",
+                type: "uint256",
             },
         ],
         name: "burn",
@@ -318,9 +306,9 @@ const _abi = [
                 type: "uint256",
             },
             {
-                internalType: "uint32",
+                internalType: "uint256",
                 name: "chainId",
-                type: "uint32",
+                type: "uint256",
             },
             {
                 internalType: "bytes32",

package/dist/src/typechain/factories/InteropXGateway__factory.js

@@ -46,15 +46,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",
@@ -83,15 +83,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,
@@ -148,9 +148,9 @@ const _abi = [
                 type: "uint256",
             },
             {
-                internalType: "uint32",
+                internalType: "uint256",
                 name: "chainId_",
-                type: "uint32",
+                type: "uint256",
             },
         ],
         name: "deposit",
@@ -176,9 +176,9 @@ const _abi = [
                 type: "uint256",
             },
             {
-                internalType: "uint32",
+                internalType: "uint256",
                 name: "chainId_",
-                type: "uint32",
+                type: "uint256",
             },
         ],
         name: "depositFor",
@@ -224,9 +224,9 @@ const _abi = [
                 type: "address",
             },
             {
-                internalType: "uint32",
+                internalType: "uint256",
                 name: "chainId_",
-                type: "uint32",
+                type: "uint256",
             },
             {
                 internalType: "bytes32",

package/dist/src/utils/index.js

@@ -22,7 +22,7 @@ function shortenHash(hash, length = 4) {
     if (hash.length < 12)
         return hash;
     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;
 }
 exports.shortenHash = shortenHash;
@@ -167,20 +167,20 @@ const buildWithdrawDataForTransaction = async (transaction, type) => {
     if (!transaction.submitEvent) {
         throw Error('Cannot build data for transaction without submitEvent');
     }
-    const { to, amount, sourceChainId, targetChainId, itoken: itokenAddress } = transaction.submitEvent;
-    const itoken = constants_1.itokens[sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
+    const { to, amount, chainId, itoken: itokenAddress } = transaction.submitEvent;
+    const itoken = constants_1.itokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
     if (!itoken) {
         throw Error('Cannot build data for transaction without itoken');
     }
-    const token = constants_1.tokens[targetChainId].find(t => t.symbol.toLowerCase() === itoken.symbol.toLowerCase());
+    const token = constants_1.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_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(targetChainId));
+    const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(transaction.targetChainId));
     const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
-    const gatewayAddress = constants_1.addresses[targetChainId].interopXGateway;
+    const gatewayAddress = constants_1.addresses[chainId].interopXGateway;
     const interopBridgeContract = getContract(gatewayAddress, abi_1.default.interopXGateway, targetWallet);
-    const { data } = await interopBridgeContract.populateTransaction.systemWithdraw(ethers_1.ethers.BigNumber.from(amount.toString()), to, token.address, ethers_1.ethers.BigNumber.from(sourceChainId.toString()), transaction.submitTransactionHash);
+    const { data } = await interopBridgeContract.populateTransaction.systemWithdraw(ethers_1.ethers.BigNumber.from(amount.toString()), to, token.address, ethers_1.ethers.BigNumber.from(transaction.sourceChainId.toString()), transaction.submitTransactionHash);
     transactions.push({
         to: gatewayAddress,
         data: data,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.2c0a756",
+  "version": "0.0.0-dev.30b0db0",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -28,6 +28,7 @@
     "await-spawn": "^4.0.2",
     "axios": "^0.27.1",
     "axios-retry": "^3.2.4",
+    "bignumber.js": "^9.0.2",
     "chalk": "4.1.2",
     "dotenv": "^16.0.0",
     "ethereumjs-util": "^7.1.4",
@@ -35,7 +36,6 @@
     "ethers-multisend": "^2.1.1",
     "expand-home-dir": "^0.0.3",
     "fastify": "^3.28.0",
-    "fs-extra": "^10.1.0",
     "libp2p": "^0.36.2",
     "libp2p-bootstrap": "^0.14.0",
     "libp2p-kad-dht": "^0.28.6",

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/api/index.ts

@@ -27,7 +27,7 @@ export const startApiServer = async () => {
 
         logger.log(`RPC Server listening at http://${HOST}:${PORT}`)
     } catch (err) {
-        logger.error(err.message)
+        logger.error(err)
         process.exit(1)
     }
 }

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/peer/index.ts

@@ -17,7 +17,6 @@ import KadDHT from "libp2p-kad-dht";
 import PubsubPeerDiscovery from "libp2p-pubsub-peer-discovery";
 import { protocol } from "@/net";
 import config from "@/config";
-import chalk from "chalk";
 
 const logger = new Logger("Peer");
 
@@ -81,7 +80,7 @@ export const startPeer = async ({ }: IPeerOptions) => {
     },
   });
 
-  logger.info("Peer ID:", chalk.bold(node.peerId.toB58String()));
+  logger.info("Peer ID:", node.peerId.toB58String());
 
   await node.start();
 

package/src/net/pool/index.ts

@@ -3,7 +3,6 @@ import config from "@/config";
 import Logger from "@/logger";
 import { getAddress } from "ethers/lib/utils";
 import { shortenHash } from "@/utils";
-import chalk from "chalk";
 
 
 const logger = new Logger('PeerPool')
@@ -89,7 +88,7 @@ export class PeerPool {
 
             if (newPeer) {
                 config.events.emit(Event.POOL_PEER_ADDED, peer)
-                logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} added to pool`)
+                logger.info(`Peer ${peer.id} with address ${shortenHash(peer.publicAddress)} added to pool`)
             }
         }
     }
@@ -104,7 +103,7 @@ export class PeerPool {
             if (this.pool.delete(peer.id)) {
                 peer.pooled = false
                 config.events.emit(Event.POOL_PEER_REMOVED, peer)
-                logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} removed from pool`)
+                logger.info(`Peer ${peer.id} with address ${shortenHash(peer.publicAddress)} removed from pool`)
             }
         }
     }

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) */
@@ -66,11 +66,11 @@ class Protocol extends EventEmitter {
                 Buffer.from(transaction.transactionHash),
 
                 Buffer.from(transaction.sourceStatus),
-                Buffer.from(transaction.sourceTransactionHash || ''),
+                Buffer.from(transaction.sourceTransactionHash),
                 transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
 
                 Buffer.from(transaction.targetStatus),
-                Buffer.from(transaction.targetTransactionHash || ''),
+                Buffer.from(transaction.targetTransactionHash),
                 transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
 
                 Buffer.from(transaction.status),
@@ -79,11 +79,11 @@ class Protocol extends EventEmitter {
                 transactionHash: transactionHash.toString(),
 
                 sourceStatus: sourceStatus.toString(),
-                sourceTransactionHash: sourceTransactionHash.toString() || null,
+                sourceTransactionHash: sourceTransactionHash.toString(),
                 sourceErrors: sourceErrors.map((e) => e.toString()),
 
                 targetStatus: targetStatus.toString(),
-                targetTransactionHash: targetTransactionHash.toString()|| null,
+                targetTransactionHash: targetTransactionHash.toString(),
                 targetErrors: targetErrors.map((e) => e.toString()),
 
                 status: status.toString(),

package/src/tasks/AutoUpdateTask.ts

@@ -1,16 +1,12 @@
 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({
@@ -22,28 +18,15 @@ class AutoUpdateTask extends BaseTask {
         return config.autoUpdate && !config.isLeadNode();
     }
 
-    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
-        }
+    getCurrentVersion() {
+        return require('../../package.json').version
     }
+    async pollHandler() {
 
-    async getLatestVersion() {
-        try {
-            const stdout = await spawnAsync('npm', ['view', `${packageJson.name}@${tag}`, 'version'])
-            return stdout.toString().trim()
-        } catch (error) {
-            this.logger.error(error)
-            return currentVersion
-        }
-    }
+        const { data } = await http.get('https://registry.npmjs.org/@instadapp/interop-x')
 
-    async pollHandler() {
-        const version = await this.getLatestVersion()
+        const version = data['dist-tags'].latest
+        const currentVersion = this.getCurrentVersion()
 
         if (version === currentVersion) {
             return;
@@ -51,13 +34,13 @@ 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)
 
-        if (version !== await this.getInstalledVersion()) {
+        if (currentVersion === this.getCurrentVersion()) {
             this.logger.warn(`failed to install ${version}, retrying in 5 minutes`)
             return;
         }
@@ -65,16 +48,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()
     }
 }