tests: update tests (#26314)

This PR builds on #26299, but also updates the tests to the most recent version, which includes tests regarding TheMerge.

This change adds checks to the beacon consensus engine, making it more strict in validating the pre- and post-headers, and not relying on the caller to have already correctly sanitized the headers/blocks.

Author: holiman

cmd/evm/README.md

@@ -230,23 +230,23 @@ func TestT8n(t *testing.T) {
 		{ // Test post-merge transition
 			base: "./testdata/24",
 			input: t8nInput{
-				"alloc.json", "txs.json", "env.json", "Merged", "",
+				"alloc.json", "txs.json", "env.json", "Merge", "",
 			},
 			output: t8nOutput{alloc: true, result: true},
 			expOut: "exp.json",
 		},
 		{ // Test post-merge transition where input is missing random
 			base: "./testdata/24",
 			input: t8nInput{
-				"alloc.json", "txs.json", "env-missingrandom.json", "Merged", "",
+				"alloc.json", "txs.json", "env-missingrandom.json", "Merge", "",
 			},
 			output:      t8nOutput{alloc: false, result: false},
 			expExitCode: 3,
 		},
 		{ // Test base fee calculation
 			base: "./testdata/25",
 			input: t8nInput{
-				"alloc.json", "txs.json", "env.json", "Merged", "",
+				"alloc.json", "txs.json", "env.json", "Merge", "",
 			},
 			output: t8nOutput{alloc: true, result: true},
 			expOut: "exp.json",