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

Merge pull request #5959 from paritytech/dont-compute-hash

Browse Source 
Defer code hash calculation.
This commit is contained in:
Robert Habermeier
2017-07-06 19:00:19 +02:00
committed by GitHub
parent df0ef6618d 5d9f5e3509
commit 125aa0aeb4
11 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rpc/src/v1/types/transaction.rs
View File

@@ -16,7 +16,6 @@
use serde::{Serialize, Serializer};
use serde::ser::SerializeStruct;
use util::Hashable;
use ethcore::miner;
use ethcore::{contract_address, CreateContractAddress};
use ethcore::transaction::{LocalizedTransaction, Action, PendingTransaction, SignedTransaction};
@@ -192,7 +191,7 @@ impl Transaction {
gas: t.gas.into(),
input: Bytes::new(t.data.clone()),
creates: match t.action {
Action::Create => Some(contract_address(scheme, &t.sender(), &t.nonce, &t.data.sha3()).into()),
Action::Create => Some(contract_address(scheme, &t.sender(), &t.nonce, &t.data).0.into()),
Action::Call(_) => None,
},
raw: ::rlp::encode(&t.signed).into_vec().into(),
@@ -226,7 +225,7 @@ impl Transaction {
gas: t.gas.into(),
input: Bytes::new(t.data.clone()),
creates: match t.action {
Action::Create => Some(contract_address(scheme, &t.sender(), &t.nonce, &t.data.sha3()).into()),
Action::Create => Some(contract_address(scheme, &t.sender(), &t.nonce, &t.data).0.into()),
Action::Call(_) => None,
},
raw: ::rlp::encode(&t).into_vec().into(),