good morning!!!!
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
bor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open
bor
Commits
1b59f890
Commit
1b59f890
authored
Jun 8, 2015
by
Bas van Kervel
Browse files
Options
Downloads
Patches
Plain Diff
added console command
parent
bbfa0a3d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
cmd/geth/main.go
+2
-0
2 additions, 0 deletions
cmd/geth/main.go
rpc/api/api.go
+0
-5
0 additions, 5 deletions
rpc/api/api.go
rpc/api/mergedapi.go
+16
-6
16 additions, 6 deletions
rpc/api/mergedapi.go
rpc/api/web3.go
+3
-4
3 additions, 4 deletions
rpc/api/web3.go
rpc/jeth.go
+43
-11
43 additions, 11 deletions
rpc/jeth.go
with
64 additions
and
26 deletions
cmd/geth/main.go
+
2
−
0
View file @
1b59f890
...
...
@@ -307,6 +307,7 @@ func console(ctx *cli.Context) {
repl
:=
newJSRE
(
ethereum
,
ctx
.
String
(
utils
.
JSpathFlag
.
Name
),
ctx
.
GlobalString
(
utils
.
IPCPathFlag
.
Name
),
ctx
.
GlobalString
(
utils
.
RPCCORSDomainFlag
.
Name
),
ctx
.
GlobalString
(
utils
.
IPCPathFlag
.
Name
),
true
,
...
...
@@ -329,6 +330,7 @@ func execJSFiles(ctx *cli.Context) {
repl
:=
newJSRE
(
ethereum
,
ctx
.
String
(
utils
.
JSpathFlag
.
Name
),
ctx
.
GlobalString
(
utils
.
IPCPathFlag
.
Name
),
ctx
.
GlobalString
(
utils
.
RPCCORSDomainFlag
.
Name
),
ctx
.
GlobalString
(
utils
.
IPCPathFlag
.
Name
),
false
,
...
...
This diff is collapsed.
Click to expand it.
rpc/api/api.go
+
0
−
5
View file @
1b59f890
...
...
@@ -27,11 +27,6 @@ var (
},
","
)
)
const
(
// List with all API's which are offered over the IPC interface by default
DefaultIpcApis
=
"eth"
)
// Ethereum RPC API interface
type
EthereumApi
interface
{
// API identifier
...
...
This diff is collapsed.
Click to expand it.
rpc/api/mergedapi.go
+
16
−
6
View file @
1b59f890
package
api
import
"github.com/ethereum/go-ethereum/rpc/shared"
import
(
"github.com/ethereum/go-ethereum/rpc/shared"
)
const
(
MergedApiVersion
=
"1.0"
)
// combines multiple API's
type
MergedApi
struct
{
apis
[
]
string
apis
map
[
string
]
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
.
apis
=
make
(
map
[
string
]
string
,
len
(
apis
))
mergedApi
.
methods
=
make
(
map
[
string
]
EthereumApi
)
for
i
,
api
:=
range
apis
{
mergedApi
.
apis
[
i
]
=
api
.
Name
()
for
_
,
api
:=
range
apis
{
mergedApi
.
apis
[
api
.
Name
()]
=
api
.
ApiVersion
()
for
_
,
method
:=
range
api
.
Methods
()
{
mergedApi
.
methods
[
method
]
=
api
}
...
...
@@ -47,8 +53,12 @@ func (self *MergedApi) Name() string {
return
MergedApiName
}
func
(
self
*
MergedApi
)
ApiVersion
()
string
{
return
MergedApiVersion
}
func
(
self
*
MergedApi
)
handle
(
req
*
shared
.
Request
)
(
interface
{},
error
)
{
if
req
.
Method
==
"
support_api
s"
{
// provided API's
if
req
.
Method
==
"
module
s"
{
// provided API's
return
self
.
apis
,
nil
}
...
...
This diff is collapsed.
Click to expand it.
rpc/api/web3.go
+
3
−
4
View file @
1b59f890
...
...
@@ -9,7 +9,7 @@ import (
)
const
(
Web3Version
=
"1.0
.0
"
Web3
Api
Version
=
"1.0"
)
var
(
...
...
@@ -63,9 +63,8 @@ func (self *web3Api) Name() string {
return
Web3ApiName
}
// Version of the API this instance provides
func
(
self
*
web3Api
)
Version
()
string
{
return
Web3Version
func
(
self
*
web3Api
)
ApiVersion
()
string
{
return
Web3ApiVersion
}
// Calculates the sha3 over req.Params.Data
...
...
This diff is collapsed.
Click to expand it.
rpc/jeth.go
+
43
−
11
View file @
1b59f890
...
...
@@ -11,6 +11,10 @@ import (
"github.com/ethereum/go-ethereum/rpc/comms"
"github.com/ethereum/go-ethereum/rpc/shared"
"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
{
...
...
@@ -40,6 +44,13 @@ func (self *Jeth) Send(call otto.FunctionCall) (response otto.Value) {
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
)
var
reqs
[]
RpcRequest
batch
:=
true
...
...
@@ -54,22 +65,43 @@ func (self *Jeth) Send(call otto.FunctionCall) (response otto.Value) {
call
.
Otto
.
Run
(
"var ret_response = new Array(response_len);"
)
for
i
,
req
:=
range
reqs
{
var
respif
interface
{}
err
=
self
.
ethApi
.
GetRequestReply
(
&
req
,
&
respif
)
err
:=
client
.
Send
(
&
req
)
if
err
!=
nil
{
fmt
.
Println
(
"Error
response
:"
,
err
)
fmt
.
Println
(
"Error
send request
:"
,
err
)
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
)
response
,
err
=
call
.
Otto
.
Run
(
`
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
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment