From 936b8aaf1e77c06888d1d096ede962b2202854b0 Mon Sep 17 00:00:00 2001 From: Sergio Chouhy Date: Sat, 28 Mar 2026 03:52:14 -0300 Subject: [PATCH] remove blockid from common --- common/src/block.rs | 3 +-- common/src/transaction.rs | 4 ++-- indexer/core/src/block_store.rs | 3 ++- nssa/core/src/lib.rs | 1 + nssa/core/src/program.rs | 3 +-- nssa/src/privacy_preserving_transaction/transaction.rs | 4 ++-- nssa/src/public_transaction/transaction.rs | 4 ++-- nssa/src/state.rs | 10 ++++++---- sequencer/service/protocol/src/lib.rs | 4 ++-- 9 files changed, 19 insertions(+), 17 deletions(-) diff --git a/common/src/block.rs b/common/src/block.rs index f6f40335..faafbf3a 100644 --- a/common/src/block.rs +++ b/common/src/block.rs @@ -2,13 +2,12 @@ use borsh::{BorshDeserialize, BorshSerialize}; use serde::{Deserialize, Serialize}; use sha2::{Digest as _, Sha256, digest::FixedOutput as _}; -use nssa_core::Timestamp; +use nssa_core::{BlockId, Timestamp}; use crate::{HashType, transaction::NSSATransaction}; pub type MantleMsgId = [u8; 32]; pub type BlockHash = HashType; -pub type BlockId = u64; #[derive(Debug, Clone, BorshSerialize, BorshDeserialize)] pub struct BlockMeta { diff --git a/common/src/transaction.rs b/common/src/transaction.rs index 4d332ef9..c59bbd18 100644 --- a/common/src/transaction.rs +++ b/common/src/transaction.rs @@ -1,10 +1,10 @@ use borsh::{BorshDeserialize, BorshSerialize}; use log::warn; use nssa::{AccountId, V03State}; -use nssa_core::Timestamp; +use nssa_core::{BlockId, Timestamp}; use serde::{Deserialize, Serialize}; -use crate::{HashType, block::BlockId}; +use crate::HashType; #[derive(Debug, Clone, PartialEq, Eq, BorshSerialize, BorshDeserialize)] pub enum NSSATransaction { diff --git a/indexer/core/src/block_store.rs b/indexer/core/src/block_store.rs index ac48ebd0..866add94 100644 --- a/indexer/core/src/block_store.rs +++ b/indexer/core/src/block_store.rs @@ -3,9 +3,10 @@ use std::{path::Path, sync::Arc}; use anyhow::Result; use bedrock_client::HeaderId; use common::{ - block::{BedrockStatus, Block, BlockId}, + block::{BedrockStatus, Block}, transaction::NSSATransaction, }; +use nssa_core::BlockId; use nssa::{Account, AccountId, V03State}; use storage::indexer::RocksDBIO; use tokio::sync::RwLock; diff --git a/nssa/core/src/lib.rs b/nssa/core/src/lib.rs index 2848c169..32224a9a 100644 --- a/nssa/core/src/lib.rs +++ b/nssa/core/src/lib.rs @@ -3,6 +3,7 @@ reason = "We prefer to group methods by functionality rather than by type for encoding" )] +pub type BlockId = u64; /// Unix timestamp in milliseconds. pub type Timestamp = u64; diff --git a/nssa/core/src/program.rs b/nssa/core/src/program.rs index 988d4acf..277ae36f 100644 --- a/nssa/core/src/program.rs +++ b/nssa/core/src/program.rs @@ -153,8 +153,7 @@ impl AccountPostState { } } -pub type BlockId = u64; -use crate::Timestamp; +use crate::{BlockId, 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 3963c037..496da5fa 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, Timestamp, + BlockId, Commitment, CommitmentSetDigest, Nullifier, PrivacyPreservingCircuitOutput, Timestamp, account::{Account, AccountWithMetadata}, - program::{BlockId, BlockValidityWindow, TimestampValidityWindow}, + program::{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 57562776..aea05965 100644 --- a/nssa/src/public_transaction/transaction.rs +++ b/nssa/src/public_transaction/transaction.rs @@ -3,9 +3,9 @@ use std::collections::{HashMap, HashSet, VecDeque}; use borsh::{BorshDeserialize, BorshSerialize}; use log::debug; use nssa_core::{ - Timestamp, + BlockId, Timestamp, account::{Account, AccountId, AccountWithMetadata}, - program::{BlockId, ChainedCall, DEFAULT_PROGRAM_ID, validate_execution}, + program::{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 148146d4..9f58bbaa 100644 --- a/nssa/src/state.rs +++ b/nssa/src/state.rs @@ -2,9 +2,10 @@ use std::collections::{BTreeSet, HashMap, HashSet}; use borsh::{BorshDeserialize, BorshSerialize}; use nssa_core::{ - Commitment, CommitmentSetDigest, DUMMY_COMMITMENT, MembershipProof, Nullifier, Timestamp, + BlockId, Commitment, CommitmentSetDigest, DUMMY_COMMITMENT, MembershipProof, Nullifier, + Timestamp, account::{Account, AccountId, Nonce}, - program::{BlockId, ProgramId}, + program::ProgramId, }; use crate::{ @@ -341,10 +342,11 @@ pub mod tests { use std::collections::HashMap; use nssa_core::{ - Commitment, Nullifier, NullifierPublicKey, NullifierSecretKey, SharedSecretKey, Timestamp, + BlockId, Commitment, Nullifier, NullifierPublicKey, NullifierSecretKey, SharedSecretKey, + Timestamp, account::{Account, AccountId, AccountWithMetadata, Nonce, data::Data}, encryption::{EphemeralPublicKey, Scalar, ViewingPublicKey}, - program::{BlockId, BlockValidityWindow, PdaSeed, ProgramId, TimestampValidityWindow}, + program::{BlockValidityWindow, PdaSeed, ProgramId, TimestampValidityWindow}, }; use crate::{ diff --git a/sequencer/service/protocol/src/lib.rs b/sequencer/service/protocol/src/lib.rs index eb868c0e..be4fc6ef 100644 --- a/sequencer/service/protocol/src/lib.rs +++ b/sequencer/service/protocol/src/lib.rs @@ -2,8 +2,8 @@ pub use common::{ HashType, - block::{Block, BlockId}, + block::Block, transaction::NSSATransaction, }; pub use nssa::{Account, AccountId, ProgramId}; -pub use nssa_core::{Commitment, MembershipProof, account::Nonce}; +pub use nssa_core::{BlockId, Commitment, MembershipProof, account::Nonce};