Bump version 2.8.0 (#1394)

### Description Bumps the version numbers to 2.8.0. ### Context 2.8.0 release ### Testing - `./gradlew test`
stellar · Jun 18, 2024 · 16b76be · 16b76be
2 parents c333bd0 + 535aeec
commit 16b76be
Show file tree

Hide file tree

Showing 122 changed files with 1,628 additions and 218 deletions.
diff --git a/.github/workflows/sub_essential_tests.yml b/.github/workflows/sub_essential_tests.yml
@@ -10,14 +10,14 @@ jobs:
     runs-on: ubuntu-latest-8-cores
     steps:
       #############################################
-      # Setup JDK 11
+      # Setup JDK 17
       # Download, and Extract java-stellar-anchor-sdk.tar
       # Setup hostnames (/etc/hosts)
       #############################################
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Download java-stellar-anchor-sdk.tar
@@ -106,7 +106,7 @@ jobs:
         run: |
           docker run --network host -v /home/runner/java-stellar-anchor-sdk/platform/src/test/resources://config stellar/anchor-tests:v0.6.10 --home-domain http://host.docker.internal:8080 --seps 1 6 10 12 24 31 38 --sep-config //config/stellar-anchor-tests-sep-config.json --verbose
 
-      - name: Upload Essential Tests Report
+      - name: Upload Essential Tests report
         if: always()
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/sub_extended_tests.yml b/.github/workflows/sub_extended_tests.yml
@@ -10,14 +10,14 @@ jobs:
     runs-on: ubuntu-latest-16-cores
     steps:
       #############################################
-      # Setup JDK 11
+      # Setup JDK 17
       # Download, and Extract java-stellar-anchor-sdk.tar
       # Setup hostnames (/etc/hosts)
       #############################################
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Download java-stellar-anchor-sdk.tar

diff --git a/.github/workflows/sub_gradle_build.yml b/.github/workflows/sub_gradle_build.yml
@@ -18,10 +18,10 @@ jobs:
         with:
           show-progress: false
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Gradle Build with unit tests only

diff --git a/.github/workflows/sub_jacoco_report.yml b/.github/workflows/sub_jacoco_report.yml
@@ -16,14 +16,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       #############################################
-      # Setup JDK 11
+      # Setup JDK 17
       # Download, and Extract java-stellar-anchor-sdk.tar
       # Setup hostnames (/etc/hosts)
       #############################################
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Download java-stellar-anchor-sdk.tar

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=gradle:7.6.4-jdk11-alpine
+ARG BASE_IMAGE=gradle:7.6.4-jdk17-alpine
 
 FROM ${BASE_IMAGE} AS build
 WORKDIR /code
@@ -9,7 +9,7 @@ RUN gradle clean bootJar --stacktrace -x test
 FROM ubuntu:22.04
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends openjdk-11-jre
+    apt-get install -y --no-install-recommends openjdk-17-jre
 
 COPY --from=build /code/service-runner/build/libs/anchor-platform-runner*.jar /app/anchor-platform-runner.jar
 COPY --from=build /code/scripts/docker-start.sh /app/start.sh

diff --git a/api-schema/src/main/java/org/stellar/anchor/api/callback/GetCustomerRequest.java b/api-schema/src/main/java/org/stellar/anchor/api/callback/GetCustomerRequest.java
@@ -20,6 +20,9 @@ public class GetCustomerRequest {
   String account;
   String memo;
 
+  @SerializedName("transaction_id")
+  String transactionId;
+
   @SerializedName("memo_type")
   String memoType;
 

diff --git a/api-schema/src/main/java/org/stellar/anchor/api/callback/PutCustomerRequest.java b/api-schema/src/main/java/org/stellar/anchor/api/callback/PutCustomerRequest.java
@@ -22,6 +22,9 @@ public class PutCustomerRequest {
   String account;
   String memo;
 
+  @SerializedName("transaction_id")
+  String transactionId;
+
   @SerializedName("memo_type")
   String memoType;
 

diff --git a/api-schema/src/main/java/org/stellar/anchor/api/platform/PlatformTransactionData.java b/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;
 
@@ -108,9 +111,11 @@ public class PlatformTransactionData {
   @SerializedName("required_info_updates")
   List<String> requiredInfoUpdates;
 
+  @Deprecated
   @SerializedName("required_customer_info_message")
   String requiredCustomerInfoMessage;
 
+  @Deprecated
   @SerializedName("required_customer_info_updates")
   List<String> requiredCustomerInfoUpdates;
 

diff --git a/api-schema/src/main/java/org/stellar/anchor/api/platform/TransactionsOrderBy.java b/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;
 

diff --git a/...rc/main/java/org/stellar/anchor/api/rpc/method/NotifyInteractiveFlowCompletedRequest.java b/...rc/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;
 }
diff --git a/.../src/main/java/org/stellar/anchor/api/rpc/method/NotifyOffchainFundsAvailableRequest.java b/.../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;
 }
diff --git a/...ma/src/main/java/org/stellar/anchor/api/rpc/method/NotifyOffchainFundsPendingRequest.java b/...ma/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;
 }
diff --git a/...chema/src/main/java/org/stellar/anchor/api/rpc/method/NotifyTransactionOnHoldRequest.java b/...chema/src/main/java/org/stellar/anchor/api/rpc/method/NotifyTransactionOnHoldRequest.java
@@ -0,0 +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 NotifyTransactionOnHoldRequest extends RpcMethodParamsRequest
+    implements SupportsUserActionRequiredBy {
+  @SerializedName("user_action_required_by")
+  Instant userActionRequiredBy;
+}
diff --git a/...ema/src/main/java/org/stellar/anchor/api/rpc/method/RequestCustomerInfoUpdateRequest.java b/...ema/src/main/java/org/stellar/anchor/api/rpc/method/RequestCustomerInfoUpdateRequest.java
@@ -1,21 +1,29 @@
 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 {
 
+  @Deprecated
   @SerializedName("required_customer_info_message")
   private String requiredCustomerInfoMessage;
 
+  @Deprecated
   @SerializedName("required_customer_info_updates")
   private List<String> requiredCustomerInfoUpdates;
+
+  @SerializedName("user_action_required_by")
+  Instant userActionRequiredBy;
 }
diff --git a/api-schema/src/main/java/org/stellar/anchor/api/rpc/method/RequestOffchainFundsRequest.java b/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;
 }
