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

Merge pull request #706 from ethcore/fix-accountdb

Browse Source 
Check for NULL_RLP in AccountDB
This commit is contained in:
Gav Wood 2016-03-13 22:29:19 +01:00
commit 5c964694b4
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ethcore/src/account_db.rs
View File

@ -97,6 +97,9 @@ impl<'db> HashDB for AccountDBMut<'db>{
} }
fn insert(&mut self, value: &[u8]) -> H256 { fn insert(&mut self, value: &[u8]) -> H256 {
if value == &NULL_RLP {
return SHA3_NULL_RLP.clone();
}
let k = value.sha3(); let k = value.sha3();
let ak = combine_key(&self.address, &k); let ak = combine_key(&self.address, &k);
self.db.emplace(ak, value.to_vec()); self.db.emplace(ak, value.to_vec());
@ -104,11 +107,17 @@ impl<'db> HashDB for AccountDBMut<'db>{
} }
fn emplace(&mut self, key: H256, value: Bytes) { fn emplace(&mut self, key: H256, value: Bytes) {
if key == SHA3_NULL_RLP {
return;
}
let key = combine_key(&self.address, &key); let key = combine_key(&self.address, &key);
self.db.emplace(key, value.to_vec()) self.db.emplace(key, value.to_vec())
} }
fn kill(&mut self, key: &H256) { fn kill(&mut self, key: &H256) {
if key == &SHA3_NULL_RLP {
return;
}
let key = combine_key(&self.address, key); let key = combine_key(&self.address, key);
self.db.kill(&key) self.db.kill(&key)
} }