Updated EIP-7002 WithdrawalRequestV1 field (validatorPublicKey -> val…

…idatorPubkey) (hyperledger#7209) Signed-off-by: Lucas Saldanha <lucascrsaldanha@gmail.com>
fab-10 · Jun 12, 2024 · d9ab92e · d9ab92e
1 parent c7e2e4d
commit d9ab92e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/...sts/tests/src/test/resources/jsonrpc/engine/prague/test-cases/06_prague_getPayloadV4.json b/...sts/tests/src/test/resources/jsonrpc/engine/prague/test-cases/06_prague_getPayloadV4.json
@@ -30,7 +30,7 @@
         "withdrawalRequests": [
           {
             "sourceAddress": "0xa4664c40aacebd82a2db79f0ea36c06bc6a19adb",
-            "validatorPublicKey": "0xb10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416e",
+            "validatorPubkey": "0xb10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416e",
             "amount": "0x0"
           }
         ],

diff --git a/...sts/tests/src/test/resources/jsonrpc/engine/prague/test-cases/09_prague_newPayloadV4.json b/...sts/tests/src/test/resources/jsonrpc/engine/prague/test-cases/09_prague_newPayloadV4.json
@@ -32,7 +32,7 @@
           {
             "sourceAddress": "0xa4664c40aacebd82a2db79f0ea36c06bc6a19adb",
             "amount": "0x0",
-            "validatorPublicKey": "0xb10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416e"
+            "validatorPubkey": "0xb10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416e"
           }
         ],
         "blockNumber": "0x2",

diff --git a/...sts/tests/src/test/resources/jsonrpc/engine/prague/test-cases/15_prague_getPayloadV4.json b/...sts/tests/src/test/resources/jsonrpc/engine/prague/test-cases/15_prague_getPayloadV4.json
@@ -33,7 +33,7 @@
           {
             "sourceAddress": "0x23618e81e3f5cdf7f54c3d65f7fbc0abf5b21e8f",
             "amount": "0x0",
-            "validatorPublicKey": "0x8706d19a62f28a6a6549f96c5adaebac9124a61d44868ec94f6d2d707c6a2f82c9162071231dfeb40e24bfde4ffdf243"
+            "validatorPubkey": "0x8706d19a62f28a6a6549f96c5adaebac9124a61d44868ec94f6d2d707c6a2f82c9162071231dfeb40e24bfde4ffdf243"
           }
         ],
         "blockNumber": "0x4",

diff --git a/...hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/WithdrawalRequestParameter.java b/...hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/WithdrawalRequestParameter.java
@@ -28,16 +28,16 @@
 public class WithdrawalRequestParameter {
 
   private final String sourceAddress;
-  private final String validatorPublicKey;
+  private final String validatorPubkey;
   private final String amount;
 
   @JsonCreator
   public WithdrawalRequestParameter(
       @JsonProperty("sourceAddress") final String sourceAddress,
-      @JsonProperty("validatorPublicKey") final String validatorPublicKey,
+      @JsonProperty("validatorPubkey") final String validatorPubkey,
       @JsonProperty("amount") final String amount) {
     this.sourceAddress = sourceAddress;
-    this.validatorPublicKey = validatorPublicKey;
+    this.validatorPubkey = validatorPubkey;
     this.amount = amount;
   }
 
@@ -52,7 +52,7 @@ public static WithdrawalRequestParameter fromWithdrawalRequest(
   public WithdrawalRequest toWithdrawalRequest() {
     return new WithdrawalRequest(
         Address.fromHexString(sourceAddress),
-        BLSPublicKey.fromHexString(validatorPublicKey),
+        BLSPublicKey.fromHexString(validatorPubkey),
         GWei.fromHexString(amount));
   }
 
@@ -62,8 +62,8 @@ public String getSourceAddress() {
   }
 
   @JsonGetter
-  public String getValidatorPublicKey() {
-    return validatorPublicKey;
+  public String getValidatorPubkey() {
+    return validatorPubkey;
   }
 
   @JsonGetter
@@ -77,13 +77,13 @@ public boolean equals(final Object o) {
     if (o == null || getClass() != o.getClass()) return false;
     final WithdrawalRequestParameter that = (WithdrawalRequestParameter) o;
     return Objects.equals(sourceAddress, that.sourceAddress)
-        && Objects.equals(validatorPublicKey, that.validatorPublicKey)
+        && Objects.equals(validatorPubkey, that.validatorPubkey)
         && Objects.equals(amount, that.amount);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(sourceAddress, validatorPublicKey, amount);
+    return Objects.hash(sourceAddress, validatorPubkey, amount);
   }
 
   @Override
@@ -92,8 +92,8 @@ public String toString() {
         + "sourceAddress='"
         + sourceAddress
         + '\''
-        + ", validatorPublicKey='"
-        + validatorPublicKey
+        + ", validatorPubkey='"
+        + validatorPubkey
         + '\''
         + ", amount='"
         + amount