forked from cerc-io/plugeth
Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop
This commit is contained in:
commit
76d7bad722
@ -339,7 +339,9 @@ func (s *Ethereum) Stop() {
|
||||
|
||||
close(s.quit)
|
||||
|
||||
s.RpcServer.Stop()
|
||||
if s.RpcServer != nil {
|
||||
s.RpcServer.Stop()
|
||||
}
|
||||
s.txPool.Stop()
|
||||
s.stateManager.Stop()
|
||||
|
||||
|
@ -4,7 +4,8 @@ import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"github.com/ethereum/eth-go/ethpub"
|
||||
_ "log"
|
||||
"github.com/ethereum/eth-go/ethutil"
|
||||
"math/big"
|
||||
)
|
||||
|
||||
type EthereumApi struct {
|
||||
@ -173,7 +174,10 @@ func (p *EthereumApi) GetStorageAt(args *GetStorageArgs, reply *string) error {
|
||||
return err
|
||||
}
|
||||
state := p.ethp.GetStateObject(args.Address)
|
||||
value := state.GetStorage(args.Key)
|
||||
// Convert the incoming string (which is a bigint) into hex
|
||||
i, _ := new(big.Int).SetString(args.Key, 10)
|
||||
hx := ethutil.Hex(i.Bytes())
|
||||
value := state.GetStorage(hx)
|
||||
*reply = NewSuccessRes(GetStorageAtRes{Address: args.Address, Key: args.Key, Value: value})
|
||||
return nil
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user