From 4535c19a476353990ed684e4f5df933220989d65 Mon Sep 17 00:00:00 2001 From: Danno Ferrin Date: Wed, 10 Jan 2024 11:13:23 -0700 Subject: [PATCH 1/2] In fluent APIs correct Tangerine Whistle definition. The fluent API incorrectly added the code size limit in Tangerine Whistle instead of first adding it in Spurious Dragon. Signed-off-by: Danno Ferrin --- .../main/java/org/hyperledger/besu/evm/fluent/EVMExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evm/src/main/java/org/hyperledger/besu/evm/fluent/EVMExecutor.java b/evm/src/main/java/org/hyperledger/besu/evm/fluent/EVMExecutor.java index 9946b6f57a8..0a43a6d359a 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/fluent/EVMExecutor.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/fluent/EVMExecutor.java @@ -221,7 +221,7 @@ public static EVMExecutor tangerineWhistle(final EvmConfiguration evmConfigurati final EVMExecutor executor = new EVMExecutor(MainnetEVMs.tangerineWhistle(evmConfiguration)); executor.precompileContractRegistry = MainnetPrecompiledContracts.frontier(executor.evm.getGasCalculator()); - executor.contractValidationRules = List.of(MaxCodeSizeRule.of(0x6000)); + executor.contractValidationRules = List.of(); executor.initialNonce = 0; return executor; } From ad45353912427bd9f51b81f4b8bf3eca46e83a49 Mon Sep 17 00:00:00 2001 From: Danno Ferrin Date: Wed, 10 Jan 2024 11:16:09 -0700 Subject: [PATCH 2/2] In fluent APIs correct Tangerine Whistle definition. The fluent API incorrectly added the code size limit in Tangerine Whistle instead of first adding it in Spurious Dragon. Signed-off-by: Danno Ferrin --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f51e8b4c2e..42f6bed10d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ ### Bug fixes - INTERNAL_ERROR from `eth_estimateGas` JSON/RPC calls [#6344](https://github.com/hyperledger/besu/issues/6344) - Fix Besu Docker images with `openjdk-latest` tags since 23.10.3 using UID 1001 instead of 1000 for the `besu` user [#6360](https://github.com/hyperledger/besu/pull/6360) +- Fluent EVM definition for Tangerine Whistle had incorrect code size validation configured [#6382](https://github.com/hyperledger/besu/pull/6382) ## 23.10.3