From 1bca44de88376199bf90d746a9ce2f8416c2e0ea Mon Sep 17 00:00:00 2001
From: raychu86 <14917648+raychu86@users.noreply.github.com>
Date: Fri, 15 Mar 2024 15:49:15 -0700
Subject: [PATCH 01/13] Add correct flag for local devnet client node

---
 devnet.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devnet.sh b/devnet.sh
index e91627335a..b0fb9fe410 100755
--- a/devnet.sh
+++ b/devnet.sh
@@ -87,7 +87,7 @@ for client_index in "${client_indices[@]}"; do
   tmux new-window -t "devnet:$window_index" -n "window-$window_index"
 
   # Send the command to start the validator to the new window and capture output to the log file
-  tmux send-keys -t "devnet:window-$window_index" "snarkos start --nodisplay --dev $window_index --client --logfile $log_file" C-m
+  tmux send-keys -t "devnet:window-$window_index" "snarkos start --nodisplay --dev $window_index --dev-num-validators $total_validators --client --logfile $log_file" C-m
 done
 
 # Attach to the tmux session to view and interact with the windows

From 4e6d0d1d196b6477413249c01e32a75fc2bb9138 Mon Sep 17 00:00:00 2001
From: raychu86 <14917648+raychu86@users.noreply.github.com>
Date: Fri, 15 Mar 2024 22:50:28 -0700
Subject: [PATCH 02/13] Fix test configs

---
 node/bft/src/worker.rs               | 2 +-
 node/bft/tests/common/primary.rs     | 2 +-
 node/bft/tests/components/mod.rs     | 2 +-
 node/bft/tests/components/pending.rs | 2 +-
 node/bft/tests/components/worker.rs  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/node/bft/src/worker.rs b/node/bft/src/worker.rs
