@instadapp/interop-x 0.0.0-dev.eb2b141 → 0.0.0-dev.edef11e

package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js

@@ -0,0 +1,53 @@
+"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 net_1 = require("@/net");
+const db_1 = require("@/db");
+const sequelize_1 = require("sequelize");
+class SyncTransactionStatusTask extends BaseTask_1.BaseTask {
+    constructor() {
+        super({
+            logger: new logger_1.default("SyncTransactionStatusTask"),
+        });
+        this.pollIntervalMs = 60 * 1000;
+        this.exceptLeadNode = true;
+    }
+    async pollHandler() {
+        // if transaction is pending for more than 1 hour, check lead node for status
+        const leadNode = net_1.peerPool.getLeadPeer();
+        if (!leadNode) {
+            return;
+        }
+        const transaction = await db_1.Transaction.findOne({
+            where: {
+                status: 'pending',
+                sourceCreatedAt: {
+                    [sequelize_1.Op.gte]: new Date(Date.now() - 60 * 60 * 1000),
+                },
+            }
+        });
+        if (!transaction) {
+            return;
+        }
+        this.logger.info(`Requesting transaction status for ${transaction.transactionHash}`);
+        const transactionStatus = await net_1.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.targetStatus = transactionStatus.targetStatus;
+        transaction.targetTransactionHash = transactionStatus.targetTransactionHash;
+        transaction.targetErrors = transactionStatus.targetErrors;
+        transaction.status = transactionStatus.status;
+        await transaction.save();
+        this.logger.info(`Updated transaction status for ${transaction.transactionHash}`);
+    }
+}
+exports.default = SyncTransactionStatusTask;

package/dist/src/tasks/index.js

@@ -8,9 +8,13 @@ const ProcessDepositEvents_1 = __importDefault(require("./InteropXGateway/Proces
 const SyncDepositEvents_1 = __importDefault(require("./InteropXGateway/SyncDepositEvents"));
 const SyncWithdrawEvents_1 = __importDefault(require("./InteropBridge/SyncWithdrawEvents"));
 const ProcessWithdrawEvents_1 = __importDefault(require("./InteropBridge/ProcessWithdrawEvents"));
+const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
+const SyncTransactionStatusTask_1 = __importDefault(require("./Transactions/SyncTransactionStatusTask"));
 class Tasks {
     constructor() {
         this.tasks = [
+            new SyncTransactionStatusTask_1.default(),
+            new AutoUpdateTask_1.default(),
             new SyncDepositEvents_1.default({
                 chainId: 43114
             }),

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

@@ -57,11 +57,17 @@ const _abi = [
                 name: "amount",
                 type: "uint256",
             },
+            {
+                indexed: false,
+                internalType: "uint32",
+                name: "sourceChainId",
+                type: "uint32",
+            },
             {
                 indexed: true,
-                internalType: "uint256",
-                name: "chainId",
-                type: "uint256",
+                internalType: "uint32",
+                name: "targetChainId",
+                type: "uint32",
             },
         ],
         name: "Burn",
@@ -84,14 +90,20 @@ const _abi = [
             },
             {
                 indexed: true,
-                internalType: "uint256",
-                name: "chainId",
-                type: "uint256",
+                internalType: "uint32",
+                name: "sourceChainId",
+                type: "uint32",
+            },
+            {
+                indexed: false,
+                internalType: "uint32",
+                name: "targetChainId",
+                type: "uint32",
             },
             {
                 indexed: true,
                 internalType: "bytes32",
-                name: "transactionHash",
+                name: "submitTransactionHash",
                 type: "bytes32",
             },
         ],
@@ -222,9 +234,9 @@ const _abi = [
                 type: "uint256",
             },
             {
-                internalType: "uint256",
+                internalType: "uint32",
                 name: "chainId",
-                type: "uint256",
+                type: "uint32",
             },
         ],
         name: "burn",
@@ -306,9 +318,9 @@ const _abi = [
                 type: "uint256",
             },
             {
-                internalType: "uint256",
+                internalType: "uint32",
                 name: "chainId",
-                type: "uint256",
+                type: "uint32",
             },
             {
                 internalType: "bytes32",

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

@@ -46,15 +46,15 @@ const _abi = [
             },
             {
                 indexed: false,
-                internalType: "uint256",
+                internalType: "uint32",
                 name: "sourceChainId",
-                type: "uint256",
+                type: "uint32",
             },
             {
                 indexed: true,
-                internalType: "uint256",
+                internalType: "uint32",
                 name: "targetChainId",
-                type: "uint256",
+                type: "uint32",
             },
         ],
         name: "LogGatewayDeposit",
@@ -83,15 +83,15 @@ const _abi = [
             },
             {
                 indexed: true,
-                internalType: "uint256",
+                internalType: "uint32",
                 name: "sourceChainId",
-                type: "uint256",
+                type: "uint32",
             },
             {
                 indexed: false,
-                internalType: "uint256",
+                internalType: "uint32",
                 name: "targetChainId",
-                type: "uint256",
+                type: "uint32",
             },
             {
                 indexed: true,
@@ -148,9 +148,9 @@ const _abi = [
                 type: "uint256",
             },
             {
-                internalType: "uint256",
+                internalType: "uint32",
                 name: "chainId_",
-                type: "uint256",
+                type: "uint32",
             },
         ],
         name: "deposit",
@@ -176,9 +176,9 @@ const _abi = [
                 type: "uint256",
             },
             {
-                internalType: "uint256",
+                internalType: "uint32",
                 name: "chainId_",
-                type: "uint256",
+                type: "uint32",
             },
         ],
         name: "depositFor",
@@ -224,9 +224,9 @@ const _abi = [
                 type: "address",
             },
             {
-                internalType: "uint256",
+                internalType: "uint32",
                 name: "chainId_",
-                type: "uint256",
+                type: "uint32",
             },
             {
                 internalType: "bytes32",

package/dist/src/utils/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getContract = exports.buildWithdrawDataForTransaction = exports.buildDepositDataForTransaction = exports.buildDataForTransaction = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.http = void 0;
+exports.getContract = exports.buildWithdrawDataForTransaction = exports.buildDepositDataForTransaction = exports.buildDataForTransaction = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.shortenHash = exports.http = void 0;
 /**
  * @module util
  */
@@ -16,6 +16,16 @@ const config_1 = __importDefault(require("@/config"));
 const abi_1 = __importDefault(require("@/abi"));
 exports.http = axios_1.default.create();
 (0, axios_retry_1.default)(exports.http, { retries: 3, retryDelay: axios_retry_1.default.exponentialDelay });
+function shortenHash(hash, length = 4) {
+    if (!hash)
+        return;
+    if (hash.length < 12)
+        return hash;
+    const beginningChars = hash.startsWith("0x") ? length + 2 : length;
+    const shortened = hash.substr(0, beginningChars) + "…" + hash.substr(-length);
+    return shortened;
+}
+exports.shortenHash = shortenHash;
 function short(buffer) {
     return buffer.toString('hex').slice(0, 8) + '...';
 }
@@ -59,11 +69,11 @@ exports.signGnosisSafeTx = signGnosisSafeTx;
 const getRpcProviderUrl = (chainId) => {
     switch (chainId) {
         case 1:
-            return 'https://rpc.instadapp.io/mainnet';
+            return 'https://rpc.ankr.com/eth';
         case 137:
-            return 'https://rpc.instadapp.io/polygon';
+            return 'https://rpc.ankr.com/polygon';
         case 43114:
-            return 'https://rpc.instadapp.io/avalanche';
+            return 'https://rpc.ankr.com/avalanche';
         default:
             throw new Error(`Unknown chainId: ${chainId}`);
     }
@@ -157,20 +167,20 @@ const buildWithdrawDataForTransaction = async (transaction, type) => {
     if (!transaction.submitEvent) {
         throw Error('Cannot build data for transaction without submitEvent');
     }
-    const { to, amount, chainId, itoken: itokenAddress } = transaction.submitEvent;
-    const itoken = constants_1.itokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
+    const { to, amount, sourceChainId, targetChainId, itoken: itokenAddress } = transaction.submitEvent;
+    const itoken = constants_1.itokens[sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
     if (!itoken) {
         throw Error('Cannot build data for transaction without itoken');
     }
-    const token = constants_1.tokens[chainId].find(t => t.symbol.toLowerCase() === itoken.symbol.toLowerCase());
+    const token = constants_1.tokens[targetChainId].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)(transaction.targetChainId));
+    const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(targetChainId));
     const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
-    const gatewayAddress = constants_1.addresses[chainId].interopXGateway;
+    const gatewayAddress = constants_1.addresses[targetChainId].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(transaction.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(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.eb2b141",
+  "version": "0.0.0-dev.edef11e",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -24,9 +24,10 @@
   },
   "dependencies": {
     "@achingbrain/libp2p-gossipsub": "^0.12.2",
+    "@fastify/cors": "^7.0.0",
+    "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",
@@ -34,7 +35,7 @@
     "ethers-multisend": "^2.1.1",
     "expand-home-dir": "^0.0.3",
     "fastify": "^3.28.0",
-    "fastify-cors": "^6.0.3",
+    "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,11 +46,17 @@
         "name": "amount",
         "type": "uint256"
       },
+      {
+        "indexed": false,
+        "internalType": "uint32",
+        "name": "sourceChainId",
+        "type": "uint32"
+      },
       {
         "indexed": true,
-        "internalType": "uint256",
-        "name": "chainId",
-        "type": "uint256"
+        "internalType": "uint32",
+        "name": "targetChainId",
+        "type": "uint32"
       }
     ],
     "name": "Burn",
@@ -73,14 +79,20 @@
       },
       {
         "indexed": true,
-        "internalType": "uint256",
-        "name": "chainId",
-        "type": "uint256"
+        "internalType": "uint32",
+        "name": "sourceChainId",
+        "type": "uint32"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint32",
+        "name": "targetChainId",
+        "type": "uint32"
       },
       {
         "indexed": true,
         "internalType": "bytes32",
-        "name": "transactionHash",
+        "name": "submitTransactionHash",
         "type": "bytes32"
       }
     ],
