Merge branch 'develop' into poc8

1 files changed, 13 insertions, 44 deletions

diff --git a/xeth/world.go b/xeth/world.go
index 008a08423..9cbdd9461 100644
--- a/xeth/world.go
+++ b/xeth/world.go
@@ -1,63 +1,32 @@
 package xeth
 
-import (
-	"github.com/ethereum/go-ethereum/p2p"
-	"github.com/ethereum/go-ethereum/state"
-)
-
-type World struct {
-	pipe *XEth
-	cfg  *Config
-}
-
-func NewWorld(pipe *XEth) *World {
-	world := &World{pipe, nil}
-	world.cfg = &Config{pipe}
+import "github.com/ethereum/go-ethereum/state"
 
-	return world
+type State struct {
+	xeth *XEth
 }
 
-func (self *XEth) World() *World {
-	return self.world
+func NewState(xeth *XEth) *State {
+	return &State{xeth}
 }
 
-func (self *World) State() *state.StateDB {
-	return self.pipe.chainManager.State()
+func (self *State) State() *state.StateDB {
+	return self.xeth.chainManager.TransState()
 }
 
-func (self *World) Get(addr []byte) *Object {
-	return &Object{self.State().GetStateObject(addr)}
+func (self *State) Get(addr string) *Object {
+	return &Object{self.State().GetStateObject(fromHex(addr))}
 }
 
-func (self *World) SafeGet(addr []byte) *Object {
+func (self *State) SafeGet(addr string) *Object {
 	return &Object{self.safeGet(addr)}
 }
 
-func (self *World) safeGet(addr []byte) *state.StateObject {
-	object := self.State().GetStateObject(addr)
+func (self *State) safeGet(addr string) *state.StateObject {
+	object := self.State().GetStateObject(fromHex(addr))
 	if object == nil {
-		object = state.NewStateObject(addr)
+		object = state.NewStateObject(fromHex(addr), self.xeth.eth.Db())
 	}
 
 	return object
 }
-
-func (self *World) Coinbase() *state.StateObject {
-	return nil
-}
-
-func (self *World) IsMining() bool {
-	return self.pipe.obj.IsMining()
-}
-
-func (self *World) IsListening() bool {
-	return self.pipe.obj.IsListening()
-}
-
-func (self *World) Peers() []*p2p.Peer {
-	return self.pipe.obj.Peers()
-}
-
-func (self *World) Config() *Config {
-	return self.cfg
-}