From 0d9a96050b8890acc31ffed5f4f2eaf35a925299 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Mon, 5 Dec 2022 21:46:30 +0000 Subject: [PATCH] ZIP 317: address Teor's comments. Signed-off-by: Daira Hopwood --- zip-0317.html | 32 +++++++++++++++++++++++--------- zip-0317.rst | 30 +++++++++++++++++------------- 2 files changed, 40 insertions(+), 22 deletions(-) diff --git a/zip-0317.html b/zip-0317.html index 5edcd443..457055fc 100644 --- a/zip-0317.html +++ b/zip-0317.html @@ -274,13 +274,16 @@ Pull-Request: <https://githu \(tx\) calculated according to the section Fee calculation.

Let - \(unpaid\_actions(tx) = \mathsf{max}\!\left(0,\, \mathsf{max}(grace\_actions,\, tx.\!logical\_actions) - \mathsf{floor}\!\left(\frac{tx.fee}{marginal\_fee}\right)\right)\!\) - .

+ \(unpaid\_actions(tx) = \begin{cases}\mathsf{max}\!\left(0,\, \mathsf{max}(grace\_actions,\, tx.\!logical\_actions) - \mathsf{floor}\!\left(\frac{tx.fee}{marginal\_fee}\right)\right),&\textsf{if }tx\textsf{ is a non-coinbase transaction} \\ 0,&\textsf{if }tx\textsf{ is a coinbase transaction.}\end{cases}\) +

Let \(block\_unpaid\_actions(block) = \sum_{tx \,\in\, block}\, unpaid\_actions(tx)\) .

-

The following algorithm is RECOMMENDED for constructing block templates from a set of transactions in a node's mempool:

+

The following algorithm is RECOMMENDED for constructing a block template from a set of transactions in a node's mempool:

    +
  1. Set the block template + \(T\) + to include only the coinbase transaction.
  2. For each transaction \(tx\) in the mempool, calculate @@ -289,29 +292,40 @@ Pull-Request: <https://githu
  3. Repeat while there is any candidate transaction that pays at least the conventional fee:
    1. Pick one of those transactions at random with probability in direct proportion to its - \(weight\_ratio\) + \(weight\_ratio\!\) , and remove it from the set of candidate transactions. Let \(B\) - be the block template with this transaction included.
      2. + be the block template + \(T\) + with this transaction included.
    2. If \(B\) - would be within the block size limit and block sigop limit 4, add the transaction to the block template.
      3. + would be within the block size limit and block sigop limit 4, set + \(T := B\!\) + .
  4. Repeat while there is any candidate transaction:
    1. Pick one of those transactions at random with probability in direct proportion to its - \(weight\_ratio\) + \(weight\_ratio\!\) , and remove it from the set of candidate transactions. Let \(B\) - be the block template with this transaction included.
      2. + be the block template + \(T\) + with this transaction included.
    2. If \(B\) would be within the block size limit and block sigop limit 4 and \(block\_unpaid\_actions(B) \leq block\_unpaid\_action\_limit\!\) - , add the transaction to the block template.
      3. + , set + \(T := B\!\) + .
    5. +
  5. Return + \(T\!\) + .

Rationale for block template construction algorithm

diff --git a/zip-0317.rst b/zip-0317.rst index 9b0c599a..fddd6d83 100644 --- a/zip-0317.rst +++ b/zip-0317.rst @@ -272,36 +272,40 @@ Define constants :math:`weight\_ratio\_cap = 4` and Let :math:`conventional\_fee(tx)` be the conventional fee for transaction :math:`tx` calculated according to the section `Fee calculation`_. -Let :math:`unpaid\_actions(tx) = \mathsf{max}\!\left(0,\, \mathsf{max}(grace\_actions,\, tx.\!logical\_actions) - \mathsf{floor}\!\left(\frac{tx.fee}{marginal\_fee}\right)\right)\!`. +Let :math:`unpaid\_actions(tx) = \begin{cases}\mathsf{max}\!\left(0,\, \mathsf{max}(grace\_actions,\, tx.\!logical\_actions) - \mathsf{floor}\!\left(\frac{tx.fee}{marginal\_fee}\right)\right),&\textsf{if }tx\textsf{ is a non-coinbase transaction} \\ 0,&\textsf{if }tx\textsf{ is a coinbase transaction.}\end{cases}` Let :math:`block\_unpaid\_actions(block) = \sum_{tx \,\in\, block}\, unpaid\_actions(tx)`. -The following algorithm is RECOMMENDED for constructing block templates +The following algorithm is RECOMMENDED for constructing a block template from a set of transactions in a node's mempool: -1. For each transaction :math:`tx` in the mempool, calculate +1. Set the block template :math:`T` to include only the coinbase transaction. + +2. For each transaction :math:`tx` in the mempool, calculate :math:`tx.\!weight\_ratio = \mathsf{min}\!\left(\frac{\mathsf{max}(1,\, tx.fee)}{conventional\_fee(tx)},\, weight\_ratio\_cap\right)\!` and add the transaction to the set of candidate transactions. -2. Repeat while there is any candidate transaction that pays at least the +3. Repeat while there is any candidate transaction that pays at least the conventional fee: a. Pick one of those transactions at random with probability in direct - proportion to its :math:`weight\_ratio`, and remove it from the set of - candidate transactions. Let :math:`B` be the block template with this - transaction included. + proportion to its :math:`weight\_ratio\!`, and remove it from the set of + candidate transactions. Let :math:`B` be the block template :math:`T` + with this transaction included. b. If :math:`B` would be within the block size limit and block sigop - limit [#sigop-limit]_, add the transaction to the block template. + limit [#sigop-limit]_, set :math:`T := B\!`. -3. Repeat while there is any candidate transaction: +4. Repeat while there is any candidate transaction: a. Pick one of those transactions at random with probability in direct - proportion to its :math:`weight\_ratio`, and remove it from the set of - candidate transactions. Let :math:`B` be the block template with this - transaction included. + proportion to its :math:`weight\_ratio\!`, and remove it from the set of + candidate transactions. Let :math:`B` be the block template :math:`T` + with this transaction included. b. If :math:`B` would be within the block size limit and block sigop limit [#sigop-limit]_ and :math:`block\_unpaid\_actions(B) \leq block\_unpaid\_action\_limit\!`, - add the transaction to the block template. + set :math:`T := B\!`. + +5. Return :math:`T\!`. Rationale for block template construction algorithm '''''''''''''''''''''''''''''''''''''''''''''''''''