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
bef78efb
Unverified
Commit
bef78efb
authored
Jun 22, 2021
by
gary rong
Committed by
GitHub
Jun 22, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
graphql: fix transaction API (#23052)
parent
ddf10250
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
7 deletions
+19
-7
graphql.go
graphql/graphql.go
+19
-7
No files found.
graphql/graphql.go
View file @
bef78efb
...
...
@@ -29,7 +29,6 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/eth/filters"
...
...
@@ -94,7 +93,11 @@ func (a *Account) Balance(ctx context.Context) (hexutil.Big, error) {
if
err
!=
nil
{
return
hexutil
.
Big
{},
err
}
return
hexutil
.
Big
(
*
state
.
GetBalance
(
a
.
address
)),
nil
balance
:=
state
.
GetBalance
(
a
.
address
)
if
balance
==
nil
{
return
hexutil
.
Big
{},
fmt
.
Errorf
(
"failed to load balance %x"
,
a
.
address
)
}
return
hexutil
.
Big
(
*
balance
),
nil
}
func
(
a
*
Account
)
TransactionCount
(
ctx
context
.
Context
)
(
hexutil
.
Uint64
,
error
)
{
...
...
@@ -179,8 +182,9 @@ type Transaction struct {
// resolve returns the internal transaction object, fetching it if needed.
func
(
t
*
Transaction
)
resolve
(
ctx
context
.
Context
)
(
*
types
.
Transaction
,
error
)
{
if
t
.
tx
==
nil
{
tx
,
blockHash
,
_
,
index
:=
rawdb
.
ReadTransaction
(
t
.
backend
.
ChainDb
(),
t
.
hash
)
if
tx
!=
nil
{
// Try to return an already finalized transaction
tx
,
blockHash
,
_
,
index
,
err
:=
t
.
backend
.
GetTransaction
(
ctx
,
t
.
hash
)
if
err
==
nil
&&
tx
!=
nil
{
t
.
tx
=
tx
blockNrOrHash
:=
rpc
.
BlockNumberOrHashWithHash
(
blockHash
,
false
)
t
.
block
=
&
Block
{
...
...
@@ -188,9 +192,10 @@ func (t *Transaction) resolve(ctx context.Context) (*types.Transaction, error) {
numberOrHash
:
&
blockNrOrHash
,
}
t
.
index
=
index
}
else
{
t
.
tx
=
t
.
backend
.
GetPoolTransaction
(
t
.
hash
)
return
t
.
tx
,
nil
}
// No finalized transaction, try to retrieve it from the pool
t
.
tx
=
t
.
backend
.
GetPoolTransaction
(
t
.
hash
)
}
return
t
.
tx
,
nil
}
...
...
@@ -286,6 +291,9 @@ func (t *Transaction) Value(ctx context.Context) (hexutil.Big, error) {
if
err
!=
nil
||
tx
==
nil
{
return
hexutil
.
Big
{},
err
}
if
tx
.
Value
()
==
nil
{
return
hexutil
.
Big
{},
fmt
.
Errorf
(
"invalid transaction value %x"
,
t
.
hash
)
}
return
hexutil
.
Big
(
*
tx
.
Value
()),
nil
}
...
...
@@ -721,7 +729,11 @@ func (b *Block) TotalDifficulty(ctx context.Context) (hexutil.Big, error) {
}
h
=
header
.
Hash
()
}
return
hexutil
.
Big
(
*
b
.
backend
.
GetTd
(
ctx
,
h
)),
nil
td
:=
b
.
backend
.
GetTd
(
ctx
,
h
)
if
td
==
nil
{
return
hexutil
.
Big
{},
fmt
.
Errorf
(
"total difficulty not found %x"
,
b
.
hash
)
}
return
hexutil
.
Big
(
*
td
),
nil
}
// BlockNumberArgs encapsulates arguments to accessors that specify a block number.
...
...
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