@instadapp/interop-x 0.0.0-dev.8a0297a → 0.0.0-dev.8a917f1

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.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}`);
     }
@@ -104,9 +114,20 @@ const generateInteropTransactionHash = (data) => {
 exports.generateInteropTransactionHash = generateInteropTransactionHash;
 const buildDataForTransaction = async (transaction, type) => {
     type = type || transaction.sourceStatus === 'pending' ? 'source' : 'target';
+    switch (transaction.action) {
+        case "deposit":
+            return await (0, exports.buildDepositDataForTransaction)(transaction, type);
+        case "withdraw":
+            return await (0, exports.buildWithdrawDataForTransaction)(transaction, type);
+        default:
+            throw new Error(`Unknown action: ${transaction.action}`);
+    }
+};
+exports.buildDataForTransaction = buildDataForTransaction;
+const buildDepositDataForTransaction = async (transaction, type) => {
     const transactions = [];
-    if (transaction.action != 'deposit') {
-        throw new Error('Invalid action');
+    if (transaction.action !== 'deposit') {
+        throw new Error(`Invalid action: ${transaction.action}`);
     }
     if (transaction.action === 'deposit' && transaction.sourceStatus === 'pending') {
         throw Error('Cannot build data for pending deposit transaction');
@@ -125,7 +146,7 @@ const buildDataForTransaction = async (transaction, type) => {
     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 interopBridgeContract = getContract(itoken.address, abi_1.default.interopBridgeToken, targetWallet);
-    const { data } = await interopBridgeContract.populateTransaction.mint(transaction.submitEvent.user, ethers_1.ethers.BigNumber.from(transaction.submitEvent.amount), transaction.sourceChainId, transaction.sourceTransactionHash);
+    const { data } = await interopBridgeContract.populateTransaction.mint(transaction.submitEvent.user, ethers_1.ethers.BigNumber.from(transaction.submitEvent.amount.toString()), ethers_1.ethers.BigNumber.from(transaction.submitEvent.sourceChainId.toString()), transaction.submitTransactionHash);
     transactions.push({
         to: itoken.address,
         data: data,
@@ -134,19 +155,58 @@ const buildDataForTransaction = async (transaction, type) => {
     });
     return (0, ethers_multisend_1.encodeMulti)(transactions).data;
 };
-exports.buildDataForTransaction = buildDataForTransaction;
+exports.buildDepositDataForTransaction = buildDepositDataForTransaction;
+const buildWithdrawDataForTransaction = async (transaction, type) => {
+    const transactions = [];
+    if (transaction.action !== 'withdraw') {
+        throw new Error(`Invalid action: ${transaction.action}`);
+    }
+    if (transaction.action === 'withdraw' && transaction.sourceStatus === 'pending') {
+        throw Error('Cannot build data for pending withdraw transaction');
+    }
+    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());
+    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());
+    if (!token) {
+        throw Error('Cannot build data for transaction without token');
+    }
+    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[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(sourceChainId.toString()), transaction.submitTransactionHash);
+    transactions.push({
+        to: gatewayAddress,
+        data: data,
+        value: '0',
+        operation: ethers_multisend_1.OperationType.Call,
+    });
+    return (0, ethers_multisend_1.encodeMulti)(transactions).data;
+};
+exports.buildWithdrawDataForTransaction = buildWithdrawDataForTransaction;
 function getContract(address, contractInterface, signerOrProvider) {
     if (!ethers_1.ethers.utils.getAddress(address) || address === ethers_1.ethers.constants.AddressZero) {
         throw Error(`Invalid 'address' parameter '${address}'.`);
     }
     const contract = new ethers_1.ethers.Contract(address, contractInterface, signerOrProvider);
+    // Make sure the contract properties is writable
+    const desc = Object.getOwnPropertyDescriptor(contract, 'functions');
+    if (!desc || desc.writable !== true) {
+        return contract;
+    }
     return new Proxy(contract, {
         get(target, prop, receiver) {
             const value = Reflect.get(target, prop, receiver);
-            if (typeof value === 'function' && contract.functions.hasOwnProperty(prop)) {
+            if (typeof value === 'function' && (contract.functions.hasOwnProperty(prop) || ['queryFilter'].includes(String(prop)))) {
                 return async (...args) => {
                     try {
-                        return await value(...args);
+                        return await value.bind(contract)(...args);
                     }
                     catch (error) {
                         throw new Error(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`);
@@ -161,7 +221,7 @@ function getContract(address, contractInterface, signerOrProvider) {
                         if (typeof value === 'function') {
                             return async (...args) => {
                                 try {
-                                    return await value(...args);
+                                    return await value.bind(contract)(...args);
                                 }
                                 catch (error) {
                                     throw new Error(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.8a0297a",
+  "version": "0.0.0-dev.8a917f1",
   "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",
@@ -46,7 +47,9 @@
     "libp2p-websockets": "^0.16.2",
     "luxon": "^2.3.2",
     "module-alias": "^2.2.2",
-    "sequelize": "^6.19.0",
+    "patch-package": "^6.4.7",
+    "postinstall-postinstall": "^2.1.0",
+    "sequelize": "6.18.0",
     "sqlite3": "^5.0.5",
     "waait": "^1.0.5"
   },
@@ -60,8 +63,6 @@
     "@types/fs-extra": "^9.0.13",
     "@types/node": "^17.0.17",
     "nodemon": "^2.0.15",
-    "patch-package": "^6.4.7",
-    "postinstall-postinstall": "^2.1.0",
     "replace-in-file": "^6.3.2",
     "rimraf": "^3.0.2",
     "ts-node": "^10.5.0",

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: '0x6c20F03598d5ABF729348E2868b0ff5e8A48aB1F',
+      address: '0x62C0045f3277E7067cAcad3c8038eEaBB1Bd92D1',
       symbol: 'USDC',
     }
   ],