Backports 0.15 pr19 by PastaPastaPasta · Pull Request #3023 · dashpay/dash

PastaPastaPasta · 2019-07-09T18:15:31Z

shouldn't conflict at all with multiwallet pr

…for QT" during ./configure 7222388 Avoid printing generic and duplicated "checking for QT" during ./configure (Timothy Redaelli) Tree-SHA512: 2c52d5b5f55aa18abba9db100f3163be572219cb0dca928f33e9757b92608d3fb330d5c35c45ffcd7599a21163bf7e6cffdb53abe206cc44317862836efc5329

8e69adc Add missing include for atomic in db.h (Alex Morcos) Tree-SHA512: 1fb9a8b3eb6238f3ee754d94cf1424fd51bbb2ec6780dcb50fdc3f190fd6c2e8567b5f01b25c4197b86ee684eddcf345d24723220154cf595e3b96ad24e611ac

… header files 4087d9e Remove unnecessary forward class declarations in header files (practicalswift) Tree-SHA512: 80a9b2cd339ba9c606c0dd93739ac80941b6050388fee2edd7976ae8b5e332fd0b4f1df1e89c1d6d28a77c23a36b1e874e72977985fb8f710c65c45c3a926f97

…sed function and trailing semicolon. 67ca816 Simplify "bool x = y ? true : false" to "bool x = y" (practicalswift) 9f841a6 [tests] Remove accidental trailing semicolon (practicalswift) 30c2d9d [tests] Remove unused function InsecureRandBytes(size_t len) (practicalswift) Tree-SHA512: ae62c255c88133cad12084b6011c105bb96b729c8103330350683d9c20020c5d7617693795df4dff6cc305f2405cb2e4e2ece182d6e6d7c3c8db82aa2f882c41

e241a63 Clarify prevector::erase and avoid swap-to-clear (Pieter Wuille) Tree-SHA512: fa7602038feb4417158df13ee7c0351673acf38f8a824e75889710344c46a9b8d5f6059faeb521f73e48b7ad3e1a238a9e433e4b44f7c3b9085ff08ef65271fa

a090d1c Header include guideline (Pieter Wuille) Tree-SHA512: 44c46a3e249c946303b0fa45ddeba1abc40ec4f993b78f10894d6f43de2b62c493d74f8a24b5b69d3c71cd5c1b3cdb638c8eabdade3dc60e376bc933a8f10940

3ee3d04 Add extra LevelDB source to Makefile (MarcoFalke) 2424989 leveldb: enable runtime-detected crc32 instructions (Cory Fields) cf44e4c Squashed 'src/leveldb/' changes from a31c8aa40..196962ff0 (Pieter Wuille) Tree-SHA512: 19ade77e3f6265507b3ab7b9aa5150d378aa0751e24ac7a61567b0f720a566cedc6c3d3336da17a3bd2b5d068ee86600d96a15228f78bd20ccf98c8fc9041a91

5432fc3 Fail on commit with VERIFY SCRIPT but no scripted-diff (Pieter Wuille) Tree-SHA512: 687b6c825f6f882f9c8e9d301bc893383710bad70216fa40b95f7e24d83a7148f9c759c3e4bd905a6cd26960829f8f6bd03106dc6c83ac312bf34ad239917018

…h.hpp> removal

-BEGIN VERIFY SCRIPT- sed -i 's/BOOST_FOREACH *($.*$,/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ; -END VERIFY SCRIPT-

-BEGIN VERIFY SCRIPT- sed -i 's/Q_FOREACH *($.*$,/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ; -END VERIFY SCRIPT-

-BEGIN VERIFY SCRIPT- sed -i 's/PAIRTYPE($[^,]*$, $[^$]*\))/std::pair<\1, \2>/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ; sed -i ':a;N;$!ba;s/#define std::pair<t1, t2> std::pair<t1, t2>\n//' ./src/utilstrencodings.h ; -END VERIFY SCRIPT-

