From 81349ff6e53a5bcb7adee210274171c22ae64053 Mon Sep 17 00:00:00 2001
From: ids <tonyhaha163@163.com>
Date: Fri, 19 Apr 2024 15:58:14 +0800
Subject: [PATCH 1/2] eth/catalyst: fix typo (#29580)

---
 eth/catalyst/api.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go
index e279d168fe19..0efa61587dc9 100644
--- a/eth/catalyst/api.go
+++ b/eth/catalyst/api.go
@@ -657,7 +657,7 @@ func (api *ConsensusAPI) delayPayloadImport(block *types.Block) engine.PayloadSt
 	api.remoteBlocks.put(block.Hash(), block.Header())
 
 	// Although we don't want to trigger a sync, if there is one already in
-	// progress, try to extend if with the current payload request to relieve
+	// progress, try to extend it with the current payload request to relieve
 	// some strain from the forkchoice update.
 	err := api.eth.Downloader().BeaconExtend(api.eth.SyncMode(), block.Header())
 	if err == nil {

From cce879b71b772ca9df83ada499127d6ca8e7c8f6 Mon Sep 17 00:00:00 2001
From: Mario Vega <marioevz@gmail.com>
Date: Fri, 19 Apr 2024 02:07:52 -0600
Subject: [PATCH 2/2] tests: define cancun-to-prague at 15K chainconig (#29557)

tests: add cancun->prague config
---
 tests/init.go | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/init.go b/tests/init.go
index 8d97b4de63bb..e333587a07a7 100644
--- a/tests/init.go
+++ b/tests/init.go
@@ -357,6 +357,26 @@ var Forks = map[string]*params.ChainConfig{
 		CancunTime:              u64(0),
 		PragueTime:              u64(0),
 	},
+	"CancunToPragueAtTime15k": {
+		ChainID:                 big.NewInt(1),
+		HomesteadBlock:          big.NewInt(0),
+		EIP150Block:             big.NewInt(0),
+		EIP155Block:             big.NewInt(0),
+		EIP158Block:             big.NewInt(0),
+		ByzantiumBlock:          big.NewInt(0),
+		ConstantinopleBlock:     big.NewInt(0),
+		PetersburgBlock:         big.NewInt(0),
+		IstanbulBlock:           big.NewInt(0),
+		MuirGlacierBlock:        big.NewInt(0),
+		BerlinBlock:             big.NewInt(0),
+		LondonBlock:             big.NewInt(0),
+		ArrowGlacierBlock:       big.NewInt(0),
+		MergeNetsplitBlock:      big.NewInt(0),
+		TerminalTotalDifficulty: big.NewInt(0),
+		ShanghaiTime:            u64(0),
+		CancunTime:              u64(0),
+		PragueTime:              u64(15_000),
+	},
 }
 
 // AvailableForks returns the set of defined fork names