From 0b8904f3cf12a34d9918a996167ed4ec45a5b65c Mon Sep 17 00:00:00 2001 From: Philippe Wang Date: Mon, 3 Jul 2023 10:09:04 -0700 Subject: [PATCH 1/4] Proto/AI: update CHANGES.rst for bakers --- CHANGES.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 85cc9ed0d4e0..17a6cb1fe5d9 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -217,9 +217,10 @@ Baker data directory when searching an existing file. The previous semantics, which looks for this file in the current working directory, takes predecence. -- Bakers are now required to set their votes for the adoption of the - adaptive inflation feature. They may use the per block votes file, - or CLI option ``--adaptive-inflation-vote``. +- Bakers are now asked (but not required) to set their votes for the adoption of the + adaptive inflation feature. They may use the CLI option ``--adaptive-inflation-vote`` + or the per-block votes file (which is re-read at each block, and overrides the CLI option). + Absence of vote is equivalent to voting "pass". - Rename ``endorsement`` into ``attestation`` for baker errors and events. (MR :gl:`!9195`) -- GitLab From bac61b03c3d9a7ac145423020f7b67c752ff4941 Mon Sep 17 00:00:00 2001 From: Philippe Wang Date: Mon, 3 Jul 2023 10:30:30 -0700 Subject: [PATCH 2/4] Proto/AI: update CHANGES.rst (RPC /protocol_data) --- CHANGES.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 17a6cb1fe5d9..9cba792c8aa2 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -203,6 +203,11 @@ Node is classified as ``branch_delayed`` with the ``prevalidation.operation_conflict`` error. (MR :gl:`!9314`) +- In RPC ``/protocol_data``, ``"per_block_votes"`` replaces ``"liquidity_baking_toggle_vote"``; + ``"per_block_votes"`` has two properties ``"liquidity_baking_vote"`` and ``"adaptive_inflation_vote"``. + A vote is one of ``"on"``, ``"off"``, ``"pass"``. + + Client ------ - Adding client commands to generate, open and verify a time-lock. -- GitLab From c0bb36e02d04935b148826ec3d3c1fe315e9fb17 Mon Sep 17 00:00:00 2001 From: Philippe Wang Date: Mon, 3 Jul 2023 10:39:53 -0700 Subject: [PATCH 3/4] Proto/AI: update Oxford doc --- docs/protocols/018_oxford.rst | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/protocols/018_oxford.rst b/docs/protocols/018_oxford.rst index 02e4491210a6..d3ab60ac1de3 100644 --- a/docs/protocols/018_oxford.rst +++ b/docs/protocols/018_oxford.rst @@ -53,11 +53,13 @@ Adaptive Inflation (ongoing) - This protocol asks the bakers to set their votes for the adoption of the adaptive inflation feature. They may use the per-block votes - file, or CLI option ``--adaptive-inflation-vote``. If they do - not vote for the adaptive inflation feature, the vote defaults to - "pass" (unlike for the liquidity baking vote, which is mandatory). - -- Introduce feature flag for Adaptive Inflation. (MR :gl:`!8566`) + file, or CLI option ``--adaptive-inflation-vote``. If they do not + vote for the adaptive inflation feature, the vote defaults to + ``"pass"`` (unlike for the liquidity baking toggle vote, which is + mandatory). As for the liquidity baking toggle vote, the value in + the per-block votes file is read at each block (so the baker does + not have to restart in case the value has changed in the file), and + overrides the value of the CLI option if any. - Add parameter ``staking_over_baking_limit`` as the limit of co-staked tokens over the baked tokens for a given baker. (MR :gl:`!8744`) -- GitLab From cf797d06f0cc38fb0e0d95aaae189f193c021a3b Mon Sep 17 00:00:00 2001 From: Philippe Wang Date: Mon, 3 Jul 2023 10:40:19 -0700 Subject: [PATCH 4/4] Proto/AI: update Oxford doc: remove "ongoing" from section title --- docs/protocols/018_oxford.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/protocols/018_oxford.rst b/docs/protocols/018_oxford.rst index d3ab60ac1de3..140e8c14c415 100644 --- a/docs/protocols/018_oxford.rst +++ b/docs/protocols/018_oxford.rst @@ -48,8 +48,8 @@ Zero Knowledge Rollups (ongoing) Data Availability Layer (ongoing) --------------------------------- -Adaptive Inflation (ongoing) ----------------------------- +Adaptive Inflation +------------------ - This protocol asks the bakers to set their votes for the adoption of the adaptive inflation feature. They may use the per-block votes -- GitLab