CIP-104: Daml for rewards accounting V2 and sv-app UI fixes#4724
CIP-104: Daml for rewards accounting V2 and sv-app UI fixes#4724dfordivam wants to merge 22 commits into
Conversation
d248a0c to
60f71eb
Compare
5968dbc to
46f8940
Compare
|
@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.
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. |
a8364c3 to
015da60
Compare
Feel free to change the static header check to ignore the |
015da60 to
393875a
Compare
393875a to
8a10977
Compare
8a10977 to
53845ec
Compare
meiersi-da
left a comment
There was a problem hiding this comment.
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.
18ce6f5 to
4fe35f3
Compare
|
I reordered the commits, and squashed the multiple .lock, darResouces updates. Confirmed that no diffs were introduced.
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 👍 |
54a0a93 to
8f7f2d1
Compare
8f7f2d1 to
2c49978
Compare
2c49978 to
a084d76
Compare
|
Summary of rebase
|
526019b to
98dc8bf
Compare
28c429f to
2ba72d8
Compare
|
@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" And dropped this commit, as we don't need it (and it was later replaced/fixed in another branch) |
meiersi-da
left a comment
There was a problem hiding this comment.
Very nice! Thank you for getting us here @dfordivam !
[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>
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>
2ba72d8 to
cc01bce
Compare
Signed-off-by: Divam <dfordivam@gmail.com>

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
DAML changes
trafficPrice,rewardConfigtoSummarizingMiningRoundappRewardCouponThreshold : DecimaltoRewardConfigrunNextIssuanceandrunNextIssuanceDVersion bumps, + dars
SV UI fixes to allow 'rewardConfig' change voting
Fixes done as part of Traffic-Based App Rewards: Fix hashing of batches #5193
Pull Request Checklist
Cluster Testing
/cluster_teston this PR to request it, and ping someone with access to the DA-internal system to approve it./hdm_teston this PR to request it, and ping someone with access to the DA-internal system to approve it./lsu_teston this PR to request it, and ping someone with access to the DA-internal system to approve it.PR Guidelines
Fixes #n, and mention issues worked on using#nMerge Guidelines