Merge release/2.8.2 into main (#1417)

### Description

Merge `release/2.8.2` into `main`

### Context

N/A

### Testing

- `./gradlew test`

### Documentation

N/A

### Known limitations

N/A

.github/workflows/sub_essential_tests.yml

@@ -48,7 +48,7 @@ jobs:
 
 
       - name: Pull Stellar Validation Tests Docker Image
-        run: docker pull stellar/anchor-tests:v0.6.10 &
+        run: docker pull stellar/anchor-tests:latest &
 
       - name: Run Kafka, Postgres, and Sep24 UI with docker-compose
         env:
@@ -104,7 +104,7 @@ jobs:
 
       - name: Run Stellar validation tool
         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
+          docker run --network host -v /home/runner/java-stellar-anchor-sdk/platform/src/test/resources://config stellar/anchor-tests:latest --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
         if: always()

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

@@ -67,6 +67,9 @@ public class PutCustomerRequest {
   @SerializedName("birth_country_code")
   String birthCountryCode;
 
+  @SerializedName("bank_name")
+  String bankName;
+
   @SerializedName("bank_account_number")
   String bankAccountNumber;
 
@@ -82,6 +85,9 @@ public class PutCustomerRequest {
   @SerializedName("bank_branch_number")
   String bankBranchNumber;
 
+  @SerializedName("external_transfer_memo")
+  String externalTransferMemo;
+
   @SerializedName("clabe_number")
   String clabeNumber;
 
@@ -91,9 +97,16 @@ public class PutCustomerRequest {
   @SerializedName("cbu_alias")
   String cbuAlias;
 
+  @SerializedName("mobile_money_number")
+  String mobileMoneyNumber;
+
+  @SerializedName("mobile_money_provider")
+  String mobileMoneyProvider;
+
   @SerializedName("crypto_address")
   String cryptoAddress;
 
+  @Deprecated
   @SerializedName("crypto_memo")
   String cryptoMemo;
 

api-schema/src/main/java/org/stellar/anchor/api/sep/sep12/Sep12PutCustomerRequest.java

@@ -63,6 +63,9 @@ public class Sep12PutCustomerRequest implements Sep12CustomerRequestBase {
   @SerializedName("birth_country_code")
   String birthCountryCode;
 
+  @SerializedName("bank_name")
+  String bankName;
+
   @SerializedName("bank_account_number")
   String bankAccountNumber;
 
@@ -78,6 +81,9 @@ public class Sep12PutCustomerRequest implements Sep12CustomerRequestBase {
   @SerializedName("bank_branch_number")
   String bankBranchNumber;
 
+  @SerializedName("external_transfer_memo")
+  String externalTransferMemo;
+
   @SerializedName("clabe_number")
   String clabeNumber;
 
@@ -87,9 +93,16 @@ public class Sep12PutCustomerRequest implements Sep12CustomerRequestBase {
   @SerializedName("cbu_alias")
   String cbuAlias;
 
+  @SerializedName("mobile_money_number")
+  String mobileMoneyNumber;
+
+  @SerializedName("mobile_money_provider")
+  String mobileMoneyProvider;
+
   @SerializedName("crypto_address")
   String cryptoAddress;
 
+  @Deprecated
   @SerializedName("crypto_memo")
   String cryptoMemo;
 

build.gradle.kts

@@ -161,7 +161,7 @@ subprojects {
 
 allprojects {
   group = "org.stellar.anchor-sdk"
-  version = "2.8.1"
+  version = "2.8.2"
 
   tasks.jar {
     manifest {

core/src/test/kotlin/org/stellar/anchor/sep12/Sep12ServiceTest.kt

@@ -276,6 +276,10 @@ class Sep12ServiceTest {
         .idIssueDate("2023-12-13")
         .idExpirationDate("2023-12-13T19:33:07Z")
         .emailAddressVerification("12345678")
+        .bankName("Bank of America")
+        .mobileMoneyNumber("12345678")
+        .mobileMoneyProvider("M-PESA")
+        .externalTransferMemo("memo")
         .build()
     val jwtToken = createJwtToken(TEST_ACCOUNT)
     assertDoesNotThrow { sep12Service.putCustomer(jwtToken, mockPutRequest) }
@@ -292,6 +296,10 @@ class Sep12ServiceTest {
         .idIssueDate("2023-12-13")
         .idExpirationDate("2023-12-13T19:33:07Z")
         .emailAddressVerification("12345678")
+        .bankName("Bank of America")
+        .mobileMoneyNumber("12345678")
+        .mobileMoneyProvider("M-PESA")
+        .externalTransferMemo("memo")
         .build()
     assertEquals(wantCallbackApiPutRequest, callbackApiPutRequestSlot.captured)
 

docs/README.md

@@ -1,6 +1,6 @@
 [![License](https://badgen.net/badge/license/Apache%202/blue?icon=github&label=License)](https://github.com/stellar/java-stellar-anchor-sdk/blob/develop/LICENSE)
 [![GitHub Version](https://badgen.net/github/release/stellar/java-stellar-anchor-sdk?icon=github&label=Latest%20release)](https://github.com/stellar/java-stellar-anchor-sdk/releases)
-[![Docker](https://badgen.net/badge/Latest%20Release/v2.8.1/blue?icon=docker)](https://hub.docker.com/r/stellar/anchor-platform/tags?page=1&name=2.8.1)
+[![Docker](https://badgen.net/badge/Latest%20Release/v2.8.2/blue?icon=docker)](https://hub.docker.com/r/stellar/anchor-platform/tags?page=1&name=2.8.2)
 ![Develop Branch](https://github.com/stellar/java-stellar-anchor-sdk/actions/workflows/on_push_to_develop.yml/badge.svg?branch=develop)
 
 <div style="text-align: center">

kotlin-reference-server/src/main/kotlin/org/stellar/reference/callbacks/customer/CustomerService.kt

@@ -100,14 +100,18 @@ class CustomerService(
           birthDate = request.birthDate ?: customer.birthDate,
           birthPlace = request.birthPlace ?: customer.birthPlace,
           birthCountryCode = request.birthCountryCode ?: customer.birthCountryCode,
+          bankName = request.bankName ?: customer.bankName,
           bankAccountNumber = request.bankAccountNumber ?: customer.bankAccountNumber,
           bankAccountType = request.bankAccountType ?: customer.bankAccountType,
           bankNumber = request.bankNumber ?: customer.bankNumber,
           bankPhoneNumber = request.bankPhoneNumber ?: customer.bankPhoneNumber,
           bankBranchNumber = request.bankBranchNumber ?: customer.bankBranchNumber,
+          externalTransferMemo = request.externalTransferMemo ?: customer.externalTransferMemo,
           clabeNumber = request.clabeNumber ?: customer.clabeNumber,
           cbuNumber = request.cbuNumber ?: customer.cbuNumber,
           cbuAlias = request.cbuAlias ?: customer.cbuAlias,
+          mobileMoneyNumber = request.mobileMoneyNumber ?: customer.mobileMoneyNumber,
+          mobileMoneyProvider = request.mobileMoneyProvider ?: customer.mobileMoneyProvider,
           cryptoAddress = request.cryptoAddress ?: customer.cryptoAddress,
           cryptoMemo = request.cryptoMemo ?: customer.cryptoMemo,
           taxId = request.taxId ?: customer.taxId,
@@ -155,14 +159,18 @@ class CustomerService(
           birthDate = request.birthDate,
           birthPlace = request.birthPlace,
           birthCountryCode = request.birthCountryCode,
+          bankName = request.bankName,
           bankAccountNumber = request.bankAccountNumber,
           bankAccountType = request.bankAccountType,
           bankNumber = request.bankNumber,
           bankPhoneNumber = request.bankPhoneNumber,
           bankBranchNumber = request.bankBranchNumber,
+          externalTransferMemo = request.externalTransferMemo,
           clabeNumber = request.clabeNumber,
           cbuNumber = request.cbuNumber,
           cbuAlias = request.cbuAlias,
+          mobileMoneyNumber = request.mobileMoneyNumber,
+          mobileMoneyProvider = request.mobileMoneyProvider,
           cryptoAddress = request.cryptoAddress,
           cryptoMemo = request.cryptoMemo,
           taxId = request.taxId,
@@ -295,6 +303,13 @@ class CustomerService(
             "The customer's birth country code",
             optional = !requiredFields.contains("birth_country_code"),
           ),
+        "bank_name" to
+          createField(
+            customer.bankName,
+            "string",
+            "The customer's bank name",
+            optional = !requiredFields.contains("bank_name"),
+          ),
         "bank_account_number" to
           createField(
             customer.bankAccountNumber,
@@ -331,6 +346,13 @@ class CustomerService(
             "The customer's bank branch number",
             optional = !requiredFields.contains("bank_branch_number"),
           ),
+        "external_transfer_memo" to
+          createField(
+            customer.externalTransferMemo,
+            "string",
+            "The external transfer memo",
+            optional = !requiredFields.contains("external_transfer_memo"),
+          ),
         "clabe_number" to
           createField(
             customer.clabeNumber,
@@ -352,6 +374,20 @@ class CustomerService(
             "The customer's CBU alias",
             optional = !requiredFields.contains("cbu_alias"),
           ),
+        "mobile_money_number" to
+          createField(
+            customer.mobileMoneyNumber,
+            "string",
+            "The customer's mobile money number",
+            optional = !requiredFields.contains("mobile_money_number"),
+          ),
+        "mobile_money_provider" to
+          createField(
+            customer.mobileMoneyProvider,
+            "string",
+            "The customer's mobile money provider",
+            optional = !requiredFields.contains("mobile_money_provider"),
+          ),
         "crypto_address" to
           createField(
             customer.cryptoAddress,

kotlin-reference-server/src/main/kotlin/org/stellar/reference/dao/CustomerRepository.kt

@@ -45,14 +45,18 @@ class JdbcCustomerRepository(private val db: Database) : CustomerRepository {
               birthDate = it[Customers.birthDate],
               birthPlace = it[Customers.birthPlace],
               birthCountryCode = it[Customers.birthCountryCode],
+              bankName = it[Customers.bankName],
               bankAccountNumber = it[Customers.bankAccountNumber],
               bankAccountType = it[Customers.bankAccountType],
               bankNumber = it[Customers.bankNumber],
               bankPhoneNumber = it[Customers.bankPhoneNumber],
               bankBranchNumber = it[Customers.bankBranchNumber],
+              externalTransferMemo = it[Customers.externalTransferMemo],
               clabeNumber = it[Customers.clabeNumber],
               cbuNumber = it[Customers.cbuNumber],
               cbuAlias = it[Customers.cbuAlias],
+              mobileMoneyNumber = it[Customers.mobileMoneyNumber],
+              mobileMoneyProvider = it[Customers.mobileMoneyProvider],
               cryptoAddress = it[Customers.cryptoAddress],
               cryptoMemo = it[Customers.cryptoMemo],
               taxId = it[Customers.taxId],
@@ -115,14 +119,18 @@ class JdbcCustomerRepository(private val db: Database) : CustomerRepository {
               birthDate = it[Customers.birthDate],
               birthPlace = it[Customers.birthPlace],
               birthCountryCode = it[Customers.birthCountryCode],
+              bankName = it[Customers.bankName],
               bankAccountNumber = it[Customers.bankAccountNumber],
               bankAccountType = it[Customers.bankAccountType],
               bankNumber = it[Customers.bankNumber],
               bankPhoneNumber = it[Customers.bankPhoneNumber],
               bankBranchNumber = it[Customers.bankBranchNumber],
+              externalTransferMemo = it[Customers.externalTransferMemo],
               clabeNumber = it[Customers.clabeNumber],
               cbuNumber = it[Customers.cbuNumber],
               cbuAlias = it[Customers.cbuAlias],
+              mobileMoneyNumber = it[Customers.mobileMoneyNumber],
+              mobileMoneyProvider = it[Customers.mobileMoneyProvider],
               cryptoAddress = it[Customers.cryptoAddress],
               cryptoMemo = it[Customers.cryptoMemo],
               taxId = it[Customers.taxId],
@@ -171,14 +179,18 @@ class JdbcCustomerRepository(private val db: Database) : CustomerRepository {
           it[birthDate] = customer.birthDate
           it[birthPlace] = customer.birthPlace
           it[birthCountryCode] = customer.birthCountryCode
+          it[bankName] = customer.bankName
           it[bankAccountNumber] = customer.bankAccountNumber
           it[bankAccountType] = customer.bankAccountType
           it[bankNumber] = customer.bankNumber
           it[bankPhoneNumber] = customer.bankPhoneNumber
-          it[bankAccountNumber] = customer.bankAccountNumber
+          it[bankBranchNumber] = customer.bankBranchNumber
+          it[externalTransferMemo] = customer.externalTransferMemo
           it[clabeNumber] = customer.clabeNumber
           it[cbuNumber] = customer.cbuNumber
           it[cbuAlias] = customer.cbuAlias
+          it[mobileMoneyNumber] = customer.mobileMoneyNumber
+          it[mobileMoneyProvider] = customer.mobileMoneyProvider
           it[cryptoAddress] = customer.cryptoAddress
           it[cryptoMemo] = customer.cryptoMemo
           it[taxId] = customer.taxId
@@ -225,14 +237,18 @@ class JdbcCustomerRepository(private val db: Database) : CustomerRepository {
         it[birthDate] = customer.birthDate
         it[birthPlace] = customer.birthPlace
         it[birthCountryCode] = customer.birthCountryCode
+        it[bankName] = customer.bankName
         it[bankAccountNumber] = customer.bankAccountNumber
         it[bankAccountType] = customer.bankAccountType
         it[bankNumber] = customer.bankNumber
         it[bankPhoneNumber] = customer.bankPhoneNumber
         it[bankBranchNumber] = customer.bankBranchNumber
+        it[externalTransferMemo] = customer.externalTransferMemo
         it[clabeNumber] = customer.clabeNumber
         it[cbuNumber] = customer.cbuNumber
         it[cbuAlias] = customer.cbuAlias
+        it[mobileMoneyNumber] = customer.mobileMoneyNumber
+        it[mobileMoneyProvider] = customer.mobileMoneyProvider
         it[cryptoAddress] = customer.cryptoAddress
         it[cryptoMemo] = customer.cryptoMemo
         it[taxId] = customer.taxId

kotlin-reference-server/src/main/kotlin/org/stellar/reference/dao/Customers.kt

@@ -21,14 +21,18 @@ object Customers : Table() {
   val birthDate = varchar("birth_date", 255).nullable()
   val birthPlace = varchar("birth_place", 255).nullable()
   val birthCountryCode = varchar("birth_country_code", 255).nullable()
+  val bankName = varchar("bank_name", 255).nullable()
   val bankAccountNumber = varchar("bank_account_number", 255).nullable()
   val bankAccountType = varchar("bank_account_type", 255).nullable()
   val bankNumber = varchar("bank_number", 255).nullable()
   val bankPhoneNumber = varchar("bank_phone_number", 255).nullable()
   val bankBranchNumber = varchar("bank_branch_number", 255).nullable()
+  val externalTransferMemo = varchar("external_transfer_memo", 255).nullable()
   val clabeNumber = varchar("clabe_number", 255).nullable()
   val cbuNumber = varchar("cbu_number", 255).nullable()
   val cbuAlias = varchar("cbu_alias", 255).nullable()
+  val mobileMoneyNumber = varchar("mobile_money_number", 255).nullable()
+  val mobileMoneyProvider = varchar("mobile_money_provider", 255).nullable()
   val cryptoAddress = varchar("crypto_address", 255).nullable()
   val cryptoMemo = varchar("crypto_memo", 255).nullable()
   val taxId = varchar("tax_id", 255).nullable()

kotlin-reference-server/src/main/kotlin/org/stellar/reference/model/Customer.kt

@@ -22,14 +22,18 @@ data class Customer(
   @SerialName("birth_date") val birthDate: String? = null,
   @SerialName("birth_place") val birthPlace: String? = null,
   @SerialName("birth_country_code") val birthCountryCode: String? = null,
+  @SerialName("bank_name") val bankName: String? = null,
   @SerialName("bank_account_number") val bankAccountNumber: String? = null,
   @SerialName("bank_account_type") val bankAccountType: String? = null,
   @SerialName("bank_number") val bankNumber: String? = null,
   @SerialName("bank_phone_number") val bankPhoneNumber: String? = null,
   @SerialName("bank_branch_number") val bankBranchNumber: String? = null,
+  @SerialName("external_transfer_memo") val externalTransferMemo: String? = null,
   @SerialName("clabe_number") val clabeNumber: String? = null,
   @SerialName("cbu_number") val cbuNumber: String? = null,
   @SerialName("cbu_alias") val cbuAlias: String? = null,
+  @SerialName("mobileMoneyNumber") val mobileMoneyNumber: String? = null,
+  @SerialName("mobileMoneyProvider") val mobileMoneyProvider: String? = null,
   @SerialName("crypto_address") val cryptoAddress: String? = null,
   @SerialName("crypto_memo") val cryptoMemo: String? = null,
   @SerialName("tax_id") val taxId: String? = null,

service-runner/build.gradle.kts

@@ -97,7 +97,7 @@ val dockerPullAnchorTest by
     tasks.register<DockerPullImage>("pullDockerImage") {
       println("Pulling the docker image.")
       group = "docker"
-      image.set("stellar/anchor-tests:v0.6.10")
+      image.set("stellar/anchor-tests:latest")
     }
 
 val dockerCreateAnchorTest by

service-runner/src/main/resources/version-info.properties

@@ -1 +1 @@
-version=2.8.1
+version=2.8.2