diff options
| author | zelig <viktor.tron@gmail.com> | 2015-03-16 23:46:29 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-03-16 23:46:29 +0800 |
| commit | 5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb (patch) | |
| tree | d5ba6197a8c0c8e36bb92ee9fc8aad717cb2d178 /xeth/state.go | |
| parent | 8393dab470c40678caf36ada82e312d29c4cf5c4 (diff) | |
| parent | 22893b7ac925c49168c119f293ea8befc3aff5cc (diff) | |
| download | dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.gz dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.bz2 dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.lz dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.xz dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.zst dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.zip | |
Merge remote-tracking branch 'upstream/develop' into frontier/js
Conflicts:
cmd/ethereum/js.go
javascript/types.go
Diffstat (limited to 'xeth/state.go')
| -rw-r--r-- | xeth/state.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xeth/state.go b/xeth/state.go index bb729db33..7d9ceab1b 100644 --- a/xeth/state.go +++ b/xeth/state.go @@ -1,7 +1,7 @@ package xeth import ( - "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/state" ) @@ -19,7 +19,7 @@ func (self *State) State() *state.StateDB { } func (self *State) Get(addr string) *Object { - return &Object{self.state.GetStateObject(ethutil.FromHex(addr))} + return &Object{self.state.GetStateObject(common.FromHex(addr))} } func (self *State) SafeGet(addr string) *Object { @@ -27,9 +27,9 @@ func (self *State) SafeGet(addr string) *Object { } func (self *State) safeGet(addr string) *state.StateObject { - object := self.state.GetStateObject(ethutil.FromHex(addr)) + object := self.state.GetStateObject(common.FromHex(addr)) if object == nil { - object = state.NewStateObject(ethutil.FromHex(addr), self.xeth.eth.StateDb()) + object = state.NewStateObject(common.FromHex(addr), self.xeth.eth.StateDb()) } return object |