Commit graph

39258 commits

Author SHA1 Message Date
merge-script
0a2a5c4ba6
Merge bitcoin/bitcoin#30722: [26.x] Fix compilation with GCC 15
Some checks failed
CI / test each commit (push) Has been cancelled
CI / macOS 13 native, x86_64, no depends, sqlite only, gui (push) Has been cancelled
CI / Win64 native, VS 2022 (push) Has been cancelled
7d5764fb29 doc: update release notes for 26.x (fanquake)
1a08364686 add missing #include <cstdint> for GCC 15 (Matt Whitlock)

Pull request description:

  Backports #30633 to the `26.x` branch, so that it can be compiled with GCC 15.

ACKs for top commit:
  glozow:
    utACK 7d5764fb29

Tree-SHA512: ecf01e45f9ebb11c683252d6ca6a5a31ff767be08bb5760d1a65e583793ab50a94c3396b47931451c67830f704781eb9264a81b4b05bec943f041ef38f563475
2024-08-28 10:35:43 +01:00
fanquake
7d5764fb29
doc: update release notes for 26.x 2024-08-23 16:46:15 +01:00
Matt Whitlock
1a08364686
add missing #include <cstdint> for GCC 15
Github-Pull: #30633
Rebased-From: 138f867156
2024-08-23 16:35:36 +01:00
glozow
7b7041019b
Merge bitcoin/bitcoin#30376: 26.2 final changes
eef5dbc21b [doc] update release notes 26.2 (glozow)
00f0267ac0 [doc] update manpages 26.2 (glozow)
29cbec45dd [build] bump copyright year (glozow)
fe8dee826d [build] bump version to 26.2 (glozow)

Pull request description:

  bins were uploaded 2 weeks ago on June 18
  website PR: https://github.com/bitcoin-core/bitcoincore.org/pull/1039

ACKs for top commit:
  stickies-v:
    ACK eef5dbc21b
  fanquake:
    ACK eef5dbc21b If you want, you could also backport the changes to get the ASAN job running again, but that isn't blocking here.
  theStack:
    ACK eef5dbc21b

Tree-SHA512: 7c9e97231fd51784f1cc78a9b7b07b8a201ad7f54715fab6dd3243244e9f52831f57883966f2061cbff7a68018b4345de27e3953c50d7ec801d1a61f216907d1
2024-07-03 16:49:43 +01:00
glozow
eef5dbc21b [doc] update release notes 26.2 2024-07-02 10:41:25 +01:00
glozow
00f0267ac0 [doc] update manpages 26.2 2024-07-02 10:41:25 +01:00
glozow
29cbec45dd [build] bump copyright year 2024-07-02 10:34:39 +01:00
glozow
fe8dee826d [build] bump version to 26.2 2024-07-02 10:33:47 +01:00
merge-script
6bbfdcfb6d
Merge bitcoin/bitcoin#30319: [26.x] upnp: fix build with miniupnpc 2.2.8
10413ac46c doc: add 30283 cherry-pick to rel notes (fanquake)
391ce775f4 upnp: add compatibility for miniupnpc 2.2.8 (Cory Fields)

Pull request description:

  Backports https://github.com/bitcoin/bitcoin/pull/30283 to the 26.x branch.

ACKs for top commit:
  edilmedeiros:
    ACK 10413ac46c
  theuni:
    ACK 10413ac46c

Tree-SHA512: 4a0f4eceefd5bbf9c97d19c4890b85963d56449856a56e6fe24161d3d6f37332de719da342d6c00ee67f2cd9434d849809a3cdc51719dc93219ec218c35a9f97
2024-06-24 13:37:23 +01:00
fanquake
10413ac46c
doc: add 30283 cherry-pick to rel notes 2024-06-21 15:45:56 +01:00
Cory Fields
391ce775f4
upnp: add compatibility for miniupnpc 2.2.8
See: c0a50ce33e

The return value of 2 now indicates:
"A valid connected IGD has been found but its IP address is reserved (non routable)"

We continue to ignore any return value other than 1.

