Commit Graph

6247 Commits

Author SHA1 Message Date
UdjinM6
e6c9d5720c Merge remote-tracking branch 'bitcoin/0.10' into v0.12.0.x 2015-04-16 00:42:33 +03:00
evan82
d5b3558a9a Merge pull request #304 from snogcel/master
QScrollBar Fix
2015-04-14 17:23:49 -07:00
UdjinM6
e55d762909 Merge pull request #315 from UdjinM6/v0.12.0.x_fix_make_translations
V0.12.0.x fix translation processs
2015-04-15 03:06:03 +03:00
UdjinM6
f35b4d80bb fix translation processs 2015-04-15 02:50:59 +03:00
thelazier
ab4336c5e9 Fixed Default RPC Ports 2015-04-15 01:27:45 +07:00
UdjinM6
930ac51876 Fix compiling errors on Linux. Should be ok now. 2015-04-14 11:54:06 +03:00
Matt Corallo
eae305f4c4
Fix missing lock in submitblock
Rebased-From: eb63bf86cf
Github-Pull: #6007
2015-04-14 10:52:03 +02:00
UdjinM6
c9df7ce9de fix makefile 2015-04-14 02:01:10 +03:00
crowning-
3fa77045a7 Missing resources add to Qt-makefile
Should build now
2015-04-13 22:28:32 +02:00
UdjinM6
b26ea22a70 Merge branch 'master' into merge_btc010 2015-04-13 22:46:04 +03:00
evan82
73b831c3a7 Merge pull request #306 from crowning-/auto-wallet-backup
Configurable Automatic Wallet Backup
2015-04-13 10:51:31 -07:00
evan82
a8d7a3feea Merge pull request #305 from UdjinM6/fix_UI_masternode_litemode
fix DS and IX for CoinControl in litemode
2015-04-13 10:50:50 -07:00
Evan Duffield
c38eff15e0 Ignore dsee entries with signatures 2015-04-13 10:49:02 -07:00
Evan Duffield
d8ebb6826d update hard-coded nodes 2015-04-13 07:01:52 -07:00
Evan Duffield
51b6287695 add dashpay seed 2015-04-13 06:55:09 -07:00
Evan Duffield
9c9085716e update seeder order 2015-04-13 06:53:55 -07:00
snogcel
2efd85af0d QScrollBar Arrow Enhancement 2015-04-12 12:43:04 -06:00
crowning-
5a1857795e Number of automatic backups configurable (0-10) 2015-04-12 14:43:53 +02:00
UdjinM6
b56b9275c7 fix DS and IX for CoinControl in litemode 2015-04-12 07:30:57 +03:00
crowning-
ea3c318fda Limit maximum number of wallet-backups to 10 2015-04-12 01:02:33 +02:00
crowning-
d2c0981786 Sanity check for backup source added 2015-04-11 17:21:18 +02:00
crowning-
3846db711a Wallet autobackup completed 2015-04-11 16:49:02 +02:00
crowning-
2b99647461 Changed error handling for debugging 2015-04-11 15:56:20 +02:00
crowning-
7b8e729cb0 Changed error handling for debugging 2015-04-11 15:23:33 +02:00
crowning-
2b040d1e48 Wallet backup OS-dependent path fix 2015-04-11 14:25:47 +02:00
crowning-
91bcad1d1f Added OS-independent path separator 2015-04-11 13:43:41 +02:00
crowning-
cfdc68633b Make backup timestamp Windows-FS compatible 2015-04-11 13:02:28 +02:00
crowning-
51304dfaa2 Create backups of wallet.dat automatically 2015-04-11 06:14:18 +02:00
crowning-
2bb8209877 CSS reverted to master 2015-04-11 05:34:08 +02:00
crowning-
756f771517 CSS reverted to master 2015-04-11 05:32:11 +02:00
crowning-
378fdf4c93 Merge remote-tracking branch 'upstream/master' 2015-04-10 21:43:45 +02:00
UdjinM6
62bbc1176e fix merge 2015-04-10 20:08:01 +03:00
UdjinM6
8051f73446 bump MIN_POOL_PEER_PROTO_VERSION manually 2015-04-10 19:39:12 +03:00
UdjinM6
63ae382c72 ru 2015-04-10 19:34:43 +03:00
UdjinM6
3cfd9538d5 Merge branch 'master' into merge_btc010 2015-04-10 19:32:57 +03:00
snogcel
14d990362f QScrollBar Fix Horizontal 2015-04-09 20:39:34 -06:00
snogcel
cc785e20bf Merge remote-tracking branch 'upstream/master' 2015-04-09 20:37:22 -06:00
Evan Duffield
a79196bc19 fixed masternode find bug 2015-04-09 12:17:32 -07:00
Evan Duffield
e741ff590e version bump 2015-04-09 10:12:04 -07:00
Evan Duffield
91a669e231 Ref-node : Always fill vecLastPayments
- In some rare cases the vecLastPayments would get truncated and would start paying people it paid recently again. This stops that from happening.
2015-04-09 10:06:48 -07:00
snogcel
2757360ace QScrollBar Fix 2015-04-08 18:48:42 -06:00
crowning-
680be25d2a Added missing scrollbar-arrows 2015-04-09 00:31:01 +02:00
UdjinM6
a866e12f74 should set nMaxToAnonymize equal to denominatedBalance only if it's greater then it was possible to denominate 2015-04-08 21:27:35 +03:00
Evan Duffield
0f677c4583 version bump / reduce max rounds options in conf 2015-04-08 09:38:04 -07:00
Evan Duffield
a4e8dfa0b6 fixed issues 2015-04-08 09:35:43 -07:00
Evan Duffield
3f57ac1aea added debugging 2015-04-08 08:46:13 -07:00
Evan Duffield
7d5948012b DS: Adjust Target Balance
- When targeting the entire balance, the wallet reports getting stuck at 99%.
2015-04-08 08:02:54 -07:00
evan82
cd4b13d86d Merge pull request #301 from UdjinM6/fix_mnstop
masternode stop should disable MN and remove it from MN list
2015-04-08 07:17:52 -07:00
UdjinM6
58e418e1e1 add Peers menu item 2015-04-08 07:26:15 +03:00
UdjinM6
27514f0f80 masternode stop should disable MN and remove it from MN list 2015-04-08 07:02:23 +03:00
UdjinM6
865b63e52d Merge branch '0.10' into merge_btc010
Conflicts:
	doc/release-notes.md
	doc/release-process.md
2015-04-08 06:15:17 +03:00
Evan Duffield
ec80b25217 updated chinese translations 2015-04-07 20:05:40 -07:00
Evan Duffield
ad348211f8 Merge branch 'v0.11.2.x' of https://github.com/darkcoin/darkcoin into v0.11.2.x 2015-04-07 20:04:02 -07:00
evan82
d7cdaad0e2 Merge pull request #300 from UdjinM6/fix_votes_filter
fix filtering for masternode list votes rpc
2015-04-07 17:48:06 -07:00
Evan Duffield
5c03872655 fixed vote crashes 2015-04-07 17:45:33 -07:00
UdjinM6
f358a8a698 fix filtering for masternode list votes rpc 2015-04-08 03:43:40 +03:00
Evan Duffield
88ab84a2e7 updated translatios 2015-04-07 17:35:22 -07:00
Evan Duffield
631e4b505f fixed vote-many 2015-04-07 12:59:30 -07:00
Evan Duffield
13e4a7d33f Merge branch 'v0.11.2.x' of https://github.com/darkcoin/darkcoin into v0.11.2.x 2015-04-07 10:22:10 -07:00
Evan Duffield
d120557b05 updated chinese translations 2015-04-07 10:09:42 -07:00
Evan Duffield
0b225546f7 check collateral before submitting 2015-04-07 09:41:31 -07:00
UdjinM6
debcbb75b1 do not search for known sporks by hash, search only by ID 2015-04-07 18:17:50 +03:00
Evan Duffield
83864c69c3 Merge branch 'master' of https://github.com/darkcoin/darkcoin into v0.11.2.x 2015-04-07 07:40:28 -07:00
evan82
ac51baf4a2 Merge pull request #297 from crowning-/master
Transaction type column width adjusted
2015-04-07 07:30:15 -07:00
UdjinM6
41f592aec7 Explicitly convert mutable txes to immutable before calling AcceptableInputs 2015-04-07 05:59:56 +03:00
UdjinM6
649434dd2e Fix SelectCoinsByDenominations relative things:
- AvailableCoins inside SelectCoinsByDenominations should select denoms only now (also removing corresponding "if"s)
- use temporary vectors in doauto when call SelectCoinsByDenominations to prevent vCoins modification
- variables naming (set...->v...)
2015-04-07 05:52:49 +03:00
Evan Duffield
7e72c2bccf added nDenom check for dsa 2015-04-06 16:07:25 -07:00
Evan Duffield
42e056c5c5 version/proto bump 2015-04-06 13:41:08 -07:00
Evan Duffield
d928a53234 DS Working pretty well 2015-04-06 13:00:46 -07:00
Evan Duffield
18828b00ef fixed overviewpage.cpp 2015-04-06 08:32:43 -07:00
Evan Duffield
f0192b1bb3 Reverting some DS changes
- Some changes caused instability of DS, this should fix that.
2015-04-06 08:14:26 -07:00
Gavin Andresen
1c62e84099
Keep mempool consistent during block-reorgs
This fixes a subtle bug involving block re-orgs and non-standard transactions.

Start with a block containing a non-standard transaction, and
one or more transactions spending it in the memory pool.

Then re-org away from that block to another chain that does
not contain the non-standard transaction.

Result before this fix: the dependent transactions get stuck
in the mempool without their parent, putting the mempool
in an inconsistent state.

Tested with a new unit test (adapted for 0.10).

Rebased-From: ad9e86dca1
Github-Pull: #5945
2015-04-06 11:38:43 +02:00
UdjinM6
bdee4cd3c5 fix cmd help for -masternodeminprotocol 2015-04-06 06:46:53 +03:00
UdjinM6
cddd69444f small rpc description fixes 2015-04-06 00:59:25 +03:00
UdjinM6
f26aff36cd unify copyright 2015-04-06 00:58:13 +03:00
UdjinM6
fabca0a428 more bitcoin->dash fixes 2015-04-06 00:56:58 +03:00
UdjinM6
8bd7e1d181 relax restrictions on AcceptableInputs 2015-04-05 22:37:15 +03:00
UdjinM6
f08ddc5eea fix DSdenom/watchonly 2015-04-05 02:45:22 +03:00
UdjinM6
4c129040fe fix unit icons (ugly but works, need to repaint however) 2015-04-05 02:25:32 +03:00
UdjinM6
b9d826a213 cleanup 2015-04-05 01:58:51 +03:00
UdjinM6
e54c11aabb tests should compile now 2015-04-05 01:58:10 +03:00
UdjinM6
3f3b6bb3cb rpc fixes 2015-04-05 01:57:25 +03:00
UdjinM6
4a325e7ebe fix CreateNewBlock 2015-04-05 01:56:29 +03:00
UdjinM6
df12ef8601 move x11 algos to crypto/ 2015-04-04 23:00:03 +03:00
UdjinM6
23129a063f Merge branch 'master' into merge_btc010 2015-04-04 20:15:38 +03:00
UdjinM6
dd39898a6b Merge branch 'master' into HEAD
Resolved conflicts:
	configure.ac
	src/clientversion.h
	src/qt/locale/dash_bg.ts
	src/qt/locale/dash_cmn.ts
	src/qt/locale/dash_de.ts
	src/qt/locale/dash_es.ts
	src/qt/locale/dash_fi.ts
	src/qt/locale/dash_pt.ts
	src/qt/locale/dash_ru.ts
	src/qt/locale/dash_sv.ts
	src/qt/locale/dash_vi.ts
	src/qt/res/icons/toolbar.png
	src/qt/res/icons/toolbar_testnet.png
2015-04-04 19:45:02 +03:00
UdjinM6
64eebc3316 0.12 dirty merge'n'fix (bitcoin 0.10) 2015-04-04 19:24:37 +03:00
Evan Duffield
09a898769a remove donations to multisig addresses 2015-04-03 20:26:55 -07:00
crowning-
833cf2b23e Transaction type column width adjusted 2015-04-03 20:42:54 +02:00
crowning-
c97d8fb1f9 "Recent Transactions" font-size reduced by 1 2015-04-03 11:10:28 +02:00
crowning-
7c57a2ed80 Disable "Try Mix" and "Reset" buttons in Masternode mode 2015-04-03 10:25:14 +02:00
crowning-
eb42ea204e Centered in/out TX icons for a more harmonic look 2015-04-03 06:14:03 +02:00
crowning-
15e931b254 Off-centered vertical "About" image fixed 2015-04-03 05:51:55 +02:00
UdjinM6
c8657cbb4d fix possible MN breakage during mixing 2015-04-02 19:26:45 +03:00
Evan Duffield
e29b66d1dc Merge branch 'master' of https://github.com/darkcoin/darkcoin 2015-04-01 20:33:27 -07:00
Evan Duffield
af6bf0f947 version bump 2015-04-01 20:32:57 -07:00
Wladimir J. van der Laan
2b7636c3d6
Merge pull request #5953
a1f425b Add a consistency check for the block chain data structures (Pieter Wuille)

This is a port of #5900 to 0.10.

Github-Pull: #5900
2015-04-01 17:26:33 +02:00
Pieter Wuille
aa587d4cae
Scale up addrman
This change was suggested as Countermeasure 6 in
Eclipse Attacks on Bitcoin’s Peer-to-Peer Network, Ethan Heilman,
Alison Kendler, Aviv Zohar, Sharon Goldberg. ePrint Archive Report
2015/263. March 2015.

Rebased-From: 1d21ba2f5e
Github-Pull: #5941
2015-04-01 16:39:55 +02:00
Pieter Wuille
0c6f334c32
Always use a 50% chance to choose between tried and new entries
This change was suggested as Countermeasure 2 in
Eclipse Attacks on Bitcoin’s Peer-to-Peer Network, Ethan Heilman,
Alison Kendler, Aviv Zohar, Sharon Goldberg. ePrint Archive Report
2015/263. March 2015.

Rebased-From: c6a63ceeb4
Github-Pull: #5941
2015-04-01 16:39:36 +02:00
Pieter Wuille
214154e6fc
Do not bias outgoing connections towards fresh addresses
This change was suggested as Countermeasure 2 in
Eclipse Attacks on Bitcoin’s Peer-to-Peer Network, Ethan Heilman,
Alison Kendler, Aviv Zohar, Sharon Goldberg. ePrint Archive Report
2015/263. March 2015.

Rebased-From: 68ba3f67bd500a64fb8932c6b41924ddc31d76f
Github-Pull: #5941
2015-04-01 16:39:30 +02:00