From 8c928516f8c8302696129aab59ff2d4c9a8b26a3 Mon Sep 17 00:00:00 2001 From: Nabarun Gogoi Date: Thu, 30 Mar 2023 12:57:23 +0530 Subject: [PATCH] Remove peer listener (#349) --- packages/mobymask-v2-watcher/package.json | 3 +- .../mobymask-v2-watcher/src/peer-listener.ts | 104 ------------------ 2 files changed, 1 insertion(+), 106 deletions(-) delete mode 100644 packages/mobymask-v2-watcher/src/peer-listener.ts diff --git a/packages/mobymask-v2-watcher/package.json b/packages/mobymask-v2-watcher/package.json index bab3b7e4..f432ecf3 100644 --- a/packages/mobymask-v2-watcher/package.json +++ b/packages/mobymask-v2-watcher/package.json @@ -24,8 +24,7 @@ "import-state:dev": "DEBUG=vulcanize:* ts-node src/cli/import-state.ts", "inspect-cid": "DEBUG=vulcanize:* ts-node src/cli/inspect-cid.ts", "index-block": "DEBUG=vulcanize:* ts-node src/cli/index-block.ts", - "peer": "DEBUG='vulcanize:*, laconic:*' node --enable-source-maps dist/cli/peer.js", - "peer-listener": "DEBUG='vulcanize:*, laconic:*' node --enable-source-maps dist/peer-listener.js" + "peer": "DEBUG='vulcanize:*, laconic:*' node --enable-source-maps dist/cli/peer.js" }, "repository": { "type": "git", diff --git a/packages/mobymask-v2-watcher/src/peer-listener.ts b/packages/mobymask-v2-watcher/src/peer-listener.ts deleted file mode 100644 index a8e265af..00000000 --- a/packages/mobymask-v2-watcher/src/peer-listener.ts +++ /dev/null @@ -1,104 +0,0 @@ -import debug from 'debug'; -import { hideBin } from 'yargs/helpers'; -import yargs from 'yargs'; -import assert from 'assert'; - -import { Config, DEFAULT_CONFIG_PATH, getConfig, initClients } from '@cerc-io/util'; -import { - PeerInitConfig, - PeerIdObj -} from '@cerc-io/peer'; - -import { getCurrentTime, sendMessageToL2 } from './libp2p-utils'; -import { readPeerId } from '@cerc-io/cli'; -import { ethers } from 'ethers'; - -const log = debug('vulcanize:peer-listener'); - -const DEFAULT_GAS_LIMIT = 500000; - -interface Arguments { - configFile: string; - privateKey: string; - contractAddress: string; - gasLimit: number; -} - -export const main = async (): Promise => { - const argv = _getArgv(); - const config: Config = await getConfig(argv.configFile); - const { ethProvider } = await initClients(config); - - const p2pConfig = config.server.p2p; - const peerConfig = p2pConfig.peer; - assert(peerConfig, 'Peer config not set'); - - const { Peer } = await import('@cerc-io/peer'); - - let peerIdObj: PeerIdObj | undefined; - if (peerConfig.peerIdFile) { - peerIdObj = readPeerId(peerConfig.peerIdFile); - } - - const peer = new Peer(peerConfig.relayMultiaddr, true); - - const peerNodeInit: PeerInitConfig = { - pingInterval: peerConfig.pingInterval, - pingTimeout: peerConfig.pingTimeout, - maxRelayConnections: peerConfig.maxRelayConnections, - relayRedialInterval: peerConfig.relayRedialInterval, - maxConnections: peerConfig.maxConnections, - dialTimeout: peerConfig.dialTimeout, - enableDebugInfo: peerConfig.enableDebugInfo - }; - - await peer.init(peerNodeInit, peerIdObj); - const wallet = new ethers.Wallet(argv.privateKey, ethProvider); - - peer.subscribeTopic(peerConfig.pubSubTopic, (peerId, data) => { - log(`[${getCurrentTime()}] Received a message on mobymask P2P network from peer:`, peerId); - - // TODO: throttle message handler - sendMessageToL2(wallet, argv, data); - }); - - log(`Peer ID: ${peer.peerId?.toString()}`); -}; - -const _getArgv = (): Arguments => { - return yargs(hideBin(process.argv)).parserConfiguration({ - 'parse-numbers': false - }).options({ - configFile: { - alias: 'config-file', - describe: 'configuration file path (toml)', - type: 'string', - default: DEFAULT_CONFIG_PATH - }, - privateKey: { - alias: 'private-key', - demandOption: true, - describe: 'Private key of the account to use for eth_call', - type: 'string' - }, - contractAddress: { - alias: 'contract', - demandOption: true, - describe: 'Address of MobyMask contract', - type: 'string' - }, - gasLimit: { - alias: 'gas-limit', - describe: 'Gas limit for eth txs', - type: 'number', - default: DEFAULT_GAS_LIMIT - } - // https://github.com/yargs/yargs/blob/main/docs/typescript.md?plain=1#L83 - }).parseSync(); -}; - -main().then(() => { - log('Starting peer...'); -}).catch(err => { - log(err); -});