UdjinM6
6ec64f8ff6
Merge remote-tracking branch 'bitcoin/0.12' into mergebtc0.12
2016-02-21 04:09:11 +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
instagibbs
c3faf78c0e
Changed getnetworkhps value to double to avoid overflow.
...
Github-Pull; #7480
Rebased-From: 993d089e82fc045d7b0f23e1a5dc934cba0e3306
2016-02-10 20:45:42 +01:00
UdjinM6
a5ac60b868
Merge remote-tracking branch 'bitcoin/0.12' into HEAD
...
+ merge fixes
+ keepass on evhttp
2016-02-06 16:48:04 +03:00
UdjinM6
e2aaf09700
Cleanup
...
- lower unobvious dependency through header files, move few includes to the right places
- some trivial code cleanup
Closes #680
2016-01-31 12:08:45 +01:00
MarcoFalke
333e1eaeea
Bump copyright headers to 2015
...
- Bump copyright headers to 2015
- [devtools] Rewrite fix-copyright-headers.py
- [devtools] Use git pretty-format for year parsing
Github-Pull: #7205
Rebased-From: fa6ad855e9159b2247da4fa0054f32fa181499ab fa24439ff3d8ab5b9efaf66ef4dae6713b88cb35 fa71669452e57039e4270fd2b33a0e0e1635b813
2016-01-05 14:13:33 +01:00
Luke Dashjr
b966aa836a
Constrain constant values to a single location in code
2015-11-28 18:47:29 +01:00
Wladimir J. van der Laan
e92377fa7f
Merge pull request #6134
...
e304432
Pass reference to estimateSmartFee and cleanup whitespace (Suhas Daftuar)
56106a3
Expose RPC calls for estimatesmart functions (Alex Morcos)
e93a236
add estimateSmartFee to the unit test (Alex Morcos)
6303051
EstimateSmart functions consider mempool min fee (Alex Morcos)
f22ac4a
Increase success threshold for fee estimation to 95% (Alex Morcos)
4fe2823
Change wallet and GUI code to use new smart fee estimation calls. (Alex Morcos)
22eca7d
Add smart fee estimation functions (Alex Morcos)
2015-11-27 12:59:37 +01:00
Alex Morcos
56106a3300
Expose RPC calls for estimatesmart functions
...
Also add testing for estimatesmartfee in smartfees.py
2015-11-16 15:42:31 -05:00
Jorge Timón
6bc9e4056b
Chainparams: Explicit CChainParams arg for miner:
...
-BitcoinMiner
-CreateNewBlock
-GenerateBitcoins
-ProcessBlockFound
2015-11-11 13:21:17 +01:00
Jorge Timón
598e494587
Chainparams: Explicit CChainParams arg for main (pre miner):
...
-ProcessNewBlock
-TestBlockValidity
2015-11-11 13:21:17 +01:00
Luke Dashjr
5f9260f458
Bugfix: If genproclimit is omitted to RPC setgenerate, don't change it; also show correct default in getmininginfo
2015-10-01 23:16:42 +00:00
Jonas Schnelli
9623e93473
[Univalue] add univalue over subtree
...
similar to secp256k1 include and compile univalue over a subtree
2015-10-01 10:49:57 +02:00
MarcoFalke
51ff777357
[trivial] Fix rpc message "help generate"
2015-09-12 18:19:53 +02:00
Ian T
e83df075f9
Update RPC generate help for numblocks to include required
...
The `generate` RPC has no default `numblocks` and a numeric value is required.
2015-09-03 13:29:10 -04:00
UdjinM6
657bd1103e
Few cleanups:
...
- compiling errors
- output
- CBitcoinAddress usage cleanup
- refresh qt project file
- fix typo in `masternode` debug category
2015-08-28 23:16:58 +03:00
Daniel Kraft
2016576998
Fix crash when mining with empty keypool.
...
Since the introduction of the ScriptForMining callback, the mining
functions (setgenerate and generate) crash with an assertion failure
(due to a NULL pointer script returned) if the keypool is empty. Fix
this by giving a proper error.
2015-08-18 09:07:33 +02:00
evan82
7bef018c22
Revert "V0.12.0.x stop mining before completely synced, more info in rpc"
2015-08-13 09:38:23 -07:00
UdjinM6
ac488d70b9
stop mining before completely synced, more info in rpc
2015-08-13 16:50:17 +03:00
Jorge Timón
9dd793f499
TRIVIAL: Missing includes
2015-07-23 21:10:22 +02:00
Pavel Janík
1327897aee
Reformat help text of estimatefee and estimatepriority to match other help texts.
2015-07-20 19:32:38 +02:00
UdjinM6
a8d230f80d
satoshi(s) -> duff(s) & Satoshi:x.x.x -> Dash Core:x.x.x (both for user visible strings only)
2015-07-07 01:40:38 +03:00
Jonas Schnelli
5496253966
add CReserveScript to allow modular script keeping/returning
...
- use one CReserveScript per mining thread
2015-07-01 16:06:14 +02:00
Jonas Schnelli
d0fc10a844
detach wallet from miner
2015-06-30 21:45:46 +02:00
thelazier
639c67d354
Fix getblocktemplate not show payee from masternode winners..
2015-06-18 16:40:22 +07:00
Wladimir J. van der Laan
3fce72eaa3
Merge pull request #6206
...
a9ac95c
use const references where appropriate (Philip Kaufmann)
2015-06-05 07:11:44 +02:00
Jonas Schnelli
ef5fca8b80
fix rpcmining/getblocktemplate univalue transition logic error
2015-06-04 21:40:11 +02:00
Philip Kaufmann
a9ac95c1bc
use const references where appropriate
2015-06-04 19:34:18 +02:00
Jonas Schnelli
9a8897f4ac
Remove JSON Spirit wrapper, remove JSON Spirit leftovers
...
- implement find_value() function for UniValue
- replace all Array/Value/Object types with UniValues, remove JSON Spirit to UniValue wrapper
- remove JSON Spirit sources
2015-06-04 09:16:21 +02:00
Jonas Schnelli
3df0411ad9
remove JSON Spirit UniValue wrapper
2015-06-04 09:16:06 +02:00
Jonas Schnelli
6c7bee0624
expicit set UniValue type to avoid empty values
2015-06-04 09:16:05 +02:00
Jonas Schnelli
53b4671a9d
extend conversion to UniValue
2015-06-04 09:16:05 +02:00
Jeff Garzik
15982a8b69
Convert tree to using univalue. Eliminate all json_spirit uses.
2015-06-04 09:16:05 +02:00
Suhas Daftuar
9be0e6837b
Be stricter in processing unrequested blocks
...
AcceptBlock will no longer process an unrequested block, unless it has not
been previously processed and has more work than chainActive.Tip()
2015-06-02 13:54:29 -04:00
jtimon
da29ecbcc6
Consensus: MOVEONLY: Move CValidationState from main consensus/validation
2015-05-15 16:05:28 +02:00
Philip Kaufmann
59b149ff82
remove unneeded incude of wallet/db.h from rpcmining.cpp
2015-05-14 01:02:01 -04:00
Wladimir J. van der Laan
1d9d314573
Merge pull request #5696
...
691161d
Consensus: Create consensus/consensus.h with some constants (jtimon)
2015-04-26 14:42:09 +02:00
Wladimir J. van der Laan
27ce808fb5
tests: Error when setgenerate is used on regtest
...
Ever since #5957 there has been the problem that older RPC test cases
(as can be found plenty in open pulls) use setgenerate() on regtest,
assuming a different interpretation of the arguments. Directly
generating a number of blocks has been split off into a new method
`generate` - however using `setgenerate` with the previous arguments will
result in spawning an unreasonable number of threads, and well, simply
not work as expected without clear indication of the error.
Add an error to point the user at the right method.
2015-04-21 10:14:06 +02:00
jtimon
691161d419
Consensus: Create consensus/consensus.h with some constants
2015-04-20 21:27:51 +02:00
UdjinM6
e6c9d5720c
Merge remote-tracking branch 'bitcoin/0.10' into v0.12.0.x
2015-04-16 00:42:33 +03:00
Jorge Timón
bebe7282ff
Chainparams: Refactor: Remove redundant AllowMinDifficultyBlocks() getter
2015-04-15 14:31:44 +02:00
Wladimir J. van der Laan
622e3c9c39
Merge pull request #5999
...
e8e8904
Chainparams: Cleanup: Delete CChainParams getters to attributes from Consensus::Params (Jorge Timón)
2015-04-15 12:00:09 +02:00
Matt Corallo
eae305f4c4
Fix missing lock in submitblock
...
Rebased-From: eb63bf86cf
Github-Pull: #6007
2015-04-14 10:52:03 +02:00
Matt Corallo
eb63bf86cf
Fix missing lock in submitblock
2015-04-13 11:29:44 -07:00
Jorge Timón
e8e8904dda
Chainparams: Cleanup: Delete CChainParams getters to attributes from Consensus::Params
2015-04-13 18:39:53 +02:00
Wladimir J. van der Laan
48265f3cf4
Revert mining changes in #5957
...
This reverts commit e2edf95cd3
6b04508e37
0df67f1f7a
,
except the changes to the RPC tests.
A `generate` RPC call is introduced based on the old code.
2015-04-10 07:51:27 +02:00
UdjinM6
cddd69444f
small rpc description fixes
2015-04-06 00:59:25 +03:00
UdjinM6
3f3b6bb3cb
rpc fixes
2015-04-05 01:57:25 +03:00
UdjinM6
64eebc3316
0.12 dirty merge'n'fix (bitcoin 0.10)
2015-04-04 19:24:37 +03:00
Pieter Wuille
e2edf95cd3
Bugfix: make CreateNewBlock return pindexPrev
2015-04-01 11:47:10 -07:00