diff options
| author | merge-script <fanquake@gmail.com> | 2024-07-24 10:31:55 +0100 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-07-24 10:31:55 +0100 |
| commit | 0cbdc6b3802d10be7772006801b1dfe8a9eaaa83 (patch) | |
| tree | 5cabf81b1e6e940e863ac5c49523a6afd866dad3 /src/policy/feerate.h | |
| parent | b6440f20f2cc4b30fc2e3432a57eaf9ba0f653cc (diff) | |
| parent | 4f23c8636498f7e5adbe0264a0dc66a566c4b1b9 (diff) | |
Merge bitcoin/bitcoin#30467: [27.x] More backports
4f23c8636498f7e5adbe0264a0dc66a566c4b1b9 [WIP] doc: update release notes for 27.x (fanquake)
54bb9b0541d44972726a187e382a6b267942f47a test: add test for modififed walletprocesspsbt calls (willcl-ark)
f22b9ca70c867a02d6f578dc56d4997b7a4ff9c9 wallet: fix FillPSBT errantly showing as complete (willcl-ark)
05192ba84c2d0ef727c9dbc1e6af4ce8a59458fa init: change shutdown order of load block thread and scheduler (Martin Zumsande)
ab422066527992d53c92bb482c6b993f089b2999 Reapply "test: p2p: check that connecting to ourself leads to disconnect" (Sebastian Falbesoner)
064f2146735c88823f73f7531fc36d21d1ddb6f3 net: prevent sending messages in `NetEventsInterface::InitializeNode` (Sebastian Falbesoner)
0933cf53b48a160612873978f38ef4ff70e74847 net: fix race condition in self-connect detection (Sebastian Falbesoner)
fa90989503494b77a0329390dc5e32d0c5e5c283 psbt: Check non witness utxo outpoint early (Ava Chow)
Pull request description:
Backports:
* https://github.com/bitcoin/bitcoin/pull/29855
* https://github.com/bitcoin/bitcoin/pull/30357
* https://github.com/bitcoin/bitcoin/pull/30394 (modified test commit)
* https://github.com/bitcoin/bitcoin/pull/30435
ACKs for top commit:
stickies-v:
ACK 4f23c8636498f7e5adbe0264a0dc66a566c4b1b9
willcl-ark:
ACK 4f23c8636498f7e5adbe0264a0dc66a566c4b1b9
Tree-SHA512: 5c26445f0855f9d14890369ce19873b0686804eeb659e7d6da36a6f404f64d019436e1e6471579eaa60a96ebf8f64311883b4aef9d0ed528a95bd610c101c079
Diffstat (limited to 'src/policy/feerate.h')
0 files changed, 0 insertions, 0 deletions