cb24c85 Use rdrand as entropy source on supported platforms (Pieter Wuille) Tree-SHA512: c42eaa01a14e6bc097c70b6bf8540d61854c2f76cb32be69c2a3c411a126f7b4bf4a4486e4493c4cc367cc689319abde0d4adb799d29a54fd3e81767ce0766fc

ec98b78 Tests for wallet encryption stuff (Andrew Chow) Tree-SHA512: 176f146dee87f7eaf6de689598ddf257264bb77c2f8c0f9b00276e0dd956327463fb50403a32916f00765d2b2a588c1692a600b36bb3c9e7fa2f18d7cc3b4bc0

6294f32 gettxoutproof() should return consistent result (John Newbery) Tree-SHA512: 1c36f78ea07a3bdde09e9494207b4372d54bcd94ed2d56e339e78281f6693e26a93e4c3123453d5c0f6e994d0069d5a1c806786c4af71864f87ea4841611c379

…es() 1d1ea9f Turn TryCreateDirectory() into TryCreateDirectories() (Marko Bencun) Tree-SHA512: 49a524167bcf66e351a964c88d09cb3bcee12769a32da83410e3ba649fa4bcdbf0478d41e4d09bb55adb9b3f122e742271db6feb30bbafe2a7973542b5f10f79

…ialog e9cd778 Pass in smart fee slider value to coin control dialog (Alex Morcos) Tree-SHA512: 3899c3eb89b06e9cc842b33fabcce40a84fcc3a88ac2b02861f63419925312ac2a9f632567c02b0a060f5c5cd55f337e35e99b80535d1c1b8fcb7fd0c539f3c0

…nt>> instead of A<A<int> >) 131a8ce Make clang-format use C++11 features (e.g. A<A<int>> instead of A<A<int> >) (practicalswift) Tree-SHA512: e3c0ee683b654eae638deb41c52cf3187fa958dc5fa67778eaf8a83946b63f5b1d24c47bb965eaa910e3fcdcaf9eebf461eb3fc8e3a73ebaf03c7904521fda00

f2fb132 Net: Fix resource leak in ReadBinaryFile(...) (practicalswift) Tree-SHA512: 879b9334d8bb681fa4b6f96d8ecb54e2a8948065f7be5fe7880131479c813602fc9d4a4314f043e6591e1aed50ffafa7c247362a9cdeb049b0721170e227b89a

9af207c random: fix crash on some 64bit platforms (Cory Fields) Tree-SHA512: c9516b69bec224c7e650dfc7c50f04cdd93a1006d515699bc64a311a03662d4ad33a834861194a1649ed212b37fb50aadfb004954cdf8b9bc1dc82f3ea962897

7810993 [trivial] fix indentation for ArgsManager class (John Newbery) Tree-SHA512: 3d24fa94ba49ad73383ca8077776492bd75f1c2158c835c1d55b4be4787f107c2de5336173e083a5585df21ef053614628fe4fe6ddf2c05df567177445661b7b

0a4912e [tests] timeout integration tests on travis after 20 minutes (John Newbery) 7c51e9f [tests] destroy zmq context in zmq_tests.py (John Newbery) b1bac1c [tests] in zmq test, timeout if message not received (John Newbery) 5ebd5f9 [tests] tidy up zmq_test.py (John Newbery) 4a0c08f [tests] update zmq test to use correct config.ini file (John Newbery) Tree-SHA512: 5e607af2f2dc5c73fba4b2d3890097580a7525f6a4996c7c78f01822e45e0054fd0a225ea53fce6308804e560cced6de6cf5d16137469dcf100b2e9643e08d03

…ce in MarkBlockAsInFlight(...) 95543d8 [net] Avoid possibility of NULL pointer dereference in MarkBlockAsInFlight(...) (practicalswift) Tree-SHA512: 80fd4f2712f20377185bd8d319255f2c54ae47b54c706f7e0d384a0a6ade1465ceb6e2a4a7f7b51987a659524474a954eddf228865ebb3fc513948b5b6d7ab6d

