 Luke-Jr
|
55ecc6fd38
|
Merge pull request #386 from btcdrak/bip9assign
Add BIP9 assignments
|
2016-05-31 18:08:56 +00:00 |
|
|
Luke-Jr
|
a01584f6eb
|
Merge pull request #391 from luke-jr/vb_gbt
BIP 9: GBT updates for versionbits
|
2016-05-31 14:50:42 +00:00 |
|
|
Luke-Jr
|
38bd8cfec6
|
Merge pull request #393 from TheBlueMatt/master
Update to new BIP 152 Protocol Flow
|
2016-05-24 05:22:55 +00:00 |
|
|
Luke-Jr
|
b484c27c5c
|
Merge pull request #392 from TheBlueMatt/master
Replace my generic bip@ email with bip-specific emails everywhere
|
2016-05-23 10:31:57 +00:00 |
|
|
Luke-Jr
|
4c61338ccb
|
Merge pull request #389 from TheBlueMatt/152
BIP 152: Compact Block Relay
|
2016-05-23 10:30:36 +00:00 |
|
|
Luke-Jr
|
ad9fc9ccea
|
Merge pull request #385 from techguy613/master
BIP75 Simplification and Enhancements
|
2016-05-19 18:51:45 +00:00 |
|
|
Luke-Jr
|
9a995e6879
|
Merge pull request #388 from stevenroose/patch-2
Error in BIP0009 code example
|
2016-05-18 22:47:14 +00:00 |
|
|
Luke-Jr
|
f65541bf26
|
Merge pull request #362 from jonasschnelli/2016/03/auth_enc
BIP 151: Peer-to-Peer Communication Encryption
|
2016-05-18 19:37:53 +00:00 |
|
|
Luke-Jr
|
0bbe045104
|
Merge pull request #381 from dooglus/patch-3
Update bip-0112.mediawiki
|
2016-05-10 20:24:01 +00:00 |
|
|
Luke-Jr
|
32f7724149
|
Merge pull request #384 from jl2012/patch-19
BIP141: BIP9 parameters for testnet
|
2016-05-07 03:29:21 +00:00 |
|
|
Luke-Jr
|
aa5531d831
|
Merge pull request #378 from jl2012/patch-18
BIP141 clarifications and formatting
|
2016-05-01 18:11:02 +00:00 |
|
|
Luke-Jr
|
c3e5f1411f
|
Merge pull request #382 from dooglus/patch-4
Update bip-0068.mediawiki
|
2016-05-01 18:10:25 +00:00 |
|
|
Luke-Jr
|
7b30c3d63e
|
Merge pull request #380 from achow101/master
Update BIP 144 'havewitness' to service bit
|
2016-04-29 04:54:56 +00:00 |
|
|
Luke-Jr
|
6015939b3b
|
Merge pull request #377 from OpenBitcoinPrivacyProject/bip47
BIP-0047: version 2 payment codes
|
2016-04-26 00:00:18 +00:00 |
|
|
Luke-Jr
|
cf51071ccd
|
Merge pull request #376 from jl2012/bip141p2sh
BIP141: Add P2SH-P2WPKH example and clarify block cost
|
2016-04-23 20:02:00 +00:00 |
|
|
Luke-Jr
|
cd1932a67a
|
Merge pull request #375 from voisine/patch-4
fix BIP141 nested P2SH scriptSig byte representation
|
2016-04-23 03:33:13 +00:00 |
|
|
Luke-Jr
|
932d0750f2
|
Merge pull request #374 from kanzure/bip143-signaturehash
BIP143: Explicitly mention the SignatureHash function
|
2016-04-20 19:41:40 +00:00 |
|
|
Luke-Jr
|
a80fbaf619
|
Merge pull request #373 from kanzure/bip143-typofix
BIP143: fix typo ("including")
|
2016-04-20 19:41:23 +00:00 |
|
|
Luke-Jr
|
5160fc71be
|
Merge pull request #372 from jl2012/patch-16
BIP143 clarifying semantics of ACP|SINGLE
|
2016-04-20 19:40:42 +00:00 |
|
|
Luke-Jr
|
5d0b400823
|
Merge pull request #371 from justusranvier/bip47
BIP-0047: Clarify usage and format of outpoints
|
2016-04-17 22:17:57 +00:00 |
|
|
Luke-Jr
|
3ff0772bb2
|
Merge pull request #369 from instagibbs/bip114clar
Some clarification on path meaning and structure
|
2016-04-14 10:38:10 +00:00 |
|
|
Luke-Jr
|
6026a0b599
|
Merge pull request #370 from jl2012/bip114ref
BIP114: Clarifying reference implementation
|
2016-04-14 10:37:53 +00:00 |
|
|
Luke-Jr
|
2b478b5f0a
|
Merge pull request #367 from jl2012/bip141commitment
BIP141: commitment clarification. BIP144: new diagram
|
2016-04-08 22:03:25 +00:00 |
|
|
Luke-Jr
|
4cdb00287d
|
Merge pull request #366 from btcdrak/patch-7
Clarify what remains "to be decided"
|
2016-03-31 19:23:30 +00:00 |
|
|
Luke-Jr
|
ba16f16742
|
Merge pull request #364 from jl2012/patch-13
BIP143: Provide private key used in the example
|
2016-03-28 21:24:30 +00:00 |
|
|
Luke-Jr
|
51319e55c6
|
Merge pull request #363 from CodeShark/bip141_edits
Witness validation logic trigger clarifications
|
2016-03-28 21:24:18 +00:00 |
|
|
Luke-Jr
|
f8c439a704
|
Merge pull request #360 from luke-jr/bip0002_deferred
Defer BIP 2
|
2016-03-28 21:23:35 +00:00 |
|
|
Luke-Jr
|
4650545169
|
Merge pull request #361 from btcdrak/patch-5
Remove deployment section
|
2016-03-21 17:23:05 +00:00 |
|
|
Luke-Jr
|
f5c136057b
|
Merge pull request #359 from btcdrak/cvsdeploy
Set deployment schedule for BIP 68,112,113
|
2016-03-18 19:20:00 +00:00 |
|
|
Luke-Jr
|
3979dbd6da
|
Merge pull request #355 from jl2012/patch-12
BIP142: Deferred
|
2016-03-16 18:22:52 +00:00 |
|
|
Luke-Jr
|
97d2f023a4
|
Merge pull request #354 from sipa/bip9fixes
Small improvements to BIP9
|
2016-03-15 19:04:40 +00:00 |
|
|
Luke-Jr
|
1daefdb374
|
Merge pull request #351 from dangershony/patch-2
Crypzo has changed name to CoinVault
|
2016-03-15 07:10:19 +00:00 |
|
|
Luke-Jr
|
5a942b04c0
|
Merge pull request #353 from priestc/master
Added paragraph about address re-use for BIP131
|
2016-03-15 06:34:42 +00:00 |
|
|
Luke-Jr
|
dada5f22a6
|
Merge pull request #331 from kanzure/bip1/typofix-and-formatfix
BIP1: Formatfix for auxiliary files section and a small typofix
|
2016-03-08 17:24:35 +00:00 |
|
|
Luke-Jr
|
66daf77f28
|
Merge pull request #349 from jonathancross/patch-1
Small typo in bip-0009.mediawiki
|
2016-03-07 17:36:20 +00:00 |
|
|
Luke-Jr
|
7cd2c104fd
|
Merge pull request #348 from MarcoFalke/patch-2
[Bip 133] Fix typos
|
2016-03-07 16:06:52 +00:00 |
|
|
Luke-Jr
|
8883b6061b
|
Merge pull request #346 from sipa/bip9work
Further tweaks to BIP9
|
2016-03-02 19:40:29 +00:00 |
|
|
Luke-Jr
|
f36fceb60a
|
Merge pull request #345 from sipa/bip9work
Remove ABANDONED and fix ambiguity
|
2016-03-02 13:31:58 +00:00 |
|
|
Luke-Jr
|
c8d5aea72b
|
Merge pull request #343 from morcos/113fixes
Remove BIP68's dependence on this BIP. Remove deployment details.
|
2016-03-01 04:17:38 +00:00 |
|
|
Luke-Jr
|
9fb2341c5d
|
Merge pull request #342 from morcos/68fixes
Clarify non-dependence on BIP113
|
2016-03-01 03:35:42 +00:00 |
|
|
Luke-Jr
|
976d5856b3
|
Merge pull request #344 from sipa/bip9work
Various changes to BIP9
|
2016-03-01 03:19:22 +00:00 |
|
|
Luke-Jr
|
2b27bb5d27
|
Merge pull request #219 from CodeShark/BIP0009_revisions
Added clarifications to BIP0009.
|
2016-03-01 00:25:30 +00:00 |
|
|
Luke-Jr
|
24f705f860
|
Merge pull request #341 from morcos/feefilter
BIP 133: feefilter message
|
2016-03-01 00:14:34 +00:00 |
|
|
Luke-Jr
|
15c0b250cb
|
Merge pull request #257 from SamouraiDev/SamouraiDev-patch-1
Add link to BIP47 test vectors
|
2016-02-24 21:11:29 +00:00 |
|
|
Luke-Jr
|
7b16ed6389
|
Merge pull request #337 from Sjors/patch-1
BIP 69: Add link to Blockchain.info implementation
|
2016-02-24 21:11:00 +00:00 |
|
|
Luke-Jr
|
eb2e7c2314
|
Merge pull request #309 from dcousens/patch-3
Add BIP38 Javascript implementation
|
2016-02-24 20:35:34 +00:00 |
|
|
Luke-Jr
|
30fb3ae942
|
Merge pull request #333 from btcdrak/112update
Update BIP112 reference example
|
2016-02-24 05:37:51 +00:00 |
|
|
Luke-Jr
|
b8fe6e43c6
|
Merge pull request #326 from dangershony/patch-1
Adding crypzo to BIP44 supported wallets
|
2016-02-24 05:08:20 +00:00 |
|
|
Luke-Jr
|
561e1b77bd
|
Merge pull request #329 from gavinandresen/withdraw_bip101
Withdraw BIP 101 proposal
|
2016-02-13 04:31:30 +00:00 |
|
|
Luke-Jr
|
0c7b56c823
|
Merge pull request #332 from paveljanik/patch-2
ISM: Proper case, update PR number
|
2016-02-12 18:08:07 +00:00 |
|
|
Luke-Jr
|
f8869a2917
|
Merge pull request #330 from btcdrak/68nits
Update BIP68 implementation to match spec
|
2016-02-12 04:33:26 +00:00 |
|
|
Luke-Jr
|
fe1b3b5b7b
|
Merge pull request #328 from gavinandresen/bump2mb
BIP109: BIP102 variation for a 2mb block size bump
|
2016-02-12 00:47:56 +00:00 |
|
|
Luke-Jr
|
4299e61179
|
Merge pull request #324 from luke-jr/segwit_gbt
BIP 145: getblocktemplate Updates for Segregated Witness
|
2016-02-09 05:22:23 +00:00 |
|
|
Luke-Jr
|
3cc972c93e
|
Merge pull request #322 from luke-jr/travis
Travis: Initial formatting tests
|
2016-02-09 05:18:40 +00:00 |
|
|
Luke-Jr
|
e56e747f78
|
Merge pull request #321 from Roasbeef/bip-68-spelling
BIP 68 Nit: fix spelling Contrats -> Contracts
|
2016-02-08 08:42:25 +00:00 |
|
|
Luke-Jr
|
a6d333ed6b
|
Merge pull request #319 from btcdrak/bip68nit
Minor update of implementation for BIP68
|
2016-02-04 23:51:03 +00:00 |
|
|
Luke-Jr
|
3c6a8e5f91
|
Merge pull request #318 from jl2012/patch-11
BIP34 correction: the height has a sign bit
|
2016-02-04 23:50:38 +00:00 |
|
|
Luke-Jr
|
00f6e2a84d
|
Merge pull request #1 from emeth-/patch-1
fix typo
|
2016-02-03 22:02:04 +00:00 |
|
|
Luke-Jr
|
605823f878
|
Merge pull request #306 from paoloaga/bip0039-italian
Added bip39 Italian wordlist
|
2016-02-03 18:45:56 +00:00 |
|
|
Luke-Jr
|
664c19aca5
|
Merge pull request #313 from prusnak/master
update location of slip-0044
|
2016-02-01 19:07:32 +00:00 |
|
|
Luke-Jr
|
336ff48b64
|
Merge pull request #312 from toby/bip74
BIP74 Draft
|
2016-01-29 01:59:02 +00:00 |
|
|
Luke-Jr
|
4cc16c2778
|
Merge pull request #311 from CodeShark/bip123
Updated BIP table
|
2016-01-29 01:23:24 +00:00 |
|
|
Luke-Jr
|
e7f28d88ec
|
Merge pull request #303 from jl2012/patch-10
BIP141: Add 520 bytes witness stack limit
|
2016-01-29 00:03:35 +00:00 |
|
|
Luke-Jr
|
1292a1c730
|
Merge pull request #300 from afk11/typo-141
BIP141, fix small typo
|
2016-01-29 00:01:48 +00:00 |
|
|
Luke-Jr
|
94cdf36797
|
Merge pull request #298 from jonathancross/patch-1
Improvements to BIP 122
|
2016-01-25 18:08:35 +00:00 |
|
|
Luke-Jr
|
aef655ecad
|
Merge pull request #302 from jl2012/patch-9
BIP141 Non-upgraded wallet description
|
2016-01-25 18:07:57 +00:00 |
|
|
Luke-Jr
|
9f8c950869
|
Merge pull request #295 from fanatid/fix/bip141-urls
BIP 141: fix URLs
|
2016-01-24 17:43:32 +00:00 |
|
|
Luke-Jr
|
5bfb685553
|
Merge pull request #296 from jl2012/patch-8
Clarify txid and wtxid
|
2016-01-24 17:43:15 +00:00 |
|
|
Luke-Jr
|
6a6c305fff
|
Merge pull request #297 from CodeShark/bip144_edits
Script witness encoding.
|
2016-01-24 17:43:03 +00:00 |
|
|
Luke-Jr
|
46a1b4e2ec
|
Merge pull request #294 from afk11/bip142-typo
142: typo in References section
|
2016-01-24 17:41:32 +00:00 |
|
|
Luke-Jr
|
2010cf4979
|
Merge pull request #291 from JornC/segwit-address
BIP142 - Typos and grammar
|
2016-01-22 05:39:27 +00:00 |
|
|
Luke-Jr
|
e38e909f91
|
Merge pull request #292 from jl2012/bip143example
BIP143 example and clarify
|
2016-01-22 02:26:05 +00:00 |
|
|
Luke-Jr
|
da0e020e24
|
Merge pull request #288 from iamsamwood/iamsamwood-patch-1
Adds a missing BIP 141 segwit BIP reference
|
2016-01-20 16:57:27 +00:00 |
|
|
Luke-Jr
|
ae9947f98d
|
Merge pull request #289 from jl2012/patch-6
Tidy up Witness Program section
|
2016-01-20 16:56:10 +00:00 |
|
|
Luke-Jr
|
a849f8cc46
|
Merge pull request #286 from jl2012/patch-6
Introducing the term "witnessscript" in BIP141
|
2016-01-19 18:00:49 +00:00 |
|
|
Luke-Jr
|
e6876035b3
|
Merge pull request #287 from schildbach/patch-1
Fix typo in proposed BIP144.
|
2016-01-19 17:48:46 +00:00 |
|
|
Luke-Jr
|
b882d296ed
|
Merge pull request #283 from jl2012/patch-5
New witness program definition in BIP141, and related revision in 142 - 144
|
2016-01-18 19:06:10 +00:00 |
|
|
Luke-Jr
|
01c5e719d3
|
Merge pull request #218 from CodeShark/link_and_ack
Updated C++ library link and added acknowledgement.
|
2016-01-18 18:29:15 +00:00 |
|
|
Luke-Jr
|
d23e14625b
|
Merge pull request #284 from btcdrak/bip68-7184
[BIP68] Update reference implementation
|
2016-01-18 18:21:45 +00:00 |
|
|
Luke-Jr
|
b457a74040
|
Merge pull request #282 from petertodd/2016-01-remove-merge-mining-mention
Remove merge-mining suggest re: witness nonce
|
2016-01-14 04:07:10 +00:00 |
|
|
Luke-Jr
|
dc4071d0e6
|
Merge pull request #281 from MarcoPon/master
added ABNF grammar
|
2016-01-13 04:24:15 +00:00 |
|
|
Luke-Jr
|
5afe46e257
|
Merge pull request #246 from CodeShark/script_templates
BIP 124: Hierarchical Deterministic Script Templates
|
2016-01-13 04:23:57 +00:00 |
|
|
Luke-Jr
|
8a35b937bd
|
Merge pull request #242 from CodeShark/DHD_key_trees
BIP 83: Dynamic Hierarchical Deterministic Key Trees
|
2016-01-13 04:23:20 +00:00 |
|
|
Luke-Jr
|
be76170385
|
Merge pull request #278 from drwasho/master
Fixes
|
2016-01-12 13:10:44 +00:00 |
|
|
Luke-Jr
|
68ac3c777c
|
Merge pull request #277 from jl2012/bip141
BIP141: New commitment structure, sigop limits, etc
|
2016-01-12 13:09:13 +00:00 |
|
|
Luke-Jr
|
7355dc8341
|
Merge pull request #276 from petertodd/2016-01-change-bip65-status-in-readme
Minor: Fix BIP65 status in README
|
2016-01-11 14:36:23 +00:00 |
|
|
Luke-Jr
|
f5d896a4fa
|
Merge pull request #250 from XBTdev/patch-1
add copay link to bip44 compatible wallets list
|
2016-01-08 20:37:19 +00:00 |
|
|
Luke-Jr
|
8ea4fceeec
|
Merge pull request #273 from luke-jr/bip0001_clarification_minorpatches
BIP 0001: Clarification of when changes don't need a BIP
|
2016-01-08 19:21:58 +00:00 |
|
|
Luke-Jr
|
5650efe117
|
Merge pull request #271 from luke-jr/bip0001_editor_luke
BIP 0001: Change BIP editor to Luke Dashjr
|
2016-01-08 17:10:54 +00:00 |
|
|
Luke-Jr
|
d37084d4ba
|
Merge pull request #233 from dcousens/patch-1
BIP65: Change to accepted status
|
2016-01-06 20:40:23 +00:00 |
|
|
Luke-Jr
|
5672b6e2c6
|
Merge pull request #264 from justusranvier/bip47
BIP47 clarifications
|
2015-12-30 17:12:34 +00:00 |
|
|
Luke-Jr
|
6bfc0151a7
|
Merge pull request #260 from btcdrak/bip68mtp
BIP68: update specification to assume MTP
|
2015-12-11 07:08:23 +00:00 |
|
|
Luke-Jr
|
99effc1c70
|
Merge pull request #254 from jl2012/patch-6
Full description of the behavior of OP_CLTV
|
2015-12-11 07:04:11 +00:00 |
|
|
Luke-Jr
|
44f021979a
|
Merge pull request #252 from jl2012/patch-5
Corrections with the conditions for script failure
|
2015-12-07 20:34:40 +00:00 |
|
|
Luke-Jr
|
0cd94c9f72
|
Merge pull request #245 from btcdrak/bip68sync
BIP68: Simplify language and update for current implementation
|
2015-11-28 22:33:57 +00:00 |
|
|
Luke-Jr
|
0ce74af5e8
|
Merge pull request #249 from bitstein/master
BIP47: fix typo
|
2015-11-28 20:46:46 +00:00 |
|
|
Luke-Jr
|
af7c75f40a
|
Merge pull request #238 from jwilkins/bip_103_squashed
Bip 103 squashed
|
2015-11-28 19:16:55 +00:00 |
|
|
Luke-Jr
|
dd208025cd
|
Merge pull request #248 from btcdrak/bip112sync
BIP112: Update document to match implementation
|
2015-11-28 19:14:04 +00:00 |
|
|
Luke-Jr
|
824284d422
|
Merge pull request #243 from CodeShark/BIP0112_revisions
BIP-0112 minor revision to text.
|
2015-11-26 00:27:06 +00:00 |
|
|
Luke-Jr
|
641b91ba28
|
Merge pull request #244 from sipa/bip62dead
Mark BIP62 as withdrawn
|
2015-11-17 21:39:55 +00:00 |
|