fixes after the merge
This commit is contained in:
parent
2ac0f0f4ac
commit
8a55909bef
@ -107,7 +107,7 @@ impl BlockChain {
|
|||||||
let mut block = Block::new(db.clone());
|
let mut block = Block::new(db.clone());
|
||||||
// TODO: commit
|
// TODO: commit
|
||||||
//block.mutable_state().insert_accounts(&self.genesis_state);
|
//block.mutable_state().insert_accounts(&self.genesis_state);
|
||||||
block.mutable_state().commit_db();
|
block.mutable_state().db().commit();
|
||||||
// TODO: set previous block
|
// TODO: set previous block
|
||||||
// TODO: reset current
|
// TODO: reset current
|
||||||
block
|
block
|
||||||
|
@ -87,7 +87,7 @@ impl Genesis {
|
|||||||
let addr = Address::from_str(address).unwrap();
|
let addr = Address::from_str(address).unwrap();
|
||||||
let o = acc.as_object().unwrap();
|
let o = acc.as_object().unwrap();
|
||||||
let balance = U256::from_dec_str(o["balance"].as_string().unwrap()).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 {
|
Genesis {
|
||||||
|
Loading…
Reference in New Issue
Block a user