From 638adc7c232ef96b3865eef0ee6c5bc18977a9c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Delbianco?= Date: Tue, 12 Apr 2022 08:10:58 +0000 Subject: [PATCH 1/8] Doc: tweak Ithaca/Jakarta/Alpha plugins doc Fixed an underlying _Gallicism_: `operation manager` -> `manager operation`. --- docs/alpha/plugins.rst | 2 +- docs/ithaca/plugins.rst | 2 +- docs/jakarta/plugins.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/alpha/plugins.rst b/docs/alpha/plugins.rst index 701e09debd8d..d3c503e9df8c 100644 --- a/docs/alpha/plugins.rst +++ b/docs/alpha/plugins.rst @@ -111,7 +111,7 @@ The detailed description of this feature is given in fully executed to decide their propagation (see :doc:`../shell/prevalidation`). -One operation manager per manager per block +One manager operation per manager per block ........................................... The mempool filters, ``prefilter``, ``precheck`` and ``postfilter`` diff --git a/docs/ithaca/plugins.rst b/docs/ithaca/plugins.rst index 362390efdffe..3eaf723e281c 100644 --- a/docs/ithaca/plugins.rst +++ b/docs/ithaca/plugins.rst @@ -114,7 +114,7 @@ The detailed description of this feature is given in fully executed to decide their propagation (see :doc:`../shell/prevalidation`). -One operation manager per manager per block +One manager operation per manager per block ........................................... The mempool filters, ``prefilter``, ``precheck`` and ``postfilter`` diff --git a/docs/jakarta/plugins.rst b/docs/jakarta/plugins.rst index eb12582c2275..19d640c7352d 100644 --- a/docs/jakarta/plugins.rst +++ b/docs/jakarta/plugins.rst @@ -111,7 +111,7 @@ The detailed description of this feature is given in fully executed to decide their propagation (see :doc:`../shell/prevalidation`). -One operation manager per manager per block +One manager operation per manager per block ........................................... The mempool filters, ``prefilter``, ``precheck`` and ``postfilter`` -- GitLab From 7d4b24deebe2330a4393e69afb724b32fb8cedc4 Mon Sep 17 00:00:00 2001 From: Lacramioara Astefanoaei Date: Tue, 12 Apr 2022 13:13:46 +0200 Subject: [PATCH 2/8] doc: update consensus in active wrt consensus in alpha --- docs/ithaca/consensus.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/ithaca/consensus.rst b/docs/ithaca/consensus.rst index c65e5fea332e..59b05975f387 100644 --- a/docs/ithaca/consensus.rst +++ b/docs/ithaca/consensus.rst @@ -57,6 +57,8 @@ Tenderbake is executed for each new block level by a "committee" whose members are called *validators*, which are delegates selected at random based on their stake, in the same way as endorsers are selected in Emmy*. We let ``CONSENSUS_COMMITTEE_SIZE`` be the number of validator :ref:`slots` per level. +This constant has the role of ``ENDORSERS_PER_BLOCK`` in Emmy*. +Furthermore, we use ``CONSENSUS_THRESHOLD`` to denote two thirds of ``CONSENSUS_COMMITTEE_SIZE``. For each level, Tenderbake proceeds in rounds. Each *round* represents an attempt by the validators to agree on the content of the block for the current @@ -94,7 +96,7 @@ Unlike Emmy*, Tenderbake has `two types of votes `_: before endorsing a block ``b``, a validator preendorses ``b``. Furthermore, to be able to endorse, a validator must have observed a preendorsement *quorum*, that is a -set of preendorsements from validators having at least :math:`\lceil CONSENSUS\_COMMITTEE\_SIZE \times \frac{2}{3} \rceil` validator slots. Similarly, to be able to decide, a validator must have observed an endorsement quorum, that is, a set of endorsements from validators having at least :math:`\lceil CONSENSUS\_COMMITTEE\_SIZE \times \frac{2}{3} \rceil` validator slots. The +set of preendorsements from validators having at least ``CONSENSUS_THRESHOLD`` validator slots. Similarly, to be able to decide, a validator must have observed an endorsement quorum, that is, a set of endorsements from validators having at least ``CONSENSUS_THRESHOLD`` validator slots. The endorsement quorum for a block ``b`` is included in a block ``b'`` on top of ``b``, serving as a certification that ``b`` has been agreed upon. We also say that block ``b'`` confirms block ``b``. @@ -303,10 +305,9 @@ validator slots above the threshold of ``CONSENSUS_COMMITTEE_SIZE * 2 / 3`` that the included endorsements represent. The bonus is also distributed immediately. -The endorsing rewards are shared among all validators, proportionally -to their *expected* number of validator slots. The endorsing reward -may be received even if the validator's endorsement is not included in -a block. However, two conditions must be met: +The endorsing rewards are distributed at the end of the cycle. +The endorsing reward may be received even if not all of the validator's endorsements are included in a block and is proportional to the validator's active stake (in other words, to its *expected* number of validator slots, and not its actual number of slots). +However, two conditions must be met: - the validator has revealed its nonce, and - the validator has been present during the cycle. @@ -319,7 +320,6 @@ corresponding level) of all the endorsements included by the delegate during the cycle represents at least ``MINIMAL_PARTICIPATION_RATIO`` of the delegate's expected number of validator slots for the current cycle (which is ``BLOCKS_PER_CYCLE * CONSENSUS_COMMITTEE_SIZE * active_stake / total_active_stake``). -The endorsing rewards are distributed at the end of the cycle. Regarding the concrete values for rewards, we first fix the total reward per level, call it ``total_rewards``, to ``80 / blocks_per_minute`` tez. @@ -491,5 +491,5 @@ Further External Resources -------------------------- * Tenderbake `report `_ -* Tenderbake `blog post `_. +* Tenderbake `blog post `_. * Tenderbake `tzip `_. -- GitLab From 78637a4d509196d1d761e3c44e521326ecd92b86 Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Thu, 7 Apr 2022 13:21:37 +0200 Subject: [PATCH 3/8] Tx_rollup: reference to wrong variable in comment --- src/proto_alpha/lib_protocol/tx_rollup_l2_verifier.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/proto_alpha/lib_protocol/tx_rollup_l2_verifier.ml b/src/proto_alpha/lib_protocol/tx_rollup_l2_verifier.ml index 4773ea604799..75a465b2e647 100644 --- a/src/proto_alpha/lib_protocol/tx_rollup_l2_verifier.ml +++ b/src/proto_alpha/lib_protocol/tx_rollup_l2_verifier.ml @@ -157,7 +157,7 @@ let compute_proof_after_hash ~max_proof_size ctxt parameters agreed proof >>= fun res -> match res with | (Ok _ | Error (`Stream_too_short _)) when proof_is_too_long -> - (* If the proof is larger than [proof_is_too_long] we care about 2 cases: + (* If the proof is larger than [max_proof_size] we care about 2 cases: - The proof verification succedeed but should not be considered valid since it is larger than the size limit -- GitLab From b304550211ca72a49a2c58f23658aefe6723a7ba Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Tue, 12 Apr 2022 14:21:35 +0200 Subject: [PATCH 4/8] Docs/python test: error in how to update python test job balancing --- docs/developer/testing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer/testing.rst b/docs/developer/testing.rst index eef15e56a1d6..f976732d9921 100644 --- a/docs/developer/testing.rst +++ b/docs/developer/testing.rst @@ -544,7 +544,7 @@ Python integration and regression tests New Pytest tests will be included automatically in the CI. To rebalance the Pytest batches based on a previous pipeline, run (from the root of the Tezos repository): - ``cd tests_python && poetry run ./scripts/jobs_fetch_reports.py test-results.xml`` + ``cd tests_python && poetry run python ./scripts/jobs_fetch_reports.py test-results.xml`` setting ```` to a GitLab project id (e.g. ``3836952`` or `tezos/tezos `_) and ```` to the id of a pipeline in this project for which integration tests have executed (e.g. `391861162 `_). -- GitLab From 0e2e6730d37f32c2ba124a05ad98f43ea42da31b Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Tue, 12 Apr 2022 14:29:38 +0200 Subject: [PATCH 5/8] doc: add J to the hall of fame of protocol names --- docs/protocols/naming.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/protocols/naming.rst b/docs/protocols/naming.rst index d3923ebf8985..0464492f3239 100644 --- a/docs/protocols/naming.rst +++ b/docs/protocols/naming.rst @@ -36,6 +36,7 @@ sequence: * 010 Granada * 011 Hangzhou * 012 Ithaca +* 013 Jakarta * ... Due to the evolving nature of the in-use protocols, the above absolute protocol -- GitLab From a975c4e91f0b0319b872fd3a5d5719d26a509e8c Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Tue, 12 Apr 2022 17:02:37 +0200 Subject: [PATCH 6/8] doc: fixes in the dev changelog --- CHANGES.rst | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 40dfefc6855b..ffde88974643 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -29,17 +29,17 @@ Node Transaction Optimistic Rollups, Tickets Hardening and Liquidity Baking Toggle. - **Breaking change**: - restored the encoding of events corresponding to "completed + Restored the encoding of events corresponding to "completed requests" (block validation, head switch, ...) to pre v11. They only - contains absolute timestamp. + contain absolute timestamps. - Add optional query parameters ``applied``, ``refused``, ``outdated``, ``branch_refused``, and ``branch_delayed`` to RPC ``GET /chains/main/mempool/pending_operations``. - These new parameters indicate the classifications for which the RPC should - or shouldn't return the corresponding operations. If no option is given, all + These new parameters filter the operations returned based on their + classifications. If no option is given, all the parameters are assumed to be ``true``, making this extension - backward-compatible (i.e. and all operations are returned). + backward-compatible (i.e. all operations are returned). - Added optional parameter ``--media-type`` and its corresponding field in the configuration file. It defines which format of data serialisation @@ -52,8 +52,8 @@ Node - Adds ``tezos-node storage head-commmit`` command to print the current context head commit hash to stdout. -- Added a check to ensure the consistency between the imported - snapshot history mode and the one stored in the targeted data +- Added a history mode check when importing a snapshot to ensure the consistency between the + history mode of the snapshot and the one stored in the targeted data directory configuration file. - Fixed a wrong behavior that could cause the savepoint to be dragged @@ -64,9 +64,11 @@ Node the node changed his head. - The node context storage format was upgraded. To this end, a new storage - version was introduced: 0.0.8 (previously 0.0.7). Upgrading from 0.0.7 to + version was introduced: 0.0.8 (previously 0.0.7). Backward compatibility is + preserved: upgrading from 0.0.7 to 0.0.8 is done automatically by the node the first time you run it. This - upgrade is instantaneous. However, be careful that previous versions of Octez + upgrade is instantaneous. However, be careful that there is no forward + compatibility: previous versions of Octez will refuse to run on a data directory which was used with Octez 13.0. - Validation errors are flatter. Instead of the ``economic_protocol_error`` @@ -101,13 +103,12 @@ Client - A new ``--self-address`` option was added to the ``run script`` command. It makes the given address be considered the address of the contract being run. The address must actually exist in the - context. If ``--balance`` wasn't specified, the script also + context. Unless ``--balance`` is specified, the script also inherits the given contract's balance. - Storage and input parameters given to the ``run script`` command - can now be read from a file just like the script itself can. - Also like with script, the ``file:`` prefix can be added for - disambiguation. + can now be read from a file just like the script itself. + The ``file:`` prefix can be added for disambiguation, like for a script. - Add option ``--force`` to the command ``submit ballots``. This is mostly for testing purposes: it disables all checks and allows to -- GitLab From eb69643121b8dc6cdf93ec83b10af2575ca8bed4 Mon Sep 17 00:00:00 2001 From: Valentin Chaboche Date: Mon, 25 Apr 2022 11:11:15 +0200 Subject: [PATCH 7/8] Proto,Client: typos in tx_rollup command --- .../lib_client_commands/client_proto_context_commands.ml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/proto_alpha/lib_client_commands/client_proto_context_commands.ml b/src/proto_alpha/lib_client_commands/client_proto_context_commands.ml index 91088fe4d098..8d2c21be3dcf 100644 --- a/src/proto_alpha/lib_client_commands/client_proto_context_commands.ml +++ b/src/proto_alpha/lib_client_commands/client_proto_context_commands.ml @@ -2302,9 +2302,9 @@ let commands_rw () = command ~group ~desc: - "Commit to an optimistic transaction rollup for an inbox and level.\n\n\ + "Commit to a transaction rollup for an inbox and level.\n\n\ The provided list of message result hash must be ordered in the same \ - way the messages was ordered in the inbox." + way the messages were ordered in the inbox." (args13 fee_arg dry_run_switch @@ -2325,7 +2325,7 @@ let commands_rw () = ())) (prefixes ["commit"; "to"; "tx"; "rollup"] @@ Tx_rollup.tx_rollup_address_param - ~usage:"Transaction rollup addressb committed to." + ~usage:"Transaction rollup address committed to." @@ prefix "from" @@ ContractAlias.destination_param ~name:"src" @@ -2339,7 +2339,7 @@ let commands_rw () = (Tx_rollup.message_result_hash_param ~usage: "Message result hash of a message from the inbox being \ - comitted.")) + committed.")) (fun ( fee, dry_run, verbose_signing, -- GitLab From 935af6471168a8f4faccba389d4d4cf7bce4be85 Mon Sep 17 00:00:00 2001 From: Lacramioara Astefanoaei Date: Mon, 25 Apr 2022 16:14:51 +0200 Subject: [PATCH 8/8] doc: rm ref to emmy --- docs/ithaca/consensus.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/ithaca/consensus.rst b/docs/ithaca/consensus.rst index 59b05975f387..4722e68a7f55 100644 --- a/docs/ithaca/consensus.rst +++ b/docs/ithaca/consensus.rst @@ -57,7 +57,6 @@ Tenderbake is executed for each new block level by a "committee" whose members are called *validators*, which are delegates selected at random based on their stake, in the same way as endorsers are selected in Emmy*. We let ``CONSENSUS_COMMITTEE_SIZE`` be the number of validator :ref:`slots` per level. -This constant has the role of ``ENDORSERS_PER_BLOCK`` in Emmy*. Furthermore, we use ``CONSENSUS_THRESHOLD`` to denote two thirds of ``CONSENSUS_COMMITTEE_SIZE``. For each level, Tenderbake proceeds in rounds. Each *round* represents an -- GitLab