@instadapp/interop-x 0.0.0-dev.b660e0a → 0.0.0-dev.b8c571d

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.b660e0a",
+    "version": "0.0.0-dev.b8c571d",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {
@@ -46,8 +46,6 @@
         "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"
@@ -62,6 +60,8 @@
         "@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,27 +19,20 @@ 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 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');
-const printUsage = () => {
+if (process.argv.at(-1) === 'help') {
     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);
 }
-if (!process.env.PRIVATE_KEY) {
-    console.error('Please provide a private key\n\n');
-    printUsage();
-    process.exit(1);
-}
+(0, assert_1.default)(process.env.PRIVATE_KEY, "PRIVATE_KEY is not defined");
 try {
     new ethers_1.ethers.Wallet(process.env.PRIVATE_KEY);
 }
@@ -47,33 +40,15 @@ catch (e) {
     logger.error('Invalid private key');
     process.exit(1);
 }
-logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.b660e0a)`);
+logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.b8c571d)`);
 const tasks_1 = require("@/tasks");
 const net_1 = require("@/net");
 const api_1 = require("@/api");
-const db_1 = require("./db");
 async function main() {
     (0, net_1.startPeer)({});
     const tasks = new tasks_1.Tasks();
     tasks.start();
     (0, api_1.startApiServer)();
-    net_1.protocol.on('TransactionStatus', async (payload) => {
-        if (!net_1.peerPool.isLeadNode(payload.peerId)) {
-            return;
-        }
-        const transaction = await db_1.Transaction.findOne({ where: { transactionHash: payload.data.transactionHash } });
-        if (!transaction) {
-            return;
-        }
-        transaction.sourceStatus = payload.data.sourceStatus;
-        transaction.sourceTransactionHash = payload.data.sourceTransactionHash;
-        transaction.sourceErrors = payload.data.sourceErrors;
-        transaction.targetStatus = payload.data.targetStatus;
-        transaction.targetTransactionHash = payload.data.targetTransactionHash;
-        transaction.targetErrors = payload.data.targetErrors;
-        transaction.status = payload.data.status;
-        await transaction.save();
-    });
 }
 main()
     .then(() => {

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

@@ -7,7 +7,6 @@ exports.peerPool = exports.PeerPool = void 0;
 const types_1 = require("@/types");
 const config_1 = __importDefault(require("@/config"));
 const logger_1 = __importDefault(require("@/logger"));
-const utils_1 = require("ethers/lib/utils");
 const logger = new logger_1.default('PeerPool');
 class PeerPool {
     constructor() {
@@ -101,13 +100,6 @@ class PeerPool {
     get activePeerIds() {
         return this.activePeers.map((p) => p.id);
     }
-    isLeadNode(id) {
-        const peer = this.pool.get(id);
-        if (!peer) {
-            return false;
-        }
-        return (0, utils_1.getAddress)(peer.publicAddress) === (0, utils_1.getAddress)(config_1.default.leadNodeAddress);
-    }
     cleanup() {
         // let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
         // this.peers.forEach((peerInfo) => {

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

@@ -16,7 +16,7 @@ class Protocol extends stream_1.EventEmitter {
         this.protocolMessages = [
             {
                 name: 'PeerInfo',
-                code: 0x01,
+                code: 0x09,
                 encode: (info) => [
                     Buffer.from(info.publicAddress),
                 ],
@@ -24,30 +24,6 @@ class Protocol extends stream_1.EventEmitter {
                     publicAddress: publicAddress.toString(),
                 }),
             },
-            {
-                name: 'TransactionStatus',
-                code: 0x02,
-                encode: (transaction) => [
-                    Buffer.from(transaction.transactionHash),
-                    Buffer.from(transaction.sourceStatus),
-                    Buffer.from(transaction.sourceTransactionHash),
-                    transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
-                    Buffer.from(transaction.targetStatus),
-                    Buffer.from(transaction.targetTransactionHash),
-                    transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
-                    Buffer.from(transaction.status),
-                ],
-                decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]) => ({
-                    transactionHash: transactionHash.toString(),
-                    sourceStatus: sourceStatus.toString(),
-                    sourceTransactionHash: sourceTransactionHash.toString(),
-                    sourceErrors: sourceErrors.map((e) => e.toString()),
-                    targetStatus: targetStatus.toString(),
-                    targetTransactionHash: targetTransactionHash.toString(),
-                    targetErrors: targetErrors.map((e) => e.toString()),
-                    status: status.toString(),
-                }),
-            },
         ];
     }
     start({ libp2p, topic = null, }) {
@@ -99,11 +75,6 @@ class Protocol extends stream_1.EventEmitter {
         const encoded = ethereumjs_util_1.rlp.encode([message.code, message.encode(data)]);
         this.libp2p.pubsub.publish(this.topic, encoded);
     }
-    sendTransaction(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);
-    }
     async requestSignatures(data, peerIds) {
         try {
             peerIds = peerIds || __1.peerPool.activePeerIds;

package/dist/src/tasks/InteropBridge/ProcessWithdrawEvents.js

@@ -126,14 +126,12 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
         if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
             console.log('ExecutionSuccess');
             transaction.targetStatus = 'success';
-            transaction.targetTransactionHash = txSent.hash;
             transaction.status = 'success';
             await transaction.save();
         }
         else {
             console.log('ExecutionFailure');
             transaction.targetStatus = 'failed';
-            transaction.targetTransactionHash = txSent.hash;
             transaction.status = 'failed';
             await transaction.save();
         }

package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js

@@ -126,18 +126,15 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
         if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
             console.log('ExecutionSuccess');
             transaction.targetStatus = 'success';
-            transaction.targetTransactionHash = txSent.hash;
             transaction.status = 'success';
             await transaction.save();
         }
         else {
             console.log('ExecutionFailure');
             transaction.targetStatus = 'failed';
-            transaction.targetTransactionHash = txSent.hash;
             transaction.status = 'failed';
             await transaction.save();
         }
-        net_1.protocol.sendTransaction(transaction);
     }
     async start() {
         this.logger.info(`Starting execution watcher on interop chain`);

package/dist/src/utils/index.js

@@ -170,7 +170,7 @@ const buildWithdrawDataForTransaction = async (transaction, type) => {
     const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
     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(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(transaction.submitEvent.sourceChainId.toString()), transaction.submitTransactionHash);
     transactions.push({
         to: gatewayAddress,
         data: data,
@@ -185,11 +185,6 @@ 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.b660e0a",
+  "version": "0.0.0-dev.b8c571d",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -46,8 +46,6 @@
     "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"
@@ -62,6 +60,8 @@
     "@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,6 +16,7 @@ moduleAlias.addAliases({
 })
 
 moduleAlias();
+import assert from "assert";
 import dotenv from "dotenv";
 import { ethers } from "ethers";
 import packageJson from '../package.json'
@@ -24,24 +25,16 @@ dotenv.config();
 import Logger from "@/logger";
 const logger = new Logger('Process')
 
-const printUsage = () => {
+
+if (process.argv.at(-1) === 'help') {
     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('Please provide a private key\n\n')
-    printUsage()
-    process.exit(1)
-}
 try {
     new ethers.Wallet(process.env.PRIVATE_KEY!)
 } catch (e) {
@@ -52,9 +45,8 @@ try {
 logger.debug(`Starting Interop X Node (v${packageJson.version} - rev.@GIT_SHORT_HASH@)`)
 
 import { Tasks } from "@/tasks";
-import { startPeer, protocol, peerPool } from "@/net";
+import { startPeer } from "@/net";
 import { startApiServer } from '@/api';
-import { Transaction } from './db';
 
 async function main() {
 
@@ -65,30 +57,6 @@ async function main() {
     tasks.start();
 
     startApiServer()
-
-    protocol.on('TransactionStatus', async (payload) => {
-        if (!peerPool.isLeadNode(payload.peerId)) {
-            return;
-        }
-
-        const transaction = await Transaction.findOne({ where: { transactionHash: payload.data.transactionHash } })
-
-        if (!transaction) {
-            return;
-        }
-
-        transaction.sourceStatus = payload.data.sourceStatus
-        transaction.sourceTransactionHash = payload.data.sourceTransactionHash
-        transaction.sourceErrors = payload.data.sourceErrors
-
-        transaction.targetStatus = payload.data.targetStatus
-        transaction.targetTransactionHash = payload.data.targetTransactionHash
-        transaction.targetErrors = payload.data.targetErrors
-
-        transaction.status = payload.data.status
-
-        await transaction.save()
-    })
 }
 
 main()

package/src/net/pool/index.ts

@@ -1,7 +1,6 @@
 import { Event } from "@/types";
 import config from "@/config";
 import Logger from "@/logger";
-import { getAddress } from "ethers/lib/utils";
 
 
 const logger = new Logger('PeerPool')
@@ -84,8 +83,8 @@ export class PeerPool {
             const newPeer = !this.pool.get(peer.id);
             this.pool.set(peer.id, peer)
             peer.pooled = true
-
-            if (newPeer) {
+           
+            if(newPeer) {
                 config.events.emit(Event.POOL_PEER_ADDED, peer)
                 logger.info(`Peer ${peer.id} with address ${peer.publicAddress} added to pool`)
             }
@@ -111,7 +110,7 @@ export class PeerPool {
         this.cleanup()
 
         return this.peers.filter((p) => {
-            if (!p.pooled) return false;
+            if(!p.pooled) return false;
 
             const now = new Date()
 
@@ -124,17 +123,6 @@ export class PeerPool {
     }
 
 
-    isLeadNode(id: string) {
-        const peer = this.pool.get(id);
-
-        if (!peer) {
-            return false;
-        }
-
-        return getAddress(peer.publicAddress) === getAddress(config.leadNodeAddress)
-    }
-
-
     cleanup() {
         // let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
 

package/src/net/protocol/index.ts

@@ -5,7 +5,6 @@ import { SignatureDialProtocol, ISignatureRequest, ISignatureResponse } from "./
 import { IPeerInfo, peerPool } from "..";
 import config from "@/config";
 import { Event } from "@/types";
-import { Transaction } from "@/db";
 
 export interface ProtocolOptions {
     /* Handshake timeout in ms (default: 8000) */
@@ -34,12 +33,7 @@ interface PeerInfoEvent extends BaseMessageEvent {
     data: Omit<IPeerInfo, 'id' | 'updated' | 'idle' | 'pooled'>
 }
 
-interface TransactionStatusEvent extends BaseMessageEvent {
-    data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'status'>
-}
-
 declare interface Protocol {
-    on(event: 'TransactionStatus', listener: (payload: TransactionStatusEvent) => void): this;
     on(event: 'PeerInfo', listener: (payload: PeerInfoEvent) => void): this;
     on(event: string, listener: (payload: BaseMessageEvent) => void): this;
 }
@@ -50,7 +44,7 @@ class Protocol extends EventEmitter {
     private protocolMessages: Message[] = [
         {
             name: 'PeerInfo',
-            code: 0x01,
+            code: 0x09,
             encode: (info: Pick<IPeerInfo, 'publicAddress'>) => [
                 Buffer.from(info.publicAddress),
             ],
@@ -58,36 +52,6 @@ class Protocol extends EventEmitter {
                 publicAddress: publicAddress.toString(),
             }),
         },
-        {
-            name: 'TransactionStatus',
-            code: 0x02,
-            encode: (transaction: Transaction) => [
-                Buffer.from(transaction.transactionHash),
-
-                Buffer.from(transaction.sourceStatus),
-                Buffer.from(transaction.sourceTransactionHash),
-                transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
-
-                Buffer.from(transaction.targetStatus),
-                Buffer.from(transaction.targetTransactionHash),
-                transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
-
-                Buffer.from(transaction.status),
-            ],
-            decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]: [Buffer, Buffer, Buffer, Buffer[], Buffer, Buffer, Buffer[], Buffer]) => ({
-                transactionHash: transactionHash.toString(),
-
-                sourceStatus: sourceStatus.toString(),
-                sourceTransactionHash: sourceTransactionHash.toString(),
-                sourceErrors: sourceErrors.map((e) => e.toString()),
-
-                targetStatus: targetStatus.toString(),
-                targetTransactionHash: targetTransactionHash.toString(),
-                targetErrors: targetErrors.map((e) => e.toString()),
-
-                status: status.toString(),
-            }),
-        },
     ];
     private signature: SignatureDialProtocol;
 
@@ -157,14 +121,6 @@ class Protocol extends EventEmitter {
         this.libp2p.pubsub.publish(this.topic, encoded)
     }
 
-    public sendTransaction(transaction: Transaction) {
-        const message = this.protocolMessages.find((m) => m.name === 'TransactionStatus')!
-
-        const encoded = rlp.encode([message.code, message.encode(transaction)]);
-
-        this.libp2p.pubsub.publish(this.topic, encoded)
-    }
-
     async requestSignatures(data: ISignatureRequest, peerIds?: string[]) {
         try {
             peerIds = peerIds || peerPool.activePeerIds;

package/src/tasks/InteropBridge/ProcessWithdrawEvents.ts

@@ -207,13 +207,11 @@ class ProcessWithdrawEvents extends BaseTask {
         if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
             console.log('ExecutionSuccess')
             transaction.targetStatus = 'success'
-            transaction.targetTransactionHash = txSent.hash
             transaction.status = 'success'
             await transaction.save();
         } else {
             console.log('ExecutionFailure')
             transaction.targetStatus = 'failed'
-            transaction.targetTransactionHash = txSent.hash
             transaction.status = 'failed'
             await transaction.save();
         }

package/src/tasks/InteropXGateway/ProcessDepositEvents.ts

@@ -209,18 +209,14 @@ class ProcessDepositEvents extends BaseTask {
         if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
             console.log('ExecutionSuccess')
             transaction.targetStatus = 'success'
-            transaction.targetTransactionHash = txSent.hash
             transaction.status = 'success'
             await transaction.save();
         } else {
             console.log('ExecutionFailure')
             transaction.targetStatus = 'failed'
-            transaction.targetTransactionHash = txSent.hash
             transaction.status = 'failed'
             await transaction.save();
         }
-
-        protocol.sendTransaction(transaction)
     }
 
     async start(): Promise<void> {

package/src/utils/index.ts

@@ -233,7 +233,7 @@ export const buildWithdrawDataForTransaction = async (transaction: Transaction,
     ethers.BigNumber.from(amount.toString()),
     to,
     token.address,
-    ethers.BigNumber.from(transaction.sourceChainId.toString()),
+    ethers.BigNumber.from(transaction.submitEvent.sourceChainId.toString()),
     transaction.submitTransactionHash,
   );
 
@@ -259,12 +259,6 @@ 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) {