fix: fix the issue where equals are not equal due to different user i…

…nputs in certain situations. For example, uppercase and lowercase hex.
lightsail-network · Aug 5, 2024 · 7a011b9 · 7a011b9
1 parent 770bc9f
commit 7a011b9
Show file tree

Hide file tree

Showing 36 changed files with 38 additions and 67 deletions.
diff --git a/src/main/java/org/stellar/sdk/TransactionPreconditions.java b/src/main/java/org/stellar/sdk/TransactionPreconditions.java
@@ -3,6 +3,7 @@
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import lombok.Builder;
 import lombok.NonNull;
 import lombok.Singular;
@@ -184,4 +185,20 @@ public Preconditions toXdr() {
 
     return preconditionsBuilder.build();
   }
+
+  @Override
+  public boolean equals(Object object) {
+    if (this == object) {
+      return true;
+    }
+    if (object == null || getClass() != object.getClass()) {
+      return false;
+    }
+    return ((TransactionPreconditions) object).toXdr() == toXdr();
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(toXdr());
+  }
 }
diff --git a/src/main/java/org/stellar/sdk/exception/AssetCodeLengthInvalidException.java b/src/main/java/org/stellar/sdk/exception/AssetCodeLengthInvalidException.java
@@ -9,6 +9,7 @@
  * @see AssetTypeCreditAlphaNum4
  * @see AssetTypeCreditAlphaNum12
  */
