diff --git a/docs/protocols/alpha.rst b/docs/protocols/alpha.rst index e6376554a648186d5fb41a2fd8dd0dc575da3d0e..931a967c3e8d2ef9b9b16f0c1c8f1e17be6681a0 100644 --- a/docs/protocols/alpha.rst +++ b/docs/protocols/alpha.rst @@ -67,6 +67,8 @@ Adaptive Issuance (ongoing) double bake/attest, by giving them some time to fix it. (MR :gl:`!11704`) +- Activating adaptive issuance per-block vote (MR !11935) + Gas improvements ---------------- diff --git a/src/proto_alpha/lib_parameters/default_parameters.ml b/src/proto_alpha/lib_parameters/default_parameters.ml index 366a3067671f3121cd0ff0453d5d518420e9c58e..c4c3909547a90a55c4454fea9095af8bfb1599c9 100644 --- a/src/proto_alpha/lib_parameters/default_parameters.ml +++ b/src/proto_alpha/lib_parameters/default_parameters.ml @@ -290,7 +290,7 @@ let constants_mainnet : Constants.Parametric.t = center_dz = Q.(1 // 2); radius_dz = Q.(1 // 50); }; - activation_vote_enable = false; + activation_vote_enable = true; autostaking_enable = true; force_activation = false; ns_enable = false; diff --git a/src/proto_alpha/lib_protocol/raw_context.ml b/src/proto_alpha/lib_protocol/raw_context.ml index f771611dd1363f2ab865edb5c41b1faf43b37548..eaf38cdb1de1b163c043773c80c20da89b49a0a8 100644 --- a/src/proto_alpha/lib_protocol/raw_context.ml +++ b/src/proto_alpha/lib_protocol/raw_context.ml @@ -1159,8 +1159,7 @@ let prepare_first_block ~level ~timestamp _chain_id ctxt = c.adaptive_issuance.edge_of_staking_over_delegation; launch_ema_threshold = c.adaptive_issuance.launch_ema_threshold; adaptive_rewards_params; - activation_vote_enable = - c.adaptive_issuance.activation_vote_enable; + activation_vote_enable = true; autostaking_enable = c.adaptive_issuance.autostaking_enable; force_activation = false; ns_enable = false; 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 94f53d83d55db4ca1e41dd349cd2a6bb56d06087..305e5e95a3da7df3e28e34d99f745e561e3125fd 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 @@ -72,7 +72,7 @@ "growth_rate": { "numerator": "1", "denominator": "100" }, "center_dz": { "numerator": "1", "denominator": "2" }, "radius_dz": { "numerator": "1", "denominator": "50" } }, - "adaptive_issuance_activation_vote_enable": false, + "adaptive_issuance_activation_vote_enable": true, "autostaking_enable": true, "adaptive_issuance_force_activation": false, "ns_enable": false, "direct_ticket_spending_enable": false } 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 6209acaea7a305e8ee65c366abacb122a6cd908d..9a22690a671da73c1f58d0f2e045f07e3e54b296 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 @@ -72,7 +72,7 @@ "growth_rate": { "numerator": "1", "denominator": "100" }, "center_dz": { "numerator": "1", "denominator": "2" }, "radius_dz": { "numerator": "1", "denominator": "50" } }, - "adaptive_issuance_activation_vote_enable": false, + "adaptive_issuance_activation_vote_enable": true, "autostaking_enable": true, "adaptive_issuance_force_activation": false, "ns_enable": false, "direct_ticket_spending_enable": false } 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 e014ca9015b2119ab63ad425785e54adb4c27c50..15a3f8f6b6d4fe27fb8bba4338d85b95534c78be 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 @@ -72,7 +72,7 @@ "growth_rate": { "numerator": "1", "denominator": "100" }, "center_dz": { "numerator": "1", "denominator": "2" }, "radius_dz": { "numerator": "1", "denominator": "50" } }, - "adaptive_issuance_activation_vote_enable": false, + "adaptive_issuance_activation_vote_enable": true, "autostaking_enable": true, "adaptive_issuance_force_activation": false, "ns_enable": false, "direct_ticket_spending_enable": false } diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out index 224a13d8af43eb90a45bd75e0ae4a51f16c2ee20..5d43abbe295745b7ee13f3113a27869247046263 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out @@ -72,7 +72,7 @@ "growth_rate": { "numerator": "1", "denominator": "100" }, "center_dz": { "numerator": "1", "denominator": "2" }, "radius_dz": { "numerator": "1", "denominator": "50" } }, - "adaptive_issuance_activation_vote_enable": false, + "adaptive_issuance_activation_vote_enable": true, "autostaking_enable": true, "adaptive_issuance_force_activation": false, "ns_enable": false, "direct_ticket_spending_enable": false } diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out index 224a13d8af43eb90a45bd75e0ae4a51f16c2ee20..5d43abbe295745b7ee13f3113a27869247046263 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out @@ -72,7 +72,7 @@ "growth_rate": { "numerator": "1", "denominator": "100" }, "center_dz": { "numerator": "1", "denominator": "2" }, "radius_dz": { "numerator": "1", "denominator": "50" } }, - "adaptive_issuance_activation_vote_enable": false, + "adaptive_issuance_activation_vote_enable": true, "autostaking_enable": true, "adaptive_issuance_force_activation": false, "ns_enable": false, "direct_ticket_spending_enable": false }