From c9938f284a75399aac7809b83398378e141f3661 Mon Sep 17 00:00:00 2001 From: Julien Tesson Date: Thu, 8 Feb 2024 18:04:09 +0100 Subject: [PATCH 1/3] proto/AI feature_flag: enable AI vote --- src/proto_alpha/lib_parameters/default_parameters.ml | 2 +- src/proto_alpha/lib_protocol/raw_context.ml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/proto_alpha/lib_parameters/default_parameters.ml b/src/proto_alpha/lib_parameters/default_parameters.ml index 366a3067671f..c4c3909547a9 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 f771611dd136..eaf38cdb1de1 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; -- GitLab From ab54bc889b9c2a8152a6be18267bd432ad934715 Mon Sep 17 00:00:00 2001 From: Julien Tesson Date: Fri, 9 Feb 2024 10:50:51 +0100 Subject: [PATCH 2/3] tezt/RPC: reset regression trace --- ...Alpha- (mode client) RPC regression tests- misc_protocol.out | 2 +- .../Alpha- (mode light) RPC regression tests- misc_protocol.out | 2 +- .../Alpha- (mode proxy) RPC regression tests- misc_protocol.out | 2 +- ...oxy_server_data_dir) RPC regression tests- misc_protocol.out | 2 +- ...de proxy_server_rpc) RPC regression tests- misc_protocol.out | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 94f53d83d55d..305e5e95a3da 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 6209acaea7a3..9a22690a671d 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 e014ca9015b2..15a3f8f6b6d4 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 224a13d8af43..5d43abbe2957 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 224a13d8af43..5d43abbe2957 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 } -- GitLab From 0930ad9fd262649f3b0bdc4137cdea68f2848099 Mon Sep 17 00:00:00 2001 From: Julien Tesson Date: Fri, 9 Feb 2024 10:52:58 +0100 Subject: [PATCH 3/3] docs/proto: update alpha changelog --- docs/protocols/alpha.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/protocols/alpha.rst b/docs/protocols/alpha.rst index e6376554a648..931a967c3e8d 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 ---------------- -- GitLab