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
8812c4d3
Commit
8812c4d3
authored
Jul 25, 2019
by
gary rong
Committed by
Péter Szilágyi
Jul 25, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
eth, graphql, internal/ethapi, les: polish and improve graphql (#19886)
parent
e4232c15
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
49 additions
and
96 deletions
+49
-96
api_backend.go
eth/api_backend.go
+4
-8
graphql.go
graphql/graphql.go
+32
-70
api.go
internal/ethapi/api.go
+7
-7
backend.go
internal/ethapi/backend.go
+1
-2
api_backend.go
les/api_backend.go
+5
-9
No files found.
eth/api_backend.go
View file @
8812c4d3
...
...
@@ -89,6 +89,10 @@ func (b *EthAPIBackend) BlockByNumber(ctx context.Context, number rpc.BlockNumbe
return
b
.
eth
.
blockchain
.
GetBlockByNumber
(
uint64
(
number
)),
nil
}
func
(
b
*
EthAPIBackend
)
BlockByHash
(
ctx
context
.
Context
,
hash
common
.
Hash
)
(
*
types
.
Block
,
error
)
{
return
b
.
eth
.
blockchain
.
GetBlockByHash
(
hash
),
nil
}
func
(
b
*
EthAPIBackend
)
StateAndHeaderByNumber
(
ctx
context
.
Context
,
number
rpc
.
BlockNumber
)
(
*
state
.
StateDB
,
*
types
.
Header
,
error
)
{
// Pending state is only known by the miner
if
number
==
rpc
.
PendingBlockNumber
{
...
...
@@ -107,14 +111,6 @@ func (b *EthAPIBackend) StateAndHeaderByNumber(ctx context.Context, number rpc.B
return
stateDb
,
header
,
err
}
func
(
b
*
EthAPIBackend
)
GetHeader
(
ctx
context
.
Context
,
hash
common
.
Hash
)
*
types
.
Header
{
return
b
.
eth
.
blockchain
.
GetHeaderByHash
(
hash
)
}
func
(
b
*
EthAPIBackend
)
GetBlock
(
ctx
context
.
Context
,
hash
common
.
Hash
)
(
*
types
.
Block
,
error
)
{
return
b
.
eth
.
blockchain
.
GetBlockByHash
(
hash
),
nil
}
func
(
b
*
EthAPIBackend
)
GetReceipts
(
ctx
context
.
Context
,
hash
common
.
Hash
)
(
types
.
Receipts
,
error
)
{
return
b
.
eth
.
blockchain
.
GetReceiptsByHash
(
hash
),
nil
}
...
...
graphql/graphql.go
View file @
8812c4d3
...
...
@@ -35,8 +35,10 @@ import (
"github.com/ethereum/go-ethereum/rpc"
)
var
OnlyOnMainChainError
=
errors
.
New
(
"This operation is only available for blocks on the canonical chain."
)
var
BlockInvariantError
=
errors
.
New
(
"Block objects must be instantiated with at least one of num or hash."
)
var
(
errOnlyOnMainChain
=
errors
.
New
(
"this operation is only available for blocks on the canonical chain"
)
errBlockInvariant
=
errors
.
New
(
"block objects must be instantiated with at least one of num or hash"
)
)
// Account represents an Ethereum account at a particular block.
type
Account
struct
{
...
...
@@ -60,7 +62,6 @@ 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
}
...
...
@@ -69,7 +70,6 @@ func (a *Account) TransactionCount(ctx context.Context) (hexutil.Uint64, error)
if
err
!=
nil
{
return
0
,
err
}
return
hexutil
.
Uint64
(
state
.
GetNonce
(
a
.
address
)),
nil
}
...
...
@@ -78,7 +78,6 @@ func (a *Account) Code(ctx context.Context) (hexutil.Bytes, error) {
if
err
!=
nil
{
return
hexutil
.
Bytes
{},
err
}
return
hexutil
.
Bytes
(
state
.
GetCode
(
a
.
address
)),
nil
}
...
...
@@ -87,7 +86,6 @@ func (a *Account) Storage(ctx context.Context, args struct{ Slot common.Hash })
if
err
!=
nil
{
return
common
.
Hash
{},
err
}
return
state
.
GetState
(
a
.
address
,
args
.
Slot
),
nil
}
...
...
@@ -151,8 +149,8 @@ func (t *Transaction) resolve(ctx context.Context) (*types.Transaction, error) {
return
t
.
tx
,
nil
}
func
(
t
x
*
Transaction
)
Hash
(
ctx
context
.
Context
)
common
.
Hash
{
return
t
x
.
hash
func
(
t
*
Transaction
)
Hash
(
ctx
context
.
Context
)
common
.
Hash
{
return
t
.
hash
}
func
(
t
*
Transaction
)
InputData
(
ctx
context
.
Context
)
(
hexutil
.
Bytes
,
error
)
{
...
...
@@ -200,12 +198,10 @@ func (t *Transaction) To(ctx context.Context, args BlockNumberArgs) (*Account, e
if
err
!=
nil
||
tx
==
nil
{
return
nil
,
err
}
to
:=
tx
.
To
()
if
to
==
nil
{
return
nil
,
nil
}
return
&
Account
{
backend
:
t
.
backend
,
address
:
*
to
,
...
...
@@ -218,8 +214,7 @@ func (t *Transaction) From(ctx context.Context, args BlockNumberArgs) (*Account,
if
err
!=
nil
||
tx
==
nil
{
return
nil
,
err
}
var
signer
types
.
Signer
=
types
.
FrontierSigner
{}
var
signer
types
.
Signer
=
types
.
HomesteadSigner
{}
if
tx
.
Protected
()
{
signer
=
types
.
NewEIP155Signer
(
tx
.
ChainId
())
}
...
...
@@ -255,16 +250,13 @@ func (t *Transaction) getReceipt(ctx context.Context) (*types.Receipt, error) {
if
_
,
err
:=
t
.
resolve
(
ctx
);
err
!=
nil
{
return
nil
,
err
}
if
t
.
block
==
nil
{
return
nil
,
nil
}
receipts
,
err
:=
t
.
block
.
resolveReceipts
(
ctx
)
if
err
!=
nil
{
return
nil
,
err
}
return
receipts
[
t
.
index
],
nil
}
...
...
@@ -273,7 +265,6 @@ func (t *Transaction) Status(ctx context.Context) (*hexutil.Uint64, error) {
if
err
!=
nil
||
receipt
==
nil
{
return
nil
,
err
}
ret
:=
hexutil
.
Uint64
(
receipt
.
Status
)
return
&
ret
,
nil
}
...
...
@@ -283,7 +274,6 @@ func (t *Transaction) GasUsed(ctx context.Context) (*hexutil.Uint64, error) {
if
err
!=
nil
||
receipt
==
nil
{
return
nil
,
err
}
ret
:=
hexutil
.
Uint64
(
receipt
.
GasUsed
)
return
&
ret
,
nil
}
...
...
@@ -293,7 +283,6 @@ func (t *Transaction) CumulativeGasUsed(ctx context.Context) (*hexutil.Uint64, e
if
err
!=
nil
||
receipt
==
nil
{
return
nil
,
err
}
ret
:=
hexutil
.
Uint64
(
receipt
.
CumulativeGasUsed
)
return
&
ret
,
nil
}
...
...
@@ -303,7 +292,6 @@ func (t *Transaction) CreatedContract(ctx context.Context, args BlockNumberArgs)
if
err
!=
nil
||
receipt
==
nil
||
receipt
.
ContractAddress
==
(
common
.
Address
{})
{
return
nil
,
err
}
return
&
Account
{
backend
:
t
.
backend
,
address
:
receipt
.
ContractAddress
,
...
...
@@ -316,7 +304,6 @@ func (t *Transaction) Logs(ctx context.Context) (*[]*Log, error) {
if
err
!=
nil
||
receipt
==
nil
{
return
nil
,
err
}
ret
:=
make
([]
*
Log
,
0
,
len
(
receipt
.
Logs
))
for
_
,
log
:=
range
receipt
.
Logs
{
ret
=
append
(
ret
,
&
Log
{
...
...
@@ -366,7 +353,7 @@ func (b *Block) onMainChain(ctx context.Context) error {
}
}
if
b
.
canonical
!=
isCanonical
{
return
OnlyOnMainChainError
return
errOnlyOnMainChain
}
return
nil
}
...
...
@@ -377,14 +364,13 @@ func (b *Block) resolve(ctx context.Context) (*types.Block, error) {
if
b
.
block
!=
nil
{
return
b
.
block
,
nil
}
var
err
error
if
b
.
hash
!=
(
common
.
Hash
{})
{
b
.
block
,
err
=
b
.
backend
.
GetBlock
(
ctx
,
b
.
hash
)
b
.
block
,
err
=
b
.
backend
.
BlockByHash
(
ctx
,
b
.
hash
)
}
else
{
b
.
block
,
err
=
b
.
backend
.
BlockByNumber
(
ctx
,
*
b
.
num
)
}
if
b
.
block
!=
nil
{
if
b
.
block
!=
nil
&&
b
.
header
==
nil
{
b
.
header
=
b
.
block
.
Header
()
}
return
b
.
block
,
err
...
...
@@ -395,15 +381,17 @@ func (b *Block) resolve(ctx context.Context) (*types.Block, error) {
// additional data (transactions and uncles).
func
(
b
*
Block
)
resolveHeader
(
ctx
context
.
Context
)
(
*
types
.
Header
,
error
)
{
if
b
.
num
==
nil
&&
b
.
hash
==
(
common
.
Hash
{})
{
return
nil
,
BlockInvariantError
return
nil
,
errBlockInvariant
}
var
err
error
if
b
.
header
==
nil
{
if
_
,
err
:=
b
.
resolve
(
ctx
);
err
!=
nil
{
return
nil
,
err
if
b
.
hash
!=
(
common
.
Hash
{})
{
b
.
header
,
err
=
b
.
backend
.
HeaderByHash
(
ctx
,
b
.
hash
)
}
else
{
b
.
header
,
err
=
b
.
backend
.
HeaderByNumber
(
ctx
,
*
b
.
num
)
}
}
return
b
.
header
,
nil
return
b
.
header
,
err
}
// resolveReceipts returns the list of receipts for this block, fetching them
...
...
@@ -418,7 +406,6 @@ func (b *Block) resolveReceipts(ctx context.Context) ([]*types.Receipt, error) {
}
hash
=
header
.
Hash
()
}
receipts
,
err
:=
b
.
backend
.
GetReceipts
(
ctx
,
hash
)
if
err
!=
nil
{
return
nil
,
err
...
...
@@ -468,14 +455,13 @@ func (b *Block) GasUsed(ctx context.Context) (hexutil.Uint64, error) {
}
func
(
b
*
Block
)
Parent
(
ctx
context
.
Context
)
(
*
Block
,
error
)
{
// If the block hasn't been fetched, and we'll need it, fetch it.
// If the block h
eader h
asn't been fetched, and we'll need it, fetch it.
if
b
.
num
==
nil
&&
b
.
hash
!=
(
common
.
Hash
{})
&&
b
.
header
==
nil
{
if
_
,
err
:=
b
.
resolve
(
ctx
);
err
!=
nil
{
if
_
,
err
:=
b
.
resolve
Header
(
ctx
);
err
!=
nil
{
return
nil
,
err
}
}
if
b
.
header
!=
nil
&&
b
.
block
.
NumberU64
()
>
0
{
if
b
.
header
!=
nil
&&
b
.
header
.
Number
.
Uint64
()
>
0
{
num
:=
rpc
.
BlockNumber
(
b
.
header
.
Number
.
Uint64
()
-
1
)
return
&
Block
{
backend
:
b
.
backend
,
...
...
@@ -573,7 +559,6 @@ func (b *Block) Ommers(ctx context.Context) (*[]*Block, error) {
if
err
!=
nil
||
block
==
nil
{
return
nil
,
err
}
ret
:=
make
([]
*
Block
,
0
,
len
(
block
.
Uncles
()))
for
_
,
uncle
:=
range
block
.
Uncles
()
{
blockNumber
:=
rpc
.
BlockNumber
(
uncle
.
Number
.
Uint64
())
...
...
@@ -613,7 +598,6 @@ func (b *Block) TotalDifficulty(ctx context.Context) (hexutil.Big, error) {
}
h
=
header
.
Hash
()
}
return
hexutil
.
Big
(
*
b
.
backend
.
GetTd
(
h
)),
nil
}
...
...
@@ -632,14 +616,13 @@ func (a BlockNumberArgs) Number() rpc.BlockNumber {
}
func
(
b
*
Block
)
Miner
(
ctx
context
.
Context
,
args
BlockNumberArgs
)
(
*
Account
,
error
)
{
block
,
err
:=
b
.
resolve
(
ctx
)
header
,
err
:=
b
.
resolveHeader
(
ctx
)
if
err
!=
nil
{
return
nil
,
err
}
return
&
Account
{
backend
:
b
.
backend
,
address
:
block
.
Coinbase
()
,
address
:
header
.
Coinbase
,
blockNumber
:
args
.
Number
(),
},
nil
}
...
...
@@ -658,7 +641,6 @@ func (b *Block) Transactions(ctx context.Context) (*[]*Transaction, error) {
if
err
!=
nil
||
block
==
nil
{
return
nil
,
err
}
ret
:=
make
([]
*
Transaction
,
0
,
len
(
block
.
Transactions
()))
for
i
,
tx
:=
range
block
.
Transactions
()
{
ret
=
append
(
ret
,
&
Transaction
{
...
...
@@ -677,13 +659,11 @@ func (b *Block) TransactionAt(ctx context.Context, args struct{ Index int32 }) (
if
err
!=
nil
||
block
==
nil
{
return
nil
,
err
}
txes
:=
block
.
Transactions
()
if
args
.
Index
<
0
||
int
(
args
.
Index
)
>=
len
(
txes
)
{
txs
:=
block
.
Transactions
()
if
args
.
Index
<
0
||
int
(
args
.
Index
)
>=
len
(
txs
)
{
return
nil
,
nil
}
tx
:=
txes
[
args
.
Index
]
tx
:=
txs
[
args
.
Index
]
return
&
Transaction
{
backend
:
b
.
backend
,
hash
:
tx
.
Hash
(),
...
...
@@ -698,12 +678,10 @@ func (b *Block) OmmerAt(ctx context.Context, args struct{ Index int32 }) (*Block
if
err
!=
nil
||
block
==
nil
{
return
nil
,
err
}
uncles
:=
block
.
Uncles
()
if
args
.
Index
<
0
||
int
(
args
.
Index
)
>=
len
(
uncles
)
{
return
nil
,
nil
}
uncle
:=
uncles
[
args
.
Index
]
blockNumber
:=
rpc
.
BlockNumber
(
uncle
.
Number
.
Uint64
())
return
&
Block
{
...
...
@@ -741,7 +719,6 @@ func runFilter(ctx context.Context, be ethapi.Backend, filter *filters.Filter) (
if
err
!=
nil
||
logs
==
nil
{
return
nil
,
err
}
ret
:=
make
([]
*
Log
,
0
,
len
(
logs
))
for
_
,
log
:=
range
logs
{
ret
=
append
(
ret
,
&
Log
{
...
...
@@ -758,21 +735,18 @@ func (b *Block) Logs(ctx context.Context, args struct{ Filter BlockFilterCriteri
if
args
.
Filter
.
Addresses
!=
nil
{
addresses
=
*
args
.
Filter
.
Addresses
}
var
topics
[][]
common
.
Hash
if
args
.
Filter
.
Topics
!=
nil
{
topics
=
*
args
.
Filter
.
Topics
}
hash
:=
b
.
hash
if
hash
==
(
common
.
Hash
{})
{
block
,
err
:=
b
.
resolve
(
ctx
)
header
,
err
:=
b
.
resolveHeader
(
ctx
)
if
err
!=
nil
{
return
nil
,
err
}
hash
=
block
.
Hash
()
hash
=
header
.
Hash
()
}
// Construct the range filter
filter
:=
filters
.
NewBlockFilter
(
b
.
backend
,
hash
,
addresses
,
topics
)
...
...
@@ -787,14 +761,12 @@ func (b *Block) Account(ctx context.Context, args struct {
if
err
!=
nil
{
return
nil
,
err
}
if
b
.
num
==
nil
{
_
,
err
:=
b
.
resolveHeader
(
ctx
)
if
err
!=
nil
{
return
nil
,
err
}
}
return
&
Account
{
backend
:
b
.
backend
,
address
:
args
.
Address
,
...
...
@@ -839,14 +811,12 @@ func (b *Block) Call(ctx context.Context, args struct {
if
err
!=
nil
{
return
nil
,
err
}
if
b
.
num
==
nil
{
_
,
err
:=
b
.
resolveHeader
(
ctx
)
if
err
!=
nil
{
return
nil
,
err
}
}
result
,
gas
,
failed
,
err
:=
ethapi
.
DoCall
(
ctx
,
b
.
backend
,
args
.
Data
,
*
b
.
num
,
vm
.
Config
{},
5
*
time
.
Second
,
b
.
backend
.
RPCGasCap
())
status
:=
hexutil
.
Uint64
(
1
)
if
failed
{
...
...
@@ -866,14 +836,12 @@ func (b *Block) EstimateGas(ctx context.Context, args struct {
if
err
!=
nil
{
return
hexutil
.
Uint64
(
0
),
err
}
if
b
.
num
==
nil
{
_
,
err
:=
b
.
resolveHeader
(
ctx
)
if
err
!=
nil
{
return
hexutil
.
Uint64
(
0
),
err
}
}
gas
,
err
:=
ethapi
.
DoEstimateGas
(
ctx
,
b
.
backend
,
args
.
Data
,
*
b
.
num
,
b
.
backend
.
RPCGasCap
())
return
gas
,
err
}
...
...
@@ -892,7 +860,6 @@ func (p *Pending) Transactions(ctx context.Context) (*[]*Transaction, error) {
if
err
!=
nil
{
return
nil
,
err
}
ret
:=
make
([]
*
Transaction
,
0
,
len
(
txs
))
for
i
,
tx
:=
range
txs
{
ret
=
append
(
ret
,
&
Transaction
{
...
...
@@ -967,12 +934,13 @@ func (r *Resolver) Block(ctx context.Context, args struct {
canonical
:
isCanonical
,
}
}
// Resolve the block; if it doesn't exist, return nil.
b
,
err
:=
block
.
resolve
(
ctx
)
// Resolve the header, return nil if it doesn't exist.
// Note we don't resolve block directly here since it will require an
// additional network request for light client.
h
,
err
:=
block
.
resolveHeader
(
ctx
)
if
err
!=
nil
{
return
nil
,
err
}
else
if
b
==
nil
{
}
else
if
h
==
nil
{
return
nil
,
nil
}
return
block
,
nil
...
...
@@ -990,11 +958,9 @@ func (r *Resolver) Blocks(ctx context.Context, args struct {
}
else
{
to
=
rpc
.
BlockNumber
(
r
.
backend
.
CurrentBlock
()
.
Number
()
.
Int64
())
}
if
to
<
from
{
return
[]
*
Block
{},
nil
}
ret
:=
make
([]
*
Block
,
0
,
to
-
from
+
1
)
for
i
:=
from
;
i
<=
to
;
i
++
{
num
:=
i
...
...
@@ -1016,7 +982,6 @@ func (r *Resolver) Transaction(ctx context.Context, args struct{ Hash common.Has
backend
:
r
.
backend
,
hash
:
args
.
Hash
,
}
// Resolve the transaction; if it doesn't exist, return nil.
t
,
err
:=
tx
.
resolve
(
ctx
)
if
err
!=
nil
{
...
...
@@ -1066,17 +1031,14 @@ func (r *Resolver) Logs(ctx context.Context, args struct{ Filter FilterCriteria
if
args
.
Filter
.
ToBlock
!=
nil
{
end
=
int64
(
*
args
.
Filter
.
ToBlock
)
}
var
addresses
[]
common
.
Address
if
args
.
Filter
.
Addresses
!=
nil
{
addresses
=
*
args
.
Filter
.
Addresses
}
var
topics
[][]
common
.
Hash
if
args
.
Filter
.
Topics
!=
nil
{
topics
=
*
args
.
Filter
.
Topics
}
// Construct the range filter
filter
:=
filters
.
NewRangeFilter
(
filters
.
Backend
(
r
.
backend
),
begin
,
end
,
addresses
,
topics
)
return
runFilter
(
ctx
,
r
.
backend
,
filter
)
...
...
internal/ethapi/api.go
View file @
8812c4d3
...
...
@@ -636,7 +636,7 @@ func (s *PublicBlockChainAPI) GetHeaderByNumber(ctx context.Context, number rpc.
// GetHeaderByHash returns the requested header by hash.
func
(
s
*
PublicBlockChainAPI
)
GetHeaderByHash
(
ctx
context
.
Context
,
hash
common
.
Hash
)
map
[
string
]
interface
{}
{
header
:=
s
.
b
.
GetHeader
(
ctx
,
hash
)
header
,
_
:=
s
.
b
.
HeaderByHash
(
ctx
,
hash
)
if
header
!=
nil
{
return
s
.
rpcMarshalHeader
(
header
)
}
...
...
@@ -666,7 +666,7 @@ func (s *PublicBlockChainAPI) GetBlockByNumber(ctx context.Context, number rpc.B
// GetBlockByHash returns the requested block. When fullTx is true all transactions in the block are returned in full
// detail, otherwise only the transaction hash is returned.
func
(
s
*
PublicBlockChainAPI
)
GetBlockByHash
(
ctx
context
.
Context
,
hash
common
.
Hash
,
fullTx
bool
)
(
map
[
string
]
interface
{},
error
)
{
block
,
err
:=
s
.
b
.
GetBlock
(
ctx
,
hash
)
block
,
err
:=
s
.
b
.
BlockByHash
(
ctx
,
hash
)
if
block
!=
nil
{
return
s
.
rpcMarshalBlock
(
block
,
true
,
fullTx
)
}
...
...
@@ -692,7 +692,7 @@ func (s *PublicBlockChainAPI) GetUncleByBlockNumberAndIndex(ctx context.Context,
// GetUncleByBlockHashAndIndex returns the uncle block for the given block hash and index. When fullTx is true
// all transactions in the block are returned in full detail, otherwise only the transaction hash is returned.
func
(
s
*
PublicBlockChainAPI
)
GetUncleByBlockHashAndIndex
(
ctx
context
.
Context
,
blockHash
common
.
Hash
,
index
hexutil
.
Uint
)
(
map
[
string
]
interface
{},
error
)
{
block
,
err
:=
s
.
b
.
GetBlock
(
ctx
,
blockHash
)
block
,
err
:=
s
.
b
.
BlockByHash
(
ctx
,
blockHash
)
if
block
!=
nil
{
uncles
:=
block
.
Uncles
()
if
index
>=
hexutil
.
Uint
(
len
(
uncles
))
{
...
...
@@ -716,7 +716,7 @@ func (s *PublicBlockChainAPI) GetUncleCountByBlockNumber(ctx context.Context, bl
// GetUncleCountByBlockHash returns number of uncles in the block for the given block hash
func
(
s
*
PublicBlockChainAPI
)
GetUncleCountByBlockHash
(
ctx
context
.
Context
,
blockHash
common
.
Hash
)
*
hexutil
.
Uint
{
if
block
,
_
:=
s
.
b
.
GetBlock
(
ctx
,
blockHash
);
block
!=
nil
{
if
block
,
_
:=
s
.
b
.
BlockByHash
(
ctx
,
blockHash
);
block
!=
nil
{
n
:=
hexutil
.
Uint
(
len
(
block
.
Uncles
()))
return
&
n
}
...
...
@@ -1146,7 +1146,7 @@ func (s *PublicTransactionPoolAPI) GetBlockTransactionCountByNumber(ctx context.
// GetBlockTransactionCountByHash returns the number of transactions in the block with the given hash.
func
(
s
*
PublicTransactionPoolAPI
)
GetBlockTransactionCountByHash
(
ctx
context
.
Context
,
blockHash
common
.
Hash
)
*
hexutil
.
Uint
{
if
block
,
_
:=
s
.
b
.
GetBlock
(
ctx
,
blockHash
);
block
!=
nil
{
if
block
,
_
:=
s
.
b
.
BlockByHash
(
ctx
,
blockHash
);
block
!=
nil
{
n
:=
hexutil
.
Uint
(
len
(
block
.
Transactions
()))
return
&
n
}
...
...
@@ -1163,7 +1163,7 @@ func (s *PublicTransactionPoolAPI) GetTransactionByBlockNumberAndIndex(ctx conte
// GetTransactionByBlockHashAndIndex returns the transaction for the given block hash and index.
func
(
s
*
PublicTransactionPoolAPI
)
GetTransactionByBlockHashAndIndex
(
ctx
context
.
Context
,
blockHash
common
.
Hash
,
index
hexutil
.
Uint
)
*
RPCTransaction
{
if
block
,
_
:=
s
.
b
.
GetBlock
(
ctx
,
blockHash
);
block
!=
nil
{
if
block
,
_
:=
s
.
b
.
BlockByHash
(
ctx
,
blockHash
);
block
!=
nil
{
return
newRPCTransactionFromBlockIndex
(
block
,
uint64
(
index
))
}
return
nil
...
...
@@ -1179,7 +1179,7 @@ func (s *PublicTransactionPoolAPI) GetRawTransactionByBlockNumberAndIndex(ctx co
// GetRawTransactionByBlockHashAndIndex returns the bytes of the transaction for the given block hash and index.
func
(
s
*
PublicTransactionPoolAPI
)
GetRawTransactionByBlockHashAndIndex
(
ctx
context
.
Context
,
blockHash
common
.
Hash
,
index
hexutil
.
Uint
)
hexutil
.
Bytes
{
if
block
,
_
:=
s
.
b
.
GetBlock
(
ctx
,
blockHash
);
block
!=
nil
{
if
block
,
_
:=
s
.
b
.
BlockByHash
(
ctx
,
blockHash
);
block
!=
nil
{
return
newRPCRawTransactionFromBlockIndex
(
block
,
uint64
(
index
))
}
return
nil
...
...
internal/ethapi/backend.go
View file @
8812c4d3
...
...
@@ -53,9 +53,8 @@ type Backend interface {
HeaderByNumber
(
ctx
context
.
Context
,
number
rpc
.
BlockNumber
)
(
*
types
.
Header
,
error
)
HeaderByHash
(
ctx
context
.
Context
,
hash
common
.
Hash
)
(
*
types
.
Header
,
error
)
BlockByNumber
(
ctx
context
.
Context
,
number
rpc
.
BlockNumber
)
(
*
types
.
Block
,
error
)
BlockByHash
(
ctx
context
.
Context
,
hash
common
.
Hash
)
(
*
types
.
Block
,
error
)
StateAndHeaderByNumber
(
ctx
context
.
Context
,
number
rpc
.
BlockNumber
)
(
*
state
.
StateDB
,
*
types
.
Header
,
error
)
GetHeader
(
ctx
context
.
Context
,
hash
common
.
Hash
)
*
types
.
Header
GetBlock
(
ctx
context
.
Context
,
hash
common
.
Hash
)
(
*
types
.
Block
,
error
)
GetReceipts
(
ctx
context
.
Context
,
hash
common
.
Hash
)
(
types
.
Receipts
,
error
)
GetTd
(
hash
common
.
Hash
)
*
big
.
Int
GetEVM
(
ctx
context
.
Context
,
msg
core
.
Message
,
state
*
state
.
StateDB
,
header
*
types
.
Header
)
(
*
vm
.
EVM
,
func
()
error
,
error
)
...
...
les/api_backend.go
View file @
8812c4d3
...
...
@@ -74,7 +74,11 @@ func (b *LesApiBackend) BlockByNumber(ctx context.Context, number rpc.BlockNumbe
if
header
==
nil
||
err
!=
nil
{
return
nil
,
err
}
return
b
.
GetBlock
(
ctx
,
header
.
Hash
())
return
b
.
BlockByHash
(
ctx
,
header
.
Hash
())
}
func
(
b
*
LesApiBackend
)
BlockByHash
(
ctx
context
.
Context
,
hash
common
.
Hash
)
(
*
types
.
Block
,
error
)
{
return
b
.
eth
.
blockchain
.
GetBlockByHash
(
ctx
,
hash
)
}
func
(
b
*
LesApiBackend
)
StateAndHeaderByNumber
(
ctx
context
.
Context
,
number
rpc
.
BlockNumber
)
(
*
state
.
StateDB
,
*
types
.
Header
,
error
)
{
...
...
@@ -88,14 +92,6 @@ func (b *LesApiBackend) StateAndHeaderByNumber(ctx context.Context, number rpc.B
return
light
.
NewState
(
ctx
,
header
,
b
.
eth
.
odr
),
header
,
nil
}
func
(
b
*
LesApiBackend
)
GetHeader
(
ctx
context
.
Context
,
hash
common
.
Hash
)
*
types
.
Header
{
return
b
.
eth
.
blockchain
.
GetHeaderByHash
(
hash
)
}
func
(
b
*
LesApiBackend
)
GetBlock
(
ctx
context
.
Context
,
hash
common
.
Hash
)
(
*
types
.
Block
,
error
)
{
return
b
.
eth
.
blockchain
.
GetBlockByHash
(
ctx
,
hash
)
}
func
(
b
*
LesApiBackend
)
GetReceipts
(
ctx
context
.
Context
,
hash
common
.
Hash
)
(
types
.
Receipts
,
error
)
{
if
number
:=
rawdb
.
ReadHeaderNumber
(
b
.
eth
.
chainDb
,
hash
);
number
!=
nil
{
return
light
.
GetBlockReceipts
(
ctx
,
b
.
eth
.
odr
,
hash
,
*
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