2019-08-20 08:05:14 -07:00
|
|
|
use std::collections::HashMap;
|
|
|
|
|
|
|
|
use crate::{MMRNode, NodeLink, NodeData};
|
|
|
|
|
|
|
|
#[derive(Default)]
|
2019-08-20 10:07:50 -07:00
|
|
|
pub struct Tree {
|
2019-08-20 08:05:14 -07:00
|
|
|
stored: HashMap<u32, MMRNode>,
|
|
|
|
|
|
|
|
generated: HashMap<u32, MMRNode>,
|
|
|
|
|
|
|
|
// number of persistent(!) tree entries
|
|
|
|
stored_count: u32,
|
|
|
|
|
|
|
|
// number of virtual nodes generated
|
|
|
|
generated_count: u32,
|
|
|
|
}
|
|
|
|
|
2019-08-20 10:07:50 -07:00
|
|
|
/// plain list of nodes that has to be appended to the end of the tree as the result of append operation
|
|
|
|
/// along with new root
|
|
|
|
pub struct AppendTransaction {
|
|
|
|
pub appended: Vec<NodeLink>,
|
|
|
|
pub new_root: NodeLink,
|
|
|
|
}
|
|
|
|
|
2019-08-22 04:36:57 -07:00
|
|
|
pub struct DeleteTransaction {
|
|
|
|
pub truncated: u32,
|
|
|
|
pub new_root: NodeLink,
|
|
|
|
}
|
|
|
|
|
2019-08-20 08:05:14 -07:00
|
|
|
impl Tree {
|
|
|
|
fn resolve_link(&self, link: NodeLink) -> IndexedNode {
|
|
|
|
match link {
|
|
|
|
NodeLink::Generated(index) => {
|
|
|
|
// TODO: maybe graceful error?
|
|
|
|
let node = self.generated.get(&index).expect("caller should ensure id generated");
|
|
|
|
IndexedNode {
|
|
|
|
node,
|
|
|
|
link,
|
|
|
|
}
|
|
|
|
},
|
|
|
|
NodeLink::Stored(index) => {
|
|
|
|
// TODO: maybe graceful error?
|
|
|
|
let node = self.stored.get(&index).expect("caller should ensure id stored");
|
|
|
|
IndexedNode {
|
|
|
|
node,
|
|
|
|
link,
|
|
|
|
}
|
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn push(&mut self, data: MMRNode) -> NodeLink {
|
|
|
|
let idx = self.stored_count;
|
|
|
|
self.stored_count = self.stored_count + 1;
|
|
|
|
self.stored.insert(idx, data);
|
|
|
|
NodeLink::Stored(idx)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn push_generated(&mut self, data: MMRNode) -> NodeLink {
|
|
|
|
let idx = self.generated_count;
|
|
|
|
self.generated_count = self.generated_count + 1;
|
|
|
|
self.generated.insert(idx, data);
|
|
|
|
NodeLink::Generated(idx)
|
|
|
|
}
|
|
|
|
|
2019-08-22 04:36:57 -07:00
|
|
|
// TODO: populate both stored and generated nodes?
|
2019-08-20 08:05:14 -07:00
|
|
|
pub fn populate(loaded: Vec<MMRNode>) -> Self {
|
|
|
|
let mut result = Tree::default();
|
|
|
|
result.stored_count = loaded.len() as u32;
|
|
|
|
for (idx, item) in loaded.into_iter().enumerate() {
|
|
|
|
result.stored.insert(idx as u32, item);
|
|
|
|
}
|
|
|
|
|
|
|
|
result
|
|
|
|
}
|
|
|
|
|
2019-08-22 04:36:57 -07:00
|
|
|
pub fn append_leaf(&mut self, root: NodeLink, new_leaf: NodeData) -> AppendTransaction {
|
2019-08-20 10:07:50 -07:00
|
|
|
|
|
|
|
let is_complete= self.resolve_link(root).node.complete();
|
|
|
|
|
|
|
|
let (new_root_node, mut appended) = if is_complete {
|
|
|
|
let new_leaf_link = self.push(new_leaf.into());
|
|
|
|
|
|
|
|
let mut appended = Vec::new();
|
|
|
|
appended.push(new_leaf_link);
|
|
|
|
|
|
|
|
// since we dethrone stored root, new one is always generated
|
|
|
|
let new_root_node = combine_nodes(
|
|
|
|
self.resolve_link(root),
|
|
|
|
self.resolve_link(new_leaf_link),
|
|
|
|
);
|
|
|
|
|
|
|
|
(new_root_node, appended)
|
|
|
|
} else {
|
|
|
|
let (root_left_child, root_right_child) = {
|
|
|
|
let root = self.resolve_link(root).node;
|
|
|
|
(
|
|
|
|
root.left.expect("Root should always have left child"),
|
|
|
|
root.right.expect("Root should always have right child"),
|
|
|
|
)
|
|
|
|
};
|
|
|
|
|
2019-08-22 04:36:57 -07:00
|
|
|
let nested_append = self.append_leaf(root_right_child, new_leaf);
|
2019-08-20 10:07:50 -07:00
|
|
|
let appended = nested_append.appended;
|
|
|
|
let subtree_root = nested_append.new_root;
|
|
|
|
|
|
|
|
let new_root_node = combine_nodes(
|
|
|
|
self.resolve_link(root_left_child),
|
|
|
|
self.resolve_link(subtree_root),
|
|
|
|
);
|
|
|
|
|
|
|
|
(new_root_node, appended)
|
|
|
|
};
|
|
|
|
|
|
|
|
let new_root = if new_root_node.complete() {
|
|
|
|
let new_root= self.push(new_root_node);
|
|
|
|
appended.push(new_root);
|
|
|
|
new_root
|
|
|
|
} else {
|
|
|
|
self.push_generated(new_root_node)
|
|
|
|
};
|
|
|
|
|
|
|
|
AppendTransaction {
|
|
|
|
new_root,
|
|
|
|
appended,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-22 04:36:57 -07:00
|
|
|
fn pop(&mut self) {
|
|
|
|
self.stored.remove(&(self.stored_count-1));
|
|
|
|
self.stored_count = self.stored_count - 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn truncate_leaf(&mut self, root: NodeLink) -> DeleteTransaction {
|
|
|
|
let root = {
|
|
|
|
let n = self.resolve_link(root);
|
|
|
|
let leaves = n.node.data.end_height - n.node.data.start_height + 1;
|
|
|
|
if leaves & 1 != 0 {
|
|
|
|
return DeleteTransaction {
|
|
|
|
truncated: 1,
|
|
|
|
new_root: n.node.left.expect("Root should have left child while deleting"),
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
n
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
let mut peaks = vec![root.node.left.expect("Root should have left child")];
|
|
|
|
let mut subtree_root_link = root.node.right.expect("Root should have right child");
|
|
|
|
let mut truncated = 1;
|
|
|
|
|
|
|
|
loop {
|
|
|
|
let left_link = self.resolve_link(subtree_root_link).node.left;
|
|
|
|
if let Some(left_link) = left_link {
|
|
|
|
peaks.push(left_link);
|
|
|
|
subtree_root_link = self
|
|
|
|
.resolve_link(subtree_root_link).node.right
|
|
|
|
.expect("If left exists, right should exist as well");
|
|
|
|
truncated += 1;
|
|
|
|
} else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
let root = peaks.drain(0..1).nth(0).expect("At lest 2 elements in peaks");
|
|
|
|
let new_root = peaks.into_iter().fold(
|
|
|
|
root,
|
|
|
|
|root, next_peak|
|
|
|
|
self.push_generated(
|
|
|
|
combine_nodes(
|
|
|
|
self.resolve_link(root),
|
|
|
|
self.resolve_link(next_peak)
|
|
|
|
)
|
|
|
|
)
|
|
|
|
);
|
|
|
|
|
|
|
|
for _ in 0..truncated { self.pop(); }
|
|
|
|
|
|
|
|
DeleteTransaction {
|
|
|
|
new_root,
|
|
|
|
truncated,
|
|
|
|
}
|
|
|
|
}
|
2019-08-22 05:49:43 -07:00
|
|
|
|
|
|
|
pub fn len(&self) -> u32 {
|
|
|
|
self.stored_count
|
|
|
|
}
|
2019-08-20 08:05:14 -07:00
|
|
|
}
|
|
|
|
|
2019-08-20 10:07:50 -07:00
|
|
|
|
2019-08-20 08:05:14 -07:00
|
|
|
struct IndexedNode<'a> {
|
|
|
|
node: &'a MMRNode,
|
|
|
|
link: NodeLink,
|
|
|
|
}
|
|
|
|
|
|
|
|
fn combine_data(left: &NodeData, right: &NodeData) -> NodeData {
|
|
|
|
NodeData {
|
|
|
|
// TODO: hash children
|
|
|
|
subtree_commitment: [0u8; 32],
|
|
|
|
start_time: left.start_time,
|
|
|
|
end_time: right.end_time,
|
|
|
|
start_target: left.start_target,
|
|
|
|
end_target: right.end_target,
|
|
|
|
start_sapling_root: left.start_sapling_root,
|
|
|
|
end_sapling_root: right.end_sapling_root,
|
|
|
|
|
|
|
|
// TODO: sum work?
|
|
|
|
subtree_total_work: 0,
|
|
|
|
start_height: left.start_height,
|
|
|
|
end_height: right.end_height,
|
|
|
|
shielded_tx: left.shielded_tx + right.shielded_tx,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn combine_nodes<'a>(left: IndexedNode<'a>, right: IndexedNode<'a>) -> MMRNode {
|
|
|
|
MMRNode {
|
|
|
|
left: Some(left.link),
|
|
|
|
right: Some(right.link),
|
|
|
|
data: combine_data(&left.node.data, &right.node.data),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
|
2019-08-20 10:07:50 -07:00
|
|
|
use super::{MMRNode, NodeData, Tree, NodeLink};
|
2019-08-20 08:05:14 -07:00
|
|
|
|
|
|
|
fn leaf(height: u32) -> NodeData {
|
|
|
|
NodeData {
|
|
|
|
subtree_commitment: [0u8; 32],
|
|
|
|
start_time: 0,
|
|
|
|
end_time: 0,
|
|
|
|
start_target: 0,
|
|
|
|
end_target: 0,
|
|
|
|
start_sapling_root: [0u8; 32],
|
|
|
|
end_sapling_root: [0u8; 32],
|
|
|
|
subtree_total_work: 0,
|
|
|
|
start_height: height,
|
|
|
|
end_height: height,
|
|
|
|
shielded_tx: 7,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn node(start_height: u32, end_height: u32) -> NodeData {
|
|
|
|
NodeData {
|
|
|
|
subtree_commitment: [0u8; 32],
|
|
|
|
start_time: 0,
|
|
|
|
end_time: 0,
|
|
|
|
start_target: 0,
|
|
|
|
end_target: 0,
|
|
|
|
start_sapling_root: [0u8; 32],
|
|
|
|
end_sapling_root: [0u8; 32],
|
|
|
|
subtree_total_work: 0,
|
|
|
|
start_height: start_height,
|
|
|
|
end_height: end_height,
|
|
|
|
shielded_tx: 7,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn initial() -> Tree {
|
|
|
|
let node1: MMRNode = leaf(1).into();
|
|
|
|
let node2: MMRNode = leaf(2).into();
|
|
|
|
|
|
|
|
let node3 = MMRNode {
|
|
|
|
data: node(1, 2),
|
|
|
|
left: Some(NodeLink::Stored(0)),
|
|
|
|
right: Some(NodeLink::Stored(1)),
|
|
|
|
};
|
|
|
|
|
|
|
|
Tree::populate(vec![node1, node2, node3])
|
|
|
|
}
|
|
|
|
|
2019-08-22 04:36:57 -07:00
|
|
|
// returns tree with specified number of leafs and it's root
|
|
|
|
fn generated(length: u32) -> (Tree, NodeLink) {
|
|
|
|
assert!(length > 3);
|
|
|
|
let mut tree = initial();
|
|
|
|
let mut root = NodeLink::Stored(2);
|
|
|
|
|
|
|
|
for i in 2..length {
|
|
|
|
root = tree.append_leaf(root, leaf(i+1).into()).new_root;
|
|
|
|
}
|
|
|
|
|
|
|
|
(tree, root)
|
|
|
|
}
|
|
|
|
|
2019-08-20 08:05:14 -07:00
|
|
|
#[test]
|
|
|
|
fn discrete_append() {
|
|
|
|
let mut tree = initial();
|
2019-08-22 04:36:57 -07:00
|
|
|
let append_tx = tree.append_leaf(NodeLink::Stored(2), leaf(3));
|
2019-08-20 08:05:14 -07:00
|
|
|
let new_root_link = append_tx.new_root;
|
|
|
|
let new_root = tree.resolve_link(new_root_link).node;
|
|
|
|
|
|
|
|
// initial tree: (2)
|
|
|
|
// / \
|
|
|
|
// (0) (1)
|
|
|
|
//
|
|
|
|
// new tree:
|
|
|
|
// (4g)
|
|
|
|
// / \
|
|
|
|
// (2) \
|
|
|
|
// / \ \
|
|
|
|
// (0) (1) (3)
|
|
|
|
//
|
|
|
|
// so only (3) is added as real leaf
|
|
|
|
// while new root, (4g) is generated one
|
|
|
|
assert_eq!(new_root.data.end_height, 3);
|
|
|
|
assert_eq!(append_tx.appended.len(), 1);
|
|
|
|
|
2019-08-22 04:36:57 -07:00
|
|
|
let append_tx = tree.append_leaf(new_root_link, leaf(4));
|
2019-08-20 08:05:14 -07:00
|
|
|
let new_root_link = append_tx.new_root;
|
|
|
|
let new_root = tree.resolve_link(new_root_link).node;
|
|
|
|
|
|
|
|
// intermediate tree:
|
|
|
|
// (4g)
|
|
|
|
// / \
|
|
|
|
// (2) \
|
|
|
|
// / \ \
|
|
|
|
// (0) (1) (3)
|
|
|
|
//
|
|
|
|
// new tree:
|
|
|
|
// ( 6 )
|
|
|
|
// / \
|
|
|
|
// (2) (5)
|
|
|
|
// / \ / \
|
|
|
|
// (0) (1) (3) (4)
|
|
|
|
//
|
|
|
|
// so (4), (5), (6) are added as real leaves
|
|
|
|
// and new root, (6) is stored one
|
|
|
|
assert_eq!(new_root.data.end_height, 4);
|
|
|
|
assert_eq!(append_tx.appended.len(), 3);
|
|
|
|
|
2019-08-22 04:36:57 -07:00
|
|
|
let append_tx = tree.append_leaf(new_root_link, leaf(5));
|
2019-08-20 08:05:14 -07:00
|
|
|
let new_root_link = append_tx.new_root;
|
|
|
|
let new_root = tree.resolve_link(new_root_link).node;
|
|
|
|
|
|
|
|
// intermediate tree:
|
|
|
|
// ( 6 )
|
|
|
|
// / \
|
|
|
|
// (2) (5)
|
|
|
|
// / \ / \
|
|
|
|
// (0) (1) (3) (4)
|
|
|
|
//
|
|
|
|
// new tree:
|
|
|
|
// ( 8g )
|
|
|
|
// / \
|
|
|
|
// ( 6 ) \
|
|
|
|
// / \ \
|
|
|
|
// (2) (5) \
|
|
|
|
// / \ / \ \
|
|
|
|
// (0) (1) (3) (4) (7)
|
|
|
|
//
|
|
|
|
// so (7) is added as real leaf
|
|
|
|
// and new root, (8g) is generated one
|
|
|
|
assert_eq!(new_root.data.end_height, 5);
|
|
|
|
assert_eq!(append_tx.appended.len(), 1);
|
|
|
|
}
|
|
|
|
|
2019-08-22 05:47:49 -07:00
|
|
|
// TODO: use assert_matches below
|
|
|
|
|
2019-08-22 04:36:57 -07:00
|
|
|
#[test]
|
|
|
|
fn truncate_simple() {
|
|
|
|
let (mut tree, root) = generated(9);
|
|
|
|
let delete_tx = tree.truncate_leaf(root);
|
|
|
|
|
2019-08-22 05:59:18 -07:00
|
|
|
// initial tree:
|
|
|
|
//
|
|
|
|
// (-------16g------)
|
|
|
|
// / \
|
|
|
|
// (--------14-------) \
|
|
|
|
// / \ \
|
|
|
|
// ( 6 ) ( 13 ) \
|
|
|
|
// / \ / \ \
|
|
|
|
// (2) (5) (9) (12) \
|
|
|
|
// / \ / \ / \ / \ \
|
|
|
|
// (0) (1) (3) (4) (7) (8) (10) (11) (15)
|
|
|
|
//
|
|
|
|
// new tree:
|
|
|
|
// (--------14-------)
|
|
|
|
// / \
|
|
|
|
// ( 6 ) ( 13 )
|
|
|
|
// / \ / \
|
|
|
|
// (2) (5) (9) (12)
|
|
|
|
// / \ / \ / \ / \
|
|
|
|
// (0) (1) (3) (4) (7) (8) (10) (11)
|
|
|
|
//
|
|
|
|
// so (15) is truncated
|
|
|
|
// and new root, (14) is a stored one now
|
|
|
|
|
2019-08-22 04:36:57 -07:00
|
|
|
match delete_tx.new_root {
|
|
|
|
NodeLink::Stored(14) => { /* ok */ },
|
|
|
|
_ => panic!("Root should be stored(14)")
|
|
|
|
}
|
2019-08-22 05:59:18 -07:00
|
|
|
assert_eq!(tree.len(), 15);
|
2019-08-22 04:36:57 -07:00
|
|
|
}
|
2019-08-22 05:47:49 -07:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn truncate_generated() {
|
|
|
|
let (mut tree, root) = generated(10);
|
|
|
|
let delete_tx = tree.truncate_leaf(root);
|
|
|
|
|
2019-08-22 05:59:18 -07:00
|
|
|
// initial tree:
|
|
|
|
//
|
|
|
|
// (--------18g--------)
|
|
|
|
// / \
|
|
|
|
// (--------14-------) \
|
|
|
|
// / \ \
|
|
|
|
// ( 6 ) ( 13 ) \
|
|
|
|
// / \ / \ \
|
|
|
|
// (2) (5) (9) (12) (17)
|
|
|
|
// / \ / \ / \ / \ / \
|
|
|
|
// (0) (1) (3) (4) (7) (8) (10) (11) (15) (16)
|
|
|
|
//
|
|
|
|
// new tree:
|
|
|
|
// (-------16g------)
|
|
|
|
// / \
|
|
|
|
// (--------14-------) \
|
|
|
|
// / \ \
|
|
|
|
// ( 6 ) ( 13 ) \
|
|
|
|
// / \ / \ \
|
|
|
|
// (2) (5) (9) (12) \
|
|
|
|
// / \ / \ / \ / \ \
|
|
|
|
// (0) (1) (3) (4) (7) (8) (10) (11) (15)
|
|
|
|
|
|
|
|
// new root is generated
|
2019-08-22 05:47:49 -07:00
|
|
|
match delete_tx.new_root {
|
|
|
|
NodeLink::Generated(_) => { /* ok */ },
|
|
|
|
_ => panic!("Root now should be generated")
|
|
|
|
}
|
|
|
|
|
2019-08-22 05:59:18 -07:00
|
|
|
// left is 14 and right is 15
|
2019-08-22 05:47:49 -07:00
|
|
|
let (left_root_child, right_root_child) = {
|
|
|
|
let root = tree.resolve_link(delete_tx.new_root);
|
|
|
|
|
|
|
|
(
|
|
|
|
root.node.left.expect("there should be left child for root"),
|
|
|
|
root.node.right.expect("there should be right child for root"),
|
|
|
|
)
|
|
|
|
};
|
|
|
|
match (left_root_child, right_root_child) {
|
|
|
|
(NodeLink::Stored(14), NodeLink::Stored(15)) => { /* ok */ },
|
|
|
|
_ => panic!("Root should have s(14) and s(15) children")
|
|
|
|
};
|
2019-08-22 05:49:43 -07:00
|
|
|
assert_eq!(delete_tx.truncated, 2);
|
|
|
|
assert_eq!(tree.len(), 16);
|
2019-08-22 05:47:49 -07:00
|
|
|
}
|
2019-08-20 08:05:14 -07:00
|
|
|
}
|