fix blobGas serialization

Signed-off-by: garyschulte <garyschulte@gmail.com>
garyschulte · Mar 1, 2024 · 87104d6 · 87104d6
1 parent 050f075
commit 87104d6
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 2 deletions.
diff --git a/besu/src/test/java/org/hyperledger/besu/services/RlpConverterServiceImplTest.java b/besu/src/test/java/org/hyperledger/besu/services/RlpConverterServiceImplTest.java
@@ -0,0 +1,40 @@
+package org.hyperledger.besu.services;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.BlobGas;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
+import org.hyperledger.besu.plugin.data.BlockHeader;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+
+public class RlpConverterServiceImplTest {
+
+  @Test
+  public void testBuildRlpFromHeader() {
+    // Arrange
+    RlpConverterServiceImpl rlpConverterServiceImpl =
+        new RlpConverterServiceImpl(ProtocolScheduleFixture.MAINNET);
+    // header with cancun fields
+    BlockHeader header =
+        new BlockHeaderTestFixture()
+            .timestamp(1710338135 + 1)
+            .baseFeePerGas(Wei.of(1000))
+            .depositsRoot(Hash.ZERO)
+            .withdrawalsRoot(Hash.ZERO)
+            .blobGasUsed(500L)
+            .excessBlobGas(BlobGas.of(500L))
+            .buildHeader();
+
+    Bytes rlpBytes = rlpConverterServiceImpl.buildRlpFromHeader(header);
+    BlockHeader deserialized = rlpConverterServiceImpl.buildHeaderFromRlp(rlpBytes);
+    // Assert
+    assertThat(header).isEqualTo(deserialized);
+    assertThat(header.getBlobGasUsed()).isEqualTo(deserialized.getBlobGasUsed());
+    assertThat(header.getExcessBlobGas()).isEqualTo(deserialized.getExcessBlobGas());
+  }
+}
diff --git a/datatypes/src/main/java/org/hyperledger/besu/datatypes/BlobGas.java b/datatypes/src/main/java/org/hyperledger/besu/datatypes/BlobGas.java
@@ -16,6 +16,7 @@
 
 import java.math.BigInteger;
 
+import com.fasterxml.jackson.annotation.JsonValue;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.units.bigints.BaseUInt64Value;
 import org.apache.tuweni.units.bigints.UInt64;
@@ -123,6 +124,7 @@ public BigInteger getAsBigInteger() {
     return toBigInteger();
   }
 
+  @JsonValue
   @Override
   public String toHexString() {
     return super.toHexString();
@@ -140,6 +142,6 @@ public String toShortHexString() {
    * @return the blob gas
    */
   public static BlobGas fromQuantity(final Quantity quantity) {
-    return BlobGas.wrap((Bytes) quantity);
+    return BlobGas.of(quantity.getAsBigInteger());
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeader.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeader.java
@@ -310,7 +310,7 @@ public static org.hyperledger.besu.ethereum.core.BlockHeader convertPluginBlockH
             .map(h -> Hash.fromHexString(h.toHexString()))
             .orElse(null),
         pluginBlockHeader.getBlobGasUsed().map(Long::longValue).orElse(null),
-        pluginBlockHeader.getExcessBlobGas().map(BlobGas::fromQuantity).orElse(null),
+        pluginBlockHeader.getExcessBlobGas().map(BlobGas.class::cast).orElse(null),
         pluginBlockHeader.getParentBeaconBlockRoot().orElse(null),
         pluginBlockHeader
             .getDepositsRoot()