From 8e1e7f211bf2bab381f834972499f27e362ce2d9 Mon Sep 17 00:00:00 2001 From: Danno Ferrin Date: Mon, 30 Oct 2023 09:26:10 -0600 Subject: [PATCH 1/3] Correct reference test blobgas calculation Fix tpyo that resulted in an NPE in t8n blob gas calculations. Signed-off-by: Danno Ferrin --- .../besu/ethereum/referencetests/ReferenceTestEnv.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestEnv.java b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestEnv.java index 230efc4f92c..6dbf7ed2c63 100644 --- a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestEnv.java +++ b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestEnv.java @@ -233,7 +233,7 @@ public BlockHeader updateFromParentValues(final ProtocolSpec protocolSpec) { protocolSpec .getGasCalculator() .computeExcessBlobGas( - Long.decode(parentExcessBlobGas), Long.decode(parentGasUsed)))); + Long.decode(parentExcessBlobGas), Long.decode(parentBlobGasUsed)))); } return builder.buildBlockHeader(); From d9a71c2ce7eac8eb93b2995ae3848daaae3f6999 Mon Sep 17 00:00:00 2001 From: Danno Ferrin Date: Mon, 30 Oct 2023 09:30:12 -0600 Subject: [PATCH 2/3] changelog Signed-off-by: Danno Ferrin --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f77745e7d43..a1007ea0073 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ - Upgrade netty to address CVE-2023-44487, CVE-2023-34462 [#6100](https://github.com/hyperledger/besu/pull/6100) - Upgrade grpc to address CVE-2023-32731, CVE-2023-33953, CVE-2023-44487, CVE-2023-4785 [#6100](https://github.com/hyperledger/besu/pull/6100) +- Fix blob gas calculation in reference tests [#6107](https://github.com/hyperledger/besu/pull/6107) --- From ea3030cc197b06bb6181ec7c238759ca62b1772f Mon Sep 17 00:00:00 2001 From: Danno Ferrin Date: Mon, 30 Oct 2023 10:59:18 -0600 Subject: [PATCH 3/3] spotless Signed-off-by: Danno Ferrin --- .../besu/ethereum/referencetests/ReferenceTestEnv.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestEnv.java b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestEnv.java index 6dbf7ed2c63..ae12be1b50e 100644 --- a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestEnv.java +++ b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestEnv.java @@ -233,7 +233,7 @@ public BlockHeader updateFromParentValues(final ProtocolSpec protocolSpec) { protocolSpec .getGasCalculator() .computeExcessBlobGas( - Long.decode(parentExcessBlobGas), Long.decode(parentBlobGasUsed)))); + Long.decode(parentExcessBlobGas), Long.decode(parentBlobGasUsed)))); } return builder.buildBlockHeader();