Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
53c87ee
Implement reward accounting v2 for CIP-104
meiersi-da Jan 27, 2026
2d3447c
Add FIXME on rewardCouponTTL
meiersi-da Mar 10, 2026
592cbc5
Remove reward sharing v2 code [ci]
meiersi-da Mar 31, 2026
734290e
Polish release notes [static]
meiersi-da Mar 31, 2026
1a49edf
Address comment typos and left-over FIXMEs [no ci]
meiersi-da Mar 31, 2026
6ca16bc
traffixPrice fix
dfordivam Apr 1, 2026
6eab3c9
Daml: headerCheck fixes, 2026 -> 2024
dfordivam Apr 6, 2026
3106227
Add trafficPrice, rewardConfig to SummarizingMiningRound
dfordivam Apr 13, 2026
7e01484
In runNextIssuance compute app rewards from app activity
dfordivam Apr 13, 2026
a90cf19
runNextIssuanceD: compute app reward coupons from traffic totals
dfordivam Apr 13, 2026
5ad5196
Add appRewardCouponThreshold to RewardConfig
dfordivam Apr 14, 2026
6705787
Bump versions
dfordivam Mar 27, 2026
387ddc4
Fix build.sbt
dfordivam Mar 27, 2026
c77520c
Ignore FeaturedAppRightV1 for headerCheck
dfordivam Apr 6, 2026
727abea
Add dars
dfordivam Apr 2, 2026
e3e3b63
Add new versions to DarResources
dfordivam Apr 2, 2026
48772d7
Update dars.lock
dfordivam Apr 2, 2026
ac28095
Update DarResources
dfordivam Apr 2, 2026
a0a166a
rewardConfig fixes
dfordivam Mar 30, 2026
4707b1d
Add Optional.empty for test defaults
dfordivam Mar 30, 2026
120c5e9
Bump versions in package.json
dfordivam Mar 30, 2026
caae2c4
Update package-lock.json
dfordivam Apr 2, 2026
8d78326
RewardConfig UI fixes
dfordivam Mar 30, 2026
4e2488b
SvDsoStore: Ingest RewardCouponV2, CalculateRewardsV2, ProcessRewardsV2
dfordivam Apr 3, 2026
9decefe
Remove fixme, to make CI green
dfordivam Apr 3, 2026
4fe35f3
[ci]
dfordivam Apr 14, 2026
a6121fc
Make beneficiary optional in RewardCouponV2
dfordivam Apr 15, 2026
a9b6c2a
SvDsoStore, rewardParty fix
dfordivam Apr 15, 2026
35c56f9
Add splice-api-reward-assignment-v1
dfordivam Apr 15, 2026
43efbdf
Build.sbt splice-api-reward-assignment-v1
dfordivam Apr 15, 2026
b80fcd6
docs splice-api-reward-assignment-v1
dfordivam Apr 15, 2026
cf19d8c
interface for RewardCouponV2
dfordivam Apr 15, 2026
65bd0cd
Use weight: Decimal
dfordivam Apr 15, 2026
a3c638e
Do batched process of coupons
dfordivam Apr 16, 2026
389093e
Return coupons grouped by party
dfordivam Apr 16, 2026
85ef8f9
Add MintingDelegation_AssignAndMint
dfordivam Apr 16, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ class AppUpgradeIntegrationTest
amuletConfig.featuredAppActivityMarkerAmount,
amuletConfig.optDevelopmentFundManager,
amuletConfig.externalPartyConfigStateTickDuration,
amuletConfig.rewardConfig,
)
val upgradeAction = new ARC_AmuletRules(
new CRARC_SetConfig(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ class BootstrapPackageConfigIntegrationTest
amuletConfig.featuredAppActivityMarkerAmount,
amuletConfig.optDevelopmentFundManager,
amuletConfig.externalPartyConfigStateTickDuration,
amuletConfig.rewardConfig,
)

val upgradeAction = new ARC_AmuletRules(
Expand Down Expand Up @@ -382,6 +383,7 @@ class BootstrapPackageConfigIntegrationTest
amuletConfig.featuredAppActivityMarkerAmount,
amuletConfig.optDevelopmentFundManager,
amuletConfig.externalPartyConfigStateTickDuration,
amuletConfig.rewardConfig,
)

val upgradeAction = new ARC_AmuletRules(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,7 @@ class DevelopmentFundFrontendTimeBasedIntegrationTest
existingConfig.featuredAppActivityMarkerAmount,
Optional.of(newDfm.toProtoPrimitive),
existingConfig.externalPartyConfigStateTickDuration,
existingConfig.rewardConfig,
)

val action = new ARC_AmuletRules(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ class SvReconcileSynchronizerConfigIntegrationTest extends SvIntegrationTestBase
amuletConfig.featuredAppActivityMarkerAmount,
amuletConfig.optDevelopmentFundManager,
amuletConfig.externalPartyConfigStateTickDuration,
amuletConfig.rewardConfig,
)

}
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@ class SvStateManagementIntegrationTest extends SvIntegrationTestBase with Trigge
initialConfig.featuredAppActivityMarkerAmount,
initialConfig.optDevelopmentFundManager,
initialConfig.externalPartyConfigStateTickDuration,
initialConfig.rewardConfig,
)

val (_, voteRequestCid) = actAndCheck(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ class UnsupportedPackageVettingIntegrationTest
currentConfig.featuredAppActivityMarkerAmount,
currentConfig.optDevelopmentFundManager,
currentConfig.externalPartyConfigStateTickDuration,
currentConfig.rewardConfig,
)
setAmuletConfig(Seq((None, newAmuletConfig, currentConfig)))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ trait AmuletConfigUtil extends TestCommon {
existingAmuletConfig.featuredAppActivityMarkerAmount,
existingAmuletConfig.optDevelopmentFundManager,
existingAmuletConfig.externalPartyConfigStateTickDuration,
existingAmuletConfig.rewardConfig,
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,13 @@ export function getAmuletRulesConfig(
featuredAppActivityMarkerAmount: null,
optDevelopmentFundManager: null,
externalPartyConfigStateTickDuration: null,
rewardConfig: {
mintingVersion: 'RewardVersion_FeaturedAppMarkers',
dryRunVersion: null,
batchSize: '100',
rewardCouponTimeToLive: { microseconds: '129600000000' },
appRewardCouponThreshold: '0.5',
},
};
}

Expand Down Expand Up @@ -394,6 +401,17 @@ export function getExpectedAmuletRulesConfigDiffsHTML(
"validatorLifecycle": "0.1.2",
"wallet": "0.1.8",
"walletPayments": "0.1.8"
}</pre></div></li><li data-key="rewardConfig"
class="jsondiffpatch-unchanged"><div
class="jsondiffpatch-property-name">rewardConfig</div><div
class="jsondiffpatch-value"><pre>{
"mintingVersion": "RewardVersion_FeaturedAppMarkers",
"dryRunVersion": null,
"batchSize": "100",
"rewardCouponTimeToLive": {
"microseconds": "129600000000"
},
"appRewardCouponThreshold": "0.5"
}</pre></div></li><li data-key="tickDuration"
class="jsondiffpatch-unchanged"><div
class="jsondiffpatch-property-name">tickDuration</div><div
Expand Down
1 change: 1 addition & 0 deletions apps/common/frontend/src/__tests__/mocks/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ export const plannedVoteResult: DsoRules_CloseVoteRequestResult = {
featuredAppActivityMarkerAmount: null,
optDevelopmentFundManager: null,
externalPartyConfigStateTickDuration: null,
rewardConfig: null,
},
},
},
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@ object SpliceUtil {
initialExternalPartyConfigStateTickDuration
.map(t => new RelTime(TimeUnit.NANOSECONDS.toMicros(t.duration.toNanos)))
.toJava,
Optional.empty(), // rewardConfig
)

def defaultAnsConfig(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,8 @@ abstract class StoreTestBase
SpliceUtil.defaultTransferConfig(10, holdingFee),
SpliceUtil.issuanceConfig(10.0, 10.0, 10.0),
new RelTime(1_000_000),
Optional.empty(), // trafficPrice
Optional.empty(), // rewardConfig
)

