Merge branch 'develop' into feat/pox-4-tests-nakamoto

Author: jcnelson

.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

clarity/src/vm/ast/definition_sorter/mod.rs

@@ -173,7 +173,7 @@ impl DefinitionSorter {
                                     return Ok(());
                                 }
                                 DefineFunctions::Map => {
-                                    // Args: [name, key, value]: with key value being potentialy tuples
+                                    // Args: [name, key, value]: with key value being potentially tuples
                                     if function_args.len() == 3 {
                                         self.probe_for_dependencies(
                                             function_args[1],

contrib/boot-contracts-unit-tests/tests/misc.test.ts

@@ -575,7 +575,7 @@ describe("test `get-total-ustx-stacked`", () => {
     expect(response.result).toBeUint(amount * 3n);
   });
 
-  it("expires stacking after the stacking duration has finsihed", () => {
+  it("expires stacking after the stacking duration has finished", () => {
     const amount = getStackingMinimum() * 2n;
 
     stackers.forEach((stacker, i) => {

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 {