From 2ebf16ba487ab0a800cb61bfb63c46ef34687843 Mon Sep 17 00:00:00 2001 From: Ilya Peresadin Date: Wed, 2 Nov 2022 16:14:46 +0000 Subject: [PATCH 1/8] Rename tezos executables to octez ones at user/sandbox --- docs/user/sandbox.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/user/sandbox.rst b/docs/user/sandbox.rst index 82afef2c5d9f..2c9fb74969ce 100644 --- a/docs/user/sandbox.rst +++ b/docs/user/sandbox.rst @@ -56,7 +56,7 @@ preconfigured for communicating with the same-numbered node. When you bootstrap a new network, the network is initialized with a dummy economic protocol, called `genesis`. If you want to run the whole implemented protocol, ``init-sandboxed-client`` also defines an -alias ``tezos-activate-alpha``, that you need to execute once for +alias ``octez-activate-alpha``, that you need to execute once for activating the whole network. For instance: @@ -64,7 +64,7 @@ For instance: $ octez-client rpc get /chains/main/blocks/head/metadata "next_protocol": "Ps9mPmXaRzmzk35gbAYNCAw6UXdE2qoABTHbN2oEEc1qM7CwT9P" - $ tezos-activate-alpha + $ octez-activate-alpha Injected BMV9KnSPE1yw $ octez-client rpc get /chains/main/blocks/head/metadata "protocol": "Ps9mPmXaRzmzk35gbAYNCAw6UXdE2qoABTHbN2oEEc1qM7CwT9P" @@ -115,7 +115,7 @@ binary. Tune protocol Alpha parameters ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The ``tezos-activate-alpha`` alias uses parameters from +The ``octez-activate-alpha`` alias uses parameters from ``src/proto_alpha/parameters/sandbox-parameters.json`` to activate protocol Alpha. It can be useful to tune these parameters when you need to debug something, for example, change the number of blocks per cycle, the time between -- GitLab From 34fb41d4562fa701fb1178c67b38fa2ed1f42d2e Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Thu, 3 Nov 2022 16:29:06 +0100 Subject: [PATCH 2/8] Typo: enable -> enabled in [gc_is_not_allowed] warning message --- src/lib_store/shared/store_events.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib_store/shared/store_events.ml b/src/lib_store/shared/store_events.ml index 02c3af17231a..ff91d1aed8db 100644 --- a/src/lib_store/shared/store_events.ml +++ b/src/lib_store/shared/store_events.ml @@ -226,7 +226,7 @@ let context_gc_is_not_allowed = ~level:Warning ~name:"gc_is_not_allowed" ~msg: - "garbage collection is not fully enable on this data directory: context \ + "garbage collection is not fully enabled on this data directory: context \ cannot be garbage collected. Please read the documentation or import a \ snapshot to enable it" () -- GitLab From 819aa23a3c4ea599b5f7f4008ddc25ad96338a16 Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Tue, 8 Nov 2022 16:31:53 +0100 Subject: [PATCH 3/8] doc: add meta-issue to guide doc update when adding a new environment --- docs/developer/protocol_environment_upgrade.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/developer/protocol_environment_upgrade.rst b/docs/developer/protocol_environment_upgrade.rst index ef20886f8cc2..35736d8b10a6 100644 --- a/docs/developer/protocol_environment_upgrade.rst +++ b/docs/developer/protocol_environment_upgrade.rst @@ -105,6 +105,7 @@ And finally, bump environment version in ``src/proto_alpha/lib_protocol/TEZOS_PR For an example, check `the MR in which the environment V6 was activated `__. +Additionally, you have to update the documentation of protocol Alpha to reflect the fact that it now uses environment ``V``. For that, see meta-issue :gl:`#4155`, which explains all the necessary changes (don't worry, the changes are very limited). Making changes in the environment --------------------------------- -- GitLab From 7016dca6b1d12155a9693c247c2d85e77a356857 Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Wed, 16 Nov 2022 19:04:14 +0100 Subject: [PATCH 4/8] doc: docstring fixes by zettez --- src/proto_alpha/bin_sc_rollup_node/state.mli | 2 +- .../lib_protocol/test/helpers/dummy_zk_rollup.ml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/proto_alpha/bin_sc_rollup_node/state.mli b/src/proto_alpha/bin_sc_rollup_node/state.mli index 0e27e37dbaf8..0b6e426bf6bd 100644 --- a/src/proto_alpha/bin_sc_rollup_node/state.mli +++ b/src/proto_alpha/bin_sc_rollup_node/state.mli @@ -53,6 +53,6 @@ val hash_of_level : _ Store.t -> int32 -> Tezos_crypto.Block_hash.t Lwt.t val level_of_hash : _ Store.t -> Tezos_crypto.Block_hash.t -> int32 tzresult Lwt.t -(** [set_block_level_and_has store head] registers the correspondences +(** [set_block_level_and_hash store head] registers the correspondences [head.level |-> head.hash] and [head.hash |-> head.level] in the store. *) val set_block_level_and_hash : Store.rw -> Layer1.head -> unit Lwt.t diff --git a/src/proto_alpha/lib_protocol/test/helpers/dummy_zk_rollup.ml b/src/proto_alpha/lib_protocol/test/helpers/dummy_zk_rollup.ml index e6eb55c04cb9..085fcd9a7057 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/dummy_zk_rollup.ml +++ b/src/proto_alpha/lib_protocol/test/helpers/dummy_zk_rollup.ml @@ -346,10 +346,10 @@ end) : sig Plonk.Main_protocol.verifier_public_parameters * Plonk.Main_protocol.transcript - (** [craft_update state ~zk_rollup ?private_ops public_ops] will apply - first the [public_ops], then the [private_ops]. While doing so, - the public inputs for every circuit will be collected. A Plonk proof - of correctness of the application these operations is created. *) + (** [craft_update state ~zk_rollup ?private_ops ?exit_validities public_ops] + will apply first the [public_ops], then the [private_ops]. While doing so, + the public inputs for every circuit will be collected. A Plonk proof of + correctness of the application these operations is created. *) val craft_update : Zk_rollup.State.t -> zk_rollup:Zk_rollup.t -> -- GitLab From 67ef037621b402c6d660666f7bd93f6d70eb2cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Andr=C3=A9s=20Delbianco?= Date: Fri, 18 Nov 2022 11:16:42 +0100 Subject: [PATCH 5/8] doc/scoru: fix WABT link MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Markdown to RST syntax fix Signed-off-by: Germán Andrés Delbianco --- docs/alpha/smart_rollups.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/alpha/smart_rollups.rst b/docs/alpha/smart_rollups.rst index 775025997911..86bb19c7a08e 100644 --- a/docs/alpha/smart_rollups.rst +++ b/docs/alpha/smart_rollups.rst @@ -575,7 +575,8 @@ the following WASM program in text format. (local.get $hello_length))))) This program can be compiled to the WASM binary format with -general-purpose tool like [WABT](https://github.com/WebAssembly/wabt). +general-purpose tool like +`WABT `_. :: -- GitLab From 8af0a64c1af04b708530602a163b56c5b558acf6 Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Fri, 18 Nov 2022 15:01:36 +0100 Subject: [PATCH 6/8] doc: add clarification in slashing (by Lacra) --- docs/alpha/consensus.rst | 2 +- docs/kathmandu/consensus.rst | 2 +- docs/lima/consensus.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/alpha/consensus.rst b/docs/alpha/consensus.rst index 2816d8507a10..967ce5d0b7a4 100644 --- a/docs/alpha/consensus.rst +++ b/docs/alpha/consensus.rst @@ -380,7 +380,7 @@ validator does not reveal its nonce by the end of the cycle, it does not receive its endorsing rewards. If a validator double signs, that is, it double bakes (which means signing different blocks at the same level and same round) or it double (pre)endorses (which means voting on two different proposals at the -same level and round), the frozen deposit is slashed. The slashed amount for double baking +same level and round), a part of the frozen deposit is slashed. The slashed amount for double baking is ``DOUBLE_BAKING_PUNISHMENT``. The slashed amount for double (pre)endorsing is a fixed percentage ``RATIO_OF_FROZEN_DEPOSITS_SLASHED_PER_DOUBLE_ENDORSEMENT`` of the frozen deposit. The payload producer that includes the misbehavior diff --git a/docs/kathmandu/consensus.rst b/docs/kathmandu/consensus.rst index ef9e48cbfbaf..21e0dafa6ad5 100644 --- a/docs/kathmandu/consensus.rst +++ b/docs/kathmandu/consensus.rst @@ -386,7 +386,7 @@ validator does not reveal its nonce by the end of the cycle, it does not receive its endorsing rewards. If a validator double signs, that is, it double bakes (which means signing different blocks at the same level and same round) or it double (pre)endorses (which means voting on two different proposals at the -same level and round), the frozen deposit is slashed. The slashed amount for double baking +same level and round), a part of the frozen deposit is slashed. The slashed amount for double baking is ``DOUBLE_BAKING_PUNISHMENT``. The slashed amount for double (pre)endorsing is a fixed percentage ``RATIO_OF_FROZEN_DEPOSITS_SLASHED_PER_DOUBLE_ENDORSEMENT`` of the frozen deposit. The payload producer that includes the misbehavior diff --git a/docs/lima/consensus.rst b/docs/lima/consensus.rst index 48ceaf456918..fd239a4fa65c 100644 --- a/docs/lima/consensus.rst +++ b/docs/lima/consensus.rst @@ -380,7 +380,7 @@ validator does not reveal its nonce by the end of the cycle, it does not receive its endorsing rewards. If a validator double signs, that is, it double bakes (which means signing different blocks at the same level and same round) or it double (pre)endorses (which means voting on two different proposals at the -same level and round), the frozen deposit is slashed. The slashed amount for double baking +same level and round), a part of the frozen deposit is slashed. The slashed amount for double baking is ``DOUBLE_BAKING_PUNISHMENT``. The slashed amount for double (pre)endorsing is a fixed percentage ``RATIO_OF_FROZEN_DEPOSITS_SLASHED_PER_DOUBLE_ENDORSEMENT`` of the frozen deposit. The payload producer that includes the misbehavior -- GitLab From e7450374fb4f5c289d10d12c43ad899eb7138596 Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Fri, 18 Nov 2022 15:07:03 +0100 Subject: [PATCH 7/8] doc: make the endorsing rewards example more realistic (by Lacra) --- docs/alpha/consensus.rst | 2 +- docs/kathmandu/consensus.rst | 2 +- docs/lima/consensus.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/alpha/consensus.rst b/docs/alpha/consensus.rst index 967ce5d0b7a4..7dbc919a1bf1 100644 --- a/docs/alpha/consensus.rst +++ b/docs/alpha/consensus.rst @@ -366,7 +366,7 @@ maximum 2333 extra endorsements it could have theoretically included.) Finally, delegate C, whose active stake at some cycle is 5% of the total stake. Note that his expected number of validator slots for that cycle is ``5/100 * 8192 * 7000 = 2,867,200`` slots. Assume also that the endorsing power of C's endorsements -included during that cycle has been ``3,123,456`` slots. Given that this number is +included during that cycle has been ``2,123,456`` slots. Given that this number is bigger than the minimum required (``2,867,200 * 2 / 3``), it receives an endorsing reward of ``2,867,200 * 0.002857 = 8191.59`` tez for that cycle. diff --git a/docs/kathmandu/consensus.rst b/docs/kathmandu/consensus.rst index 21e0dafa6ad5..fea11638d740 100644 --- a/docs/kathmandu/consensus.rst +++ b/docs/kathmandu/consensus.rst @@ -371,7 +371,7 @@ maximum 2333 extra endorsements it could have theoretically included.) Finally, delegate C, whose active stake at some cycle is 5% of the total stake. Note that his expected number of validator slots for that cycle is ``5/100 * 8192 * 7000 = 2,867,200`` slots. Assume also that the endorsing power of C's endorsements -included during that cycle has been ``3,123,456`` slots. Given that this number is +included during that cycle has been ``2,123,456`` slots. Given that this number is bigger than the minimum required (``2,867,200 * 2 / 3``), it receives an endorsing reward of ``2,867,200 * 0.002857 = 8191.59`` tez for that cycle. diff --git a/docs/lima/consensus.rst b/docs/lima/consensus.rst index fd239a4fa65c..502dcc23b7f5 100644 --- a/docs/lima/consensus.rst +++ b/docs/lima/consensus.rst @@ -366,7 +366,7 @@ maximum 2333 extra endorsements it could have theoretically included.) Finally, delegate C, whose active stake at some cycle is 5% of the total stake. Note that his expected number of validator slots for that cycle is ``5/100 * 8192 * 7000 = 2,867,200`` slots. Assume also that the endorsing power of C's endorsements -included during that cycle has been ``3,123,456`` slots. Given that this number is +included during that cycle has been ``2,123,456`` slots. Given that this number is bigger than the minimum required (``2,867,200 * 2 / 3``), it receives an endorsing reward of ``2,867,200 * 0.002857 = 8191.59`` tez for that cycle. -- GitLab From 4cd95e84d2ef7e7dec07f968cce0f2561c46ce88 Mon Sep 17 00:00:00 2001 From: Thomas Letan Date: Fri, 18 Nov 2022 23:14:45 +0100 Subject: [PATCH 8/8] WASM: `Input_buffer.dequeue` clean-up the tree This is the result of !6866 and !6819. --- src/lib_webassembly/runtime/input_buffer.mli | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lib_webassembly/runtime/input_buffer.mli b/src/lib_webassembly/runtime/input_buffer.mli index e07a2d57840a..ccfdce1991f8 100644 --- a/src/lib_webassembly/runtime/input_buffer.mli +++ b/src/lib_webassembly/runtime/input_buffer.mli @@ -30,8 +30,6 @@ val num_elements : t -> Z.t (** [reset buffer] removes the current contents of the buffer. *) val reset : t -> unit -(* TODO: #3340 Note that op does not clean up the list. *) - (** [dequeue buffer] pops the current message from buffer and returns it. Note that the input buffer models a FIFO queue so the current message is the oldest in the queue. If the queue is empty it raises -- GitLab