Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
00f59f50
Commit
00f59f50
authored
May 20, 2015
by
zelig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix eth.sign. now implemented in admin jsre until web3.js has it .
parent
b0ae84aa
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
68 additions
and
43 deletions
+68
-43
admin.go
cmd/geth/admin.go
+25
-0
js_test.go
cmd/geth/js_test.go
+1
-1
api.go
rpc/api.go
+10
-10
args.go
rpc/args.go
+32
-32
No files found.
cmd/geth/admin.go
View file @
00f59f50
...
@@ -35,6 +35,7 @@ func (js *jsre) adminBindings() {
...
@@ -35,6 +35,7 @@ func (js *jsre) adminBindings() {
eth
:=
ethO
.
Object
()
eth
:=
ethO
.
Object
()
eth
.
Set
(
"pendingTransactions"
,
js
.
pendingTransactions
)
eth
.
Set
(
"pendingTransactions"
,
js
.
pendingTransactions
)
eth
.
Set
(
"resend"
,
js
.
resend
)
eth
.
Set
(
"resend"
,
js
.
resend
)
eth
.
Set
(
"sign"
,
js
.
sign
)
js
.
re
.
Set
(
"admin"
,
struct
{}{})
js
.
re
.
Set
(
"admin"
,
struct
{}{})
t
,
_
:=
js
.
re
.
Get
(
"admin"
)
t
,
_
:=
js
.
re
.
Get
(
"admin"
)
...
@@ -177,6 +178,30 @@ func (js *jsre) resend(call otto.FunctionCall) otto.Value {
...
@@ -177,6 +178,30 @@ func (js *jsre) resend(call otto.FunctionCall) otto.Value {
return
otto
.
FalseValue
()
return
otto
.
FalseValue
()
}
}
func
(
js
*
jsre
)
sign
(
call
otto
.
FunctionCall
)
otto
.
Value
{
if
len
(
call
.
ArgumentList
)
!=
2
{
fmt
.
Println
(
"requires 2 arguments: eth.sign(signer, data)"
)
return
otto
.
UndefinedValue
()
}
signer
,
err
:=
call
.
Argument
(
0
)
.
ToString
()
if
err
!=
nil
{
fmt
.
Println
(
err
)
return
otto
.
UndefinedValue
()
}
data
,
err
:=
call
.
Argument
(
1
)
.
ToString
()
if
err
!=
nil
{
fmt
.
Println
(
err
)
return
otto
.
UndefinedValue
()
}
v
,
err
:=
js
.
xeth
.
Sign
(
signer
,
data
,
false
)
if
err
!=
nil
{
fmt
.
Println
(
err
)
return
otto
.
UndefinedValue
()
}
return
js
.
re
.
ToVal
(
v
)
}
func
(
js
*
jsre
)
debugBlock
(
call
otto
.
FunctionCall
)
otto
.
Value
{
func
(
js
*
jsre
)
debugBlock
(
call
otto
.
FunctionCall
)
otto
.
Value
{
block
,
err
:=
js
.
getBlock
(
call
)
block
,
err
:=
js
.
getBlock
(
call
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
cmd/geth/js_test.go
View file @
00f59f50
...
@@ -230,7 +230,7 @@ func TestSignature(t *testing.T) {
...
@@ -230,7 +230,7 @@ func TestSignature(t *testing.T) {
defer
ethereum
.
Stop
()
defer
ethereum
.
Stop
()
defer
os
.
RemoveAll
(
tmp
)
defer
os
.
RemoveAll
(
tmp
)
val
,
err
:=
repl
.
re
.
Run
(
`eth.sign(
{from: "`
+
testAddress
+
`", data: "`
+
testHash
+
`"}
)`
)
val
,
err
:=
repl
.
re
.
Run
(
`eth.sign(
"`
+
testAddress
+
`", "`
+
testHash
+
`"
)`
)
// This is a very preliminary test, lacking actual signature verification
// This is a very preliminary test, lacking actual signature verification
if
err
!=
nil
{
if
err
!=
nil
{
...
...
rpc/api.go
View file @
00f59f50
...
@@ -158,16 +158,16 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
...
@@ -158,16 +158,16 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
v
:=
api
.
xethAtStateNum
(
args
.
BlockNumber
)
.
CodeAtBytes
(
args
.
Address
)
v
:=
api
.
xethAtStateNum
(
args
.
BlockNumber
)
.
CodeAtBytes
(
args
.
Address
)
*
reply
=
newHexData
(
v
)
*
reply
=
newHexData
(
v
)
case
"eth_sign"
:
//
case "eth_sign":
args
:=
new
(
NewSigArgs
)
//
args := new(NewSigArgs)
if
err
:=
json
.
Unmarshal
(
req
.
Params
,
&
args
);
err
!=
nil
{
//
if err := json.Unmarshal(req.Params, &args); err != nil {
return
err
//
return err
}
//
}
v
,
err
:=
api
.
xeth
()
.
Sign
(
args
.
From
,
args
.
Data
,
false
)
//
v, err := api.xeth().Sign(args.From, args.Data, false)
if
err
!=
nil
{
//
if err != nil {
return
err
//
return err
}
//
}
*
reply
=
v
//
*reply = v
case
"eth_sendTransaction"
,
"eth_transact"
:
case
"eth_sendTransaction"
,
"eth_transact"
:
args
:=
new
(
NewTxArgs
)
args
:=
new
(
NewTxArgs
)
...
...
rpc/args.go
View file @
00f59f50
...
@@ -166,45 +166,45 @@ type NewTxArgs struct {
...
@@ -166,45 +166,45 @@ type NewTxArgs struct {
BlockNumber
int64
BlockNumber
int64
}
}
type
NewSigArgs
struct
{
//
type NewSigArgs struct {
From
string
//
From string
Data
string
//
Data string
}
//
}
func
(
args
*
NewSigArgs
)
UnmarshalJSON
(
b
[]
byte
)
(
err
error
)
{
//
func (args *NewSigArgs) UnmarshalJSON(b []byte) (err error) {
var
obj
[]
json
.
RawMessage
//
var obj []json.RawMessage
var
ext
struct
{
//
var ext struct {
From
string
//
From string
Data
string
//
Data string
}
//
}
// Decode byte slice to array of RawMessages
//
// Decode byte slice to array of RawMessages
if
err
:=
json
.
Unmarshal
(
b
,
&
obj
);
err
!=
nil
{
//
if err := json.Unmarshal(b, &obj); err != nil {
return
NewDecodeParamError
(
err
.
Error
())
//
return NewDecodeParamError(err.Error())
}
//
}
// Check for sufficient params
//
// Check for sufficient params
if
len
(
obj
)
<
1
{
//
if len(obj) < 1 {
return
NewInsufficientParamsError
(
len
(
obj
),
1
)
//
return NewInsufficientParamsError(len(obj), 1)
}
//
}
// Decode 0th RawMessage to temporary struct
//
// Decode 0th RawMessage to temporary struct
if
err
:=
json
.
Unmarshal
(
obj
[
0
],
&
ext
);
err
!=
nil
{
//
if err := json.Unmarshal(obj[0], &ext); err != nil {
return
NewDecodeParamError
(
err
.
Error
())
//
return NewDecodeParamError(err.Error())
}
//
}
if
len
(
ext
.
From
)
==
0
{
//
if len(ext.From) == 0 {
return
NewValidationError
(
"from"
,
"is required"
)
//
return NewValidationError("from", "is required")
}
//
}
if
len
(
ext
.
Data
)
==
0
{
//
if len(ext.Data) == 0 {
return
NewValidationError
(
"data"
,
"is required"
)
//
return NewValidationError("data", "is required")
}
//
}
args
.
From
=
ext
.
From
//
args.From = ext.From
args
.
Data
=
ext
.
Data
//
args.Data = ext.Data
return
nil
//
return nil
}
//
}
func
(
args
*
NewTxArgs
)
UnmarshalJSON
(
b
[]
byte
)
(
err
error
)
{
func
(
args
*
NewTxArgs
)
UnmarshalJSON
(
b
[]
byte
)
(
err
error
)
{
var
obj
[]
json
.
RawMessage
var
obj
[]
json
.
RawMessage
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment