Commit graph

34156 commits

Author SHA1 Message Date
Tom Trevethan
1c8784e6b1
Merge 062863d40f into merged_master (Bitcoin PR bitcoin/bitcoin#34855) 2026-07-14 21:43:19 +01:00
ivanlele
8319df045e
Merge 8d6ebc80ce into merged_master (Bitcoin PR bitcoin/bitcoin#34680) 2026-07-14 18:39:35 +00:00
ivanlele
810c450dda
Merge 8de2549bda into merged_master (Bitcoin PR bitcoin/bitcoin#34450) 2026-07-14 18:32:13 +00:00
ivanlele
433a93dbd7
Merge 115172ceb8 into merged_master (Bitcoin PR bitcoin/bitcoin#34370) 2026-07-14 17:50:44 +00:00
ivanlele
7036b9351f
Merge fa91ad3420 into merged_master (Bitcoin PR bitcoin/bitcoin#34268) 2026-07-14 17:50:31 +00:00
ivanlele
13b42cf172
Merge 6e7ea3cf2a into merged_master (Bitcoin PR bitcoin/bitcoin#33788) 2026-07-14 16:24:55 +00:00
ivanlele
b09750f2f1
Merge 3af199531b into merged_master (Bitcoin PR bitcoin/bitcoin#34222) 2026-07-14 15:58:33 +00:00
ivanlele
239a13fd5d
Merge d1b5d4e9ca into merged_master (Bitcoin PR bitcoin/bitcoin#33474) 2026-07-14 15:06:09 +00:00
ivanlele
b1125e0120
Merge 7e1eca4882 into merged_master (Bitcoin PR bitcoin/bitcoin#33344) 2026-07-14 14:18:40 +00:00
ivanlele
bf5638cb8c
Merge fd784f2774 into merged_master (Bitcoin PR bitcoin/bitcoin#33271) 2026-07-14 13:44:15 +00:00
ivanlele
ce58628893
Merge 162c009c1d into merged_master (Bitcoin PR bitcoin/bitcoin#33251) 2026-07-14 13:25:21 +00:00
ivanlele
aa30aa9c4f
Merge 89fe999cda into merged_master (Bitcoin PR bitcoin/bitcoin#33226) 2026-07-14 13:24:56 +00:00
ivanlele
7ae876ad52
Merge c5196bc9c4 into merged_master (Bitcoin PR bitcoin/bitcoin#33225) 2026-07-14 11:36:40 +00:00
ivanlele
a7a6c7dfab
Merge 837c5c7fd8 into merged_master (Bitcoin PR bitcoin/bitcoin#33074) 2026-07-14 11:14:25 +00:00
Tom Trevethan
793af382e4 Merge 4bf77955ed into merged_master (Bitcoin PR bitcoin/bitcoin#33013 2026-07-14 10:17:42 +01:00
ivanlele
342b1e8b6c
Merge ef380a454c into merged_master (Bitcoin PR bitcoin/bitcoin#32863) 2026-07-13 15:43:38 +00:00
ivanlele
d2bfcaa9db
Merge d360a6ef56 into merged_master (Bitcoin PR bitcoin/bitcoin#32810) 2026-07-13 15:36:56 +00:00
ivanlele
af7d5e9a2d
Merge 983b268768 into merged_master (Bitcoin PR bitcoin/bitcoin#32589) 2026-07-13 15:36:36 +00:00
ivanlele
d6516d7f3a
Merge 589b56192f into merged_master (Bitcoin PR bitcoin/bitcoin#32292) 2026-07-13 14:15:43 +00:00
ivanlele
22cb72b8b1
Merge 3fad438b83 into merged_master (Bitcoin PR bitcoin/bitcoin#32352) 2026-07-13 14:08:52 +00:00
ivanlele
c8f4c0dc55
Merge 1344d3bd0f into merged_master (Bitcoin PR bitcoin/bitcoin#32136) 2026-07-13 14:05:34 +00:00
Tom Trevethan
cb1c30db22
Merge d6db87165c into merged_master (Bitcoin PR bitcoin/bitcoin#32062) 2026-07-13 08:37:40 +01:00
Tom Trevethan
756c5514b5
Merge branch 'master' into elements-29.x 2026-07-12 19:09:23 +01:00
merge-script
af697df271
Merge ElementsProject/elements#1569: Linter fixes
Some checks failed
CI / test each commit (push) Has been cancelled
CI / macOS 14 native, arm64, no depends, sqlite only, gui (push) Has been cancelled
CI / macOS 14 native, arm64, fuzz (push) Has been cancelled
CI / Win64 native, VS 2022 (push) Has been cancelled
CI / Win64 native fuzz, VS 2022 (push) Has been cancelled
CI / ASan + LSan + UBSan + integer, no depends, USDT (push) Has been cancelled
CI / lint (push) Has been cancelled
713da86406 add linter check to CI (Tom Trevethan)
bd2dbdcceb Fix: linter errors (Tom Trevethan)
0ee8558f3a Squashed 'src/secp256k1/' content from commit 95b983597a (Tom Trevethan)

Pull request description:

  Fixes for the v29 branch point linter checks.

  `tests/bitcoin_functional` obsolete tests removed.

ACKs for top commit:
  delta1:
    ACK 713da86406; tested locally.

Tree-SHA512: 8385282c8824ac4b47213594955a99279e83890f0be879e8558ad7aa166571dd813c97a3c57e08b54b9d12b650cb8518282dc87d91b39ad2eaa97955f81b51b5
2026-07-10 13:06:25 +02:00
Tom Trevethan
e5d02b9fd5
fix RPC documentation inconsistencies 2026-07-09 14:13:48 +01:00
Tom Trevethan
e559b1c1a7
Merge branch 'master' into rpc-fixes 2026-07-06 16:19:19 +01:00
merge-script
d2ce7b7d77
Merge ElementsProject/elements#1570: rpc: fix fields describtion in man
Some checks are pending
CI / test each commit (push) Waiting to run
CI / macOS 14 native, arm64, no depends, sqlite only, gui (push) Waiting to run
CI / macOS 14 native, arm64, fuzz (push) Waiting to run
CI / Win64 native, VS 2022 (push) Waiting to run
CI / Win64 native fuzz, VS 2022 (push) Waiting to run
CI / ASan + LSan + UBSan + integer, no depends, USDT (push) Waiting to run
a58014af6e rpc: fix fields describtion in man (Ruslan Kasheparov)

Pull request description:

ACKs for top commit:
  tomt1664:
    ACK a58014af6e tested locally

Tree-SHA512: b7ea26dcd2119d87f37cd7fdd459347ee5432bd3a1a19c2d639e65bf6e516d0f12cad9e06a34a99184654bc7bfe138c8e568eb74c7bdff4c54c94c5b9a16910e
2026-07-06 15:04:30 +01:00
Tom Trevethan
4821ef4762
Merge branch 'master' into rpc-fixes 2026-07-06 14:13:33 +01:00
merge-script
7a53073d04
Merge ElementsProject/elements#1564: mempool: disable full-RBF, require BIP125 opt-in signaling
0e0d01913a mempool: disable full-RBF, require BIP125 opt-in signaling (Byron Hambly)

Pull request description:

  Bitcoin Core defaults to accepting any fee-bumping replacement regardless of signaling (full-RBF). Revert this for Elements: only replace mempool transactions that explicitly opt in via BIP125 nSequence signaling (or TRUC), and report fullrbf=false in getmempoolinfo.

  Update feature_rbf.py accordingly, and add a regression test for CVE-2021-31876 confirming that inherited signaling from an unconfirmed parent does not make a non-signaling child replaceable.

ACKs for top commit:
  tomt1664:
    Tested locally ACK 0e0d01913a

Tree-SHA512: 58847919c6a702fe3d5ea4065e07912684cce6f084ca2507d9ef24c6fe8fdb290bb08108d9e025f26a5674e731bf71a9bdbd262aaf78e4f991bcdf06b61228f7
2026-07-06 13:41:58 +01:00
merge-script
e52226c262
Merge ElementsProject/elements#1560: rpc: fix fields description in a man in 'decodepsbt'
ef1d2673d7 rpc: fix fields type in man in 'decodepsbt' (Ruslan Kasheparov)
91ae0e92e6 rpc: fix fields describtion in man in 'decodepsbt' (Ruslan Kasheparov)

Pull request description:

Top commit has no ACKs.

Tree-SHA512: 736f7ebfd3c54267aee8e7b25970a25356f9a4c38ac23caecd40a7f4b2a96c0142adc0e73bcbd6881243981297af2d5fcc68bae9023cca6179bee823d1dd9ecb
2026-07-06 13:36:52 +01:00
merge-script
5f30cd20d9
Merge ElementsProject/elements#1565: Guard against trimmed chain_start in TryLowWorkHeadersSync
e151cada58 test: update and re-enable trim headers functional test (Byron Hambly)
3824d7dd36 add guard to TryLowWorkHeadersSync to prevent assert_untrimmed (Tom Trevethan)

Pull request description:

  When -trim_headers is enabled, TryLowWorkHeadersSync can receive a chain_start_header pointing to a trimmed block index entry. The `HeadersSyncState` constructor immediately calls `GetBlockHeader()` on it via the m_last_header_received initialiser, which hits `assert_untrimmed()` and aborts the node.

  Conditional untrim_to guard added inside `TryLowWorkHeadersSync`, before `HeadersSyncState`.

  For nodes running -trim_headers, in practice the crash path is not reachable on Elements because `already_validated_work` is always true on a federated chain (nChainWork == nMinimumChainWork == 0), so `TryLowWorkHeadersSync` is not entered. But this ensures consistency with guarded serving paths.

  `TryLowWorkHeadersSync` and `HeadersSyncState` were introduced in Bitcoin v24 (bitcoin/bitcoin#25717) and so this is not applicable to Elements v23.

ACKs for top commit:
  delta1:
    ACK e151cada58; tested locally

Tree-SHA512: 824344079b2136f7e2005968eafa3ad4385ed13ee3b3f3f79b3f878ed7e7dd88c68c85c1d6dd6e989f8484561984e6350fa81a6a19c96550787d0e615b76e87c
2026-07-06 13:34:40 +01:00
Tom Trevethan
bd2dbdcceb Fix: linter errors 2026-07-06 01:42:43 +01:00
Ruslan Kasheparov
a58014af6e
rpc: fix fields describtion in man 2026-07-02 14:39:44 +02:00
Byron Hambly
e151cada58
test: update and re-enable trim headers functional test
The trim_headers test was previously moved to extended tests, and only
worked with legacy wallets. Update it to work with descriptor wallets,
and move it back to base scripts in functional tests.
2026-07-02 14:10:12 +02:00
Ruslan Kasheparov
8165ec8289
rpc: fix fields type in man 2026-06-30 12:37:36 +02:00
Tom Trevethan
3824d7dd36
add guard to TryLowWorkHeadersSync to prevent assert_untrimmed 2026-06-26 15:13:23 +01:00
Ruslan Kasheparov
14a52bf188
rpc: use null for optional parameters 2026-06-25 17:01:10 +02:00
Byron Hambly
0e0d01913a
mempool: disable full-RBF, require BIP125 opt-in signaling
Bitcoin Core defaults to accepting any fee-bumping replacement
regardless of signaling (full-RBF). Revert this for Elements: only
replace mempool transactions that explicitly opt in via BIP125
nSequence signaling (or TRUC), and report fullrbf=false in
getmempoolinfo.

Update feature_rbf.py accordingly, and add a regression test for
CVE-2021-31876 confirming that inherited signaling from an
unconfirmed parent does not make a non-signaling child replaceable.
2026-06-25 15:10:01 +02:00
Ruslan Kasheparov
ef1d2673d7
rpc: fix fields type in man in 'decodepsbt' 2026-06-24 18:01:36 +02:00
Ruslan Kasheparov
91ae0e92e6
rpc: fix fields describtion in man in 'decodepsbt' 2026-06-24 13:01:22 +02:00
Byron Hambly
20c5d373e3
fix: minor fixes 2026-06-23 12:09:01 +02:00
Tom Trevethan
7c1fcd1ba6
Merge remote-tracking branch 'origin/master' into HEAD 2026-06-19 14:59:31 +01:00
Tom Trevethan
60fba755b5
Update src/secp256k1 to latest BlockstreamResearch/secp256k1-zkp master 2026-06-17 14:17:47 +01:00
Tom Trevethan
13398037b6
set Wno-error for simplicity keep warning but dont error on it
fuzz test fixes

set -DPRODUCTION for simplicity in fuzz tests

set UNDEBUG for simplicity in fuzz tests

update wallet fuzz tests

update test script

fix msvc conversion issues

more msvc vector conversion fixes and substitution of boost libs

fix more hexstr calls

fix hexstr calls in init.cpp

default CMAKE_GENERATOR to Unix Makefiles

more span fixes

specify build bin directory

fix executable locations

fix fuzz tests for c11 and functional test fixes

fix fuzz test executable path

specify legacy wallet for elements functional tests

remove assertion for static initialization order issue

use elements fuzz corpus

print debug log on failure

use heap for blind and asset_blind

test: avoid disk space warning for non-regtest

feature_config_args.py incorrectly assumed that its testnet4 node
would not log a disk space warning.

0683b8ebf3 increased m_assumed_blockchain_size
on testnet4 from 1 to 11 GiB which triggers this bug on more
systems, e.g. a RAM disk.

Prevent the warning by setting -prune for these nodes.

Fix the same issue in feature_signet.py

Github-Pull: #32057
Rebased-From: 20fe41e9e83d510fd467f5a999d55a614b16ef89
2026-06-17 14:15:49 +01:00
Tom Trevethan
dee90f21c1
Merge pull request #1549 from RuslanProgrammer/man-help-update
fix help man
2026-06-11 14:38:27 +01:00
Ruslan Kasheparov
fecf4f1cf1 fix help man 2026-06-10 16:24:33 +02:00
Tom Trevethan
17c1e0dc97
Merge remote-tracking branch 'myfork/merged-master' into merged-master-ci 2026-06-01 16:41:54 +01:00
Pablo Greco
60a97d1b09
Enable ELIP203 by default in liquidv1 2026-05-27 05:27:57 -07:00
Pablo Greco
7577eb93a6
Enable ELIP203 by default in liquidtestnet 2026-05-27 05:27:42 -07:00
Tom Trevethan
556c2614c8
descriptor wallet option in GUI unchecked by default 2026-05-26 15:15:53 +01:00