Commit graph

37330 commits

Author SHA1 Message Date
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: 7cb88c8b46
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: dd9633b516
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: cc781a2180
2023-07-21 09:38:35 +01:00
furszy
37d9cc657c
test: wallet, add coverage for addressbook migration
Github-Pull: #28038
Rebased-From: 7ecc29a0b7
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: a277f8357a
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: 1b64f6498c
2023-07-07 17:30:53 +01:00
fanquake
8825983716
Merge bitcoin/bitcoin#27752: [25.x] Parallel compact block downloads
b8ad3220a9 Unconditionally return when compact block status == READ_STATUS_FAILED (Greg Sanders)
cdd3de08e3 Add tests for parallel compact block downloads (Greg Sanders)
e66a5cbb56 Support up to 3 parallel compact block txn fetchings (Greg Sanders)
d1a93f5d41 Only request full blocks from the peer we thought had the block in-flight (Greg Sanders)
38e3af9fad Convert mapBlocksInFlight to a multimap (Greg Sanders)
a45159b8e2 Remove nBlocksInFlight (Greg Sanders)
722361e129 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 b8ad3220a9 ; 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: d972695797
2023-06-16 10:17:22 +01:00
Greg Sanders
cdd3de08e3
Add tests for parallel compact block downloads
Github-Pull: #27626
Rebased-From: d7f359b35e
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: 03423f8bd1
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: 13f9b20b4c
2023-06-16 10:17:22 +01:00
Greg Sanders
38e3af9fad
Convert mapBlocksInFlight to a multimap
Github-Pull: #27626
Rebased-From: cce96182ba
2023-06-16 10:17:22 +01:00
Greg Sanders
a45159b8e2
Remove nBlocksInFlight
Github-Pull: #27626
Rebased-From: a90595478d
2023-06-16 10:17:21 +01:00
Greg Sanders
722361e129
alias BlockDownloadMap for mapBlocksInFlight
Github-Pull: #27626
Rebased-From: 86cff8bf18
2023-06-16 10:17:21 +01:00
fanquake
642b5dd1b4
Merge bitcoin/bitcoin#27887: [25.x] Backports
6233049709 ci: Switch to `amd64` container in "ARM" task (Hennadii Stepanov)
d845a3ed21 test: add coverage for `/deploymentinfo` passing a blockhash (brunoerg)
72ead8699f rest: bugfix, fix crash error when calling `/deploymentinfo` (brunoerg)
6f7a0ae58b ci: Use podman stop over podman kill (MarcoFalke)
de56daab41 ci: Use podman for persistent workers (MarcoFalke)
71f626ef2c 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 6233049709

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: 016fe6d828
2023-06-15 10:38:29 +01:00
brunoerg
d845a3ed21
test: add coverage for /deploymentinfo passing a blockhash
Github-Pull: #27853
Rebased-From: 7d452d826a
2023-06-15 10:38:29 +01:00
brunoerg
72ead8699f
rest: bugfix, fix crash error when calling /deploymentinfo
Github-Pull: #27853
Rebased-From: ce887eaf49
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: faaa62754e
2023-06-15 10:38:28 +01:00
MarcoFalke
de56daab41
ci: Use podman for persistent workers
Github-Pull: #27777
Rebased-From: fa123077bc
2023-06-15 10:38:19 +01:00
MarcoFalke
71f626ef2c
ci: Prune dangling images on RESTART_CI_DOCKER_BEFORE_RUN
Github-Pull: #27777
Rebased-From: fa9c65a74c
2023-06-15 10:38:10 +01:00
fanquake
cda3fe2808
Merge bitcoin/bitcoin#27775: [25.x] build: disable boost multi index safe mode
9dc5848492 build: disable boost multi index safe mode (willcl-ark)

Pull request description:

  Backports https://github.com/bitcoin/bitcoin/pull/27724 to `25.x`.

ACKs for top commit:
  stickies-v:
    ACK 9dc584849

