Skip to content

Commit 4dbaabd

Browse files
[ci] Add storeDescriptorUserVersion config to scan.
Signed-off-by: Raymond Roestenburg <raymond.roestenburg@digitalasset.com>
1 parent 8cd8373 commit 4dbaabd

File tree

5 files changed

+14
-1
lines changed

5 files changed

+14
-1
lines changed

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/store/db/StoreDescriptorStore.scala

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,21 @@ case class StoreDescriptor(
3434
party: PartyId,
3535
participant: ParticipantId,
3636
key: Map[String, String],
37+
userVersion: Option[Long] = None,
3738
) {
3839
def toJson: io.circe.Json = {
39-
Json.obj(
40+
val base = Json.obj(
4041
"version" -> Json.fromInt(version),
4142
"name" -> Json.fromString(name),
4243
"party" -> Json.fromString(party.toProtoPrimitive),
4344
"participant" -> Json.fromString(participant.toProtoPrimitive),
4445
"key" -> Json.obj(key.map { case (k, v) => k -> Json.fromString(v) }.toSeq*),
4546
)
47+
48+
userVersion match {
49+
case Some(uv) => base.deepMerge(Json.obj("userVersion" -> Json.fromLong(uv)))
50+
case None => base
51+
}
4652
}
4753
}
4854

apps/scan/src/main/scala/org/lfdecentralizedtrust/splice/scan/ScanApp.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ class ScanApp(
185185
nodeMetrics.dbScanStore,
186186
config.automation.ingestion,
187187
initialRound.toLong,
188+
config.storeDescriptorUserVersion,
188189
)
189190
updateHistory = new UpdateHistory(
190191
storage,

apps/scan/src/main/scala/org/lfdecentralizedtrust/splice/scan/config/ScanAppConfig.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ case class ScanAppBackendConfig(
5959
txLogBackfillBatchSize: Int = 100,
6060
bftSequencers: Seq[BftSequencerConfig] = Seq.empty,
6161
cache: ScanCacheConfig = ScanCacheConfig(),
62+
storeDescriptorUserVersion: Option[Long] = None,
6263
) extends SpliceBackendConfig
6364
with BaseScanAppConfig // TODO(DACH-NY/canton-network-node#736): fork or generalize this trait.
6465
{

apps/scan/src/main/scala/org/lfdecentralizedtrust/splice/scan/store/ScanStore.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ object ScanStore {
317317
metrics: DbScanStoreMetrics,
318318
ingestionConfig: IngestionConfig,
319319
initialRound: Long,
320+
storeDescriptorUserVersion: Option[Long] = None,
320321
)(implicit
321322
ec: ExecutionContext,
322323
templateJsonDecoder: TemplateJsonDecoder,
@@ -337,6 +338,7 @@ object ScanStore {
337338
ingestionConfig,
338339
metrics,
339340
initialRound,
341+
storeDescriptorUserVersion,
340342
),
341343
cacheConfigs,
342344
metrics,

apps/scan/src/main/scala/org/lfdecentralizedtrust/splice/scan/store/db/DbScanStore.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ class DbScanStore(
100100
ingestionConfig: IngestionConfig,
101101
storeMetrics: DbScanStoreMetrics,
102102
initialRound: Long,
103+
storeDescriptorUserVersion: Option[Long] = None,
103104
)(implicit
104105
override protected val ec: ExecutionContext,
105106
templateJsonDecoder: TemplateJsonDecoder,
@@ -119,6 +120,7 @@ class DbScanStore(
119120
key = Map(
120121
"dsoParty" -> key.dsoParty.toProtoPrimitive
121122
),
123+
userVersion = storeDescriptorUserVersion,
122124
),
123125
txLogStoreDescriptor = StoreDescriptor(
124126
version = 1,
@@ -128,6 +130,7 @@ class DbScanStore(
128130
key = Map(
129131
"dsoParty" -> key.dsoParty.toProtoPrimitive
130132
),
133+
userVersion = storeDescriptorUserVersion,
131134
),
132135
domainMigrationInfo,
133136
ingestionConfig,

0 commit comments

Comments
 (0)