CRC: remove UpdateTime

jferrant · jferrant · commit 2d36bd902a5c · 2025-07-01T17:50:35.000-07:00
Signed-off-by: Jacinta Ferrant &lt;jacinta.ferrant@gmail.com&gt;
diff --git a/libsigner/src/tests/signer_state.rs b/libsigner/src/tests/signer_state.rs
@@ -13,6 +13,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 use std::collections::HashMap;
+use std::time::SystemTime;
 
 use blockstack_lib::chainstate::stacks::{
     StacksTransaction, TokenTransferMemo, TransactionAnchorMode, TransactionAuth,
@@ -27,9 +28,7 @@ use crate::v0::messages::{
     StateMachineUpdate as StateMachineUpdateMessage, StateMachineUpdateContent,
     StateMachineUpdateMinerState,
 };
-use crate::v0::signer_state::{
-    GlobalStateEvaluator, ReplayTransactionSet, SignerStateMachine, UpdateTime,
-};
+use crate::v0::signer_state::{GlobalStateEvaluator, ReplayTransactionSet, SignerStateMachine};
 
 fn generate_global_state_evaluator(num_addresses: u32) -> GlobalStateEvaluator {
     let address_weights = generate_random_address_with_equal_weights(num_addresses);
@@ -240,7 +239,7 @@ fn determine_global_states() {
         current_miner: (&current_miner).into(),
         active_signer_protocol_version: local_supported_signer_protocol_version, // a majority of signers are saying they support version the same local_supported_signer_protocol_version, so update it here...
         tx_replay_set: ReplayTransactionSet::none(),
-        update_time: UpdateTime::now(),
+        update_time: SystemTime::now(),
     };
 
     global_eval.insert_update(local_address, local_update);
@@ -280,7 +279,7 @@ fn determine_global_states() {
         current_miner: (&new_miner).into(),
         active_signer_protocol_version: local_supported_signer_protocol_version, // a majority of signers are saying they support version the same local_supported_signer_protocol_version, so update it here...
         tx_replay_set: ReplayTransactionSet::none(),
-        update_time: UpdateTime::now(),
+        update_time: SystemTime::now(),
     };
 
     global_eval.insert_update(local_address, new_update);
@@ -321,7 +320,7 @@ fn determine_global_states_with_tx_replay_set() {
         current_miner: (&current_miner).into(),
         active_signer_protocol_version, // a majority of signers are saying they support version the same local_supported_signer_protocol_version, so update it here...
         tx_replay_set: ReplayTransactionSet::none(),
-        update_time: UpdateTime::now(),
+        update_time: SystemTime::now(),
     };
 
     let burn_block = ConsensusHash([20u8; 20]);
@@ -359,7 +358,7 @@ fn determine_global_states_with_tx_replay_set() {
         current_miner: (&current_miner).into(),
         active_signer_protocol_version: local_supported_signer_protocol_version, // a majority of signers are saying they support version the same local_supported_signer_protocol_version, so update it here...
         tx_replay_set: ReplayTransactionSet::none(),
-        update_time: UpdateTime::now(),
+        update_time: SystemTime::now(),
     };
 
     // Let's tip the scales over to the correct burn view
@@ -416,7 +415,7 @@ fn determine_global_states_with_tx_replay_set() {
         current_miner: (&current_miner).into(),
         active_signer_protocol_version,
         tx_replay_set: ReplayTransactionSet::new(vec![tx]),
-        update_time: UpdateTime::now(),
+        update_time: SystemTime::now(),
     };
 
     assert_eq!(
diff --git a/libsigner/src/v0/signer_state.rs b/libsigner/src/v0/signer_state.rs
@@ -120,7 +120,7 @@ impl GlobalStateEvaluator {
                 active_signer_protocol_version,
                 // We need to calculate the threshold for the tx_replay_set separately
                 tx_replay_set: ReplayTransactionSet::none(),
-                update_time: UpdateTime::now(),
+                update_time: SystemTime::now(),
             };
             let key = SignerStateMachineKey(state_machine.clone());
             let entry = state_views.entry(key).or_insert_with(|| 0);
@@ -240,7 +240,7 @@ impl Default for ReplayTransactionSet {
 /// A signer state machine view. This struct can
 ///  be used to encode the local signer's view or
 ///  the global view.
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Eq, Hash)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct SignerStateMachine {
     /// The tip burn block (i.e., the latest bitcoin block) seen by this signer
     pub burn_block: ConsensusHash,
@@ -253,30 +253,30 @@ pub struct SignerStateMachine {
     /// Transaction replay set
     pub tx_replay_set: ReplayTransactionSet,
     /// The time when this state machine was last updated
-    pub update_time: UpdateTime,
+    pub update_time: SystemTime,
 }
 
-/// A wrapped SystemTime to enforce equality regardless of the value
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct UpdateTime(pub SystemTime);
-
-impl UpdateTime {
-    /// Creates a new UpdateTime with SystemTime::now()
-    pub fn now() -> Self {
-        UpdateTime(SystemTime::now())
-    }
-}
-
-impl PartialEq for UpdateTime {
-    fn eq(&self, _: &Self) -> bool {
-        true
+impl PartialEq for SignerStateMachine {
+    fn eq(&self, other: &Self) -> bool {
+        // update_time is intentionally ignored
+        self.burn_block == other.burn_block
+            && self.burn_block_height == other.burn_block_height
+            && self.current_miner == other.current_miner
+            && self.tx_replay_set == other.tx_replay_set
     }
 }
 
-impl Eq for UpdateTime {}
+impl Eq for SignerStateMachine {}
 
-impl Hash for UpdateTime {
-    fn hash<H: Hasher>(&self, _: &mut H) {}
+impl Hash for SignerStateMachine {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        // update_time is intentionally ignored
+        self.burn_block.hash(state);
+        self.burn_block_height.hash(state);
+        self.current_miner.hash(state);
+        self.active_signer_protocol_version.hash(state);
+        self.tx_replay_set.hash(state);
+    }
 }
 
 #[derive(Debug)]
@@ -291,7 +291,6 @@ impl PartialEq for SignerStateMachineKey {
             && self.0.burn_block_height == other.0.burn_block_height
             && self.0.current_miner == other.0.current_miner
             && self.0.active_signer_protocol_version == other.0.active_signer_protocol_version
-            && self.0.update_time == other.0.update_time // This doesn't actually do anything. But include for completeness sake.
     }
 }
 
diff --git a/stacks-signer/src/chainstate/tests/v2.rs b/stacks-signer/src/chainstate/tests/v2.rs
@@ -30,7 +30,7 @@ use clarity::types::chainstate::{BurnchainHeaderHash, SortitionId, StacksAddress
 use clarity::types::PrivateKey;
 use libsigner::v0::messages::RejectReason;
 use libsigner::v0::signer_state::{
-    GlobalStateEvaluator, MinerState, ReplayTransactionSet, SignerStateMachine, UpdateTime,
+    GlobalStateEvaluator, MinerState, ReplayTransactionSet, SignerStateMachine,
 };
 use libsigner::{BlockProposal, BlockProposalData};
 use stacks_common::bitvec::BitVec;
@@ -142,7 +142,7 @@ fn setup_test_environment(
         },
         active_signer_protocol_version: 0,
         tx_replay_set: ReplayTransactionSet::none(),
-        update_time: UpdateTime::now(),
+        update_time: SystemTime::now(),
     };
 
     let sortitions_view = GlobalStateView {
diff --git a/stacks-signer/src/tests/signer_state.rs b/stacks-signer/src/tests/signer_state.rs
@@ -32,7 +32,7 @@ use libsigner::v0::messages::{
     StateMachineUpdateMinerState,
 };
 use libsigner::v0::signer_state::{
-    GlobalStateEvaluator, MinerState, ReplayTransactionSet, SignerStateMachine, UpdateTime,
+    GlobalStateEvaluator, MinerState, ReplayTransactionSet, SignerStateMachine,
 };
 use stacks_common::bitvec::BitVec;
 use stacks_common::function_name;
@@ -181,7 +181,7 @@ fn check_capitulate_miner_view() {
         current_miner: (&new_miner).into(),
         tx_replay_set: ReplayTransactionSet::none(),
         active_signer_protocol_version,
-        update_time: UpdateTime::now(),
+        update_time: SystemTime::now(),
     };
 
     let mut local_state_machine = LocalStateMachine::Initialized(signer_state_machine.clone());
@@ -392,7 +392,7 @@ fn check_miner_inactivity_timeout() {
         current_miner: inactive_miner,
         active_signer_protocol_version: 0,
         tx_replay_set: ReplayTransactionSet::none(),
-        update_time: UpdateTime::now(),
+        update_time: SystemTime::now(),
     };
     local_state_machine = LocalStateMachine::Initialized(signer_state.clone());
     local_state_machine
diff --git a/stacks-signer/src/v0/signer_state.rs b/stacks-signer/src/v0/signer_state.rs
@@ -28,7 +28,7 @@ use libsigner::v0::messages::{
     StateMachineUpdateContent, StateMachineUpdateMinerState,
 };
 use libsigner::v0::signer_state::{
-    GlobalStateEvaluator, MinerState, ReplayTransactionSet, SignerStateMachine, UpdateTime,
+    GlobalStateEvaluator, MinerState, ReplayTransactionSet, SignerStateMachine,
 };
 use serde::{Deserialize, Serialize};
 use stacks_common::codec::Error as CodecError;
@@ -223,7 +223,7 @@ impl LocalStateMachine {
             current_miner: MinerState::NoValidMiner,
             active_signer_protocol_version: version,
             tx_replay_set: ReplayTransactionSet::none(),
-            update_time: UpdateTime::now(),
+            update_time: SystemTime::now(),
         }
     }
 
@@ -241,7 +241,7 @@ impl LocalStateMachine {
     pub fn get_update_time(&self) -> Option<SystemTime> {
         match self {
             LocalStateMachine::Initialized(update)
-            | LocalStateMachine::Pending { prior: update, .. } => Some(update.update_time.0),
+            | LocalStateMachine::Pending { prior: update, .. } => Some(update.update_time),
             LocalStateMachine::Uninitialized => None,
         }
     }
@@ -359,7 +359,7 @@ impl LocalStateMachine {
             db,
             proposal_config.tenure_last_block_proposal_timeout,
         )?;
-        state_machine.update_time = UpdateTime::now();
+        state_machine.update_time = SystemTime::now();
         info!(
             "Signer State: Current tenure timed out, setting the active miner to the prior tenure";
             "inactive_tenure_ch" => %inactive_tenure_ch,
@@ -497,15 +497,15 @@ impl LocalStateMachine {
                             "signer_signature_hash" => %signer_signature_hash,
                         );
                         prior_state_machine.tx_replay_set = ReplayTransactionSet::none();
-                        prior_state_machine.update_time = UpdateTime::now();
+                        prior_state_machine.update_time = SystemTime::now();
                     }
                 }
                 Ok(None) => {
                     info!("Signer State: got a new block during replay that wasn't validated by our replay set. Clearing the local replay set.";
                         "txs" => ?txs,
                     );
                     prior_state_machine.tx_replay_set = ReplayTransactionSet::none();
-                    prior_state_machine.update_time = UpdateTime::now()
+                    prior_state_machine.update_time = SystemTime::now()
                 }
                 Err(e) => {
                     warn!("Signer State: Failed to check if block was validated by replay tx";
@@ -549,7 +549,7 @@ impl LocalStateMachine {
 
         *parent_tenure_last_block = *block_id;
         *parent_tenure_last_block_height = height;
-        prior_state_machine.update_time = UpdateTime::now();
+        prior_state_machine.update_time = SystemTime::now();
         *self = LocalStateMachine::Initialized(prior_state_machine);
 
         crate::monitoring::actions::increment_signer_agreement_state_change_reason(
@@ -709,7 +709,7 @@ impl LocalStateMachine {
             current_miner: miner_state,
             active_signer_protocol_version: prior_state_machine.active_signer_protocol_version,
             tx_replay_set,
-            update_time: UpdateTime::now(),
+            update_time: SystemTime::now(),
         });
 
         if prior_state != *self {
@@ -769,7 +769,7 @@ impl LocalStateMachine {
                 current_miner: current_miner.into(),
                 active_signer_protocol_version,
                 tx_replay_set,
-                update_time: UpdateTime::now(),
+                update_time: SystemTime::now(),
             });
             // Because we updated our active signer protocol version, update local_update so its included in the subsequent evaluations
             let Ok(update) =
@@ -819,7 +819,7 @@ impl LocalStateMachine {
                 current_miner: (&new_miner).into(),
                 active_signer_protocol_version,
                 tx_replay_set,
-                update_time: UpdateTime::now(),
+                update_time: SystemTime::now(),
             });
 
             match new_miner {
diff --git a/testnet/stacks-node/src/tests/signer/multiversion.rs b/testnet/stacks-node/src/tests/signer/multiversion.rs
@@ -14,12 +14,10 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 use std::sync::mpsc::TryRecvError;
 use std::thread;
-use std::time::Duration;
+use std::time::{Duration, SystemTime};
 
 use libsigner::v0::messages::{SignerMessage, StateMachineUpdate};
-use libsigner::v0::signer_state::{
-    MinerState, ReplayTransactionSet, SignerStateMachine, UpdateTime,
-};
+use libsigner::v0::signer_state::{MinerState, ReplayTransactionSet, SignerStateMachine};
 use stacks::chainstate::stacks::StacksTransaction;
 use stacks::util::hash::Hash160;
 use stacks::util::secp256k1::Secp256k1PrivateKey;
@@ -106,7 +104,7 @@ pub fn signer_state_machine_v3_1_00_13_to_current(
                 .map(stacks_transaction_v3_1_00_13_to_current)
                 .collect(),
         ),
-        update_time: UpdateTime::now(),
+        update_time: SystemTime::now(),
     }
 }
 
