From c4d2df48729b7ae2c7e41c65d119c42358abadee Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Thu, 14 Jan 2016 16:46:32 +0100 Subject: [PATCH 1/3] Refactored Pod & Diff types into separate files. --- Cargo.toml | 1 - src/account.rs | 571 ++++++-------------------------------------- src/account_diff.rs | 121 ++++++++++ src/lib.rs | 15 +- src/pod_account.rs | 116 +++++++++ src/pod_state.rs | 44 ++++ src/state.rs | 4 +- src/state_diff.rs | 98 ++++++++ src/tests/state.rs | 5 +- 9 files changed, 471 insertions(+), 504 deletions(-) create mode 100644 src/account_diff.rs create mode 100644 src/pod_account.rs create mode 100644 src/pod_state.rs create mode 100644 src/state_diff.rs diff --git a/Cargo.toml b/Cargo.toml index a15f19ec8..bffab3ac3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,6 @@ rust-crypto = "0.2.34" time = "0.1" #interpolate_idents = { git = "https://github.com/SkylerLipthay/interpolate_idents" } evmjit = { path = "rust-evmjit", optional = true } -itertools = "0.4" [features] default = ["jit"] diff --git a/src/account.rs b/src/account.rs index 3806aae98..70c14f5aa 100644 --- a/src/account.rs +++ b/src/account.rs @@ -1,396 +1,5 @@ use util::*; -use itertools::Itertools; - -pub const SHA3_EMPTY: H256 = H256( [0xc5, 0xd2, 0x46, 0x01, 0x86, 0xf7, 0x23, 0x3c, 0x92, 0x7e, 0x7d, 0xb2, 0xdc, 0xc7, 0x03, 0xc0, 0xe5, 0x00, 0xb6, 0x53, 0xca, 0x82, 0x27, 0x3b, 0x7b, 0xfa, 0xd8, 0x04, 0x5d, 0x85, 0xa4, 0x70] ); - -#[derive(Debug,Clone,PartialEq,Eq)] -pub enum Diff where T: Eq { - Same, - Born(T), - Changed(T, T), - Died(T), -} - -#[derive(Debug,Clone,PartialEq,Eq)] -pub enum Existance { - Born, - Alive, - Died, -} - -impl Diff where T: Eq { - pub fn new(pre: T, post: T) -> Self { if pre == post { Diff::Same } else { Diff::Changed(pre, post) } } - pub fn pre(&self) -> Option<&T> { match self { &Diff::Died(ref x) | &Diff::Changed(ref x, _) => Some(x), _ => None } } - pub fn post(&self) -> Option<&T> { match self { &Diff::Born(ref x) | &Diff::Changed(_, ref x) => Some(x), _ => None } } - pub fn is_same(&self) -> bool { match self { &Diff::Same => true, _ => false }} -} - -#[derive(Debug,Clone,PartialEq,Eq)] -/// Genesis account data. Does not have a DB overlay cache. -pub struct PodAccount { - // Balance of the account. - pub balance: U256, - // Nonce of the account. - pub nonce: U256, - pub code: Bytes, - pub storage: BTreeMap, -} - -impl fmt::Display for PodAccount { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "(bal={}; nonce={}; code={} bytes, #{}; storage={} items)", self.balance, self.nonce, self.code.len(), self.code.sha3(), self.storage.len()) - } -} - -#[derive(Debug,Clone,PartialEq,Eq)] -pub struct PodState (BTreeMap); - -pub fn map_h256_h256_from_json(json: &Json) -> BTreeMap { - json.as_object().unwrap().iter().fold(BTreeMap::new(), |mut m, (key, value)| { - m.insert(H256::from(&u256_from_str(key)), H256::from(&u256_from_json(value))); - m - }) -} - -impl PodState { - /// Contruct a new object from the `m`. - pub fn from(m: BTreeMap) -> PodState { PodState(m) } - - /// Translate the JSON object into a hash map of account information ready for insertion into State. - pub fn from_json(json: &Json) -> PodState { - PodState(json.as_object().unwrap().iter().fold(BTreeMap::new(), |mut state, (address, acc)| { - let balance = acc.find("balance").map(&u256_from_json); - let nonce = acc.find("nonce").map(&u256_from_json); - let storage = acc.find("storage").map(&map_h256_h256_from_json);; - let code = acc.find("code").map(&bytes_from_json); - if balance.is_some() || nonce.is_some() || storage.is_some() || code.is_some() { - state.insert(address_from_hex(address), PodAccount{ - balance: balance.unwrap_or(U256::zero()), - nonce: nonce.unwrap_or(U256::zero()), - storage: storage.unwrap_or(BTreeMap::new()), - code: code.unwrap_or(Vec::new()) - }); - } - state - })) - } - - /// Drain object to get the underlying map. - pub fn drain(self) -> BTreeMap { self.0 } -} - -impl fmt::Display for PodState { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - for (add, acc) in &self.0 { - try!(writeln!(f, "{} => {}", add, acc)); - } - Ok(()) - } -} - -#[derive(Debug,Clone,PartialEq,Eq)] -pub struct AccountDiff { - pub balance: Diff, // Allowed to be Same - pub nonce: Diff, // Allowed to be Same - pub code: Diff, // Allowed to be Same - pub storage: BTreeMap>,// Not allowed to be Same -} - -impl AccountDiff { - pub fn existance(&self) -> Existance { - match self.balance { - Diff::Born(_) => Existance::Born, - Diff::Died(_) => Existance::Died, - _ => Existance::Alive, - } - } -} - -fn format(u: &H256) -> String { - if u <= &H256::from(0xffffffff) { - format!("{} = 0x{:x}", U256::from(u.as_slice()).low_u32(), U256::from(u.as_slice()).low_u32()) - } else if u <= &H256::from(u64::max_value()) { - format!("{} = 0x{:x}", U256::from(u.as_slice()).low_u64(), U256::from(u.as_slice()).low_u64()) -// } else if u <= &H256::from("0xffffffffffffffffffffffffffffffffffffffff") { -// format!("@{}", Address::from(u)) - } else { - format!("#{}", u) - } -} - -#[derive(Debug,Clone,PartialEq,Eq)] -pub struct StateDiff (BTreeMap); - -impl fmt::Display for AccountDiff { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - match self.nonce { - Diff::Born(ref x) => try!(write!(f, " non {}", x)), - Diff::Changed(ref pre, ref post) => try!(write!(f, "#{} ({} {} {})", post, pre, if pre > post {"-"} else {"+"}, *max(pre, post) - * min(pre, post))), - _ => {}, - } - match self.balance { - Diff::Born(ref x) => try!(write!(f, " bal {}", x)), - Diff::Changed(ref pre, ref post) => try!(write!(f, "${} ({} {} {})", post, pre, if pre > post {"-"} else {"+"}, *max(pre, post) - *min(pre, post))), - _ => {}, - } - match self.code { - Diff::Born(ref x) => try!(write!(f, " code {}", x.pretty())), - _ => {}, - } - try!(write!(f, "\n")); - for (k, dv) in self.storage.iter() { - match dv { - &Diff::Born(ref v) => try!(write!(f, " + {} => {}\n", format(k), format(v))), - &Diff::Changed(ref pre, ref post) => try!(write!(f, " * {} => {} (was {})\n", format(k), format(post), format(pre))), - &Diff::Died(_) => try!(write!(f, " X {}\n", format(k))), - _ => {}, - } - } - Ok(()) - } -} - -impl fmt::Display for Existance { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - match self { - &Existance::Born => try!(write!(f, "+++")), - &Existance::Alive => try!(write!(f, "***")), - &Existance::Died => try!(write!(f, "XXX")), - } - Ok(()) - } -} - -impl fmt::Display for StateDiff { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - for (add, acc) in self.0.iter() { - try!(write!(f, "{} {}: {}", acc.existance(), add, acc)); - } - Ok(()) - } -} - -pub fn pod_diff(pre: Option<&PodAccount>, post: Option<&PodAccount>) -> Option { - match (pre, post) { - (None, Some(x)) => Some(AccountDiff { - balance: Diff::Born(x.balance.clone()), - nonce: Diff::Born(x.nonce.clone()), - code: Diff::Born(x.code.clone()), - storage: x.storage.iter().map(|(k, v)| (k.clone(), Diff::Born(v.clone()))).collect(), - }), - (Some(x), None) => Some(AccountDiff { - balance: Diff::Died(x.balance.clone()), - nonce: Diff::Died(x.nonce.clone()), - code: Diff::Died(x.code.clone()), - storage: x.storage.iter().map(|(k, v)| (k.clone(), Diff::Died(v.clone()))).collect(), - }), - (Some(pre), Some(post)) => { - let storage: Vec<_> = pre.storage.keys().merge(post.storage.keys()) - .filter(|k| pre.storage.get(k).unwrap_or(&H256::new()) != post.storage.get(k).unwrap_or(&H256::new())) - .collect(); - let r = AccountDiff { - balance: Diff::new(pre.balance.clone(), post.balance.clone()), - nonce: Diff::new(pre.nonce.clone(), post.nonce.clone()), - code: Diff::new(pre.code.clone(), post.code.clone()), - storage: storage.into_iter().map(|k| - (k.clone(), Diff::new( - pre.storage.get(&k).cloned().unwrap_or(H256::new()), - post.storage.get(&k).cloned().unwrap_or(H256::new()) - ))).collect(), - }; - if r.balance.is_same() && r.nonce.is_same() && r.code.is_same() && r.storage.len() == 0 { - None - } else { - Some(r) - } - }, - _ => None, - } -} - -pub fn pod_state_diff(pre: &PodState, post: &PodState) -> StateDiff { - StateDiff(pre.0.keys().merge(post.0.keys()).filter_map(|acc| pod_diff(pre.0.get(acc), post.0.get(acc)).map(|d|(acc.clone(), d))).collect()) -} - -#[test] -fn state_diff_create_delete() { - let a = PodState(map![ - x!(1) => PodAccount{ - balance: x!(69), - nonce: x!(0), - code: vec![], - storage: map![] - } - ]); - assert_eq!(pod_state_diff(&a, &PodState(map![])), StateDiff(map![ - x!(1) => AccountDiff{ - balance: Diff::Died(x!(69)), - nonce: Diff::Died(x!(0)), - code: Diff::Died(vec![]), - storage: map![], - } - ])); - assert_eq!(pod_state_diff(&PodState(map![]), &a), StateDiff(map![ - x!(1) => AccountDiff{ - balance: Diff::Born(x!(69)), - nonce: Diff::Born(x!(0)), - code: Diff::Born(vec![]), - storage: map![], - } - ])); -} - -#[test] -fn state_diff_cretae_delete_with_unchanged() { - let a = PodState(map![ - x!(1) => PodAccount{ - balance: x!(69), - nonce: x!(0), - code: vec![], - storage: map![] - } - ]); - let b = PodState(map![ - x!(1) => PodAccount{ - balance: x!(69), - nonce: x!(0), - code: vec![], - storage: map![] - }, - x!(2) => PodAccount{ - balance: x!(69), - nonce: x!(0), - code: vec![], - storage: map![] - } - ]); - assert_eq!(pod_state_diff(&a, &b), StateDiff(map![ - x!(2) => AccountDiff{ - balance: Diff::Born(x!(69)), - nonce: Diff::Born(x!(0)), - code: Diff::Born(vec![]), - storage: map![], - } - ])); - assert_eq!(pod_state_diff(&b, &a), StateDiff(map![ - x!(2) => AccountDiff{ - balance: Diff::Died(x!(69)), - nonce: Diff::Died(x!(0)), - code: Diff::Died(vec![]), - storage: map![], - } - ])); -} - -#[test] -fn state_diff_change_with_unchanged() { - let a = PodState(map![ - x!(1) => PodAccount{ - balance: x!(69), - nonce: x!(0), - code: vec![], - storage: map![] - }, - x!(2) => PodAccount{ - balance: x!(69), - nonce: x!(0), - code: vec![], - storage: map![] - } - ]); - let b = PodState(map![ - x!(1) => PodAccount{ - balance: x!(69), - nonce: x!(1), - code: vec![], - storage: map![] - }, - x!(2) => PodAccount{ - balance: x!(69), - nonce: x!(0), - code: vec![], - storage: map![] - } - ]); - assert_eq!(pod_state_diff(&a, &b), StateDiff(map![ - x!(1) => AccountDiff{ - balance: Diff::Same, - nonce: Diff::Changed(x!(0), x!(1)), - code: Diff::Same, - storage: map![], - } - ])); -} - -#[test] -fn account_diff_existence() { - let a = PodAccount{balance: x!(69), nonce: x!(0), code: vec![], storage: map![]}; - assert_eq!(pod_diff(Some(&a), Some(&a)), None); - assert_eq!(pod_diff(None, Some(&a)), Some(AccountDiff{ - balance: Diff::Born(x!(69)), - nonce: Diff::Born(x!(0)), - code: Diff::Born(vec![]), - storage: map![], - })); -} - -#[test] -fn account_diff_basic() { - let a = PodAccount{balance: x!(69), nonce: x!(0), code: vec![], storage: map![]}; - let b = PodAccount{balance: x!(42), nonce: x!(1), code: vec![], storage: map![]}; - assert_eq!(pod_diff(Some(&a), Some(&b)), Some(AccountDiff { - balance: Diff::Changed(x!(69), x!(42)), - nonce: Diff::Changed(x!(0), x!(1)), - code: Diff::Same, - storage: map![], - })); -} - -#[test] -fn account_diff_code() { - let a = PodAccount{balance: x!(0), nonce: x!(0), code: vec![], storage: map![]}; - let b = PodAccount{balance: x!(0), nonce: x!(1), code: vec![0], storage: map![]}; - assert_eq!(pod_diff(Some(&a), Some(&b)), Some(AccountDiff { - balance: Diff::Same, - nonce: Diff::Changed(x!(0), x!(1)), - code: Diff::Changed(vec![], vec![0]), - storage: map![], - })); -} - -#[test] -fn account_diff_storage() { - let a = PodAccount { - balance: x!(0), - nonce: x!(0), - code: vec![], - storage: mapx![1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 0, 6 => 0, 7 => 0] - }; - let b = PodAccount { - balance: x!(0), - nonce: x!(0), - code: vec![], - storage: mapx![1 => 1, 2 => 3, 3 => 0, 5 => 0, 7 => 7, 8 => 0, 9 => 9] - }; - assert_eq!(pod_diff(Some(&a), Some(&b)), Some(AccountDiff { - balance: Diff::Same, - nonce: Diff::Same, - code: Diff::Same, - storage: map![ - x!(2) => Diff::new(x!(2), x!(3)), - x!(3) => Diff::new(x!(3), x!(0)), - x!(4) => Diff::new(x!(4), x!(0)), - x!(7) => Diff::new(x!(0), x!(7)), - x!(9) => Diff::new(x!(0), x!(9)) - ], - })); -} - -#[derive(PartialEq,Eq,Clone,Copy)] -pub enum Filth { - Clean, - Dirty, -} +use pod_account::*; /// Single account in the system. #[derive(Clone)] @@ -409,29 +18,6 @@ pub struct Account { code_cache: Bytes, } -impl PodAccount { - /// Convert Account to a PodAccount. - /// NOTE: This will silently fail unless the account is fully cached. - pub fn from_account(acc: &Account) -> PodAccount { - PodAccount { - balance: acc.balance.clone(), - nonce: acc.nonce.clone(), - storage: acc.storage_overlay.borrow().iter().fold(BTreeMap::new(), |mut m, (k, &(_, ref v))| {m.insert(k.clone(), v.clone()); m}), - code: acc.code_cache.clone() - } - } - - pub fn rlp(&self) -> Bytes { - let mut stream = RlpStream::new_list(4); - stream.append(&self.nonce); - stream.append(&self.balance); - // TODO. - stream.append(&SHA3_NULL_RLP); - stream.append(&self.code.sha3()); - stream.out() - } -} - impl Account { /// General constructor. pub fn new(balance: U256, nonce: U256, storage: HashMap, code: Bytes) -> Account { @@ -647,98 +233,93 @@ impl fmt::Debug for Account { #[cfg(test)] mod tests { -use super::*; -use std::collections::HashMap; -use util::hash::*; -use util::bytes::*; -use util::rlp::*; -use util::uint::*; -use util::overlaydb::*; + use util::*; + use super::*; -#[test] -fn storage_at() { - let mut db = OverlayDB::new_temp(); - let rlp = { + #[test] + fn storage_at() { + let mut db = OverlayDB::new_temp(); + let rlp = { + let mut a = Account::new_contract(U256::from(69u8)); + a.set_storage(H256::from(&U256::from(0x00u64)), H256::from(&U256::from(0x1234u64))); + a.commit_storage(&mut db); + a.init_code(vec![]); + a.commit_code(&mut db); + a.rlp() + }; + + let a = Account::from_rlp(&rlp); + assert_eq!(a.storage_root().unwrap().hex(), "c57e1afb758b07f8d2c8f13a3b6e44fa5ff94ab266facc5a4fd3f062426e50b2"); + assert_eq!(a.storage_at(&mut db, &H256::from(&U256::from(0x00u64))), H256::from(&U256::from(0x1234u64))); + assert_eq!(a.storage_at(&mut db, &H256::from(&U256::from(0x01u64))), H256::new()); + } + + #[test] + fn note_code() { + let mut db = OverlayDB::new_temp(); + + let rlp = { + let mut a = Account::new_contract(U256::from(69u8)); + a.init_code(vec![0x55, 0x44, 0xffu8]); + a.commit_code(&mut db); + a.rlp() + }; + + let mut a = Account::from_rlp(&rlp); + assert_eq!(a.cache_code(&db), true); + + let mut a = Account::from_rlp(&rlp); + assert_eq!(a.note_code(vec![0x55, 0x44, 0xffu8]), Ok(())); + } + + #[test] + fn commit_storage() { let mut a = Account::new_contract(U256::from(69u8)); + let mut db = OverlayDB::new_temp(); a.set_storage(H256::from(&U256::from(0x00u64)), H256::from(&U256::from(0x1234u64))); + assert_eq!(a.storage_root(), None); a.commit_storage(&mut db); - a.init_code(vec![]); - a.commit_code(&mut db); - a.rlp() - }; + assert_eq!(a.storage_root().unwrap().hex(), "c57e1afb758b07f8d2c8f13a3b6e44fa5ff94ab266facc5a4fd3f062426e50b2"); + } - let a = Account::from_rlp(&rlp); - assert_eq!(a.storage_root().unwrap().hex(), "c57e1afb758b07f8d2c8f13a3b6e44fa5ff94ab266facc5a4fd3f062426e50b2"); - assert_eq!(a.storage_at(&mut db, &H256::from(&U256::from(0x00u64))), H256::from(&U256::from(0x1234u64))); - assert_eq!(a.storage_at(&mut db, &H256::from(&U256::from(0x01u64))), H256::new()); -} - -#[test] -fn note_code() { - let mut db = OverlayDB::new_temp(); - - let rlp = { + #[test] + fn commit_code() { let mut a = Account::new_contract(U256::from(69u8)); + let mut db = OverlayDB::new_temp(); a.init_code(vec![0x55, 0x44, 0xffu8]); + assert_eq!(a.code_hash(), SHA3_EMPTY); a.commit_code(&mut db); - a.rlp() - }; + assert_eq!(a.code_hash().hex(), "af231e631776a517ca23125370d542873eca1fb4d613ed9b5d5335a46ae5b7eb"); + } - let mut a = Account::from_rlp(&rlp); - assert_eq!(a.cache_code(&db), true); + #[test] + fn rlpio() { + let a = Account::new(U256::from(69u8), U256::from(0u8), HashMap::new(), Bytes::new()); + let b = Account::from_rlp(&a.rlp()); + assert_eq!(a.balance(), b.balance()); + assert_eq!(a.nonce(), b.nonce()); + assert_eq!(a.code_hash(), b.code_hash()); + assert_eq!(a.storage_root(), b.storage_root()); + } - let mut a = Account::from_rlp(&rlp); - assert_eq!(a.note_code(vec![0x55, 0x44, 0xffu8]), Ok(())); -} + #[test] + fn new_account() { + use rustc_serialize::hex::ToHex; -#[test] -fn commit_storage() { - let mut a = Account::new_contract(U256::from(69u8)); - let mut db = OverlayDB::new_temp(); - a.set_storage(H256::from(&U256::from(0x00u64)), H256::from(&U256::from(0x1234u64))); - assert_eq!(a.storage_root(), None); - a.commit_storage(&mut db); - assert_eq!(a.storage_root().unwrap().hex(), "c57e1afb758b07f8d2c8f13a3b6e44fa5ff94ab266facc5a4fd3f062426e50b2"); -} + let a = Account::new(U256::from(69u8), U256::from(0u8), HashMap::new(), Bytes::new()); + assert_eq!(a.rlp().to_hex(), "f8448045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"); + assert_eq!(a.balance(), &U256::from(69u8)); + assert_eq!(a.nonce(), &U256::from(0u8)); + assert_eq!(a.code_hash(), SHA3_EMPTY); + assert_eq!(a.storage_root().unwrap(), &SHA3_NULL_RLP); + } -#[test] -fn commit_code() { - let mut a = Account::new_contract(U256::from(69u8)); - let mut db = OverlayDB::new_temp(); - a.init_code(vec![0x55, 0x44, 0xffu8]); - assert_eq!(a.code_hash(), SHA3_EMPTY); - a.commit_code(&mut db); - assert_eq!(a.code_hash().hex(), "af231e631776a517ca23125370d542873eca1fb4d613ed9b5d5335a46ae5b7eb"); -} + #[test] + fn create_account() { + use rustc_serialize::hex::ToHex; -#[test] -fn rlpio() { - let a = Account::new(U256::from(69u8), U256::from(0u8), HashMap::new(), Bytes::new()); - let b = Account::from_rlp(&a.rlp()); - assert_eq!(a.balance(), b.balance()); - assert_eq!(a.nonce(), b.nonce()); - assert_eq!(a.code_hash(), b.code_hash()); - assert_eq!(a.storage_root(), b.storage_root()); -} - -#[test] -fn new_account() { - use rustc_serialize::hex::ToHex; - - let a = Account::new(U256::from(69u8), U256::from(0u8), HashMap::new(), Bytes::new()); - assert_eq!(a.rlp().to_hex(), "f8448045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"); - assert_eq!(a.balance(), &U256::from(69u8)); - assert_eq!(a.nonce(), &U256::from(0u8)); - assert_eq!(a.code_hash(), SHA3_EMPTY); - assert_eq!(a.storage_root().unwrap(), &SHA3_NULL_RLP); -} - -#[test] -fn create_account() { - use rustc_serialize::hex::ToHex; - - let a = Account::new(U256::from(69u8), U256::from(0u8), HashMap::new(), Bytes::new()); - assert_eq!(a.rlp().to_hex(), "f8448045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"); -} + let a = Account::new(U256::from(69u8), U256::from(0u8), HashMap::new(), Bytes::new()); + assert_eq!(a.rlp().to_hex(), "f8448045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"); + } } \ No newline at end of file diff --git a/src/account_diff.rs b/src/account_diff.rs new file mode 100644 index 000000000..2bf138669 --- /dev/null +++ b/src/account_diff.rs @@ -0,0 +1,121 @@ +use util::*; +use pod_account::*; + +#[derive(Debug,Clone,PartialEq,Eq)] +/// Change in existance type. +// TODO: include other types of change. +pub enum Existance { + Born, + Alive, + Died, +} + +impl fmt::Display for Existance { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + match self { + &Existance::Born => try!(write!(f, "+++")), + &Existance::Alive => try!(write!(f, "***")), + &Existance::Died => try!(write!(f, "XXX")), + } + Ok(()) + } +} + +#[derive(Debug,Clone,PartialEq,Eq)] +pub struct AccountDiff { + pub balance: Diff, // Allowed to be Same + pub nonce: Diff, // Allowed to be Same + pub code: Diff, // Allowed to be Same + pub storage: BTreeMap>,// Not allowed to be Same +} + +impl AccountDiff { + pub fn existance(&self) -> Existance { + match self.balance { + Diff::Born(_) => Existance::Born, + Diff::Died(_) => Existance::Died, + _ => Existance::Alive, + } + } + + pub fn diff_pod(pre: Option<&PodAccount>, post: Option<&PodAccount>) -> Option { + match (pre, post) { + (None, Some(x)) => Some(AccountDiff { + balance: Diff::Born(x.balance.clone()), + nonce: Diff::Born(x.nonce.clone()), + code: Diff::Born(x.code.clone()), + storage: x.storage.iter().map(|(k, v)| (k.clone(), Diff::Born(v.clone()))).collect(), + }), + (Some(x), None) => Some(AccountDiff { + balance: Diff::Died(x.balance.clone()), + nonce: Diff::Died(x.nonce.clone()), + code: Diff::Died(x.code.clone()), + storage: x.storage.iter().map(|(k, v)| (k.clone(), Diff::Died(v.clone()))).collect(), + }), + (Some(pre), Some(post)) => { + let storage: Vec<_> = pre.storage.keys().merge(post.storage.keys()) + .filter(|k| pre.storage.get(k).unwrap_or(&H256::new()) != post.storage.get(k).unwrap_or(&H256::new())) + .collect(); + let r = AccountDiff { + balance: Diff::new(pre.balance.clone(), post.balance.clone()), + nonce: Diff::new(pre.nonce.clone(), post.nonce.clone()), + code: Diff::new(pre.code.clone(), post.code.clone()), + storage: storage.into_iter().map(|k| + (k.clone(), Diff::new( + pre.storage.get(&k).cloned().unwrap_or(H256::new()), + post.storage.get(&k).cloned().unwrap_or(H256::new()) + ))).collect(), + }; + if r.balance.is_same() && r.nonce.is_same() && r.code.is_same() && r.storage.len() == 0 { + None + } else { + Some(r) + } + }, + _ => None, + } + } +} + +// TODO: refactor into something nicer. +fn interpreted_hash(u: &H256) -> String { + if u <= &H256::from(0xffffffff) { + format!("{} = 0x{:x}", U256::from(u.as_slice()).low_u32(), U256::from(u.as_slice()).low_u32()) + } else if u <= &H256::from(u64::max_value()) { + format!("{} = 0x{:x}", U256::from(u.as_slice()).low_u64(), U256::from(u.as_slice()).low_u64()) +// } else if u <= &H256::from("0xffffffffffffffffffffffffffffffffffffffff") { +// format!("@{}", Address::from(u)) + } else { + format!("#{}", u) + } +} + +impl fmt::Display for AccountDiff { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + match self.nonce { + Diff::Born(ref x) => try!(write!(f, " non {}", x)), + Diff::Changed(ref pre, ref post) => try!(write!(f, "#{} ({} {} {})", post, pre, if pre > post {"-"} else {"+"}, *max(pre, post) - * min(pre, post))), + _ => {}, + } + match self.balance { + Diff::Born(ref x) => try!(write!(f, " bal {}", x)), + Diff::Changed(ref pre, ref post) => try!(write!(f, "${} ({} {} {})", post, pre, if pre > post {"-"} else {"+"}, *max(pre, post) - *min(pre, post))), + _ => {}, + } + match self.code { + Diff::Born(ref x) => try!(write!(f, " code {}", x.pretty())), + _ => {}, + } + try!(write!(f, "\n")); + for (k, dv) in self.storage.iter() { + match dv { + &Diff::Born(ref v) => try!(write!(f, " + {} => {}\n", interpreted_hash(k), interpreted_hash(v))), + &Diff::Changed(ref pre, ref post) => try!(write!(f, " * {} => {} (was {})\n", interpreted_hash(k), interpreted_hash(post), interpreted_hash(pre))), + &Diff::Died(_) => try!(write!(f, " X {}\n", interpreted_hash(k))), + _ => {}, + } + } + Ok(()) + } +} + diff --git a/src/lib.rs b/src/lib.rs index 8610404d2..0b81f4fd3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -73,18 +73,19 @@ //! sudo ldconfig //! ``` -#[macro_use] extern crate log; +#[macro_use] +extern crate log; extern crate rustc_serialize; -#[macro_use] extern crate itertools; extern crate flate2; extern crate rocksdb; extern crate heapsize; extern crate crypto; extern crate time; extern crate env_logger; -#[cfg(feature = "jit" )] extern crate evmjit; - -#[macro_use] extern crate ethcore_util as util; +#[cfg(feature = "jit" )] +extern crate evmjit; +#[macro_use] +extern crate ethcore_util as util; pub mod common; pub mod basic_types; @@ -92,6 +93,10 @@ pub mod executive; pub mod error; pub mod log_entry; pub mod env_info; +pub mod pod_account; +pub mod pod_state; +pub mod account_diff; +pub mod state_diff; pub mod engine; pub mod state; pub mod account; diff --git a/src/pod_account.rs b/src/pod_account.rs new file mode 100644 index 000000000..ecbccb038 --- /dev/null +++ b/src/pod_account.rs @@ -0,0 +1,116 @@ +use util::*; +use account::*; + +#[derive(Debug,Clone,PartialEq,Eq)] +/// Genesis account data. Does not have a DB overlay cache. +pub struct PodAccount { + pub balance: U256, + pub nonce: U256, + pub code: Bytes, + pub storage: BTreeMap, +} + +impl PodAccount { + /// Construct new object. + pub fn new(balance: U256, nonce: U256, code: Bytes, storage: BTreeMap) -> PodAccount { + PodAccount { balance: balance, nonce: nonce, code: code, storage: storage } + } + + /// Convert Account to a PodAccount. + /// NOTE: This will silently fail unless the account is fully cached. + pub fn from_account(acc: &Account) -> PodAccount { + PodAccount { + balance: acc.balance().clone(), + nonce: acc.nonce().clone(), + storage: acc.storage_overlay().iter().fold(BTreeMap::new(), |mut m, (k, &(_, ref v))| {m.insert(k.clone(), v.clone()); m}), + code: acc.code().unwrap().to_vec(), + } + } + + pub fn rlp(&self) -> Bytes { + let mut stream = RlpStream::new_list(4); + stream.append(&self.nonce); + stream.append(&self.balance); + // TODO. + stream.append(&SHA3_NULL_RLP); + stream.append(&self.code.sha3()); + stream.out() + } +} + +impl fmt::Display for PodAccount { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + write!(f, "(bal={}; nonce={}; code={} bytes, #{}; storage={} items)", self.balance, self.nonce, self.code.len(), self.code.sha3(), self.storage.len()) + } +} + +#[cfg(test)] +mod test { + use common::*; + use super::*; + use account_diff::*; + + #[test] + fn existence() { + let a = PodAccount{balance: x!(69), nonce: x!(0), code: vec![], storage: map![]}; + assert_eq!(AccountDiff::diff_pod(Some(&a), Some(&a)), None); + assert_eq!(AccountDiff::diff_pod(None, Some(&a)), Some(AccountDiff{ + balance: Diff::Born(x!(69)), + nonce: Diff::Born(x!(0)), + code: Diff::Born(vec![]), + storage: map![], + })); + } + + #[test] + fn basic() { + let a = PodAccount{balance: x!(69), nonce: x!(0), code: vec![], storage: map![]}; + let b = PodAccount{balance: x!(42), nonce: x!(1), code: vec![], storage: map![]}; + assert_eq!(AccountDiff::diff_pod(Some(&a), Some(&b)), Some(AccountDiff { + balance: Diff::Changed(x!(69), x!(42)), + nonce: Diff::Changed(x!(0), x!(1)), + code: Diff::Same, + storage: map![], + })); + } + + #[test] + fn code() { + let a = PodAccount{balance: x!(0), nonce: x!(0), code: vec![], storage: map![]}; + let b = PodAccount{balance: x!(0), nonce: x!(1), code: vec![0], storage: map![]}; + assert_eq!(AccountDiff::diff_pod(Some(&a), Some(&b)), Some(AccountDiff { + balance: Diff::Same, + nonce: Diff::Changed(x!(0), x!(1)), + code: Diff::Changed(vec![], vec![0]), + storage: map![], + })); + } + + #[test] + fn storage() { + let a = PodAccount { + balance: x!(0), + nonce: x!(0), + code: vec![], + storage: mapx![1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 0, 6 => 0, 7 => 0] + }; + let b = PodAccount { + balance: x!(0), + nonce: x!(0), + code: vec![], + storage: mapx![1 => 1, 2 => 3, 3 => 0, 5 => 0, 7 => 7, 8 => 0, 9 => 9] + }; + assert_eq!(AccountDiff::diff_pod(Some(&a), Some(&b)), Some(AccountDiff { + balance: Diff::Same, + nonce: Diff::Same, + code: Diff::Same, + storage: map![ + x!(2) => Diff::new(x!(2), x!(3)), + x!(3) => Diff::new(x!(3), x!(0)), + x!(4) => Diff::new(x!(4), x!(0)), + x!(7) => Diff::new(x!(0), x!(7)), + x!(9) => Diff::new(x!(0), x!(9)) + ], + })); + } +} diff --git a/src/pod_state.rs b/src/pod_state.rs new file mode 100644 index 000000000..f3f7a2f39 --- /dev/null +++ b/src/pod_state.rs @@ -0,0 +1,44 @@ +use util::*; +use pod_account::*; + +#[derive(Debug,Clone,PartialEq,Eq)] +pub struct PodState (BTreeMap); + +impl PodState { + /// Contruct a new object from the `m`. + pub fn new(m: BTreeMap) -> PodState { PodState(m) } + + /// Translate the JSON object into a hash map of account information ready for insertion into State. + pub fn from_json(json: &Json) -> PodState { + PodState(json.as_object().unwrap().iter().fold(BTreeMap::new(), |mut state, (address, acc)| { + let balance = acc.find("balance").map(&u256_from_json); + let nonce = acc.find("nonce").map(&u256_from_json); + let storage = acc.find("storage").map(&map_h256_h256_from_json);; + let code = acc.find("code").map(&bytes_from_json); + if balance.is_some() || nonce.is_some() || storage.is_some() || code.is_some() { + state.insert(address_from_hex(address), PodAccount{ + balance: balance.unwrap_or(U256::zero()), + nonce: nonce.unwrap_or(U256::zero()), + storage: storage.unwrap_or(BTreeMap::new()), + code: code.unwrap_or(Vec::new()) + }); + } + state + })) + } + + /// Get the underlying map. + pub fn get(&self) -> &BTreeMap { &self.0 } + + /// Drain object to get the underlying map. + pub fn drain(self) -> BTreeMap { self.0 } +} + +impl fmt::Display for PodState { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + for (add, acc) in &self.0 { + try!(writeln!(f, "{} => {}", add, acc)); + } + Ok(()) + } +} diff --git a/src/state.rs b/src/state.rs index 1f58f638c..6c7b1dcef 100644 --- a/src/state.rs +++ b/src/state.rs @@ -1,6 +1,8 @@ use common::*; use engine::Engine; use executive::Executive; +use pod_account::*; +use pod_state::*; pub type ApplyResult = Result; @@ -201,7 +203,7 @@ impl State { /// Populate a PodAccount map from this state. pub fn to_pod(&self) -> PodState { // TODO: handle database rather than just the cache. - PodState::from(self.cache.borrow().iter().fold(BTreeMap::new(), |mut m, (add, opt)| { + PodState::new(self.cache.borrow().iter().fold(BTreeMap::new(), |mut m, (add, opt)| { if let &Some(ref acc) = opt { m.insert(add.clone(), PodAccount::from_account(acc)); } diff --git a/src/state_diff.rs b/src/state_diff.rs new file mode 100644 index 000000000..d603dda5e --- /dev/null +++ b/src/state_diff.rs @@ -0,0 +1,98 @@ +use util::*; +use pod_state::*; +use account_diff::*; + +#[derive(Debug,Clone,PartialEq,Eq)] +pub struct StateDiff (BTreeMap); + +impl StateDiff { + /// Calculate and return diff between `pre` state and `post` state. + pub fn diff_pod(pre: &PodState, post: &PodState) -> StateDiff { + StateDiff(pre.get().keys().merge(post.get().keys()).filter_map(|acc| AccountDiff::diff_pod(pre.get().get(acc), post.get().get(acc)).map(|d|(acc.clone(), d))).collect()) + } +} + +impl fmt::Display for StateDiff { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + for (add, acc) in self.0.iter() { + try!(write!(f, "{} {}: {}", acc.existance(), add, acc)); + } + Ok(()) + } +} + +#[cfg(test)] +mod test { + use common::*; + use pod_state::*; + use account_diff::*; + use pod_account::*; + use super::*; + + #[test] + fn create_delete() { + let a = PodState::new(map![ x!(1) => PodAccount::new(x!(69), x!(0), vec![], map![]) ]); + assert_eq!(StateDiff::diff_pod(&a, &PodState::new(map![])), StateDiff(map![ + x!(1) => AccountDiff{ + balance: Diff::Died(x!(69)), + nonce: Diff::Died(x!(0)), + code: Diff::Died(vec![]), + storage: map![], + } + ])); + assert_eq!(StateDiff::diff_pod(&PodState::new(map![]), &a), StateDiff(map![ + x!(1) => AccountDiff{ + balance: Diff::Born(x!(69)), + nonce: Diff::Born(x!(0)), + code: Diff::Born(vec![]), + storage: map![], + } + ])); + } + + #[test] + fn create_delete_with_unchanged() { + let a = PodState::new(map![ x!(1) => PodAccount::new(x!(69), x!(0), vec![], map![]) ]); + let b = PodState::new(map![ + x!(1) => PodAccount::new(x!(69), x!(0), vec![], map![]), + x!(2) => PodAccount::new(x!(69), x!(0), vec![], map![]) + ]); + assert_eq!(StateDiff::diff_pod(&a, &b), StateDiff(map![ + x!(2) => AccountDiff{ + balance: Diff::Born(x!(69)), + nonce: Diff::Born(x!(0)), + code: Diff::Born(vec![]), + storage: map![], + } + ])); + assert_eq!(StateDiff::diff_pod(&b, &a), StateDiff(map![ + x!(2) => AccountDiff{ + balance: Diff::Died(x!(69)), + nonce: Diff::Died(x!(0)), + code: Diff::Died(vec![]), + storage: map![], + } + ])); + } + + #[test] + fn change_with_unchanged() { + let a = PodState::new(map![ + x!(1) => PodAccount::new(x!(69), x!(0), vec![], map![]), + x!(2) => PodAccount::new(x!(69), x!(0), vec![], map![]) + ]); + let b = PodState::new(map![ + x!(1) => PodAccount::new(x!(69), x!(1), vec![], map![]), + x!(2) => PodAccount::new(x!(69), x!(0), vec![], map![]) + ]); + assert_eq!(StateDiff::diff_pod(&a, &b), StateDiff(map![ + x!(1) => AccountDiff{ + balance: Diff::Same, + nonce: Diff::Changed(x!(0), x!(1)), + code: Diff::Same, + storage: map![], + } + ])); + } + +} diff --git a/src/tests/state.rs b/src/tests/state.rs index 080bdf979..58e57558c 100644 --- a/src/tests/state.rs +++ b/src/tests/state.rs @@ -1,6 +1,7 @@ use super::test_common::*; use state::*; -use executive::*; +use pod_state::*; +use state_diff::*; use ethereum; fn do_json_test(json_data: &[u8]) -> Vec { @@ -40,7 +41,7 @@ fn do_json_test(json_data: &[u8]) -> Vec { let our_post = s.to_pod(); println!("Got:\n{}", our_post); println!("Expect:\n{}", post); - println!("Diff ---expect -> +++got:\n{}", pod_state_diff(&post, &our_post)); + println!("Diff ---expect -> +++got:\n{}", StateDiff::diff_pod(&post, &our_post)); } if fail_unless(logs == r.logs) { From d3091b95c39834414fcf6fb70b0fd122cde1ab7e Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Thu, 14 Jan 2016 21:23:46 +0100 Subject: [PATCH 2/3] Use new json trait for conversion of some types. --- src/env_info.rs | 4 ++-- src/pod_account.rs | 2 +- src/pod_state.rs | 4 ++-- src/tests/executive.rs | 48 ++++++++++++++++++++-------------------- src/tests/transaction.rs | 8 +++---- src/transaction.rs | 32 +++++++++++++-------------- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/env_info.rs b/src/env_info.rs index 88367fca9..c806f228d 100644 --- a/src/env_info.rs +++ b/src/env_info.rs @@ -42,8 +42,8 @@ impl EnvInfo { EnvInfo { number: current_number, author: address_from_json(&json["currentCoinbase"]), - difficulty: u256_from_json(&json["currentDifficulty"]), - gas_limit: u256_from_json(&json["currentGasLimit"]), + difficulty: xjson!(&json["currentDifficulty"]), + gas_limit: xjson!(&json["currentGasLimit"]), timestamp: u64_from_json(&json["currentTimestamp"]), last_hashes: (1..257).map(|i| format!("{}", current_number - i).as_bytes().sha3()).collect(), gas_used: x!(0), diff --git a/src/pod_account.rs b/src/pod_account.rs index ecbccb038..a39bf1fa3 100644 --- a/src/pod_account.rs +++ b/src/pod_account.rs @@ -47,8 +47,8 @@ impl fmt::Display for PodAccount { #[cfg(test)] mod test { use common::*; - use super::*; use account_diff::*; + use super::*; #[test] fn existence() { diff --git a/src/pod_state.rs b/src/pod_state.rs index f3f7a2f39..ff456bda3 100644 --- a/src/pod_state.rs +++ b/src/pod_state.rs @@ -11,8 +11,8 @@ impl PodState { /// Translate the JSON object into a hash map of account information ready for insertion into State. pub fn from_json(json: &Json) -> PodState { PodState(json.as_object().unwrap().iter().fold(BTreeMap::new(), |mut state, (address, acc)| { - let balance = acc.find("balance").map(&u256_from_json); - let nonce = acc.find("nonce").map(&u256_from_json); + let balance = acc.find("balance").map(&U256::from_json); + let nonce = acc.find("nonce").map(&U256::from_json); let storage = acc.find("storage").map(&map_h256_h256_from_json);; let code = acc.find("code").map(&bytes_from_json); if balance.is_some() || nonce.is_some() || storage.is_some() || code.is_some() { diff --git a/src/tests/executive.rs b/src/tests/executive.rs index 25166dc04..1e95082ae 100644 --- a/src/tests/executive.rs +++ b/src/tests/executive.rs @@ -9,14 +9,14 @@ use ethereum; struct TestEngine { spec: Spec, - max_depth: usize + stack_limit: usize } impl TestEngine { - fn new(max_depth: usize) -> TestEngine { + fn new(stack_limit: usize) -> TestEngine { TestEngine { spec: ethereum::new_frontier_test(), - max_depth: max_depth + stack_limit: stack_limit } } } @@ -26,7 +26,7 @@ impl Engine for TestEngine { fn spec(&self) -> &Spec { &self.spec } fn schedule(&self, _env_info: &EnvInfo) -> Schedule { let mut schedule = Schedule::new_frontier(); - schedule.max_depth = self.max_depth; + schedule.stack_limit = self.stack_limit; schedule } } @@ -87,7 +87,7 @@ impl<'a> Ext for TestExt<'a> { }); Ok((gas_left, Some(address))) }, - // creation failed only due to reaching max_depth + // creation failed only due to reaching stack_limit Ok((gas_left, None)) if ext.state.balance(&ext.params.address) >= *value => { let address = contract_address(&ext.params.address, &ext.state.nonce(&ext.params.address)); self.callcreates.push(CallCreate { @@ -169,9 +169,9 @@ fn do_json_test(json_data: &[u8]) -> Vec { test.find("pre").map(|pre| for (addr, s) in pre.as_object().unwrap() { let address = Address::from(addr.as_ref()); - let balance = u256_from_json(&s["balance"]); + let balance = xjson!(&s["balance"]); let code = bytes_from_json(&s["code"]); - let _nonce = u256_from_json(&s["nonce"]); + let _nonce: U256 = xjson!(&s["nonce"]); state.new_contract(&address); state.add_balance(&address, &balance); @@ -179,7 +179,7 @@ fn do_json_test(json_data: &[u8]) -> Vec { for (k, v) in s["storage"].as_object().unwrap() { let key = H256::from(&u256_from_str(k)); - let val = H256::from(&u256_from_json(v)); + let val = H256::from(&U256::from_json(v)); state.set_storage(&address, key, val); } }); @@ -188,10 +188,10 @@ fn do_json_test(json_data: &[u8]) -> Vec { test.find("env").map(|env| { info.author = address_from_json(&env["currentCoinbase"]); - info.difficulty = u256_from_json(&env["currentDifficulty"]); - info.gas_limit = u256_from_json(&env["currentGasLimit"]); - info.number = u256_from_json(&env["currentNumber"]).low_u64(); - info.timestamp = u256_from_json(&env["currentTimestamp"]).low_u64(); + info.difficulty = xjson!(&env["currentDifficulty"]); + info.gas_limit = xjson!(&env["currentGasLimit"]); + info.number = xjson!(&env["currentNumber"]); + info.timestamp = xjson!(&env["currentTimestamp"]); }); let engine = TestEngine::new(0); @@ -204,9 +204,9 @@ fn do_json_test(json_data: &[u8]) -> Vec { params.origin = address_from_json(&exec["origin"]); params.code = bytes_from_json(&exec["code"]); params.data = bytes_from_json(&exec["data"]); - params.gas = u256_from_json(&exec["gas"]); - params.gas_price = u256_from_json(&exec["gasPrice"]); - params.value = u256_from_json(&exec["value"]); + params.gas = xjson!(&exec["gas"]); + params.gas_price = xjson!(&exec["gasPrice"]); + params.value = xjson!(&exec["value"]); }); let out_of_gas = test.find("callcreates").map(|_calls| { @@ -228,23 +228,23 @@ fn do_json_test(json_data: &[u8]) -> Vec { match res { Err(_) => fail_unless(out_of_gas, "didn't expect to run out of gas."), Ok(gas_left) => { - //println!("name: {}, gas_left : {:?}, expected: {:?}", name, gas_left, u256_from_json(&test["gas"])); + //println!("name: {}, gas_left : {:?}, expected: {:?}", name, gas_left, U256::from(&test["gas"])); fail_unless(!out_of_gas, "expected to run out of gas."); - fail_unless(gas_left == u256_from_json(&test["gas"]), "gas_left is incorrect"); + fail_unless(gas_left == xjson!(&test["gas"]), "gas_left is incorrect"); fail_unless(output == bytes_from_json(&test["out"]), "output is incorrect"); test.find("post").map(|pre| for (addr, s) in pre.as_object().unwrap() { let address = Address::from(addr.as_ref()); - //let balance = u256_from_json(&s["balance"]); + //let balance = U256::from(&s["balance"]); fail_unless(state.code(&address).unwrap_or(vec![]) == bytes_from_json(&s["code"]), "code is incorrect"); - fail_unless(state.balance(&address) == u256_from_json(&s["balance"]), "balance is incorrect"); - fail_unless(state.nonce(&address) == u256_from_json(&s["nonce"]), "nonce is incorrect"); + fail_unless(state.balance(&address) == xjson!(&s["balance"]), "balance is incorrect"); + fail_unless(state.nonce(&address) == xjson!(&s["nonce"]), "nonce is incorrect"); for (k, v) in s["storage"].as_object().unwrap() { let key = H256::from(&u256_from_str(k)); - let val = H256::from(&u256_from_json(v)); + let val = H256::from(&U256::from_json(v)); fail_unless(state.storage_at(&address, &key) == val, "storage is incorrect"); } @@ -257,12 +257,12 @@ fn do_json_test(json_data: &[u8]) -> Vec { let expected = &cc[i]; fail_unless(is.data == bytes_from_json(&expected["data"]), "callcreates data is incorrect"); fail_unless(is.destination == address_from_json(&expected["destination"]), "callcreates destination is incorrect"); - fail_unless(is.value == u256_from_json(&expected["value"]), "callcreates value is incorrect"); + fail_unless(is.value == xjson!(&expected["value"]), "callcreates value is incorrect"); // TODO: call_gas is calculated in externalities and is not exposed to TestExt. // maybe move it to it's own function to simplify calculation? - //println!("name: {:?}, is {:?}, expected: {:?}", name, is.gas_limit, u256_from_json(&expected["gasLimit"])); - //fail_unless(is.gas_limit == u256_from_json(&expected["gasLimit"]), "callcreates gas_limit is incorrect"); + //println!("name: {:?}, is {:?}, expected: {:?}", name, is.gas_limit, U256::from(&expected["gasLimit"])); + //fail_unless(is.gas_limit == U256::from(&expected["gasLimit"]), "callcreates gas_limit is incorrect"); } } } diff --git a/src/tests/transaction.rs b/src/tests/transaction.rs index b3c62b883..0660b2345 100644 --- a/src/tests/transaction.rs +++ b/src/tests/transaction.rs @@ -21,10 +21,10 @@ fn do_json_test(json_data: &[u8]) -> Vec { let t = res.unwrap(); fail_unless(t.sender().unwrap() == address_from_hex(clean(expect_sender))); fail_unless(t.data == bytes_from_json(&tx["data"])); - fail_unless(t.gas == u256_from_json(&tx["gasLimit"])); - fail_unless(t.gas_price == u256_from_json(&tx["gasPrice"])); - fail_unless(t.nonce == u256_from_json(&tx["nonce"])); - fail_unless(t.value == u256_from_json(&tx["value"])); + fail_unless(t.gas == xjson!(&tx["gasLimit"])); + fail_unless(t.gas_price == xjson!(&tx["gasPrice"])); + fail_unless(t.nonce == xjson!(&tx["nonce"])); + fail_unless(t.value == xjson!(&tx["value"])); if let Action::Call(ref to) = t.action { *ot.borrow_mut() = t.clone(); fail_unless(to == &address_from_json(&tx["to"])); diff --git a/src/transaction.rs b/src/transaction.rs index 7bc882d6d..f0441d774 100644 --- a/src/transaction.rs +++ b/src/transaction.rs @@ -32,15 +32,15 @@ pub struct Transaction { impl Transaction { pub fn new() -> Self { Transaction { - nonce: U256::zero(), - gas_price: U256::zero(), - gas: U256::zero(), + nonce: x!(0), + gas_price: x!(0), + gas: x!(0), action: Action::Create, - value: U256::zero(), + value: x!(0), data: vec![], v: 0, - r: U256::zero(), - s: U256::zero(), + r: x!(0), + s: x!(0), hash: RefCell::new(None), sender: RefCell::new(None), } @@ -55,8 +55,8 @@ impl Transaction { value: value, data: data, v: 0, - r: U256::zero(), - s: U256::zero(), + r: x!(0), + s: x!(0), hash: RefCell::new(None), sender: RefCell::new(None), } @@ -72,8 +72,8 @@ impl Transaction { value: value, data: data, v: 0, - r: U256::zero(), - s: U256::zero(), + r: x!(0), + s: x!(0), hash: RefCell::new(None), sender: RefCell::new(None), } @@ -81,18 +81,18 @@ impl Transaction { pub fn from_json(json: &Json) -> Transaction { let mut r = Transaction { - nonce: u256_from_json(&json["nonce"]), - gas_price: u256_from_json(&json["gasPrice"]), - gas: u256_from_json(&json["gasLimit"]), + nonce: xjson!(&json["nonce"]), + gas_price: xjson!(&json["gasPrice"]), + gas: xjson!(&json["gasLimit"]), action: match bytes_from_json(&json["to"]) { ref x if x.len() == 0 => Action::Create, ref x => Action::Call(Address::from_slice(x)), }, - value: u256_from_json(&json["value"]), + value: xjson!(&json["value"]), data: bytes_from_json(&json["data"]), v: match json.find("v") { Some(ref j) => u8_from_json(j), None => 0 }, - r: match json.find("r") { Some(ref j) => u256_from_json(j), None => U256::zero() }, - s: match json.find("s") { Some(ref j) => u256_from_json(j), None => U256::zero() }, + r: match json.find("r") { Some(j) => xjson!(j), None => x!(0) }, + s: match json.find("s") { Some(j) => xjson!(j), None => x!(0) }, hash: RefCell::new(None), sender: match json.find("sender") { Some(&Json::String(ref sender)) => RefCell::new(Some(address_from_hex(clean(sender)))), From 6eea05d2551359bd8778fb8aa0e41564241fff8c Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Thu, 14 Jan 2016 21:58:37 +0100 Subject: [PATCH 3/3] Change over to new FromJson API. --- src/builtin.rs | 12 ++++----- src/env_info.rs | 10 +++++--- src/log_entry.rs | 22 ++++++++-------- src/pod_state.rs | 20 ++++++++------- src/spec.rs | 9 ++++--- src/tests/executive.rs | 38 ++++++++++------------------ src/tests/state.rs | 4 +-- src/tests/transaction.rs | 8 +++--- src/transaction.rs | 54 +++++++++++++++++++++------------------- 9 files changed, 88 insertions(+), 89 deletions(-) diff --git a/src/builtin.rs b/src/builtin.rs index 0c1e60d5f..85319c948 100644 --- a/src/builtin.rs +++ b/src/builtin.rs @@ -39,6 +39,12 @@ impl Builtin { }) } + /// Simple forwarder for cost. + pub fn cost(&self, s: usize) -> U256 { (*self.cost)(s) } + + /// Simple forwarder for execute. + pub fn execute(&self, input: &[u8], output: &mut[u8]) { (*self.execute)(input, output); } + /// Create a builtin from JSON. /// /// JSON must be of the form `{ "name": "identity", "linear": {"base": 10, "word": 20} }`. @@ -55,12 +61,6 @@ impl Builtin { } None } - - /// Simple forwarder for cost. - pub fn cost(&self, s: usize) -> U256 { (*self.cost)(s) } - - /// Simple forwarder for execute. - pub fn execute(&self, input: &[u8], output: &mut[u8]) { (*self.execute)(input, output); } } pub fn copy_to(src: &[u8], dest: &mut[u8]) { diff --git a/src/env_info.rs b/src/env_info.rs index c806f228d..964312449 100644 --- a/src/env_info.rs +++ b/src/env_info.rs @@ -36,15 +36,17 @@ impl EnvInfo { gas_used: x!(0), } } +} - pub fn from_json(json: &Json) -> EnvInfo { - let current_number = u64_from_json(&json["currentNumber"]); +impl FromJson for EnvInfo { + fn from_json(json: &Json) -> EnvInfo { + let current_number: u64 = xjson!(&json["currentNumber"]); EnvInfo { number: current_number, - author: address_from_json(&json["currentCoinbase"]), + author: xjson!(&json["currentCoinbase"]), difficulty: xjson!(&json["currentDifficulty"]), gas_limit: xjson!(&json["currentGasLimit"]), - timestamp: u64_from_json(&json["currentTimestamp"]), + timestamp: xjson!(&json["currentTimestamp"]), last_hashes: (1..257).map(|i| format!("{}", current_number - i).as_bytes().sha3()).collect(), gas_used: x!(0), } diff --git a/src/log_entry.rs b/src/log_entry.rs index b16dfe9fc..cd4353874 100644 --- a/src/log_entry.rs +++ b/src/log_entry.rs @@ -28,16 +28,6 @@ impl LogEntry { } } - /// Convert given JSON object to a LogEntry. - pub fn from_json(json: &Json) -> LogEntry { - // TODO: check bloom. - LogEntry { - address: address_from_json(&json["address"]), - topics: vec_h256_from_json(&json["topics"]), - data: bytes_from_json(&json["data"]), - } - } - /// Returns reference to address. pub fn address(&self) -> &Address { &self.address @@ -59,6 +49,18 @@ impl LogEntry { } } +impl FromJson for LogEntry { + /// Convert given JSON object to a LogEntry. + fn from_json(json: &Json) -> LogEntry { + // TODO: check bloom. + LogEntry { + address: xjson!(&json["address"]), + topics: xjson!(&json["topics"]), + data: xjson!(&json["data"]), + } + } +} + #[cfg(test)] mod tests { use util::*; diff --git a/src/pod_state.rs b/src/pod_state.rs index ff456bda3..e3802c42a 100644 --- a/src/pod_state.rs +++ b/src/pod_state.rs @@ -8,13 +8,21 @@ impl PodState { /// Contruct a new object from the `m`. pub fn new(m: BTreeMap) -> PodState { PodState(m) } + /// Get the underlying map. + pub fn get(&self) -> &BTreeMap { &self.0 } + + /// Drain object to get the underlying map. + pub fn drain(self) -> BTreeMap { self.0 } +} + +impl FromJson for PodState { /// Translate the JSON object into a hash map of account information ready for insertion into State. - pub fn from_json(json: &Json) -> PodState { + fn from_json(json: &Json) -> PodState { PodState(json.as_object().unwrap().iter().fold(BTreeMap::new(), |mut state, (address, acc)| { let balance = acc.find("balance").map(&U256::from_json); let nonce = acc.find("nonce").map(&U256::from_json); - let storage = acc.find("storage").map(&map_h256_h256_from_json);; - let code = acc.find("code").map(&bytes_from_json); + let storage = acc.find("storage").map(&BTreeMap::from_json); + let code = acc.find("code").map(&Bytes::from_json); if balance.is_some() || nonce.is_some() || storage.is_some() || code.is_some() { state.insert(address_from_hex(address), PodAccount{ balance: balance.unwrap_or(U256::zero()), @@ -26,12 +34,6 @@ impl PodState { state })) } - - /// Get the underlying map. - pub fn get(&self) -> &BTreeMap { &self.0 } - - /// Drain object to get the underlying map. - pub fn drain(self) -> BTreeMap { self.0 } } impl fmt::Display for PodState { diff --git a/src/spec.rs b/src/spec.rs index acdfd2ecf..c9e3383eb 100644 --- a/src/spec.rs +++ b/src/spec.rs @@ -148,9 +148,11 @@ impl Spec { ret.append_raw(&empty_list, 1); ret.out() } +} +impl FromJson for Spec { /// Loads a chain-specification from a json data structure - pub fn from_json(json: Json) -> Spec { + fn from_json(json: &Json) -> Spec { // once we commit ourselves to some json parsing library (serde?) // move it to proper data structure let mut state = HashMap::new(); @@ -210,7 +212,9 @@ impl Spec { state_root_memo: RwLock::new(genesis.find("stateRoot").and_then(|_| genesis["stateRoot"].as_string()).map(|s| H256::from_str(&s[2..]).unwrap())), } } +} +impl Spec { /// Ensure that the given state DB has the trie nodes in for the genesis state. pub fn ensure_db_good(&self, db: &mut HashDB) { if !db.contains(&self.state_root()) { @@ -229,8 +233,7 @@ impl Spec { /// Create a new Spec from a JSON string. pub fn from_json_str(s: &str) -> Spec { - let json = Json::from_str(s).expect("Json is invalid"); - Self::from_json(json) + Self::from_json(&Json::from_str(s).expect("Json is invalid")) } /// Create a new Spec which conforms to the Morden chain except that it's a NullEngine consensus. diff --git a/src/tests/executive.rs b/src/tests/executive.rs index 1e95082ae..61c4df7ac 100644 --- a/src/tests/executive.rs +++ b/src/tests/executive.rs @@ -170,24 +170,19 @@ fn do_json_test(json_data: &[u8]) -> Vec { test.find("pre").map(|pre| for (addr, s) in pre.as_object().unwrap() { let address = Address::from(addr.as_ref()); let balance = xjson!(&s["balance"]); - let code = bytes_from_json(&s["code"]); + let code = xjson!(&s["code"]); let _nonce: U256 = xjson!(&s["nonce"]); state.new_contract(&address); state.add_balance(&address, &balance); state.init_code(&address, code); - - for (k, v) in s["storage"].as_object().unwrap() { - let key = H256::from(&u256_from_str(k)); - let val = H256::from(&U256::from_json(v)); - state.set_storage(&address, key, val); - } + BTreeMap::from_json(&s["storage"]).into_iter().foreach(|(k, v)| state.set_storage(&address, k, v)); }); let mut info = EnvInfo::new(); test.find("env").map(|env| { - info.author = address_from_json(&env["currentCoinbase"]); + info.author = xjson!(&env["currentCoinbase"]); info.difficulty = xjson!(&env["currentDifficulty"]); info.gas_limit = xjson!(&env["currentGasLimit"]); info.number = xjson!(&env["currentNumber"]); @@ -199,11 +194,11 @@ fn do_json_test(json_data: &[u8]) -> Vec { // params let mut params = ActionParams::new(); test.find("exec").map(|exec| { - params.address = address_from_json(&exec["address"]); - params.sender = address_from_json(&exec["caller"]); - params.origin = address_from_json(&exec["origin"]); - params.code = bytes_from_json(&exec["code"]); - params.data = bytes_from_json(&exec["data"]); + params.address = xjson!(&exec["address"]); + params.sender = xjson!(&exec["caller"]); + params.origin = xjson!(&exec["origin"]); + params.code = xjson!(&exec["code"]); + params.data = xjson!(&exec["data"]); params.gas = xjson!(&exec["gas"]); params.gas_price = xjson!(&exec["gasPrice"]); params.value = xjson!(&exec["value"]); @@ -231,23 +226,16 @@ fn do_json_test(json_data: &[u8]) -> Vec { //println!("name: {}, gas_left : {:?}, expected: {:?}", name, gas_left, U256::from(&test["gas"])); fail_unless(!out_of_gas, "expected to run out of gas."); fail_unless(gas_left == xjson!(&test["gas"]), "gas_left is incorrect"); - fail_unless(output == bytes_from_json(&test["out"]), "output is incorrect"); + fail_unless(output == Bytes::from_json(&test["out"]), "output is incorrect"); test.find("post").map(|pre| for (addr, s) in pre.as_object().unwrap() { let address = Address::from(addr.as_ref()); - //let balance = U256::from(&s["balance"]); - fail_unless(state.code(&address).unwrap_or(vec![]) == bytes_from_json(&s["code"]), "code is incorrect"); + fail_unless(state.code(&address).unwrap_or(vec![]) == Bytes::from_json(&s["code"]), "code is incorrect"); fail_unless(state.balance(&address) == xjson!(&s["balance"]), "balance is incorrect"); fail_unless(state.nonce(&address) == xjson!(&s["nonce"]), "nonce is incorrect"); - - for (k, v) in s["storage"].as_object().unwrap() { - let key = H256::from(&u256_from_str(k)); - let val = H256::from(&U256::from_json(v)); - - fail_unless(state.storage_at(&address, &key) == val, "storage is incorrect"); - } + BTreeMap::from_json(&s["storage"]).iter().foreach(|(k, v)| fail_unless(&state.storage_at(&address, &k) == v, "storage is incorrect")); }); let cc = test["callcreates"].as_array().unwrap(); @@ -255,8 +243,8 @@ fn do_json_test(json_data: &[u8]) -> Vec { for i in 0..cc.len() { let is = &callcreates[i]; let expected = &cc[i]; - fail_unless(is.data == bytes_from_json(&expected["data"]), "callcreates data is incorrect"); - fail_unless(is.destination == address_from_json(&expected["destination"]), "callcreates destination is incorrect"); + fail_unless(is.data == Bytes::from_json(&expected["data"]), "callcreates data is incorrect"); + fail_unless(is.destination == xjson!(&expected["destination"]), "callcreates destination is incorrect"); fail_unless(is.value == xjson!(&expected["value"]), "callcreates value is incorrect"); // TODO: call_gas is calculated in externalities and is not exposed to TestExt. diff --git a/src/tests/state.rs b/src/tests/state.rs index 58e57558c..7aa5b4882 100644 --- a/src/tests/state.rs +++ b/src/tests/state.rs @@ -16,8 +16,8 @@ fn do_json_test(json_data: &[u8]) -> Vec { let t = Transaction::from_json(&test["transaction"]); let env = EnvInfo::from_json(&test["env"]); - let _out = bytes_from_json(&test["out"]); - let post_state_root = h256_from_json(&test["postStateRoot"]); + let _out = Bytes::from_json(&test["out"]); + let post_state_root = xjson!(&test["postStateRoot"]); let pre = PodState::from_json(&test["pre"]); let post = PodState::from_json(&test["post"]); let logs: Vec<_> = test["logs"].as_array().unwrap().iter().map(&LogEntry::from_json).collect(); diff --git a/src/tests/transaction.rs b/src/tests/transaction.rs index 0660b2345..d4836ca84 100644 --- a/src/tests/transaction.rs +++ b/src/tests/transaction.rs @@ -14,23 +14,23 @@ fn do_json_test(json_data: &[u8]) -> Vec { .and_then(|j| j.as_string()) .and_then(|s| BlockNumber::from_str(s).ok()) .unwrap_or(0) { x if x < 900000 => &old_schedule, _ => &new_schedule }; - let rlp = bytes_from_json(&test["rlp"]); + let rlp = Bytes::from_json(&test["rlp"]); let res = UntrustedRlp::new(&rlp).as_val().map_err(|e| From::from(e)).and_then(|t: Transaction| t.validate(schedule, schedule.have_delegate_call)); fail_unless(test.find("transaction").is_none() == res.is_err()); if let (Some(&Json::Object(ref tx)), Some(&Json::String(ref expect_sender))) = (test.find("transaction"), test.find("sender")) { let t = res.unwrap(); fail_unless(t.sender().unwrap() == address_from_hex(clean(expect_sender))); - fail_unless(t.data == bytes_from_json(&tx["data"])); + fail_unless(t.data == Bytes::from_json(&tx["data"])); fail_unless(t.gas == xjson!(&tx["gasLimit"])); fail_unless(t.gas_price == xjson!(&tx["gasPrice"])); fail_unless(t.nonce == xjson!(&tx["nonce"])); fail_unless(t.value == xjson!(&tx["value"])); if let Action::Call(ref to) = t.action { *ot.borrow_mut() = t.clone(); - fail_unless(to == &address_from_json(&tx["to"])); + fail_unless(to == &xjson!(&tx["to"])); } else { *ot.borrow_mut() = t.clone(); - fail_unless(bytes_from_json(&tx["to"]).len() == 0); + fail_unless(Bytes::from_json(&tx["to"]).len() == 0); } } } diff --git a/src/transaction.rs b/src/transaction.rs index f0441d774..56acf5ab7 100644 --- a/src/transaction.rs +++ b/src/transaction.rs @@ -79,32 +79,6 @@ impl Transaction { } } - pub fn from_json(json: &Json) -> Transaction { - let mut r = Transaction { - nonce: xjson!(&json["nonce"]), - gas_price: xjson!(&json["gasPrice"]), - gas: xjson!(&json["gasLimit"]), - action: match bytes_from_json(&json["to"]) { - ref x if x.len() == 0 => Action::Create, - ref x => Action::Call(Address::from_slice(x)), - }, - value: xjson!(&json["value"]), - data: bytes_from_json(&json["data"]), - v: match json.find("v") { Some(ref j) => u8_from_json(j), None => 0 }, - r: match json.find("r") { Some(j) => xjson!(j), None => x!(0) }, - s: match json.find("s") { Some(j) => xjson!(j), None => x!(0) }, - hash: RefCell::new(None), - sender: match json.find("sender") { - Some(&Json::String(ref sender)) => RefCell::new(Some(address_from_hex(clean(sender)))), - _ => RefCell::new(None), - }, - }; - if let Some(&Json::String(ref secret_key)) = json.find("secretKey") { - r.sign(&h256_from_hex(clean(secret_key))); - } - r - } - /// Get the nonce of the transaction. pub fn nonce(&self) -> &U256 { &self.nonce } /// Get the gas price of the transaction. @@ -144,6 +118,34 @@ impl Transaction { } } +impl FromJson for Transaction { + fn from_json(json: &Json) -> Transaction { + let mut r = Transaction { + nonce: xjson!(&json["nonce"]), + gas_price: xjson!(&json["gasPrice"]), + gas: xjson!(&json["gasLimit"]), + action: match Bytes::from_json(&json["to"]) { + ref x if x.len() == 0 => Action::Create, + ref x => Action::Call(Address::from_slice(x)), + }, + value: xjson!(&json["value"]), + data: xjson!(&json["data"]), + v: match json.find("v") { Some(ref j) => u16::from_json(j) as u8, None => 0 }, + r: match json.find("r") { Some(j) => xjson!(j), None => x!(0) }, + s: match json.find("s") { Some(j) => xjson!(j), None => x!(0) }, + hash: RefCell::new(None), + sender: match json.find("sender") { + Some(&Json::String(ref sender)) => RefCell::new(Some(address_from_hex(clean(sender)))), + _ => RefCell::new(None), + }, + }; + if let Some(&Json::String(ref secret_key)) = json.find("secretKey") { + r.sign(&h256_from_hex(clean(secret_key))); + } + r + } +} + impl RlpStandard for Transaction { fn rlp_append(&self, s: &mut RlpStream) { self.rlp_append_opt(s, Seal::With) } }