diff options
| author | obscuren <geffobscura@gmail.com> | 2014-06-25 15:47:27 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-06-25 15:47:27 +0800 |
| commit | e58ba2fcfacb9003eb8cb69539e92f783266d5d1 (patch) | |
| tree | 8a112943c35d279c74349764e496159593996650 | |
| parent | 9dae1a17324df671bf2223ae80257a310cecfea5 (diff) | |
| parent | 0c55a113180955aa149a6e961c6e4bba9a7418e0 (diff) | |
| download | go-tangerine-e58ba2fcfacb9003eb8cb69539e92f783266d5d1.tar.gz go-tangerine-e58ba2fcfacb9003eb8cb69539e92f783266d5d1.tar.zst go-tangerine-e58ba2fcfacb9003eb8cb69539e92f783266d5d1.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop
| -rw-r--r-- | ethrpc/packages.go | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/ethrpc/packages.go b/ethrpc/packages.go index 1c4fb99f6..34d7a3d6f 100644 --- a/ethrpc/packages.go +++ b/ethrpc/packages.go @@ -6,6 +6,7 @@ import ( "github.com/ethereum/eth-go/ethpub" "github.com/ethereum/eth-go/ethutil" "math/big" + "strings" ) type EthereumApi struct { @@ -174,9 +175,15 @@ func (p *EthereumApi) GetStorageAt(args *GetStorageArgs, reply *string) error { return err } state := p.ethp.GetStateObject(args.Address) - // Convert the incoming string (which is a bigint) into hex - i, _ := new(big.Int).SetString(args.Key, 10) - hx := ethutil.Hex(i.Bytes()) + + var hx string + 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) *reply = NewSuccessRes(GetStorageAtRes{Address: args.Address, Key: args.Key, Value: value}) return nil |