diff options
| author | Felix Lange <fjl@twurst.com> | 2015-03-18 20:39:01 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-03-18 20:39:01 +0800 |
| commit | d15f90645d5b2e90c441140972d9fe6ecd753643 (patch) | |
| tree | b1f024c3c01f25b67bc25ed0452a9b584dad984f /xeth/state.go | |
| parent | a59dd393e71cc52b1f96973aef884af619166f38 (diff) | |
| parent | 0a1eeca41e6ba5920ba65d9b41654768299bc7e3 (diff) | |
| download | dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.gz dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.bz2 dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.lz dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.xz dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.tar.zst dexon-d15f90645d5b2e90c441140972d9fe6ecd753643.zip | |
Merge remote-tracking branch 'ethereum/conversion' into conversion
Diffstat (limited to 'xeth/state.go')
| -rw-r--r-- | xeth/state.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xeth/state.go b/xeth/state.go index 7d9ceab1b..f645a9cac 100644 --- a/xeth/state.go +++ b/xeth/state.go @@ -19,7 +19,7 @@ func (self *State) State() *state.StateDB { } func (self *State) Get(addr string) *Object { - return &Object{self.state.GetStateObject(common.FromHex(addr))} + return &Object{self.state.GetStateObject(common.HexToAddress(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(common.FromHex(addr)) + object := self.state.GetStateObject(common.HexToAddress(addr)) if object == nil { - object = state.NewStateObject(common.FromHex(addr), self.xeth.eth.StateDb()) + object = state.NewStateObject(common.HexToAddress(addr), self.xeth.eth.StateDb()) } return object |