aboutsummaryrefslogtreecommitdiffstats
path: root/xeth/state.go
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-03-16 23:50:29 +0800
committerzelig <viktor.tron@gmail.com>2015-03-16 23:50:29 +0800
commitb3e133dd159749a625c4b0245af293607ba12c8c (patch)
tree9ba8e8c4afe9168f5bc83219d402efb00387d616 /xeth/state.go
parent8139d444f8d8163251d1c96ef8034d186825ce32 (diff)
parent73af0302bed5076260ac935e452064aee423934d (diff)
downloadgo-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar
go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar.gz
go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar.bz2
go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar.lz
go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar.xz
go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.tar.zst
go-tangerine-b3e133dd159749a625c4b0245af293607ba12c8c.zip
Merge branch 'frontier/js' into frontier/nodeadmin.js
Diffstat (limited to 'xeth/state.go')
-rw-r--r--xeth/state.go8
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