From d0a6a70cc8c1cad977b08f6ad1e5a72796b08f13 Mon Sep 17 00:00:00 2001 From: Danno Ferrin <danno.ferrin@swirldslabs.com> Date: Mon, 30 Oct 2023 18:12:04 -0600 Subject: [PATCH] Correct reference test blobgas calculation (#6107) * Correct reference test blobgas calculation Fix tpyo that resulted in an NPE in t8n blob gas calculations. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> * changelog Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> * spotless Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> --------- Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> --- CHANGELOG.md | 1 + .../besu/ethereum/referencetests/ReferenceTestEnv.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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) --- 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..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(parentGasUsed)))); + Long.decode(parentExcessBlobGas), Long.decode(parentBlobGasUsed)))); } return builder.buildBlockHeader();