Skip to content

Backports 0.15 pr10 - #2911

Merged
UdjinM6 merged 29 commits into
dashpay:developfrom
PastaPastaPasta:backports-0.15-pr10
May 22, 2019
Merged

Backports 0.15 pr10#2911
UdjinM6 merged 29 commits into
dashpay:developfrom
PastaPastaPasta:backports-0.15-pr10

Conversation

@PastaPastaPasta

@PastaPastaPasta PastaPastaPasta commented May 10, 2019 •
edited
Loading

Copy link
Copy Markdown
Member

EachMost of these backports was a clean cherry-pick, no conflicts were present. Not based on pr8/9

@UdjinM6 UdjinM6 added this to the 14.1 milestone May 10, 2019
@UdjinM6

UdjinM6 commented May 15, 2019

Copy link
Copy Markdown

qt/sendcoinsdialog.cpp:207:13: error: 'class Ui::SendCoinsDialog' has no member named 'optInRBF'

@PastaPastaPasta

PastaPastaPasta commented May 15, 2019 •
edited
Loading

Copy link
Copy Markdown
Member Author

Removed one backport that was only relevant to RBF

Now building w/o error :)

UdjinM6
UdjinM6 reviewed May 15, 2019
View reviewed changes
Comment thread CONTRIBUTING.md Outdated
Comment thread test/functional/net.py Outdated
Comment thread src/Makefile.am Outdated
@PastaPastaPasta

PastaPastaPasta commented May 16, 2019

Copy link
Copy Markdown
Member Author

Building locally

UdjinM6
UdjinM6 reviewed May 16, 2019
View reviewed changes

@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.

pls force push the latest commit to re-trigger travis again

@PastaPastaPasta

PastaPastaPasta commented May 16, 2019

Copy link
Copy Markdown
Member Author

force pushed

@UdjinM6

UdjinM6 commented May 16, 2019

Copy link
Copy Markdown

LGTM, let's wait for #2912

laanwj and others added 20 commits May 19, 2019 20:42
@laanwj @PastaPastaPasta
Merge bitcoin#10095: refactor: Move GetDifficulty out of rpc/server.h
16641e1 
f885b67 refactor: Make rest.cpp dependency on `*toJSON` in `blockchain.cpp` explicit (Wladimir J. van der Laan)
8d8f28d refactor: Move RPCNotifyBlockChange out of `rpc/server.h` (Wladimir J. van der Laan)
e6dcfee refactor: Move GetDifficulty out of `rpc/server.h` (Wladimir J. van der Laan)

Tree-SHA512: fc2656611d18442f2fddba5ac1554d958151f6785c2039afdfc36735d7e71592d9686ff6cc7b2ad95180071d7514470e62c52d697c5a1e88f851bddaf5942edb
@laanwj @PastaPastaPasta
Merge bitcoin#10129: scheduler: fix sub-second precision with boost <…
b5968cd 
… 1.50

e025246 scheduler: fix sub-second precision with boost < 1.50 (Cory Fields)

Tree-SHA512: b9d4875406c1a2bf3cb6412d7511c24d871bfba6a2ea5ccfbbf7392f2f8850027b001b776da422fea592878da21d897b1aa56d92bc2239869055dce79fd442ac
@laanwj @PastaPastaPasta
Merge bitcoin#10136: build: Disable Wshadow warning
07ed44d 
2c83911 build: Disable Wshadow warning (Wladimir J. van der Laan)

Tree-SHA512: e3c1f7253c43449740760da287985b8027344dfc48c8a85ea9bca977c73cbaf75709d6e32ac0fea51eb89dccb48706a5abdf006be45375838df10ccba35e9aa1
@laanwj @PastaPastaPasta
Merge bitcoin#10128: Speed Up CuckooCache tests
818ec21 
3f098cc Decrease testcase sizes in cuckoocache tests (Jeremy Rubin)

Tree-SHA512: 71a0e171be8d5473c791440aa4353d99b885b926b7284a3a1914c95e0c2c77925d5f3a6f329778cd81931a4e5832a082cb31d82ee8adb433d357d2e2b4f7a9e5
MarcoFalke @PastaPastaPasta
Merge bitcoin#10072: Remove sources of unreliablility in extended fun…
9fa51cc 
…ctional tests

a4fd89f Make forknotify.py more robust (John Newbery)
1f3d78b Wait for connection to open in bip9-softforks.py (John Newbery)

Tree-SHA512: de7d0002ee62ad97059b6f6c89b11f6e9901e3b4164ef6906bcd61e4ca499c277d9034784755966e5baf599869fad611b0b18f5547a384ceb5b7db3cc5bbd132
@laanwj @PastaPastaPasta
Merge bitcoin#10077: [qa] Add setnetworkactive smoke test
22b21f5 
fa697b7 [qa] Add setnetworkactive smoke test (MarcoFalke)

Tree-SHA512: 7205bae16f551e93383987392702e6853cfb06d4448735815fa116385cbf5deb6c4a8f521efdd43cf3cc59fede3b3d1ffe74e662890b74bcc21b5c13ce1f20b7
@laanwj @PastaPastaPasta
Merge bitcoin#10058: No need to use OpenSSL malloc/free
1988088 
6d5dd60 No need to use OpenSSL malloc/free (Thomas Snider)

Tree-SHA512: 29f790067ffd5a10a8e1a621318a0ba445691f57c804aa3b7c8ca372c8408d8c7fe703c42b48018e400fc32e3feff5ab401d97433910ce2c50e69da0b8a6662e
@laanwj @PastaPastaPasta
Merge bitcoin#9533: Allow non-power-of-2 signature cache sizes
f471b75 
7482781 Allow non-power-of-2 signature cache sizes (Pieter Wuille)

Tree-SHA512: 5731c22b46c5ae81cf6d52000c28e39b243a47d96d91079942a5b5a10db214449217f71aa2195e18f8a3917cb206b04c75dc13e4522eb700a1dbf1819013ba22
@laanwj @PastaPastaPasta
Merge bitcoin#10104: linearize script: Option to use RPC cookie
13cdff4 
bd41d98 Datadir option in linearize scripts (Andrew Chow)

Tree-SHA512: 0d11866b574986c087ec962a8a9fc0b6dfee8175ae20ef827f8b4a143f657c5bffc9f9696e9dabf29b68002003a5b6a7d8ac473231b5c9c81c3a4fa0318f5bd0
@laanwj @PastaPastaPasta
Merge bitcoin#10166: Ignore Doxyfile generated from Doxyfile.in templ…
3dcaf47 
…ate.

9eaf718 Ignore Doxyfile generated from Doxyfile.in template. (Pavel Janík)

Tree-SHA512: 03d6d0fb4a708d9e41ada8b6d3d277f8c66abc2f07081629ac81ed90a3e5b2d76fa2faab9afb2ee8c91597ee031b3f5c6923d5658019321e290cdf6a70724896
@laanwj @PastaPastaPasta
Merge bitcoin#9949: [bench] Avoid function call arguments which are p…
e5ecff6 
…ointers to uninitialized values

218d915 [bench] Avoid function call arguments which are pointers to uninitialized values (practicalswift)

Tree-SHA512: 68d62e9442094f171433291b7f13dba20fc7ead5fd7f2292e1eb97ae51aa2345d40224c4a65c2e5d3552802b3cd0f675a82b6181cf5b77e964355650b25089f0
@laanwj @PastaPastaPasta
Merge bitcoin#10135: [p2p] Send the correct error code in reject mess…
23530a8 
…ages

5d08c9c Send the correct error code in reject messages (John Newbery)

Tree-SHA512: 0cd3ef3ae202584b138cc0bbfba4125635822e0c5a755fb9276a604b39286959ab22dabc3104aa5d7e71358cd69d965de2a333ff04bf3e8ed43cf0296ac01264
@laanwj @PastaPastaPasta
Merge bitcoin#10164: Wallet: reduce excess logic InMempool()
dccd697 
3491476 Wallet: reduce excess logic InMemPool() (Kewde)

Tree-SHA512: 554ea2827cfd482281fae0ba3d0a7989dbfeace98a35462732ea08bf3cc94c9564a9ea8ca2fa9905b963367d0b56a490ef0d83ceb6731c8f06187de98b6a7f23
@laanwj @PastaPastaPasta
Merge bitcoin#10177: Changed "Send" button default status from true t…
0db1328 
…o false