index ffb3fceee3..c699168c62 100644
--- a/node/bft/src/worker.rs
+++ b/node/bft/src/worker.rs
@@ -556,7 +556,7 @@ mod tests {
     async fn test_max_redundant_requests() {
         let rng = &mut TestRng::default();
         // Sample a committee.
-        let committee = snarkvm::ledger::committee::test_helpers::sample_committee_for_round_and_size(0, 100, rng);
+        let committee = snarkvm::ledger::committee::test_helpers::sample_committee_for_round_and_size(0, 10, rng);
         let committee_clone = committee.clone();
         // Setup the mock ledger.
         let mut mock_ledger = MockLedger::default();
diff --git a/node/bft/tests/common/primary.rs b/node/bft/tests/common/primary.rs
index d1aa748852..18ace2646f 100644
--- a/node/bft/tests/common/primary.rs
+++ b/node/bft/tests/common/primary.rs
@@ -138,7 +138,7 @@ impl TestNetwork {
             .collect();
         let gen_key = *accounts[0].private_key();
         let public_balance_per_validator =
-            (1_500_000_000_000_000 - (config.num_nodes as u64) * 1_000_000_000_000) / (config.num_nodes as u64);
+            (1_500_000_000_000_000 - (config.num_nodes as u64) * 10_000_000_000_000) / (config.num_nodes as u64);
         let mut balances = IndexMap::<Address<CurrentNetwork>, u64>::new();
         for account in accounts.iter() {
             balances.insert(account.address(), public_balance_per_validator);
diff --git a/node/bft/tests/components/mod.rs b/node/bft/tests/components/mod.rs
index a153ad7b43..a1eb8a1552 100644
--- a/node/bft/tests/components/mod.rs
+++ b/node/bft/tests/components/mod.rs
@@ -42,7 +42,7 @@ pub fn sample_ledger(
         committee.members().iter().map(|(address, (amount, _))| (*address, (*address, *address, *amount))).collect();
     let gen_key = *accounts[0].private_key();
     let public_balance_per_validator =
-        (1_500_000_000_000_000 - (num_nodes as u64) * 1_000_000_000_000) / (num_nodes as u64);
+        (1_500_000_000_000_000 - (num_nodes as u64) * 10_000_000_000_000) / (num_nodes as u64);
     let mut balances = IndexMap::<Address<CurrentNetwork>, u64>::new();
     for account in accounts.iter() {
         balances.insert(account.address(), public_balance_per_validator);
diff --git a/node/bft/tests/components/pending.rs b/node/bft/tests/components/pending.rs
index b1405207d4..b4c1d65223 100644
--- a/node/bft/tests/components/pending.rs
+++ b/node/bft/tests/components/pending.rs
@@ -18,7 +18,7 @@ use snarkvm::prelude::TestRng;
 
 #[test]
 fn test_max_redundant_requests() {
-    const NUM_NODES: u16 = 100;
+    const NUM_NODES: u16 = 10;
 
     // Initialize the RNG.
     let rng = &mut TestRng::default();
diff --git a/node/bft/tests/components/worker.rs b/node/bft/tests/components/worker.rs
index 279bc1bf92..a2273b35e2 100644
--- a/node/bft/tests/components/worker.rs
+++ b/node/bft/tests/components/worker.rs
@@ -27,7 +27,7 @@ use std::net::SocketAddr;
 #[tokio::test]
 #[rustfmt::skip]
 async fn test_resend_transmission_request() {
-    const NUM_NODES: u16 = 100;
+    const NUM_NODES: u16 = 10;
 
     // Initialize the RNG.
     let rng = &mut TestRng::default();

From 16c59b9b015aaae62730ba0f447749127822b78d Mon Sep 17 00:00:00 2001
From: raychu86 <14917648+raychu86@users.noreply.github.com>
Date: Fri, 15 Mar 2024 23:16:30 -0700
Subject: [PATCH 03/13] Update expected test value

---
 node/bft/src/worker.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/node/bft/src/worker.rs b/node/bft/src/worker.rs
index c699168c62..dfa6490fe5 100644
--- a/node/bft/src/worker.rs
+++ b/node/bft/src/worker.rs
@@ -567,7 +567,7 @@ mod tests {
         let ledger: Arc<dyn LedgerService<CurrentNetwork>> = Arc::new(mock_ledger);
 
         // Ensure the maximum number of redundant requests is correct and consistent across iterations.
-        assert_eq!(max_redundant_requests(ledger, 0), 34, "Update me if the formula changes");
+        assert_eq!(max_redundant_requests(ledger, 0), 4, "Update me if the formula changes");
     }
 
     #[tokio::test]

From af15155c6dc6c9f5203742c1eff07de3b1330a32 Mon Sep 17 00:00:00 2001
From: raychu86 <14917648+raychu86@users.noreply.github.com>
Date: Mon, 18 Mar 2024 09:26:45 -0700
Subject: [PATCH 04/13] Update expected values

---
 node/bft/tests/components/worker.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/node/bft/tests/components/worker.rs b/node/bft/tests/components/worker.rs
index a2273b35e2..d1658bb02f 100644
--- a/node/bft/tests/components/worker.rs
+++ b/node/bft/tests/components/worker.rs
@@ -36,6 +36,10 @@ async fn test_resend_transmission_request() {
     // Sample a worker.
     let worker = sample_worker(0, ledger.clone());
 
+    // Determine the maximum number of redundant requests.
+    let max_redundancy = max_redundant_requests(ledger.clone(), 0);
+    assert_eq!(max_redundancy, 4, "Update me if the formula changes");
+
     // Prepare a dummy transmission ID.
     let peer_ip = SocketAddr::from(([127, 0, 0, 1], 1234));
     let transmission_id = TransmissionID::Transaction(<CurrentNetwork as Network>::TransactionID::default());
@@ -75,14 +79,14 @@ async fn test_resend_transmission_request() {
         // Ensure the number of callbacks is correct.
         assert_eq!(pending.num_callbacks(transmission_id), 1 + i, "Incorrect number of callbacks for transmission");
         // Ensure the number of sent requests is correct.
-        assert_eq!(pending.num_sent_requests(transmission_id), 1 + i, "Incorrect number of sent requests for transmission");
+        assert_eq!(pending.num_sent_requests(transmission_id), (1 + i).min(max_redundancy), "Incorrect number of sent requests for transmission");
     }
 }
 
 #[tokio::test]
 #[rustfmt::skip]
 async fn test_flood_transmission_requests() {
-    const NUM_NODES: u16 = 100;
+    const NUM_NODES: u16 = 10;
 
     // Initialize the RNG.
     let rng = &mut TestRng::default();
@@ -93,7 +97,7 @@ async fn test_flood_transmission_requests() {
 
     // Determine the maximum number of redundant requests.
     let max_redundancy = max_redundant_requests(ledger.clone(), 0);
-    assert_eq!(max_redundancy, 34, "Update me if the formula changes");
+    assert_eq!(max_redundancy, 4, "Update me if the formula changes");
 
     // Prepare a dummy transmission ID.
     let peer_ip = SocketAddr::from(([127, 0, 0, 1], 1234));

From f4edfc7e1a7434abf6b566d142b40666c4a4c305 Mon Sep 17 00:00:00 2001
From: raychu86 <14917648+raychu86@users.noreply.github.com>
Date: Mon, 18 Mar 2024 10:06:42 -0700
Subject: [PATCH 05/13] Update expected max_redundant_requests value

---
 node/bft/tests/components/pending.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/node/bft/tests/components/pending.rs b/node/bft/tests/components/pending.rs
index b4c1d65223..4f00fb3436 100644
--- a/node/bft/tests/components/pending.rs
+++ b/node/bft/tests/components/pending.rs
@@ -25,5 +25,5 @@ fn test_max_redundant_requests() {
     // Sample a ledger.
     let ledger = sample_ledger(NUM_NODES, rng);
     // Ensure the maximum number of redundant requests is correct and consistent across iterations.
-    assert_eq!(max_redundant_requests(ledger, 0), 34, "Update me if the formula changes");
+    assert_eq!(max_redundant_requests(ledger, 0), 4, "Update me if the formula changes");
 }

From aff8f2b6930158d90d4158d124da58a32fcf48a9 Mon Sep 17 00:00:00 2001
From: raychu86 <14917648+raychu86@users.noreply.github.com>
Date: Tue, 19 Mar 2024 11:32:27 -0700
Subject: [PATCH 06/13] Update snarkVM rev - e29c1df

---
 Cargo.lock                           | 116 +++++++++++++--------------
 Cargo.toml                           |   2 +-
 node/bft/tests/components/pending.rs |   8 +-
 node/bft/tests/components/worker.rs  |  10 +--
 4 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2b724e9d99..e76be79509 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3301,7 +3301,7 @@ dependencies = [
 [[package]]
 name = "snarkvm"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "anstyle",
  "anyhow",
@@ -3332,7 +3332,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-algorithms"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "aleo-std",
  "anyhow",
@@ -3362,7 +3362,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-circuit-account",
  "snarkvm-circuit-algorithms",
@@ -3376,7 +3376,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-account"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-circuit-algorithms",
  "snarkvm-circuit-network",
@@ -3387,7 +3387,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-algorithms"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-circuit-types",
  "snarkvm-console-algorithms",
@@ -3397,7 +3397,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-collections"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-circuit-algorithms",
  "snarkvm-circuit-types",
@@ -3407,7 +3407,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-environment"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "indexmap 2.2.5",
  "itertools 0.11.0",
@@ -3425,12 +3425,12 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-environment-witness"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 
 [[package]]
 name = "snarkvm-circuit-network"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-circuit-algorithms",
  "snarkvm-circuit-collections",
@@ -3441,7 +3441,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-program"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "paste",
  "snarkvm-circuit-account",
@@ -3456,7 +3456,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-types"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-circuit-environment",
  "snarkvm-circuit-types-address",
@@ -3471,7 +3471,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-types-address"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-circuit-environment",
  "snarkvm-circuit-types-boolean",
@@ -3484,7 +3484,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-types-boolean"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-circuit-environment",
  "snarkvm-console-types-boolean",
@@ -3493,7 +3493,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-types-field"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-circuit-environment",
  "snarkvm-circuit-types-boolean",
@@ -3503,7 +3503,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-types-group"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-circuit-environment",
  "snarkvm-circuit-types-boolean",
@@ -3515,7 +3515,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-types-integers"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-circuit-environment",
  "snarkvm-circuit-types-boolean",
@@ -3527,7 +3527,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-types-scalar"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-circuit-environment",
  "snarkvm-circuit-types-boolean",
@@ -3538,7 +3538,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-types-string"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-circuit-environment",
  "snarkvm-circuit-types-boolean",
@@ -3550,7 +3550,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-console-account",
  "snarkvm-console-algorithms",
@@ -3563,7 +3563,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-account"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "bs58",
  "snarkvm-console-network",
@@ -3574,7 +3574,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-algorithms"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "blake2s_simd",
  "smallvec",
@@ -3587,7 +3587,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-collections"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "aleo-std",
  "rayon",
@@ -3598,7 +3598,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-network"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "anyhow",
  "indexmap 2.2.5",
@@ -3621,7 +3621,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-network-environment"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "anyhow",
  "bech32",
@@ -3639,7 +3639,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-program"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "enum_index",
  "enum_index_derive",
@@ -3660,7 +3660,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-types"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-console-network-environment",
  "snarkvm-console-types-address",
@@ -3675,7 +3675,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-types-address"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-console-network-environment",
  "snarkvm-console-types-boolean",
@@ -3686,7 +3686,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-types-boolean"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-console-network-environment",
 ]
@@ -3694,7 +3694,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-types-field"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-console-network-environment",
  "snarkvm-console-types-boolean",
@@ -3704,7 +3704,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-types-group"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-console-network-environment",
  "snarkvm-console-types-boolean",
@@ -3715,7 +3715,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-types-integers"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-console-network-environment",
  "snarkvm-console-types-boolean",
@@ -3726,7 +3726,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-types-scalar"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-console-network-environment",
  "snarkvm-console-types-boolean",
@@ -3737,7 +3737,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-types-string"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-console-network-environment",
  "snarkvm-console-types-boolean",
@@ -3748,7 +3748,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-curves"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "rand",
  "rayon",
@@ -3762,7 +3762,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-fields"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "aleo-std",
  "anyhow",
@@ -3779,7 +3779,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "aleo-std",
  "anyhow",
@@ -3804,7 +3804,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-authority"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "anyhow",
  "rand",
@@ -3816,7 +3816,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-block"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "indexmap 2.2.5",
  "rayon",
@@ -3835,7 +3835,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-coinbase"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "aleo-std",
  "anyhow",
@@ -3855,7 +3855,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-committee"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "anyhow",
  "indexmap 2.2.5",
@@ -3873,7 +3873,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-narwhal"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-ledger-narwhal-batch-certificate",
  "snarkvm-ledger-narwhal-batch-header",
@@ -3886,7 +3886,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-narwhal-batch-certificate"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "indexmap 2.2.5",
  "rayon",
@@ -3899,7 +3899,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-narwhal-batch-header"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "indexmap 2.2.5",
  "serde_json",
@@ -3911,7 +3911,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-narwhal-data"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "bytes",
  "serde_json",
@@ -3922,7 +3922,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-narwhal-subdag"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "indexmap 2.2.5",
  "rayon",
@@ -3937,7 +3937,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-narwhal-transmission"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "bytes",
  "serde_json",
@@ -3950,7 +3950,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-narwhal-transmission-id"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "snarkvm-console",
  "snarkvm-ledger-coinbase",
@@ -3959,7 +3959,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-query"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "async-trait",
  "reqwest",
@@ -3972,7 +3972,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-store"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "aleo-std-storage",
  "anyhow",
@@ -3998,7 +3998,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-test-helpers"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "once_cell",
  "snarkvm-circuit",
@@ -4013,7 +4013,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-metrics"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "metrics",
  "metrics-exporter-prometheus",
@@ -4022,7 +4022,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-parameters"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "aleo-std",
  "anyhow",
@@ -4047,7 +4047,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-synthesizer"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "aleo-std",
  "anyhow",
@@ -4073,7 +4073,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-synthesizer-process"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "aleo-std",
  "colored",
@@ -4096,7 +4096,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-synthesizer-program"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "indexmap 2.2.5",
  "paste",
@@ -4110,7 +4110,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-synthesizer-snark"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "bincode",
  "once_cell",
@@ -4123,7 +4123,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-utilities"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "aleo-std",
  "anyhow",
@@ -4144,7 +4144,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-utilities-derives"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=01c8b09#01c8b095cfa8bbeb4dedc97543966af8026bce61"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
 dependencies = [
  "proc-macro2",
  "quote 1.0.35",
diff --git a/Cargo.toml b/Cargo.toml
index f1107f7c36..625bd434c5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,7 +46,7 @@ default-features = false
 
 [workspace.dependencies.snarkvm]
 git = "https://github.com/AleoHQ/snarkVM.git"
-rev = "01c8b09"
+rev = "e29c1df"
 #version = "=0.16.18"
 features = [ "circuit", "console", "rocks" ]
 
diff --git a/node/bft/tests/components/pending.rs b/node/bft/tests/components/pending.rs
index 4f00fb3436..f4766084a5 100644
--- a/node/bft/tests/components/pending.rs
+++ b/node/bft/tests/components/pending.rs
@@ -12,18 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::components::sample_ledger;
+use crate::{common::CurrentNetwork, components::sample_ledger};
 use snarkos_node_bft::helpers::max_redundant_requests;
-use snarkvm::prelude::TestRng;
+use snarkvm::{ledger::committee::Committee, prelude::TestRng};
 
 #[test]
 fn test_max_redundant_requests() {
-    const NUM_NODES: u16 = 10;
+    const NUM_NODES: u16 = Committee::<CurrentNetwork>::MAX_COMMITTEE_SIZE;
 
     // Initialize the RNG.
     let rng = &mut TestRng::default();
     // Sample a ledger.
     let ledger = sample_ledger(NUM_NODES, rng);
     // Ensure the maximum number of redundant requests is correct and consistent across iterations.
-    assert_eq!(max_redundant_requests(ledger, 0), 4, "Update me if the formula changes");
+    assert_eq!(max_redundant_requests(ledger, 0), 34, "Update me if the formula changes");
 }
diff --git a/node/bft/tests/components/worker.rs b/node/bft/tests/components/worker.rs
index d1658bb02f..1877bd859a 100644
--- a/node/bft/tests/components/worker.rs
+++ b/node/bft/tests/components/worker.rs
@@ -18,7 +18,7 @@ use crate::{
 };
 use snarkos_node_bft::helpers::max_redundant_requests;
 use snarkvm::{
-    ledger::narwhal::TransmissionID,
+    ledger::{committee::Committee, narwhal::TransmissionID},
     prelude::{Network, TestRng},
 };
 
@@ -27,7 +27,7 @@ use std::net::SocketAddr;
 #[tokio::test]
 #[rustfmt::skip]
 async fn test_resend_transmission_request() {
-    const NUM_NODES: u16 = 10;
+    const NUM_NODES: u16 = Committee::<CurrentNetwork>::MAX_COMMITTEE_SIZE;
 
     // Initialize the RNG.
     let rng = &mut TestRng::default();
@@ -38,7 +38,7 @@ async fn test_resend_transmission_request() {
 
     // Determine the maximum number of redundant requests.
     let max_redundancy = max_redundant_requests(ledger.clone(), 0);
-    assert_eq!(max_redundancy, 4, "Update me if the formula changes");
+    assert_eq!(max_redundancy, 34, "Update me if the formula changes");
 
     // Prepare a dummy transmission ID.
     let peer_ip = SocketAddr::from(([127, 0, 0, 1], 1234));
@@ -86,7 +86,7 @@ async fn test_resend_transmission_request() {
 #[tokio::test]
 #[rustfmt::skip]
 async fn test_flood_transmission_requests() {
-    const NUM_NODES: u16 = 10;
+    const NUM_NODES: u16 = Committee::<CurrentNetwork>::MAX_COMMITTEE_SIZE;
 
     // Initialize the RNG.
     let rng = &mut TestRng::default();
@@ -97,7 +97,7 @@ async fn test_flood_transmission_requests() {
 
     // Determine the maximum number of redundant requests.
     let max_redundancy = max_redundant_requests(ledger.clone(), 0);
-    assert_eq!(max_redundancy, 4, "Update me if the formula changes");
+    assert_eq!(max_redundancy, 34, "Update me if the formula changes");
 
     // Prepare a dummy transmission ID.
     let peer_ip = SocketAddr::from(([127, 0, 0, 1], 1234));

From 086103ec05772ed22d4c5a8d1fe8560cf41c8486 Mon Sep 17 00:00:00 2001
From: raychu86 <14917648+raychu86@users.noreply.github.com>
Date: Tue, 19 Mar 2024 15:56:52 -0700
Subject: [PATCH 07/13] Update snarkVM rev - eefd27d

---
 Cargo.lock | 116 ++++++++++++++++++++++++++---------------------------
 Cargo.toml |   2 +-
 2 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e76be79509..140828d972 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3301,7 +3301,7 @@ dependencies = [
 [[package]]
 name = "snarkvm"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "anstyle",
  "anyhow",
@@ -3332,7 +3332,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-algorithms"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "aleo-std",
  "anyhow",
@@ -3362,7 +3362,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-circuit-account",
  "snarkvm-circuit-algorithms",
@@ -3376,7 +3376,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-account"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-circuit-algorithms",
  "snarkvm-circuit-network",
@@ -3387,7 +3387,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-algorithms"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-circuit-types",
  "snarkvm-console-algorithms",
@@ -3397,7 +3397,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-collections"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-circuit-algorithms",
  "snarkvm-circuit-types",
@@ -3407,7 +3407,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-environment"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "indexmap 2.2.5",
  "itertools 0.11.0",
@@ -3425,12 +3425,12 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-environment-witness"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 
 [[package]]
 name = "snarkvm-circuit-network"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-circuit-algorithms",
  "snarkvm-circuit-collections",
@@ -3441,7 +3441,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-program"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "paste",
  "snarkvm-circuit-account",
@@ -3456,7 +3456,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-types"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-circuit-environment",
  "snarkvm-circuit-types-address",
@@ -3471,7 +3471,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-types-address"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-circuit-environment",
  "snarkvm-circuit-types-boolean",
@@ -3484,7 +3484,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-types-boolean"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-circuit-environment",
  "snarkvm-console-types-boolean",
@@ -3493,7 +3493,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-types-field"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-circuit-environment",
  "snarkvm-circuit-types-boolean",
@@ -3503,7 +3503,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-types-group"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-circuit-environment",
  "snarkvm-circuit-types-boolean",
@@ -3515,7 +3515,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-types-integers"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-circuit-environment",
  "snarkvm-circuit-types-boolean",
@@ -3527,7 +3527,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-types-scalar"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-circuit-environment",
  "snarkvm-circuit-types-boolean",
@@ -3538,7 +3538,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-circuit-types-string"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-circuit-environment",
  "snarkvm-circuit-types-boolean",
@@ -3550,7 +3550,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-console-account",
  "snarkvm-console-algorithms",
@@ -3563,7 +3563,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-account"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "bs58",
  "snarkvm-console-network",
@@ -3574,7 +3574,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-algorithms"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "blake2s_simd",
  "smallvec",
@@ -3587,7 +3587,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-collections"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "aleo-std",
  "rayon",
@@ -3598,7 +3598,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-network"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "anyhow",
  "indexmap 2.2.5",
@@ -3621,7 +3621,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-network-environment"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "anyhow",
  "bech32",
@@ -3639,7 +3639,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-program"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "enum_index",
  "enum_index_derive",
@@ -3660,7 +3660,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-types"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-console-network-environment",
  "snarkvm-console-types-address",
@@ -3675,7 +3675,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-types-address"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-console-network-environment",
  "snarkvm-console-types-boolean",
@@ -3686,7 +3686,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-types-boolean"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-console-network-environment",
 ]
@@ -3694,7 +3694,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-types-field"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-console-network-environment",
  "snarkvm-console-types-boolean",
@@ -3704,7 +3704,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-types-group"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-console-network-environment",
  "snarkvm-console-types-boolean",
@@ -3715,7 +3715,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-types-integers"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-console-network-environment",
  "snarkvm-console-types-boolean",
@@ -3726,7 +3726,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-types-scalar"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-console-network-environment",
  "snarkvm-console-types-boolean",
@@ -3737,7 +3737,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-console-types-string"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-console-network-environment",
  "snarkvm-console-types-boolean",
@@ -3748,7 +3748,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-curves"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "rand",
  "rayon",
@@ -3762,7 +3762,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-fields"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "aleo-std",
  "anyhow",
@@ -3779,7 +3779,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "aleo-std",
  "anyhow",
@@ -3804,7 +3804,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-authority"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "anyhow",
  "rand",
@@ -3816,7 +3816,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-block"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "indexmap 2.2.5",
  "rayon",
@@ -3835,7 +3835,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-coinbase"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "aleo-std",
  "anyhow",
@@ -3855,7 +3855,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-committee"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "anyhow",
  "indexmap 2.2.5",
@@ -3873,7 +3873,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-narwhal"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-ledger-narwhal-batch-certificate",
  "snarkvm-ledger-narwhal-batch-header",
@@ -3886,7 +3886,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-narwhal-batch-certificate"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "indexmap 2.2.5",
  "rayon",
@@ -3899,7 +3899,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-narwhal-batch-header"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "indexmap 2.2.5",
  "serde_json",
@@ -3911,7 +3911,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-narwhal-data"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "bytes",
  "serde_json",
@@ -3922,7 +3922,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-narwhal-subdag"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "indexmap 2.2.5",
  "rayon",
@@ -3937,7 +3937,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-narwhal-transmission"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "bytes",
  "serde_json",
@@ -3950,7 +3950,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-narwhal-transmission-id"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "snarkvm-console",
  "snarkvm-ledger-coinbase",
@@ -3959,7 +3959,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-query"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "async-trait",
  "reqwest",
@@ -3972,7 +3972,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-store"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "aleo-std-storage",
  "anyhow",
@@ -3998,7 +3998,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-ledger-test-helpers"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "once_cell",
  "snarkvm-circuit",
@@ -4013,7 +4013,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-metrics"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "metrics",
  "metrics-exporter-prometheus",
@@ -4022,7 +4022,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-parameters"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "aleo-std",
  "anyhow",
@@ -4047,7 +4047,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-synthesizer"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "aleo-std",
  "anyhow",
@@ -4073,7 +4073,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-synthesizer-process"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "aleo-std",
  "colored",
@@ -4096,7 +4096,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-synthesizer-program"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "indexmap 2.2.5",
  "paste",
@@ -4110,7 +4110,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-synthesizer-snark"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "bincode",
  "once_cell",
@@ -4123,7 +4123,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-utilities"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "aleo-std",
  "anyhow",
@@ -4144,7 +4144,7 @@ dependencies = [
 [[package]]
 name = "snarkvm-utilities-derives"
 version = "0.16.19"
-source = "git+https://github.com/AleoHQ/snarkVM.git?rev=e29c1df#e29c1dff55a652f59cfffb584da20d48e05eafbf"
+source = "git+https://github.com/AleoHQ/snarkVM.git?rev=eefd27d#eefd27d8637c78925f25bdb5878e67a9e2addeeb"
 dependencies = [
  "proc-macro2",
  "quote 1.0.35",
diff --git a/Cargo.toml b/Cargo.toml
index 625bd434c5..e97eed2eae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,7 +46,7 @@ default-features = false
 
 [workspace.dependencies.snarkvm]
 git = "https://github.com/AleoHQ/snarkVM.git"
-rev = "e29c1df"
+rev = "eefd27d"
 #version = "=0.16.18"
 features = [ "circuit", "console", "rocks" ]
 

From efc6468b8add8c14e891a01961aeadbcaec5bba7 Mon Sep 17 00:00:00 2001
From: raychu86 <14917648+raychu86@users.noreply.github.com>
Date: Tue, 19 Mar 2024 16:00:09 -0700
Subject: [PATCH 08/13] Use variables instead of constants

---
 node/bft/src/worker.rs           | 7 +++++--
 node/bft/tests/common/primary.rs | 6 ++++--
 node/bft/tests/components/mod.rs | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/node/bft/src/worker.rs b/node/bft/src/worker.rs
index dfa6490fe5..25e0a9bd3b 100644
--- a/node/bft/src/worker.rs
+++ b/node/bft/src/worker.rs
@@ -554,9 +554,12 @@ mod tests {
 
     #[tokio::test]
     async fn test_max_redundant_requests() {
+        const NUM_NODES: u16 = Committee::<CurrentNetwork>::MAX_COMMITTEE_SIZE;
+
         let rng = &mut TestRng::default();
         // Sample a committee.
-        let committee = snarkvm::ledger::committee::test_helpers::sample_committee_for_round_and_size(0, 10, rng);
+        let committee =
+            snarkvm::ledger::committee::test_helpers::sample_committee_for_round_and_size(0, NUM_NODES, rng);
         let committee_clone = committee.clone();
         // Setup the mock ledger.
         let mut mock_ledger = MockLedger::default();
@@ -567,7 +570,7 @@ mod tests {
         let ledger: Arc<dyn LedgerService<CurrentNetwork>> = Arc::new(mock_ledger);
 
         // Ensure the maximum number of redundant requests is correct and consistent across iterations.
-        assert_eq!(max_redundant_requests(ledger, 0), 4, "Update me if the formula changes");
+        assert_eq!(max_redundant_requests(ledger, 0), 34, "Update me if the formula changes");
     }
 
     #[tokio::test]
diff --git a/node/bft/tests/common/primary.rs b/node/bft/tests/common/primary.rs
index 18ace2646f..086112247d 100644
--- a/node/bft/tests/common/primary.rs
+++ b/node/bft/tests/common/primary.rs
@@ -29,6 +29,7 @@ use snarkvm::{
     console::{
         account::{Address, PrivateKey},
         algorithms::{Hash, BHP256},
+        network::Network,
     },
     ledger::{
         block::Block,
@@ -137,8 +138,9 @@ impl TestNetwork {
             .map(|(address, (amount, _))| (*address, (*address, *address, *amount)))
             .collect();
         let gen_key = *accounts[0].private_key();
-        let public_balance_per_validator =
-            (1_500_000_000_000_000 - (config.num_nodes as u64) * 10_000_000_000_000) / (config.num_nodes as u64);
+        let public_balance_per_validator = (<CurrentNetwork as Network>::STARTING_SUPPLY
+            - (config.num_nodes as u64) * MIN_VALIDATOR_STAKE)
+            / (config.num_nodes as u64);
         let mut balances = IndexMap::<Address<CurrentNetwork>, u64>::new();
         for account in accounts.iter() {
             balances.insert(account.address(), public_balance_per_validator);
diff --git a/node/bft/tests/components/mod.rs b/node/bft/tests/components/mod.rs
index a1eb8a1552..1c9c573f9e 100644
--- a/node/bft/tests/components/mod.rs
+++ b/node/bft/tests/components/mod.rs
@@ -22,7 +22,7 @@ use snarkos_node_bft_ledger_service::LedgerService;
 use snarkos_node_bft_storage_service::BFTMemoryService;
 use snarkvm::{
     console::{account::Address, network::Network},
-    ledger::{narwhal::BatchHeader, store::helpers::memory::ConsensusMemory},
+    ledger::{committee::MIN_VALIDATOR_STAKE, narwhal::BatchHeader, store::helpers::memory::ConsensusMemory},
     prelude::TestRng,
 };
 
@@ -42,7 +42,7 @@ pub fn sample_ledger(
         committee.members().iter().map(|(address, (amount, _))| (*address, (*address, *address, *amount))).collect();
     let gen_key = *accounts[0].private_key();
     let public_balance_per_validator =
-        (1_500_000_000_000_000 - (num_nodes as u64) * 10_000_000_000_000) / (num_nodes as u64);
+        (<CurrentNetwork as Network>::STARTING_SUPPLY - (num_nodes as u64) * MIN_VALIDATOR_STAKE) / (num_nodes as u64);
     let mut balances = IndexMap::<Address<CurrentNetwork>, u64>::new();
     for account in accounts.iter() {
         balances.insert(account.address(), public_balance_per_validator);

From 777c00d51d70bac6d306c243becf23cb0d7a845a Mon Sep 17 00:00:00 2001
From: raychu86 <14917648+raychu86@users.noreply.github.com>
Date: Wed, 20 Mar 2024 18:12:44 -0700
Subject: [PATCH 09/13] nit

---
 node/bft/tests/common/primary.rs | 2 +-
 node/bft/tests/components/mod.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/node/bft/tests/common/primary.rs b/node/bft/tests/common/primary.rs
index 086112247d..029c8d54b0 100644
--- a/node/bft/tests/common/primary.rs
+++ b/node/bft/tests/common/primary.rs
@@ -138,7 +138,7 @@ impl TestNetwork {
             .map(|(address, (amount, _))| (*address, (*address, *address, *amount)))
             .collect();
         let gen_key = *accounts[0].private_key();
-        let public_balance_per_validator = (<CurrentNetwork as Network>::STARTING_SUPPLY
+        let public_balance_per_validator = (CurrentNetwork::STARTING_SUPPLY
             - (config.num_nodes as u64) * MIN_VALIDATOR_STAKE)
             / (config.num_nodes as u64);
         let mut balances = IndexMap::<Address<CurrentNetwork>, u64>::new();
diff --git a/node/bft/tests/components/mod.rs b/node/bft/tests/components/mod.rs
index 1c9c573f9e..65336665cc 100644
--- a/node/bft/tests/components/mod.rs
+++ b/node/bft/tests/components/mod.rs
@@ -42,7 +42,7 @@ pub fn sample_ledger(
         committee.members().iter().map(|(address, (amount, _))| (*address, (*address, *address, *amount))).collect();
     let gen_key = *accounts[0].private_key();
     let public_balance_per_validator =
-        (<CurrentNetwork as Network>::STARTING_SUPPLY - (num_nodes as u64) * MIN_VALIDATOR_STAKE) / (num_nodes as u64);
+        (CurrentNetwork::STARTING_SUPPLY - (num_nodes as u64) * MIN_VALIDATOR_STAKE) / (num_nodes as u64);
     let mut balances = IndexMap::<Address<CurrentNetwork>, u64>::new();
     for account in accounts.iter() {
         balances.insert(account.address(), public_balance_per_validator);

From 840263dd2c610ed88bde2ce34f36a3c93f409600 Mon Sep 17 00:00:00 2001
From: miazn <mzhangnacke@gmail.com>
Date: Fri, 22 Mar 2024 13:50:49 -0400
Subject: [PATCH 10/13] update grafana

---
 node/metrics/snarkOS-grafana.json | 1210 +++++++++++------------------
 1 file changed, 475 insertions(+), 735 deletions(-)

diff --git a/node/metrics/snarkOS-grafana.json b/node/metrics/snarkOS-grafana.json
index 8e0a7cacfe..d86a954c8d 100644
--- a/node/metrics/snarkOS-grafana.json
+++ b/node/metrics/snarkOS-grafana.json
@@ -1,41 +1,4 @@
 {
-  "__inputs": [
-    {
-      "name": "DS_PROMETHEUS",
-      "label": "prometheus",
-      "description": "",
-      "type": "datasource",
-      "pluginId": "prometheus",
-      "pluginName": "Prometheus"
-    }
-  ],
-  "__elements": {},
-  "__requires": [
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "10.2.3"
-    },
-    {
-      "type": "datasource",
-      "id": "prometheus",
-      "name": "Prometheus",
-      "version": "1.0.0"
-    },
-    {
-      "type": "panel",
-      "id": "stat",
-      "name": "Stat",
-      "version": ""
-    },
-    {
-      "type": "panel",
-      "id": "timeseries",
-      "name": "Time series",
-      "version": ""
-    }
-  ],
   "annotations": {
     "list": [
       {
@@ -61,11 +24,12 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": null,
+  "id": 1,
   "links": [],
   "liveNow": false,
   "panels": [
     {
+      "collapsed": false,
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -73,52 +37,88 @@
         "y": 0
       },
       "id": 26,
+      "panels": [],
       "title": "Aleo Network",
       "type": "row"
     },
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "palette-classic"
+            "mode": "thresholds"
           },
-          "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"
-            }
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 6,
+        "x": 0,
+        "y": 1
+      },
+      "id": 49,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.4.1",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "adgg6tp3e19fkc"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "snarkos_blocks_height_total",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Block Height",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "adgg6tp3e19fkc"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
           },
-          "displayName": "Connected Peers",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -129,7 +129,7 @@
               },
               {
                 "color": "red",
-                "value": 80
+                "value": 60
               }
             ]
           }
@@ -138,43 +138,59 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 12,
-        "x": 0,
+        "w": 6,
+        "x": 6,
         "y": 1
       },
-      "id": 27,
+      "id": 48,
       "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
         },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
+      "pluginVersion": "10.4.1",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
           "editorMode": "code",
-          "expr": "snarkos_router_connected_total",
+          "expr": "avg(\n  1 / rate(snarkos_blocks_height_total{}[1m])\n) < +inf",
+          "instant": false,
           "legendFormat": "__auto",
           "range": true,
           "refId": "A"
         }
       ],
-      "title": "Connected Peers",
-      "type": "timeseries"
+      "title": "Average Seconds/Block over last minute",
+      "transformations": [
+        {
+          "id": "reduce",
+          "options": {
+            "reducers": [
+              "mean"
+            ]
+          }
+        }
+      ],
+      "type": "stat"
     },
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
@@ -213,7 +229,6 @@
               "mode": "off"
             }
           },
-          "displayName": "Candidate Peers",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -221,10 +236,6 @@
               {
                 "color": "green",
                 "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
               }
             ]
           }
@@ -237,7 +248,7 @@
         "x": 12,
         "y": 1
       },
-      "id": 28,
+      "id": 23,
       "options": {
         "legend": {
           "calcs": [],
@@ -250,26 +261,27 @@
           "sort": "none"
         }
       },
+      "pluginVersion": "10.4.1",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
           "editorMode": "code",
-          "expr": "snarkos_router_candidate_total",
+          "expr": "snarkos_blocks_height_total",
           "legendFormat": "__auto",
           "range": true,
           "refId": "A"
         }
       ],
-      "title": "Candidate Peers",
+      "title": "Block Height",
       "type": "timeseries"
     },
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
@@ -349,7 +361,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
           "editorMode": "code",
           "expr": "snarkos_router_restricted_total",
@@ -364,13 +376,46 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "thresholds"
+            "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 Transactions",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -390,43 +435,44 @@
         "x": 12,
         "y": 9
       },
-      "id": 23,
+      "id": 36,
       "options": {
-        "colorMode": "value",
-        "graphMode": "area",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
         },
-        "textMode": "auto",
-        "wideLayout": true
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
       },
-      "pluginVersion": "10.2.3",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
-          "editorMode": "code",
-          "expr": "snarkos_blocks_height_total",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "snarkos_blocks_transactions_total",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
           "legendFormat": "__auto",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         }
       ],
-      "title": "Block Height",
-      "type": "stat"
+      "title": "Total Transactions",
+      "type": "timeseries"
     },
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
@@ -502,7 +548,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
           "editorMode": "builder",
           "expr": "sum(rate(snarkos_blocks_transactions_total[5m]))",
@@ -517,7 +563,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
@@ -556,7 +602,7 @@
               "mode": "off"
             }
           },
-          "displayName": "Total Transactions",
+          "displayName": "Total Transmissions",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -576,7 +622,7 @@
         "x": 12,
         "y": 17
       },
-      "id": 36,
+      "id": 42,
       "options": {
         "legend": {
           "calcs": [],
@@ -593,11 +639,11 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "snarkos_blocks_transactions_total",
+          "expr": "snarkos_blocks_solutions_total",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -607,13 +653,13 @@
           "useBackend": false
         }
       ],
-      "title": "Total Transactions",
+      "title": "Total Solutions",
       "type": "timeseries"
     },
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
@@ -652,7 +698,7 @@
               "mode": "off"
             }
           },
-          "displayName": "Total Solutions",
+          "displayName": "Total Stake",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -660,6 +706,10 @@
               {
                 "color": "green",
                 "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
               }
             ]
           }