@@ -164,7 +176,7 @@
     "inputs": [
       { "internalType": "address", "name": "to", "type": "address" },
       { "internalType": "uint256", "name": "amount", "type": "uint256" },
-      { "internalType": "uint256", "name": "chainId", "type": "uint256" }
+      { "internalType": "uint32", "name": "chainId", "type": "uint32" }
     ],
     "name": "burn",
     "outputs": [],
@@ -206,7 +218,7 @@
     "inputs": [
       { "internalType": "address", "name": "to", "type": "address" },
       { "internalType": "uint256", "name": "amount", "type": "uint256" },
-      { "internalType": "uint256", "name": "chainId", "type": "uint256" },
+      { "internalType": "uint32", "name": "chainId", "type": "uint32" },
       {
         "internalType": "bytes32",
         "name": "transactionHash",

package/src/abi/interopXGateway.json

@@ -35,15 +35,15 @@
       },
       {
         "indexed": false,
-        "internalType": "uint256",
+        "internalType": "uint32",
         "name": "sourceChainId",
-        "type": "uint256"
+        "type": "uint32"
       },
       {
         "indexed": true,
-        "internalType": "uint256",
+        "internalType": "uint32",
         "name": "targetChainId",
-        "type": "uint256"
+        "type": "uint32"
       }
     ],
     "name": "LogGatewayDeposit",
@@ -72,15 +72,15 @@
       },
       {
         "indexed": true,
-        "internalType": "uint256",
+        "internalType": "uint32",
         "name": "sourceChainId",
-        "type": "uint256"
+        "type": "uint32"
       },
       {
         "indexed": false,
-        "internalType": "uint256",
+        "internalType": "uint32",
         "name": "targetChainId",
-        "type": "uint256"
+        "type": "uint32"
       },
       {
         "indexed": true,
@@ -122,7 +122,7 @@
     "inputs": [
       { "internalType": "address", "name": "token_", "type": "address" },
       { "internalType": "uint256", "name": "amount_", "type": "uint256" },
-      { "internalType": "uint256", "name": "chainId_", "type": "uint256" }
+      { "internalType": "uint32", "name": "chainId_", "type": "uint32" }
     ],
     "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": "uint256", "name": "chainId_", "type": "uint256" }
