Commit 4391c382 authored by obscuren's avatar obscuren

Changed getters on account objects. Closes #610

* GetCode
* GetNonce
* GetStorage
* GetBalance
parent 344b3556
......@@ -95,10 +95,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
return err
}
state := api.xethAtStateNum(args.BlockNumber).State().SafeGet(args.Address)
value := state.StorageString(args.Key)
*reply = common.ToHex(value.Bytes())
*reply = api.xethAtStateNum(args.BlockNumber).StorageAt(args.Address, args.Key)
case "eth_getTransactionCount":
args := new(GetTxCountArgs)
if err := json.Unmarshal(req.Params, &args); err != nil {
......
......@@ -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 self.State().state.GetBalance(common.HexToAddress(addr)).String()
}
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) IsContract(address string) bool {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment