Commit graph

542 commits

Author SHA1 Message Date
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
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
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
Sebastian Falbesoner
d516cf83ed test: use built-in collection types for type hints (Python 3.9 / PEP 585)
Since Python 3.9, type hinting has become a little less awkward, 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. [1] [2]
This commit applies the replacement for all Python scripts (i.e. in the
contrib and test folders) for the basic types:
    - typing.Dict  -> dict
    - typing.List  -> list
    - typing.Set   -> set
    - typing.Tuple -> tuple

[1] https://docs.python.org/3.9/whatsnew/3.9.html#type-hinting-generics-in-standard-collections
[2] https://peps.python.org/pep-0585/#implementation for a list of type
2023-10-25 01:10:21 +02:00
Fabian Jahr
cb0336817e
scripted-diff: Rename hash_serialized_2 to hash_serialized_3
-BEGIN VERIFY SCRIPT-
sed -i 's/hash_serialized_2/hash_serialized_3/g' $( git grep -l 'hash_serialized_2' ./src ./contrib ./test )
-END VERIFY SCRIPT-
2023-10-20 22:53:06 +02:00
fanquake
4caa10b580
Merge bitcoin/bitcoin#28628: lint: Include test_utxo_snapshots in lint_shell, fix linter errors
348e79f7c6 lint: Include test_utxo_snapshots in lint_shell (Fabian Jahr)

Pull request description:

  jamesob excluded `test_utxo_snapshots.sh` from the shell linter with this explanation: "Add the script to the shellcheck exception list since the quoted variables rule needs to be violated in order to get bitcoind to pick up on $EARLY_IBD_FLAGS." However, macrofake pointed out that single lines can be excluded from linting.

  This fixes one fixable rule violation, excludes the rest of the offending lines from the linter and then removes the exclusion of the `test_utxo_snapshots.sh` file. Also adds documentation.

ACKs for top commit:
  Empact:
    ACK 348e79f7c6
  maflcko:
    lgtm ACK 348e79f7c6
  pablomartin4btc:
    tACK 348e79f7c6

Tree-SHA512: a904cc1cc3c94488dfbd39ea69a3ef17259f991708a797009001669448fef81eed086ecbce1ec433988d88baef293849698e2e0eb86a969b949cc7ef93af7b4b
2023-10-17 09:48:50 +01:00
Andrew Chow
76d89579b5
Merge bitcoin/bitcoin#28630: depends: update LD64_VERSION to 711
092daa2f95 contrib: add test for macOS linker version to symbol-check (fanquake)
cefbf0bc20 depends: update LD64_VERSION to 711 (fanquake)

Pull request description:

  I forgot to do this in 7d5815293e.
  Add a test so it's impossible to forget.

ACKs for top commit:
  TheCharlatan:
    utACK 092daa2f95
  achow101:
    ACK 092daa2f95
  jarolrod:
    ACK 092daa2f95
  hebasto:
    ACK 092daa2f95.
  laanwj:
    ACK 092daa2f95

Tree-SHA512: 37f0bdfd6607a7760eabe5efe279532ba0c59c0915161e08d5e3b9a0b7705839d62537d6e17406062f6a0a1db5407575da7cd671e9cb916e422e77f5649c6e2b
2023-10-16 13:29:26 -04:00
Byron Hambly
25b65b9f3a Merge deb847b757 into merged_master (Bitcoin PR bitcoin/bitcoin#24491) 2023-10-14 21:53:48 +00:00
Fabian Jahr
348e79f7c6
lint: Include test_utxo_snapshots in lint_shell 2023-10-13 14:06:06 +02:00
fanquake
73dfa6da08
Merge bitcoin/bitcoin#28631: devtools: test_utxo_snapshots.sh sleep cleanup and documentation
36a3004a41 devtools: test_utxo_snapshots.sh sleep cleanup and documentation (Fabian Jahr)

Pull request description:

  There were bare sleep statements in the script where it was unclear why they were needed and I think they could also be replaced by existing helpers.

ACKs for top commit:
  Sjors:
    utACK 36a3004a41
  pablomartin4btc:
    utACK 36a3004a41

Tree-SHA512: b6e2fc69cd7babcfa7f413f11304f4d648d6d64b3b526862664ccedb0016ad182b9e886aa4e8c33315e4c18824512e11a4fd6365f9c3c95093967d3ef7687e62
2023-10-13 11:16:33 +02:00
Fabian Jahr
36a3004a41
devtools: test_utxo_snapshots.sh sleep cleanup and documentation 2023-10-10 12:57:54 +02:00
fanquake
092daa2f95
contrib: add test for macOS linker version to symbol-check 2023-10-10 11:22:14 +01:00
vuittont60
57131bfa3c docs: fix typo 2023-10-10 15:06:47 +08:00