From 1fdf2611c63e11eee02023d3565fa7f0d9de8bbf Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Tue, 3 Jan 2017 09:38:06 +0100 Subject: [PATCH 01/14] Bitcoin Core 0.13.2 --- _releases/v0.13.2.md | 210 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 210 insertions(+) create mode 100644 _releases/v0.13.2.md diff --git a/_releases/v0.13.2.md b/_releases/v0.13.2.md new file mode 100644 index 00000000..142268af --- /dev/null +++ b/_releases/v0.13.2.md @@ -0,0 +1,210 @@ +--- +# 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.13.2 +## Required title. +title: Bitcoin Core version 0.13.2 released +## Optional release date. May be filled in hours/days after a release +optional_date: 2017-01-03 +## 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:746697d03db3ff531158b1133bab5d1e4cef4e5a&dn=bitcoin-core-0.13.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%2Ftracker.leechers-paradise.org%3A6969&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.13.2 is now available from: + + + +This is a new minor version release, including various bugfixes and +performance improvements, as well as updated translations. + +Please report bugs using the issue tracker at github: + + + +To receive security and update notifications, please subscribe to: + + + +Compatibility +============== + +Microsoft ended support for Windows XP on [April 8th, 2014](https://www.microsoft.com/en-us/WindowsForBusiness/end-of-xp-support), +an OS initially released in 2001. This means that not even critical security +updates will be released anymore. Without security updates, using a bitcoin +wallet on a XP machine is irresponsible at least. + +In addition to that, with 0.12.x there have been varied reports of Bitcoin Core +randomly crashing on Windows XP. It is [not clear](https://github.com/bitcoin/bitcoin/issues/7681#issuecomment-217439891) +what the source of these crashes is, but it is likely that upstream +libraries such as Qt are no longer being tested on XP. + +We do not have time nor resources to provide support for an OS that is +end-of-life. From 0.13.0 on, Windows XP is no longer supported. Users are +suggested to upgrade to a newer version of Windows, or install an alternative OS +that is supported. + +No attempt is made to prevent installing or running the software on Windows XP, +you can still do so at your own risk, but do not expect it to work: do not +report issues about Windows XP to the issue tracker. + +From 0.13.1 onwards OS X 10.7 is no longer supported. 0.13.0 was intended to work on 10.7+, +but severe issues with the libc++ version on 10.7.x keep it from running reliably. +0.13.1 now requires 10.8+, and will communicate that to 10.7 users, rather than crashing unexpectedly. + +Notable changes +=============== + +Change to wallet handling of mempool rejection +----------------------------------------------- + +When a newly created transaction failed to enter the mempool due to +the limits on chains of unconfirmed transactions the sending RPC +calls would return an error. The transaction would still be queued +in the wallet and, once some of the parent transactions were +confirmed, broadcast after the software was restarted. + +This behavior has been changed to return success and to reattempt +mempool insertion at the same time transaction rebroadcast is +attempted, avoiding a need for a restart. + +Transactions in the wallet which cannot be accepted into the mempool +can be abandoned with the previously existing abandontransaction RPC +(or in the GUI via a context menu on the transaction). + + +0.13.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. + +### Consensus +- #9293 `e591c10` [0.13 Backport #9053] IBD using chainwork instead of height and not using header timestamp (gmaxwell) +- #9053 `5b93eee` IBD using chainwork instead of height and not using header timestamps (gmaxwell) + +### RPC and other APIs +- #8845 `1d048b9` Don't return the address of a P2SH of a P2SH (jnewbery) +- #9041 `87fbced` keypoololdest denote Unix epoch, not GMT (s-matthew-english) +- #9122 `f82c81b` fix getnettotals RPC description about timemillis (visvirial) +- #9042 `5bcb05d` [rpc] ParseHash: Fail when length is not 64 (MarcoFalke) +- #9194 `f26dab7` Add option to return non-segwit serialization via rpc (instagibbs) +- #9347 `b711390` [0.13.2] wallet/rpc backports (MarcoFalke) +- #9292 `c365556` Complain when unknown rpcserialversion is specified (sipa) +- #9322 `49a612f` [qa] Don't set unknown rpcserialversion (MarcoFalke) + +### Block and transaction handling +- #8357 `ce0d817` [mempool] Fix relaypriority calculation error (maiiz) +- #9267 `0a4aa87` [0.13 backport #9239] Disable fee estimates for a confirm target of 1 block (morcos) +- #9196 `0c09d9f` Send tip change notification from invalidateblock (ryanofsky) + +### P2P protocol and network code +- #8995 `9ef3875` Add missing cs_main lock to ::GETBLOCKTXN processing (TheBlueMatt) +- #9234 `94531b5` torcontrol: Explicitly request RSA1024 private key (laanwj) +- #8637 `2cad5db` Compact Block Tweaks (rebase of #8235) (sipa) +- #9058 `286e548` Fixes for p2p-compactblocks.py test timeouts on travis (#8842) (ryanofsky) +- #8865 `4c71fc4` Decouple peer-processing-logic from block-connection-logic (TheBlueMatt) +- #9117 `6fe3981` net: don't send feefilter messages before the version handshake is complete (theuni) +- #9188 `ca1fd75` Make orphan parent fetching ask for witnesses (gmaxwell) +- #9052 `3a3bcbf` Use RelevantServices instead of node_network in AttemptToEvict (gmaxwell) +- #9048 `9460771` [0.13 backport #9026] Fix handling of invalid compact blocks (sdaftuar) +- #9357 `03b6f62` [0.13 backport #9352] Attempt reconstruction from all compact block announcements (sdaftuar) +- #9189 `b96a8f7` Always add default_witness_commitment with GBT client support (sipa) +- #9253 `28d0f22` Fix calculation of number of bound sockets to use (TheBlueMatt) +- #9199 `da5a16b` Always drop the least preferred HB peer when adding a new one (gmaxwell) + +### Build system +- #9169 `d1b4da9` build: fix qt5.7 build under macOS (theuni) +- #9326 `a0f7ece` Update for OpenSSL 1.1 API (gmaxwell) +- #9224 `396c405` Prevent FD_SETSIZE error building on OpenBSD (ivdsangen) + +### GUI +- #8972 `6f86b53` Make warnings label selectable (jonasschnelli) (MarcoFalke) +- #9185 `6d70a73` Fix coincontrol sort issue (jonasschnelli) +- #9094 `5f3a12c` Use correct conversion function for boost::path datadir (laanwj) +- #8908 `4a974b2` Update bitcoin-qt.desktop (s-matthew-english) +- #9190 `dc46b10` Plug many memory leaks (laanwj) + +### Wallet +- #9290 `35174a0` Make RelayWalletTransaction attempt to AcceptToMemoryPool (gmaxwell) +- #9295 `43bcfca` Bugfix: Fundrawtransaction: don't terminate when keypool is empty (jonasschnelli) +- #9302 `f5d606e` Return txid even if ATMP fails for new transaction (sipa) +- #9262 `fe39f26` Prefer coins that have fewer ancestors, sanity check txn before ATMP (instagibbs) + +### Tests and QA +- #9159 `eca9b46` Wait for specific block announcement in p2p-compactblocks (ryanofsky) +- #9186 `dccdc3a` Fix use-after-free in scheduler tests (laanwj) +- #9168 `3107280` Add assert_raises_message to check specific error message (mrbandrews) +- #9191 `29435db` 0.13.2 Backports (MarcoFalke) +- #9077 `1d4c884` Increase wallet-dump RPC timeout (ryanofsky) +- #9098 `ecd7db5` Handle zombies and cluttered tmpdirs (MarcoFalke) +- #8927 `387ec9d` Add script tests for FindAndDelete in pre-segwit and segwit scripts (jl2012) +- #9200 `eebc699` bench: Fix subtle counting issue when rescaling iteration count (laanwj) + +### Miscellaneous +- #8838 `094848b` Calculate size and weight of block correctly in CreateNewBlock() (jnewbery) +- #8920 `40169dc` Set minimum required Boost to 1.47.0 (fanquake) +- #9251 `a710a43` Improvement of documentation of command line parameter 'whitelist' (wodry) +- #8932 `106da69` Allow bitcoin-tx to create v2 transactions (btcdrak) +- #8929 `12428b4` add software-properties-common (sigwo) +- #9120 `08d1c90` bug: Missed one "return false" in recent refactoring in #9067 (UdjinM6) +- #9067 `f85ee01` Fix exit codes (UdjinM6) +- #9340 `fb987b3` [0.13] Update secp256k1 subtree (MarcoFalke) +- #9229 `b172377` Remove calls to getaddrinfo_a (TheBlueMatt) + +Credits +======= + +Thanks to everyone who directly contributed to this release: + +- Alex Morcos +- BtcDrak +- Cory Fields +- fanquake +- Gregory Maxwell +- Gregory Sanders +- instagibbs +- Ivo van der Sangen +- jnewbery +- Johnson Lau +- Jonas Schnelli +- Luke Dashjr +- maiiz +- MarcoFalke +- Masahiko Hyuga +- Matt Corallo +- matthias +- mrbandrews +- Pavel Janík +- Pieter Wuille +- randy-waterhouse +- Russell Yanofsky +- S. Matthew English +- Steven +- Suhas Daftuar +- UdjinM6 +- Wladimir J. van der Laan +- wodry + +As well as everyone that helped translating on [Transifex](https://www.transifex.com/projects/p/bitcoin/). + +{% endgithubify %} From 6333ba96cd88d3ba16bece23d242d0b15cd0aeb9 Mon Sep 17 00:00:00 2001 From: Will Binns Date: Tue, 3 Jan 2017 00:19:35 -0600 Subject: [PATCH 02/14] community: Fix misalignment issue in country list This resolves an issue where-in the countries were not lining up correctly, causing the layout to look messed up on the [Community](https://bitcoin.org/en/community) page. --- _templates/community.html | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/_templates/community.html b/_templates/community.html index 3e31412e..67e08274 100644 --- a/_templates/community.html +++ b/_templates/community.html @@ -74,15 +74,15 @@ id: community Bitcoin Australia

