Merge remote-tracking branch 'origin/develop' into feat/dry-run-signer

Author: hstove

.github/workflows/bitcoin-tests.yml

@@ -124,6 +124,7 @@ jobs:
           - tests::signer::v0::signing_in_0th_tenure_of_reward_cycle
           - tests::signer::v0::continue_after_tenure_extend
           - tests::signer::v0::tenure_extend_after_idle_signers
+          - tests::signer::v0::tenure_extend_with_other_transactions
           - tests::signer::v0::tenure_extend_after_idle_miner
           - tests::signer::v0::tenure_extend_after_failed_miner
           - tests::signer::v0::tenure_extend_succeeds_after_rejected_attempt

CHANGELOG.md

@@ -8,12 +8,16 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 ## [Unreleased]
 
 ### Added
-- Add `dry_run` configuration option to `stacks-signer` config toml. Dry run mode will 
-  run the signer binary as if it were a registered signer. Instead of broadcasting 
+- Add `dry_run` configuration option to `stacks-signer` config toml. Dry run mode will
+  run the signer binary as if it were a registered signer. Instead of broadcasting
   `StackerDB` messages, it logs `INFO` messages. Other interactions with the `stacks-node`
   behave normally (e.g., submitting validation requests, submitting finished blocks). A
   dry run signer will error out if the supplied key is actually a registered signer.
 
+### Changed
+
+- Miner will include other transactions in blocks with tenure extend transactions (#5760)
+
 ## [3.1.0.0.4]
 
 ### Added

stacks-common/src/address/b58.rs

@@ -14,7 +14,7 @@
 
 //! Base58 encoder and decoder
 
-use std::{error, fmt, str};
+use std::{fmt, str};
 
 use crate::address::Error;
 use crate::util::hash::DoubleSha256;

stacks-common/src/address/mod.rs

@@ -19,7 +19,7 @@ use std::{error, fmt};
 use sha2::{Digest, Sha256};
 
 use crate::deps_common::bitcoin::blockdata::opcodes::All as btc_opcodes;
-use crate::deps_common::bitcoin::blockdata::script::{Builder, Instruction, Script};
+use crate::deps_common::bitcoin::blockdata::script::Builder;
 use crate::types::PublicKey;
 use crate::util::hash::Hash160;
 
@@ -220,7 +220,6 @@ pub fn public_keys_to_address_hash<K: PublicKey>(
 mod test {
     use super::*;
     use crate::util::hash::*;
-    use crate::util::log;
     use crate::util::secp256k1::Secp256k1PublicKey as PubKey;
 
     struct PubkeyFixture {

stacks-common/src/bitvec.rs

@@ -260,7 +260,6 @@ mod test {
 
     use super::BitVec;
     use crate::codec::StacksMessageCodec;
-    use crate::util::hash::to_hex;
 
     fn check_set_get(mut input: BitVec<{ u16::MAX }>) {
         let original_input = input.clone();

stacks-common/src/deps_common/bitcoin/blockdata/block.rs

@@ -25,7 +25,6 @@ use crate::deps_common::bitcoin::blockdata::transaction::Transaction;
 use crate::deps_common::bitcoin::network::constants::Network;
 use crate::deps_common::bitcoin::network::encodable::VarInt;
 use crate::deps_common::bitcoin::network::serialize::BitcoinHash;
-use crate::deps_common::bitcoin::util;
 use crate::deps_common::bitcoin::util::hash::Sha256dHash;
 use crate::deps_common::bitcoin::util::Error;
 use crate::deps_common::bitcoin::util::Error::{SpvBadProofOfWork, SpvBadTarget};

stacks-common/src/deps_common/bitcoin/blockdata/script.rs

@@ -27,7 +27,6 @@
 use std::mem::size_of;
 use std::{error, fmt};
 
-use serde;
 use sha2::{Digest, Sha256};
 
 use crate::deps_common::bitcoin::blockdata::opcodes;

stacks-common/src/deps_common/bitcoin/blockdata/transaction.rs

@@ -34,7 +34,6 @@ use crate::deps_common::bitcoin::network::serialize::{
     self, serialize, BitcoinHash, SimpleDecoder, SimpleEncoder,
 };
 use crate::deps_common::bitcoin::util::hash::Sha256dHash;
-use crate::util::hash::to_hex;
 
 /// A reference to a transaction output
 #[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
@@ -675,7 +674,7 @@ impl SigHashType {
 
 #[cfg(test)]
 mod tests {
-    use super::{SigHashType, Transaction, TxIn};
+    use super::{Transaction, TxIn};
     use crate::deps_common;
     use crate::deps_common::bitcoin::blockdata::script::Script;
     use crate::deps_common::bitcoin::network::serialize::{deserialize, BitcoinHash};
@@ -690,7 +689,6 @@ mod tests {
 
     #[test]
     fn test_is_coinbase() {
-        use crate::deps_common::bitcoin::blockdata::constants;
         use crate::deps_common::bitcoin::network::constants::Network;
 
         let genesis = deps_common::bitcoin::blockdata::constants::genesis_block(Network::Bitcoin);

stacks-common/src/deps_common/bitcoin/network/message_network.rs

@@ -19,8 +19,6 @@
 //!
 
 use crate::deps_common::bitcoin::network::address::Address;
-use crate::deps_common::bitcoin::network::constants;
-use crate::util;
 
 // Some simple messages
 

stacks-common/src/deps_common/bitcoin/util/hash.rs

@@ -18,7 +18,7 @@
 use std::char::from_digit;
 use std::cmp::min;
 use std::io::{Cursor, Write};
-use std::{error, fmt, mem};
+use std::{fmt, mem};
 
 use ripemd::Ripemd160;
 #[cfg(feature = "serde")]