Tree-SHA512: 5f156424bbd86caac6ace933b807cd62a21067bcfa7f572d6efeff2622ba0b15401038a3b06fe00d84cf62b5d9b8a9e101650d145683a21fa890c18a9c2bd4b6
2023-06-02 10:09:44 +01:00
willcl-ark
9dc5848492
build: disable boost multi index safe mode
Disable boost multi index safe mode by default when configuring with
--enable-debug.

This option can cause transactions to take a long time to be accepted
into the mempool under certain conditions; iterator destruction takes
O(n) time vs O(1) as they are stored in a singly linked list. See
27586 for more information.

Re-enable it on the CI builds which previously had it enabled.

Re-enable it on the msan fuzz target so that we have fuzz tasks testing
with it enabeld and disabled in this repo.

Github-Pull: #27724
Rebased-From: 59c8944749
2023-05-29 17:14:00 +01:00
fanquake
725c3dc2dd
Merge bitcoin/bitcoin#27750: [25.x] rpc: Fix invalid bech32 handling
796e1145a9 rpc: Fix invalid bech32 handling (MarcoFalke)

Pull request description:

  Backports https://github.com/bitcoin/bitcoin/pull/27727 to 25.x.

ACKs for top commit:
  MarcoFalke:
    clean cherry-pick ACK 796e1145a9 💼

Tree-SHA512: 2dd2064546b422160ddcc2c544ae18ef24179d31289bdedfa2e34fc0edaaec71d9b3f2a19a81bfce3f4d90bbd59daccc96cda8a3df42b5a453a9a240f48114bf
2023-05-25 15:50:42 +01:00
MarcoFalke
796e1145a9
rpc: Fix invalid bech32 handling
Github-Pull: #27727
Rebased-From: eeee55f928
2023-05-25 11:15:27 +01:00
fanquake
8105bce5b3
Merge bitcoin/bitcoin#27686: 25.0 Final Changes
6ee3881551 doc: update release notes for 25.0 (fanquake)
51195ea570 doc: update manual pages for 25.0 (fanquake)
8f7db443e9 build: bump version to v25.0 final (fanquake)

Pull request description:

  Final changes for v25.0.
  PR for bitcoincore.org is here: https://github.com/bitcoin-core/bitcoincore.org/pull/970.

ACKs for top commit:
  dergoegge:
    ACK 6ee3881551

Tree-SHA512: 7325e7d2747fbbeaa7efa9ceebfef56121d6866441fc4f3f9e95e67ab8ad7d4e518db4f545c214f1b677eaea84f28c1ea4f790aaf993a20904c76c3592406fd6
2023-05-25 11:10:39 +01:00
fanquake
6ee3881551
doc: update release notes for 25.0 2023-05-24 11:29:57 +01:00
fanquake
51195ea570
doc: update manual pages for 25.0 2023-05-19 12:17:31 +01:00
fanquake
8f7db443e9
build: bump version to v25.0 final 2023-05-19 12:12:58 +01:00
fanquake
8996da626d
Merge bitcoin/bitcoin#27613: [25.0] Backports for rc2
49a2d66f4e doc: update manual pages for v25.0rc2 (fanquake)
3ea4a115c2 build: bump version to v25.0rc2 (fanquake)
7ef71e30c9 net_processing: Boost inv trickle rate (Anthony Towns)
1adbcd302f txmempool: have CompareDepthAndScore sort missing txs first (Anthony Towns)
9a23079df3 p2p: Avoid prematurely clearing download state for other peers (Suhas Daftuar)

Pull request description:

  Backports for rc2. Currently:
  * https://github.com/bitcoin/bitcoin/pull/27608
  * https://github.com/bitcoin/bitcoin/pull/27610

ACKs for top commit:
  achow101:
    ACK 49a2d66f4e

