Commit graph

123 commits

Author SHA1 Message Date
ivanlele
5eec58e762
Merge 11f68cc810 into merged_master (Bitcoin PR bitcoin/bitcoin#31212) 2026-04-08 12:28:17 +00:00
ivanlele
d4e0018418
Merge 4a31f8ccc9 into merged_master (Bitcoin PR bitcoin/bitcoin#31156) 2026-04-02 09:53:30 +00:00
Tom Trevethan
030ab66c70 Merge 54c4b09f08 into merged_master (Bitcoin PR bitcoin/bitcoin#31042) 2026-04-01 22:41:52 +01:00
Tom Trevethan
6c26b6e1f2 Merge 7640cfdd62 into merged_master (Bitcoin PR bitcoin/bitcoin#31118) 2026-03-31 23:15:13 +01:00
ivanlele
4731a942e1 Merge 2f40e453cc into merged_master (Bitcoin PR bitcoin/bitcoin#29450) 2026-03-30 15:34:04 +00:00
ivanlele
55dd6d547d
Merge 9f45062b9b into merged_master (Bitcoin PR bitcoin/bitcoin#30937) 2026-03-30 10:51:11 +00:00
ivanlele
12e3189183
Merge e0ae9c14c4 into merged_master (Bitcoin PR bitcoin/bitcoin#31011) 2026-03-27 12:58:13 +00:00
ivanlele
41f86ea365
Merge df3f63ccfa into merged_master (Bitcoin PR bitcoin/bitcoin#30509) 2026-03-25 12:35:05 +00:00
ivanlele
464433bd1b
Merge 81276540d3 into merged_master (Bitcoin PR bitcoin/bitcoin#30148) 2026-03-24 16:04:14 +00:00
ivanlele
d06014267a
Merge da083d4bbd into merged_master (Bitcoin PR bitcoin/bitcoin#29775) 2026-03-11 17:10:37 +00:00
ivanlele
fca1fd01d1
Merge 2987ba6637 into merged_master (Bitcoin PR bitcoin/bitcoin#30525 2026-03-11 15:00:56 +00:00
ivanlele
5489305052
Merge 870447fd58 into merged_master (Bitcoin PR bitcoin/bitcoin#30212) 2026-03-11 14:14:02 +00:00
ivanlele
8d69f4b94d
Merge 5c0cd205a1 into merged_master (Bitcoin PR bitcoin/bitcoin#29625) 2026-03-03 15:43:14 +00:00
ikripaka
006073614d
Merge 011a895a82 into merged_master (Bitcoin PR bitcoin/bitcoin#29015) 2026-02-27 22:51:31 +00:00
Tom Trevethan
de9f729c68 Merge 915d7276e4 into merged_master (Bitcoin PR bitcoin/bitcoin#27064) 2026-02-24 01:14:52 +00:00
ivanlele
f64242fec3
Merge 8efd03ad04 into merged_master (Bitcoin PR bitcoin/bitcoin#29494) 2026-02-19 16:14:46 +00:00
ivanlele
9bf3ef6967
Merge 16a6174613 into merged_master (Bitcoin PR bitcoin/bitcoin#29904) 2026-02-18 16:43:54 +00:00
ivanlele
dcd431d845
Merge 50729c0609 into merged_master (Bitcoin PR bitcoin/bitcoin#29910) 2026-02-18 15:37:43 +00:00
Tom Trevethan
1604ad5a8b Merge 0a9cfd1752 into merged_master (Bitcoin PR bitcoin/bitcoin#28981) 2026-02-18 00:09:45 +00:00
Byron Hambly
730ebc99c6
Merge a945f09fa6 into merged_master (Bitcoin PR bitcoin/bitcoin#29007) 2026-02-13 14:49:25 +02:00
Byron Hambly
5477e96d25
ci: lint fixes 2025-12-05 09:39:59 +02:00
Byron Hambly
451ac2cc1c
Merge 45b2a91897 into merged_master (Bitcoin PR bitcoin/bitcoin#29404) 2025-12-04 09:29:58 +02:00
Byron Hambly
194a187979
Merge 6f7395b3ff into merged_master (Bitcoin PR bitcoin/bitcoin#29301) 2025-11-29 14:15:33 +02:00
Byron Hambly
1f75e89e65
Merge 874c8bdb9e into merged_master (Bitcoin PR bitcoin/bitcoin#29144) 2025-11-18 15:12:36 +02:00
Byron Hambly
18bd83f1e1
Merge 1b2dedbf5c into merged_master (Bitcoin PR bitcoin/bitcoin#29040) 2025-11-17 17:28:17 +02:00
Byron Hambly
9f2ac6dbcf
Merge dd73c22976 into merged_master (Bitcoin PR bitcoin/bitcoin#28486) 2025-11-11 11:12:30 +02:00
Byron Hambly
3950e02cd0
Merge 16b5b4b674 into merged_master (Bitcoin PR bitcoin/bitcoin#28579) 2025-11-11 10:52:33 +02:00
Byron Hambly
26b9abc2f2
Merge b5a271334c into merged_master (Bitcoin PR bitcoin/bitcoin#28922) 2025-11-11 08:56:23 +02:00
Byron Hambly
efa5a05b73
Merge 6342348072 into merged_master (Bitcoin PR bitcoin/bitcoin#28076) 2025-11-06 11:27:08 +02:00
Byron Hambly
86ea3ebeac
Merge 29c2c90362 into merged_master (Bitcoin PR bitcoin/bitcoin#28721) 2025-11-06 11:20:50 +02:00
Byron Hambly
69492d27da
Merge 08ea835220 into merged_master (Bitcoin PR bitcoin/bitcoin#28583) 2025-08-07 10:05:15 +02:00
Byron Hambly
6c55760a2d Merge 7ef2d4ee4d into merged_master (Bitcoin PR bitcoin/bitcoin#28244) 2025-07-04 17:24:18 +02:00
Byron Hambly
7b632f5f99 Merge b5ebeb376d into merged_master (Bitcoin PR bitcoin/bitcoin#28002) 2025-06-30 14:59:55 +02:00
Byron Hambly
fed3cadc7b Merge e410fb711c into merged_master (Bitcoin PR bitcoin/bitcoin#27822) 2025-06-27 21:53:11 +02:00
Byron Hambly
3af56ffbe7 Merge 153a6882f4 into merged_master (Bitcoin PR bitcoin/bitcoin#27576) 2025-06-27 13:00:41 +02:00
Byron Hambly
edc585d157 Merge 9564f98fee into merged_master (Bitcoin PR bitcoin/bitcoin#27636) 2025-06-25 11:40:46 +02:00
Byron Hambly
fe4599e9f0 Merge 66b08e7822 into merged_master (Bitcoin PR bitcoin/bitcoin#27302) 2025-06-24 14:25:07 +02:00
Byron Hambly
c5e6e709b8 Merge 104eed1166 into merged_master (Bitcoin PR bitcoin/bitcoin#27611) 2025-06-20 09:31:55 +02:00
Byron Hambly
cbd7b123d9 Merge fc06881f13 into merged_master (Bitcoin PR bitcoin/bitcoin#27491) 2025-06-19 16:08:36 +02:00
Byron Hambly
5ac82e15a9 Merge 669af32632 into merged_master (Bitcoin PR bitcoin/bitcoin#27419) 2025-05-09 11:47:45 +02:00
Hodlinator
e85abe92c7
args: Catch directories in place of config files
Previously passing a directory path as -conf would lead to an ifstream being opened for it, and would not trigger any errors.
2024-12-03 11:04:10 +01:00
Hodlinator
483f0dacc4
args: Properly support -noconf
-noconf would previously lead to an ifstream "successfully" being opened to the ".bitcoin"-directory (not a file). (Guards against the general case of directories as configs are added in grandchild commit to this one).

Other users of AbsPathForConfigVal() in combination with negated args have been updated earlier in this PR ("args: Support -nopid" and "args: Support -norpccookiefile...").
2024-12-03 11:04:10 +01:00
Ava Chow
4a31f8ccc9
Merge bitcoin/bitcoin#31156: test: Don't enforce BIP94 on regtest unless specified by arg
e60cecc811 doc: add release note for 31156 (Martin Zumsande)
fc7dfb3df5 test: Don't enforce BIP94 on regtest unless specified by arg (Martin Zumsande)

Pull request description:

  The added arg `-test=bip94` is only used in a functional test for BIP94. This is done because the default regtest consensus rules should follow mainnet, not testnet.

  Fixes #31137.

ACKs for top commit:
  achow101:
    ACK e60cecc811
  tdb3:
    cr and light test ACK e60cecc811
  rkrux:
    tACK e60cecc811
  BrandonOdiwuor:
    utACK e60cecc811
  laanwj:
    Code review ACK e60cecc811

Tree-SHA512: ca2f322f89d8808dfc3565fe020d2615cfcc110e188a02128ad7108fef51c735b33d55b5e6a70c505d78f7291f3c635dc7dfbcd78be1348d4d6e483883be4216
2024-10-30 17:00:14 -04:00
Martin Zumsande
fc7dfb3df5 test: Don't enforce BIP94 on regtest unless specified by arg
The added regtest option -test=bip94 is only used in the functional
test for BIP94.
This is done because the default regtest consensus rules
should aim to follow to mainnet, not testnet.
2024-10-28 11:38:38 -04:00
Hennadii Stepanov
70713303b6
scripted-diff: Rename PACKAGE_* variables to CLIENT_*
This change ensures consistent use of the `CLIENT_` namespace everywhere
in the repository.

-BEGIN VERIFY SCRIPT-

ren() { sed -i "s/\<$1\>/$2/g" $( git grep -l "$1" ./cmake ./src :\(exclude\)./src/secp256k1 ./test ) ; }

ren PACKAGE_NAME      CLIENT_NAME
ren PACKAGE_VERSION   CLIENT_VERSION_STRING
ren PACKAGE_URL       CLIENT_URL
ren PACKAGE_BUGREPORT CLIENT_BUGREPORT

-END VERIFY SCRIPT-
2024-10-28 12:36:19 +00:00
Ava Chow
7640cfdd62
Merge bitcoin/bitcoin#31118: doc: replace -? with -h and -help
33a28e252a Change default help arg to `-help` and mention `-h` and `-?` as alternatives (Lőrinc)
f0130ab1a1 doc: replace `-?` with `-h` for bench_bitcoin help (Lőrinc)

Pull request description:

  The question mark is interpreted as a wildcard for any single character in Zsh (see https://www.techrepublic.com/article/globbing-wildcard-characters-with-zsh), so `bench_bitcoin -?` will not show the help message on systems using Zsh, such as macOS.

  Since `-h` provides equivalent help functionality (as defined in https://github.com/bitcoin/bitcoin/blob/master/src/common/args.cpp#L684-L693), the `benchmarking.md` documentation has been updated to ensure compatibility with macOS.

  ----

  ### -?
  > % cmake -B build -DBUILD_BENCH=ON && cmake --build build && build/src/bench/bench_bitcoin -?
  zsh: no matches found: -?

  ### -h
  > % cmake -B build -DBUILD_BENCH=ON && cmake --build build && build/src/bench/bench_bitcoin -h
  Usage:  bench_bitcoin [options]
  Options:
  ...

  ----

  Based on the comments the args help default was also changed to `-help`, mentioning `-h` and `-?` (instead of `-?` being the default)

ACKs for top commit:
  edilmedeiros:
    tACK 33a28e252a
  maflcko:
    lgtm ACK 33a28e252a
  achow101:
    ACK 33a28e252a
  rkrux:
    tACK 33a28e252a
  laanwj:
    Code review ACK 33a28e252a

Tree-SHA512: 8c6e27488462be9ba9186b34abe6249c1d93026b3963acc0f42c75496f39407563766ae518cf1839156039cc0047e29d91f70d191cfb97e0fbde85665e88c71e
2024-10-24 18:01:41 -04:00
Lőrinc
6c6b2442ed build: Replace MAC_OSX macro with existing __APPLE__
Adopting `__APPLE__` aligns our project with broader industry practices, including those in prominent projects such as the Linux kernel (and even our own code).

See: https://sourceforge.net/p/predef/wiki/OperatingSystems/#macos
2024-10-24 12:29:26 +02:00
Lőrinc
33a28e252a Change default help arg to -help and mention -h and -? as alternatives
% build/src/bench/bench_bitcoin -h
[...]
  -help
       Print this help message and exit (also -h or -?)
2024-10-21 11:08:51 +02:00
Sebastian Falbesoner
1786be7b4a scripted-diff: drop config/ subdir for bitcoin-config.h, rename to bitcoin-build-config.h
Follow-up for PR #30856, commit 0dd66251.

-BEGIN VERIFY SCRIPT-
sed -i "s|config/bitcoin-config\.h|bitcoin-build-config.h|g" $(git grep -l config/bitcoin-config\.h)
sed -i "s|bitcoin-config\.h|bitcoin-build-config.h|g" $(git grep -l "bitcoin-config\.h" ./src ./test ./cmake)
git mv ./cmake/bitcoin-config.h.in ./cmake/bitcoin-build-config.h.in
-END VERIFY SCRIPT-
2024-10-10 12:22:12 +02:00
Ryan Ofsky
d51edecddc common: move pcp.cpp and netif.cpp files from util to common library since they depend on netaddress.cpp
Prevents check-deps.sh errors reported by fanquake
https://github.com/bitcoin/bitcoin/pull/30415#issuecomment-2385475097
2024-10-01 09:28:31 -04:00