+      { "internalType": "uint32", "name": "chainId_", "type": "uint32" }
     ],
     "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": "uint256", "name": "chainId_", "type": "uint256" },
+      { "internalType": "uint32", "name": "chainId_", "type": "uint32" },
       {
         "internalType": "bytes32",
         "name": "transactionHash_",

package/src/api/index.ts

@@ -1,5 +1,5 @@
 import fastify from "fastify"
-import cors from 'fastify-cors'
+import cors from '@fastify/cors'
 import Logger from "@/logger"
 import { Transaction } from "@/db";
 
@@ -27,7 +27,7 @@ export const startApiServer = async () => {
 
         logger.log(`RPC Server listening at http://${HOST}:${PORT}`)
     } catch (err) {
-        logger.error(err)
+        logger.error(err.message)
         process.exit(1)
     }
 }

package/src/config/index.ts

@@ -1,5 +1,7 @@
 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
@@ -8,14 +10,18 @@ class Config {
     public readonly privateKey: string
     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 = 10
+        this.maxPeers = 20
         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(){
@@ -25,6 +31,10 @@ 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: '0x8D27758751BA488690974B6Ccfcda771D462945f',
+    interopXGateway: '0xF0317C5Bc206F2291dd2f3eE9C4cDB5Bbb25418d',
   }
 }

package/src/constants/itokens.ts

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

package/src/index.ts

@@ -1,5 +1,6 @@
 import moduleAlias from 'module-alias';
-
+import expandHomeDir from "expand-home-dir";
+import fs from 'fs-extra'
 moduleAlias.addAliases({
     "@/": __dirname + "/",
     "@/logger": __dirname + "/logger",
@@ -25,11 +26,30 @@ 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('   PRIVATE_KEY=abcd1234 interop-x')
-    console.log('   PRIVATE_KEY=abcd1234 STAGING=true interop-x')
-    console.log('   PRIVATE_KEY=abcd1234 API_HOST=0.0.0.0 API_PORT=8080 interop-x')
+    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()
+
 }
 
 if (process.argv.at(-1) === 'help') {
@@ -37,9 +57,28 @@ 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)
+}
+
 
-if(! process.env.PRIVATE_KEY) {
-    console.error(chalk.bgRed.white('Please provide a private key\n'))
+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) {
+    console.error(chalk.bgRed.white.bold('Please provide a private key\n'))
     printUsage()
     process.exit(1)
 }
@@ -51,12 +90,13 @@ try {
     process.exit(1)
 }
 
-logger.debug(`Starting Interop X Node (v${packageJson.version} - rev.@GIT_SHORT_HASH@)`)
+logger.debug(`Starting Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
 
 import { Tasks } from "@/tasks";
 import { startPeer, protocol, peerPool } from "@/net";
 import { startApiServer } from '@/api';
 import { Transaction } from './db';
+import { shortenHash } from './utils';
 
 async function main() {
 
@@ -71,7 +111,12 @@ async function main() {
     protocol.on('TransactionStatus', async (payload) => {
         if (!peerPool.isLeadNode(payload.peerId)) {
             const peer = peerPool.getPeer(payload.peerId)
-            logger.info(`ignored transaction status from ${payload.peerId} ${peer?.publicAddress} `)
+
+            if (!peer) {
+                return;
+            }
+
+            logger.info(`ignored transaction status from ${payload.peerId} ${shortenHash(peer.publicAddress)} `)
             return;
         }
 

package/src/net/peer/index.ts

@@ -17,6 +17,7 @@ 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");
 
@@ -80,7 +81,7 @@ export const startPeer = async ({ }: IPeerOptions) => {
     },
   });
 
-  logger.info("Peer ID:", node.peerId.toB58String());
+  logger.info("Peer ID:", chalk.bold(node.peerId.toB58String()));
 
   await node.start();