Dev -> release 2.7.0 (#1371)

### Description

- TODO: describe what this change does

### Context

- TODO: describe why this change was made

### Testing

- `./gradlew test`
- TODO: replace with any additional test steps

### Documentation

TODO: If this pull request adds a feature, describe changes to
documentation that has been made

- Attach stellar-docs pull request, documenting new feature
- If it's an urgent feature request, please create a ticket and attach
ticket number to this PR

### Known limitations

TODO: describe any limitations or replace with N/A

api-schema/build.gradle.kts

@@ -14,8 +14,4 @@ dependencies {
   annotationProcessor(libs.lombok)
 }
 
-apply(from = "$rootDir/scripts.gradle.kts")
-@Suppress("UNCHECKED_CAST")
-val enableTestConcurrency = extra["enableTestConcurrency"] as (Test) -> Unit
 
-tasks.test { enableTestConcurrency(this) }

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

@@ -60,6 +60,9 @@ public class PlatformTransactionData {
   @SerializedName("completed_at")
   Instant completedAt;
 
+  @SerializedName("user_action_required_by")
+  Instant userActionRequiredBy;
+
   @SerializedName("transfer_received_at")
   Instant transferReceivedAt;
 

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

@@ -2,7 +2,8 @@
 
 public enum TransactionsOrderBy {
   CREATED_AT("started_at"),
-  TRANSFER_RECEIVED_AT("transfer_received_at");
+  TRANSFER_RECEIVED_AT("transfer_received_at"),
+  USER_ACTION_REQUIRED_BY("user_action_required_by");
 
   private final String tableName;
 

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

@@ -1,18 +1,21 @@
 package org.stellar.anchor.api.rpc.method;
 
 import com.google.gson.annotations.SerializedName;
+import java.time.Instant;
 import javax.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
+import org.stellar.anchor.api.rpc.method.features.SupportsUserActionRequiredBy;
 import org.stellar.anchor.api.shared.FeeDetails;
 
 @Data
 @SuperBuilder
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
-public class NotifyInteractiveFlowCompletedRequest extends RpcMethodParamsRequest {
+public class NotifyInteractiveFlowCompletedRequest extends RpcMethodParamsRequest
+    implements SupportsUserActionRequiredBy {
 
   @NotNull
   @SerializedName("amount_in")
@@ -31,4 +34,7 @@ public class NotifyInteractiveFlowCompletedRequest extends RpcMethodParamsReques
 
   @SerializedName("amount_expected")
   private AmountRequest amountExpected;
+
+  @SerializedName("user_action_required_by")
+  Instant userActionRequiredBy;
 }

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

@@ -1,17 +1,23 @@
 package org.stellar.anchor.api.rpc.method;
 
 import com.google.gson.annotations.SerializedName;
+import java.time.Instant;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
+import org.stellar.anchor.api.rpc.method.features.SupportsUserActionRequiredBy;
 
 @Data
 @SuperBuilder
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
-public class NotifyOffchainFundsAvailableRequest extends RpcMethodParamsRequest {
+public class NotifyOffchainFundsAvailableRequest extends RpcMethodParamsRequest
+    implements SupportsUserActionRequiredBy {
 
   @SerializedName("external_transaction_id")
   private String externalTransactionId;
+
+  @SerializedName("user_action_required_by")
+  Instant userActionRequiredBy;
 }

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

@@ -1,17 +1,23 @@
 package org.stellar.anchor.api.rpc.method;
 
 import com.google.gson.annotations.SerializedName;
+import java.time.Instant;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
+import org.stellar.anchor.api.rpc.method.features.SupportsUserActionRequiredBy;
 
 @Data
 @SuperBuilder
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
-public class NotifyOffchainFundsPendingRequest extends RpcMethodParamsRequest {
+public class NotifyOffchainFundsPendingRequest extends RpcMethodParamsRequest
+    implements SupportsUserActionRequiredBy {
 
   @SerializedName("external_transaction_id")
   private String externalTransactionId;
+
+  @SerializedName("user_action_required_by")
+  Instant userActionRequiredBy;
 }

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

@@ -1,21 +1,27 @@
 package org.stellar.anchor.api.rpc.method;
 
 import com.google.gson.annotations.SerializedName;
+import java.time.Instant;
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
+import org.stellar.anchor.api.rpc.method.features.SupportsUserActionRequiredBy;
 
 @Data
 @SuperBuilder
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
-public class RequestCustomerInfoUpdateRequest extends RpcMethodParamsRequest {
+public class RequestCustomerInfoUpdateRequest extends RpcMethodParamsRequest
+    implements SupportsUserActionRequiredBy {
 
   @SerializedName("required_customer_info_message")
   private String requiredCustomerInfoMessage;
 
   @SerializedName("required_customer_info_updates")
   private List<String> requiredCustomerInfoUpdates;
+
+  @SerializedName("user_action_required_by")
+  Instant userActionRequiredBy;
 }

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

@@ -1,19 +1,22 @@
 package org.stellar.anchor.api.rpc.method;
 
 import com.google.gson.annotations.SerializedName;
+import java.time.Instant;
 import java.util.Map;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
+import org.stellar.anchor.api.rpc.method.features.SupportsUserActionRequiredBy;
 import org.stellar.anchor.api.shared.FeeDetails;
 import org.stellar.anchor.api.shared.InstructionField;
 
 @Data
 @SuperBuilder
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
-public class RequestOffchainFundsRequest extends RpcMethodParamsRequest {
+public class RequestOffchainFundsRequest extends RpcMethodParamsRequest
+    implements SupportsUserActionRequiredBy {
 
   @SerializedName("amount_in")
   private AmountAssetRequest amountIn;
@@ -33,4 +36,7 @@ public class RequestOffchainFundsRequest extends RpcMethodParamsRequest {
 
   @SerializedName("instructions")
   Map<String, InstructionField> instructions;
+
+  @SerializedName("user_action_required_by")
+  Instant userActionRequiredBy;
 }

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

@@ -1,17 +1,20 @@
 package org.stellar.anchor.api.rpc.method;
 
 import com.google.gson.annotations.SerializedName;
+import java.time.Instant;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
+import org.stellar.anchor.api.rpc.method.features.SupportsUserActionRequiredBy;
 import org.stellar.anchor.api.shared.FeeDetails;
 
 @Data
 @SuperBuilder
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
-public class RequestOnchainFundsRequest extends RpcMethodParamsRequest {
+public class RequestOnchainFundsRequest extends RpcMethodParamsRequest
+    implements SupportsUserActionRequiredBy {
 
   @SerializedName("amount_in")
   private AmountAssetRequest amountIn;
@@ -36,4 +39,7 @@ public class RequestOnchainFundsRequest extends RpcMethodParamsRequest {
   private String memoType;
 
   private String memo;
+
+  @SerializedName("user_action_required_by")
+  Instant userActionRequiredBy;
 }

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

@@ -1,12 +1,19 @@
 package org.stellar.anchor.api.rpc.method;
 
+import com.google.gson.annotations.SerializedName;
+import java.time.Instant;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
+import org.stellar.anchor.api.rpc.method.features.SupportsUserActionRequiredBy;
 
 @Data
 @SuperBuilder
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
-public class RequestTrustRequest extends RpcMethodParamsRequest {}
+public class RequestTrustRequest extends RpcMethodParamsRequest
+    implements SupportsUserActionRequiredBy {
+  @SerializedName("user_action_required_by")
+  Instant userActionRequiredBy;
+}

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

@@ -0,0 +1,9 @@
+package org.stellar.anchor.api.rpc.method.features;
+
+import java.time.Instant;
+
+public interface SupportsUserActionRequiredBy {
+  Instant getUserActionRequiredBy();
+
+  void setUserActionRequiredBy(Instant userActionRequiredBy);
+}

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

@@ -49,6 +49,9 @@ public class TransactionResponse {
   @SerializedName("completed_at")
   Instant completedAt;
 
+  @SerializedName("user_action_required_by")
+  Instant userActionRequiredBy;
+
   @SerializedName("stellar_transaction_id")
   String stellarTransactionId;
 

api-schema/src/main/java/org/stellar/anchor/api/sep/sep31/Sep31GetTransactionResponse.java

@@ -69,6 +69,9 @@ public static class TransactionResponse {
     @SerializedName("completed_at")
     Instant completedAt;
 
+    @SerializedName("user_action_required_by")
+    Instant userActionRequiredBy;
+
     @SerializedName("stellar_transaction_id")
     String stellarTransactionId;
 

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

@@ -78,6 +78,9 @@ public class Sep6TransactionResponse {
   @SerializedName("completed_at")
   String completedAt;
 
+  @SerializedName("user_action_required_by")
+  String userActionRequiredBy;
+
   @SerializedName("stellar_transaction_id")
   String stellarTransactionId;
 

core/build.gradle.kts

@@ -118,11 +118,4 @@ publishing {
 
   apply<SigningPlugin>()
   configure<SigningExtension> { sign(publishing.publications) }
-}
-
-apply(from = "$rootDir/scripts.gradle.kts")
-
-@Suppress("UNCHECKED_CAST")
-val enableTestConcurrency = extra["enableTestConcurrency"] as (Test) -> Unit
-
-tasks.test { enableTestConcurrency(this) }
+}

core/src/main/java/org/stellar/anchor/SepTransaction.java

@@ -53,6 +53,15 @@ public interface SepTransaction {
   Instant getCompletedAt();
 
   void setCompletedAt(Instant completedAt);
+
+  /**
+   * The date and time user action is required by. See SEP protocols for more details.
+   *
+   * @return date and time of user action required by.
+   */
+  Instant getUserActionRequiredBy();
+
+  void setUserActionRequiredBy(Instant requiredBy);
   /**
    * <code>transaction_id</code> on Stellar network of the transfer that either completed the
    * deposit or started the withdrawal.

core/src/main/java/org/stellar/anchor/config/Sep24Config.java

@@ -11,6 +11,8 @@ public interface Sep24Config {
 
   DepositInfoGeneratorType getDepositInfoGeneratorType();
 
+  Long getInitialUserDeadlineSeconds();
+
   @Getter
   @Setter
   class Features {

core/src/main/java/org/stellar/anchor/config/Sep6Config.java

@@ -5,6 +5,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.jetbrains.annotations.Nullable;
 
 public interface Sep6Config {
   boolean isEnabled();
@@ -13,6 +14,9 @@ public interface Sep6Config {
 
   DepositInfoGeneratorType getDepositInfoGeneratorType();
 
+  @Nullable
+  Long getInitialUserDeadlineSeconds();
+
   @Getter
   @Setter
   @AllArgsConstructor

core/src/main/java/org/stellar/anchor/sep24/Sep24Helper.java

@@ -25,6 +25,8 @@ static void setSharedTransactionResponseFields(TransactionResponse txnR, Sep24Tr
     if (txn.getToAccount() != null) txnR.setTo(txn.getToAccount());
     if (txn.getStartedAt() != null) txnR.setStartedAt(txn.getStartedAt());
     if (txn.getCompletedAt() != null) txnR.setCompletedAt(txn.getCompletedAt());
+    if (txn.getUserActionRequiredBy() != null)
+      txnR.setUserActionRequiredBy(txn.getUserActionRequiredBy());
   }
 
   static TransactionResponse updateRefundInfo(

core/src/main/java/org/stellar/anchor/sep24/Sep24Service.java

@@ -204,6 +204,10 @@ public InteractiveTransactionResponse withdraw(
             .assetCode(assetCode)
             .assetIssuer(asset.getIssuer())
             .startedAt(Instant.now())
+            .userActionRequiredBy(
+                sep24Config.getInitialUserDeadlineSeconds() == null
+                    ? null
+                    : Instant.now().plusSeconds(sep24Config.getInitialUserDeadlineSeconds()))
             .sep10Account(token.getAccount())
             .sep10AccountMemo(token.getAccountMemo())
             .fromAccount(sourceAccount)
@@ -397,6 +401,10 @@ public InteractiveTransactionResponse deposit(Sep10Jwt token, Map<String, String
             .assetCode(assetCode)
             .assetIssuer(depositRequest.get("asset_issuer"))
             .startedAt(Instant.now())
+            .userActionRequiredBy(
+                sep24Config.getInitialUserDeadlineSeconds() == null
+                    ? null
+                    : Instant.now().plusSeconds(sep24Config.getInitialUserDeadlineSeconds()))
             .sep10Account(token.getAccount())
             .sep10AccountMemo(token.getAccountMemo())
             .toAccount(destinationAccount)

core/src/main/java/org/stellar/anchor/sep24/Sep24TransactionBuilder.java

@@ -41,6 +41,11 @@ public Sep24TransactionBuilder startedAt(Instant time) {
     return this;
   }
 
+  public Sep24TransactionBuilder userActionRequiredBy(Instant time) {
+    txn.setUserActionRequiredBy(time);
+    return this;
+  }
+
   public Sep24TransactionBuilder completedAt(Instant time) {
     txn.setCompletedAt(time);
     return this;

core/src/main/java/org/stellar/anchor/sep31/Sep31Transaction.java

@@ -151,6 +151,7 @@ default Sep31GetTransactionResponse toSep31GetTransactionResponse() {
                 .stellarMemoType(getStellarMemoType())
                 .startedAt(getStartedAt())
                 .completedAt(getCompletedAt())
+                .userActionRequiredBy(getUserActionRequiredBy())
                 .stellarTransactionId(getStellarTransactionId())
                 .externalTransactionId(getExternalTransactionId())
                 .refunded(getRefunded())