Tree-SHA512: a1a7678e16136636ec8a232d12630529639bae3b577769b5a5fd204dda234a5e588f3d4dfebf4d7abe7111d13cc0714f9ccdea0a858fe821a7146e6a697308d3
2023-05-11 19:15:53 +01:00
fanquake
49a2d66f4e
doc: update manual pages for v25.0rc2 2023-05-11 18:27:32 +01:00
fanquake
3ea4a115c2
build: bump version to v25.0rc2 2023-05-11 18:22:01 +01:00
Anthony Towns
7ef71e30c9
net_processing: Boost inv trickle rate
If transactions are being added to the mempool at a rate faster than 7tx/s
(INVENTORY_BROADCAST_PER_SECOND) then peers' inventory_to_send queue can
become relatively large. If this happens, increase the number of txids
we include in an INV message (normally capped at 35) by 5 for each 1000
txids in the queue.

This will tend to clear a temporary excess out reasonably quickly; an
excess of 4000 invs to send will be cleared down to 1000 in about 30
minutes, while an excess of 20000 invs would be cleared down to 1000 in
about 60 minutes.

Github-Pull: #27610
Rebased-From: 5b3406094f
2023-05-11 14:30:20 +01:00
Anthony Towns
1adbcd302f
txmempool: have CompareDepthAndScore sort missing txs first
We use CompareDepthAndScore to choose an order of txs to inv. Rather
than sorting txs that have been evicted from the mempool at the end
of the list, sort them at the beginning so they are removed from
the queue immediately.

Github-Pull: #27610
Rebased-From: 228e9201ef
2023-05-11 14:29:54 +01:00
Suhas Daftuar
9a23079df3
p2p: Avoid prematurely clearing download state for other peers
Github-Pull: #27608
Rebased-From: 52e52071e0
2023-05-10 10:14:17 +01:00
fanquake
fcdd7b9e53
Merge bitcoin/bitcoin#27517: qt: 25.0rc2 translations update
20c076d056 qt: 25.0rc2 translations update (Hennadii Stepanov)

