mirror of https://github.com/poanetwork/quorum.git
Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop
This commit is contained in:
commit
e58ba2fcfa
|
@ -6,6 +6,7 @@ import (
|
||||||
"github.com/ethereum/eth-go/ethpub"
|
"github.com/ethereum/eth-go/ethpub"
|
||||||
"github.com/ethereum/eth-go/ethutil"
|
"github.com/ethereum/eth-go/ethutil"
|
||||||
"math/big"
|
"math/big"
|
||||||
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
type EthereumApi struct {
|
type EthereumApi struct {
|
||||||
|
@ -174,9 +175,15 @@ func (p *EthereumApi) GetStorageAt(args *GetStorageArgs, reply *string) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
state := p.ethp.GetStateObject(args.Address)
|
state := p.ethp.GetStateObject(args.Address)
|
||||||
// Convert the incoming string (which is a bigint) into hex
|
|
||||||
i, _ := new(big.Int).SetString(args.Key, 10)
|
var hx string
|
||||||
hx := ethutil.Hex(i.Bytes())
|
if strings.Index(args.Key, "0x") == 0 {
|
||||||
|
hx = string([]byte(args.Key)[2:])
|
||||||
|
} else {
|
||||||
|
// 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)
|
value := state.GetStorage(hx)
|
||||||
*reply = NewSuccessRes(GetStorageAtRes{Address: args.Address, Key: args.Key, Value: value})
|
*reply = NewSuccessRes(GetStorageAtRes{Address: args.Address, Key: args.Key, Value: value})
|
||||||
return nil
|
return nil
|
||||||
|
|
Loading…
Reference in New Issue