forked from bitcoin/bitcoin
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Merge Bitcoin 0.12.1 #897
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Merge Bitcoin 0.12.1 #897
Changes from all commits
Commits
Show all changes
51 commits
Select commit
Hold shift + click to select a range
35af157
doc: Clean out release notes
laanwj 00d57b4
Workaround Travis-side CI issues
luke-jr a10da9a
[depends] builders: No need to set -L and --location for curl
ca8f160
Bugfix: gitian: Add curl to packages (now needed for depends)
luke-jr f04f4fd
[doc/log] Fix markdown syntax and line terminate LogPrint
15ba08c
Implement SequenceLocks functions
morcos 0d09af7
Add RPC test exercising BIP68 (mempool only)
sdaftuar 0a79c04
Bug fix to RPC test
morcos 197c376
fix sdaftuar's nits again
morcos c0c5e09
BIP112: Implement CHECKSEQUENCEVERIFY
maaku 6170506
Separate CheckLockTime() and CheckSequence() logic
btcdrak c8d309e
Code style fix.
btcdrak ade85e1
Add LockPoints
morcos 6f83cf2
BIP9 Implementation
sipa 5f90d4e
Versionbits tests
sipa 0bdaacd
Softfork status report in RPC
sipa 8ebc6f2
Add testing of ComputeBlockVersion
sdaftuar 0710b30
Test versionbits deployments
sdaftuar 6ff0b9f
RPC test for BIP9 warning logic
sdaftuar ee40924
Add CHECKSEQUENCEVERIFY softfork through BIP9
sipa 648be9b
Soft fork logic for BIP113
btcdrak 9713ed3
Soft fork logic for BIP68
btcdrak 159ee3d
Policy: allow transaction version 2 relay policy.
btcdrak 3a99feb
Add RPC test for BIP 68/112/113 soft fork.
morcos 19866c1
Fix calculation of balances and available coins.
morcos 7ffc2bd
[Wallet][RPC] add abandoned status to listtransactions
jonasschnelli 597494f
Remove openssl info from init/log and from Qt debug window
jonasschnelli c0fe2c9
Mark p2p alert system as deprecated.
btcdrak 26e9a05
Test of BIP9 fork activation of mtp, csv, sequence_lock
NicolasDorier a0cea89
Merge #7741: [0.12] Mark p2p alert system as deprecated
laanwj caf1381
Add bip68-sequence.py to extended rpc tests
btcdrak ba80cee
bump version to 0.12.1
laanwj c270b62
Fix comments in tests
btcdrak 4d035bc
[doc] added depends cross compile info
accraze 8692626
Disable bad chain alerts
btcdrak c5f94f6
Merge #7780: [0.12] Disable bad-chain alert
laanwj e10c044
[0.12] Update release notes
btcdrak 640666b
[qa] rpc-tests: Properly use integers, floats
btcdrak 834aaef
Merge #7543: [0.12] Backport BIP9, BIP68 and BIP112 with softfork
laanwj e3341aa
Merge #7800: [0.12] Update release notes
laanwj a784675
build: Remove unnecessary executables from gitian release
laanwj c210654
pre-rc1 translations update
laanwj 4226aac
init: allow shutdown during 'Activating best chain...'
laanwj 90f1d24
Track block download times per individual block
sipa 4c3a00d
Reduce block timeout to 10 minutes
laanwj cada7c2
Fill in rest of release notes
laanwj 46898e7
Version 2 transactions remain non-standard until CSV activates
sdaftuar 465d309
doc: update release notes for #7835
laanwj de7c34c
Add missing link to BIP113
btcdrak 9779e1e
Merge #7852: [0.12] Add missing reference to release notes
laanwj f4e4dd6
Merge bitcoin tag 'v0.12.1' into dash v0.12.1.x
schinzelh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| ### Verify SF Binaries ### | ||
| ### Verify Binaries ### | ||
| This script attempts to download the signature file `SHA256SUMS.asc` from https://bitcoin.org. | ||
|
|
||
| It first checks if the signature passes, and then downloads the files specified in the file, and checks if the hashes of these files match those that are specified in the signature file. | ||
|
|
||
| The script returns 0 if everything passes the checks. It returns 1 if either the signature check or the hash check doesn't pass. If an error occurs the return value is 2. | ||
| The script returns 0 if everything passes the checks. It returns 1 if either the signature check or the hash check doesn't pass. If an error occurs the return value is 2. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| Dash Core 0.12.0 | ||
| Dash Core 0.12.1 | ||
| ===================== | ||
|
|
||
| Intro | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this update to our transifex ?
possibly off-topic , 😎
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
True that. We might even go further, as @UdjinM6 separated the release notes of Bitcoin and Dash to separate folders, so most if these changes should go to bitcoin folder while retaining our own release-notes.