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

fixes after the merge

This commit is contained in:
debris 2015-12-14 11:05:40 +01:00
parent 2ac0f0f4ac
commit 8a55909bef
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/blockchain.rs
View File

@ -107,7 +107,7 @@ impl BlockChain {
let mut block = Block::new(db.clone());
// TODO: commit
//block.mutable_state().insert_accounts(&self.genesis_state);
block.mutable_state().commit_db();
block.mutable_state().db().commit();
// TODO: set previous block
// TODO: reset current
block

2
src/genesis.rs
View File

@ -87,7 +87,7 @@ impl Genesis {
let addr = Address::from_str(address).unwrap();
let o = acc.as_object().unwrap();
let balance = U256::from_dec_str(o["balance"].as_string().unwrap()).unwrap();
state.insert(addr, Account::new_with_balance(balance));
state.insert(addr, Account::new_basic(balance));
}
Genesis {