- -

Austrian flagAustria

Bitcoin Austria

-
-
+
+
+
+

Belgian flagBelgium

Belgian Bitcoin Association @@ -95,14 +95,14 @@ id: community Bitcoin Alliance of Canada

-
- +

French flagFrance

@@ -115,14 +115,14 @@ id: community Bundesverband Bitcoin e.V.

-
- +

Irish flagIreland

@@ -135,14 +135,14 @@ id: community איגוד הביטקוין הישראלי

-
- +

Dutch flagNetherlands

@@ -150,8 +150,6 @@ id: community Bitcoin Embassy Amsterdam

-
-

Philippine flagPhilippines

@@ -164,14 +162,14 @@ id: community Polish Bitcoin Association

+
+ -

Russian flagRussia

@@ -184,14 +182,14 @@ id: community Bitcoin Foundation Ukraine

+
+ -

Swedish flagSweden

From 9b9b7732fd23319ea1f7bc8cc1add40c82a673d3 Mon Sep 17 00:00:00 2001 From: Will Binns Date: Sat, 31 Dec 2016 08:16:53 -0600 Subject: [PATCH 03/14] en: Add string for 'Vouchers' --- _translations/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/_translations/en.yml b/_translations/en.yml index 73c85455..3a3df47c 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -703,6 +703,7 @@ en: news: "News" documentaries: "Documentaries" learn: "Learning resources" + vouchers: "Vouchers" secure-your-wallet: title: "Securing your wallet - Bitcoin" pagetitle: "Securing your wallet" From eb0cd45a87b5776466be27eef4cf76d9c415bdf8 Mon Sep 17 00:00:00 2001 From: Will Binns Date: Sat, 31 Dec 2016 08:23:38 -0600 Subject: [PATCH 04/14] resources: Add 'Vouchers', Consolidate 'Learn' --- _templates/resources.html | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/_templates/resources.html b/_templates/resources.html index e149f6d5..adc399c7 100644 --- a/_templates/resources.html +++ b/_templates/resources.html @@ -10,12 +10,17 @@ id: resources

