Wladimir J. van der Laan
a65f7b7a76
Merge #7311 : MOVEONLY: Move non-consensus functions out of pow
...
e867561 MOVEONLY: non-consensus: from pow to chain: (Jorge Timón)
2017-12-11 08:08:48 +01:00
Alexander Block
c8e04d43f7
Add missing comment in net.cpp
...
Missed in previous backports
2017-12-11 08:08:48 +01:00
Alexander Block
5f68e06a07
Add missing whitelistalwaysrelay arg to SET_DOC_OPTIONAL
...
Missed from bitcoin #7439
2017-12-11 08:08:48 +01:00
Wladimir J. van der Laan
6789bf6e13
Merge #7287 : Consensus: Remove calls to error() and FormatStateMessage()
...
93fc58c Consensus: Remove calls to error() and FormatStateMessage() from some consensus code in main (Jorge Timón)
2017-12-11 08:08:48 +01:00
Wladimir J. van der Laan
3cd83db0dc
Merge #7441 : Use Debian 8.3 in gitian build guide
...
666a0f8 Use Debian 8.3 in gitian build guide (fanquake)
2017-12-11 08:08:48 +01:00
Wladimir J. van der Laan
c5f84c4e60
Merge #6842 : limitfreerelay edge case bugfix
...
2dfeaa1 limitfreerelay edge case bugfix: (ptschip)
2017-12-11 08:08:48 +01:00
Wladimir J. van der Laan
6c5286aadd
Merge #7423 : doc: add example for building with constrained resources
...
f9298cc doc: add example for building with constrained resources (Jarret Dyrbye)
2017-12-11 08:08:48 +01:00
Wladimir J. van der Laan
2fd5d93a92
Merge #7437 : GUI: Disable tab navigation for peers tables.
...
8b3d8e3 GUI: Disable tab navigation for peers tables. (Kefkius)
2017-12-11 08:08:48 +01:00
Wladimir J. van der Laan
b277eed58f
Merge #7425 : devtools: Fix utf-8 support in messages for github-merge
...
c8a6c11 devtools: Fix utf-8 support in messages for github-merge (Wladimir J. van der Laan)
2017-12-11 08:08:48 +01:00
Wladimir J. van der Laan
5323a08afa
Merge #7300 : [trivial] Add missing copyright headers
...
fabcee1 Remove copyright header from autogenerated chainparamsseeds.h (MarcoFalke)
fa60d05 Add missing copyright headers (MarcoFalke)
fa7e4c0 Bump copyright headers to 2014 (MarcoFalke)
2017-12-11 08:08:48 +01:00
Wladimir J. van der Laan
577f683c5b
Merge #7402 : [devtools] github-merge get toplevel dir without extra whitespace
...
5ed2f16 [devtools] github-merge get toplevel dir without extra whitespace (Andrew C)
2017-12-10 00:04:02 +01:00
Wladimir J. van der Laan
d9d9e95e42
Merge #7395 : devtools: show pull and commit information in github-merge
...
17b5d38 devtools: show pull and commit information in github-merge (Wladimir J. van der Laan)
2017-12-10 00:04:02 +01:00
Wladimir J. van der Laan
85919332dd
Merge #7236 : Use createrawtx locktime parm in txn_clone
...
e279038 Use createrawtx locktime parm in txn_clone (Tom Harding)
2017-12-10 00:04:02 +01:00
Wladimir J. van der Laan
643181fe15
Merge #7262 : Reduce inefficiency of GetAccountAddress()
...
2409865 Reduce inefficiency of GetAccountAddress() (Chris Moore)
2017-12-10 00:04:02 +01:00
Jonas Schnelli
43700eef36
Merge #7383 : [Qt] rename "amount" to "requested amount" in receive coins table
...
df6e8e1 [Qt] rename "amount" to "requested amount" in receive coins table (Jonas Schnelli)
2017-12-10 00:04:02 +01:00
Wladimir J. van der Laan
59db2fda16
Merge #7183 : Improved readability of ApproximateBestSubset
...
96efcad Improved readability of sorting for coin selection. (Murch)
2017-12-10 00:04:02 +01:00
Wladimir J. van der Laan
78ad32d105
Merge #7307 : [RPC, Wallet] Move RPC dispatch table registration to wallet/ code
...
dd2dc40 [RPC, Wallet] Move RPC dispatch table registration to wallet/ code (Jonas Schnelli)
2017-12-10 00:04:02 +01:00
Wladimir J. van der Laan
3be77849d7
Merge pull request #7378
...
da6d18b devtools: replace github-merge with python version (Wladimir J. van der Laan)
2017-12-10 00:04:02 +01:00
Wladimir J. van der Laan
42997ee8dc
Merge pull request #7280
...
faeda0e [travis] Run contrib/devtools/check-doc.py early (MarcoFalke)
fada0c9 [travis] Fail when documentation is outdated (MarcoFalke)
2017-12-10 00:04:02 +01:00
Wladimir J. van der Laan
2474fd0aea
Merge pull request #7208
...
64360f1 Make max tip age an option instead of chainparam (Wladimir J. van der Laan)
2017-12-10 00:04:02 +01:00
Wladimir J. van der Laan
723eacf454
Merge pull request #7290
...
fa461df Clarify mocktime help message (MarcoFalke)
faa572a [init] Help Msg: Use Params(CBaseChainParams::MAIN) (MarcoFalke)
fa6ab96 [init] Add missing help for args (MarcoFalke)
fac11ea [init] Fix error message of maxtxfee invalid amount (MarcoFalke)
2017-12-10 00:04:02 +01:00
Wladimir J. van der Laan
25ba3aba16
Merge pull request #7304
...
fa074a6 [contrib] Prepare clang-format-diff for usage (MarcoFalke)
fa4f4b6 Add clang-format-diff.py from the LLVM svn (MarcoFalke)
2017-12-10 00:04:01 +01:00
Wladimir J. van der Laan
38080259be
Merge pull request #7313
...
0331aa3 Fixing typos on security-check.py and torcontrol.cpp (calebogden)
2017-12-10 00:04:01 +01:00
Wladimir J. van der Laan
26a5dfe339
Merge pull request #7326
...
3a9dfe9 Fix typo, wrong information in gettxout help text. (paveljanik)
2017-12-10 00:04:01 +01:00
Wladimir J. van der Laan
5ca9b1a9c3
Merge pull request #7317
...
8a7f000 [RPC] remove the option of having multiple timer interfaces (Jonas Schnelli)
db198d5 Fix RPCTimerInterface ordering issue Dispatching a QThread from a non Qt thread is not allowed. Always use the HTTPRPCTimerInterface (non QT) to dispatch RPCRunLater threads. (Jonas Schnelli)
2017-12-10 00:04:01 +01:00
Wladimir J. van der Laan
bcebc7c4c1
Merge pull request #7266
...
6cd198f Removed comment about IsStandard for P2SH scripts (Marcel Krüger)
2017-12-10 00:04:01 +01:00
Wladimir J. van der Laan
f04f8c19dc
Merge pull request #7257
...
5e10922 Combine common error strings for different options so translations can be shared and reused (Luke Dashjr)
2017-12-10 00:04:01 +01:00
Wladimir J. van der Laan
3f6d6572f9
Merge pull request #7156
...
6e76587 rpc: remove cs_main lock from `createrawtransaction` (Wladimir J. van der Laan)
2017-12-10 00:04:01 +01:00
Wladimir J. van der Laan
bf688abcee
Merge pull request #7113
...
086ee67 Switch to a more efficient rolling Bloom filter (Pieter Wuille)
2017-12-10 00:04:01 +01:00
Wladimir J. van der Laan
f1da40c876
Merge #7550 : rpc: Input-from-stdin mode for bitcoin-cli
...
f22f14c doc: mention bitcoin-cli -stdin in release notes (Wladimir J. van der Laan)
92bcca3 rpc: Input-from-stdin mode for bitcoin-cli (Wladimir J. van der Laan)
2017-12-10 00:04:01 +01:00
Alexander Block
f8407083ca
Remove duplicated CCACHE= line in depends/config.site.in
...
Got added due to wrong merge conflict resolution
2017-12-10 00:04:01 +01:00
UdjinM6
f9f28e7c73
De-bump to 0.12.2.2 ( #1768 )
...
* Revert "bump to 0.12.3.0 (#1726 )"
This reverts commit ccbd5273ec
.
* bump to 0.12.2.2
2017-12-08 16:55:05 +03:00
UdjinM6
51b2c7501c
Fix WarningBitsConditionChecker ( #1765 )
...
Assume that all masternodes are upgraded to avoid false warnings
2017-12-07 19:07:21 +03:00
UdjinM6
3028af19f1
post-DIP0001 cleanup ( #1763 )
...
* post-DIP0001 cleanup
also fixes tests
* bump nMinimumChainWork and defaultAssumeValid
2017-12-07 12:43:23 +03:00
UdjinM6
4802a1fb71
Allow IS for all txes, not only for txes with p2pkh and data outputs ( #1760 )
2017-12-07 12:43:08 +03:00
UdjinM6
f4502099a4
make CheckDSTXes() private, execute it on both client and server ( #1736 )
2017-12-07 12:42:47 +03:00
UdjinM6
c5ec2f82a8
Drop IsNormalPaymentScript
, use IsPayToPublicKeyHash
( #1761 )
2017-12-07 04:33:51 +03:00
Ilya Savinov
442325b072
add maxgovobjdatasize
field to the output of getgovernanceinfo
( #1757 )
2017-12-06 01:18:08 +03:00
thephez
3f3705c476
[Trivial] Typo/doc updates and RPC help formatting ( #1758 )
...
* Protocol Doc - correct type of DSQ nTime and fReady fields
* Basic typo correction
* RPC help typos
- Change port in DisconnectNode example from Bitcoin port -> Dash port
- Correct order of chainwork in getblockheader/getblockheaders help to
match actual output
- Add missing fields to getmininginfo/getblocktemplate help output
* Remove duplicate generate field in getmininginfo output
* Fix generate field type info / description in getmininginfo output
2017-12-06 01:17:45 +03:00
Турбанов Андрей
9e7cc56cb6
Fix typo in release-notes.md ( #1759 )
2017-12-06 01:17:21 +03:00
joe
d1aeac1b2e
Spelling mistake in validation.cpp ( #1752 )
...
Fixed!
2017-12-04 09:06:19 +03:00
UdjinM6
7e96af4e65
Refactor PrivateSend ( #1735 )
...
* make infoMixingMasternode private
* move PS queue entries expiration checks (and cs_darksend) to CPrivateSendBase
* drop CTxDSOut
* move prevPubKey out of CTxIn into CTxDSIn and use CTxDSIn explicitly
* drop CPrivateSendClient::NewBlock
* move IsDenominatedAmount to CPrivateSend
* move IsCollateralAmount to CPrivateSend
* drop darksend-relay.cpp/h
* drop GetMasternodeByRank
2017-12-04 09:06:07 +03:00
UdjinM6
c166ed39b0
Allow compilation with --disable-wallet
( #1733 )
...
* Allow compilation with `--disable-wallet`
* fix remaining references
* Drop wallet references/include in CActiveMasternode and fix other files affected by this change
* Wrap privatesend-client.h include with ifdef/endif and fix other files affected by this change
* Re-enable Travis build with no wallet
reverts 267e57877b
2017-12-01 21:53:34 +03:00
UdjinM6
865b61b503
Unify GetNextWorkRequired ( #1737 )
...
* unify GetNextWorkRequired
* drop enum
2017-12-01 08:15:11 +03:00
UdjinM6
3280097495
fine-tune sync conditions in getblocktemplate ( #1739 )
2017-12-01 08:14:57 +03:00
UdjinM6
70cb2a4af5
Fix traditional UI theme ( #1741 )
...
* fix traditional UI theme
* Fix Send dialog (PS/IS/Balance)
2017-12-01 08:14:39 +03:00
UdjinM6
32f21698e8
Adjust tests to avoid Travis timeouts ( #1745 )
...
- add some stdout spam to heavy tests (versionbits_tests, coins_tests and PrevectorTests)
- replace `--show_progress` with `--log_level=test_suite` to print these messages and avoid timeout
2017-12-01 08:14:17 +03:00
UdjinM6
bc83425589
Two small fixes in docs ( #1746 )
2017-12-01 08:13:49 +03:00
UdjinM6
7dfe8aade1
Merge pull request #1748 from willwray/build_quiet_warnings
...
Build: quiet annoying warnings
2017-12-01 08:13:21 +03:00
UdjinM6
e975f891c8
Fix ru typo ( #1742 )
2017-11-30 00:45:12 +03:00