diff --git a/CHANGES.rst b/CHANGES.rst index 40dfefc6855b3cadcc9b1f2629fd4bf83f02c02b..ffde8897464339c24818ae4f42559456589ee587 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 diff --git a/docs/alpha/plugins.rst b/docs/alpha/plugins.rst index 701e09debd8de68f9be33e232b936b828d48e1d0..d3c503e9df8cb4ff308eb79680ed019c076ce65a 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/developer/testing.rst b/docs/developer/testing.rst index eef15e56a1d65bbca6d6bcf2f92e7214557efa8d..f976732d9921334f1e003cedd8ee14b549e72620 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 `_). diff --git a/docs/ithaca/consensus.rst b/docs/ithaca/consensus.rst index c65e5fea332ede04c0906dab5dfa0b29a047e53c..4722e68a7f557c08950c94488f1e007776e90a27 100644 --- a/docs/ithaca/consensus.rst +++ b/docs/ithaca/consensus.rst @@ -57,6 +57,7 @@ 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. +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 +95,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 +304,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 +319,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 +490,5 @@ Further External Resources -------------------------- * Tenderbake `report `_ -* Tenderbake `blog post `_. +* Tenderbake `blog post `_. * Tenderbake `tzip `_. diff --git a/docs/ithaca/plugins.rst b/docs/ithaca/plugins.rst index 362390efdffe93908a9d1ffa689db389d22eec4d..3eaf723e281cc9e8206c41f64bb99577abb73fad 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 eb12582c22752fb43a6687130837b22130fc46ae..19d640c7352d866ff91a56e6643ed3abbbb4d618 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`` diff --git a/docs/protocols/naming.rst b/docs/protocols/naming.rst index d3923ebf898558444c37d22f1aabeee9fc1baa94..0464492f3239f3cbfedf94c6f90bcab0a35ad15b 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 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 91088fe4d098511636580c7b01523b0fd4c915b1..8d2c21be3dcfa2af42806e702195ffbf0d952486 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, 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 4773ea604799099c5e346ab062fae2fc53b2586c..75a465b2e647050c04cbbe137205e5944fbc2240 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