Skip to content

CIP-104: Daml for rewards accounting V2 and sv-app UI fixes#4724

Open
dfordivam wants to merge 22 commits into
mainfrom
dfordivam/cip-104-sv-app-rewards
Open

CIP-104: Daml for rewards accounting V2 and sv-app UI fixes#4724
dfordivam wants to merge 22 commits into
mainfrom
dfordivam/cip-104-sv-app-rewards

Conversation

@dfordivam
Copy link
Copy Markdown
Contributor

@dfordivam dfordivam commented Mar 30, 2026

Fixes: https://github.com/hyperledger-labs/splice/issues/4804

This is the base branch for all the work to be done as part of https://github.com/hyperledger-labs/splice/issues/4802

This branch consists of

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.
  • If a logical synchronizer upgrade test is required (from canton-3.5), comment /lsu_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).

@dfordivam dfordivam self-assigned this Mar 30, 2026
@dfordivam dfordivam force-pushed the dfordivam/cip-104-sv-app-rewards branch 3 times, most recently from d248a0c to 60f71eb Compare April 2, 2026 07:11
@dfordivam dfordivam changed the base branch from main to canton-3.5 April 2, 2026 07:16
@dfordivam dfordivam force-pushed the dfordivam/cip-104-sv-app-rewards branch from 5968dbc to 46f8940 Compare April 3, 2026 00:51
@dfordivam
Copy link
Copy Markdown
Contributor Author

dfordivam commented Apr 3, 2026

@meiersi-da @adetokunbo Please note this branch( dfordivam/cip-104-sv-app-rewards) is now ready for use as a base for the subsequent work requiring daml changes. (cc @rautenrieth-da )

The SV-app UI support for doing the config change submission is minimal, ie no dropdowns for enum fields. This matched the existing UI for other fields in the config.
I tried but not could not confirm if the SV UI is able to do the rewardConfig fields modifications via vote, due to unrelated failures (CORS issues, breaking governance UI). Though I could submit a vote for doing the change via SV1, which at least shows that ledger accepted the vote request. If the user makes a typo, the submission of vote request would fail.

The static tests are failing due to headerCheck. I also posted in slack that this cannot be fixed without also affecting splice-api-featured-app-v1 package. So I will keep this as it is for now. (Edit: fixed via c9c8822)

Finally there isn't much to review here, and I will keep this PR open in draft mode open for running the CI whenever I do a rebase.

@dfordivam dfordivam force-pushed the dfordivam/cip-104-sv-app-rewards branch from a8364c3 to 015da60 Compare April 6, 2026 04:17
@meiersi-da
Copy link
Copy Markdown
Contributor

The static tests are failing due to headerCheck. I also posted in slack that this cannot be fixed without also affecting splice-api-featured-app-v1 package. So I will keep this as it is for now. (Edit: fixed via c9c8822)

Feel free to change the static header check to ignore the splice-api packages, if the fix for this issue by @isegall-da is not merged in on main for your PR:

@dfordivam dfordivam force-pushed the dfordivam/cip-104-sv-app-rewards branch from 015da60 to 393875a Compare April 8, 2026 02:06
@dfordivam dfordivam changed the base branch from canton-3.5 to main April 8, 2026 02:07
@dfordivam dfordivam changed the title IGNORE: CI for cip 104 sv app rewards daml changes CIP-104: Daml + sv-app UI fixes Apr 13, 2026
@dfordivam dfordivam force-pushed the dfordivam/cip-104-sv-app-rewards branch from 393875a to 8a10977 Compare April 13, 2026 05:00
@dfordivam dfordivam marked this pull request as ready for review April 13, 2026 05:00
@dfordivam dfordivam requested a review from meiersi-da April 13, 2026 05:03
@dfordivam dfordivam force-pushed the dfordivam/cip-104-sv-app-rewards branch from 8a10977 to 53845ec Compare April 14, 2026 03:07
Copy link
Copy Markdown
Contributor

@meiersi-da meiersi-da left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot. Looks good.

I can't approve as your base branch is set to main. We don't want to merge this to main. If you set your base branch to the feature banch, and make this a normal PR against that feature branch I can approve, and you'll still get a CI run; and you can then merge using squash merge to get the one CI checked commit.

@dfordivam dfordivam force-pushed the dfordivam/cip-104-sv-app-rewards branch 2 times, most recently from 18ce6f5 to 4fe35f3 Compare April 14, 2026 09:22
@dfordivam
Copy link
Copy Markdown
Contributor Author

I reordered the commits, and squashed the multiple .lock, darResouces updates. Confirmed that no diffs were introduced.

If you set your base branch to the feature banch, and make this a normal PR against that feature branch I can approve, and you'll still get a CI run; and you can then merge using squash merge to get the one CI checked commit.

At the moment I feel that keeping the entire commit history intact is better, once Tim's branch is merged on main, I will again need to do version bumps, and as discussed today more daml changes would need to happen for the reward-sharing work.

@meiersi-da
Copy link
Copy Markdown
Contributor

I reordered the commits, and squashed the multiple .lock, darResouces updates. Confirmed that no diffs were introduced.

If you set your base branch to the feature banch, and make this a normal PR against that feature branch I can approve, and you'll still get a CI run; and you can then merge using squash merge to get the one CI checked commit.