-
-

Icon{% translate useful %}

+
+

Icon{% translate learn %}

{% translate linkwiki %}

WeUseCoins.com

BitcoinMining.com

-
+

Icon{% translate directories %}

{% translate linkwallets %} - bitcoin.org

{% translate linkmerchants %} - coinmap.org

@@ -38,7 +43,8 @@ id: resources

Bitcoin Magazine

CoinJournal

{% if page.lang == 'ru' %}

Биткойн Форум / Новости

{% else %}

BitcoinTalk press links

{% endif %} -
+
+

Icon{% translate charts %}

Blockchain.info

Biteasy.com

@@ -53,12 +59,12 @@ id: resources

BitcoinFilm.org

Ulterior States

The Bitcoin Phenomenon

-
+
+

Icon{% translate vouchers %}

+

Fold

+

Gyft

+

Opendime

-
+
\ No newline at end of file From 34b123639bf2f044f02b8665620236a834b6a9bd Mon Sep 17 00:00:00 2001 From: Will Binns Date: Sat, 31 Dec 2016 08:28:28 -0600 Subject: [PATCH 05/14] icons: Add icons for vouchers --- img/icons/ico_voucher.png | Bin 0 -> 680 bytes img/icons/ico_voucher.svg | 8 ++++++++ 2 files changed, 8 insertions(+) create mode 100644 img/icons/ico_voucher.png create mode 100644 img/icons/ico_voucher.svg diff --git a/img/icons/ico_voucher.png b/img/icons/ico_voucher.png new file mode 100644 index 0000000000000000000000000000000000000000..3b97638b367dce863114c840ff0d8bf1dc71fe71 GIT binary patch literal 680 zcmV;Z0$2TsP)oGR6!KR@!xFLXd*^o5o3ZFR!ABP*+!y>R;IDo zPv8r7Zli^*c7lbK_yG*oBHCIAX(b8@g4ifANTML>=4D+Si(JVjX0!M1Zb;#Q(+p?k z|D2g~W+ucKZKvh7mHuA|2qBDw5GF$i*BZz3TL|2b3Xb3~j-v<9*968GyY49BGa?r8 z8V_*vpV%#c_a<2`<6O)5E&%hmj9EOx{Uq}%spfY8?!hH|!uQ_Z-Z(ls`YVCIK+l#4 zNWd48jDH{&3WYc`GZRatQXCi|?S}oS=^*BF2AN%_HB9^*#1SnW-s||f@Y%EqP zl{hps^mlBwD*_NOh1zBUHt^{*0@BpLO_Z=BMQo$JPZPAMfDpnNTt|OKIK1mfKnURg z9<~Wz(#Z~l5OR2eJ#D~Qsh5wbBAXQ6ZB1G(r7vK(tuDaXF2FCQzF*eChw-%o_%a@6 zy4oAydAvlu0|9f`*RFs&$@aAiU&N^_@EGHoFWCZqH!Ic_wurki#;MFR*VRB7-|#a- z=5@S6K5O>Py5JC|C2xHSucFuvyy;_P<vpW-e7o?b0vd#z#uqDB>w5SS9(4k5 zDIgJ1z|#$mWDa|`TtI`6t5!Q@0Vg|!XA+QzIEJ^l(G7TvQAifvHv0p%R;OFD#`fs| O0000 + + + + + + + From b3a691ab6ddcbda72e67911bf57686fd9c5d8339 Mon Sep 17 00:00:00 2001 From: Will Binns Date: Sat, 31 Dec 2016 08:44:40 -0600 Subject: [PATCH 06/14] en: Drop 'Useful places' string --- _translations/en.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/_translations/en.yml b/_translations/en.yml index 3a3df47c..e90822ff 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -690,7 +690,6 @@ en: title: "Resources - Bitcoin" pagetitle: "Bitcoin resources" pagedesc: "Find useful websites and resources about Bitcoin." - useful: "Useful places" linkwiki: "Bitcoin Wiki" linkcointelegraph: "CoinTelegraph" directories: "Directories" From 4b179968b444c831e711e226f3d05bb3378cf560 Mon Sep 17 00:00:00 2001 From: Will Binns Date: Sat, 31 Dec 2016 09:06:18 -0600 Subject: [PATCH 07/14] resources: Resolve issue with div spacing --- _templates/resources.html | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/_templates/resources.html b/_templates/resources.html index adc399c7..8db70839 100644 --- a/_templates/resources.html +++ b/_templates/resources.html @@ -19,8 +19,7 @@ id: resources

Bitcoin Knowledge Podcast

Khan Academy

IamSatoshi

-
-
+

Icon{% translate directories %}

{% translate linkwallets %} - bitcoin.org

{% translate linkmerchants %} - coinmap.org

@@ -43,8 +42,7 @@ id: resources

Bitcoin Magazine

CoinJournal

{% if page.lang == 'ru' %}

Биткойн Форум / Новости

{% else %}

BitcoinTalk press links

{% endif %} -
-
+

Icon{% translate charts %}

Blockchain.info

Biteasy.com

@@ -59,8 +57,7 @@ id: resources

BitcoinFilm.org

Ulterior States

The Bitcoin Phenomenon

-
-
+

Icon{% translate vouchers %}

Fold

Gyft

From 8fb89a5bd7b06c45bca9f4317c87d23bb68b6800 Mon Sep 17 00:00:00 2001 From: Will Binns Date: Sat, 31 Dec 2016 09:07:55 -0600 Subject: [PATCH 08/14] resources: Reorder some of the learning resources --- _templates/resources.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_templates/resources.html b/_templates/resources.html index 8db70839..5fe27c45 100644 --- a/_templates/resources.html +++ b/_templates/resources.html @@ -13,11 +13,11 @@ id: resources

Icon{% translate directories %}

From 54422ffcbf5eaf54ccb8e90d03877505ed138d5b Mon Sep 17 00:00:00 2001 From: Will Binns Date: Sun, 1 Jan 2017 17:41:06 -0600 Subject: [PATCH 09/14] full-node: Add info on pruning to reduce storage --- en/full-node.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/en/full-node.md b/en/full-node.md index 1ea3f709..5fb0f2e2 100644 --- a/en/full-node.md +++ b/en/full-node.md @@ -1287,6 +1287,25 @@ 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 Storage + +It is possible to configure your node to to run in pruned mode in order to +reduce storage requirements. This can reduce the disk usage from over 100GB to +around 2GB. + +Running a node in pruned mode disables the RPCs `importwallet`, `importaddress`, +and `importprivkey`. + +To enable block pruning set `prune=` on the command line or in `bitcoin.conf`, +where `N` is the number of MiB to allot for raw block & undo data. + +A value of `0` disables pruning. The minimal value above `0` is `550`. Your +wallet is as secure with high values as it is with low ones. Higher values +merely ensure that your node will not shut down upon blockchain reorganizations +of more than 2 days - which are unlikely to happen in practice. In future +releases, a higher value may also help the network as a whole because stored +blocks could be served to other nodes. + ### Reduce Traffic Some node operators need to deal with bandwith caps imposed by their ISPs. From 941d4e5d5e36840ae612057911ffaab277f9a3be Mon Sep 17 00:00:00 2001 From: Will Binns Date: Sun, 1 Jan 2017 22:07:49 -0600 Subject: [PATCH 10/14] full-node: Add note about txindex and rescan --- en/full-node.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/en/full-node.md b/en/full-node.md index 5fb0f2e2..af471b60 100644 --- a/en/full-node.md +++ b/en/full-node.md @@ -1293,7 +1293,8 @@ It is possible to configure your node to to run in pruned mode in order to reduce storage requirements. This can reduce the disk usage from over 100GB to around 2GB. -Running a node in pruned mode disables the RPCs `importwallet`, `importaddress`, +Running a node in pruned mode is incompatible with `-txindex` +and `-rescan` and disables the RPCs `importwallet`, `importaddress`, and `importprivkey`. To enable block pruning set `prune=` on the command line or in `bitcoin.conf`, From d5f24bee1fcdbfd9bbcdf795c335f705957b3bb8 Mon Sep 17 00:00:00 2001 From: Will Binns Date: Mon, 2 Jan 2017 23:49:41 -0600 Subject: [PATCH 11/14] full-node: Drop brackets around 'N' for readability --- en/full-node.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/full-node.md b/en/full-node.md index af471b60..c1be4667 100644 --- a/en/full-node.md +++ b/en/full-node.md @@ -1297,7 +1297,7 @@ Running a node in pruned mode is incompatible with `-txindex` and `-rescan` and disables the RPCs `importwallet`, `importaddress`, and `importprivkey`. -To enable block pruning set `prune=` on the command line or in `bitcoin.conf`, +To enable block pruning set `prune=N` on the command line or in `bitcoin.conf`, where `N` is the number of MiB to allot for raw block & undo data. A value of `0` disables pruning. The minimal value above `0` is `550`. Your From 46a02391f45c6dbfb0881f37b5e1ce9c7a130b6d Mon Sep 17 00:00:00 2001 From: Will Binns Date: Mon, 2 Jan 2017 23:51:26 -0600 Subject: [PATCH 12/14] full-node: Drop ampersand, use 'and' --- en/full-node.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/full-node.md b/en/full-node.md index c1be4667..45c34973 100644 --- a/en/full-node.md +++ b/en/full-node.md @@ -1298,7 +1298,7 @@ and `-rescan` and disables the RPCs `importwallet`, `importaddress`, and `importprivkey`. To enable block pruning set `prune=N` on the command line or in `bitcoin.conf`, -where `N` is the number of MiB to allot for raw block & undo data. +where `N` is the number of MiB to allot for raw block and undo data. A value of `0` disables pruning. The minimal value above `0` is `550`. Your wallet is as secure with high values as it is with low ones. Higher values From d15f4752f0fac61446f3c2cef2d0f1542eff386d Mon Sep 17 00:00:00 2001 From: Will Binns Date: Tue, 3 Jan 2017 00:05:01 -0600 Subject: [PATCH 13/14] full-node: Revise disabled RPCs This removes two of the RPCs because they were later reenabled in Bitcoin Core when in pruning mode. --- en/full-node.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/en/full-node.md b/en/full-node.md index 45c34973..74eab711 100644 --- a/en/full-node.md +++ b/en/full-node.md @@ -1293,9 +1293,8 @@ It is possible to configure your node to to run in pruned mode in order to reduce storage requirements. This can reduce the disk usage from over 100GB to around 2GB. -Running a node in pruned mode is incompatible with `-txindex` -and `-rescan` and disables the RPCs `importwallet`, `importaddress`, -and `importprivkey`. +Running a node in pruned mode is incompatible with `-txindex` and `-rescan`. It +also disables the RPC `importwallet`. To enable block pruning set `prune=N` on the command line or in `bitcoin.conf`, where `N` is the number of MiB to allot for raw block and undo data. From 8a0762be4f9c5406c51025fbdd56e26a90294ae8 Mon Sep 17 00:00:00 2001 From: Will Binns Date: Tue, 3 Jan 2017 00:08:14 -0600 Subject: [PATCH 14/14] full-node: Add importprunedfunds/removeprunedfunds --- en/full-node.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/en/full-node.md b/en/full-node.md index 74eab711..0702447b 100644 --- a/en/full-node.md +++ b/en/full-node.md @@ -1294,7 +1294,8 @@ reduce storage requirements. This can reduce the disk usage from over 100GB to around 2GB. Running a node in pruned mode is incompatible with `-txindex` and `-rescan`. It -also disables the RPC `importwallet`. +also disables the RPC `importwallet`. Two RPCs that are available and +potentially helpful, however, are `importprunedfunds` and `removeprunedfunds`. To enable block pruning set `prune=N` on the command line or in `bitcoin.conf`, where `N` is the number of MiB to allot for raw block and undo data.