forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 14:46:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ethclient: use pending block hash to key tx sender cache

Browse source
This commit is contained in:
lightclient 2025-05-01 14:11:22 -06:00
parent 8a84834134
commit fc341f484d
No known key found for this signature in database
GPG key ID: 657913021EF45A6A
2 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ethclient/ethclient.go
View file

@ -158,6 +158,13 @@ func (ec *Client) getBlock(ctx context.Context, method string, args ...interface
if err := json.Unmarshal(raw, &body); err != nil { if err := json.Unmarshal(raw, &body); err != nil {
return nil, err return nil, err
} }
// Pending blocks do not return a block hash, set it to empty hash explicitly
// for sender caching.
if body.Hash == nil {
tmp := head.Hash()
body.Hash = &tmp
}
// Quick-verify transaction and uncle lists. This mostly helps with debugging the server. // Quick-verify transaction and uncle lists. This mostly helps with debugging the server.
if head.UncleHash == types.EmptyUncleHash && len(body.UncleHashes) > 0 { if head.UncleHash == types.EmptyUncleHash && len(body.UncleHashes) > 0 {
return nil, errors.New("server returned non-empty uncle list but block header indicates no uncles") return nil, errors.New("server returned non-empty uncle list but block header indicates no uncles")
@ -198,7 +205,7 @@ 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 && body.Hash != nil { if tx.From != nil {
setSenderFromServer(tx.tx, *tx.From, *body.Hash) setSenderFromServer(tx.tx, *tx.From, *body.Hash)
} }
txs[i] = tx.tx txs[i] = tx.tx

27
ethclient/ethclient_test.go
View file

@ -625,6 +625,21 @@ func testAtFunctions(t *testing.T, client *rpc.Client) {
if gas != 21000 { if gas != 21000 {
t.Fatalf("unexpected gas limit: %v", gas) t.Fatalf("unexpected gas limit: %v", gas)
} }
// Verify that sender address of pending transaction is saved in cache.
pendingBlock, err := ec.BlockByNumber(context.Background(), big.NewInt(int64(rpc.PendingBlockNumber)))
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
// No additional RPC should be required, ensure the server is not asked by
// canceling the context.
sender, err := ec.TransactionSender(newCanceledContext(), pendingBlock.Transactions()[0], pendingBlock.Hash(), 0)
if err != nil {
t.Fatal("unable to recover sender:", err)
}
if sender != testAddr {
t.Fatal("wrong sender:", sender)
}
} }
func testTransactionSender(t *testing.T, client *rpc.Client) { func testTransactionSender(t *testing.T, client *rpc.Client) {
@ -646,10 +661,7 @@ func testTransactionSender(t *testing.T, client *rpc.Client) {
// The sender address is cached in tx1, so no additional RPC should be required in // The sender address is cached in tx1, so no additional RPC should be required in
// TransactionSender. Ensure the server is not asked by canceling the context here. // TransactionSender. Ensure the server is not asked by canceling the context here.
canceledCtx, cancel := context.WithCancel(context.Background()) sender1, err := ec.TransactionSender(newCanceledContext(), tx1, block2.Hash(), 0)
cancel()
<-canceledCtx.Done() // Ensure the close of the Done channel
sender1, err := ec.TransactionSender(canceledCtx, tx1, block2.Hash(), 0)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -668,6 +680,13 @@ func testTransactionSender(t *testing.T, client *rpc.Client) {
} }
} }
func newCanceledContext() context.Context {
ctx, cancel := context.WithCancel(context.Background())
cancel()
<-ctx.Done() // Ensure the close of the Done channel
return ctx
}
func sendTransaction(ec *ethclient.Client) error { func sendTransaction(ec *ethclient.Client) error {
chainID, err := ec.ChainID(context.Background()) chainID, err := ec.ChainID(context.Background())
if err != nil { if err != nil {