From d6f5619870e340e3403797f8fcee72a5b1421d2e Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Thu, 12 Nov 2015 09:16:45 -0500 Subject: [PATCH 01/33] Full Node: Add configuration tuning section --- en/full-node.md | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/en/full-node.md b/en/full-node.md index 9d988d23..e779a817 100644 --- a/en/full-node.md +++ b/en/full-node.md @@ -1396,5 +1396,46 @@ ask for help on sites like [SuperUser](http://superuser.com). We can't provide direct support, but if you see a way to improve these instructions, please [open an issue.](https://github.com/bitcoin-dot-org/bitcoin.org/issues/new) +## Configuration Tuning + +This section contains advice about how to change your Bitcoin Core +configuration to adapt it to your needs. + +There are two ways to change your configuration. The first is to start +Bitcoin Core with the options you want. For example, if you want to +limit it to using one CPU core for signature verification, you can start +Bitcoin Core like this: + +{% highlight bash %} +## Bitcoin Core daemon +bitcoind -par=1 -daemon + +## Bitcoin Core GUI +bitcoin-qt -par=1 +{% endhighlight %} + +Once you've decided you like an option, you can add it to the Bitcoin +Core configuration file. You can find that file in the following +directories: + +- Windows: %APPDATA%\Bitcoin\ + +- OSX: $HOME/Library/Application Support/Bitcoin/ + +- Linux: $HOME/.bitcoin/ + +To add an option to the configuration file, just remove its leading +dash. You may also need to remove any quotation marks you used in your shell. +For example, the `-par` option seen above would look like this in the +configuration file: + +{% highlight text %} +par=1 +{% endhighlight %} + +If you have any questions about configuring Bitcoin Core, please stop by +one of our [forums](/en/bitcoin-core/help#forums) or [live +chatrooms](/en/bitcoin-core/help#live). + From 012873deada40465926a6e974056e123db670f43 Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Thu, 12 Nov 2015 09:19:18 -0500 Subject: [PATCH 02/33] Full node: reduce traffic configuration options Closes #1131 --- en/full-node.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/en/full-node.md b/en/full-node.md index e779a817..f30e1973 100644 --- a/en/full-node.md +++ b/en/full-node.md @@ -1437,5 +1437,52 @@ If you have any questions about configuring Bitcoin Core, please stop by one of our [forums](/en/bitcoin-core/help#forums) or [live chatrooms](/en/bitcoin-core/help#live). +### Reduce Traffic + +Some node operators need to deal with bandwith caps imposed by their ISPs. + +By default, bitcoin-core allows up to 125 connections to different peers, 8 of +which are outbound. You can therefore, have at most 117 inbound connections. + +The default settings can result in relatively significant traffic consumption. + +Ways to reduce traffic: + +#### Maximum Upload Targets + +{% highlight text %} +-maxuploadtarget= +{% endhighlight %} + +A major component of the traffic is caused by serving historic blocks to other nodes +during the initial blocks download phase (syncing up a new node). +This option can be specified in MiB per day and is turned off by default. +This is *not* a hard limit; only a threshold to minimize the outbound +traffic. When the limit is about to be reached, the uploaded data is cut by no +longer serving historic blocks (blocks older than one week). +Keep in mind that new nodes require other nodes that are willing to serve +historic blocks. **The recommended minimum is 144 blocks per day (max. 144MB +per day)** + +#### Disable listening + +{% highlight text %} +-listen=0 +{% endhighlight %} + +Disabling listening will result in fewer nodes connected (remember the maximum of 8 +outbound peers). Fewer nodes will result in less traffic usage as you are relaying +blocks and transactions to fewer nodes. + +#### Reduce maximum connections + +{% highlight text %} +-maxconnections= +{% endhighlight %} + +Reducing the maximum connected nodes to a miniumum could be desirable if traffic +limits are tiny. Keep in mind that bitcoin's trustless model works best if you are +connected to a handful of nodes. + From a3e5091e9ae00dd57a5134c5aa58487386d6cde0 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Thu, 12 Nov 2015 21:07:50 -0500 Subject: [PATCH 03/33] Release: Bitcoin Core 0.11.2 --- _releases/0.11.2.md | 248 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 248 insertions(+) create mode 100644 _releases/0.11.2.md diff --git a/_releases/0.11.2.md b/_releases/0.11.2.md new file mode 100644 index 00000000..0d96ff42 --- /dev/null +++ b/_releases/0.11.2.md @@ -0,0 +1,248 @@ +--- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. +# Text originally from Bitcoin Core project +# Metadata and small formatting changes from Bitcoin.org project + +## Required value below populates the %v variable (note: % needs to be escaped in YAML if it starts a value) +required_version: 0.11.2 +## Optional release date. May be filled in hours/days after a release +#optional_date: 2015-11-12 +## Optional title. If not set, default is: Bitcoin Core version %v released +optional_title: Bitcoin Core version %v released +## Optional magnet link. To get it, open the torrent in a good BitTorrent client +## and View Details, or install the transmission-cli Debian/Ubuntu package +## and run: transmission-show -m +# +## Link should be enclosed in quotes and start with: "magnet:? +#optional_magnetlink: "magnet:?xt=urn:btih:c6dd5f10efd99d9129869bb5fbf9cc53fc07cefa&dn=bitcoin-core-0.11.1&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.publicbt.com%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.ccc.de%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337&ws=https%3A%2F%2Fbitcoin.org%2Fbin%2F" + +## The --- below ends the YAML header. After that, paste the release notes. +## Warning: this site's Markdown parser commonly requires you make two +## changes to the release notes from the Bitcoin Core source tree: +## +## 1. Make sure both ordered and unordered lists are preceeded by an empty +## (whitespace only) line, like the empty line before this list item. +## +## 2. Place URLs inside angle brackets, like + +--- +{% githubify https://github.com/bitcoin/bitcoin %} +Bitcoin Core version 0.11.2 is now available from: + + + +This is a new minor version release, bringing bug fixes, the BIP65 +(CLTV) consensus change, and relay policy preparation for BIP113. It is +recommended to upgrade to this version as soon as possible. + +Please report bugs using the issue tracker at github: + + + +Upgrading and downgrading +========================= + +How to Upgrade +-------------- + +If you are running an older version, shut it down. Wait until it has completely +shut down (which might take a few minutes for older versions), then run the +installer (on Windows) or just copy over /Applications/Bitcoin-Qt (on Mac) or +bitcoind/bitcoin-qt (on Linux). + +Downgrade warning +------------------ + +Because release 0.10.0 and later makes use of headers-first synchronization and +parallel block download (see further), the block files and databases are not +backwards-compatible with pre-0.10 versions of Bitcoin Core or other software: + +* Blocks will be stored on disk out of order (in the order they are +received, really), which makes it incompatible with some tools or +other programs. Reindexing using earlier versions will also not work +anymore as a result of this. + +* The block index database will now hold headers for which no block is +stored on disk, which earlier versions won't support. + +If you want to be able to downgrade smoothly, make a backup of your entire data +directory. Without this your node will need start syncing (or importing from +bootstrap.dat) anew afterwards. It is possible that the data from a completely +synchronised 0.10 node may be usable in older versions as-is, but this is not +supported and may break as soon as the older version attempts to reindex. + +This does not affect wallet forward or backward compatibility. There are no +known problems when downgrading from 0.11.x to 0.10.x. + +Notable changes since 0.11.1 +============================ + +BIP65 soft fork to enforce OP_CHECKLOCKTIMEVERIFY opcode +-------------------------------------------------------- + +This release includes several changes related to the [BIP65][] soft fork +which redefines the existing OP_NOP2 opcode as OP_CHECKLOCKTIMEVERIFY +(CLTV) so that a transaction output can be made unspendable until a +specified point in the future. + +1. This release will only relay and mine transactions spending a CLTV + output if they comply with the BIP65 rules as provided in code. + +2. This release will produce version 4 blocks by default. Please see the + *notice to miners* below. + +3. Once 951 out of a sequence of 1,001 blocks on the local node's best block + chain contain version 4 (or higher) blocks, this release will no + longer accept new version 3 blocks and it will only accept version 4 + blocks if they comply with the BIP65 rules for CLTV. + +For more information about the soft-forking change, please see + + +Graphs showing the progress towards block version 4 adoption may be +found at the URLs below: + +- Block versions over the last 50,000 blocks as progress towards BIP65 + consensus enforcement: + +- Block versions over the last 2,000 blocks showing the days to the + earliest possible BIP65 consensus-enforced block: + +**Notice to miners:** Bitcoin Core’s block templates are now for +version 4 blocks only, and any mining software relying on its +getblocktemplate must be updated in parallel to use libblkmaker either +version 0.4.3 or any version from 0.5.2 onward. + +- If you are solo mining, this will affect you the moment you upgrade + Bitcoin Core, which must be done prior to BIP65 achieving its 951/1001 + status. + +- If you are mining with the stratum mining protocol: this does not + affect you. + +- If you are mining with the getblocktemplate protocol to a pool: this + will affect you at the pool operator’s discretion, which must be no + later than BIP65 achieving its 951/1001 status. + +[BIP65]: https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki + +BIP113 mempool-only locktime enforcement using GetMedianTimePast() +---------------------------------------------------------------- + +Bitcoin transactions currently may specify a locktime indicating when +they may be added to a valid block. Current consensus rules require +that blocks have a block header time greater than the locktime specified +in any transaction in that block. + +Miners get to choose what time they use for their header time, with the +consensus rule being that no node will accept a block whose time is more +than two hours in the future. This creates a incentive for miners to +set their header times to future values in order to include locktimed +transactions which weren't supposed to be included for up to two more +hours. + +The consensus rules also specify that valid blocks may have a header +time greater than that of the median of the 11 previous blocks. This +GetMedianTimePast() time has a key feature we generally associate with +time: it can't go backwards. + +[BIP113][] specifies a soft fork (**not enforced in this release**) that +weakens this perverse incentive for individual miners to use a future +time by requiring that valid blocks have a computed GetMedianTimePast() +greater than the locktime specified in any transaction in that block. + +Mempool inclusion rules currently require transactions to be valid for +immediate inclusion in a block in order to be accepted into the mempool. +This release begins applying the BIP113 rule to received transactions, +so transaction whose time is greater than the GetMedianTimePast() will +no longer be accepted into the mempool. + +**Implication for miners:** you will begin rejecting transactions that +would not be valid under BIP113, which will prevent you from producing +invalid blocks if/when BIP113 is enforced on the network. Any +transactions which are valid under the current rules but not yet valid +under the BIP113 rules will either be mined by other miners or delayed +until they are valid under BIP113. Note, however, that time-based +locktime transactions are more or less unseen on the network currently. + +**Implication for users:** GetMedianTimePast() always trails behind the +current time, so a transaction locktime set to the present time will be +rejected by nodes running this release until the median time moves +forward. To compensate, subtract one hour (3,600 seconds) from your +locktimes to allow those transactions to be included in mempools at +approximately the expected time. + +[BIP113]: https://github.com/bitcoin/bips/blob/master/bip-0113.mediawiki + +Windows bug fix for corrupted UTXO database on unclean shutdowns +---------------------------------------------------------------- + +Several Windows users reported that they often need to reindex the +entire blockchain after an unclean shutdown of Bitcoin Core on Windows +(or an unclean shutdown of Windows itself). Although unclean shutdowns +remain unsafe, this release no longer relies on memory-mapped files for +the UTXO database, which significantly reduced the frequency of unclean +shutdowns leading to required reindexes during testing. + +For more information, see: + +Other fixes for database corruption on Windows are expected in the +next major release. + +0.11.2 Change log +================= + +Detailed release notes follow. This overview includes changes that affect +behavior, not code moves, refactors and string updates. For convenience in locating +the code changes and accompanying discussion, both the pull request and +git merge commit are mentioned. + +- #6124 `684636b` Make CScriptNum() take nMaxNumSize as an argument +- #6124 `4fa7a04` Replace NOP2 with CHECKLOCKTIMEVERIFY (BIP65) +- #6124 `6ea5ca4` Enable CHECKLOCKTIMEVERIFY as a standard script verify flag +- #6351 `5e82e1c` Add CHECKLOCKTIMEVERIFY (BIP65) soft-fork logic +- #6353 `ba1da90` Show softfork status in getblockchaininfo +- #6351 `6af25b0` Add BIP65 to getblockchaininfo softforks list +- #6688 `01878c9` Fix locking in GetTransaction +- #6653 `b3eaa30` [Qt] Raise debug window when requested +- #6600 `1e672ae` Debian/Ubuntu: Include bitcoin-tx binary +- #6600 `2394f4d` Debian/Ubuntu: Split bitcoin-tx into its own package +- #5987 `33d6825` Bugfix: Allow mining on top of old tip blocks for testnet +- #6852 `21e58b8` build: make sure OpenSSL heeds noexecstack +- #6846 `af6edac` alias `-h` for `--help` +- #6867 `95a5039` Set TCP_NODELAY on P2P sockets. +- #6856 `dfe55bd` Do not allow blockfile pruning during reindex. +- #6566 `a1d3c6f` Add rules--presently disabled--for using GetMedianTimePast as end point for lock-time calculations +- #6566 `f720c5f` Enable policy enforcing GetMedianTimePast as the end point of lock-time constraints +- #6917 `0af5b8e` leveldb: Win32WritableFile without memory mapping +- #6948 `4e895b0` Always flush block and undo when switching to new file + +Credits +======= + +Thanks to everyone who directly contributed to this release: + +- Alex Morcos +- ฿tcDrak +- Chris Kleeschulte +- Daniel Cousens +- Diego Viola +- Eric Lombrozo +- Esteban Ordano +- Gregory Maxwell +- Luke Dashjr +- Marco Falke +- Mark Friedenbach +- Matt Corallo +- Micha +- Mitchell Cash +- Peter Todd +- Pieter Wuille +- Wladimir J. van der Laan +- Zak Wilcox + +And those who contributed additional code review and/or security research. + +As well as everyone that helped translating on [Transifex](https://www.transifex.com/projects/p/bitcoin/). +{% endgithubify %} From eb5036d4de49ad7629bbe19f7b30aec5e9f763d6 Mon Sep 17 00:00:00 2001 From: Will Binns Date: Thu, 12 Nov 2015 20:35:31 -0600 Subject: [PATCH 04/33] _templates/about-us.html: Update GitHub username This updates the about page with a change to my user name. --- _templates/about-us.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_templates/about-us.html b/_templates/about-us.html index 49fd7879..1dc49182 100644 --- a/_templates/about-us.html +++ b/_templates/about-us.html @@ -54,7 +54,7 @@ id: about-us

{% translate translation %}

-

Will BinnsTranslation coordination

+

Will BinnsTranslation coordination

Ar ViccoRussian

Simon Alexander HinterreiterGerman

Jacob BurenstamSwedish

From b412b8cce01f558cf0822a10627a31f6bc46220f Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Fri, 13 Nov 2015 13:12:11 +0100 Subject: [PATCH 05/33] Add magnet link --- _releases/0.11.2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_releases/0.11.2.md b/_releases/0.11.2.md index 0d96ff42..06ea04a4 100644 --- a/_releases/0.11.2.md +++ b/_releases/0.11.2.md @@ -15,7 +15,7 @@ optional_title: Bitcoin Core version %v released ## and run: transmission-show -m # ## Link should be enclosed in quotes and start with: "magnet:? -#optional_magnetlink: "magnet:?xt=urn:btih:c6dd5f10efd99d9129869bb5fbf9cc53fc07cefa&dn=bitcoin-core-0.11.1&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.publicbt.com%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.ccc.de%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337&ws=https%3A%2F%2Fbitcoin.org%2Fbin%2F" +optional_magnetlink: "magnet:?xt=urn:btih:d6d3387160f7e14f6f27dc40ae84cf566ebf631b&dn=bitcoin-core-0.11.2&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.publicbt.com%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.ccc.de%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Fopen.demonii.com%3A1337&ws=https%3A%2F%2Fbitcoin.org%2Fbin%2F" ## The --- below ends the YAML header. After that, paste the release notes. ## Warning: this site's Markdown parser commonly requires you make two From 7cd960baf486f52924e08c4a7d3eb65ecb356a6d Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Fri, 13 Nov 2015 13:13:58 +0100 Subject: [PATCH 06/33] Fill in release date --- _releases/0.11.2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_releases/0.11.2.md b/_releases/0.11.2.md index 06ea04a4..52b05529 100644 --- a/_releases/0.11.2.md +++ b/_releases/0.11.2.md @@ -7,7 +7,7 @@ ## Required value below populates the %v variable (note: % needs to be escaped in YAML if it starts a value) required_version: 0.11.2 ## Optional release date. May be filled in hours/days after a release -#optional_date: 2015-11-12 +optional_date: 2015-11-13 ## Optional title. If not set, default is: Bitcoin Core version %v released optional_title: Bitcoin Core version %v released ## Optional magnet link. To get it, open the torrent in a good BitTorrent client From c8cf91fe76561fbbdff4702ffb58621e340416ff Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Fri, 13 Nov 2015 15:12:08 +0100 Subject: [PATCH 07/33] add jonasschnellis PGP key to core commiters list --- _includes/bitcoin-core/core-committers.html | 1 + jonasschnelli.asc | 63 +++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 jonasschnelli.asc diff --git a/_includes/bitcoin-core/core-committers.html b/_includes/bitcoin-core/core-committers.html index 528874df..bd13124c 100644 --- a/_includes/bitcoin-core/core-committers.html +++ b/_includes/bitcoin-core/core-committers.html @@ -9,4 +9,5 @@ http://opensource.org/licenses/MIT.
Gregory Maxwell
+
diff --git a/jonasschnelli.asc b/jonasschnelli.asc new file mode 100644 index 00000000..e7048ec4 --- /dev/null +++ b/jonasschnelli.asc @@ -0,0 +1,63 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +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 +=xtTA +-----END PGP PUBLIC KEY BLOCK----- From 586528defe2c3524911d2aa9f9e74ddf7d747ad3 Mon Sep 17 00:00:00 2001 From: instagibbs Date: Tue, 8 Sep 2015 15:44:17 -0400 Subject: [PATCH 08/33] Added greenbits --- _templates/choose-your-wallet.html | 23 +++++++++++++++++++++++ _translations/en.yml | 1 + img/wallet/greenbits.png | Bin 0 -> 11718 bytes 3 files changed, 24 insertions(+) create mode 100644 img/wallet/greenbits.png diff --git a/_templates/choose-your-wallet.html b/_templates/choose-your-wallet.html index 8e67901c..bdc88c78 100755 --- a/_templates/choose-your-wallet.html +++ b/_templates/choose-your-wallet.html @@ -445,6 +445,29 @@ wallets: privacyaddressreuse: "checkfailprivacyaddressrotation" privacydisclosure: "checkfailprivacydisclosurespv" privacynetwork: "checkfailprivacynetworknosupporttor" +- greenbits: + title: "GreenBits" + titleshort: "GreenBits" + compat: "mobile android" + level: 2 + platform: + mobile: + text: "walletgreenbits" + link: "https://play.google.com/store/apps/details?id=com.greenaddress.greenbits_android_wallet" + source: "https://github.com/greenaddress/GreenBits" + screenshot: "greenbits.png" + os: + - android + check: + control: "checkpasscontrolmulti" + validation: "checkpassvalidationspvp2p" + transparency: "checkpasstransparencyopensource" + environment: "checkpassenvironmenttwofactor" + privacy: "checkpassprivacybasic" + privacycheck: + privacyaddressreuse: "checkpassprivacyaddressrotation" + privacydisclosure: "checkfailprivacydisclosureaccount" + privacynetwork: "checkfailprivacynetworknosupporttor" - mycelium: title: "Mycelium" titleshort: "Mycelium" diff --git a/_translations/en.yml b/_translations/en.yml index e64e8349..0c628b6a 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -190,6 +190,7 @@ en: walletninki: "An advanced wallet for experienced Bitcoin users. Ninki is a multi-signature wallet with a beautiful user interface. You have full control of your bitcoins at all times." walletbither: "Bither is a simple and secure wallet on many platforms. With special designed Cold/Hot modes, user can easily get both safety and simplicity. Bither's XRANDOM uses different entropy sources to generate true random number for users. Also with HDM, users can have HD's advantages and Multisig's security." walletcoinapult: "Coinapult's wallet is designed with Bitcoin newcomers in mind. It allows sending bitcoins via email and SMS, and a handy tool called Locks helps protecting your balance from Bitcoin price swings. Users can Lock bitcoins to Gold, Euros, and more!" + walletgreenbits: "GreenBits is a fast and easy to use wallet. Enjoy improved security with a minimal/zero trust approach, optional hardware wallets support, multisignature based 2FA and spending limits functionality." walletcoinomi: "Coinomi is a lightweight, secure, open-source, universal, HD Wallet. Apart from Bitcoin it also supports many altcoins so you can keep all your funds in a single wallet. Your private keys never leave your device and you only need to back it up just once!" walletdownload: "Install" walletvisit: "Visit website" diff --git a/img/wallet/greenbits.png b/img/wallet/greenbits.png new file mode 100644 index 0000000000000000000000000000000000000000..2a1f20acbe22dae8a8241ff6c43c514a2d283bb4 GIT binary patch literal 11718 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 literal 0 HcmV?d00001 From e58f05d7fcef310db1303d761858f67e139d01a1 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Thu, 26 Nov 2015 15:57:36 -0500 Subject: [PATCH 09/33] Events: update multiple events - Closes #1146 -- Bitcoin Wednesday Conference (Amsterdam, NL) --- _events.yml | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/_events.yml b/_events.yml index a3fad753..80cf1820 100644 --- a/_events.yml +++ b/_events.yml @@ -1,27 +1,3 @@ -- date: 2015-11-12 - title: "The Future of Money: Cashing out on Cash" - venue: "Thomson Reuters" - address: "3 Times Square" - city: "New York" - country: "USA" - link: "http://rsvp.thomsonreuters.com/node/839" - -- date: 2015-11-20 - title: "Practical workshop" - venue: "Las Naves" - address: "Joan Verdeguer 16" - city: "Valencia" - country: "Spain" - link: "http://avalbit.org/actividades/taller-practico-bitcoin/" - -- date: 2015-11-24 - title: "ADCCA Fintech Summit" - venue: "The Westin Sydney" - address: "1 Martin Place" - city: "Sydney" - country: "Australia" - link: "http://www.adccasummit.com/" - - date: 2015-12-03 title: "Moneylab#2 Economies of Dissent" venue: "Pakhuis De Zwijger" @@ -31,9 +7,9 @@ link: "http://networkcultures.org/moneylab/" - date: 2015-12-02 - title: "Bitcoin Wednesday Conference" - venue: "De Balie" - address: "Leidseplein, Kleine-Gartmanplantsoen 10" + title: "The Bitcoin Film Festival: Bitcoin Wednesday Conference" + venue: "Melkweg" + address: "Leidseplein, Lijnbaansgracht 234a" city: "Amsterdam" country: "The Netherlands" link: "http://www.bitcoinwednesday.com/event/bitcoin-wednesday-30/" @@ -78,6 +54,14 @@ country: "United States" link: "http://insidebitcoins.com/san-diego/2015?utm_source=bitcoinorg&utm_medium=eventlisting&utm_campaign=bitcoinorgeventlistingibsd" +- date: 2016-01-06 + title: "Bitcoin Wednesday Conference" + venue: "Melkweg" + address: "Leidseplein, Lijnbaansgracht 234a" + city: "Amsterdam" + country: "The Netherlands" + link: "http://www.bitcoinwednesday.com/event/bitcoin-wednesday-31/" + - date: 2016-01-21 title: "The North American Bitcoin Conference" venue: "James L Knight Center" From 79e8fb50e7b2724407e5966c80ec7e5918968f34 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Mon, 7 Dec 2015 19:49:33 -0500 Subject: [PATCH 10/33] Dev Docs: document sendheaders P2P message Closes #1153 --- _autocrossref.yaml | 3 + _includes/devdoc/ref_p2p_networking.md | 14 ++++ _includes/references.md | 2 + img/dev/en-p2p-control-messages.dot | 1 + img/dev/en-p2p-control-messages.png | Bin 5425 -> 4863 bytes img/dev/en-p2p-control-messages.svg | 107 +++++++++++++------------ 6 files changed, 76 insertions(+), 51 deletions(-) diff --git a/_autocrossref.yaml b/_autocrossref.yaml index 494d7ded..59f52d02 100644 --- a/_autocrossref.yaml +++ b/_autocrossref.yaml @@ -309,6 +309,9 @@ CVE-2012-2459: '`ping` RPC': rpc ping '`sendfrom`': rpc sendfrom '`sendfrom` RPC': rpc sendfrom +'`sendheaders`': sendheaders message +'`sendheaders` message': sendheaders message +'`sendheaders` messages': sendheaders message '`sendmany`': rpc sendmany '`sendmany` RPC': rpc sendmany '`sendrawtransaction`': rpc sendrawtransaction diff --git a/_includes/devdoc/ref_p2p_networking.md b/_includes/devdoc/ref_p2p_networking.md index dfe1eb44..b743baa2 100644 --- a/_includes/devdoc/ref_p2p_networking.md +++ b/_includes/devdoc/ref_p2p_networking.md @@ -68,6 +68,7 @@ As of Bitcoin Core 0.11.0, the most recent protocol version is 70002. | Version | Initial Release | Major Changes |---------|------------------------------------|-------------- +| 70012 | Bitcoin Core 0.12.0
(Not released yet) | [BIP130][]:
• Added `sendheaders` message | 70002 | Bitcoin Core 0.9.0
(Mar 2014) | • Send multiple `inv` messages in response to a `mempool` message if necessary

[BIP61][]:
• Added `reject` message | 70001 | Bitcoin Core 0.8.0
(Feb 2013) | • Added `notfound` message.

[BIP37][]:
• Added `filterload` message.
• Added `filteradd` message.
• Added `filterclear` message.
• Added `merkleblock` message.
• Added relay field to `version` message
• Added `MSG_FILTERED_BLOCK` inventory type to `getdata` message. | 60002 | Bitcoin Core 0.7.0
(Sep 2012) | [BIP35][]:
• Added `mempool` message.
• Extended `getdata` message to allow download of memory pool transactions @@ -1211,6 +1212,19 @@ header has been omitted.) {% endautocrossref %} +#### SendHeaders +{% include helpers/subhead-links.md %} + +{% autocrossref %} + +The `sendheaders` message tells the receiving peer to send new block +announcements using a `headers` message rather than an `inv` message. + +There is no payload in a `sendheaders` message. See the [message header +section][section message header] for an example of a message without a payload. + +{% endautocrossref %} + #### VerAck {% include helpers/subhead-links.md %} diff --git a/_includes/references.md b/_includes/references.md index 528df1d5..78ed320e 100644 --- a/_includes/references.md +++ b/_includes/references.md @@ -175,6 +175,7 @@ http://opensource.org/licenses/MIT. [ping message]: /en/developer-reference#ping "A P2P network message used to see if the remote host is still connected" [pong message]: /en/developer-reference#pong "A P2P network message used to reply to a P2P network ping message" [reject message]: /en/developer-reference#reject "A P2P network message used to indicate a previously-received message was rejected for some reason" +[sendheaders message]: /en/developer-reference#sendheaders "A P2P network message used to request new blocks be announced through headers messages rather than inv messages" [tx message]: /en/developer-reference#tx "A P2P protocol message which sends a single serialized transaction" [verack message]: /en/developer-reference#verack "A P2P network message sent in reply to a version message to confirm a connection has been established" [version message]: /en/developer-reference#version "A P2P network message sent at the begining of a connection to allow protocol version negotiation" @@ -287,6 +288,7 @@ http://opensource.org/licenses/MIT. [BIP70]: https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki [BIP71]: https://github.com/bitcoin/bips/blob/master/bip-0071.mediawiki [BIP72]: https://github.com/bitcoin/bips/blob/master/bip-0072.mediawiki +[BIP130]: https://github.com/bitcoin/bips/blob/master/bip-0130.mediawiki [CVE-2012-2459]: https://en.bitcoin.it/wiki/CVEs#CVE-2012-2459 [RFC5737]: http://tools.ietf.org/html/rfc5737 [secp256k1]: http://www.secg.org/sec2-v2.pdf diff --git a/img/dev/en-p2p-control-messages.dot b/img/dev/en-p2p-control-messages.dot index 0591c062..ddb35231 100644 --- a/img/dev/en-p2p-control-messages.dot +++ b/img/dev/en-p2p-control-messages.dot @@ -17,6 +17,7 @@ getaddr -> addr; filterload -> filteradd; filterload -> filterclear; alert; +sendheaders; ERROR [ style = "invis" ]; ERROR -> reject [ style = "invis" ]; diff --git a/img/dev/en-p2p-control-messages.png b/img/dev/en-p2p-control-messages.png index 16ece34d323fbb997d6dc70a2ac6af0b9523ed1b..f9b69d2c7425f24ad69b33c0a6d52dd27196b935 100644 GIT binary patch literal 4863 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 W*_doM!K$|}dw>Q^N2N*$5&mB`MJ_V{ literal 5425 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 diff --git a/img/dev/en-p2p-control-messages.svg b/img/dev/en-p2p-control-messages.svg index 22ebf677..eab70122 100644 --- a/img/dev/en-p2p-control-messages.svg +++ b/img/dev/en-p2p-control-messages.svg @@ -1,91 +1,96 @@ - - - - -_anonymous_0 - - -Overview Of P2P Protocol Control And Advisory Messages + + + +%3 + + +Overview Of P2P Protocol Control And Advisory Messages version - -version + +version -verack - -verack +verack + +verack -version->verack - +version->verack + -ping - -ping +ping + +ping -pong - -pong +pong + +pong -ping->pong - +ping->pong + -getaddr - -getaddr +getaddr + +getaddr -addr - -addr +addr + +addr -getaddr->addr - +getaddr->addr + -filterload - -filterload +filterload + +filterload -filteradd - -filteradd +filteradd + +filteradd -filterload->filteradd - +filterload->filteradd + -filterclear - -filterclear +filterclear + +filterclear -filterload->filterclear - +filterload->filterclear + -alert - -alert +alert + +alert + + +sendheaders + +sendheaders -reject - -reject +reject + +reject From e1358980cc6d2a59a2ee96c53dc1f4cd198d8e5b Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Sat, 19 Dec 2015 23:01:38 -0500 Subject: [PATCH 11/33] Add "Capacity increases" page with initial signatures --- en/bitcoin-core/capacity-increases.md | 28 +++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 en/bitcoin-core/capacity-increases.md diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md new file mode 100644 index 00000000..b728c135 --- /dev/null +++ b/en/bitcoin-core/capacity-increases.md @@ -0,0 +1,28 @@ +--- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + +layout: base-core +lang: en +id: bitcoin-core-capacity-increases +columns: 1 +title: Capacity increases for the Bitcoin system -- Bitcoin Core +breadcrumbs: + - bitcoin + - bcc + - Capacity increases +--- +# Capacity increases for the Bitcoin system + +*[Capacity increases for the Bitcoin system][1]* is a plan I can fully +support. I publicly sign on to this proposal so we can stop +bikeshedding, start implementing, and move forward. + +- [Mark Friedenbach](https://github.com/maaku) +- [David Harding](https://github.com/harding) +- [Pieter Wuille](https://github.com/sipa) + + + + +[1]: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-December/011865.html From 6a1d2601f3123f890bf567c2f62b8e1cf1b313de Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Mon, 21 Dec 2015 09:39:01 -0500 Subject: [PATCH 12/33] Update "Capacity increases" statement --- en/bitcoin-core/capacity-increases.md | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md index b728c135..31ba50cb 100644 --- a/en/bitcoin-core/capacity-increases.md +++ b/en/bitcoin-core/capacity-increases.md @@ -14,15 +14,32 @@ breadcrumbs: --- # Capacity increases for the Bitcoin system +We, the undersigned, support the roadmap in [Capacity increases for the +Bitcoin system.][1] We have been working on +scalability for several years within the Bitcoin Core project and +consider this the best possible continuation of our efforts. + +- [Adam Back](https://github.com/adam3us) +- [Alex Morcos](https://github.com/morcos) +- [BtcDrak](https://github.com/btcdrak) + +{% comment %} +Earlier statement: *[Capacity increases for the Bitcoin system][1]* is a plan I can fully support. I publicly sign on to this proposal so we can stop bikeshedding, start implementing, and move forward. -- [Mark Friedenbach](https://github.com/maaku) -- [David Harding](https://github.com/harding) -- [Pieter Wuille](https://github.com/sipa) - +Signed earlier statement but not (yet) later statement: +- maaku +- sipa +- BlueMatt +- CodeShark +- JonasSchnelli +- wumpus +- kanzure +- greenaddress +{% endcomment %} [1]: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-December/011865.html From abfea84590588c5ad2e607cf8fe1f783ce427b3c Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Mon, 21 Dec 2015 10:18:48 -0500 Subject: [PATCH 13/33] Capacity increases: add signatures --- en/bitcoin-core/capacity-increases.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md index 31ba50cb..727bb7c2 100644 --- a/en/bitcoin-core/capacity-increases.md +++ b/en/bitcoin-core/capacity-increases.md @@ -22,6 +22,8 @@ consider this the best possible continuation of our efforts. - [Adam Back](https://github.com/adam3us) - [Alex Morcos](https://github.com/morcos) - [BtcDrak](https://github.com/btcdrak) +- [Gregory Sanders](https://github.com/instagibbs) +- [Lawrence Nahum](https://github.com/greenaddress) {% comment %} Earlier statement: @@ -37,7 +39,6 @@ Signed earlier statement but not (yet) later statement: - JonasSchnelli - wumpus - kanzure -- greenaddress {% endcomment %} From 6933fbff69df338a2cea72b286d8502309cb9e45 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Mon, 21 Dec 2015 10:41:25 -0500 Subject: [PATCH 14/33] Capacity increases: add signatures [skip ci] --- en/bitcoin-core/capacity-increases.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md index 727bb7c2..db11921f 100644 --- a/en/bitcoin-core/capacity-increases.md +++ b/en/bitcoin-core/capacity-increases.md @@ -21,9 +21,11 @@ consider this the best possible continuation of our efforts. - [Adam Back](https://github.com/adam3us) - [Alex Morcos](https://github.com/morcos) +- [Bryan Bishop](https://github.com/kanzure) - [BtcDrak](https://github.com/btcdrak) - [Gregory Sanders](https://github.com/instagibbs) - [Lawrence Nahum](https://github.com/greenaddress) +- [Wladimir J. van der Laan](https://github.com/laanwj) {% comment %} Earlier statement: @@ -37,8 +39,6 @@ Signed earlier statement but not (yet) later statement: - BlueMatt - CodeShark - JonasSchnelli -- wumpus -- kanzure {% endcomment %} From f8caef0c2610d69334a7241f61e85391f1e7713b Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Mon, 21 Dec 2015 11:58:13 -0500 Subject: [PATCH 15/33] Capacity increases: add signatures --- en/bitcoin-core/capacity-increases.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md index db11921f..23d88632 100644 --- a/en/bitcoin-core/capacity-increases.md +++ b/en/bitcoin-core/capacity-increases.md @@ -24,7 +24,9 @@ consider this the best possible continuation of our efforts. - [Bryan Bishop](https://github.com/kanzure) - [BtcDrak](https://github.com/btcdrak) - [Gregory Sanders](https://github.com/instagibbs) +- [Jonas Schnelli](https://github.com/jonasschnelli) - [Lawrence Nahum](https://github.com/greenaddress) +- [Pieter Wuille](https://github.com/sipa) - [Wladimir J. van der Laan](https://github.com/laanwj) {% comment %} @@ -35,10 +37,8 @@ bikeshedding, start implementing, and move forward. Signed earlier statement but not (yet) later statement: - maaku -- sipa - BlueMatt - CodeShark -- JonasSchnelli {% endcomment %} From 0149c933a3aa26f52a3a91ee5c92b355f647d895 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Mon, 21 Dec 2015 12:18:06 -0500 Subject: [PATCH 16/33] Capacity increases: add signatures --- en/bitcoin-core/capacity-increases.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md index 23d88632..8d3b3996 100644 --- a/en/bitcoin-core/capacity-increases.md +++ b/en/bitcoin-core/capacity-increases.md @@ -23,6 +23,8 @@ consider this the best possible continuation of our efforts. - [Alex Morcos](https://github.com/morcos) - [Bryan Bishop](https://github.com/kanzure) - [BtcDrak](https://github.com/btcdrak) +- [Charlie Lee](https://github.com/coblee) +- [Eric Lombrozo](https://github.com/CodeShark) - [Gregory Sanders](https://github.com/instagibbs) - [Jonas Schnelli](https://github.com/jonasschnelli) - [Lawrence Nahum](https://github.com/greenaddress) @@ -38,7 +40,6 @@ bikeshedding, start implementing, and move forward. Signed earlier statement but not (yet) later statement: - maaku - BlueMatt -- CodeShark {% endcomment %} From d1dcbf29559cb8b68392e499939a90a63ae98204 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Mon, 21 Dec 2015 12:53:46 -0500 Subject: [PATCH 17/33] Capacity increases: add signatures --- en/bitcoin-core/capacity-increases.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md index 8d3b3996..8e17a16e 100644 --- a/en/bitcoin-core/capacity-increases.md +++ b/en/bitcoin-core/capacity-increases.md @@ -24,11 +24,15 @@ consider this the best possible continuation of our efforts. - [Bryan Bishop](https://github.com/kanzure) - [BtcDrak](https://github.com/btcdrak) - [Charlie Lee](https://github.com/coblee) +- [David A. Harding](https://github.com/harding) - [Eric Lombrozo](https://github.com/CodeShark) - [Gregory Sanders](https://github.com/instagibbs) - [Jonas Schnelli](https://github.com/jonasschnelli) - [Lawrence Nahum](https://github.com/greenaddress) +- [Pavel Janik](https://github.com/paveljanik) - [Pieter Wuille](https://github.com/sipa) +- [Theymos](https://github.com/theymos) +- [Thomas Kerin](https://github.com/afk11) - [Wladimir J. van der Laan](https://github.com/laanwj) {% comment %} From 2fae96f604f2341a2e2477c7d000b9221333f256 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Mon, 21 Dec 2015 14:08:53 -0500 Subject: [PATCH 18/33] Capacity increases: add signatures --- en/bitcoin-core/capacity-increases.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md index 8e17a16e..0bf29153 100644 --- a/en/bitcoin-core/capacity-increases.md +++ b/en/bitcoin-core/capacity-increases.md @@ -24,13 +24,17 @@ consider this the best possible continuation of our efforts. - [Bryan Bishop](https://github.com/kanzure) - [BtcDrak](https://github.com/btcdrak) - [Charlie Lee](https://github.com/coblee) +- [Daniel Kraft](https://github.com/domob1812) - [David A. Harding](https://github.com/harding) - [Eric Lombrozo](https://github.com/CodeShark) - [Gregory Sanders](https://github.com/instagibbs) +- [Johnathan Corgan](https://github.com/jmcorgan) +- [Johnson Lau](https://github.com/jl2012) - [Jonas Schnelli](https://github.com/jonasschnelli) - [Lawrence Nahum](https://github.com/greenaddress) - [Pavel Janik](https://github.com/paveljanik) - [Pieter Wuille](https://github.com/sipa) +- [Rodolfo Novak](https://github.com/nvk) - [Theymos](https://github.com/theymos) - [Thomas Kerin](https://github.com/afk11) - [Wladimir J. van der Laan](https://github.com/laanwj) From ce2e2e0766b706491ea124f596d4a3ebd0973764 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Mon, 21 Dec 2015 14:23:23 -0500 Subject: [PATCH 19/33] Capacity increases: add signatures --- en/bitcoin-core/capacity-increases.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md index 0bf29153..37c09d24 100644 --- a/en/bitcoin-core/capacity-increases.md +++ b/en/bitcoin-core/capacity-increases.md @@ -24,8 +24,11 @@ consider this the best possible continuation of our efforts. - [Bryan Bishop](https://github.com/kanzure) - [BtcDrak](https://github.com/btcdrak) - [Charlie Lee](https://github.com/coblee) +- [Christian Decker](https://github.com/cdecker) +- [Cory Fields](https://github.com/theuni) - [Daniel Kraft](https://github.com/domob1812) - [David A. Harding](https://github.com/harding) +- [Douglas Huff](https://github.com/jrmithdobbs) - [Eric Lombrozo](https://github.com/CodeShark) - [Gregory Sanders](https://github.com/instagibbs) - [Johnathan Corgan](https://github.com/jmcorgan) From a5faf19c63d731de0599b577045a3967dc59d171 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Mon, 21 Dec 2015 14:35:27 -0500 Subject: [PATCH 20/33] Capacity increases: add signatures --- en/bitcoin-core/capacity-increases.md | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md index 37c09d24..ba1d784a 100644 --- a/en/bitcoin-core/capacity-increases.md +++ b/en/bitcoin-core/capacity-increases.md @@ -35,6 +35,7 @@ consider this the best possible continuation of our efforts. - [Johnson Lau](https://github.com/jl2012) - [Jonas Schnelli](https://github.com/jonasschnelli) - [Lawrence Nahum](https://github.com/greenaddress) +- [Matt Corallo](https://github.com/TheBlueMatt) - [Pavel Janik](https://github.com/paveljanik) - [Pieter Wuille](https://github.com/sipa) - [Rodolfo Novak](https://github.com/nvk) @@ -42,17 +43,4 @@ consider this the best possible continuation of our efforts. - [Thomas Kerin](https://github.com/afk11) - [Wladimir J. van der Laan](https://github.com/laanwj) -{% comment %} -Earlier statement: -*[Capacity increases for the Bitcoin system][1]* is a plan I can fully -support. I publicly sign on to this proposal so we can stop -bikeshedding, start implementing, and move forward. - -Signed earlier statement but not (yet) later statement: -- maaku -- BlueMatt - -{% endcomment %} - - [1]: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-December/011865.html From 47ceeb5dff04065da9ec1e0841ff35a4bbe145d1 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Mon, 21 Dec 2015 14:49:24 -0500 Subject: [PATCH 21/33] capacity increases: add signatures & link to PR --- en/bitcoin-core/capacity-increases.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md index ba1d784a..dbf7a275 100644 --- a/en/bitcoin-core/capacity-increases.md +++ b/en/bitcoin-core/capacity-increases.md @@ -31,6 +31,7 @@ consider this the best possible continuation of our efforts. - [Douglas Huff](https://github.com/jrmithdobbs) - [Eric Lombrozo](https://github.com/CodeShark) - [Gregory Sanders](https://github.com/instagibbs) +- [James Hilliard](https://github.com/jameshilliard) - [Johnathan Corgan](https://github.com/jmcorgan) - [Johnson Lau](https://github.com/jl2012) - [Jonas Schnelli](https://github.com/jonasschnelli) @@ -41,6 +42,11 @@ consider this the best possible continuation of our efforts. - [Rodolfo Novak](https://github.com/nvk) - [Theymos](https://github.com/theymos) - [Thomas Kerin](https://github.com/afk11) +- [Warren Togami](https://github.com/wtogami) - [Wladimir J. van der Laan](https://github.com/laanwj) +--- + +Signatures may be added to Bitcoin.org pull request [#1165](https://github.com/bitcoin-dot-org/bitcoin.org/pull/1165) + [1]: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-December/011865.html From 5a8763d84cb24dc3acb6fa846cd590bfe7664d91 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Mon, 21 Dec 2015 15:16:20 -0500 Subject: [PATCH 22/33] Capacity increases: add signatures --- en/bitcoin-core/capacity-increases.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md index dbf7a275..7fbda1ea 100644 --- a/en/bitcoin-core/capacity-increases.md +++ b/en/bitcoin-core/capacity-increases.md @@ -30,6 +30,7 @@ consider this the best possible continuation of our efforts. - [David A. Harding](https://github.com/harding) - [Douglas Huff](https://github.com/jrmithdobbs) - [Eric Lombrozo](https://github.com/CodeShark) +- [Gregory Maxwell](https://github.com/gmaxwell) - [Gregory Sanders](https://github.com/instagibbs) - [James Hilliard](https://github.com/jameshilliard) - [Johnathan Corgan](https://github.com/jmcorgan) @@ -40,6 +41,7 @@ consider this the best possible continuation of our efforts. - [Pavel Janik](https://github.com/paveljanik) - [Pieter Wuille](https://github.com/sipa) - [Rodolfo Novak](https://github.com/nvk) +- [Suhas Daftuar](https://github.com/sdaftuar) - [Theymos](https://github.com/theymos) - [Thomas Kerin](https://github.com/afk11) - [Warren Togami](https://github.com/wtogami) From f95fdf292945a33313b889dd9cf19907fa23806a Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Mon, 21 Dec 2015 15:41:26 -0500 Subject: [PATCH 23/33] Capaticy increase: add signatures and ref to future FAQ --- en/bitcoin-core/capacity-increases.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md index 7fbda1ea..d3dfc490 100644 --- a/en/bitcoin-core/capacity-increases.md +++ b/en/bitcoin-core/capacity-increases.md @@ -21,11 +21,13 @@ consider this the best possible continuation of our efforts. - [Adam Back](https://github.com/adam3us) - [Alex Morcos](https://github.com/morcos) +- [Ben Davenport](https://github.com/bpdavenport) - [Bryan Bishop](https://github.com/kanzure) - [BtcDrak](https://github.com/btcdrak) - [Charlie Lee](https://github.com/coblee) - [Christian Decker](https://github.com/cdecker) - [Cory Fields](https://github.com/theuni) +- [Craig Watkins](https://github.com/crwatkins) - [Daniel Kraft](https://github.com/domob1812) - [David A. Harding](https://github.com/harding) - [Douglas Huff](https://github.com/jrmithdobbs) @@ -49,6 +51,8 @@ consider this the best possible continuation of our efforts. --- +A FAQ is being prepared and will be linked from here when available. + Signatures may be added to Bitcoin.org pull request [#1165](https://github.com/bitcoin-dot-org/bitcoin.org/pull/1165) [1]: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-December/011865.html From 20fe0674da85d8a59db675e71289a34ac71a7877 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Mon, 21 Dec 2015 16:04:52 -0500 Subject: [PATCH 24/33] Capacity increases: add signatures --- en/bitcoin-core/capacity-increases.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md index d3dfc490..01adb8e7 100644 --- a/en/bitcoin-core/capacity-increases.md +++ b/en/bitcoin-core/capacity-increases.md @@ -40,8 +40,10 @@ consider this the best possible continuation of our efforts. - [Jonas Schnelli](https://github.com/jonasschnelli) - [Lawrence Nahum](https://github.com/greenaddress) - [Matt Corallo](https://github.com/TheBlueMatt) +- [Nicolas Bacca](https://github.com/btchip) - [Pavel Janik](https://github.com/paveljanik) - [Pieter Wuille](https://github.com/sipa) +- [Randy Waterhouse](https://github.com/randy-waterhouse) - [Rodolfo Novak](https://github.com/nvk) - [Suhas Daftuar](https://github.com/sdaftuar) - [Theymos](https://github.com/theymos) From 2a9d7e8d9a18b791cd4b61e00e2a3c36251a1583 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Mon, 21 Dec 2015 16:47:45 -0500 Subject: [PATCH 25/33] Capacity increases: add signature --- en/bitcoin-core/capacity-increases.md | 1 + 1 file changed, 1 insertion(+) diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md index 01adb8e7..99a844f0 100644 --- a/en/bitcoin-core/capacity-increases.md +++ b/en/bitcoin-core/capacity-increases.md @@ -30,6 +30,7 @@ consider this the best possible continuation of our efforts. - [Craig Watkins](https://github.com/crwatkins) - [Daniel Kraft](https://github.com/domob1812) - [David A. Harding](https://github.com/harding) +- [David Vorick](https://github.com/DavidVorick) - [Douglas Huff](https://github.com/jrmithdobbs) - [Eric Lombrozo](https://github.com/CodeShark) - [Gregory Maxwell](https://github.com/gmaxwell) From ef21d830cac77cda01368bfc384e99e02d008420 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Mon, 21 Dec 2015 18:38:29 -0500 Subject: [PATCH 26/33] Capacity increases: new sigs & link from Bitcoin Core main page --- en/bitcoin-core/capacity-increases.md | 4 ++++ en/bitcoin-core/index.md | 1 + 2 files changed, 5 insertions(+) diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md index 99a844f0..77109dda 100644 --- a/en/bitcoin-core/capacity-increases.md +++ b/en/bitcoin-core/capacity-increases.md @@ -22,6 +22,7 @@ consider this the best possible continuation of our efforts. - [Adam Back](https://github.com/adam3us) - [Alex Morcos](https://github.com/morcos) - [Ben Davenport](https://github.com/bpdavenport) +- [Bram Cohen](https://github.com/bramcohen) - [Bryan Bishop](https://github.com/kanzure) - [BtcDrak](https://github.com/btcdrak) - [Charlie Lee](https://github.com/coblee) @@ -41,7 +42,10 @@ consider this the best possible continuation of our efforts. - [Jonas Schnelli](https://github.com/jonasschnelli) - [Lawrence Nahum](https://github.com/greenaddress) - [Matt Corallo](https://github.com/TheBlueMatt) +- [Midnight Magic](https://github.com/midnightmagic) +- [Michael Ford](https://github.com/fanquake) - [Nicolas Bacca](https://github.com/btchip) +- [Patrick Strateman](https://github.com/pstratem) - [Pavel Janik](https://github.com/paveljanik) - [Pieter Wuille](https://github.com/sipa) - [Randy Waterhouse](https://github.com/randy-waterhouse) diff --git a/en/bitcoin-core/index.md b/en/bitcoin-core/index.md index 82c41671..e1949d76 100644 --- a/en/bitcoin-core/index.md +++ b/en/bitcoin-core/index.md @@ -91,6 +91,7 @@ breadcrumbs: {% endcapture %} {% assign array_releases = text_releases | strip_newlines | split: '::' %} + - 2015-12-21 - [Roadmap: Capacity increases for the Bitcoin system](/en/bitcoin-core/capacity-increases) {% comment %}{% endcomment %} {% for release in array_releases %} {% if forloop.index <= 3 %} From 55c21fe8f95703d9b8d4ce453f11a27400944910 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Tue, 22 Dec 2015 08:45:15 -0500 Subject: [PATCH 27/33] Capacity increases: add signatures --- en/bitcoin-core/capacity-increases.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md index 77109dda..f254b2f7 100644 --- a/en/bitcoin-core/capacity-increases.md +++ b/en/bitcoin-core/capacity-increases.md @@ -22,6 +22,7 @@ consider this the best possible continuation of our efforts. - [Adam Back](https://github.com/adam3us) - [Alex Morcos](https://github.com/morcos) - [Ben Davenport](https://github.com/bpdavenport) +- [Ben Gorlick](https://github.com/bgorlick) - [Bram Cohen](https://github.com/bramcohen) - [Bryan Bishop](https://github.com/kanzure) - [BtcDrak](https://github.com/btcdrak) @@ -32,19 +33,28 @@ consider this the best possible continuation of our efforts. - [Daniel Kraft](https://github.com/domob1812) - [David A. Harding](https://github.com/harding) - [David Vorick](https://github.com/DavidVorick) +- [Dev Random](https://github.com/devrandom) +- [DexX7](https://github.com/dexX7) - [Douglas Huff](https://github.com/jrmithdobbs) - [Eric Lombrozo](https://github.com/CodeShark) +- [Glenn H Tarbox](https://github.com/ghtdak) - [Gregory Maxwell](https://github.com/gmaxwell) - [Gregory Sanders](https://github.com/instagibbs) - [James Hilliard](https://github.com/jameshilliard) - [Johnathan Corgan](https://github.com/jmcorgan) - [Johnson Lau](https://github.com/jl2012) - [Jonas Schnelli](https://github.com/jonasschnelli) +- [Jouke Hofman](https://github.com/Joukehofman) - [Lawrence Nahum](https://github.com/greenaddress) +- [Luke Dashjr](https://github.com/luke-jr) +- [Marshall Long](https://github.com/FinalHash) +- [Marco Falke](https://github.com/MarcoFalke) - [Matt Corallo](https://github.com/TheBlueMatt) - [Midnight Magic](https://github.com/midnightmagic) - [Michael Ford](https://github.com/fanquake) - [Nicolas Bacca](https://github.com/btchip) +- [Nicolas Dorier](https://github.com/NicolasDorier) +- [Obi Nwosu](https://github.com/obi) - [Patrick Strateman](https://github.com/pstratem) - [Pavel Janik](https://github.com/paveljanik) - [Pieter Wuille](https://github.com/sipa) @@ -53,6 +63,7 @@ consider this the best possible continuation of our efforts. - [Suhas Daftuar](https://github.com/sdaftuar) - [Theymos](https://github.com/theymos) - [Thomas Kerin](https://github.com/afk11) +- [Wang Chun](https://github.com/wangchun) - [Warren Togami](https://github.com/wtogami) - [Wladimir J. van der Laan](https://github.com/laanwj) From 3896ad0784f6770b050ecfbfe4f53666a8b9bafa Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Tue, 22 Dec 2015 11:42:47 -0500 Subject: [PATCH 28/33] Capacity increases: add chinese translations (jl2012) --- .../bitcoin-core/capability-increases-sigs.md | 55 +++++++++++++++++++ en/bitcoin-core/capacity-increases.md | 53 ++---------------- zh_CN/bitcoin-core/capacity-increases.md | 29 ++++++++++ zh_TW/bitcoin-core/capacity-increases.md | 28 ++++++++++ 4 files changed, 118 insertions(+), 47 deletions(-) create mode 100644 _includes/bitcoin-core/capability-increases-sigs.md create mode 100644 zh_CN/bitcoin-core/capacity-increases.md create mode 100644 zh_TW/bitcoin-core/capacity-increases.md diff --git a/_includes/bitcoin-core/capability-increases-sigs.md b/_includes/bitcoin-core/capability-increases-sigs.md new file mode 100644 index 00000000..3d11a5b4 --- /dev/null +++ b/_includes/bitcoin-core/capability-increases-sigs.md @@ -0,0 +1,55 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +- [Adam Back](https://github.com/adam3us) +- [Alex Morcos](https://github.com/morcos) +- [Ben Davenport](https://github.com/bpdavenport) +- [Ben Gorlick](https://github.com/bgorlick) +- [Bram Cohen](https://github.com/bramcohen) +- [Bryan Bishop](https://github.com/kanzure) +- [BtcDrak](https://github.com/btcdrak) +- [Charlie Lee](https://github.com/coblee) +- [Christian Decker](https://github.com/cdecker) +- [Cory Fields](https://github.com/theuni) +- [Craig Watkins](https://github.com/crwatkins) +- [Daniel](https://github.com/arowser) +- [Daniel Kraft](https://github.com/domob1812) +- [David A. Harding](https://github.com/harding) +- [David Vorick](https://github.com/DavidVorick) +- [Dev Random](https://github.com/devrandom) +- [DexX7](https://github.com/dexX7) +- [Douglas Huff](https://github.com/jrmithdobbs) +- [Eric Lombrozo](https://github.com/CodeShark) +- [Glenn H Tarbox](https://github.com/ghtdak) +- [Gregory Maxwell](https://github.com/gmaxwell) +- [Gregory Sanders](https://github.com/instagibbs) +- [James Hilliard](https://github.com/jameshilliard) +- [Johnathan Corgan](https://github.com/jmcorgan) +- [Johnson Lau](https://github.com/jl2012) +- [Jonas Schnelli](https://github.com/jonasschnelli) +- [Jouke Hofman](https://github.com/Joukehofman) +- [Lawrence Nahum](https://github.com/greenaddress) +- [Luke Dashjr](https://github.com/luke-jr) +- [Mark Friedenbach](https://github.com/maaku) +- [Marshall Long](https://github.com/FinalHash) +- [Eric Martindale](https://github.com/martindale) +- [Marco Falke](https://github.com/MarcoFalke) +- [Matt Corallo](https://github.com/TheBlueMatt) +- [Midnight Magic](https://github.com/midnightmagic) +- [Michael Ford](https://github.com/fanquake) +- [Nicolas Bacca](https://github.com/btchip) +- [Nicolas Dorier](https://github.com/NicolasDorier) +- [Obi Nwosu](https://github.com/obi) +- [Patrick Strateman](https://github.com/pstratem) +- [Pavel Janik](https://github.com/paveljanik) +- [Pieter Wuille](https://github.com/sipa) +- [Randy Waterhouse](https://github.com/randy-waterhouse) +- [Rodolfo Novak](https://github.com/nvk) +- [Suhas Daftuar](https://github.com/sdaftuar) +- [Theymos](https://github.com/theymos) +- [Thomas Kerin](https://github.com/afk11) +- [Wang Chun](https://github.com/wangchun) +- [Warren Togami](https://github.com/wtogami) +- [Wladimir J. van der Laan](https://github.com/laanwj) diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md index f254b2f7..025a6479 100644 --- a/en/bitcoin-core/capacity-increases.md +++ b/en/bitcoin-core/capacity-increases.md @@ -19,56 +19,15 @@ Bitcoin system.][1] We have been working on scalability for several years within the Bitcoin Core project and consider this the best possible continuation of our efforts. -- [Adam Back](https://github.com/adam3us) -- [Alex Morcos](https://github.com/morcos) -- [Ben Davenport](https://github.com/bpdavenport) -- [Ben Gorlick](https://github.com/bgorlick) -- [Bram Cohen](https://github.com/bramcohen) -- [Bryan Bishop](https://github.com/kanzure) -- [BtcDrak](https://github.com/btcdrak) -- [Charlie Lee](https://github.com/coblee) -- [Christian Decker](https://github.com/cdecker) -- [Cory Fields](https://github.com/theuni) -- [Craig Watkins](https://github.com/crwatkins) -- [Daniel Kraft](https://github.com/domob1812) -- [David A. Harding](https://github.com/harding) -- [David Vorick](https://github.com/DavidVorick) -- [Dev Random](https://github.com/devrandom) -- [DexX7](https://github.com/dexX7) -- [Douglas Huff](https://github.com/jrmithdobbs) -- [Eric Lombrozo](https://github.com/CodeShark) -- [Glenn H Tarbox](https://github.com/ghtdak) -- [Gregory Maxwell](https://github.com/gmaxwell) -- [Gregory Sanders](https://github.com/instagibbs) -- [James Hilliard](https://github.com/jameshilliard) -- [Johnathan Corgan](https://github.com/jmcorgan) -- [Johnson Lau](https://github.com/jl2012) -- [Jonas Schnelli](https://github.com/jonasschnelli) -- [Jouke Hofman](https://github.com/Joukehofman) -- [Lawrence Nahum](https://github.com/greenaddress) -- [Luke Dashjr](https://github.com/luke-jr) -- [Marshall Long](https://github.com/FinalHash) -- [Marco Falke](https://github.com/MarcoFalke) -- [Matt Corallo](https://github.com/TheBlueMatt) -- [Midnight Magic](https://github.com/midnightmagic) -- [Michael Ford](https://github.com/fanquake) -- [Nicolas Bacca](https://github.com/btchip) -- [Nicolas Dorier](https://github.com/NicolasDorier) -- [Obi Nwosu](https://github.com/obi) -- [Patrick Strateman](https://github.com/pstratem) -- [Pavel Janik](https://github.com/paveljanik) -- [Pieter Wuille](https://github.com/sipa) -- [Randy Waterhouse](https://github.com/randy-waterhouse) -- [Rodolfo Novak](https://github.com/nvk) -- [Suhas Daftuar](https://github.com/sdaftuar) -- [Theymos](https://github.com/theymos) -- [Thomas Kerin](https://github.com/afk11) -- [Wang Chun](https://github.com/wangchun) -- [Warren Togami](https://github.com/wtogami) -- [Wladimir J. van der Laan](https://github.com/laanwj) +{% include bitcoin-core/capability-increases-sigs.md %} --- +Other versions of this page: + +- [简体中文](/zh_CN/bitcoin-core/capacity-increases) +- [繁體中文](/zh_TW/bitcoin-core/capacity-increases) + A FAQ is being prepared and will be linked from here when available. Signatures may be added to Bitcoin.org pull request [#1165](https://github.com/bitcoin-dot-org/bitcoin.org/pull/1165) diff --git a/zh_CN/bitcoin-core/capacity-increases.md b/zh_CN/bitcoin-core/capacity-increases.md new file mode 100644 index 00000000..388d1120 --- /dev/null +++ b/zh_CN/bitcoin-core/capacity-increases.md @@ -0,0 +1,29 @@ +--- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + +layout: base-core +lang: zh_CN +id: bitcoin-core-capacity-increases +columns: 1 +title: 比特币系统扩展 +breadcrumbs: + - bitcoin + - bcc + - Capacity increases +--- +# 比特币系统扩展 + + +我们连署支持 [比特币系统扩展][1] 路线图。我们已在Bitcoin Core计划内为可扩展性工作多年，认为这是最可以延续我们一直以来努力的方向。 + +{% include bitcoin-core/capability-increases-sigs.md %} + +--- + +我们正准备一份常见问答集，完成後会在此连结。 + +如果你想参与连署，请到[#1165](https://github.com/bitcoin-dot-org/bitcoin.org/pull/1165)。 + + +[1]: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-December/011865.html diff --git a/zh_TW/bitcoin-core/capacity-increases.md b/zh_TW/bitcoin-core/capacity-increases.md new file mode 100644 index 00000000..2ac6038b --- /dev/null +++ b/zh_TW/bitcoin-core/capacity-increases.md @@ -0,0 +1,28 @@ +--- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + +layout: base-core +lang: zh_TW +id: bitcoin-core-capacity-increases +columns: 1 +title: 比特幣系統擴展 +breadcrumbs: + - bitcoin + - bcc + - Capacity increases +--- +# 比特幣系統擴展 + +我們連署支持[比特幣系統擴展][1]路線圖。我們已在Bitcoin +Core計劃內為可擴展性工作多年，認為這是最可以延續我們一直以來努力的方向。 + +{% include bitcoin-core/capability-increases-sigs.md %} + +--- + +我們正準備一份常見問答集，完成後會在此連結。 + +如果你想參與連署，請到[#1165](https://github.com/bitcoin-dot-org/bitcoin.org/pull/1165)。 + +[1]: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-December/011865.html From f394135bf09c5e1f10e2988629a9a0ff464bfdbc Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Tue, 22 Dec 2015 12:13:06 -0500 Subject: [PATCH 29/33] Capacity increases: move FAQ mention to near top --- en/bitcoin-core/capacity-increases.md | 4 ++-- zh_CN/bitcoin-core/capacity-increases.md | 4 ++-- zh_TW/bitcoin-core/capacity-increases.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md index 025a6479..87bf7c64 100644 --- a/en/bitcoin-core/capacity-increases.md +++ b/en/bitcoin-core/capacity-increases.md @@ -19,6 +19,8 @@ Bitcoin system.][1] We have been working on scalability for several years within the Bitcoin Core project and consider this the best possible continuation of our efforts. +A FAQ is being prepared and will be linked from here when available. + {% include bitcoin-core/capability-increases-sigs.md %} --- @@ -28,8 +30,6 @@ Other versions of this page: - [简体中文](/zh_CN/bitcoin-core/capacity-increases) - [繁體中文](/zh_TW/bitcoin-core/capacity-increases) -A FAQ is being prepared and will be linked from here when available. - Signatures may be added to Bitcoin.org pull request [#1165](https://github.com/bitcoin-dot-org/bitcoin.org/pull/1165) [1]: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-December/011865.html diff --git a/zh_CN/bitcoin-core/capacity-increases.md b/zh_CN/bitcoin-core/capacity-increases.md index 388d1120..8d78d9eb 100644 --- a/zh_CN/bitcoin-core/capacity-increases.md +++ b/zh_CN/bitcoin-core/capacity-increases.md @@ -17,12 +17,12 @@ breadcrumbs: 我们连署支持 [比特币系统扩展][1] 路线图。我们已在Bitcoin Core计划内为可扩展性工作多年，认为这是最可以延续我们一直以来努力的方向。 +我们正准备一份常见问答集，完成後会在此连结。 + {% include bitcoin-core/capability-increases-sigs.md %} --- -我们正准备一份常见问答集，完成後会在此连结。 - 如果你想参与连署，请到[#1165](https://github.com/bitcoin-dot-org/bitcoin.org/pull/1165)。 diff --git a/zh_TW/bitcoin-core/capacity-increases.md b/zh_TW/bitcoin-core/capacity-increases.md index 2ac6038b..35dd25b8 100644 --- a/zh_TW/bitcoin-core/capacity-increases.md +++ b/zh_TW/bitcoin-core/capacity-increases.md @@ -17,12 +17,12 @@ breadcrumbs: 我們連署支持[比特幣系統擴展][1]路線圖。我們已在Bitcoin Core計劃內為可擴展性工作多年，認為這是最可以延續我們一直以來努力的方向。 +我們正準備一份常見問答集，完成後會在此連結。 + {% include bitcoin-core/capability-increases-sigs.md %} --- -我們正準備一份常見問答集，完成後會在此連結。 - 如果你想參與連署，請到[#1165](https://github.com/bitcoin-dot-org/bitcoin.org/pull/1165)。 [1]: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-December/011865.html From 09340267782a8e47a82a3f59dbd99fe3fba039a8 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Tue, 22 Dec 2015 16:25:14 -0500 Subject: [PATCH 30/33] Add capacity increses FAQ --- en/bitcoin-core/capacity-increases-faq.md | 364 ++++++++++++++++++++++ en/bitcoin-core/capacity-increases.md | 3 +- en/bitcoin-core/index.md | 2 +- 3 files changed, 367 insertions(+), 2 deletions(-) create mode 100644 en/bitcoin-core/capacity-increases-faq.md diff --git a/en/bitcoin-core/capacity-increases-faq.md b/en/bitcoin-core/capacity-increases-faq.md new file mode 100644 index 00000000..1c6e671a --- /dev/null +++ b/en/bitcoin-core/capacity-increases-faq.md @@ -0,0 +1,364 @@ +--- +# This file is licensed under the MIT License (MIT) available on +# http://opensource.org/licenses/MIT. + +layout: base-core +lang: en +id: bitcoin-core-capacity-increases-faq +columns: 1 +title: Capacity increases FAQ — Bitcoin Core +breadcrumbs: + - bitcoin + - bcc + - Capacity increases FAQ +--- +# Capacity increases FAQ + +1. toc +{:toc} + +## What specific technologies are included in the roadmap, and when can we expect them? {#roadmap-dates} + +New technology will be deployed when it is ready and has been tested. +However, we believe the following is a reasonable schedule for the +specific improvements described in the [roadmap][]. + +| Dec 2015 | | Deploy segregated witness testnet | +| Feb 2016 | 0.12.0 | [libsecp256k1 verification][] | +| Feb 2016 | | Segregated witness feature complete & ready for general review | +| Mar 2016\* | 0.12.x | Deploy OP_CHECKSEQUENCEVERIFY (BIPs [68][BIP68] & [112][BIP112]) + [BIP113][] as first [BIP9][] versionbits soft fork | +| April 2016\* | 0.12.x | Deploy segregated witness | +| 2016 | | Weak blocks, IBLTs, or both | + +\* Dates with an asterisk are when we expect to release soft fork-ready code. The code will not be released until it has been well reviewed, and the actual fork will take time to activate ([BIP66][] activated in July 2015 after a few months; [BIP65][] activated in Dec 2015 after only 5 weeks). + +- **Segregated witness testnet:** a separate testnet (not part of the + regular testnet) that provides an opportunity for Bitcoin Core + contributors to test segregated witness and for wallet authors to + begin working with it. + +- **Libsecp256k1 verification:** 500% to 700% speed boost on x86\_64 + hardware during verification to help new full nodes join the network + and to lighten the burden on existing nodes. + +- **OP\_CHECKSEQUENCEVERIFY:** 25,000% improvement in bi-directional + [payment channel efficiency][] by allowing users to keep channels open + as long as they want. + +- **VersionBits:** increase the maximum number of soft forks able to be + deployed simultaneously from 1 to 29, allowing for faster and more + decentralized future upgrades of the network. + +- **Segregated witness:** 175% to 400% direct capacity upgrade, 66% + additional improvement in bi-directional channel efficiency by + consolidating channel open and close operations, an end to + third-party malleability that hurts smart contract deployment, fraud + proofs to allow lightweight clients to better participate in + economic enforcement, and ability to more easily upgrade Bitcoin's + Script language so that new and more powerful trustless contracts + may be devised. + +- **IBLTs and weak blocks:** 90% or more reduction in critical bandwidth + to relay blocks created by miners who want their blocks to propagate + quickly with a modest [increase in total bandwidth][], bringing many of + the benefits of the [Bitcoin Relay Network][] to all full nodes. This + improvement is accomplished by spreading bandwidth usage out over time + for full nodes, which means IBLT and weak blocks may allow for safer + future increases to the max block size. + +## Is the segregated witness soft fork equivalent to a 4MB block size increase, a 2MB increase, a 1.75MB increase, or what? I keep hearing different numbers. {#segwit-size} + +The [current proposal][] for soft fork segregated witness (segwit) counts +each byte in a witness as 0.25 bytes towards the maximum block size +limit, meaning the maximum size of a block is just under 4MB. + +However, blocks are not expected to consist entirely of witness data and +each non-witness byte is counted as 1.00 bytes towards the maximum block +size limit, so blocks near 4MB in size would be unlikely. + +According to some [calculations][] performed by Anthony Towns, a block +filled with standard single-signature P2PKH transactions would be about +1.6MB and a block filled with 2-of-2 multisignature transactions would +be about 2.0MB. + +[current proposal]: https://youtu.be/fst1IK_mrng?t=2234 +[calculations]: http://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-December/011869.html + +## Segregated witness sounds complicated; will the ecosystem be prepared for its deployment? {#ecosystem-ready} + +Some ideas are easy to explain but hard to execute. Other ideas are easy +to execute but hard to explain. Segregated witness (segwit) seems to be +the latter. + +Segwit can be deployed incrementally without breaking compatibility, so +no significant preparation of the ecosystem is necessary. Developers +who want immediate hands-on experience with segwit can begin to test +their software on the segwit testnet being deployed in Dec 2015. + +Initially, only miners who wish to support it need to upgrade in +order to activate it and enforce it on the mainnet. Existing +applications only need to change if they wish to take advantage of the +new features. + +Segregated witness transactions will require lower fees, will afford +much greater performance optimizations, and can support multistage smart +contracts and protocols such as bi-directional payment channels that can +scale without writing extra data to the blockchain. Wallets are strongly +encouraged to upgrade but can continue to operate without modification +as the deployment does not break backwards compatibility. + +## Segregated witness still sounds complicated. Why not simply raise the maximum block size? {#size-bump} + +There's a [single line of code][max_block_size] in Bitcoin Core that says the maximum block size is 1,000,000 bytes (1MB). The simplest change would be a hard fork to update that line to say, for example, 2,000,000 bytes (2MB). + +Hard forks are anything but simple: + +- **We don't have experience:** Miners, merchants, developers, and users + have never deployed a hard fork, so techniques for safely deploying + them have not been tested. + + This is unlike soft forks, whose deployments were initially managed + by Nakamoto, where we gained experience from the complications in + the [BIP16][] deployment, where we refined our technique in the [BIP34][] + deployment, and where we've gained enough experience with BIPs [66][BIP66] + and [65][BIP65] to begin managing multiple soft forks with [BIP9][] version bits + in the future. + +- **Upgrades required:** Hard forks require all full nodes to upgrade or + everyone who uses that node may lose money. This includes the node + operator, if they use it to protect their wallet, as well as + lightweight clients who get their data from the node. + +- **Other changes required:** Even a single-line change such as + increasing the maximum block size has effects on other parts of the + code, some of which are undesirable. For example, right now it's + possible to construct a transaction that takes up almost 1MB of + space and which takes 30 seconds or more to validate on a modern + computer (blocks containing such transactions have been mined). In + 2MB blocks, a 2MB transaction can be constructed that may take over + 10 minutes to validate which opens up dangerous denial-of-service + attack vectors. Other lines of code would need to be changed to + prevent these problems. + +Despite these considerable complications, with sufficient precautions, +none of them is fatal to a hard fork, and we do expect to make hard +forks in the future. But with segregated witness (segwit) we have a +soft fork, similar to to other soft forks we've performed and gained +experience in deploying, that provides us with many benefits in addition +to allowing more transactions to be added to the blockchain. + +Segwit does require more changes in higher level software stacks than a +simple block size increase, but if we truly want to see bitcoin scale, +far more invasive changes will be needed anyway, and segwit will +gently encourage people to upgrade to more scalable models right away +without forcing them to do so. + +Developers, miners, and the community have accrued significant +experience deploying soft forks, and we believe segwit can be deployed +at least as fast, and probably more securely, than a hard fork that +increases the maximum block size. + +## Will there be a hard fork before or as part of the segregated witness implementation? {#pre-segwit-fork} + +No. That is not part of the [roadmap][]. + +[roadmap]: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-December/011865.html + +## If there's eventually going to be a hard fork, why not do it now? {#why-not-now} + +We currently have the ability to increase the capacity of the +system through soft forks that have widespread consensus without any +of the complications of a hard fork, as described in an [earlier +question][q simple raise], so the expectation that there will be an +eventual hard fork is not sufficient reason to attempt one now. + +In addition to giving us extra transaction capacity, the improvements +proposed in the roadmap (combined with other technology such as +bi-directional payment channels) give users the ability to reduce the +amount of blockchain space they use on average---effectively increasing +the capacity of the Bitcoin system without increasing the amount of full +node bandwidth used. + +For example, + +- [BIP68][] and [BIP112][] allow bi-directional payment channels to stay open + indefinitely, which we expect to vastly reduce the number of payment + channel transactions that need to be committed to the blockchain. + +- Segregated witness allows a payment channel close transaction to be + combined with a payment channel open transaction, reducing the + blockchain space used to change channels by about 66%. + +- Segregated witness allows soft forks to change the Bitcoin Script + language in ways that could reduce the average size of a transaction, + such as using public-key-recovery-from-signatures or Schnorr combined + signatures. + +- Segregated witness permits the creation of compact fraud proofs that + may bring the security of Simplified Payment Verification (SPV) + lightweight clients up near to that of full nodes, which may allow the + network to function well with fewer full nodes than it can under + currently-deployed technology. + +The actual effect of these technologies is unknown, but scaling now with +a soft fork that has wide consensus allows us to obtain the immediate +gains, test and measure the mid-term possibilities, and use that data to +formulate long-term plans. + +## How will segregated witness transactions work for wallets? {#segwit-in-wallets} + +Wallets that currently support P2SH can migrate to full segregated +witness in two phases: + +- Phase 1: Scripts are hashed twice, first to 256 bytes and then to 160 + bytes. The 160 byte hash will be compatible with existing P2SH + addresses, so upgraded wallets will be able to send and receive + bitcoins to and from currently existing wallets. + +- Phase 2: Scripts are hashed once to 256 bytes. This format will not be + compatible with existing wallets but will allow more efficient use of + block space and will offer better security due to greater collision + resistance. + +## If no one is forced to upgrade, why will anyone bother to upgrade? I heard P2SH took almost two years to become widely deployed. {#why-upgrade} + +Each byte of the witness part of a segregated witness (segwit) +transaction will only count as 0.25 bytes towards the size of the +transaction. Since transaction fees are based on the size of a +transaction, this is effectively a 75% discount on fees for that part of +a transaction---but only for people who use segwit. + +David Harding provided a table of [estimated savings][] at various +fee/transaction levels. That is, if the fee for a typical 250-byte +transaction is $0.01 USD, using segwit will save about $0.003 when +spending a P2PK-in-P2SH transaction output. + +| Transaction | Bytes saved | $0.01/250B | $0.05/250B | $0.25/250B | $1.00/250B | +|-------------|-------------|------------|------------|------------|------------| +| P2PK-in-P2SH | 79/107 | $0.003 | $0.015 | $0.079 | $0.316 | +| 1-of-1 P2SH multisig | 83/112 | $0.003 | $0.016 | $0.083 | $0.332 | +| 2-of-2 P2SH multisig | 163/219 | $0.006 | $0.032 | $0.163 | $0.652 | +| 2-of-3 P2SH multisig | 189/254 | $0.007 | $0.037 | $0.189 | $0.756 | + +(We don't expect fees to get as high as the highest seen in this +table; they are just provided for reference.) + +Web wallets and exchanges that send large numbers of transactions each +day at fixed rates (such as for free or for 1% per spend) are expected +to be early adopters---even the small savings per spend seen in the +table above adds up to significant amounts of money if repeated hundreds +or thousands of times a day. + +## I heard you were breaking zero-confirmation transactions. Which technology in the scaling roadmap is doing that? {#rbf} + +None of them. By default, current versions of Bitcoin Core won't +replace an unconfirmed transaction with another transaction that spends +any of the same inputs. Some people think this means the first +transaction they see that spends a particular input is safe, but this is +untrue. (If it were true, we wouldn't need the blockchain.) + +This current default policy does mean that people who want to be able to +update their unconfirmed transactions can't do that. The original +version of Bitcoin provided people with a way to indicate that they +wanted to be able to update their transactions, but Nakamoto had to +disable it in 2010 to prevent denial-of-service attacks. + +Recent Bitcoin Core developers realized that they could prevent the +DOS attack by requiring updated transactions pay extra fees, and they've +re-enabled Nakamoto's mechanism for indicating when a transactions can +be replaced. This feature is planned for Bitcoin Core 0.12.0 (expected +Jan/Feb 2016) but, like Nakamoto's original feature, is opt-in so +people who want to be able to replace their transactions have to use a +wallet that supports that feature. + +Currently there are no wallets that provide this feature, but wallets +that do provide it in the future may be able to combine multiple +transactions together to reduce the amount of blockchain space they use +as well as increase the fees they pay on transactions that are taking a +long time to confirm, helping to prevent transactions from getting +“stuck” (a known usability problem). + +## Weak blocks and IBLTs just say “2016” in the roadmap schedule. Does this mean you have no idea when they'll be available? {#weak-blocks-iblts} + +Weak blocks and IBLTs are two separate technologies that are still being +actively studied to choose the right parameters, but the number of +developers working on them is limited and so it's difficult to guess +when they'll be deployed. + +Weak blocks and IBLTs can both be deployed as network-only enhancements +(no soft or hard fork required) which means that there will probably +only be a short time from when testing is completed to when their +benefits are available to all upgraded nodes. We hope this will happen +within 2016. + +After deployment, both weak blocks and IBLTs may benefit from a simple +non-controversial soft fork ([canonical transaction ordering][]), which +should be easy to deploy using the BIP9 versionBits system described +elsewhere in this FAQ. + +[canonical transaction ordering]: https://gist.github.com/gavinandresen/e20c3b5a1d4b97f79ac2#canonical-ordering-of-transactions + +## “Why would miners adopt the SegWit format, given that it does not provide any savings of bandwidth, storage, or processing time to them?” {#why-mine-segwit} + +Most [previous soft forks][] have not provided these benefits to miners +either. For example, + +| BIP16 (P2SH) | New transaction type | +| BIP30 (duplicate txids) | Required checking for duplicate txids | +| BIP34 (height in coinbase) | Reduced miner coinbase space by 4 bytes | +| BIP65 (OP_CLTV) | New opcode | + +The BIP66 (strict DER) soft fork which activated in July 2015 will +soon be providing reduced processing time by making it possible to +switch to libsecp256k1 for validation as described elsewhere is this +FAQ. The reduced validation time make makes it fairly unique among soft +forks in providing direct benefits to miners. + +What segregated witness (segwit) does is provide several major benefits +to anyone who uses it to create transactions: + +A permanent fix for third-party malleability, allowing multi-stage +smart contracts to flourish. A modest reduction in fees. Easy future +upgrades to Bitcoin Script, so wallets can more easily gain access to +new features. + +Through the previous soft forks, and through conversations such as the +[Miners' Panel][] at Scaling Bitcoin Hong Kong, miners have +repeatedly shown that they want Bitcoin to be the most useful system +possible even if they don't receive any direct benefits. Segwit and +the other improvements in the roadmap provide significant usability +enhancements. + +In addition, segwit allows miners to put more transactions in their +blocks, which may allow them to increase their per-block revenue. + +## How can I help? + +Start by reading the [Bitcoin Core contributor][] pages on Bitcoin.org. +In particular, [code review][] is a critical part of getting soft forks +deployed. + +To get specific suggestions on how you can help, please join the +[#bitcoin-dev][] IRC channel. + +[#bitcoin-dev]: https://webchat.freenode.net/?channels=bitcoin-dev&uio=d4 +[BIP9]: https://github.com/bitcoin/bips/blob/master/bip-0009.mediawiki +[BIP16]: https://github.com/bitcoin/bips/blob/master/bip-0016.mediawiki +[BIP34]: https://github.com/bitcoin/bips/blob/master/bip-0034.mediawiki +[BIP50]: https://github.com/bitcoin/bips/blob/master/bip-0050.mediawiki +[BIP65]: https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki +[BIP66]: https://github.com/bitcoin/bips/blob/master/bip-0066.mediawiki +[BIP68]: https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki +[BIP112]: https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki +[BIP113]: https://github.com/bitcoin/bips/blob/master/bip-0113.mediawiki +[bitcoin core contributor]: /en/bitcoin-core/ +[Bitcoin relay network]: http://bitcoinrelaynetwork.org/ +[code review]: https://bitcoin.org/en/development#code-review +[estimated savings]: https://www.reddit.com/r/bitcoinxt/comments/3w1i6b/i_attended_scaling_bitcoin_hong_kong_these_are_my/cxtkaih +[increase in total bandwidth]: https://scalingbitcoin.org/hongkong2015/presentations/DAY1/3_block_propagation_1_rosenbaum.pdf +[libsecp256k1 verification]: https://github.com/bitcoin/bitcoin/pull/6954 +[max_block_size]: https://github.com/bitcoin/bitcoin/blob/3038eb63e8a674b4818cb5d5e461f1ccf4b2932f/src/consensus/consensus.h#L10 +[miners' panel]: https://youtu.be/H-ErmmDQRFs?t=1086 +[payment channel efficiency]: https://scalingbitcoin.org/hongkong2015/presentations/DAY2/1_layer2_2_dryja.pdf +[previous soft forks]: https://github.com/bitcoin/bips/blob/master/bip-0123.mediawiki#classification-of-existing-bips +[q simple raise]: #size-bump diff --git a/en/bitcoin-core/capacity-increases.md b/en/bitcoin-core/capacity-increases.md index 87bf7c64..6e4fa2f6 100644 --- a/en/bitcoin-core/capacity-increases.md +++ b/en/bitcoin-core/capacity-increases.md @@ -19,7 +19,8 @@ Bitcoin system.][1] We have been working on scalability for several years within the Bitcoin Core project and consider this the best possible continuation of our efforts. -A FAQ is being prepared and will be linked from here when available. +For more information, please see the +[FAQ](/en/bitcoin-core/capacity-increases-faq). {% include bitcoin-core/capability-increases-sigs.md %} diff --git a/en/bitcoin-core/index.md b/en/bitcoin-core/index.md index e1949d76..c72f859f 100644 --- a/en/bitcoin-core/index.md +++ b/en/bitcoin-core/index.md @@ -91,7 +91,7 @@ breadcrumbs: {% endcapture %} {% assign array_releases = text_releases | strip_newlines | split: '::' %} - - 2015-12-21 - [Roadmap: Capacity increases for the Bitcoin system](/en/bitcoin-core/capacity-increases) + - 2015-12-21 - Capacity increases for the Bitcoin system: [Statement](/en/bitcoin-core/capacity-increases) & [FAQ](/en/bitcoin-core/capacity-increases-faq) {% comment %}{% endcomment %} {% for release in array_releases %} {% if forloop.index <= 3 %} From f16634a6b010e3b524356747e7e0ab5cf682d6b1 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Tue, 22 Dec 2015 21:22:23 -0500 Subject: [PATCH 31/33] Capacity increases: update Chinese translations Translation by jl2012 --- zh_CN/bitcoin-core/capacity-increases.md | 3 ++- zh_TW/bitcoin-core/capacity-increases.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/zh_CN/bitcoin-core/capacity-increases.md b/zh_CN/bitcoin-core/capacity-increases.md index 8d78d9eb..d99f4a46 100644 --- a/zh_CN/bitcoin-core/capacity-increases.md +++ b/zh_CN/bitcoin-core/capacity-increases.md @@ -17,7 +17,7 @@ breadcrumbs: 我们连署支持 [比特币系统扩展][1] 路线图。我们已在Bitcoin Core计划内为可扩展性工作多年，认为这是最可以延续我们一直以来努力的方向。 -我们正准备一份常见问答集，完成後会在此连结。 +有关更多详情请参阅 [常见问题解答][FAQ]，中文版本正在准备中。 {% include bitcoin-core/capability-increases-sigs.md %} @@ -27,3 +27,4 @@ breadcrumbs: [1]: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-December/011865.html +[FAQ]: /en/bitcoin-core/capacity-increases-faq diff --git a/zh_TW/bitcoin-core/capacity-increases.md b/zh_TW/bitcoin-core/capacity-increases.md index 35dd25b8..52b91500 100644 --- a/zh_TW/bitcoin-core/capacity-increases.md +++ b/zh_TW/bitcoin-core/capacity-increases.md @@ -17,7 +17,7 @@ breadcrumbs: 我們連署支持[比特幣系統擴展][1]路線圖。我們已在Bitcoin Core計劃內為可擴展性工作多年，認為這是最可以延續我們一直以來努力的方向。 -我們正準備一份常見問答集，完成後會在此連結。 +有關更多詳情請參閱 [常見問題解答][FAQ]，中文版本正在準備中。 {% include bitcoin-core/capability-increases-sigs.md %} @@ -26,3 +26,4 @@ Core計劃內為可擴展性工作多年，認為這是最可以延續我們一 如果你想參與連署，請到[#1165](https://github.com/bitcoin-dot-org/bitcoin.org/pull/1165)。 [1]: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-December/011865.html +[FAQ]: /en/bitcoin-core/capacity-increases-faq From 4f906e43fe23532e904eb56db8c9fe852cb102cd Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Tue, 22 Dec 2015 21:44:32 -0500 Subject: [PATCH 32/33] Capacity increases FAQ: fix typos reported by Dooglus (thanks!) --- en/bitcoin-core/capacity-increases-faq.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/en/bitcoin-core/capacity-increases-faq.md b/en/bitcoin-core/capacity-increases-faq.md index 1c6e671a..25083423 100644 --- a/en/bitcoin-core/capacity-increases-faq.md +++ b/en/bitcoin-core/capacity-increases-faq.md @@ -143,7 +143,7 @@ Hard forks are anything but simple: Despite these considerable complications, with sufficient precautions, none of them is fatal to a hard fork, and we do expect to make hard forks in the future. But with segregated witness (segwit) we have a -soft fork, similar to to other soft forks we've performed and gained +soft fork, similar to other soft forks we've performed and gained experience in deploying, that provides us with many benefits in addition to allowing more transactions to be added to the blockchain. @@ -210,12 +210,12 @@ formulate long-term plans. Wallets that currently support P2SH can migrate to full segregated witness in two phases: -- Phase 1: Scripts are hashed twice, first to 256 bytes and then to 160 - bytes. The 160 byte hash will be compatible with existing P2SH +- Phase 1: Scripts are hashed twice, first to 256 bits and then to 160 + bits. The 160 bit hash will be compatible with existing P2SH addresses, so upgraded wallets will be able to send and receive bitcoins to and from currently existing wallets. -- Phase 2: Scripts are hashed once to 256 bytes. This format will not be +- Phase 2: Scripts are hashed once to 256 bits. This format will not be compatible with existing wallets but will allow more efficient use of block space and will offer better security due to greater collision resistance. @@ -246,7 +246,7 @@ table; they are just provided for reference.) Web wallets and exchanges that send large numbers of transactions each day at fixed rates (such as for free or for 1% per spend) are expected to be early adopters---even the small savings per spend seen in the -table above adds up to significant amounts of money if repeated hundreds +table above will add up to significant amounts of money if repeated hundreds or thousands of times a day. ## I heard you were breaking zero-confirmation transactions. Which technology in the scaling roadmap is doing that? {#rbf} @@ -311,7 +311,7 @@ either. For example, The BIP66 (strict DER) soft fork which activated in July 2015 will soon be providing reduced processing time by making it possible to switch to libsecp256k1 for validation as described elsewhere is this -FAQ. The reduced validation time make makes it fairly unique among soft +FAQ. The reduced validation time makes it uncommon among soft forks in providing direct benefits to miners. What segregated witness (segwit) does is provide several major benefits From cc79a1ee7de9a2a6366898b7ace3a33d9853d24e Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Wed, 23 Dec 2015 18:44:46 -0500 Subject: [PATCH 33/33] Capacity increases FAQ: add links --- en/bitcoin-core/capacity-increases-faq.md | 29 +++++++++++++---------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/en/bitcoin-core/capacity-increases-faq.md b/en/bitcoin-core/capacity-increases-faq.md index 25083423..0e6330e5 100644 --- a/en/bitcoin-core/capacity-increases-faq.md +++ b/en/bitcoin-core/capacity-increases-faq.md @@ -37,19 +37,19 @@ specific improvements described in the [roadmap][]. contributors to test segregated witness and for wallet authors to begin working with it. -- **Libsecp256k1 verification:** 500% to 700% speed boost on x86\_64 +- **[Libsecp256k1][] verification:** 500% to 700% speed boost on x86\_64 hardware during verification to help new full nodes join the network and to lighten the burden on existing nodes. -- **OP\_CHECKSEQUENCEVERIFY:** 25,000% improvement in bi-directional +- **[OP\_CHECKSEQUENCEVERIFY][BIP112]:** 25,000% improvement in bi-directional [payment channel efficiency][] by allowing users to keep channels open as long as they want. -- **VersionBits:** increase the maximum number of soft forks able to be +- **[VersionBits][BIP9]:** increase the maximum number of soft forks able to be deployed simultaneously from 1 to 29, allowing for faster and more decentralized future upgrades of the network. -- **Segregated witness:** 175% to 400% direct capacity upgrade, 66% +- **[Segregated witness][bip-segwit]:** 175% to 400% direct capacity upgrade, 66% additional improvement in bi-directional channel efficiency by consolidating channel open and close operations, an end to third-party malleability that hurts smart contract deployment, fraud @@ -280,8 +280,8 @@ long time to confirm, helping to prevent transactions from getting ## Weak blocks and IBLTs just say “2016” in the roadmap schedule. Does this mean you have no idea when they'll be available? {#weak-blocks-iblts} -Weak blocks and IBLTs are two separate technologies that are still being -actively studied to choose the right parameters, but the number of +[Weak blocks and IBLTs][] are two separate technologies that are still being +[actively studied][] to choose the right parameters, but the number of developers working on them is limited and so it's difficult to guess when they'll be deployed. @@ -293,7 +293,7 @@ within 2016. After deployment, both weak blocks and IBLTs may benefit from a simple non-controversial soft fork ([canonical transaction ordering][]), which -should be easy to deploy using the BIP9 versionBits system described +should be easy to deploy using the [BIP9][] versionBits system described elsewhere in this FAQ. [canonical transaction ordering]: https://gist.github.com/gavinandresen/e20c3b5a1d4b97f79ac2#canonical-ordering-of-transactions @@ -303,12 +303,12 @@ elsewhere in this FAQ. Most [previous soft forks][] have not provided these benefits to miners either. For example, -| BIP16 (P2SH) | New transaction type | -| BIP30 (duplicate txids) | Required checking for duplicate txids | -| BIP34 (height in coinbase) | Reduced miner coinbase space by 4 bytes | -| BIP65 (OP_CLTV) | New opcode | +| [BIP16][] (P2SH) | New transaction type | +| [BIP30][] (duplicate txids) | Required checking for duplicate txids | +| [BIP34][] (height in coinbase) | Reduced miner coinbase space by 4 bytes | +| [BIP65][] (OP_CLTV) | New opcode | -The BIP66 (strict DER) soft fork which activated in July 2015 will +The [BIP66][] (strict DER) soft fork which activated in July 2015 will soon be providing reduced processing time by making it possible to switch to libsecp256k1 for validation as described elsewhere is this FAQ. The reduced validation time makes it uncommon among soft @@ -342,8 +342,11 @@ To get specific suggestions on how you can help, please join the [#bitcoin-dev][] IRC channel. [#bitcoin-dev]: https://webchat.freenode.net/?channels=bitcoin-dev&uio=d4 +[actively studied]: http://diyhpl.us/wiki/transcripts/scalingbitcoin/bitcoin-block-propagation-iblt-rusty-russell/ +[bip-segwit]: https://github.com/jl2012/bips/blob/segwit/bip-segwit.mediawiki [BIP9]: https://github.com/bitcoin/bips/blob/master/bip-0009.mediawiki [BIP16]: https://github.com/bitcoin/bips/blob/master/bip-0016.mediawiki +[BIP30]: https://github.com/bitcoin/bips/blob/master/bip-0030.mediawiki [BIP34]: https://github.com/bitcoin/bips/blob/master/bip-0034.mediawiki [BIP50]: https://github.com/bitcoin/bips/blob/master/bip-0050.mediawiki [BIP65]: https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki @@ -356,9 +359,11 @@ To get specific suggestions on how you can help, please join the [code review]: https://bitcoin.org/en/development#code-review [estimated savings]: https://www.reddit.com/r/bitcoinxt/comments/3w1i6b/i_attended_scaling_bitcoin_hong_kong_these_are_my/cxtkaih [increase in total bandwidth]: https://scalingbitcoin.org/hongkong2015/presentations/DAY1/3_block_propagation_1_rosenbaum.pdf +[libsecp256k1]: https://github.com/bitcoin/secp256k1 [libsecp256k1 verification]: https://github.com/bitcoin/bitcoin/pull/6954 [max_block_size]: https://github.com/bitcoin/bitcoin/blob/3038eb63e8a674b4818cb5d5e461f1ccf4b2932f/src/consensus/consensus.h#L10 [miners' panel]: https://youtu.be/H-ErmmDQRFs?t=1086 [payment channel efficiency]: https://scalingbitcoin.org/hongkong2015/presentations/DAY2/1_layer2_2_dryja.pdf [previous soft forks]: https://github.com/bitcoin/bips/blob/master/bip-0123.mediawiki#classification-of-existing-bips +[weak blocks and iblts]: https://www.youtube.com/watch?v=ivgxcEOyWNs&t=1h40m20s [q simple raise]: #size-bump