ethclient: change Hash field of rpcBlock to pointer

This commit is contained in:
islishude 2025-03-27 16:07:47 +08:00 committed by lightclient
parent 701df4baad
commit ad5d463ceb
No known key found for this signature in database
GPG key ID: 657913021EF45A6A

View file

@ -131,7 +131,7 @@ func (ec *Client) BlockReceipts(ctx context.Context, blockNrOrHash rpc.BlockNumb
} }
type rpcBlock struct { type rpcBlock struct {
Hash common.Hash `json:"hash"` Hash *common.Hash `json:"hash"`
Transactions []rpcTransaction `json:"transactions"` Transactions []rpcTransaction `json:"transactions"`
UncleHashes []common.Hash `json:"uncles"` UncleHashes []common.Hash `json:"uncles"`
Withdrawals []*types.Withdrawal `json:"withdrawals,omitempty"` Withdrawals []*types.Withdrawal `json:"withdrawals,omitempty"`
@ -198,8 +198,8 @@ func (ec *Client) getBlock(ctx context.Context, method string, args ...interface
// Fill the sender cache of transactions in the block. // Fill the sender cache of transactions in the block.
txs := make([]*types.Transaction, len(body.Transactions)) txs := make([]*types.Transaction, len(body.Transactions))
for i, tx := range body.Transactions { for i, tx := range body.Transactions {
if tx.From != nil { if tx.From != nil && body.Hash != nil {
setSenderFromServer(tx.tx, *tx.From, body.Hash) setSenderFromServer(tx.tx, *tx.From, *body.Hash)
} }
txs[i] = tx.tx txs[i] = tx.tx
} }