@@ -672,7 +722,7 @@
         "x": 0,
         "y": 25
       },
-      "id": 41,
+      "id": 31,
       "options": {
         "legend": {
           "calcs": [],
@@ -689,11 +739,11 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "snarkos_blocks_solutions_total",
+          "expr": "snarkvm_ledger_committee_total_stake",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -703,13 +753,13 @@
           "useBackend": false
         }
       ],
-      "title": "Total Solutions",
+      "title": "Total Stake",
       "type": "timeseries"
     },
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
@@ -748,7 +798,6 @@
               "mode": "off"
             }
           },
-          "displayName": "Total Transmissions",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -756,6 +805,10 @@
               {
                 "color": "green",
                 "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
               }
             ]
           }
@@ -768,7 +821,7 @@
         "x": 12,
         "y": 25
       },
-      "id": 42,
+      "id": 47,
       "options": {
         "legend": {
           "calcs": [],
@@ -785,11 +838,11 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "snarkos_blocks_transmissions_total",
+          "expr": "snarkos_bft_connected_total",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -799,13 +852,13 @@
           "useBackend": false
         }
       ],
-      "title": "Total Transmissions",
+      "title": "SnarkOS BFT Connected Total",
       "type": "timeseries"
     },
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
@@ -844,7 +897,7 @@
               "mode": "off"
             }
           },
-          "displayName": "Total Stake",
+          "displayName": "Connected Peers",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -868,7 +921,7 @@
         "x": 0,
         "y": 33
       },
-      "id": 31,
+      "id": 27,
       "options": {
         "legend": {
           "calcs": [],
@@ -885,46 +938,61 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
-          "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "snarkvm_ledger_committee_total_stake",
-          "fullMetaSearch": false,
-          "includeNullMetadata": true,
-          "instant": false,
+          "editorMode": "code",
+          "expr": "snarkos_router_connected_total",
           "legendFormat": "__auto",
           "range": true,
-          "refId": "A",
-          "useBackend": false
+          "refId": "A"
         }
       ],
-      "title": "Total Stake",
+      "title": "Connected Peers",
       "type": "timeseries"
     },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 41
-      },
-      "id": 18,
-      "panels": [],
-      "title": "BFT",
-      "type": "row"
-    },
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "thresholds"
+            "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": "Candidate Peers",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -932,6 +1000,10 @@
               {
                 "color": "green",
                 "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
               }
             ]
           }
@@ -940,51 +1012,56 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 6,
-        "x": 0,
-        "y": 42
+        "w": 12,
+        "x": 12,
+        "y": 33
       },
-      "id": 16,
+      "id": 28,
       "options": {
-        "colorMode": "value",
-        "graphMode": "area",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
         },
