[CHORE] Merge release/2.6.1 to main

api-schema/src/main/java/org/stellar/anchor/api/callback/GetRateResponse.java

@@ -5,7 +5,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.stellar.anchor.api.sep.sep38.RateFee;
+import org.stellar.anchor.api.shared.FeeDetails;
 import reactor.util.annotation.Nullable;
 
 /**
@@ -37,7 +37,7 @@ public GetRateResponse(Rate rate) {
    * @return a GET /rate response with price, total_price, sell_amount, buy_amount and fee.
    */
   public static GetRateResponse indicativePrice(
-      String price, String sellAmount, String buyAmount, RateFee fee) {
+      String price, String sellAmount, String buyAmount, FeeDetails fee) {
     Rate rate =
         Rate.builder().price(price).sellAmount(sellAmount).buyAmount(buyAmount).fee(fee).build();
     return new GetRateResponse(rate);
@@ -60,6 +60,6 @@ public static class Rate {
     @Nullable
     Instant expiresAt;
 
-    @Nullable RateFee fee;
+    @Nullable FeeDetails fee;
   }
 }

api-schema/src/main/java/org/stellar/anchor/api/platform/GetQuoteResponse.java

@@ -6,7 +6,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
-import org.stellar.anchor.api.sep.sep38.RateFee;
+import org.stellar.anchor.api.shared.FeeDetails;
 import org.stellar.anchor.api.shared.StellarId;
 
 @Data
@@ -51,5 +51,5 @@ public class GetQuoteResponse {
   @SerializedName("created_at")
   Instant createdAt;
 
-  RateFee fee;
+  FeeDetails fee;
 }

api-schema/src/main/java/org/stellar/anchor/api/platform/PlatformTransactionData.java

@@ -42,8 +42,12 @@ public class PlatformTransactionData {
   Amount amountOut;
 
   @SerializedName("amount_fee")
+  @Deprecated // ANCHOR-636
   Amount amountFee;
 
+  @SerializedName("fee_details")
+  FeeDetails feeDetails;
+
   @SerializedName("quote_id")
   String quoteId;
 

api-schema/src/main/java/org/stellar/anchor/api/rpc/method/NotifyAmountsUpdatedRequest.java

@@ -6,6 +6,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
+import org.stellar.anchor.api.shared.FeeDetails;
 
 @Data
 @SuperBuilder
@@ -18,6 +19,9 @@ public class NotifyAmountsUpdatedRequest extends RpcMethodParamsRequest {
   private AmountRequest amountOut;
 
   @SerializedName("amount_fee")
-  @NotNull
+  @Deprecated // ANCHOR-636
   private AmountRequest amountFee;
+
+  @SerializedName("fee_details")
+  private FeeDetails feeDetails;
 }

api-schema/src/main/java/org/stellar/anchor/api/rpc/method/NotifyInteractiveFlowCompletedRequest.java

@@ -6,6 +6,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
+import org.stellar.anchor.api.shared.FeeDetails;
 
 @Data
 @SuperBuilder
@@ -21,10 +22,13 @@ public class NotifyInteractiveFlowCompletedRequest extends RpcMethodParamsReques
   @SerializedName("amount_out")
   private AmountAssetRequest amountOut;
 
-  @NotNull
   @SerializedName("amount_fee")
+  @Deprecated // ANCHOR-636
   private AmountAssetRequest amountFee;
 
+  @SerializedName("fee_details")
+  private FeeDetails feeDetails;
+
   @SerializedName("amount_expected")
   private AmountRequest amountExpected;
 }

api-schema/src/main/java/org/stellar/anchor/api/rpc/method/NotifyOffchainFundsReceivedRequest.java

@@ -6,6 +6,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
+import org.stellar.anchor.api.shared.FeeDetails;
 
 @Data
 @SuperBuilder
@@ -26,5 +27,9 @@ public class NotifyOffchainFundsReceivedRequest extends RpcMethodParamsRequest {
   private AmountRequest amountOut;
 
   @SerializedName("amount_fee")
+  @Deprecated // ANCHOR-636
   private AmountRequest amountFee;
+
+  @SerializedName("fee_details")
+  private FeeDetails feeDetails;
 }

api-schema/src/main/java/org/stellar/anchor/api/rpc/method/NotifyOnchainFundsReceivedRequest.java

@@ -6,6 +6,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
+import org.stellar.anchor.api.shared.FeeDetails;
 
 @Data
 @SuperBuilder
@@ -24,5 +25,9 @@ public class NotifyOnchainFundsReceivedRequest extends RpcMethodParamsRequest {
   private AmountRequest amountOut;
 
   @SerializedName("amount_fee")
+  @Deprecated // ANCHOR-636
   private AmountRequest amountFee;
+
+  @SerializedName("fee_details")
+  private FeeDetails feeDetails;
 }

api-schema/src/main/java/org/stellar/anchor/api/rpc/method/RequestOffchainFundsRequest.java

@@ -6,6 +6,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
+import org.stellar.anchor.api.shared.FeeDetails;
 import org.stellar.anchor.api.shared.InstructionField;
 
 @Data
