cerc-io/watcher-ts
16
1
Fork 0
mirror of https://github.com/cerc-io/watcher-ts synced 2024-11-19 20:36:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Expose peer instance in server CLI and add nitro config options

* Update package versions

---------

Co-authored-by: prathamesh0 <prathamesh.musale0@gmail.com>
This commit is contained in:
Nabarun Gogoi 2023-07-13 15:30:31 +05:30 committed by GitHub
parent c6e685fc13
commit 11930c0107
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 48 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -2,7 +2,7 @@
"packages": [ "packages": [
"packages/*" "packages/*"
], ],
"version": "0.2.45", "version": "0.2.46",
"npmClient": "yarn", "npmClient": "yarn",
"useWorkspaces": true, "useWorkspaces": true,
"command": { "command": {

2
packages/cache/package.json vendored
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/cache", "name": "@cerc-io/cache",
"version": "0.2.45", "version": "0.2.46",
"description": "Generic object cache", "description": "Generic object cache",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {

6
packages/cli/package.json
View File

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

16
packages/cli/src/server.ts
View File

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

4
packages/codegen/package.json
View File

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

10
packages/codegen/src/templates/package-template.handlebars
View File

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

10
packages/graph-node/package.json
View File

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

4
packages/ipld-eth-client/package.json
View File

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

2
packages/peer/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/peer", "name": "@cerc-io/peer",
"version": "0.2.45", "version": "0.2.46",
"description": "libp2p module", "description": "libp2p module",
"main": "dist/index.js", "main": "dist/index.js",
"exports": "./dist/index.js", "exports": "./dist/index.js",

4
packages/solidity-mapper/package.json
View File

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

2
packages/test/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/test", "name": "@cerc-io/test",
"version": "0.2.45", "version": "0.2.46",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"private": true, "private": true,

2
packages/tracing-client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/tracing-client", "name": "@cerc-io/tracing-client",
"version": "0.2.45", "version": "0.2.46",
"description": "ETH VM tracing client", "description": "ETH VM tracing client",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {

8
packages/util/package.json
View File

@ -1,11 +1,11 @@
{ {
"name": "@cerc-io/util", "name": "@cerc-io/util",
"version": "0.2.45", "version": "0.2.46",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"dependencies": { "dependencies": {
"@apollo/utils.keyvaluecache": "^1.0.1", "@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", "@ethersproject/providers": "^5.4.4",
"@graphql-tools/schema": "^9.0.10", "@graphql-tools/schema": "^9.0.10",
"@graphql-tools/utils": "^9.1.1", "@graphql-tools/utils": "^9.1.1",
@ -37,8 +37,8 @@
"yargs": "^17.0.1" "yargs": "^17.0.1"
}, },
"devDependencies": { "devDependencies": {
"@cerc-io/cache": "^0.2.45", "@cerc-io/cache": "^0.2.46",
"@cerc-io/ipld-eth-client": "^0.2.45", "@cerc-io/ipld-eth-client": "^0.2.46",
"@nomiclabs/hardhat-waffle": "^2.0.1", "@nomiclabs/hardhat-waffle": "^2.0.1",
"@types/express": "^4.17.14", "@types/express": "^4.17.14",
"@types/fs-extra": "^9.0.11", "@types/fs-extra": "^9.0.11",

9
packages/util/src/config.ts
View File

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