At the moment I feel that keeping the entire commit history intact is better, once Tim's branch is merged on main, I will again need to do version bumps, and as discussed today more daml changes would need to happen for the reward-sharing work.

Fine with me 👍

@dfordivam dfordivam force-pushed the dfordivam/cip-104-sv-app-rewards branch 3 times, most recently from 54a0a93 to 8f7f2d1 Compare April 20, 2026 02:50
Comment thread build.sbt Outdated
@dfordivam dfordivam force-pushed the dfordivam/cip-104-sv-app-rewards branch from 8f7f2d1 to 2c49978 Compare April 20, 2026 03:13
@dfordivam dfordivam force-pushed the dfordivam/cip-104-sv-app-rewards branch from 2c49978 to a084d76 Compare May 4, 2026 08:22
@dfordivam dfordivam requested a review from a team as a code owner May 4, 2026 08:22
@dfordivam
Copy link
Copy Markdown
Contributor Author

Summary of rebase

  • Squashed five commits from Simon (25d1e1f, 247fa31, 275c3b5, 0a6d819, 3ee2113) into d9b7ede. The squashed commit combines the add + remove of the reward-sharing interface code making the rebase easier. And it no longer modifies build.sbt.
  • Add new commit d192a64 to Replace deprecated submitMulti with submit
  • Removed following commits as they are no longer needed
    • aee423b Fix build.sbt
    • 6142aa1 Ignore FeaturedAppRightV1 for headerCheck
    • f6a6841 Add new versions to DarResources
  • Squashed 0d8c167 in ee61515 to fix build

@dfordivam dfordivam force-pushed the dfordivam/cip-104-sv-app-rewards branch from 526019b to 98dc8bf Compare May 19, 2026 06:27
@dfordivam dfordivam force-pushed the dfordivam/cip-104-sv-app-rewards branch from 28c429f to 2ba72d8 Compare May 22, 2026 07:51
@dfordivam
Copy link
Copy Markdown
Contributor Author

@meiersi-da This is now ready for review, it has all the daml changes. I have added the following commits

553a8e3 * Fix link to "SV Longterm schedule"
b4d8b10 * Add latest daml versions
f75e55c * Rename migration
822d0b9 * Traffic-Based App Rewards: Fix hashing of batches (#5193)

And dropped this commit, as we don't need it (and it was later replaced/fixed in another branch)
e6e4763 SvDsoStore: Ingest RewardCouponV2, CalculateRewardsV2, ProcessRewardsV2

@dfordivam dfordivam changed the title CIP-104: Daml + sv-app UI fixes CIP-104: Daml for rewards accounting V2 and sv-app UI fixes May 22, 2026
@dfordivam
Copy link
Copy Markdown
Contributor Author

Release notes

2026-05-22-170614_screenshot

Copy link
Copy Markdown
Contributor

@meiersi-da meiersi-da left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice! Thank you for getting us here @dfordivam !

Comment thread apps/common/frontend-test-handlers/src/mocks/helpers/amulet-config-helper.ts Outdated
Comment thread apps/package-lock.json
meiersi-da and others added 21 commits May 27, 2026 01:05
[static]

Signed-off-by: Divam <dfordivam@gmail.com>

Add FIXME on rewardCouponTTL

Signed-off-by: Divam <dfordivam@gmail.com>

Remove reward sharing v2 code [ci]

It will be added in a separate PR

Signed-off-by: Simon Meier <simon@digitalasset.com>

Polish release notes [static]

Signed-off-by: Simon Meier <simon@digitalasset.com>

Address comment typos and left-over FIXMEs [no ci]

Signed-off-by: Simon Meier <simon@digitalasset.com>
Signed-off-by: Divam <dfordivam@gmail.com>
Signed-off-by: Divam <dfordivam@gmail.com>
Signed-off-by: Divam <dfordivam@gmail.com>
Signed-off-by: Divam <dfordivam@gmail.com>
For traffic-based app rewards perform the computation of featured app
reward coupons from the total app activity for the round. This matched
the actual reward computation flow.

Signed-off-by: Divam <dfordivam@gmail.com>
Signed-off-by: Divam <dfordivam@gmail.com>
Signed-off-by: Divam <dfordivam@gmail.com>
Signed-off-by: Divam <dfordivam@gmail.com>
Signed-off-by: Divam <dfordivam@gmail.com>
Signed-off-by: Divam <dfordivam@gmail.com>
Signed-off-by: Divam <dfordivam@gmail.com>
Signed-off-by: Divam <dfordivam@gmail.com>
Signed-off-by: Divam <dfordivam@gmail.com>
Signed-off-by: Divam <dfordivam@gmail.com>
in ClaimExpiredRewardsV2 require actual expiryObservers

---------

Signed-off-by: Divam <dfordivam@gmail.com>
Signed-off-by: Tim Emiola <adetokunbo@emio.la>
Signed-off-by: Divam <dfordivam@gmail.com>
Signed-off-by: Divam <dfordivam@gmail.com>
Signed-off-by: Divam <dfordivam@gmail.com>
Signed-off-by: Divam <dfordivam@gmail.com>
@dfordivam dfordivam force-pushed the dfordivam/cip-104-sv-app-rewards branch from 2ba72d8 to cc01bce Compare May 27, 2026 02:41
Signed-off-by: Divam <dfordivam@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants