From d91db9cefe75b7ecec5e4638ce11631e13427592 Mon Sep 17 00:00:00 2001
From: garyschulte <garyschulte@gmail.com>
Date: Tue, 16 Aug 2022 11:35:07 -0700
Subject: [PATCH] getProof encoding fix for 4249 (#4261)

* getProof encoding fix for 4249

Signed-off-by: garyschulte <garyschulte@gmail.com>
---
 CHANGELOG.md                                                    | 1 +
 .../api/jsonrpc/internal/results/proof/StorageEntryProof.java   | 2 +-
 .../ethereum/api/jsonrpc/internal/methods/EthGetProofTest.java  | 2 ++
 .../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 +-
 .../jsonrpc/eth/eth_getProof_blockHashObjectCanonicalFalse.json | 2 +-
 .../besu/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 +-
 11 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c66b1501fdb..1d136811258 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 ### Bug Fixes
 - Fixes off-by-one error for mainnet TTD fallback [#4223](https://github.com/hyperledger/besu/pull/4223)
 - Fix off-by-one error in AbstractRetryingPeerTask [#4254](https://github.com/hyperledger/besu/pull/4254)
+- Fix encoding of key (short hex) in eth_getProof [#4261](https://github.com/hyperledger/besu/pull/4261)
 
 ## 22.7.0
 
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 08ceba3f96d..b01e83485fe 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.toDecimalString();
+    return key.toShortHexString();
   }
 
   @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 459d00e0274..b8ab222f875 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
@@ -172,6 +172,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());
   }
 
   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 3e2b5b4d6b3..9a35456c08d 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" : "839",
+        "key" : "0x347",
         "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 77b6b060901..950a9810f21 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" : "839",
+        "key" : "0x347",
         "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 897f839a932..262509e6a93 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" : "839",
+        "key" : "0x347",
         "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 281676960fc..4229d948bb7 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" : "839",
+        "key" : "0x347",
         "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 d27de4e3b86..cd943daca87 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" : "839",
+        "key" : "0x347",
         "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 6366479b77e..5a3851b51b6 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" : "839",
+        "key" : "0x347",
         "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 9a3cb9f34c8..2bedeba6aa9 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" : "839",
+        "key" : "0x347",
         "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 e3de0cf5478..3fa558cad85 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" : "839",
+        "key" : "0x347",
         "value" : "0x0",
         "proof" : [ "0xf8b18080a0c7f91ee5ea67d593275fcc773a02a5e5fb37b0625ca5c5cdc783483d43f2d7c280a06672614c102b0f02e747250bae452ed105110e25761c15a2a459afbd9eb8cf2e808080a0f671e05fab19f512b16fdcbc938f5fbbfbbc2fa67fecb575bb7721c221f71cf78080a0ba2fc36b0235d7ea299126bd4d404cb38456f32a6c236b422a3868f98c69eda1a0d77552655c7b63916586a73350b1933836f2378789613b548b90fa0a44125df180808080"]
       } ]