-        "textMode": "auto",
-        "wideLayout": true
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
       },
-      "pluginVersion": "10.2.3",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
-          "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "snarkos_bft_primary_proposal_round",
-          "fullMetaSearch": false,
-          "includeNullMetadata": true,
+          "editorMode": "code",
+          "expr": "snarkos_router_candidate_total",
           "legendFormat": "__auto",
           "range": true,
-          "refId": "A",
-          "useBackend": false
+          "refId": "A"
         }
       ],
-      "title": "Current Round",
-      "type": "stat"
+      "title": "Candidate Peers",
+      "type": "timeseries"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 41
+      },
+      "id": 18,
+      "panels": [],
+      "title": "BFT",
+      "type": "row"
     },
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
@@ -1006,11 +1083,11 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 6,
-        "x": 6,
+        "w": 8,
+        "x": 0,
         "y": 42
       },
-      "id": 25,
+      "id": 16,
       "options": {
         "colorMode": "value",
         "graphMode": "area",
@@ -1023,30 +1100,35 @@
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "10.2.3",
+      "pluginVersion": "10.4.1",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
-          "editorMode": "code",
-          "expr": "snarkos_consensus_last_committed_round",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "snarkos_bft_primary_proposal_round",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "__auto",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         }
       ],
-      "title": "Last Committed Round",
+      "title": "Current Round",
       "type": "stat"
     },
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
@@ -1068,11 +1150,11 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 6,
-        "x": 12,
+        "w": 8,
+        "x": 8,
         "y": 42
       },
