From c2849490995d55ceb341a78ab518070a20235a6c Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Fri, 18 Jul 2025 13:17:33 +0200
Subject: [PATCH] params/presets: update for new system

---
 params/presets/presets.go | 45 ++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/params/presets/presets.go b/params/presets/presets.go
index 0903ccffcc..0f464cb526 100644
--- a/params/presets/presets.go
+++ b/params/presets/presets.go
@@ -17,11 +17,16 @@
 package presets
 
 import (
+	"math"
+	"math/big"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/params/forks"
 )
 
+var mainnetTD, _ = new(big.Int).SetString("58_750_000_000_000_000_000_000", 0)
+
 var Mainnet = params.NewConfig2(
 	params.Activations{
 		forks.Homestead:        1_150_000,
@@ -43,16 +48,18 @@ var Mainnet = params.NewConfig2(
 		forks.Cancun:   1710338135,
 		forks.Prague:   1746612311,
 	},
-	params.NewChainID("1"),
-	params.NewTerminalTotalDifficulty("58_750_000_000_000_000_000_000"),
-	params.DepositContractAddress(common.HexToAddress("0x00000000219ab540356cbb839cbe05303d7705fa")),
-	params.DAOForkSupport(true),
-	params.BlobSchedule{
+	params.ChainID.V(big.NewInt(1)),
+	params.TerminalTotalDifficulty.V(mainnetTD),
+	params.DepositContractAddress.V(common.HexToAddress("0x00000000219ab540356cbb839cbe05303d7705fa")),
+	params.DAOForkSupport.V(true),
+	params.BlobSchedule.V(map[forks.Fork]params.BlobConfig{
 		forks.Cancun: *params.DefaultCancunBlobConfig,
 		forks.Prague: *params.DefaultPragueBlobConfig,
-	},
+	}),
 )
 
+var sepoliaTD, _ = new(big.Int).SetString("17_000_000_000_000_000", 0)
+
 // SepoliaChainConfig contains the chain parameters to run a node on the Sepolia test network.
 var Sepolia = params.NewConfig2(
 	params.Activations{
@@ -72,13 +79,13 @@ var Sepolia = params.NewConfig2(
 		forks.Cancun:   1706655072,
 		forks.Prague:   1741159776,
 	},
-	params.NewChainID("11155111"),
-	params.NewTerminalTotalDifficulty("17_000_000_000_000_000"),
-	params.DepositContractAddress(common.HexToAddress("0x7f02c3e3c98b133055b8b348b2ac625669ed295d")),
-	params.BlobSchedule{
+	params.ChainID.V(big.NewInt(11155111)),
+	params.TerminalTotalDifficulty.V(sepoliaTD),
+	params.DepositContractAddress.V(common.HexToAddress("0x7f02c3e3c98b133055b8b348b2ac625669ed295d")),
+	params.BlobSchedule.V(map[forks.Fork]params.BlobConfig{
 		forks.Cancun: *params.DefaultCancunBlobConfig,
 		forks.Prague: *params.DefaultPragueBlobConfig,
-	},
+	}),
 )
 
 // AllEthashProtocolChanges2 contains every protocol change (EIPs) introduced
@@ -98,8 +105,8 @@ var AllEthashProtocolChanges = params.NewConfig2(
 		forks.ArrowGlacier:     0,
 		forks.GrayGlacier:      0,
 	},
-	params.NewChainID("1337"),
-	params.NewTerminalTotalDifficulty("0xffffffffffffff"),
+	params.ChainID.V(big.NewInt(1337)),
+	params.TerminalTotalDifficulty.V(big.NewInt(math.MaxInt64)),
 )
 
 // TestChainConfig contains every protocol change (EIPs) introduced
@@ -119,8 +126,8 @@ var TestChainConfig = params.NewConfig2(
 		forks.ArrowGlacier:     0,
 		forks.GrayGlacier:      0,
 	},
-	params.NewChainID("1"),
-	params.NewTerminalTotalDifficulty("0xffffffffffff"),
+	params.ChainID.V(big.NewInt(1)),
+	params.TerminalTotalDifficulty.V(big.NewInt(math.MaxInt64)),
 )
 
 // MergedTestChainConfig2 contains every protocol change (EIPs) introduced
@@ -145,11 +152,11 @@ var MergedTestChainConfig = params.NewConfig2(
 		forks.Prague:           0,
 		forks.Osaka:            0,
 	},
-	params.NewChainID("1"),
-	params.NewTerminalTotalDifficulty("0"),
-	params.BlobSchedule{
+	params.ChainID.V(big.NewInt(1)),
+	params.TerminalTotalDifficulty.V(big.NewInt(0)),
+	params.BlobSchedule.V(map[forks.Fork]params.BlobConfig{
 		forks.Cancun: *params.DefaultCancunBlobConfig,
 		forks.Prague: *params.DefaultPragueBlobConfig,
 		forks.Osaka:  *params.DefaultOsakaBlobConfig,
-	},
+	}),
 )