CRC: fix build error and move copyright text to top of monitor_signers file

Signed-off-by: Jacinta Ferrant <[email protected]>

Author: jferrant

stacks-signer/src/monitor_signers.rs

@@ -1,18 +1,3 @@
-use std::collections::HashMap;
-
-use clarity::codec::read_next;
-use clarity::types::chainstate::{StacksAddress, StacksPrivateKey, StacksPublicKey};
-use clarity::types::StacksEpochId;
-use clarity::util::sleep_ms;
-use libsigner::v0::messages::{MessageSlotID, SignerMessage};
-use libsigner::SignerSession;
-use slog::{slog_info, slog_warn};
-use stacks_common::{info, warn};
-
-use crate::cli::MonitorSignersArgs;
-use crate::client::{ClientError, SignerSlotID, StacksClient};
-use crate::utils::stackerdb_session;
-
 // Copyright (C) 2020-2024 Stacks Open Internet Foundation
 //
 // This program is free software: you can redistribute it and/or modify
@@ -28,6 +13,21 @@ use crate::utils::stackerdb_session;
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+use std::collections::HashMap;
+
+use clarity::codec::read_next;
+use clarity::types::chainstate::{StacksAddress, StacksPrivateKey, StacksPublicKey};
+use clarity::types::StacksEpochId;
+use clarity::util::sleep_ms;
+use libsigner::v0::messages::{MessageSlotID, SignerMessage};
+use libsigner::SignerSession;
+use slog::{slog_info, slog_warn};
+use stacks_common::{info, warn};
+
+use crate::cli::MonitorSignersArgs;
+use crate::client::{ClientError, SignerSlotID, StacksClient};
+use crate::utils::stackerdb_session;
+
 /// The `SignerMonitor` struct is used to monitor the signers stackerdb slots for expected new messages
 pub struct SignerMonitor {
     /// The client being used to monitor stackerdb messages

testnet/stacks-node/src/neon_node.rs

@@ -2268,6 +2268,7 @@ impl BlockMinerThread {
             stacks_tip_height,
             pox_consensus,
             server_version,
+            network_id: self.config.get_burnchain_config().chain_id,
         }
     }
 
@@ -2392,8 +2393,7 @@ impl BlockMinerThread {
             return Ok(());
         }
         let election_sortition = last_winner_snapshot.consensus_hash;
-        let mock_proposal =
-            MockProposal::new(peer_info, self.config.burnchain.chain_id, &mining_key);
+        let mock_proposal = MockProposal::new(peer_info, &mining_key);
 
         info!("Sending mock proposal to stackerdb: {mock_proposal:?}");