diff options
author | obscuren <geffobscura@gmail.com> | 2014-12-04 18:40:20 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2014-12-04 18:40:20 +0800 |
commit | f298ffdbb8ec2b14f254e880a65f22f4d7c66305 (patch) | |
tree | 59b0edc06529785afef7c103e9bdbd4248ec58da /core/types | |
parent | 3664cd58e3631fccf4d9aba1932e0bb63ad442a6 (diff) | |
download | dexon-f298ffdbb8ec2b14f254e880a65f22f4d7c66305.tar dexon-f298ffdbb8ec2b14f254e880a65f22f4d7c66305.tar.gz dexon-f298ffdbb8ec2b14f254e880a65f22f4d7c66305.tar.bz2 dexon-f298ffdbb8ec2b14f254e880a65f22f4d7c66305.tar.lz dexon-f298ffdbb8ec2b14f254e880a65f22f4d7c66305.tar.xz dexon-f298ffdbb8ec2b14f254e880a65f22f4d7c66305.tar.zst dexon-f298ffdbb8ec2b14f254e880a65f22f4d7c66305.zip |
Renamed State => StateDB
Diffstat (limited to 'core/types')
-rw-r--r-- | core/types/block.go | 4 | ||||
-rw-r--r-- | core/types/transaction.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/types/block.go b/core/types/block.go index feab7072f..55ce1fb9b 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -77,7 +77,7 @@ type Block struct { Coinbase []byte // Block Trie state //state *ethutil.Trie - state *state.State + state *state.StateDB // Difficulty for the current block Difficulty *big.Int // Creation time @@ -151,7 +151,7 @@ func (block *Block) HashNoNonce() []byte { return crypto.Sha3(ethutil.Encode(block.miningHeader())) } -func (block *Block) State() *state.State { +func (block *Block) State() *state.StateDB { return block.state } diff --git a/core/types/transaction.go b/core/types/transaction.go index efc90b6f2..63edef756 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -77,7 +77,7 @@ func (tx *Transaction) IsContract() bool { return tx.CreatesContract() } -func (tx *Transaction) CreationAddress(state *state.State) []byte { +func (tx *Transaction) CreationAddress(state *state.StateDB) []byte { // Generate a new address return crypto.Sha3(ethutil.NewValue([]interface{}{tx.Sender(), tx.Nonce}).Encode())[12:] } |