Commit Graph

16592 Commits

Author SHA1 Message Date
UdjinM6
0f088d03af
Change regtest and devnet p2p/rpc ports (#3064) 2019-08-28 10:52:00 +03: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
Alexander Block
788d42dbcf
Bump version to 0.14.0.3 and copy release notes (#3053) 2019-08-12 20:08:33 +02:00
Pasta
806da3c6e2
adjust number of parameters in sendmany 2019-08-12 09:11:29 -05:00
UdjinM6
c4094c8de1
Few more tiny trivial fixes 2019-08-12 09:07:03 -05:00
UdjinM6
8c2c2a1ad4
s/bitcoind/dashd/ in some places 2019-08-12 09:07:03 -05:00
UdjinM6
76822dd509
fix imports 2019-08-12 09:07:03 -05:00
UdjinM6
4bfef1daad
Add missing dash-specific parts 2019-08-12 09:07:03 -05:00
UdjinM6
9828b624a0
_wait_for_bitcoind_start should be a part of BitcoinTestFramework 2019-08-12 09:07:03 -05:00
UdjinM6
d0288fba58
Refactor/fix mocktime usage in tests 2019-08-12 09:07:03 -05:00
UdjinM6
9c8365ee62
Fix GetMinimumFee changes 2019-08-12 09:07:03 -05:00
UdjinM6
2e235b4b4d
Fix rpcs 2019-08-12 09:07:03 -05:00
UdjinM6
00052aa15b
Drop rbf-related parts 2019-08-12 09:07:03 -05:00
Luke Dashjr
00c4046e55
Wallet: Refactor FundTransaction to accept parameters via CCoinControl 2019-08-12 09:07:03 -05:00
Wladimir J. van der Laan
c9784838a7
Merge #10589: More economical fee estimates for RBF and RPC options to control
f135923 Add RPC options for RBF, confirmation target, and conservative fee estimation. (Alex Morcos)
f0bf33d Change default fee estimation mode. (Alex Morcos)
e0738e3 remove default argument from estimateSmartFee (Alex Morcos)
d507c30 Introduce a fee estimate mode. (Alex Morcos)
cfaef69 remove default argument from GetMinimumFee (Alex Morcos)

Tree-SHA512: 49c3a49a6893790a7e8b4e93a48f123dd5307af26c2017800683b76b4df8fc904ba73402917878676242c7440e3e04288d0c1ff3c2c907418724efc03cedab50
2019-08-12 09:07:03 -05:00
UdjinM6
c853c012ee
Fix amounts formatting in decoderawtransaction and getsuperblockbudget 2019-08-12 09:07:03 -05:00
MarcoFalke
a82f22e528
Merge #10556: Move stop/start functions from utils.py into BitcoinTestFramework
5ba83c1 [tests] fix nits. (John Newbery)
05b8c08 [tests] reorganize utils.py module (code move only) (John Newbery)
0d473c5 [tests] move mocktime property and functions to BitcoinTestFramework (John Newbery)
cad967a [tests] Move stop_node and start_node methods to BitcoinTestFramework (John Newbery)
f1fe536 [tests] fix flake8 warnings in test_framework.py and util.py (John Newbery)
37065d2 [tests] remove unused imports from utils.py (John Newbery)

Tree-SHA512: 461db412c57c4d0030e27fe3f78f17bcaf00b966f319a9e613460cca897508ff70a29db7138133fe1be8d447dad6702ba2778f9eddfe929016e560d71c20b09f
2019-08-12 09:07:03 -05:00
Pasta
746ebf1651
fix indendation in wallet.cpp
Signed-off-by: Pasta <pasta@dashboost.org>
2019-08-12 09:07:03 -05:00
Pasta
3a6b2ce274
backport part of #10481
Signed-off-by: Pasta <pasta@dashboost.org>
2019-08-12 09:07:03 -05:00
Wladimir J. van der Laan
ecfdfa64d2
Merge #10792: Replace MAX_OPCODE for OP_NOP10.
c8e29d7 Replace MAX_OPCODE for OP_NOP10. (Mark Friedenbach)

Tree-SHA512: f6a4129db24fe3feb044acaec3b94194cc4fa909de3d0a45a664b32f886a7d8ab997c9cb6ff0870c4aee66d8e038cf0453dbbb518316829d15e84da9882f3e69
2019-08-12 09:07:03 -05:00
Pasta
1a0d52814e
#10483 scripted-diff: Use the C++11 keyword nullptr to denote the pointer literal instead of the macro NULL
-BEGIN VERIFY SCRIPT-
sed -i 's/\<NULL\>/nullptr/g' src/*.cpp src/*.h src/*/*.cpp src/*/*.h src/qt/*/*.cpp src/qt/*/*.h src/wallet/*/*.cpp src/wallet/*/*.h src/support/allocators/*.h
sed -i 's/Prefer nullptr, otherwise SAFECOOKIE./Prefer NULL, otherwise SAFECOOKIE./g' src/torcontrol.cpp
sed -i 's/tor: Using nullptr authentication/tor: Using NULL authentication/g' src/torcontrol.cpp
sed -i 's/METHODS=nullptr/METHODS=NULL/g' src/test/torcontrol_tests.cpp src/torcontrol.cpp
sed -i 's/nullptr certificates/NULL certificates/g' src/qt/paymentserver.cpp
sed -i 's/"nullptr"/"NULL"/g' src/torcontrol.cpp src/test/torcontrol_tests.cpp
-END VERIFY SCRIPT-

Signed-off-by: Pasta <pasta@dashboost.org>
2019-08-12 09:07:03 -05:00
Wladimir J. van der Laan
ac80c90123
Merge #11012: Make sure to clean up mapBlockSource if we've already seen the block
3f8fa7f Make sure to clean up mapBlockSource if we've already seen the block (Cory Fields)

Pull request description:

  Otherwise we may leave them dangling.

  Credit TheBlueMatt.

Tree-SHA512: 8be77e08ebfc4f5b206d5ee7cfbe87f92c1eb5bc2b412471993658fe210306789aaf0f3d1454c635508a7d8effede2cf5ac144d622b0157b872733d9661d65c3
2019-08-12 09:07:03 -05:00
Wladimir J. van der Laan
19a17a58d2
Merge #10968: Add instructions for parallel gitian builds.
e93ff71 Add instructions for multi-processor gitian builds (Charlie Lee)

Pull request description:

  This makes builds much faster if you have a multi-core machine.

Tree-SHA512: edb64c691a31a8a2e6c45f87886912d429a3fd600ebc0de2b16d44efd9d38bb92fea33c5fed207ad684b75d3247218912cab67661466a5538d534845e0808c9f
2019-08-12 09:07:03 -05:00
MarcoFalke
7f3d3deda7
Merge #11032: [qa] Fix block message processing error in sendheaders.py
f1bf31186 [qa] Fix block message processing error in sendheaders.py (Suhas Daftuar)

Pull request description:

  Introduced in #10169

  @jnewbery

Tree-SHA512: f330b926c51bd4f1b63738e1ddac23c58cb32345baed36343f7a989b3b9906c5c6e7dbd74b416f662c6ef68b8d256a6c69a977ec5f85789b2c1dc802bc831f6b
2019-08-12 09:07:03 -05:00
MarcoFalke
e5c94eea0f
Merge #10765: Tests: address placement should be deterministic by default
c5ebddd11 Tests: address placement should be deterministic by default (René Nyffenegger)

Pull request description:

  Better version of wrong and closed pull request https://github.com/bitcoin/bitcoin/pull/10764

Tree-SHA512: dfda6ea4a9dd0f4c8b96212ad43a716ff1dddf115cd2712a2a7e42c97fc9494079c746906b39d880a9827c05d2b75c728afd4ca4519ce4d365f0dae0c4aec24c
2019-08-12 09:07:03 -05:00
MarcoFalke
c2fcf849a7
Merge #11025: qa: Fix inv race in example_test
faa76d1b7 qa: Fix inv race in example_test (MarcoFalke)

Pull request description:

  There have been intermittent test failures on this script.

  ```py
    File "./test/functional/example_test.py", line 216, in run_test
      assert_equal(block, 1)
  AssertionError: not(2 == 1)
  ```

  Probably the simplest way to fix them is overriding the `on_inv` method, so that no "colliding" getdata for the blocks are sent out.

  Additionally, all getdata are now sent in a single message.

Tree-SHA512: 809c2bbfa90a67fc97905769fcbe90ba9abe1aac1f145530934f56a364835973b94d3302b6be68f4f2987acf333bce146bcc4c878c283301871ba5bb1a9bedb6
2019-08-12 09:07:03 -05:00
MarcoFalke
50fee01e3d
Merge #10963: [bench] Restore format state of cout after printing with std::fixed/setprecision
fd05132e5 Restore default format state of cout after printing with std::fixed/setprecision (practicalswift)

Pull request description:

  Restore default format state of `std::cout` after printing with `std::fixed`/`std::setprecision`.

Tree-SHA512: 445b5b42aff58e2350939e8febc9b4a6fff478616abfe831aec42bee906cefac7a153c93d506407fb213d04dae9c7afbb5bfd344be63ca0f40ae39b331a4144f
2019-08-12 09:07:03 -05:00
MarcoFalke
5f2aef826f
Merge #11003: Docs: Capitalize bullet points in CONTRIBUTING guide
13b1e9a16 Capitalize bullet points in CONTRIBUTING guide (Evan Klitzke)

Pull request description:

  English grammar dictates that these bullet points should be capitalized.
  This also makes the capitalization style consistent with the rest of the
  document, e.g. the "Decision Making Process" section.

Tree-SHA512: 59f5a8941180ff3862ba63d364c27fd83d2e144299a71b2e784d58f806e8a02d7951dcc80fcc7152d0c78c2d1f5a22db1236af7ea6b9abece8dbe93533e4b65c
2019-08-12 09:07:03 -05:00