summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Chase <asperous2@gmail.com>2015-09-04 15:15:08 -0700
committerJorge Timón <jtimon@jtimon.cc>2015-11-07 20:06:05 +0100
commit1da1397d5427df53c19e72db0116606ebe172ce3 (patch)
treee08c60232f0a6ac3305eeb230f672ad803c55605
parentd954832e3091d3fc61e5d30d14c06f042993134f (diff)
downloadbips-1da1397d5427df53c19e72db0116606ebe172ce3.tar.xz
Bip-99/Add details to definitions
-rw-r--r--bip-0099.mediawiki24
1 files changed, 11 insertions, 13 deletions
diff --git a/bip-0099.mediawiki b/bip-0099.mediawiki
index dd1e8bc..040ed45 100644
--- a/bip-0099.mediawiki
+++ b/bip-0099.mediawiki
@@ -25,19 +25,17 @@ deployment of changes.
==Definitions==
-- Software fork: in free software, an existing project can be copied
- and extended/maintained without permission from the original
- project's maintainers.
-- Consensus fork: a divergence in the implementation of the
- verification rules can impede the expected eventual convergence of
- the network in a single chain that has the most proof of work and
- also satisfies the rules. This can be intentional or be caused by a
- bug in consensus validation reimplementations.
-- Softfork: an intentional consensus fork where everything that
- was previously invalid remains invalid, but some things that were
- valid also become invalid. A majority of miners can impose
- these kind of changes and they also have some deployment advantages.
-- Hardfork: an intentional consensus fork that is not a softfork.
+;Software fork
+: A copy of an existing project where management is separate from the existing project.
+
+;Consensus fork
+: A divergence in the implementation of the verification rules can impede the expected eventual convergence of the network in a single chain that has the most proof of work and also satisfies the rules. This can be intentional or be caused by a bug in consensus validation reimplementations.
+
+;Softfork
+: A change to the Bitcoin protocol wherein previously valid blocks and transactions become invalid. A hashrate majority miners can enforce the new rules so that the change enforced across all clients. Softforks are backward compatible.
+
+;Hardfork
+: A change to the Bitcoin protocol that makes previously invalid blocks valid. Hardforks require all users to upgrade.
==Taxonomy of consensus forks==