-      "id": 12,
+      "id": 25,
       "options": {
         "colorMode": "value",
         "graphMode": "area",
@@ -1085,30 +1167,31 @@
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "10.2.3",
+      "pluginVersion": "10.4.1",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
-          "editorMode": "builder",
-          "expr": "snarkos_consensus_committed_certificates_total",
+          "editorMode": "code",
+          "expr": "snarkos_consensus_last_committed_round",
           "legendFormat": "__auto",
           "range": true,
           "refId": "A"
         }
       ],
-      "title": "Committed Certificates",
+      "title": "Last Committed Round",
       "type": "stat"
     },
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
@@ -1130,8 +1213,8 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 6,
-        "x": 18,
+        "w": 8,
+        "x": 16,
         "y": 42
       },
       "id": 24,
@@ -1147,15 +1230,16 @@
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "10.2.3",
+      "pluginVersion": "10.4.1",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
           "editorMode": "code",
           "expr": "snarkos_bft_leaders_elected_total",
@@ -1170,7 +1254,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
@@ -1192,371 +1276,37 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 6,
-        "x": 0,
+        "w": 7,
+        "x": 4,
         "y": 50
       },
       "id": 40,
       "options": {
         "colorMode": "value",
-        "graphMode": "area",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto",
-        "wideLayout": true
-      },
-      "pluginVersion": "10.2.3",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "snarkos_bft_primary_certified_batches",
-          "fullMetaSearch": false,
-          "includeNullMetadata": true,
-          "instant": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A",
-          "useBackend": false
-        }
-      ],
-      "title": "Certified Batches",
-      "type": "stat"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 58
-      },
-      "id": 10,
-      "panels": [],
-      "title": "Consensus",
-      "type": "row"
-    },
-    {
-      "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": "Average Certificate Commit Latency",
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 9,
-        "x": 0,
-        "y": 59
-      },
-      "id": 8,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.4.1",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "disableTextWrap": false,
-          "editorMode": "builder",
-          "exemplar": false,
-          "expr": "avg(snarkos_consensus_certificate_commit_latency_secs)",
-          "format": "time_series",
-          "fullMetaSearch": false,
-          "includeNullMetadata": true,
-          "instant": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A",
-          "useBackend": false
-        }
-      ],
-      "title": "Certificate Commit Latency",
-      "transformations": [
-        {
-          "id": "filterByValue",
-          "options": {
-            "filters": [
-              {
-                "config": {
-                  "id": "equal",
-                  "options": {
-                    "value": ""
-                  }
-                },
-                "fieldName": "certificate_round"
-              }
-            ],
-            "match": "all",
-            "type": "exclude"
-          }
-        }
-      ],
-      "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": "Average round latency",
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 15
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 9,
-        "x": 9,
-        "y": 59
-      },
-      "id": 14,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "disableTextWrap": false,
-          "editorMode": "builder",
-          "exemplar": false,
-          "expr": "avg(snarkos_bft_commit_rounds_latency_secs)",
-          "format": "time_series",
-          "fullMetaSearch": false,
-          "includeNullMetadata": true,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A",
-          "useBackend": false
-        }
-      ],
-      "title": "Commit Rounds Latency",
-      "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 Transactions",
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 9,
-        "x": 0,
-        "y": 67
-      },
-      "id": 43,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
         },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
