diff --git a/README.md b/README.md index 21c9dfd8..b48c410d 100644 --- a/README.md +++ b/README.md @@ -538,34 +538,148 @@ is the particular version: ### Alerts -Network alerts should be placed in `_alerts/YYYY-MM-DD-SHORTITLE.html` and adhere to this format: +1. [Who to contact](#who-to-contact) +2. [Basic alert](#basic-alert) (emergency fast instructions) +3. [Detailed alert](#detailed-alert) +4. [Clearing an alert](#clearing-an-alert) -``` +#### Who to Contact + +The following people can publish alerts on Bitcoin.org. Their email +addresses are on the linked GitHub profiles. + +- Saïvann Carignan, [@saivann](https://github.com/saivann), saivann on Freenode +- Dave Harding, [@harding](https://github.com/harding), harding on Freenode +- Wladimir van der Laan, [@laanwj](https://github.com/laanwj), wumpus on Freenode +- Theymos, [@theymos](https://github.com/theymos), theymos on Freenode + +Several of the above are only occasionally on Freenode. Alert +coordination is usually conducted in #bitcoin-dev on Freenode. + +#### Basic Alert + +1. Open your editor on a file named `_alerts/YYYY-MM-DD-short-title.md` + (the alert will appear as ). + +2. Paste the following text into the top of the file: + + ``` + --- + ## Title displayed on alert page + title: "11/12 March 2013 Chain Fork" + ## Short URL for use in P2P network alerts: https://bitcoin.org/ + shorturl: "chainfork" + ## Active alerts will display the banner (below) on all bitcoin.org content pages + active: true + ## Banner displayed if 'active: true'. Can use HTML formatting + banner: "Chain fork - Please stop mining on bitcoin version 0.8.0. Click here for more information." + --- + + {% comment %} + First paragraph should indicate whose bitcoins are safe, to avoid + starting a panic. + {% comment %} + + Your bitcoins are safe if you received them in transactions + confirmed before 2015-07-06 00:00 UTC. + + {% comment %} + Second paragraph should summarize the problem, and subsequent + text should indicate what people should do immediately. + Consider: users (by wallet type), merchants, and miners. + {% comment %} + + However, there has been a problem with a planned upgrade. For + bitcoins received later than the time above, confirmation scores are + significantly less reliable then they usually are for users of + certain software: + + - Lightweight (SPV) wallet users should wait an additional 30 + confirmations more than you would normally wait. Electrum users, + please see this note. + ``` + +- Edit the file. It is written in [Markdown format][]. + +- Commit it. + + - **Note:** the commit must be signed by one of the people in the + [Who to Contact](#who-to-contact) section for site + auto-building to work. + +- Push the commit to the master branch. Rebuilding the site occurs + automatically and takes 7 to 15 minutes. + + - **Note:** do not push additional commits until the alert is + displayed on the live site. The site build aborts and starts over + when new commits are found. + +- Give the `shorturl` URL (`bitcoin.org/`) to the P2P alert message + key holders to use in any alert messages they send. + +- Proceed to the next section to improve the alert. + +#### Detailed Alert + +In addition to providing more information about how users should respond +to the situation, you can enhance the alert in several ways described +below. + +The following fields may be defined in the the alert YAML header: + +```yaml --- +## (Required; HTML text) Title displayed on alert page title: "11/12 March 2013 Chain Fork" -alias: "chainfork" +## (Optional; display ASCII only) Short URL for use in P2P network alerts: https://bitcoin.org/ +shorturl: "chainfork" +## (Optional; default=false) Active alerts will display the banner (below) on all bitcoin.org content pages active: true +## (Optional; HTML text) Banner displayed if 'active: true'. Can use HTML formatting banner: "Chain fork - Please stop mining on bitcoin version 0.8.0. Click here for more information." +## (Optional; default=alert) CSS class to set banner color +## alert = red | warning = orange | success = green | info = blue +bannerclass: alert --- +``` -

-A chain fork is happening. Please stop mining on bitcoin version 0.8.0. Your bitcoins are safe but it is recommended that you postpone your Bitcoin transactions for the next hours. -

-

-More information will follow. -

+The time of the last update should be placed on the page somewhere. UTC +should be used for all dates, and RFC 2822 format ( date -uR ) is +recommended for long dates. For example, place the date in the footer of +the document: + +```html
This notice last updated: Thu, 16 May 2013 01:37:00 UTC
- ``` -* `SHORTTITLE` is used to construct the URL. -* `title: ...` will be used as the title in the layout. -* `alias: ...` (optional) a short alias for Bitcoin Core alerts. Ex. "dos" will produce /dos.html -* `active: ...` (true or false) define if the alert should appear as ongoing in the network status page. -* `banner: ...` (optional) a short text that will be displayed in an alert banner and link to the alert page. -* `bannerclass: ...` (optional) a CSS class that sets the color of the banner. Possible values: alert (default red), warning (orange), success (green), info (blue). -* `last updated: ...` should be kept up to date and be in RFC 2822 format ( date -uR ). + +You may also want to create a page on the Wiki to allow anyone to +provide additional information. If you do so, link to it from the +alert. + +#### Clearing An Alert + +To stop advertising an alert on every Bitcoin.org page, change the YAML +header field `active` to *false*: + +```yaml +## (Optional; default=false) Active alerts will display the banner (below) on all bitcoin.org content pages +active: false +``` + +Alternatively, for a few days you can change the message and set the +CSS `bannerclass` to *success* to indicate the problem has been resolved. + +```yaml +## (Optional; HTML text) Banner displayed if 'active: true'. Can use HTML formatting +banner: "Chain fork - situation resolved" +## (Optional; default=alert) CSS class to set banner color +## alert = red | warning = orange | success = green | info = blue +bannerclass: success +``` + +[markdown format]: https://help.github.com/articles/markdown-basics/ ## Wallets @@ -586,6 +700,7 @@ Basic requirements: - SSL certificate passes [Qualys SSL Labs SSL test](https://www.ssllabs.com/ssltest/) - Website serving executable code or requiring authentication uses HSTS with a max-age of at least 180 days - The identity of CEOs and/or developers is public +- Avoid address reuse by using a new change address for each transaction - If private keys or encryption keys are stored online: - Refuses weak passwords (short passwords and/or common passwords) used to secure access to any funds, or provides an aggressive account lock-out feature in response to failed login attempts along with a strict account recovery process. - If user has no access over its private keys: @@ -611,7 +726,6 @@ Basic requirements: Optional criterias (some could become requirements): - Received independent security audit(s) -- Avoid address reuse by using a new change address for each transaction - Avoid address reuse by displaying a new receiving address for each transaction in the wallet UI - Does not show "received from" Bitcoin addresses in the UI - Uses deterministic ECDSA nonces (RFC 6979) diff --git a/_alerts/2012-02-18-protocol-change.html b/_alerts/2012-02-18-protocol-change.html index 803ff2d8..cc95153d 100644 --- a/_alerts/2012-02-18-protocol-change.html +++ b/_alerts/2012-02-18-protocol-change.html @@ -1,6 +1,6 @@ --- title: "February 20, 2012 Protocol Changes" -alias: "feb20" +shorturl: "feb20" active: false banner: "" --- diff --git a/_alerts/2012-03-16-critical-vulnerability.html b/_alerts/2012-03-16-critical-vulnerability.html index 27da905a..8ef6b867 100644 --- a/_alerts/2012-03-16-critical-vulnerability.html +++ b/_alerts/2012-03-16-critical-vulnerability.html @@ -1,6 +1,6 @@ --- title: "Potentially Critical Security Vulnerability" -alias: "critfix" +shorturl: "critfix" active: false banner: "" --- diff --git a/_alerts/2012-05-14-dos.html b/_alerts/2012-05-14-dos.html index 1a4715af..88cb8855 100644 --- a/_alerts/2012-05-14-dos.html +++ b/_alerts/2012-05-14-dos.html @@ -1,6 +1,6 @@ --- title: "CVE-2012-2459: Critical Vulnerability (denial-of-service)" -alias: "dos" +shorturl: "dos" active: false banner: "" --- diff --git a/_alerts/2013-03-11-chain-fork.html b/_alerts/2013-03-11-chain-fork.html index c3ec6439..6ef31653 100644 --- a/_alerts/2013-03-11-chain-fork.html +++ b/_alerts/2013-03-11-chain-fork.html @@ -1,6 +1,6 @@ --- title: "11/12 March 2013 Chain Fork Information" -alias: "chainfork" +shorturl: "chainfork" active: false banner: "" --- diff --git a/_alerts/2013-03-15-upgrade-deadline.html b/_alerts/2013-03-15-upgrade-deadline.html index 585a8c5e..06f98ff5 100644 --- a/_alerts/2013-03-15-upgrade-deadline.html +++ b/_alerts/2013-03-15-upgrade-deadline.html @@ -1,6 +1,6 @@ --- title: "15 May 2013 Upgrade Deadline" -alias: "may15" +shorturl: "may15" active: false banner: "" --- diff --git a/_alerts/2013-08-11-android.html b/_alerts/2013-08-11-android.html index 29d4b4a5..79175222 100644 --- a/_alerts/2013-08-11-android.html +++ b/_alerts/2013-08-11-android.html @@ -1,7 +1,7 @@ --- title: "Android Security Vulnerability" active: false -alias: "android" +shorturl: "android" banner: "" --- diff --git a/_alerts/2014-04-11-heartbleed.html b/_alerts/2014-04-11-heartbleed.html index b63d11a4..50b98e26 100644 --- a/_alerts/2014-04-11-heartbleed.html +++ b/_alerts/2014-04-11-heartbleed.html @@ -1,6 +1,6 @@ --- title: "OpenSSL Heartbleed vulnerability" -alias: "heartbleed" +shorturl: "heartbleed" active: false banner: "" --- diff --git a/_alerts/2015-07-04-spv-mining.md b/_alerts/2015-07-04-spv-mining.md index a641cf5e..6a404c5c 100644 --- a/_alerts/2015-07-04-spv-mining.md +++ b/_alerts/2015-07-04-spv-mining.md @@ -3,7 +3,7 @@ ## http://opensource.org/licenses/MIT. title: "Some Miners Generating Invalid Blocks" -alias: "spv-mining" +shorturl: "spv-mining" active: false #banner: "WARNING: many wallets currently vulnerable to double-spending of confirmed transactions (click here to read)" bannerclass: "alert" diff --git a/_contrib/bco-htmlproof b/_contrib/bco-htmlproof index d23c115d..8f2af944 100755 --- a/_contrib/bco-htmlproof +++ b/_contrib/bco-htmlproof @@ -28,6 +28,7 @@ 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 ], diff --git a/_events.yml b/_events.yml index 3bb0dcf0..f76ccd4f 100644 --- a/_events.yml +++ b/_events.yml @@ -1,91 +1,3 @@ -- date: 2015-06-24 - title: "London Blockchain Conference" - venue: "The London Escalator" - address: "69-89 Mile End Rd, E1 4TT" - city: "London" - country: "United Kingdom" - link: "http://blockchainlondon.com/" - -- date: 2015-06-26 - title: "HVA Blockchain blockstrap course" - venue: "Amsterdam University of Applied Sciences" - address: "Duivendrechtsekade 36-38" - city: "Amsterdam" - country: "Netherlands" - link: "https://bitcoinembassy.nl/hva-blockchain-blockstrap-course-amsterdam-2015-06-26/" - -- date: 2015-06-29 - title: "Blockchain Payments" - venue: "Deloitte Amsterdam" - address: "Gustav Mahlerlaan 2970" - city: "Amsterdam" - country: "The Netherlands" - link: "https://www.about-payments.com/newsroom/events/blockchain-payments-2015-29-june-2015" - -- date: 2015-07-01 - title: "Bitcoin Wednesday 2-Year Anniversary Conference" - venue: "VondelCS: The media, culture and broadcasting center in Amsterdam for national broadcaster AVROTROS." - address: "Vondelpark 3" - city: "Amsterdam" - country: "The Netherlands" - link: "http://www.bitcoinwednesday.com/event/bitcoin-wednesday-25/" - -- date: 2015-07-02 - title: "Blockchain Incredible Party" - venue: "Hub Odessa" - address: "Grecheskaya str. 1a" - city: "Odessa" - country: "Ukraine" - link: "http://bip001.com" - -- date: 2015-07-06 - title: "The New Context" - venue: "Toranomon Hills Forum" - address: "23 Toranomon 1 chome, Minato-ku, 105-6305" - city: "Tokyo" - country: "Japan" - link: "http://ncc.garage.co.jp/en/" - -- date: 2015-07-08 - title: "WIRED Money" - venue: "The British Museum" - address: "Great Russell Street, WC1B 3DG" - city: "London" - country: "United Kingdom" - link: "http://www.wiredevent.co.uk/wired-money-2015" - -- date: 2015-07-10 - title: "Inside Bitcoins Chicago" - venue: "Navy Pier" - address: "600 East Grand Ave, Chicago, IL 60611" - city: "Chicago" - country: "United States" - link: "http://insidebitcoins.com/chicago/2015?utm_source=bitcoinorg&utm_medium=eventlisting&utm_campaign=bitcoinorgeventlistingibchicago" - -- date: 2015-07-18 - title: "III Brazilian Bitcoin Conference" - venue: "Centro de Inovação ACATE Primavera" - address: "Rodovia SC 401, Km 4 | Bairro Saco Grande" - city: "Florianopolis" - country: "Brazil" - link: "http://www.bitconf.com.br" - -- date: 2015-07-18 - title: "avalBit: Pay Paella with bitcoin " - venue: "Polígono Industrial Plá dels Olivars" - address: "Av espinoca" - city: "Valencia" - country: "Spain" - link: "http://avalbit.org/actividades/evento-pagar-paella-birras-y-bitcoins/" - -- date: 2015-07-28 - title: "Digital Currencies + The Blockchain" - venue: "Convene" - address: "730 Third Avenue, 10017" - city: "New York" - country: "United States" - link: "http://www.americanbanker.com/conferences/digitalcurrencies/" - - date: 2015-08-03 title: "Keynote" venue: "Park Plaza Hotel" @@ -96,8 +8,8 @@ - date: 2015-08-05 title: "Bitcoin Wednesday #26" - venue: "VondelCS: The media, culture and broadcasting center in Amsterdam for national broadcaster AVROTROS." - address: "Vondelpark 3" + venue: "Rockstart Ballroom" + address: "Rockstart Accelerator, Herengracht 182" city: "Amsterdam" country: "The Netherlands" link: "http://www.bitcoinwednesday.com/event/bitcoin-wednesday-26/" @@ -118,6 +30,14 @@ country: "United States" link: "http://cryptolina.com/" +- date: 2015-09-02 + title: "Bitcoin Wednesday Conference" + venue: Rockstart Ballroom + address: Rockstart Accelerator, Herengracht 182 + city: "Amsterdam" + country: "The Netherlands" + link: "http://www.bitcoinwednesday.com/event/bitcoin-wednesday-27/" + - date: 2015-09-10 title: "Consensus 2015" venue: "TimesCenter" @@ -174,6 +94,14 @@ country: "United States" link: "http://www.imtconferences.com/mtbit/" +- date: 2015-12-14 + title: "Inside Bitcoins San Diego" + venue: "San Diego Convention Center" + address: "111 W. Harbor Drive" + city: "San Diego" + country: "United States" + link: "http://insidebitcoins.com/san-diego/2015?utm_source=bitcoinorg&utm_medium=eventlisting&utm_campaign=bitcoinorgeventlistingibsd" + - date: 2016-04-04 title: "Money 20/20 Europe" venue: "Bella Center" diff --git a/_includes/fragment_reviews_needed.md b/_includes/fragment_reviews_needed.md index 768039da..f9326297 100644 --- a/_includes/fragment_reviews_needed.md +++ b/_includes/fragment_reviews_needed.md @@ -6,7 +6,7 @@ http://opensource.org/licenses/MIT.
BETA: This documentation has not been extensively reviewed by Bitcoin experts and so likely contains numerous errors. Please use the Issue and Edit links on the bottom left menu to help us improve. Click here to close this disclaimer. -X +X
diff --git a/_includes/index.html b/_includes/index.html index ce39f4e5..e58118af 100644 --- a/_includes/index.html +++ b/_includes/index.html @@ -4,7 +4,7 @@ http://opensource.org/licenses/MIT. {% endcomment %}

