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

Storage export

Browse Source
This commit is contained in:
arkpar 2016-11-27 11:57:05 +01:00
parent b0555fbe7c
commit e91f7977fb
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
parity/blockchain.rs
View File

@ -22,7 +22,7 @@ use std::thread::sleep;
use std::sync::Arc; use std::sync::Arc;
use rustc_serialize::hex::FromHex; use rustc_serialize::hex::FromHex;
use io::{PanicHandler, ForwardPanic}; use io::{PanicHandler, ForwardPanic};
use util::{ToPretty, Uint, U256, Address, Hashable}; use util::{ToPretty, Uint, U256, H256, Address, Hashable};
use rlp::PayloadInfo; use rlp::PayloadInfo;
use ethcore::service::ClientService; use ethcore::service::ClientService;
use ethcore::client::{Mode, DatabaseCompactionProfile, VMType, BlockImportError, BlockChainClient, BlockID}; use ethcore::client::{Mode, DatabaseCompactionProfile, VMType, BlockImportError, BlockChainClient, BlockID};
@ -393,7 +393,7 @@ fn execute_export_state(cmd: ExportState) -> Result<String, String> {
let at = cmd.at; let at = cmd.at;
let mut i = 0usize; let mut i = 0usize;
out.write_fmt(format_args!("{{\n\"state\": [", )).expect("Couldn't write to stream."); out.write_fmt(format_args!("{{ "state\": [", )).expect("Couldn't write to stream.");
loop { loop {
let accounts = try!(client.list_accounts(at, last.as_ref(), 1000).ok_or("Specified block not found")); let accounts = try!(client.list_accounts(at, last.as_ref(), 1000).ok_or("Specified block not found"));
if accounts.is_empty() { if accounts.is_empty() {
@ -416,7 +416,25 @@ fn execute_export_state(cmd: ExportState) -> Result<String, String> {
if storage_root != ::util::SHA3_NULL_RLP { if storage_root != ::util::SHA3_NULL_RLP {
out.write_fmt(format_args!(", \"storage_root\": \"0x{}\"", storage_root.hex())).expect("Write error"); out.write_fmt(format_args!(", \"storage_root\": \"0x{}\"", storage_root.hex())).expect("Write error");
if cmd.storage { if cmd.storage {
//out.write_fmt(format_args!(", \"storage\": {\n", client.code(at, &account).hex())); out.write_fmt(format_args!(", \"storage\": {{")).expect("Write error");
let mut last_storage: Option<H256> = None;
loop {
let keys = try!(client.list_storage(at, &account, last_storage.as_ref(), 1000).ok_or("Specified block not found"));
if keys.is_empty() {
break;
}
let mut si = 0;
for key in keys.into_iter() {
if si != 0 {
out.write(b",").expect("Write error");
}
out.write_fmt(format_args!("\n\t\"0x{}\": \"0x{}\"", key.hex(), client.storage_at(&account, &key, at).unwrap_or_else(Default::default).hex())).expect("Write error");
si += 1;
last_storage = Some(key);
}
}
out.write(b"\n}").expect("Write error");
} }
} }
out.write(b"}").expect("Write error"); out.write(b"}").expect("Write error");