fix trielog decoding issue (#156)

* fix trielog decoding issue

Author: matkt

gradle.properties

@@ -2,7 +2,7 @@
 groupVal=io.consensys.protocols.shomei
 besuVersion=26.1.0-linea1.0
 shomeiPluginVersion=0.8.5
-version=2.5.1
+version=2.5.2
 
 org.gradle.welcome=never
 

services/rpc/common/build.gradle

@@ -16,11 +16,16 @@ tasks.named('jar') {
 dependencies {
 
     implementation project(':core')
+    implementation project(':trie')
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'org.hyperledger.besu:besu-datatypes'
     implementation 'io.consensys.tuweni:tuweni-bytes'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter-api'
+    testImplementation 'org.assertj:assertj-core'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 }
 
 test {
-    useJUnitPlatform()
+  useJUnitPlatform()
 }

services/rpc/common/src/main/java/net/consensys/shomei/rpc/model/TrieLogElement.java

@@ -14,9 +14,11 @@
 package net.consensys.shomei.rpc.model;
 
 import net.consensys.shomei.observer.TrieLogObserver.TrieLogIdentifier;
+import net.consensys.shomei.trie.json.JsonTraceParser;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.apache.tuweni.bytes.Bytes32;
 
 public class TrieLogElement {
@@ -31,7 +33,9 @@ public TrieLogElement() {}
   @JsonCreator
   public TrieLogElement(
       @JsonProperty("blockNumber") final Long blockNumber,
-      @JsonProperty("blockHash") final Bytes32 blockHash,
+      @JsonProperty("blockHash")
+          @JsonDeserialize(using = JsonTraceParser.Bytes32Deserializer.class)
+          final Bytes32 blockHash,
       @JsonProperty("trieLog") final String trieLog) {
     this.blockNumber = blockNumber;
     this.blockHash = blockHash;

services/rpc/common/src/test/java/net/consensys/shomei/rpc/model/TrieLogElementTest.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright ConsenSys Software Inc., 2025
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package net.consensys.shomei.rpc.model;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.jupiter.api.Test;
+
+class TrieLogElementTest {
+
+  private static final ObjectMapper MAPPER = new ObjectMapper();
+
+  @Test
+  void deserializeFromJson() throws Exception {
+    String json =
+        "{\"blockNumber\":29524257,"
+            + "\"blockHash\":\"0x2ff25b3771a2d67c2cf9237972c0f182ff60971ff979447fd7c80815d62b7f5d\","
+            + "\"trieLog\":\"0xdeadbeef\"}";
+
+    TrieLogElement element = MAPPER.readValue(json, TrieLogElement.class);
+
+    assertThat(element.blockNumber()).isEqualTo(29524257L);
+    assertThat(element.blockHash())
+        .isEqualTo(
+            Bytes32.fromHexString(
+                "0x2ff25b3771a2d67c2cf9237972c0f182ff60971ff979447fd7c80815d62b7f5d"));
+    assertThat(element.trieLog()).isEqualTo("0xdeadbeef");
+  }
+
+  @Test
+  void deserializeViaConvertValue() throws Exception {
+    Map<String, Object> map = new LinkedHashMap<>();
+    map.put("blockNumber", 29524257);
+    map.put(
+        "blockHash",
+        "0x2ff25b3771a2d67c2cf9237972c0f182ff60971ff979447fd7c80815d62b7f5d");
+    map.put("trieLog", "0xdeadbeef");
+
+    TrieLogElement element = MAPPER.convertValue(map, TrieLogElement.class);
+
+    assertThat(element.blockNumber()).isEqualTo(29524257L);
+    assertThat(element.blockHash())
+        .isEqualTo(
+            Bytes32.fromHexString(
+                "0x2ff25b3771a2d67c2cf9237972c0f182ff60971ff979447fd7c80815d62b7f5d"));
+    assertThat(element.trieLog()).isEqualTo("0xdeadbeef");
+  }
+
+  @Test
+  void trieLogIdentifierHasCorrectValues() throws Exception {
+    String json =
+        "{\"blockNumber\":100,"
+            + "\"blockHash\":\"0x0000000000000000000000000000000000000000000000000000000000000001\","
+            + "\"trieLog\":\"0x\"}";
+
+    TrieLogElement element = MAPPER.readValue(json, TrieLogElement.class);
+    var identifier = element.getTrieLogIdentifier();
+
+    assertThat(identifier.blockNumber()).isEqualTo(100L);
+    assertThat(identifier.blockHash())
+        .isEqualTo(
+            Bytes32.fromHexString(
+                "0x0000000000000000000000000000000000000000000000000000000000000001"));
+  }
+}

services/rpc/server/src/main/java/net/consensys/shomei/rpc/server/model/RollupForkChoiceUpdatedParameter.java

@@ -13,8 +13,11 @@
 
 package net.consensys.shomei.rpc.server.model;
 
+import net.consensys.shomei.trie.json.JsonTraceParser;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.apache.tuweni.bytes.Bytes32;
 
 public class RollupForkChoiceUpdatedParameter {
@@ -27,7 +30,9 @@ public class RollupForkChoiceUpdatedParameter {
   public RollupForkChoiceUpdatedParameter(
       @JsonProperty(required = true, value = "finalizedBlockNumber")
           final String finalizedBlockNumber,
-      @JsonProperty(required = true, value = "finalizedBlockHash") final Bytes32 finalizedBlockHash) {
+      @JsonProperty(required = true, value = "finalizedBlockHash")
+          @JsonDeserialize(using = JsonTraceParser.Bytes32Deserializer.class)
+          final Bytes32 finalizedBlockHash) {
     this.finalizedBlockNumber = finalizedBlockNumber;
     this.finalizedBlockHash = finalizedBlockHash;
   }

trie/src/main/java/net/consensys/shomei/trie/json/JsonTraceParser.java

@@ -17,6 +17,9 @@
 import java.util.Optional;
 
 import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.SerializerProvider;
@@ -30,6 +33,13 @@
 @SuppressWarnings("rawtypes")
 public class JsonTraceParser {
 
+  public static class Bytes32Deserializer extends JsonDeserializer<Bytes32> {
+    @Override
+    public Bytes32 deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+      return Bytes32.fromHexString(p.getText());
+    }
+  }
+
   public static Module[] modules =
       new Module[] {
         new SimpleModule()
@@ -65,17 +75,18 @@ public void serialize(
                     jsonGen.writeString(node.toHexString());
                   }
                 }),
-              new SimpleModule()
-                      .addSerializer(
-                      Bytes32.class,
-                      new JsonSerializer<>() {
-                          @Override
-                          public void serialize(
-                                  Bytes32 node, JsonGenerator jsonGen, SerializerProvider serProv)
-                                  throws IOException {
-                              jsonGen.writeString(node.toHexString());
-                          }
-                      }),
+        new SimpleModule()
+            .addSerializer(
+                Bytes32.class,
+                new JsonSerializer<>() {
+                  @Override
+                  public void serialize(
+                      Bytes32 node, JsonGenerator jsonGen, SerializerProvider serProv)
+                      throws IOException {
+                    jsonGen.writeString(node.toHexString());
+                  }
+                })
+            .addDeserializer(Bytes32.class, new Bytes32Deserializer()),
         new SimpleModule()
             .addSerializer(
                 Optional.class,