Github-Pull: #30283
Rebased-From: 8acdf66540
2024-06-21 15:42:38 +01:00
glozow
d10cf127e5
Merge bitcoin/bitcoin#30260: [26.x] backports and final changes for 26.2rc1
7ca424f8e6 [doc] update release notes for 26.2rc1 (glozow)
03a91a0142 [doc] manpages for 26.2rc1 (glozow)
4c824bbe03 [build] bump to version 26.2rc1 (glozow)
b99229737d qt: 26.2rc1 translations update (Hennadii Stepanov)
7b2489f57f depends: Fetch miniupnpc sources from an alternative website (Hennadii Stepanov)

Pull request description:

  Backports + release notes for:
  - #30151

  And final changes for 26.2rc1:
  - build changes
  - manpages
  - non-removal translations updates

ACKs for top commit:
  stickies-v:
    ACK 7ca424f8e6
  fanquake:
    ACK 7ca424f8e6

Tree-SHA512: 881697eb6fb78261e3deb5064d6f38227b449049add810c7da999a1f22fad60b9dd32057c626bbfaa7e461d53635cd2f7a9fb225eba0f6fb503afd4f1ef6c46d
2024-06-12 13:06:12 +01:00
glozow
7ca424f8e6 [doc] update release notes for 26.2rc1 2024-06-10 14:53:16 +01:00
glozow
03a91a0142 [doc] manpages for 26.2rc1 2024-06-10 14:50:34 +01:00
glozow
4c824bbe03 [build] bump to version 26.2rc1 2024-06-10 14:50:34 +01:00
Hennadii Stepanov
b99229737d qt: 26.2rc1 translations update
This change is a result if pulling the recent translations
from the Transifex website using the
bitcoin-maintainer-tools/update-translations.py tool.

A few manual adjustments were made:
- skipped removing of `bitcoin_af.ts`
- skipped removing of `bitcoin_ar.ts`
- skipped removing of `bitcoin_fa.ts`
- skipped removing of `bitcoin_la.ts`
- skipped removing of `bitcoin_ru.ts`
- skipped removing of `bitcoin_th.ts`
- skipped removing of `bitcoin_uk.ts`
present)
2024-06-10 14:50:28 +01:00
Hennadii Stepanov
7b2489f57f depends: Fetch miniupnpc sources from an alternative website
The https://miniupnp.tuxfamily.org website is unavailable now.

Rebased-From: 21b8a14d37
Github-Pull: #30151
2024-06-10 14:08:42 +01:00
glozow
6d7a1e3670
Merge bitcoin/bitcoin#29899: [26.x] archive 26.1 release notes + backports
aa7e876953 [doc] add draft release notes for 26.2rc1 (glozow)
21d9aaae32 p2p, bugfix: detect addnode cjdns peers in GetAddedNodeInfo() (Jon Atack)
ec5ce2fb2b windeploy: Renew certificate (Ava Chow)
96d0e818c5 rpc: Reword SighashFromStr error message (MarcoFalke)
6685affe92 rpc: move UniValue in blockToJSON (willcl-ark)
7f45e00174 depends: Fix build of Qt for 32-bit platforms (laanwj)
f9b76bae57 ci: Pull in qtbase5-dev instead of seperate low-level libraries (laanwj)
c587753f48 doc: Suggest installing dev packages for debian/ubuntu qt5 build (laanwj)
7ecdb0846d ci: Bump s390x to ubuntu:24.04 (MarcoFalke)
d9ef6cf934 sign: don't assume we are parsing a sane Miniscript (Antoine Poinsot)
e4859c82c7 depends: fix mingw-w64 Qt DEBUG=1 build (fanquake)
bb46b90b2e Fix #29767, set m_synced = true after Commit() (nanlour)
bf5b6fc8a7 Throw error if invalid parameters passed to getnetworkhashps RPC endpoint (Jameson Lopp)
a81a9228fb [rpc, bugfix] Enforce maximum value for setmocktime (dergoegge)
d39ea519c7 Change Luke Dashjr seed to dashjr-list-of-p2p-nodes.us (Luke Dashjr)
c21bbcc898 [doc] archive 26.1 release notes (glozow)

Pull request description:

  Archives 26.1 release notes and adds draft release notes for 26.2rc1

  Also backports:
  - #29691
  - #29869
  - #28554
  - #29747
  - #29853
  - #29856
  - #29764
  - #29776
  - #29985
  - #30094
  - #29870
  - #30149
  - #30085

ACKs for top commit:
  stickies-v:
    re-ACK aa7e876953, only changes are fixing commit msg and transifex reference
  willcl-ark:
    ACK aa7e876953

Tree-SHA512: b81ba6092640de696d782114cdf43e7ed1d63ea0a3231cade30653c2743d87700e0f852a1b1fcc42ae313b2d4f004e6026ddbad87d58c2fde0a660e90026ed98
2024-05-24 11:22:00 +01:00
glozow
aa7e876953 [doc] add draft release notes for 26.2rc1 2024-05-23 17:06:26 +01:00
Jon Atack
21d9aaae32 p2p, bugfix: detect addnode cjdns peers in GetAddedNodeInfo()
Addnode (manual) peers connected to us via the cjdns network are currently not
detected by CConnman::GetAddedNodeInfo(), i.e. fConnected is always false.

This causes the following issues:

- RPC `getaddednodeinfo` incorrectly shows them as not connected

- CConnman::ThreadOpenAddedConnections() continually retries to connect them

Github-Pull: #30085
Rebased-From: 684da97070
2024-05-23 17:05:57 +01:00
Ava Chow
ec5ce2fb2b windeploy: Renew certificate
Github-Pull: #30149
Rebased-From: 9f4ff1e965
2024-05-23 17:05:57 +01:00
MarcoFalke
96d0e818c5 rpc: Reword SighashFromStr error message
Github-Pull: #29870
Rebased-From: fa6ab0d020
2024-05-23 17:05:57 +01:00
willcl-ark
6685affe92 rpc: move UniValue in blockToJSON
Without explicitly declaring the move, these UniValues get copied,
causing increased memory usage. Fix this by explicitly moving the
UniValue objects.

Used by `rest_block` and `getblock` RPC.

Github-Pull: #30094
Rebased-From: b77bad309e
2024-05-23 17:05:57 +01:00
laanwj
7f45e00174 depends: Fix build of Qt for 32-bit platforms
The 32 to 64-bit time_t transition causes a build failure in the built-in
zlib about conflicting _TIME_BITS and _FILE_OFFSET_BITS.

Note that zlib doesn't use time_t at all, so it is a false alarm.

Take the following patch from upstream zlib:
a566e156b3.patch

Closes #29980.

Github-Pull: #29985
Rebased-From: 2e266f33b5
2024-05-23 17:05:57 +01:00
laanwj
f9b76bae57 ci: Pull in qtbase5-dev instead of seperate low-level libraries
Fix CI build for t64 migration.

Github-Pull: #29764
Rebased-From: 6c2990416e
2024-05-23 17:05:57 +01:00
laanwj
c587753f48 doc: Suggest installing dev packages for debian/ubuntu qt5 build
Pretty much all library packages were renamed in the 64-bit time_t
migration to add `t64` (even on 64-bit platforms).

Instead of complicating the doc with conditional package names, suggest
installing the `-dev` packages which still have the same name, and
besides that, are the right way to go about it as they contain the
"user facing" C++ headers needed to build against Qt5.

For Fedora, devel packages are already suggested.

This affects Ubuntu 24.04 and Debian Testing.

Github-Pull: #29764
Rebased-From: a3c6a13cb2
2024-05-23 17:05:57 +01:00
MarcoFalke
7ecdb0846d ci: Bump s390x to ubuntu:24.04
Re-enable feature_init

Github-Pull: #29856
Rebased-From: fadf7e90dc
2024-05-23 17:05:57 +01:00
Antoine Poinsot
d9ef6cf934 sign: don't assume we are parsing a sane Miniscript
The script provided for signature might be externally provided, for
instance by way of 'finalizepsbt'. Therefore the script might be
ill-crafted, so don't assume pubkeys are always 32 bytes.

Thanks to Niklas for finding this.

Github-Pull: #29853
Rebased-From: 4d8d21320e
2024-05-23 17:05:57 +01:00
fanquake
e4859c82c7 depends: fix mingw-w64 Qt DEBUG=1 build
The issue is that compilation is done with `x86_64-w64-mingw32-g++-posix`,
but then linking is done with `x86_64-w64-mingw32-g++`.

I'm guessing this has been broken since #24131
(01d1845a80), but have not checked.

Fixes #29734.
Unblocks #29527 (now DEBUG=1 builds can be tested).

Github-Pull: #29747
Rebased-From: b7e7e727ab
2024-05-23 17:05:57 +01:00
nanlour
bb46b90b2e Fix #29767, set m_synced = true after Commit()
Github-Pull: #29776
Rebased-From: bbe82c116e
2024-05-23 17:05:22 +01:00
Jameson Lopp
bf5b6fc8a7 Throw error if invalid parameters passed to getnetworkhashps RPC endpoint
Github-Pull: #28554
Rebased-From: 9ac114e5cd
2024-04-17 13:47:50 +01:00
dergoegge
a81a9228fb [rpc, bugfix] Enforce maximum value for setmocktime
Github-Pull: #29869
Rebased-From: c2e0489b71
2024-04-17 13:28:13 +01:00
Luke Dashjr
d39ea519c7 Change Luke Dashjr seed to dashjr-list-of-p2p-nodes.us
To avoid issues with DNS blacklisting, I've setup a separate domain for my DNS seed.

Github-Pull: #29691
Rebased-From: 4f273ab436
2024-04-17 13:28:13 +01:00
glozow
c21bbcc898 [doc] archive 26.1 release notes 2024-04-17 13:28:13 +01:00
fanquake
0b4aa31c34
Merge bitcoin/bitcoin#29719: [26.x] final changes for 26.1
cc0553d0d6 [doc] add manual pages for 26.1 (glozow)
785242dd4c [doc] update release notes 26.1 (glozow)
5f06dcf9c9 [build] bump version to 26.1 final (glozow)
b53bf22c72 ci, macos: Use `--break-system-packages` with Homebrew's python (Hennadii Stepanov)
324e562399 ci: Add workaround for Homebrew's python link error (Hennadii Stepanov)

Pull request description:

  Final changes for `v26.1`.

  Bins for rc2 have been available for 10 days and I haven't seen any bug reports or new things to add.
  Includes #29610 backport for the CI, which has no effect on what goes into the release.
  Website PR: https://github.com/bitcoin-core/bitcoincore.org/pull/1009

ACKs for top commit:
  hebasto:
    ACK cc0553d0d6.
  fanquake:
    ACK cc0553d0d6
  stickies-v:
    ACK cc0553d0d6 (modulo CI passing)

Tree-SHA512: d032157c7cdf07a474e40b947f7e51bfc6a8e280e43345522bad67b6ad449d473f29bf03ee845b2e403693c1c81078589d042337c895eceb8a59cb4340432887
2024-03-25 16:51:08 +00:00
glozow
cc0553d0d6 [doc] add manual pages for 26.1 2024-03-25 10:01:44 +00:00
glozow
785242dd4c [doc] update release notes 26.1 2024-03-25 10:01:43 +00:00
glozow
5f06dcf9c9 [build] bump version to 26.1 final 2024-03-25 10:01:13 +00:00
Hennadii Stepanov
b53bf22c72 ci, macos: Use --break-system-packages with Homebrew's python
Homebrew's python@3.12 is marked as externally managed (PEP 668),
necessitating different approaches for installing Python packages.

For more details, please refer to https://github.com/orgs/Homebrew/discussions/3404.

Github-Pull: #29610
Rebased-From: acc06bc91f
2024-03-25 09:59:31 +00:00
Hennadii Stepanov
324e562399 ci: Add workaround for Homebrew's python link error
Promoting Homebrew's python@3.12 to the default python3 breaks symbolic
links on macOS x86_64.

This change adds a workaround for that issue.

Also see: https://github.com/actions/runner-images/issues/9471 etc.

