added RejectCode::ReorgNotAllowed

Author: rdeioris

libsigner/src/v0/messages.rs

@@ -539,7 +539,9 @@ RejectCodeTypePrefix {
     /// The block was rejected due to a mismatch with expected sortition view
     SortitionViewMismatch = 4,
     /// The block was rejected due to a testing directive
-    TestingDirective = 5
+    TestingDirective = 5,
+    /// The block was rejected due to an invalid reorg attempt
+    ReorgNotAllowed = 6
 });
 
 impl TryFrom<u8> for RejectCodeTypePrefix {
@@ -560,6 +562,7 @@ impl From<&RejectCode> for RejectCodeTypePrefix {
             RejectCode::NoSortitionView => RejectCodeTypePrefix::NoSortitionView,
             RejectCode::SortitionViewMismatch => RejectCodeTypePrefix::SortitionViewMismatch,
             RejectCode::TestingDirective => RejectCodeTypePrefix::TestingDirective,
+            RejectCode::ReorgNotAllowed => RejectCodeTypePrefix::ReorgNotAllowed,
         }
     }
 }
@@ -602,6 +605,8 @@ pub enum RejectCode {
     SortitionViewMismatch,
     /// The block was rejected due to a testing directive
     TestingDirective,
+    /// The block was rejected due to an invalid reorg attempt
+    ReorgNotAllowed,
 }
 
 impl From<&RejectReason> for RejectCode {
@@ -615,6 +620,7 @@ impl From<&RejectReason> for RejectCode {
             RejectReason::RejectedInPriorRound => RejectCode::RejectedInPriorRound,
             RejectReason::SortitionViewMismatch => RejectCode::SortitionViewMismatch,
             RejectReason::TestingDirective => RejectCode::TestingDirective,
+            RejectReason::ReorgNotAllowed => RejectCode::ReorgNotAllowed,
             // Newer reject reasons were expanded from SortitionViewMismatch
             _ => RejectCode::SortitionViewMismatch,
         }
@@ -761,6 +767,7 @@ impl From<&RejectCode> for RejectReason {
             RejectCode::NoSortitionView => RejectReason::NoSortitionView,
             RejectCode::SortitionViewMismatch => RejectReason::SortitionViewMismatch,
             RejectCode::TestingDirective => RejectReason::TestingDirective,
+            RejectCode::ReorgNotAllowed => RejectReason::ReorgNotAllowed,
         }
     }
 }
@@ -1271,7 +1278,8 @@ impl StacksMessageCodec for RejectCode {
             | RejectCode::RejectedInPriorRound
             | RejectCode::NoSortitionView
             | RejectCode::SortitionViewMismatch
-            | RejectCode::TestingDirective => {
+            | RejectCode::TestingDirective
+            | RejectCode::ReorgNotAllowed => {
                 // No additional data to serialize / deserialize
             }
         };
@@ -1297,6 +1305,7 @@ impl StacksMessageCodec for RejectCode {
             RejectCodeTypePrefix::NoSortitionView => RejectCode::NoSortitionView,
             RejectCodeTypePrefix::SortitionViewMismatch => RejectCode::SortitionViewMismatch,
             RejectCodeTypePrefix::TestingDirective => RejectCode::TestingDirective,
+            RejectCodeTypePrefix::ReorgNotAllowed => RejectCode::ReorgNotAllowed,
         };
         Ok(code)
     }
@@ -1388,6 +1397,9 @@ impl std::fmt::Display for RejectCode {
             RejectCode::TestingDirective => {
                 write!(f, "The block was rejected due to a testing directive.")
             }
+            RejectCode::ReorgNotAllowed => {
+                write!(f, "The block was rejected due to an invalid reorg attempt.")
+            }
         }
     }
 }

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

@@ -1063,6 +1063,40 @@ fn wait_for_block_global_rejection(
     })
 }
 
+/// Waits for >30% of num_signers block rejection to be observed in the test_observer stackerdb chunks for a block
+/// with the provided signer signature hash and the specified reject_code
+fn wait_for_block_global_rejection_with_reject_code(
+    timeout_secs: u64,
+    block_signer_signature_hash: Sha512Trunc256Sum,
+    num_signers: usize,
+    reject_code: RejectCode,
+) -> Result<(), String> {
+    let mut found_rejections = HashSet::new();
+    wait_for(timeout_secs, || {
+        let chunks = test_observer::get_stackerdb_chunks();
+        for chunk in chunks.into_iter().flat_map(|chunk| chunk.modified_slots) {
+            let Ok(message) = SignerMessage::consensus_deserialize(&mut chunk.data.as_slice())
+            else {
+                continue;
+            };
+            if let SignerMessage::BlockResponse(BlockResponse::Rejected(BlockRejection {
+                signer_signature_hash,
+                signature,
+                reason_code,
+                ..
+            })) = message
+            {
+                if signer_signature_hash == block_signer_signature_hash
+                    && reason_code == reject_code
+                {
+                    found_rejections.insert(signature);
+                }
+            }
+        }
+        Ok(found_rejections.len() >= num_signers * 3 / 10)
+    })
+}
+
 /// Waits for the provided number of block rejections to be observed in the test_observer stackerdb chunks for a block
 /// with the provided signer signature hash
 fn wait_for_block_rejections(
@@ -10282,12 +10316,13 @@ fn disallow_reorg_within_first_proposal_burn_block_timing_secs_but_more_than_one
     let proposed_block = wait_for_block_proposal(30, block_n_height + 1, &miner_pk_1)
         .expect("Timed out waiting for block proposal");
     // check it has been rejected
-    wait_for_block_global_rejection(
+    wait_for_block_global_rejection_with_reject_code(
         30,
         proposed_block.header.signer_signature_hash(),
         num_signers,
+        RejectCode::ReorgNotAllowed,
     )
-    .expect("Timed out waiting for a block proposal to be rejected");
+    .expect("Timed out waiting for a block proposal to be rejected due to invalid reorg");
 
     // check only 1 block from miner1 has been added after the epoch3 boot
     let miner1_blocks_after_boot_to_epoch3 = get_nakamoto_headers(&conf_1)