diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-20 17:31:52 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-20 17:31:52 +0800 |
| commit | 0300eef94d7d1e58bc5cf94094a3d492c70486e1 (patch) | |
| tree | d2828b978ad2a0128459c9a09096aec95b18af1c /rpc/api.go | |
| parent | 6b83a0a589d4615382de3d9f3ed2800064b4c1b9 (diff) | |
| parent | e1d1417729b82f00bcb62dffa36358cb74ab790f (diff) | |
| download | dexon-0300eef94d7d1e58bc5cf94094a3d492c70486e1.tar dexon-0300eef94d7d1e58bc5cf94094a3d492c70486e1.tar.gz dexon-0300eef94d7d1e58bc5cf94094a3d492c70486e1.tar.bz2 dexon-0300eef94d7d1e58bc5cf94094a3d492c70486e1.tar.lz dexon-0300eef94d7d1e58bc5cf94094a3d492c70486e1.tar.xz dexon-0300eef94d7d1e58bc5cf94094a3d492c70486e1.tar.zst dexon-0300eef94d7d1e58bc5cf94094a3d492c70486e1.zip | |
Merge pull request #1048 from ethersphere/cli-fixes
CLI, JSRE admin and Solc improvements
Diffstat (limited to 'rpc/api.go')
| -rw-r--r-- | rpc/api.go | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/rpc/api.go b/rpc/api.go index 0c1409d71..b6f6ac3f9 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -158,16 +158,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) @@ -347,7 +347,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err solc, _ := api.xeth().Solc() if solc == nil { - return NewNotImplementedError(req.Method) + return NewNotAvailableError(req.Method, "solc (solidity compiler) not found") } args := new(SourceArgs) @@ -355,12 +355,11 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err return err } - contract, err := solc.Compile(args.Source) + contracts, err := solc.Compile(args.Source) if err != nil { return err } - contract.Code = newHexData(contract.Code).String() - *reply = contract + *reply = contracts case "eth_newFilter": args := new(BlockFilterArgs) |