Update Splice from CCI (#405)

Signed-off-by: DA Automation <splice-maintainers@digitalasset.com>
Co-authored-by: DA Automation <splice-maintainers@digitalasset.com>

Author: canton-network-da

.envrc.vars

@@ -14,9 +14,6 @@ export EXPECTED_FILES_DIR="${SPLICE_ROOT}/cluster/expected"
 export PRIVATE_CONFIGS_PATH=${SPLICE_ROOT}/cluster/configs/configs-private
 export PUBLIC_CONFIGS_PATH=${SPLICE_ROOT}/cluster/configs/configs
 
-# TODO(#19438) get rid of configs-internal in Splice
-export CONFIGS_DIR=${SPLICE_ROOT}/cluster/configs-internal
-
 # Inrease code heap sizes to avoid issues
 # Defaults NonNMethodCodeHeapSize=7M,NonProfiledCodeHeapSize=122M,ProfiledCodeHeapSize=122M
 export SBT_OPTS="-Xmx6G -Xms2G -Xss2M -XX:+UseG1GC -XX:NonNMethodCodeHeapSize=32M -XX:NonProfiledCodeHeapSize=256M -XX:ProfiledCodeHeapSize=256M -XX:ReservedCodeCacheSize=544M"

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/ExternalPartySetupProposalIntegrationTest.scala

@@ -439,6 +439,24 @@ class ExternalPartySetupProposalIntegrationTest
       },
     )
 
+    val txs = sv1ScanBackend.listActivity(None, 1000)
+    forExactly(1, txs) { tx =>
+      // Test that the tx history for the TransferCommand_Send exercise gets parsed properly.
+      val transfer = tx.transfer.value
+      transfer.sender.party shouldBe aliceParty.toProtoPrimitive
+      transfer.balanceChanges should have size (2)
+      transfer.transferKind shouldBe Some(definitions.Transfer.TransferKind.members.PreapprovalSend)
+      transfer.description shouldBe Some("transfer-command-description")
+      forExactly(1, transfer.balanceChanges) { change =>
+        change.party shouldBe aliceParty.toProtoPrimitive
+        BigDecimal(change.changeToInitialAmountAsOfRoundZero) should beAround(BigDecimal(-517))
+      }
+      forExactly(1, transfer.balanceChanges) { change =>
+        change.party shouldBe bobParty.toProtoPrimitive
+        BigDecimal(change.changeToInitialAmountAsOfRoundZero) should beAround(BigDecimal(500))
+      }
+    }
+
     // Check that transfer command gets archived if preapproval does not exist.
     val sv1Party = sv1Backend.getDsoInfo().svParty
     val now = env.environment.clock.now.toInstant

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/TokenStandardCliTestDataTimeBasedIntegrationTest.scala

@@ -46,6 +46,7 @@ import org.lfdecentralizedtrust.splice.config.ConfigTransforms.{
   updateAutomationConfig,
 }
 import org.lfdecentralizedtrust.splice.console.LedgerApiExtensions.RichPartyId
