diff --git a/README.md b/README.md index 09dbdb1f..022f888f 100644 --- a/README.md +++ b/README.md @@ -750,6 +750,7 @@ Optional criteria (some could become requirements): - Does not show "received from" Bitcoin addresses in the UI - Uses deterministic ECDSA nonces (RFC 6979) - Provides a bug reporting policy on the website +- Website serving executable code or requiring authentication is included in the [HSTS preload list](https://hstspreload.appspot.com/) - If user has no access over its private keys: - Full reserve audit(s) - Insurance(s) against failures on their side diff --git a/_alerts/2016-11-01-alert-retirement.md b/_alerts/2016-11-01-alert-retirement.md index 87500451..a48f0c19 100644 --- a/_alerts/2016-11-01-alert-retirement.md +++ b/_alerts/2016-11-01-alert-retirement.md @@ -9,6 +9,12 @@ banner: "Alert system is being retired (click here to read)" bannerclass: "info" --- +## Updates + +* **January 19th 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. + ## Summary The network wide Alert system is being retired. **_No Bitcoins are at risk and this warning may be safely ignored._** diff --git a/_autocrossref.yaml b/_autocrossref.yaml index bdf99d7a..e7e842b5 100644 --- a/_autocrossref.yaml +++ b/_autocrossref.yaml @@ -117,6 +117,9 @@ protocol version 60001: section protocol versions protocol version 60002: section protocol versions protocol version 70001: section protocol versions protocol version 70002: section protocol versions +protocol version 70012: section protocol versions +protocol version 70013: section protocol versions +protocol version 70014: section protocol versions public key infrastructure: pki '`r`': r receipt: @@ -156,6 +159,7 @@ x.509: x509 X509Certificates: ## BIPs in numerical order; don't use padding zeros (e.g. BIP70 not BIP0070) +BIP9: BIP14: BIP16: BIP21: @@ -172,6 +176,14 @@ BIP66: BIP70: BIP71: BIP72: +BIP111: +BIP112: +BIP113: +BIP130: +BIP133: +BIP141: +BIP151: +BIP152: ## CVEs CVE-2012-2459: @@ -373,4 +385,15 @@ Bitcoin Core 0.9.0: Bitcoin Core 0.9.1: Bitcoin Core 0.9.3: Bitcoin Core 0.10.0: +Bitcoin Core 0.10.1: +Bitcoin Core 0.10.2: +Bitcoin Core 0.10.3: +Bitcoin Core 0.11.0: +Bitcoin Core 0.11.1: +Bitcoin Core 0.11.2: +Bitcoin Core 0.12.0: +Bitcoin Core 0.12.1: +Bitcoin Core 0.13.0: +Bitcoin Core 0.13.1: +Bitcoin Core 0.13.2: Bitcoin Core master: diff --git a/_config.yml b/_config.yml index ea87e555..1772b3b8 100644 --- a/_config.yml +++ b/_config.yml @@ -221,8 +221,8 @@ text: ## such as: subsidy_in_decimal_bitcoins or ## bitcoin_org_docs_maintainer_email_link subsidy_in_decimal_bitcoins: 25 - chain_gb: 60 - bitcoin_datadir_gb: 80 + chain_gb: 100 + bitcoin_datadir_gb: 125 bitcoin_datadir_gb_pruned: 5 total_tx_count_in_millions: 100 typical_ibd_time_in_hours: 4 diff --git a/_data/glossary/en/hard-fork.yaml b/_data/glossary/en/hard-fork.yaml index 34ab032e..e2e207c0 100644 --- a/_data/glossary/en/hard-fork.yaml +++ b/_data/glossary/en/hard-fork.yaml @@ -7,7 +7,7 @@ required: title_max_40_characters_no_formatting: Hard Fork, Hard-Forking Change summary_max_255_characters_no_formatting: > - A permanent divergence in the the block chain, commonly occurs + A permanent divergence in the block chain, commonly occurs when non-upgraded nodes can't validate blocks created by upgraded nodes that follow newer consensus rules. diff --git a/_events.yml b/_events.yml index 2c643de9..6e9aace9 100644 --- a/_events.yml +++ b/_events.yml @@ -1,15 +1,151 @@ -- date: 2016-12-18 - title: "A Bitcoin Brunch (and Christmas Bitcoin Shopping)" - venue: "VANNU" - address: "Jansplein 48" +- date: 2017-01-05 + title: "CES Digital Money Forum" + venue: "Las Vegas Convention Center" + address: "3150 Paradise Road" + city: "Las Vegas, NV" + country: "USA" + link: "http://thedigitalmoneyforum.com/" + +- date: 2017-01-07 + title: "2017 Blockchain Fintech Summit of Silicon Valley" + venue: "Santa Clara Conventional Center, Great America Ballroom" + address: "5001 Great America Pkwy" + city: "Santa Clara" + country: "USA" + link: "https://www.eventbrite.com/e/the-blockchain-fintech-summit-of-silicon-valley-tickets-29506617086" + +- date: 2017-01-12 + title: "Blockchain Incredible Party" + venue: "Business Center Gulliver" + address: "Sportyvna Square, 1A, Tower A, 24th floor" + city: "Kiev" + country: "Ukraine" + link: "http://bip001.com/" + +- date: 2017-01-17 + title: "The North American Bitcoin Conference" + venue: "Knight Center Complex" + address: "400 SE 2nd Ave" + city: "Miami" + country: "United States" + link: "http://btcmiami.com/" + +- date: 2017-01-20 + title: "London Blockchain Week" + venue: "Grange Tower Bridge Hotel" + address: "45 Prescot Street" + city: "London" + country: "United Kingdom" + link: "https://www.blockchainweek.com/" + +- date: 2017-01-23 + title: "Blockchain Expo" + venue: "Olympia" + address: "Hammersmith Rd" + city: "London" + country: "United Kingdom" + link: "http://blockchain-expo.com/" + +- date: 2017-01-25 + title: "Finance Disrupted" + venue: "St. Pancras Renaissance Hotel" + address: "Euston Road" + city: "London" + country: "United Kingdom" + link: "http://www.economist.com/events-conferences/emea/finance-disrupted" + +- date: 2017-01-28 + title: "Bitcoin Brunch @ International Day of Privacy" + venue: "Urban Chef" + address: "Koningstraat 50/51" city: "Arnhem Bitcoincity" country: "The Netherlands" - link: "https://www.meetup.com/Arnhem-Bitcoin-Users/events/235650407/" + link: "https://www.ArnhemBitcoinstad.nl" + +- date: 2017-02-14 + title: "Event Horizon" + venue: "Hofburg Palace" + address: "Michaelerkuppel, 1010" + city: "Vienna" + country: "Austria" + link: "http://eventhorizon2017.com/" + +- date: 2017-02-21 + title: "d10e" + venue: "Sheraton Hotel" + address: "Calea Dorobantilor 5-7" + city: "Bucharest" + country: "Romania" + link: "http://d10e.biz/" + +- date: 2017-02-27 + title: "Distributed: Markets" + venue: "Ritz Carlton" + address: "181 Peachtree St NE" + city: "Atlanta" + country: "United States" + link: "https://godistributed.com/events/markets/" - date: 2017-03-01 title: "Blockchain Africa Conference 2017" - venue: "Johannesburg, South Africa" - address: "Johannesburg, South Africa" + venue: "The Focus Rooms" + address: "The Core, The Core Shopping Centre, Leeuwkop Rd and Kikuyu Rd" city: "Johannesburg" country: "South Africa" link: "http://blockchainafrica.co" + +- date: 2017-03-07 + title: "APAC Blockchain Conference" + venue: "Aerial UTS Function Centre" + address: "235 Jones Street, Level 7, Building 10" + city: "Sydney" + country: "Australia" + link: "http://www.questevents.com.au/apac-blockchain-conference-2017" + +- date: 2017-05-19 + title: "Bitcoin Conference Prague" + venue: "Angelo Hotel Prague" + address: "Radlicka 1g, 150 00" + city: "Prague" + country: "Czech Republic" + link: "https://bitcoinconf.eu/en" + +- date: 2017-05-22 + title: "Consensus 2017" + venue: "New York Marriott Marquis" + address: "1535 Broadway" + city: "New York" + country: "United States" + link: "http://www.coindesk.com/events/consensus-2017/" + +- date: 2017-05-24 + title: "Blockchain Cruise 2017" + venue: "Anthem of the Seas" + address: "4 Port Terminal Blvd" + city: "Bayonne" + country: "United States" + link: "https://coinsbank.com/cruise" + +- date: 2017-06-26 + title: "Money 2020 Europe" + venue: "Bella Center" + address: "Center Blvd. 5, 2300" + city: "Copenhagen" + country: "Denmark" + link: "https://www.money2020europe.com/" + +- date: 2017-07-07 + title: "London Fintech Week" + venue: "Grange Tower Bridge Hotel" + address: "45 Prescot St." + city: "London" + country: "United Kingdom" + link: "https://fintechweek.com/" + +- date: 2017-09-23 + title: "Bitcoin Conference Kiev" + venue: "Congress Hall" + address: "Cosmopolite, 6 V. Hetmana Street" + city: "Kiev" + country: "Ukraine" + link: "https://bitcoinconf.com.ua/en" diff --git a/_includes/devdoc/example_transactions.md b/_includes/devdoc/example_transactions.md index b67fa9ce..f4dd8bd4 100644 --- a/_includes/devdoc/example_transactions.md +++ b/_includes/devdoc/example_transactions.md @@ -89,7 +89,9 @@ UTXOs and we just spent our only confirmed UTXO. "scriptPubKey" : "76a9149ba386253ea698158b6d34802bb9b550\ f5ce36dd88ac", "amount" : 40.00000000, - "confirmations" : 0 + "confirmations" : 0, + "spendable" : true, + "solvable" : true }, { "txid" : "263c018582731ff54dc72c7d67e858c002ae298835501d\ @@ -100,7 +102,9 @@ UTXOs and we just spent our only confirmed UTXO. "scriptPubKey" : "76a914a57414e5ffae9ef5074bacbe10a320bb\ 2614e1f388ac", "amount" : 10.00000000, - "confirmations" : 0 + "confirmations" : 0, + "spendable" : true, + "solvable" : true } ] {% endhighlight %} @@ -161,7 +165,9 @@ This subsection covers one of the simplest possible raw transactions. "scriptPubKey" : "76a9149ba386253ea698158b6d34802bb9b550\ f5ce36dd88ac", "amount" : 40.00000000, - "confirmations" : 1 + "confirmations" : 1, + "spendable" : true, + "solvable" : true }, { "txid" : "263c018582731ff54dc72c7d67e858c002ae298835501d\ @@ -172,7 +178,9 @@ This subsection covers one of the simplest possible raw transactions. "scriptPubKey" : "76a914a57414e5ffae9ef5074bacbe10a320bb\ 2614e1f388ac", "amount" : 10.00000000, - "confirmations" : 1 + "confirmations" : 1, + "spendable" : true, + "solvable" : true }, { "txid" : "3f4fa19803dec4d6a84fae3821da7ac7577080ef754512\ @@ -182,7 +190,9 @@ This subsection covers one of the simplest possible raw transactions. "scriptPubKey" : "210260a275cccf0f4b106220725be516adba27\ 52db1bec8c5b7174c89c4c07891f88ac", "amount" : 50.00000000, - "confirmations" : 101 + "confirmations" : 101, + "spendable" : true, + "solvable" : true } ] {% endhighlight %} @@ -255,6 +265,9 @@ can send the change back to yourself. { "txid" : "c80b343d2ce2b5d829c2de9854c7c8d423c0e33bda264c4013\ 8d834aab4c0638", + "hash" : "c80b343d2ce2b5d829c2de9854c7c8d423c0e33bda264c40138d834aab4c0638", + "size" : 85, + "vsize" : 85, "version" : 1, "locktime" : 0, "vin" : [ @@ -378,7 +391,9 @@ transaction together (such as a CoinJoin transaction). "scriptPubKey" : "76a9149ba386253ea698158b6d34802bb9b550\ f5ce36dd88ac", "amount" : 40.00000000, - "confirmations" : 2 + "confirmations" : 2, + "spendable" : true, + "solvable" : true }, { "txid" : "263c018582731ff54dc72c7d67e858c002ae298835501d\ @@ -389,7 +404,9 @@ transaction together (such as a CoinJoin transaction). "scriptPubKey" : "76a914a57414e5ffae9ef5074bacbe10a320bb\ 2614e1f388ac", "amount" : 10.00000000, - "confirmations" : 2 + "confirmations" : 2, + "spendable" : true, + "solvable" : true }, { "txid" : "78203a8f6b529693759e1917a1b9f05670d036fbb12911\ @@ -399,7 +416,9 @@ transaction together (such as a CoinJoin transaction). "scriptPubKey" : "210229688a74abd0d5ad3b06ddff36fa9cd8ed\ d181d97b9489a6adc40431fb56e1d8ac", "amount" : 50.00000000, - "confirmations" : 101 + "confirmations" : 101, + "spendable" : true, + "solvable" : true }, { "txid" : "c7736a0a0046d5a8cc61c8c3c2821d4d7517f5de2bc66a\ @@ -410,7 +429,9 @@ transaction together (such as a CoinJoin transaction). "scriptPubKey" : "76a914cbc20a7664f2f69e5355aa427045bc15\ e7c6c77288ac", "amount" : 49.99990000, - "confirmations" : 1 + "confirmations" : 1, + "spendable" : true, + "solvable" : true } ] {% endhighlight %} @@ -519,6 +540,15 @@ before, except now we have two inputs and two outputs. 76a914fa5139067622fd7e1e722a05c17c2bb7d5fd6df088ac0\ 0000000", "complete" : false + "errors": [ + { + "txid": "c53f8f5ac0b6b10cdc77f543718eb3880fee6cf9b5e0cbf4edb2a59c0fae09a4", + "vout": 0, + "scriptSig": "", + "sequence": 4294967295, + "error": "Operation not valid with the current stack size" + } + ] } {% endhighlight %} {% highlight bash %} @@ -638,6 +668,9 @@ variable. { "txid" : "682cad881df69cb9df8f0c996ce96ecad758357ded2da03bad\ 40cf18ffbb8e09", + "hash" : "682cad881df69cb9df8f0c996ce96ecad758357ded2da03bad40cf18ffbb8e09", + "size" : 340, + "vsize" : 340, "version" : 1, "locktime" : 0, "vin" : [ @@ -936,7 +969,9 @@ redeem script. You must give them a full public key. { "isvalid" : true, "address" : "mk2QpYatsKicvFVuTAQLBryyccRXMUaGHP", + "scriptPubKey" : "76a9143172b5654f6683c8fb146959d347ce303cae4ca788ac", "ismine" : true, + "iswatchonly" : false, "isscript" : false, "pubkey" : "029e03a901b85534ff1e92c43c74431f7ce72046060fcf7a\ 95c37e148f78c77255", @@ -1041,6 +1076,9 @@ We save that txid to a shell variable as the txid of the UTXO we plan to spend n 04c84dcbaff8700000000", "txid" : "7278d7d030f042ebe633732b512bcb31fff14a697675a1fe18\ 84db139876e175", + "hash" : "7278d7d030f042ebe633732b512bcb31fff14a697675a1fe1884db139876e175", + "size" : 189, + "vsize" : 189, "version" : 1, "locktime" : 0, "vin" : [ diff --git a/_includes/devdoc/guide_wallets.md b/_includes/devdoc/guide_wallets.md index 736937b3..60caacfd 100644 --- a/_includes/devdoc/guide_wallets.md +++ b/_includes/devdoc/guide_wallets.md @@ -429,11 +429,11 @@ existing [(parent) public key][/en/glossary/parent-key]{:#term-parent-public-key integer (*i*) value. This child public key is the same public key which would be created by the `point()` function if you added the *i* value to the original (parent) private key and then found the remainder of that -sum divided by a global constant used by all Bitcoin software (*G*): +sum divided by a global constant used by all Bitcoin software (*p*): {% endautocrossref %} - point( (parent_private_key + i) % G ) == parent_public_key + point(i) + point( (parent_private_key + i) % p ) == parent_public_key + point(i) {% autocrossref %} @@ -451,7 +451,7 @@ operations: {% endautocrossref %} - point( (child_private_key + i) % G ) == child_public_key + point(i) + point( (child_private_key + i) % p ) == child_public_key + point(i) {% autocrossref %} diff --git a/_includes/devdoc/ref_block_chain.md b/_includes/devdoc/ref_block_chain.md index 7bde25b6..5cb471a9 100644 --- a/_includes/devdoc/ref_block_chain.md +++ b/_includes/devdoc/ref_block_chain.md @@ -23,9 +23,9 @@ serialized header format part of the consensus rules. | 4 | version | int32_t | The [block version][/en/glossary/block]{:#term-block-version}{:.term} number indicates which set of block validation rules to follow. See the list of block versions below. | 32 | [previous block header hash][]{:#term-previous-block-header-hash}{:.term} | char[32] | A SHA256(SHA256()) hash in internal byte order of the previous block's header. This ensures no previous block can be changed without also changing this block's header. | 32 | merkle root hash | char[32] | A SHA256(SHA256()) hash in internal byte order. The merkle root is derived from the hashes of all transactions included in this block, ensuring that none of those transactions can be modified without modifying the header. See the [merkle trees section][section merkle trees] below. -| 4 | time | uint32_t | The block time is a Unix epoch time when the miner started hashing the header (according to the miner). Must be greater than or equal to the median time of the previous 11 blocks. Full nodes will not accept blocks with headers more than two hours in the future according to their clock. +| 4 | time | uint32_t | The block time is a Unix epoch time when the miner started hashing the header (according to the miner). Must be strictly greater than the median time of the previous 11 blocks. Full nodes will not accept blocks with headers more than two hours in the future according to their clock. | 4 | nBits | uint32_t | An encoded version of the target threshold this block's header hash must be less than or equal to. See the nBits format described below. -| 4 | nonce | uint32_t | An arbitrary number miners change to modify the header hash in order to produce a hash below the target threshold. If all 32-bit values are tested, the time can be updated or the coinbase transaction can be changed and the merkle root updated. +| 4 | nonce | uint32_t | An arbitrary number miners change to modify the header hash in order to produce a hash less than or equal to the target threshold. If all 32-bit values are tested, the time can be updated or the coinbase transaction can be changed and the merkle root updated. The hashes are in internal byte order; the other values are all in little-endian order. diff --git a/_includes/layout/base/head-menu.html b/_includes/layout/base/head-menu.html index c19aa114..9fe55aca 100644 --- a/_includes/layout/base/head-menu.html +++ b/_includes/layout/base/head-menu.html @@ -16,7 +16,8 @@ http://opensource.org/licenses/MIT.
  • {% translate menu-resources layout %}