sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 21:12:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,243 Commits 24 Branches 554 Tags 576 MiB
635778f0ab
Commit Graph

6446 Commits

Author SHA1 Message Date
UdjinM6
5037c710de When DS inputs are selected in coincontrol: 
- spend exactly these inputs
- allow to spend more than 0.1 as a fee (note: still will respect non-ds fee limits)
 2015-06-23 18:47:05 +03:00
UdjinM6
a6a04cb5c1 refactor: dsee -> mnb 2015-06-23 18:40:08 +03:00
UdjinM6
154567bf5d refactor: allowFree -> ignoreFees 2015-06-23 18:24:20 +03:00
UdjinM6
db18ce0480 bump required version for fee_estimates.dat file 2015-06-23 18:22:39 +03:00
UdjinM6
159b3366b1 reject real insane fee instead of hardcoded 2015-06-23 18:19:45 +03:00
UdjinM6
f3e619a2d1 btc/kb -> dash/kb 2015-06-23 18:15:12 +03:00
UdjinM6
d35dab332a bump min fees 10x 2015-06-23 18:02:46 +03:00
UdjinM6
3e95f3b98c accept(verify) DS mixing txes ignoring fees 2015-06-23 07:12:24 +03:00
UdjinM6
9925e0a360 try to lower fee in CreateTransaction 2015-06-22 22:36:35 +03:00
evan82
511b11aa53 Merge pull request #374 from UdjinM6/v0.12.0.x_ds_reservekeys 
V0.12.0.x deal with reservekeys in CreateDenominated and MakeCollaterals more accurate (+todo)
 2015-06-22 12:25:27 -07:00
evan82
59097ed28d Merge pull request #373 from UdjinM6/v0.12.0.x_fix_PrepareDarksendDenominate 
V0.12.0.x fix PrepareDarksendDenominate - loop instead of if
 2015-06-22 11:35:29 -07:00
UdjinM6
d766b6b564 fix PrepareDarksendDenominate - loop instead of if 2015-06-22 21:10:46 +03:00
UdjinM6
02230c4263 deal with reservekeys in CreateDenominated and MakeCollaterals more accurate (+todo) 2015-06-22 20:59:27 +03:00
UdjinM6
a049348110 bump ix min proto 2015-06-22 20:51:28 +03:00
Evan Duffield
12863bb423 version bump 2015-06-22 08:47:24 -07:00
Evan Duffield
feaaf1e166 fixed bug with counting votes 2015-06-22 07:20:34 -07:00
Evan Duffield
12e5f8f4d4 added some debugging 2015-06-22 06:50:33 -07:00
Evan Duffield
dddc095856 changed enforcement strategy for mn payments 2015-06-21 10:06:25 -07:00
Evan Duffield
892212d407 version / min version bump 2015-06-21 09:32:32 -07:00
Evan Duffield
b8c842744d clear out old masternodes in CheckAndRemove 2015-06-21 06:54:07 -07:00
Evan Duffield
1cf09fae8e update protocol version 2015-06-20 19:03:06 -07:00
Evan Duffield
ca95ca2d95 fixed nDos for failure of mnp 2015-06-20 13:28:41 -07:00
Evan Duffield
06ac558fee version bump 2015-06-20 13:00:19 -07:00
Evan Duffield
049aae7c49 Merge branch 'v0.12.0.x' of https://github.com/dashpay/dash into v0.12.0.x 2015-06-20 12:59:38 -07:00
Evan Duffield
947b79c8c5 Changed masternode broadcast/pinging logic 
- Fixed a bug causing the broadcasts to be ignored in some situations
- Added some logic to rebroadcast new masternodes, so the rest of the network finds out about unknown nodes quickly
- should help masternode payments to work properly
 2015-06-20 12:56:56 -07:00
UdjinM6
97c97f7e40 use v11-like AcceptToMemoryPool call in ProcessMessage(dstx/tx) 2015-06-20 05:33:15 +03:00
Evan Duffield
a0d8442835 added hybrid keys for masternode payment voting 2015-06-19 11:33:02 -07:00
Evan Duffield
b6f760ff90 Check before pulling payee 2015-06-19 09:14:48 -07:00
UdjinM6
58c0f150a4 fix dsc 2015-06-19 04:42:25 +03:00
evan82
3834e459d9 Merge pull request #364 from UdjinM6/v0.12.0.x_fix_mnping 
V0.12.0.x fix mnping
 2015-06-18 11:52:49 -07:00
