Merge branch 'master' into hotfix/0.8.5-2

1 files changed, 33 insertions, 0 deletions

diff --git a/xeth/state.go b/xeth/state.go
new file mode 100644
index 000000000..e2562613c
--- /dev/null
+++ b/xeth/state.go
@@ -0,0 +1,33 @@
+package xeth
+
+import "github.com/ethereum/go-ethereum/state"
+
+type State struct {
+	xeth  *XEth
+	state *state.StateDB
+}
+
+func NewState(xeth *XEth, statedb *state.StateDB) *State {
+	return &State{xeth, statedb}
+}
+
+func (self *State) State() *state.StateDB {
+	return self.state
+}
+
+func (self *State) Get(addr string) *Object {
+	return &Object{self.state.GetStateObject(fromHex(addr))}
+}
+
+func (self *State) SafeGet(addr string) *Object {
+	return &Object{self.safeGet(addr)}
+}
+
+func (self *State) safeGet(addr string) *state.StateObject {
+	object := self.state.GetStateObject(fromHex(addr))
+	if object == nil {
+		object = state.NewStateObject(fromHex(addr), self.xeth.eth.Db())
+	}
+
+	return object
+}