@@ -21,8 +22,12 @@ public class RequestOffchainFundsRequest extends RpcMethodParamsRequest {
   private AmountAssetRequest amountOut;
 
   @SerializedName("amount_fee")
+  @Deprecated // ANCHOR-636
   private AmountAssetRequest amountFee;
 
+  @SerializedName("fee_details")
+  private FeeDetails feeDetails;
+
   @SerializedName("amount_expected")
   private AmountRequest amountExpected;
 

api-schema/src/main/java/org/stellar/anchor/api/rpc/method/RequestOnchainFundsRequest.java

@@ -5,6 +5,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
+import org.stellar.anchor.api.shared.FeeDetails;
 
 @Data
 @SuperBuilder
@@ -19,8 +20,12 @@ public class RequestOnchainFundsRequest extends RpcMethodParamsRequest {
   private AmountAssetRequest amountOut;
 
   @SerializedName("amount_fee")
+  @Deprecated // ANCHOR-636
   private AmountAssetRequest amountFee;
 
+  @SerializedName("fee_details")
+  private FeeDetails feeDetails;
+
   @SerializedName("amount_expected")
   private AmountRequest amountExpected;
 

api-schema/src/main/java/org/stellar/anchor/api/sep/sep24/TransactionResponse.java

@@ -3,6 +3,7 @@
 import com.google.gson.annotations.SerializedName;
 import java.time.Instant;
 import lombok.Data;
+import org.stellar.anchor.api.shared.FeeDetails;
 
 /** Base class of transaction responses for withdraw and deposit. */
 @Data
@@ -32,11 +33,16 @@ public class TransactionResponse {
   String amountOutAsset;
 
   @SerializedName("amount_fee")
+  @Deprecated // ANCHOR-636
   String amountFee;
 
   @SerializedName("amount_fee_asset")
+  @Deprecated // ANCHOR-636
   String amountFeeAsset;
 
+  @SerializedName("fee_details")
+  FeeDetails feeDetails;
+
   @SerializedName("started_at")
   Instant startedAt;
 

api-schema/src/main/java/org/stellar/anchor/api/sep/sep38/GetPriceResponse.java

@@ -3,6 +3,7 @@
 import com.google.gson.annotations.SerializedName;
 import lombok.Builder;
 import lombok.Data;
+import org.stellar.anchor.api.shared.FeeDetails;
 
 /**
  * The response body of the GET /price endpoint of SEP-38.
@@ -25,5 +26,5 @@ public class GetPriceResponse {
   @SerializedName("buy_amount")
   String buyAmount;
 
-  RateFee fee;
+  FeeDetails fee;
 }

api-schema/src/main/java/org/stellar/anchor/api/sep/sep38/Sep38QuoteResponse.java

@@ -4,6 +4,7 @@
 import java.time.Instant;
 import lombok.Builder;
 import lombok.Data;
+import org.stellar.anchor.api.shared.FeeDetails;
 
 /**
  * The response body of the POST /quote endpoint of SEP-38.
@@ -37,5 +38,5 @@ public class Sep38QuoteResponse {
   @SerializedName("buy_amount")
   String buyAmount;
 
-  RateFee fee;
+  FeeDetails fee;
 }

api-schema/src/main/java/org/stellar/anchor/api/sep/sep6/Sep6TransactionResponse.java

@@ -5,6 +5,7 @@
 import java.util.Map;
 import lombok.Builder;
 import lombok.Data;
+import org.stellar.anchor.api.shared.FeeDetails;
 import org.stellar.anchor.api.shared.InstructionField;
 import org.stellar.anchor.api.shared.Refunds;
 
@@ -36,11 +37,16 @@ public class Sep6TransactionResponse {
   String amountOutAsset;
 
   @SerializedName("amount_fee")
+  @Deprecated // ANCHOR-636
   String amountFee;
 
   @SerializedName("amount_fee_asset")
+  @Deprecated // ANCHOR-636
   String amountFeeAsset;
 
+  @SerializedName("fee_details")
+  FeeDetails feeDetails;
+
   @SerializedName("quote_id")
   String quoteId;
 

api-schema/src/main/java/org/stellar/anchor/api/sep/sep38/RateFeeDetail.java → api-schema/src/main/java/org/stellar/anchor/api/shared/FeeDescription.java

@@ -1,4 +1,4 @@
-package org.stellar.anchor.api.sep.sep38;
+package org.stellar.anchor.api.shared;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -7,12 +7,12 @@
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class RateFeeDetail {
+public class FeeDescription {
   String name;
   String description;
   String amount;
 
-  public RateFeeDetail(String name, String amount) {
+  public FeeDescription(String name, String amount) {
     this.name = name;
     this.amount = amount;
   }

api-schema/src/main/java/org/stellar/anchor/api/sep/sep38/RateFee.java → api-schema/src/main/java/org/stellar/anchor/api/shared/FeeDetails.java

@@ -1,4 +1,4 @@
-package org.stellar.anchor.api.sep.sep38;
+package org.stellar.anchor.api.shared;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -12,17 +12,17 @@
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class RateFee {
+public class FeeDetails {
   String total;
   String asset;
-  List<RateFeeDetail> details;
+  List<FeeDescription> details;
 
-  public RateFee(String total, String asset) {
+  public FeeDetails(String total, String asset) {
     this.total = total;
     this.asset = asset;
   }
 
-  public void addFeeDetail(RateFeeDetail feeDetail) {
+  public void addFeeDetail(FeeDescription feeDetail) {
     if (feeDetail == null || feeDetail.amount == null) {
       return;
     }

build.gradle.kts

@@ -169,13 +169,14 @@ subprojects {
       exclude(group = "ch.qos.logback", module = "logback-classic")
       exclude(group = "org.apache.logging.log4j", module = "log4j-to-slf4j")
       exclude(group = "org.slf4j", module = "slf4j-log4j12")
-    }
+      exclude(group = "org.slf4j", module ="slf4j-simple")
+     }
   }
 }
 
 allprojects {
   group = "org.stellar.anchor-sdk"
-  version = "2.6.0"
+  version = "2.6.1"
 
   tasks.jar {
     manifest {