Evan Duffield
e0021f08af
Merge branch 'v0.12.1.x' of http://www.github.com/dashpay/dash into v0.12.1.x
2016-03-03 06:59:23 -07:00
Evan Duffield
89ff8a6d7e
merged and fixed messages
2016-03-03 06:55:32 -07:00
UdjinM6
459472357f
connections icon click was not working
...
Closes #709
2016-03-02 12:57:45 +01:00
UdjinM6
581312ff90
Fix default fees
...
Closes #708
2016-03-02 12:56:19 +01:00
UdjinM6
8cb8772d95
bitcoin -> dash
2016-03-02 12:55:37 +01:00
UdjinM6
3736403985
Make sure there is only one instance of dash-darksend
thread
...
Closes #707
2016-03-02 12:55:27 +01:00
UdjinM6
5c2a0cc9ec
Fix bug that prevented new blocks to update tip during mixing
...
Closes #706
2016-03-02 12:54:46 +01:00
UdjinM6
97bcec4853
more bitcoin -> dash in docs
...
Closes #704
2016-02-28 11:28:27 +01:00
UdjinM6
c8ba8a1be5
fix testnet quickfix (or "one does not simply replace a bunch of divisions" because there is rounding at each step)
...
Closes #702
2016-02-27 09:29:38 +01:00
Holger Schinzel
a0099242dc
Merge pull request #700 from thelazier/v0.12.1.x_fix_icons
...
Fix icons/bitcoin.ico not found.
2016-02-24 09:14:43 +01:00
TheLazieR Yip
4fce2910b4
Fix icons/bitcoin.ico not found.
2016-02-24 13:14:08 +07:00
Holger Schinzel
296373b108
fix test suite
2016-02-23 11:10:41 +01:00
Holger Schinzel
267e57877b
fixing test suite
2016-02-23 10:37:21 +01:00
Holger Schinzel
b5165fcfb6
passing -fPIC flag to crypto_lib
2016-02-23 06:55:37 +01:00
Holger Schinzel
8b824323e7
passing -fPIC flag to crypto_lib
2016-02-23 05:10:33 +01:00
Holger Schinzel
3d95db8b7c
fixing Makefile.test.include
...
... Bitcoin 0.12 merging bug
2016-02-23 04:27:38 +01:00
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