+// TODO: extends IllegalArgumentException?
 public class AssetCodeLengthInvalidException extends SdkException {
   public AssetCodeLengthInvalidException() {
     super();

diff --git a/src/main/java/org/stellar/sdk/operations/AccountMergeOperation.java b/src/main/java/org/stellar/sdk/operations/AccountMergeOperation.java
@@ -1,7 +1,6 @@
 package org.stellar.sdk.operations;
 
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
@@ -18,7 +17,6 @@
  */
 @Getter
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 @SuperBuilder(toBuilder = true)
 public class AccountMergeOperation extends Operation {

diff --git a/src/main/java/org/stellar/sdk/operations/AllowTrustOperation.java b/src/main/java/org/stellar/sdk/operations/AllowTrustOperation.java
@@ -1,7 +1,6 @@
 package org.stellar.sdk.operations;
 
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
@@ -26,7 +25,6 @@
  */
 @Getter
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 @SuperBuilder(toBuilder = true)
 @Deprecated

diff --git a/src/main/java/org/stellar/sdk/operations/BeginSponsoringFutureReservesOperation.java b/src/main/java/org/stellar/sdk/operations/BeginSponsoringFutureReservesOperation.java
@@ -1,7 +1,6 @@
 package org.stellar.sdk.operations;
 
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
@@ -17,7 +16,6 @@
  */
 @Getter
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 @SuperBuilder(toBuilder = true)
 public class BeginSponsoringFutureReservesOperation extends Operation {

diff --git a/src/main/java/org/stellar/sdk/operations/BumpSequenceOperation.java b/src/main/java/org/stellar/sdk/operations/BumpSequenceOperation.java
@@ -1,7 +1,6 @@
 package org.stellar.sdk.operations;
 
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
@@ -17,7 +16,6 @@
  */
 @Getter
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 @SuperBuilder(toBuilder = true)
 public class BumpSequenceOperation extends Operation {

diff --git a/src/main/java/org/stellar/sdk/operations/ChangeTrustOperation.java b/src/main/java/org/stellar/sdk/operations/ChangeTrustOperation.java
@@ -1,7 +1,6 @@
 package org.stellar.sdk.operations;
 
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
@@ -18,7 +17,6 @@
  */
 @Getter
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 @SuperBuilder(toBuilder = true)
 public class ChangeTrustOperation extends Operation {

diff --git a/src/main/java/org/stellar/sdk/operations/ClaimClaimableBalanceOperation.java b/src/main/java/org/stellar/sdk/operations/ClaimClaimableBalanceOperation.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
@@ -19,7 +18,6 @@
  */
 @Getter
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 @SuperBuilder(toBuilder = true)
 public class ClaimClaimableBalanceOperation extends Operation {

diff --git a/src/main/java/org/stellar/sdk/operations/ClawbackClaimableBalanceOperation.java b/src/main/java/org/stellar/sdk/operations/ClawbackClaimableBalanceOperation.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
@@ -19,7 +18,6 @@
  */
 @Getter
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 @SuperBuilder(toBuilder = true)
 public class ClawbackClaimableBalanceOperation extends Operation {

diff --git a/src/main/java/org/stellar/sdk/operations/ClawbackOperation.java b/src/main/java/org/stellar/sdk/operations/ClawbackOperation.java
@@ -1,7 +1,6 @@
 package org.stellar.sdk.operations;
 
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
@@ -20,7 +19,6 @@
  */
 @Getter
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 @SuperBuilder(toBuilder = true)
 public class ClawbackOperation extends Operation {

diff --git a/src/main/java/org/stellar/sdk/operations/CreateAccountOperation.java b/src/main/java/org/stellar/sdk/operations/CreateAccountOperation.java
@@ -1,7 +1,6 @@
 package org.stellar.sdk.operations;
 
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
@@ -18,7 +17,6 @@
  */
 @Getter
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 @SuperBuilder(toBuilder = true)
 public class CreateAccountOperation extends Operation {

diff --git a/src/main/java/org/stellar/sdk/operations/CreateClaimableBalanceOperation.java b/src/main/java/org/stellar/sdk/operations/CreateClaimableBalanceOperation.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
@@ -24,7 +23,6 @@
  */
 @Getter
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 @SuperBuilder(toBuilder = true)
 public class CreateClaimableBalanceOperation extends Operation {

diff --git a/src/main/java/org/stellar/sdk/operations/CreatePassiveSellOfferOperation.java b/src/main/java/org/stellar/sdk/operations/CreatePassiveSellOfferOperation.java
@@ -1,7 +1,6 @@
 package org.stellar.sdk.operations;
 
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
@@ -19,7 +18,6 @@
  */
 @Getter
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 @SuperBuilder(toBuilder = true)
 public class CreatePassiveSellOfferOperation extends Operation {

diff --git a/src/main/java/org/stellar/sdk/operations/EndSponsoringFutureReservesOperation.java b/src/main/java/org/stellar/sdk/operations/EndSponsoringFutureReservesOperation.java
@@ -1,6 +1,5 @@
 package org.stellar.sdk.operations;
 
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
@@ -12,7 +11,6 @@
  * target="_blank">EndSponsoringFutureReserves</a> operation.
  */
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder(toBuilder = true)
 public class EndSponsoringFutureReservesOperation extends Operation {

diff --git a/src/main/java/org/stellar/sdk/operations/ExtendFootprintTTLOperation.java b/src/main/java/org/stellar/sdk/operations/ExtendFootprintTTLOperation.java
@@ -1,7 +1,6 @@
 package org.stellar.sdk.operations;
 
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
@@ -21,7 +20,6 @@
  */
 @Getter
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 @SuperBuilder(toBuilder = true)
 public class ExtendFootprintTTLOperation extends Operation {

diff --git a/src/main/java/org/stellar/sdk/operations/InflationOperation.java b/src/main/java/org/stellar/sdk/operations/InflationOperation.java
@@ -1,6 +1,5 @@
 package org.stellar.sdk.operations;
 
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
@@ -12,7 +11,6 @@
  * target="_blank">Inflation</a> operation.
  */
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder(toBuilder = true)
 public class InflationOperation extends Operation {

diff --git a/src/main/java/org/stellar/sdk/operations/InvokeHostFunctionOperation.java b/src/main/java/org/stellar/sdk/operations/InvokeHostFunctionOperation.java
@@ -7,7 +7,6 @@
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
@@ -42,7 +41,6 @@
  */
 @Getter
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 @SuperBuilder(toBuilder = true)
 public class InvokeHostFunctionOperation extends Operation {

diff --git a/src/main/java/org/stellar/sdk/operations/LiquidityPoolDepositOperation.java b/src/main/java/org/stellar/sdk/operations/LiquidityPoolDepositOperation.java
@@ -1,7 +1,6 @@
 package org.stellar.sdk.operations;
 
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
@@ -22,7 +21,6 @@
  */
 @Getter
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 @SuperBuilder(toBuilder = true)
 public class LiquidityPoolDepositOperation extends Operation {

diff --git a/src/main/java/org/stellar/sdk/operations/LiquidityPoolWithdrawOperation.java b/src/main/java/org/stellar/sdk/operations/LiquidityPoolWithdrawOperation.java
@@ -1,7 +1,6 @@
 package org.stellar.sdk.operations;
 
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
@@ -21,7 +20,6 @@
  */
 @Getter
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 @SuperBuilder(toBuilder = true)
 public class LiquidityPoolWithdrawOperation extends Operation {

diff --git a/src/main/java/org/stellar/sdk/operations/ManageBuyOfferOperation.java b/src/main/java/org/stellar/sdk/operations/ManageBuyOfferOperation.java
@@ -1,7 +1,6 @@
 package org.stellar.sdk.operations;
 
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
@@ -19,7 +18,6 @@
  */
 @Getter
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 @SuperBuilder(toBuilder = true)
 public class ManageBuyOfferOperation extends Operation {

diff --git a/src/main/java/org/stellar/sdk/operations/ManageDataOperation.java b/src/main/java/org/stellar/sdk/operations/ManageDataOperation.java
@@ -1,7 +1,6 @@
 package org.stellar.sdk.operations;
 
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
@@ -20,7 +19,6 @@
  */
 @Getter
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 @SuperBuilder(toBuilder = true)
 public class ManageDataOperation extends Operation {

diff --git a/src/main/java/org/stellar/sdk/operations/ManageSellOfferOperation.java b/src/main/java/org/stellar/sdk/operations/ManageSellOfferOperation.java
@@ -1,7 +1,6 @@
 package org.stellar.sdk.operations;
 
 import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
@@ -19,7 +18,6 @@
  */
 @Getter
 @ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor(access = lombok.AccessLevel.PRIVATE)
 @SuperBuilder(toBuilder = true)
 public class ManageSellOfferOperation extends Operation {

diff --git a/src/main/java/org/stellar/sdk/operations/Operation.java b/src/main/java/org/stellar/sdk/operations/Operation.java
@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 import java.math.BigDecimal;
-import lombok.EqualsAndHashCode;
+import java.util.Objects;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
@@ -12,7 +12,6 @@
 
 /** Abstract class for operations. */
 @SuperBuilder(toBuilder = true)
-@EqualsAndHashCode
 public abstract class Operation {
   Operation() {}
 
@@ -193,4 +192,20 @@ public static Operation fromXdr(org.stellar.sdk.xdr.Operation xdr) {
    * @return OperationBody XDR object
    */
   abstract org.stellar.sdk.xdr.Operation.OperationBody toOperationBody();
+
+  @Override
+  public boolean equals(Object object) {
+    if (this == object) {
+      return true;
+    }
+    if (object == null || getClass() != object.getClass()) {
+      return false;
+    }
+    return ((Operation) object).toXdr().equals(toXdr());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(toXdr());
+  }
 }