Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[backport] Backport fixes from master to elements-22.x for rc6 #1166

Merged
merged 30 commits into from
Sep 7, 2022

Conversation

psgreco
Copy link
Contributor

@psgreco psgreco commented Sep 7, 2022

Backports from master:
#869
#1155
#1157
#1159
#1162
#1165

Backports from Bitcoin Core to fix CI
bitcoin/bitcoin#23504
bitcoin/bitcoin#23716
Bump to -rc6

stevenroose and others added 30 commits November 25, 2021 17:04
…-tx-format-fix-typo

docs: fix typo in elements-tx-format.md
fb5132b Fix createblindedaddress help message (Andrea Bonel)

Pull request description:

ACKs for top commit:
  delta1:
    ACK fb5132b
  stevenroose:
    utACK ElementsProject@fb5132b

Tree-SHA512: dd60dac485815b8e02a6dd239862fdc079ad53a7079b75ded3fbd1552a88514b0e5168749d2ad186b589ebbe9d73a1d490f263978bbc67b516ec461e191ef139
…ields

pset: Add input explicit value, assets, and proofs, and issuance blinding flag
Fix Bitcoin name usage in Windows installer
…ields-tests

pset: Tests and bug fixes for input explicit value and asset fields
Modifies the getnewblockhex json rpc call to accept an array of
commitments instead of a single commitment.

Backwards compatibility is maintained by first attempting to parse as a
string for a singular commitment.
…mmitments

rpc: change getnewblockhex to take multiple commitments
Github-Pull: #23504
Rebased-From: fafa66e
Github-Pull: 23716
Rebased-From: ad3e9e1
@psgreco psgreco changed the title Elements 22 rc6 [backport] Backport fixes from master to elements-22.x for rc6 Sep 7, 2022
@delta1
Copy link
Member

delta1 commented Sep 7, 2022

utACK f669c08

@apoelstra
Copy link
Member

utACK f669c08

Confirmed that this is master with 5 minor/inconsequential commits on top of it. One is a backport of some test-only code from Core which I confirmed was identical except for one constant being changed.

@jamesdorfman jamesdorfman merged commit a317eca into ElementsProject:elements-22.x Sep 7, 2022
@psgreco psgreco deleted the elements-22-rc6 branch September 7, 2022 20:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants