Merge branch 'develop' into rpcfabian

1 files changed, 4 insertions, 6 deletions

diff --git a/xeth/xeth.go b/xeth/xeth.go
index 1b6b1ccd0..6c9db16c2 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -308,21 +308,19 @@ func (self *XEth) NumberToHuman(balance string) string {
 }
 
 func (self *XEth) StorageAt(addr, storageAddr string) string {
-	storage := self.State().SafeGet(addr).StorageString(storageAddr)
-
-	return common.ToHex(storage.Bytes())
+	return common.ToHex(self.State().state.GetState(common.HexToAddress(addr), common.HexToHash(storageAddr)))
 }
 
 func (self *XEth) BalanceAt(addr string) string {
-	return self.State().SafeGet(addr).Balance().String()
+	return common.ToHex(self.State().state.GetBalance(common.HexToAddress(addr)).Bytes())
 }
 
 func (self *XEth) TxCountAt(address string) int {
-	return int(self.State().SafeGet(address).Nonce())
+	return int(self.State().state.GetNonce(common.HexToAddress(address)))
 }
 
 func (self *XEth) CodeAt(address string) string {
-	return common.ToHex(self.State().SafeGet(address).Code())
+	return common.ToHex(self.State().state.GetCode(common.HexToAddress(address)))
 }
 
 func (self *XEth) CodeAtBytes(address string) []byte {