Merges up to Bitcoin Core v23 branch point#1262
Merged
psgreco merged 3959 commits intoElementsProject:masterfrom Sep 21, 2023
Merged
Merges up to Bitcoin Core v23 branch point#1262psgreco merged 3959 commits intoElementsProject:masterfrom
psgreco merged 3959 commits intoElementsProject:masterfrom
Conversation
All conflicts were resolved by taking the "incoming" changes by using `git checkout --theirs src/secp256k1` during conflict resolution.
Collaborator
This fixes a compilation issue in coins.cpp when tracing is enabled.
Member
Author
|
pushed 2 commits which fix some failures in CI build (except lint) |
Member
Author
|
looks like the macOS native CI build might need 53fd8278 from bitcoin/bitcoin#26879 |
resolves the newly introduced circular dependencies correctly
delta1
force-pushed
the
merged-master
branch
from
ff892e5 to
dabea18
Compare
Member
Author
|
ACK 5dc85e0 for @jamesdorfman commits from me. 3 out of 4 of the failing CI jobs we know are fixed from upstream backports for 23.x Then the TSan CI test will have to be debugged and fixed. |
| (uint32_t)outpoint.n, | ||
| (uint32_t)coin.nHeight, | ||
| (int64_t)coin.out.nValue, | ||
| coin.out.nValue.IsExplicit() ? (int64_t)coin.out.nValue.GetAmount() : 0, |
Collaborator
There was a problem hiding this comment.
@delta1 it's impossible for an explicit value to be 0, correct?
Collaborator
|
ACK 5dc85e0. Reviewed all of the commits which were not mine, up until that point. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Merges and reviews done so far by myself and @jamesdorfman