…icted txn d9bec88 Use REJECT_DUPLICATE for already known and conflicted txn (Pieter Wuille) Tree-SHA512: adc6dc5caed731c3fd5c8784e8820a074e320360cdb5579c5b9299f9799dd99de60b7382d336ab1909dab8b23e744456d78aa0c3b1c8dd1af3d1b779314cf8fa

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

…pcpassword 279fde5 Check for rpcuser/rpcpassword first then for cookie (Andrew Chow) 3ec5ad8 Add test for rpcuser/rpcpassword (Andrew Chow) c53c983 Replace cookie auth in tests (Andrew Chow) Tree-SHA512: 21efb84c87080a895cac8a7fe4766738c34eebe9686c7d10af1bf91ed4ae422e2d5dbbebffd00d34744eb6bb2d0195ea3aca86deebf085bbdeeb1d8b474241ed

UdjinM6 · 2019-07-10T10:01:04Z

+    user = None
+    password = None
+    if os.path.isfile(os.path.join(datadir, "bitcoin.conf")):
+        with open(os.path.join(datadir, "bitcoin.conf"), 'r') as f:


Suggested change

with open(os.path.join(datadir, "bitcoin.conf"), 'r') as f:

with open(os.path.join(datadir, "dash.conf"), 'r') as f:

also need bitcoin#10759 to fix tests

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

UdjinM6 · 2019-07-10T16:37:06Z

