Evan Duffield
a2fdef43e2
merged
2016-02-22 12:53:52 -07:00
evan82
e161616095
Merge pull request #698 from UdjinM6/mergebtc0.12
...
Merge bitcoin/0.12 + few fixes
2016-02-22 12:51:46 -07:00
UdjinM6
5be1403a19
move bitcoin release notes
2016-02-21 04:53:23 +03:00
UdjinM6
7fe88c24f9
clean fixed TODOs
2016-02-21 04:22:11 +03:00
UdjinM6
6ec64f8ff6
Merge remote-tracking branch 'bitcoin/0.12' into mergebtc0.12
2016-02-21 04:09:11 +03:00
UdjinM6
045877b93c
fix crash
2016-02-20 22:03:19 +03:00
UdjinM6
29b1af2bb1
quick fix for testnet - we reeeeally should restart it one day..
2016-02-19 21:11:44 +03:00
UdjinM6
b654a6a320
refactor sync progress ui to use signals, remove lock from masternode str ui
2016-02-19 21:09:54 +03:00
UdjinM6
06b6dce132
fix typo in GetNextWorkRequired
2016-02-19 21:08:30 +03:00
UdjinM6
f50d534440
fix nMaxTipAge
2016-02-19 07:59:22 +03:00
UdjinM6
c676748beb
Replace all hardcoded network message strings with NetMsgType:: constants, log unknown commands (net debug category only)
2016-02-19 07:59:00 +03:00
UdjinM6
e8d9aabb62
Move many hardcoded mainnet/testnet magic numbers to consensus part of chainparams,
...
get rid of most `if(Params().NetworkIDString() == CBaseChainParams::MAIN)` and alike to unify formulas.
Further improvements will require testnet restart (see TODO notes in changed code) so I'm keeping few things as they are till then.
2016-02-17 21:54:24 +03:00
UdjinM6
8ad088ab75
Add few more debug messages for masternode category
2016-02-17 21:53:55 +03:00
UdjinM6
6fc9b4c772
Replace hardcoded 9999 with Params(CBaseChainParams::MAIN).GetDefaultPort()
2016-02-17 21:52:37 +03:00
Wladimir J. van der Laan
188ca9c305
Merge #7548 : Correct duplicate names in release notes
...
ea52530
Fix duplicate names in release notes (fanquake)
2016-02-17 09:40:03 +01:00
fanquake
ea52530906
Fix duplicate names in release notes
...
Fixes #7547
2016-02-17 11:55:22 +08:00
Wladimir J. van der Laan
b466264635
doc: Remove another duplicate author name from release notes
...
The list of contributors is automatically generated from git, so people
that use multiple author names will end up on the list multiple times.
2016-02-16 12:40:13 +01:00
UdjinM6
a4aef837bd
Merge remote-tracking branch 'origin/v0.12.1.x' into mergebtc0.12 + fix
2016-02-16 03:17:25 +03:00
UdjinM6
fcad1c26ec
fix peers subversion column width
2016-02-15 22:04:21 +03:00
UdjinM6
0d387900c5
Refactor tools menu signals/slots, add more shortcuts
2016-02-15 22:02:55 +03:00
UdjinM6
fd747bae01
Added note about GetBlockSubsidy using previous height, changed var names accordingly
2016-02-15 17:01:16 +03:00
UdjinM6
8092c84694
fix consensus.nSubsidyHalvingInterval (210000 -> 210240) and ConnectBlock
2016-02-15 16:40:35 +03:00
crowning-
1f70fb3c04
Fix crash in validateaddress with -disablewallet
...
Closes #696
2016-02-15 14:13:02 +01:00
crowning-
cfc8cc2fe5
dseg shouldn't be send for local addresses
...
Closes #695
2016-02-15 14:06:47 +01:00
Joseph Pentland
7a0354bb17
txmempool: Fix comparison between signed/unsigned int
...
Comparison between signed/unsigned int found in removeCoinbaseSpends
This commit is based on commit e617fe25
by Luke Dashjr in bitcoin.
Fixes: Dashpay github issue 540
Closes #694
2016-02-15 14:01:06 +01:00
UdjinM6
ad5da28cd8
UI fixes:
...
- fix icons in tx list
- fix about/cmd-line help dialog
- get rid of the warning icon (use old text label instead)
2016-02-15 09:03:14 +03:00
UdjinM6
0495d45ac1
update overview screen ds rounds/amount/progress when settings changed
...
(we were already sending signals but connectors in overview screen were missing)
2016-02-15 03:43:06 +03:00
UdjinM6
bff701f420
fix settings
2016-02-15 03:08:48 +03:00
UdjinM6
0e55aeb538
fix CreateTransaction (bip69 related)
...
add mempool debug msg in case AcceptToMemoryPool fails
2016-02-15 00:03:55 +03:00
UdjinM6
83813caafd
Cleanup
2016-02-15 00:01:44 +03:00
Wladimir J. van der Laan
02d707ff37
Merge #7523 : Fix of semantic failure "meet pay"
...
e473c2d
Fix of semantic failure "meet pay" (wodry)
2016-02-12 10:11:38 +01:00
wodry
e473c2dd02
Fix of semantic failure "meet pay"
...
"do not meet pay the minimum relay fee" ? I can understand English language quite well, but that I do not understand. So, if it's not an semantic nonsense, I would suggest to write it in more simple English.
2016-02-12 09:50:32 +01:00
Wladimir J. van der Laan
04503f78c7
Merge #7346 : 0.12 release notes: Mining Policy Changes
...
b460004
release-notes: Minor corrections and clarifications re Priority (Luke Dashjr)
3450f4c
release-notes: Significantly rewrite priority transactions section (Gregory Maxwell)
d0dbb6d
release-notes: Remove suggestion to use 0.11 (Luke Dashjr)
73a0375
release-notes: Mention possibility of priority removal in 0.13, uncertainty of priority calculation being changed back, and request community input (Luke Dashjr)
4b8d2bc
release-notes: Cover priority changes correctly, removing mentions of possible futures (Luke Dashjr)
2016-02-11 15:30:20 +01:00
Wladimir J. van der Laan
772863583c
doc: fix author list in release notes
2016-02-10 21:37:49 +01:00
Wladimir J. van der Laan
68134263e2
qt: Translation update pre-rc5
2016-02-10 21:18:33 +01:00
Wladimir J. van der Laan
10be44a0bb
doc: Release notes update pre-rc5
2016-02-10 21:03:40 +01:00
instagibbs
c3faf78c0e
Changed getnetworkhps value to double to avoid overflow.
...
Github-Pull; #7480
Rebased-From: 993d089e82fc045d7b0f23e1a5dc934cba0e3306
2016-02-10 20:45:42 +01:00
mrbandrews
947c4ff724
[rpc-tests] Change solve() to use rehash
...
Github-Pull: #7468
Rebased-From: 7689041c03278a09c88a2bb78cd00217f6d4b1de
2016-02-10 20:39:52 +01:00
Matt
9cb31e664a
Fix spelling: misbeha{b,v}ing
...
Github-Pull: #7469
Rebased-From: 0830552673e37142599de897e87510f2f9866e1e
2016-02-10 20:38:10 +01:00
Pieter Wuille
889e5b3050
Correctly report high-S violations
...
Github-Pull: #7500
Rebased-From: 9d95187d5ddee56b6dfb55985008bdf70aed31f2
2016-02-10 20:32:42 +01:00
Pieter Wuille
1329963001
Update the wallet best block marker when pruning
...
Github-Pull: #7502
Rebased-From: e4eebb604e19f67b0c7a483b1ded1229d75ecdd3
2016-02-10 19:59:01 +01:00
Wladimir J. van der Laan
00ec73e062
wallet: Ignore MarkConflict if block hash is not known
...
If number of conflict confirms cannot be determined, this means
that the block is still unknown or not yet part of the main chain,
for example during a reindex. Do nothing in that case,
instead of crash with an assertion.
Fixes #7234 .
Github-Pull: #7491
Rebased-From: 40e7b61835cbe5fd471d0b4b71972526bf0e523c
2016-02-10 19:58:19 +01:00
Luke Dashjr
b46000415c
release-notes: Minor corrections and clarifications re Priority
2016-02-09 23:31:30 +00:00
Gregory Maxwell
3450f4cc95
release-notes: Significantly rewrite priority transactions section
2016-02-09 23:21:36 +00:00
Luke Dashjr
d0dbb6daee
release-notes: Remove suggestion to use 0.11
2016-02-09 21:28:57 +00:00
Wladimir J. van der Laan
827a2b6736
qt: Translations update pre-rc4
2016-02-09 10:53:13 +01:00
Wladimir J. van der Laan
43484d7c08
doc: Update release notes for rc4 changes
2016-02-09 10:50:05 +01:00
Luke Dashjr
73a0375ebe
release-notes: Mention possibility of priority removal in 0.13, uncertainty of priority calculation being changed back, and request community input
2016-02-09 08:13:38 +00:00
Suhas Daftuar
e16f5b40c2
Update nQueuedValidatedHeaders after peer disconnection
...
Github-Pull: #7482
Rebased-From: 301bc7bc7e83f4c268c1722558b07dbb5b55fa92
2016-02-09 08:55:03 +01:00
Wladimir J. van der Laan
b2f2b85ad5
rpc: Add WWW-Authenticate header to 401 response
...
A WWW-Authenticate header must be present in the 401
response to make clients know that they can authenticate,
and how.
WWW-Authenticate: Basic realm="jsonrpc"
Fixes #7462 .
Github-Pull: #7472
Rebased-From: 7c06fbd8f58058d77c3e9da841811201d2e45e92
2016-02-09 08:52:33 +01:00