From 3b7fe58f6fa897d25bb42cc0852f6b297af1f1d3 Mon Sep 17 00:00:00 2001 From: Sergio Chouhy Date: Sat, 28 Mar 2026 03:47:07 -0300 Subject: [PATCH] remove common TimeStamp --- common/src/block.rs | 7 ++++--- common/src/transaction.rs | 2 +- nssa/core/src/lib.rs | 3 +++ nssa/core/src/program.rs | 3 +-- nssa/src/privacy_preserving_transaction/transaction.rs | 4 ++-- nssa/src/public_transaction/transaction.rs | 3 ++- nssa/src/state.rs | 8 ++++---- sequencer/core/src/lib.rs | 2 +- 8 files changed, 18 insertions(+), 14 deletions(-) diff --git a/common/src/block.rs b/common/src/block.rs index 01ba586e..f6f40335 100644 --- a/common/src/block.rs +++ b/common/src/block.rs @@ -2,12 +2,13 @@ use borsh::{BorshDeserialize, BorshSerialize}; use serde::{Deserialize, Serialize}; use sha2::{Digest as _, Sha256, digest::FixedOutput as _}; +use nssa_core::Timestamp; + use crate::{HashType, transaction::NSSATransaction}; pub type MantleMsgId = [u8; 32]; pub type BlockHash = HashType; pub type BlockId = u64; -pub type TimeStamp = u64; #[derive(Debug, Clone, BorshSerialize, BorshDeserialize)] pub struct BlockMeta { @@ -35,7 +36,7 @@ pub struct BlockHeader { pub block_id: BlockId, pub prev_block_hash: BlockHash, pub hash: BlockHash, - pub timestamp: TimeStamp, + pub timestamp: Timestamp, pub signature: nssa::Signature, } @@ -75,7 +76,7 @@ impl<'de> Deserialize<'de> for Block { pub struct HashableBlockData { pub block_id: BlockId, pub prev_block_hash: BlockHash, - pub timestamp: TimeStamp, + pub timestamp: Timestamp, pub transactions: Vec, } diff --git a/common/src/transaction.rs b/common/src/transaction.rs index e734b893..5cfc9661 100644 --- a/common/src/transaction.rs +++ b/common/src/transaction.rs @@ -1,7 +1,7 @@ use borsh::{BorshDeserialize, BorshSerialize}; use log::warn; use nssa::{AccountId, V03State}; -use nssa_core::program::Timestamp; +use nssa_core::Timestamp; use serde::{Deserialize, Serialize}; use crate::{HashType, block::BlockId}; diff --git a/nssa/core/src/lib.rs b/nssa/core/src/lib.rs index 8014c7ca..2848c169 100644 --- a/nssa/core/src/lib.rs +++ b/nssa/core/src/lib.rs @@ -3,6 +3,9 @@ reason = "We prefer to group methods by functionality rather than by type for encoding" )] +/// Unix timestamp in milliseconds. +pub type Timestamp = u64; + pub use circuit_io::{PrivacyPreservingCircuitInput, PrivacyPreservingCircuitOutput}; pub use commitment::{ Commitment, CommitmentSetDigest, DUMMY_COMMITMENT, DUMMY_COMMITMENT_HASH, MembershipProof, diff --git a/nssa/core/src/program.rs b/nssa/core/src/program.rs index a7fe9f07..988d4acf 100644 --- a/nssa/core/src/program.rs +++ b/nssa/core/src/program.rs @@ -154,8 +154,7 @@ impl AccountPostState { } pub type BlockId = u64; -/// Unix timestamp in milliseconds. -pub type Timestamp = u64; +use crate::Timestamp; pub type BlockValidityWindow = ValidityWindow; pub type TimestampValidityWindow = ValidityWindow; diff --git a/nssa/src/privacy_preserving_transaction/transaction.rs b/nssa/src/privacy_preserving_transaction/transaction.rs index 2fbd08fc..51e00ddf 100644 --- a/nssa/src/privacy_preserving_transaction/transaction.rs +++ b/nssa/src/privacy_preserving_transaction/transaction.rs @@ -5,9 +5,9 @@ use std::{ use borsh::{BorshDeserialize, BorshSerialize}; use nssa_core::{ - Commitment, CommitmentSetDigest, Nullifier, PrivacyPreservingCircuitOutput, + Commitment, CommitmentSetDigest, Nullifier, PrivacyPreservingCircuitOutput, Timestamp, account::{Account, AccountWithMetadata}, - program::{BlockId, BlockValidityWindow, Timestamp, TimestampValidityWindow}, + program::{BlockId, BlockValidityWindow, TimestampValidityWindow}, }; use sha2::{Digest as _, digest::FixedOutput as _}; diff --git a/nssa/src/public_transaction/transaction.rs b/nssa/src/public_transaction/transaction.rs index 9bb27e04..d22e8936 100644 --- a/nssa/src/public_transaction/transaction.rs +++ b/nssa/src/public_transaction/transaction.rs @@ -3,8 +3,9 @@ use std::collections::{HashMap, HashSet, VecDeque}; use borsh::{BorshDeserialize, BorshSerialize}; use log::debug; use nssa_core::{ + Timestamp, account::{Account, AccountId, AccountWithMetadata}, - program::{BlockId, ChainedCall, DEFAULT_PROGRAM_ID, Timestamp, validate_execution}, + program::{BlockId, ChainedCall, DEFAULT_PROGRAM_ID, validate_execution}, }; use sha2::{Digest as _, digest::FixedOutput as _}; diff --git a/nssa/src/state.rs b/nssa/src/state.rs index 97da2af7..23cd326c 100644 --- a/nssa/src/state.rs +++ b/nssa/src/state.rs @@ -2,9 +2,9 @@ use std::collections::{BTreeSet, HashMap, HashSet}; use borsh::{BorshDeserialize, BorshSerialize}; use nssa_core::{ - Commitment, CommitmentSetDigest, DUMMY_COMMITMENT, MembershipProof, Nullifier, + Commitment, CommitmentSetDigest, DUMMY_COMMITMENT, MembershipProof, Nullifier, Timestamp, account::{Account, AccountId, Nonce}, - program::{BlockId, ProgramId, Timestamp}, + program::{BlockId, ProgramId}, }; use crate::{ @@ -341,10 +341,10 @@ pub mod tests { use std::collections::HashMap; use nssa_core::{ - Commitment, Nullifier, NullifierPublicKey, NullifierSecretKey, SharedSecretKey, + Commitment, Nullifier, NullifierPublicKey, NullifierSecretKey, SharedSecretKey, Timestamp, account::{Account, AccountId, AccountWithMetadata, Nonce, data::Data}, encryption::{EphemeralPublicKey, Scalar, ViewingPublicKey}, - program::{BlockId, BlockValidityWindow, PdaSeed, ProgramId, Timestamp, TimestampValidityWindow}, + program::{BlockId, BlockValidityWindow, PdaSeed, ProgramId, TimestampValidityWindow}, }; use crate::{ diff --git a/sequencer/core/src/lib.rs b/sequencer/core/src/lib.rs index 50154c82..93f6a475 100644 --- a/sequencer/core/src/lib.rs +++ b/sequencer/core/src/lib.rs @@ -16,7 +16,7 @@ use mempool::{MemPool, MemPoolHandle}; #[cfg(feature = "mock")] pub use mock::SequencerCoreWithMockClients; use nssa::V03State; -use nssa_core::program::Timestamp; +use nssa_core::Timestamp; pub use storage::error::DbError; use testnet_initial_state::initial_state;