Skip to content

Backports 0.18 pr7 - #4239

Merged
PastaPastaPasta merged 9 commits into
dashpay:developfrom
Munkybooty:backports-0.18-pr7
Jul 13, 2021
Merged

Backports 0.18 pr7#4239
PastaPastaPasta merged 9 commits into
dashpay:developfrom
Munkybooty:backports-0.18-pr7

Conversation

@Munkybooty

Copy link
Copy Markdown

No description provided.

Comment thread .travis/test_06_script.sh Outdated
Comment thread src/noui.cpp Outdated
Comment thread depends/Makefile Outdated
Comment thread src/qt/guiutil.cpp Outdated
Comment thread src/Makefile.bench.include Outdated
Comment thread doc/release-notes/release-notes-0.16.3.md Outdated
laanwj added 3 commits July 11, 2021 10:16
…ke bitcoind

fa7e969 qt: Also log and print messages or questions like bitcoind (MarcoFalke)
dd031e3 noui: Move handlers to header file (MarcoFalke)

Pull request description:

  Testing and debugging after shutdown are harder if the node was run through the gui, because errors and warnings would not be logged to the debug.log or written to the stderr (as is the case for bitcoind).

Tree-SHA512: 1154e2bf02e3c2616c8d28609569d6c3c7344c5877ad5c1303245044cc7aced9eaec9627f1e1258ed087b49c2a2e6f99bc6c1ad0abe0a855b61e737bdf2059bc

# Conflicts:
#	src/noui.cpp
…reating wallet 100 times.

a679109 Speed up knapsack_solver_test by not recreating wallet 100 times. (lucash.dev@gmail.com)

Pull request description:

  Optimization of `knapsack_solver_test`by moving an expensive wallet creation to outside a 100x for loop.

  On my (slow) machine:

  ```
  before:        9.8s
  after:         6.2s
  --------------------
  saved:         3.6s (36%)
  ```

  This PR was split from bitcoin#13050. Also see bitcoin#10026.

Tree-SHA512: bde1a856b5f076a5845e14d1a924855c8c91742c3139b47903081289b21d01fef6f2d1fd8947058728a57de56f877bab3866af8cd1d25ba2daa44411752cdb2f
e7a7245 Scripts and tools: increased timeout downloading (Emanuele Cisbani)

Pull request description:

  DOWNLOAD_CONNECT_TIMEOUT changed from 10 to 30 because some file start only after 15 sec (see below).
  ```
  Fetching boost_1_64_0.tar.bz2 from https://dl.bintray.com/boostorg/release/1.64.0/source/
    % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                   Dload  Upload   Total   Spent    Left  Speed
    0     0    0     0    0     0      0      0 --:--:--  0:00:15 --:--:--     0
  100 76.7M  100 76.7M    0     0  1863k      0  0:00:42  0:00:42 --:--:-- 8136k
  /home/gitianuser/bitcoin/depends/work/download/boost-1_64_0/boost_1_64_0.tar.bz2.temp: OK
  ```

Tree-SHA512: 43250df818eacedeed5fa3cc8453ecedbf564776fa1c6124e872f46d123423f8bdf174a47389dce7d6cc6b96791953b1bb2f96ce3df6c156415f0c3de2d5cc76

# Conflicts:
#	depends/Makefile
@Munkybooty
Munkybooty force-pushed the backports-0.18-pr7 branch 3 times, most recently from a41973a to aa5cb13 Compare July 12, 2021 14:09
laanwj and others added 5 commits July 12, 2021 11:50
d0b1cee doc: `-help-debug` implies `-help` (Wladimir J. van der Laan)

Pull request description:

  I don't understand why `-help-debug` would be useful without requesting the help, and I've made this particular mistake one time too many.

Tree-SHA512: 370eab368d672fc09e66fcc440db3cb7e4c70c2988aab506cdc3f3e234c27c8f0fc7512c9cf86606ac43f5c6023b3618b7b0302b4b6e289b388559ba8010f27a

# Conflicts:
#	src/init.cpp
…test

9dcb676 [qa] Use correct python index slices in example test (Suhas Daftuar)

Pull request description:

  There's an off-by-one in the list indices used in example_test.py.

Tree-SHA512: d75b77c1e0b3931d02dfa043da4cb6fe8e62864a73717ce5c184d9dbeb25579342c6365cc7bbcc7c4382d76a320a528bf3c69107854dfc6fa704133d0ba11012

# Conflicts:
#	test/functional/example_test.py
8e1c13e doc: Document -checklevel levels (Wladimir J. van der Laan)

Pull request description:

  Document the various possible check levels for the command-line argument. The numbers say nothing on their own.

Tree-SHA512: 8a526c53222b55304dde1d9350dd15a50f1dd62bf452a32dc886a4521e3ab49d5f0a86a4c5cbb0d52fb76b60222101045100f93fee5e1a5d5e3ab8e79b64cbe0

# Conflicts:
#	src/init.cpp
…ersion

be54f42 use integer division instead of double conversion and multiplication for computing amounts (Arvid Norberg)

Pull request description:

  use integer division instead of double conversion and multiplication for computing amounts. This will most likely generate identical code.

  My main argument in favour of this change is one of purity, that we should not rely on implicit conversion from `CAmount` -> `double` and back again. Today this implicit conversion can happen because `CAmount` is just a typedef to `int64_t`. However, I envision a future where `CAmount` is a proper type that does not allow suspicious implicit conversions like these.

Tree-SHA512: a70966623ac6e82410ac94d26cf44e2b7b7a4dbaa514d68ae1f0369aaee1bc2851d05a5e365291b005fe0941428e6139dc62bcfdd0b2f66720706fefe0eb92f1

# Conflicts:
#	src/validation.h
…yle ()

3ccfa34 convert C-style (void) parameter lists to C++ style () (Arvid Norberg)

Pull request description:

  In C, an empty parameter list, `()`, means the function takes any arguments, and `(void)` means the function does not take any parameters.
  In C++, an empty parameter list means the function does not take any parameters.

  So, C++ still supports `(void)` parameter lists with the same semantics, why change to `()`?

  1. removing the redundant `void` improves signal-to-noise ratio of the code
  2. using `(void)` exposes a rare inconsistency in that a template taking a template `(T)` parameter list, cannot be instantiated with `T=void`

Tree-SHA512: be2897b6c5e474873aa878ed6bac098382cd21866aec33752fe40b089a6331aa6263cae749aba1b4a41e8467f1a47086d32eb74abaf09927fd5a2f44a4b2109a

# Conflicts:
#	src/qt/rpcconsole.cpp
@Munkybooty
Munkybooty force-pushed the backports-0.18-pr7 branch from aa5cb13 to 7de0b07 Compare July 12, 2021 15:51
@Munkybooty

Copy link
Copy Markdown
Author

@UdjinM6 Do you have any idea why this wont build on windows? I thought 13734 was to blame but it seems not.

@UdjinM6

UdjinM6 commented Jul 12, 2021

Copy link
Copy Markdown

https://gitlab.com/dashpay/dash/-/jobs/1418036751#L2718 i.e. fs_tests failed, so my guess is 13877. The weird thing is I can't reproduce the issue in my repo - https://gitlab.com/UdjinM6/dash/-/pipelines/335701448 is green.

…I explicitly on Windows

bb6ca65 gui: get special folder in unicode (Chun Kuan Lee)
1c5d225 Drop boost::scoped_array (Chun Kuan Lee)

Pull request description:

  Drop boost::scoped_array and simplify the code.

  `TCHAR` should be defined as `wchar_t` if `UNICODE` is defined. So we can use `.toStdWString().c_str()` to get wchar_t C-style string.

  Fix bitcoin#13819

Tree-SHA512: 3fd4aa784129c9d1576b01e6ee27faa42d793e152d132f2dde504d917dad3a8e95e065fcbc54a3895d74fb6b2a9ed4f5ec67d893395552f585e225486a84a454

# Conflicts:
#	src/qt/guiutil.cpp
@Munkybooty
Munkybooty force-pushed the backports-0.18-pr7 branch from 57c7050 to c585c4a Compare July 13, 2021 01:57
@UdjinM6 UdjinM6 added this to the 18 milestone Jul 13, 2021

@UdjinM6 UdjinM6 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6
UdjinM6 requested a review from PastaPastaPasta July 13, 2021 16:29

@PastaPastaPasta PastaPastaPasta left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@PastaPastaPasta
PastaPastaPasta merged commit 4848712 into dashpay:develop Jul 13, 2021
@Munkybooty
Munkybooty deleted the backports-0.18-pr7 branch November 30, 2021 03:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants