diff --git a/protocol/0056-REWA-rewards_overview.md b/protocol/0056-REWA-rewards_overview.md index d3a515392..400e1242e 100644 --- a/protocol/0056-REWA-rewards_overview.md +++ b/protocol/0056-REWA-rewards_overview.md @@ -431,8 +431,8 @@ Run for another epoch with no fee generated. Expect no transfer to be made to th When a party earns locked rewards (in governance token), they are transferred into the party's vesting account account but locked for the appropriate period before vesting. The rewards in the vesting and vested account (both locked and unlocked) should count toward the party's staking balance and they can be [staked](0059-STKG-simple_staking_and_delegating.md). -- When a party receives a governance token reward that is locked, the [LOCKED_FOR_STAKING] balance for the party is incremented by the corresponding amount. (0056-REWA-220). -- Total balance of the governance asset in the [LOCKED_FOR_STAKING] account counts towards the party's staking balance and can be nominated to a validator and earn staking rewards. (0056-REWA-221). +- When a party receives a governance token reward that is locked, the [LOCKED_FOR_STAKING] balance for the party is incremented by the corresponding amount. (0056-REWA-246). +- Total balance of the governance asset in the [LOCKED_FOR_STAKING] account counts towards the party's staking balance and can be nominated to a validator and earn staking rewards. (0056-REWA-247). ### Distributing fees paid rewards (0056-REWA-010) @@ -1100,24 +1100,20 @@ At the end of epoch 2, 10000 VEGA rewards should be distributed to the `ETHUSDT` - `DISPATCH_METRIC_MAKER_FEES_PAID` (0056-REWA-201). - `DISPATCH_METRIC_MAKER_FEES_RECEIVED` (0056-REWA-202). - `DISPATCH_METRIC_LP_FEES_RECEIVED` (0056-REWA-203). - - `DISPATCH_METRIC_MAKER_FEES_RECEIVED` (0056-REWA-204). - `DISPATCH_METRIC_MARKET_VALUE` (0056-REWA-205). - `DISPATCH_METRIC_AVERAGE_POSITION` (0056-REWA-206). - `DISPATCH_METRIC_RELATIVE_RETURN` (0056-REWA-207). - `DISPATCH_METRIC_RETURN_VOLATILITY` (0056-REWA-208). - - `DISPATCH_METRIC_VALIDATOR_RANKING` (0056-REWA-209). - `DISPATCH_METRIC_REALISED_RETURN` (0056-REWA-210). - Given the following dispatch metrics, if an `eligible keys` list is specified in the recurring transfer, only parties included in the list and meeting other eligibility criteria should receive a score (if they meet the criteria for one): - `DISPATCH_METRIC_MAKER_FEES_PAID` (0056-REWA-211). - `DISPATCH_METRIC_MAKER_FEES_RECEIVED` (0056-REWA-212). - `DISPATCH_METRIC_LP_FEES_RECEIVED` (0056-REWA-213). - - `DISPATCH_METRIC_MAKER_FEES_RECEIVED` (0056-REWA-214). - `DISPATCH_METRIC_MARKET_VALUE` (0056-REWA-215). - `DISPATCH_METRIC_AVERAGE_POSITION` (0056-REWA-216). - `DISPATCH_METRIC_RELATIVE_RETURN` (0056-REWA-217). - `DISPATCH_METRIC_RETURN_VOLATILITY` (0056-REWA-218). - - `DISPATCH_METRIC_VALIDATOR_RANKING` (0056-REWA-219). - `DISPATCH_METRIC_REALISED_RETURN` (0056-REWA-220). - Given an `eligible keys` list is specified, live data should only be published for keys in that list (0056-REWA-221). @@ -1231,37 +1227,37 @@ At the end of epoch 2, 10000 VEGA rewards should be distributed to the `ETHUSDT` #### Specifying valid/invalid values -- If a `target_notional_volume` is not specified, the full transfer amount should be paid out regardless of the volume. (0056-REWA-200). -- If a `target_notional_volume` is specified but the value is zero. The transfer should be rejected. (0056-REWA-201). -- If a `target_notional_volume` is specified, the dispatch metric is for eligible entities rewards and an `asset_for_metric` is specified, the transfer should be accepted. (0056-REWA-202). -- If a `target_notional_volume` is specified, the dispatch metric is for eligible entities rewards and an `asset_for_metric` is **not** specified, the transfer should be rejected. (0056-REWA-203). -- If a `target_notional_volume` is specified and the dispatch metric is for market creation rewards, the transfer should be rejected. (0056-REWA-204). -- If a `target_notional_volume` is specified and the dispatch metric is for validator ranking rewards, the transfer should be rejected. (0056-REWA-205). +- If a `target_notional_volume` is not specified, the full transfer amount should be paid out regardless of the volume. (0056-REWA-226). +- If a `target_notional_volume` is specified but the value is zero. The transfer should be rejected. (0056-REWA-227). +- If a `target_notional_volume` is specified, the dispatch metric is for eligible entities rewards and an `asset_for_metric` is specified, the transfer should be accepted. (0056-REWA-228). +- If a `target_notional_volume` is specified, the dispatch metric is for eligible entities rewards and an `asset_for_metric` is **not** specified, the transfer should be rejected. (0056-REWA-229). +- If a `target_notional_volume` is specified and the dispatch metric is for market creation rewards, the transfer should be rejected. (0056-REWA-230). +- If a `target_notional_volume` is specified and the dispatch metric is for validator ranking rewards, the transfer should be rejected. (0056-REWA-231). #### Interactions with scoping markets -- Given a recurring transfer scoping a single market and specifying a non-zero `target_notional_volume`. If that market's volume is less than the target, the rewards distributed are scaled accordingly. (0056-REWA-206). -- Given a recurring transfer scoping a single market and specifying a non-zero `target_notional_volume`. If that market's volume is greater than the target, no more than the full reward amount is distributed. (0056-REWA-207). +- Given a recurring transfer scoping a single market and specifying a non-zero `target_notional_volume`. If that market's volume is less than the target, the rewards distributed are scaled accordingly. (0056-REWA-232). +- Given a recurring transfer scoping a single market and specifying a non-zero `target_notional_volume`. If that market's volume is greater than the target, no more than the full reward amount is distributed. (0056-REWA-233). -- Given a recurring transfer scoping multiple markets and specifying a non-zero `target_notional_volume`. When the volume is spread evenly across the markets, if the cumulative volume is less than the target, the rewards distributed are scaled accordingly (participants in each market with the same score should receive the same amount of rewards). (0056-REWA-208). -- Given a recurring transfer scoping multiple markets and specifying a non-zero `target_notional_volume`. When the volume is spread evenly across the markets, if the cumulative volume is greater than the target, no more than the full reward amount is distributed (participants in each market with the same score should receive the same amount of rewards). (0056-REWA-209). +- Given a recurring transfer scoping multiple markets and specifying a non-zero `target_notional_volume`. When the volume is spread evenly across the markets, if the cumulative volume is less than the target, the rewards distributed are scaled accordingly (participants in each market with the same score should receive the same amount of rewards). (0056-REWA-234). +- Given a recurring transfer scoping multiple markets and specifying a non-zero `target_notional_volume`. When the volume is spread evenly across the markets, if the cumulative volume is greater than the target, no more than the full reward amount is distributed (participants in each market with the same score should receive the same amount of rewards). (0056-REWA-235). -- Given a recurring transfer scoping multiple markets and specifying a non-zero `target_notional_volume`. When the volume is spread unevenly across the markets, if the cumulative volume is less than the target, the rewards distributed are scaled accordingly (participants in each market with the same score should **STILL** receive the same amount of rewards). (0056-REWA-210). -- Given a recurring transfer scoping multiple markets and specifying a non-zero `target_notional_volume`. When the volume is spread unevenly across the markets, if the cumulative volume is greater than the target, no more than the full reward amount is distributed (participants in each market with the same score should **STILL** receive the same amount of rewards). (0056-REWA-211). +- Given a recurring transfer scoping multiple markets and specifying a non-zero `target_notional_volume`. When the volume is spread unevenly across the markets, if the cumulative volume is less than the target, the rewards distributed are scaled accordingly (participants in each market with the same score should **STILL** receive the same amount of rewards). (0056-REWA-236). +- Given a recurring transfer scoping multiple markets and specifying a non-zero `target_notional_volume`. When the volume is spread unevenly across the markets, if the cumulative volume is greater than the target, no more than the full reward amount is distributed (participants in each market with the same score should **STILL** receive the same amount of rewards). (0056-REWA-237). -- Given a recurring transfer scoping multiple markets and specifying a non-zero `target_notional_volume`. When the volume is zero in one market, if the cumulative volume is less than the target, the rewards distributed are scaled accordingly (participants in each market with the same score should **STILL** receive the same amount of rewards including the market which contributed no volume). (0056-REWA-212). -- Given a recurring transfer scoping multiple markets and specifying a non-zero `target_notional_volume`. When the volume is zero in one market, if the cumulative volume is greater than the target, no more than the full reward amount is distributed (participants in each market with the same score should **STILL** receive the same amount of rewards including the market which contributed no volume). (0056-REWA-213). +- Given a recurring transfer scoping multiple markets and specifying a non-zero `target_notional_volume`. When the volume is zero in one market, if the cumulative volume is less than the target, the rewards distributed are scaled accordingly (participants in each market with the same score should **STILL** receive the same amount of rewards including the market which contributed no volume). (0056-REWA-238). +- Given a recurring transfer scoping multiple markets and specifying a non-zero `target_notional_volume`. When the volume is zero in one market, if the cumulative volume is greater than the target, no more than the full reward amount is distributed (participants in each market with the same score should **STILL** receive the same amount of rewards including the market which contributed no volume). (0056-REWA-239). #### Interactions with reward windows -- Given a recurring transfer with a reward window `>1` and specifying a non-zero `target_notional_volume`. When the volume is spread evenly across the window, if the cumulative volume across the window is less than the target, the rewards distributed are scaled accordingly. (0056-REWA-214). -- Given a recurring transfer with a reward window `>1` and specifying a non-zero `target_notional_volume`. When the volume is spread evenly across the window, if the cumulative volume across the window is greater than the target, no more than the full reward amount is distributed. (0056-REWA-215). +- Given a recurring transfer with a reward window `>1` and specifying a non-zero `target_notional_volume`. When the volume is spread evenly across the window, if the cumulative volume across the window is less than the target, the rewards distributed are scaled accordingly. (0056-REWA-240). +- Given a recurring transfer with a reward window `>1` and specifying a non-zero `target_notional_volume`. When the volume is spread evenly across the window, if the cumulative volume across the window is greater than the target, no more than the full reward amount is distributed. (0056-REWA-241). -- Given a recurring transfer with a reward window `>1` and specifying a non-zero `target_notional_volume`. When the volume is spread unevenly across the window, if the cumulative volume across the window is less than the target, the rewards distributed are scaled accordingly. (0056-REWA-216). -- Given a recurring transfer with a reward window `>1` and specifying a non-zero `target_notional_volume`. When the volume is spread unevenly across the window, if the cumulative volume across the window is greater than the target, no more than the full reward amount is **still** distributed. (0056-REWA-217). +- Given a recurring transfer with a reward window `>1` and specifying a non-zero `target_notional_volume`. When the volume is spread unevenly across the window, if the cumulative volume across the window is less than the target, the rewards distributed are scaled accordingly. (0056-REWA-242). +- Given a recurring transfer with a reward window `>1` and specifying a non-zero `target_notional_volume`. When the volume is spread unevenly across the window, if the cumulative volume across the window is greater than the target, no more than the full reward amount is **still** distributed. (0056-REWA-243). -- Given a recurring transfer with a reward window `>1` and specifying a non-zero `target_notional_volume`. When the volume is zero in the current epoch, if the cumulative volume across the window is less than the target, the rewards distributed are scaled accordingly. (0056-REWA-218). -- Given a recurring transfer with a reward window `>1` and specifying a non-zero `target_notional_volume`. When the volume is zero in the current epoch, if the cumulative volume across the window is greater than the target, no more than the full reward amount is **still** distributed. (0056-REWA-219). +- Given a recurring transfer with a reward window `>1` and specifying a non-zero `target_notional_volume`. When the volume is zero in the current epoch, if the cumulative volume across the window is less than the target, the rewards distributed are scaled accordingly. (0056-REWA-244). +- Given a recurring transfer with a reward window `>1` and specifying a non-zero `target_notional_volume`. When the volume is zero in the current epoch, if the cumulative volume across the window is greater than the target, no more than the full reward amount is **still** distributed. (0056-REWA-245). ### Spot markets diff --git a/protocol/0057-TRAN-transfers.md b/protocol/0057-TRAN-transfers.md index 000283e19..4a83ea363 100644 --- a/protocol/0057-TRAN-transfers.md +++ b/protocol/0057-TRAN-transfers.md @@ -422,6 +422,3 @@ If a party sets up a recurring transfer with a transfer interval strictly greate A recurring transfer to a reward account with entity scope set to individuals and individual scope set to `INDIVIDUAL_SCOPE_AMM` will only be divided amongst AMM parties based on their score in the relevant metric (0057-TRAN-080) s -A recurring transfer to a reward account specifying a set of eligible keys should be rejected if their are zero keys listed (0057-TRAN-081). - -A recurring transfer to a reward account specifying a set of eligible keys should be accepted if their are more than zero keys listed (0057-TRAN-082). diff --git a/protocol/features.json b/protocol/features.json index b1b43205f..6ac7f0a2c 100644 --- a/protocol/features.json +++ b/protocol/features.json @@ -606,29 +606,24 @@ "0056-REWA-201", "0056-REWA-202", "0056-REWA-203", - "0056-REWA-204", "0056-REWA-205", "0056-REWA-206", "0056-REWA-207", "0056-REWA-208", - "0056-REWA-209", "0056-REWA-210", "0056-REWA-211", "0056-REWA-212", "0056-REWA-213", - "0056-REWA-214", "0056-REWA-215", "0056-REWA-216", "0056-REWA-217", "0056-REWA-218", - "0056-REWA-219", "0056-REWA-220", "0056-REWA-221", "0056-REWA-222", "0056-REWA-223", "0056-REWA-224", - "0057-TRAN-081", - "0057-TRAN-082" + "0056-REWA-225" ] }, "LP 3.0": { @@ -688,26 +683,26 @@ "Reward Scaling": { "milestone": "suzuka_castle_II", "acs": [ - "0056-REWA-200", - "0056-REWA-201", - "0056-REWA-202", - "0056-REWA-203", - "0056-REWA-204", - "0056-REWA-205", - "0056-REWA-206", - "0056-REWA-207", - "0056-REWA-208", - "0056-REWA-209", - "0056-REWA-210", - "0056-REWA-211", - "0056-REWA-212", - "0056-REWA-213", - "0056-REWA-214", - "0056-REWA-215", - "0056-REWA-216", - "0056-REWA-217", - "0056-REWA-218", - "0056-REWA-219" + "0056-REWA-226", + "0056-REWA-227", + "0056-REWA-228", + "0056-REWA-229", + "0056-REWA-230", + "0056-REWA-231", + "0056-REWA-232", + "0056-REWA-233", + "0056-REWA-234", + "0056-REWA-235", + "0056-REWA-236", + "0056-REWA-237", + "0056-REWA-238", + "0056-REWA-239", + "0056-REWA-240", + "0056-REWA-241", + "0056-REWA-242", + "0056-REWA-243", + "0056-REWA-244", + "0056-REWA-245" ] }, "Cancelling Proposals": { @@ -833,11 +828,11 @@ "0095-HVMR-039" ] }, - "staking tokens from general account": { + "Staking tokens from general account": { "milestone": "suzuka_castle_II", "acs": [ - "0056-REWA-220", - "0056-REWA-221", + "0056-REWA-246", + "0056-REWA-247", "0057-TRAN-003", "0057-TRAN-004" ]