Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pollard: add from_roots #65

Merged
merged 1 commit into from
Jan 31, 2025
Merged
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
74 changes: 72 additions & 2 deletions src/accumulator/pollard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,19 @@
use std::cell::Cell;
use std::cell::RefCell;
use std::collections::HashMap;
use std::convert::TryInto;
use std::fmt::Debug;
use std::fmt::Display;
use std::rc::Rc;
use std::rc::Weak;

use super::node_hash::AccumulatorHash;
use super::proof::Proof;
use super::stump::Stump;
use super::util::detect_row;
use super::util::detwin;
use super::util::get_proof_positions;
use super::util::is_root_populated;
use super::util::is_root_position;
use super::util::left_child;
use super::util::max_position_at_row;
Expand Down Expand Up @@ -639,9 +642,37 @@ impl<Hash: AccumulatorHash> Pollard<Hash> {
}
}

/// Reconstructs the [Pollard] from a set of roots and number of leaves
///
/// One use for a partial pollard is for mempool and wallet implementations, where you need to
/// keep track of a subset of the whole tree. Instead of remputing the pollard from genesis for
/// every flavor of accumulator you have, you can sync-up using the [Stump] and then use its
/// roots to create a up-to-date pollard.
pub fn from_roots(roots: Vec<Hash>, leaves: u64) -> Pollard<Hash> {
let mut pollard = Pollard::<Hash>::new();
pollard.leaves = leaves;

let roots = (0..=63)
.map(|x| {
if is_root_populated(x, leaves) {
return Some(PollardNode::<Hash>::new(*roots.get(x as usize)?, true));
}
None
})
.collect::<Vec<_>>()
.try_into()
.unwrap();

Pollard {
roots,
leaves,
leaf_map: HashMap::new(),
}
}

/// Serializes the [Pollard] into a sync
///
/// This function serializes the [Pollard] into a sync that implements [Write]. This will be
/// This function serializes the [Pollard] into a sync that implements [std::io::Write]. This will be
/// serialized in a compact binary format, so it can be stored in a file or sent over the
/// network. This function will return an error if it fails to write to the sync.
///
Expand All @@ -668,7 +699,7 @@ impl<Hash: AccumulatorHash> Pollard<Hash> {

/// Deserializes a [Pollard] from a stream
///
/// This function deserializes a [Pollard] from a stream that implements [Read]. This stream
/// This function deserializes a [Pollard] from a stream that implements [std::io::Read]. This stream
/// should contain a [Pollard] serialized with the [serialize] function.
pub fn deserialize<R: std::io::Read>(reader: &mut R) -> Result<Pollard<Hash>, std::io::Error> {
let mut leaves = [0u8; 8];
Expand Down Expand Up @@ -1099,6 +1130,12 @@ impl<Hash: AccumulatorHash> Pollard<Hash> {
}
}

impl<Hash: AccumulatorHash> From<Stump<Hash>> for Pollard<Hash> {
fn from(stump: Stump<Hash>) -> Self {
Pollard::<Hash>::from_roots(stump.roots, stump.leaves)
}
}

#[cfg(test)]
mod tests {
use std::str::FromStr;
Expand Down Expand Up @@ -1188,6 +1225,39 @@ mod tests {
assert_eq!(p, p2);
}

#[test]
fn test_from_roots() {
let roots = vec![
hash_from_u8(0),
hash_from_u8(1),
hash_from_u8(2),
hash_from_u8(3),
];

let leaves = 15;

let p = Pollard::<BitcoinNodeHash>::from_roots(roots.clone(), leaves);
assert_eq!(roots, p.roots());
assert_eq!(leaves, p.leaves());
}

#[test]
fn test_from_stump() {
let roots = vec![
hash_from_u8(0),
hash_from_u8(1),
hash_from_u8(2),
hash_from_u8(3),
];
let leaves = 15;

let stump = Stump { roots, leaves };
let p: Pollard<BitcoinNodeHash> = stump.clone().into();

assert_eq!(stump.roots, p.roots());
assert_eq!(leaves, p.leaves());
}

#[test]
fn test_add() {
let values = vec![0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14];
Expand Down