Reference tests 12.3 (hyperledger#5733)

Update Reference Tests to 12.3 * fix decoding error * add ignored field * update module Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Signed-off-by: garyschulte <garyschulte@gmail.com>
garyschulte · Aug 28, 2023 · e9b8f46 · e9b8f46
1 parent 4f34600
commit e9b8f46
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/ethereum/referencetests/build.gradle b/ethereum/referencetests/build.gradle
@@ -163,7 +163,7 @@ tasks.register('validateReferenceTestSubmodule') {
   description = "Checks that the reference tests submodule is not accidentally changed"
   doLast {
     def result = new ByteArrayOutputStream()
-    def expectedHash = '04f338a6e673a6b4d906ec9d6d2bc939309357a5'
+    def expectedHash = '06e276776bc87817c38f6efb492bf6f4527fa904'
     def submodulePath = java.nio.file.Path.of("${rootProject.projectDir}", "ethereum/referencetests/src/reference-test/external-resources").toAbsolutePath()
     try {
       exec {

diff --git a/...in/java/org/hyperledger/besu/ethereum/referencetests/BlockchainReferenceTestCaseSpec.java b/...in/java/org/hyperledger/besu/ethereum/referencetests/BlockchainReferenceTestCaseSpec.java
@@ -189,7 +189,7 @@ public ReferenceTestBlockHeader(
           Hash.fromHexString(mixHash), // mixHash
           Bytes.fromHexStringLenient(nonce).toLong(),
           withdrawalsRoot != null ? Hash.fromHexString(withdrawalsRoot) : null,
-          dataGasUsed != null ? Long.parseLong(dataGasUsed) : 0,
+          dataGasUsed != null ? Long.decode(dataGasUsed) : 0,
           excessDataGas != null ? DataGas.fromHexString(excessDataGas) : null,
           depositsRoot != null ? Hash.fromHexString(depositsRoot) : null,
           new BlockHeaderFunctions() {
@@ -207,6 +207,10 @@ public ParsedExtraData parseExtraData(final BlockHeader header) {
   }
 
   @JsonIgnoreProperties({
+    "blocknumber",
+    "chainname",
+    "chainnetwork",
+    "expectException",
     "expectExceptionByzantium",
     "expectExceptionConstantinople",
     "expectExceptionConstantinopleFix",
@@ -215,11 +219,8 @@ public ParsedExtraData parseExtraData(final BlockHeader header) {
     "expectExceptionEIP158",
     "expectExceptionFrontier",
     "expectExceptionHomestead",
-    "expectException",
-    "blocknumber",
-    "chainname",
     "expectExceptionALL",
-    "chainnetwork",
+    "hasBigInt",
     "transactionSequence"
   })
   public static class CandidateBlock {

diff --git a/ethereum/referencetests/src/reference-test/external-resources b/ethereum/referencetests/src/reference-test/external-resources