Revert "OverrideShanghaiTime -> OverrideCancunTime (ledgerwatch#1067)"

This reverts commit d574daa.
pratikspatil024 · Aug 18, 2023 · 53625de · 53625de
1 parent 7c9c722
commit 53625de
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git 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
-	OverrideCancunTime    *big.Int
+	OverrideShanghaiTime  *big.Int
 }
 
 var DefaultConfig = Config{
@@ -53,9 +53,10 @@ 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
+	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,
 }
 
 type DiscardReason uint8

diff --git 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
-	cancunTime := chainConfig.CancunTime
-	if cfg.OverrideCancunTime != nil {
-		cancunTime = cfg.OverrideCancunTime
+	if cfg.OverrideShanghaiTime != nil {
+		shanghaiTime = cfg.OverrideShanghaiTime
 	}
+	cancunTime := chainConfig.CancunTime
 
 	txPool, err := txpool.New(newTxs, chainDB, cfg, cache, *chainID, shanghaiTime, cancunTime, logger)
 	if err != nil {