summaryrefslogtreecommitdiff
path: root/bip-0009.mediawiki
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2016-05-31 14:55:53 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2016-05-31 14:55:53 +0000
commit8324bc512e835f4ff16000ab1dbe7f55e8d110ee (patch)
tree7aa135c3182c3a8e733334d3f31b84ae8af5045d /bip-0009.mediawiki
parentce426ab4e1318c4550cb9e61740620756a49e68b (diff)
parented0f8da4ad97703f1c57919303da082810885fb7 (diff)
Merge branch 'master' into segwit_gbt_updates_20160330
Diffstat (limited to 'bip-0009.mediawiki')
-rw-r--r--bip-0009.mediawiki6
1 files changed, 3 insertions, 3 deletions
diff --git a/bip-0009.mediawiki b/bip-0009.mediawiki
index 162b264..153f6db 100644
--- a/bip-0009.mediawiki
+++ b/bip-0009.mediawiki
@@ -116,7 +116,7 @@ other one simultaneously transitions to STARTED, which would mean both would dem
Note that a block's state never depends on its own nVersion; only on that of its ancestors.
- case STARTED: {
+ case STARTED:
if (GetMedianTimePast(block.parent) >= timeout) {
return FAILED;
}
@@ -124,14 +124,14 @@ Note that a block's state never depends on its own nVersion; only on that of its
walk = block;
for (i = 0; i < 2016; i++) {
walk = walk.parent;
- if (walk.nVersion & 0xE0000000 == 0x2000000 && (walk.nVersion >> bit) & 1 == 1) {
+ if (walk.nVersion & 0xE0000000 == 0x20000000 && (walk.nVersion >> bit) & 1 == 1) {
count++;
}
}
if (count >= threshold) {
return LOCKED_IN;
}
- }
+ return STARTED;
After a retarget period of LOCKED_IN, we automatically transition to ACTIVE.