blockchain wip

This commit is contained in:
debris 2015-12-15 16:21:19 +01:00
parent e38225d1a5
commit e575f35caf

View File

@ -27,7 +27,7 @@ pub struct BlockChain {
genesis_hash: H256, genesis_hash: H256,
_genesis_state: HashMap<Address, Account>, _genesis_state: HashMap<Address, Account>,
last_block_number: U256, _last_block_number: U256,
// block cache // block cache
blocks: RwLock<HashMap<H256, Bytes>>, blocks: RwLock<HashMap<H256, Bytes>>,
@ -103,7 +103,7 @@ impl BlockChain {
_genesis_header: genesis_header, _genesis_header: genesis_header,
genesis_hash: genesis_hash, genesis_hash: genesis_hash,
_genesis_state: genesis_state, _genesis_state: genesis_state,
last_block_number: U256::from(0u8), _last_block_number: U256::from(0u8),
blocks: RwLock::new(HashMap::new()), blocks: RwLock::new(HashMap::new()),
block_details: Extras::new(ExtrasIndex::BlockDetails), block_details: Extras::new(ExtrasIndex::BlockDetails),
block_hashes: Extras::new(ExtrasIndex::BlockHash), block_hashes: Extras::new(ExtrasIndex::BlockHash),
@ -122,32 +122,20 @@ impl BlockChain {
return Block::new_existing(db.clone(), root) return Block::new_existing(db.clone(), root)
} }
let block = Block::new(db.clone()); let _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().db().commit(); // block.mutable_state().db().commit();
// TODO: set previous block // TODO: set previous block
// TODO: reset current // TODO: reset current
block unimplemented!()
} }
pub fn verify_block<'a>(&self, block: &'a [u8]) -> VerifiedBlock<'a> { pub fn verify_block<'a>(&self, _block: &'a [u8]) -> VerifiedBlock<'a> {
//TODO: verify block unimplemented!()
VerifiedBlock::new(block)
}
pub fn import_block(&self, block: &[u8], _db: &OverlayDB) -> ImportRoute {
let view = HeaderView::new(block);
// check if we already know this block
if self.is_known(&view.sha3()) {
}
// check if we already know parent of this block
if !self.is_known(&view.parent_hash()) {
} }
pub fn import_block(&self, _block: &[u8], _db: &OverlayDB) -> ImportRoute {
unimplemented!(); unimplemented!();
} }
@ -155,12 +143,7 @@ impl BlockChain {
/// (though not necessarily a part of the canon chain). /// (though not necessarily a part of the canon chain).
pub fn is_known(&self, hash: &H256) -> bool { pub fn is_known(&self, hash: &H256) -> bool {
// TODO: consider taking into account current block // TODO: consider taking into account current block
// TODO: first do lookup in blocks_db for given hash self.query_extras_exist(hash, &self.block_details)
// TODO: is comparing block numbers necessery?
match self.query_extras(hash, &self.block_details) {
None => false,
Some(details) => details.number <= self.last_block_number
}
} }
/// Returns true if transaction is known. /// Returns true if transaction is known.