+      "pluginVersion": "10.4.1",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "snarkos_consensus_unconfirmed_transactions_total",
+          "expr": "snarkos_bft_primary_certified_batches",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -1566,52 +1316,19 @@
           "useBackend": false
         }
       ],
-      "title": "Total Unconfirmed Transactions",
-      "type": "timeseries"
+      "title": "Certified Batches",
+      "type": "stat"
     },
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "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"
-            }
+            "mode": "thresholds"
           },
-          "displayName": "Total Solutions",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -1627,48 +1344,61 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 9,
-        "x": 9,
-        "y": 67
+        "w": 7,
+        "x": 11,
+        "y": 50
       },
-      "id": 44,
+      "id": 12,
       "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
         },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
+      "pluginVersion": "10.4.1",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
-          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "snarkos_consensus_unconfirmed_solutions_total",
-          "fullMetaSearch": false,
-          "includeNullMetadata": true,
-          "instant": false,
+          "expr": "snarkos_consensus_committed_certificates_total",
           "legendFormat": "__auto",
           "range": true,
-          "refId": "A",
-          "useBackend": false
+          "refId": "A"
         }
       ],
-      "title": "Total Unconfirmed Solutions",
-      "type": "timeseries"
+      "title": "Committed Certificates",
+      "type": "stat"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 58
+      },
+      "id": 10,
+      "panels": [],
+      "title": "Consensus",
+      "type": "row"
     },
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
@@ -1707,7 +1437,7 @@
               "mode": "off"
             }
           },
-          "displayName": "Total Transmissions",
+          "displayName": "Average Certificate Commit Latency",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -1715,19 +1445,24 @@
               {
                 "color": "green",
                 "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
               }
             ]
-          }
+          },
+          "unit": "s"
         },
         "overrides": []
       },
       "gridPos": {
         "h": 8,
-        "w": 9,
+        "w": 12,
         "x": 0,
-        "y": 75
+        "y": 59
       },
-      "id": 45,
+      "id": 8,
       "options": {
         "legend": {
           "calcs": [],
@@ -1740,15 +1475,18 @@
           "sort": "none"
         }
       },
+      "pluginVersion": "9.4.1",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "snarkos_consensus_unconfirmed_transmissions_total",
+          "exemplar": false,
+          "expr": "avg(snarkos_consensus_certificate_commit_latency_secs)",
+          "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -1758,13 +1496,33 @@
           "useBackend": false
         }
       ],
-      "title": "Total Unconfirmed Transmissions",
+      "title": "Certificate Commit Latency",
+      "transformations": [
+        {
+          "id": "filterByValue",
+          "options": {
+            "filters": [
+              {
+                "config": {
+                  "id": "equal",
+                  "options": {
+                    "value": ""
+                  }
+                },
+                "fieldName": "certificate_round"
+              }
+            ],
+            "match": "all",
+            "type": "exclude"
+          }
+        }
+      ],
       "type": "timeseries"
     },
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
@@ -1803,7 +1561,7 @@
               "mode": "off"
             }
           },
-          "displayName": "Average Block Latency",
+          "displayName": "Average round latency",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -1814,20 +1572,21 @@
               },
               {
                 "color": "red",
-                "value": 80
+                "value": 15
               }
             ]
-          }
+          },
+          "unit": "s"
         },
         "overrides": []
       },
       "gridPos": {
         "h": 8,
-        "w": 9,
-        "x": 9,
-        "y": 75
+        "w": 12,
+        "x": 12,
+        "y": 59
       },
-      "id": 38,
+      "id": 14,
       "options": {
         "legend": {
           "calcs": [],
@@ -1844,40 +1603,28 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "avg(snarkos_consensus_block_latency_secs)",
+          "exemplar": false,
+          "expr": "avg(snarkos_bft_commit_rounds_latency_secs)",
+          "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
-          "instant": false,
           "legendFormat": "__auto",
           "range": true,
           "refId": "A",
           "useBackend": false
         }
       ],
-      "title": "Block Latency",
+      "title": "Commit Rounds Latency",
       "type": "timeseries"
     },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 83
-      },
-      "id": 4,
-      "panels": [],
-      "title": "Network",
-      "type": "row"
-    },
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
@@ -1916,7 +1663,7 @@
               "mode": "off"
             }
           },
-          "displayName": "Queue Depth",
+          "displayName": "Total Transactions",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -1924,10 +1671,6 @@
               {
                 "color": "green",
                 "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
               }
             ]
           }
@@ -1937,10 +1680,10 @@
       "gridPos": {
         "h": 8,
         "w": 12,
-        "x": 6,
-        "y": 84
+        "x": 0,
+        "y": 67
       },
-      "id": 37,
+      "id": 43,
       "options": {
         "legend": {
           "calcs": [],
@@ -1957,11 +1700,11 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "snarkos_tcp_tasks_total",
+          "expr": "snarkos_consensus_unconfirmed_transactions_total",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -1971,13 +1714,13 @@
           "useBackend": false
         }
       ],
-      "title": "TCP Queue Depth",
+      "title": "Total Unconfirmed Transactions",
       "type": "timeseries"
     },
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
@@ -2016,7 +1759,7 @@
               "mode": "off"
             }
           },
-          "displayName": "average encrypt time",
+          "displayName": "Total Solutions",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -2024,24 +1767,19 @@
               {
                 "color": "green",
                 "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
               }
             ]
-          },
-          "unit": "µs"
+          }
         },
         "overrides": []
       },
       "gridPos": {
         "h": 8,
         "w": 12,
-        "x": 0,
-        "y": 92
+        "x": 12,
+        "y": 67
       },
-      "id": 32,
+      "id": 44,
       "options": {
         "legend": {
           "calcs": [],
@@ -2058,11 +1796,11 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "avg(snarkos_tcp_noise_codec_encryption_micros)",
+          "expr": "snarkos_consensus_unconfirmed_solutions_total",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -2072,13 +1810,13 @@
           "useBackend": false
         }
       ],
-      "title": "Encryption Time",
+      "title": "Total Unconfirmed Solutions",
       "type": "timeseries"
     },
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
@@ -2117,7 +1855,7 @@
               "mode": "off"
             }
           },
-          "displayName": "average decrypt time",
+          "displayName": "Total Transmissions",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -2125,24 +1863,19 @@
               {
                 "color": "green",
                 "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
               }
             ]
-          },
-          "unit": "µs"
+          }
         },
         "overrides": []
       },
       "gridPos": {
         "h": 8,
         "w": 12,
-        "x": 12,
-        "y": 92
+        "x": 0,
+        "y": 75
       },
-      "id": 33,
+      "id": 45,
       "options": {
         "legend": {
           "calcs": [],
@@ -2159,30 +1892,27 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "exemplar": false,
-          "expr": "avg(snarkos_tcp_noise_codec_decryption_micros)",
-          "format": "time_series",
+          "expr": "snarkos_consensus_unconfirmed_transmissions_total",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
-          "interval": "",
           "legendFormat": "__auto",
           "range": true,
           "refId": "A",
           "useBackend": false
         }
       ],
