37360 Commits

Author SHA1 Message Date
fanquake
7da4ae1f78
Merge bitcoin/bitcoin#28655: [25.1] Final Changes
a13670090dbf34daf2a378a9870817e19d4c2aa0 doc: update release notes for 25.1 (fanquake)
e8d5c35e8094382537c3d1704b46f2554818a146 doc: update manual pages for 25.1 (fanquake)
9e00b73ee776c7bb902016121d28b9b5bea6537b build: bump version to 25.1 final (fanquake)

Pull request description:

  Final changes for `v25.1`.
  PR for bitcoincore.org is here: https://github.com/bitcoin-core/bitcoincore.org/pull/991.
  No additional changes have been backported since rc1 (tagged 14 days ago),
  and no bugs or issues have been reported (test bins have been available for 9 days).

ACKs for top commit:
  hebasto:
    ACK a13670090dbf34daf2a378a9870817e19d4c2aa0.
  TheCharlatan:
    lgtm ACK a13670090dbf34daf2a378a9870817e19d4c2aa0

Tree-SHA512: 037f937dd4d2a9de15ff15a80f35b6047b61ffc3d9a33e7d4a4fcbce6302569bbc516c6da5849211b34ebbe914c4edcdd182e2d1d43897d0dcd32834ce6f2574
v25.1
2023-10-16 16:44:20 +01:00
fanquake
a13670090d
doc: update release notes for 25.1 2023-10-16 11:35:40 +02:00
fanquake
e8d5c35e80
doc: update manual pages for 25.1 2023-10-16 11:34:25 +02:00
fanquake
9e00b73ee7
build: bump version to 25.1 final 2023-10-16 11:30:08 +02:00
fanquake
167d3e2f16
Merge bitcoin/bitcoin#28559: [25.1] Final changes for 25.1rc1
10f3f813b251d16c86d0b41bbdd7b7ab4a22e00d doc: add release notes for 25.1rc1 (fanquake)
71aed7aa31507220ca8b53a8d3c1b62a73a80c45 doc: update manual pages for 25.1rc1 (fanquake)
02f059c8199efbcbec47ff289f71ac30a5d7313d build: Bump version to 25.1rc1 (fanquake)
dc1fcec0260db8fa95d74d46d2e1b302e0a66782 doc: add 25.0 release notes (fanquake)

Pull request description:

  Final changes to tag a `25.1rc1`.
  Bumps version numbers, man pages, adds release notes etc.

ACKs for top commit:
  dergoegge:
    ACK 10f3f813b251d16c86d0b41bbdd7b7ab4a22e00d
  hebasto:
    ACK 10f3f813b251d16c86d0b41bbdd7b7ab4a22e00d, I have reviewed the code and it looks OK.
  willcl-ark:
    ACK 10f3f813b251d16c86d0b41bbdd7b7ab4a22e00d
  stickies-v:
    ACK 10f3f813b251d16c86d0b41bbdd7b7ab4a22e00d

