Expose peer instance in server CLI and add nitro config options (#390)

* Expose peer instance in server CLI and add nitro config options * Update package versions --------- Co-authored-by: prathamesh0 <prathamesh.musale0@gmail.com>
cerc-io · Jul 13, 2023 · 11930c0 · 11930c0
1 parent c6e685f
commit 11930c0
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 33 deletions.
diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.2.45",
+  "version": "0.2.46",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {

diff --git a/packages/cache/package.json b/packages/cache/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/cache",
-  "version": "0.2.45",
+  "version": "0.2.46",
   "description": "Generic object cache",
   "main": "dist/index.js",
   "scripts": {

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/cli",
-  "version": "0.2.45",
+  "version": "0.2.46",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "scripts": {
@@ -11,8 +11,8 @@
     "chat": "DEBUG='vulcanize:*, laconic:*' node dist/chat.js"
   },
   "dependencies": {
-    "@cerc-io/peer": "^0.2.45",
-    "@cerc-io/util": "^0.2.45",
+    "@cerc-io/peer": "^0.2.46",
+    "@cerc-io/util": "^0.2.46",
     "@ethersproject/providers": "^5.4.4",
     "@graphql-tools/utils": "^9.1.1",
     "@ipld/dag-cbor": "^8.0.0",

diff --git a/packages/cli/src/server.ts b/packages/cli/src/server.ts
@@ -31,7 +31,8 @@ import { TypeSource } from '@graphql-tools/utils';
 import {
   RelayNodeInitConfig,
   PeerInitConfig,
-  PeerIdObj
+  PeerIdObj,
+  Peer
   // @ts-expect-error https://github.com/microsoft/TypeScript/issues/49721#issuecomment-1319854183
 } from '@cerc-io/peer';
 
@@ -47,6 +48,7 @@ interface Arguments {
 export class ServerCmd {
   _argv?: Arguments;
   _baseCmd: BaseCmd;
+  _peer?: Peer;
 
   constructor () {
     this._baseCmd = new BaseCmd();
@@ -68,6 +70,10 @@ export class ServerCmd {
     return this._baseCmd.database;
   }
 
+  get peer (): Peer | undefined {
+    return this._peer;
+  }
+
   async initConfig<ConfigType> (): Promise<ConfigType> {
     this._argv = this._getArgv();
     assert(this._argv);
@@ -194,7 +200,7 @@ export class ServerCmd {
         peerIdObj = readPeerId(peerConfig.peerIdFile);
       }
 
-      const peer = new Peer(peerConfig.relayMultiaddr, true);
+      this._peer = new Peer(peerConfig.relayMultiaddr, true);
 
       const peerNodeInit: PeerInitConfig = {
         pingInterval: peerConfig.pingInterval,
@@ -206,15 +212,15 @@ export class ServerCmd {
         dialTimeout: peerConfig.dialTimeout,
         enableDebugInfo: peerConfig.enableDebugInfo
       };
-      await peer.init(peerNodeInit, peerIdObj);
+      await this._peer.init(peerNodeInit, peerIdObj);
 
-      peer.subscribeTopic(peerConfig.pubSubTopic, (peerId, data) => {
+      this._peer.subscribeTopic(peerConfig.pubSubTopic, (peerId, data) => {
         if (parseLibp2pMessage) {
           parseLibp2pMessage(peerId.toString(), data);
         }
       });
 
-      log(`Peer ID: ${peer.peerId?.toString()}`);
+      log(`Peer ID: ${this._peer.peerId?.toString()}`);
     }
   }
 

diff --git a/packages/codegen/package.json b/packages/codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/codegen",
-  "version": "0.2.45",
+  "version": "0.2.46",
   "description": "Code generator",
   "private": true,
   "main": "index.js",
@@ -20,7 +20,7 @@
   },
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
-    "@cerc-io/util": "^0.2.45",
+    "@cerc-io/util": "^0.2.46",
     "@graphql-tools/load-files": "^6.5.2",
     "@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git",
     "@solidity-parser/parser": "^0.13.2",

diff --git a/packages/codegen/src/templates/package-template.handlebars b/packages/codegen/src/templates/package-template.handlebars
@@ -41,12 +41,12 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.45",
-    "@cerc-io/ipld-eth-client": "^0.2.45",
-    "@cerc-io/solidity-mapper": "^0.2.45",
-    "@cerc-io/util": "^0.2.45",
+    "@cerc-io/cli": "^0.2.46",
+    "@cerc-io/ipld-eth-client": "^0.2.46",
+    "@cerc-io/solidity-mapper": "^0.2.46",
+    "@cerc-io/util": "^0.2.46",
     {{#if (subgraphPath)}}
-    "@cerc-io/graph-node": "^0.2.45",
+    "@cerc-io/graph-node": "^0.2.46",
     {{/if}}
     "@ethersproject/providers": "^5.4.4",
     "apollo-type-bigint": "^0.1.3",

diff --git a/packages/graph-node/package.json b/packages/graph-node/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@cerc-io/graph-node",
-  "version": "0.2.45",
+  "version": "0.2.46",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
-    "@cerc-io/solidity-mapper": "^0.2.45",
+    "@cerc-io/solidity-mapper": "^0.2.46",
     "@ethersproject/providers": "^5.4.4",
     "@graphprotocol/graph-ts": "^0.22.0",
     "@nomiclabs/hardhat-ethers": "^2.0.2",
@@ -51,9 +51,9 @@
   "dependencies": {
     "@apollo/client": "^3.3.19",
     "@cerc-io/assemblyscript": "0.19.10-watcher-ts-0.1.2",
-    "@cerc-io/cache": "^0.2.45",
-    "@cerc-io/ipld-eth-client": "^0.2.45",
-    "@cerc-io/util": "^0.2.45",
+    "@cerc-io/cache": "^0.2.46",
+    "@cerc-io/ipld-eth-client": "^0.2.46",
+    "@cerc-io/util": "^0.2.46",
     "@types/json-diff": "^0.5.2",
     "@types/yargs": "^17.0.0",
     "bn.js": "^4.11.9",

diff --git a/packages/ipld-eth-client/package.json b/packages/ipld-eth-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/ipld-eth-client",
-  "version": "0.2.45",
+  "version": "0.2.46",
   "description": "IPLD ETH Client",
   "main": "dist/index.js",
   "scripts": {
@@ -20,7 +20,7 @@
   "homepage": "https://github.com/cerc-io/watcher-ts#readme",
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@cerc-io/cache": "^0.2.45",
+    "@cerc-io/cache": "^0.2.46",
     "cross-fetch": "^3.1.4",
     "debug": "^4.3.1",
     "ethers": "^5.4.4",

diff --git a/packages/peer/package.json b/packages/peer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/peer",
-  "version": "0.2.45",
+  "version": "0.2.46",
   "description": "libp2p module",
   "main": "dist/index.js",
   "exports": "./dist/index.js",

diff --git a/packages/solidity-mapper/package.json b/packages/solidity-mapper/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@cerc-io/solidity-mapper",
-  "version": "0.2.45",
+  "version": "0.2.46",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
-    "@cerc-io/ipld-eth-client": "^0.2.45",
+    "@cerc-io/ipld-eth-client": "^0.2.46",
     "@ethersproject/abi": "^5.3.0",
     "@nomiclabs/hardhat-ethers": "^2.0.2",
     "@nomiclabs/hardhat-waffle": "^2.0.1",

diff --git a/packages/test/package.json b/packages/test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/test",
-  "version": "0.2.45",
+  "version": "0.2.46",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "private": true,

diff --git a/packages/tracing-client/package.json b/packages/tracing-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/tracing-client",
-  "version": "0.2.45",
+  "version": "0.2.46",
   "description": "ETH VM tracing client",
   "main": "dist/index.js",
   "scripts": {

diff --git a/packages/util/package.json b/packages/util/package.json
@@ -1,11 +1,11 @@
 {
   "name": "@cerc-io/util",
-  "version": "0.2.45",
+  "version": "0.2.46",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "dependencies": {
     "@apollo/utils.keyvaluecache": "^1.0.1",
-    "@cerc-io/solidity-mapper": "^0.2.45",
+    "@cerc-io/solidity-mapper": "^0.2.46",
     "@ethersproject/providers": "^5.4.4",
     "@graphql-tools/schema": "^9.0.10",
     "@graphql-tools/utils": "^9.1.1",
@@ -37,8 +37,8 @@
     "yargs": "^17.0.1"
   },
   "devDependencies": {
-    "@cerc-io/cache": "^0.2.45",
-    "@cerc-io/ipld-eth-client": "^0.2.45",
+    "@cerc-io/cache": "^0.2.46",
+    "@cerc-io/ipld-eth-client": "^0.2.46",
     "@nomiclabs/hardhat-waffle": "^2.0.1",
     "@types/express": "^4.17.14",
     "@types/fs-extra": "^9.0.11",

diff --git a/packages/util/src/config.ts b/packages/util/src/config.ts
@@ -126,6 +126,13 @@ export interface PeerConfig {
   l2TxsConfig?: L2TxsConfig;
 }
 
+// ts-nitro config
+export interface NitroConfig {
+  store: string
+  privateKey: string
+  chainPrivateKey: string
+}
+
 // P2P config
 export interface P2PConfig {
   // Enable relay node
@@ -135,6 +142,8 @@ export interface P2PConfig {
   // Enable peer node
   enablePeer: boolean;
   peer: PeerConfig;
+
+  nitro: NitroConfig
 }
 
 export interface ServerConfig {