-      "title": "Decryption Time",
+      "title": "Total Unconfirmed Transmissions",
       "type": "timeseries"
     },
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
@@ -2221,7 +1951,7 @@
               "mode": "off"
             }
           },
-          "displayName": "Average Size",
+          "displayName": "Average Block Latency",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -2235,18 +1965,17 @@
                 "value": 80
               }
             ]
-          },
-          "unit": "decbytes"
+          }
         },
         "overrides": []
       },
       "gridPos": {
         "h": 8,
         "w": 12,
-        "x": 0,
-        "y": 100
+        "x": 12,
+        "y": 75
       },
-      "id": 34,
+      "id": 38,
       "options": {
         "legend": {
           "calcs": [],
@@ -2263,11 +1992,11 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "avg(snarkos_tcp_noise_codec_encryption_size)",
+          "expr": "avg(snarkos_consensus_block_latency_secs)",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -2277,13 +2006,26 @@
           "useBackend": false
         }
       ],
-      "title": "Encryption Size",
+      "title": "Block Latency",
       "type": "timeseries"
     },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 83
+      },
+      "id": 4,
+      "panels": [],
+      "title": "Network",
+      "type": "row"
+    },
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
+        "uid": "adgg6tp3e19fkc"
       },
       "fieldConfig": {
         "defaults": {
@@ -2322,7 +2064,7 @@
               "mode": "off"
             }
           },
-          "displayName": "Average Size",
+          "displayName": "Queue Depth",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -2336,18 +2078,17 @@
                 "value": 80
               }
             ]
-          },
-          "unit": "decbytes"
+          }
         },
         "overrides": []
       },
       "gridPos": {
         "h": 8,
         "w": 12,
-        "x": 12,
-        "y": 100
+        "x": 6,
+        "y": 84
       },
-      "id": 35,
+      "id": 37,
       "options": {
         "legend": {
           "calcs": [],
@@ -2364,11 +2105,11 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
+            "uid": "adgg6tp3e19fkc"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "avg(snarkos_tcp_noise_codec_decryption_size)",
+          "expr": "snarkos_tcp_tasks_total",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -2378,7 +2119,7 @@
           "useBackend": false
         }
       ],
-      "title": "Decryption Size",
+      "title": "TCP Queue Depth",
       "type": "timeseries"
     }
   ],
@@ -2393,8 +2134,8 @@
     "list": []
   },
   "time": {
-    "from": "now-5m",
-    "to": "now"
+    "from": "now-30m",
+    "to": "now-18m"
   },
   "timepicker": {
     "refresh_intervals": [
@@ -2412,7 +2153,6 @@
   },
   "timezone": "",
   "title": "snarkOS",
-  "uid": "ahTJm4-4k",
-  "version": 1,
+  "version": 3,
   "weekStart": ""
 }
\ No newline at end of file

From 7b910e82267d52223cc0a219a7a78d5189902f8d Mon Sep 17 00:00:00 2001
From: miazn <mzhangnacke@gmail.com>
Date: Fri, 22 Mar 2024 13:53:31 -0400
Subject: [PATCH 11/13] generalize the prometheus datasource id

---
 node/metrics/snarkOS-grafana.json | 92 +++++++++++++++----------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/node/metrics/snarkOS-grafana.json b/node/metrics/snarkOS-grafana.json
index d86a954c8d..2da0e15189 100644
--- a/node/metrics/snarkOS-grafana.json
+++ b/node/metrics/snarkOS-grafana.json
@@ -44,7 +44,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -92,7 +92,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -112,7 +112,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -164,7 +164,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
           "expr": "avg(\n  1 / rate(snarkos_blocks_height_total{}[1m])\n) < +inf",
@@ -190,7 +190,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -266,7 +266,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
           "expr": "snarkos_blocks_height_total",
@@ -281,7 +281,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -361,7 +361,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
           "expr": "snarkos_router_restricted_total",
@@ -376,7 +376,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -452,7 +452,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -472,7 +472,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -548,7 +548,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "builder",
           "expr": "sum(rate(snarkos_blocks_transactions_total[5m]))",
@@ -563,7 +563,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -639,7 +639,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -659,7 +659,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -739,7 +739,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -759,7 +759,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -838,7 +838,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -858,7 +858,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -938,7 +938,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
           "expr": "snarkos_router_connected_total",
@@ -953,7 +953,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -1033,7 +1033,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
           "expr": "snarkos_router_candidate_total",
@@ -1061,7 +1061,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -1109,7 +1109,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -1128,7 +1128,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -1176,7 +1176,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
           "expr": "snarkos_consensus_last_committed_round",
@@ -1191,7 +1191,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -1239,7 +1239,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
           "expr": "snarkos_bft_leaders_elected_total",
@@ -1254,7 +1254,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -1302,7 +1302,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -1322,7 +1322,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -1370,7 +1370,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "builder",
           "expr": "snarkos_consensus_committed_certificates_total",
@@ -1398,7 +1398,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -1480,7 +1480,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -1522,7 +1522,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -1603,7 +1603,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -1624,7 +1624,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -1700,7 +1700,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -1720,7 +1720,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -1796,7 +1796,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -1816,7 +1816,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -1892,7 +1892,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -1912,7 +1912,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -1992,7 +1992,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -2025,7 +2025,7 @@
     {
       "datasource": {
         "type": "prometheus",
-        "uid": "adgg6tp3e19fkc"
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -2105,7 +2105,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "adgg6tp3e19fkc"
+            "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
           "editorMode": "builder",

From 6eede72197d4fea3242ee3a88ebeb0c65c1a08a1 Mon Sep 17 00:00:00 2001
From: miazn <mzhangnacke@gmail.com>
Date: Fri, 22 Mar 2024 13:54:14 -0400
Subject: [PATCH 12/13] default time

---
 node/metrics/snarkOS-grafana.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/node/metrics/snarkOS-grafana.json b/node/metrics/snarkOS-grafana.json
index 2da0e15189..485725ba39 100644
--- a/node/metrics/snarkOS-grafana.json
+++ b/node/metrics/snarkOS-grafana.json
@@ -2134,8 +2134,8 @@
     "list": []
   },
   "time": {
-    "from": "now-30m",
-    "to": "now-18m"
+    "from": "now-5m",
+    "to": "now"
   },
   "timepicker": {
     "refresh_intervals": [

From 28d04ab4e886209b484b4dde9ca6e2f57877ea84 Mon Sep 17 00:00:00 2001
From: miazn <mzhangnacke@gmail.com>
Date: Fri, 22 Mar 2024 14:03:01 -0400
Subject: [PATCH 13/13] keep default input

---
 node/metrics/snarkOS-grafana.json | 38 ++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/node/metrics/snarkOS-grafana.json b/node/metrics/snarkOS-grafana.json
index 485725ba39..e837e590f7 100644
--- a/node/metrics/snarkOS-grafana.json
+++ b/node/metrics/snarkOS-grafana.json
@@ -1,4 +1,40 @@
-{
+{  "__inputs": [
+  {
+    "name": "DS_PROMETHEUS",
+    "label": "prometheus",
+    "description": "",
+    "type": "datasource",
+    "pluginId": "prometheus",
+    "pluginName": "Prometheus"
+  }
+],
+"__elements": {},
+"__requires": [
+  {
+    "type": "grafana",
+    "id": "grafana",
+    "name": "Grafana",
+    "version": "10.2.3"
+  },
+  {
+    "type": "datasource",
+    "id": "prometheus",
+    "name": "Prometheus",
+    "version": "1.0.0"
+  },
+  {
+    "type": "panel",
+    "id": "stat",
+    "name": "Stat",
+    "version": ""
+  },
+  {
+    "type": "panel",
+    "id": "timeseries",
+    "name": "Time series",
+    "version": ""
+  }
+],
   "annotations": {
     "list": [
       {