forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-23 05:06:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cmd/utils, eth/filters: changed flag name to LogQueryLimit

Browse source
This commit is contained in:
zsfelfoldi 2025-09-16 12:46:28 +02:00
parent 75dd37215b
commit 3cc4015d29
7 changed files with 44 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/geth/main.go
View file

@ -180,7 +180,7 @@ var (
utils.RPCGlobalGasCapFlag,
utils.RPCGlobalEVMTimeoutFlag,
utils.RPCGlobalTxFeeCapFlag,
utils.EthGetLogMaxAddressFlag,
utils.RPCGlobalLogQueryLimit,
utils.AllowUnprotectedTxs,
utils.BatchRequestLimit,
utils.BatchResponseMaxSize,

14
cmd/utils/flags.go
View file

@ -590,10 +590,10 @@ var (
Value: ethconfig.Defaults.RPCTxFeeCap,
Category: flags.APICategory,
}
EthGetLogMaxAddressFlag = &cli.IntFlag{
Name: "rpc.getlogmaxaddrs",
Usage: "Maximum number of addresses allowed in eth_getLogs filter criteria",
Value: ethconfig.Defaults.FilterMaxAddresses,
RPCGlobalLogQueryLimit = &cli.IntFlag{
Name: "rpc.logquerylimit",
Usage: "Maximum number of alternative addresses or topics allowed per search position in eth_getLogs filter criteria (0 = no cap)",
Value: ethconfig.Defaults.LogQueryLimit,
Category: flags.APICategory,
}
// Authenticated RPC HTTP settings
@ -1695,8 +1695,8 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
if ctx.IsSet(CacheLogSizeFlag.Name) {
cfg.FilterLogCacheSize = ctx.Int(CacheLogSizeFlag.Name)
}
if ctx.IsSet(EthGetLogMaxAddressFlag.Name) {
cfg.FilterMaxAddresses = ctx.Int(EthGetLogMaxAddressFlag.Name)
if ctx.IsSet(RPCGlobalLogQueryLimit.Name) {
cfg.LogQueryLimit = ctx.Int(RPCGlobalLogQueryLimit.Name)
}
if !ctx.Bool(SnapshotFlag.Name) || cfg.SnapshotCache == 0 {
// If snap-sync is requested, this flag is also required
@ -2007,7 +2007,7 @@ func RegisterGraphQLService(stack *node.Node, backend ethapi.Backend, filterSyst
func RegisterFilterAPI(stack *node.Node, backend ethapi.Backend, ethcfg *ethconfig.Config) *filters.FilterSystem {
filterSystem := filters.NewFilterSystem(backend, filters.Config{
LogCacheSize: ethcfg.FilterLogCacheSize,
MaxAddresses: ethcfg.FilterMaxAddresses,
LogQueryLimit: ethcfg.LogQueryLimit,
})
stack.RegisterAPIs([]rpc.API{{
Namespace: "eth",

4
eth/ethconfig/config.go
View file

@ -62,7 +62,7 @@ var Defaults = Config{
TrieTimeout: 60 * time.Minute,
SnapshotCache: 102,
FilterLogCacheSize: 32,
FilterMaxAddresses: 1000,
LogQueryLimit: 1000,
Miner: miner.DefaultConfig,
TxPool: legacypool.DefaultConfig,
BlobPool: blobpool.DefaultConfig,
@ -133,7 +133,7 @@ type Config struct {
FilterLogCacheSize int
// This is the maximum number of addresses allowed in filter criteria for eth_getLogs.
FilterMaxAddresses int
LogQueryLimit int
// Mining options
Miner miner.Config

10
eth/ethconfig/gen_config.go
View file

@ -44,7 +44,7 @@ func (c Config) MarshalTOML() (interface{}, error) {
SnapshotCache int
Preimages bool
FilterLogCacheSize int
FilterMaxAddresses int
LogQueryLimit int
Miner miner.Config
TxPool legacypool.Config
BlobPool blobpool.Config
@ -87,7 +87,7 @@ func (c Config) MarshalTOML() (interface{}, error) {
enc.SnapshotCache = c.SnapshotCache
enc.Preimages = c.Preimages
enc.FilterLogCacheSize = c.FilterLogCacheSize
enc.FilterMaxAddresses = c.FilterMaxAddresses
enc.LogQueryLimit = c.LogQueryLimit
enc.Miner = c.Miner
enc.TxPool = c.TxPool
enc.BlobPool = c.BlobPool
@ -134,7 +134,7 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error {
SnapshotCache *int
Preimages *bool
FilterLogCacheSize *int
FilterMaxAddresses *int
LogQueryLimit *int
Miner *miner.Config
TxPool *legacypool.Config
BlobPool *blobpool.Config
@ -234,8 +234,8 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error {
if dec.FilterLogCacheSize != nil {
c.FilterLogCacheSize = *dec.FilterLogCacheSize
}
if dec.FilterMaxAddresses != nil {
c.FilterMaxAddresses = *dec.FilterMaxAddresses
if dec.LogQueryLimit != nil {
c.LogQueryLimit = *dec.LogQueryLimit
}
if dec.Miner != nil {
c.Miner = *dec.Miner

10
eth/filters/api.go
View file

@ -42,7 +42,7 @@ var (
errBlockHashWithRange = errors.New("can't specify fromBlock/toBlock with blockHash")
errPendingLogsUnsupported = errors.New("pending logs are not supported")
errExceedMaxTopics = errors.New("exceed max topics")
errExceedMaxAddresses = errors.New("exceed max addresses")
errExceedLogQueryLimit = errors.New("exceed max addresses or topics per search position")
)
const (
@ -73,7 +73,7 @@ type FilterAPI struct {
filtersMu sync.Mutex
filters map[rpc.ID]*filter
timeout time.Duration
maxAddresses int
logQueryLimit int
}
// NewFilterAPI returns a new FilterAPI instance.
@ -83,7 +83,7 @@ func NewFilterAPI(system *FilterSystem) *FilterAPI {
events: NewEventSystem(system),
filters: make(map[rpc.ID]*filter),
timeout: system.cfg.Timeout,
maxAddresses: system.cfg.MaxAddresses,
logQueryLimit: system.cfg.LogQueryLimit,
}
go api.timeoutLoop(system.cfg.Timeout)
@ -347,8 +347,8 @@ func (api *FilterAPI) GetLogs(ctx context.Context, crit FilterCriteria) ([]*type
if len(crit.Topics) > maxTopics {
return nil, errExceedMaxTopics
}
if len(crit.Addresses) > api.maxAddresses {
return nil, errExceedMaxAddresses
if len(crit.Addresses) > api.logQueryLimit {
return nil, errExceedLogQueryLimit
}
var filter *Filter

10
eth/filters/filter_system.go
View file

@ -43,7 +43,7 @@ import (
type Config struct {
LogCacheSize int // maximum number of cached blocks (default: 32)
Timeout time.Duration // how long filters stay active (default: 5min)
MaxAddresses int // maximum number of addresses allowed in filter criteria (default: 1000)
LogQueryLimit int // maximum number of addresses allowed in filter criteria (default: 1000)
}
func (cfg Config) withDefaults() Config {
@ -53,8 +53,8 @@ func (cfg Config) withDefaults() Config {
if cfg.LogCacheSize == 0 {
cfg.LogCacheSize = 32
}
if cfg.MaxAddresses == 0 {
cfg.MaxAddresses = 1000
if cfg.LogQueryLimit == 0 {
cfg.LogQueryLimit = 1000
}
return cfg
}
@ -295,8 +295,8 @@ func (es *EventSystem) SubscribeLogs(crit ethereum.FilterQuery, logs chan []*typ
if len(crit.Topics) > maxTopics {
return nil, errExceedMaxTopics
}
if len(crit.Addresses) > es.sys.cfg.MaxAddresses {
return nil, errExceedMaxAddresses
if len(crit.Addresses) > es.sys.cfg.LogQueryLimit {
return nil, errExceedLogQueryLimit
}
var from, to rpc.BlockNumber
if crit.FromBlock == nil {

16
eth/filters/filter_system_test.go
View file

@ -435,7 +435,7 @@ func TestInvalidLogFilterCreation(t *testing.T) {
1: {FromBlock: big.NewInt(rpc.PendingBlockNumber.Int64()), ToBlock: big.NewInt(100)},
2: {FromBlock: big.NewInt(rpc.LatestBlockNumber.Int64()), ToBlock: big.NewInt(100)},
3: {Topics: [][]common.Hash{{}, {}, {}, {}, {}}},
4: {Addresses: make([]common.Address, api.maxAddresses+1)},
4: {Addresses: make([]common.Address, api.logQueryLimit+1)},
}
for i, test := range testCases {
@ -532,10 +532,10 @@ func TestInvalidGetRangeLogsRequest(t *testing.T) {
func TestInvalidAddressLengthRequest(t *testing.T) {
t.Parallel()
// Test with custom config (MaxAddresses = 5 for easier testing)
// Test with custom config (LogQueryLimit = 5 for easier testing)
var (
db = rawdb.NewMemoryDatabase()
_, sys = newTestFilterSystem(db, Config{MaxAddresses: 5})
_, sys = newTestFilterSystem(db, Config{LogQueryLimit: 5})
api = NewFilterAPI(sys)
)
@ -550,14 +550,14 @@ func TestInvalidAddressLengthRequest(t *testing.T) {
FromBlock: big.NewInt(0),
ToBlock: big.NewInt(100),
Addresses: invalidAddresses,
}); err != errExceedMaxAddresses {
t.Errorf("Expected GetLogs with 6 addresses to return errExceedMaxAddresses, but got: %v", err)
}); err != errExceedLogQueryLimit {
t.Errorf("Expected GetLogs with 6 addresses to return errExceedLogQueryLimit, but got: %v", err)
}
// Test with default config should reject 1001 addresses
var (
db2 = rawdb.NewMemoryDatabase()
_, sys2 = newTestFilterSystem(db2, Config{}) // Uses default MaxAddresses = 1000
_, sys2 = newTestFilterSystem(db2, Config{}) // Uses default LogQueryLimit = 1000
api2 = NewFilterAPI(sys2)
)
@ -571,8 +571,8 @@ func TestInvalidAddressLengthRequest(t *testing.T) {
FromBlock: big.NewInt(0),
ToBlock: big.NewInt(100),
Addresses: tooManyAddresses,
}); err != errExceedMaxAddresses {
t.Errorf("Expected GetLogs with 1001 addresses to return errExceedMaxAddresses, but got: %v", err)
}); err != errExceedLogQueryLimit {
t.Errorf("Expected GetLogs with 1001 addresses to return errExceedLogQueryLimit, but got: %v", err)
}
}