Handle unknown metrics in gossipsub onScrapeMetrics (#3889)

* Handle unknown metrics in gossipsub onScrapeMetrics * Change version to 0.34.4 Co-authored-by: Lion - dapplion <[email protected]>
ChainSafe · Apr 6, 2022 · 4d766d1 · 4d766d1
1 parent e15c549
commit 4d766d1
Show file tree

Hide file tree

Showing 16 changed files with 81 additions and 71 deletions.
diff --git a/lerna.json b/lerna.json
@@ -4,7 +4,7 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.34.2",
+  "version": "0.34.4",
   "stream": "true",
   "command": {
     "version": {

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "0.34.2",
+  "version": "0.34.4",
   "main": "lib/index.js",
   "files": [
     "lib/**/*.d.ts",
@@ -36,10 +36,10 @@
   },
   "dependencies": {
     "@chainsafe/abort-controller": "^3.0.1",
-    "@chainsafe/lodestar-config": "^0.34.2",
-    "@chainsafe/lodestar-params": "^0.34.2",
-    "@chainsafe/lodestar-types": "^0.34.2",
-    "@chainsafe/lodestar-utils": "^0.34.2",
+    "@chainsafe/lodestar-config": "^0.34.4",
+    "@chainsafe/lodestar-params": "^0.34.4",
+    "@chainsafe/lodestar-types": "^0.34.4",
+    "@chainsafe/lodestar-utils": "^0.34.4",
     "@chainsafe/persistent-merkle-tree": "^0.3.7",
     "@chainsafe/ssz": "^0.8.20",
     "cross-fetch": "^3.1.4",

diff --git a/packages/beacon-state-transition/package.json b/packages/beacon-state-transition/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "0.34.2",
+  "version": "0.34.4",
   "main": "lib/index.js",
   "files": [
     "lib/**/*.d.ts",
@@ -36,10 +36,10 @@
   "types": "lib/index.d.ts",
   "dependencies": {
     "@chainsafe/bls": "6.0.3",
-    "@chainsafe/lodestar-config": "^0.34.2",
-    "@chainsafe/lodestar-params": "^0.34.2",
-    "@chainsafe/lodestar-types": "^0.34.2",
-    "@chainsafe/lodestar-utils": "^0.34.2",
+    "@chainsafe/lodestar-config": "^0.34.4",
+    "@chainsafe/lodestar-params": "^0.34.4",
+    "@chainsafe/lodestar-types": "^0.34.4",
+    "@chainsafe/lodestar-utils": "^0.34.4",
     "@chainsafe/persistent-merkle-tree": "^0.3.7",
     "@chainsafe/persistent-ts": "^0.19.1",
     "@chainsafe/ssz": "^0.8.20",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chainsafe/lodestar-cli",
-  "version": "0.34.2",
+  "version": "0.34.4",
   "description": "Command line interface for other packages",
   "author": "ChainSafe Systems",
   "license": "LGPL-3.0",
@@ -54,15 +54,15 @@
     "@chainsafe/bls-keystore": "2.0.0",
     "@chainsafe/blst": "^0.2.2",
     "@chainsafe/discv5": "^0.6.7",
-    "@chainsafe/lodestar": "^0.34.2",
-    "@chainsafe/lodestar-api": "^0.34.2",
-    "@chainsafe/lodestar-beacon-state-transition": "^0.34.2",
-    "@chainsafe/lodestar-config": "^0.34.2",
-    "@chainsafe/lodestar-db": "^0.34.2",
-    "@chainsafe/lodestar-params": "^0.34.2",
-    "@chainsafe/lodestar-types": "^0.34.2",
-    "@chainsafe/lodestar-utils": "^0.34.2",
-    "@chainsafe/lodestar-validator": "^0.34.2",
+    "@chainsafe/lodestar": "^0.34.4",
+    "@chainsafe/lodestar-api": "^0.34.4",
+    "@chainsafe/lodestar-beacon-state-transition": "^0.34.4",
+    "@chainsafe/lodestar-config": "^0.34.4",
+    "@chainsafe/lodestar-db": "^0.34.4",
+    "@chainsafe/lodestar-params": "^0.34.4",
+    "@chainsafe/lodestar-types": "^0.34.4",
+    "@chainsafe/lodestar-utils": "^0.34.4",
+    "@chainsafe/lodestar-validator": "^0.34.4",
     "@chainsafe/ssz": "^0.8.20",
     "@types/lockfile": "^1.0.1",
     "bip39": "^3.0.2",

diff --git a/packages/config/package.json b/packages/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chainsafe/lodestar-config",
-  "version": "0.34.2",
+  "version": "0.34.4",
   "description": "Chain configuration required for lodestar",
   "author": "ChainSafe Systems",
   "license": "Apache-2.0",
@@ -42,8 +42,8 @@
     "blockchain"
   ],
   "dependencies": {
-    "@chainsafe/lodestar-params": "^0.34.2",
-    "@chainsafe/lodestar-types": "^0.34.2",
+    "@chainsafe/lodestar-params": "^0.34.4",
+    "@chainsafe/lodestar-types": "^0.34.4",
     "@chainsafe/ssz": "^0.8.20"
   }
 }
diff --git a/packages/db/package.json b/packages/db/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chainsafe/lodestar-db",
-  "version": "0.34.2",
+  "version": "0.34.4",
   "description": "DB modules of Lodestar",
   "author": "ChainSafe Systems",
   "homepage": "https://github.com/ChainSafe/lodestar#readme",
@@ -36,8 +36,8 @@
     "check-readme": "typescript-docs-verifier"
   },
   "dependencies": {
-    "@chainsafe/lodestar-config": "^0.34.2",
-    "@chainsafe/lodestar-utils": "^0.34.2",
+    "@chainsafe/lodestar-config": "^0.34.4",
+    "@chainsafe/lodestar-utils": "^0.34.4",
     "@chainsafe/ssz": "^0.8.20",
     "@types/levelup": "^4.3.3",
     "it-all": "^1.0.2",

diff --git a/packages/fork-choice/package.json b/packages/fork-choice/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "0.34.2",
+  "version": "0.34.4",
   "main": "lib/index.js",
   "files": [
     "lib/**/*.d.ts",
@@ -37,11 +37,11 @@
     "check-readme": "typescript-docs-verifier"
   },
   "dependencies": {
-    "@chainsafe/lodestar-beacon-state-transition": "^0.34.2",
-    "@chainsafe/lodestar-config": "^0.34.2",
-    "@chainsafe/lodestar-params": "^0.34.2",
-    "@chainsafe/lodestar-types": "^0.34.2",
-    "@chainsafe/lodestar-utils": "^0.34.2",
+    "@chainsafe/lodestar-beacon-state-transition": "^0.34.4",
+    "@chainsafe/lodestar-config": "^0.34.4",
+    "@chainsafe/lodestar-params": "^0.34.4",
+    "@chainsafe/lodestar-types": "^0.34.4",
+    "@chainsafe/lodestar-utils": "^0.34.4",
     "@chainsafe/ssz": "^0.8.20"
   },
   "keywords": [

diff --git a/packages/light-client/package.json b/packages/light-client/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "0.34.2",
+  "version": "0.34.4",
   "main": "lib/index.js",
   "files": [
     "lib/**/*.d.ts",
@@ -37,11 +37,11 @@
   "dependencies": {
     "@chainsafe/abort-controller": "^3.0.1",
     "@chainsafe/bls": "6.0.3",
-    "@chainsafe/lodestar-api": "^0.34.2",
-    "@chainsafe/lodestar-config": "^0.34.2",
-    "@chainsafe/lodestar-params": "^0.34.2",
-    "@chainsafe/lodestar-types": "^0.34.2",
-    "@chainsafe/lodestar-utils": "^0.34.2",
+    "@chainsafe/lodestar-api": "^0.34.4",
+    "@chainsafe/lodestar-config": "^0.34.4",
+    "@chainsafe/lodestar-params": "^0.34.4",
+    "@chainsafe/lodestar-types": "^0.34.4",
+    "@chainsafe/lodestar-utils": "^0.34.4",
     "@chainsafe/persistent-merkle-tree": "^0.3.7",
     "@chainsafe/ssz": "^0.8.20",
     "cross-fetch": "^3.1.4",

diff --git a/packages/lodestar/package.json b/packages/lodestar/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "0.34.2",
+  "version": "0.34.4",
   "main": "lib/index.js",
   "files": [
     "lib/**/*.d.ts",
@@ -64,16 +64,16 @@
     "@chainsafe/bls": "6.0.3",
     "@chainsafe/discv5": "^0.6.7",
     "@chainsafe/libp2p-noise": "5.0.3",
-    "@chainsafe/lodestar-api": "^0.34.2",
-    "@chainsafe/lodestar-beacon-state-transition": "^0.34.2",
-    "@chainsafe/lodestar-config": "^0.34.2",
-    "@chainsafe/lodestar-db": "^0.34.2",
-    "@chainsafe/lodestar-fork-choice": "^0.34.2",
-    "@chainsafe/lodestar-light-client": "^0.34.2",
-    "@chainsafe/lodestar-params": "^0.34.2",
-    "@chainsafe/lodestar-types": "^0.34.2",
-    "@chainsafe/lodestar-utils": "^0.34.2",
-    "@chainsafe/lodestar-validator": "^0.34.2",
+    "@chainsafe/lodestar-api": "^0.34.4",
+    "@chainsafe/lodestar-beacon-state-transition": "^0.34.4",
+    "@chainsafe/lodestar-config": "^0.34.4",
+    "@chainsafe/lodestar-db": "^0.34.4",
+    "@chainsafe/lodestar-fork-choice": "^0.34.4",
+    "@chainsafe/lodestar-light-client": "^0.34.4",
+    "@chainsafe/lodestar-params": "^0.34.4",
+    "@chainsafe/lodestar-types": "^0.34.4",
+    "@chainsafe/lodestar-utils": "^0.34.4",
+    "@chainsafe/lodestar-validator": "^0.34.4",
     "@chainsafe/persistent-merkle-tree": "^0.3.7",
     "@chainsafe/snappy-stream": "5.0.0",
     "@chainsafe/ssz": "^0.8.20",

diff --git a/packages/lodestar/src/network/gossip/gossipsub.ts b/packages/lodestar/src/network/gossip/gossipsub.ts
@@ -424,13 +424,17 @@ export class Eth2Gossipsub extends Gossipsub {
         // Ignore topics with 0 peers. May prevent overriding after a fork
         if (peers.size === 0) continue;
 
-        const topic = this.gossipTopicCache.getTopic(topicString);
-        if (topic.type === GossipType.beacon_attestation) {
-          peersByBeaconAttSubnetByFork.set(topic.fork, topic.subnet, peers.size);
-        } else if (topic.type === GossipType.sync_committee) {
-          peersByBeaconSyncSubnetByFork.set(topic.fork, topic.subnet, peers.size);
-        } else {
-          peersByTypeByFork.set(topic.fork, topic.type, peers.size);
+        // there are some new topics in the network so `getKnownTopic()` returns undefined
+        // for example in prater: /eth2/82f4a72b/optimistic_light_client_update_v0/ssz_snappy
+        const topic = this.gossipTopicCache.getKnownTopic(topicString);
+        if (topic !== undefined) {
+          if (topic.type === GossipType.beacon_attestation) {
+            peersByBeaconAttSubnetByFork.set(topic.fork, topic.subnet, peers.size);
+          } else if (topic.type === GossipType.sync_committee) {
+            peersByBeaconSyncSubnetByFork.set(topic.fork, topic.subnet, peers.size);
+          } else {
+            peersByTypeByFork.set(topic.fork, topic.type, peers.size);
+          }
         }
       }
 

diff --git a/packages/lodestar/src/network/gossip/topic.ts b/packages/lodestar/src/network/gossip/topic.ts
@@ -16,6 +16,7 @@ export class GossipTopicCache implements IGossipTopicCache {
 
   constructor(private readonly forkDigestContext: IForkDigestContext) {}
 
+  /** Returns cached GossipTopic, otherwise attempts to parse it from the str */
   getTopic(topicStr: string): GossipTopic {
     let topic = this.topicsByTopicStr.get(topicStr);
     if (topic === undefined) {
@@ -26,6 +27,11 @@ export class GossipTopicCache implements IGossipTopicCache {
     return topic;
   }
 
+  /** Returns cached GossipTopic, otherwise returns undefined */
+  getKnownTopic(topicStr: string): GossipTopic | undefined {
+    return this.topicsByTopicStr.get(topicStr);
+  }
+
   setTopic(topicStr: string, topic: GossipTopic): void {
     if (!this.topicsByTopicStr.has(topicStr)) {
       this.topicsByTopicStr.set(topicStr, {encoding: DEFAULT_ENCODING, ...topic});

diff --git a/packages/params/package.json b/packages/params/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chainsafe/lodestar-params",
-  "version": "0.34.2",
+  "version": "0.34.4",
   "description": "Chain parameters required for lodestar",
   "author": "ChainSafe Systems",
   "license": "Apache-2.0",

diff --git a/packages/spec-test-util/package.json b/packages/spec-test-util/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chainsafe/lodestar-spec-test-util",
-  "version": "0.34.2",
+  "version": "0.34.4",
   "description": "Spec test suite generator from yaml test files",
   "author": "ChainSafe Systems",
   "license": "Apache-2.0",
@@ -45,7 +45,7 @@
     "blockchain"
   ],
   "dependencies": {
-    "@chainsafe/lodestar-utils": "^0.34.2",
+    "@chainsafe/lodestar-utils": "^0.34.4",
     "@chainsafe/ssz": "^0.8.20",
     "async-retry": "^1.3.3",
     "axios": "^0.21.0",

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "0.34.2",
+  "version": "0.34.4",
   "main": "lib/index.js",
   "files": [
     "lib/**/*.d.ts",
@@ -35,7 +35,7 @@
   },
   "types": "lib/index.d.ts",
   "dependencies": {
-    "@chainsafe/lodestar-params": "^0.34.2",
+    "@chainsafe/lodestar-params": "^0.34.4",
     "@chainsafe/ssz": "^0.8.20"
   },
   "keywords": [

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "0.34.2",
+  "version": "0.34.4",
   "main": "lib/index.js",
   "files": [
     "lib/**/*.d.ts",

diff --git a/packages/validator/package.json b/packages/validator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chainsafe/lodestar-validator",
-  "version": "0.34.2",
+  "version": "0.34.4",
   "description": "A Typescript implementation of the validator client",
   "author": "ChainSafe Systems",
   "license": "LGPL-3.0",
@@ -47,13 +47,13 @@
   "dependencies": {
     "@chainsafe/abort-controller": "^3.0.1",
     "@chainsafe/bls": "6.0.3",
-    "@chainsafe/lodestar-api": "^0.34.2",
-    "@chainsafe/lodestar-beacon-state-transition": "^0.34.2",
-    "@chainsafe/lodestar-config": "^0.34.2",
-    "@chainsafe/lodestar-db": "^0.34.2",
-    "@chainsafe/lodestar-params": "^0.34.2",
-    "@chainsafe/lodestar-types": "^0.34.2",
-    "@chainsafe/lodestar-utils": "^0.34.2",
+    "@chainsafe/lodestar-api": "^0.34.4",
+    "@chainsafe/lodestar-beacon-state-transition": "^0.34.4",
+    "@chainsafe/lodestar-config": "^0.34.4",
+    "@chainsafe/lodestar-db": "^0.34.4",
+    "@chainsafe/lodestar-params": "^0.34.4",
+    "@chainsafe/lodestar-types": "^0.34.4",
+    "@chainsafe/lodestar-utils": "^0.34.4",
     "@chainsafe/ssz": "^0.8.20",
     "bigint-buffer": "^1.1.5",
     "cross-fetch": "^3.1.4",