Merge branch 'develop' into ci/fix-develop-tests

Author: wileyj

clarity/src/vm/functions/mod.rs

@@ -64,9 +64,8 @@ macro_rules! switch_on_global_epoch {
     };
 }
 
-use crate::vm::ClarityVersion;
-
 use super::errors::InterpreterError;
+use crate::vm::ClarityVersion;
 
 mod arithmetic;
 mod assets;

testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs

@@ -2350,7 +2350,8 @@ impl BitcoinRPCRequest {
     pub fn send_raw_transaction(config: &Config, tx: String) -> RPCResult<()> {
         let payload = BitcoinRPCRequest {
             method: "sendrawtransaction".to_string(),
-            params: vec![tx.into()],
+            // set maxfee (as uncapped) and maxburncap (new in bitcoin 25)
+            params: vec![tx.into(), 0.into(), 1_000_000.into()],
             id: "stacks".to_string(),
             jsonrpc: "2.0".to_string(),
         };

testnet/stacks-node/src/tests/signer.rs

@@ -133,10 +133,11 @@ fn setup_stx_btc_node(
 
     info!("Send pox contract-publish...");
 
+    let tx_fee = 100_000;
     let tx = make_contract_publish(
         publisher_private_key,
         0,
-        10_000,
+        tx_fee,
         &pox_contract_id.name,
         pox_contract,
     );
@@ -146,7 +147,7 @@ fn setup_stx_btc_node(
     let tx = make_contract_publish(
         publisher_private_key,
         1,
-        10_000,
+        tx_fee,
         &stackerdb_contract_id.name,
         stackerdb_contract,
     );
@@ -188,6 +189,7 @@ pub fn build_pox_contract(num_signers: u32) -> String {
 }
 
 #[test]
+#[ignore]
 fn test_stackerdb_dkg() {
     if env::var("BITCOIND_TEST") != Ok("1".into()) {
         return;
@@ -199,8 +201,8 @@ fn test_stackerdb_dkg() {
         .init();
 
     // Generate Signer Data
-    let num_signers: u32 = 100;
-    let num_keys: u32 = 4000;
+    let num_signers: u32 = 10;
+    let num_keys: u32 = 400;
     let publisher_private_key = StacksPrivateKey::new();
     let signer_stacks_private_keys = (0..num_signers)
         .map(|_| StacksPrivateKey::new())