Terminology fixes

This commit is contained in:
str4d 2018-01-29 03:13:00 +00:00
parent 851265c13c
commit debf26b3f8
No known key found for this signature in database
GPG Key ID: 665DBCD284F7DAFF
1 changed files with 5 additions and 4 deletions

View File

@ -150,9 +150,10 @@ chain is valid over the same epochs.
Post-activation upgrading
`````````````````````````
If a user does not upgrade their node to a compatible software version before ``ACTIVATION_HEIGHT`` is
reached, their node will follow the pre-upgrade chain and download blocks that are incompatible with the
post-upgrade branch. If the user subsequently upgrades their node to a compatible software version, the node
will consider these blocks to be invalid, and MUST take one of the two following actions:
reached, their node will follow any pre-upgrade branch that persists, and may download blocks that are
incompatible with the post-upgrade branch. If the user subsequently upgrades their node to a compatible
software version, the node will consider these blocks to be invalid, and MUST take one of the two following
actions:
- Discard all blocks of height ``ACTIVATION_HEIGHT`` and above, and then synchronize with the network.
@ -163,7 +164,7 @@ Memory pool
-----------
While the current chain tip height is below ``ACTIVATION_HEIGHT``, nodes SHOULD NOT accept transactions that
will only be valid on the post-upgrade chain.
will only be valid on the post-upgrade branch.
When the current chain tip height reaches ``ACTIVATION_HEIGHT``, the node's local transaction memory pool
SHOULD be cleared.