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

Ignore global cache for patched accounts (#9752)

Browse Source 
* Ignore global cache for patched accounts

* Rollback patched account flag

* Store root in checkpoint storage
This commit is contained in:
Anton Gavrilov
2018-10-31 16:55:11 +01:00
committed by André Silva
parent 1c1cd8b164
commit a3bd355b16
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ethcore/private-tx/src/lib.rs
View File

@@ -499,6 +499,7 @@ impl Provider where {
None => bail!(ErrorKind::ContractDoesNotExist),
Some(address) => {
let (code, storage) = state.into_account(&address)?;
trace!(target: "privatetx", "Private contract executed. code: {:?}, state: {:?}, result: {:?}", code, storage, result.output);
let enc_code = match code {
Some(c) => Some(self.encrypt(&address, &Self::iv_from_address(&address), &c)?),
None => None,
@@ -506,7 +507,6 @@ impl Provider where {
(enc_code, self.encrypt(&address, &Self::iv_from_transaction(transaction), &Self::snapshot_from_storage(&storage))?)
},
};
trace!(target: "privatetx", "Private contract executed. code: {:?}, state: {:?}, result: {:?}", encrypted_code, encrypted_storage, result.output);
Ok(PrivateExecutionResult {
code: encrypted_code,
state: encrypted_storage,