diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2016-04-12 20:20:06 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2016-04-12 20:20:06 +0000 |
commit | 952ba4ad16fe567995c54f44f1e6f1690bfff0db (patch) | |
tree | 9fca45efd9840f4301439dcd849a176edd8ed352 | |
parent | 735a55612949f5b0bcec6fe2e5f89e65bf0602c6 (diff) | |
download | bips-952ba4ad16fe567995c54f44f1e6f1690bfff0db.tar.xz |
Assign BIP 114: Merkelized Abstract Syntax Tree
-rw-r--r-- | README.mediawiki | 6 | ||||
-rw-r--r-- | bip-0114.mediawiki (renamed from bip-mast.mediawiki) | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/README.mediawiki b/README.mediawiki index 92ca9f9..974870e 100644 --- a/README.mediawiki +++ b/README.mediawiki @@ -404,6 +404,12 @@ Those proposing changes should consider that ultimately consent may rest with th | Standard | Draft |- +| [[bip-0114.mediawiki|114]] +| Merkelized Abstract Syntax Tree +| Johnson Lau +| Standard +| Draft +|- | [[bip-0120.mediawiki|120]] | Proof of Payment | Kalle Rosenbaum diff --git a/bip-mast.mediawiki b/bip-0114.mediawiki index a903235..4ad593f 100644 --- a/bip-mast.mediawiki +++ b/bip-0114.mediawiki @@ -1,5 +1,5 @@ <pre> - BIP: ? + BIP: 114 Title: Merkelized Abstract Syntax Tree Author: Johnson Lau <jl2012@xbt.hk> Status: Draft @@ -135,7 +135,7 @@ The idea of MAST originates from Russell O’Connor, Pieter Wuille, and [https:/ == Reference Implementation == https://github.com/jl2012/bitcoin/commit/f335cab76eb95d4f7754a718df201216a4975d8c -<source lang=cpp> +<source lang="cpp"> if (witversion == 1) { if (program.size() == 32) { if (witness.stack.size() < 3) @@ -189,4 +189,4 @@ if (witversion == 1) { *[[bip-0141.mediawiki|BIP141 Segregated Witness (Consensus layer)]] == Copyright == -This document is placed in the public domain.
\ No newline at end of file +This document is placed in the public domain. |