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
9f5e9eb3
Commit
9f5e9eb3
authored
Mar 05, 2015
by
Taylor Gerring
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve storage/storageat
parent
a6599404
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
16 deletions
+24
-16
api.go
rpc/api.go
+5
-5
args.go
rpc/args.go
+3
-3
messages.go
rpc/messages.go
+16
-8
No files found.
rpc/api.go
View file @
9f5e9eb3
...
...
@@ -311,7 +311,7 @@ func (p *EthereumApi) PushTx(args *PushTxArgs, reply *interface{}) error {
return
nil
}
func
(
p
*
EthereumApi
)
GetSt
ateAt
(
args
*
GetState
Args
,
reply
*
interface
{})
error
{
func
(
p
*
EthereumApi
)
GetSt
orageAt
(
args
*
GetStorageAt
Args
,
reply
*
interface
{})
error
{
err
:=
args
.
requirements
()
if
err
!=
nil
{
return
err
...
...
@@ -333,7 +333,7 @@ func (p *EthereumApi) GetStateAt(args *GetStateArgs, reply *interface{}) error {
return
nil
}
func
(
p
*
EthereumApi
)
GetStorage
At
(
args
*
GetStorageArgs
,
reply
*
interface
{})
error
{
func
(
p
*
EthereumApi
)
GetStorage
(
args
*
GetStorageArgs
,
reply
*
interface
{})
error
{
err
:=
args
.
requirements
()
if
err
!=
nil
{
return
err
...
...
@@ -527,14 +527,14 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error
return
p
.
GetBalanceAt
(
args
,
reply
)
case
"eth_getStorage"
:
// TODO handle defaultBlock
args
,
err
:=
req
.
To
GetStat
eArgs
()
args
,
err
:=
req
.
To
Storag
eArgs
()
if
err
!=
nil
{
return
err
}
return
p
.
GetSt
ateAt
(
args
,
reply
)
return
p
.
GetSt
orage
(
args
,
reply
)
case
"eth_getStorageAt"
:
// TODO handle defaultBlock
args
,
err
:=
req
.
ToStorageAtArgs
()
args
,
err
:=
req
.
To
Get
StorageAtArgs
()
if
err
!=
nil
{
return
err
}
...
...
rpc/args.go
View file @
9f5e9eb3
...
...
@@ -102,12 +102,12 @@ func (a *GetStorageArgs) requirements() error {
return
nil
}
type
GetSt
ate
Args
struct
{
type
GetSt
orageAt
Args
struct
{
Address
string
Key
string
}
func
(
obj
*
GetSt
ate
Args
)
UnmarshalJSON
(
b
[]
byte
)
(
err
error
)
{
func
(
obj
*
GetSt
orageAt
Args
)
UnmarshalJSON
(
b
[]
byte
)
(
err
error
)
{
arg0
:=
""
if
err
=
json
.
Unmarshal
(
b
,
&
arg0
);
err
==
nil
{
obj
.
Address
=
arg0
...
...
@@ -116,7 +116,7 @@ func (obj *GetStateArgs) UnmarshalJSON(b []byte) (err error) {
return
errDecodeArgs
}
func
(
a
*
GetSt
ate
Args
)
requirements
()
error
{
func
(
a
*
GetSt
orageAt
Args
)
requirements
()
error
{
if
a
.
Address
==
""
{
return
NewErrorWithMessage
(
errArguments
,
"GetStorageAt requires an 'address' value as argument"
)
}
...
...
rpc/messages.go
View file @
9f5e9eb3
...
...
@@ -120,23 +120,31 @@ func (req *RpcRequest) ToPushTxArgs() (*PushTxArgs, error) {
return
args
,
nil
}
func
(
req
*
RpcRequest
)
ToGetSt
ateArgs
()
(
*
GetState
Args
,
error
)
{
if
len
(
req
.
Params
)
<
1
{
func
(
req
*
RpcRequest
)
ToGetSt
orageAtArgs
()
(
*
GetStorageAt
Args
,
error
)
{
if
len
(
req
.
Params
)
<
2
{
return
nil
,
errArguments
}
args
:=
new
(
GetSt
ate
Args
)
// TODO need to pass both arguments
r
:=
bytes
.
NewReader
(
req
.
Params
[
0
])
err
:=
json
.
NewDecoder
(
r
)
.
Decode
(
args
)
if
err
!=
nil
{
args
:=
new
(
GetSt
orageAt
Args
)
var
arg0
,
arg1
string
r0
:=
bytes
.
NewReader
(
req
.
Params
[
0
]
)
if
err
:=
json
.
NewDecoder
(
r0
)
.
Decode
(
arg0
);
err
!=
nil
{
return
nil
,
errDecodeArgs
}
r1
:=
bytes
.
NewReader
(
req
.
Params
[
1
])
if
err
:=
json
.
NewDecoder
(
r1
)
.
Decode
(
arg1
);
err
!=
nil
{
return
nil
,
errDecodeArgs
}
args
.
Address
=
arg0
args
.
Key
=
arg1
return
args
,
nil
}
func
(
req
*
RpcRequest
)
ToStorageA
tA
rgs
()
(
*
GetStorageArgs
,
error
)
{
func
(
req
*
RpcRequest
)
ToStorageArgs
()
(
*
GetStorageArgs
,
error
)
{
if
len
(
req
.
Params
)
<
1
{
return
nil
,
errArguments
}
...
...
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