diff --git a/api-schema/src/main/java/org/stellar/anchor/api/rpc/method/RequestOnchainFundsRequest.java b/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;
 }
diff --git a/api-schema/src/main/java/org/stellar/anchor/api/rpc/method/RequestTrustRequest.java b/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;
+}
diff --git a/api-schema/src/main/java/org/stellar/anchor/api/rpc/method/RpcMethod.java b/api-schema/src/main/java/org/stellar/anchor/api/rpc/method/RpcMethod.java
@@ -66,7 +66,10 @@ public enum RpcMethod {
   NOTIFY_AMOUNTS_UPDATED("notify_amounts_updated"),
 
   @SerializedName("notify_transaction_recovery")
-  NOTIFY_TRANSACTION_RECOVERY("notify_transaction_recovery");
+  NOTIFY_TRANSACTION_RECOVERY("notify_transaction_recovery"),
+
+  @SerializedName("notify_transaction_on_hold")
+  NOTIFY_TRANSACTION_ON_HOLD("notify_transaction_on_hold");
 
   private final String method;
 

diff --git a/...rc/main/java/org/stellar/anchor/api/rpc/method/features/SupportsUserActionRequiredBy.java b/...rc/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);
+}
diff --git a/api-schema/src/main/java/org/stellar/anchor/api/sep/SepTransactionStatus.java b/api-schema/src/main/java/org/stellar/anchor/api/sep/SepTransactionStatus.java
@@ -50,7 +50,11 @@ public enum SepTransactionStatus {
   @SerializedName("pending_external")
   PENDING_EXTERNAL("pending_external", "waiting on an external entity"),
   @SerializedName("pending_stellar")
-  PENDING_STELLAR("pending_stellar", "stellar is executing the transaction");
+  PENDING_STELLAR("pending_stellar", "stellar is executing the transaction"),
+  @SerializedName("on_hold")
+  ON_HOLD(
+      "on_hold",
+      "deposit/withdrawal is currently on hold for additional checks after receiving user's funds");
 
   private final String status;
   private final String description;