Merge #15308 #15754 #15483 #16332 #4651
Merged
Conversation
This file contains hidden or 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
changed the title
|
Hey Vijay, Is there an update on the status of this pr? |
Author
|
Hi Munkybooty,
I am not keeping well , couldn't devote time , probably work on it
tomorrow, if you are blocked ,please feel free to take over
…On Tue, 8 Feb 2022, 21:46 Munkybooty, ***@***.***> wrote:
Hey Vijay,
Is there an update on the status of this pr?
—
Reply to this email directly, view it on GitHub
<#4651 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAR5IIQIGWRCF2E54NOR6WTU2E6VJANCNFSM5LAUEPXA>
.
Triage notifications on the go with GitHub Mobile for iOS
<https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675>
or Android
<https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
|
This pull request has conflicts, please rebase. |
vijaydasmp
force-pushed
the
bp1910
branch
2 times, most recently
from
12f25d2 to
c627655
Compare
vijaydasmp
force-pushed
the
bp1910
branch
2 times, most recently
from
7e9989a to
2471f7d
Compare
vijaydasmp
changed the title
Author
|
Hello @UdjinM6 please review |
PastaPastaPasta
previously approved these changes
Mar 29, 2022
Member
PastaPastaPasta
left a comment
PastaPastaPasta
left a comment
There was a problem hiding this comment.
utACK for merging via merge commit
UdjinM6
requested changes
Mar 30, 2022
119d360 travis: Document whether functional tests are run in the job name (Ben Woosley) 64f2854 Revert "travis: Compile trusty with depends for now" (Ben Woosley) 267eac0 Prefer boost::optional#get_value_or over #value_or (Ben Woosley) 1971f5b Piecewise construct to avoid invalid construction (Ben Woosley) Pull request description: In light of bitcoin#14979, I realized that only qt 5.5+ was being tested under CI, while compatibility lists 5.2+. In bitcoin#15276, Marco added Trusty to CI, building with depends. This changes that build to system libraries, in order to ensure ongoing compatibility with our claimed minimum required versions. Fixes bitcoin#14983, previously open as bitcoin#14998 Tree-SHA512: 6cff5e28c756ecb8bf797c8f6eb77c1944ba61a8dd6d7d4984e63eef384f6429dc79c505da3241c05b9c4db31c72b2a9846c7365aba9280f2e0620e5f3998d07
f4b7a2f rpc: getrpcinfo docs (Ben Carman) Pull request description: Fixes bitcoin#15731 ACKs for commit f4b7a2: laanwj: utACK f4b7a2f Tree-SHA512: 45dce83c4bfac2ddf85133a29aee332e9de8f73c15438ce899a2edbcd0d82d4f743753f6699c50cbc62d110fa8c6bc257722447e1090cdd23acbe00f26014ec8
8a6810d Add a 'logpath' field to getrpcinfo (darosior) Pull request description: as discussed in bitcoin#15438 ACKs for top commit: laanwj: Tested ACK 8a6810d Tree-SHA512: 752c7d90f670677c8144efb338c5c97c2264f85f1e65e031fd5a44f04230b6eafbabd0f634db263eb42c25642ecc1c4b1b602d4735e3fab07ec00b566134ddab
vijaydasmp
changed the title
a30bd09 Add logpath description for getrpcinfo (Gregory Sanders) Pull request description: Introduced in bitcoin#15483 ACKs for top commit: fanquake: ACK a30bd09 Tree-SHA512: f561af675d1184412b9e426debab6269f80a65098fc7226ee93581f4075dfc93846dd4b226bd4842eb43e1649d3291c7d18558bfeb851970728b64b8a0e6df0f
PastaPastaPasta
approved these changes
Apr 1, 2022
Member
PastaPastaPasta
left a comment
PastaPastaPasta
left a comment
There was a problem hiding this comment.
utACK for merge via merge commit
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
cb3511b Add release notes for importing key origin info change (Andrew Chow)
4c75a69 Test importing descriptors with key origin information (Andrew Chow)
02d6586 Import KeyOriginData when importing descriptors (Andrew Chow)
3d235df Implement a function to add KeyOriginInfo to a wallet (Andrew Chow)
eab63bc Store key origin info in key metadata (Andrew Chow)
345bff6 Remove hdmasterkeyid (Andrew Chow)
bac8c67 Add a method to CWallet to write just CKeyMetadata (Andrew Chow)
e7652d3 Add WriteHDKeypath function and move *HDKeypath to util/bip32.{h,cpp} (Andrew Chow)
c45415f Refactor keymetadata writing to a separate method (Andrew Chow)
Pull request description:
This PR allows for key origin data as defined by the descriptors document to be imported to the wallet when importing a descriptor using
importmulti. This allows thewalletprocesspsbtto include the BIP 32 derivation paths for keys that it is watching that are from a different HD wallet.In order to make this easier to use, a new field
hdmasterkeyfingerprinthas been added togetaddressinfo. Additionally I have removedhdmasterkeyidas was planned. I think that this API change is fine since it was going to be removed in 0.18 anyways.CKeyMetadatahas also been extended to store key origin info to facilitate this.Tree-SHA512: 9c7794f3c793da57e23c5abbdc3d58779ee9dea3d53168bb86c0643a4ad5a11a446264961e2f772f35eea645048cb60954ed58050002caee4e43cd9f51215097