Pull request description:

  This PR follows our [Release Process](https://github.com/bitcoin/bitcoin/blob/master/doc/release-process.md#before-every-release-candidate) and 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.

  Unfortunately, it wasn't done before `v25.0rc1` tagging. Therefore, it is expected to be merged just before the `v25.0rc2` tag (I commit to keep this PR updated on a daily basis).

  All developers with non-English native languages are welcome to skim through their language translation files and look for any malicious content, such as "official technical support for a stuck transaction", etc.

ACKs for top commit:
  jarolrod:
    ACK 20c076d056

Tree-SHA512: a96856b059ec8e2d05eb03f7b2d6505e8fe384e7139e0ad7781b38e4f90b37ec8cb89d822a10467a45e5397d5fe82bb68d5675b6ad9749df71e8c219a28f901a
2023-05-09 14:52:01 +01:00
Hennadii Stepanov
20c076d056
qt: 25.0rc2 translations update 2023-05-03 21:03:14 +01:00
Andrew Chow
079957d2ba
Merge bitcoin/bitcoin#27504: [25.x] Bump version to 25.0rc1
cf5850688d doc: generate example bitcoin.conf for v25.0rc1 (fanquake)
51af8957c5 doc: generate manual pages for v25.0rc1 (fanquake)
46accc7617 doc: point release-notes.md to the dev wiki (fanquake)
7a807eb735 doc: update version number in bips.md to v25.0 (fanquake)
0ff26b8c0f build: bump version to v25.0rc1 (fanquake)

Pull request description:

  Bump the version number.
  Generate the man pages.
  Generate example bitcoin.conf.
  Point release-notes.md to the wiki: https://github.com/bitcoin-core/bitcoin-devwiki/wiki/25.0-Release-Notes-Draft.
  Bump the version number in bips.md.

ACKs for top commit:
  achow101:
    ACK cf5850688d

Tree-SHA512: 0f8065b33aff8d39f5ab969eea22c0161ebc984cff90f0f9496706af3b1199f4c8ec06e67d7db68cf103550f0d1f5c0f1aba493acf27f65f341f7865b152b293
2023-04-20 16:39:59 -04:00
fanquake
cf5850688d
doc: generate example bitcoin.conf for v25.0rc1 2023-04-20 21:24:16 +01:00
fanquake
51af8957c5
doc: generate manual pages for v25.0rc1 2023-04-20 21:24:16 +01:00
fanquake
46accc7617
doc: point release-notes.md to the dev wiki 2023-04-20 21:24:04 +01:00
fanquake
7a807eb735
doc: update version number in bips.md to v25.0 2023-04-20 21:24:04 +01:00
fanquake
0ff26b8c0f
build: bump version to v25.0rc1 2023-04-20 21:24:04 +01:00
fanquake
bbbf89a9de
Merge bitcoin/bitcoin#27503: Bump to 25.99 and remove release note fragments
9c24826e7b doc: Remove 25.0 release note fragments (Andrew Chow)
088a93dce8 build: Bump to 25.99 (Andrew Chow)

Pull request description:

  Pre-25.x branch off version bump and release note fragments removal.

  The 25.0 draft release notes are in the dev wiki: https://github.com/bitcoin-core/bitcoin-devwiki/wiki/25.0-Release-Notes-Draft

ACKs for top commit:
  fanquake:
    ACK 9c24826e7b

Tree-SHA512: f7c7b04aa904e946bc672b5b07082a819b9d76ebccda0838bc27d0e6179cfb88b8f110500d5ea815f711580916bcfa0275774ec50a7298a4c66e645647111125
2023-04-20 20:51:20 +01:00
Andrew Chow
9c24826e7b doc: Remove 25.0 release note fragments 2023-04-20 14:01:06 -04:00
Andrew Chow
088a93dce8 build: Bump to 25.99 2023-04-20 13:58:00 -04:00
Andrew Chow
6db0a3002b
Merge bitcoin/bitcoin#27488: p2p: update hardcoded mainnet seeds for 25.x
31b1798d2c p2p: update hardcoded mainnet seeds for 25.x (Jon Atack)
04dd1d3926 contrib: make-seeds updates for 25.x (Jon Atack)
f5c8788628 p2p: update manual tor/i2p/cjdns mainnet seeds for 25.x (Jon Atack)

Pull request description:

  Update the hardcoded P2P network seeds for 25.x after updating the manual seeds and the generation script as necessary. Previous update was #25911.

  The manual seeds are selected for reachability, uptime and service bit 1 and/or curated trusted peers. We need more Tor and CJDNS seeds and some of the current Tor and I2P seeds are no longer reachable.

  Can be tested by following the steps in `contrib/seeds/README.md` and verifying the manual seeds by checking their presence and services in getnodeaddresses and/or connecting to them and checking their services with getpeerinfo and behavior with -netinfo.

  Tool output:

  ```
  $ python3 makeseeds.py -a asmap-filled.dat -s seeds_main.txt > nodes_main.txt

  Loading asmap database "asmap-filled.dat"…Done.
  Loading and parsing DNS seeds…Done.
    IPv4   IPv6  Onion Pass
    3972   1118      0 Initial
    3972   1118      0 Skip entries with invalid address
    3972   1118      0 After removing duplicates
    3946   1112      0 Enforce minimal number of blocks
    3946   1112      0 Require service bit 1
    2791    798      0 Require minimum uptime
    2757    788      0 Require a known and recent user agent
    2757    788      0 Filter out hosts with multiple bitcoin ports
     512    289      0 Look up ASNs and limit results per ASN and per net```

ACKs for top commit:
  achow101:
    ACK 31b1798d2c
  mzumsande:
    reACK 31b1798d2c

Tree-SHA512: 40cdd0ac74e3d26975ab688ee4af09bedcf15f6e02311757b27c91aafdc4da16cca2be90fee767207bb4ccd542ad19197e4d5e00011185018239de35da19c174
2023-04-20 13:42:01 -04:00
Jon Atack
31b1798d2c p2p: update hardcoded mainnet seeds for 25.x 2023-04-20 06:08:22 -07:00
Jon Atack
04dd1d3926 contrib: make-seeds updates for 25.x
and make the steps in /contrib/seeds/README.md easier to copy-paste
2023-04-20 06:08:22 -07:00
Jon Atack
f5c8788628 p2p: update manual tor/i2p/cjdns mainnet seeds for 25.x
selected for reachability, uptime, and service bit 1
2023-04-20 06:08:22 -07:00