Skip to content

Commit f188239

Browse files
rautenrieth-darautenrieth-da
committed
Split SV app auth
[ci] Signed-off-by: Robert Autenrieth <[email protected]>
1 parent 5ce3ef8 commit f188239

File tree

21 files changed

+1253
-1082
lines changed

21 files changed

+1253
-1082
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ import org.lfdecentralizedtrust.splice.codegen.java.splice.dsorules.{
5959
DsoRules_CloseVoteRequestResult,
6060
VoteRequest,
6161
}
62-
import org.lfdecentralizedtrust.splice.sv.admin.api.client.commands.HttpSvAdminAppClient
62+
import org.lfdecentralizedtrust.splice.sv.admin.api.client.commands.HttpSvOperatorAppClient
6363

6464
import scala.jdk.OptionConverters.*
6565
import java.time.Instant
@@ -645,7 +645,7 @@ abstract class ScanAppReference(
645645
): Contract[VoteRequest.ContractId, VoteRequest] = {
646646
consoleEnvironment.run {
647647
httpCommand(
648-
HttpSvAdminAppClient.LookupVoteRequest(trackingCid)()
648+
HttpSvOperatorAppClient.LookupVoteRequest(trackingCid)()
649649
)
650650
}
651651
}

‎apps/app/src/main/scala/org/lfdecentralizedtrust/splice/console/SvAppReference.scala‎

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ import org.lfdecentralizedtrust.splice.http.v0.definitions
2222
import org.lfdecentralizedtrust.splice.sv.{SvApp, SvAppBootstrap, SvAppClientConfig}
2323
import org.lfdecentralizedtrust.splice.sv.admin.api.client.commands.{
2424
HttpSvAdminAppClient,
25-
HttpSvAppClient,
25+
HttpSvOperatorAppClient,
26+
HttpSvPublicAppClient,
2627
}
2728
import org.lfdecentralizedtrust.splice.sv.automation.{
2829
DsoDelegateBasedAutomationService,
29-
SvSvAutomationService,
3030
SvDsoAutomationService,
31+
SvSvAutomationService,
3132
}
3233
import org.lfdecentralizedtrust.splice.sv.config.SvAppBackendConfig
3334
import org.lfdecentralizedtrust.splice.sv.migration.{DomainDataSnapshot, SynchronizerNodeIdentities}
@@ -54,46 +55,51 @@ abstract class SvAppReference(
5455
def onboardValidator(validator: PartyId, secret: String, contactPoint: String): Unit =
5556
consoleEnvironment.run {
5657
httpCommand(
57-
HttpSvAppClient.OnboardValidator(validator, secret, BuildInfo.compiledVersion, contactPoint)
58+
HttpSvPublicAppClient.OnboardValidator(
59+
validator,
60+
secret,
61+
BuildInfo.compiledVersion,
62+
contactPoint,
63+
)
5864
)
5965
}
6066

6167
def startSvOnboarding(token: String): Unit =
6268
consoleEnvironment.run {
63-
httpCommand(HttpSvAppClient.StartSvOnboarding(token))
69+
httpCommand(HttpSvPublicAppClient.StartSvOnboarding(token))
6470
}
6571

66-
def getSvOnboardingStatus(candidate: PartyId): HttpSvAppClient.SvOnboardingStatus =
72+
def getSvOnboardingStatus(candidate: PartyId): HttpSvPublicAppClient.SvOnboardingStatus =
6773
consoleEnvironment.run {
68-
httpCommand(HttpSvAppClient.getSvOnboardingStatus(candidate.toProtoPrimitive))
74+
httpCommand(HttpSvPublicAppClient.getSvOnboardingStatus(candidate.toProtoPrimitive))
6975
}
7076

71-
def getSvOnboardingStatus(candidate: String): HttpSvAppClient.SvOnboardingStatus =
77+
def getSvOnboardingStatus(candidate: String): HttpSvPublicAppClient.SvOnboardingStatus =
7278
consoleEnvironment.run {
73-
httpCommand(HttpSvAppClient.getSvOnboardingStatus(candidate))
79+
httpCommand(HttpSvPublicAppClient.getSvOnboardingStatus(candidate))
7480
}
7581

7682
@Help.Summary("Prepare a validator onboarding and return an onboarding secret (via client API)")
7783
def devNetOnboardValidatorPrepare(): String =
7884
consoleEnvironment.run {
79-
httpCommand(HttpSvAppClient.DevNetOnboardValidatorPrepare())
85+
httpCommand(HttpSvPublicAppClient.DevNetOnboardValidatorPrepare())
8086
}
8187

82-
def getDsoInfo(): HttpSvAppClient.DsoInfo =
88+
def getDsoInfo(): HttpSvPublicAppClient.DsoInfo =
8389
consoleEnvironment.run {
84-
httpCommand(HttpSvAppClient.GetDsoInfo)
90+
httpCommand(HttpSvPublicAppClient.GetDsoInfo)
8591
}
8692

8793
@Help.Summary("Get the CometBFT node status")
8894
def cometBftNodeStatus(): definitions.CometBftNodeStatusResponse =
8995
consoleEnvironment.run {
90-
httpCommand(HttpSvAppClient.GetCometBftNodeStatus())
96+
httpCommand(HttpSvPublicAppClient.GetCometBftNodeStatus())
9197
}
9298

9399
@Help.Summary("Get the CometBFT node dump")
94100
def cometBftNodeDebugDump(): definitions.CometBftNodeDumpResponse =
95101
consoleEnvironment.run {
96-
httpCommand(HttpSvAdminAppClient.GetCometBftNodeDump())
102+
httpCommand(HttpSvPublicAppClient.GetCometBftNodeDump())
97103
}
98104

99105
@Help.Summary("Make a CometBFT Json RPC request")
@@ -103,17 +109,17 @@ abstract class SvAppReference(
103109
params: Map[String, io.circe.Json] = Map.empty,
104110
): definitions.CometBftJsonRpcResponse =
105111
consoleEnvironment.run {
106-
httpCommand(HttpSvAppClient.CometBftJsonRpcRequest(id, method, params))
112+
httpCommand(HttpSvPublicAppClient.CometBftJsonRpcRequest(id, method, params))
107113
}
108114

109115
def onboardSvPartyMigrationAuthorize(
110116
participantId: ParticipantId,
111117
candidateParty: PartyId,
112-
): HttpSvAppClient.OnboardSvPartyMigrationAuthorizeResponse =
118+
): HttpSvPublicAppClient.OnboardSvPartyMigrationAuthorizeResponse =
113119
consoleEnvironment
114120
.run {
115121
httpCommand(
116-
HttpSvAppClient.OnboardSvPartyMigrationAuthorize(
122+
HttpSvPublicAppClient.OnboardSvPartyMigrationAuthorize(
117123
participantId,
118124
candidateParty,
119125
)
@@ -174,7 +180,7 @@ abstract class SvAppReference(
174180
)(implicit tc: TraceContext): Unit = {
175181
consoleEnvironment.run {
176182
httpCommand(
177-
HttpSvAdminAppClient.CreateVoteRequest(
183+
HttpSvOperatorAppClient.CreateVoteRequest(
178184
requester,
179185
action,
180186
reasonUrl,
@@ -190,7 +196,7 @@ abstract class SvAppReference(
190196
def listVoteRequests(): Seq[Contract[VoteRequest.ContractId, VoteRequest]] = {
191197
consoleEnvironment.run {
192198
httpCommand(
193-
HttpSvAdminAppClient.ListVoteRequests
199+
HttpSvOperatorAppClient.ListVoteRequests
194200
)
195201
}
196202
}
@@ -212,7 +218,7 @@ abstract class SvAppReference(
212218
): Contract[VoteRequest.ContractId, VoteRequest] = {
213219
consoleEnvironment.run {
214220
httpCommand(
215-
HttpSvAdminAppClient.LookupVoteRequest(trackingCid)()
221+
HttpSvOperatorAppClient.LookupVoteRequest(trackingCid)()
216222
)
217223
}
218224
}
@@ -227,7 +233,7 @@ abstract class SvAppReference(
227233
): Seq[DsoRules_CloseVoteRequestResult] = {
228234
consoleEnvironment.run {
229235
httpCommand(
230-
HttpSvAdminAppClient.ListVoteRequestResults(
236+
HttpSvOperatorAppClient.ListVoteRequestResults(
231237
actionName,
232238
accepted,
233239
requester,
@@ -248,7 +254,7 @@ abstract class SvAppReference(
248254
): Unit = {
249255
consoleEnvironment.run {
250256
httpCommand(
251-
HttpSvAdminAppClient.CastVote(trackingCid, isAccepted, reasonUrl, reasonDescription)
257+
HttpSvOperatorAppClient.CastVote(trackingCid, isAccepted, reasonUrl, reasonDescription)
252258
)
253259
}
254260
}
@@ -338,31 +344,31 @@ class SvAppBackendReference(
338344
def listOngoingValidatorOnboardings(): Seq[ValidatorOnboarding] =
339345
consoleEnvironment.run {
340346
httpCommand(
341-
HttpSvAdminAppClient.ListOngoingValidatorOnboardings
347+
HttpSvOperatorAppClient.ListOngoingValidatorOnboardings
342348
)
343349
}
344350

345351
@Help.Summary("Prepare a validator onboarding and return an onboarding secret (via admin API)")
346352
def prepareValidatorOnboarding(expiresIn: FiniteDuration, partyHint: Option[String]): String =
347353
consoleEnvironment.run {
348354
httpCommand(
349-
HttpSvAdminAppClient.PrepareValidatorOnboarding(expiresIn, partyHint)
355+
HttpSvOperatorAppClient.PrepareValidatorOnboarding(expiresIn, partyHint)
350356
)
351357
}
352358

353359
@Help.Summary("Update CC price vote (via admin API)")
354360
def updateAmuletPriceVote(amuletPrice: BigDecimal): Unit =
355361
consoleEnvironment.run {
356362
httpCommand(
357-
HttpSvAdminAppClient.UpdateAmuletPriceVote(amuletPrice)
363+
HttpSvOperatorAppClient.UpdateAmuletPriceVote(amuletPrice)
358364
)
359365
}
360366

361367
@Help.Summary("List CC price vote (via admin API)")
362368
def listAmuletPriceVotes(): Seq[Contract[cp.AmuletPriceVote.ContractId, cp.AmuletPriceVote]] = {
363369
consoleEnvironment.run {
364370
httpCommand(
365-
HttpSvAdminAppClient.ListAmuletPriceVotes
371+
HttpSvOperatorAppClient.ListAmuletPriceVotes
366372
)
367373
}
368374
}
@@ -371,27 +377,27 @@ class SvAppBackendReference(
371377
def listOpenMiningRounds(): Seq[Contract[OpenMiningRound.ContractId, OpenMiningRound]] = {
372378
consoleEnvironment.run {
373379
httpCommand(
374-
HttpSvAdminAppClient.ListOpenMiningRounds
380+
HttpSvOperatorAppClient.ListOpenMiningRounds
375381
)
376382
}
377383
}
378384

379385
@Help.Summary("Get the CometBFT node debug dump")
380386
def cometBftNodeDump(): definitions.CometBftNodeDumpResponse =
381387
consoleEnvironment.run {
382-
httpCommand(HttpSvAdminAppClient.GetCometBftNodeDump())
388+
httpCommand(HttpSvPublicAppClient.GetCometBftNodeDump())
383389
}
384390

385391
@Help.Summary("Get the sequencer node status")
386392
def sequencerNodeStatus(): NodeStatus[SpliceStatus] =
387393
consoleEnvironment.run {
388-
httpCommand(HttpSvAdminAppClient.GetSequencerNodeStatus())
394+
httpCommand(HttpSvOperatorAppClient.GetSequencerNodeStatus())
389395
}
390396

391397
@Help.Summary("Get the mediator node status")
392398
def mediatorNodeStatus(): NodeStatus[SpliceStatus] =
393399
consoleEnvironment.run {
394-
httpCommand(HttpSvAdminAppClient.GetMediatorNodeStatus())
400+
httpCommand(HttpSvOperatorAppClient.GetMediatorNodeStatus())
395401
}
396402

397403
/** Remote participant this sv app is configured to interact with. */

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ class BftScanConnectionIntegrationTest
8888
)
8989

9090
aliceValidatorBackend.startSync()
91-
onboardWalletUser(aliceWalletClient, aliceValidatorBackend)
91+
onboardWalletUser(aliceValidatorWalletClient, aliceValidatorBackend)
92+
val walletUserToken =
93+
OAuth2BearerToken(aliceValidatorWalletClient.token.valueOrFail("No token found"))
9294

9395
val fakeCid = new TransferInstruction.ContractId("00" + s"01" * 31 + "42")
9496

@@ -113,11 +115,7 @@ class BftScanConnectionIntegrationTest
113115
.getTransferInstructionAcceptContext(
114116
fakeCid.contractId,
115117
GetChoiceContextRequest(None),
116-
List(
117-
Authorization(
118-
OAuth2BearerToken(aliceValidatorBackend.token.valueOrFail("No token found"))
119-
)
120-
),
118+
List(Authorization(walletUserToken)),
121119
)
122120
.value
123121
.futureValue
@@ -139,11 +137,7 @@ class BftScanConnectionIntegrationTest
139137
walletClient
140138
.acceptTokenStandardTransfer(
141139
fakeCid.contractId,
142-
List(
143-
Authorization(
144-
OAuth2BearerToken(aliceValidatorBackend.token.valueOrFail("No token found"))
145-
)
146-
),
140+
List(Authorization(walletUserToken)),
147141
)
148142
.value
149143
.futureValue

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.{
3131
}
3232
import org.lfdecentralizedtrust.splice.scan.config.BftSequencerConfig
3333
import org.lfdecentralizedtrust.splice.store.Limit
34-
import org.lfdecentralizedtrust.splice.sv.admin.api.client.commands.HttpSvAppClient
34+
import org.lfdecentralizedtrust.splice.sv.admin.api.client.commands.HttpSvPublicAppClient
3535
import org.lfdecentralizedtrust.splice.sv.automation.delegatebased.{
3636
AdvanceOpenMiningRoundTrigger,
3737
ExpireIssuingMiningRoundTrigger,
@@ -112,7 +112,7 @@ class ScanIntegrationTest extends IntegrationTest with WalletTestUtil with TimeT
112112
"return dso info same as the sv app" in { implicit env =>
113113
val scan = sv1ScanBackend.getDsoInfo()
114114
inside(sv1Backend.getDsoInfo()) {
115-
case HttpSvAppClient.DsoInfo(
115+
case HttpSvPublicAppClient.DsoInfo(
116116
svUser,
117117
svParty,
118118
dsoParty,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import org.lfdecentralizedtrust.splice.sv.util.{SvOnboardingToken, SvUtil}
1111
import com.digitalasset.canton.sequencing.GrpcSequencerConnection
1212

1313
import scala.jdk.OptionConverters.*
14-
import org.lfdecentralizedtrust.splice.sv.admin.api.client.commands.HttpSvAppClient.SvOnboardingStatus
14+
import org.lfdecentralizedtrust.splice.sv.admin.api.client.commands.HttpSvPublicAppClient.SvOnboardingStatus
1515
import org.lfdecentralizedtrust.splice.util.{SvTestUtil, WalletTestUtil}
1616
import com.digitalasset.canton.logging.SuppressionRule
1717
import com.digitalasset.canton.topology.transaction.ParticipantPermission

‎apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/runbook/SvUiPreflightIntegrationTestUtil.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package org.lfdecentralizedtrust.splice.integration.tests.runbook
22

33
import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.TestCommon
44
import org.lfdecentralizedtrust.splice.integration.tests.FrontendTestCommon
5-
import org.lfdecentralizedtrust.splice.sv.admin.api.client.commands.HttpSvAppClient.DsoInfo
5+
import org.lfdecentralizedtrust.splice.sv.admin.api.client.commands.HttpSvPublicAppClient.DsoInfo
66
import com.digitalasset.canton.topology.PartyId
77
import scala.concurrent.duration.*
88

0 commit comments

Comments
 (0)