Skip to content

Commit 43da5de

Browse files
authored
Merge pull request bitcoin#1333 from 54627384/patch-1
Update bip-0300.mediawiki with consistent use of "ACK-counter" term
2 parents bcb66af + 858b6be commit 43da5de

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

bip-0300.mediawiki

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ D2 controls Bundles, and is driven by M3, M4, M5, and M6.
210210
| 3
211211
| ACKs (Work Score)
212212
| uint16_t
213-
| The current total number of ACKs (the PoW that has been used to validate the Bundle).
213+
| The current ACK-counter, which is the total number of ACKs (the PoW that has been used to validate the Bundle).
214214
|-
215215
| 4
216216
| Blocks Remaining (Age)
@@ -226,7 +226,7 @@ A hash of D2 exists in each coinbase txn, and has consensus-significance.
226226
# The Bundles must be listed in a canonical order (so that the hashes match).
227227
# From one block to the next, "Age" fields must increase by exactly 1 (ie, Blocks Remaining decreases by 1).
228228
# Bundles are stored in D2 until they fail (which occurs at "Age" = "MaxAge"), or they succeed (Bundle is paid out).
229-
# From one block to the next, the value in the ACKs field can increase or decrease by a maximum of 1 (see below).
229+
# From one block to the next, the value in the ACKs field (ACK-counter) can increase or decrease by a maximum of 1 (see below).
230230
231231
If a Bundle succeeds (in D2), it "becomes" an M6 message and is included in a block.
232232

@@ -254,7 +254,7 @@ Once a Bundle is in D2, how can we give it enough ACKs to make it valid?
254254
From one block to the next, "ACKs" can only change as follows:
255255

256256
* The ACK-counter of any Bundle can only change by (-1,0,+1).
257-
* Within a sidechain-group, upvoting one Bundle ("+1") requires you to downvote all other Bundles in that group. However, the minimum ACK-value is zero.
257+
* Within a sidechain-group, upvoting one Bundle ("+1") requires you to downvote all other Bundles in that group. However, the minimum ACK-counter is zero.
258258
* While only one Bundle can be upvoted at once; the whole group can all be unchanged at once ("abstain"), and they can all be downvoted at once ("alarm").
259259
260260
M4 does not need to be explicitly transmitted. It can simply be inferred from the new state of D2. M4 can therefore be improved over time, without affecting consensus.
@@ -285,7 +285,7 @@ As far as mainchain consensus is concerned, all deposits to a sidechain are alwa
285285

286286
We come, finally, to the critical matter: where users can take their money *out* of the sidechain.
287287

288-
In each block, a Bundle in D2 is considered "approved" if its "ACKs" value meets the threshold (13,150).
288+
In each block, a Bundle in D2 is considered "approved" if its "ACK-counter" value meets the threshold (13,150).
289289

290290

291291
The Bundle must meet all these criteria:

0 commit comments

Comments
 (0)