diff --git a/_alerts/2016-11-01-alert-retirement.md b/_alerts/2016-11-01-alert-retirement.md
index 51a17b56..5907b668 100644
--- a/_alerts/2016-11-01-alert-retirement.md
+++ b/_alerts/2016-11-01-alert-retirement.md
@@ -11,13 +11,16 @@ active: false
## Updates
-* **January 19th 2017**: The Final alert has been broadcast. This final alert essentially disables the alert system by overriding all
+* **January 19, 2017**: The Final alert has been broadcast. This final alert essentially disables the alert system by overriding all
alerts, preventing other alerts from being broadcast, and displays the static message "Alert Key Compromised". The Alert Key
will be published in the coming months.
+* **March 8, 2017**: Bitcoin Core 0.14 released with hard-coded [final alert](https://bitcoin.org/en/release/v0.14.0#final-alert).
+* **May 1, 2017**: Postpone release date of Alert key. Older clients may contain Alert handling code which is exploitable using the alert key, therefore the public release of the key has been temporarily postponed until considered safe.
+
## Summary
-The network wide Alert system is being retired. **_No Bitcoins are at risk and this warning may be safely ignored._**
+The network wide Alert system is being retired. **_No Bitcoins are at risk and this warning may be safely ignored._**
Upgrade to the newest version of your wallet software to no longer see the alert.
## Reasons for Retirement
@@ -36,11 +39,11 @@ still must have handling for the Alert system because it is network wide. Someth
not be imposed on the entire network.
The Alert system has also lost its usefulness. It is no longer necessary to use it to inform users about problematic network
-events as users can easily get their information from any major Bitcoin news outlet.
+events as users can easily get their information from any major Bitcoin news outlet.
## The Retirement Plan
-Retirement of the Alert system consists of a pre-final alert (this alert) which will warn about the impending retirement, a
+Retirement of the Alert system consists of a pre-final alert (this alert) which will warn about the impending retirement, a
final maximum sequence alert which cannot be overridden and displays a static "Alert Key Compromised" message, and the
publishing of the Alert key itself. The final alert will be hard coded into Bitcoin Core 0.14 to ensure that all old nodes
receive the final alert.
@@ -49,15 +52,15 @@ receive the final alert.
|---|---|---|
|Pre-final Alert Posts|Posts on Bitcoin.org, various forums, and various mailing lists that the Alert system will be retired|2016-11-01|
|Pre-final Alert|The alert itself warning that the Alert system will be retired|2016-11-02|
-|Final Alert|Max sequence Alert to disable the Alert system|2017 (Will coincide with Bitcoin Core 0.14 Release Candidate process)|
-|Alert key released|The Alert key will be made publicly available|1-2 months after the Final Alert|
+|Final Alert|Max sequence Alert to disable the Alert system|2017-01-19|
+|Alert key release|The Alert key will be made publicly available|Postponed until further notice.|
## Software without the Alert system
-Most major Bitcoin wallets have already removed the alert system in the most recent releases. The software listed below
+Most major Bitcoin wallets have already removed the alert system in the most recent releases. The software listed below
are guaranteed to have removed/disabled the Alert system or allow you to disable it.
-* Bitcoin Core 0.13.1, 0.13.0, 0.12.1
+* Bitcoin Core 0.12.1+
* Bitcoin Core 0.10.3, 0.11.x, and 0.12.x can disable alerts with `-alerts=0`
* Armory 0.94.1+
diff --git a/_autocrossref.yaml b/_autocrossref.yaml
index 3dddb596..9b04f687 100644
--- a/_autocrossref.yaml
+++ b/_autocrossref.yaml
@@ -201,6 +201,8 @@ CVE-2012-2459:
'`addwitnessaddress` RPC': rpc addwitnessaddress
'`backupwallet`': rpc backupwallet
'`backupwallet` RPC': rpc backupwallet
+'`bumpfee`': rpc bumpfee
+'`bumpfee` RPC': rpc bumpfee
'`clearbanned`': rpc clearbanned
'`clearbanned` RPC': rpc clearbanned
'`createmultisig`': rpc createmultisig
@@ -265,6 +267,8 @@ CVE-2012-2459:
'`gethashespersec` RPC': rpc gethashespersec
'`getinfo`': rpc getinfo
'`getinfo` RPC': rpc getinfo
+'`getmemoryinfo`': rpc getmemoryinfo
+'`getmemoryinfo` RPC': rpc getmemoryinfo
'`getmempoolancestors`': rpc getmempoolancestors
'`getmempoolancestors` RPC': rpc getmempoolancestors
'`getmempooldescendants`': rpc getmempooldescendants
@@ -313,6 +317,8 @@ CVE-2012-2459:
'`help` RPC': rpc help
'`importaddress`': rpc importaddress
'`importaddress` RPC': rpc importaddress
+'`importmulti`': rpc importmulti
+'`importmulti` RPC': rpc importmulti
'`importprivkey`': rpc importprivkey
'`importprivkey` RPC': rpc importprivkey
'`importprunedfunds`': rpc importprunedfunds
@@ -345,6 +351,12 @@ CVE-2012-2459:
'`move` RPC': rpc move
'`ping`': rpc ping
'`ping` RPC': rpc ping
+'`preciousblock`': rpc preciousblock
+'`preciousblock` RPC': rpc preciousblock
+'`prioritisetransaction`': rpc prioritisetransaction
+'`prioritisetransaction` RPC': rpc prioritisetransaction
+'`pruneblockchain`': rpc pruneblockchain
+'`pruneblockchain` RPC': rpc pruneblockchain
'`removeprunedfunds`': rpc removeprunedfunds
'`removeprunedfunds` RPC': rpc removeprunedfunds
'`sendfrom`': rpc sendfrom
@@ -364,6 +376,8 @@ CVE-2012-2459:
'`setban` RPC': rpc setban
'`setgenerate`': rpc setgenerate
'`setgenerate` RPC': rpc setgenerate
+'`setnetworkactive`': rpc setnetworkactive
+'`setnetworkactive` RPC': rpc setnetworkactive
'`settxfee`': rpc settxfee
'`settxfee` RPC': rpc settxfee
'`signmessage`': rpc signmessage
@@ -416,4 +430,6 @@ Bitcoin Core 0.12.1:
Bitcoin Core 0.13.0:
Bitcoin Core 0.13.1:
Bitcoin Core 0.13.2:
+Bitcoin Core 0.14.0:
+Bitcoin Core 0.14.1:
Bitcoin Core master:
diff --git a/_config.yml b/_config.yml
index 82cf25db..01091416 100644
--- a/_config.yml
+++ b/_config.yml
@@ -252,6 +252,7 @@ devsearches:
- 'AddNode': "/en/developer-reference#addnode"
- 'AddWitnessAddress': "/en/developer-reference#addwitnessaddress"
- 'BackupWallet': "/en/developer-reference#backupwallet"
+ - 'BumpFee': "/en/developer-reference#bumpfee"
- 'ClearBanned': "/en/developer-reference#clearbanned"
- 'CreateMultisig': "/en/developer-reference#createmultisig"
- 'CreateRawTransaction': "/en/developer-reference#createrawtransaction"
@@ -284,6 +285,7 @@ devsearches:
- 'GetGenerate': "/en/developer-reference#getgenerate"
- 'GetHashesPerSec': "/en/developer-reference#gethashespersec"
- 'GetInfo': "/en/developer-reference#getinfo"
+ - 'GetMemoryInfo': "/en/developer-reference#getmemoryinfo"
- 'GetMempoolInfo': "/en/developer-reference#getmempoolinfo"
- 'GetMempoolEntry': "/en/developer-reference#getmempoolentry"
- 'GetMempoolAncestors': "/en/developer-reference#getmempoolancestors"
@@ -307,7 +309,8 @@ devsearches:
- 'GetWalletInfo': "/en/developer-reference#getwalletinfo"
- 'GetWork': "/en/developer-reference#getwork"
- 'Help': "/en/developer-reference#help"
- - 'ImportAddress': "/en/developer-reference#importaddress"
+ - 'ImportAddress': "/en/developer-reference#importaddress"
+ - 'ImportMulti': "/en/developer-reference#importmulti"
- 'ImportPrivkey': "/en/developer-reference#importprivkey"
- 'ImportPrunedFunds': "/en/developer-reference#importprunedfunds"
- 'ImportWallet': "/en/developer-reference#importwallet"
@@ -324,6 +327,9 @@ devsearches:
- 'LockUnspent': "/en/developer-reference#lockunspent"
- 'Move': "/en/developer-reference#move"
- 'Ping': "/en/developer-reference#ping-rpc"
+ - 'PreciousBlock': "/en/developer-reference#preciousblock"
+ - 'PrioritiseTransaction': "/en/developer-reference#prioritisetransaction"
+ - 'PruneBlockChain': "/en/developer-reference#pruneblockchain"
- 'RemovePrunedFunds': "/en/developer-reference#removeprunedfunds"
- 'SendFrom': "/en/developer-reference#sendfrom"
- 'SendMany': "/en/developer-reference#sendmany"
@@ -332,6 +338,7 @@ devsearches:
- 'SetAccount': "/en/developer-reference#setaccount"
- 'SetBan': "/en/developer-reference#setban"
- 'SetGenerate': "/en/developer-reference#setgenerate"
+ - 'SetNetworkActive': "/en/developer-reference#setnetworkactive"
- 'SetTxFee': "/en/developer-reference#settxfee"
- 'SignMessage': "/en/developer-reference#signmessage"
- 'SignMessageWithPrivKey': "/en/developer-reference#signmessagewithprivkey"
diff --git a/_contrib/bco-htmlproof b/_contrib/bco-htmlproof
index 8f2af944..3d01088e 100755
--- a/_contrib/bco-htmlproof
+++ b/_contrib/bco-htmlproof
@@ -27,10 +27,11 @@ HTML::Proofer.new(
## Links to ignore
:href_ignore => [
- '#', ## hrefs pointing to the current page (htmlproofer fails them)
- /^$/, ## anchors with no href attribute set (for clickable javascript elements)
- /^\/bin/, ## /bin dir is not part of repository; holds Bitcoin Core binaries
- /^\/stats/ ## /stats dir is not part of repository; generated by separate stats script
+ '#', ## hrefs pointing to the current page (htmlproofer fails them)
+ /^$/, ## anchors with no href attribute set (for clickable javascript elements)
+ /^\/bin/, ## /bin dir is not part of repository; holds Bitcoin Core binaries
+ 'bitcoin:1GwV7fPX97hmavc6iNrUZUogmjpLPrPFoE', ## bitcoin address handlers
+ /^\/stats/ ## /stats dir is not part of repository; generated by separate stats script
],
## Mangle links. If we enable external link checking, this will
diff --git a/_includes/devdoc/bitcoin-core/rest/quick-reference.md b/_includes/devdoc/bitcoin-core/rest/quick-reference.md
index 07ea0f91..e92b2f20 100644
--- a/_includes/devdoc/bitcoin-core/rest/quick-reference.md
+++ b/_includes/devdoc/bitcoin-core/rest/quick-reference.md
@@ -9,13 +9,13 @@ http://opensource.org/licenses/MIT.
{% autocrossref %}
-* [GET Block][rest get block] {{summary_restGetBlock}} {{NEW0_10_0}}, {{UPDATED0_13_0}}
-* [GET Block/NoTxDetails][rest get block-notxdetails] {{summary_restGetBlock-noTxDetails}} {{NEW0_10_0}}, {{UPDATED0_13_0}}
+* [GET Block][rest get block] {{summary_restGetBlock}} {{UPDATED0_13_0}}
+* [GET Block/NoTxDetails][rest get block-notxdetails] {{summary_restGetBlock-noTxDetails}} {{UPDATED0_13_0}}
* [GET ChainInfo][rest get chaininfo] {{summary_restGetChainInfo}} {{NEW0_11_0}}, {{UPDATED0_12_0}}
* [GET GetUtxos][rest get getutxos] {{summary_restGetGetUtxos}} {{NEW0_11_0}}
* [GET Headers][rest get headers] {{summary_restGetHeaders}} {{NEW0_11_0}}, {{UPDATED0_13_0}}
* [GET MemPool/Contents][rest get mempool-contents] {{summary_restGetMemPool-contents}} {{NEW0_12_0}}
* [GET MemPool/Info][rest get mempool-info] {{summary_restGetMemPool-info}} {{NEW0_12_0}}
-* [GET Tx][rest get tx] {{summary_restGetTx}} {{NEW0_10_0}}, {{UPDATED0_13_0}}
+* [GET Tx][rest get tx] {{summary_restGetTx}} {{UPDATED0_13_0}}
{% endautocrossref %}
diff --git a/_includes/devdoc/bitcoin-core/rest/requests/get_tx.md b/_includes/devdoc/bitcoin-core/rest/requests/get_tx.md
index 19c27ac3..da945df7 100644
--- a/_includes/devdoc/bitcoin-core/rest/requests/get_tx.md
+++ b/_includes/devdoc/bitcoin-core/rest/requests/get_tx.md
@@ -11,7 +11,7 @@ http://opensource.org/licenses/MIT.
{% autocrossref %}
-The `GET tx` operation {{summary_restTx}}
+The `GET tx` operation {{summary_restGetTx}}
{{reindexNote}}
diff --git a/_includes/devdoc/bitcoin-core/rpcs/quick-ref.md b/_includes/devdoc/bitcoin-core/rpcs/quick-ref.md
index 7ced5b70..218e8907 100644
--- a/_includes/devdoc/bitcoin-core/rpcs/quick-ref.md
+++ b/_includes/devdoc/bitcoin-core/rpcs/quick-ref.md
@@ -16,11 +16,16 @@ changes made more than two years ago.
Use v0.n.n in abbreviation title to prevent autocrossrefing.
{% endcomment %}
-
-{% assign NEW_MASTER='**New in master**' %}
-{% assign UPDATED_MASTER='**Updated in master**' %}
+
{% assign DEPRECATED='**Deprecated**' %}
+
+{% assign UPDATED0_14_0='**Updated in 0.14.1**' %}
+
+
+{% assign NEW0_14_0='**New in 0.14.0**' %}
+{% assign UPDATED0_14_0='**Updated in 0.14.0**' %}
+
{% assign UPDATED0_13_1='*Updated in 0.13.1*' %}
@@ -38,10 +43,6 @@ Use v0.n.n in abbreviation title to prevent autocrossrefing.
{% assign NEW0_11_0='*New in 0.11.0*' %}
-
-{% assign NEW0_10_0='*New in 0.10.0*' %}
-{% assign UPDATED0_10_0='*Updated in 0.10.0*' %}
-
to the specified file, which can be a directory or a path with filename." %}
+{% assign summary_bumpFee="replaces an unconfirmed wallet transaction that signaled RBF with a new transaction that pays a higher fee." %}
{% assign summary_clearBanned="clears list of banned nodes." %}
{% assign summary_createMultiSig="creates a P2SH multi-signature address." %}
{% assign summary_createRawTransaction="creates an unsigned serialized transaction that spends a previous output to a new output with a P2PKH or P2SH address. The transaction is not stored in the wallet or transmitted to the network." %}
{% assign summary_decodeRawTransaction="decodes a serialized transaction hex string into a JSON object describing the transaction." %}
{% assign summary_decodeScript="decodes a hex-encoded P2SH redeem script." %}
-{% assign summary_disconnectnode="immediately disconnects from a specified node." %}
+{% assign summary_disconnectNode="immediately disconnects from a specified node." %}
{% assign summary_dumpPrivKey="returns the wallet-import-format (WIP) private key corresponding to an address. (But does not remove it from the wallet.)" %}
{% assign summary_dumpWallet="creates or overwrites a file with all wallet keys in a human-readable format." %}
{% assign summary_encryptWallet="encrypts the wallet with a passphrase. This is only to enable encryption for the first time. After encryption is enabled, you will need to enter the passphrase to use private keys." %}
@@ -41,6 +42,7 @@ This file is licensed under the terms of its source texts{%endcomment%}
{% assign summary_getMemPoolDescendants="returns all in-mempool descendants for a transaction in the mempool." %}
{% assign summary_getMemPoolEntry="returns mempool data for given transaction (must be in mempool)." %}
{% assign summary_getMemPoolInfo="returns information about the node's current transaction memory pool." %}
+{% assign summary_getMemoryInfo="returns information about memory usage." %}
{% assign summary_getMiningInfo="returns various mining-related information." %}
{% assign summary_getNetTotals="returns information about network traffic, including bytes in, bytes out, and the current time." %}
{% assign summary_getNetworkHashPS="returns the estimated current or historical network hashes per second based on the last *n* blocks." %}
@@ -61,6 +63,7 @@ This file is licensed under the terms of its source texts{%endcomment%}
{% assign summary_getWork="was removed in Bitcoin Core 0.10.0." %}
{% assign summary_help="lists all available public RPC commands, or gets help for the specified RPC. Commands which are unavailable will not be listed, such as wallet RPCs if wallet support is disabled." %}
{% assign summary_importAddress="adds an address or pubkey script to the wallet without the associated private key, allowing you to watch for transactions affecting that address or pubkey script without being able to spend any of its outputs." %}
+{% assign summary_importMulti="imports addresses or scripts (with private keys, public keys, or P2SH redeem scripts) and optionally performs the minimum necessary rescan for all imports." %}
{% assign summary_importPrivKey="adds a private key to your wallet. The key should be formatted in the wallet import format created by the `dumpprivkey` RPC." %}
{% assign summary_importPrunedFunds="imports funds without the need of a rescan. Meant for use with pruned wallets." %}
{% assign summary_importWallet="imports private keys from a file in wallet dump file format (see the `dumpwallet` RPC). These keys will be added to the keys currently in the wallet. This call may need to rescan all or parts of the block chain for transactions affecting the newly-added keys, which may take several minutes." %}
@@ -77,13 +80,15 @@ This file is licensed under the terms of its source texts{%endcomment%}
{% assign summary_lockUnspent="temporarily locks or unlocks specified transaction outputs. A locked transaction output will not be chosen by automatic coin selection when spending bitcoins. Locks are stored in memory only, so nodes start with zero locked outputs and the locked output list is always cleared when a node stops or fails." %}
{% assign summary_move="moves a specified amount from one account in your wallet to another using an off-block-chain transaction." %}
{% assign summary_ping-rpc="sends a P2P ping message to all connected nodes to measure ping time. Results are provided by the `getpeerinfo` RPC pingtime and pingwait fields as decimal seconds. The P2P `ping` message is handled in a queue with all other commands, so it measures processing backlog, not just network ping." %}
+{% assign summary_preciousBlock="treats a block as if it were received before others with the same work." %}
{% assign summary_prioritiseTransaction="adds virtual priority or fee to a transaction, allowing it to be accepted into blocks mined by this node (or miners which use this node) with a lower priority or fee. (It can also remove virtual priority or fee, requiring the transaction have a higher priority or fee to be accepted into a locally-mined block.)" %}
+{% assign summary_pruneBlockChain="prunes the blockchain up to a specified height or timestamp." %}
{% assign summary_removePrunedFunds="deletes the specified transaction from the wallet. Meant for use with pruned wallets and as a companion to importprunedfunds." %}
{% assign summary_restGetBlock-noTxDetails="gets a block with a particular header hash from the local block database either as a JSON object or as a serialized block. The JSON object includes TXIDs for transactions within the block rather than the complete transactions [GET block][rest get block] returns." %}
{% assign summary_restGetBlock="gets a block with a particular header hash from the local block database either as a JSON object or as a serialized block." %}
-{% assign summary_restGetChainInfo="provides information about the current state of the block chain." %}
+{% assign summary_restGetChainInfo="returns information about the current state of the block chain." %}
{% assign summary_restGetGetUtxos="returns an UTXO set given a set of outpoints." %}
-{% assign summary_restGetHeaders="returns a specified amout of block headers in upward direction." %}
+{% assign summary_restGetHeaders="returns a specified amount of block headers in upward direction." %}
{% assign summary_restGetMemPool-contents="returns all transaction in the memory pool with detailed information." %}
{% assign summary_restGetMemPool-info="returns information about the node's current transaction memory pool." %}
{% assign summary_restGetTx="gets a hex-encoded serialized transaction or a JSON object describing the transaction. By default, Bitcoin Core only stores complete transaction data for UTXOs and your own transactions, so this method may fail on historic transactions unless you use the non-default `txindex=1` in your Bitcoin Core startup settings." %}
@@ -94,6 +99,7 @@ This file is licensed under the terms of its source texts{%endcomment%}
{% assign summary_setAccount="puts the specified address in the given account." %}
{% assign summary_setBan="attempts add or remove a IP/Subnet from the banned list." %}
{% assign summary_setGenerate="was removed in Bitcoin Core 0.13.0." %}
+{% assign summary_setNetworkActive="disables/enables all P2P network activity." %}
{% assign summary_setTxFee="sets the transaction fee per kilobyte paid by transactions created by this wallet." %}
{% assign summary_signMessage="signs a message with the private key of an address." %}
{% assign summary_signMessageWithPrivKey="signs a message with a given private key." %}
diff --git a/_includes/helpers/vars.md b/_includes/helpers/vars.md
index 3278df11..3ffa0d1b 100644
--- a/_includes/helpers/vars.md
+++ b/_includes/helpers/vars.md
@@ -7,7 +7,7 @@ http://opensource.org/licenses/MIT.
- n: "{{DEPTH}}
`involvesWatchonly`"
t: "bool"
p: "Optional
(0 or 1)"
- d: "*Added in Bitcoin Core 0.10.0*
Set to `true` if the payment involves a watch-only address. Otherwise not returned"
+ d: "Set to `true` if the payment involves a watch-only address. Otherwise not returned"
- n: "{{DEPTH}}
`account`"
t: "string"
@@ -32,7 +32,7 @@ http://opensource.org/licenses/MIT.
- n: "{{DEPTH}}
`vout`"
t: "number (int)"
p: "Required
(exactly 1)"
- d: "*Added in Bitcoin Core 0.10.0*
For an output, the output index (vout) for this output in this transaction. For an input, the output index for the output being spent in its transaction. Because inputs list the output indexes from previous transactions, more than one entry in the details array may have the same output index"
+ d: "For an output, the output index (vout) for this output in this transaction. For an input, the output index for the output being spent in its transaction. Because inputs list the output indexes from previous transactions, more than one entry in the details array may have the same output index"
- n: "{{DEPTH}}
`fee`"
t: "number (bitcoins)"
@@ -280,7 +280,7 @@ bitcoins even if this parameter is set to `1` or higher.{% endcapture %}
- n: "Include Watch-Only"
t: "bool"
p: "Optional
(0 or 1)"
- d: "*Added in Bitcoin Core 0.10.0*
If set to `true`, include watch-only addresses in details and calculations as if they were regular addresses belonging to the wallet. If set to `false` (the default), treat watch-only addresses as if they didn't belong to this wallet"
+ d: "If set to `true`, include watch-only addresses in details and calculations as if they were regular addresses belonging to the wallet. If set to `false` (the default), treat watch-only addresses as if they didn't belong to this wallet"
{% enditemplate %}
{% endcapture %}
diff --git a/_includes/layout/base-core/footer-menu.html b/_includes/layout/base-core/footer-menu.html
index 59b5c794..81ce4b2d 100644
--- a/_includes/layout/base-core/footer-menu.html
+++ b/_includes/layout/base-core/footer-menu.html
@@ -3,6 +3,10 @@ This file is licensed under the MIT License (MIT) available on
http://opensource.org/licenses/MIT.
{% endcomment %}
+
Bitcoin.org is community supported: 1GwV7fPX97hmavc6iNrUZUogmjpLPrPFoE
+