diff --git a/zip-0221.html b/zip-0221.html index fe6aba25..1337fb87 100644 --- a/zip-0221.html +++ b/zip-0221.html @@ -329,34 +329,24 @@ License: MIT

Serialized as CompactSize uint.

-
  • [NU5 onward] hashEarliestOrchardRoot
    • - -
    -
    -
    Leaf node
    -
    Calculated as the note commitment root of the final Orchard treestate (similar to hashEarliestSaplingRoot in Sapling).
    -
    Internal or root node
    -
    Inherited from the left child.
    -
    -

    Serialized as char[32].

    -
    -
      -
    1. [NU5 onward] hashLatestOrchardRoot
      2. -
    -
    -

    System Message: INFO/1 (zip-0221.rst line 169)

    -

    Enumerated list start value not ordinal-1: "13" (ordinal 13)

    -
    -
    -
    -
    Leaf node
    -
    Calculated as the note commitment root of the final Orchard treestate (similar to hashLatestSaplingRoot in Sapling).
    -
    Internal or root node
    -
    Inherited from the right child.
    -
    -

    Serialized as char[32].

    -
    -
      +
    1. [NU5 onward] hashEarliestOrchardRoot +
      +
      Leaf node
      +
      Calculated as the note commitment root of the final Orchard treestate (similar to hashEarliestSaplingRoot in Sapling).
      +
      Internal or root node
      +
      Inherited from the left child.
      +
      +

      Serialized as char[32].

      +
      2. +
    2. [NU5 onward] hashLatestOrchardRoot +
      +
      Leaf node
      +
      Calculated as the note commitment root of the final Orchard treestate (similar to hashLatestSaplingRoot in Sapling).
      +
      Internal or root node
      +
      Inherited from the right child.
      +
      +

      Serialized as char[32].

      +
    3. [NU5 onward] nOrchardTxCount
      Leaf node
      @@ -367,10 +357,6 @@ License: MIT

      Serialized as CompactSize uint.

    -
    -

    System Message: INFO/1 (zip-0221.rst line 169)

    -

    Enumerated list start value not ordinal-1: "14" (ordinal 14)

    -

    The fields marked "[NU5 onward]" are omitted before NU5 activation 11.

    Each node, when serialized, is between 147 and 171 bytes long (between 212 and 244 bytes after NU5 activation). The canonical serialized representation of a node is used whenever creating child commitments for future nodes. Other than the metadata commitments, the MMR tree's construction is standard.

    Once the MMR has been generated, we produce hashChainHistoryRoot, which we define as the BLAKE2b-256 digest of the serialization of the root node.

    diff --git a/zip-0221.rst b/zip-0221.rst index 852a3e80..c7cd5613 100644 --- a/zip-0221.rst +++ b/zip-0221.rst @@ -330,25 +330,25 @@ Each MMR node is defined as follows: 12. [NU5 onward] ``hashEarliestOrchardRoot`` - Leaf node - Calculated as the note commitment root of the final Orchard treestate - (similar to ``hashEarliestSaplingRoot`` in Sapling). + Leaf node + Calculated as the note commitment root of the final Orchard treestate + (similar to ``hashEarliestSaplingRoot`` in Sapling). - Internal or root node - Inherited from the left child. + Internal or root node + Inherited from the left child. - Serialized as ``char[32]``. + Serialized as ``char[32]``. 13. [NU5 onward] ``hashLatestOrchardRoot`` - Leaf node - Calculated as the note commitment root of the final Orchard treestate - (similar to ``hashLatestSaplingRoot`` in Sapling). + Leaf node + Calculated as the note commitment root of the final Orchard treestate + (similar to ``hashLatestSaplingRoot`` in Sapling). - Internal or root node - Inherited from the right child. + Internal or root node + Inherited from the right child. - Serialized as ``char[32]``. + Serialized as ``char[32]``. 14. [NU5 onward] ``nOrchardTxCount``