From 64a5d7421af99ebd93e73fba08e23bb3d2dddc2a Mon Sep 17 00:00:00 2001
From: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>
Date: Tue, 6 Dec 2022 15:18:27 +1100
Subject: [PATCH]  Fix storage key format for eth_getProof (#4564)

---
 .../api/jsonrpc/internal/results/proof/StorageEntryProof.java  | 2 +-
 .../ethereum/api/jsonrpc/internal/methods/EthGetProofTest.java | 3 ++-
 .../besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHash.json  | 2 +-
 .../ethereum/api/jsonrpc/eth/eth_getProof_blockHashObject.json | 2 +-
 .../api/jsonrpc/eth/eth_getProof_blockHashObjectCanonical.json | 2 +-
 .../eth/eth_getProof_blockHashObjectCanonicalFalse.json        | 2 +-
 .../ethereum/api/jsonrpc/eth/eth_getProof_blockNumber.json     | 2 +-
 .../api/jsonrpc/eth/eth_getProof_blockNumberObject.json        | 2 +-
 .../besu/ethereum/api/jsonrpc/eth/eth_getProof_latest.json     | 2 +-
 .../besu/ethereum/api/jsonrpc/eth/eth_getProof_pending.json    | 2 +-
 10 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/proof/StorageEntryProof.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/proof/StorageEntryProof.java
index b01e83485fe..3939906520e 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/proof/StorageEntryProof.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/proof/StorageEntryProof.java
@@ -39,7 +39,7 @@ public StorageEntryProof(final UInt256 key, final UInt256 value, final List<Byte
 
   @JsonGetter(value = "key")
   public String getKey() {
-    return key.toShortHexString();
+    return key.trimLeadingZeros().toHexString();
   }
 
   @JsonGetter(value = "value")
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetProofTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetProofTest.java
index a207a24f96d..f8a81979487 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetProofTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetProofTest.java
@@ -176,7 +176,8 @@ void getProof() {
     assertThat(result).usingRecursiveComparison().isEqualTo(expectedResponse);
     assertThat(result.getNonce()).isEqualTo("0xfffffffffffffffe");
     assertThat(result.getStorageProof().size()).isGreaterThan(0);
-    assertThat(result.getStorageProof().get(0).getKey()).isEqualTo(storageKey.toShortHexString());
+    assertThat(result.getStorageProof().get(0).getKey())
+        .isEqualTo(storageKey.trimLeadingZeros().toHexString());
   }
 
   private JsonRpcRequestContext requestWithParams(final Object... params) {
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHash.json
index 9a35456c08d..91fcf579d2d 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHash.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHash.json
@@ -20,7 +20,7 @@
       "nonce" : "0x0",
       "storageHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
       "storageProof" : [ {
-        "key" : "0x347",
+        "key" : "0x0347",
         "value" : "0x0",
         "proof" : [ ]
       } ]
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObject.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObject.json
index 950a9810f21..ac8cbb6bcf1 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObject.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObject.json
@@ -22,7 +22,7 @@
       "nonce" : "0x0",
       "storageHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
       "storageProof" : [ {
-        "key" : "0x347",
+        "key" : "0x0347",
         "value" : "0x0",
         "proof" : [ ]
       } ]
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObjectCanonical.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObjectCanonical.json
index 262509e6a93..ab4e6269543 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObjectCanonical.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObjectCanonical.json
@@ -23,7 +23,7 @@
       "nonce" : "0x0",
       "storageHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
       "storageProof" : [ {
-        "key" : "0x347",
+        "key" : "0x0347",
         "value" : "0x0",
         "proof" : [ ]
       } ]
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObjectCanonicalFalse.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObjectCanonicalFalse.json
index 4229d948bb7..22ec46ae601 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObjectCanonicalFalse.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObjectCanonicalFalse.json
@@ -23,7 +23,7 @@
       "nonce" : "0x0",
       "storageHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
       "storageProof" : [ {
-        "key" : "0x347",
+        "key" : "0x0347",
         "value" : "0x0",
         "proof" : [ ]
       } ]
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockNumber.json
index cd943daca87..d2ebfc9f513 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockNumber.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockNumber.json
@@ -20,7 +20,7 @@
       "nonce" : "0x0",
       "storageHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
       "storageProof" : [ {
-        "key" : "0x347",
+        "key" : "0x0347",
         "value" : "0x0",
         "proof" : [ ]
       } ]
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockNumberObject.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockNumberObject.json
index 5a3851b51b6..5b7332d68bb 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockNumberObject.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockNumberObject.json
@@ -22,7 +22,7 @@
       "nonce" : "0x0",
       "storageHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
       "storageProof" : [ {
-        "key" : "0x347",
+        "key" : "0x0347",
         "value" : "0x0",
         "proof" : [ ]
       } ]
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_latest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_latest.json
index 2bedeba6aa9..40c999f7161 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_latest.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_latest.json
@@ -20,7 +20,7 @@
       "nonce" : "0x0",
       "storageHash" : "0xdd3fa56425f8195f314c22547243081293b3f5537cd98ed8f84d4fda3f9a515b",
       "storageProof" : [ {
-        "key" : "0x347",
+        "key" : "0x0347",
         "value" : "0x0",
         "proof" : [ "0xf8b18080a0c7f91ee5ea67d593275fcc773a02a5e5fb37b0625ca5c5cdc783483d43f2d7c280a06672614c102b0f02e747250bae452ed105110e25761c15a2a459afbd9eb8cf2e808080a0f671e05fab19f512b16fdcbc938f5fbbfbbc2fa67fecb575bb7721c221f71cf78080a0ba2fc36b0235d7ea299126bd4d404cb38456f32a6c236b422a3868f98c69eda1a0d77552655c7b63916586a73350b1933836f2378789613b548b90fa0a44125df180808080"]
       } ]
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_pending.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_pending.json
index 3fa558cad85..ccbcfddd01b 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_pending.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_pending.json
@@ -20,7 +20,7 @@
       "nonce" : "0x0",
       "storageHash" : "0xdd3fa56425f8195f314c22547243081293b3f5537cd98ed8f84d4fda3f9a515b",
       "storageProof" : [ {
-        "key" : "0x347",
+        "key" : "0x0347",
         "value" : "0x0",
         "proof" : [ "0xf8b18080a0c7f91ee5ea67d593275fcc773a02a5e5fb37b0625ca5c5cdc783483d43f2d7c280a06672614c102b0f02e747250bae452ed105110e25761c15a2a459afbd9eb8cf2e808080a0f671e05fab19f512b16fdcbc938f5fbbfbbc2fa67fecb575bb7721c221f71cf78080a0ba2fc36b0235d7ea299126bd4d404cb38456f32a6c236b422a3868f98c69eda1a0d77552655c7b63916586a73350b1933836f2378789613b548b90fa0a44125df180808080"]
       } ]