Backports 0.15 pr23 - #3043

Merged
UdjinM6 merged 24 commits into
dashpay:developfrom
PastaPastaPasta:backports-0.15-pr23
Aug 7, 2019
Merged

Backports 0.15 pr23#3043
UdjinM6 merged 24 commits into
dashpay:developfrom
PastaPastaPasta:backports-0.15-pr23

Conversation

@PastaPastaPasta

@PastaPastaPastaPastaPastaPasta commented Aug 2, 2019

Copy link
Copy Markdown
Member

No description provided.

laanwjand others added 17 commits August 1, 2019 09:02
@laanwj@PastaPastaPasta
Mergebitcoin#10832: init: Factor out AppInitLockDataDirectory and fi…
6fb74ea
…x startup core dump issue
dba485d init: Factor out AppInitLockDataDirectory (Wladimir J. van der Laan)
Pull request description:
Alternative to bitcoin#10818, alternative solution to bitcoin#10815.
After this change: All the AppInit steps before and inclusive AppInitLockDataDirectory must not have Shutdown() called in case of failure. Only when AppInitMain fails, Shutdown should be called.
Changes the GUI and bitcoind code to consistently do this.
Tree-SHA512: 393e1a0ae05eb8e791025069e3ac4f6f3cdeb459ec63feda85d01cf6696ab3fed7632b6a0ac3641b8c7015af51d46756b5bba77f5e5f0c446f0c2dea58bbc92e
@laanwj@PastaPastaPasta
Mergebitcoin#10849: Multiwallet: simplest endpoint support
fdf34ff
6b9faf7 [QA] add basic multiwallet test (Jonas Schnelli)
979d0b8 [tests] [wallet] Add wallet endpoint support to authproxy (John Newbery)
76603b1 Select wallet based on the given endpoint (Jonas Schnelli)
32c9710 Fix test_bitcoin circular dependency issue (Jonas Schnelli)
31e0720 Add wallet endpoint support to bitcoin-cli (-usewallet) (Jonas Schnelli)
dd2185c Register wallet endpoint (Jonas Schnelli)
Pull request description:
Alternative for bitcoin#10829 and bitcoin#10650.
It adds the most simplest form of wallet based endpoint support (`/wallet/<filename>`).
No v1 and no node/wallet endpoint split.
Tree-SHA512: 23de1fd2f9b48d94682928b582fb6909e16ca507c2ee19e1f989d5a4f3aa706194c4b1fe8854d1d79ba531b7092434239776cae1ae715ff536e829424f59f9be
@PastaPastaPasta
add gArgs
1a96452
Signed-off-by: Pasta <pasta@dashboost.org>
@laanwj@PastaPastaPasta
Mergebitcoin#10883: Rename -usewallet to -rpcwallet
6096212
2264236 Rename -usewallet to -rpcwallet (Alex Morcos)
Pull request description:
Tree-SHA512: 99bdbff5d18e464e620b7b2a1ff8db874b3888db4d43348c96c372097ed51edd796b564e4ef1193ccd75d0a1fd51f865cf6fff4e0e3672654cd2933c851d210a
@laanwj@PastaPastaPasta
Mergebitcoin#10870: [Qt] Use wallet 0 in rpc console if running with…
b2b0bc9
… multiple wallets
9737572 [Qt] Use wallet 0 in rpc console if running with multiple wallets (Jonas Schnelli)
Pull request description:
Current master with multiwallet results in accessing wallet 0 in QT (send / receive / tx history / etc.), **but** the RPC console cannot access that wallet (only non-wallet commands work).
This is a quick solution to re-allow accessing the same wallet (Index 0) via RPC console in multiwallet.
The solutions design is not "state of the art" (should go over WalletModel). Ideally we work on an overall multiwallet support for the GUI (which then would remove this change).
I think we should consider this as a bugfix.
Tree-SHA512: 16cf844662248ffd3d82c7d0cbe5879f231fbc7d4f5a4aab4180a9087018519c98301e4ac311eaec2cc39dddf25d3edf9be99a6622ea682c138a820a9b21fd0c
@laanwj@PastaPastaPasta
Mergebitcoin#10927: test: Make sure wallet.backup is created in temp…
8fdf594
… path
88af227 test: Make sure wallet.backup is created in temp path (Wladimir J. van der Laan)
Pull request description:
This assures that we don't overwrite a random file called `wallet.backup` that happens to be in the current directory. It also assures that the temporary file will be cleaned up.
Noticed by Evan Klitzke, came up in discussion here: bitcoin#10880 (comment)
Tree-SHA512: 2d2c23c2deba26a1130a29279b3d8565b277eb90a98a6a6d7dd4948f5cbbd5ec5453b3082e3e4e21e0e2423e642bbd2f4433e4c21032d3c8cff27ee35e87e7e7
@laanwj@PastaPastaPasta
Mergebitcoin#10824: Avoid unnecessary work in SetNetworkActive
5dc2193
a2420ae Avoid unnecessary work in SetNetworkActive (João Barbosa)
Pull request description:
This PR adds an early return to avoid unnecessary notifications when the status doesn't change.
Tree-SHA512: 85d05ca6fa36cb581f94bc154d08bd72cd53f6a857173c6fb2f184058f9c0208c4cf5e5d196825a78339902d8f256688eb6793f99abc7be9c7cfac85136180d9
@laanwj@PastaPastaPasta
Mergebitcoin#10912: [tests] Fix incorrect memory_cleanse(…) call in …
07d08a8
…crypto_tests.cpp
065039d [tests] Fix incorrect memory_cleanse(…) call in crypto_tests.cpp (practicalswift)
Pull request description:
`chKey` and `chIV` are pointers, not arrays :-)
Probably the result of copy-pasting of old code where the code was operating on arrays instead of pointers.
If I'm reading the code correctly the absence/presence of these `memory_cleanse(…)` calls won't alter the outcome of the test in question (`TestPassphraseSingle`) even if fixed. Therefore removing.
Tree-SHA512: a053b2817bedf6ef889744e546ce9a0f165dee94aef6850d9d6a6bb05b0018789597371ecf154a4aec8588c0ef5626ef08c23c35e35927f6b0497b5f086146fe
@laanwj@PastaPastaPasta
Mergebitcoin#10892: Replace traditional for with ranged for in block…
80bc6df
… and transaction primitives
72f0060 Replace traditional for with ranged for in primitives (Dag Robole)
Pull request description:
Replace traditional for with ranged for in block and transaction primitives to improve readability
Tree-SHA512: c0fff603d2939149ca48b6aa72b59738a3658d49bd58b2d4ffbc85bdb774d8d5bb808fe526fe22bb9eb214de632834d373e2aab44f6019a83c0b09440cea6528
@laanwj@PastaPastaPasta
Mergebitcoin#10974: Fix typo in sendcoinsdialog.
8cb2508
7f121a0 Fix typo in sendcoinsdialog. (Masahiko Hyuga)
Pull request description:
Tree-SHA512: 7b3ea344a8a432b6e3835b6870ccfaa197df43f812fea506259b644a44442e36ee39967eed246d9b4b5334528b63f41d7e8af9fd2267e51bcf7557ed652452e4
@laanwj@PastaPastaPasta
Mergebitcoin#10301: Check if sys/random.h is required for getentropy.
52aef4c
ee2d10a Check if sys/random.h is required for getentropy on OSX. (James Hilliard)
Pull request description:
This should check and include sys/random.h if required for osx as mentioned [here](bitcoin#9821 (comment)).
Tree-SHA512: e9491f67f2e8b2e6bcdbcbb8063295e844d5627daf5336e3e17b4a8027d888fa65a08e4580a745abdc35ffd8d86b4fc7434daaac172c4a06ab7566a2ed0bfb92
MarcoFalke@PastaPastaPasta
Mergebitcoin#11023: [tests] Add option to attach a python debugger i…
7f1009e
…f functional test fails
cc5d38f Add option to attach a python debugger if test fails (John Newbery)
Pull request description:
Adds a simple option to the test_framework to attach pdb if the test fails.
Helpful for catching and debugging intermittent failures: Run the test in a loop with this option. The first failure will cause execution to pause and nodes will be left running for interactive debugging.
@sdaftuar
Tree-SHA512: 01cfae15fa3f04ed6ec6a99fef60a6c6a59723429309e81eacd6767caf12f5758f59b337804291ecab33a38a2958f36e2b513d201bee72a2eeb207a67046f952
MarcoFalke@PastaPastaPasta
Mergebitcoin#11000: test: Add resendwallettransactions functional tests
33807c8
bdf607e test: Add resendwallettransactions functional tests (João Barbosa)
Pull request description:
Adds functional tests to cover the behaviour introduced in bitcoin#10995.
Tree-SHA512: 3be337cbe51edab2cc0eb9ecfa68d00cd3c3a00aef0672cd841706802726c9cd4138626a8f209c3d9fbd207ce332daa062f270e4c94c1c2398bfc475e36423f6
@instagibbs@PastaPastaPasta
disable jni in builds
8ed0d52
Github-Pull: bitcoin#11056
Rebased-From: 844b73e
Tree-SHA512: f735853c3d9abbde5032cc55201b0ddc29679e681ba7d3822cbcbeee17c7185ee984b235411224cfb8ff12550de88a0f1367d55ad24bf52c5c03061330849eb2
@laanwj@PastaPastaPasta
Mergebitcoin#10148: Use non-atomic flushing with block replay
453d756
176c021 [qa] Test non-atomic chainstate writes (Suhas Daftuar)
d6af06d Dont create pcoinsTip until after ReplayBlocks. (Matt Corallo)
eaca1b7 Random db flush crash simulator (Pieter Wuille)
0580ee0 Adapt memory usage estimation for flushing (Pieter Wuille)
013a56a Non-atomic flushing using the blockchain as replay journal (Pieter Wuille)
b3a279c [MOVEONLY] Move LastCommonAncestor to chain (Pieter Wuille)
Tree-SHA512: 47ccc62303f9075c44d2a914be75bd6969ff881a857a2ff1227f05ec7def6f4c71c46680c5a28cb150c814999526797dc05cf2701fde1369c06169f46eccddee
@PastaPastaPasta
remove DB_PEAK_USAGE_FACTOR
f3259d0
Signed-off-by: Pasta <pasta@dashboost.org>
@PastaPastaPasta
add gArgs
60b3ae1
Signed-off-by: Pasta <pasta@dashboost.org>
@UdjinM6UdjinM6 added this to the 14.1 milestone Aug 3, 2019
UdjinM6
UdjinM6 requested changes Aug 3, 2019
View reviewed changes
Comment threadsrc/Makefile.test.include Outdated
Comment threadsrc/Makefile.test.include Outdated
Comment threadsrc/Makefile.test.include Outdated
Comment threadtest/functional/multiwallet.py Outdated
Comment threadtest/functional/multiwallet.py Outdated
@UdjinM6

UdjinM6 commented Aug 5, 2019•
edited
Loading

Copy link
Copy Markdown

Guess we have to finish 10297 backport to fix DisconnectBlock issue https://travis-ci.org/dashpay/dash/jobs/567341959#L2131. We also need 10995 and 11002 to fix resendwallettransactions crash and 10683 too fix generate in multiwallet.py. See https://github.com/UdjinM6/dash/commits/pr3043, Travis: https://travis-ci.org/UdjinM6/dash/builds/567602297.

@UdjinM6UdjinM6 mentioned this pull request Aug 5, 2019
Merged
@laanwj@PastaPastaPasta
Mergebitcoin#10995: Fix resendwallettransactions assert failure if -…
a7ef222
…walletbroadcast=0
01699fb Fix resendwallettransactions assert failure if -walletbroadcast=0 (Matt Corallo)
Pull request description:
This fixesbitcoin#10981 in my preferred way.
Tree-SHA512: 2e43d3ac78d13c5d59db23a82c76c722cc3344767a8237617080e489296d27a98bb1b3bd469b2c9b289b57a9da3709c90448d7a23bcc2e1dfb791c4fd16be015
@laanwj@PastaPastaPasta
Mergebitcoin#11002: [wallet] return correct error code from resendwa…
f1f9e5d
…llettransaction
055d95f [wallet] return correct error code from resendwallettransaction (John Newbery)
Pull request description:
New code in bitcoin#10995 uses `RPC_INVALID_REQUEST`. According to the comment in rpc/protocol.h:
```
// RPC_INVALID_REQUEST is internally mapped to HTTP_BAD_REQUEST (400).
// It should not be used for application-layer errors.
```
Change the returned error code to `RPC_WALLET_ERROR`
bitcoin#11000 will need to be updated to test for the correct error code.
Tree-SHA512: 0201b3a2091adf17ad301825da5bd29f0ea7e284b5394cbef80483fc293a558acc849f74a0780bb8501acab324fc722e41ae049cffec7afb76884e26df4b809e
@laanwj@PastaPastaPasta
Mergebitcoin#10683: rpc: Move thegenerateRPC call to rpcwallet
6edcf43
2a96283 rpc: Update `generate` for developer notes (Wladimir J. van der Laan)
df7e2f0 rpc: Move the `generate` RPC call to rpcwallet (Wladimir J. van der Laan)
Tree-SHA512: ec658d6178f8435dc54b9d9c6dd59f873055a8ae0c3f177c02049d77b93107dd5fc17a1ff56d50f051810d52fdf306846eaba2ef4fc8d2a6cfa831f57a1045c4
@PastaPastaPasta

PastaPastaPasta commented Aug 5, 2019

Copy link
Copy Markdown
MemberAuthor

I believe bitcoin#10683 will need more changes due to our changes that mining isn't compiled in by default

@PastaPastaPasta

PastaPastaPasta commented Aug 5, 2019

Copy link
Copy Markdown
MemberAuthor

Compiles and passes tests locally

@PastaPastaPasta

PastaPastaPasta commented Aug 6, 2019

Copy link
Copy Markdown
MemberAuthor

@codablock please review

UdjinM6
UdjinM6 reviewed Aug 6, 2019
View reviewed changes

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

LGTM, fee small notes

Comment threadsrc/validation.cpp Outdated
Comment threadsrc/wallet/rpcwallet.cpp Outdated
PastaPastaPastaand others added 2 commits August 6, 2019 06:46
@PastaPastaPasta@UdjinM6
Fix tests
106fdfa
Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
@PastaPastaPasta@UdjinM6
Fix makefile
53f046c
Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
UdjinM6
UdjinM6 approved these changes Aug 6, 2019
View reviewed changes

@UdjinM6UdjinM6 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 codablockAugust 6, 2019 11:54
@UdjinM6

UdjinM6 commented Aug 6, 2019

Copy link
Copy Markdown

Travis is having its usual issues again it seems...

codablock
codablock reviewed Aug 7, 2019
View reviewed changes

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

just a mini NIT, otherwise LGTM

Comment threadsrc/qt/forms/sendcoinsdialog.ui
codablock
codablock approved these changes Aug 7, 2019
View reviewed changes

@codablockcodablock 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 5bc53b6 into dashpay:developAug 7, 2019
@PastaPastaPasta
PastaPastaPasta deleted the backports-0.15-pr23 branch August 7, 2019 16:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes
+1 more reviewer
@codablockcodablockcodablock 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.

5 participants

@PastaPastaPasta@UdjinM6@codablock@laanwj@instagibbs
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Backports 0.15 pr23 - #3043
Merged
UdjinM6 merged 24 commits into
dashpay:developfrom 
PastaPastaPasta:backports-0.15-pr23
Aug 7, 2019
Merged
Backports 0.15 pr23#3043
UdjinM6 merged 24 commits into
dashpay:developfrom 
PastaPastaPasta:backports-0.15-pr23
Conversation
@PastaPastaPasta
@PastaPastaPastaPastaPastaPasta
commented
Aug 2, 2019

Copy link


Copy Markdown

Member
 No description provided. 
laanwjand others
added 17 commits
August 1, 2019 09:02
@laanwj@PastaPastaPasta
Mergebitcoin#10832: init: Factor out AppInitLockDataDirectory and fi…
6fb74ea
…x startup core dump issue
dba485d init: Factor out AppInitLockDataDirectory (Wladimir J. van der Laan)
Pull request description:
Alternative to bitcoin#10818, alternative solution to bitcoin#10815.
After this change: All the AppInit steps before and inclusive AppInitLockDataDirectory must not have Shutdown() called in case of failure. Only when AppInitMain fails, Shutdown should be called.
Changes the GUI and bitcoind code to consistently do this.
Tree-SHA512: 393e1a0ae05eb8e791025069e3ac4f6f3cdeb459ec63feda85d01cf6696ab3fed7632b6a0ac3641b8c7015af51d46756b5bba77f5e5f0c446f0c2dea58bbc92e
@laanwj@PastaPastaPasta
Mergebitcoin#10849: Multiwallet: simplest endpoint support
fdf34ff
6b9faf7 [QA] add basic multiwallet test (Jonas Schnelli)
979d0b8 [tests] [wallet] Add wallet endpoint support to authproxy (John Newbery)
76603b1 Select wallet based on the given endpoint (Jonas Schnelli)
32c9710 Fix test_bitcoin circular dependency issue (Jonas Schnelli)
31e0720 Add wallet endpoint support to bitcoin-cli (-usewallet) (Jonas Schnelli)
dd2185c Register wallet endpoint (Jonas Schnelli)
Pull request description:
Alternative for bitcoin#10829 and bitcoin#10650.
It adds the most simplest form of wallet based endpoint support (`/wallet/<filename>`).
No v1 and no node/wallet endpoint split.
Tree-SHA512: 23de1fd2f9b48d94682928b582fb6909e16ca507c2ee19e1f989d5a4f3aa706194c4b1fe8854d1d79ba531b7092434239776cae1ae715ff536e829424f59f9be
@PastaPastaPasta
add gArgs
1a96452
Signed-off-by: Pasta <pasta@dashboost.org>
@laanwj@PastaPastaPasta
Mergebitcoin#10883: Rename -usewallet to -rpcwallet
6096212
2264236 Rename -usewallet to -rpcwallet (Alex Morcos)
Pull request description:
Tree-SHA512: 99bdbff5d18e464e620b7b2a1ff8db874b3888db4d43348c96c372097ed51edd796b564e4ef1193ccd75d0a1fd51f865cf6fff4e0e3672654cd2933c851d210a
@laanwj@PastaPastaPasta
Mergebitcoin#10870: [Qt] Use wallet 0 in rpc console if running with…
b2b0bc9
… multiple wallets
9737572 [Qt] Use wallet 0 in rpc console if running with multiple wallets (Jonas Schnelli)
Pull request description:
Current master with multiwallet results in accessing wallet 0 in QT (send / receive / tx history / etc.), **but** the RPC console cannot access that wallet (only non-wallet commands work).
This is a quick solution to re-allow accessing the same wallet (Index 0) via RPC console in multiwallet.
The solutions design is not "state of the art" (should go over WalletModel). Ideally we work on an overall multiwallet support for the GUI (which then would remove this change).
I think we should consider this as a bugfix.
Tree-SHA512: 16cf844662248ffd3d82c7d0cbe5879f231fbc7d4f5a4aab4180a9087018519c98301e4ac311eaec2cc39dddf25d3edf9be99a6622ea682c138a820a9b21fd0c
@laanwj@PastaPastaPasta
Mergebitcoin#10927: test: Make sure wallet.backup is created in temp…
8fdf594
… path
88af227 test: Make sure wallet.backup is created in temp path (Wladimir J. van der Laan)
Pull request description:
This assures that we don't overwrite a random file called `wallet.backup` that happens to be in the current directory. It also assures that the temporary file will be cleaned up.
Noticed by Evan Klitzke, came up in discussion here: bitcoin#10880 (comment)
Tree-SHA512: 2d2c23c2deba26a1130a29279b3d8565b277eb90a98a6a6d7dd4948f5cbbd5ec5453b3082e3e4e21e0e2423e642bbd2f4433e4c21032d3c8cff27ee35e87e7e7
@laanwj@PastaPastaPasta
Mergebitcoin#10824: Avoid unnecessary work in SetNetworkActive
5dc2193
a2420ae Avoid unnecessary work in SetNetworkActive (João Barbosa)
Pull request description:
This PR adds an early return to avoid unnecessary notifications when the status doesn't change.
Tree-SHA512: 85d05ca6fa36cb581f94bc154d08bd72cd53f6a857173c6fb2f184058f9c0208c4cf5e5d196825a78339902d8f256688eb6793f99abc7be9c7cfac85136180d9
@laanwj@PastaPastaPasta
Mergebitcoin#10912: [tests] Fix incorrect memory_cleanse(…) call in …
07d08a8
…crypto_tests.cpp
065039d [tests] Fix incorrect memory_cleanse(…) call in crypto_tests.cpp (practicalswift)
Pull request description:
`chKey` and `chIV` are pointers, not arrays :-)
Probably the result of copy-pasting of old code where the code was operating on arrays instead of pointers.
If I'm reading the code correctly the absence/presence of these `memory_cleanse(…)` calls won't alter the outcome of the test in question (`TestPassphraseSingle`) even if fixed. Therefore removing.
Tree-SHA512: a053b2817bedf6ef889744e546ce9a0f165dee94aef6850d9d6a6bb05b0018789597371ecf154a4aec8588c0ef5626ef08c23c35e35927f6b0497b5f086146fe
@laanwj@PastaPastaPasta
Mergebitcoin#10892: Replace traditional for with ranged for in block…
80bc6df
… and transaction primitives
72f0060 Replace traditional for with ranged for in primitives (Dag Robole)
Pull request description:
Replace traditional for with ranged for in block and transaction primitives to improve readability
Tree-SHA512: c0fff603d2939149ca48b6aa72b59738a3658d49bd58b2d4ffbc85bdb774d8d5bb808fe526fe22bb9eb214de632834d373e2aab44f6019a83c0b09440cea6528
@laanwj@PastaPastaPasta
Mergebitcoin#10974: Fix typo in sendcoinsdialog.
8cb2508
7f121a0 Fix typo in sendcoinsdialog. (Masahiko Hyuga)
Pull request description:
Tree-SHA512: 7b3ea344a8a432b6e3835b6870ccfaa197df43f812fea506259b644a44442e36ee39967eed246d9b4b5334528b63f41d7e8af9fd2267e51bcf7557ed652452e4
@laanwj@PastaPastaPasta
Mergebitcoin#10301: Check if sys/random.h is required for getentropy.
52aef4c
ee2d10a Check if sys/random.h is required for getentropy on OSX. (James Hilliard)
Pull request description:
This should check and include sys/random.h if required for osx as mentioned [here](bitcoin#9821 (comment)).
Tree-SHA512: e9491f67f2e8b2e6bcdbcbb8063295e844d5627daf5336e3e17b4a8027d888fa65a08e4580a745abdc35ffd8d86b4fc7434daaac172c4a06ab7566a2ed0bfb92
MarcoFalke@PastaPastaPasta
Mergebitcoin#11023: [tests] Add option to attach a python debugger i…
7f1009e
…f functional test fails
cc5d38f Add option to attach a python debugger if test fails (John Newbery)
Pull request description:
Adds a simple option to the test_framework to attach pdb if the test fails.
Helpful for catching and debugging intermittent failures: Run the test in a loop with this option. The first failure will cause execution to pause and nodes will be left running for interactive debugging.
@sdaftuar
Tree-SHA512: 01cfae15fa3f04ed6ec6a99fef60a6c6a59723429309e81eacd6767caf12f5758f59b337804291ecab33a38a2958f36e2b513d201bee72a2eeb207a67046f952
MarcoFalke@PastaPastaPasta
Mergebitcoin#11000: test: Add resendwallettransactions functional tests
33807c8
bdf607e test: Add resendwallettransactions functional tests (João Barbosa)
Pull request description:
Adds functional tests to cover the behaviour introduced in bitcoin#10995.
Tree-SHA512: 3be337cbe51edab2cc0eb9ecfa68d00cd3c3a00aef0672cd841706802726c9cd4138626a8f209c3d9fbd207ce332daa062f270e4c94c1c2398bfc475e36423f6
@instagibbs@PastaPastaPasta
disable jni in builds
8ed0d52
Github-Pull: bitcoin#11056
Rebased-From: 844b73e
Tree-SHA512: f735853c3d9abbde5032cc55201b0ddc29679e681ba7d3822cbcbeee17c7185ee984b235411224cfb8ff12550de88a0f1367d55ad24bf52c5c03061330849eb2
@laanwj@PastaPastaPasta
Mergebitcoin#10148: Use non-atomic flushing with block replay
453d756
176c021 [qa] Test non-atomic chainstate writes (Suhas Daftuar)
d6af06d Dont create pcoinsTip until after ReplayBlocks. (Matt Corallo)
eaca1b7 Random db flush crash simulator (Pieter Wuille)
0580ee0 Adapt memory usage estimation for flushing (Pieter Wuille)
013a56a Non-atomic flushing using the blockchain as replay journal (Pieter Wuille)
b3a279c [MOVEONLY] Move LastCommonAncestor to chain (Pieter Wuille)
Tree-SHA512: 47ccc62303f9075c44d2a914be75bd6969ff881a857a2ff1227f05ec7def6f4c71c46680c5a28cb150c814999526797dc05cf2701fde1369c06169f46eccddee
@PastaPastaPasta
remove DB_PEAK_USAGE_FACTOR
f3259d0
Signed-off-by: Pasta <pasta@dashboost.org>
@PastaPastaPasta
add gArgs
60b3ae1
Signed-off-by: Pasta <pasta@dashboost.org>
@UdjinM6UdjinM6
added this to the 14.1 milestone
Aug 3, 2019
UdjinM6
UdjinM6
requested changes
Aug 3, 2019
View reviewed changes
Comment threadsrc/Makefile.test.include
Outdated

Comment threadsrc/Makefile.test.include
Outdated

Comment threadsrc/Makefile.test.include
Outdated

Comment threadtest/functional/multiwallet.py
Outdated

Comment threadtest/functional/multiwallet.py
Outdated

@UdjinM6
UdjinM6
commented
Aug 5, 2019•

edited

Loading

Copy link


Copy Markdown

Guess we have to finish 10297 backport to fix DisconnectBlock issue https://travis-ci.org/dashpay/dash/jobs/567341959#L2131. We also need 10995 and 11002 to fix resendwallettransactions crash and 10683 too fix generate in multiwallet.py. See https://github.com/UdjinM6/dash/commits/pr3043, Travis: https://travis-ci.org/UdjinM6/dash/builds/567602297.
@UdjinM6UdjinM6
mentioned this pull request
Aug 5, 2019
 Merged

@laanwj@PastaPastaPasta
Mergebitcoin#10995: Fix resendwallettransactions assert failure if -…
a7ef222
…walletbroadcast=0
01699fb Fix resendwallettransactions assert failure if -walletbroadcast=0 (Matt Corallo)
Pull request description:
This fixesbitcoin#10981 in my preferred way.
Tree-SHA512: 2e43d3ac78d13c5d59db23a82c76c722cc3344767a8237617080e489296d27a98bb1b3bd469b2c9b289b57a9da3709c90448d7a23bcc2e1dfb791c4fd16be015
@laanwj@PastaPastaPasta
Mergebitcoin#11002: [wallet] return correct error code from resendwa…
f1f9e5d
…llettransaction
055d95f [wallet] return correct error code from resendwallettransaction (John Newbery)
Pull request description:
New code in bitcoin#10995 uses `RPC_INVALID_REQUEST`. According to the comment in rpc/protocol.h:
```
// RPC_INVALID_REQUEST is internally mapped to HTTP_BAD_REQUEST (400).
// It should not be used for application-layer errors.
```
Change the returned error code to `RPC_WALLET_ERROR`
bitcoin#11000 will need to be updated to test for the correct error code.
Tree-SHA512: 0201b3a2091adf17ad301825da5bd29f0ea7e284b5394cbef80483fc293a558acc849f74a0780bb8501acab324fc722e41ae049cffec7afb76884e26df4b809e
@laanwj@PastaPastaPasta
Mergebitcoin#10683: rpc: Move thegenerateRPC call to rpcwallet
6edcf43
2a96283 rpc: Update `generate` for developer notes (Wladimir J. van der Laan)
df7e2f0 rpc: Move the `generate` RPC call to rpcwallet (Wladimir J. van der Laan)
Tree-SHA512: ec658d6178f8435dc54b9d9c6dd59f873055a8ae0c3f177c02049d77b93107dd5fc17a1ff56d50f051810d52fdf306846eaba2ef4fc8d2a6cfa831f57a1045c4
@PastaPastaPasta
PastaPastaPasta
commented
Aug 5, 2019

Copy link


Copy Markdown

MemberAuthor
I believe bitcoin#10683 will need more changes due to our changes that mining isn't compiled in by default
@PastaPastaPasta
PastaPastaPasta
commented
Aug 5, 2019

Copy link


Copy Markdown

MemberAuthor
Compiles and passes tests locally
@PastaPastaPasta
PastaPastaPasta
commented
Aug 6, 2019

Copy link


Copy Markdown

MemberAuthor
@codablock please review
UdjinM6
UdjinM6
reviewed
Aug 6, 2019
View reviewed changes
@UdjinM6UdjinM6
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.

LGTM, fee small notes
Comment threadsrc/validation.cpp
Outdated

Comment threadsrc/wallet/rpcwallet.cpp
Outdated

PastaPastaPastaand others
added 2 commits
August 6, 2019 06:46
@PastaPastaPasta@UdjinM6
Fix tests
106fdfa
Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
@PastaPastaPasta@UdjinM6
Fix makefile
53f046c
Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
UdjinM6
UdjinM6
approved these changes
Aug 6, 2019
View reviewed changes
@UdjinM6UdjinM6
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 codablockAugust 6, 2019 11:54
@UdjinM6
UdjinM6
commented
Aug 6, 2019

Copy link


Copy Markdown

Travis is having its usual issues again it seems...
codablock
codablock
reviewed
Aug 7, 2019
View reviewed changes
@codablockcodablock
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.

just a mini NIT, otherwise LGTM
Comment threadsrc/qt/forms/sendcoinsdialog.ui
codablock
codablock
approved these changes
Aug 7, 2019
View reviewed changes
@codablockcodablock
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 5bc53b6
into
dashpay:developAug 7, 2019
@PastaPastaPasta
PastaPastaPasta
deleted the

backports-0.15-pr23

branch
August 7, 2019 16:00
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes

+1 more reviewer

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

5 participants

@PastaPastaPasta@UdjinM6@codablock@laanwj@instagibbs

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Backports 0.15 pr23 - #3043
Merged
UdjinM6 merged 24 commits into
dashpay:developfrom 
PastaPastaPasta:backports-0.15-pr23
Aug 7, 2019
Merged
Backports 0.15 pr23#3043
UdjinM6 merged 24 commits into
dashpay:developfrom 
PastaPastaPasta:backports-0.15-pr23
Conversation
@PastaPastaPasta
@PastaPastaPastaPastaPastaPasta
commented
Aug 2, 2019

Copy link


Copy Markdown

Member
 No description provided. 
laanwjand others
added 17 commits
August 1, 2019 09:02
@laanwj@PastaPastaPasta
Mergebitcoin#10832: init: Factor out AppInitLockDataDirectory and fi…
6fb74ea
…x startup core dump issue
dba485d init: Factor out AppInitLockDataDirectory (Wladimir J. van der Laan)
Pull request description:
Alternative to bitcoin#10818, alternative solution to bitcoin#10815.
After this change: All the AppInit steps before and inclusive AppInitLockDataDirectory must not have Shutdown() called in case of failure. Only when AppInitMain fails, Shutdown should be called.
Changes the GUI and bitcoind code to consistently do this.
Tree-SHA512: 393e1a0ae05eb8e791025069e3ac4f6f3cdeb459ec63feda85d01cf6696ab3fed7632b6a0ac3641b8c7015af51d46756b5bba77f5e5f0c446f0c2dea58bbc92e
@laanwj@PastaPastaPasta
Mergebitcoin#10849: Multiwallet: simplest endpoint support
fdf34ff
6b9faf7 [QA] add basic multiwallet test (Jonas Schnelli)
979d0b8 [tests] [wallet] Add wallet endpoint support to authproxy (John Newbery)
76603b1 Select wallet based on the given endpoint (Jonas Schnelli)
32c9710 Fix test_bitcoin circular dependency issue (Jonas Schnelli)
31e0720 Add wallet endpoint support to bitcoin-cli (-usewallet) (Jonas Schnelli)
dd2185c Register wallet endpoint (Jonas Schnelli)
Pull request description:
Alternative for bitcoin#10829 and bitcoin#10650.
It adds the most simplest form of wallet based endpoint support (`/wallet/<filename>`).
No v1 and no node/wallet endpoint split.
Tree-SHA512: 23de1fd2f9b48d94682928b582fb6909e16ca507c2ee19e1f989d5a4f3aa706194c4b1fe8854d1d79ba531b7092434239776cae1ae715ff536e829424f59f9be
@PastaPastaPasta
add gArgs
1a96452
Signed-off-by: Pasta <pasta@dashboost.org>
@laanwj@PastaPastaPasta
Mergebitcoin#10883: Rename -usewallet to -rpcwallet
6096212
2264236 Rename -usewallet to -rpcwallet (Alex Morcos)
Pull request description:
Tree-SHA512: 99bdbff5d18e464e620b7b2a1ff8db874b3888db4d43348c96c372097ed51edd796b564e4ef1193ccd75d0a1fd51f865cf6fff4e0e3672654cd2933c851d210a
@laanwj@PastaPastaPasta
Mergebitcoin#10870: [Qt] Use wallet 0 in rpc console if running with…
b2b0bc9
… multiple wallets
9737572 [Qt] Use wallet 0 in rpc console if running with multiple wallets (Jonas Schnelli)
Pull request description:
Current master with multiwallet results in accessing wallet 0 in QT (send / receive / tx history / etc.), **but** the RPC console cannot access that wallet (only non-wallet commands work).
This is a quick solution to re-allow accessing the same wallet (Index 0) via RPC console in multiwallet.
The solutions design is not "state of the art" (should go over WalletModel). Ideally we work on an overall multiwallet support for the GUI (which then would remove this change).
I think we should consider this as a bugfix.
Tree-SHA512: 16cf844662248ffd3d82c7d0cbe5879f231fbc7d4f5a4aab4180a9087018519c98301e4ac311eaec2cc39dddf25d3edf9be99a6622ea682c138a820a9b21fd0c
@laanwj@PastaPastaPasta
Mergebitcoin#10927: test: Make sure wallet.backup is created in temp…
8fdf594
… path
88af227 test: Make sure wallet.backup is created in temp path (Wladimir J. van der Laan)
Pull request description:
This assures that we don't overwrite a random file called `wallet.backup` that happens to be in the current directory. It also assures that the temporary file will be cleaned up.
Noticed by Evan Klitzke, came up in discussion here: bitcoin#10880 (comment)
Tree-SHA512: 2d2c23c2deba26a1130a29279b3d8565b277eb90a98a6a6d7dd4948f5cbbd5ec5453b3082e3e4e21e0e2423e642bbd2f4433e4c21032d3c8cff27ee35e87e7e7
@laanwj@PastaPastaPasta
Mergebitcoin#10824: Avoid unnecessary work in SetNetworkActive
5dc2193
a2420ae Avoid unnecessary work in SetNetworkActive (João Barbosa)
Pull request description:
This PR adds an early return to avoid unnecessary notifications when the status doesn't change.
Tree-SHA512: 85d05ca6fa36cb581f94bc154d08bd72cd53f6a857173c6fb2f184058f9c0208c4cf5e5d196825a78339902d8f256688eb6793f99abc7be9c7cfac85136180d9
@laanwj@PastaPastaPasta
Mergebitcoin#10912: [tests] Fix incorrect memory_cleanse(…) call in …
07d08a8
…crypto_tests.cpp
065039d [tests] Fix incorrect memory_cleanse(…) call in crypto_tests.cpp (practicalswift)
Pull request description:
`chKey` and `chIV` are pointers, not arrays :-)
Probably the result of copy-pasting of old code where the code was operating on arrays instead of pointers.
If I'm reading the code correctly the absence/presence of these `memory_cleanse(…)` calls won't alter the outcome of the test in question (`TestPassphraseSingle`) even if fixed. Therefore removing.
Tree-SHA512: a053b2817bedf6ef889744e546ce9a0f165dee94aef6850d9d6a6bb05b0018789597371ecf154a4aec8588c0ef5626ef08c23c35e35927f6b0497b5f086146fe
@laanwj@PastaPastaPasta
Mergebitcoin#10892: Replace traditional for with ranged for in block…
80bc6df
… and transaction primitives
72f0060 Replace traditional for with ranged for in primitives (Dag Robole)
Pull request description:
Replace traditional for with ranged for in block and transaction primitives to improve readability
Tree-SHA512: c0fff603d2939149ca48b6aa72b59738a3658d49bd58b2d4ffbc85bdb774d8d5bb808fe526fe22bb9eb214de632834d373e2aab44f6019a83c0b09440cea6528
@laanwj@PastaPastaPasta
Mergebitcoin#10974: Fix typo in sendcoinsdialog.
8cb2508
7f121a0 Fix typo in sendcoinsdialog. (Masahiko Hyuga)
Pull request description:
Tree-SHA512: 7b3ea344a8a432b6e3835b6870ccfaa197df43f812fea506259b644a44442e36ee39967eed246d9b4b5334528b63f41d7e8af9fd2267e51bcf7557ed652452e4
@laanwj@PastaPastaPasta
Mergebitcoin#10301: Check if sys/random.h is required for getentropy.
52aef4c
ee2d10a Check if sys/random.h is required for getentropy on OSX. (James Hilliard)
Pull request description:
This should check and include sys/random.h if required for osx as mentioned [here](bitcoin#9821 (comment)).
Tree-SHA512: e9491f67f2e8b2e6bcdbcbb8063295e844d5627daf5336e3e17b4a8027d888fa65a08e4580a745abdc35ffd8d86b4fc7434daaac172c4a06ab7566a2ed0bfb92
MarcoFalke@PastaPastaPasta
Mergebitcoin#11023: [tests] Add option to attach a python debugger i…
7f1009e
…f functional test fails
cc5d38f Add option to attach a python debugger if test fails (John Newbery)
Pull request description:
Adds a simple option to the test_framework to attach pdb if the test fails.
Helpful for catching and debugging intermittent failures: Run the test in a loop with this option. The first failure will cause execution to pause and nodes will be left running for interactive debugging.
@sdaftuar
Tree-SHA512: 01cfae15fa3f04ed6ec6a99fef60a6c6a59723429309e81eacd6767caf12f5758f59b337804291ecab33a38a2958f36e2b513d201bee72a2eeb207a67046f952
MarcoFalke@PastaPastaPasta
Mergebitcoin#11000: test: Add resendwallettransactions functional tests
33807c8
bdf607e test: Add resendwallettransactions functional tests (João Barbosa)
Pull request description:
Adds functional tests to cover the behaviour introduced in bitcoin#10995.
Tree-SHA512: 3be337cbe51edab2cc0eb9ecfa68d00cd3c3a00aef0672cd841706802726c9cd4138626a8f209c3d9fbd207ce332daa062f270e4c94c1c2398bfc475e36423f6
@instagibbs@PastaPastaPasta
disable jni in builds
8ed0d52
Github-Pull: bitcoin#11056
Rebased-From: 844b73e
Tree-SHA512: f735853c3d9abbde5032cc55201b0ddc29679e681ba7d3822cbcbeee17c7185ee984b235411224cfb8ff12550de88a0f1367d55ad24bf52c5c03061330849eb2
@laanwj@PastaPastaPasta
Mergebitcoin#10148: Use non-atomic flushing with block replay
453d756
176c021 [qa] Test non-atomic chainstate writes (Suhas Daftuar)
d6af06d Dont create pcoinsTip until after ReplayBlocks. (Matt Corallo)
eaca1b7 Random db flush crash simulator (Pieter Wuille)
0580ee0 Adapt memory usage estimation for flushing (Pieter Wuille)
013a56a Non-atomic flushing using the blockchain as replay journal (Pieter Wuille)
b3a279c [MOVEONLY] Move LastCommonAncestor to chain (Pieter Wuille)
Tree-SHA512: 47ccc62303f9075c44d2a914be75bd6969ff881a857a2ff1227f05ec7def6f4c71c46680c5a28cb150c814999526797dc05cf2701fde1369c06169f46eccddee
@PastaPastaPasta
remove DB_PEAK_USAGE_FACTOR
f3259d0
Signed-off-by: Pasta <pasta@dashboost.org>
@PastaPastaPasta
add gArgs
60b3ae1
Signed-off-by: Pasta <pasta@dashboost.org>
@UdjinM6UdjinM6
added this to the 14.1 milestone
Aug 3, 2019
UdjinM6
UdjinM6
requested changes
Aug 3, 2019
View reviewed changes
Comment threadsrc/Makefile.test.include
Outdated

Comment threadsrc/Makefile.test.include
Outdated

Comment threadsrc/Makefile.test.include
Outdated

Comment threadtest/functional/multiwallet.py
Outdated

Comment threadtest/functional/multiwallet.py
Outdated

@UdjinM6
UdjinM6
commented
Aug 5, 2019•

edited

Loading

Copy link


Copy Markdown

Guess we have to finish 10297 backport to fix DisconnectBlock issue https://travis-ci.org/dashpay/dash/jobs/567341959#L2131. We also need 10995 and 11002 to fix resendwallettransactions crash and 10683 too fix generate in multiwallet.py. See https://github.com/UdjinM6/dash/commits/pr3043, Travis: https://travis-ci.org/UdjinM6/dash/builds/567602297.
@UdjinM6UdjinM6
mentioned this pull request
Aug 5, 2019
 Merged

@laanwj@PastaPastaPasta
Mergebitcoin#10995: Fix resendwallettransactions assert failure if -…
a7ef222
…walletbroadcast=0
01699fb Fix resendwallettransactions assert failure if -walletbroadcast=0 (Matt Corallo)
Pull request description:
This fixesbitcoin#10981 in my preferred way.
Tree-SHA512: 2e43d3ac78d13c5d59db23a82c76c722cc3344767a8237617080e489296d27a98bb1b3bd469b2c9b289b57a9da3709c90448d7a23bcc2e1dfb791c4fd16be015
@laanwj@PastaPastaPasta
Mergebitcoin#11002: [wallet] return correct error code from resendwa…
f1f9e5d
…llettransaction
055d95f [wallet] return correct error code from resendwallettransaction (John Newbery)
Pull request description:
New code in bitcoin#10995 uses `RPC_INVALID_REQUEST`. According to the comment in rpc/protocol.h:
```
// RPC_INVALID_REQUEST is internally mapped to HTTP_BAD_REQUEST (400).
// It should not be used for application-layer errors.
```
Change the returned error code to `RPC_WALLET_ERROR`
bitcoin#11000 will need to be updated to test for the correct error code.
Tree-SHA512: 0201b3a2091adf17ad301825da5bd29f0ea7e284b5394cbef80483fc293a558acc849f74a0780bb8501acab324fc722e41ae049cffec7afb76884e26df4b809e
@laanwj@PastaPastaPasta
Mergebitcoin#10683: rpc: Move thegenerateRPC call to rpcwallet
6edcf43
2a96283 rpc: Update `generate` for developer notes (Wladimir J. van der Laan)
df7e2f0 rpc: Move the `generate` RPC call to rpcwallet (Wladimir J. van der Laan)
Tree-SHA512: ec658d6178f8435dc54b9d9c6dd59f873055a8ae0c3f177c02049d77b93107dd5fc17a1ff56d50f051810d52fdf306846eaba2ef4fc8d2a6cfa831f57a1045c4
@PastaPastaPasta
PastaPastaPasta
commented
Aug 5, 2019

Copy link


Copy Markdown

MemberAuthor
I believe bitcoin#10683 will need more changes due to our changes that mining isn't compiled in by default
@PastaPastaPasta
PastaPastaPasta
commented
Aug 5, 2019

Copy link


Copy Markdown

MemberAuthor
Compiles and passes tests locally
@PastaPastaPasta
PastaPastaPasta
commented
Aug 6, 2019

Copy link


Copy Markdown

MemberAuthor
@codablock please review
UdjinM6
UdjinM6
reviewed
Aug 6, 2019
View reviewed changes
@UdjinM6UdjinM6
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.

LGTM, fee small notes
Comment threadsrc/validation.cpp
Outdated

Comment threadsrc/wallet/rpcwallet.cpp
Outdated

PastaPastaPastaand others
added 2 commits
August 6, 2019 06:46
@PastaPastaPasta@UdjinM6
Fix tests
106fdfa
Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
@PastaPastaPasta@UdjinM6
Fix makefile
53f046c
Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
UdjinM6
UdjinM6
approved these changes
Aug 6, 2019
View reviewed changes
@UdjinM6UdjinM6
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 codablockAugust 6, 2019 11:54
@UdjinM6
UdjinM6
commented
Aug 6, 2019

Copy link


Copy Markdown

Travis is having its usual issues again it seems...
codablock
codablock
reviewed
Aug 7, 2019
View reviewed changes
@codablockcodablock
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.

just a mini NIT, otherwise LGTM
Comment threadsrc/qt/forms/sendcoinsdialog.ui
codablock
codablock
approved these changes
Aug 7, 2019
View reviewed changes
@codablockcodablock
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 5bc53b6
into
dashpay:developAug 7, 2019
@PastaPastaPasta
PastaPastaPasta
deleted the

backports-0.15-pr23

branch
August 7, 2019 16:00
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes

+1 more reviewer

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

5 participants

@PastaPastaPasta@UdjinM6@codablock@laanwj@instagibbs

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Backports 0.15 pr23 - #3043
Merged
UdjinM6 merged 24 commits into
dashpay:developfrom 
PastaPastaPasta:backports-0.15-pr23
Aug 7, 2019
Merged
Backports 0.15 pr23#3043
UdjinM6 merged 24 commits into
dashpay:developfrom 
PastaPastaPasta:backports-0.15-pr23
Conversation
@PastaPastaPasta
@PastaPastaPastaPastaPastaPasta
commented
Aug 2, 2019

Copy link


Copy Markdown

Member
 No description provided. 
laanwjand others
added 17 commits
August 1, 2019 09:02
@laanwj@PastaPastaPasta
Mergebitcoin#10832: init: Factor out AppInitLockDataDirectory and fi…
6fb74ea
…x startup core dump issue
dba485d init: Factor out AppInitLockDataDirectory (Wladimir J. van der Laan)
Pull request description:
Alternative to bitcoin#10818, alternative solution to bitcoin#10815.
After this change: All the AppInit steps before and inclusive AppInitLockDataDirectory must not have Shutdown() called in case of failure. Only when AppInitMain fails, Shutdown should be called.
Changes the GUI and bitcoind code to consistently do this.
Tree-SHA512: 393e1a0ae05eb8e791025069e3ac4f6f3cdeb459ec63feda85d01cf6696ab3fed7632b6a0ac3641b8c7015af51d46756b5bba77f5e5f0c446f0c2dea58bbc92e
@laanwj@PastaPastaPasta
Mergebitcoin#10849: Multiwallet: simplest endpoint support
fdf34ff
6b9faf7 [QA] add basic multiwallet test (Jonas Schnelli)
979d0b8 [tests] [wallet] Add wallet endpoint support to authproxy (John Newbery)
76603b1 Select wallet based on the given endpoint (Jonas Schnelli)
32c9710 Fix test_bitcoin circular dependency issue (Jonas Schnelli)
31e0720 Add wallet endpoint support to bitcoin-cli (-usewallet) (Jonas Schnelli)
dd2185c Register wallet endpoint (Jonas Schnelli)
Pull request description:
Alternative for bitcoin#10829 and bitcoin#10650.
It adds the most simplest form of wallet based endpoint support (`/wallet/<filename>`).
No v1 and no node/wallet endpoint split.
Tree-SHA512: 23de1fd2f9b48d94682928b582fb6909e16ca507c2ee19e1f989d5a4f3aa706194c4b1fe8854d1d79ba531b7092434239776cae1ae715ff536e829424f59f9be
@PastaPastaPasta
add gArgs
1a96452
Signed-off-by: Pasta <pasta@dashboost.org>
@laanwj@PastaPastaPasta
Mergebitcoin#10883: Rename -usewallet to -rpcwallet
6096212
2264236 Rename -usewallet to -rpcwallet (Alex Morcos)
Pull request description:
Tree-SHA512: 99bdbff5d18e464e620b7b2a1ff8db874b3888db4d43348c96c372097ed51edd796b564e4ef1193ccd75d0a1fd51f865cf6fff4e0e3672654cd2933c851d210a
@laanwj@PastaPastaPasta
Mergebitcoin#10870: [Qt] Use wallet 0 in rpc console if running with…
b2b0bc9
… multiple wallets
9737572 [Qt] Use wallet 0 in rpc console if running with multiple wallets (Jonas Schnelli)
Pull request description:
Current master with multiwallet results in accessing wallet 0 in QT (send / receive / tx history / etc.), **but** the RPC console cannot access that wallet (only non-wallet commands work).
This is a quick solution to re-allow accessing the same wallet (Index 0) via RPC console in multiwallet.
The solutions design is not "state of the art" (should go over WalletModel). Ideally we work on an overall multiwallet support for the GUI (which then would remove this change).
I think we should consider this as a bugfix.
Tree-SHA512: 16cf844662248ffd3d82c7d0cbe5879f231fbc7d4f5a4aab4180a9087018519c98301e4ac311eaec2cc39dddf25d3edf9be99a6622ea682c138a820a9b21fd0c
@laanwj@PastaPastaPasta
Mergebitcoin#10927: test: Make sure wallet.backup is created in temp…
8fdf594
… path
88af227 test: Make sure wallet.backup is created in temp path (Wladimir J. van der Laan)
Pull request description:
This assures that we don't overwrite a random file called `wallet.backup` that happens to be in the current directory. It also assures that the temporary file will be cleaned up.
Noticed by Evan Klitzke, came up in discussion here: bitcoin#10880 (comment)
Tree-SHA512: 2d2c23c2deba26a1130a29279b3d8565b277eb90a98a6a6d7dd4948f5cbbd5ec5453b3082e3e4e21e0e2423e642bbd2f4433e4c21032d3c8cff27ee35e87e7e7
@laanwj@PastaPastaPasta
Mergebitcoin#10824: Avoid unnecessary work in SetNetworkActive
5dc2193
a2420ae Avoid unnecessary work in SetNetworkActive (João Barbosa)
Pull request description:
This PR adds an early return to avoid unnecessary notifications when the status doesn't change.
Tree-SHA512: 85d05ca6fa36cb581f94bc154d08bd72cd53f6a857173c6fb2f184058f9c0208c4cf5e5d196825a78339902d8f256688eb6793f99abc7be9c7cfac85136180d9
@laanwj@PastaPastaPasta
Mergebitcoin#10912: [tests] Fix incorrect memory_cleanse(…) call in …
07d08a8
…crypto_tests.cpp
065039d [tests] Fix incorrect memory_cleanse(…) call in crypto_tests.cpp (practicalswift)
Pull request description:
`chKey` and `chIV` are pointers, not arrays :-)
Probably the result of copy-pasting of old code where the code was operating on arrays instead of pointers.
If I'm reading the code correctly the absence/presence of these `memory_cleanse(…)` calls won't alter the outcome of the test in question (`TestPassphraseSingle`) even if fixed. Therefore removing.
Tree-SHA512: a053b2817bedf6ef889744e546ce9a0f165dee94aef6850d9d6a6bb05b0018789597371ecf154a4aec8588c0ef5626ef08c23c35e35927f6b0497b5f086146fe
@laanwj@PastaPastaPasta
Mergebitcoin#10892: Replace traditional for with ranged for in block…
80bc6df
… and transaction primitives
72f0060 Replace traditional for with ranged for in primitives (Dag Robole)
Pull request description:
Replace traditional for with ranged for in block and transaction primitives to improve readability
Tree-SHA512: c0fff603d2939149ca48b6aa72b59738a3658d49bd58b2d4ffbc85bdb774d8d5bb808fe526fe22bb9eb214de632834d373e2aab44f6019a83c0b09440cea6528
@laanwj@PastaPastaPasta
Mergebitcoin#10974: Fix typo in sendcoinsdialog.
8cb2508
7f121a0 Fix typo in sendcoinsdialog. (Masahiko Hyuga)
Pull request description:
Tree-SHA512: 7b3ea344a8a432b6e3835b6870ccfaa197df43f812fea506259b644a44442e36ee39967eed246d9b4b5334528b63f41d7e8af9fd2267e51bcf7557ed652452e4
@laanwj@PastaPastaPasta
Mergebitcoin#10301: Check if sys/random.h is required for getentropy.
52aef4c
ee2d10a Check if sys/random.h is required for getentropy on OSX. (James Hilliard)
Pull request description:
This should check and include sys/random.h if required for osx as mentioned [here](bitcoin#9821 (comment)).
Tree-SHA512: e9491f67f2e8b2e6bcdbcbb8063295e844d5627daf5336e3e17b4a8027d888fa65a08e4580a745abdc35ffd8d86b4fc7434daaac172c4a06ab7566a2ed0bfb92
MarcoFalke@PastaPastaPasta
Mergebitcoin#11023: [tests] Add option to attach a python debugger i…
7f1009e
…f functional test fails
cc5d38f Add option to attach a python debugger if test fails (John Newbery)
Pull request description:
Adds a simple option to the test_framework to attach pdb if the test fails.
Helpful for catching and debugging intermittent failures: Run the test in a loop with this option. The first failure will cause execution to pause and nodes will be left running for interactive debugging.
@sdaftuar
Tree-SHA512: 01cfae15fa3f04ed6ec6a99fef60a6c6a59723429309e81eacd6767caf12f5758f59b337804291ecab33a38a2958f36e2b513d201bee72a2eeb207a67046f952
MarcoFalke@PastaPastaPasta
Mergebitcoin#11000: test: Add resendwallettransactions functional tests
33807c8
bdf607e test: Add resendwallettransactions functional tests (João Barbosa)
Pull request description:
Adds functional tests to cover the behaviour introduced in bitcoin#10995.
Tree-SHA512: 3be337cbe51edab2cc0eb9ecfa68d00cd3c3a00aef0672cd841706802726c9cd4138626a8f209c3d9fbd207ce332daa062f270e4c94c1c2398bfc475e36423f6
@instagibbs@PastaPastaPasta
disable jni in builds
8ed0d52
Github-Pull: bitcoin#11056
Rebased-From: 844b73e
Tree-SHA512: f735853c3d9abbde5032cc55201b0ddc29679e681ba7d3822cbcbeee17c7185ee984b235411224cfb8ff12550de88a0f1367d55ad24bf52c5c03061330849eb2
@laanwj@PastaPastaPasta
Mergebitcoin#10148: Use non-atomic flushing with block replay
453d756
176c021 [qa] Test non-atomic chainstate writes (Suhas Daftuar)
d6af06d Dont create pcoinsTip until after ReplayBlocks. (Matt Corallo)
eaca1b7 Random db flush crash simulator (Pieter Wuille)
0580ee0 Adapt memory usage estimation for flushing (Pieter Wuille)
013a56a Non-atomic flushing using the blockchain as replay journal (Pieter Wuille)
b3a279c [MOVEONLY] Move LastCommonAncestor to chain (Pieter Wuille)
Tree-SHA512: 47ccc62303f9075c44d2a914be75bd6969ff881a857a2ff1227f05ec7def6f4c71c46680c5a28cb150c814999526797dc05cf2701fde1369c06169f46eccddee
@PastaPastaPasta
remove DB_PEAK_USAGE_FACTOR
f3259d0
Signed-off-by: Pasta <pasta@dashboost.org>
@PastaPastaPasta
add gArgs
60b3ae1
Signed-off-by: Pasta <pasta@dashboost.org>
@UdjinM6UdjinM6
added this to the 14.1 milestone
Aug 3, 2019
UdjinM6
UdjinM6
requested changes
Aug 3, 2019
View reviewed changes
Comment threadsrc/Makefile.test.include
Outdated

Comment threadsrc/Makefile.test.include
Outdated

Comment threadsrc/Makefile.test.include
Outdated

Comment threadtest/functional/multiwallet.py
Outdated

Comment threadtest/functional/multiwallet.py
Outdated

@UdjinM6
UdjinM6
commented
Aug 5, 2019•

edited

Loading

Copy link


Copy Markdown

Guess we have to finish 10297 backport to fix DisconnectBlock issue https://travis-ci.org/dashpay/dash/jobs/567341959#L2131. We also need 10995 and 11002 to fix resendwallettransactions crash and 10683 too fix generate in multiwallet.py. See https://github.com/UdjinM6/dash/commits/pr3043, Travis: https://travis-ci.org/UdjinM6/dash/builds/567602297.
@UdjinM6UdjinM6
mentioned this pull request
Aug 5, 2019
 Merged

@laanwj@PastaPastaPasta
Mergebitcoin#10995: Fix resendwallettransactions assert failure if -…
a7ef222
…walletbroadcast=0
01699fb Fix resendwallettransactions assert failure if -walletbroadcast=0 (Matt Corallo)
Pull request description:
This fixesbitcoin#10981 in my preferred way.
Tree-SHA512: 2e43d3ac78d13c5d59db23a82c76c722cc3344767a8237617080e489296d27a98bb1b3bd469b2c9b289b57a9da3709c90448d7a23bcc2e1dfb791c4fd16be015
@laanwj@PastaPastaPasta
Mergebitcoin#11002: [wallet] return correct error code from resendwa…
f1f9e5d
…llettransaction
055d95f [wallet] return correct error code from resendwallettransaction (John Newbery)
Pull request description:
New code in bitcoin#10995 uses `RPC_INVALID_REQUEST`. According to the comment in rpc/protocol.h:
```
// RPC_INVALID_REQUEST is internally mapped to HTTP_BAD_REQUEST (400).
// It should not be used for application-layer errors.
```
Change the returned error code to `RPC_WALLET_ERROR`
bitcoin#11000 will need to be updated to test for the correct error code.
Tree-SHA512: 0201b3a2091adf17ad301825da5bd29f0ea7e284b5394cbef80483fc293a558acc849f74a0780bb8501acab324fc722e41ae049cffec7afb76884e26df4b809e
@laanwj@PastaPastaPasta
Mergebitcoin#10683: rpc: Move thegenerateRPC call to rpcwallet
6edcf43
2a96283 rpc: Update `generate` for developer notes (Wladimir J. van der Laan)
df7e2f0 rpc: Move the `generate` RPC call to rpcwallet (Wladimir J. van der Laan)
Tree-SHA512: ec658d6178f8435dc54b9d9c6dd59f873055a8ae0c3f177c02049d77b93107dd5fc17a1ff56d50f051810d52fdf306846eaba2ef4fc8d2a6cfa831f57a1045c4
@PastaPastaPasta
PastaPastaPasta
commented
Aug 5, 2019

Copy link


Copy Markdown

MemberAuthor
I believe bitcoin#10683 will need more changes due to our changes that mining isn't compiled in by default
@PastaPastaPasta
PastaPastaPasta
commented
Aug 5, 2019

Copy link


Copy Markdown

MemberAuthor
Compiles and passes tests locally
@PastaPastaPasta
PastaPastaPasta
commented
Aug 6, 2019

Copy link


Copy Markdown

MemberAuthor
@codablock please review
UdjinM6
UdjinM6
reviewed
Aug 6, 2019
View reviewed changes
@UdjinM6UdjinM6
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.

LGTM, fee small notes
Comment threadsrc/validation.cpp
Outdated

Comment threadsrc/wallet/rpcwallet.cpp
Outdated

PastaPastaPastaand others
added 2 commits
August 6, 2019 06:46
@PastaPastaPasta@UdjinM6
Fix tests
106fdfa
Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
@PastaPastaPasta@UdjinM6
Fix makefile
53f046c
Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
UdjinM6
UdjinM6
approved these changes
Aug 6, 2019
View reviewed changes
@UdjinM6UdjinM6
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 codablockAugust 6, 2019 11:54
@UdjinM6
UdjinM6
commented
Aug 6, 2019

Copy link


Copy Markdown

Travis is having its usual issues again it seems...
codablock
codablock
reviewed
Aug 7, 2019
View reviewed changes
@codablockcodablock
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.

just a mini NIT, otherwise LGTM
Comment threadsrc/qt/forms/sendcoinsdialog.ui
codablock
codablock
approved these changes
Aug 7, 2019
View reviewed changes
@codablockcodablock
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 5bc53b6
into
dashpay:developAug 7, 2019
@PastaPastaPasta
PastaPastaPasta
deleted the

backports-0.15-pr23

branch
August 7, 2019 16:00
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes

+1 more reviewer

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

5 participants

@PastaPastaPasta@UdjinM6@codablock@laanwj@instagibbs

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Backports 0.15 pr23 - #3043
Merged
UdjinM6 merged 24 commits into
dashpay:developfrom 
PastaPastaPasta:backports-0.15-pr23
Aug 7, 2019
Merged
Backports 0.15 pr23#3043
UdjinM6 merged 24 commits into
dashpay:developfrom 
PastaPastaPasta:backports-0.15-pr23
Conversation
@PastaPastaPasta
@PastaPastaPastaPastaPastaPasta
commented
Aug 2, 2019

Copy link


Copy Markdown

Member
 No description provided. 
laanwjand others
added 17 commits
August 1, 2019 09:02
@laanwj@PastaPastaPasta
Mergebitcoin#10832: init: Factor out AppInitLockDataDirectory and fi…
6fb74ea
…x startup core dump issue
dba485d init: Factor out AppInitLockDataDirectory (Wladimir J. van der Laan)
Pull request description:
Alternative to bitcoin#10818, alternative solution to bitcoin#10815.
After this change: All the AppInit steps before and inclusive AppInitLockDataDirectory must not have Shutdown() called in case of failure. Only when AppInitMain fails, Shutdown should be called.
Changes the GUI and bitcoind code to consistently do this.
Tree-SHA512: 393e1a0ae05eb8e791025069e3ac4f6f3cdeb459ec63feda85d01cf6696ab3fed7632b6a0ac3641b8c7015af51d46756b5bba77f5e5f0c446f0c2dea58bbc92e
@laanwj@PastaPastaPasta
Mergebitcoin#10849: Multiwallet: simplest endpoint support
fdf34ff
6b9faf7 [QA] add basic multiwallet test (Jonas Schnelli)
979d0b8 [tests] [wallet] Add wallet endpoint support to authproxy (John Newbery)
76603b1 Select wallet based on the given endpoint (Jonas Schnelli)
32c9710 Fix test_bitcoin circular dependency issue (Jonas Schnelli)
31e0720 Add wallet endpoint support to bitcoin-cli (-usewallet) (Jonas Schnelli)
dd2185c Register wallet endpoint (Jonas Schnelli)
Pull request description:
Alternative for bitcoin#10829 and bitcoin#10650.
It adds the most simplest form of wallet based endpoint support (`/wallet/<filename>`).
No v1 and no node/wallet endpoint split.
Tree-SHA512: 23de1fd2f9b48d94682928b582fb6909e16ca507c2ee19e1f989d5a4f3aa706194c4b1fe8854d1d79ba531b7092434239776cae1ae715ff536e829424f59f9be
@PastaPastaPasta
add gArgs
1a96452
Signed-off-by: Pasta <pasta@dashboost.org>
@laanwj@PastaPastaPasta
Mergebitcoin#10883: Rename -usewallet to -rpcwallet
6096212
2264236 Rename -usewallet to -rpcwallet (Alex Morcos)
Pull request description:
Tree-SHA512: 99bdbff5d18e464e620b7b2a1ff8db874b3888db4d43348c96c372097ed51edd796b564e4ef1193ccd75d0a1fd51f865cf6fff4e0e3672654cd2933c851d210a
@laanwj@PastaPastaPasta
Mergebitcoin#10870: [Qt] Use wallet 0 in rpc console if running with…
b2b0bc9
… multiple wallets
9737572 [Qt] Use wallet 0 in rpc console if running with multiple wallets (Jonas Schnelli)
Pull request description:
Current master with multiwallet results in accessing wallet 0 in QT (send / receive / tx history / etc.), **but** the RPC console cannot access that wallet (only non-wallet commands work).
This is a quick solution to re-allow accessing the same wallet (Index 0) via RPC console in multiwallet.
The solutions design is not "state of the art" (should go over WalletModel). Ideally we work on an overall multiwallet support for the GUI (which then would remove this change).
I think we should consider this as a bugfix.
Tree-SHA512: 16cf844662248ffd3d82c7d0cbe5879f231fbc7d4f5a4aab4180a9087018519c98301e4ac311eaec2cc39dddf25d3edf9be99a6622ea682c138a820a9b21fd0c
@laanwj@PastaPastaPasta
Mergebitcoin#10927: test: Make sure wallet.backup is created in temp…
8fdf594
… path
88af227 test: Make sure wallet.backup is created in temp path (Wladimir J. van der Laan)
Pull request description:
This assures that we don't overwrite a random file called `wallet.backup` that happens to be in the current directory. It also assures that the temporary file will be cleaned up.
Noticed by Evan Klitzke, came up in discussion here: bitcoin#10880 (comment)
Tree-SHA512: 2d2c23c2deba26a1130a29279b3d8565b277eb90a98a6a6d7dd4948f5cbbd5ec5453b3082e3e4e21e0e2423e642bbd2f4433e4c21032d3c8cff27ee35e87e7e7
@laanwj@PastaPastaPasta
Mergebitcoin#10824: Avoid unnecessary work in SetNetworkActive
5dc2193
a2420ae Avoid unnecessary work in SetNetworkActive (João Barbosa)
Pull request description:
This PR adds an early return to avoid unnecessary notifications when the status doesn't change.
Tree-SHA512: 85d05ca6fa36cb581f94bc154d08bd72cd53f6a857173c6fb2f184058f9c0208c4cf5e5d196825a78339902d8f256688eb6793f99abc7be9c7cfac85136180d9
@laanwj@PastaPastaPasta
Mergebitcoin#10912: [tests] Fix incorrect memory_cleanse(…) call in …
07d08a8
…crypto_tests.cpp
065039d [tests] Fix incorrect memory_cleanse(…) call in crypto_tests.cpp (practicalswift)
Pull request description:
`chKey` and `chIV` are pointers, not arrays :-)
Probably the result of copy-pasting of old code where the code was operating on arrays instead of pointers.
If I'm reading the code correctly the absence/presence of these `memory_cleanse(…)` calls won't alter the outcome of the test in question (`TestPassphraseSingle`) even if fixed. Therefore removing.
Tree-SHA512: a053b2817bedf6ef889744e546ce9a0f165dee94aef6850d9d6a6bb05b0018789597371ecf154a4aec8588c0ef5626ef08c23c35e35927f6b0497b5f086146fe
@laanwj@PastaPastaPasta
Mergebitcoin#10892: Replace traditional for with ranged for in block…
80bc6df
… and transaction primitives
72f0060 Replace traditional for with ranged for in primitives (Dag Robole)
Pull request description:
Replace traditional for with ranged for in block and transaction primitives to improve readability
Tree-SHA512: c0fff603d2939149ca48b6aa72b59738a3658d49bd58b2d4ffbc85bdb774d8d5bb808fe526fe22bb9eb214de632834d373e2aab44f6019a83c0b09440cea6528
@laanwj@PastaPastaPasta
Mergebitcoin#10974: Fix typo in sendcoinsdialog.
8cb2508
7f121a0 Fix typo in sendcoinsdialog. (Masahiko Hyuga)
Pull request description:
Tree-SHA512: 7b3ea344a8a432b6e3835b6870ccfaa197df43f812fea506259b644a44442e36ee39967eed246d9b4b5334528b63f41d7e8af9fd2267e51bcf7557ed652452e4
@laanwj@PastaPastaPasta
Mergebitcoin#10301: Check if sys/random.h is required for getentropy.
52aef4c
ee2d10a Check if sys/random.h is required for getentropy on OSX. (James Hilliard)
Pull request description:
This should check and include sys/random.h if required for osx as mentioned [here](bitcoin#9821 (comment)).
Tree-SHA512: e9491f67f2e8b2e6bcdbcbb8063295e844d5627daf5336e3e17b4a8027d888fa65a08e4580a745abdc35ffd8d86b4fc7434daaac172c4a06ab7566a2ed0bfb92
MarcoFalke@PastaPastaPasta
Mergebitcoin#11023: [tests] Add option to attach a python debugger i…
7f1009e
…f functional test fails
cc5d38f Add option to attach a python debugger if test fails (John Newbery)
Pull request description:
Adds a simple option to the test_framework to attach pdb if the test fails.
Helpful for catching and debugging intermittent failures: Run the test in a loop with this option. The first failure will cause execution to pause and nodes will be left running for interactive debugging.
@sdaftuar
Tree-SHA512: 01cfae15fa3f04ed6ec6a99fef60a6c6a59723429309e81eacd6767caf12f5758f59b337804291ecab33a38a2958f36e2b513d201bee72a2eeb207a67046f952
MarcoFalke@PastaPastaPasta
Mergebitcoin#11000: test: Add resendwallettransactions functional tests
33807c8
bdf607e test: Add resendwallettransactions functional tests (João Barbosa)
Pull request description:
Adds functional tests to cover the behaviour introduced in bitcoin#10995.
Tree-SHA512: 3be337cbe51edab2cc0eb9ecfa68d00cd3c3a00aef0672cd841706802726c9cd4138626a8f209c3d9fbd207ce332daa062f270e4c94c1c2398bfc475e36423f6
@instagibbs@PastaPastaPasta
disable jni in builds
8ed0d52
Github-Pull: bitcoin#11056
Rebased-From: 844b73e
Tree-SHA512: f735853c3d9abbde5032cc55201b0ddc29679e681ba7d3822cbcbeee17c7185ee984b235411224cfb8ff12550de88a0f1367d55ad24bf52c5c03061330849eb2
@laanwj@PastaPastaPasta
Mergebitcoin#10148: Use non-atomic flushing with block replay
453d756
176c021 [qa] Test non-atomic chainstate writes (Suhas Daftuar)
d6af06d Dont create pcoinsTip until after ReplayBlocks. (Matt Corallo)
eaca1b7 Random db flush crash simulator (Pieter Wuille)
0580ee0 Adapt memory usage estimation for flushing (Pieter Wuille)
013a56a Non-atomic flushing using the blockchain as replay journal (Pieter Wuille)
b3a279c [MOVEONLY] Move LastCommonAncestor to chain (Pieter Wuille)
Tree-SHA512: 47ccc62303f9075c44d2a914be75bd6969ff881a857a2ff1227f05ec7def6f4c71c46680c5a28cb150c814999526797dc05cf2701fde1369c06169f46eccddee
@PastaPastaPasta
remove DB_PEAK_USAGE_FACTOR
f3259d0
Signed-off-by: Pasta <pasta@dashboost.org>
@PastaPastaPasta
add gArgs
60b3ae1
Signed-off-by: Pasta <pasta@dashboost.org>
@UdjinM6UdjinM6
added this to the 14.1 milestone
Aug 3, 2019
UdjinM6
UdjinM6
requested changes
Aug 3, 2019
View reviewed changes
Comment threadsrc/Makefile.test.include
Outdated

Comment threadsrc/Makefile.test.include
Outdated

Comment threadsrc/Makefile.test.include
Outdated

Comment threadtest/functional/multiwallet.py
Outdated

Comment threadtest/functional/multiwallet.py
Outdated

@UdjinM6
UdjinM6
commented
Aug 5, 2019•

edited

Loading

Copy link


Copy Markdown

Guess we have to finish 10297 backport to fix DisconnectBlock issue https://travis-ci.org/dashpay/dash/jobs/567341959#L2131. We also need 10995 and 11002 to fix resendwallettransactions crash and 10683 too fix generate in multiwallet.py. See https://github.com/UdjinM6/dash/commits/pr3043, Travis: https://travis-ci.org/UdjinM6/dash/builds/567602297.
@UdjinM6UdjinM6
mentioned this pull request
Aug 5, 2019
 Merged

@laanwj@PastaPastaPasta
Mergebitcoin#10995: Fix resendwallettransactions assert failure if -…
a7ef222
…walletbroadcast=0
01699fb Fix resendwallettransactions assert failure if -walletbroadcast=0 (Matt Corallo)
Pull request description:
This fixesbitcoin#10981 in my preferred way.
Tree-SHA512: 2e43d3ac78d13c5d59db23a82c76c722cc3344767a8237617080e489296d27a98bb1b3bd469b2c9b289b57a9da3709c90448d7a23bcc2e1dfb791c4fd16be015
@laanwj@PastaPastaPasta
Mergebitcoin#11002: [wallet] return correct error code from resendwa…
f1f9e5d
…llettransaction
055d95f [wallet] return correct error code from resendwallettransaction (John Newbery)
Pull request description:
New code in bitcoin#10995 uses `RPC_INVALID_REQUEST`. According to the comment in rpc/protocol.h:
```
// RPC_INVALID_REQUEST is internally mapped to HTTP_BAD_REQUEST (400).
// It should not be used for application-layer errors.
```
Change the returned error code to `RPC_WALLET_ERROR`
bitcoin#11000 will need to be updated to test for the correct error code.
Tree-SHA512: 0201b3a2091adf17ad301825da5bd29f0ea7e284b5394cbef80483fc293a558acc849f74a0780bb8501acab324fc722e41ae049cffec7afb76884e26df4b809e
@laanwj@PastaPastaPasta
Mergebitcoin#10683: rpc: Move thegenerateRPC call to rpcwallet
6edcf43
2a96283 rpc: Update `generate` for developer notes (Wladimir J. van der Laan)
df7e2f0 rpc: Move the `generate` RPC call to rpcwallet (Wladimir J. van der Laan)
Tree-SHA512: ec658d6178f8435dc54b9d9c6dd59f873055a8ae0c3f177c02049d77b93107dd5fc17a1ff56d50f051810d52fdf306846eaba2ef4fc8d2a6cfa831f57a1045c4
@PastaPastaPasta
PastaPastaPasta
commented
Aug 5, 2019

Copy link


Copy Markdown

MemberAuthor
I believe bitcoin#10683 will need more changes due to our changes that mining isn't compiled in by default
@PastaPastaPasta
PastaPastaPasta
commented
Aug 5, 2019

Copy link


Copy Markdown

MemberAuthor
Compiles and passes tests locally
@PastaPastaPasta
PastaPastaPasta
commented
Aug 6, 2019

Copy link


Copy Markdown

MemberAuthor
@codablock please review
UdjinM6
UdjinM6
reviewed
Aug 6, 2019
View reviewed changes
@UdjinM6UdjinM6
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.

LGTM, fee small notes
Comment threadsrc/validation.cpp
Outdated

Comment threadsrc/wallet/rpcwallet.cpp
Outdated

PastaPastaPastaand others
added 2 commits
August 6, 2019 06:46
@PastaPastaPasta@UdjinM6
Fix tests
106fdfa
Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
@PastaPastaPasta@UdjinM6
Fix makefile
53f046c
Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
UdjinM6
UdjinM6
approved these changes
Aug 6, 2019
View reviewed changes
@UdjinM6UdjinM6
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 codablockAugust 6, 2019 11:54
@UdjinM6
UdjinM6
commented
Aug 6, 2019

Copy link


Copy Markdown

Travis is having its usual issues again it seems...
codablock
codablock
reviewed
Aug 7, 2019
View reviewed changes
@codablockcodablock
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.

just a mini NIT, otherwise LGTM
Comment threadsrc/qt/forms/sendcoinsdialog.ui
codablock
codablock
approved these changes
Aug 7, 2019
View reviewed changes
@codablockcodablock
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 5bc53b6
into
dashpay:developAug 7, 2019
@PastaPastaPasta
PastaPastaPasta
deleted the

backports-0.15-pr23

branch
August 7, 2019 16:00
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes

+1 more reviewer

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

5 participants

@PastaPastaPasta@UdjinM6@codablock@laanwj@instagibbs

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Backports 0.15 pr23 - #3043
Merged
UdjinM6 merged 24 commits into
dashpay:developfrom 
PastaPastaPasta:backports-0.15-pr23
Aug 7, 2019
Merged
Backports 0.15 pr23#3043
UdjinM6 merged 24 commits into
dashpay:developfrom 
PastaPastaPasta:backports-0.15-pr23
Conversation
@PastaPastaPasta
@PastaPastaPastaPastaPastaPasta
commented
Aug 2, 2019

Copy link


Copy Markdown

Member
 No description provided. 
laanwjand others
added 17 commits
August 1, 2019 09:02
@laanwj@PastaPastaPasta
Mergebitcoin#10832: init: Factor out AppInitLockDataDirectory and fi…
6fb74ea
…x startup core dump issue
dba485d init: Factor out AppInitLockDataDirectory (Wladimir J. van der Laan)
Pull request description:
Alternative to bitcoin#10818, alternative solution to bitcoin#10815.
After this change: All the AppInit steps before and inclusive AppInitLockDataDirectory must not have Shutdown() called in case of failure. Only when AppInitMain fails, Shutdown should be called.
Changes the GUI and bitcoind code to consistently do this.
Tree-SHA512: 393e1a0ae05eb8e791025069e3ac4f6f3cdeb459ec63feda85d01cf6696ab3fed7632b6a0ac3641b8c7015af51d46756b5bba77f5e5f0c446f0c2dea58bbc92e
@laanwj@PastaPastaPasta
Mergebitcoin#10849: Multiwallet: simplest endpoint support
fdf34ff
6b9faf7 [QA] add basic multiwallet test (Jonas Schnelli)
979d0b8 [tests] [wallet] Add wallet endpoint support to authproxy (John Newbery)
76603b1 Select wallet based on the given endpoint (Jonas Schnelli)
32c9710 Fix test_bitcoin circular dependency issue (Jonas Schnelli)
31e0720 Add wallet endpoint support to bitcoin-cli (-usewallet) (Jonas Schnelli)
dd2185c Register wallet endpoint (Jonas Schnelli)
Pull request description:
Alternative for bitcoin#10829 and bitcoin#10650.
It adds the most simplest form of wallet based endpoint support (`/wallet/<filename>`).
No v1 and no node/wallet endpoint split.
Tree-SHA512: 23de1fd2f9b48d94682928b582fb6909e16ca507c2ee19e1f989d5a4f3aa706194c4b1fe8854d1d79ba531b7092434239776cae1ae715ff536e829424f59f9be
@PastaPastaPasta
add gArgs
1a96452
Signed-off-by: Pasta <pasta@dashboost.org>
@laanwj@PastaPastaPasta
Mergebitcoin#10883: Rename -usewallet to -rpcwallet
6096212
2264236 Rename -usewallet to -rpcwallet (Alex Morcos)
Pull request description:
Tree-SHA512: 99bdbff5d18e464e620b7b2a1ff8db874b3888db4d43348c96c372097ed51edd796b564e4ef1193ccd75d0a1fd51f865cf6fff4e0e3672654cd2933c851d210a
@laanwj@PastaPastaPasta
Mergebitcoin#10870: [Qt] Use wallet 0 in rpc console if running with…
b2b0bc9
… multiple wallets
9737572 [Qt] Use wallet 0 in rpc console if running with multiple wallets (Jonas Schnelli)
Pull request description:
Current master with multiwallet results in accessing wallet 0 in QT (send / receive / tx history / etc.), **but** the RPC console cannot access that wallet (only non-wallet commands work).
This is a quick solution to re-allow accessing the same wallet (Index 0) via RPC console in multiwallet.
The solutions design is not "state of the art" (should go over WalletModel). Ideally we work on an overall multiwallet support for the GUI (which then would remove this change).
I think we should consider this as a bugfix.
Tree-SHA512: 16cf844662248ffd3d82c7d0cbe5879f231fbc7d4f5a4aab4180a9087018519c98301e4ac311eaec2cc39dddf25d3edf9be99a6622ea682c138a820a9b21fd0c
@laanwj@PastaPastaPasta
Mergebitcoin#10927: test: Make sure wallet.backup is created in temp…
8fdf594
… path
88af227 test: Make sure wallet.backup is created in temp path (Wladimir J. van der Laan)
Pull request description:
This assures that we don't overwrite a random file called `wallet.backup` that happens to be in the current directory. It also assures that the temporary file will be cleaned up.
Noticed by Evan Klitzke, came up in discussion here: bitcoin#10880 (comment)
Tree-SHA512: 2d2c23c2deba26a1130a29279b3d8565b277eb90a98a6a6d7dd4948f5cbbd5ec5453b3082e3e4e21e0e2423e642bbd2f4433e4c21032d3c8cff27ee35e87e7e7
@laanwj@PastaPastaPasta
Mergebitcoin#10824: Avoid unnecessary work in SetNetworkActive
5dc2193
a2420ae Avoid unnecessary work in SetNetworkActive (João Barbosa)
Pull request description:
This PR adds an early return to avoid unnecessary notifications when the status doesn't change.
Tree-SHA512: 85d05ca6fa36cb581f94bc154d08bd72cd53f6a857173c6fb2f184058f9c0208c4cf5e5d196825a78339902d8f256688eb6793f99abc7be9c7cfac85136180d9
@laanwj@PastaPastaPasta
Mergebitcoin#10912: [tests] Fix incorrect memory_cleanse(…) call in …
07d08a8
…crypto_tests.cpp
065039d [tests] Fix incorrect memory_cleanse(…) call in crypto_tests.cpp (practicalswift)
Pull request description:
`chKey` and `chIV` are pointers, not arrays :-)
Probably the result of copy-pasting of old code where the code was operating on arrays instead of pointers.
If I'm reading the code correctly the absence/presence of these `memory_cleanse(…)` calls won't alter the outcome of the test in question (`TestPassphraseSingle`) even if fixed. Therefore removing.
Tree-SHA512: a053b2817bedf6ef889744e546ce9a0f165dee94aef6850d9d6a6bb05b0018789597371ecf154a4aec8588c0ef5626ef08c23c35e35927f6b0497b5f086146fe
@laanwj@PastaPastaPasta
Mergebitcoin#10892: Replace traditional for with ranged for in block…
80bc6df
… and transaction primitives
72f0060 Replace traditional for with ranged for in primitives (Dag Robole)
Pull request description:
Replace traditional for with ranged for in block and transaction primitives to improve readability
Tree-SHA512: c0fff603d2939149ca48b6aa72b59738a3658d49bd58b2d4ffbc85bdb774d8d5bb808fe526fe22bb9eb214de632834d373e2aab44f6019a83c0b09440cea6528
@laanwj@PastaPastaPasta
Mergebitcoin#10974: Fix typo in sendcoinsdialog.
8cb2508
7f121a0 Fix typo in sendcoinsdialog. (Masahiko Hyuga)
Pull request description:
Tree-SHA512: 7b3ea344a8a432b6e3835b6870ccfaa197df43f812fea506259b644a44442e36ee39967eed246d9b4b5334528b63f41d7e8af9fd2267e51bcf7557ed652452e4
@laanwj@PastaPastaPasta
Mergebitcoin#10301: Check if sys/random.h is required for getentropy.
52aef4c
ee2d10a Check if sys/random.h is required for getentropy on OSX. (James Hilliard)
Pull request description:
This should check and include sys/random.h if required for osx as mentioned [here](bitcoin#9821 (comment)).
Tree-SHA512: e9491f67f2e8b2e6bcdbcbb8063295e844d5627daf5336e3e17b4a8027d888fa65a08e4580a745abdc35ffd8d86b4fc7434daaac172c4a06ab7566a2ed0bfb92
MarcoFalke@PastaPastaPasta
Mergebitcoin#11023: [tests] Add option to attach a python debugger i…
7f1009e
…f functional test fails
cc5d38f Add option to attach a python debugger if test fails (John Newbery)
Pull request description:
Adds a simple option to the test_framework to attach pdb if the test fails.
Helpful for catching and debugging intermittent failures: Run the test in a loop with this option. The first failure will cause execution to pause and nodes will be left running for interactive debugging.
@sdaftuar
Tree-SHA512: 01cfae15fa3f04ed6ec6a99fef60a6c6a59723429309e81eacd6767caf12f5758f59b337804291ecab33a38a2958f36e2b513d201bee72a2eeb207a67046f952
MarcoFalke@PastaPastaPasta
Mergebitcoin#11000: test: Add resendwallettransactions functional tests
33807c8
bdf607e test: Add resendwallettransactions functional tests (João Barbosa)
Pull request description:
Adds functional tests to cover the behaviour introduced in bitcoin#10995.
Tree-SHA512: 3be337cbe51edab2cc0eb9ecfa68d00cd3c3a00aef0672cd841706802726c9cd4138626a8f209c3d9fbd207ce332daa062f270e4c94c1c2398bfc475e36423f6
@instagibbs@PastaPastaPasta
disable jni in builds
8ed0d52
Github-Pull: bitcoin#11056
Rebased-From: 844b73e
Tree-SHA512: f735853c3d9abbde5032cc55201b0ddc29679e681ba7d3822cbcbeee17c7185ee984b235411224cfb8ff12550de88a0f1367d55ad24bf52c5c03061330849eb2
@laanwj@PastaPastaPasta
Mergebitcoin#10148: Use non-atomic flushing with block replay
453d756
176c021 [qa] Test non-atomic chainstate writes (Suhas Daftuar)
d6af06d Dont create pcoinsTip until after ReplayBlocks. (Matt Corallo)
eaca1b7 Random db flush crash simulator (Pieter Wuille)
0580ee0 Adapt memory usage estimation for flushing (Pieter Wuille)
013a56a Non-atomic flushing using the blockchain as replay journal (Pieter Wuille)
b3a279c [MOVEONLY] Move LastCommonAncestor to chain (Pieter Wuille)
Tree-SHA512: 47ccc62303f9075c44d2a914be75bd6969ff881a857a2ff1227f05ec7def6f4c71c46680c5a28cb150c814999526797dc05cf2701fde1369c06169f46eccddee
@PastaPastaPasta
remove DB_PEAK_USAGE_FACTOR
f3259d0
Signed-off-by: Pasta <pasta@dashboost.org>
@PastaPastaPasta
add gArgs
60b3ae1
Signed-off-by: Pasta <pasta@dashboost.org>
@UdjinM6UdjinM6
added this to the 14.1 milestone
Aug 3, 2019
UdjinM6
UdjinM6
requested changes
Aug 3, 2019
View reviewed changes
Comment threadsrc/Makefile.test.include
Outdated

Comment threadsrc/Makefile.test.include
Outdated

Comment threadsrc/Makefile.test.include
Outdated

Comment threadtest/functional/multiwallet.py
Outdated

Comment threadtest/functional/multiwallet.py
Outdated

@UdjinM6
UdjinM6
commented
Aug 5, 2019•

edited

Loading

Copy link


Copy Markdown

Guess we have to finish 10297 backport to fix DisconnectBlock issue https://travis-ci.org/dashpay/dash/jobs/567341959#L2131. We also need 10995 and 11002 to fix resendwallettransactions crash and 10683 too fix generate in multiwallet.py. See https://github.com/UdjinM6/dash/commits/pr3043, Travis: https://travis-ci.org/UdjinM6/dash/builds/567602297.
@UdjinM6UdjinM6
mentioned this pull request
Aug 5, 2019
 Merged

@laanwj@PastaPastaPasta
Mergebitcoin#10995: Fix resendwallettransactions assert failure if -…
a7ef222
…walletbroadcast=0
01699fb Fix resendwallettransactions assert failure if -walletbroadcast=0 (Matt Corallo)
Pull request description:
This fixesbitcoin#10981 in my preferred way.
Tree-SHA512: 2e43d3ac78d13c5d59db23a82c76c722cc3344767a8237617080e489296d27a98bb1b3bd469b2c9b289b57a9da3709c90448d7a23bcc2e1dfb791c4fd16be015
@laanwj@PastaPastaPasta
Mergebitcoin#11002: [wallet] return correct error code from resendwa…
f1f9e5d
…llettransaction
055d95f [wallet] return correct error code from resendwallettransaction (John Newbery)
Pull request description:
New code in bitcoin#10995 uses `RPC_INVALID_REQUEST`. According to the comment in rpc/protocol.h:
```
// RPC_INVALID_REQUEST is internally mapped to HTTP_BAD_REQUEST (400).
// It should not be used for application-layer errors.
```
Change the returned error code to `RPC_WALLET_ERROR`
bitcoin#11000 will need to be updated to test for the correct error code.
Tree-SHA512: 0201b3a2091adf17ad301825da5bd29f0ea7e284b5394cbef80483fc293a558acc849f74a0780bb8501acab324fc722e41ae049cffec7afb76884e26df4b809e
@laanwj@PastaPastaPasta
Mergebitcoin#10683: rpc: Move thegenerateRPC call to rpcwallet
6edcf43
2a96283 rpc: Update `generate` for developer notes (Wladimir J. van der Laan)
df7e2f0 rpc: Move the `generate` RPC call to rpcwallet (Wladimir J. van der Laan)
Tree-SHA512: ec658d6178f8435dc54b9d9c6dd59f873055a8ae0c3f177c02049d77b93107dd5fc17a1ff56d50f051810d52fdf306846eaba2ef4fc8d2a6cfa831f57a1045c4
@PastaPastaPasta
PastaPastaPasta
commented
Aug 5, 2019

Copy link


Copy Markdown

MemberAuthor
I believe bitcoin#10683 will need more changes due to our changes that mining isn't compiled in by default
@PastaPastaPasta
PastaPastaPasta
commented
Aug 5, 2019

Copy link


Copy Markdown

MemberAuthor
Compiles and passes tests locally
@PastaPastaPasta
PastaPastaPasta
commented
Aug 6, 2019

Copy link


Copy Markdown

MemberAuthor
@codablock please review
UdjinM6
UdjinM6
reviewed
Aug 6, 2019
View reviewed changes
@UdjinM6UdjinM6
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.

LGTM, fee small notes
Comment threadsrc/validation.cpp
Outdated

Comment threadsrc/wallet/rpcwallet.cpp
Outdated

PastaPastaPastaand others
added 2 commits
August 6, 2019 06:46
@PastaPastaPasta@UdjinM6
Fix tests
106fdfa
Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
@PastaPastaPasta@UdjinM6
Fix makefile
53f046c
Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
UdjinM6
UdjinM6
approved these changes
Aug 6, 2019
View reviewed changes
@UdjinM6UdjinM6
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 codablockAugust 6, 2019 11:54
@UdjinM6
UdjinM6
commented
Aug 6, 2019

Copy link


Copy Markdown

Travis is having its usual issues again it seems...
codablock
codablock
reviewed
Aug 7, 2019
View reviewed changes
@codablockcodablock
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.

just a mini NIT, otherwise LGTM
Comment threadsrc/qt/forms/sendcoinsdialog.ui
codablock
codablock
approved these changes
Aug 7, 2019
View reviewed changes
@codablockcodablock
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 5bc53b6
into
dashpay:developAug 7, 2019
@PastaPastaPasta
PastaPastaPasta
deleted the

backports-0.15-pr23

branch
August 7, 2019 16:00
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes

+1 more reviewer

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

5 participants

@PastaPastaPasta@UdjinM6@codablock@laanwj@instagibbs

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Backports 0.15 pr23 - #3043
Merged
UdjinM6 merged 24 commits into
dashpay:developfrom 
PastaPastaPasta:backports-0.15-pr23
Aug 7, 2019
Merged
Backports 0.15 pr23#3043
UdjinM6 merged 24 commits into
dashpay:developfrom 
PastaPastaPasta:backports-0.15-pr23
Conversation
@PastaPastaPasta
@PastaPastaPastaPastaPastaPasta
commented
Aug 2, 2019

Copy link


Copy Markdown

Member
 No description provided. 
laanwjand others
added 17 commits
August 1, 2019 09:02
@laanwj@PastaPastaPasta
Mergebitcoin#10832: init: Factor out AppInitLockDataDirectory and fi…
6fb74ea
…x startup core dump issue
dba485d init: Factor out AppInitLockDataDirectory (Wladimir J. van der Laan)
Pull request description:
Alternative to bitcoin#10818, alternative solution to bitcoin#10815.
After this change: All the AppInit steps before and inclusive AppInitLockDataDirectory must not have Shutdown() called in case of failure. Only when AppInitMain fails, Shutdown should be called.
Changes the GUI and bitcoind code to consistently do this.
Tree-SHA512: 393e1a0ae05eb8e791025069e3ac4f6f3cdeb459ec63feda85d01cf6696ab3fed7632b6a0ac3641b8c7015af51d46756b5bba77f5e5f0c446f0c2dea58bbc92e
@laanwj@PastaPastaPasta
Mergebitcoin#10849: Multiwallet: simplest endpoint support
fdf34ff
6b9faf7 [QA] add basic multiwallet test (Jonas Schnelli)
979d0b8 [tests] [wallet] Add wallet endpoint support to authproxy (John Newbery)
76603b1 Select wallet based on the given endpoint (Jonas Schnelli)
32c9710 Fix test_bitcoin circular dependency issue (Jonas Schnelli)
31e0720 Add wallet endpoint support to bitcoin-cli (-usewallet) (Jonas Schnelli)
dd2185c Register wallet endpoint (Jonas Schnelli)
Pull request description:
Alternative for bitcoin#10829 and bitcoin#10650.
It adds the most simplest form of wallet based endpoint support (`/wallet/<filename>`).
No v1 and no node/wallet endpoint split.
Tree-SHA512: 23de1fd2f9b48d94682928b582fb6909e16ca507c2ee19e1f989d5a4f3aa706194c4b1fe8854d1d79ba531b7092434239776cae1ae715ff536e829424f59f9be
@PastaPastaPasta
add gArgs
1a96452
Signed-off-by: Pasta <pasta@dashboost.org>
@laanwj@PastaPastaPasta
Mergebitcoin#10883: Rename -usewallet to -rpcwallet
6096212
2264236 Rename -usewallet to -rpcwallet (Alex Morcos)
Pull request description:
Tree-SHA512: 99bdbff5d18e464e620b7b2a1ff8db874b3888db4d43348c96c372097ed51edd796b564e4ef1193ccd75d0a1fd51f865cf6fff4e0e3672654cd2933c851d210a
@laanwj@PastaPastaPasta
Mergebitcoin#10870: [Qt] Use wallet 0 in rpc console if running with…
b2b0bc9
… multiple wallets
9737572 [Qt] Use wallet 0 in rpc console if running with multiple wallets (Jonas Schnelli)
Pull request description:
Current master with multiwallet results in accessing wallet 0 in QT (send / receive / tx history / etc.), **but** the RPC console cannot access that wallet (only non-wallet commands work).
This is a quick solution to re-allow accessing the same wallet (Index 0) via RPC console in multiwallet.
The solutions design is not "state of the art" (should go over WalletModel). Ideally we work on an overall multiwallet support for the GUI (which then would remove this change).
I think we should consider this as a bugfix.
Tree-SHA512: 16cf844662248ffd3d82c7d0cbe5879f231fbc7d4f5a4aab4180a9087018519c98301e4ac311eaec2cc39dddf25d3edf9be99a6622ea682c138a820a9b21fd0c
@laanwj@PastaPastaPasta
Mergebitcoin#10927: test: Make sure wallet.backup is created in temp…
8fdf594
… path
88af227 test: Make sure wallet.backup is created in temp path (Wladimir J. van der Laan)
Pull request description:
This assures that we don't overwrite a random file called `wallet.backup` that happens to be in the current directory. It also assures that the temporary file will be cleaned up.
Noticed by Evan Klitzke, came up in discussion here: bitcoin#10880 (comment)
Tree-SHA512: 2d2c23c2deba26a1130a29279b3d8565b277eb90a98a6a6d7dd4948f5cbbd5ec5453b3082e3e4e21e0e2423e642bbd2f4433e4c21032d3c8cff27ee35e87e7e7
@laanwj@PastaPastaPasta
Mergebitcoin#10824: Avoid unnecessary work in SetNetworkActive
5dc2193
a2420ae Avoid unnecessary work in SetNetworkActive (João Barbosa)
Pull request description:
This PR adds an early return to avoid unnecessary notifications when the status doesn't change.
Tree-SHA512: 85d05ca6fa36cb581f94bc154d08bd72cd53f6a857173c6fb2f184058f9c0208c4cf5e5d196825a78339902d8f256688eb6793f99abc7be9c7cfac85136180d9
@laanwj@PastaPastaPasta
Mergebitcoin#10912: [tests] Fix incorrect memory_cleanse(…) call in …
07d08a8
…crypto_tests.cpp
065039d [tests] Fix incorrect memory_cleanse(…) call in crypto_tests.cpp (practicalswift)
Pull request description:
`chKey` and `chIV` are pointers, not arrays :-)
Probably the result of copy-pasting of old code where the code was operating on arrays instead of pointers.
If I'm reading the code correctly the absence/presence of these `memory_cleanse(…)` calls won't alter the outcome of the test in question (`TestPassphraseSingle`) even if fixed. Therefore removing.
Tree-SHA512: a053b2817bedf6ef889744e546ce9a0f165dee94aef6850d9d6a6bb05b0018789597371ecf154a4aec8588c0ef5626ef08c23c35e35927f6b0497b5f086146fe
@laanwj@PastaPastaPasta
Mergebitcoin#10892: Replace traditional for with ranged for in block…
80bc6df
… and transaction primitives
72f0060 Replace traditional for with ranged for in primitives (Dag Robole)
Pull request description:
Replace traditional for with ranged for in block and transaction primitives to improve readability
Tree-SHA512: c0fff603d2939149ca48b6aa72b59738a3658d49bd58b2d4ffbc85bdb774d8d5bb808fe526fe22bb9eb214de632834d373e2aab44f6019a83c0b09440cea6528
@laanwj@PastaPastaPasta
Mergebitcoin#10974: Fix typo in sendcoinsdialog.
8cb2508
7f121a0 Fix typo in sendcoinsdialog. (Masahiko Hyuga)
Pull request description:
Tree-SHA512: 7b3ea344a8a432b6e3835b6870ccfaa197df43f812fea506259b644a44442e36ee39967eed246d9b4b5334528b63f41d7e8af9fd2267e51bcf7557ed652452e4
@laanwj@PastaPastaPasta
Mergebitcoin#10301: Check if sys/random.h is required for getentropy.
52aef4c
ee2d10a Check if sys/random.h is required for getentropy on OSX. (James Hilliard)
Pull request description:
This should check and include sys/random.h if required for osx as mentioned [here](bitcoin#9821 (comment)).
Tree-SHA512: e9491f67f2e8b2e6bcdbcbb8063295e844d5627daf5336e3e17b4a8027d888fa65a08e4580a745abdc35ffd8d86b4fc7434daaac172c4a06ab7566a2ed0bfb92
MarcoFalke@PastaPastaPasta
Mergebitcoin#11023: [tests] Add option to attach a python debugger i…
7f1009e
…f functional test fails
cc5d38f Add option to attach a python debugger if test fails (John Newbery)
Pull request description:
Adds a simple option to the test_framework to attach pdb if the test fails.
Helpful for catching and debugging intermittent failures: Run the test in a loop with this option. The first failure will cause execution to pause and nodes will be left running for interactive debugging.
@sdaftuar
Tree-SHA512: 01cfae15fa3f04ed6ec6a99fef60a6c6a59723429309e81eacd6767caf12f5758f59b337804291ecab33a38a2958f36e2b513d201bee72a2eeb207a67046f952
MarcoFalke@PastaPastaPasta
Mergebitcoin#11000: test: Add resendwallettransactions functional tests
33807c8
bdf607e test: Add resendwallettransactions functional tests (João Barbosa)
Pull request description:
Adds functional tests to cover the behaviour introduced in bitcoin#10995.
Tree-SHA512: 3be337cbe51edab2cc0eb9ecfa68d00cd3c3a00aef0672cd841706802726c9cd4138626a8f209c3d9fbd207ce332daa062f270e4c94c1c2398bfc475e36423f6
@instagibbs@PastaPastaPasta
disable jni in builds
8ed0d52
Github-Pull: bitcoin#11056
Rebased-From: 844b73e
Tree-SHA512: f735853c3d9abbde5032cc55201b0ddc29679e681ba7d3822cbcbeee17c7185ee984b235411224cfb8ff12550de88a0f1367d55ad24bf52c5c03061330849eb2
@laanwj@PastaPastaPasta
Mergebitcoin#10148: Use non-atomic flushing with block replay
453d756
176c021 [qa] Test non-atomic chainstate writes (Suhas Daftuar)
d6af06d Dont create pcoinsTip until after ReplayBlocks. (Matt Corallo)
eaca1b7 Random db flush crash simulator (Pieter Wuille)
0580ee0 Adapt memory usage estimation for flushing (Pieter Wuille)
013a56a Non-atomic flushing using the blockchain as replay journal (Pieter Wuille)
b3a279c [MOVEONLY] Move LastCommonAncestor to chain (Pieter Wuille)
Tree-SHA512: 47ccc62303f9075c44d2a914be75bd6969ff881a857a2ff1227f05ec7def6f4c71c46680c5a28cb150c814999526797dc05cf2701fde1369c06169f46eccddee
@PastaPastaPasta
remove DB_PEAK_USAGE_FACTOR
f3259d0
Signed-off-by: Pasta <pasta@dashboost.org>
@PastaPastaPasta
add gArgs
60b3ae1
Signed-off-by: Pasta <pasta@dashboost.org>
@UdjinM6UdjinM6
added this to the 14.1 milestone
Aug 3, 2019
UdjinM6
UdjinM6
requested changes
Aug 3, 2019
View reviewed changes
Comment threadsrc/Makefile.test.include
Outdated

Comment threadsrc/Makefile.test.include
Outdated

Comment threadsrc/Makefile.test.include
Outdated

Comment threadtest/functional/multiwallet.py
Outdated

Comment threadtest/functional/multiwallet.py
Outdated

@UdjinM6
UdjinM6
commented
Aug 5, 2019•

edited

Loading

Copy link


Copy Markdown

Guess we have to finish 10297 backport to fix DisconnectBlock issue https://travis-ci.org/dashpay/dash/jobs/567341959#L2131. We also need 10995 and 11002 to fix resendwallettransactions crash and 10683 too fix generate in multiwallet.py. See https://github.com/UdjinM6/dash/commits/pr3043, Travis: https://travis-ci.org/UdjinM6/dash/builds/567602297.
@UdjinM6UdjinM6
mentioned this pull request
Aug 5, 2019
 Merged

@laanwj@PastaPastaPasta
Mergebitcoin#10995: Fix resendwallettransactions assert failure if -…
a7ef222
…walletbroadcast=0
01699fb Fix resendwallettransactions assert failure if -walletbroadcast=0 (Matt Corallo)
Pull request description:
This fixesbitcoin#10981 in my preferred way.
Tree-SHA512: 2e43d3ac78d13c5d59db23a82c76c722cc3344767a8237617080e489296d27a98bb1b3bd469b2c9b289b57a9da3709c90448d7a23bcc2e1dfb791c4fd16be015
@laanwj@PastaPastaPasta
Mergebitcoin#11002: [wallet] return correct error code from resendwa…
f1f9e5d
…llettransaction
055d95f [wallet] return correct error code from resendwallettransaction (John Newbery)
Pull request description:
New code in bitcoin#10995 uses `RPC_INVALID_REQUEST`. According to the comment in rpc/protocol.h:
```
// RPC_INVALID_REQUEST is internally mapped to HTTP_BAD_REQUEST (400).
// It should not be used for application-layer errors.
```
Change the returned error code to `RPC_WALLET_ERROR`
bitcoin#11000 will need to be updated to test for the correct error code.
Tree-SHA512: 0201b3a2091adf17ad301825da5bd29f0ea7e284b5394cbef80483fc293a558acc849f74a0780bb8501acab324fc722e41ae049cffec7afb76884e26df4b809e
@laanwj@PastaPastaPasta
Mergebitcoin#10683: rpc: Move thegenerateRPC call to rpcwallet
6edcf43
2a96283 rpc: Update `generate` for developer notes (Wladimir J. van der Laan)
df7e2f0 rpc: Move the `generate` RPC call to rpcwallet (Wladimir J. van der Laan)
Tree-SHA512: ec658d6178f8435dc54b9d9c6dd59f873055a8ae0c3f177c02049d77b93107dd5fc17a1ff56d50f051810d52fdf306846eaba2ef4fc8d2a6cfa831f57a1045c4
@PastaPastaPasta
PastaPastaPasta
commented
Aug 5, 2019

Copy link


Copy Markdown

MemberAuthor
I believe bitcoin#10683 will need more changes due to our changes that mining isn't compiled in by default
@PastaPastaPasta
PastaPastaPasta
commented
Aug 5, 2019

Copy link


Copy Markdown

MemberAuthor
Compiles and passes tests locally
@PastaPastaPasta
PastaPastaPasta
commented
Aug 6, 2019

Copy link


Copy Markdown

MemberAuthor
@codablock please review
UdjinM6
UdjinM6
reviewed
Aug 6, 2019
View reviewed changes
@UdjinM6UdjinM6
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.

LGTM, fee small notes
Comment threadsrc/validation.cpp
Outdated

Comment threadsrc/wallet/rpcwallet.cpp
Outdated

PastaPastaPastaand others
added 2 commits
August 6, 2019 06:46
@PastaPastaPasta@UdjinM6
Fix tests
106fdfa
Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
@PastaPastaPasta@UdjinM6
Fix makefile
53f046c
Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
UdjinM6
UdjinM6
approved these changes
Aug 6, 2019
View reviewed changes
@UdjinM6UdjinM6
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 codablockAugust 6, 2019 11:54
@UdjinM6
UdjinM6
commented
Aug 6, 2019

Copy link


Copy Markdown

Travis is having its usual issues again it seems...
codablock
codablock
reviewed
Aug 7, 2019
View reviewed changes
@codablockcodablock
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.

just a mini NIT, otherwise LGTM
Comment threadsrc/qt/forms/sendcoinsdialog.ui
codablock
codablock
approved these changes
Aug 7, 2019
View reviewed changes
@codablockcodablock
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 5bc53b6
into
dashpay:developAug 7, 2019
@PastaPastaPasta
PastaPastaPasta
deleted the

backports-0.15-pr23

branch
August 7, 2019 16:00
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes

+1 more reviewer

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

5 participants

@PastaPastaPasta@UdjinM6@codablock@laanwj@instagibbs

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Backports 0.15 pr23 - #3043
Merged
UdjinM6 merged 24 commits into
dashpay:developfrom 
PastaPastaPasta:backports-0.15-pr23
Aug 7, 2019
Merged
Backports 0.15 pr23#3043
UdjinM6 merged 24 commits into
dashpay:developfrom 
PastaPastaPasta:backports-0.15-pr23
Conversation
@PastaPastaPasta
@PastaPastaPastaPastaPastaPasta
commented
Aug 2, 2019

Copy link


Copy Markdown

Member
 No description provided. 
laanwjand others
added 17 commits
August 1, 2019 09:02
@laanwj@PastaPastaPasta
Mergebitcoin#10832: init: Factor out AppInitLockDataDirectory and fi…
6fb74ea
…x startup core dump issue
dba485d init: Factor out AppInitLockDataDirectory (Wladimir J. van der Laan)
Pull request description:
Alternative to bitcoin#10818, alternative solution to bitcoin#10815.
After this change: All the AppInit steps before and inclusive AppInitLockDataDirectory must not have Shutdown() called in case of failure. Only when AppInitMain fails, Shutdown should be called.
Changes the GUI and bitcoind code to consistently do this.
Tree-SHA512: 393e1a0ae05eb8e791025069e3ac4f6f3cdeb459ec63feda85d01cf6696ab3fed7632b6a0ac3641b8c7015af51d46756b5bba77f5e5f0c446f0c2dea58bbc92e
@laanwj@PastaPastaPasta
Mergebitcoin#10849: Multiwallet: simplest endpoint support
fdf34ff
6b9faf7 [QA] add basic multiwallet test (Jonas Schnelli)
979d0b8 [tests] [wallet] Add wallet endpoint support to authproxy (John Newbery)
76603b1 Select wallet based on the given endpoint (Jonas Schnelli)
32c9710 Fix test_bitcoin circular dependency issue (Jonas Schnelli)
31e0720 Add wallet endpoint support to bitcoin-cli (-usewallet) (Jonas Schnelli)
dd2185c Register wallet endpoint (Jonas Schnelli)
Pull request description:
Alternative for bitcoin#10829 and bitcoin#10650.
It adds the most simplest form of wallet based endpoint support (`/wallet/<filename>`).
No v1 and no node/wallet endpoint split.
Tree-SHA512: 23de1fd2f9b48d94682928b582fb6909e16ca507c2ee19e1f989d5a4f3aa706194c4b1fe8854d1d79ba531b7092434239776cae1ae715ff536e829424f59f9be
@PastaPastaPasta
add gArgs
1a96452
Signed-off-by: Pasta <pasta@dashboost.org>
@laanwj@PastaPastaPasta
Mergebitcoin#10883: Rename -usewallet to -rpcwallet
6096212
2264236 Rename -usewallet to -rpcwallet (Alex Morcos)
Pull request description:
Tree-SHA512: 99bdbff5d18e464e620b7b2a1ff8db874b3888db4d43348c96c372097ed51edd796b564e4ef1193ccd75d0a1fd51f865cf6fff4e0e3672654cd2933c851d210a
@laanwj@PastaPastaPasta
Mergebitcoin#10870: [Qt] Use wallet 0 in rpc console if running with…
b2b0bc9
… multiple wallets
9737572 [Qt] Use wallet 0 in rpc console if running with multiple wallets (Jonas Schnelli)
Pull request description:
Current master with multiwallet results in accessing wallet 0 in QT (send / receive / tx history / etc.), **but** the RPC console cannot access that wallet (only non-wallet commands work).
This is a quick solution to re-allow accessing the same wallet (Index 0) via RPC console in multiwallet.
The solutions design is not "state of the art" (should go over WalletModel). Ideally we work on an overall multiwallet support for the GUI (which then would remove this change).
I think we should consider this as a bugfix.
Tree-SHA512: 16cf844662248ffd3d82c7d0cbe5879f231fbc7d4f5a4aab4180a9087018519c98301e4ac311eaec2cc39dddf25d3edf9be99a6622ea682c138a820a9b21fd0c
@laanwj@PastaPastaPasta
Mergebitcoin#10927: test: Make sure wallet.backup is created in temp…
8fdf594
… path
88af227 test: Make sure wallet.backup is created in temp path (Wladimir J. van der Laan)
Pull request description:
This assures that we don't overwrite a random file called `wallet.backup` that happens to be in the current directory. It also assures that the temporary file will be cleaned up.
Noticed by Evan Klitzke, came up in discussion here: bitcoin#10880 (comment)
Tree-SHA512: 2d2c23c2deba26a1130a29279b3d8565b277eb90a98a6a6d7dd4948f5cbbd5ec5453b3082e3e4e21e0e2423e642bbd2f4433e4c21032d3c8cff27ee35e87e7e7
@laanwj@PastaPastaPasta
Mergebitcoin#10824: Avoid unnecessary work in SetNetworkActive
5dc2193
a2420ae Avoid unnecessary work in SetNetworkActive (João Barbosa)
Pull request description:
This PR adds an early return to avoid unnecessary notifications when the status doesn't change.
Tree-SHA512: 85d05ca6fa36cb581f94bc154d08bd72cd53f6a857173c6fb2f184058f9c0208c4cf5e5d196825a78339902d8f256688eb6793f99abc7be9c7cfac85136180d9
@laanwj@PastaPastaPasta
Mergebitcoin#10912: [tests] Fix incorrect memory_cleanse(…) call in …
07d08a8
…crypto_tests.cpp
065039d [tests] Fix incorrect memory_cleanse(…) call in crypto_tests.cpp (practicalswift)
Pull request description:
`chKey` and `chIV` are pointers, not arrays :-)
Probably the result of copy-pasting of old code where the code was operating on arrays instead of pointers.
If I'm reading the code correctly the absence/presence of these `memory_cleanse(…)` calls won't alter the outcome of the test in question (`TestPassphraseSingle`) even if fixed. Therefore removing.
Tree-SHA512: a053b2817bedf6ef889744e546ce9a0f165dee94aef6850d9d6a6bb05b0018789597371ecf154a4aec8588c0ef5626ef08c23c35e35927f6b0497b5f086146fe
@laanwj@PastaPastaPasta
Mergebitcoin#10892: Replace traditional for with ranged for in block…
80bc6df
… and transaction primitives
72f0060 Replace traditional for with ranged for in primitives (Dag Robole)
Pull request description:
Replace traditional for with ranged for in block and transaction primitives to improve readability
Tree-SHA512: c0fff603d2939149ca48b6aa72b59738a3658d49bd58b2d4ffbc85bdb774d8d5bb808fe526fe22bb9eb214de632834d373e2aab44f6019a83c0b09440cea6528
@laanwj@PastaPastaPasta
Mergebitcoin#10974: Fix typo in sendcoinsdialog.
8cb2508
7f121a0 Fix typo in sendcoinsdialog. (Masahiko Hyuga)
Pull request description:
Tree-SHA512: 7b3ea344a8a432b6e3835b6870ccfaa197df43f812fea506259b644a44442e36ee39967eed246d9b4b5334528b63f41d7e8af9fd2267e51bcf7557ed652452e4
@laanwj@PastaPastaPasta
Mergebitcoin#10301: Check if sys/random.h is required for getentropy.
52aef4c
ee2d10a Check if sys/random.h is required for getentropy on OSX. (James Hilliard)
Pull request description:
This should check and include sys/random.h if required for osx as mentioned [here](bitcoin#9821 (comment)).
Tree-SHA512: e9491f67f2e8b2e6bcdbcbb8063295e844d5627daf5336e3e17b4a8027d888fa65a08e4580a745abdc35ffd8d86b4fc7434daaac172c4a06ab7566a2ed0bfb92
MarcoFalke@PastaPastaPasta
Mergebitcoin#11023: [tests] Add option to attach a python debugger i…
7f1009e
…f functional test fails
cc5d38f Add option to attach a python debugger if test fails (John Newbery)
Pull request description:
Adds a simple option to the test_framework to attach pdb if the test fails.
Helpful for catching and debugging intermittent failures: Run the test in a loop with this option. The first failure will cause execution to pause and nodes will be left running for interactive debugging.
@sdaftuar
Tree-SHA512: 01cfae15fa3f04ed6ec6a99fef60a6c6a59723429309e81eacd6767caf12f5758f59b337804291ecab33a38a2958f36e2b513d201bee72a2eeb207a67046f952
MarcoFalke@PastaPastaPasta
Mergebitcoin#11000: test: Add resendwallettransactions functional tests
33807c8
bdf607e test: Add resendwallettransactions functional tests (João Barbosa)
Pull request description:
Adds functional tests to cover the behaviour introduced in bitcoin#10995.
Tree-SHA512: 3be337cbe51edab2cc0eb9ecfa68d00cd3c3a00aef0672cd841706802726c9cd4138626a8f209c3d9fbd207ce332daa062f270e4c94c1c2398bfc475e36423f6
@instagibbs@PastaPastaPasta
disable jni in builds
8ed0d52
Github-Pull: bitcoin#11056
Rebased-From: 844b73e
Tree-SHA512: f735853c3d9abbde5032cc55201b0ddc29679e681ba7d3822cbcbeee17c7185ee984b235411224cfb8ff12550de88a0f1367d55ad24bf52c5c03061330849eb2
@laanwj@PastaPastaPasta
Mergebitcoin#10148: Use non-atomic flushing with block replay
453d756
176c021 [qa] Test non-atomic chainstate writes (Suhas Daftuar)
d6af06d Dont create pcoinsTip until after ReplayBlocks. (Matt Corallo)
eaca1b7 Random db flush crash simulator (Pieter Wuille)
0580ee0 Adapt memory usage estimation for flushing (Pieter Wuille)
013a56a Non-atomic flushing using the blockchain as replay journal (Pieter Wuille)
b3a279c [MOVEONLY] Move LastCommonAncestor to chain (Pieter Wuille)
Tree-SHA512: 47ccc62303f9075c44d2a914be75bd6969ff881a857a2ff1227f05ec7def6f4c71c46680c5a28cb150c814999526797dc05cf2701fde1369c06169f46eccddee
@PastaPastaPasta
remove DB_PEAK_USAGE_FACTOR
f3259d0
Signed-off-by: Pasta <pasta@dashboost.org>
@PastaPastaPasta
add gArgs
60b3ae1
Signed-off-by: Pasta <pasta@dashboost.org>
@UdjinM6UdjinM6
added this to the 14.1 milestone
Aug 3, 2019
UdjinM6
UdjinM6
requested changes
Aug 3, 2019
View reviewed changes
Comment threadsrc/Makefile.test.include
Outdated

Comment threadsrc/Makefile.test.include
Outdated

Comment threadsrc/Makefile.test.include
Outdated

Comment threadtest/functional/multiwallet.py
Outdated

Comment threadtest/functional/multiwallet.py
Outdated

@UdjinM6
UdjinM6
commented
Aug 5, 2019•

edited

Loading

Copy link


Copy Markdown

Guess we have to finish 10297 backport to fix DisconnectBlock issue https://travis-ci.org/dashpay/dash/jobs/567341959#L2131. We also need 10995 and 11002 to fix resendwallettransactions crash and 10683 too fix generate in multiwallet.py. See https://github.com/UdjinM6/dash/commits/pr3043, Travis: https://travis-ci.org/UdjinM6/dash/builds/567602297.
@UdjinM6UdjinM6
mentioned this pull request
Aug 5, 2019
 Merged

@laanwj@PastaPastaPasta
Mergebitcoin#10995: Fix resendwallettransactions assert failure if -…
a7ef222
…walletbroadcast=0
01699fb Fix resendwallettransactions assert failure if -walletbroadcast=0 (Matt Corallo)
Pull request description:
This fixesbitcoin#10981 in my preferred way.
Tree-SHA512: 2e43d3ac78d13c5d59db23a82c76c722cc3344767a8237617080e489296d27a98bb1b3bd469b2c9b289b57a9da3709c90448d7a23bcc2e1dfb791c4fd16be015
@laanwj@PastaPastaPasta
Mergebitcoin#11002: [wallet] return correct error code from resendwa…
f1f9e5d
…llettransaction
055d95f [wallet] return correct error code from resendwallettransaction (John Newbery)
Pull request description:
New code in bitcoin#10995 uses `RPC_INVALID_REQUEST`. According to the comment in rpc/protocol.h:
```
// RPC_INVALID_REQUEST is internally mapped to HTTP_BAD_REQUEST (400).
// It should not be used for application-layer errors.
```
Change the returned error code to `RPC_WALLET_ERROR`
bitcoin#11000 will need to be updated to test for the correct error code.
Tree-SHA512: 0201b3a2091adf17ad301825da5bd29f0ea7e284b5394cbef80483fc293a558acc849f74a0780bb8501acab324fc722e41ae049cffec7afb76884e26df4b809e
@laanwj@PastaPastaPasta
Mergebitcoin#10683: rpc: Move thegenerateRPC call to rpcwallet
6edcf43
2a96283 rpc: Update `generate` for developer notes (Wladimir J. van der Laan)
df7e2f0 rpc: Move the `generate` RPC call to rpcwallet (Wladimir J. van der Laan)
Tree-SHA512: ec658d6178f8435dc54b9d9c6dd59f873055a8ae0c3f177c02049d77b93107dd5fc17a1ff56d50f051810d52fdf306846eaba2ef4fc8d2a6cfa831f57a1045c4
@PastaPastaPasta
PastaPastaPasta
commented
Aug 5, 2019

Copy link


Copy Markdown

MemberAuthor
I believe bitcoin#10683 will need more changes due to our changes that mining isn't compiled in by default
@PastaPastaPasta
PastaPastaPasta
commented
Aug 5, 2019

Copy link


Copy Markdown

MemberAuthor
Compiles and passes tests locally
@PastaPastaPasta
PastaPastaPasta
commented
Aug 6, 2019

Copy link


Copy Markdown

MemberAuthor
@codablock please review
UdjinM6
UdjinM6
reviewed
Aug 6, 2019
View reviewed changes
@UdjinM6UdjinM6
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.

LGTM, fee small notes
Comment threadsrc/validation.cpp
Outdated

Comment threadsrc/wallet/rpcwallet.cpp
Outdated

PastaPastaPastaand others
added 2 commits
August 6, 2019 06:46
@PastaPastaPasta@UdjinM6
Fix tests
106fdfa
Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
@PastaPastaPasta@UdjinM6
Fix makefile
53f046c
Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
UdjinM6
UdjinM6
approved these changes
Aug 6, 2019
View reviewed changes
@UdjinM6UdjinM6
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 codablockAugust 6, 2019 11:54
@UdjinM6
UdjinM6
commented
Aug 6, 2019

Copy link


Copy Markdown

Travis is having its usual issues again it seems...
codablock
codablock
reviewed
Aug 7, 2019
View reviewed changes
@codablockcodablock
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.

just a mini NIT, otherwise LGTM
Comment threadsrc/qt/forms/sendcoinsdialog.ui
codablock
codablock
approved these changes
Aug 7, 2019
View reviewed changes
@codablockcodablock
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 5bc53b6
into
dashpay:developAug 7, 2019
@PastaPastaPasta
PastaPastaPasta
deleted the

backports-0.15-pr23

branch
August 7, 2019 16:00
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes

+1 more reviewer

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

5 participants

@PastaPastaPasta@UdjinM6@codablock@laanwj@instagibbs