[ANCHOR-555] Add client_domain and client_name to Platform transactions

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

@@ -89,6 +89,12 @@ public class PlatformTransactionData {
   @SerializedName("withdraw_anchor_account")
   String withdrawAnchorAccount;
 
+  @SerializedName("client_domain")
+  String clientDomain;
+
+  @SerializedName("client_name")
+  String clientName;
+
   Customers customers;
   StellarId creator;
 

core/src/main/java/org/stellar/anchor/client/ClientFinder.java

@@ -9,14 +9,14 @@
 import org.stellar.anchor.config.ClientsConfig.ClientConfig;
 import org.stellar.anchor.config.Sep10Config;
 
-/** Finds the client ID for a SEP-10 JWT. */
+/** Finds the client name for a SEP-10 JWT. */
 @RequiredArgsConstructor
 public class ClientFinder {
   @NonNull private final Sep10Config sep10Config;
   @NonNull private final ClientsConfig clientsConfig;
 
   /**
-   * Returns the client ID for a SEP-10 JWT. If the client attribution is not required, the client
+   * Returns the client name for a SEP-10 JWT. If the client attribution is not required, the client
    * ID is returned if the client is found. If the client attribution is required, the client ID is
    * returned if the client is found and the client domain and name are allowed.
    *
@@ -25,7 +25,7 @@ public class ClientFinder {
    * @throws BadRequestException if the client is not found or the client domain or name is not
    */
   @Nullable
-  public String getClientId(Sep10Jwt token) throws BadRequestException {
+  public String getClientName(Sep10Jwt token) throws BadRequestException {
     ClientsConfig.ClientConfig client = getClient(token);
 
     // If client attribution is not required, return the client name

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

@@ -41,6 +41,7 @@
 import org.stellar.anchor.asset.AssetService;
 import org.stellar.anchor.auth.JwtService;
 import org.stellar.anchor.auth.Sep10Jwt;
+import org.stellar.anchor.client.ClientFinder;
 import org.stellar.anchor.config.AppConfig;
 import org.stellar.anchor.config.ClientsConfig;
 import org.stellar.anchor.config.CustodyConfig;
@@ -62,6 +63,7 @@ public class Sep24Service {
   final ClientsConfig clientsConfig;
   final AssetService assetService;
   final JwtService jwtService;
+  final ClientFinder clientFinder;
   final Sep24TransactionStore txnStore;
   final EventService.Session eventSession;
   final InteractiveUrlConstructor interactiveUrlConstructor;
@@ -93,6 +95,7 @@ public Sep24Service(
       ClientsConfig clientsConfig,
       AssetService assetService,
       JwtService jwtService,
+      ClientFinder clientFinder,
       Sep24TransactionStore txnStore,
       EventService eventService,
       InteractiveUrlConstructor interactiveUrlConstructor,
@@ -106,6 +109,7 @@ public Sep24Service(
     this.clientsConfig = clientsConfig;
     this.assetService = assetService;
     this.jwtService = jwtService;
+    this.clientFinder = clientFinder;
     this.txnStore = txnStore;
     this.eventSession = eventService.createSession(this.getClass().getName(), TRANSACTION);
     this.interactiveUrlConstructor = interactiveUrlConstructor;
@@ -209,7 +213,8 @@ public InteractiveTransactionResponse withdraw(
             .sep10AccountMemo(token.getAccountMemo())
             .fromAccount(sourceAccount)
             .toAccount(asset.getDistributionAccount())
-            .clientDomain(token.getClientDomain());
+            .clientDomain(token.getClientDomain())
+            .clientName(clientFinder.getClientName(token));
 
     if (!isEmpty(asset.getDistributionAccount())) {
       builder.withdrawAnchorAccount(asset.getDistributionAccount());
@@ -397,6 +402,7 @@ public InteractiveTransactionResponse deposit(Sep10Jwt token, Map<String, String
             .sep10AccountMemo(token.getAccountMemo())
             .toAccount(destinationAccount)
             .clientDomain(token.getClientDomain())
+            .clientName(clientFinder.getClientName(token))
             .claimableBalanceSupported(claimableSupported);
 
     if (memo != null) {

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

@@ -141,6 +141,15 @@ public interface Sep24Transaction extends SepTransaction {
 
   void setClientDomain(String domainClient);
 
+  /**
+   * The name of the client that initiated the transaction.
+   *
+   * @return the client name.
+   */
+  String getClientName();
+
+  void setClientName(String nameClient);
+
   /**
    * True if the client supports receiving deposit transactions as a claimable balance, false
    * otherwise.

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

@@ -85,6 +85,11 @@ public Sep24TransactionBuilder clientDomain(String domainClient) {
     return this;
   }
 
+  public Sep24TransactionBuilder clientName(String clientName) {
+    txn.setClientName(clientName);
+    return this;
+  }
+
   public Sep24TransactionBuilder claimableBalanceSupported(Boolean claimableBalanceSupported) {
     txn.setClaimableBalanceSupported(claimableBalanceSupported);
     return this;

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

@@ -204,6 +204,7 @@ public Sep31PostTransactionResponse postTransaction(
             .requiredInfoMessage(null)
             .quoteId(request.getQuoteId())
             .clientDomain(sep10Jwt.getClientDomain())
+            .clientName(getClientName())
             .requiredInfoUpdates(null)
             .fields(request.getFields().getTransaction())
             .refunded(null)

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

@@ -92,6 +92,10 @@ public interface Sep31Transaction extends SepTransaction {
 
   void setClientDomain(String clientDomain);
 
+  String getClientName();
+
+  void setClientName(String clientName);
+
   void setSenderId(String sourceId);
 
   String getSenderId();

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

@@ -149,6 +149,11 @@ public Sep31TransactionBuilder clientDomain(String clientDomain) {
     return this;
   }
 
+  public Sep31TransactionBuilder clientName(String clientName) {
+    txn.setClientName(clientName);
+    return this;
+  }
+
   public Sep31TransactionBuilder senderId(String senderId) {
     txn.setSenderId(senderId);
     return this;

core/src/main/java/org/stellar/anchor/sep6/Sep6Service.java

@@ -14,6 +14,7 @@
 import org.stellar.anchor.api.sep.sep6.InfoResponse.*;
 import org.stellar.anchor.asset.AssetService;
 import org.stellar.anchor.auth.Sep10Jwt;
+import org.stellar.anchor.client.ClientFinder;
 import org.stellar.anchor.config.Sep6Config;
 import org.stellar.anchor.event.EventService;
 import org.stellar.anchor.sep6.ExchangeAmountsCalculator.Amounts;
@@ -25,6 +26,8 @@ public class Sep6Service {
   private final Sep6Config sep6Config;
   private final AssetService assetService;
   private final RequestValidator requestValidator;
+
+  private final ClientFinder clientFinder;
   private final Sep6TransactionStore txnStore;
   private final ExchangeAmountsCalculator exchangeAmountsCalculator;
   private final EventService.Session eventSession;
@@ -35,12 +38,14 @@ public Sep6Service(
       Sep6Config sep6Config,
       AssetService assetService,
       RequestValidator requestValidator,
+      ClientFinder clientFinder,
       Sep6TransactionStore txnStore,
       ExchangeAmountsCalculator exchangeAmountsCalculator,
       EventService eventService) {
     this.sep6Config = sep6Config;
     this.assetService = assetService;
     this.requestValidator = requestValidator;
+    this.clientFinder = clientFinder;
     this.txnStore = txnStore;
     this.exchangeAmountsCalculator = exchangeAmountsCalculator;
     this.eventSession =
@@ -93,7 +98,9 @@ public StartDepositResponse deposit(Sep10Jwt token, StartDepositRequest request)
             .startedAt(Instant.now())
             .sep10Account(token.getAccount())
             .sep10AccountMemo(token.getAccountMemo())
-            .toAccount(request.getAccount());
+            .toAccount(request.getAccount())
+            .clientDomain(token.getClientDomain())
+            .clientName(clientFinder.getClientName(token));
 
     if (memo != null) {
       builder.memo(memo.toString());
@@ -185,6 +192,8 @@ public StartDepositResponse depositExchange(Sep10Jwt token, StartDepositExchange
             .sep10Account(token.getAccount())
             .sep10AccountMemo(token.getAccountMemo())
             .toAccount(request.getAccount())
+            .clientDomain(token.getClientDomain())
+            .clientName(clientFinder.getClientName(token))
             .quoteId(request.getQuoteId());
 
     if (memo != null) {
@@ -253,6 +262,8 @@ public StartWithdrawResponse withdraw(Sep10Jwt token, StartWithdrawRequest reque
             .sep10Account(token.getAccount())
             .sep10AccountMemo(token.getAccountMemo())
             .fromAccount(sourceAccount)
+            .clientDomain(token.getClientDomain())
+            .clientName(clientFinder.getClientName(token))
             .refundMemo(request.getRefundMemo())
             .refundMemoType(request.getRefundMemoType());
 
@@ -339,6 +350,8 @@ public StartWithdrawResponse withdrawExchange(
             .sep10Account(token.getAccount())
             .sep10AccountMemo(token.getAccountMemo())
             .fromAccount(sourceAccount)
+            .clientDomain(token.getClientDomain())
+            .clientName(clientFinder.getClientName(token))
             .refundMemo(request.getRefundMemo())
             .refundMemoType(request.getRefundMemoType())
             .quoteId(request.getQuoteId());

core/src/main/java/org/stellar/anchor/sep6/Sep6Transaction.java

@@ -276,6 +276,24 @@ public interface Sep6Transaction extends SepTransaction {
 
   void setMemoType(String memoType);
 
+  /**
+   * The client domain of the wallet that initiated the transaction.
+   *
+   * @return the client domain.
+   */
+  String getClientDomain();
+
+  void setClientDomain(String clientDomain);
+
+  /**
+   * The name of the client that initiated the transaction.
+   *
+   * @return the client name.
+   */
+  String getClientName();
+
+  void setClientName(String clientName);
+
   /**
    * The ID returned from a SEP-38 quote response. IF this is set, the user must deliver the deposit
    * funds to the anchor before the quote expires, otherwise the anchor may not honor the quote.

core/src/main/java/org/stellar/anchor/sep6/Sep6TransactionBuilder.java

@@ -148,6 +148,16 @@ public Sep6TransactionBuilder memoType(String memoType) {
     return this;
   }
 
+  public Sep6TransactionBuilder clientDomain(String clientDomain) {
+    txn.setClientDomain(clientDomain);
+    return this;
+  }
+
+  public Sep6TransactionBuilder clientName(String clientName) {
+    txn.setClientName(clientName);
+    return this;
+  }
+
   public Sep6TransactionBuilder quoteId(String quoteId) {
     txn.setQuoteId(quoteId);
     return this;

core/src/main/java/org/stellar/anchor/util/TransactionHelper.java

@@ -108,6 +108,8 @@ public static GetTransactionResponse toGetTransactionResponse(Sep31Transaction t
         .refunds(refunds)
         .stellarTransactions(txn.getStellarTransactions())
         .externalTransactionId(txn.getExternalTransactionId())
+        .clientDomain(txn.getClientDomain())
+        .clientName(txn.getClientName())
         .customers(txn.getCustomers())
         .creator(txn.getCreator())
         .build();
@@ -145,6 +147,8 @@ public static GetTransactionResponse toGetTransactionResponse(
         .externalTransactionId(txn.getExternalTransactionId())
         .memo(txn.getMemo())
         .memoType(txn.getMemoType())
+        .clientDomain(txn.getClientDomain())
+        .clientName(txn.getClientName())
         .refundMemo(txn.getRefundMemo())
         .refundMemoType(txn.getRefundMemoType())
         .requiredInfoMessage(txn.getRequiredInfoMessage())
@@ -190,6 +194,8 @@ public static GetTransactionResponse toGetTransactionResponse(
         .externalTransactionId(txn.getExternalTransactionId())
         .memo(txn.getMemo())
         .memoType(txn.getMemoType())
+        .clientDomain(txn.getClientDomain())
+        .clientName(txn.getClientName())
         .refundMemo(txn.getRefundMemo())
         .refundMemoType(txn.getRefundMemoType())
         .quoteId(txn.getQuoteId())

core/src/test/java/org/stellar/anchor/sep24/PojoSep24Transaction.java

@@ -28,6 +28,7 @@ public class PojoSep24Transaction implements Sep24Transaction {
   String memo;
   String protocol;
   String clientDomain;
+  String clientName;
   Boolean claimableBalanceSupported;
   String amountIn;
   String amountOut;

core/src/test/java/org/stellar/anchor/sep31/PojoSep31Transaction.java

@@ -30,6 +30,7 @@ public class PojoSep31Transaction implements Sep31Transaction {
   String requiredInfoMessage;
   String quoteId;
   String clientDomain;
+  String clientName;
   Sep31Operation.Fields requiredInfoUpdates;
   Map<String, String> fields;
   Boolean refunded;

core/src/test/java/org/stellar/anchor/sep6/PojoSep6Transaction.java

@@ -40,6 +40,8 @@ public class PojoSep6Transaction implements Sep6Transaction {
   String toAccount;
   String memo;
   String memoType;
+  String clientDomain;
+  String clientName;
   String quoteId;
   String message;
   Refunds refunds;

core/src/test/kotlin/org/stellar/anchor/sep24/Sep24ServiceTest.kt

@@ -39,6 +39,7 @@ import org.stellar.anchor.auth.JwtService
 import org.stellar.anchor.auth.JwtService.CLIENT_DOMAIN
 import org.stellar.anchor.auth.Sep10Jwt
 import org.stellar.anchor.auth.Sep24InteractiveUrlJwt
+import org.stellar.anchor.client.ClientFinder
 import org.stellar.anchor.config.*
 import org.stellar.anchor.event.EventService
 import org.stellar.anchor.sep38.PojoSep38Quote
@@ -106,6 +107,8 @@ internal class Sep24ServiceTest {
 
   @MockK(relaxed = true) lateinit var feeIntegration: FeeIntegration
 
+  @MockK(relaxed = true) lateinit var clientFinder: ClientFinder
+
   @MockK(relaxed = true) lateinit var txnStore: Sep24TransactionStore
 
   @MockK(relaxed = true) lateinit var interactiveUrlConstructor: InteractiveUrlConstructor
@@ -148,6 +151,7 @@ internal class Sep24ServiceTest {
     every { moreInfoUrlConstructor.construct(any()) } returns
       "${TEST_SEP24_MORE_INFO_URL}?lang=en&token=$strToken"
     every { clientsConfig.getClientConfigByDomain(any()) } returns clientConfig
+    every { clientFinder.getClientName(any()) } returns TEST_CLIENT_NAME
     calculator = ExchangeAmountsCalculator(sep38QuoteStore)
 
     sep24Service =
@@ -157,6 +161,7 @@ internal class Sep24ServiceTest {
         clientsConfig,
         assetService,
         jwtService,
+        clientFinder,
         txnStore,
         eventService,
         interactiveUrlConstructor,
@@ -195,6 +200,7 @@ internal class Sep24ServiceTest {
     )
     assertEquals(TEST_ACCOUNT, slotTxn.captured.fromAccount)
     assertEquals(TEST_CLIENT_DOMAIN, slotTxn.captured.clientDomain)
+    assertEquals(TEST_CLIENT_NAME, slotTxn.captured.clientName)
 
     val params = URLEncodedUtils.parse(URI(response.url), Charset.forName("UTF-8"))
     val tokenStrings = params.filter { pair -> pair.name.equals("token") }
@@ -244,6 +250,7 @@ internal class Sep24ServiceTest {
     assertEquals(TEST_MEMO, slotTxn.captured.sep10AccountMemo)
     assertEquals(TEST_ACCOUNT, slotTxn.captured.fromAccount)
     assertEquals(TEST_CLIENT_DOMAIN, slotTxn.captured.clientDomain)
+    assertEquals(TEST_CLIENT_NAME, slotTxn.captured.clientName)
   }
 
   @Test
@@ -343,6 +350,7 @@ internal class Sep24ServiceTest {
     assertEquals(TEST_ASSET_ISSUER_ACCOUNT_ID, slotTxn.captured.requestAssetIssuer)
     assertEquals(TEST_ACCOUNT, slotTxn.captured.toAccount)
     assertEquals(TEST_CLIENT_DOMAIN, slotTxn.captured.clientDomain)
+    assertEquals(TEST_CLIENT_NAME, slotTxn.captured.clientName)
   }
 
   @Test
@@ -377,6 +385,7 @@ internal class Sep24ServiceTest {
     assertEquals(TEST_MEMO, slotTxn.captured.sep10AccountMemo)
     assertEquals(TEST_ACCOUNT, slotTxn.captured.fromAccount)
     assertEquals(TEST_CLIENT_DOMAIN, slotTxn.captured.clientDomain)
+    assertEquals(TEST_CLIENT_NAME, slotTxn.captured.clientName)
   }
 
   @Test
@@ -442,6 +451,7 @@ internal class Sep24ServiceTest {
     assertEquals(TEST_ASSET_ISSUER_ACCOUNT_ID, slotTxn.captured.requestAssetIssuer)
     assertEquals(whitelistedAccount, slotTxn.captured.toAccount)
     assertEquals(TEST_CLIENT_DOMAIN, slotTxn.captured.clientDomain)
+    assertEquals(TEST_CLIENT_NAME, slotTxn.captured.clientName)
   }
 
   @Test