DO NOT MERGE: ts2 - split AmuletAllocation and AmuletAllocationV2 and polish V2 by meiersi-da · Pull Request #4337 · hyperledger-labs/splice

meiersi-da · 2026-03-09T16:30:21Z

Pull Request Checklist

Cluster Testing

If a cluster test is required, comment /cluster_test on this PR to request it, and ping someone with access to the DA-internal system to approve it.
If a hard-migration test is required (from the latest release), comment /hdm_test on this PR to request it, and ping someone with access to the DA-internal system to approve it.

PR Guidelines

Include any change that might be observable by our partners or affect their deployment in the release notes.
Specify fixed issues with Fixes #n, and mention issues worked on using #n
Include a screenshot for frontend-related PRs - see README or use your favorite screenshot tool

Merge Guidelines

Make the git commit message look sensible when squash-merging on GitHub (most likely: just copy your PR description).

tests pass! *yay*

This reverts commit 0af6c68.

... but its not pretty :/

meiersi-da

@bame-da: I think the code for allocations is ready for an alignment review. The base for this PR is a branch where the V2 files are a pure copy and rename of the V1 versions.

I've added comments tagged with @bame-da to guide your attention, so you don't end up reviewing WIP material. I focused on polishing the AllocationV2 API together with its implementation in AmuletAllocation and AmuletAllocationV2 based on helper functions in a split-up version of your UtilsV2 module.

I'm looking for two things:

double-checking our alignment on the API and its implementation
help for making the remaining few design decisions (mostly how to use the actors pattern, and whether to switch away from the settlementVersion)

Once we have the decisions, I'll implement and smoke test them on the AlocationV2 code, so that I can then reach out to Moritz for a review.

Once that's done, I'll pull through the design through all APIs, and get the PR into a state, where we can ask app builders and registry operators to start implementing PoC's against the new APIs on their side.

token-standard/splice-api-token-utils-v2/daml/Splice/Api/Token/UtilsV2.daml

meiersi-da · 2026-03-13T14:01:19Z

token-standard/splice-api-token-allocation-v2/daml/Splice/Api/Token/AllocationV2.daml

+      --
+      -- Registries that require joint authorization for a withdrawal to complete SHOULD
+      -- set this to the empty list, and provide a registry specific UI to
+      -- initiate and complete the withdrawal.


Note: I'm not sure about this construction, it seems a bit too ad-hoc.

I'm though also wary about the generic construction where the possible actors for every choice are encoded in the view, as that requires a type of the form Map ActionId [[Party]], which can become large for rich action graphs.

meiersi-da · 2026-03-13T14:04:14Z

token-standard/splice-api-token-allocation-v2/daml/Splice/Api/Token/AllocationV2.daml

+      --
+      -- Additional versions may defined in future extensions of the token standard.
+      --
+    -- FIXME: consider whether we can replace this ^^ in favor of `extraSettlementAuthorizers`


I will give this a try. Left it as-is for now to get a first version into a reviewable state.

meiersi-da · 2026-03-13T15:36:10Z

daml/splice-amulet/daml/Splice/AmuletAllocationV2.daml

+      allocation_withdrawExtraObservers _arg = []
+
+      allocation_withdrawImpl self arg@(V2.Allocation_Withdraw{..}) = do
+        archive self


TODO: simplify the check using the canWithdraw information

meiersi-da · 2026-03-13T16:53:29Z

...n-standard/splice-token-standard-test-v2/daml/Splice/Tests/TestAmuletTokenDvP_V1V2Mixed.daml

+    feeLeg
+
+
+-- | Test that a DvP settlement of an OTC trade works when using Amulet via the token standard.


@bame-da: mixed version settlement worth reviewing together with the code used in the TradingAppV2 to manage the actors.

meiersi-da · 2026-03-13T16:54:37Z

token-standard/splice-api-token-allocation-v2/daml/Splice/Api/Token/AllocationV2.daml

@@ -1,18 +1,30 @@
 -- Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 -- SPDX-License-Identifier: Apache-2.0


@bame-da: worth reviewing in full. Apart from the FIXME's the API here is polished.

I expect that we want to get rid of the settlementVersion though; and I expect that we want to make a more consistent decision wrt actors vs. controller overrides.

meiersi-da · 2026-03-13T16:55:02Z

...andard/splice-api-token-allocation-request-v2/daml/Splice/Api/Token/AllocationRequestV2.daml

@@ -6,8 +6,6 @@
 -- for the purpose of settling a DvP or a payment as part of an app's workflow.
 module Splice.Api.Token.AllocationRequestV2 where


@bame-da: ready for review, but nothing surprising in here.

meiersi-da · 2026-03-13T16:57:02Z

...plice-api-token-allocation-instruction-v2/daml/Splice/Api/Token/AllocationInstructionV2.daml

 -- Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 -- SPDX-License-Identifier: Apache-2.0

-- | Interfaces to enable wallets to instruct the registry to create allocations.


@bame-da: this module is still a bit WIP. The main construction site is how to deal best with the actors pattern and different authorization policies by different registries. I don't think it's going to be terribly difficult. Just didn't have time to build a convincing solution proposal.

I suggest we first align on AllocationV2 + mixed version settlement + allocation request, before we finish this one.

meiersi-da · 2026-03-13T16:58:32Z

...standard/splice-token-standard-test-v2/daml/Splice/Testing/TokenStandard/WalletClientV2.daml

+  return [ reqView | (_, Some reqView) <- reqs ]
+
+
+-- | Accept the allocation request by authorizing the transfer of all its requested legs.


@bame-da: this is how I expect wallets to accept allocation requests. Worth reviewing to check alignment.

