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

eth, cmd: change flag from pointer to value

Browse source
This commit is contained in:
healthykim 2026-06-22 15:40:38 +02:00
parent cfcd8aa797
commit 91b643be83
4 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmd/utils/flags.go
View file

@ -500,7 +500,7 @@ var (
} }
BlobPoolFetchProbabilityFlag = &cli.Uint64Flag{ BlobPoolFetchProbabilityFlag = &cli.Uint64Flag{
Name: "blobpool.fetchprobability", Name: "blobpool.fetchprobability",
Usage: "Probability of fetching the full blob payload for sparse blobpool", Usage: "Probability of fetching the full blob payload for sparse blobpool (min=15, max=100)",
Value: fetcher.DefaultFetchProbability, Value: fetcher.DefaultFetchProbability,
Category: flags.BlobPoolCategory, Category: flags.BlobPoolCategory,
} }
@ -1677,8 +1677,7 @@ func setBlobPool(ctx *cli.Context, cfg *blobpool.Config) {
cfg.PriceBump = ctx.Uint64(BlobPoolPriceBumpFlag.Name) cfg.PriceBump = ctx.Uint64(BlobPoolPriceBumpFlag.Name)
} }
if ctx.IsSet(BlobPoolFetchProbabilityFlag.Name) { if ctx.IsSet(BlobPoolFetchProbabilityFlag.Name) {
v := ctx.Uint64(BlobPoolFetchProbabilityFlag.Name) cfg.FetchProbability = ctx.Uint64(BlobPoolFetchProbabilityFlag.Name)
cfg.FetchProbability = &v
} }
} }

2
core/txpool/blobpool/config.go
View file

@ -26,7 +26,7 @@ type Config struct {
Datacap uint64 // Soft-cap of database storage (hard cap is larger due to overhead) Datacap uint64 // Soft-cap of database storage (hard cap is larger due to overhead)
PriceBump uint64 // Minimum price bump percentage to replace an already existing nonce PriceBump uint64 // Minimum price bump percentage to replace an already existing nonce
FetchProbability *uint64 // EIP-8070: full blob fetch probability for sparse blobpool FetchProbability uint64 // EIP-8070: full blob fetch probability for sparse blobpool
} }
// DefaultConfig contains the default configurations for the transaction pool. // DefaultConfig contains the default configurations for the transaction pool.

9
eth/backend.go
View file

@ -344,13 +344,6 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
stack.RegisterLifecycle(eth.localTxTracker) stack.RegisterLifecycle(eth.localTxTracker)
} }
var fetchProb uint64
if config.BlobPool.FetchProbability != nil {
fetchProb = *config.BlobPool.FetchProbability
} else {
fetchProb = fetcher.DefaultFetchProbability
}
// Permit the downloader to use the trie cache allowance during fast sync // Permit the downloader to use the trie cache allowance during fast sync
cacheLimit := options.TrieCleanLimit + options.TrieDirtyLimit + options.SnapshotLimit cacheLimit := options.TrieCleanLimit + options.TrieDirtyLimit + options.SnapshotLimit
if eth.handler, err = newHandler(&handlerConfig{ if eth.handler, err = newHandler(&handlerConfig{
@ -364,7 +357,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
BloomCache: uint64(cacheLimit), BloomCache: uint64(cacheLimit),
RequiredBlocks: config.RequiredBlocks, RequiredBlocks: config.RequiredBlocks,
SnapV2: config.SnapV2, SnapV2: config.SnapV2,
FetchProbability: fetchProb, FetchProbability: config.BlobPool.FetchProbability,
}); err != nil { }); err != nil {
return nil, err return nil, err
} }

3
eth/fetcher/blob_fetcher.go
View file

@ -161,6 +161,9 @@ type token struct {
} }
func NewBlobFetcher(fn BlobFetcherFunctions, custody types.CustodyBitmap, rand random, fetchProbability uint64) *BlobFetcher { func NewBlobFetcher(fn BlobFetcherFunctions, custody types.CustodyBitmap, rand random, fetchProbability uint64) *BlobFetcher {
if fetchProbability < DefaultFetchProbability {
fetchProbability = DefaultFetchProbability
}
return &BlobFetcher{ return &BlobFetcher{
notify: make(chan *blobTxAnnounce), notify: make(chan *blobTxAnnounce),
cleanup: make(chan *payloadDelivery), cleanup: make(chan *payloadDelivery),