Commit Graph

16718 Commits

Author SHA1 Message Date
Wladimir J. van der Laan
93754f8d85 Merge #10799: Prevent user from specifying conflicting parameters to fundrawtx
99c7fc3 Prevent user from specifying conflicting parameters to fundrawtx (Matt Corallo)

Pull request description:

  estimate_mode/conf_target both are overridden by feeRate, so should
  not be specified together with feeRate.

  Based on #10706

Tree-SHA512: 8ccd08575fd1f2a0d45112538ffbbc73983ee172963230b0cc7ac41d13c6f3c740917f82b212c41ded3a64d873452e7f2c7af49f3b47cab897f8e85117f21333
2019-09-03 19:14:02 -05:00
Pieter Wuille
05bed7009f Merge #10833: Fix typos
0189d8ed1 Fix typos (practicalswift)

Tree-SHA512: bac96ab13964e7579c93d63fc7550eb091c316767cc33f2a52c18cd786537650668799603414d418680a5e04516abf1e304b10d5f4ad48a5dcba24b3f09a0387
2019-09-03 19:11:04 -05:00
Pasta
0cccde9df7 fix all of the problems
Signed-off-by: Pasta <pasta@dashboost.org>
2019-09-03 18:55:21 -05:00
Pasta
791c07fb06 add gArgs
Signed-off-by: Pasta <pasta@dashboost.org>
2019-09-03 18:02:51 -05:00
Pasta
19b584c3ba remove some rbf
Signed-off-by: Pasta <pasta@dashboost.org>
2019-09-03 18:02:17 -05:00
Wladimir J. van der Laan
c849708996 Merge #10706: Improve wallet fee logic and fix GUI bugs
Contains RBF stuff to be removed in a later commit

11590d3 Properly bound check conf_target in wallet RPC calls (Alex Morcos)
fd29d3d Remove checking of mempool min fee from estimateSmartFee. (Alex Morcos)
2fffaa9 Make QT fee displays use GetMinimumFee instead of estimateSmartFee (Alex Morcos)
1983ca6 Use CoinControl to pass custom fee setting from QT. (Alex Morcos)
03ee701 Refactor to use CoinControl in GetMinimumFee and FeeBumper (Alex Morcos)
ecd81df Make CoinControl a required argument to CreateTransaction (Alex Morcos)

Pull request description:

  This builds on #10589  (first 5 commits from that PR, last 5 commits are new)

  The first couple commits refactor to use the CCoinControl class to pass fee calculation parameters around.

  This allows for fixing the buggy interaction in QT between the global payTxFee which can be modified by the RPC call settxfee or temporarily modified by the QT custom fee settings.  Before these changes the GUI could sometimes send a transaction with a recently set payTxFee and not respect the settings displayed in the GUI.   After these changes, using the GUI does not involve the global transaction confirm target or payTxFee.

  The prospective fee displays in the smart fee slider and the coin control dialog are changed to use the fee calculation from GetMinimumFee, this simplifies the code and makes them slightly more correct in edge cases.

  Maxing the fee calculation with the mempool min fee is move from estimateSmartFee to GetMinimumFee.

  This fixes a long standing bug, and should be tagged for 0.15 as it is holding up finalizing the estimatesmartfee RPC API before release.

Tree-SHA512: 4d36a1bd5934aa62f3806d380fcafbef73e9fe5bdf190fc5259a3e3a13349e5ce796e50e7068c46dc630ccf56d061bce5804f0bfe2e082bb01ca725b63efd4c1
2019-09-03 22:40:26 -05:00
MarcoFalke
c62c7ab6d6 Merge #10662: Initialize randomness in benchmarks
5155d11 Initialize randomness in benchmarks (Andrew Chow)

Tree-SHA512: 235006eb161893e1a84d5b2747cbaf7c82ced179ab2b9df30197b4cb2d3c4f31e47fa5b9cf62aced0fe244da47f3a38fbbe91fe86b0a90f1d86604da5d806fb1
2019-09-03 22:21:17 -05:00
Wladimir J. van der Laan
de1342791b Merge #10314: Remove unused forward declaration for non-existent ScriptPubKeyToJSON(...)
3fe8a83 Remove unused forward declaration for non-existent ScriptPubKeyToJSON(...) (practicalswift)

Tree-SHA512: 68d6a906fef86058ae7190228c7e65b5473b36f76b0cc53181b52c0de96f45d4a8dac0d1656f3793aaf4f79f4ca149ecb8293cc25b3f52fb09ceb114a343e933
2019-09-03 22:11:56 -05:00
UdjinM6
c22169d579
Reduce non-debug PS log output (#3076) 2019-09-03 22:48:35 +03:00
Alexander Block
41ae1c7e20 Add LDFLAGS_WRAP_EXCEPTIONS to dash_fuzzy linking (#3075) 2019-09-03 22:48:24 +03:00
UdjinM6
77b88558eb
Update/modernize macOS plist (#3074)
* Use 4-digit version numbers for macOS bundles

* Drop deprecated CFBundleGetInfoString and use NSHumanReadableCopyright instead
2019-09-03 22:48:14 +03:00
UdjinM6
f1ff148181
Fix bip69 vs change position issue (#3063)
* Fix bip69 vs change position issue

* Drop `setbip69enabled` rpc
2019-08-28 14:52:53 +03:00
UdjinM6
3a79b676a1
Merge pull request #3072 from PastaPastaPasta/backport-fuzzing
Backport fuzzing
2019-08-28 14:52:29 +03:00
UdjinM6
9abc393839
Refactor few things here and there (#3066)
* Refactor `HandleFullyConfirmedBlock()`

* Pass `pindexMined` into `AddNonLockedTx()`

* Unify time import in Dash specific tests

* Refactor UpdateSpork and SetPrivKey
2019-08-28 14:51:59 +03:00
UdjinM6
f2dcac3a4f
Merge #10757: RPC: Introduce getblockstats to plot things (#3058)
* Merge #10757: RPC: Introduce getblockstats to plot things

41d0476f62269027ec2193a5f80d508d789de8aa Tests: Add data file (Anthony Towns)
4cbfb6aad9ba8fa17b5e7ed3e9a36dc8a24f1fcf Tests: Test new getblockstats RPC (Jorge Timón)
35e77a0288bcac5594ff25c10c9679a161cb730b RPC: Introduce getblockstats (Jorge Timón)
cda8e36f019dd181e5c3774961b4f1335e5602cb Refactor: RPC: Separate GetBlockChecked() from getblock() (Jorge Timón)

Pull request description:

  It returns per block statistics about several things. It should be easy to add more if people think of other things to add or remove some if I went too far (but once written, why not keep it? EDIT: answer: not to test or maintain them).

  The currently available options are: minfee,maxfee,totalfee,minfeerate,maxfeerate,avgfee,avgfeerate,txs,ins,outs (EDIT: see updated list in the rpc call documentation)

  For the x axis, one can use height or block.nTime (I guess I could add mediantime if there's interest [EDIT: nobody showed interest but I implemented mediantime nonetheless, in fact there's no distinction between x or y axis anymore, that's for the caller to judge]).

  To calculate fees, -txindex is required.

Tree-SHA512: 2b2787a3c7dc4a11df1fce62c8a4c748f5347d7f7104205d5f0962ffec1e0370c825b49fd4d58ce8ce86bf39d8453f698bcd46206eea505f077541ca7d59b18c

* Replace get_mocktime() usage with self.mocktime
2019-08-28 14:50:29 +03:00
UdjinM6
3d5eabcfbb
Update/unify debug and logging rpc descriptions (#3071)
* Update/unify `debug` and `logging` rpc descriptions

* Add yet another meta - ""

* Apply suggestions from code review

Co-Authored-By: thephez <thephez@users.noreply.github.com>
2019-08-28 10:55:05 +03:00
UdjinM6
0e94e97cc5
Add missing tx type to TxToUniv (#3069)
* Add missing tx `type` to `TxToUniv`

* Adjust the expected output in unit test testcases accordingly
2019-08-28 10:54:44 +03:00
UdjinM6
becca24fcc
Few fixes in docs/comments (#3068)
* Few fixes in docs/comments

* Add descriptions
2019-08-28 10:54:19 +03:00
UdjinM6
9d109d6a30
Add missing instantlock/instantlock_internal to getblock's verbosity=2 mode (#3067) 2019-08-28 10:53:20 +03:00
UdjinM6
0f088d03af
Change regtest and devnet p2p/rpc ports (#3064) 2019-08-28 10:52:00 +03:00
Pasta
51a4e11d6e dashify what made sense in fuzzing.md
Signed-off-by: Pasta <pasta@dashboost.org>
2019-08-26 17:25:02 -05:00
PastaPastaPasta
b1970add13
Code Review fixes
Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
2019-08-25 00:17:19 -05:00
Pasta
8cadbf622e bitcoin -> dash
Signed-off-by: Pasta <pasta@dashboost.org>
2019-08-24 11:11:25 -05:00
Wladimir J. van der Laan
122da986c1 Merge #10415: [tests] Speed up fuzzing by ~200x when using afl-fuzz
693247b [test] Speed up fuzzing by ~200x when using afl-fuzz (practicalswift)

Tree-SHA512: 95922fc2616b8cb00dd531ed1140a52bbda4e04292dd8c1c60a8f49dbf6ccb797a18b61180b3fb68d695456b478a1f5ae7fda47e8ecee41dd65555487aef40a3
2019-08-24 10:23:31 -05:00
Wladimir J. van der Laan
2f2a6972dd Merge #9691: Init ECC context for test_bitcoin_fuzzy.
ac719c9 Init ECC context for test_bitcoin_fuzzy. (Gregory Maxwell)
2019-08-24 10:23:17 -05:00
Wladimir J. van der Laan
32dc5f1da6 Merge #9354: Make fuzzer actually test CTxOutCompressor
5dd626a Make fuzzer actually test CTxOutCompressor (Pieter Wuille)
2019-08-24 10:23:01 -05:00
Wladimir J. van der Laan
f55cf17040 Merge #9172: Resurrect pstratem's "Simple fuzzing framework"
8b15434 doc: Add bare-bones documentation for fuzzing (Wladimir J. van der Laan)
a4153e2 Simple fuzzing framework (Patrick Strateman)
2019-08-24 10:22:40 -05:00
UdjinM6
1905422561
Rework govobject/trigger cleanup a bit (#3070)
* No friends for `CGovernanceObject`

* Simplify CGovernanceTriggerManager::CleanAndRemove() logic and make sure CSuperblock::IsExpired() does not modify the state
2019-08-23 21:03:05 +03:00
UdjinM6
386de78bcb
Fix SelectCoinsMinConf to allow instant respends (#3061)
* Modify tests to check for instant respends

This should fail atm...

* Fix SelectCoinsMinConf to allow instant respends

Now tests should pass again.
2019-08-23 21:02:33 +03:00
thephez
cbbeec6897 RPC Getrawtransaction fix (#3065)
* Remove duplicate hex field from getrawtransaction

* Add missing height to help output
2019-08-22 13:15:08 +03:00
thephez
1e34967996 Added getmemoryinfo parameter string update (#3062)
- Make consistent with other RPCs
2019-08-22 13:14:22 +03:00
Alexander Block
9d2d8ccede Add a few malleability tests for DIP2/3 transactions (#3060)
* Remove unused scriptPubKey

* Add payload malleability check to DIP3 tests

* Also check malleability protection by signatures inside CProUpRegTx
2019-08-22 13:13:34 +03:00
thephez
4983f7abb7 RPC Fix typo in getmerkleblocks help (#3056) 2019-08-16 14:54:48 +03:00
UdjinM6
4588f67f84
Merge pull request #3059 from UdjinM6/mergemaster_0.14.0.3
Merge master 0.14.0.3 back into develop
2019-08-16 14:53:29 +03:00
PastaPastaPasta
a78dcfdec2 Add the public GPG key for Pasta for Gitian building (#3057)
* Add the public GPG key for Pasta for Gitain building

* change file ending from gpg to pgp
2019-08-16 14:52:41 +03:00
Alexander Block
6905da5fe4 Merge #11308: [qa] zapwallettxes: Wait up to 3s for mempool reload (#3051)
* Merge #11308: [qa] zapwallettxes: Wait up to 3s for mempool reload

fadd0c16b [qa] zapwallettxes: Wait up to 3s for mempool reload (MarcoFalke)

Pull request description:

  There had been intermittent test failures on zapwallettxes, as no time was allotted to reload the mempool.

Tree-SHA512: 993254d2aaca6ea42fceefffed0cf90bdda91c64150179ef2a11337c3fe2cc6bf42b83ea9d9a1a575204fbde2676d7203443b00d053e8c2ed43e017c09d3ab11

* Fix import
2019-08-16 14:51:15 +03:00
UdjinM6
929c892c05
Remove p2p alert leftovers (#3050)
* Drop ALERT debug category

Was used for p2p alerts only

* Drop `alert` p2p message handling in tests
2019-08-16 14:49:15 +03:00
PastaPastaPasta
0599d3a030 Backport bitcoin#10831: Batch flushing operations to the walletdb during top up and increase keypool size (#3045)
* backport #10831

Signed-off-by: Pasta <pasta@dashboost.org>

* Apply the same logic for SetHDChain/SetCryptedHDChain
2019-08-16 14:48:46 +03:00
UdjinM6
60cc3c0562
Merge pull request #3049 from PastaPastaPasta/backports-0.15-pr24
Backports 0.15 pr24
2019-08-16 14:47:58 +03:00
UdjinM6
c851de9996 Resolve merge issues 2019-08-16 04:15:25 +03:00
UdjinM6
c8b16fa8cd Merge branch 'master' into mergemaster_0.14.0.3 2019-08-15 21:58:12 +03:00
Alexander Block
7d8eab2641
Add 0.14.0.3 change log to release-notes.md (#3055) 2019-08-14 04:51:13 +02:00
UdjinM6
3d6c5ac27a
More mocktime related fixes 2019-08-13 14:50:34 -05:00
UdjinM6
59e57337e4
fix wait_node 2019-08-13 14:50:28 -05:00
UdjinM6
cd30d6b447
simplify stop_node 2019-08-13 14:50:20 -05:00
Pasta
a67f5375fb
remove duplicate import 2019-08-13 14:49:28 -05:00
Pasta
3980caf200
re-add import shutil 2019-08-13 14:48:24 -05:00
Alexander Block
f2443709b3
Update release-notes.md for 0.14.0.3 (#3054) 2019-08-13 19:33:52 +02:00
Alexander Block
8aa45cfb0d
Merge pull request #3046 from codablock/pr_v14_backports
[v0.14.0.x] Backport pending PRs
2019-08-13 19:33:21 +02:00
PastaPastaPasta
cb480af013
Dashify
Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
2019-08-13 11:27:56 -05:00