summaryrefslogtreecommitdiff
path: root/README.mediawiki
diff options
context:
space:
mode:
authorLuke-Jr <luke_github1@dashjr.org>2016-01-13 04:23:57 +0000
committerLuke-Jr <luke_github1@dashjr.org>2016-01-13 04:23:57 +0000
commit5afe46e2571342252eec861c5133fcdb0d7bbaf5 (patch)
treed8c616a72896f0824f67a07d339870a319a5db3e /README.mediawiki
parent8a35b937bd131e1d42b2a7dd7c61c1c94efc06e3 (diff)
parenta8ace6d608b2068ce949993d4dd048fd759820ce (diff)
Merge pull request #246 from CodeShark/script_templates
BIP 124: Hierarchical Deterministic Script Templates
Diffstat (limited to 'README.mediawiki')
-rw-r--r--README.mediawiki6
1 files changed, 6 insertions, 0 deletions
diff --git a/README.mediawiki b/README.mediawiki
index 0df3d28..9c28fc1 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -392,6 +392,12 @@ Those proposing changes should consider that ultimately consent may rest with th
| Informational
| Draft
|-
+| [[bip-0124.mediawiki|124]]
+| Hierarchical Deterministic Script Templates
+| Eric Lombrozo, William Swanson
+| Informational
+| Draft
+|-
| [[bip-0125.mediawiki|125]]
| Opt-in Full Replace-by-Fee Signaling
| David Harding, Peter Todd