From 1489bcc0bfe241aee39957b1256f599a344a82c7 Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Fri, 17 Jan 2025 08:43:23 +0100 Subject: [PATCH 1/9] Alpha/DAL: enable incentives for Alpha and set the rewards to 10% --- .../lib_parameters/default_parameters.ml | 11 ++++--- .../lib_protocol/constants_repr.ml | 8 ----- src/proto_alpha/lib_protocol/raw_context.ml | 32 +++++++------------ 3 files changed, 18 insertions(+), 33 deletions(-) diff --git a/src/proto_alpha/lib_parameters/default_parameters.ml b/src/proto_alpha/lib_parameters/default_parameters.ml index 846bc907091a..d50b752d3a71 100644 --- a/src/proto_alpha/lib_parameters/default_parameters.ml +++ b/src/proto_alpha/lib_parameters/default_parameters.ml @@ -150,7 +150,7 @@ let default_dal = Constants.Parametric. { feature_enable = true; - incentives_enable = false; + incentives_enable = true; number_of_slots = 32; attestation_lag = 8; attestation_threshold = 66; @@ -167,10 +167,11 @@ let default_dal = that we have x = a/b with a and b smallest such that they are relatively prime, and (a+1, b+1) are relatively prime as well. The value x = 63% works as well. *) - rewards_ratio = Q.zero; + rewards_ratio = Q.(1 // 10); (* This value determines the value of - [issuance_weights.dal_rewards_ratio]. When computing the actual - rewards, their values are ignored when [incentives_enable = false]. *) + [issuance_weights.dal_rewards_weight]. When computing the actual + rewards, [dal_rewards_weight] is ignored when [incentives_enable = + false]. *) traps_fraction = Q.(5 // 10000); } @@ -312,7 +313,7 @@ let constants_mainnet : Constants.Parametric.t = vdf_revelation_tip_weight; (* 1/20480 of block rewards *) dal_rewards_weight; - (* 0 for now; it depends on the value of [dal.rewards_ratio] *) + (* 2275; it depends on the value of [dal.rewards_ratio] *) }; hard_storage_limit_per_operation = Z.of_int 60_000; cost_per_byte = Tez.of_mutez_exn 250L; diff --git a/src/proto_alpha/lib_protocol/constants_repr.ml b/src/proto_alpha/lib_protocol/constants_repr.ml index 3802d6320d72..ca76ab9b631e 100644 --- a/src/proto_alpha/lib_protocol/constants_repr.ml +++ b/src/proto_alpha/lib_protocol/constants_repr.ml @@ -330,14 +330,6 @@ let check_constants constants = (Invalid_protocol_constants "The DAL committee must be a subset of the Tenderbake committee.") in - let* () = - error_when - (Q.(constants.dal.rewards_ratio > zero) - && not constants.dal.incentives_enable) - (Invalid_protocol_constants - "When DAL incentives are not enabled, the DAL rewards_ratio should be \ - zero.") - in let* () = error_unless Q.(constants.dal.rewards_ratio < one) diff --git a/src/proto_alpha/lib_protocol/raw_context.ml b/src/proto_alpha/lib_protocol/raw_context.ml index 4d20062b944a..ec621d286fd6 100644 --- a/src/proto_alpha/lib_protocol/raw_context.ml +++ b/src/proto_alpha/lib_protocol/raw_context.ml @@ -1300,7 +1300,7 @@ let prepare_first_block ~level ~timestamp chain_id ctxt = let dal = let ({ feature_enable; - incentives_enable; + incentives_enable = _; number_of_slots; attestation_lag; attestation_threshold; @@ -1311,13 +1311,13 @@ let prepare_first_block ~level ~timestamp chain_id ctxt = in { Constants_parametric_repr.feature_enable; - incentives_enable; + incentives_enable = true; number_of_slots; attestation_lag; attestation_threshold; cryptobox_parameters; minimal_participation_ratio = Q.(64 // 100); - rewards_ratio = Q.zero; + rewards_ratio = Q.(1 // 10); traps_fraction = Q.(5 // 10000); } in @@ -1452,26 +1452,18 @@ let prepare_first_block ~level ~timestamp chain_id ctxt = adaptive_rewards_params; } in + (* update the weights, but do not update [base_total_issued_per_minute] *) let issuance_weights = - let ({ - base_total_issued_per_minute; - baking_reward_fixed_portion_weight; - baking_reward_bonus_weight; - attesting_reward_weight; - seed_nonce_revelation_tip_weight; - vdf_revelation_tip_weight; - } - : Previous.issuance_weights) = - c.issuance_weights + let Constants_repr.Generated. + {consensus_threshold_size = _; issuance_weights} = + Constants_repr.Generated.generate + ~consensus_committee_size:c.consensus_committee_size + ~dal_rewards_ratio:dal.rewards_ratio in { - Constants_parametric_repr.base_total_issued_per_minute; - baking_reward_fixed_portion_weight; - baking_reward_bonus_weight; - attesting_reward_weight; - seed_nonce_revelation_tip_weight; - vdf_revelation_tip_weight; - dal_rewards_weight = 0; + issuance_weights with + base_total_issued_per_minute = + c.issuance_weights.base_total_issued_per_minute; } in let constants = -- GitLab From 6d42168624dd67d384c14c7fc3c1563fdf2a2cd6 Mon Sep 17 00:00:00 2001 From: Eugen Zalinescu Date: Tue, 21 Jan 2025 15:47:40 +0100 Subject: [PATCH 2/9] Alpha: add 'dal_attesting_reward_per_shard' field in 'expected_issuance' RPC --- .../adaptive_issuance_services.ml | 26 ++++++++++++++++--- .../adaptive_issuance_services.mli | 1 + 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/proto_alpha/lib_protocol/adaptive_issuance_services.ml b/src/proto_alpha/lib_protocol/adaptive_issuance_services.ml index d02335c05a5f..967a26a6de40 100644 --- a/src/proto_alpha/lib_protocol/adaptive_issuance_services.ml +++ b/src/proto_alpha/lib_protocol/adaptive_issuance_services.ml @@ -30,6 +30,7 @@ type expected_rewards = { baking_reward_fixed_portion : Tez.t; baking_reward_bonus_per_slot : Tez.t; attesting_reward_per_slot : Tez.t; + dal_attesting_reward_per_shard : Tez.t; seed_nonce_revelation_tip : Tez.t; vdf_revelation_tip : Tez.t; } @@ -42,6 +43,7 @@ let expected_rewards_encoding : expected_rewards Data_encoding.t = baking_reward_fixed_portion; baking_reward_bonus_per_slot; attesting_reward_per_slot; + dal_attesting_reward_per_shard; seed_nonce_revelation_tip; vdf_revelation_tip; } -> @@ -50,28 +52,32 @@ let expected_rewards_encoding : expected_rewards Data_encoding.t = baking_reward_bonus_per_slot, attesting_reward_per_slot, seed_nonce_revelation_tip, - vdf_revelation_tip )) + vdf_revelation_tip, + dal_attesting_reward_per_shard )) (fun ( cycle, baking_reward_fixed_portion, baking_reward_bonus_per_slot, attesting_reward_per_slot, seed_nonce_revelation_tip, - vdf_revelation_tip ) -> + vdf_revelation_tip, + dal_attesting_reward_per_shard ) -> { cycle; baking_reward_fixed_portion; baking_reward_bonus_per_slot; attesting_reward_per_slot; + dal_attesting_reward_per_shard; seed_nonce_revelation_tip; vdf_revelation_tip; }) - (obj6 + (obj7 (req "cycle" Cycle.encoding) (req "baking_reward_fixed_portion" Tez.encoding) (req "baking_reward_bonus_per_slot" Tez.encoding) (req "attesting_reward_per_slot" Tez.encoding) (req "seed_nonce_revelation_tip" Tez.encoding) - (req "vdf_revelation_tip" Tez.encoding)) + (req "vdf_revelation_tip" Tez.encoding) + (req "dal_attesting_reward_per_shard" Tez.encoding)) module S = struct open Data_encoding @@ -205,6 +211,10 @@ let collect_expected_rewards ~ctxt = let*? baking_reward_fixed_portion = baking_reward_fixed_portion ctxt in let*? baking_reward_bonus_per_slot = baking_reward_bonus_per_slot ctxt in let*? attesting_reward_per_slot = attesting_reward_per_slot ctxt in + let*? dal_attesting_reward_per_shard = + if csts.dal.incentives_enable then dal_attesting_reward_per_shard ctxt + else ok Tez.zero + in let*? seed_nonce_revelation_tip = seed_nonce_revelation_tip ctxt in let*? vdf_revelation_tip = vdf_revelation_tip ctxt in return @@ -213,6 +223,7 @@ let collect_expected_rewards ~ctxt = baking_reward_fixed_portion; baking_reward_bonus_per_slot; attesting_reward_per_slot; + dal_attesting_reward_per_shard; seed_nonce_revelation_tip; vdf_revelation_tip; } @@ -238,6 +249,12 @@ let collect_expected_rewards ~ctxt = let*? attesting_reward_per_slot = reward_from_constants ~coeff csts ~reward_kind:Attesting_reward_per_slot in + let*? dal_attesting_reward_per_shard = + reward_from_constants + ~coeff + csts + ~reward_kind:Dal_attesting_reward_per_shard + in let*? seed_nonce_revelation_tip = reward_from_constants ~coeff csts ~reward_kind:Seed_nonce_revelation_tip in @@ -250,6 +267,7 @@ let collect_expected_rewards ~ctxt = baking_reward_fixed_portion; baking_reward_bonus_per_slot; attesting_reward_per_slot; + dal_attesting_reward_per_shard; seed_nonce_revelation_tip; vdf_revelation_tip; } diff --git a/src/proto_alpha/lib_protocol/adaptive_issuance_services.mli b/src/proto_alpha/lib_protocol/adaptive_issuance_services.mli index 058845f9b80a..f5ee2a498941 100644 --- a/src/proto_alpha/lib_protocol/adaptive_issuance_services.mli +++ b/src/proto_alpha/lib_protocol/adaptive_issuance_services.mli @@ -30,6 +30,7 @@ type expected_rewards = { baking_reward_fixed_portion : Tez.t; baking_reward_bonus_per_slot : Tez.t; attesting_reward_per_slot : Tez.t; + dal_attesting_reward_per_shard : Tez.t; seed_nonce_revelation_tip : Tez.t; vdf_revelation_tip : Tez.t; } -- GitLab From bc420a75a2f764d2035cd9be2c1c8c81db11e0a3 Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Thu, 16 Jan 2025 15:52:55 +0100 Subject: [PATCH 3/9] Alpha/Tests: set DAL rewards to zero in double baking/attesting tests Full tests titles: - alpha: double baking (double baking followed by double attesting) - alpha: double baking (valid double baking evidence) - alpha: double baking (payload producer receives the rewards for double baking evidence) - alpha: double baking (double attesting followed by double baking) --- .../consensus/test_double_baking.ml | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/proto_alpha/lib_protocol/test/integration/consensus/test_double_baking.ml b/src/proto_alpha/lib_protocol/test/integration/consensus/test_double_baking.ml index 10a037445d6a..46f9e1262515 100644 --- a/src/proto_alpha/lib_protocol/test/integration/consensus/test_double_baking.ml +++ b/src/proto_alpha/lib_protocol/test/integration/consensus/test_double_baking.ml @@ -73,6 +73,14 @@ let double_baking ctxt ?(correct_order = true) bh1 bh2 = let bh1, bh2 = order_block_hashes ~correct_order bh1 bh2 in Op.double_baking ctxt bh1 bh2 +let constants_no_rewards = + let constants = Default_parameters.constants_test in + { + constants with + issuance_weights = {constants.issuance_weights with dal_rewards_weight = 0}; + consensus_threshold_size = 0; + } + (****************************************************************) (* Tests *) (****************************************************************) @@ -81,8 +89,9 @@ let double_baking ctxt ?(correct_order = true) bh1 bh2 = exposed by a double baking evidence operation. *) let test_valid_double_baking_evidence () = let open Lwt_result_syntax in - let* genesis, contracts = Context.init2 ~consensus_threshold_size:0 () in + let* genesis, contracts = Context.init_with_constants2 constants_no_rewards in let* c = Context.get_constants (B genesis) in + assert (c.parametric.issuance_weights.dal_rewards_weight = 0) ; let p = c.parametric.percentage_of_frozen_deposits_slashed_per_double_baking in @@ -165,7 +174,7 @@ let double_attestation ctxt ?(correct_order = true) op1 op2 = let test_valid_double_baking_followed_by_double_attesting () = let open Lwt_result_syntax in - let* genesis, contracts = Context.init2 ~consensus_threshold_size:0 () in + let* genesis, contracts = Context.init_with_constants2 constants_no_rewards in let* baker1, baker2 = Context.get_first_different_bakers (B genesis) in let* b = Block.bake genesis in let* blk_a, blk_b = block_fork ~policy:(By_account baker1) contracts b in @@ -246,7 +255,7 @@ let block_fork_diff b = let test_valid_double_attesting_followed_by_double_baking () = let open Lwt_result_syntax in - let* genesis, contracts = Context.init2 ~consensus_threshold_size:0 () in + let* genesis, contracts = Context.init_with_constants2 constants_no_rewards in let* baker1, baker2 = Context.get_first_different_bakers (B genesis) in let* blk_1, blk_2 = block_fork_diff genesis in let* blk_a = Block.bake blk_1 in @@ -327,11 +336,8 @@ let test_valid_double_attesting_followed_by_double_baking () = let test_payload_producer_gets_evidence_rewards () = let open Lwt_result_syntax in let* genesis, contracts = - Context.init_n - ~consensus_threshold_size:0 - ~consensus_committee_size:64 - 10 - () + let constants = {constants_no_rewards with consensus_committee_size = 64} in + Context.init_with_constants_n constants 10 in let* c = Context.get_constants (B genesis) in let p = -- GitLab From 55e56e045a2ff71ae0b872274fed39234631ec0b Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Thu, 16 Jan 2025 16:03:00 +0100 Subject: [PATCH 4/9] Alpha/Tests: set DAL rewards to zero in participation tests Full tests titles: - alpha: participation monitoring (minimal participation) - alpha: participation monitoring (insufficient participation) --- .../consensus/test_participation.ml | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/src/proto_alpha/lib_protocol/test/integration/consensus/test_participation.ml b/src/proto_alpha/lib_protocol/test/integration/consensus/test_participation.ml index 2e340877301d..bded22a0a32a 100644 --- a/src/proto_alpha/lib_protocol/test/integration/consensus/test_participation.ml +++ b/src/proto_alpha/lib_protocol/test/integration/consensus/test_participation.ml @@ -69,9 +69,16 @@ let bake_and_attest_once (_b_pred, b_cur) baker attester = let test_participation ~sufficient_participation () = let open Lwt_result_wrap_syntax in let n_accounts = 2 in - let* b0, accounts = - Context.init_n ~consensus_threshold_size:1 n_accounts () + let constants = + let c = Default_parameters.constants_test in + { + c with + dal = {c.dal with rewards_ratio = Q.(0 // 100)}; + issuance_weights = {c.issuance_weights with dal_rewards_weight = 0}; + consensus_threshold_size = 1; + } in + let* b0, accounts = Context.init_with_constants_n constants n_accounts in let* csts = Context.get_constants (B b0) in let blocks_per_cycle = Int32.to_int csts.parametric.blocks_per_cycle in let mpr = csts.parametric.minimal_participation_ratio in @@ -174,9 +181,7 @@ let check_no_dal_participation Assert.equal_bool ~loc:__LOC__ dal_info.sufficient_dal_participation true in let* () = - (* No Tez are actually provisioned for DAL rewards as incentives are not - enabled in this test. Turn the test to [Assert.not_equal_tez] when - incentives are enabled by default. *) + (* No Tez are provisioned for DAL rewards when [dal_rewards_weight = 0]. *) Assert.equal_tez ~loc:__LOC__ dal_info.expected_dal_rewards Tez.zero in return_unit @@ -187,9 +192,15 @@ let check_no_dal_participation let test_participation_rpc () = let open Lwt_result_wrap_syntax in let n_accounts = 2 in - let* b0, (account1, account2) = - Context.init2 ~consensus_threshold_size:1 () + let constants = + let c = Default_parameters.constants_test in + { + c with + issuance_weights = {c.issuance_weights with dal_rewards_weight = 0}; + consensus_threshold_size = 1; + } in + let* b0, (account1, account2) = Context.init_with_constants2 constants in let del1 = Context.Contract.pkh account1 in let del2 = Context.Contract.pkh account2 in let* csts = Context.get_constants (B b0) in -- GitLab From a7ad33b7de9c9a760f449e99ed045c9cbb5b88df Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Mon, 13 Jan 2025 14:43:32 +0100 Subject: [PATCH 5/9] Tezt/Tests: update regression outputs --- ...PC regression tests- adaptive_issuance.out | 24 ++-- ...lient) RPC regression tests- delegates.out | 7 +- ...t) RPC regression tests- misc_protocol.out | 6 +- ...de client) RPC regression tests- votes.out | 14 +-- ...PC regression tests- adaptive_issuance.out | 24 ++-- ...light) RPC regression tests- delegates.out | 7 +- ...t) RPC regression tests- misc_protocol.out | 6 +- ...ode light) RPC regression tests- votes.out | 14 +-- ...PC regression tests- adaptive_issuance.out | 24 ++-- ...proxy) RPC regression tests- delegates.out | 7 +- ...y) RPC regression tests- misc_protocol.out | 6 +- ...ode proxy) RPC regression tests- votes.out | 14 +-- .../baker_test.ml/Alpha- Baker rewards.out | 8 +- ... - delegate - consensus - destination).out | 105 +++++++++++------- ...- delegate - consensus -- destination).out | 103 ++++++++++------- ...-- delegate - consensus - destination).out | 93 ++++++++++------ ...- delegate - consensus -- destination).out | 91 +++++++++------ ...lpha- Test register with consensus key.out | 14 ++- ... set consensus key - baker is delegate.out | 47 +++++--- ... consensus key - baker is not delegate.out | 35 ++++-- .../Alpha- update consensus key.out | 16 +-- ...lowing dal and baker tutorial commands.out | 7 +- ... integration (Use all available slots).out | 18 +-- .../Alpha- weeklynet regression test.out | 6 +- 24 files changed, 428 insertions(+), 268 deletions(-) diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- adaptive_issuance.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- adaptive_issuance.out index 2d9234d651cc..1210015efe52 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- adaptive_issuance.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- adaptive_issuance.out @@ -38,18 +38,18 @@ 0 ./octez-client rpc get /chains/main/blocks/head/context/issuance/expected_issuance -[ { "cycle": 0, "baking_reward_fixed_portion": "333333", - "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", - "vdf_revelation_tip": "260" }, - { "cycle": 1, "baking_reward_fixed_portion": "333333", - "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", - "vdf_revelation_tip": "260" }, - { "cycle": 2, "baking_reward_fixed_portion": "333333", - "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", - "vdf_revelation_tip": "260" } ] +[ { "cycle": 0, "baking_reward_fixed_portion": "300010", + "baking_reward_bonus_per_slot": "1171", + "attesting_reward_per_slot": "2343", "seed_nonce_revelation_tip": "234", + "vdf_revelation_tip": "234", "dal_attesting_reward_per_shard": "520" }, + { "cycle": 1, "baking_reward_fixed_portion": "300010", + "baking_reward_bonus_per_slot": "1171", + "attesting_reward_per_slot": "2343", "seed_nonce_revelation_tip": "234", + "vdf_revelation_tip": "234", "dal_attesting_reward_per_shard": "520" }, + { "cycle": 2, "baking_reward_fixed_portion": "300010", + "baking_reward_bonus_per_slot": "1171", + "attesting_reward_per_slot": "2343", "seed_nonce_revelation_tip": "234", + "vdf_revelation_tip": "234", "dal_attesting_reward_per_shard": "520" } ] ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]/stakers' [ { "staker": "[PUBLIC_KEY_HASH]", diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- delegates.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- delegates.out index 03be43a86056..7d5a299c3b36 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- delegates.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- delegates.out @@ -22,7 +22,12 @@ { "expected_cycle_activity": 409, "minimal_cycle_activity": 272, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 137, - "expected_attesting_rewards": "1065036" }, "grace_period": 4, + "expected_attesting_rewards": "958287" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 409, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "212680", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 4, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol.out index f9aecdc0a088..d51e80864e35 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol.out @@ -23,7 +23,7 @@ "baking_reward_fixed_portion_weight": 5120, "baking_reward_bonus_weight": 5120, "attesting_reward_weight": 10240, "seed_nonce_revelation_tip_weight": 1, "vdf_revelation_tip_weight": 1, - "dal_rewards_weight": 0 }, "cost_per_byte": "250", + "dal_rewards_weight": 2275 }, "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, "liquidity_baking_subsidy": "5000000", @@ -39,12 +39,12 @@ "cache_script_size": 100000000, "cache_stake_distribution_cycles": 5, "cache_sampler_state_cycles": 5, "dal_parametric": - { "feature_enable": true, "incentives_enable": false, + { "feature_enable": true, "incentives_enable": true, "number_of_slots": 16, "attestation_lag": 8, "attestation_threshold": 66, "minimal_participation_ratio": { "numerator": "16", "denominator": "25" }, - "rewards_ratio": { "numerator": "0", "denominator": "1" }, + "rewards_ratio": { "numerator": "1", "denominator": "10" }, "traps_fraction": { "numerator": "1", "denominator": "2000" }, "redundancy_factor": 8, "page_size": 3967, "slot_size": 126944, "number_of_shards": 256 }, "smart_rollup_arith_pvm_enable": false, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- votes.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- votes.out index aceb75eb281b..eefdb00afd19 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- votes.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- votes.out @@ -43,7 +43,7 @@ null { "pkh": "[PUBLIC_KEY_HASH]", "ballot": "yay" } ] ./octez-client rpc get /chains/main/blocks/head/votes/ballots -{ "yay": "4000001679643", "nay": "4000000000000", "pass": "4000000000000" } +{ "yay": "4000001617576", "nay": "4000000106080", "pass": "4000000106080" } ./octez-client rpc get /chains/main/blocks/head/votes/current_period { "voting_period": { "index": 1, "kind": "exploration", "start_position": 4 }, @@ -57,15 +57,15 @@ null ./octez-client rpc get /chains/main/blocks/head/votes/listings [ { "pkh": "[PUBLIC_KEY_HASH]", - "voting_power": "4000000000000" }, + "voting_power": "4000000106080" }, { "pkh": "[PUBLIC_KEY_HASH]", - "voting_power": "4000000000000" }, + "voting_power": "4000000106080" }, { "pkh": "[PUBLIC_KEY_HASH]", - "voting_power": "4000000000000" }, + "voting_power": "4000000106080" }, { "pkh": "[PUBLIC_KEY_HASH]", - "voting_power": "4000000000000" }, + "voting_power": "4000000106080" }, { "pkh": "[PUBLIC_KEY_HASH]", - "voting_power": "4000001679643" } ] + "voting_power": "4000001617576" } ] ./octez-client rpc get /chains/main/blocks/head/votes/proposals [] @@ -75,4 +75,4 @@ null "position": 1, "remaining": 2 } ./octez-client rpc get /chains/main/blocks/head/votes/total_voting_power -"20000001679643" +"20000002041896" diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- adaptive_issuance.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- adaptive_issuance.out index 8883f5ceb76b..cc06794cf3d6 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- adaptive_issuance.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- adaptive_issuance.out @@ -38,18 +38,18 @@ 0 ./octez-client --mode light rpc get /chains/main/blocks/head/context/issuance/expected_issuance -[ { "cycle": 0, "baking_reward_fixed_portion": "333333", - "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", - "vdf_revelation_tip": "260" }, - { "cycle": 1, "baking_reward_fixed_portion": "333333", - "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", - "vdf_revelation_tip": "260" }, - { "cycle": 2, "baking_reward_fixed_portion": "333333", - "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", - "vdf_revelation_tip": "260" } ] +[ { "cycle": 0, "baking_reward_fixed_portion": "300010", + "baking_reward_bonus_per_slot": "1171", + "attesting_reward_per_slot": "2343", "seed_nonce_revelation_tip": "234", + "vdf_revelation_tip": "234", "dal_attesting_reward_per_shard": "520" }, + { "cycle": 1, "baking_reward_fixed_portion": "300010", + "baking_reward_bonus_per_slot": "1171", + "attesting_reward_per_slot": "2343", "seed_nonce_revelation_tip": "234", + "vdf_revelation_tip": "234", "dal_attesting_reward_per_shard": "520" }, + { "cycle": 2, "baking_reward_fixed_portion": "300010", + "baking_reward_bonus_per_slot": "1171", + "attesting_reward_per_slot": "2343", "seed_nonce_revelation_tip": "234", + "vdf_revelation_tip": "234", "dal_attesting_reward_per_shard": "520" } ] ./octez-client --mode light rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]/stakers' [ { "staker": "[PUBLIC_KEY_HASH]", diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- delegates.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- delegates.out index 313b24b6aee1..a40052ec4bd6 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- delegates.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- delegates.out @@ -22,7 +22,12 @@ { "expected_cycle_activity": 409, "minimal_cycle_activity": 272, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 137, - "expected_attesting_rewards": "1065036" }, "grace_period": 4, + "expected_attesting_rewards": "958287" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 409, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "212680", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 4, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol.out index 96c0e41cddc6..48dc6f8990da 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol.out @@ -23,7 +23,7 @@ "baking_reward_fixed_portion_weight": 5120, "baking_reward_bonus_weight": 5120, "attesting_reward_weight": 10240, "seed_nonce_revelation_tip_weight": 1, "vdf_revelation_tip_weight": 1, - "dal_rewards_weight": 0 }, "cost_per_byte": "250", + "dal_rewards_weight": 2275 }, "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, "liquidity_baking_subsidy": "5000000", @@ -39,12 +39,12 @@ "cache_script_size": 100000000, "cache_stake_distribution_cycles": 5, "cache_sampler_state_cycles": 5, "dal_parametric": - { "feature_enable": true, "incentives_enable": false, + { "feature_enable": true, "incentives_enable": true, "number_of_slots": 16, "attestation_lag": 8, "attestation_threshold": 66, "minimal_participation_ratio": { "numerator": "16", "denominator": "25" }, - "rewards_ratio": { "numerator": "0", "denominator": "1" }, + "rewards_ratio": { "numerator": "1", "denominator": "10" }, "traps_fraction": { "numerator": "1", "denominator": "2000" }, "redundancy_factor": 8, "page_size": 3967, "slot_size": 126944, "number_of_shards": 256 }, "smart_rollup_arith_pvm_enable": false, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- votes.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- votes.out index 8baa3dc26318..dd9158aaf465 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- votes.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- votes.out @@ -43,7 +43,7 @@ null { "pkh": "[PUBLIC_KEY_HASH]", "ballot": "yay" } ] ./octez-client --mode light rpc get /chains/main/blocks/head/votes/ballots -{ "yay": "4000001679643", "nay": "4000000000000", "pass": "4000000000000" } +{ "yay": "4000001617576", "nay": "4000000106080", "pass": "4000000106080" } ./octez-client --mode light rpc get /chains/main/blocks/head/votes/current_period { "voting_period": { "index": 1, "kind": "exploration", "start_position": 4 }, @@ -57,15 +57,15 @@ null ./octez-client --mode light rpc get /chains/main/blocks/head/votes/listings [ { "pkh": "[PUBLIC_KEY_HASH]", - "voting_power": "4000000000000" }, + "voting_power": "4000000106080" }, { "pkh": "[PUBLIC_KEY_HASH]", - "voting_power": "4000000000000" }, + "voting_power": "4000000106080" }, { "pkh": "[PUBLIC_KEY_HASH]", - "voting_power": "4000000000000" }, + "voting_power": "4000000106080" }, { "pkh": "[PUBLIC_KEY_HASH]", - "voting_power": "4000000000000" }, + "voting_power": "4000000106080" }, { "pkh": "[PUBLIC_KEY_HASH]", - "voting_power": "4000001679643" } ] + "voting_power": "4000001617576" } ] ./octez-client --mode light rpc get /chains/main/blocks/head/votes/proposals [] @@ -75,4 +75,4 @@ null "position": 1, "remaining": 2 } ./octez-client --mode light rpc get /chains/main/blocks/head/votes/total_voting_power -"20000001679643" +"20000002041896" diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- adaptive_issuance.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- adaptive_issuance.out index cefe6c3349a8..23e1a11df8b5 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- adaptive_issuance.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- adaptive_issuance.out @@ -38,18 +38,18 @@ 0 ./octez-client --mode proxy rpc get /chains/main/blocks/head/context/issuance/expected_issuance -[ { "cycle": 0, "baking_reward_fixed_portion": "333333", - "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", - "vdf_revelation_tip": "260" }, - { "cycle": 1, "baking_reward_fixed_portion": "333333", - "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", - "vdf_revelation_tip": "260" }, - { "cycle": 2, "baking_reward_fixed_portion": "333333", - "baking_reward_bonus_per_slot": "1302", - "attesting_reward_per_slot": "2604", "seed_nonce_revelation_tip": "260", - "vdf_revelation_tip": "260" } ] +[ { "cycle": 0, "baking_reward_fixed_portion": "300010", + "baking_reward_bonus_per_slot": "1171", + "attesting_reward_per_slot": "2343", "seed_nonce_revelation_tip": "234", + "vdf_revelation_tip": "234", "dal_attesting_reward_per_shard": "520" }, + { "cycle": 1, "baking_reward_fixed_portion": "300010", + "baking_reward_bonus_per_slot": "1171", + "attesting_reward_per_slot": "2343", "seed_nonce_revelation_tip": "234", + "vdf_revelation_tip": "234", "dal_attesting_reward_per_shard": "520" }, + { "cycle": 2, "baking_reward_fixed_portion": "300010", + "baking_reward_bonus_per_slot": "1171", + "attesting_reward_per_slot": "2343", "seed_nonce_revelation_tip": "234", + "vdf_revelation_tip": "234", "dal_attesting_reward_per_shard": "520" } ] ./octez-client --mode proxy rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]/stakers' [ { "staker": "[PUBLIC_KEY_HASH]", diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- delegates.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- delegates.out index 25abf2608779..884c401000f6 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- delegates.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- delegates.out @@ -22,7 +22,12 @@ { "expected_cycle_activity": 409, "minimal_cycle_activity": 272, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 137, - "expected_attesting_rewards": "1065036" }, "grace_period": 4, + "expected_attesting_rewards": "958287" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 409, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "212680", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 4, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol.out index e0a8946c2c36..0f8b23fbc1d8 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol.out @@ -23,7 +23,7 @@ "baking_reward_fixed_portion_weight": 5120, "baking_reward_bonus_weight": 5120, "attesting_reward_weight": 10240, "seed_nonce_revelation_tip_weight": 1, "vdf_revelation_tip_weight": 1, - "dal_rewards_weight": 0 }, "cost_per_byte": "250", + "dal_rewards_weight": 2275 }, "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, "liquidity_baking_subsidy": "5000000", @@ -39,12 +39,12 @@ "cache_script_size": 100000000, "cache_stake_distribution_cycles": 5, "cache_sampler_state_cycles": 5, "dal_parametric": - { "feature_enable": true, "incentives_enable": false, + { "feature_enable": true, "incentives_enable": true, "number_of_slots": 16, "attestation_lag": 8, "attestation_threshold": 66, "minimal_participation_ratio": { "numerator": "16", "denominator": "25" }, - "rewards_ratio": { "numerator": "0", "denominator": "1" }, + "rewards_ratio": { "numerator": "1", "denominator": "10" }, "traps_fraction": { "numerator": "1", "denominator": "2000" }, "redundancy_factor": 8, "page_size": 3967, "slot_size": 126944, "number_of_shards": 256 }, "smart_rollup_arith_pvm_enable": false, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- votes.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- votes.out index 1bf5d004e281..7d5e8067783a 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- votes.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- votes.out @@ -43,7 +43,7 @@ null { "pkh": "[PUBLIC_KEY_HASH]", "ballot": "yay" } ] ./octez-client --mode proxy rpc get /chains/main/blocks/head/votes/ballots -{ "yay": "4000001679643", "nay": "4000000000000", "pass": "4000000000000" } +{ "yay": "4000001617576", "nay": "4000000106080", "pass": "4000000106080" } ./octez-client --mode proxy rpc get /chains/main/blocks/head/votes/current_period { "voting_period": { "index": 1, "kind": "exploration", "start_position": 4 }, @@ -57,15 +57,15 @@ null ./octez-client --mode proxy rpc get /chains/main/blocks/head/votes/listings [ { "pkh": "[PUBLIC_KEY_HASH]", - "voting_power": "4000000000000" }, + "voting_power": "4000000106080" }, { "pkh": "[PUBLIC_KEY_HASH]", - "voting_power": "4000000000000" }, + "voting_power": "4000000106080" }, { "pkh": "[PUBLIC_KEY_HASH]", - "voting_power": "4000000000000" }, + "voting_power": "4000000106080" }, { "pkh": "[PUBLIC_KEY_HASH]", - "voting_power": "4000000000000" }, + "voting_power": "4000000106080" }, { "pkh": "[PUBLIC_KEY_HASH]", - "voting_power": "4000001679643" } ] + "voting_power": "4000001617576" } ] ./octez-client --mode proxy rpc get /chains/main/blocks/head/votes/proposals [] @@ -75,4 +75,4 @@ null "position": 1, "remaining": 2 } ./octez-client --mode proxy rpc get /chains/main/blocks/head/votes/total_voting_power -"20000001679643" +"20000002041896" diff --git a/tezt/tests/expected/baker_test.ml/Alpha- Baker rewards.out b/tezt/tests/expected/baker_test.ml/Alpha- Baker rewards.out index bbf60a07d917..1c88f77fa658 100644 --- a/tezt/tests/expected/baker_test.ml/Alpha- Baker rewards.out +++ b/tezt/tests/expected/baker_test.ml/Alpha- Baker rewards.out @@ -55,17 +55,17 @@ { "kind": "contract", "contract": "[PUBLIC_KEY_HASH]", "change": "3600000000000", "origin": "migration" }, - { "kind": "minted", "category": "baking rewards", "change": "-266667", + { "kind": "minted", "category": "baking rewards", "change": "-240009", "origin": "block" }, { "kind": "freezer", "category": "deposits", "staker": { "baker_own_stake": "[PUBLIC_KEY_HASH]" }, - "change": "266667", "origin": "block" }, - { "kind": "minted", "category": "baking rewards", "change": "-2399999", + "change": "240009", "origin": "block" }, + { "kind": "minted", "category": "baking rewards", "change": "-2160073", "origin": "block" }, { "kind": "contract", "contract": "[PUBLIC_KEY_HASH]", - "change": "2399999", "origin": "block" } ], + "change": "2160073", "origin": "block" } ], "liquidity_baking_toggle_ema": 0, "adaptive_issuance_vote_ema": 0, "adaptive_issuance_activation_cycle": 0, "implicit_operations_results": diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus - destination).out b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus - destination).out index a5a8b7b10450..1f5149d2b392 100644 --- a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus - destination).out +++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus - destination).out @@ -31,7 +31,12 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, @@ -66,23 +71,28 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466666683333", - "total_staked": "200000016667", "total_delegated": "3800000316666", + "pending_staking_parameters": [], "baking_power": "1466666681667", + "total_staked": "200000015001", "total_delegated": "3800000285009", "min_delegated_in_current_cycle": { "amount": "3800000000000", "level": { "level": 1, "level_position": 0, "cycle": 0, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000000333333", "own_staked": "200000016667", - "own_delegated": "3800000316666", "external_staked": "0", + "own_full_balance": "4000000300010", "own_staked": "200000015001", + "own_delegated": "3800000285009", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", - "staking_denominator": "0", "current_voting_power": "4000000333333", + "staking_denominator": "0", "current_voting_power": "4000000300010", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, @@ -95,7 +105,7 @@ This sequence of operations was run: "pk": "[PUBLIC_KEY]" } ] }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000016667" } ], + "frozen_deposits": "200000015001" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -104,24 +114,29 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667493344", - "total_staked": "200000164910", "total_delegated": "3800003133203", + "pending_staking_parameters": [], "baking_power": "1466667454794", + "total_staked": "200000159015", "total_delegated": "3800003021130", "min_delegated_in_current_cycle": - { "amount": "3800001985302", + { "amount": "3800001887337", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000003298113", "own_staked": "200000164910", - "own_delegated": "3800003133203", "external_staked": "0", + "own_full_balance": "4000003180145", "own_staked": "200000159015", + "own_delegated": "3800003021130", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", - "staking_denominator": "0", "current_voting_power": "4000003298113", + "staking_denominator": "0", "current_voting_power": "4000003180145", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, @@ -131,7 +146,7 @@ This sequence of operations was run: "pk": "[PUBLIC_KEY]" } }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000164910" } ], + "frozen_deposits": "200000159015" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -140,24 +155,29 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667493344", - "total_staked": "200000164910", "total_delegated": "3800003133203", + "pending_staking_parameters": [], "baking_power": "1466667454794", + "total_staked": "200000159015", "total_delegated": "3800003021130", "min_delegated_in_current_cycle": - { "amount": "3800001985302", + { "amount": "3800001887337", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000003298113", "own_staked": "200000164910", - "own_delegated": "3800003133203", "external_staked": "0", + "own_full_balance": "4000003180145", "own_staked": "200000159015", + "own_delegated": "3800003021130", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", - "staking_denominator": "0", "current_voting_power": "4000003298113", + "staking_denominator": "0", "current_voting_power": "4000003180145", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, @@ -167,11 +187,11 @@ This sequence of operations was run: "pk": "[PUBLIC_KEY]" } }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000164910" } ], + "frozen_deposits": "200000159015" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3800003133203" +"3800003021130" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' "0" @@ -195,10 +215,10 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.06425 storage fees ........................... +ꜩ0.06425 - [PUBLIC_KEY_HASH] ... -ꜩ3762003.038264 - [PUBLIC_KEY_HASH] ... +ꜩ3762003.038264 - [PUBLIC_KEY_HASH] ... -ꜩ38000.030689 - [PUBLIC_KEY_HASH] ... +ꜩ38000.030689 + [PUBLIC_KEY_HASH] ... -ꜩ3762002.927312 + [PUBLIC_KEY_HASH] ... +ꜩ3762002.927312 + [PUBLIC_KEY_HASH] ... -ꜩ38000.029568 + [PUBLIC_KEY_HASH] ... +ꜩ38000.029568 ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -207,25 +227,30 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 59, "missed_levels": 1, "remaining_allowed_missed_slots": 9, - "expected_attesting_rewards": "13872" }, "grace_period": 4, + "expected_attesting_rewards": "12444" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "2652", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 4, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "212666845505", - "total_staked": "200000166099", "total_delegated": "38000038219", + "pending_staking_parameters": [], "baking_power": "212666838867", + "total_staked": "200000160086", "total_delegated": "38000036344", "min_delegated_in_current_cycle": - { "amount": "38000038219", + { "amount": "38000036344", "level": { "level": 9, "level_position": 8, "cycle": 2, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "238000204318", "own_staked": "200000166099", - "own_delegated": "38000038219", "external_staked": "0", + "own_full_balance": "238000196430", "own_staked": "200000160086", + "own_delegated": "38000036344", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" }, { "cycle": 2, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", "staking_denominator": "0", - "current_voting_power": "238000204318", "voting_power": "4000000000000", + "current_voting_power": "238000196430", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, "consensus_key": @@ -234,14 +259,14 @@ This sequence of operations was run: "pk": "[PUBLIC_KEY]" } }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000166099" } ], + "frozen_deposits": "200000160086" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"38000038219" +"38000036344" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3762003038264" +"3762002927312" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3762003038264" +"3762002927312" diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus -- destination).out b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus -- destination).out index 24cd7c22b805..a651ab6098de 100644 --- a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus -- destination).out +++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus -- destination).out @@ -31,7 +31,12 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, @@ -66,23 +71,28 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466666683333", - "total_staked": "200000016667", "total_delegated": "3800000316666", + "pending_staking_parameters": [], "baking_power": "1466666681667", + "total_staked": "200000015001", "total_delegated": "3800000285009", "min_delegated_in_current_cycle": { "amount": "3800000000000", "level": { "level": 1, "level_position": 0, "cycle": 0, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000000333333", "own_staked": "200000016667", - "own_delegated": "3800000316666", "external_staked": "0", + "own_full_balance": "4000000300010", "own_staked": "200000015001", + "own_delegated": "3800000285009", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", - "staking_denominator": "0", "current_voting_power": "4000000333333", + "staking_denominator": "0", "current_voting_power": "4000000300010", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, @@ -95,7 +105,7 @@ This sequence of operations was run: "pk": "[PUBLIC_KEY]" } ] }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000016667" } ], + "frozen_deposits": "200000015001" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -104,24 +114,29 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667493344", - "total_staked": "200000164910", "total_delegated": "3800003133203", + "pending_staking_parameters": [], "baking_power": "1466667454794", + "total_staked": "200000159015", "total_delegated": "3800003021130", "min_delegated_in_current_cycle": - { "amount": "3800001985302", + { "amount": "3800001887337", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000003298113", "own_staked": "200000164910", - "own_delegated": "3800003133203", "external_staked": "0", + "own_full_balance": "4000003180145", "own_staked": "200000159015", + "own_delegated": "3800003021130", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", - "staking_denominator": "0", "current_voting_power": "4000003298113", + "staking_denominator": "0", "current_voting_power": "4000003180145", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, @@ -131,7 +146,7 @@ This sequence of operations was run: "pk": "[PUBLIC_KEY]" } }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000164910" } ], + "frozen_deposits": "200000159015" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -140,24 +155,29 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667493344", - "total_staked": "200000164910", "total_delegated": "3800003133203", + "pending_staking_parameters": [], "baking_power": "1466667454794", + "total_staked": "200000159015", "total_delegated": "3800003021130", "min_delegated_in_current_cycle": - { "amount": "3800001985302", + { "amount": "3800001887337", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000003298113", "own_staked": "200000164910", - "own_delegated": "3800003133203", "external_staked": "0", + "own_full_balance": "4000003180145", "own_staked": "200000159015", + "own_delegated": "3800003021130", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", - "staking_denominator": "0", "current_voting_power": "4000003298113", + "staking_denominator": "0", "current_voting_power": "4000003180145", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, @@ -167,11 +187,11 @@ This sequence of operations was run: "pk": "[PUBLIC_KEY]" } }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000164910" } ], + "frozen_deposits": "200000159015" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3800003133203" +"3800003021130" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' "0" @@ -195,10 +215,10 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.06425 storage fees ........................... +ꜩ0.06425 - [PUBLIC_KEY_HASH] ... -ꜩ3762003.038264 - [PUBLIC_KEY_HASH] ... +ꜩ3762003.038264 - [PUBLIC_KEY_HASH] ... -ꜩ38000.030689 - [PUBLIC_KEY_HASH] ... +ꜩ38000.030689 + [PUBLIC_KEY_HASH] ... -ꜩ3762002.927312 + [PUBLIC_KEY_HASH] ... +ꜩ3762002.927312 + [PUBLIC_KEY_HASH] ... -ꜩ38000.029568 + [PUBLIC_KEY_HASH] ... +ꜩ38000.029568 ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -207,25 +227,30 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 59, "missed_levels": 1, "remaining_allowed_missed_slots": 9, - "expected_attesting_rewards": "13872" }, "grace_period": 4, + "expected_attesting_rewards": "12444" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "2652", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 4, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "212666845505", - "total_staked": "200000166099", "total_delegated": "38000038219", + "pending_staking_parameters": [], "baking_power": "212666838867", + "total_staked": "200000160086", "total_delegated": "38000036344", "min_delegated_in_current_cycle": - { "amount": "38000038219", + { "amount": "38000036344", "level": { "level": 9, "level_position": 8, "cycle": 2, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "238000204318", "own_staked": "200000166099", - "own_delegated": "38000038219", "external_staked": "0", + "own_full_balance": "238000196430", "own_staked": "200000160086", + "own_delegated": "38000036344", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" }, { "cycle": 2, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", "staking_denominator": "0", - "current_voting_power": "238000204318", "voting_power": "4000000000000", + "current_voting_power": "238000196430", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, "consensus_key": @@ -234,14 +259,14 @@ This sequence of operations was run: "pk": "[PUBLIC_KEY]" } }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000166099" } ], + "frozen_deposits": "200000160086" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"38000038219" +"38000036344" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' "0" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3762003038264" +"3762002927312" diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus - destination).out b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus - destination).out index c1986ece2edc..477ca3cc082b 100644 --- a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus - destination).out +++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus - destination).out @@ -31,7 +31,12 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, @@ -66,7 +71,12 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, @@ -104,24 +114,29 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667371026", - "total_staked": "200000148243", "total_delegated": "3800002816252", + "pending_staking_parameters": [], "baking_power": "1466667344695", + "total_staked": "200000144014", "total_delegated": "3800002735836", "min_delegated_in_current_cycle": - { "amount": "3800001668351", + { "amount": "3800001602043", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000002964495", "own_staked": "200000148243", - "own_delegated": "3800002816252", "external_staked": "0", + "own_full_balance": "4000002879850", "own_staked": "200000144014", + "own_delegated": "3800002735836", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", - "staking_denominator": "0", "current_voting_power": "4000002964495", + "staking_denominator": "0", "current_voting_power": "4000002879850", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, @@ -131,7 +146,7 @@ This sequence of operations was run: "pk": "[PUBLIC_KEY]" } }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000148243" } ], + "frozen_deposits": "200000144014" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -140,24 +155,29 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667371026", - "total_staked": "200000148243", "total_delegated": "3800002816252", + "pending_staking_parameters": [], "baking_power": "1466667344695", + "total_staked": "200000144014", "total_delegated": "3800002735836", "min_delegated_in_current_cycle": - { "amount": "3800001668351", + { "amount": "3800001602043", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000002964495", "own_staked": "200000148243", - "own_delegated": "3800002816252", "external_staked": "0", + "own_full_balance": "4000002879850", "own_staked": "200000144014", + "own_delegated": "3800002735836", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", - "staking_denominator": "0", "current_voting_power": "4000002964495", + "staking_denominator": "0", "current_voting_power": "4000002879850", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, @@ -167,11 +187,11 @@ This sequence of operations was run: "pk": "[PUBLIC_KEY]" } }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000148243" } ], + "frozen_deposits": "200000144014" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3800002816252" +"3800002735836" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' "0" @@ -195,10 +215,10 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.06425 storage fees ........................... +ꜩ0.06425 - [PUBLIC_KEY_HASH] ... -ꜩ3762002.724482 - [PUBLIC_KEY_HASH] ... +ꜩ3762002.724482 - [PUBLIC_KEY_HASH] ... -ꜩ38000.02752 - [PUBLIC_KEY_HASH] ... +ꜩ38000.02752 + [PUBLIC_KEY_HASH] ... -ꜩ3762002.644871 + [PUBLIC_KEY_HASH] ... +ꜩ3762002.644871 + [PUBLIC_KEY_HASH] ... -ꜩ38000.026715 + [PUBLIC_KEY_HASH] ... +ꜩ38000.026715 ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -207,25 +227,30 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 59, "missed_levels": 1, "remaining_allowed_missed_slots": 9, - "expected_attesting_rewards": "13872" }, "grace_period": 4, + "expected_attesting_rewards": "12444" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "2652", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 4, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "212666827782", - "total_staked": "200000149432", "total_delegated": "38000035050", + "pending_staking_parameters": [], "baking_power": "212666822915", + "total_staked": "200000145085", "total_delegated": "38000033491", "min_delegated_in_current_cycle": - { "amount": "38000035050", + { "amount": "38000033491", "level": { "level": 9, "level_position": 8, "cycle": 2, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "238000184482", "own_staked": "200000149432", - "own_delegated": "38000035050", "external_staked": "0", + "own_full_balance": "238000178576", "own_staked": "200000145085", + "own_delegated": "38000033491", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" }, { "cycle": 2, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", "staking_denominator": "0", - "current_voting_power": "238000184482", "voting_power": "4000000000000", + "current_voting_power": "238000178576", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, "consensus_key": @@ -234,14 +259,14 @@ This sequence of operations was run: "pk": "[PUBLIC_KEY]" } }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000149432" } ], + "frozen_deposits": "200000145085" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"38000035050" +"38000033491" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3762002724482" +"3762002644871" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3762002724482" +"3762002644871" diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus -- destination).out b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus -- destination).out index 04f3096d677e..d265883cc067 100644 --- a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus -- destination).out +++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus -- destination).out @@ -31,7 +31,12 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, @@ -66,7 +71,12 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, @@ -104,24 +114,29 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667371026", - "total_staked": "200000148243", "total_delegated": "3800002816252", + "pending_staking_parameters": [], "baking_power": "1466667344695", + "total_staked": "200000144014", "total_delegated": "3800002735836", "min_delegated_in_current_cycle": - { "amount": "3800001668351", + { "amount": "3800001602043", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000002964495", "own_staked": "200000148243", - "own_delegated": "3800002816252", "external_staked": "0", + "own_full_balance": "4000002879850", "own_staked": "200000144014", + "own_delegated": "3800002735836", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", - "staking_denominator": "0", "current_voting_power": "4000002964495", + "staking_denominator": "0", "current_voting_power": "4000002879850", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, @@ -131,7 +146,7 @@ This sequence of operations was run: "pk": "[PUBLIC_KEY]" } }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000148243" } ], + "frozen_deposits": "200000144014" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -140,24 +155,29 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667371026", - "total_staked": "200000148243", "total_delegated": "3800002816252", + "pending_staking_parameters": [], "baking_power": "1466667344695", + "total_staked": "200000144014", "total_delegated": "3800002735836", "min_delegated_in_current_cycle": - { "amount": "3800001668351", + { "amount": "3800001602043", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000002964495", "own_staked": "200000148243", - "own_delegated": "3800002816252", "external_staked": "0", + "own_full_balance": "4000002879850", "own_staked": "200000144014", + "own_delegated": "3800002735836", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", - "staking_denominator": "0", "current_voting_power": "4000002964495", + "staking_denominator": "0", "current_voting_power": "4000002879850", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, @@ -167,11 +187,11 @@ This sequence of operations was run: "pk": "[PUBLIC_KEY]" } }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000148243" } ], + "frozen_deposits": "200000144014" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3800002816252" +"3800002735836" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' "0" @@ -195,10 +215,10 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.06425 storage fees ........................... +ꜩ0.06425 - [PUBLIC_KEY_HASH] ... -ꜩ3762002.724482 - [PUBLIC_KEY_HASH] ... +ꜩ3762002.724482 - [PUBLIC_KEY_HASH] ... -ꜩ38000.02752 - [PUBLIC_KEY_HASH] ... +ꜩ38000.02752 + [PUBLIC_KEY_HASH] ... -ꜩ3762002.644871 + [PUBLIC_KEY_HASH] ... +ꜩ3762002.644871 + [PUBLIC_KEY_HASH] ... -ꜩ38000.026715 + [PUBLIC_KEY_HASH] ... +ꜩ38000.026715 ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -207,25 +227,30 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 59, "missed_levels": 1, "remaining_allowed_missed_slots": 9, - "expected_attesting_rewards": "13872" }, "grace_period": 4, + "expected_attesting_rewards": "12444" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "2652", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 4, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "212666827782", - "total_staked": "200000149432", "total_delegated": "38000035050", + "pending_staking_parameters": [], "baking_power": "212666822915", + "total_staked": "200000145085", "total_delegated": "38000033491", "min_delegated_in_current_cycle": - { "amount": "38000035050", + { "amount": "38000033491", "level": { "level": 9, "level_position": 8, "cycle": 2, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "238000184482", "own_staked": "200000149432", - "own_delegated": "38000035050", "external_staked": "0", + "own_full_balance": "238000178576", "own_staked": "200000145085", + "own_delegated": "38000033491", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" }, { "cycle": 2, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", "staking_denominator": "0", - "current_voting_power": "238000184482", "voting_power": "4000000000000", + "current_voting_power": "238000178576", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, "consensus_key": @@ -234,14 +259,14 @@ This sequence of operations was run: "pk": "[PUBLIC_KEY]" } }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000149432" } ], + "frozen_deposits": "200000145085" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"38000035050" +"38000033491" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' "0" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3762002724482" +"3762002644871" diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test register with consensus key.out b/tezt/tests/expected/consensus_key.ml/Alpha- Test register with consensus key.out index 27920df86abd..69dce6a7ff25 100644 --- a/tezt/tests/expected/consensus_key.ml/Alpha- Test register with consensus key.out +++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test register with consensus key.out @@ -66,7 +66,12 @@ This sequence of operations was run: { "expected_cycle_activity": 0, "minimal_cycle_activity": 0, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 0, - "expected_attesting_rewards": "0" }, "grace_period": 3, + "expected_attesting_rewards": "0" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 0, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "0", "sufficient_dal_participation": false, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, @@ -102,7 +107,12 @@ This sequence of operations was run: { "expected_cycle_activity": 0, "minimal_cycle_activity": 0, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 0, - "expected_attesting_rewards": "0" }, "grace_period": 3, + "expected_attesting_rewards": "0" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 0, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "0", "sufficient_dal_participation": false, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is delegate.out b/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is delegate.out index c567bcfbc04c..e68d67fe0179 100644 --- a/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is delegate.out +++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is delegate.out @@ -31,7 +31,12 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, @@ -66,23 +71,28 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466666683333", - "total_staked": "200000016667", "total_delegated": "3800000316666", + "pending_staking_parameters": [], "baking_power": "1466666681667", + "total_staked": "200000015001", "total_delegated": "3800000285009", "min_delegated_in_current_cycle": { "amount": "3800000000000", "level": { "level": 1, "level_position": 0, "cycle": 0, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000000333333", "own_staked": "200000016667", - "own_delegated": "3800000316666", "external_staked": "0", + "own_full_balance": "4000000300010", "own_staked": "200000015001", + "own_delegated": "3800000285009", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", - "staking_denominator": "0", "current_voting_power": "4000000333333", + "staking_denominator": "0", "current_voting_power": "4000000300010", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, @@ -95,7 +105,7 @@ This sequence of operations was run: "pk": "[PUBLIC_KEY]" } ] }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000016667" } ], + "frozen_deposits": "200000015001" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -104,24 +114,29 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667493344", - "total_staked": "200000164910", "total_delegated": "3800003133203", + "pending_staking_parameters": [], "baking_power": "1466667454794", + "total_staked": "200000159015", "total_delegated": "3800003021130", "min_delegated_in_current_cycle": - { "amount": "3800001985302", + { "amount": "3800001887337", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000003298113", "own_staked": "200000164910", - "own_delegated": "3800003133203", "external_staked": "0", + "own_full_balance": "4000003180145", "own_staked": "200000159015", + "own_delegated": "3800003021130", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", - "staking_denominator": "0", "current_voting_power": "4000003298113", + "staking_denominator": "0", "current_voting_power": "4000003180145", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, @@ -131,5 +146,5 @@ This sequence of operations was run: "pk": "[PUBLIC_KEY]" } }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000164910" } ], + "frozen_deposits": "200000159015" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is not delegate.out b/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is not delegate.out index ccead09b023e..747df4f92153 100644 --- a/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is not delegate.out +++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is not delegate.out @@ -31,7 +31,12 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, @@ -66,7 +71,12 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, @@ -104,24 +114,29 @@ This sequence of operations was run: { "expected_cycle_activity": 204, "minimal_cycle_activity": 136, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 68, - "expected_attesting_rewards": "531216" }, "grace_period": 3, + "expected_attesting_rewards": "477972" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 204, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "106080", "sufficient_dal_participation": true, + "denounced": false }, "grace_period": 3, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667371026", - "total_staked": "200000148243", "total_delegated": "3800002816252", + "pending_staking_parameters": [], "baking_power": "1466667344695", + "total_staked": "200000144014", "total_delegated": "3800002735836", "min_delegated_in_current_cycle": - { "amount": "3800001668351", + { "amount": "3800001602043", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000002964495", "own_staked": "200000148243", - "own_delegated": "3800002816252", "external_staked": "0", + "own_full_balance": "4000002879850", "own_staked": "200000144014", + "own_delegated": "3800002735836", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", - "staking_denominator": "0", "current_voting_power": "4000002964495", + "staking_denominator": "0", "current_voting_power": "4000002879850", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, @@ -131,5 +146,5 @@ This sequence of operations was run: "pk": "[PUBLIC_KEY]" } }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000148243" } ], + "frozen_deposits": "200000144014" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- update consensus key.out b/tezt/tests/expected/consensus_key.ml/Alpha- update consensus key.out index 9871b8ed4091..7ea6193c537b 100644 --- a/tezt/tests/expected/consensus_key.ml/Alpha- update consensus key.out +++ b/tezt/tests/expected/consensus_key.ml/Alpha- update consensus key.out @@ -144,10 +144,10 @@ This sequence of operations was run: Delegate: [PUBLIC_KEY_HASH] Destination: [PUBLIC_KEY_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ3761998.945648 - [PUBLIC_KEY_HASH] ... +ꜩ3761998.945648 - [PUBLIC_KEY_HASH] ... -ꜩ37999.989349 - [PUBLIC_KEY_HASH] ... +ꜩ37999.989349 + [PUBLIC_KEY_HASH] ... -ꜩ3761999.152219 + [PUBLIC_KEY_HASH] ... +ꜩ3761999.152219 + [PUBLIC_KEY_HASH] ... -ꜩ37999.991436 + [PUBLIC_KEY_HASH] ... +ꜩ37999.991436 ./octez-client --wait none drain delegate bootstrap3 to tezt_5 with tezt_1 @@ -164,8 +164,8 @@ This sequence of operations was run: Delegate: [PUBLIC_KEY_HASH] Destination: [PUBLIC_KEY_HASH] Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ3761999.999718 - [PUBLIC_KEY_HASH] ... +ꜩ3761999.999718 - [PUBLIC_KEY_HASH] ... -ꜩ37999.999997 - [PUBLIC_KEY_HASH] ... +ꜩ37999.999997 + [PUBLIC_KEY_HASH] ... -ꜩ3762000.20629 + [PUBLIC_KEY_HASH] ... +ꜩ3762000.20629 + [PUBLIC_KEY_HASH] ... -ꜩ38000.002083 + [PUBLIC_KEY_HASH] ... +ꜩ38000.002083 diff --git a/tezt/tests/expected/dal.ml/Alpha- Test following dal and baker tutorial commands.out b/tezt/tests/expected/dal.ml/Alpha- Test following dal and baker tutorial commands.out index c4d4e404e9ae..a55d4f012489 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Test following dal and baker tutorial commands.out +++ b/tezt/tests/expected/dal.ml/Alpha- Test following dal and baker tutorial commands.out @@ -116,7 +116,12 @@ This sequence of operations was run: { "expected_cycle_activity": 0, "minimal_cycle_activity": 0, "missed_slots": 0, "missed_levels": 0, "remaining_allowed_missed_slots": 0, - "expected_attesting_rewards": "0" }, "grace_period": 4, + "expected_attesting_rewards": "0" }, + "dal_participation": + { "expected_assigned_shards_per_slot": 0, + "delegate_attested_dal_slots": 0, "delegate_attestable_dal_slots": 0, + "expected_dal_rewards": "0", "sufficient_dal_participation": false, + "denounced": false }, "grace_period": 4, "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL L1 integration (Use all available slots).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL L1 integration (Use all available slots).out index 5800208d7858..3a70312dc463 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL L1 integration (Use all available slots).out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL L1 integration (Use all available slots).out @@ -1,6 +1,6 @@ GET http://[HOST]:[PORT]/chains/main/blocks/head/metadata 200 OK -{"protocol":"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK","next_protocol":"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK","test_chain_status":{"status":"not_running"},"max_operations_ttl":3,"max_operation_data_length":32768,"max_block_header_length":289,"max_operation_list_length":[{"max_size":4194304,"max_op":2048},{"max_size":32768},{"max_size":135168,"max_op":132},{"max_size":524288}],"proposer":"[PUBLIC_KEY_HASH]","baker":"[PUBLIC_KEY_HASH]","level_info":{"level":3,"level_position":2,"cycle":0,"cycle_position":2,"expected_commitment":false},"voting_period_info":{"voting_period":{"index":0,"kind":"proposal","start_position":0},"position":2,"remaining":61},"nonce_hash":null,"deactivated":[],"balance_updates":[{"kind":"accumulator","category":"block fees","change":"-416000","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"416000","origin":"block"},{"kind":"minted","category":"baking rewards","change":"-16667","origin":"block"},{"kind":"freezer","category":"deposits","staker":{"baker_own_stake":"[PUBLIC_KEY_HASH]"},"change":"16667","origin":"block"},{"kind":"minted","category":"baking rewards","change":"-316666","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"316666","origin":"block"},{"kind":"minted","category":"baking bonuses","change":"-16666","origin":"block"},{"kind":"freezer","category":"deposits","staker":{"baker_own_stake":"[PUBLIC_KEY_HASH]"},"change":"16666","origin":"block"},{"kind":"minted","category":"baking bonuses","change":"-316646","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"316646","origin":"block"}],"liquidity_baking_toggle_ema":0,"adaptive_issuance_vote_ema":0,"adaptive_issuance_activation_cycle":0,"implicit_operations_results":[{"kind":"transaction","storage":[{"int":"1"},{"int":"166766"},{"int":"100"},{"bytes":"01e927f00ef734dfc85919635e9afc9166c83ef9fc00"},{"bytes":"0115eb0104481a6d7921160bc982c5e0a561cd8a3a00"}],"balance_updates":[{"kind":"minted","category":"subsidy","change":"-83333","origin":"subsidy"},{"kind":"contract","contract":"[CONTRACT_HASH]","change":"83333","origin":"subsidy"}],"consumed_milligas":"206420","storage_size":"4629"}],"proposer_consensus_key":"[PUBLIC_KEY_HASH]","baker_consensus_key":"[PUBLIC_KEY_HASH]","consumed_milligas":"544000000","dal_attestation":"0"} +{"protocol":"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK","next_protocol":"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK","test_chain_status":{"status":"not_running"},"max_operations_ttl":3,"max_operation_data_length":32768,"max_block_header_length":289,"max_operation_list_length":[{"max_size":4194304,"max_op":2048},{"max_size":32768},{"max_size":135168,"max_op":132},{"max_size":524288}],"proposer":"[PUBLIC_KEY_HASH]","baker":"[PUBLIC_KEY_HASH]","level_info":{"level":3,"level_position":2,"cycle":0,"cycle_position":2,"expected_commitment":false},"voting_period_info":{"voting_period":{"index":0,"kind":"proposal","start_position":0},"position":2,"remaining":61},"nonce_hash":null,"deactivated":[],"balance_updates":[{"kind":"accumulator","category":"block fees","change":"-416000","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"416000","origin":"block"},{"kind":"minted","category":"baking rewards","change":"-15001","origin":"block"},{"kind":"freezer","category":"deposits","staker":{"baker_own_stake":"[PUBLIC_KEY_HASH]"},"change":"15001","origin":"block"},{"kind":"minted","category":"baking rewards","change":"-285009","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"285009","origin":"block"},{"kind":"minted","category":"baking bonuses","change":"-14989","origin":"block"},{"kind":"freezer","category":"deposits","staker":{"baker_own_stake":"[PUBLIC_KEY_HASH]"},"change":"14989","origin":"block"},{"kind":"minted","category":"baking bonuses","change":"-284787","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"284787","origin":"block"}],"liquidity_baking_toggle_ema":0,"adaptive_issuance_vote_ema":0,"adaptive_issuance_activation_cycle":0,"implicit_operations_results":[{"kind":"transaction","storage":[{"int":"1"},{"int":"166766"},{"int":"100"},{"bytes":"01e927f00ef734dfc85919635e9afc9166c83ef9fc00"},{"bytes":"0115eb0104481a6d7921160bc982c5e0a561cd8a3a00"}],"balance_updates":[{"kind":"minted","category":"subsidy","change":"-83333","origin":"subsidy"},{"kind":"contract","contract":"[CONTRACT_HASH]","change":"83333","origin":"subsidy"}],"consumed_milligas":"206420","storage_size":"4629"}],"proposer_consensus_key":"[PUBLIC_KEY_HASH]","baker_consensus_key":"[PUBLIC_KEY_HASH]","consumed_milligas":"544000000","dal_attestation":"0"} { "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", @@ -63,7 +63,7 @@ GET http://[HOST]:[PORT]/chains/main/blocks/head/metadata { "kind": "minted", "category": "baking rewards", - "change": "-16667", + "change": "-15001", "origin": "block" }, { @@ -72,25 +72,25 @@ GET http://[HOST]:[PORT]/chains/main/blocks/head/metadata "staker": { "baker_own_stake": "[PUBLIC_KEY_HASH]" }, - "change": "16667", + "change": "15001", "origin": "block" }, { "kind": "minted", "category": "baking rewards", - "change": "-316666", + "change": "-285009", "origin": "block" }, { "kind": "contract", "contract": "[PUBLIC_KEY_HASH]", - "change": "316666", + "change": "285009", "origin": "block" }, { "kind": "minted", "category": "baking bonuses", - "change": "-16666", + "change": "-14989", "origin": "block" }, { @@ -99,19 +99,19 @@ GET http://[HOST]:[PORT]/chains/main/blocks/head/metadata "staker": { "baker_own_stake": "[PUBLIC_KEY_HASH]" }, - "change": "16666", + "change": "14989", "origin": "block" }, { "kind": "minted", "category": "baking bonuses", - "change": "-316646", + "change": "-284787", "origin": "block" }, { "kind": "contract", "contract": "[PUBLIC_KEY_HASH]", - "change": "316646", + "change": "284787", "origin": "block" } ], diff --git a/tezt/tests/expected/weeklynet.ml/Alpha- weeklynet regression test.out b/tezt/tests/expected/weeklynet.ml/Alpha- weeklynet regression test.out index 874e030dc9cd..d795a216d8f2 100644 --- a/tezt/tests/expected/weeklynet.ml/Alpha- weeklynet regression test.out +++ b/tezt/tests/expected/weeklynet.ml/Alpha- weeklynet regression test.out @@ -13,7 +13,7 @@ "baking_reward_fixed_portion_weight": 5120, "baking_reward_bonus_weight": 5120, "attesting_reward_weight": 10240, "seed_nonce_revelation_tip_weight": 1, "vdf_revelation_tip_weight": 1, - "dal_rewards_weight": 0 }, "cost_per_byte": "250", + "dal_rewards_weight": 2275 }, "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, "liquidity_baking_subsidy": "5000000", @@ -29,12 +29,12 @@ "cache_script_size": 100000000, "cache_stake_distribution_cycles": 5, "cache_sampler_state_cycles": 5, "dal_parametric": - { "feature_enable": true, "incentives_enable": false, + { "feature_enable": true, "incentives_enable": true, "number_of_slots": 32, "attestation_lag": 8, "attestation_threshold": 66, "minimal_participation_ratio": { "numerator": "16", "denominator": "25" }, - "rewards_ratio": { "numerator": "0", "denominator": "1" }, + "rewards_ratio": { "numerator": "1", "denominator": "10" }, "traps_fraction": { "numerator": "1", "denominator": "2000" }, "redundancy_factor": 8, "page_size": 3967, "slot_size": 126944, "number_of_shards": 512 }, "smart_rollup_arith_pvm_enable": true, -- GitLab From 4617670be5f1991f931979da775da227342207d0 Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Thu, 16 Jan 2025 15:18:17 +0100 Subject: [PATCH 6/9] Tezt/Tests: set DAL rewards to zero for delegate & staker staking test Exact tezt test is: 'Alpha: Staking - test staking with delegate and staker in a simple scenario' --- tezt/tests/adaptive_issuance.ml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tezt/tests/adaptive_issuance.ml b/tezt/tests/adaptive_issuance.ml index 284ac3831ae4..7b11fa4f180a 100644 --- a/tezt/tests/adaptive_issuance.ml +++ b/tezt/tests/adaptive_issuance.ml @@ -511,9 +511,12 @@ let test_staking = if Protocol.(number protocol > number Quebec) then (* TODO: https://gitlab.com/tezos/tezos/-/issues/7576 use a default value for [tolerated_inactivity_period] *) - (["tolerated_inactivity_period"], `Int 3) :: overrides + (["tolerated_inactivity_period"], `Int 3) + :: (["issuance_weights"; "dal_rewards_weight"], `Int 0) + :: overrides else overrides in + let* _proto_hash, endpoint, client_1, node_1 = init ~overrides protocol in let* eosod = edge_of_staking_over_delegation client_1 in -- GitLab From 3ffae5eb834e5ebe09d0e4339161630473938e6a Mon Sep 17 00:00:00 2001 From: Eugen Zalinescu Date: Tue, 21 Jan 2025 09:05:28 +0100 Subject: [PATCH 7/9] Tezt/Tezos: be able to set DAL rewards weight for sc_rollup tests --- tezt/lib_tezos/sc_rollup_helpers.ml | 11 ++++++++++- tezt/lib_tezos/sc_rollup_helpers.mli | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tezt/lib_tezos/sc_rollup_helpers.ml b/tezt/lib_tezos/sc_rollup_helpers.ml index d1eb940ced54..d2311d73ba65 100644 --- a/tezt/lib_tezos/sc_rollup_helpers.ml +++ b/tezt/lib_tezos/sc_rollup_helpers.ml @@ -229,6 +229,10 @@ let make_parameter name = function | None -> [] | Some value -> [([name], `Int value)] +let make_int_parameter name = function + | None -> [] + | Some value -> [(name, `Int value)] + let make_bool_parameter name = function | None -> [] | Some value -> [([name], `Bool value)] @@ -244,7 +248,7 @@ let make_string_parameter name = function let setup_l1 ?timestamp ?bootstrap_smart_rollups ?bootstrap_contracts ?commitment_period ?challenge_window ?timeout ?whitelist_enable ?rpc_external ?(riscv_pvm_enable = false) ?minimal_block_delay - ?dal_incentives protocol = + ?dal_incentives ?dal_rewards_weight protocol = let parameters = make_parameter "smart_rollup_commitment_period_in_blocks" commitment_period @ make_parameter "smart_rollup_challenge_window_in_blocks" challenge_window @@ -262,6 +266,11 @@ let setup_l1 ?timestamp ?bootstrap_smart_rollups ?bootstrap_contracts @ make_bool_parameter_l ["dal_parametric"; "incentives_enable"] dal_incentives + @ (if Protocol.(number protocol > number Quebec) then + make_int_parameter + ["issuance_weights"; "dal_rewards_weight"] + dal_rewards_weight + else []) @ if riscv_pvm_enable then [(["smart_rollup_riscv_pvm_enable"], `Bool true)] else [] diff --git a/tezt/lib_tezos/sc_rollup_helpers.mli b/tezt/lib_tezos/sc_rollup_helpers.mli index a43bc2223893..4b0da3dd8d27 100644 --- a/tezt/lib_tezos/sc_rollup_helpers.mli +++ b/tezt/lib_tezos/sc_rollup_helpers.mli @@ -124,6 +124,7 @@ val setup_l1 : ?riscv_pvm_enable:bool -> ?minimal_block_delay:int -> ?dal_incentives:bool -> + ?dal_rewards_weight:int -> Protocol.t -> (Node.t * Client.t) Lwt.t -- GitLab From 95f5a93626212a61c29ec9ec58bf9f583dc896a0 Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Fri, 17 Jan 2025 06:49:52 +0100 Subject: [PATCH 8/9] Tezt/Tests: set DAL rewards to zero in SC rollup test related to rewards --- tezt/tests/sc_rollup.ml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tezt/tests/sc_rollup.ml b/tezt/tests/sc_rollup.ml index 511585878479..373d7bf0aeba 100644 --- a/tezt/tests/sc_rollup.ml +++ b/tezt/tests/sc_rollup.ml @@ -150,7 +150,7 @@ let gen_keys_then_transfer_tez ?(giver = Constant.bootstrap1.alias) let test_l1_scenario ?supports ?regression ?hooks ~kind ?boot_sector ?whitelist_enable ?whitelist ?commitment_period ?challenge_window ?timeout - ?(src = Constant.bootstrap1.alias) ?rpc_external ?uses + ?(src = Constant.bootstrap1.alias) ?rpc_external ?uses ?dal_rewards_weight {variant; tags; description} scenario = let tags = kind :: tags in register_test @@ -166,6 +166,7 @@ let test_l1_scenario ?supports ?regression ?hooks ~kind ?boot_sector setup_l1 ?commitment_period ?challenge_window + ?dal_rewards_weight ?timeout ?whitelist_enable ?rpc_external @@ -3930,6 +3931,9 @@ let test_refutation_reward_and_punishment ~kind = ~kind ~timeout:timeout_period ~commitment_period + ~dal_rewards_weight:0 + (* Set the DAL rewards to zero, to not interfere with this test. See details + here: https://gitlab.com/tezos/tezos/-/issues/7696#note_2307123115. *) ~regression:true ~hooks { -- GitLab From 4002c128fce6f60d7773cfabf8d31b61b75a2601 Mon Sep 17 00:00:00 2001 From: Eugen Zalinescu Date: Wed, 22 Jan 2025 11:55:35 +0100 Subject: [PATCH 9/9] CHANGES: add relevant entries --- CHANGES.rst | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 8e73c0c81efe..356f539f0360 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -258,17 +258,22 @@ DAL node Protocol ~~~~~~~~ +- The DAL incentives feature flag was turned on. (MR :gl:`!15614`) + +- **Change** The output of the RPC ``context/issuance/expected_issuance`` has a + new field ``"dal_attesting_reward_per_shard"`` (MR :gl:`!15614`) + - A new RPC ``/chains/main/blocks/head/context/delegates//dal_participation`` similar to Tenderbake's ``/participation`` RPC to track bakers' DAL activity (MR :gl:`!16168`) -- A new antonymous operation "DAL entrapment evidence" was added. This operation - is not valid when the feature flag for DAL incentives is turned off. (MR - :gl:`!15677`) + - A new anonymous operation "DAL entrapment evidence" was added. This operation is not valid when the feature flag for DAL incentives is turned off. (MRs :gl:`!15677`, :gl:`!15832`, :gl:`!15836`) + - Set the message validation function at node startup, fixing https://gitlab.com/tezos/tezos/-/issues/7629. (MR :gl:`!15830`) + - A warning has been introduced in case it is observed that the DAL node lags behind the L1 node. (MR :gl:`!15756`) -- GitLab