Tree-SHA512: 3e1c527dac06afb4c8e1e481055211f69aa0ed769ac242ed610d23d470bbc0c062227034d01876ba4a5fa836e953fb001e8b0d6bc026069d372d34b8a031fb25
v25.1rc1
2023-10-04 13:10:16 +01:00
fanquake
10f3f813b2
doc: add release notes for 25.1rc1 2023-10-04 11:24:05 +01:00
fanquake
71aed7aa31
doc: update manual pages for 25.1rc1 2023-10-04 11:24:05 +01:00
fanquake
02f059c819
build: Bump version to 25.1rc1 2023-10-04 11:24:05 +01:00
fanquake
dc1fcec026
doc: add 25.0 release notes 2023-10-04 11:24:05 +01:00
fanquake
9f8d501cb8
Merge bitcoin/bitcoin#28487: [25.1] Final backports
45a5fcb165081f38ef90944dd31c5e3107aa03dc http: bugfix: track closed connection (stickies-v)
752a456fa839c796a37eb5db0011910f799748ee http: log connection instead of request count (stickies-v)
ae86adabe44cbb8328d9290ad809803b86df8a07 http: refactor: use encapsulated HTTPRequestTracker (stickies-v)
f31899d19a0333e87c3690b3d3c2b574abb357fa gui: macOS, make appMenuBar part of the main app window (furszy)
64ffa9423197c2dad2f5c5d812e1b17d6b9030f0 gui: macOS, do not process dock icon actions during shutdown (furszy)
e270f3f8578d933e8f219b3381ac105185b3b707 depends: fix unusable memory_resource in macos qt build (fanquake)
a6683945ca38752875e82dddccba075195ec61a6 build, macos: Fix `qt` package build with new Xcode 15 linker (Hennadii Stepanov)
b3517cb1b54e040f3167abdd77095003e525b5d1 test: Test loading wallets with conflicts without a chain (Andrew Chow)
d63478cb502de8345db2525f47abc1e9ef788733 wallet: Check last block and conflict height are valid in MarkConflicted (Andrew Chow)
5e51a9cc7246700612887e78d1cfafc351529a9b ci: Nuke Android APK task, Use credits for tsan (MarcoFalke)
910c36253e4ff5a21de47e082071ce903f74a2dd test: ensure old fee_estimate.dat not read on restart and flushed (ismaelsadeeq)
37764d3300669e64d9b8549a6a4ea78bfba6b1b5 tx fees, policy: read stale fee estimates with a regtest-only option (ismaelsadeeq)
16bb9161fabee70edac4c3e64b1ff4b47945cbdd tx fees, policy: do not read estimates of old fee_estimates.dat (ismaelsadeeq)
c4dd5989b36e6da62dedb4e0bfceade75abb0ac5 tx fees, policy: periodically flush fee estimates to fee_estimates.dat (ismaelsadeeq)
c36770cefd07c5263d366e7378ac9701f5679816 test: wallet, verify migration doesn't crash for an invalid script (furszy)
0d2a33e05c056fbc9834b532cb50621e622f14c9 wallet: disallow migration of invalid or not-watched scripts (furszy)
2c51a07c085b25246effa91a1f5f17dac560ff58 Do not use std::vector = {} to release memory (Pieter Wuille)

Pull request description:

  Further backports for the `25.x` branch. Currently:
  * https://github.com/bitcoin/bitcoin/pull/27622
  * https://github.com/bitcoin/bitcoin/pull/27834
  * https://github.com/bitcoin/bitcoin/pull/28125
  * https://github.com/bitcoin/bitcoin/pull/28452
  * https://github.com/bitcoin/bitcoin/pull/28542
  * https://github.com/bitcoin/bitcoin/pull/28543
  * https://github.com/bitcoin/bitcoin/pull/28551
  * https://github.com/bitcoin/bitcoin/pull/28571
  * https://github.com/bitcoin-core/gui/pull/751

ACKs for top commit:
  hebasto:
    re-ACK 45a5fcb165081f38ef90944dd31c5e3107aa03dc, only #28551 has been backported with since my recent [review](https://github.com/bitcoin/bitcoin/pull/28487#pullrequestreview-1655584132).
  dergoegge:
    reACK 45a5fcb165081f38ef90944dd31c5e3107aa03dc
  willcl-ark:
    reACK 45a5fcb165081f38ef90944dd31c5e3107aa03dc

Tree-SHA512: 0f5807aa364b7c2a2039fef11d5cd5e168372c3bf5b0e941350fcd92e7db4a1662801b97bb4f68e29788c77d24bbf97385a483c4501ca72d93fa25327d5694fa
2023-10-04 11:23:14 +01:00
stickies-v
45a5fcb165
http: bugfix: track closed connection
It is possible that the client disconnects before the request is
handled. In those cases, evhttp_request_set_on_complete_cb is never
called, which means that on shutdown the server we'll keep waiting
endlessly.