8c3e6c6 Changed "Send" button default status from true to false (KibbledJiveElkZoo)

Tree-SHA512: e60d7481351e88925d99b33bdb616f3c234e93ef052571b9c4a1328186ec9abb8b61b0c4299afcb731edad2634aef6b1adaad121646b6c0c56dc933662904674
@sipa @PastaPastaPasta
Merge bitcoin#9693: Prevent integer overflow in ReadVarInt.
632956a 
45f0961 Prevent integer overflow in ReadVarInt. (Gregory Maxwell)

Tree-SHA512: 385ea0efb6b59d44c45a49227e5f6fff236b4775544cbeb236312a3fd87fd75c226ac56f7aa1bca66b853639da75a579610074f7582f92cf2ebd4a74bc40f6f0
@laanwj @PastaPastaPasta
Merge bitcoin#10211: [doc] Contributor fixes & new "finding reviewers…
383d181 
…" section

3ddd227 [doc] Add blob about finding reviewers. (Kalle Alm)
846dc17 [doc] Wording fixes in CONTRIBUTING.md. (Kalle Alm)

Tree-SHA512: 232e6496769f0fba1022da2e9a3add10dcec721e6cc168d552445125849a8c02729a71b7c526bbff30c7428bcdcfdd92b424014fbb6310148392d261408b4044
@laanwj @PastaPastaPasta
Merge bitcoin#9827: Improve ScanForWalletTransactions return value
a089c93 
30abce7 Improve ScanForWalletTransactions return value (Russell Yanofsky)

Tree-SHA512: 195028553b103052a842b6a37e67410118a20c32475b80f7fd22d6d8622f92eca1c2d84f291d1092bef2161d3187d91052799b533e1e265b7613d51955490b8d
@laanwj @PastaPastaPasta
Merge bitcoin#10228: build: regenerate bitcoin-config.h as necessary
a3467dd 
91ab8f5 build: fix bitcoin-config.h regeneration after touching build files (Cory Fields)
3577603 build: remove wonky auto top-level convenience targets (Cory Fields)

Tree-SHA512: 2e68634439eeb7eca43cd2858135a583bfe0cf146e021a8384a24f7267aacc6f99bdc7a6d497a04d32e6a03e9446f0f599afb5bd53346dadf19f47d5fb2ea9f9
@laanwj @PastaPastaPasta
Merge bitcoin#9670: contrib: github-merge improvements
317b797 
b508424 contrib: github-merge improvements (Wladimir J. van der Laan)

Tree-SHA512: 56a34e887716bf6bfcd1b6520f6b9a1bb742e1ad17e75618caf982af71fceb75d50caec1bf4279cb9a2f7a74319f1bcec4c824682841bd6e994acc0991616451
@laanwj @PastaPastaPasta
Merge bitcoin#10273: [scripts] Minor improvements to `macdeployqtplus…
0d2f2b3 
…` script.

e8babc4 Use `with` in `macdeployqtplus` script. (Chris Gavin)
4f3ac7d Remove unused variable from `macdeployqtplus` script. (Chris Gavin)

Tree-SHA512: 0259506b36f3bfcc64ada951dcd4fdab1611ef76a39f92effd1163b6d8fab06bdbf50784b4b22f8b1483697c3029c12cfee5372b442ab445887ac4f928f6de80
laanwj and others added 9 commits May 19, 2019 20:43
@laanwj @PastaPastaPasta
Merge bitcoin#10486: devtools: Retry after signing fails in github-merge
55dc3da 
1983c87 devtools: Retry after signing fails in github-merge (Wladimir J. van der Laan)

Tree-SHA512: f5ef91c93f4e53c9b234e7dc3ac398c6715144021d92c8592174d02c672ae99d27e88faefd52239c2a74c8e49cfd3a979e0229580016ce9a74829bdb0af206ec
@laanwj @PastaPastaPasta
Merge bitcoin#10469: Fixing typo in rpcdump.cpp
b708ea8 
16d94d3 Fixing typo in rpcdump.cpp (James Evans)

Tree-SHA512: 84ef1b91c719131196ebed6b865e282b77bee7699614e15884ba59010239a3bbc1380dc8f856c83338f071e3eb3ca41c6b10f830816e6c794531cf6a965d63a9
@laanwj @PastaPastaPasta
Merge bitcoin#10514: Bugfix: missing == 0 after randrange
f570631 
9aa215b Bugfixes: missing == 0 after randrange (Pieter Wuille)

Tree-SHA512: 160657ac09553f23ad7a3966c753a30ba938ce6f7ccfd34a4ef0d05d73d712362f7eef97e44a96e37a181b8347caa9d8e1584cc4485f69674ab2de3d8a247373
MarcoFalke @PastaPastaPasta
Merge bitcoin#10538: [trivial] Fix typo: "occurrences" (misspelled as…
31bb462 
… "occurrances")

b083db6 [trivial] Fix typo: "occurrences" (misspelled as "occurrances") (practicalswift)

Tree-SHA512: 5141526dbbbbe797ef103fcbdc0a1318648214973214607e35cc0e99abfc4dd547e3ef15fe21976c53a78b03dff140fe76e5c92a0f7e7d2b08081215983a8616
MarcoFalke @PastaPastaPasta
Merge bitcoin#10522: [wallet] Remove unused variables
742744f 
a8c09af Remove unused variables (practicalswift)

Tree-SHA512: 34807dc3a0471c83b086f430b66465602c8f6a3a158b54ace2ec8afb746f1f5907f7dfcde5a4bad4041df9721ec46b61681b2dbf89725c9c8c4c5ad0ca99f78f
@sipa @PastaPastaPasta
Merge bitcoin#10564: Return early in IsBanned.
eecc724 
bf376ea Return early in IsBanned. (Gregory Maxwell)

Tree-SHA512: d8ed4aaf9a7523b00effa4ac17cec3be1ec1f5c5ce64d89833fbc8f3d73d13b022043354fbcf2682b2af05070d115e1fc0cc0b122197e9ddee5959c3fb9dd16d
@NicolasDorier @PastaPastaPasta
Merge bitcoin#9960: Trivial: Add const modifier to GetHDChain and IsH…
e7a21fa 
…DEnabled

Signed-off-by: Pasta <Pasta@dash.org>
@PastaPastaPasta
dashify "Finding reviewers" section to be more relevant
2f63322 
Signed-off-by: Pasta <Pasta@dash.org>
@PastaPastaPasta
s/bitcoin-config.h/dash-config.h/
67c735b 
Signed-off-by: Pasta <Pasta@dash.org>
@PastaPastaPasta

PastaPastaPasta commented May 20, 2019

Copy link
Copy Markdown
Member Author

rebased

UdjinM6
UdjinM6 approved these changes May 20, 2019
View reviewed changes

@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 codablock May 22, 2019 14:17
codablock
codablock approved these changes May 22, 2019
View reviewed changes

@codablock codablock 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 merged commit 92e5a38 into dashpay:develop May 22, 2019
@PastaPastaPasta
PastaPastaPasta deleted the backports-0.15-pr10 branch May 22, 2019 14:52
UdjinM6 added a commit to UdjinM6/dash that referenced this pull request May 28, 2019
@UdjinM6
Remove duplicate code from src/Makefile.am
d9141f0 
Backported 10228 twice - in dashpay#1879 and dashpay#2911
@UdjinM6 UdjinM6 mentioned this pull request May 28, 2019
Merged
UdjinM6 added a commit that referenced this pull request May 28, 2019
@UdjinM6
Remove duplicate code from src/Makefile.am (#2944)
5780fa6 
Backported 10228 twice - in #1879 and #2911
charlesrocket added a commit to AXErunners/axe that referenced this pull request Nov 5, 2019
@charlesrocket
Merge pull request #226 from AXErunners/backport-0.15-pr10
0153353 
Merge dashpay/dash#2911
PastaPastaPasta added a commit that referenced this pull request Aug 11, 2022
@PastaPastaPasta
Merge pull request #4478 from kittywhiskers/undashify
f83d857 
revert #3036, #2911, #1879, #1432: revert dashification of filenames
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@UdjinM6 UdjinM6 UdjinM6 approved these changes
+1 more reviewer
@codablock codablock codablock approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

15

Development

Successfully merging this pull request may close these issues.

6 participants

@PastaPastaPasta @UdjinM6 @codablock @laanwj @sipa @NicolasDorier