diff --git a/txpool/txpoolcfg/txpoolcfg.go b/txpool/txpoolcfg/txpoolcfg.go index 53b87ab5f..bdfab2690 100644 --- a/txpool/txpoolcfg/txpoolcfg.go +++ b/txpool/txpoolcfg/txpoolcfg.go @@ -40,7 +40,7 @@ type Config struct { MinFeeCap uint64 AccountSlots uint64 // Number of executable transaction slots guaranteed per account PriceBump uint64 // Price bump percentage to replace an already existing transaction - OverrideShanghaiTime *big.Int + OverrideCancunTime *big.Int } var DefaultConfig = Config{ @@ -53,10 +53,9 @@ var DefaultConfig = Config{ BaseFeeSubPoolLimit: 10_000, QueuedSubPoolLimit: 10_000, - MinFeeCap: 1, - AccountSlots: 16, //TODO: to choose right value (16 to be compatible with Geth) - PriceBump: 10, // Price bump percentage to replace an already existing transaction - OverrideShanghaiTime: nil, + MinFeeCap: 1, + AccountSlots: 16, //TODO: to choose right value (16 to be compatible with Geth) + PriceBump: 10, // Price bump percentage to replace an already existing transaction } type DiscardReason uint8 diff --git a/txpool/txpooluitl/all_components.go b/txpool/txpooluitl/all_components.go index 12494ff14..b0ef862a1 100644 --- a/txpool/txpooluitl/all_components.go +++ b/txpool/txpooluitl/all_components.go @@ -120,10 +120,10 @@ func AllComponents(ctx context.Context, cfg txpoolcfg.Config, cache kvcache.Cach chainID, _ := uint256.FromBig(chainConfig.ChainID) shanghaiTime := chainConfig.ShanghaiTime - if cfg.OverrideShanghaiTime != nil { - shanghaiTime = cfg.OverrideShanghaiTime - } cancunTime := chainConfig.CancunTime + if cfg.OverrideCancunTime != nil { + cancunTime = cfg.OverrideCancunTime + } txPool, err := txpool.New(newTxs, chainDB, cfg, cache, *chainID, shanghaiTime, cancunTime, logger) if err != nil {