Skip to content

Commit 45f5c56

Browse files
author
Matt David
committed
Merge remote-tracking branch 'upstream/master'
Added: - Versioning - Cancellation - Add UNKNOWN_TYPE to ProtocolMessageType enum in paymentrequest.proto and BIP75 text (based on suggestions from http://androiddevblog.com/protocol-buffers-pitfall-adding-enum-values/) Updated: - Additional pki_type values - Updated status_code values - Update BIP75 Motivation and use cases to provide more color around reasoning and use of BIP75 NOTE: The BIP75 language no longer contains a description of the KYC compliance use case, as it is a single, very specific use-case that does not have any bearing on the technical specifications herein. BIP75 extends the original BIP70 Payment Protocol to become a two-way, encrypted messaging process, which can be used for a variety of reasons one of which is regulatory compliance.
2 parents 7ba8e58 + 1501dd9 commit 45f5c56

21 files changed

+556
-141
lines changed

README.mediawiki

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ Those proposing changes should consider that ultimately consent may rest with th
2424
| Luke Dashjr
2525
| Process
2626
| Deferred
27-
|-
27+
|- style="background-color: #cfffcf"
2828
| [[bip-0009.mediawiki|9]]
2929
| Version bits with timeout and delay
3030
| Pieter Wuille, Peter Todd, Greg Maxwell, Rusty Russell
3131
| Informational
32-
| Draft
32+
| Final
3333
|- style="background-color: #ffcfcf"
3434
| [[bip-0010.mediawiki|10]]
3535
| Multi-Sig Transaction Distribution
@@ -78,12 +78,12 @@ Those proposing changes should consider that ultimately consent may rest with th
7878
| Luke Dashjr
7979
| Standard
8080
| Withdrawn
81-
|-
81+
|- style="background-color: #ffffcf"
8282
| [[bip-0018.mediawiki|18]]
8383
| hashScriptCheck
8484
| Luke Dashjr
8585
| Standard
86-
| Draft
86+
| Accepted
8787
|-
8888
| [[bip-0019.mediawiki|19]]
8989
| M-of-N Standard Transactions (Low SigOp)
@@ -168,12 +168,12 @@ Those proposing changes should consider that ultimately consent may rest with th
168168
| Mike Caldwell, Aaron Voisine
169169
| Standard
170170
| Draft
171-
|-
171+
|- style="background-color: #ffffcf"
172172
| [[bip-0039.mediawiki|39]]
173173
| Mnemonic code for generating deterministic keys
174174
| Marek Palatinus, Pavol Rusnak, Aaron Voisine, Sean Bowe
175175
| Standard
176-
| Draft
176+
| Accepted
177177
|-
178178
| 40
179179
| Stratum wire protocol
@@ -196,20 +196,20 @@ Those proposing changes should consider that ultimately consent may rest with th
196196
| [[bip-0043.mediawiki|43]]
197197
| Purpose Field for Deterministic Wallets
198198
| Marek Palatinus, Pavol Rusnak
199-
| Standard
199+
| Informational
200200
| Draft
201-
|-
201+
|- style="background-color: #ffffcf"
202202
| [[bip-0044.mediawiki|44]]
203203
| Multi-Account Hierarchy for Deterministic Wallets
204204
| Marek Palatinus, Pavol Rusnak
205205
| Standard
206-
| Draft
207-
|-
206+
| Accepted
207+
|- style="background-color: #ffffcf"
208208
| [[bip-0045.mediawiki|45]]
209209
| Structure for Deterministic P2SH Multisignature Wallets
210210
| Manuel Araoz, Ryan X. Charles, Matias Alejo Garcia
211211
| Standard
212-
| Draft
212+
| Accepted
213213
|-
214214
| [[bip-0047.mediawiki|47]]
215215
| Reusable Payment Codes for Hierarchical Deterministic Wallets
@@ -265,24 +265,24 @@ Those proposing changes should consider that ultimately consent may rest with th
265265
| Pieter Wuille
266266
| Standard
267267
| Final
268-
|-
268+
|- style="background-color: #ffffcf"
269269
| [[bip-0067.mediawiki|67]]
270270
| Deterministic Pay-to-script-hash multi-signature addresses through public key sorting
271271
| Thomas Kerin, Jean-Pierre Rupp, Ruben de Vries
272272
| Standard
273-
| Draft
273+
| Accepted
274274
|- style="background-color: #cfffcf"
275275
| [[bip-0068.mediawiki|68]]
276276
| Relative lock-time using consensus-enforced sequence numbers
277277
| Mark Friedenbach, BtcDrak, Nicolas Dorier, kinoshitajona
278278
| Standard
279279
| Final
280-
|-
280+
|- style="background-color: #ffffcf"
281281
| [[bip-0069.mediawiki|69]]
282282
| Lexicographical Indexing of Transaction Inputs and Outputs
283283
| Kristov Atlas
284284
| Informational
285-
| Draft
285+
| Accepted
286286
|- style="background-color: #cfffcf"
287287
| [[bip-0070.mediawiki|70]]
288288
| Payment Protocol
@@ -324,13 +324,13 @@ Those proposing changes should consider that ultimately consent may rest with th
324324
| Hierarchy for Non-Colored Voting Pool Deterministic Multisig Wallets
325325
| Justus Ranvier, Jimmy Song
326326
| Informational
327-
| Draft
327+
| Deferred
328328
|-
329329
| [[bip-0081.mediawiki|81]]
330330
| Hierarchy for Colored Voting Pool Deterministic Multisig Wallets
331331
| Justus Ranvier, Jimmy Song
332332
| Informational
333-
| Draft
333+
| Deferred
334334
|-
335335
| [[bip-0083.mediawiki|83]]
336336
| Dynamic Hierarchical Deterministic Key Trees
@@ -385,12 +385,12 @@ Those proposing changes should consider that ultimately consent may rest with th
385385
| Gavin Andresen
386386
| Standard
387387
| Draft
388-
|-
388+
|- style="background-color: #ffffcf"
389389
| [[bip-0111.mediawiki|111]]
390390
| NODE_BLOOM service bit
391391
| Matt Corallo, Peter Todd
392392
| Standard
393-
| Draft
393+
| Accepted
394394
|- style="background-color: #cfffcf"
395395
| [[bip-0112.mediawiki|112]]
396396
| CHECKSEQUENCEVERIFY
@@ -439,36 +439,36 @@ Those proposing changes should consider that ultimately consent may rest with th
439439
| Eric Lombrozo, William Swanson
440440
| Informational
441441
| Draft
442-
|-
442+
|- style="background-color: #ffffcf"
443443
| [[bip-0125.mediawiki|125]]
444444
| Opt-in Full Replace-by-Fee Signaling
445445
| David A. Harding, Peter Todd
446446
| Standard
447-
| Draft
447+
| Accepted
448448
|-
449449
| [[bip-0126.mediawiki|126]]
450450
| Best Practices for Heterogeneous Input Script Transactions
451451
| Kristov Atlas
452452
| Informational
453453
| Draft
454-
|-
454+
|- style="background-color: #ffffcf"
455455
| [[bip-0130.mediawiki|130]]
456456
| sendheaders message
457457
| Suhas Daftuar
458458
| Standard
459-
| Draft
459+
| Accepted
460460
|-
461461
| [[bip-0131.mediawiki|131]]
462462
| "Coalescing Transaction" Specification (wildcard inputs)
463463
| Chris Priest
464464
| Standard
465465
| Draft
466-
|-
466+
|- style="background-color: #ffcfcf"
467467
| [[bip-0132.mediawiki|132]]
468468
| Committee-based BIP Acceptance Process
469469
| Andy Chase
470470
| Process
471-
| Draft
471+
| Withdrawn
472472
|-
473473
| [[bip-0133.mediawiki|133]]
474474
| feefilter message
@@ -512,6 +512,18 @@ Those proposing changes should consider that ultimately consent may rest with th
512512
| Standard
513513
| Draft
514514
|-
515+
| [[bip-0146.mediawiki|146]]
516+
| Dealing with signature malleability
517+
| Pieter Wuille, Johnson Lau
518+
| Standard
519+
| Draft
520+
|-
521+
| [[bip-0150.mediawiki|150]]
522+
| Peer Authentication
523+
| Jonas Schnelli
524+
| Standard
525+
| Draft
526+
|-
515527
| [[bip-0151.mediawiki|151]]
516528
| Peer-to-Peer Communication Encryption
517529
| Jonas Schnelli

bip-0009.mediawiki

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Peter Todd <[email protected]>
66
Greg Maxwell <[email protected]>
77
Rusty Russell <[email protected]>
8-
Status: Draft
8+
Status: Final
99
Type: Informational
1010
Created: 2015-10-04
1111
</pre>

bip-0018.mediawiki

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
BIP: 18
33
Title: hashScriptCheck
44
Author: Luke Dashjr <[email protected]>
5-
Status: Draft
5+
Status: Accepted
66
Type: Standards Track
77
Created: 2012-01-27
88
</pre>

bip-0021.mediawiki

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,5 @@ Characters must be URI encoded properly.
124124
125125
=== Libraries ===
126126
* Javascript - https://github.com/bitcoinjs/bip21
127-
* https://github.com/SandroMachado/BitcoinPaymentURI Java library to process and generate Bitcoin payment URI's.
127+
* Java - https://github.com/SandroMachado/BitcoinPaymentURI
128+
* Swift - https://github.com/SandroMachado/BitcoinPaymentURISwift

bip-0039.mediawiki

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Pavol Rusnak <[email protected]>
66
Aaron Voisine <[email protected]>
77
Sean Bowe <[email protected]>
8-
Status: Draft
8+
Status: Accepted
99
Type: Standards Track
1010
Created: 2013-09-10
1111
</pre>
@@ -146,3 +146,6 @@ Haskell:
146146
JavaScript:
147147
* https://github.com/bitpay/bitcore-mnemonic
148148
* https://github.com/bitcoinjs/bip39 (used by [[https://github.com/blockchain/My-Wallet-V3/blob/v3.8.0/src/hd-wallet.js#L121-L146|blockchain.info]])
149+
150+
Ruby:
151+
* https://github.com/sreekanthgs/bip_mnemonic

bip-0043.mediawiki

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Author: Marek Palatinus <[email protected]>
55
Pavol Rusnak <[email protected]>
66
Status: Draft
7-
Type: Standards Track
7+
Type: Informational
88
Created: 2014-04-24
99
</pre>
1010

bip-0044.mediawiki

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Title: Multi-Account Hierarchy for Deterministic Wallets
44
Author: Marek Palatinus <[email protected]>
55
Pavol Rusnak <[email protected]>
6-
Status: Draft
6+
Status: Accepted
77
Type: Standards Track
88
Created: 2014-04-24
99
</pre>

bip-0045.mediawiki

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Author: Manuel Araoz <[email protected]>
55
Ryan X. Charles <[email protected]>
66
Matias Alejo Garcia <[email protected]>
7-
Status: Draft
7+
Status: Accepted
88
Type: Standards Track
99
Created: 2014-04-25
1010
</pre>

bip-0067.mediawiki

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Author: Thomas Kerin <[email protected]>
55
Jean-Pierre Rupp <[email protected]>
66
Ruben de Vries <[email protected]>
7-
Status: Draft
7+
Status: Accepted
88
Type: Standards Track
99
Created: 2015-02-08
1010
</pre>

bip-0069.mediawiki

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Title: Lexicographical Indexing of Transaction Inputs and Outputs
44
Author: Kristov Atlas <[email protected]>
55
Editor: Daniel Cousens <[email protected]>
6-
Status: Draft
6+
Status: Accepted
77
Type: Informational
88
Created: 2015-06-12
99
</pre>

0 commit comments

Comments
 (0)