By adding evhttp_connection_set_closecb, libevent automatically
cleans up those dead connections at latest when we shutdown, and
depending on the libevent version already at the moment of remote
client disconnect. In both cases, the bug is fixed.

Github-Pull: #28551
Rebased-From: 68f23f57d77bc172ed39ecdd4d2d5cd5e13cf483
2023-10-04 10:12:59 +01:00
stickies-v
752a456fa8
http: log connection instead of request count
There is no significant benefit in logging the request count instead
of the connection count. Reduces amount of code and computational
complexity.

Github-Pull: #28551
Rebased-From: 084d0372311e658a486622f720d2b827d8416591
2023-10-04 10:11:01 +01:00
stickies-v
ae86adabe4
http: refactor: use encapsulated HTTPRequestTracker
Introduces and uses a HTTPRequestTracker class to keep track of
how many HTTP requests are currently active, so we don't stop the
server before they're all handled.

This has two purposes:
1. In a next commit, allows us to untrack all requests associated
with a connection without running into lifetime issues of the
connection living longer than the request
(see https://github.com/bitcoin/bitcoin/pull/27909#discussion_r1265614783)

2. Improve encapsulation by making the mutex and cv internal members,
and exposing just the WaitUntilEmpty() method that can be safely
used.

Github-Pull: #28551
Rebased-From: 41f9027813f849a9fd6a1479bbb74b9037990c3c
2023-10-04 10:10:35 +01:00
furszy
f31899d19a
gui: macOS, make appMenuBar part of the main app window
By moving the appMenuBar destruction responsibility to the QT
framework, we ensure the disconnection of the submenus signals
prior to the destruction of the main app window.

The standalone menu bar may have served a purpose in earlier
versions when it didn't contain actions that directly open
specific screens within the main application window. However,
at present, all the actions within the appMenuBar lead to the
opening of screens within the main app window. So, the absence
of a main app window makes these actions essentially pointless.

Github-Pull: gui#751
Rebased-From: bae209e3879fa099302d3b211362c49bbbfbdd14
2023-10-03 15:59:17 +01:00
furszy
64ffa94231
gui: macOS, do not process dock icon actions during shutdown
As the 'QMenuBar' is created without a parent window in MacOS, the
app crashes when the user presses the shutdown button and, right
after it, triggers any action in the menu bar.

This happens because the QMenuBar is manually deleted in the
BitcoinGUI destructor but the events attached to it children
actions are not disconnected, so QActions events such us the
'QMenu::aboutToShow' could try to access null pointers.

Instead of guarding every single QAction pointer inside the
QMenu::aboutToShow slot, or manually disconnecting all
registered events in the destructor, we can check if a
shutdown was requested and discard the event.

The 'node' field is a ref whose memory is held by the
main application class, so it is safe to use here. Events
are disconnected prior destructing the main application object.

Furthermore, the 'MacDockIconHandler::dockIconClicked' signal
can make the app crash during shutdown for the very same
reason. The 'show()' call triggers the 'QApplication::focusWindowChanged'
event, which is connected to the 'minimize_action' QAction,
which is also part of the app menu bar, which could no longer exist.

Github-Pull: gui#751
Rebased-From: e14cc8fc69cb3e3a98076fbb23a94eba7873368a
2023-10-03 15:58:41 +01:00
fanquake
e270f3f857
depends: fix unusable memory_resource in macos qt build
See https://codereview.qt-project.org/c/qt/qtbase/+/482392.

Github-Pull: #28571
Rebased-From: 848eec09363d1ba8198376eb9654b1a69e3541aa
2023-10-03 15:55:04 +01:00
Hennadii Stepanov
a6683945ca
build, macos: Fix qt package build with new Xcode 15 linker
Github-Pull: #28543
Rebased-From: 79ef528511f0cbbe0a7097ef031f2964aaccfe5c
2023-10-03 10:32:55 +01:00
Andrew Chow
b3517cb1b5
test: Test loading wallets with conflicts without a chain
Loading a wallet with conflicts without a chain (e.g. wallet tool and
migration) would previously result in an assertion due to -1 being both
a valid number of conflict confirmations, and the indicator that that
member has not been set yet.

Github-Pull: #28542
Rebased-From: 782701ce7d31919dba2241ee43b582d8ae5a2541
2023-10-02 13:39:34 +01:00
Andrew Chow
d63478cb50
wallet: Check last block and conflict height are valid in MarkConflicted
MarkConflicted calculates conflict confirmations incorrectly when both
the last block processed height and the conflicting height are negative
(i.e. uninitialized). If either are negative, we should not be marking
conflicts and should exit early.

Github-Pull: #28542
Rebased-From: 4660fc82a1f5cf6eb6404d5268beef5919581661
2023-10-02 13:29:04 +01:00
MarcoFalke
5e51a9cc72
ci: Nuke Android APK task, Use credits for tsan
Github-Pull: #27834
Rebased-From: fa22538e481fa2c4f0b5d6f91166335e60b67fe9
2023-10-02 13:09:01 +01:00
ismaelsadeeq
910c36253e
test: ensure old fee_estimate.dat not read on restart and flushed
This commit adds tests to ensure that old fee_estimates.dat files
are not read and that fee_estimates are periodically flushed to the
fee_estimates.dat file.

Additionaly it tests the -regtestonly option -acceptstalefeeestimates.

Github-Pull: #27622
Rebased-From: d2b39e09bc6a5982fc5cf4b538b7fdb0e3cae576
2023-10-02 13:09:01 +01:00
ismaelsadeeq
37764d3300
tx fees, policy: read stale fee estimates with a regtest-only option
If -acceptstalefeeestimates option is passed stale fee estimates can now
be read when operating in regtest environments.

Additionally, this commit updates all declarations of the CBlockPolicyEstimator
class to include a the second constructor variable.

Github-Pull: #27622
Rebased-From: cf219f29f3c5b41070eaab9a549a476f01990f3a
2023-10-02 13:09:01 +01:00
ismaelsadeeq
16bb9161fa
tx fees, policy: do not read estimates of old fee_estimates.dat
Old fee estimates could cause transactions to become stuck in the
mempool. This commit prevents the node from using stale estimates
from an old file.

Github-Pull: #27622
Rebased-From: 3eb241a141defa564c94cb95c5bbaf4c5bd9682e
2023-10-02 13:09:01 +01:00
ismaelsadeeq
c4dd5989b3
tx fees, policy: periodically flush fee estimates to fee_estimates.dat
This reduces chances of having old estimates in fee_estimates.dat.

Github-Pull: #27622
Rebased-From: 5b886f2b436eaa8c2b7de58dc4644dc6223040da
2023-10-02 13:09:01 +01:00
furszy
c36770cefd
test: wallet, verify migration doesn't crash for an invalid script
The migration process must skip any invalid script inside the legacy
spkm and all the addressbook records linked to them.

These scripts are not being watched by the current wallet, nor should
be watched by the migrated one.

IsMine() returns ISMINE_NO for them.

Github-Pull: #28125
Rebased-From: 8e7e3e614955e60d3bf9e9a481ef8916bf9e22d9
2023-10-02 13:09:01 +01:00
furszy
0d2a33e05c
wallet: disallow migration of invalid or not-watched scripts
The legacy wallet allowed to import any raw script, without checking if
it was valid or not. Appending it to the watch-only set.

This causes a crash in the migration process because we are only
expecting to find valid scripts inside the legacy spkm.

These stored scripts internally map to `ISMINE_NO` (same as if they
weren't stored at all..).

So we need to check for these special case, and take into account that
the legacy spkm could be storing invalid not watched scripts.

Which, in code words, means IsMineInner() returning IsMineResult::INVALID
for them.

Github-Pull: #28125
Rebased-From: 1de8a2372ab39386e689b27d15c4d029be239319
2023-10-02 13:09:01 +01:00
Pieter Wuille
2c51a07c08
Do not use std::vector = {} to release memory
Github-Pull: #28452
Rebased-From: 3fcd7fc7ff563bdc0e2bba66b4cbe72d898c876e
2023-10-02 13:09:00 +01:00
fanquake
887cbfcc93
Merge bitcoin/bitcoin#28534: [25.x] qt: 25.1rc1 translations update
88b525f93adc713dc69a6af94f3b9fd4474595d4 qt: 25.1rc1 translations update (Hennadii Stepanov)

Pull request description:

  This PR pulls the recent translations from the [Transifex.com](https://www.transifex.com/bitcoin/bitcoin) using the [`bitcoin-maintainer-tools/update-translations.py`](https://github.com/bitcoin-core/bitcoin-maintainer-tools/blob/main/update-translations.py) tool.

  According to our [Release Process docs](https://github.com/bitcoin/bitcoin/blob/master/doc/release-process.md#before-every-release-candidate), it is supposed to be merged before `v25.1rc1` tagging.

  Changes in "Chinese (China) (zh_CN)" translation were manually discarded as they have too many removals (it looks like a vandalism).

ACKs for top commit:
  stickies-v:
    re-ACK 88b525f93adc713dc69a6af94f3b9fd4474595d4
  jarolrod:
    ACK 88b525f93adc713dc69a6af94f3b9fd4474595d4

Tree-SHA512: 007d3e00f92d2450f99d1a84b53dc929fd80b7ebb7939271b67969bf99bb3b0ae7426428f6c63f1dbdfa88b90cb237e7614f7b2239f9773b84424b544bf106af
2023-10-02 10:47:32 +02:00
Hennadii Stepanov
88b525f93a
qt: 25.1rc1 translations update 2023-09-28 15:50:04 +01:00
fanquake
ecc74cd4f3
Merge bitcoin/bitcoin#28047: [25.x] Further backports for 25.1
494f1afa5a6eab4f243b19ab1691cd231a855b34 depends: xcb-proto 1.15.2 (fanquake)
513ca0a71173691fb030973612189ac6d064aedd test: wallet, add coverage for watch-only raw sh script migration (furszy)
6d5a510dcdbed7b53f73b8422cea331dd6e9589e descriptor: InferScript, do not return top-level only func as sub descriptor (furszy)
37d9cc657cf5b8126a0faef5237bc57e7453abb8 test: wallet, add coverage for addressbook migration (furszy)
4b16650c10b028485ece7b438b89236a52322b89 wallet: migration bugfix, persist empty labels (furszy)
59b06b696a2fd730ff73bb45e4d1161517bd4562 wallet: migration bugfix, clone 'send' record label to all wallets (furszy)

Pull request description:

  Currently backports:
  * #28038
  * #28067 2nd & 3rd commits.
  * #28097

ACKs for top commit:
  stickies-v:
    ACK 494f1afa5a6eab4f243b19ab1691cd231a855b34

Tree-SHA512: cea134cfa72950d8428191adce79c0881302ca54488f64d3d4a5f9070bb2445d8074e58fa31a482481c4eabb74c852a025f53597540fc646dc20f33b21cf0a06
2023-09-06 15:55:51 +01:00
fanquake
494f1afa5a
depends: xcb-proto 1.15.2
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: 7cb88c8b46723d306b96953a6a60c90a4ab211e3
2023-07-21 09:57:59 +01:00
furszy
513ca0a711
test: wallet, add coverage for watch-only raw sh script migration
Github-Pull: #28067
Rebased-From: dd9633b516d6936ac4e23a40f9b0bea120117d35
2023-07-21 09:39:15 +01:00
furszy
6d5a510dcd
descriptor: InferScript, do not return top-level only func as sub descriptor
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: #28067
Rebased-From: cc781a21800a6ce13875feefd0cb14ab0a84524c
2023-07-21 09:38:35 +01:00
furszy
37d9cc657c
test: wallet, add coverage for addressbook migration
Github-Pull: #28038
Rebased-From: 7ecc29a0b7a23d8f5d3c1e6a0dad29b3ad839eb9
2023-07-07 17:32:28 +01:00
furszy
4b16650c10
wallet: migration bugfix, persist empty labels
addressbook records with no associated label could be
treated as change. And we don't want that for external
addresses.

Github-Pull: #28038
Rebased-From: a277f8357ad8b0eb26f33fc36f919d868c06847b
2023-07-07 17:31:14 +01:00
furszy
59b06b696a
wallet: migration bugfix, clone 'send' record label to all wallets
Github-Pull: #28038
Rebased-From: 1b64f6498c394a143df196172a14204fe3b8a744
2023-07-07 17:30:53 +01:00
fanquake
8825983716
Merge bitcoin/bitcoin#27752: [25.x] Parallel compact block downloads
b8ad3220a9068f10c2b3b14b40f211372aeece31 Unconditionally return when compact block status == READ_STATUS_FAILED (Greg Sanders)
cdd3de08e301ec309c179796bedfa2be29042128 Add tests for parallel compact block downloads (Greg Sanders)
e66a5cbb56db3dffc119e110472ab1176ea3fe99 Support up to 3 parallel compact block txn fetchings (Greg Sanders)
d1a93f5d41f7385af28cee3863976fd75f27415b Only request full blocks from the peer we thought had the block in-flight (Greg Sanders)
38e3af9fad1eb8ef7d6a9d812ded412668b650e3 Convert mapBlocksInFlight to a multimap (Greg Sanders)
a45159b8e2a198219d7c46baeb647ff5d18436bf Remove nBlocksInFlight (Greg Sanders)
722361e129342078376b6d30b9d80de17ca7ddfb alias BlockDownloadMap for mapBlocksInFlight (Greg Sanders)

Pull request description:

  Backports:
  * https://github.com/bitcoin/bitcoin/pull/27626
  * https://github.com/bitcoin/bitcoin/pull/27743

ACKs for top commit:
  instagibbs:
    utACK b8ad3220a9
  ajtowns:
    ACK b8ad3220a9068f10c2b3b14b40f211372aeece31 ; confirmed patches are clean cherry-picks from master, and already tested patches prior to 25.0 release

Tree-SHA512: 438901496a5ed927662e62f936e3d1e7ffb727cb235869854983e8e29a68e144eb3bff307d9fc3ae785fb276b67a216b1cce397689252ca49c5d761efc1380ac
2023-07-04 12:00:54 +01:00
Greg Sanders
b8ad3220a9
Unconditionally return when compact block status == READ_STATUS_FAILED
Github-Pull: #27743
Rebased-From: d97269579769effbe6eec2303ea0cc3e396d3e0d
2023-06-16 10:17:22 +01:00
Greg Sanders
cdd3de08e3
Add tests for parallel compact block downloads
Github-Pull: #27626
Rebased-From: d7f359b35e8b1e9acc4d397de262cd9ba9bbcb83
2023-06-16 10:17:22 +01:00
Greg Sanders
e66a5cbb56
Support up to 3 parallel compact block txn fetchings
A single outbound slot is required, so if the first two slots
are taken by inbound in-flights, the node will reject additional
unless they are coming from outbound.

This means in the case where a fast sybil peer is attempting to
stall out a node, a single high bandwidth outbound peer can
mitigate the attack.

Github-Pull: #27626
Rebased-From: 03423f8bd12b95a06a4a9d8377e781625dd38aae
2023-06-16 10:17:22 +01:00
Greg Sanders
d1a93f5d41
Only request full blocks from the peer we thought had the block in-flight
This is a change in behavior so that if for some reason we request a block from a peer, we don't allow an unsolicited CMPCT_BLOCK announcement for that same block to cause a request for a full block from the uninvited peer (as some type of request is already outstanding from the original peer)

Github-Pull: #27626
Rebased-From: 13f9b20b4cb2f3f26e81184a77e9cf1f626d4f57
2023-06-16 10:17:22 +01:00
Greg Sanders
38e3af9fad
Convert mapBlocksInFlight to a multimap
Github-Pull: #27626
Rebased-From: cce96182ba2457335868c65dc16b081c3dee32ee
2023-06-16 10:17:22 +01:00
Greg Sanders
a45159b8e2
Remove nBlocksInFlight
Github-Pull: #27626
Rebased-From: a90595478dcf4e443cd15bbb822d485dc42bdb18
2023-06-16 10:17:21 +01:00
Greg Sanders
722361e129
alias BlockDownloadMap for mapBlocksInFlight
Github-Pull: #27626
Rebased-From: 86cff8bf18f2c6344a25ad8b81cf366201a73c36
2023-06-16 10:17:21 +01:00
fanquake
642b5dd1b4
Merge bitcoin/bitcoin#27887: [25.x] Backports
6233049709f339ad4e01860872ecb6174006f5be ci: Switch to `amd64` container in "ARM" task (Hennadii Stepanov)
d845a3ed2186528c382639e79fe8c61dff8f4723 test: add coverage for `/deploymentinfo` passing a blockhash (brunoerg)
72ead8699fadee4019d324763c05742b7d8880a9 rest: bugfix, fix crash error when calling `/deploymentinfo` (brunoerg)
6f7a0ae58b843290ae2006dfd9aa1e8fd86053a5 ci: Use podman stop over podman kill (MarcoFalke)
de56daab4178460a0755d7e258862f3bba940c13 ci: Use podman for persistent workers (MarcoFalke)
71f626ef2cde995927784d370451dd334a022069 ci: Prune dangling images on RESTART_CI_DOCKER_BEFORE_RUN (MarcoFalke)

Pull request description:

  Currently backports:
  * https://github.com/bitcoin/bitcoin/pull/27777
  * https://github.com/bitcoin/bitcoin/pull/27844
  * https://github.com/bitcoin/bitcoin/pull/27853
  * https://github.com/bitcoin/bitcoin/pull/27886

  Effectively also backports: https://github.com/bitcoin/bitcoin/pull/27562.

ACKs for top commit:
  stickies-v:
    ACK 6233049709f339ad4e01860872ecb6174006f5be

Tree-SHA512: d0f3d5c4cd0cf9792f3270078b49ad6661e28e7a883f91e5981e8cfe95d01c6e415762ee2e3a5fea17d198299989a8b5412961c2cc788cef975b2ee45d84550c
2023-06-16 10:16:41 +01:00
Hennadii Stepanov
6233049709
ci: Switch to amd64 container in "ARM" task
Tee `arm_container` does not support 32-bit mode anymore.
See: https://github.com/bitcoin/bitcoin/issues/27879

Github-Pull: #27886
Rebased-From: 016fe6d8280768917081894dfca233c2f06e78d9
2023-06-15 10:38:29 +01:00
brunoerg
d845a3ed21
test: add coverage for /deploymentinfo passing a blockhash
Github-Pull: #27853
Rebased-From: 7d452d826a7056411077b870efc3872bb2fa45e4
2023-06-15 10:38:29 +01:00
brunoerg
72ead8699f
rest: bugfix, fix crash error when calling /deploymentinfo
Github-Pull: #27853
Rebased-From: ce887eaf4917c337b21aa2e7811804ce003d36be
2023-06-15 10:38:28 +01:00
MarcoFalke
6f7a0ae58b
ci: Use podman stop over podman kill
This should avoid a race where the kill is not done when spinning up the
new container. podman stop waits 10 seconds by default.

Github-Pull: #27844
Rebased-From: faaa62754e84417baa917f20db379db78146687d
2023-06-15 10:38:28 +01:00
MarcoFalke
de56daab41
ci: Use podman for persistent workers
Github-Pull: #27777
Rebased-From: fa123077bc3f39aa0969d883e2d799a054cd4543
2023-06-15 10:38:19 +01:00