mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-06-05 14:38:42 +00:00
eth/protocols/snap: skip trie lookup for oversized compact paths
Short-circuit GetTrieNodes paths longer than 33 bytes to avoid expensive trie traversal while preserving the empty-node response. Fixes #34853.
This commit is contained in:
parent
3d1e6aa6c3
commit
c20b0c60f2
3 changed files with 97 additions and 0 deletions
|
|
@ -44,6 +44,10 @@ const (
|
||||||
// number is there to limit the number of disk lookups.
|
// number is there to limit the number of disk lookups.
|
||||||
maxTrieNodeLookups = 1024
|
maxTrieNodeLookups = 1024
|
||||||
|
|
||||||
|
// maxCompactTriePathLen is the maximum length of a compact-encoded trie node path.
|
||||||
|
// Trie keys are at most 32 bytes (64 nibbles); compact encoding adds at most one flag byte.
|
||||||
|
maxCompactTriePathLen = 33
|
||||||
|
|
||||||
// maxAccessListLookups is the maximum number of BALs to server. This number
|
// maxAccessListLookups is the maximum number of BALs to server. This number
|
||||||
// is there to limit the number of disk lookups.
|
// is there to limit the number of disk lookups.
|
||||||
maxAccessListLookups = 1024
|
maxAccessListLookups = 1024
|
||||||
|
|
|
||||||
|
|
@ -469,6 +469,12 @@ func ServiceGetTrieNodesQuery(chain *core.BlockChain, req *GetTrieNodesPacket) (
|
||||||
if accKey == nil {
|
if accKey == nil {
|
||||||
return nodes, fmt.Errorf("%w: invalid account node request", errBadRequest)
|
return nodes, fmt.Errorf("%w: invalid account node request", errBadRequest)
|
||||||
}
|
}
|
||||||
|
if len(accKey) > maxCompactTriePathLen {
|
||||||
|
// Structurally invalid path; avoid expensive trie traversal. The missing
|
||||||
|
// node is represented by a nil blob, which hashes to the empty trie node.
|
||||||
|
nodes = append(nodes, nil)
|
||||||
|
break
|
||||||
|
}
|
||||||
blob, resolved, err := accTrie.GetNode(accKey)
|
blob, resolved, err := accTrie.GetNode(accKey)
|
||||||
loads += resolved // always account database reads, even for failures
|
loads += resolved // always account database reads, even for failures
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -513,6 +519,10 @@ func ServiceGetTrieNodesQuery(chain *core.BlockChain, req *GetTrieNodesPacket) (
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("%w: invalid storage key: %v", errBadRequest, err)
|
return nil, fmt.Errorf("%w: invalid storage key: %v", errBadRequest, err)
|
||||||
}
|
}
|
||||||
|
if len(path) > maxCompactTriePathLen {
|
||||||
|
nodes = append(nodes, nil)
|
||||||
|
continue
|
||||||
|
}
|
||||||
blob, resolved, err := stTrie.GetNode(path)
|
blob, resolved, err := stTrie.GetNode(path)
|
||||||
loads += resolved // always account database reads, even for failures
|
loads += resolved // always account database reads, even for failures
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
83
eth/protocols/snap/handlers_trienodes_test.go
Normal file
83
eth/protocols/snap/handlers_trienodes_test.go
Normal file
|
|
@ -0,0 +1,83 @@
|
||||||
|
// Copyright 2026 The go-ethereum Authors
|
||||||
|
// This file is part of the go-ethereum library.
|
||||||
|
//
|
||||||
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU Lesser General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Lesser General Public License
|
||||||
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package snap
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/ethereum/go-ethereum/consensus/beacon"
|
||||||
|
"github.com/ethereum/go-ethereum/consensus/ethash"
|
||||||
|
"github.com/ethereum/go-ethereum/core"
|
||||||
|
"github.com/ethereum/go-ethereum/core/rawdb"
|
||||||
|
"github.com/ethereum/go-ethereum/core/types"
|
||||||
|
"github.com/ethereum/go-ethereum/crypto"
|
||||||
|
"github.com/ethereum/go-ethereum/params"
|
||||||
|
"github.com/ethereum/go-ethereum/rlp"
|
||||||
|
)
|
||||||
|
|
||||||
|
func testTrieNodeChain(t *testing.T) *core.BlockChain {
|
||||||
|
t.Helper()
|
||||||
|
gspec := &core.Genesis{Config: params.MergedTestChainConfig}
|
||||||
|
db := rawdb.NewMemoryDatabase()
|
||||||
|
engine := beacon.New(ethash.NewFaker())
|
||||||
|
_, blocks, _ := core.GenerateChainWithGenesis(gspec, engine, 1, nil)
|
||||||
|
bc, err := core.NewBlockChain(db, gspec, engine, &core.BlockChainConfig{
|
||||||
|
StateScheme: rawdb.PathScheme,
|
||||||
|
TrieTimeLimit: 5 * time.Minute,
|
||||||
|
NoPrefetch: true,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := bc.InsertChain(blocks); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
return bc
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestServiceGetTrieNodesQueryOversizedPath ensures structurally invalid trie paths
|
||||||
|
// do not trigger expensive trie lookups while preserving the empty-node response
|
||||||
|
// expected by the snap protocol test suite (see issue #34853).
|
||||||
|
func TestServiceGetTrieNodesQueryOversizedPath(t *testing.T) {
|
||||||
|
bc := testTrieNodeChain(t)
|
||||||
|
defer bc.Stop()
|
||||||
|
|
||||||
|
longPath := make([]byte, 54)
|
||||||
|
for i := range longPath {
|
||||||
|
longPath[i] = byte(i)
|
||||||
|
}
|
||||||
|
paths, err := rlp.EncodeToRawList([]TrieNodePathSet{{longPath}})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
req := &GetTrieNodesPacket{
|
||||||
|
Root: bc.CurrentBlock().Root,
|
||||||
|
Paths: paths,
|
||||||
|
Bytes: 5000,
|
||||||
|
}
|
||||||
|
nodes, err := ServiceGetTrieNodesQuery(bc, req)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if len(nodes) != 1 {
|
||||||
|
t.Fatalf("got %d nodes, want 1", len(nodes))
|
||||||
|
}
|
||||||
|
if hash := crypto.Keccak256Hash(nodes[0]); hash != types.EmptyCodeHash {
|
||||||
|
t.Fatalf("got node hash %s, want %s", hash, types.EmptyCodeHash)
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue