Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion salt/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ extern crate alloc as std;
pub mod constant;
pub mod empty_salt;
pub mod proof;
pub use proof::{ProofError, SaltProof, SaltWitness, Witness};
pub use proof::{fx_hashmap_serde, ProofError, SaltProof, SaltWitness, Witness};
pub mod state;
pub use state::{
hasher, state::EphemeralSaltState, state::PlainStateProvider, updates::StateUpdates,
Expand Down
2 changes: 1 addition & 1 deletion salt/src/proof/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ pub mod witness;
#[cfg(test)]
mod test_utils;

pub use prover::{SaltProof, SerdeCommitment, SerdeMultiPointProof};
pub use prover::{fx_hashmap_serde, SaltProof, SerdeCommitment, SerdeMultiPointProof};
pub use salt_witness::SaltWitness;
pub use witness::Witness;

Expand Down
11 changes: 6 additions & 5 deletions salt/src/proof/prover.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,12 @@ pub struct SaltProof {
pub levels: FxHashMap<BucketId, u8>,
}

// Hand-written (de)serialization for `levels` so the salt crate doesn't need
// to enable `hashbrown/serde` (which transitively pulls in serde_core 1.0.221+
// and breaks downstream alloy-tx-macros 1.0.23). Entries are emitted in
// ascending key order to keep proof bytes deterministic across provers.
mod fx_hashmap_serde {
/// Hand-written (de)serialization for `levels` so the salt crate doesn't need
/// to enable `hashbrown/serde` (which transitively pulls in serde_core 1.0.221+
/// and breaks downstream alloy-tx-macros 1.0.23). Entries are emitted in
/// ascending key order to keep proof bytes deterministic across provers.
/// Also reused downstream (e.g. `stateless-core::LightWitness`) via `#[serde(with = "salt::fx_hashmap_serde")]`.
pub mod fx_hashmap_serde {
use super::*;

pub fn serialize<S: Serializer>(
Expand Down
Loading