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

Merge remote-tracking branch 'origin/master' into broken

Browse Source
This commit is contained in:
Gav Wood 2015-12-19 14:06:00 +00:00
commit 20d4da78bc
5 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -11,6 +11,7 @@ log = "0.3"
env_logger = "0.3" env_logger = "0.3"
ethcore-util = "0.1.0" ethcore-util = "0.1.0"
evmjit = { path = "rust-evmjit", optional = true } evmjit = { path = "rust-evmjit", optional = true }
rustc-serialize = "0.3"
[features] [features]
jit = ["evmjit"] jit = ["evmjit"]

4
src/account.rs
View File

@ -286,6 +286,8 @@ fn rlpio() {
#[test] #[test]
fn new_account() { fn new_account() {
use rustc_serialize::hex::ToHex;
let a = Account::new(U256::from(69u8), U256::from(0u8), HashMap::new(), Bytes::new()); let a = Account::new(U256::from(69u8), U256::from(0u8), HashMap::new(), Bytes::new());
assert_eq!(a.rlp().to_hex(), "f8448045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"); assert_eq!(a.rlp().to_hex(), "f8448045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
assert_eq!(a.balance(), &U256::from(69u8)); assert_eq!(a.balance(), &U256::from(69u8));
@ -296,6 +298,8 @@ fn new_account() {
#[test] #[test]
fn create_account() { fn create_account() {
use rustc_serialize::hex::ToHex;
let a = Account::new(U256::from(69u8), U256::from(0u8), HashMap::new(), Bytes::new()); let a = Account::new(U256::from(69u8), U256::from(0u8), HashMap::new(), Bytes::new());
assert_eq!(a.rlp().to_hex(), "f8448045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"); assert_eq!(a.rlp().to_hex(), "f8448045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
} }

49
src/blockheader.rs
View File

@ -56,26 +56,30 @@ impl Header {
impl Decodable for Header { impl Decodable for Header {
fn decode<D>(decoder: &D) -> Result<Self, DecoderError> where D: Decoder { fn decode<D>(decoder: &D) -> Result<Self, DecoderError> where D: Decoder {
decoder.read_list(| d | { let d = try!(decoder.as_list());
let blockheader = Header {
parent_hash: try!(Decodable::decode(&d[0])), let mut blockheader = Header {
uncles_hash: try!(Decodable::decode(&d[1])), parent_hash: try!(Decodable::decode(&d[0])),
author: try!(Decodable::decode(&d[2])), uncles_hash: try!(Decodable::decode(&d[1])),
state_root: try!(Decodable::decode(&d[3])), author: try!(Decodable::decode(&d[2])),
transactions_root: try!(Decodable::decode(&d[4])), state_root: try!(Decodable::decode(&d[3])),
receipts_root: try!(Decodable::decode(&d[5])), transactions_root: try!(Decodable::decode(&d[4])),
log_bloom: try!(Decodable::decode(&d[6])), receipts_root: try!(Decodable::decode(&d[5])),
difficulty: try!(Decodable::decode(&d[7])), log_bloom: try!(Decodable::decode(&d[6])),
number: try!(Decodable::decode(&d[8])), difficulty: try!(Decodable::decode(&d[7])),
gas_limit: try!(Decodable::decode(&d[9])), number: try!(Decodable::decode(&d[8])),
gas_used: try!(Decodable::decode(&d[10])), gas_limit: try!(Decodable::decode(&d[9])),
timestamp: try!(Decodable::decode(&d[11])), gas_used: try!(Decodable::decode(&d[10])),
extra_data: try!(Decodable::decode(&d[12])), timestamp: try!(Decodable::decode(&d[11])),
seal: vec![], extra_data: try!(Decodable::decode(&d[12])),
}; seal: vec![],
// TODO: fill blockheader.seal with (raw) list items index 12..) };
Ok(blockheader)
}) for i in 13..d.len() {
blockheader.seal.push(try!(Decodable::decode(&d[i])));
}
Ok(blockheader)
} }
} }
@ -95,7 +99,10 @@ impl Encodable for Header {
self.gas_used.encode(e); self.gas_used.encode(e);
self.timestamp.encode(e); self.timestamp.encode(e);
self.extra_data.encode(e); self.extra_data.encode(e);
// TODO: emit raw seal items.
for b in self.seal.iter() {
b.encode(e);
}
}) })
} }
} }

1
src/lib.rs
View File

@ -72,6 +72,7 @@
#[macro_use] #[macro_use]
extern crate log; extern crate log;
extern crate env_logger; extern crate env_logger;
extern crate rustc_serialize;
#[cfg(feature = "jit" )] #[cfg(feature = "jit" )]
extern crate evmjit; extern crate evmjit;
extern crate ethcore_util as util; extern crate ethcore_util as util;

23
src/transaction.rs
View File

@ -37,17 +37,18 @@ impl Encodable for Transaction {
impl Decodable for Transaction { impl Decodable for Transaction {
fn decode<D>(decoder: &D) -> Result<Self, DecoderError> where D: Decoder { fn decode<D>(decoder: &D) -> Result<Self, DecoderError> where D: Decoder {
decoder.read_list(| d | { let d = try!(decoder.as_list());
let transaction = Transaction {
nonce: try!(Decodable::decode(&d[0])), let transaction = Transaction {
gas_price: try!(Decodable::decode(&d[1])), nonce: try!(Decodable::decode(&d[0])),
gas: try!(Decodable::decode(&d[2])), gas_price: try!(Decodable::decode(&d[1])),
receive_address: try!(Decodable::decode(&d[3])), gas: try!(Decodable::decode(&d[2])),
value: try!(Decodable::decode(&d[4])), receive_address: try!(Decodable::decode(&d[3])),
data: try!(Decodable::decode(&d[5])), value: try!(Decodable::decode(&d[4])),
}; data: try!(Decodable::decode(&d[5])),
Ok(transaction) };
})
Ok(transaction)
} }
} }