mirrors/bitcoin-bips
1
0
Fork 0
mirror of https://github.com/bitcoin/bips.git synced 2025-02-24 15:36:53 +01:00
Code Issues Projects Releases Wiki Activity
1242 commits 6 branches 0 tags 39 MiB
Commit graph

1242 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matt David
4d1949d707 Merge pull request #19 from jmacwhyte/proofread 
Added versioning, canceling
 2016-08-30 14:00:34 -07:00
jmacwhyte
ac8a5f4df6 Added versioning, canceling 2016-08-29 17:56:34 -07:00
Matt David
8516e47a5e Merge pull request #18 from jmacwhyte/master 
Added additional pki_type values
 2016-08-29 15:49:17 -07:00
jmacwhyte
c7fdd9d428 Added additional pki_type values 2016-08-29 15:45:44 -07:00
Matt David
6559767e03 - Replace UNKNOWN_TYPE with UNKNOWN_MESSAGE_TYPE 2016-07-28 15:13:32 -07:00
Matt David
f7e08aa1a7 - 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/) 
- 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.
 2016-07-28 09:26:36 -07:00
Matt David
95df420895 Merge remote-tracking branch 'upstream/master' 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2016-07-27 11:01:28 -07:00
Luke-Jr
87cdaa7d2e Merge pull request #425 from ysangkok/master 
BIP-0141: Link to permanent PR of reference implementation
 2016-07-27 17:03:18 +00:00
Luke-Jr
0e3f9df412 Merge pull request #426 from chjj/bip151-aadseq 
BIP151: Clarifications on sequence numbers.
 2016-07-27 17:02:54 +00:00
Christopher Jeffrey
0607a34fcf
bip151: remove aad change. 2016-07-27 00:26:34 -07:00
Christopher Jeffrey
f388fef2f6
BIP151: Clarifications on AAD and sequence numbers. 2016-07-26 23:47:03 -07:00
Janus Troelsen
d49512e612 Link to permanent PR of reference implementation 
analogue to ecfb7ebbca
 2016-07-25 10:05:55 +02:00
Luke Dashjr
2ac0b472da Merge branch 'master' 2016-07-23 20:36:16 +00:00
Luke Dashjr
d8928eb85a BIP 145: Update s/cost/weight/ 2016-07-23 20:35:56 +00:00
Luke-Jr
d0591ebc39 Merge pull request #424 from elias19r/patch-1 
Minor link fix
 2016-07-22 21:01:00 +00:00
Elias Rodrigues
6fb5aaf136 Minor link fix 2016-07-22 14:52:15 -03:00
Luke-Jr
850d103abe Merge pull request #416 from jl2012/patch-26 
BIP141 fix
 2016-07-21 16:13:10 +00:00
Luke-Jr
76e29be5e0 Merge pull request #420 from laanwj/2016_07_bip141_blockmaxweight 
bip141: Change 'block cost' to 'block weight'
 2016-07-21 16:06:51 +00:00
Luke Dashjr
c98859fe20 Promote Draft->Final BIPs: 68, 112, and 113 
Softforks are deployed by miners and enforced on the network
 2016-07-18 23:37:42 +00:00
Luke-Jr
fdf2772ce8 Merge pull request #421 from Sjors/patch-1 
BIP 39: remove "public beta" from blockchain.info link
 2016-07-18 23:22:44 +00:00
Sjors Provoost
34be169fe3 BIP 39: remove "public beta" from blockchain.info link 
This is now in the default wallet.
 2016-07-18 20:43:23 +02:00
jl2012
55c3d8068a BIP141 terms fix 2016-07-19 00:15:38 +08:00
Luke Dashjr
a53cf50b52 Merge remote-tracking branch 'origin-pull/336/head' 2016-07-18 15:29:09 +00:00
Wladimir J. van der Laan
83596de8ca bip141: Change 'block cost' to 'block weight' 
The term 'block cost' led to confusion about the unit that it is
expressed in, in that it expressed monetary cost. Change it to a more
general term 'block weight'.

This was discussed in the [2016-07-14 Bitcoin Core developer meeting](http://www.erisian.com.au/meetbot/bitcoin-core-dev/2016/bitcoin-core-dev.2016-07-14-19.00.html).
 2016-07-18 08:17:00 +02:00
Luke-Jr
ab32c2a845 Merge pull request #358 from bushidowallet/tech-wiki-change 
Proposed a new Java implementation link
 2016-07-16 00:37:45 +00:00
Luke-Jr
f42ca5953b Merge pull request #399 from jl2012/patch-22 
BIP141 script failure clarifications
 2016-07-16 00:00:31 +00:00
Luke Dashjr
f275a5549b Merge remote-tracking branch 'origin-pull/335/head' 2016-07-15 15:44:54 +00:00
Luke-Jr
0884f727a8 Merge pull request #308 from dcousens/patch-2 
Add BIP21 Javascript library
 2016-07-15 15:37:20 +00:00
Luke-Jr
2c84b48778 Merge pull request #325 from afk11/323-fix-typo 
Typo in change to BIP50
 2016-07-15 15:36:59 +00:00
Luke-Jr
98b7976928 Merge pull request #418 from jonasschnelli/2016/07/bip151_hkdf 
[BIP151] Switch from plain HMAC_SHA512 KDF to HKDF
 2016-07-15 15:01:19 +00:00
Luke-Jr
c0796a30d3 Merge pull request #417 from dcousens/patch-1 
bip141: clarify that marker is 1 byte
 2016-07-15 15:00:49 +00:00
Luke Dashjr
6394087857 Merge BIP 126: Best Practices for Heterogeneous Input Script Transactions 2016-07-15 14:54:15 +00:00
Luke Dashjr
f5a708d434 Update README for BIP 126 2016-07-15 14:53:44 +00:00
Jonas Schnelli
529c7cddb7
[BIP151] Switch from plain HMAC_SHA512 KDF to HKDF 2016-07-13 13:18:52 +02:00
Daniel Cousens
9c7fde09aa bip141: clarify that marker is 1 byte 2016-07-12 12:15:35 +10:00
Wladimir J. van der Laan
5ddea46bce Merge pull request #400 from mappum/update-bip9-assignments 
Update BIP9 assignments list
 2016-07-11 12:48:47 +02:00
Kristov Atlas
da43de2dba Merge pull request #4 from dcousens/patch-1 
BIP126: Grammar fix and review
 2016-07-06 20:46:38 -04:00
Matt David
cd9d2d37b5 Merge remote-tracking branch 'upstream/master' 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2016-07-06 14:08:55 -07:00
Luke-Jr
ad2af69d3c Merge pull request #415 from jl2012/bip68_113_coinbase 
BIP68/113 for generation transaction
 2016-07-06 01:02:49 +00:00
jl2012
8d40b6ef02 BIP68/113 for generation transaction 2016-07-06 01:53:05 +08:00
Matt Bell
95947c5d77 Added CSV mainnet activation to BIP9 assignments list 2016-07-05 09:43:34 -07:00
Luke-Jr
e36b6d5634 Merge pull request #414 from btcdrak/patch-8 
BIP 152: Link to permanent PR of reference implementation
 2016-06-30 17:03:14 +00:00
฿tcDrak
ecfb7ebbca Link to permanent PR of reference implementation 2016-06-28 22:42:20 +01:00
Kristov Atlas
f048678277 Merge pull request #5 from justusranvier/bip126 
revise wording of alternate HIT procedure
 2016-06-27 15:04:31 -04:00
Luke-Jr
eab92a156e Merge pull request #411 from jl2012/bip112_114_fix 
BIP112/114 example fix
 2016-06-24 12:36:50 +00:00
jl2012
7478ee3260 BIP112/114 example fix 2016-06-24 01:59:25 +08:00
Justus Ranvier
b33ca0c97b
revise wording of alternate HIT procedure 2016-06-23 09:52:16 -05:00
Daniel Cousens
f51a8e1d0e further grammar, not An Hit 2016-06-23 13:42:03 +10:00
Daniel Cousens
05e96d2500 grammar fix 2016-06-23 13:30:24 +10:00
Luke-Jr
ae70f3ec69 Merge pull request #409 from NicolasDorier/master 
header message can also get replied by getdata (CMPCT_BLOCK)
 2016-06-23 03:13:34 +00:00