From 0681346201e8d1cf66acab987051790ecc0ead99 Mon Sep 17 00:00:00 2001 From: debris Date: Fri, 1 Apr 2016 11:26:14 +0200 Subject: [PATCH] fixed #855 --- ethcore/src/client/client.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs index ced426a0c..dfdad70a9 100644 --- a/ethcore/src/client/client.rs +++ b/ethcore/src/client/client.rs @@ -30,7 +30,7 @@ use service::{NetSyncMessage, SyncMessage}; use env_info::LastHashes; use verification::*; use block::*; -use transaction::{LocalizedTransaction, SignedTransaction}; +use transaction::{LocalizedTransaction, SignedTransaction, Action}; use extras::TransactionAddress; use filter::Filter; use log_entry::LocalizedLogEntry; @@ -38,7 +38,7 @@ use block_queue::{BlockQueue, BlockQueueInfo}; use blockchain::{BlockChain, BlockProvider, TreeRoute, ImportRoute}; use client::{BlockId, TransactionId, UncleId, ClientConfig, BlockChainClient}; use env_info::EnvInfo; -use executive::{Executive, Executed}; +use executive::{Executive, Executed, contract_address}; use receipt::LocalizedReceipt; pub use blockchain::CacheSize as BlockChainCacheSize; @@ -577,8 +577,10 @@ impl BlockChainClient for Client where V: Verifier { // TODO: to fix this, query all previous transaction receipts and retrieve their gas usage cumulative_gas_used: receipt.gas_used, gas_used: receipt.gas_used, - // TODO: to fix this, store created contract address in db - contract_address: None, + contract_address: match tx.action { + Action::Call(_) => None, + Action::Create => Some(contract_address(&tx.sender().unwrap(), &tx.nonce)) + }, logs: receipt.logs.into_iter().enumerate().map(|(i, log)| LocalizedLogEntry { entry: log, block_hash: block_hash.clone(),