{% translate listintro %}

-
+
Youtube video
diff --git a/_includes/layout/base/breadcrumbs.html b/_includes/layout/base/breadcrumbs.html new file mode 100644 index 00000000..fd2f430d --- /dev/null +++ b/_includes/layout/base/breadcrumbs.html @@ -0,0 +1,28 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +
+ {% for crumb in page.breadcrumbs %} + {% if forloop.last %} + {% case crumb %} + {% when "GLOSSARY_ENTRY_TITLE" %} + {% comment %} ## Only show first synonym in crumb ## {% endcomment %} + {% for synonym in page.required.synonyms_shown_in_glossary_capitalize_first_letter %} + {% if forloop.first %}{{synonym}}{% endif %} + {% endfor %} + {% else %}{{crumb}} + {% endcase %} + {% else %} + {% case crumb %} + {% comment %}/// Alphabetical order by crumb \\\{% endcomment %} + {% when "bitcoin" %}{% translate bitcoin vocabulary %} + {% when "dev docs" %}Dev Docs + {% when "glossary" %}Glossary + {% else %}{% die "Breadcrumb not found in _includes/layout/breadcrumbs.html" %} + {% endcase %} + > + {% endif %} + {% endfor %} +
diff --git a/_includes/layout/base/content.html b/_includes/layout/base/content.html new file mode 100644 index 00000000..001db305 --- /dev/null +++ b/_includes/layout/base/content.html @@ -0,0 +1,8 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +
+ {{ content }} +
diff --git a/_includes/layout/base/footer-js.html b/_includes/layout/base/footer-js.html new file mode 100644 index 00000000..b75ea04a --- /dev/null +++ b/_includes/layout/base/footer-js.html @@ -0,0 +1,9 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + + diff --git a/_includes/layout/base/footer-license.html b/_includes/layout/base/footer-license.html new file mode 100644 index 00000000..3332cef0 --- /dev/null +++ b/_includes/layout/base/footer-license.html @@ -0,0 +1,6 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +
© Bitcoin Project 2009-{{ site.time | date: '%Y' }} {% translate footer layout %}
diff --git a/_includes/layout/base/footer-menu.html b/_includes/layout/base/footer-menu.html new file mode 100644 index 00000000..1af12879 --- /dev/null +++ b/_includes/layout/base/footer-menu.html @@ -0,0 +1,18 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +
+ Network Status + {% translate menu-legal layout %} + {% case page.lang %} + {% when 'ar' or 'es' or 'sl' %} + Privacy + {% else %} + {% translate menu-privacy layout %} + {% endcase %} + {% translate menu-press layout %} + {% translate menu-about-us layout %} + Blog +
diff --git a/_includes/layout/base/footer-sponsor.html b/_includes/layout/base/footer-sponsor.html new file mode 100644 index 00000000..9922946e --- /dev/null +++ b/_includes/layout/base/footer-sponsor.html @@ -0,0 +1,8 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +
+
{% translate sponsor layout %} Bitcoin Foundation
+
diff --git a/_includes/layout/base/head-language-dropdown.html b/_includes/layout/base/head-language-dropdown.html new file mode 100644 index 00000000..770ba9e9 --- /dev/null +++ b/_includes/layout/base/head-language-dropdown.html @@ -0,0 +1,17 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} +
    +
  • {{ site.langs[page.lang] }} +
      +
      • + {% assign i = 0 %}{% assign c = site.langsorder.size | divided_by: 2 | plus: 1 %} + {% for lang in site.langsorder %}{% assign mod = i | modulo: c %}{% assign active = ''%}{% if lang == page.lang %}{% assign active = ' class="active"'%}{% endif %} + {% if mod == 0 and i != 0 %}
      • +
    +
    • +
