Merge branch 'develop' into debug/dkg-results

Author: obycode

.cargo/config

@@ -2,12 +2,10 @@
 stacks-node = "run --package stacks-node --"
 fmt-stacks = "fmt -- --config group_imports=StdExternalCrate,imports_granularity=Module"
 
-# Default to `native`
-# This makes it slightly faster for running tests and locally built binaries.
-# This can cause trouble when building "portable" binaries, such as for docker,
-# so disable it with the "portable" feature.
-[target.'cfg(not(feature = "portable"))']
-rustflags = ["-Ctarget-cpu=native"]
+# Uncomment to improve performance slightly, at the cost of portability
+#   * Note that native binaries may not run on CPUs that are different from the build machine
+# [build]
+# rustflags = ["-Ctarget-cpu=native"]
 
 # Needed by perf to generate flamegraphs.
 #[target.x86_64-unknown-linux-gnu]

.github/actions/dockerfiles/Dockerfile.debian-source

@@ -19,7 +19,7 @@ RUN --mount=type=tmpfs,target=${BUILD_DIR} cp -R /src/. ${BUILD_DIR}/ \
     && cd ${BUILD_DIR} \
     && rustup target add ${TARGET} \
     && rustup component add rustfmt \
-    && cargo build --features monitoring_prom,slog_json,portable --release --workspace --target ${TARGET} \
+    && cargo build --features monitoring_prom,slog_json --release --workspace --target ${TARGET} \
     && mkdir -p /out \
     && cp -R ${BUILD_DIR}/target/${TARGET}/release/. /out
 

Dockerfile

@@ -12,7 +12,7 @@ RUN apk add --no-cache musl-dev
 
 RUN mkdir /out
 
-RUN cd testnet/stacks-node && cargo build --features monitoring_prom,slog_json,portable --release
+RUN cd testnet/stacks-node && cargo build --features monitoring_prom,slog_json --release
 
 RUN cp target/release/stacks-node /out
 

Dockerfile.debian

@@ -10,7 +10,7 @@ COPY . .
 
 RUN mkdir /out
 
-RUN cd testnet/stacks-node && cargo build --features monitoring_prom,slog_json,portable --release
+RUN cd testnet/stacks-node && cargo build --features monitoring_prom,slog_json --release
 
 RUN cp target/release/stacks-node /out
 

README.md