Still need 10759 (#3023 (comment)) to fix multi_rpc.py test https://travis-ci.org/dashpay/dash/jobs/556841057#L2719

…o utf8 bc7d103 Fix multi_rpc test for hosts that dont default to utf8 (Matt Corallo) Tree-SHA512: 7644b1f50d4010a08aed5d1c87ab7326af9c109ac05dfbfc4bb6d5a19ace7997ef9cdd64d4301072f1106225de6d3aacccb17f53043b55ba61f5723c2b65af30

PastaPastaPasta · 2019-07-10T16:40:53Z

was already in working branch, just had to cherry-pick in

UdjinM6

utACK

codablock

utACK

laanwj and others added 27 commits July 9, 2019 13:08

Merge bitcoin#10578: Add missing include for atomic in db.h

30c5aae

8e69adc Add missing include for atomic in db.h (Alex Morcos) Tree-SHA512: 1fb9a8b3eb6238f3ee754d94cf1424fd51bbb2ec6780dcb50fdc3f190fd6c2e8567b5f01b25c4197b86ee684eddcf345d24723220154cf595e3b96ad24e611ac

Merge bitcoin#10534: Clarify prevector::erase and avoid swap-to-clear

c1c2420

e241a63 Clarify prevector::erase and avoid swap-to-clear (Pieter Wuille) Tree-SHA512: fa7602038feb4417158df13ee7c0351673acf38f8a824e75889710344c46a9b8d5f6059faeb521f73e48b7ad3e1a238a9e433e4b44f7c3b9085ff08ef65271fa

Merge bitcoin#10575: Header include guideline

10716ea

a090d1c Header include guideline (Pieter Wuille) Tree-SHA512: 44c46a3e249c946303b0fa45ddeba1abc40ec4f993b78f10894d6f43de2b62c493d74f8a24b5b69d3c71cd5c1b3cdb638c8eabdade3dc60e376bc933a8f10940

Merge bitcoin#10480: Improve commit-check-script.sh

a0bc91a

5432fc3 Fail on commit with VERIFY SCRIPT but no scripted-diff (Pieter Wuille) Tree-SHA512: 687b6c825f6f882f9c8e9d301bc893383710bad70216fa40b95f7e24d83a7148f9c759c3e4bd905a6cd26960829f8f6bd03106dc6c83ac312bf34ad239917018

Small preparations for Q_FOREACH, PAIRTYPE and #include <boost/foreac…

25008bd

…h.hpp> removal

scripted diff: bitcoin#10502 Fully remove BOOST_FOREACH

a15d740

-BEGIN VERIFY SCRIPT- sed -i 's/BOOST_FOREACH *($.*$,/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ; -END VERIFY SCRIPT-

scripted-diff: Remove Q_FOREACH bitcoin#10502

0d52db8

-BEGIN VERIFY SCRIPT- sed -i 's/Q_FOREACH *($.*$,/for (\1 :/' ./src/*.h ./src/*.cpp ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ; -END VERIFY SCRIPT-

Merge bitcoin#10551: [Tests] Wallet encryption functional tests

61ca895

ec98b78 Tests for wallet encryption stuff (Andrew Chow) Tree-SHA512: 176f146dee87f7eaf6de689598ddf257264bb77c2f8c0f9b00276e0dd956327463fb50403a32916f00765d2b2a588c1692a600b36bb3c9e7fa2f18d7cc3b4bc0

Merge bitcoin#9738: gettxoutproof() should return consistent result

ab02a43

6294f32 gettxoutproof() should return consistent result (John Newbery) Tree-SHA512: 1c36f78ea07a3bdde09e9494207b4372d54bcd94ed2d56e339e78281f6693e26a93e4c3123453d5c0f6e994d0069d5a1c806786c4af71864f87ea4841611c379

Merge bitcoin#10587: Net: Fix resource leak in ReadBinaryFile(...)

0647ea6

f2fb132 Net: Fix resource leak in ReadBinaryFile(...) (practicalswift) Tree-SHA512: 879b9334d8bb681fa4b6f96d8ecb54e2a8948065f7be5fe7880131479c813602fc9d4a4314f043e6591e1aed50ffafa7c247362a9cdeb049b0721170e227b89a

Merge bitcoin#10614: random: fix crash on some 64bit platforms

5ac6d7c

9af207c random: fix crash on some 64bit platforms (Cory Fields) Tree-SHA512: c9516b69bec224c7e650dfc7c50f04cdd93a1006d515699bc64a311a03662d4ad33a834861194a1649ed212b37fb50aadfb004954cdf8b9bc1dc82f3ea962897

Merge bitcoin#10592: [trivial] fix indentation for ArgsManager class

e1a146d

7810993 [trivial] fix indentation for ArgsManager class (John Newbery) Tree-SHA512: 3d24fa94ba49ad73383ca8077776492bd75f1c2158c835c1d55b4be4787f107c2de5336173e083a5585df21ef053614628fe4fe6ddf2c05df567177445661b7b

REJECT_CONFLICT -> REJECT_DUPLICATE

82dcb03

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

remove Boost_Reverse_foreach

ed24dbb

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

UdjinM6 requested changes Jul 10, 2019

View reviewed changes

PastaPastaPasta added 2 commits July 10, 2019 09:42

fix indents

eb1b61b

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

bitcoin -> dash

722c373

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

UdjinM6 approved these changes Jul 10, 2019

View reviewed changes

UdjinM6 added this to the 14.1 milestone Jul 10, 2019

codablock approved these changes Jul 11, 2019

View reviewed changes

UdjinM6 merged commit 7eeee33 into dashpay:develop Jul 11, 2019

PastaPastaPasta deleted the backports-0.15-pr19 branch July 11, 2019 15:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Backports 0.15 pr19#3023

Backports 0.15 pr19#3023
UdjinM6 merged 30 commits intodashpay:developfrom
PastaPastaPasta:backports-0.15-pr19

PastaPastaPasta commented Jul 9, 2019 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

UdjinM6 Jul 10, 2019 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

UdjinM6 commented Jul 10, 2019

Uh oh!

PastaPastaPasta commented Jul 10, 2019

Uh oh!

UdjinM6 left a comment

Uh oh!

codablock left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

	with open(os.path.join(datadir, "bitcoin.conf"), 'r') as f:
	with open(os.path.join(datadir, "dash.conf"), 'r') as f:

Conversation

PastaPastaPasta commented Jul 9, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

UdjinM6 Jul 10, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

UdjinM6 commented Jul 10, 2019

Uh oh!

PastaPastaPasta commented Jul 10, 2019

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

codablock left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

PastaPastaPasta commented Jul 9, 2019 •

edited

Loading

UdjinM6 Jul 10, 2019 •

edited

Loading