added console command
This commit is contained in:
parent
2a0d888326
commit
a1a475fb92
5
Makefile
5
Makefile
@ -10,6 +10,11 @@ geth:
|
|||||||
@echo "Done building."
|
@echo "Done building."
|
||||||
@echo "Run \"$(GOBIN)/geth\" to launch geth."
|
@echo "Run \"$(GOBIN)/geth\" to launch geth."
|
||||||
|
|
||||||
|
console:
|
||||||
|
build/env.sh go install -v $(shell build/ldflags.sh) ./cmd/console
|
||||||
|
@echo "Done building."
|
||||||
|
@echo "Run \"$(GOBIN)/console\" to launch the console."
|
||||||
|
|
||||||
mist:
|
mist:
|
||||||
build/env.sh go install -v $(shell build/ldflags.sh) ./cmd/mist
|
build/env.sh go install -v $(shell build/ldflags.sh) ./cmd/mist
|
||||||
@echo "Done building."
|
@echo "Done building."
|
||||||
|
@ -73,7 +73,7 @@ type jsre struct {
|
|||||||
prompter
|
prompter
|
||||||
}
|
}
|
||||||
|
|
||||||
func newJSRE(ethereum *eth.Ethereum, libPath, corsDomain string, interactive bool, f xeth.Frontend) *jsre {
|
func newJSRE(ethereum *eth.Ethereum, libPath, corsDomain, ipcpath string, interactive bool, f xeth.Frontend) *jsre {
|
||||||
js := &jsre{ethereum: ethereum, ps1: "> "}
|
js := &jsre{ethereum: ethereum, ps1: "> "}
|
||||||
// set default cors domain used by startRpc from CLI flag
|
// set default cors domain used by startRpc from CLI flag
|
||||||
js.corsDomain = corsDomain
|
js.corsDomain = corsDomain
|
||||||
@ -84,7 +84,7 @@ func newJSRE(ethereum *eth.Ethereum, libPath, corsDomain string, interactive boo
|
|||||||
js.wait = js.xeth.UpdateState()
|
js.wait = js.xeth.UpdateState()
|
||||||
// update state in separare forever blocks
|
// update state in separare forever blocks
|
||||||
js.re = re.New(libPath)
|
js.re = re.New(libPath)
|
||||||
js.apiBindings(f)
|
js.apiBindings(ipcpath, f)
|
||||||
js.adminBindings()
|
js.adminBindings()
|
||||||
|
|
||||||
if !liner.TerminalSupported() || !interactive {
|
if !liner.TerminalSupported() || !interactive {
|
||||||
@ -103,10 +103,10 @@ func newJSRE(ethereum *eth.Ethereum, libPath, corsDomain string, interactive boo
|
|||||||
return js
|
return js
|
||||||
}
|
}
|
||||||
|
|
||||||
func (js *jsre) apiBindings(f xeth.Frontend) {
|
func (js *jsre) apiBindings(ipcpath string, f xeth.Frontend) {
|
||||||
xe := xeth.New(js.ethereum, f)
|
xe := xeth.New(js.ethereum, f)
|
||||||
ethApi := rpc.NewEthereumApi(xe)
|
ethApi := rpc.NewEthereumApi(xe)
|
||||||
jeth := rpc.NewJeth(ethApi, js.re)
|
jeth := rpc.NewJeth(ethApi, js.re, ipcpath)
|
||||||
|
|
||||||
js.re.Set("jeth", struct{}{})
|
js.re.Set("jeth", struct{}{})
|
||||||
t, _ := js.re.Get("jeth")
|
t, _ := js.re.Get("jeth")
|
||||||
@ -119,7 +119,7 @@ func (js *jsre) apiBindings(f xeth.Frontend) {
|
|||||||
utils.Fatalf("Error loading bignumber.js: %v", err)
|
utils.Fatalf("Error loading bignumber.js: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
err = js.re.Compile("ethereum.js", re.Ethereum_JS)
|
err = js.re.Compile("ethereum.js", re.Web3_JS)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
utils.Fatalf("Error loading ethereum.js: %v", err)
|
utils.Fatalf("Error loading ethereum.js: %v", err)
|
||||||
}
|
}
|
||||||
|
@ -307,6 +307,7 @@ func console(ctx *cli.Context) {
|
|||||||
repl := newJSRE(
|
repl := newJSRE(
|
||||||
ethereum,
|
ethereum,
|
||||||
ctx.String(utils.JSpathFlag.Name),
|
ctx.String(utils.JSpathFlag.Name),
|
||||||
|
ctx.GlobalString(utils.IPCPathFlag.Name),
|
||||||
ctx.GlobalString(utils.RPCCORSDomainFlag.Name),
|
ctx.GlobalString(utils.RPCCORSDomainFlag.Name),
|
||||||
true,
|
true,
|
||||||
nil,
|
nil,
|
||||||
@ -328,6 +329,7 @@ func execJSFiles(ctx *cli.Context) {
|
|||||||
repl := newJSRE(
|
repl := newJSRE(
|
||||||
ethereum,
|
ethereum,
|
||||||
ctx.String(utils.JSpathFlag.Name),
|
ctx.String(utils.JSpathFlag.Name),
|
||||||
|
ctx.GlobalString(utils.IPCPathFlag.Name),
|
||||||
ctx.GlobalString(utils.RPCCORSDomainFlag.Name),
|
ctx.GlobalString(utils.RPCCORSDomainFlag.Name),
|
||||||
false,
|
false,
|
||||||
nil,
|
nil,
|
||||||
|
4543
jsre/ethereum_js.go
4543
jsre/ethereum_js.go
File diff suppressed because it is too large
Load Diff
@ -4,14 +4,26 @@ import "github.com/ethereum/go-ethereum/rpc/shared"
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
// List with all API's which are offered over the IPC interface by default
|
// List with all API's which are offered over the IPC interface by default
|
||||||
DefaultIpcApis = "eth"
|
DefaultIpcApis = "eth,web3"
|
||||||
|
|
||||||
|
EthApiName = "eth"
|
||||||
|
MergedApiName = "merged"
|
||||||
|
Web3ApiName = "web3"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Ethereum RPC API interface
|
// Ethereum RPC API interface
|
||||||
type EthereumApi interface {
|
type EthereumApi interface {
|
||||||
|
// API identifier
|
||||||
|
Name() string
|
||||||
|
|
||||||
// Execute the given request and returns the response or an error
|
// Execute the given request and returns the response or an error
|
||||||
Execute(*shared.Request) (interface{}, error)
|
Execute(*shared.Request) (interface{}, error)
|
||||||
|
|
||||||
// List of supported RCP methods this API provides
|
// List of supported RCP methods this API provides
|
||||||
Methods() []string
|
Methods() []string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Merge multiple API's to a single API instance
|
||||||
|
func Merge(apis ...EthereumApi) EthereumApi {
|
||||||
|
return newMergedApi(apis...)
|
||||||
|
}
|
||||||
|
@ -93,6 +93,10 @@ func (self *EthApi) Execute(req *shared.Request) (interface{}, error) {
|
|||||||
return nil, shared.NewNotImplementedError(req.Method)
|
return nil, shared.NewNotImplementedError(req.Method)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (self *EthApi) Name() string {
|
||||||
|
return EthApiName
|
||||||
|
}
|
||||||
|
|
||||||
func (self *EthApi) Accounts(req *shared.Request) (interface{}, error) {
|
func (self *EthApi) Accounts(req *shared.Request) (interface{}, error) {
|
||||||
return self.xeth.Accounts(), nil
|
return self.xeth.Accounts(), nil
|
||||||
}
|
}
|
||||||
|
56
rpc/api/mergedapi.go
Normal file
56
rpc/api/mergedapi.go
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import "github.com/ethereum/go-ethereum/rpc/shared"
|
||||||
|
|
||||||
|
// combines multiple API's
|
||||||
|
type mergedApi struct {
|
||||||
|
apis []string
|
||||||
|
methods map[string]EthereumApi
|
||||||
|
}
|
||||||
|
|
||||||
|
// create new merged api instance
|
||||||
|
func newMergedApi(apis ...EthereumApi) *mergedApi {
|
||||||
|
mergedApi := new(mergedApi)
|
||||||
|
mergedApi.apis = make([]string, len(apis))
|
||||||
|
mergedApi.methods = make(map[string]EthereumApi)
|
||||||
|
|
||||||
|
for i, api := range apis {
|
||||||
|
mergedApi.apis[i] = api.Name()
|
||||||
|
for _, method := range api.Methods() {
|
||||||
|
mergedApi.methods[method] = api
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return mergedApi
|
||||||
|
}
|
||||||
|
|
||||||
|
// Supported RPC methods
|
||||||
|
func (self *mergedApi) Methods() []string {
|
||||||
|
all := make([]string, len(self.methods))
|
||||||
|
for method, _ := range self.methods {
|
||||||
|
all = append(all, method)
|
||||||
|
}
|
||||||
|
return all
|
||||||
|
}
|
||||||
|
|
||||||
|
// Call the correct API's Execute method for the given request
|
||||||
|
func (self *mergedApi) Execute(req *shared.Request) (interface{}, error) {
|
||||||
|
if res, _ := self.handle(req); res != nil {
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
if api, found := self.methods[req.Method]; found {
|
||||||
|
return api.Execute(req)
|
||||||
|
}
|
||||||
|
return nil, shared.NewNotImplementedError(req.Method)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (self *mergedApi) Name() string {
|
||||||
|
return MergedApiName
|
||||||
|
}
|
||||||
|
|
||||||
|
func (self *mergedApi) handle(req *shared.Request) (interface{}, error) {
|
||||||
|
if req.Method == "support_apis" { // provided API's
|
||||||
|
return self.apis, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil, nil
|
||||||
|
}
|
1
rpc/api/mergedapi_js.go
Normal file
1
rpc/api/mergedapi_js.go
Normal file
@ -0,0 +1 @@
|
|||||||
|
package api
|
@ -8,11 +8,6 @@ import (
|
|||||||
"github.com/ethereum/go-ethereum/eth"
|
"github.com/ethereum/go-ethereum/eth"
|
||||||
"github.com/ethereum/go-ethereum/rpc/codec"
|
"github.com/ethereum/go-ethereum/rpc/codec"
|
||||||
"github.com/ethereum/go-ethereum/xeth"
|
"github.com/ethereum/go-ethereum/xeth"
|
||||||
"github.com/ethereum/go-ethereum/rpc/shared"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
EthApiName = "eth"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Parse a comma separated API string to individual api's
|
// Parse a comma separated API string to individual api's
|
||||||
@ -28,6 +23,8 @@ func ParseApiString(apistr string, codec codec.Codec, xeth *xeth.XEth, eth *eth.
|
|||||||
switch strings.ToLower(strings.TrimSpace(name)) {
|
switch strings.ToLower(strings.TrimSpace(name)) {
|
||||||
case EthApiName:
|
case EthApiName:
|
||||||
apis[i] = NewEthApi(xeth, codec)
|
apis[i] = NewEthApi(xeth, codec)
|
||||||
|
case Web3ApiName:
|
||||||
|
apis[i] = NewWeb3(xeth, codec)
|
||||||
default:
|
default:
|
||||||
return nil, fmt.Errorf("Unknown API '%s'", name)
|
return nil, fmt.Errorf("Unknown API '%s'", name)
|
||||||
}
|
}
|
||||||
@ -35,43 +32,3 @@ func ParseApiString(apistr string, codec codec.Codec, xeth *xeth.XEth, eth *eth.
|
|||||||
|
|
||||||
return apis, nil
|
return apis, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// combines multiple API's
|
|
||||||
type mergedApi struct {
|
|
||||||
apis map[string]EthereumApi
|
|
||||||
}
|
|
||||||
|
|
||||||
// create new merged api instance
|
|
||||||
func newMergedApi(apis ...EthereumApi) *mergedApi {
|
|
||||||
mergedApi := new(mergedApi)
|
|
||||||
mergedApi.apis = make(map[string]EthereumApi)
|
|
||||||
|
|
||||||
for _, api := range apis {
|
|
||||||
for _, method := range api.Methods() {
|
|
||||||
mergedApi.apis[method] = api
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return mergedApi
|
|
||||||
}
|
|
||||||
|
|
||||||
// Supported RPC methods
|
|
||||||
func (self *mergedApi) Methods() []string {
|
|
||||||
all := make([]string, len(self.apis))
|
|
||||||
for method, _ := range self.apis {
|
|
||||||
all = append(all, method)
|
|
||||||
}
|
|
||||||
return all
|
|
||||||
}
|
|
||||||
|
|
||||||
// Call the correct API's Execute method for the given request
|
|
||||||
func (self *mergedApi) Execute(req *shared.Request) (interface{}, error) {
|
|
||||||
if api, found := self.apis[req.Method]; found {
|
|
||||||
return api.Execute(req)
|
|
||||||
}
|
|
||||||
return nil, shared.NewNotImplementedError(req.Method)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Merge multiple API's to a single API instance
|
|
||||||
func Merge(apis ...EthereumApi) EthereumApi {
|
|
||||||
return newMergedApi(apis...)
|
|
||||||
}
|
|
||||||
|
84
rpc/api/web3.go
Normal file
84
rpc/api/web3.go
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/ethereum/go-ethereum/common"
|
||||||
|
"github.com/ethereum/go-ethereum/crypto"
|
||||||
|
"github.com/ethereum/go-ethereum/rpc/codec"
|
||||||
|
"github.com/ethereum/go-ethereum/rpc/shared"
|
||||||
|
"github.com/ethereum/go-ethereum/xeth"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
Web3Version = "1.0.0"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
// mapping between methods and handlers
|
||||||
|
Web3Mapping = map[string]web3handler{
|
||||||
|
"web3_sha3": (*web3).Sha3,
|
||||||
|
"web3_clientVersion": (*web3).ClientVersion,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
// web3 callback handler
|
||||||
|
type web3handler func(*web3, *shared.Request) (interface{}, error)
|
||||||
|
|
||||||
|
// web3 api provider
|
||||||
|
type web3 struct {
|
||||||
|
xeth *xeth.XEth
|
||||||
|
methods map[string]web3handler
|
||||||
|
codec codec.ApiCoder
|
||||||
|
}
|
||||||
|
|
||||||
|
// create a new web3 api instance
|
||||||
|
func NewWeb3(xeth *xeth.XEth, coder codec.Codec) *web3 {
|
||||||
|
return &web3{
|
||||||
|
xeth: xeth,
|
||||||
|
methods: Web3Mapping,
|
||||||
|
codec: coder.New(nil),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// collection with supported methods
|
||||||
|
func (self *web3) Methods() []string {
|
||||||
|
methods := make([]string, len(self.methods))
|
||||||
|
i := 0
|
||||||
|
for k := range self.methods {
|
||||||
|
methods[i] = k
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
return methods
|
||||||
|
}
|
||||||
|
|
||||||
|
// Execute given request
|
||||||
|
func (self *web3) Execute(req *shared.Request) (interface{}, error) {
|
||||||
|
if callback, ok := self.methods[req.Method]; ok {
|
||||||
|
return callback(self, req)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil, &shared.NotImplementedError{req.Method}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (self *web3) Name() string {
|
||||||
|
return Web3ApiName
|
||||||
|
}
|
||||||
|
|
||||||
|
// Version of the API this instance provides
|
||||||
|
func (self *web3) Version() string {
|
||||||
|
return Web3Version
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculates the sha3 over req.Params.Data
|
||||||
|
func (self *web3) Sha3(req *shared.Request) (interface{}, error) {
|
||||||
|
args := new(Sha3Args)
|
||||||
|
if err := self.codec.Decode(req.Params, &args); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return common.ToHex(crypto.Sha3(common.FromHex(args.Data))), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// returns the xeth client vrsion
|
||||||
|
func (self *web3) ClientVersion(req *shared.Request) (interface{}, error) {
|
||||||
|
return self.xeth.ClientVersion(), nil
|
||||||
|
}
|
5
rpc/api/web3_args.go
Normal file
5
rpc/api/web3_args.go
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
type Sha3Args struct {
|
||||||
|
Data string
|
||||||
|
}
|
51
rpc/jeth.go
51
rpc/jeth.go
@ -6,15 +6,20 @@ import (
|
|||||||
|
|
||||||
"github.com/ethereum/go-ethereum/jsre"
|
"github.com/ethereum/go-ethereum/jsre"
|
||||||
"github.com/robertkrimen/otto"
|
"github.com/robertkrimen/otto"
|
||||||
|
"github.com/ethereum/go-ethereum/rpc/comms"
|
||||||
|
"github.com/ethereum/go-ethereum/rpc/codec"
|
||||||
|
"github.com/ethereum/go-ethereum/rpc/shared"
|
||||||
|
"reflect"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Jeth struct {
|
type Jeth struct {
|
||||||
ethApi *EthereumApi
|
ethApi *EthereumApi
|
||||||
re *jsre.JSRE
|
re *jsre.JSRE
|
||||||
|
ipcpath string
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewJeth(ethApi *EthereumApi, re *jsre.JSRE) *Jeth {
|
func NewJeth(ethApi *EthereumApi, re *jsre.JSRE, ipcpath string) *Jeth {
|
||||||
return &Jeth{ethApi, re}
|
return &Jeth{ethApi, re, ipcpath}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (self *Jeth) err(call otto.FunctionCall, code int, msg string, id interface{}) (response otto.Value) {
|
func (self *Jeth) err(call otto.FunctionCall, code int, msg string, id interface{}) (response otto.Value) {
|
||||||
@ -34,6 +39,13 @@ func (self *Jeth) Send(call otto.FunctionCall) (response otto.Value) {
|
|||||||
return self.err(call, -32700, err.Error(), nil)
|
return self.err(call, -32700, err.Error(), nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
client, err := comms.NewIpcClient(comms.IpcConfig{self.ipcpath}, codec.JSON)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println("Unable to connect to geth.")
|
||||||
|
return self.err(call, -32603, err.Error(), -1)
|
||||||
|
}
|
||||||
|
defer client.Close()
|
||||||
|
|
||||||
jsonreq, err := json.Marshal(reqif)
|
jsonreq, err := json.Marshal(reqif)
|
||||||
var reqs []RpcRequest
|
var reqs []RpcRequest
|
||||||
batch := true
|
batch := true
|
||||||
@ -48,22 +60,43 @@ func (self *Jeth) Send(call otto.FunctionCall) (response otto.Value) {
|
|||||||
call.Otto.Run("var ret_response = new Array(response_len);")
|
call.Otto.Run("var ret_response = new Array(response_len);")
|
||||||
|
|
||||||
for i, req := range reqs {
|
for i, req := range reqs {
|
||||||
var respif interface{}
|
err := client.Send(&req)
|
||||||
err = self.ethApi.GetRequestReply(&req, &respif)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println("Error response:", err)
|
fmt.Println("Error send request:", err)
|
||||||
return self.err(call, -32603, err.Error(), req.Id)
|
return self.err(call, -32603, err.Error(), req.Id)
|
||||||
}
|
}
|
||||||
call.Otto.Set("ret_jsonrpc", jsonrpcver)
|
|
||||||
call.Otto.Set("ret_id", req.Id)
|
|
||||||
|
|
||||||
res, _ := json.Marshal(respif)
|
respif, err := client.Recv()
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println("Error recv response:", err)
|
||||||
|
return self.err(call, -32603, err.Error(), req.Id)
|
||||||
|
}
|
||||||
|
|
||||||
call.Otto.Set("ret_result", string(res))
|
if res, ok := respif.(shared.SuccessResponse); ok {
|
||||||
|
call.Otto.Set("ret_id", res.Id)
|
||||||
|
call.Otto.Set("ret_jsonrpc", res.Jsonrpc)
|
||||||
|
resObj, _ := json.Marshal(res.Result)
|
||||||
|
call.Otto.Set("ret_result", string(resObj))
|
||||||
call.Otto.Set("response_idx", i)
|
call.Otto.Set("response_idx", i)
|
||||||
|
|
||||||
response, err = call.Otto.Run(`
|
response, err = call.Otto.Run(`
|
||||||
ret_response[response_idx] = { jsonrpc: ret_jsonrpc, id: ret_id, result: JSON.parse(ret_result) };
|
ret_response[response_idx] = { jsonrpc: ret_jsonrpc, id: ret_id, result: JSON.parse(ret_result) };
|
||||||
`)
|
`)
|
||||||
|
} else if res, ok := respif.(shared.ErrorResponse); ok {
|
||||||
|
fmt.Printf("Error: %s (%d)\n", res.Error.Message, res.Error.Code)
|
||||||
|
|
||||||
|
call.Otto.Set("ret_id", res.Id)
|
||||||
|
call.Otto.Set("ret_jsonrpc", res.Jsonrpc)
|
||||||
|
call.Otto.Set("ret_error", res.Error)
|
||||||
|
call.Otto.Set("response_idx", i)
|
||||||
|
|
||||||
|
response, _ = call.Otto.Run(`
|
||||||
|
ret_response = { jsonrpc: ret_jsonrpc, id: ret_id, error: ret_error };
|
||||||
|
`)
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
fmt.Printf("unexpected response\n", reflect.TypeOf(respif))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if !batch {
|
if !batch {
|
||||||
|
Loading…
Reference in New Issue
Block a user