CH12: s/reconverge/(converge|reorganize)/

- When appropriate, use the current preferred technical term
  "reorganize" to describe what a node does when the block at the tip of
  the chain is removed.

- Otherwise, just use "converge".
develop
David A. Harding 1 year ago
parent 2866ffc9fb
commit 2735c25bfa

@ -1518,7 +1518,7 @@ expended to create that chain. As long as all nodes select the
greatest-cumulative-work chain, the global Bitcoin network eventually
converges to a consistent state. Forks occur as temporary
inconsistencies between versions of the blockchain, which are resolved
by eventual reconvergence as more blocks are added to one of the forks.
by eventual reorganization as more blocks are added to one of the forks.
[TIP]
====
@ -1607,7 +1607,7 @@ assumed to have "lost" the race. Yet, the "upside-down triangle" block
is not discarded. It is linked to the "star" block parent and forms a
secondary chain. While Node X assumes it has correctly selected the
winning chain, it keeps the "losing" chain so that it has the
information needed to reconverge if the "losing" chain ends up
information needed to reorganize if the "losing" chain ends up
"winning."
On the other side of the network, Node Y constructs a blockchain based
@ -1650,7 +1650,7 @@ star-triangle-rhombus is now longer (more cumulative work) than the
other chain. As a result, those nodes will set the chain
star-triangle-rhombus as the best chain and change the
star-upside-down-triangle chain to a secondary chain, as shown in
<<fork5>>. This is a chain reconvergence, because those nodes are forced
<<fork5>>. This is a chain reorganization, because those nodes are forced
to revise their view of the blockchain to incorporate the new evidence
of a longer chain. Any miners working on extending the chain
star-upside-down-triangle will now stop that work because their
@ -1658,20 +1658,20 @@ candidate block is "stale," as its parent "upside-down-triangle" is
no longer on the longest chain. The transactions within
"upside-down-triangle" that are not within "triangle" are re-inserted in
the mempool for inclusion in the next block to become a part of the best
chain. The entire network reconverges on a single blockchain
chain. The entire network converges on a single blockchain
star-triangle-rhombus, with "rhombus" as the last block in the chain.
All miners immediately start working on candidate blocks that reference
"rhombus" as their parent to extend the star-triangle-rhombus chain.
[[fork4]]
[role="smallereighty"]
.Visualization of a blockchain fork event: a new block extends one fork, reconverging the network
.Visualization of a blockchain fork event: a new block extends one fork, reorganizing the network
image::images/mbc2_1005.png["Visualization of a blockchain fork event: a new block extends one fork"]
[[fork5]]
[role="smallereighty"]
.Visualization of a blockchain fork event: the network reconverges on a new longest chain
image::images/mbc2_1006.png["Visualization of a blockchain fork event: the network reconverges on a new longest chain"]
.Visualization of a blockchain fork event: the network reorganizes on a new longest chain
image::images/mbc2_1006.png["Visualization of a blockchain fork event: the network reorganizes on a new longest chain"]
It is theoretically possible for a fork to extend to two blocks, if two
blocks are found almost simultaneously by miners on opposite "sides" of
@ -2170,13 +2170,13 @@ between all the participants.
the Bitcoin network may briefly diverge, with two parts of the network
following two different branches of the blockchain for a short time. We
saw how this process occurs naturally, as part of the normal operation
of the network and how the network reconverges on a common blockchain
of the network and how the network converges on a common blockchain
after one or more blocks are mined.
There is another scenario in which the network may diverge into
following two chains: a change in the consensus rules. This type of fork
is called a _hard fork_, because after the fork the network does not
reconverge onto a single chain. Instead, the two chains evolve
converge onto a single chain. Instead, the two chains evolve
independently. Hard forks occur when part of the network is operating
under a different set of consensus rules than the rest of the network.
This may occur because of a bug or because of a deliberate change in the
@ -2194,7 +2194,7 @@ Let's examine the mechanics of a hard fork with a specific example.
<<blockchainwithforks>> shows a blockchain with two forks. At block
height 4, a one-block fork occurs. This is the type of spontaneous fork
we saw in <<forks>>. With the mining of block 5, the network reconverges
we saw in <<forks>>. With the mining of block 5, the network converges
on one chain and the fork is resolved.
[[blockchainwithforks]]

Loading…
Cancel
Save