summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-08-30Merge pull request #19 from jmacwhyte/proofreadMatt David
Added versioning, canceling
2016-08-29Added versioning, cancelingjmacwhyte
2016-08-29Merge pull request #18 from jmacwhyte/masterMatt David
Added additional pki_type values
2016-08-29Added additional pki_type valuesjmacwhyte
2016-07-28- Replace UNKNOWN_TYPE with UNKNOWN_MESSAGE_TYPEMatt David
2016-07-28- Add UNKNOWN_TYPE to ProtocolMessageType enum in paymentrequest.proto and ↵Matt David
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-27Merge remote-tracking branch 'upstream/master'Matt David
# 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-27Merge pull request #425 from ysangkok/masterLuke-Jr
BIP-0141: Link to permanent PR of reference implementation
2016-07-27Merge pull request #426 from chjj/bip151-aadseqLuke-Jr
BIP151: Clarifications on sequence numbers.
2016-07-27bip151: remove aad change.Christopher Jeffrey
2016-07-26BIP151: Clarifications on AAD and sequence numbers.Christopher Jeffrey
2016-07-25Link to permanent PR of reference implementationJanus Troelsen
analogue to https://github.com/bitcoin/bips/commit/ecfb7ebbca3488cd4c1e11210cbc5914a9228c67
2016-07-23Merge branch 'master'Luke Dashjr
2016-07-23BIP 145: Update s/cost/weight/Luke Dashjr
2016-07-22Merge pull request #424 from elias19r/patch-1Luke-Jr
Minor link fix
2016-07-22Minor link fixElias Rodrigues
2016-07-21Merge pull request #416 from jl2012/patch-26Luke-Jr
BIP141 fix
2016-07-21Merge pull request #420 from laanwj/2016_07_bip141_blockmaxweightLuke-Jr
bip141: Change 'block cost' to 'block weight'
2016-07-18Promote Draft->Final BIPs: 68, 112, and 113Luke Dashjr
Softforks are deployed by miners and enforced on the network
2016-07-18Merge pull request #421 from Sjors/patch-1Luke-Jr
BIP 39: remove "public beta" from blockchain.info link
2016-07-18BIP 39: remove "public beta" from blockchain.info linkSjors Provoost
This is now in the default wallet.
2016-07-19BIP141 terms fixjl2012
2016-07-18Merge remote-tracking branch 'origin-pull/336/head'Luke Dashjr
2016-07-18bip141: Change 'block cost' to 'block weight'Wladimir J. van der Laan
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-16Merge pull request #358 from bushidowallet/tech-wiki-changeLuke-Jr
Proposed a new Java implementation link
2016-07-16Merge pull request #399 from jl2012/patch-22Luke-Jr
BIP141 script failure clarifications
2016-07-15Merge remote-tracking branch 'origin-pull/335/head'Luke Dashjr
2016-07-15Merge pull request #308 from dcousens/patch-2Luke-Jr
Add BIP21 Javascript library
2016-07-15Merge pull request #325 from afk11/323-fix-typoLuke-Jr
Typo in change to BIP50
2016-07-15Merge pull request #418 from jonasschnelli/2016/07/bip151_hkdfLuke-Jr
[BIP151] Switch from plain HMAC_SHA512 KDF to HKDF
2016-07-15Merge pull request #417 from dcousens/patch-1Luke-Jr
bip141: clarify that marker is 1 byte
2016-07-15Merge BIP 126: Best Practices for Heterogeneous Input Script TransactionsLuke Dashjr
2016-07-15Update README for BIP 126Luke Dashjr
2016-07-13[BIP151] Switch from plain HMAC_SHA512 KDF to HKDFJonas Schnelli
2016-07-12bip141: clarify that marker is 1 byteDaniel Cousens
2016-07-11Merge pull request #400 from mappum/update-bip9-assignmentsWladimir J. van der Laan
Update BIP9 assignments list
2016-07-06Merge pull request #4 from dcousens/patch-1Kristov Atlas
BIP126: Grammar fix and review
2016-07-06Merge remote-tracking branch 'upstream/master'Matt David
# 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-06Merge pull request #415 from jl2012/bip68_113_coinbaseLuke-Jr
BIP68/113 for generation transaction
2016-07-06BIP68/113 for generation transactionjl2012
2016-07-05Added CSV mainnet activation to BIP9 assignments listMatt Bell
2016-06-30Merge pull request #414 from btcdrak/patch-8Luke-Jr
BIP 152: Link to permanent PR of reference implementation
2016-06-28Link to permanent PR of reference implementation฿tcDrak
2016-06-27Merge pull request #5 from justusranvier/bip126Kristov Atlas
revise wording of alternate HIT procedure
2016-06-24Merge pull request #411 from jl2012/bip112_114_fixLuke-Jr
BIP112/114 example fix
2016-06-24BIP112/114 example fixjl2012
2016-06-23revise wording of alternate HIT procedureJustus Ranvier
2016-06-23further grammar, not An HitDaniel Cousens
2016-06-23grammar fixDaniel Cousens
2016-06-23Merge pull request #409 from NicolasDorier/masterLuke-Jr
header message can also get replied by getdata (CMPCT_BLOCK)