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

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.c3250d9",
+    "version": "0.0.0-dev.eb2b141",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {
@@ -46,6 +46,8 @@
         "libp2p-websockets": "^0.16.2",
         "luxon": "^2.3.2",
         "module-alias": "^2.2.2",
+        "patch-package": "^6.4.7",
+        "postinstall-postinstall": "^2.1.0",
         "sequelize": "6.18.0",
         "sqlite3": "^5.0.5",
         "waait": "^1.0.5"
@@ -60,8 +62,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/dist/src/index.js

@@ -19,28 +19,37 @@ module_alias_1.default.addAliases({
     "@/typechain": __dirname + "/typechain"
 });
 (0, module_alias_1.default)();
-const assert_1 = __importDefault(require("assert"));
 const dotenv_1 = __importDefault(require("dotenv"));
+const chalk_1 = __importDefault(require("chalk"));
 const ethers_1 = require("ethers");
 const package_json_1 = __importDefault(require("../package.json"));
 dotenv_1.default.config();
 const logger_1 = __importDefault(require("@/logger"));
 const logger = new logger_1.default('Process');
-if (process.argv.at(-1) === 'help') {
+const printUsage = () => {
     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');
+};
+if (process.argv.at(-1) === 'help') {
+    printUsage();
     process.exit(0);
 }
-(0, assert_1.default)(process.env.PRIVATE_KEY, "PRIVATE_KEY is not defined");
+if (!process.env.PRIVATE_KEY) {
+    console.error(chalk_1.default.bgRed.white('Please provide a private key\n'));
+    printUsage();
+    process.exit(1);
+}
 try {
     new ethers_1.ethers.Wallet(process.env.PRIVATE_KEY);
 }
 catch (e) {
-    logger.error('Invalid private key');
+    console.error(chalk_1.default.bgRed.white('Invalid private key\n'));
+    printUsage();
     process.exit(1);
 }
-logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.c3250d9)`);
+logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.eb2b141)`);
 const tasks_1 = require("@/tasks");
 const net_1 = require("@/net");
 const api_1 = require("@/api");
