Skip to content

[25.x] Further backports for 25.1 #28047

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.

Sign up for GitHub

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

Jump to bottom
Merged
fanquake merged 6 commits into from
Sep 6, 2023
Merged

[25.x] Further backports for 25.1 #28047

fanquake merged 6 commits into from
Sep 6, 2023

Conversation

@fanquake
Copy link
Member

@fanquake fanquake commented Jul 7, 2023 •
edited
Loading

furszy added 3 commits July 7, 2023 17:30
@furszy @fanquake
wallet: migration bugfix, clone 'send' record label to all wallets
59b06b6 
Github-Pull: bitcoin#28038
Rebased-From: 1b64f64
@furszy @fanquake
wallet: migration bugfix, persist empty labels
4b16650 
addressbook records with no associated label could be
treated as change. And we don't want that for external
addresses.

Github-Pull: bitcoin#28038
Rebased-From: a277f83
@furszy @fanquake
test: wallet, add coverage for addressbook migration
37d9cc6 
Github-Pull: bitcoin#28038
Rebased-From: 7ecc29a
@fanquake fanquake added this to the 25.1 milestone Jul 7, 2023
@DrahtBot
Copy link
Contributor

DrahtBot commented Jul 7, 2023 •
edited
Loading

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK stickies-v

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

@fanquake fanquake mentioned this pull request Jul 7, 2023
Merged
furszy and others added 3 commits July 21, 2023 09:38
@furszy @fanquake
descriptor: InferScript, do not return top-level only func as sub des…
6d5a510 
…criptor

e.g. sh(addr(ADDR)) or sh(raw(HEX)) are invalid descriptors.

Making sh and wsh top level functions to return addr/raw descriptors when
the subscript inference fails.

Github-Pull: bitcoin#28067
Rebased-From: cc781a2
@furszy @fanquake
test: wallet, add coverage for watch-only raw sh script migration
513ca0a 
Github-Pull: bitcoin#28067
Rebased-From: dd9633b
@fanquake
depends: xcb-proto 1.15.2
494f1af 
Resolves build failures under Python 3.12, i.e building on rawhide:
```bash
make[3]: Nothing to be done for 'install-exec-am'.
 /usr/bin/mkdir -p '/bitcoin/depends/work/staging/aarch64-unknown-linux-gnu/xcb_proto/1.14.1-4a91ac9dc41/bitcoin/depends/aarch64-unknown-linux-gnu/lib/python3.12/site-packages/xcbgen'
 /usr/bin/install -c -m 644 __init__.py error.py expr.py align.py matcher.py state.py xtypes.py '/bitcoin/depends/work/staging/aarch64-unknown-linux-gnu/xcb_proto/1.14.1-4a91ac9dc41/bitcoin/depends/aarch64-unknown-linux-gnu/lib/python3.12/site-packages/xcbgen'
Traceback (most recent call last):
  File "<string>", line 2, in <module>
ModuleNotFoundError: No module named 'imp'
make[3]: *** [Makefile:271: install-pkgpythonPYTHON] Error 1
```

`imp` was removed in 3.12: https://docs.python.org/3/library/imp.html.

Github-Pull: bitcoin#28097
Rebased-From: 7cb88c8
@fanquake fanquake mentioned this pull request Jul 21, 2023
Merged
@fanquake fanquake marked this pull request as ready for review September 2, 2023 17:47
@fanquake fanquake requested a review from stickies-v September 2, 2023 17:47
@fanquake fanquake mentioned this pull request Sep 5, 2023
Merged
fanquake added a commit that referenced this pull request Sep 5, 2023
@fanquake
Merge #28410: [24.x] depends: xcb-proto 1.15.2
0df8f98 
66b2b10 depends: xcb-proto 1.15.2 (fanquake)

Pull request description:

  Resolves build failures under Python 3.12, i.e building on rawhide:
  ```bash
  make[3]: Nothing to be done for 'install-exec-am'.
   /usr/bin/mkdir -p '/bitcoin/depends/work/staging/aarch64-unknown-linux-gnu/xcb_proto/1.14.1-4a91ac9dc41/bitcoin/depends/aarch64-unknown-linux-gnu/lib/python3.12/site-packages/xcbgen'
   /usr/bin/install -c -m 644 __init__.py error.py expr.py align.py matcher.py state.py xtypes.py '/bitcoin/depends/work/staging/aarch64-unknown-linux-gnu/xcb_proto/1.14.1-4a91ac9dc41/bitcoin/depends/aarch64-unknown-linux-gnu/lib/python3.12/site-packages/xcbgen'
  Traceback (most recent call last):
    File "<string>", line 2, in <module>
  ModuleNotFoundError: No module named 'imp'
  make[3]: *** [Makefile:271: install-pkgpythonPYTHON] Error 1
  ```

  `imp` was removed in 3.12: https://docs.python.org/3/library/imp.html.

  Github-Pull: #28097
  Rebased-From: 7cb88c8

  Also being backported for 25.x in #28047.

ACKs for top commit:
  hebasto:
    ACK 66b2b10

Tree-SHA512: 5364c5ced3004bc08a9c8f96e2b3abae3e31b3f0e7b1d10f83ff997f19b314d4d14c2a780ed02e793771c23091f8f02137cf7f5404627f2bd218c8726ae3228f
stickies-v
stickies-v approved these changes Sep 6, 2023
View reviewed changes
Copy link
Contributor

@stickies-v stickies-v left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 494f1af

Verified that the commits backport what's specified in pull description, and nothing more. Not familiar with the underlying pulls so relying on the test suite for the changes to not mess things up.

  • 59b06b6: clean backport
  • 4b16650: clean backport
  • 37d9cc6: removed references to test_default_wallet() and test_direct_file() that were introduced only in 26740
  • 6d5a510: clean backport
  • 513ca0a: clean backport
  • 494f1af: clean backport

@fanquake fanquake merged commit ecc74cd into bitcoin:25.x Sep 6, 2023
@fanquake fanquake deleted the further_25_x_backports branch September 6, 2023 14:56
@fanquake
Copy link
Member Author

fanquake commented Sep 6, 2023

CI for 25.x: https://github.com/bitcoin/bitcoin/runs/16549476169

@fanquake fanquake mentioned this pull request Sep 6, 2023
Closed
@bitcoin bitcoin locked and limited conversation to collaborators Sep 5, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@stickies-v stickies-v stickies-v approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Backport

Projects

None yet

Milestone

25.1

Development

Successfully merging this pull request may close these issues.

4 participants

@fanquake @DrahtBot @stickies-v @furszy