+import org.lfdecentralizedtrust.splice.http.v0.definitions
 import org.lfdecentralizedtrust.splice.integration.EnvironmentDefinition
 import org.lfdecentralizedtrust.splice.integration.plugins.TokenStandardCliSanityCheckPlugin
 import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.{
@@ -202,9 +203,20 @@ class TokenStandardCliTestDataTimeBasedIntegrationTest
             alice.partyId,
             BigDecimal("200.0"),
             transferinstruction.v1.definitions.TransferFactoryWithChoiceContext.TransferKind.Direct,
+            description = Some("token-standard-transfer-description"),
           )
           eventually() {
             aliceWalletClient.balance().unlockedQty should beAround(BigDecimal("200"))
+            val scanTxs = sv1ScanBackend.listActivity(None, 1000)
+            forExactly(1, scanTxs) { tx =>
+              val transfer = tx.transfer.value
+              transfer.transferKind shouldBe Some(
+                definitions.Transfer.TransferKind.members.PreapprovalSend
+              )
+              transfer.description shouldBe Some("token-standard-transfer-description")
+              transfer.sender.party shouldBe aliceValidator.partyId.toProtoPrimitive
+              transfer.receivers.loneElement.party shouldBe alice.partyId.toProtoPrimitive
+            }
           }
           // send some back so there's a TransferOut
           executeTransferViaTokenStandard(

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/TokenStandardTest.scala

@@ -14,7 +14,7 @@ import org.lfdecentralizedtrust.splice.codegen.java.splice.api.token.{
 import org.lfdecentralizedtrust.splice.console.LedgerApiExtensions.RichPartyId
 import org.lfdecentralizedtrust.splice.console.ParticipantClientReference
 import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.{SpliceTestConsoleEnvironment}
-import org.lfdecentralizedtrust.splice.util.FactoryChoiceWithDisclosures
+import org.lfdecentralizedtrust.splice.util.{FactoryChoiceWithDisclosures, TokenStandardMetadata}
 import org.lfdecentralizedtrust.tokenstandard.transferinstruction
 
 import java.time.Duration
@@ -35,6 +35,7 @@ trait TokenStandardTest extends ExternallySignedPartyTestUtil {
       timeToLife: Duration = Duration.ofMinutes(10),
       expectedTimeBounds: Option[(CantonTimestamp, CantonTimestamp)] = None,
       advanceTimeBeforeExecute: Option[Duration] = None,
+      description: Option[String] = None,
   )(implicit
       env: SpliceTestConsoleEnvironment
   ) = {
@@ -47,6 +48,7 @@ trait TokenStandardTest extends ExternallySignedPartyTestUtil {
           amount,
           expectedKind,
           timeToLife,
+          description,
         )
         participant.ledger_api_extensions.commands
           .submitJavaExternalOrLocal(
@@ -81,6 +83,7 @@ trait TokenStandardTest extends ExternallySignedPartyTestUtil {
       amount: BigDecimal,
       expectedKind: transferinstruction.v1.definitions.TransferFactoryWithChoiceContext.TransferKind,
       timeToLife: Duration = Duration.ofMinutes(10),
+      description: Option[String] = None,
   )(implicit
       env: SpliceTestConsoleEnvironment
   ): (
@@ -109,7 +112,9 @@ trait TokenStandardTest extends ExternallySignedPartyTestUtil {
         now,
         now.plus(timeToLife),
         senderHoldingCids.asJava,
-        new metadatav1.Metadata(java.util.Map.of()),
+        new metadatav1.Metadata(
+          description.toList.map(TokenStandardMetadata.reasonMetaKey -> _).toMap.asJava
+        ),
       ),
       emptyExtraArgs,
     )

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/TokenStandardTransferIntegrationTest.scala

@@ -11,6 +11,7 @@ import org.lfdecentralizedtrust.splice.config.ConfigTransforms.{
   updateAutomationConfig,
 }
 import org.lfdecentralizedtrust.splice.http.v0.definitions.TransferInstructionResultOutput.members
+import org.lfdecentralizedtrust.splice.http.v0.definitions.TransactionHistoryResponseItem.TransactionType as HttpTransactionType
 import org.lfdecentralizedtrust.splice.http.v0.definitions.{
   AbortTransferInstruction,
   ReceiverAmount,
@@ -289,10 +290,11 @@ class TokenStandardTransferIntegrationTest
       // 4 transfer instructions + accept + withdraw + reject
       activityTxs should have size (7)
       clue("TransferInstruction accept") {
+        activityTxs(0).transactionType shouldBe HttpTransactionType.Transfer
         val transfer = activityTxs(0).transfer.value
         transfer.sender.party shouldBe aliceUserParty.toProtoPrimitive
         transfer.transferInstructionCid shouldBe Some(cids(2).contractId)
-        transfer.transferInstructionDescription shouldBe None
+        transfer.description shouldBe None
         transfer.transferInstructionReceiver shouldBe None
         transfer.transferKind shouldBe Some(Transfer.TransferKind.members.TransferInstructionAccept)
         transfer.receivers shouldBe Seq(
@@ -315,12 +317,14 @@ class TokenStandardTransferIntegrationTest
         }
       }
       clue("TransferInstruction withdraw") {
+        activityTxs(1).transactionType shouldBe HttpTransactionType.AbortTransferInstruction
         val abort = activityTxs(1).abortTransferInstruction.value
         abort.transferInstructionCid shouldBe cids(1).contractId
         abort.abortKind shouldBe AbortTransferInstruction.AbortKind.members.Withdraw
         // Scan tracks the sum of locked and unlocked amulets so there is no balance change here.
       }
       clue("TransferInstruction reject") {
+        activityTxs(2).transactionType shouldBe HttpTransactionType.AbortTransferInstruction
         val abort = activityTxs(2).abortTransferInstruction.value
         abort.transferInstructionCid shouldBe cids(0).contractId
         abort.abortKind shouldBe AbortTransferInstruction.AbortKind.members.Reject
@@ -329,12 +333,13 @@ class TokenStandardTransferIntegrationTest
       forAll(Seq(3, 4, 5, 6)) { i =>
         val transferInstructionNumber = 7 - i
         clue(s"Transfer #$transferInstructionNumber") {
+          activityTxs(i).transactionType shouldBe HttpTransactionType.Transfer
           val transfer = activityTxs(i).transfer.value
           transfer.sender.party shouldBe aliceUserParty.toProtoPrimitive
           transfer.transferInstructionCid shouldBe Some(
             cids(transferInstructionNumber - 1).contractId
           )
-          transfer.transferInstructionDescription shouldBe Some(
+          transfer.description shouldBe Some(
             s"Transfer #$transferInstructionNumber"
           )
           transfer.transferInstructionReceiver shouldBe Some(bobUserParty.toProtoPrimitive)

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/reonboard/SvReOnboardPreflightIntegrationTest.scala

@@ -150,11 +150,14 @@ class SvReOnboardPreflightIntegrationTest
         "Transfer appears in transactions log",
         _ => {
           val rows = findAll(className("tx-row")).toSeq
-          val expectedRow = rows.filter { row =>
+          val expectedRows = rows.filter { row =>
             val transaction = readTransactionFromRow(row)
             transaction.partyDescription.exists(_.contains(offboardedSvParty.toProtoPrimitive))
           }
-          inside(expectedRow) { case Seq(tx) =>
+          // There will be two tx log entries, one for the creation of the offer and one for the acceptance
+          // when using the token standard flow and one otherwise.
+          // We support both and just check that the entry for the completed transfer is there.
+          forExactly(1, expectedRows) { tx =>
             val transaction = readTransactionFromRow(tx)
             logger.info(s"Found transaction $transaction")
             transaction.action should matchText("Received")

apps/common/frontend/utils/src/temporal-fns.ts

@@ -30,6 +30,8 @@ function prettyPrintInterval(
   return durations.join(', ');
 }
 
+export const dateTimeFormatISO = 'YYYY-MM-DD HH:mm:ss';
+
 export function durationToInterval(duration: string): string {
   const { years, months, days, hours, minutes, seconds } = Temporal.Duration.from(duration);
 

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/config/GcpConfig.scala

@@ -52,8 +52,8 @@ object GcpBucketConfig {
   def inferForTesting: GcpBucketConfig =
     infer(
       "GCP_DATA_EXPORT_INTEGRATION_TEST_SERVICE_ACCOUNT_CREDENTIALS",
-      "da-cn-scratchnet",
-      "da-cn-scratch-acs-store-dumps",
+      "da-cn-splice",
+      "da-splice-identity-dumps",
     )
 
   def inferForCluster: GcpBucketConfig =

apps/scan/src/main/openapi/scan.yaml

@@ -2660,7 +2660,7 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/BalanceChange"
-        transferInstructionDescription:
+        description:
           type: string
         transferInstructionReceiver:
           type: string
@@ -2670,7 +2670,7 @@ components:
           type: string
         transfer_kind:
           type: string
-          enum: [create_transfer_instruction, transfer_instruction_accept]
+          enum: [create_transfer_instruction, transfer_instruction_accept, preapproval_send]
     AbortTransferInstruction:
       type: object
       required:

apps/scan/src/main/protobuf/scan_tx_log.proto

@@ -120,6 +120,7 @@ enum TransferKind {
   TRANSFER_KIND_OTHER = 0;
   TRANSFER_KIND_CREATE_TRANSFER_INSTRUCTION = 1;
   TRANSFER_KIND_TRANSFER_INSTRUCTION_ACCEPT = 2;
+  TRANSFER_KIND_PREAPPROVAL_SEND = 3;
 }
 
 message TransferTxLogEntry {
@@ -137,7 +138,8 @@ message TransferTxLogEntry {
   int64 round = 9;
   string amulet_price = 10 [(scalapb.field).type = "scala.math.BigDecimal"];
 
-  string transfer_instruction_description = 11;
+  string description = 11;
+
   string transfer_instruction_receiver = 12;
   string transfer_instruction_amount = 13 [(scalapb.field).type = "Option[scala.math.BigDecimal]"];
   string transfer_instruction_cid = 14;