contract(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ object DarResources {
lazy val amulet_0_1_15 = DarResource("splice-amulet-0.1.15.dar")
lazy val amulet_0_1_16 = DarResource("splice-amulet-0.1.16.dar")
lazy val amulet_0_1_17 = DarResource("splice-amulet-0.1.17.dar")
lazy val amulet_0_1_18 = DarResource("splice-amulet-0.1.18.dar")
lazy val amulet_current = DarResource("splice-amulet-current.dar")
lazy val amulet = PackageResource(
amulet_current,
Expand All @@ -105,6 +106,7 @@ object DarResources {
amulet_0_1_15,
amulet_0_1_16,
amulet_0_1_17,
amulet_0_1_18,
),
)

Expand Down Expand Up @@ -133,6 +135,7 @@ object DarResources {
lazy val dsoGovernance_0_1_22 = DarResource("splice-dso-governance-0.1.22.dar")
lazy val dsoGovernance_0_1_23 = DarResource("splice-dso-governance-0.1.23.dar")
lazy val dsoGovernance_0_1_24 = DarResource("splice-dso-governance-0.1.24.dar")
lazy val dsoGovernance_0_1_25 = DarResource("splice-dso-governance-0.1.25.dar")
lazy val dsoGovernance_current = DarResource("splice-dso-governance-current.dar")
lazy val dsoGovernance = PackageResource(
dsoGovernance_current,
Expand Down Expand Up @@ -163,6 +166,7 @@ object DarResources {
dsoGovernance_0_1_22,
dsoGovernance_0_1_23,
dsoGovernance_0_1_24,
dsoGovernance_0_1_25,
),
)

Expand All @@ -185,6 +189,7 @@ object DarResources {
lazy val amuletNameService_0_1_16 = DarResource("splice-amulet-name-service-0.1.16.dar")
lazy val amuletNameService_0_1_17 = DarResource("splice-amulet-name-service-0.1.17.dar")
lazy val amuletNameService_0_1_18 = DarResource("splice-amulet-name-service-0.1.18.dar")
lazy val amuletNameService_0_1_19 = DarResource("splice-amulet-name-service-0.1.19.dar")
lazy val amuletNameService_current = DarResource("splice-amulet-name-service-current.dar")
lazy val amuletNameService = PackageResource(
amuletNameService_current,
Expand All @@ -209,6 +214,7 @@ object DarResources {
amuletNameService_0_1_16,
amuletNameService_0_1_17,
amuletNameService_0_1_18,
amuletNameService_0_1_19,
),
)

Expand All @@ -231,6 +237,7 @@ object DarResources {
lazy val splitwell_0_1_16 = DarResource("splitwell-0.1.16.dar")
lazy val splitwell_0_1_17 = DarResource("splitwell-0.1.17.dar")
lazy val splitwell_0_1_18 = DarResource("splitwell-0.1.18.dar")
lazy val splitwell_0_1_19 = DarResource("splitwell-0.1.19.dar")
lazy val splitwell_current = DarResource("splitwell-current.dar")
lazy val splitwell = PackageResource(
splitwell_current,
Expand All @@ -255,6 +262,7 @@ object DarResources {
splitwell_0_1_16,
splitwell_0_1_17,
splitwell_0_1_18,
splitwell_0_1_19,
),
)

Expand All @@ -277,6 +285,7 @@ object DarResources {
lazy val wallet_0_1_16 = DarResource("splice-wallet-0.1.16.dar")
lazy val wallet_0_1_17 = DarResource("splice-wallet-0.1.17.dar")
lazy val wallet_0_1_18 = DarResource("splice-wallet-0.1.18.dar")
lazy val wallet_0_1_19 = DarResource("splice-wallet-0.1.19.dar")
lazy val wallet_current = DarResource("splice-wallet-current.dar")
lazy val wallet = PackageResource(
wallet_current,
Expand All @@ -301,6 +310,7 @@ object DarResources {
wallet_0_1_16,
wallet_0_1_17,
wallet_0_1_18,
wallet_0_1_19,
),
)

Expand All @@ -322,6 +332,7 @@ object DarResources {
lazy val walletPayments_0_1_15 = DarResource("splice-wallet-payments-0.1.15.dar")
lazy val walletPayments_0_1_16 = DarResource("splice-wallet-payments-0.1.16.dar")
lazy val walletPayments_0_1_17 = DarResource("splice-wallet-payments-0.1.17.dar")
lazy val walletPayments_0_1_18 = DarResource("splice-wallet-payments-0.1.18.dar")
lazy val walletPayments_current = DarResource("splice-wallet-payments-current.dar")
lazy val walletPayments = PackageResource(
walletPayments_current,
Expand All @@ -345,6 +356,7 @@ object DarResources {
walletPayments_0_1_15,
walletPayments_0_1_16,
walletPayments_0_1_17,
walletPayments_0_1_18,
),
)

Expand Down
Loading
Loading