Commit graph

552 commits

Author SHA1 Message Date
Byron Hambly
0c3e3643e0
Merge 014f52550b into merged_master (Bitcoin PR bitcoin/bitcoin#29186) 2025-11-18 09:54:57 +02:00
Byron Hambly
295f98e6d8
Merge 925a750d99 into merged_master (Bitcoin PR bitcoin/bitcoin#28844) 2025-11-17 19:09:22 +02:00
Byron Hambly
95b25a3028
Merge dce1dfbc47 into merged_master (Bitcoin PR bitcoin/bitcoin#28622) 2025-11-11 15:25:58 +02:00
Byron Hambly
402de2f938
Merge 1c8893bd1c into merged_master (Bitcoin PR bitcoin/bitcoin#28852) 2025-11-11 15:00:48 +02:00
Byron Hambly
1a150831f3
Merge 98b0acda0f into merged_master (Bitcoin PR bitcoin/bitcoin#28725) 2025-11-10 14:40:43 +02:00
Byron Hambly
9af1cbdb3f
Merge fb85bb2776 into merged_master (Bitcoin PR bitcoin/bitcoin#28783) 2025-11-06 11:38:25 +02:00
Byron Hambly
0362700e4e
Merge da8e397e4a into merged_master (Bitcoin PR bitcoin/bitcoin#28685) 2025-08-07 16:07:18 +02:00
Byron Hambly
64123a22f8
Merge 4caa10b580 into merged_master (Bitcoin PR bitcoin/bitcoin#28628) 2025-08-07 12:23:49 +02:00
Byron Hambly
e89707551e
Merge 76d89579b5 into merged_master (Bitcoin PR bitcoin/bitcoin#28630) 2025-08-07 12:20:14 +02:00
Byron Hambly
95a30fbffd
Merge 73dfa6da08 into merged_master (Bitcoin PR bitcoin/bitcoin#28631) 2025-08-07 09:20:55 +02:00
Byron Hambly
f8e8fd3a2d
Merge 154404e33f into merged_master (Bitcoin PR bitcoin/bitcoin#28624) 2025-08-06 20:35:59 +02:00
Byron Hambly
d01090d0df
Merge 3003861e78 into merged_master (Bitcoin PR bitcoin/bitcoin#28591) 2025-08-06 20:35:02 +02:00
Byron Hambly
37d3b62c98
Merge 2eacc61ad7 into merged_master (Bitcoin PR bitcoin/bitcoin#25970) 2025-08-06 15:10:33 +02:00
Byron Hambly
7fc909ab98
Merge e7b0004b37 into merged_master (Bitcoin PR bitcoin/bitcoin#27596)
ELEMENTS TODO assumeutxo for liquidv1
2025-08-06 14:33:15 +02:00
Byron Hambly
6a868386b5 Merge 7bf078f2b7 into merged_master (Bitcoin PR bitcoin/bitcoin#28237) 2025-07-04 21:24:50 +02:00
Byron Hambly
9af357b0e0 Merge 6c508ac3ff into merged_master (Bitcoin PR bitcoin/bitcoin#28258) 2025-07-03 21:09:40 +02:00
Byron Hambly
f093f750f2 Merge 3654d84c6f into merged_master (Bitcoin PR bitcoin/bitcoin#28245) 2025-07-03 21:09:37 +02:00
Byron Hambly
81083d47bf Merge 624333455a into merged_master (Bitcoin PR bitcoin/bitcoin#26296) 2025-07-03 20:38:42 +02:00
Byron Hambly
82e4ff741b Merge 1fde20faf8 into merged_master (Bitcoin PR bitcoin/bitcoin#28099) 2025-07-02 17:41:56 +02:00
Byron Hambly
55c95fd927 Merge c123e1d215 into merged_master (Bitcoin PR bitcoin/bitcoin#28069) 2025-07-01 13:34:08 +02:00
Byron Hambly
f86b72b128 Merge a8bd0fef25 into merged_master (Bitcoin PR bitcoin/bitcoin#27999) 2025-06-30 15:00:23 +02:00
Byron Hambly
04fc205a18 Merge 3367e1c850 into merged_master (Bitcoin PR bitcoin/bitcoin#28009) 2025-06-30 15:00:21 +02:00
Byron Hambly
acab5dd981 Merge ec822e88dd into merged_master (Bitcoin PR bitcoin/bitcoin#27813) 2025-06-30 13:48:25 +02:00
Byron Hambly
16d9ef4a8c Merge 35b01e8504 into merged_master (Bitcoin PR bitcoin/bitcoin#27676) 2025-06-28 09:59:07 +02:00
Byron Hambly
2acb8b75bf Merge 6cf47a8f44 into merged_master (Bitcoin PR bitcoin/bitcoin#27507) 2025-06-25 10:21:36 +02:00
Byron Hambly
53a14af7d9 Merge 49d543dcaf into merged_master (Bitcoin PR bitcoin/bitcoin#26953) 2025-05-15 13:12:50 +02:00
Tom Trevethan
fad4c02c57 Merge 0c579203d2 into merged_master (Bitcoin PR bitcoin/bitcoin#25867) 2025-04-08 12:33:05 +00:00
Byron Hambly
54025896c4 Merge fe1b325688 into merged_master (Bitcoin PR bitcoin/bitcoin#27029) 2025-04-06 21:44:29 +02:00
Byron Hambly
30170c6bd9 Merge aef8b4f43b into merged_master (Bitcoin PR bitcoin/bitcoin#26226) 2025-04-03 11:42:16 +02:00
Byron Hambly
4b62493f28 Merge 0c2a1288a2 into merged_master (Bitcoin PR bitcoin/bitcoin#26835) 2025-04-02 10:02:41 +02:00
Byron Hambly
b4405ba453 Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750) 2025-03-31 16:37:52 +02:00
Byron Hambly
6658d3ce4b Merge 9c47eb4503 into merged_master (Bitcoin PR bitcoin/bitcoin#26446) 2025-03-03 15:12:03 +02:00
Byron Hambly
ca0a68b350
Merge UP TO 551c8e9526 into merged_master (UP TO bitcoin/bitcoin#26349)
Includes FIXMEs for a few functional tests
2025-02-05 09:50:17 +02:00
Byron Hambly
24ef305cd0 Merge a9ffebddbe into merged_master (Bitcoin PR bitcoin/bitcoin#26075) 2024-11-27 11:25:12 +02:00
Byron Hambly
076e809b74 Merge 821f5c824f into merged_master (Bitcoin PR bitcoin/bitcoin#25487) 2024-10-17 09:16:23 +02:00
James Dorfman
6d638f8e4d Merge a09033e22c into merged_master (Bitcoin PR bitcoin/bitcoin#25409) 2024-09-16 00:03:15 +00:00
James Dorfman
941d1a4586 Merge 3b3c66f859 into merged_master (Bitcoin PR bitcoin/bitcoin#25392) 2024-09-10 23:50:46 +00:00
James Dorfman
ac7b05a27d Merge 8035b5c80d into merged_master (Bitcoin PR bitcoin/bitcoin#25369) 2024-09-10 20:10:06 +00:00
James Dorfman
b6df20eb34 Merge d4475ea7ae into merged_master (Bitcoin PR bitcoin/bitcoin#22235) 2024-08-09 04:52:58 +00:00
James Dorfman
ede65a76c3 Merge 0047d9b89b into merged_master (Bitcoin PR bitcoin/bitcoin#24993) 2024-08-09 04:20:20 +00:00
James Dorfman
7ed5fcfb0f Merge 9446de160f into merged_master (Bitcoin PR bitcoin/bitcoin#24831) 2024-08-06 18:50:35 +00:00
James Dorfman
9d2e5152cd Merge bdbabc50ba into merged_master (Bitcoin PR bitcoin/bitcoin#24561) 2024-05-24 00:32:01 +00:00
Hennadii Stepanov
a395218d8c
ci, iwyu: Drop backported mappings
See https://github.com/include-what-you-use/include-what-you-use/pull/1026
2024-01-05 16:01:52 +00:00
fanquake
925a750d99
Merge bitcoin/bitcoin#28844: contrib: drop GCC MAX_VERSION to 4.3.0 in symbol-check
ff896d2581 contrib: drop GCC MAX_VERSION to 4.3.0 in symbol-check (fanquake)

Pull request description:

  Reflect the actual symbols used, i.e:

  ```bash
  bitcoind: symbol __bswapsi2 from unsupported version GCC_4.3.0(7)
  ```

ACKs for top commit:
  TheCharlatan:
    ACK ff896d2581

Tree-SHA512: b38ff8f4dd78d2d1c9063c53544dc4f240c3043f142e1581f7ba42f088a509293f6f17cc402c60ac82bff3b36668866b87e0e9e4d10d929484bb4c7a3e654f25
2023-12-18 12:48:14 +00:00
fanquake
8ea45e626e
build: use macOS 14 SDK (Xcode 15.0) 2023-12-05 09:55:01 +00:00
Ryan Ofsky
1c8893bd1c
Merge bitcoin/bitcoin#28852: script, assumeutxo: Enhance validations in utxo_snapshot.sh
11b7269d83 script: Enhance validations in utxo_snapshot.sh (pablomartin4btc)

Pull request description:

  This PR resolves #27841 and some more:

  - Ensure that the snapshot height is higher than the pruned block height when the node is pruned (Suggested by @Sjors [here](https://github.com/bitcoin/bitcoin/pull/28553#issuecomment-1804941396)).

  - Validate the correctness of the file path and check if the file already exists (@hazeycode's [#27845](https://github.com/bitcoin/bitcoin/pull/27845)).

  - Make network activity disablement optional for the user (Suggested by @Sjors [here](https://github.com/bitcoin/bitcoin/pull/16899#discussion_r342735815) and [here](https://github.com/bitcoin/bitcoin/pull/16899#issuecomment-536520911)).

  - Ensure the `reconsiderblock` command is triggered on exit (@hazeycode's same PR as above), even in the case of user interruption (Ctrl-C).

  In order to perform some testing please follow the instructions in the description of previous @hazeycode's PR #27845.

ACKs for top commit:
  Sjors:
    tACK 11b7269d83
  ryanofsky:
    Code review ACK 11b7269d83

Tree-SHA512: 2b699894c6f732ad5104f5a2bcf5dc86ed31edcc9d664690cab55b94a8ab00e2ca5bde901ee1d63acddca7ea80ad1734d8cfe78f9c02f8470f264fe93a2af759
2023-12-04 17:07:14 -05:00
fanquake
ff896d2581
contrib: drop GCC MAX_VERSION to 4.3.0 in symbol-check
Reflect the actual symbols used, i.e:

```bash
bitcoind: symbol __bswapsi2 from unsupported version GCC_4.3.0(7)
```
2023-11-30 17:42:26 +00:00
fanquake
98b0acda0f
Merge bitcoin/bitcoin#28725: test: refactor: use built-in collection types for type hints (Python 3.9 / PEP 585)
a478c817b2 test: replace `Callable`/`Iterable` with their `collections.abc` alternative (PEP 585) (stickies-v)
4b9afb18e6 scripted-diff: use PEP 585 built-in collection types for verify-binary script (Sebastian Falbesoner)
d516cf83ed test: use built-in collection types for type hints (Python 3.9 / PEP 585) (Sebastian Falbesoner)

Pull request description:

  With Python 3.9 / [PEP 585](https://peps.python.org/pep-0585/), [type hinting has become a little less awkward](https://docs.python.org/3.9/whatsnew/3.9.html#type-hinting-generics-in-standard-collections), as for collection types one doesn't need to import the corresponding capitalized types (`Dict`, `List`, `Set`, `Tuple`, ...) anymore, but can use the built-in types directly (see  https://peps.python.org/pep-0585/#implementation for the full list).

  This PR applies the replacement for all Python scripts (i.e. in the contrib and test folders) for the basic types, i.e.:

  - typing.Dict -> dict
  - typing.List -> list
  - typing.Set  -> set
  - typing.Tuple -> tuple

  For an additional check, I ran mypy 1.6.1 on both master and the PR branch via
  ```
  $ mypy --ignore-missing-imports --explicit-package-bases $(git ls-files "*.py")
  ```
  and verified that the output is identical -- (from the 22 identified problems, most look like false-positives, it's probably worth it to go deeper here and address them in a follow-up though).

ACKs for top commit:
  stickies-v:
    ACK a478c817b2
  fanquake:
    ACK a478c817b2

Tree-SHA512: 6948c905f6abd644d84f09fcb3661d7edb2742e8f2b28560008697d251d77a61a1146ab4b070e65b0d27acede7a5256703da7bf6eb1c7c3a897755478c76c6e8
2023-11-17 11:19:17 +00:00
pablomartin4btc
11b7269d83 script: Enhance validations in utxo_snapshot.sh
- Ensure that the snapshot height is higher than the pruned block height when the node is pruned.
- Validate the correctness of the file path and check if the file already exists.
- Make network activity disablement optional for the user.
- Ensure the reconsiderblock command is triggered on exit, even in the case of user interruption (Ctrl-C).

Co-authored-by: Chris Heyes <22148308+hazeycode@users.noreply.github.com>
Co-authored-by: Sjors Provoost <sjors@sprovoost.nl>
2023-11-13 19:01:07 -03:00
fanquake
45257601da
build: remove -bind_at_load usage
This is deprecated on macOS:
```bash
ld: warning: -bind_at_load is deprecated on macOS
```
and likely redundant anyways, given the behaviour of dyld3.

Unfortunately libtool is still injecting a `-bind_at_load`:
```bash
	# Don't allow lazy linking, it breaks C++ global constructors
	# But is supposedly fixed on 10.4 or later (yay!).
	if test CXX = "$tagname"; then
	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
	    10.[0123])
	      func_append compile_command " $wl-bind_at_load"
	      func_append finalize_command " $wl-bind_at_load"
	    ;;
	  esac
	fi
```
so this doesn't remove all the warnings, but removes us as a potential
source of them.

Note that anywhere the ld64 warnings are being emitted, we are already
not adding this flag to our hardened ldflags, because of `-Wl,-fatal_warnings`.
2023-11-09 17:07:21 +00:00