Merge branch 'mainnet-staging' into min-proposal-time

AleoNet · Apr 2, 2024 · ef8b522 · ef8b522
2 parents 03cc214 + 053512d
commit ef8b522
Show file tree

Hide file tree

Showing 4 changed files with 142 additions and 3 deletions.
diff --git a/node/consensus/src/lib.rs b/node/consensus/src/lib.rs
@@ -422,6 +422,9 @@ impl<N: Network> Consensus<N> {
             let num_sol = next_block.solutions().len();
             let num_tx = next_block.transactions().len();
             let num_transmissions = num_tx + num_sol;
+            let proof_target = next_block.header().proof_target();
+            let coinbase_target = next_block.header().coinbase_target();
+            let cumulative_proof_target = next_block.header().cumulative_proof_target();
 
             metrics::gauge(metrics::blocks::HEIGHT, next_block.height() as f64);
             metrics::increment_gauge(metrics::blocks::SOLUTIONS, num_sol as f64);
@@ -431,6 +434,9 @@ impl<N: Network> Consensus<N> {
             metrics::gauge(metrics::consensus::COMMITTED_CERTIFICATES, num_committed_certificates as f64);
             metrics::histogram(metrics::consensus::CERTIFICATE_COMMIT_LATENCY, elapsed.as_secs_f64());
             metrics::histogram(metrics::consensus::BLOCK_LATENCY, block_latency as f64);
+            metrics::gauge(metrics::blocks::PROOF_TARGET, proof_target as f64);
+            metrics::gauge(metrics::blocks::COINBASE_TARGET, coinbase_target as f64);
+            metrics::gauge(metrics::blocks::CUMULATIVE_PROOF_TARGET, cumulative_proof_target as f64);
         }
         Ok(())
     }

diff --git a/node/metrics/snarkOS-grafana.json b/node/metrics/snarkOS-grafana.json
@@ -638,14 +638,17 @@
               "mode": "off"
             }
           },
-          "displayName": "Total Transmissions",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
             "steps": [
               {
                 "color": "green",
                 "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
               }
             ]
           }
@@ -658,6 +661,130 @@
         "x": 12,
         "y": 17
       },
+      "id": 53,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "maxHeight": 600,
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
+          "disableTextWrap": false,
+          "editorMode": "code",
+          "expr": "max(snarkos_blocks_coinbase_target)",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "interval": "",
+          "legendFormat": "Coinbase Target",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "expr": "max(snarkos_blocks_proof_target)",
+          "hide": false,
+          "instant": false,
+          "legendFormat": "Proof Target",
+          "range": true,
+          "refId": "B"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
+          "editorMode": "code",
+          "expr": "max(snarkos_blocks_cumulative_proof_target)",
+          "hide": false,
+          "instant": false,
+          "legendFormat": "Cumulative Proof Target",
+          "range": true,
+          "refId": "C"
+        }
+      ],
+      "title": "Difficulty",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "displayName": "Total Transmissions",
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 25
+      },
       "id": 42,
       "options": {
         "legend": {

diff --git a/node/metrics/src/names.rs b/node/metrics/src/names.rs
@@ -14,7 +14,7 @@
 
 pub(super) const COUNTER_NAMES: [&str; 1] = [bft::LEADERS_ELECTED];
 
-pub(super) const GAUGE_NAMES: [&str; 18] = [
+pub(super) const GAUGE_NAMES: [&str; 21] = [
     bft::CONNECTED,
     bft::CONNECTING,
     bft::LAST_STORED_ROUND,
@@ -24,6 +24,9 @@ pub(super) const GAUGE_NAMES: [&str; 18] = [
     blocks::SOLUTIONS,
     blocks::TRANSACTIONS,
     blocks::TRANSMISSIONS,
+    blocks::PROOF_TARGET,
+    blocks::COINBASE_TARGET,
+    blocks::CUMULATIVE_PROOF_TARGET,
     consensus::COMMITTED_CERTIFICATES,
     consensus::LAST_COMMITTED_ROUND,
     consensus::UNCONFIRMED_SOLUTIONS,
@@ -60,6 +63,9 @@ pub mod blocks {
     pub const TRANSACTIONS: &str = "snarkos_blocks_transactions_total";
     pub const TRANSMISSIONS: &str = "snarkos_blocks_transmissions_total";
     pub const SOLUTIONS: &str = "snarkos_blocks_solutions_total";
+    pub const PROOF_TARGET: &str = "snarkos_blocks_proof_target";
+    pub const COINBASE_TARGET: &str = "snarkos_blocks_coinbase_target";
+    pub const CUMULATIVE_PROOF_TARGET: &str = "snarkos_blocks_cumulative_proof_target";
 }
 
 pub mod consensus {

diff --git a/node/router/tests/common/mod.rs b/node/router/tests/common/mod.rs
@@ -111,7 +111,7 @@ pub async fn validator(listening_port: u16, max_peers: u16) -> TestRouter<Curren
         sample_account(),
         &[],
         max_peers,
-        false,
+        true, // Router tests require validators to connect to peers.
         true,
     )
     .await