Merge commit 'e9444f089a6d5fbc2b7fc4eb6bb4321368d8020b' into s11/2723-attach-SecurityPolicy-backend

[skip ci]

Author: stephencompall-DA

MAINTENANCE.md

@@ -16,15 +16,12 @@
 1. Generate a patch file of the JSON API v2 OpenAPI definition by running `diff-openapi.sh` in `token-standard/dependencies/canton-json-api-v2/openapi/`.
 2. Choose the Canton version you wish to upgrade to. The currently published versions on
    Artifactory can be found [here](https://digitalasset.jfrog.io/ui/repos/tree/General/canton-enterprise).
-3. Compute the hashes of the corresponding enterprise and oss versions by running:
-   `nix store prefetch-file --json --hash-type sha256 https://digitalasset.jfrog.io/artifactory/canton-enterprise/canton-enterprise-<version>.tar.gz | jq -r '.hash'` and
-   `nix store prefetch-file --json --hash-type sha256  https://www.canton.io/releases/canton-open-source-<version>.tar.gz | jq -r '.hash'`
-4. Update the Canton version and hashes of the oss and enterprise versions in `nix/canton-sources.json`.
-5. In case you have also made configuration changes to Canton in `simple-topology-canton.conf`, remember
+3. Update the hashes in `nix/canton-sources.json` by running: `build-tools/bump-canton.sh <version>`
+4. In case you have also made configuration changes to Canton in `simple-topology-canton.conf`, remember
    to also make the corresponding changes for our cluster deployments. It is recommended to test any configuration
    changes on scratchnet first.
-6. Update the OpenAPI definitions from step 1 by running `update-openapi.sh` in `token-standard/dependencies/canton-json-api-v2/openapi/`.
-7. Cleanup the `openapi.patch` file.
+5. Update the OpenAPI definitions from step 1 by running `update-openapi.sh` in `token-standard/dependencies/canton-json-api-v2/openapi/`.
+6. Cleanup the `openapi.patch` file.
    Check `token-standard/dependencies/canton-json-api-v2/openapi/CHANGES.md` and apply any changes manually if CI breaks due to
    token standard CLI issues that look caused by bad OpenAPI definitions.
 

apps/app/src/main/scala/org/lfdecentralizedtrust/splice/config/ConfigTransforms.scala

@@ -200,6 +200,7 @@ object ConfigTransforms {
       updateAllAutomationConfigs(
         _.copy(rewardOperationRoundsCloseBufferDuration = NonNegativeFiniteDuration.ofMillis(100))
       ),
+      disableDevelopmentFund(),
     )
   }
 
@@ -299,6 +300,9 @@ object ConfigTransforms {
   def disableZeroFees(): ConfigTransform =
     updateAllSvAppFoundDsoConfigs_(c => c.copy(zeroTransferFees = false))
 
+  def disableDevelopmentFund(): ConfigTransform =
+    updateAllSvAppFoundDsoConfigs_(c => c.copy(developmentFundPercentage = Some(0.0)))
+
   def updateAllValidatorAppConfigs(
       update: (String, ValidatorAppBackendConfig) => ValidatorAppBackendConfig
   ): ConfigTransform =
@@ -718,6 +722,9 @@ object ConfigTransforms {
     }
   }
 
+  def withDevelopmentFundPercentage(percentage: BigDecimal): ConfigTransform =
+    updateAllSvAppFoundDsoConfigs_(c => c.copy(developmentFundPercentage = Some(percentage)))
+
   private def portTransform(bump: Int, c: AdminServerConfig): AdminServerConfig =
     c.copy(internalPort = c.internalPort.map(_ + bump))
 

apps/app/src/main/scala/org/lfdecentralizedtrust/splice/config/SpliceConfig.scala

@@ -13,10 +13,10 @@ import org.lfdecentralizedtrust.splice.http.UrlValidator
 import org.lfdecentralizedtrust.splice.scan.admin.api.client.BftScanConnection.BftScanClientConfig
 import org.lfdecentralizedtrust.splice.scan.config.{
   BftSequencerConfig,
+  MediatorVerdictIngestionConfig,
   ScanAppBackendConfig,
   ScanAppClientConfig,
   ScanCacheConfig,
-  MediatorVerdictIngestionConfig,
   ScanSynchronizerConfig,
   CacheConfig as SpliceCacheConfig,
 }
@@ -82,6 +82,7 @@ import com.digitalasset.canton.synchronizer.sequencer.config.{
 }
 import com.digitalasset.canton.topology.PartyId
 import com.digitalasset.daml.lf.data.Ref.PackageVersion
+import org.lfdecentralizedtrust.splice.store.ChoiceContextContractFetcher
 
 case class SpliceConfig(
     override val name: Option[String] = None,
@@ -412,6 +413,9 @@ object SpliceConfig {
       deriveReader[CircuitBreakerConfig]
     implicit val circuitBreakersConfig: ConfigReader[CircuitBreakersConfig] =
       deriveReader[CircuitBreakersConfig]
+    implicit val contractFetchLedgerFallbackConfigReader
+        : ConfigReader[ChoiceContextContractFetcher.StoreContractFetcherWithLedgerFallbackConfig] =
+      deriveReader[ChoiceContextContractFetcher.StoreContractFetcherWithLedgerFallbackConfig]
     implicit val spliceParametersConfig: ConfigReader[SpliceParametersConfig] =
       deriveReader[SpliceParametersConfig]
     implicit val rateLimitersConfig: ConfigReader[RateLimitersConfig] =
@@ -711,11 +715,11 @@ object SpliceConfig {
           )
           _ <- Either.cond(
             conf.domains.global.trustedSynchronizerConfig.forall(c =>
-              c.sequencerNames.length >= c.threshold
+              c.svNames.length >= c.threshold
             ),
             (),
             ConfigValidationFailed(
-              "Configuration error: Length of sequencerNames should be greater than or equal to threshold."
+              "Configuration error: Length of svNames should be greater than or equal to threshold."
             ),
           )
           _ <- Either.cond(
@@ -838,6 +842,9 @@ object SpliceConfig {
       deriveWriter[CircuitBreakerConfig]
     implicit val circuitBreakersConfig: ConfigWriter[CircuitBreakersConfig] =
       deriveWriter[CircuitBreakersConfig]
+    implicit val contractFetchLedgerFallbackConfigWriter
+        : ConfigWriter[ChoiceContextContractFetcher.StoreContractFetcherWithLedgerFallbackConfig] =
+      deriveWriter[ChoiceContextContractFetcher.StoreContractFetcherWithLedgerFallbackConfig]
     implicit val spliceParametersConfig: ConfigWriter[SpliceParametersConfig] =
       deriveWriter[SpliceParametersConfig]
 

apps/app/src/main/scala/org/lfdecentralizedtrust/splice/console/ScanAppReference.scala

@@ -394,6 +394,16 @@ abstract class ScanAppReference(
       )
     }
 
+  def getDateOfFirstSnapshotAfter(after: CantonTimestamp, migrationId: Long) =
+    consoleEnvironment.run {
+      httpCommand(
+        HttpScanAppClient.GetDateOfFirstSnapshotAfter(
+          after.toInstant.atOffset(java.time.ZoneOffset.UTC),
+          migrationId,
+        )
+      )
+    }
+
   def getAcsSnapshotAt(
       at: CantonTimestamp,
       migrationId: Long,

apps/app/src/main/scala/org/lfdecentralizedtrust/splice/metrics/SpliceMetricsFactory.scala

@@ -33,6 +33,7 @@ case class SpliceMetricsFactory(
         new ValidatorAppMetrics(
           metricsFactoryProvider.generateMetricsFactory(metricsContext),
           storageHistograms,
+          loggerFactory,
         )
       },
     )
@@ -45,6 +46,7 @@ case class SpliceMetricsFactory(
         new SvAppMetrics(
           metricsFactoryProvider.generateMetricsFactory(metricsContext),
           storageHistograms,
+          loggerFactory,
         )
       },
     )
@@ -71,9 +73,9 @@ case class SpliceMetricsFactory(
         new SplitwellAppMetrics(
           metricsFactoryProvider.generateMetricsFactory(metricsContext),
           storageHistograms,
+          loggerFactory,
         )
       },
     )
   }
-
 }

apps/app/src/test/resources/include/mediators.conf

@@ -14,7 +14,6 @@ _mediator_template {
   # ref: https://github.com/DACH-NY/canton/issues/16371#issuecomment-1885005687
   time-tracker.min-observation-duration = 10s
   sequencer-client {
-    use-new-connection-pool = true
     enable-amplification-improvements = true
   }
   topology.validate-initial-topology-snapshot = false

apps/app/src/test/resources/include/participants.conf

@@ -44,7 +44,6 @@ _participant_template {
   sequencer-client {
     # Use a higher number of in flight batches to increase throughput
     maximum-in-flight-event-batches = 50
-    use-new-connection-pool = true
     enable-amplification-improvements = true
   }
 

apps/app/src/test/resources/include/sequencers.conf

@@ -22,9 +22,6 @@ _sequencer_reference_template {
     generate-topology-transactions-and-keys = false
     identity.type = manual
   }
-  sequencer-client {
-    use-new-connection-pool = true
-  }
   parameters {
     batching.max-pruning-time-interval = "10 minutes"
   }

apps/app/src/test/resources/local-sv-node/canton-participant/canton.conf

@@ -25,10 +25,6 @@ canton {
         }
       }
 
-      sequencer-client {
-          use-new-connection-pool = true
-      }
-
       ledger-api {
         address = "0.0.0.0"
         port = 9101

apps/app/src/test/resources/local-validator-node/canton-participant/canton.conf

@@ -25,10 +25,6 @@ canton {
         }
       }
 
-      sequencer-client {
-          use-new-connection-pool = true
-      }
-
       ledger-api {
         address = "0.0.0.0"
         port = 9201