@@ -50,8 +59,10 @@ async function main() {
     const tasks = new tasks_1.Tasks();
     tasks.start();
     (0, api_1.startApiServer)();
-    net_1.protocol.on('Transaction', async (payload) => {
+    net_1.protocol.on('TransactionStatus', async (payload) => {
         if (!net_1.peerPool.isLeadNode(payload.peerId)) {
+            const peer = net_1.peerPool.getPeer(payload.peerId);
+            logger.info(`ignored transaction status from ${payload.peerId} ${peer === null || peer === void 0 ? void 0 : peer.publicAddress} `);
             return;
         }
         const transaction = await db_1.Transaction.findOne({ where: { transactionHash: payload.data.transactionHash } });

package/dist/src/net/pool/index.js

@@ -101,6 +101,9 @@ class PeerPool {
     get activePeerIds() {
         return this.activePeers.map((p) => p.id);
     }
+    getPeer(id) {
+        return this.pool.get(id);
+    }
     isLeadNode(id) {
         const peer = this.pool.get(id);
         if (!peer) {

package/dist/src/net/protocol/index.js

@@ -25,7 +25,7 @@ class Protocol extends stream_1.EventEmitter {
                 }),
             },
             {
-                name: 'Transaction',
+                name: 'TransactionStatus',
                 code: 0x02,
                 encode: (transaction) => [
                     Buffer.from(transaction.transactionHash),
@@ -100,7 +100,7 @@ class Protocol extends stream_1.EventEmitter {
         this.libp2p.pubsub.publish(this.topic, encoded);
     }
     sendTransaction(transaction) {
-        const message = this.protocolMessages.find((m) => m.name === 'Transaction');
+        const message = this.protocolMessages.find((m) => m.name === 'TransactionStatus');
         const encoded = ethereumjs_util_1.rlp.encode([message.code, message.encode(transaction)]);
         this.libp2p.pubsub.publish(this.topic, encoded);
     }

package/dist/src/utils/index.js

@@ -185,6 +185,11 @@ function getContract(address, contractInterface, signerOrProvider) {
         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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.c3250d9",
+  "version": "0.0.0-dev.eb2b141",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -46,6 +46,8 @@
     "libp2p-websockets": "^0.16.2",
     "luxon": "^2.3.2",
     "module-alias": "^2.2.2",
+    "patch-package": "^6.4.7",
+    "postinstall-postinstall": "^2.1.0",
     "sequelize": "6.18.0",
     "sqlite3": "^5.0.5",
     "waait": "^1.0.5"
@@ -60,8 +62,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/index.ts

@@ -16,8 +16,8 @@ moduleAlias.addAliases({
 })
 
 moduleAlias();
-import assert from "assert";
 import dotenv from "dotenv";
+import chalk from 'chalk';
 import { ethers } from "ethers";
 import packageJson from '../package.json'
 dotenv.config();
@@ -25,20 +25,29 @@ dotenv.config();
 import Logger from "@/logger";
 const logger = new Logger('Process')
 
-
-if (process.argv.at(-1) === 'help') {
+const printUsage = () => {
     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')
+}
+
+if (process.argv.at(-1) === 'help') {
+    printUsage()
     process.exit(0)
 }
 
-assert(process.env.PRIVATE_KEY, "PRIVATE_KEY is not defined");
 
+if(! process.env.PRIVATE_KEY) {
+    console.error(chalk.bgRed.white('Please provide a private key\n'))
+    printUsage()
+    process.exit(1)
+}
 try {
     new ethers.Wallet(process.env.PRIVATE_KEY!)
 } catch (e) {
-    logger.error('Invalid private key')
+    console.error(chalk.bgRed.white('Invalid private key\n'))
+    printUsage()
     process.exit(1)
 }
 
@@ -59,8 +68,10 @@ async function main() {
 
     startApiServer()
 
-    protocol.on('Transaction', async (payload) => {
+    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} `)
             return;
         }
 

package/src/net/pool/index.ts

@@ -124,6 +124,10 @@ export class PeerPool {
     }
 
 
+    getPeer(id: string){
+     return this.pool.get(id);   
+    }
+
     isLeadNode(id: string) {
         const peer = this.pool.get(id);
 

package/src/net/protocol/index.ts

@@ -34,12 +34,12 @@ interface PeerInfoEvent extends BaseMessageEvent {
     data: Omit<IPeerInfo, 'id' | 'updated' | 'idle' | 'pooled'>
 }
 
-interface TransactionEvent extends BaseMessageEvent {
+interface TransactionStatusEvent extends BaseMessageEvent {
     data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'status'>
 }
 
 declare interface Protocol {
-    on(event: 'Transaction', listener: (payload: TransactionEvent) => void): this;
+    on(event: 'TransactionStatus', listener: (payload: TransactionStatusEvent) => void): this;
     on(event: 'PeerInfo', listener: (payload: PeerInfoEvent) => void): this;
     on(event: string, listener: (payload: BaseMessageEvent) => void): this;
 }
@@ -59,7 +59,7 @@ class Protocol extends EventEmitter {
             }),
         },
         {
-            name: 'Transaction',
+            name: 'TransactionStatus',
             code: 0x02,
             encode: (transaction: Transaction) => [
                 Buffer.from(transaction.transactionHash),
@@ -158,7 +158,7 @@ class Protocol extends EventEmitter {
     }
 
     public sendTransaction(transaction: Transaction) {
-        const message = this.protocolMessages.find((m) => m.name === 'Transaction')!
+        const message = this.protocolMessages.find((m) => m.name === 'TransactionStatus')!
 
         const encoded = rlp.encode([message.code, message.encode(transaction)]);
 

package/src/utils/index.ts

@@ -259,6 +259,12 @@ export function getContract<TContract extends ethers.Contract>(address: string,
     signerOrProvider
   ) as TContract
 
+  // 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) {