UdjinM6
1e393d5b70 fix mnping 2015-06-18 21:41:01 +03:00
evan82
85815dcf29 Merge pull request #362 from snogcel/v0.12.0.x 
Available Balance, Pending Label Fix
 2015-06-18 10:38:52 -07:00
thelazier
639c67d354 Fix getblocktemplate not show payee from masternode winners.. 2015-06-18 16:40:22 +07:00
snogcel
5fed89fde4 Available Balance, Pending Label Fix 2015-06-17 21:37:30 -06:00
Evan Duffield
cc458007e3 update version 2015-06-17 17:10:42 -07:00
UdjinM6
91c7f66562 remove nLastPaid from CMasternodeBroadcast 2015-06-18 00:18:24 +03:00
UdjinM6
795ee119ec SecondsSincePayment (fix buffer overflow / change logic / move impl to cpp) 2015-06-17 23:03:09 +03:00
Evan Duffield
df77f56e11 Budget stability fixes 
- Proposals must start on a budget block now
- Finalized budgets now enforce proposal start and end periods
- Other misc fixes
 2015-06-16 10:04:35 -07:00
Evan Duffield
5c4dc3727b fixed issue with reindex and super blocks 2015-06-16 07:04:50 -07:00
Evan Duffield
c489574e8a Masternode System Bug Fixes 
- Fixed a race condition with masternode node selection upon new blocks
- Using nTime for lastpaid instead of the current time for high consensus
 2015-06-14 17:05:51 -07:00
UdjinM6
f1debd4688 fix segfault in budgets 2015-06-10 09:49:08 +03:00
Evan Duffield
928f6edcb6 Adjusted max payment per finalized budget to 10% of the monthly block reward 2015-06-09 20:46:24 -06:00
evan82
07fbdfc525 Merge pull request #356 from UdjinM6/v0.12.0.x_mnping_blockhash 
V0.12.0.x add recent (tip - 12) blockhash to mnping
 2015-06-09 20:04:12 -06:00
evan82
201448cea0 Merge pull request #358 from UdjinM6/v0.12.0.x_fix_budget_gethash 
V0.12.0.x fix budget gethash
 2015-06-09 20:01:00 -06:00
UdjinM6
5f5ee7a59b fix CFinalizedBudgetVote and CBudgetVote hashing, see https://github.com/dashpay/dash/pull/357 for more info 2015-06-09 19:37:58 +03:00
adios
f9b77c4376 Masternode broadcast's and ping's GetHash method fix 2015-06-09 17:22:31 +04:00
UdjinM6
19d9a65f8a add recent (tip - 12) block hash to mnping 2015-06-09 14:37:36 +03:00
evan82
aa91dde992 Merge pull request #354 from UdjinM6/v0.12.0.x_merge_master 
V0.12.0.x merge master
 2015-06-07 18:50:37 -06:00
evan82
cddd69ef40 Merge pull request #350 from UdjinM6/v0.12.0.x_budget 
V0.12.0.x budget fixes/cleanups
 2015-06-06 08:14:44 -06:00
UdjinM6
d53968ea56 fix ix comments 2015-06-04 21:54:33 +03:00
UdjinM6
9e8d54124f Merge branch 'master' into v0.12.0.x_merge_master 2015-06-04 19:14:32 +03:00
evan82
34e808bfbd Merge pull request #348 from UdjinM6/v0.12.0.x_fix_unlock_null_collateral 
V0.12.0.x fix unlock/setnull/collateraltx
 2015-06-04 07:10:49 -07:00
evan82
1a9e34e18a Merge pull request #347 from UdjinM6/v0.12.0.x_ds_rand_denom 
V0.12.0.x ds rand denom
 2015-06-04 07:09:59 -07:00
UdjinM6
17d3df5300 fix CBudgetManager::FindProposal 2015-06-03 19:45:15 +03:00
UdjinM6
d335c1ebbe MOVE: group classes` implementation together; REMOVE: GetMasternodeBudgetEscrow (not used) 2015-06-03 19:10:11 +03:00
UdjinM6
6e0a64bc5d simplify few IFs 2015-06-03 18:42:37 +03:00
UdjinM6
b8b3690a5c Merge pull request #349 from crowning-/Statusbar_Icons 
Statusbar icons for testnet added
 2015-06-03 00:55:36 +03:00
Evan Duffield
439679f5bc Finalized Budget Voting and Payment 
- Added strBudgetMode with modes of "auto", "output-vin" and "suggest". Auto votes for what the masternode sees as the most popular proposals, output-vin is a delegation mode to another party and "suggest" sends a message to the network, suggesting the most popular proposals
 2015-06-01 12:06:03 -07:00
crowning-
859d523a46 Statusbar_Icons: makefile for Gitian fixed 2015-06-01 10:27:46 +02:00
crowning-
8f695a03c1 Statusbar icons for tDASH added 2015-06-01 09:55:07 +02:00
Evan Duffield
a93ceed090 Finalized Budget Changes 
- Finalized budgets now pass proposal hash, payee and amount. This keeps them completely separate from the proposal system to aid in consensus.
- Added status messages for badly formed finalized budgets (probably attacks). If users see messages like this they should check the proposals to see if something is wrong with them before voting.
 2015-05-30 13:12:12 -07:00
Evan Duffield
c4b1156206 Merge branch 'v0.12.0.x' of https://github.com/dashpay/dash into v0.12.0.x 2015-05-30 10:30:01 -07:00
Evan Duffield
eaf7b940a6 Complete rewrite of consensus code for mn/budget payments 
- Added FindProposal and FindFinalBudget to budgeting class
- Added 2 new sporks for Proposals and Budget payment enforcement. This is outside of the decentralized code so we can turn it off if there's a problem.
- Detect budget blocks and pay correct amounts in super blocks
 2015-05-30 10:27:51 -07:00
UdjinM6
543256c3e8 - fix issues with locking coins and not unlocking them properly (mostly on failures) 
- more SetNull calls on failures
- move collateral tx reset out of SetNull and redo verification/renewal on doAuto in one single place (should prevent fast keypool exhausting on failures)
- move lastNewBlock from SetNull to Reset
 2015-05-30 07:44:56 +03:00
crowning-
e01fefa6c4 Dash copyright year fixed 2015-05-30 05:13:09 +02:00
UdjinM6
4292d4d87d - Randomize denoms calculated ot of vecAmounts. Should help to find partners faster/more often and maybe slightly improve anonymity also. 
- sessionTotal doesn't makes sense anymore, get rid of it.
- GetDenominationsByAmount cleaned but it is not used anywhere else so maybe it should be removed too (placed a comment there but didn't remove it yet).
 2015-05-30 05:59:31 +03:00
UdjinM6
04f9fb043f Merge pull request #342 from crowning-/Wallet_Repair 
Wallet Repair Buttons
 2015-05-29 11:26:03 +03:00
crowning-
d953b23061 Wallet Repair Buttons: statustip changed 2015-05-29 08:18:33 +02:00
crowning-
4574218349 Wallet Repair Buttons: removed obsolete comment 2015-05-28 23:14:09 +02:00
crowning-
a4dce4340a Wallet Repair Buttons: refactoring and remove old repair args before restart 2015-05-28 23:09:14 +02:00
Evan Duffield
bd4a7f2fad Masternode payment consensus via quorums 
- Payees are chosen by their last payment, if no payment it's based on their hash
- Fixed a few issues with counting quorum votes
 2015-05-28 10:45:31 -07:00
Evan Duffield
d470eddc01 fixed hashing issues with mnw messages 2015-05-27 15:07:53 -07:00
crowning-
6f49808caa Wallet Repair Buttons: refactoring to remove redundant code 2015-05-27 22:35:46 +02:00
Evan Duffield
fe55b12a1f added improvements for finding next masternode to get paid 2015-05-27 12:47:01 -07:00
Evan Duffield
66dcf6bbc7 cleaned up naming of budget functions 2015-05-27 10:11:00 -07:00
Evan Duffield
41eb74dc82 Stable budget implementation 
- All budgeting code seems to be rather stable now. Serialization/caching is working rather well.
- Fixed some ambiguous variable names within the budgeting system that were causing the file caching to not work all of the time
 2015-05-27 09:28:55 -07:00
crowning-
e68350d372 Wallet Repair Buttons (possible segfault on OSX fixed) 2015-05-26 23:09:16 +02:00
Evan Duffield
efe377fa69 tie budget system to masternode payment system 2015-05-26 07:56:51 -07:00
crowning-
3ab747d8ff Wallet Repair Buttons added 2015-05-25 22:59:38 +02:00
crowning-
9a6fe03974 Wallet Repair Buttons: initial commit (+ file permissions restored) 2015-05-25 18:29:11 +02:00
crowning-
8c4175b359 Wallet Repair Buttons: initial commit 2015-05-23 13:28:33 +02:00
evan82
b616fb8ef0 Merge pull request #338 from UdjinM6/lock_masternodes 
Lock masternodes from masternode configuration file
 2015-05-20 16:06:49 -07:00
evan82
9e5542ac45 Merge pull request #337 from UdjinM6/ds_coin_control 
CoinControl should disable DS when non-anonymized inputs are selected
 2015-05-20 16:06:38 -07:00
evan82
de562d89f7 Merge pull request #333 from UdjinM6/v0.12.0.x_update_mainnet_lastcheckpoint_data 
V0.12.0.x update mainnet lastcheckpoint data
 2015-05-20 16:06:08 -07:00
UdjinM6
472d2a21d6 fix tooltip background 2015-05-20 23:09:31 +03:00
UdjinM6
5a8b8538e3 Lock masternodes from masternode configuration file 2015-05-20 20:21:44 +03:00
crowning-
34a205b9a6 Fix tooltip background for OSX 2015-05-20 09:05:46 +02:00
UdjinM6
06032be332 unset DS checkbox if there were non-anonymized inputs selected in coincontrol, give warning 2015-05-20 00:10:52 +03:00
crowning-
eea3317755 Use existing constant instead of hardcoded size value 2015-05-17 21:21:43 +02:00
crowning-
2154f94131 Open peers information page when clicking on connections item 2015-05-17 20:56:00 +02:00
crowning-
32c6068ce9 Merge remote-tracking branch 'upstream/v0.12.0.x' into v0.12.0.x 2015-05-17 16:37:59 +02:00
UdjinM6
5cb819c3f8 Merge pull request #332 from UdjinM6/v0.12.0.x_fix_mnpayment_bugs 
V0.12.0.x fix 2 masternode payments bugs
 2015-05-17 17:26:12 +03:00
crowning-
dd76a079dd Tooltips for Coincontrol-Dialog added 2015-05-17 14:12:01 +02:00
UdjinM6
a4a72d6fa0 Update last checkpoint data for mainnet - should give more accurate verification progress 2015-05-16 06:04:33 +03:00
UdjinM6
397654ef76 fix masternode payments bugs 2015-05-16 05:53:53 +03:00
UdjinM6
18c60f9ecb Merge branch 'master' into v0.12.0.x_merge_btc010_master (fix spaces) 2015-05-16 02:34:25 +03:00
UdjinM6
e50d9bbc5d Merge branch '0.10' into v0.12.0.x_merge_btc010 2015-05-16 00:05:57 +03:00
crowning-
af08fbf0c9 Merge remote-tracking branch 'upstream/v0.12.0.x' into v0.12.0.x 2015-05-15 20:23:20 +02:00
Evan Duffield
66ac44651e Merge branch 'v0.12.0.x' of https://github.com/darkcoinproject/darkcoin into v0.12.0.x 2015-05-14 18:04:43 -07:00
Evan Duffield
40149c4e41 Budgeting Software / Reference Node Removal 
- Added commands for using budgets "mnbudget" and "mnfinalbudget"
- Supports 100% decentralized budget control and view-only site with json meta data object
 2015-05-14 18:01:15 -07:00
crowning-
e9a8b99694 Show sum of selected transactions: mouse + key selection added, some general cleanup 2015-05-14 08:31:40 +02:00
Gregory Maxwell
da656068ec
Avoid crash on start in TestBlockValidity with gen=1. 
When the internal miner is enabled at the start of a new node, there
 is an near instant assert in TestBlockValidity because its attempting
 to mine a block before the top checkpoint.

Also avoids a data race around vNodes.

Github-Pull: #6123
Rebased-From: bba7c24929
 2015-05-12 16:38:04 +02:00
Wladimir J. van der Laan
49e4d14f75
Translations update 2015-05-12 16:33:04 +02:00
Wladimir J. van der Laan
d7e7727658
Preparations for 0.10.2 release 2015-05-12 16:23:53 +02:00
Jonas Schnelli
424ae6629b
don't imbue boost::filesystem::path with locale "C" on windows 
fixes https://github.com/bitcoin/bitcoin/issues/6078

Github-Pull: #6093
Rebased-From: b3ffcdf916 3da7849007
 2015-05-10 14:26:22 +02:00
crowning-
575ddb3eca Show sum of all selected transactions in 'Transactions' tab. (Own ToDo marker removed) 2015-05-10 01:30:45 +02:00
crowning-
40f742c6be Show sum of all selected transactions in 'Transactions' tab. (typo + file permission fix) 2015-05-10 01:28:03 +02:00
crowning-
3a6466bced Show sum of all selected transactions in 'Transactions' tab. 2015-05-10 01:22:35 +02:00
UdjinM6
4a107035c7 fix boost::get build error 2015-05-09 00:06:07 +03:00
UdjinM6
4c6b9e8969 use tooltip for submited denoms 2015-05-08 17:35:15 +03:00
Cory Fields
824c011d16 wallet: fix boost::get usage with boost 1.58 
Backport from master
 2015-05-06 16:52:46 -04:00
Evan Duffield
e7557f2baf make masternode votes last 30 days 2015-05-06 13:15:44 -07:00
Wladimir J. van der Laan
ebc0e41ede
qt: translation update for next 0.10 point release 2015-05-04 13:12:30 +02:00
Evan Duffield
c6233880c3 draft 2015-05-04 03:05:08 -07:00
Evan Duffield
160eec6e30 merged 2015-05-04 02:36:23 -07:00
Evan Duffield
f38b8e9572 draft 2015-05-04 02:31:31 -07:00
crowning-
acec2b399f Resync with upstream 2015-05-03 15:29:35 +02:00
crowning-
4fa07131b6 Merge remote-tracking branch 'upstream/v0.12.0.x' into v0.12.0.x 2015-05-03 14:34:40 +02:00
evan82
11f83f3141 Merge pull request #322 from UdjinM6/v0.12.0.x_fix_kgw 
V0.12.0.x Fix KGW (handle negative uint256 properly)
 2015-05-02 19:43:16 -07:00
evan82
a689f630ed Merge pull request #323 from UdjinM6/v0.12.0.x_fix_ds_mixing 
V0.12.0.x DS fixes
 2015-05-02 19:43:07 -07:00
evan82
1506d63284 Merge pull request #324 from UdjinM6/v0.12.0.x_mn_payment_initial_download 
v0.12.0.x Do not waste CPU calculating MN payments during initial download
 2015-05-02 19:41:46 -07:00
UdjinM6
905b28f813 Do not calculate MN payments during initial download 2015-05-02 19:55:31 +03:00
UdjinM6
6e229e16ff DS fixes: 
- detect denominated but not yet anonymized balance properly or both (GetAnonymizableBalance)
 - fix progress calculation by using GetAnonymizableBalance
 - do not count MN-like inputs as anonymizable
 - denominate faster: if there is enough new inputs after DS started (their sum is greater then "already denominated but not yet anonymized balance")
 - allow small amounts to be used in CreateDenominated (modified SelectCoinsDark) but only if they are larger then 1 CENT
 - do not use collateral inputs in CreateDenominated (modified SelectCoinsDark)
 - convert some int64_t -> CAmount for money related variables/params
 2015-05-02 19:18:20 +03:00
UdjinM6
efca207c13 Fix KGW (handle negative uint256 properly) 2015-05-01 20:17:14 +03:00
Evan Duffield
40adfbf2c9 fixed 2015-04-30 12:54:34 -07:00
Evan Duffield
b02d5260fd fixed most of the budget functions 2015-04-30 10:11:34 -07:00
Evan Duffield
969826c249 Reference Node / Stubbed Out Budget System 
- Removed of reference node and replaced with decentralized quorums that pick the masternodes who get paid each block.
- Made a budgeting system, where masternodes can vote on individual budgets and the data is stored perminently on each clients computer
 2015-04-30 07:55:37 -07:00
crowning-
6aca47300e Merge remote-tracking branch 'upstream/v0.12.0.x' into v0.12.0.x 2015-04-30 08:31:47 +02:00
crowning-
8f505019e9 Only show most common transaction types by default 2015-04-29 23:46:53 +02:00
UdjinM6
24309f78ce various (gitian) build fixes 2015-04-29 21:27:52 +03:00
crowning-
8223e0d34f Fix for addressbook label problem on Windows 2015-04-26 00:58:50 +02:00
crowning-
cf7e9886f5 Enable dynamic CSS temporarily for debugging 2015-04-25 23:53:58 +02:00
UdjinM6
854a1be027 Merge pull request #316 from UdjinM6/v0.12.0.x_mn_replies 
V0.12.0.x Fix translations(mn replies /protobump/ + DS progress)
 2015-04-20 17:18:48 +03:00
Gregory Maxwell
139cd8177b
Cap nAttempts penalty at 8 and switch to pow instead of a division loop. 
On hosts that had spent some time with a failed internet connection their
 nAttempts penalty was going through the roof (e.g. thousands for all peers)
 and as a result the connect search was pegging the CPU and failing to get
 more than a 4 connections after days of running (because it was taking so
 long per try).

Rebased-From: a784f90c98
Github-Pull: #6029
 2015-04-20 13:59:19 +02:00
Suhas Daftuar
bac6fca3c9
Set nSequenceId when a block is fully linked 
Also adds a test to CheckBlockIndex

Conflicts:
	src/main.cpp

Rebased-From: c1ecee8f72
Github-Pull: #6010
 2015-04-20 13:48:52 +02:00
crowning-
5873a5e5a3 Included new "Peers list" tab into CSS theme 2015-04-19 16:01:45 +02:00
crowning-
4f28254506 Merge remote-tracking branch 'upstream/v0.12.0.x' into v0.12.0.x 2015-04-19 00:38:39 +02:00
dexX7
323de27f4b
Initialization: setup environment before starting QT tests 
The environment is prepared by the main thread to guard against invalid locale settings.
 2015-04-18 16:06:22 +02:00
dexX7
7494e0915b
Initialization: setup environment before starting tests 
The environment is prepared by the main thread to guard against invalid locale settings and to prevent deinitialization issues of Boost path, which can result in app crashes.
 2015-04-18 16:06:20 +02:00
dexX7
df45564cf0
Initialization: set fallback locale as environment variable 
The scope of `std::locale::global` appears to be smaller than `setenv("LC_ALL", ...)` and insufficient to fix messed up locale settings for the whole application.
 2015-04-18 16:06:15 +02:00
Evan Duffield
1e69e57662 Masternode Overhaul 
- Added new CMasterBroadcast/CmasternodePing objects, with all of the code required to check each new message. SHould be much easier to tell what's going on now.
 2015-04-17 23:44:49 -07:00
UdjinM6
949494d4de Merge pull request #317 from crowning-/auto-wallet-backup 
Autobackup: keep n-backups per wallet-name
 2015-04-17 02:43:43 +03:00
Evan Duffield
7d33b6d8b3 Masternode Last Paid Times 
-Update nLastPaid when blocks come in
 2015-04-16 14:08:58 -07:00
Evan Duffield
d25cf1af22 Split masternode and payments code 2015-04-16 13:26:18 -07:00
Evan Duffield
88f6a598b9 Updated Reference-Node Implementation 
- Added nLastPaid to masternode information for persistant storage of the masternode payment cycle
- Masternodes get flagged as just paid when they enter the masternode list and must wait a full cycle to be paid again
- Masternode RPC commands now show short vin string instead of ip address
 2015-04-16 07:08:06 -07:00
crowning-
9296ce0e4c Autobackup: keep n-backups per wallet-name 2015-04-16 13:13:33 +02:00
mrbandrews
57d1f46952
Fix CheckBlockIndex for reindex. 
Some tests in CheckBlockIndex require chainActive.Tip(), but when reindexing, chainActive has not been set on the first call to CheckBlockIndex.

reindex.py starts a node, mines 3 blocks, stops, and reindexes with CheckBlockIndex enabled.

Rebased-From: 0421c18f3a
Github-Pull: #6012
 2015-04-16 10:34:30 +02:00
UdjinM6
8e05e9eb10 Fix translations: 
- mn replies
  - MN should use codes for replies, translations are done on client side (client protocol / min pool peer protocol bump)
  - use QString for translation instead of ostream, construct better human readable strings for translators
- progress
  - use QString here too
 2015-04-16 05:35:12 +03:00
UdjinM6
5daefc1a08 Merge remote-tracking branch 'origin/master' into v0.12.0.x 
+Fix Makefile.qt.include
 2015-04-16 01:13:25 +03:00
UdjinM6
e6c9d5720c Merge remote-tracking branch 'bitcoin/0.10' into v0.12.0.x 2015-04-16 00:42:33 +03:00