From 3bf61dff5d4195724f10078a32ea5873cfaa6983 Mon Sep 17 00:00:00 2001 From: naviechan Date: Tue, 10 Oct 2023 21:11:55 +0800 Subject: [PATCH 1/2] Standardize pubkey and public key naming Signed-off-by: naviechan --- .../internal/parameters/DepositParameter.java | 22 +++++++++---------- .../besu/ethereum/core/Deposit.java | 16 +++++++------- .../core/encoding/DepositEncoder.java | 2 +- .../hyperledger/besu/plugin/data/Deposit.java | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/DepositParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/DepositParameter.java index c13bc0435fc..288c998977d 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/DepositParameter.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/DepositParameter.java @@ -30,7 +30,7 @@ public class DepositParameter { - private final String publicKey; + private final String pubkey; private final String withdrawalCredentials; private final String amount; @@ -40,12 +40,12 @@ public class DepositParameter { @JsonCreator public DepositParameter( - @JsonProperty("pubkey") final String pubKey, + @JsonProperty("pubkey") final String pubkey, @JsonProperty("withdrawalCredentials") final String withdrawalCredentials, @JsonProperty("amount") final String amount, @JsonProperty("signature") final String signature, @JsonProperty("index") final String index) { - this.publicKey = pubKey; + this.pubkey = pubkey; this.withdrawalCredentials = withdrawalCredentials; this.amount = amount; this.signature = signature; @@ -54,7 +54,7 @@ public DepositParameter( public static DepositParameter fromDeposit(final Deposit deposit) { return new DepositParameter( - deposit.getPublicKey().toString(), + deposit.getPubkey().toString(), deposit.getWithdrawalCredentials().toString(), deposit.getAmount().toShortHexString(), deposit.getSignature().toString(), @@ -63,7 +63,7 @@ public static DepositParameter fromDeposit(final Deposit deposit) { public Deposit toDeposit() { return new Deposit( - BLSPublicKey.fromHexString(publicKey), + BLSPublicKey.fromHexString(pubkey), Bytes32.fromHexString(withdrawalCredentials), GWei.fromHexString(amount), BLSSignature.fromHexString(signature), @@ -72,7 +72,7 @@ public Deposit toDeposit() { public JsonObject asJsonObject() { return new JsonObject() - .put("pubKey", publicKey) + .put("pubkey", pubkey) .put("withdrawalCredentials", withdrawalCredentials) .put("amount", amount) .put("signature", signature) @@ -80,8 +80,8 @@ public JsonObject asJsonObject() { } @JsonGetter - public String getPublicKey() { - return publicKey; + public String getPubkey() { + return pubkey; } @JsonGetter @@ -109,7 +109,7 @@ public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; final DepositParameter that = (DepositParameter) o; - return Objects.equals(publicKey, that.publicKey) + return Objects.equals(pubkey, that.pubkey) && Objects.equals(withdrawalCredentials, that.withdrawalCredentials) && Objects.equals(amount, that.amount) && Objects.equals(signature, that.signature) @@ -118,14 +118,14 @@ public boolean equals(final Object o) { @Override public int hashCode() { - return Objects.hash(publicKey, withdrawalCredentials, amount, signature, index); + return Objects.hash(pubkey, withdrawalCredentials, amount, signature, index); } @Override public String toString() { return "DepositParameter{" + "pubKey='" - + publicKey + + pubkey + '\'' + ", withdrawalCredentials='" + withdrawalCredentials diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Deposit.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Deposit.java index b01d6deee32..ed362199b23 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Deposit.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Deposit.java @@ -32,19 +32,19 @@ public class Deposit implements org.hyperledger.besu.plugin.data.Deposit { - private final BLSPublicKey pubKey; + private final BLSPublicKey pubkey; private final Bytes32 depositWithdrawalCredentials; private final GWei amount; private final BLSSignature signature; private final UInt64 index; public Deposit( - final BLSPublicKey pubKey, + final BLSPublicKey pubkey, final Bytes32 depositWithdrawalCredentials, final GWei amount, final BLSSignature signature, final UInt64 index) { - this.pubKey = pubKey; + this.pubkey = pubkey; this.depositWithdrawalCredentials = depositWithdrawalCredentials; this.amount = amount; this.signature = signature; @@ -64,8 +64,8 @@ public void writeTo(final RLPOutput out) { } @Override - public PublicKey getPublicKey() { - return pubKey; + public PublicKey getPubkey() { + return pubkey; } @Override @@ -92,7 +92,7 @@ public UInt64 getIndex() { public String toString() { return "Deposit{" + "pubKey=" - + pubKey + + pubkey + ", withdrawalCredentials=" + depositWithdrawalCredentials + ", amount=" @@ -109,7 +109,7 @@ public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; final Deposit that = (Deposit) o; - return Objects.equals(pubKey, that.pubKey) + return Objects.equals(pubkey, that.pubkey) && Objects.equals(depositWithdrawalCredentials, that.depositWithdrawalCredentials) && Objects.equals(amount, that.amount) && Objects.equals(signature, that.signature) @@ -118,6 +118,6 @@ public boolean equals(final Object o) { @Override public int hashCode() { - return Objects.hash(pubKey, depositWithdrawalCredentials, amount, signature, index); + return Objects.hash(pubkey, depositWithdrawalCredentials, amount, signature, index); } } diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/DepositEncoder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/DepositEncoder.java index d5171d18f79..15f825e0757 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/DepositEncoder.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/DepositEncoder.java @@ -24,7 +24,7 @@ public class DepositEncoder { public static void encode(final Deposit deposit, final RLPOutput rlpOutput) { rlpOutput.startList(); - rlpOutput.writeBytes(deposit.getPublicKey()); + rlpOutput.writeBytes(deposit.getPubkey()); rlpOutput.writeBytes(deposit.getWithdrawalCredentials()); rlpOutput.writeUInt64Scalar(deposit.getAmount()); rlpOutput.writeBytes(deposit.getSignature()); diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Deposit.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Deposit.java index 2fe82effe72..50e67898d75 100644 --- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Deposit.java +++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Deposit.java @@ -34,7 +34,7 @@ public interface Deposit { * * @return public key of sender */ - PublicKey getPublicKey(); + PublicKey getPubkey(); /** * Withdrawal credential that contains info that will be used for verifying the destination of From 3029cdf6ca2bf342e055890852e43223f8e277e1 Mon Sep 17 00:00:00 2001 From: naviechan Date: Tue, 10 Oct 2023 21:25:37 +0800 Subject: [PATCH 2/2] Update api hash Signed-off-by: naviechan --- plugin-api/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin-api/build.gradle b/plugin-api/build.gradle index 231fd953d38..cabfcd12a92 100644 --- a/plugin-api/build.gradle +++ b/plugin-api/build.gradle @@ -69,7 +69,7 @@ Calculated : ${currentHash} tasks.register('checkAPIChanges', FileStateChecker) { description = "Checks that the API for the Plugin-API project does not change without deliberate thought" files = sourceSets.main.allJava.files - knownHash = '+7wo9cABKEFyYvjtpDFAOXqVKBAkffdnb433hT0VQ7I=' + knownHash = 'cI31KuEj0TTIxlDaZZbY0u4GZ/dNVQZnibVLKFzyM3Y=' } check.dependsOn('checkAPIChanges')