grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for adding item beyond a leaf.

Browse Source
This commit is contained in:
Gav Wood 2015-12-01 19:45:30 +01:00
parent afbff3689c
commit 8073adff68
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/trie.rs
View File

@ -416,8 +416,19 @@ impl TrieDB {
trace!("complete-prefix (cp={:?}): AUGMENT-AT-END", cp); trace!("complete-prefix (cp={:?}): AUGMENT-AT-END", cp);
// fully-shared prefix for this extension: // fully-shared prefix for this extension:
// skip to the end of this extension and continue to augment there. // skip to the end of this extension and continue to augment there.
let n = if is_leaf { old_rlp.at(1).raw() } else { self.take_node(&old_rlp.at(1), diff) }; let downstream_node: Bytes;
let downstream_node = self.augmented(n, &partial.mid(cp), value, diff); if is_leaf {
// TODO: can maybe do with transmuted_to_branch_and_augmented/transmute to branch?
// create mostly-empty branch node.
let mut s = RlpStream::new_list(17);
for _ in 0..16 { s.append_empty_data(); }
s.append_raw(old_rlp.at(1).raw(), 1);
// create rlp for branch with single leaf item.
downstream_node = self.augmented(&s.out(), &partial.mid(cp), value, diff);
} else {
let n = self.take_node(&old_rlp.at(1), diff);
downstream_node = self.augmented(n, &partial.mid(cp), value, diff);
}
let mut s = RlpStream::new_list(2); let mut s = RlpStream::new_list(2);
s.append_raw(old_rlp.at(0).raw(), 1); s.append_raw(old_rlp.at(0).raw(), 1);
diff.new_node(downstream_node, &mut s); diff.new_node(downstream_node, &mut s);
@ -445,7 +456,7 @@ impl TrieDB {
}, },
} }
}, },
Prototype::Data(_) => { Prototype::Data(0) => {
trace!("empty: COMPOSE"); trace!("empty: COMPOSE");
Self::compose_leaf(partial, value) Self::compose_leaf(partial, value)
}, },