diff --git a/_includes/layout/base/head-language-select.html b/_includes/layout/base/head-language-select.html new file mode 100644 index 00000000..ada4678f --- /dev/null +++ b/_includes/layout/base/head-language-select.html @@ -0,0 +1,9 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} +
diff --git a/_includes/layout/base/head-logo.html b/_includes/layout/base/head-logo.html new file mode 100644 index 00000000..1de7c8f6 --- /dev/null +++ b/_includes/layout/base/head-logo.html @@ -0,0 +1,6 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + + diff --git a/_includes/layout/base/head-menu.html b/_includes/layout/base/head-menu.html new file mode 100644 index 00000000..af454160 --- /dev/null +++ b/_includes/layout/base/head-menu.html @@ -0,0 +1,35 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + + diff --git a/_includes/layout/base/head-mobile-menu.html b/_includes/layout/base/head-mobile-menu.html new file mode 100644 index 00000000..8ffe3ea4 --- /dev/null +++ b/_includes/layout/base/head-mobile-menu.html @@ -0,0 +1,6 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + + diff --git a/_includes/layout/base/html-head.html b/_includes/layout/base/html-head.html new file mode 100644 index 00000000..2b6b4b05 --- /dev/null +++ b/_includes/layout/base/html-head.html @@ -0,0 +1,19 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + + + + +{% capture title %}{% translate title %}{% endcapture %}{% if title != '' %}{{ title }}{% else %}{{ page.title }}{% endif %} +{% capture metadescription %}{% translate metadescription %}{% endcapture %}{% if metadescription != '' %}{% endif %} +{% lesscss main.less %} + + +{% if page.lang == 'ar' or page.lang == 'fa' %}{% lesscss rtl.less %}{% endif %} +{% if page.lang == 'bg' or page.lang == 'el' or page.lang == 'ko' or page.lang == 'hi' or page.lang == 'pl' or page.lang == 'sl' or page.lang == 'ro' or page.lang == 'ru' or page.lang == 'tr' or page.lang == 'uk' or page.lang == 'zh_CN' or page.lang == 'zh_TW' %}{% lesscss sans.less %}{% endif %} + +{% if page.id != 'download' %}{% endif %} + + diff --git a/_includes/layout/base/pagetop-alert.html b/_includes/layout/base/pagetop-alert.html new file mode 100644 index 00000000..6e2a2836 --- /dev/null +++ b/_includes/layout/base/pagetop-alert.html @@ -0,0 +1,10 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +{% if site.ALERT %} + +{% endif %} diff --git a/_includes/layout/base/pagetop-detect-mobile.html b/_includes/layout/base/pagetop-detect-mobile.html new file mode 100644 index 00000000..45e06444 --- /dev/null +++ b/_includes/layout/base/pagetop-detect-mobile.html @@ -0,0 +1,6 @@ +{% comment %} +This file is licensed under the MIT License (MIT) available on +http://opensource.org/licenses/MIT. +{% endcomment %} + +
diff --git a/_includes/ref/bitcoin-core/rpcs/rpcs/lockunspent.md b/_includes/ref/bitcoin-core/rpcs/rpcs/lockunspent.md index a3d848ce..2e72e018 100644 --- a/_includes/ref/bitcoin-core/rpcs/rpcs/lockunspent.md +++ b/_includes/ref/bitcoin-core/rpcs/rpcs/lockunspent.md @@ -18,10 +18,10 @@ The `lockunspent` RPC {{summary_lockUnspent}} *Parameter #1---whether to lock or unlock the outputs* {% itemplate ntpd1 %} -- n: "Lock Or Unlock" +- n: "Unlock" t: "bool" p: "Required
(exactly 1)" - d: "Set to `true` to lock the outputs specified in the following parameter. Set to `false` to unlock the outputs specified. If this is the only argument specified, all outputs will be unlocked (even if this is set to `false`)" + d: "Set to `false` to lock the outputs specified in the following parameter. Set to `true` to unlock the outputs specified. If this is the only argument specified and it is set to `true`, all outputs will be unlocked; if it is the only argument and is set to `false`, there will be no change" {% enditemplate %} @@ -56,7 +56,7 @@ The `lockunspent` RPC {{summary_lockUnspent}} - n: "`result`" t: "bool" p: "Required
(exactly 1)" - d: "Set to `true` if the outputs were successfully locked or unlocked" + d: "Set to `true` if the outputs were successfully locked or unlocked. If the outputs were already locked or unlocked, it will also return `true`" {% enditemplate %} @@ -65,7 +65,7 @@ The `lockunspent` RPC {{summary_lockUnspent}} Lock two outputs: {% highlight bash %} -bitcoin-cli -testnet lockunspent true ''' +bitcoin-cli -testnet lockunspent false ''' [ { "txid": "5a7d24cd665108c66b2d56146f244932edae4e2376b561b3d396d5ae017b9589", @@ -85,10 +85,31 @@ Result: true {% endhighlight %} +Verify the outputs have been locked: + +{% highlight bash %} +bitcoin-cli -testnet listlockunspent +{% endhighlight %} + +Result + +{% highlight json %} +[ + { + "txid": "5a7d24cd665108c66b2d56146f244932edae4e2376b561b3d396d5ae017b9589", + "vout": 0 + }, + { + "txid": "6c5edd41a33f9839257358ba6ddece67df9db7f09c0db6bbea00d0372e8fe5cd", + "vout": 0 + } +] +{% endhighlight %} + Unlock one of the above outputs: {% highlight bash %} -bitcoin-cli -testnet lockunspent false ''' +bitcoin-cli -testnet lockunspent true ''' [ { "txid": "5a7d24cd665108c66b2d56146f244932edae4e2376b561b3d396d5ae017b9589", @@ -104,6 +125,23 @@ Result: true {% endhighlight %} +Verify the output has been unlocked: + +{% highlight bash %} +bitcoin-cli -testnet listlockunspent +{% endhighlight %} + +Result: + +{% highlight json %} +[ + { + "txid": "6c5edd41a33f9839257358ba6ddece67df9db7f09c0db6bbea00d0372e8fe5cd", + "vout": 0 + } +] +{% endhighlight %} + *See also* * [ListLockUnspent][rpc listlockunspent]: {{summary_listLockUnspent}} diff --git a/_includes/ref/bitcoin-core/rpcs/rpcs/settxfee.md b/_includes/ref/bitcoin-core/rpcs/rpcs/settxfee.md index 6fc3292a..e04a15d5 100644 --- a/_includes/ref/bitcoin-core/rpcs/rpcs/settxfee.md +++ b/_includes/ref/bitcoin-core/rpcs/rpcs/settxfee.md @@ -21,7 +21,7 @@ The `settxfee` RPC {{summary_setTxFee}} - n: "Transaction Fee Per Kilobyte" t: "number (bitcoins)" p: "Required
(exactly 1)" - d: "The transaction fee to pay, in bitcoins, for each kilobyte of transaction data. The value `0` will not be accepted. Be careful setting the fee too low---your transactions may not be relayed or included in blocks" + d: "The transaction fee to pay, in bitcoins, for each kilobyte of transaction data. Be careful setting the fee too low---your transactions may not be relayed or included in blocks" {% enditemplate %} diff --git a/_layouts/base.html b/_layouts/base.html index 14183d3d..6996621a 100644 --- a/_layouts/base.html +++ b/_layouts/base.html @@ -4,109 +4,34 @@ --- + - - - -{% capture title %}{% translate title %}{% endcapture %}{% if title != '' %}{{ title }}{% else %}{{ page.title }}{% endif %} -{% capture metadescription %}{% translate metadescription %}{% endcapture %}{% if metadescription != '' %}{% endif %} -{% lesscss main.less %} - - -{% if page.lang == 'ar' or page.lang == 'fa' %}{% lesscss rtl.less %}{% endif %} -{% if page.lang == 'bg' or page.lang == 'el' or page.lang == 'ko' or page.lang == 'hi' or page.lang == 'pl' or page.lang == 'sl' or page.lang == 'ro' or page.lang == 'ru' or page.lang == 'tr' or page.lang == 'uk' or page.lang == 'zh_CN' or page.lang == 'zh_TW' %}{% lesscss sans.less %}{% endif %} - -{% if page.id != 'download' %}{% endif %} - - +{% include layout/base/html-head.html %} + -
-{% if site.ALERT %} -