summaryrefslogtreecommitdiff
path: root/README.mediawiki
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2021-05-17 23:33:33 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2021-05-17 23:33:33 +0000
commita099f43ce2013e5dc17e9ad4aa92b5c53fd69da7 (patch)
treec536fc88085ab71ec496def4041e9038345e25db /README.mediawiki
parent3893c2d3bd830bbec53826aca8b7f0d9ab0288aa (diff)
parente7ee4fe6d51727c37e3435815b693ca5e78a42bb (diff)
downloadbips-a099f43ce2013e5dc17e9ad4aa92b5c53fd69da7.tar.xz
Merge BIP 343
Diffstat (limited to 'README.mediawiki')
-rw-r--r--README.mediawiki7
1 files changed, 7 insertions, 0 deletions
diff --git a/README.mediawiki b/README.mediawiki
index 3b8e302..d8bcae6 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -1008,6 +1008,13 @@ Those proposing changes should consider that ultimately consent may rest with th
| Pieter Wuille, Jonas Nick, Anthony Towns
| Standard
| Draft
+|- style="background-color: #ffffcf"
+| [[bip-0343.mediawiki|343]]
+| Consensus (soft fork)
+| Mandatory activation of taproot deployment
+| Shinobius, Michael Folkson
+| Standard
+| Proposed
|-
| [[bip-0350.mediawiki|350]]
| Applications