From 2118e1eb4d434da60d951eb83596aa588988d19f Mon Sep 17 00:00:00 2001 From: Albin Coquereau Date: Wed, 20 Dec 2023 14:02:01 +0100 Subject: [PATCH] Docs/Alpha: update after reduction of block times --- docs/alpha/adaptive_issuance.rst | 10 +++++----- docs/alpha/consensus.rst | 24 ++++++++++++------------ docs/alpha/liquidity_baking.rst | 6 +++--- docs/alpha/proof_of_stake.rst | 4 ++-- docs/alpha/randomness_generation.rst | 4 ++-- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/alpha/adaptive_issuance.rst b/docs/alpha/adaptive_issuance.rst index a8ef3f5511c5..391e1a125c47 100644 --- a/docs/alpha/adaptive_issuance.rst +++ b/docs/alpha/adaptive_issuance.rst @@ -162,10 +162,10 @@ In this formula: :math:`\IL{\F{f}{c}}` and the interval :math:`\IL{\left[ \tc - \tr, \tc + \tr \right]}`. -- :math:`\IL{\DTF = \frac{16384 \tmult 15}{86400} = 2.8\overline{444}}`, +- :math:`\IL{\DTF = \frac{24576 \tmult 10}{86400} = 2.8\overline{444}}`, denotes the minimal duration (in days) of a Tezos cycle, assuming all - 16384 blocks in the cycle are produced at the minimal allowed time – - that is, every 15 seconds. + 24576 blocks in the cycle are produced at the minimal allowed time – + that is, every 10 seconds. - :math:`\IL{\sgn{\tc - \F{f}{c}} = 1}` if :math:`\IL{\F{f}{c} \leq \tc}` and :math:`-1` otherwise, denotes the @@ -273,11 +273,11 @@ being subject to the existing participation conditions. **Nonce and VDF revelation tips.** The rewards allocated to delegates for contributing to :ref:`random seed generation ` (that is for, revealing nonce seeds and posting VDF proofs) are not paid -each block, but rather every 128 blocks. The adjusted formulas result: +each block, but rather every 192 blocks. The adjusted formulas result: .. math:: - \tip{\vdf}{c} = \tip{nr}{c} = 128 \tmult \frac{1}{\tw} \tmult \isb{c} + \tip{\vdf}{c} = \tip{nr}{c} = 192 \tmult \frac{1}{\tw} \tmult \isb{c} **Liquidity baking subsidy.** The :doc:`LB subsidy ` per block is determined by the following formula: diff --git a/docs/alpha/consensus.rst b/docs/alpha/consensus.rst index ccabeace3df6..2bd1e8fbc907 100644 --- a/docs/alpha/consensus.rst +++ b/docs/alpha/consensus.rst @@ -331,7 +331,7 @@ CONSENSUS_COMMITTEE_SIZE * active_stake / total_active_stake``). Regarding the concrete values for rewards, we first fix the total reward per level, call it ``total_rewards``, to ``80 / blocks_per_minute`` tez. -Assuming ``blocks_per_minute = 4``, ``total_rewards`` is 20 tez. +Assuming ``blocks_per_minute = 6``, ``total_rewards`` is 13.33 tez. We define: - ``BAKING_REWARD_FIXED_PORTION := baking_reward_ratio * total_rewards`` @@ -343,16 +343,16 @@ where: - ``baking_reward_ratio`` to ``1 / 4``, - ``bonus_ratio`` to ``1 / 3``. -Thus, we obtain ``BAKING_REWARD_FIXED_PORTION = 5`` tez, -(maximum) ``bonus = 5`` tez, and ``attesting_rewards = 10`` tez. +Thus, we obtain ``BAKING_REWARD_FIXED_PORTION = 3.33`` tez, +(maximum) ``bonus = 3.33`` tez, and ``attesting_rewards = 6.67`` tez. The bonus per additional attestation slot is in turn ``bonus / (CONSENSUS_COMMITTEE_SIZE / 3)`` (because there are at most ``CONSENSUS_COMMITTEE_SIZE / 3`` validator slots corresponding to the additional attestations included in a block). The rewards per attestation slot are ``attesting_rewards / CONSENSUS_COMMITTEE_SIZE``. Assuming ``CONSENSUS_COMMITTEE_SIZE = 7000``, we obtain a bonus per slot of -``5 / (7000 / 3) = 0.002143`` tez and an attesting -rewards per slot of ``10 / 7000 = 0.001428`` tez. +``3.33 / (7000 / 3) = 0.001427`` tez and an attesting +rewards per slot of ``6.67 / 7000 = 0.000952`` tez. Let's take an example. Say a block has round 1, is proposed by delegate B, and contains the payload from round 0 produced by delegate @@ -360,7 +360,7 @@ A. Also, B includes attestations with attesting power ``5251``. Then A receives the fees and 10 tez (the ``BAKING_REWARD_FIXED_PORTION``) as a reward for producing the block's payload. Concerning the bonus, given that ``CONSENSUS_COMMITTEE_SIZE = 7000``, the minimum required validator slots is ``4667``, and there are ``2333 = 7000 - 4667`` additional validator slots. -Therefore B receives the bonus ``(5251 - 4667) * 0.002143 = 1.251512`` tez. (Note +Therefore B receives the bonus ``(5251 - 4667) * 0.001428 = 0.833952`` tez. (Note that B only included attestations corresponding to 584 = 5251 - 4667 additional validator slots, about a quarter of the maximum 2333 extra attestations it could have theoretically included.) Finally, consider some delegate C, whose active stake at some cycle is 5% of the total stake. Note that @@ -368,7 +368,7 @@ his expected number of validator slots for that cycle is ``5/100 * 8192 * 7000 = 2,867,200`` slots. Assume also that the attesting power of C's attestations 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 attesting -reward of ``2,867,200 * 0.001428 = 4094.3616`` tez for that cycle. +reward of ``2,867,200 * 0.000952 = 2729.5744`` tez for that cycle. .. _slashing_alpha: @@ -430,9 +430,9 @@ Consensus related protocol parameters * - ``CONSENSUS_THRESHOLD`` - ``ceil(2 * CONSENSUS_COMMITTEE_SIZE / 3)`` = 4667 * - ``MINIMAL_BLOCK_DELAY`` - - 15s + - 10s * - ``DELAY_INCREMENT_PER_ROUND`` - - 8s + - 5s * - ``MINIMAL_PARTICIPATION_RATIO`` - 2/3 * - ``FROZEN_DEPOSITS_PERCENTAGE`` @@ -444,11 +444,11 @@ Consensus related protocol parameters * - ``PERCENTAGE_OF_FROZEN_DEPOSITS_SLASHED_PER_DOUBLE_ATTESTATION`` - 50% * - ``BAKING_REWARD_FIXED_PORTION`` - - 5 tez + - 3.33 tez * - ``BAKING_REWARD_BONUS_PER_SLOT`` - - ``bonus / (CONSENSUS_COMMITTEE_SIZE / 3)`` = 0.002143 tez + - ``bonus / (CONSENSUS_COMMITTEE_SIZE / 3)`` = 0.001429 tez * - ``ATTESTING_REWARD_PER_SLOT`` - - ``attesting_reward / CONSENSUS_COMMITTEE_SIZE`` = 0.001428 tez + - ``attesting_reward / CONSENSUS_COMMITTEE_SIZE`` = 0.000952 tez * - ``GLOBAL_LIMIT_OF_STAKING_OVER_BAKING`` - 5 diff --git a/docs/alpha/liquidity_baking.rst b/docs/alpha/liquidity_baking.rst index cc29db770b34..d8385e72eae7 100644 --- a/docs/alpha/liquidity_baking.rst +++ b/docs/alpha/liquidity_baking.rst @@ -30,8 +30,8 @@ At every block in the chain, a small amount of tez is minted and credited to the CPMM contract, and the CPMM's ``%default`` entrypoint is called to update the ``xtz_pool`` balance in its storage. The amount that is minted and sent to the CPMM contract is 1/16th of the rewards for a block of round 0 with all -attestations; currently these rewards are 20 tez per block so the amount that is -sent to the CPMM contract is 1.25 tez per block. +attestations; currently these rewards are 13.33 tez per block so the amount that is +sent to the CPMM contract is 0.83 tez per block. If the :ref:`adaptive issuance ` feature were to be activated, the subsidy would be adjusted by the adaptive issuance coefficient. @@ -67,7 +67,7 @@ For indicative purposes, if among the non-abstaining blocks a fraction reached after roughly ``2*(log(1-1/(2f)) / log(0.999))`` non-abstaining blocks, about 1386 blocks if everyone signals, 1963 blocks if 80% do, 3583 blocks if 60% do etc. Recall for comparison -that assuming four blocks per minute there are 5760 blocks per day. +that assuming six blocks per minute there are 8640 blocks per day. When producing blocks using Octez baking daemon ``octez-baker``, there are two command-line options affecting toggle vote. The diff --git a/docs/alpha/proof_of_stake.rst b/docs/alpha/proof_of_stake.rst index f5839b1ae11e..5c703b678e19 100644 --- a/docs/alpha/proof_of_stake.rst +++ b/docs/alpha/proof_of_stake.rst @@ -170,7 +170,7 @@ Proof-of-stake parameters * - Parameter name - Parameter value * - ``BLOCKS_PER_CYCLE`` - - 16384 blocks + - 24576 blocks * - ``PRESERVED_CYCLES`` - 5 cycles * - ``MINIMAL_STAKE`` @@ -178,7 +178,7 @@ Proof-of-stake parameters * - ``MINIMAL_FROZEN_STAKE`` - 600 ꜩ * - ``BLOCKS_PER_STAKE_SNAPSHOT`` - - 1024 blocks + - 1536 blocks Further External Resources diff --git a/docs/alpha/randomness_generation.rst b/docs/alpha/randomness_generation.rst index bffd551a311a..e25d94569123 100644 --- a/docs/alpha/randomness_generation.rst +++ b/docs/alpha/randomness_generation.rst @@ -152,9 +152,9 @@ Randomness generation parameters * - Parameter name - Parameter value * - ``BLOCKS_PER_COMMITMENT`` - - 128 blocks + - 192 blocks * - ``NONCE_REVELATION_THRESHOLD`` - - 512 blocks + - 768 blocks * - ``MAX_ANON_OPS_PER_BLOCK`` - 132 revelations * - ``SEED_NONCE_REVELATION_TIP`` -- GitLab