Merge pull request #298 from monadicus/chore-misc

chore: misc cleanup
monadicus · Oct 25, 2024 · dc30271 · dc30271
2 parents 10a90d2 + 7a5f2f6
commit dc30271
Show file tree

Hide file tree

Showing 12 changed files with 1,971 additions and 712 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -70,7 +70,7 @@ lazysort = "0.2"
 lazy_static = "1.5"
 lasso = { version = "0.7", features = ["multi-threaded"] }
 local-ip-address = "0.6"
-metrics-exporter-prometheus = "0.15"
+metrics-exporter-prometheus = "0.13"
 nix = { version = "0.29", features = ["process"] }
 num_cpus = "1.16"
 paste = "1.0"
@@ -117,25 +117,25 @@ url = "2.5"
 uuid = { version = "1.10", default-features = false }
 wildmatch = "2.4"
 
-# snops-checkpoint = { path = "./crates/snops-checkpoint" }
-# snops-common = { path = "./crates/snops-common" }
+snops-checkpoint = { path = "./crates/snops-checkpoint" }
+snops-common = { path = "./crates/snops-common" }
 
-snops-checkpoint = { version = "0.1" }
-snops-common = { version = "0.1" }
+# snops-checkpoint = { version = "0.1" }
+# snops-common = { version = "0.1" }
 
 # snarkos-account = { path = "../snarkos/account" }
 # snarkos-node = { path = "../snarkos/node" }
 # snarkvm = { path = "../snarkvm", features = ["rocks"] }
 # snarkos-node-metrics = { path = "../snarkos/node/metrics" }
 
-snarkos-account = { version = "3.0" }
-snarkos-node = { version = "3.0" }
-snarkos-node-metrics = { version = "3.0" }
-snarkvm = { version = "1.0", features = ["rocks"] }
+# snarkos-account = { version = "3.0" }
+# snarkos-node = { version = "3.0" }
+# snarkos-node-metrics = { version = "3.0" }
+# snarkvm = { version = "1.0", features = ["rocks"] }
 
-# snarkos-account = { git = "https://github.com/AleoNet/snarkOS", rev = "805bade" }
-# snarkos-node = { git = "https://github.com/AleoNet/snarkOS", rev = "805bade" }
-# snarkos-node-metrics = { git = "https://github.com/AleoNet/snarkOS", rev = "805bade" }
-# snarkvm = { git = "https://github.com/AleoNet/snarkVM", rev = "5bb50a8", features = [
-# 	"rocks",
-# ] }
+snarkos-account = { git = "https://github.com/AleoNet/snarkOS", rev = "ba2ce9a" }
+snarkos-node = { git = "https://github.com/AleoNet/snarkOS", rev = "ba2ce9a" }
+snarkos-node-metrics = { git = "https://github.com/AleoNet/snarkOS", rev = "ba2ce9a" }
+snarkvm = { git = "https://github.com/AleoNet/snarkVM", rev = "dea322b", features = [
+	"rocks",
+] }
diff --git a/crates/aot/src/runner/mod.rs b/crates/aot/src/runner/mod.rs
@@ -208,6 +208,7 @@ impl<N: Network> Runner<N> {
                     genesis,
                     None,
                     storage_mode.clone(),
+                    false,
                     shutdown,
                 )
                 .await?

diff --git a/crates/snops-agent/Cargo.toml b/crates/snops-agent/Cargo.toml
@@ -43,3 +43,4 @@ tracing-appender.workspace = true
 tracing.workspace = true
 tracing-subscriber.workspace = true
 url.workspace = true
+rustls = { version = "0.23.15", features = ["ring"] }
diff --git a/crates/snops-agent/src/main.rs b/crates/snops-agent/src/main.rs
@@ -64,6 +64,10 @@ fn make_env_filter(level: LevelFilter) -> EnvFilter {
 
 #[tokio::main]
 async fn main() {
+    rustls::crypto::ring::default_provider()
+        .install_default()
+        .expect("Failed to install rustls crypto provider");
+
     let (stdout, _guard) = tracing_appender::non_blocking(std::io::stdout());
     let start_time = Instant::now();
 

diff --git a/scripts/agent_watch.sh b/scripts/agent_watch.sh
@@ -3,4 +3,4 @@
 cargo watch -x 'build --profile release-big -p snops-agent' \
   -w ./crates/snops-agent \
   -w ./crates/snops-common \
-  -w ./crates/checkpoint
+  -w ./crates/snops-checkpoint
diff --git a/scripts/control_plane_watch.sh b/scripts/control_plane_watch.sh
@@ -3,4 +3,4 @@
 cargo watch -x 'run -p snops' \
   -w ./crates/snops \
   -w ./crates/snops-common \
-  -w ./crates/checkpoint
+  -w ./crates/snops-checkpoint
diff --git a/scripts/control_plane_watch_prom.sh b/scripts/control_plane_watch_prom.sh
@@ -3,4 +3,4 @@
 cargo watch -x 'run -p snops -- --prometheus http://127.0.0.1:9090 --loki http://127.0.0.1:3100' \
   -w ./crates/snops \
   -w ./crates/snops-common \
-  -w ./crates/checkpoint
+  -w ./crates/snops-checkpoint
diff --git a/scripts/measure_tps.sh b/scripts/measure_tps.sh
@@ -2,6 +2,9 @@
 
 ENDPOINT="$1"
 NUM_BLOCKS="$2"
+if [ -z "$NETWORK"]; then
+  NETWORK="testnet"
+fi
 
 # check if mode is client, validator, or prover
 if [ -z "$ENDPOINT" ]; then
@@ -14,7 +17,7 @@ if [ -z "$NUM_BLOCKS" ]; then
   NUM_BLOCKS=10
 fi
 
-HEIGHT="$(curl -s $ENDPOINT/mainnet/latest/height)"
+HEIGHT="$(curl -s $ENDPOINT/$NETWORK/latest/height)"
 if [ -z "$HEIGHT" ]; then
   echo "error: failed to get height from $ENDPOINT"
   exit 1
@@ -48,7 +51,7 @@ prev_block_time=""
 
 # get all the blocks from (HEIGHT-NUM_BLOCKS) to HEIGHT
 for i in $(seq $((HEIGHT-NUM_BLOCKS+1)) $HEIGHT); do
-  block="$(curl -s $ENDPOINT/mainnet/block/$i)"
+  block="$(curl -s $ENDPOINT/$NETWORK/block/$i)"
 
   # update timestamps
   LAST_TIMESTAMP="$(echo $block | jq '.header.metadata.timestamp')"
-Original file line number
+Diff line change
@@ Expand Up / @@ -208,6 +208,7 @@ impl<N: Network> Runner<N> { @@
                         genesis,
                         None,
                         storage_mode.clone(),
+                        false,
                         shutdown,
                     )
                     .await?
@@ Expand Down @@