Github-Pull: #29610
Rebased-From: ae5f72027f
2024-03-25 09:59:07 +00:00
glozow
c33e83a53a
Merge bitcoin/bitcoin#29509: [26.x] backports and final changes for v26.1rc2
c68d4d0ac5 [doc] update manual pages for v26.1rc2 (glozow)
bd715bfb30 [build] bump version to v26.1rc2 (glozow)
b6d006d2a2 update release notes 26.1 (glozow)
fce992b38e fuzz: restrict fopencookie usage to Linux & FreeBSD (fanquake)
40c56a4d13 test: make sure keypool sizes do not change on `getrawchangeaddress`/`getnewaddress` failures (UdjinM6)
7c82b2758c wallet: Avoid updating `ReserveDestination::nIndex` when `GetReservedDestination` fails (UdjinM6)
b5419ce6b6 p2p: Don't consider blocks mutated if they don't connect to known prev block (Greg Sanders)
0535c253fe [test] IsBlockMutated unit tests (dergoegge)
8141498f3a [validation] Cache merkle root and witness commitment checks (dergoegge)
0c5c5962cb [test] Add regression test for #27608 (dergoegge)
24736350e9 [net processing] Don't process mutated blocks (dergoegge)
50c0b61a9d [validation] Merkle root malleation should be caught by IsBlockMutated (dergoegge)
aff368fa81 [validation] Introduce IsBlockMutated (dergoegge)
076c67c3aa [refactor] Cleanup merkle root checks (dergoegge)
97a1d0a459 [validation] Isolate merkle root checks (dergoegge)
4ac0eb543d test: Drop `x` modifier in `fsbridge::fopen` call for mingw builds (Hennadii Stepanov)

Pull request description:

  Includes:
  - #29357
  - #29412
  - #29524
  - #29510
  - #29529

  Also does:
  - update to release notes
  - bump to rc2
  - manpages
  - (no changes to bitcoin.conf)

ACKs for top commit:
  achow101:
    ACK c68d4d0ac5

Tree-SHA512: 2f8c3dd705e3f9f33403b3cc17e8006510ff827d7dbd609b09732a1669964e9b001cfecdc63d8d8daeb8f39c652e1e4ad0aac873d44d259c21803de85688ed2b
2024-03-11 09:54:18 +00:00
glozow
c68d4d0ac5 [doc] update manual pages for v26.1rc2 2024-03-07 10:51:31 +00:00
glozow
bd715bfb30 [build] bump version to v26.1rc2 2024-03-07 10:47:19 +00:00
glozow
b6d006d2a2 update release notes 26.1 2024-03-07 10:45:40 +00:00
fanquake
fce992b38e fuzz: restrict fopencookie usage to Linux & FreeBSD
Should fix the GCC compilation portion of #29517:
https://github.com/bitcoin/bitcoin/issues/29517#issuecomment-1973573314.

See also:
https://www.gnu.org/software/gnulib/manual/html_node/fopencookie.html
but note that FreeBSD has supported this function since 11.x.

Github-Pull: #29529
Rebased-From: 312f3381a2
2024-03-07 10:45:14 +00:00
UdjinM6
40c56a4d13 test: make sure keypool sizes do not change on getrawchangeaddress/getnewaddress failures
Github-Pull: #29510
Rebased-From: e073f1dfda
2024-03-05 10:50:03 +00:00
UdjinM6
7c82b2758c wallet: Avoid updating ReserveDestination::nIndex when GetReservedDestination fails
Github-Pull: #29510
Rebased-From: 367bb7a80c
2024-03-05 10:49:41 +00:00
Greg Sanders
b5419ce6b6 p2p: Don't consider blocks mutated if they don't connect to known prev block
Github-Pull: #29524
Rebased-From: a1fbde0ef7
2024-03-05 10:47:50 +00:00
dergoegge
0535c253fe [test] IsBlockMutated unit tests
Github-Pull: #29412
Rebased-From: d8087adc7e
2024-03-05 10:46:15 +00:00
dergoegge
8141498f3a [validation] Cache merkle root and witness commitment checks
Slight performance improvement by avoiding duplicate work.

Github-Pull: #29412
Rebased-From: 1ec6bbeb8d
2024-03-05 10:24:35 +00:00