I haven't yet built the analoguous function for V1 requests. I expect it will work by creating one v1 allocation for every single leg.

meiersi-da added 13 commits March 5, 2026 15:14

Add PoC based on latest state of Bernhard's branch

252b090

Make PoC compile after rebase

51373e5

tests pass! *yay*

Reuse Lock and InstrumentId from V1

b03cdf8

Add type-class based conversion

647518b

Communicate action graph in transfer instr

bdd8a8a

partial work towards v1 transfer

793483b

Base Amulet implementation changes on V1

7d250ed

Add conversion of instrumentId and lock

f7245a6

make tests pass and polish conversion utilities

4a920e7

Use V1 views as the base impl. for Amulet

442148d

Switch to multiple actors on transfer instructions

0940950

Split AmuletAllocation and AmuletAllocationV2

59ccd8a

Remove accidentally committed file

cf7bdaf

meiersi-da marked this pull request as draft March 9, 2026 16:30

meiersi-da changed the base branch from meiersi/ts2/rebase/poc-provider-authz-on-tf to meiersi/ts2/rebase/copy-and-rename-only March 10, 2026 05:27

meiersi-da force-pushed the meiersi/ts2/rebase/poc-separate-amuletallocations branch from 8e1db7f to cf7bdaf Compare March 10, 2026 06:07

meiersi-da added 13 commits March 10, 2026 06:26

external amulet rules with inline two-step tfer

0af6c68

Revert "external amulet rules with inline two-step tfer"

7e81c90

This reverts commit 0af6c68.

Switch to a list of parties for the executors

8d00595

switch allocationfactory to actors

3ebb3cd

partial work towards V1/V2 alloc compatibility

6c749f6

partial implemenation of V2 on AmuletAllocation

1d76eb8

Move settlement implementation into generic utils

9968270

write generic mixed version settlement algorithm

ee846d3

Allow V2 settlemnt of V1 allocations

9e056ae

partial testing of mixed settlement

c802d88

Wrangle mixed version settlement into submissions

97115f8

... but its not pretty :/

script allocation request acceptance

383d48a

Introdue settlementVersion and settlementV1Authorizers

e3b2cf7

meiersi-da changed the base branch from meiersi/ts2/rebase/copy-and-rename-only to meiersi/ts2/rebase/poc-provider-authz-on-tf March 11, 2026 07:13

meiersi-da added 15 commits March 11, 2026 10:41

Move authorizer into allocation specification

162d2e4

Switch back to single executor; remove tryDowncast_allocation

8198acc

Ensure V2 settlement of V1 allocation always calls V1 choices

7cd5463

Implement AmuletAllocationV1's V2 withdraw

ad87379

Draft impl. of V1-based V2-alloc-cancel impl

7f978c8

Polish comments and types on allocation interface

68c3abf

PARTIAL work towards allocation factory polish

6ef6ed9

Move and polish SettlementFactory_SettleBatch

e08aa37

Remove HoldingMap, group settle result holdings by account

19ab00b

Split UtilsV2 into better scoped modules

9e5c8f2

Share public fetch implementations

ff8a584

Better structure and comments for defaultBatchSettleImpl

0ca9200

Use controllersOverride pattern for settleBatch

fd38730

Add more actor checks and self-archivals

84a5f64

Better names for default allocation implementations

0603a67

meiersi-da changed the base branch from meiersi/ts2/rebase/poc-provider-authz-on-tf to meiersi/ts2/rebase/copy-and-rename-only March 13, 2026 13:55

meiersi-da added 6 commits March 13, 2026 14:01

self-review

664828b

More self-review; polish AmuletAllocationV2 impl.

c9276a8

More allocation impl polish

efa8456

Polish TradingAppV2 - step 1

087fba9

Polish TradingApp: reuse AllocationRequestView

289b2d6

Polish test code

90e05fa

meiersi-da commented Mar 13, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

DO NOT MERGE: ts2 - split AmuletAllocation and AmuletAllocationV2 and polish V2#4337

DO NOT MERGE: ts2 - split AmuletAllocation and AmuletAllocationV2 and polish V2#4337
meiersi-da wants to merge 47 commits intomeiersi/ts2/rebase/copy-and-rename-onlyfrom
meiersi/ts2/rebase/poc-separate-amuletallocations

meiersi-da commented Mar 9, 2026

Uh oh!

meiersi-da left a comment

Uh oh!

Uh oh!

Uh oh!

meiersi-da Mar 13, 2026

Uh oh!

meiersi-da Mar 13, 2026

Uh oh!

meiersi-da Mar 13, 2026

Uh oh!

meiersi-da Mar 13, 2026

Uh oh!

meiersi-da Mar 13, 2026

Uh oh!

meiersi-da Mar 13, 2026

Uh oh!

meiersi-da Mar 13, 2026

Uh oh!

meiersi-da Mar 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

		feeLeg


		-- \| Test that a DvP settlement of an OTC trade works when using Amulet via the token standard.

		@@ -1,18 +1,30 @@
		-- Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
		-- SPDX-License-Identifier: Apache-2.0

		@@ -6,8 +6,6 @@
		-- for the purpose of settling a DvP or a payment as part of an app's workflow.
		module Splice.Api.Token.AllocationRequestV2 where

		return [ reqView \| (_, Some reqView) <- reqs ]


		-- \| Accept the allocation request by authorizing the transfer of all its requested legs.

Conversation

meiersi-da commented Mar 9, 2026

Pull Request Checklist

Cluster Testing

PR Guidelines

Merge Guidelines

Uh oh!

meiersi-da left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant