Merge branch 'develop' of https://github.com/stacks-network/stacks-core into feat/mock-signature-aggregation

Author: jferrant

.github/workflows/bitcoin-tests.yml

@@ -72,6 +72,7 @@ jobs:
           - tests::neon_integrations::confirm_unparsed_ongoing_ops
           - tests::neon_integrations::min_txs
           - tests::neon_integrations::vote_for_aggregate_key_burn_op_test
+          - tests::neon_integrations::mock_miner_replay
           - tests::epoch_25::microblocks_disabled
           - tests::should_succeed_handling_malformed_and_valid_txs
           - tests::nakamoto_integrations::simple_neon_integration
@@ -96,6 +97,7 @@ jobs:
           - tests::signer::v0::signer_set_rollover
           - tests::signer::v0::miner_forking
           - tests::signer::v0::reloads_signer_set_in
+          - tests::signer::v0::signers_broadcast_signed_blocks
           - tests::nakamoto_integrations::stack_stx_burn_op_integration_test
           - tests::nakamoto_integrations::check_block_heights
           - tests::nakamoto_integrations::clarity_burn_state

docs/rpc-endpoints.md

@@ -427,7 +427,7 @@ Determine whether a given trait is implemented within the specified contract (ei
 
 See OpenAPI [spec](./rpc/openapi.yaml) for details.
 
-### POST /v2/block_proposal
+### POST /v3/block_proposal
 
 Used by miner to validate a proposed Stacks block using JSON encoding.
 

libsigner/src/runloop.rs

@@ -53,7 +53,7 @@ pub trait SignerRunLoop<R: Send, CMD: Send, T: SignerEventTrait> {
         &mut self,
         event: Option<SignerEvent<T>>,
         cmd: Option<CMD>,
-        res: Sender<R>,
+        res: &Sender<R>,
     ) -> Option<R>;
 
     /// This is the main loop body for the signer. It continuously receives events from
@@ -70,6 +70,7 @@ pub trait SignerRunLoop<R: Send, CMD: Send, T: SignerEventTrait> {
         result_send: Sender<R>,
         mut event_stop_signaler: EVST,
     ) -> Option<R> {
+        info!("Signer runloop begin");
         loop {
             let poll_timeout = self.get_event_timeout();
             let next_event_opt = match event_recv.recv_timeout(poll_timeout) {
@@ -83,7 +84,7 @@ pub trait SignerRunLoop<R: Send, CMD: Send, T: SignerEventTrait> {
             // Do not block for commands
             let next_command_opt = command_recv.try_recv().ok();
             if let Some(final_state) =
-                self.run_one_pass(next_event_opt, next_command_opt, result_send.clone())
+                self.run_one_pass(next_event_opt, next_command_opt, &result_send)
             {
                 info!("Runloop exit; signaling event-receiver to stop");
                 event_stop_signaler.send();

libsigner/src/tests/mod.rs

@@ -76,7 +76,7 @@ impl<T: SignerEventTrait> SignerRunLoop<Vec<SignerEvent<T>>, Command, T> for Sim
         &mut self,
         event: Option<SignerEvent<T>>,
         _cmd: Option<Command>,
-        _res: Sender<Vec<SignerEvent<T>>>,
+        _res: &Sender<Vec<SignerEvent<T>>>,
     ) -> Option<Vec<SignerEvent<T>>> {
         debug!("Got event: {:?}", &event);
         if let Some(event) = event {

stacks-common/src/types/chainstate.rs

@@ -30,11 +30,11 @@ impl_byte_array_serde!(TrieHash);
 
 pub const TRIEHASH_ENCODED_SIZE: usize = 32;
 
-#[derive(Serialize, Deserialize)]
 pub struct BurnchainHeaderHash(pub [u8; 32]);
 impl_array_newtype!(BurnchainHeaderHash, u8, 32);
 impl_array_hexstring_fmt!(BurnchainHeaderHash);
 impl_byte_array_newtype!(BurnchainHeaderHash, u8, 32);
+impl_byte_array_serde!(BurnchainHeaderHash);
 
 pub struct BlockHeaderHash(pub [u8; 32]);
 impl_array_newtype!(BlockHeaderHash, u8, 32);

stacks-common/src/util/macros.rs

@@ -617,6 +617,28 @@ macro_rules! impl_byte_array_serde {
     };
 }
 
+#[allow(unused_macros)]
+#[macro_export]
+macro_rules! impl_file_io_serde_json {
+    ($thing:ident) => {
+        impl $thing {
+            pub fn serialize_to_file<P>(&self, path: P) -> Result<(), std::io::Error>
+            where
+                P: AsRef<std::path::Path>,
+            {
+                $crate::util::serialize_json_to_file(self, path)
+            }
+
+            pub fn deserialize_from_file<P>(path: P) -> Result<Self, std::io::Error>
+            where
+                P: AsRef<std::path::Path>,
+            {
+                $crate::util::deserialize_json_from_file(path)
+            }
+        }
+    };
+}
+
 // print debug statements while testing
 #[allow(unused_macros)]
 #[macro_export]

stacks-common/src/util/mod.rs

@@ -28,6 +28,9 @@ pub mod uint;
 pub mod vrf;
 
 use std::collections::HashMap;
+use std::fs::File;
+use std::io::{BufReader, BufWriter, Write};
+use std::path::Path;
 use std::time::{SystemTime, UNIX_EPOCH};
 use std::{error, fmt, thread, time};
 
@@ -120,3 +123,26 @@ pub mod db_common {
         true
     }
 }
+
+/// Write any `serde_json` object directly to a file
+pub fn serialize_json_to_file<J, P>(json: &J, path: P) -> Result<(), std::io::Error>
+where
+    J: ?Sized + serde::Serialize,
+    P: AsRef<Path>,
+{
+    let file = File::create(path)?;
+    let mut writer = BufWriter::new(file);
+    serde_json::to_writer(&mut writer, json)?;
+    writer.flush()
+}
+
+/// Read any `serde_json` object directly from a file
+pub fn deserialize_json_from_file<J, P>(path: P) -> Result<J, std::io::Error>
+where
+    J: serde::de::DeserializeOwned,
+    P: AsRef<Path>,
+{
+    let file = File::open(path)?;
+    let reader = BufReader::new(file);
+    serde_json::from_reader::<_, J>(reader).map_err(std::io::Error::from)
+}

stacks-signer/src/client/mod.rs

@@ -570,6 +570,7 @@ pub(crate) mod tests {
             db_path: config.db_path.clone(),
             first_proposal_burn_block_timing: config.first_proposal_burn_block_timing,
             block_proposal_timeout: config.block_proposal_timeout,
+            broadcast_signed_blocks: true,
         }
     }
 

stacks-signer/src/client/stacks_client.rs

@@ -685,8 +685,13 @@ impl StacksClient {
     pub fn post_block(&self, block: &NakamotoBlock) -> Result<bool, ClientError> {
         let response = self
             .stacks_node_client
-            .post(format!("{}{}", self.http_origin, postblock_v3::PATH))
+            .post(format!(
+                "{}{}?broadcast=1",
+                self.http_origin,
+                postblock_v3::PATH
+            ))
             .header("Content-Type", "application/octet-stream")
+            .header(AUTHORIZATION, self.auth_password.clone())
             .body(block.serialize_to_vec())
             .send()?;
         if !response.status().is_success() {
@@ -789,7 +794,7 @@ impl StacksClient {
     }
 
     fn block_proposal_path(&self) -> String {
-        format!("{}/v2/block_proposal", self.http_origin)
+        format!("{}/v3/block_proposal", self.http_origin)
     }
 
     fn sortition_info_path(&self) -> String {
@@ -814,7 +819,7 @@ impl StacksClient {
     }
 
     fn reward_set_path(&self, reward_cycle: u64) -> String {
-        format!("{}/v2/stacker_set/{reward_cycle}", self.http_origin)
+        format!("{}/v3/stacker_set/{reward_cycle}", self.http_origin)
     }
 
     fn fees_transaction_path(&self) -> String {

stacks-signer/src/config.rs

@@ -157,6 +157,8 @@ pub struct SignerConfig {
     pub first_proposal_burn_block_timing: Duration,
     /// How much time to wait for a miner to propose a block following a sortition
     pub block_proposal_timeout: Duration,
+    /// Broadcast a block to the node if we gather enough signatures from other signers
+    pub broadcast_signed_blocks: bool,
 }
 
 /// The parsed configuration for the signer
@@ -201,6 +203,8 @@ pub struct GlobalConfig {
     pub first_proposal_burn_block_timing: Duration,
     /// How much time to wait for a miner to propose a block following a sortition
     pub block_proposal_timeout: Duration,
+    /// Broadcast a block to the node if we gather enough signatures from other signers
+    pub broadcast_signed_blocks: bool,
 }
 
 /// Internal struct for loading up the config file
@@ -357,6 +361,7 @@ impl TryFrom<RawConfigFile> for GlobalConfig {
             metrics_endpoint,
             first_proposal_burn_block_timing,
             block_proposal_timeout,
+            broadcast_signed_blocks: true,
         })
     }
 }