diff options
| author | obscuren <geffobscura@gmail.com> | 2015-05-26 20:48:39 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-05-26 20:48:39 +0800 |
| commit | 52b4e51366d14d6d974c7a72697606cb588636b7 (patch) | |
| tree | 9e6f9a99d2392c75c57815e8e0725e5067f95234 /rpc/api.go | |
| parent | 13e662f6dec6342a488a9dad60f2093b72c14bb6 (diff) | |
| parent | 0a85260bcd1c6f084c820e709cfdf476ca9a2ac4 (diff) | |
| download | go-tangerine-52b4e51366d14d6d974c7a72697606cb588636b7.tar go-tangerine-52b4e51366d14d6d974c7a72697606cb588636b7.tar.gz go-tangerine-52b4e51366d14d6d974c7a72697606cb588636b7.tar.bz2 go-tangerine-52b4e51366d14d6d974c7a72697606cb588636b7.tar.lz go-tangerine-52b4e51366d14d6d974c7a72697606cb588636b7.tar.xz go-tangerine-52b4e51366d14d6d974c7a72697606cb588636b7.tar.zst go-tangerine-52b4e51366d14d6d974c7a72697606cb588636b7.zip | |
Merge branch 'release/0.9.24'
Diffstat (limited to 'rpc/api.go')
| -rw-r--r-- | rpc/api.go | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/rpc/api.go b/rpc/api.go index b6f6ac3f9..6b37acb03 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -6,6 +6,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger/glog" @@ -158,16 +159,16 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err v := api.xethAtStateNum(args.BlockNumber).CodeAtBytes(args.Address) *reply = newHexData(v) - // case "eth_sign": - // args := new(NewSigArgs) - // if err := json.Unmarshal(req.Params, &args); err != nil { - // return err - // } - // v, err := api.xeth().Sign(args.From, args.Data, false) - // if err != nil { - // return err - // } - // *reply = v + case "eth_sign": + args := new(NewSigArgs) + if err := json.Unmarshal(req.Params, &args); err != nil { + return err + } + v, err := api.xeth().Sign(args.From, args.Data, false) + if err != nil { + return err + } + *reply = v case "eth_sendTransaction", "eth_transact": args := new(NewTxArgs) @@ -344,7 +345,6 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err return NewNotImplementedError(req.Method) case "eth_compileSolidity": - solc, _ := api.xeth().Solc() if solc == nil { return NewNotAvailableError(req.Method, "solc (solidity compiler) not found") @@ -562,6 +562,13 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err case "eth_hashrate": *reply = newHexNum(api.xeth().HashRate()) + case "ext_disasm": + args := new(SourceArgs) + if err := json.Unmarshal(req.Params, &args); err != nil { + return err + } + + *reply = vm.Disasm(common.FromHex(args.Source)) // case "eth_register": // // Placeholder for actual type |