Merge #16226 #4640
Merged
Merge #16226 #4640
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vijaydasmp
changed the title
vijaydasmp
force-pushed
the
bp199
branch
2 times, most recently
from
4f356f9
to
5d4d1a4
Compare
|
Temporary interface_zmq failure |
vijaydasmp
commented
Dec 31, 2021
| #include <script/script.h> | ||
|
|
There was a problem hiding this comment.
we dont have #include <script/sign.h> in line 10 (as in upstream) So two lines are deleted
|
This pull request has conflicts, please rebase. |
|
feature_llmq_data_recovery test case failure is intermittent |
|
This pull request has conflicts, please rebase. |
UdjinM6
requested changes
Mar 30, 2022
|
still missing some parts from 5352236 in |
e61de63 Change ismine to take a CWallet instead of CKeyStore (Andrew Chow) 7c611e2 Move ismine to wallet module (Andrew Chow) Pull request description: `IsMine` isn't used outside of the wallet except for the tests. It also doesn't make sense to be outside of the wallet. This PR moves `IsMine` into the wallet module and for it to take a `CWallet` instead of `CKeyStore`. The test that used `IsMine` is also moved to the wallet tests. This is first [prerequisites](https://github.com/bitcoin-core/bitcoin-devwiki/wiki/Wallet-Class-Structure-Changes#ismine) for the wallet structure changes. ACKs for commit e61de6: MarcoFalke: re-ACK e61de63 (only change is rebase with git auto-merge) meshcollider: Very light code review ACK bitcoin@e61de63 Tree-SHA512: 1cb4ad12652aef7922ab7460c6d413e8b9d1855dca78c0a286ae49d5c0765bc7996c55f262c742001d434eb9bd4215dc2cc7aae1b371ee1a82d46b32c17e6341
vijaydasmp
commented
Apr 2, 2022
| #include <script/script.h> | ||
|
|
||
| #include <wallet/wallet.h> | ||
|
|
There was a problem hiding this comment.
Already a line break is here, do we need to add another?
PastaPastaPasta
approved these changes
Apr 3, 2022
gades
pushed a commit
to cosanta/cosanta-core
that referenced
this pull request
Dec 1, 2023
e61de63 Change ismine to take a CWallet instead of CKeyStore (Andrew Chow) 7c611e2 Move ismine to wallet module (Andrew Chow) Pull request description: `IsMine` isn't used outside of the wallet except for the tests. It also doesn't make sense to be outside of the wallet. This PR moves `IsMine` into the wallet module and for it to take a `CWallet` instead of `CKeyStore`. The test that used `IsMine` is also moved to the wallet tests. This is first [prerequisites](https://github.com/bitcoin-core/bitcoin-devwiki/wiki/Wallet-Class-Structure-Changes#ismine) for the wallet structure changes. ACKs for commit e61de6: MarcoFalke: re-ACK e61de63 (only change is rebase with git auto-merge) meshcollider: Very light code review ACK bitcoin@e61de63 Tree-SHA512: 1cb4ad12652aef7922ab7460c6d413e8b9d1855dca78c0a286ae49d5c0765bc7996c55f262c742001d434eb9bd4215dc2cc7aae1b371ee1a82d46b32c17e6341 Co-authored-by: MeshCollider <dobsonsa68@gmail.com>
gades
pushed a commit
to piratecash/pirate
that referenced
this pull request
Dec 9, 2023
e61de63 Change ismine to take a CWallet instead of CKeyStore (Andrew Chow) 7c611e2 Move ismine to wallet module (Andrew Chow) Pull request description: `IsMine` isn't used outside of the wallet except for the tests. It also doesn't make sense to be outside of the wallet. This PR moves `IsMine` into the wallet module and for it to take a `CWallet` instead of `CKeyStore`. The test that used `IsMine` is also moved to the wallet tests. This is first [prerequisites](https://github.com/bitcoin-core/bitcoin-devwiki/wiki/Wallet-Class-Structure-Changes#ismine) for the wallet structure changes. ACKs for commit e61de6: MarcoFalke: re-ACK e61de63 (only change is rebase with git auto-merge) meshcollider: Very light code review ACK bitcoin@e61de63 Tree-SHA512: 1cb4ad12652aef7922ab7460c6d413e8b9d1855dca78c0a286ae49d5c0765bc7996c55f262c742001d434eb9bd4215dc2cc7aae1b371ee1a82d46b32c17e6341 Co-authored-by: MeshCollider <dobsonsa68@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
e61de63 Change ismine to take a CWallet instead of CKeyStore (Andrew Chow)
7c611e2 Move ismine to wallet module (Andrew Chow)
Pull request description:
IsMineisn't used outside of the wallet except for the tests. It also doesn't make sense to be outside of the wallet. This PR movesIsMineinto the wallet module and for it to take aCWalletinstead ofCKeyStore. The test that usedIsMineis also moved to the wallet tests.This is first prerequisites for the wallet structure changes.
ACKs for commit e61de6:
MarcoFalke:
re-ACK e61de63 (only change is rebase with git auto-merge)
meshcollider:
Very light code review ACK bitcoin@e61de63
Tree-SHA512: 1cb4ad12652aef7922ab7460c6d413e8b9d1855dca78c0a286ae49d5c0765bc7996c55f262c742001d434eb9bd4215dc2cc7aae1b371ee1a82d46b32c17e6341