@@ -49,6 +49,19 @@ cargo build --release
 cargo build --profile release-lite
 ```
 
+_Note on building_: you may set `RUSTFLAGS` to build binaries for your native cpu:
+
+```
+RUSTFLAGS="-Ctarget-cpu=native"
+```
+
+or uncomment these lines in `./cargo/config`:
+
+```
+# [build]
+# rustflags = ["-Ctarget-cpu=native"]
+```
+
 ## Testing
 
 **Run the tests:**

stacks-signer/Cargo.toml

@@ -60,6 +60,3 @@ features = ["arbitrary_precision", "unbounded_depth"]
 [dependencies.secp256k1]
 version = "0.24.3"
 features = ["serde", "recovery"]
-
-[features]
-portable = []

stacks-signer/src/cli.rs

@@ -44,11 +44,11 @@ pub struct Cli {
 /// Subcommands for the stacks signer binary
 #[derive(clap::Subcommand, Debug)]
 pub enum Command {
-    /// Get a chunk from the stacker-db instance
+    /// Get a chunk from the stacker-db instance in hex encoding
     GetChunk(GetChunkArgs),
-    /// Get the latest chunk from the stacker-db instance
+    /// Get the latest chunk from the stacker-db instance in hex encoding
     GetLatestChunk(GetLatestChunkArgs),
-    /// List chunks from the stacker-db instance
+    /// List chunks from the stacker-db instance in hex encoding
     ListChunks(StackerDBArgs),
     /// Upload a chunk to the stacker-db instance
     PutChunk(PutChunkArgs),
@@ -64,6 +64,8 @@ pub enum Command {
     GenerateFiles(GenerateFilesArgs),
     /// Generate a signature for Stacking transactions
     GenerateStackingSignature(GenerateStackingSignatureArgs),
+    /// Check a configuration file and output config information
+    CheckConfig(RunSignerArgs),
 }
 
 /// Basic arguments for all cyrptographic and stacker-db functionality
@@ -349,17 +351,16 @@ mod tests {
     }
 
     fn clarity_tuple_version(pox_addr: &PoxAddress) -> u8 {
-        pox_addr
+        *pox_addr
             .as_clarity_tuple()
             .expect("Failed to generate clarity tuple for pox address")
             .get("version")
             .expect("Expected version in clarity tuple")
             .clone()
             .expect_buff(1)
             .expect("Expected version to be a u128")
-            .get(0)
+            .first()
             .expect("Expected version to be a uint")
-            .clone()
     }
 
     #[test]

stacks-signer/src/client/mod.rs

@@ -116,6 +116,7 @@ pub(crate) mod tests {
     use blockstack_lib::net::api::getpoxinfo::{
         RPCPoxCurrentCycleInfo, RPCPoxEpoch, RPCPoxInfoData, RPCPoxNextCycleInfo,
     };
+    use blockstack_lib::net::api::postfeerate::{RPCFeeEstimate, RPCFeeEstimateResponse};
     use blockstack_lib::util_lib::boot::boot_code_id;
     use clarity::vm::costs::ExecutionCost;
     use clarity::vm::types::TupleData;
@@ -398,6 +399,44 @@ pub(crate) mod tests {
         format!("HTTP/1.1 200 OK\n\n{{\"okay\":true,\"result\":\"{hex}\"}}")
     }
 
+    /// Build a response for the get_medium_estimated_fee_ustx_response request with a specific medium estimate
+    pub fn build_get_medium_estimated_fee_ustx_response(
+        medium_estimate: u64,
+    ) -> (String, RPCFeeEstimateResponse) {
+        // Generate some random info
+        let fee_response = RPCFeeEstimateResponse {
+            estimated_cost: ExecutionCost {
+                write_length: thread_rng().next_u64(),
+                write_count: thread_rng().next_u64(),
+                read_length: thread_rng().next_u64(),
+                read_count: thread_rng().next_u64(),
+                runtime: thread_rng().next_u64(),
+            },
+            estimated_cost_scalar: thread_rng().next_u64(),
+            cost_scalar_change_by_byte: thread_rng().next_u32() as f64,
+            estimations: vec![
+                RPCFeeEstimate {
+                    fee_rate: thread_rng().next_u32() as f64,
+                    fee: thread_rng().next_u64(),
+                },
+                RPCFeeEstimate {
+                    fee_rate: thread_rng().next_u32() as f64,
+                    fee: medium_estimate,
+                },
+                RPCFeeEstimate {
+                    fee_rate: thread_rng().next_u32() as f64,
+                    fee: thread_rng().next_u64(),
+                },
+            ],
+        };
+        let fee_response_json = serde_json::to_string(&fee_response)
+            .expect("Failed to serialize fee estimate response");
+        (
+            format!("HTTP/1.1 200 OK\n\n{fee_response_json}"),
+            fee_response,
+        )
+    }
+
     /// Generate a signer config with the given number of signers and keys where the first signer is
     /// obtained from the provided global config
     pub fn generate_signer_config(
@@ -515,6 +554,7 @@ pub(crate) mod tests {
             nonce_timeout: config.nonce_timeout,
             sign_timeout: config.sign_timeout,
             tx_fee_ustx: config.tx_fee_ustx,
+            max_tx_fee_ustx: config.max_tx_fee_ustx,
             db_path: config.db_path.clone(),
         }
     }

stacks-signer/src/client/stackerdb.rs

@@ -100,7 +100,7 @@ impl StackerDB {
     }
 
     /// Sends message (as a raw msg ID and bytes) to the .signers stacker-db with an
-    ///  exponential backoff retry
+    /// exponential backoff retry
     pub fn send_message_bytes_with_retry(
         &mut self,
         msg_id: &MessageSlotID,
@@ -224,9 +224,7 @@ impl StackerDB {
     }
 
     /// Get this signer's latest transactions from stackerdb
-    pub fn get_current_transactions_with_retry(
-        &mut self,
-    ) -> Result<Vec<StacksTransaction>, ClientError> {
+    pub fn get_current_transactions(&mut self) -> Result<Vec<StacksTransaction>, ClientError> {
         let Some(transactions_session) = self
             .signers_message_stackerdb_sessions
             .get_mut(&MessageSlotID::Transactions)
@@ -237,7 +235,7 @@ impl StackerDB {
     }
 
     /// Get the latest signer transactions from signer ids for the next reward cycle
-    pub fn get_next_transactions_with_retry(
+    pub fn get_next_transactions(
         &mut self,
         signer_ids: &[SignerSlotID],
     ) -> Result<Vec<StacksTransaction>, ClientError> {
@@ -272,7 +270,7 @@ mod tests {
     use crate::config::GlobalConfig;
 
     #[test]
-    fn get_signer_transactions_with_retry_should_succeed() {
+    fn get_signer_transactions_should_succeed() {
         let config = GlobalConfig::load_from_file("./src/tests/conf/signer-0.toml").unwrap();
         let signer_config = generate_signer_config(&config, 5, 20);
         let mut stackerdb = StackerDB::from(&signer_config);
@@ -297,7 +295,7 @@ mod tests {
         let message = signer_message.serialize_to_vec();
 
         let signer_slot_ids = vec![SignerSlotID(0), SignerSlotID(1)];
-        let h = spawn(move || stackerdb.get_next_transactions_with_retry(&signer_slot_ids));
+        let h = spawn(move || stackerdb.get_next_transactions(&signer_slot_ids));
         let mut response_bytes = b"HTTP/1.1 200 OK\n\n".to_vec();
         response_bytes.extend(message);
         let mock_server = mock_server_from_config(&config);
@@ -315,7 +313,7 @@ mod tests {
     }
 
     #[test]
-    fn send_signer_message_with_retry_should_succeed() {
+    fn send_signer_message_should_succeed() {
         let config = GlobalConfig::load_from_file("./src/tests/conf/signer-1.toml").unwrap();
         let signer_config = generate_signer_config(&config, 5, 20);
         let mut stackerdb = StackerDB::from(&signer_config);