Skip to content

Commit 921d1ee

Browse files
committed
Check block against state should consider the local state machien update regardless of using global vs local state
Signed-off-by: Jacinta Ferrant <[email protected]>
1 parent 4f3676f commit 921d1ee

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

stacks-signer/src/v0/signer.rs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,15 @@ impl Signer {
714714
sortition_state: &mut Option<SortitionsView>,
715715
block: &NakamotoBlock,
716716
) -> Option<BlockResponse> {
717+
// First update our global state evaluator with our local state if we have one
718+
let version = self.get_signer_protocol_version();
719+
if let Ok(update) = self
720+
.local_state_machine
721+
.try_into_update_message_with_version(version)
722+
{
723+
self.global_state_evaluator
724+
.insert_update(self.stacks_address, update);
725+
};
717726
let Some(latest_version) = self
718727
.global_state_evaluator
719728
.determine_latest_supported_signer_protocol_version()
@@ -804,16 +813,6 @@ impl Signer {
804813
) -> Option<BlockResponse> {
805814
let signer_signature_hash = block.header.signer_signature_hash();
806815
let block_id = block.block_id();
807-
// First update our global state evaluator with our local state if we have one
808-
let version = self.get_signer_protocol_version();
809-
if let Ok(update) = self
810-
.local_state_machine
811-
.try_into_update_message_with_version(version)
812-
{
813-
self.global_state_evaluator
814-
.insert_update(self.stacks_address, update);
815-
};
816-
817816
let Some(global_state) = self.global_state_evaluator.determine_global_state() else {
818817
warn!(
819818
"{self}: Cannot validate block, no global signer state";

0 commit comments

Comments
 (0)