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

Merge branch 'master' of https://github.com/gavofyork/ethcore into blockchain

Browse Source
This commit is contained in:
debris 2015-12-14 15:26:56 +01:00
commit eb342d4a6a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/blockheader.rs
View File

@ -99,7 +99,7 @@ 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 {
let d = try!(decoder.as_list()); let d = try!(decoder.as_list());
let blockheader = Header { let mut blockheader = Header {
parent_hash: try!(Decodable::decode(&d[0])), parent_hash: try!(Decodable::decode(&d[0])),
uncles_hash: try!(Decodable::decode(&d[1])), uncles_hash: try!(Decodable::decode(&d[1])),
author: try!(Decodable::decode(&d[2])), author: try!(Decodable::decode(&d[2])),
@ -115,7 +115,11 @@ impl Decodable for Header {
extra_data: try!(Decodable::decode(&d[12])), extra_data: try!(Decodable::decode(&d[12])),
seal: vec![], seal: vec![],
}; };
// TODO: fill blockheader.seal with (raw) list items index 12..)
for i in 13..d.len() {
blockheader.seal.push(try!(Decodable::decode(&d[i])));
}
Ok(blockheader) Ok(blockheader)
} }
} }
@ -136,7 +140,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);
}
}) })
} }
} }