From 19119f1e0fab8891dea2be8b880fff602eeb260b Mon Sep 17 00:00:00 2001
From: Fabio Di Fabio <fabio.difabio@consensys.net>
Date: Thu, 12 Dec 2024 19:16:23 +0100
Subject: [PATCH 1/2] Fix BOM pom publication to Artifactory (#8021)

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
---
 build.gradle          | 2 +-
 platform/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8b6982cd4a0..9c9bb68939b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -579,7 +579,7 @@ subprojects {
           password = artifactoryKey
         }
         defaults {
-          publications('mavenJava')
+          publications('mavenJava', 'mavenJavaPlatform')
           publishArtifacts = true
           publishPom = true
         }
diff --git a/platform/build.gradle b/platform/build.gradle
index f679fa20d2e..f5bb54afcd1 100644
--- a/platform/build.gradle
+++ b/platform/build.gradle
@@ -194,7 +194,7 @@ spotless {
 
 publishing {
   publications {
-    mavenPlatform(MavenPublication) {
+    mavenJavaPlatform(MavenPublication) {
       from components.javaPlatform
       groupId "org.hyperledger.besu"
       artifactId 'bom'

From 98780efd15ee3223de2c0cf2d144c8aaee30d5db Mon Sep 17 00:00:00 2001
From: Sally MacFarlane <macfarla.github@gmail.com>
Date: Fri, 13 Dec 2024 14:27:55 +1000
Subject: [PATCH 2/2] eth_call state override bugfix - movePrecompileToAddress
 (#8024)

* add ignore unknown prop to builder

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

---------

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
---
 .../besu/datatypes/AccountOverride.java       |  1 +
 ...stateOverride_movePrecompileToAddress.json | 33 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_stateOverride_movePrecompileToAddress.json

diff --git a/datatypes/src/main/java/org/hyperledger/besu/datatypes/AccountOverride.java b/datatypes/src/main/java/org/hyperledger/besu/datatypes/AccountOverride.java
index 55ee71fde15..e33f6feef54 100644
--- a/datatypes/src/main/java/org/hyperledger/besu/datatypes/AccountOverride.java
+++ b/datatypes/src/main/java/org/hyperledger/besu/datatypes/AccountOverride.java
@@ -85,6 +85,7 @@ public Optional<Map<String, String>> getStateDiff() {
   }
 
   /** Builder class for Account overrides */
+  @JsonIgnoreProperties(ignoreUnknown = true)
   public static class Builder {
     private Optional<Wei> balance = Optional.empty();
     private Optional<Long> nonce = Optional.empty();
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_stateOverride_movePrecompileToAddress.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_stateOverride_movePrecompileToAddress.json
new file mode 100644
index 00000000000..c49130c00bd
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_stateOverride_movePrecompileToAddress.json
@@ -0,0 +1,33 @@
+{
+  "request": {
+    "id": 3,
+    "jsonrpc": "2.0",
+    "method": "eth_call",
+    "params": [
+      {
+        "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+        "from": "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "data": "0x12a7b914"
+      },
+      "latest",
+      {
+        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+          "balance": "0xde0b6b3a7640000",
+          "nonce": 88
+        },
+        "0xb9741079a300Cb3B8f324CdDB847c0d1d273a05E": {
+          "stateDiff": {
+            "0x1cf7945003fc5b59d2f6736f0704557aa805c4f2844084ccd1173b8d56946962": "0x000000000000000000000000000000000000000000000000000000110ed03bf7"
+          },
+          "movePrecompileToAddress":null
+        }
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 3,
+    "result": "0x0000000000000000000000000000000000000000000000000000000000000001"
+  },
+  "statusCode": 200
+}
\ No newline at end of file