Tom Trevethan
f60016e6ad
Merge 338b9d82dc into merged_master (Bitcoin PR bitcoin/bitcoin#30681 )
2026-03-13 13:51:41 +00:00
Tom Trevethan
a554b0efd2
Merge 0a379a129b into merged_master (Bitcoin PR bitcoin/bitcoin#28553 )
2026-03-13 01:24:31 +00:00
ivanlele
50c75e72ac
Merge c7b8f6f2e2 into merged_master (Bitcoin PR bitcoin/bitcoin#30625 )
2026-03-12 15:08:57 +00:00
ivanlele
d2e2c989ec
Merge 389cf32aca into merged_master (Bitcoin PR bitcoin/bitcoin#30604 )
2026-03-12 13:33:16 +00:00
ivanlele
d06014267a
Merge da083d4bbd into merged_master (Bitcoin PR bitcoin/bitcoin#29775 )
2026-03-11 17:10:37 +00:00
ivanlele
4fc984078d
Merge 21c2879f37 into merged_master (Bitcoin PR bitcoin/bitcoin#30560 )
2026-03-11 11:41:20 +00:00
ivanlele
c54dc2f736
Merge 1a19a4d960 into merged_master (Bitcoin PR bitcoin/bitcoin#29656 )
2026-03-11 10:36:54 +00:00
ikripaka
34db2c5404
Merge 5239e935cf into merged_master (Bitcoin PR bitcoin/bitcoin#30329 )
2026-03-05 14:24:25 +00:00
ikripaka
b8ecb96b27
Merge 3f0ee7655b into merged_master (Bitcoin PR bitcoin/bitcoin#30007 )
2026-03-02 15:36:46 +00:00
ikripaka
006073614d
Merge 011a895a82 into merged_master (Bitcoin PR bitcoin/bitcoin#29015 )
2026-02-27 22:51:31 +00:00
ikripaka
17631653e2
Merge 5ee6b76c69 into merged_master (Bitcoin PR bitcoin/bitcoin#29325 )
2026-02-26 20:15:02 +00:00
ivanlele
8efe038202
Merge 80bdd4b6be into merged_master (Bitcoin PR bitcoin/bitcoin#30167
2026-02-24 14:09:03 +00:00
ivanlele
362770315c
Merge 413844f1c2 into merged_master (Bitcoin PR bitcoin/bitcoin#29612 )
2026-02-24 11:44:45 +00:00
ivanlele
f6739e1c6a
Merge 34a299f9ee into merged_master (Bitcoin PR bitcoin/bitcoin#29691 )
2026-02-17 18:54:51 +00:00
Byron Hambly
9e5aaef647
Merge 7791d31bcf into merged_master (Elements PR #1499 )
2026-02-12 12:17:19 +02:00
Byron Hambly
5477e96d25
ci: lint fixes
2025-12-05 09:39:59 +02:00
Byron Hambly
3bcbddf376
Merge 11a1db8780 into merged_master (Bitcoin PR bitcoin/bitcoin#29547 )
2025-12-04 15:39:15 +02:00
Byron Hambly
b79e113001
Merge cd3683c21a into merged_master (Bitcoin PR bitcoin/bitcoin#29354 )
2025-11-30 15:33:23 +02:00
Byron Hambly
e01c3b8dc1
Merge dc369af3f5 into merged_master (Bitcoin PR bitcoin/bitcoin#28936 )
2025-11-11 09:35:25 +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
4d24d98b18
Merge 6150a745f9 into merged_master (Elements PR #1493 )
2025-11-05 11:21:26 +02:00
Byron Hambly
43e88ba24e
Merge cc7aee39b9 into merged_master (Elements PR #1492 )
2025-11-05 10:12:43 +02:00
Byron Hambly
4de706a2a4
ci(tidy): use emplace_back instead of push_back
2025-08-22 09:23:55 +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
d01090d0df
Merge 3003861e78 into merged_master (Bitcoin PR bitcoin/bitcoin#28591 )
2025-08-06 20:35:02 +02:00
Byron Hambly
e9d955b25a
Merge 38f4b0d9d1 into merged_master (Bitcoin PR bitcoin/bitcoin#28562 )
2025-08-06 15:55:32 +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
55a7304319
Merge f29091410d into merged_master (Bitcoin PR bitcoin/bitcoin#28379 )
2025-08-04 10:43:30 +02:00
Byron Hambly
61847fc900
Merge 1e9d367d0d into merged_master (Bitcoin PR bitcoin/bitcoin#28423 )
2025-07-21 14:48:23 +02:00
Byron Hambly
461e9aa5fb
Merge 5175ae482e into merged_master (Bitcoin PR bitcoin/bitcoin#28354 )
2025-07-05 16:06:42 +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
cbd7b123d9
Merge fc06881f13 into merged_master (Bitcoin PR bitcoin/bitcoin#27491 )
2025-06-19 16:08:36 +02:00
Byron Hambly
73e325456b
Merge ea5d6fdf81 into merged_master (Elements PR #1427 )
2025-04-16 12:37:22 +02:00
Byron Hambly
9bd6cf4e8f
Merge fe48feb32d into merged_master (Elements PR #1447 )
2025-04-16 12:25:34 +02:00
Byron Hambly
b925462209
Merge 246a764f23 into merged_master (Elements PR #1446 )
2025-04-16 12:15:40 +02:00
Byron Hambly
fcd6674243
Merge 3c1782e3ce into merged_master (Elements PR #1438 )
2025-04-16 12:04:11 +02:00
Byron Hambly
0030d5e1f1
Merge 3133d935ce into merged_master (Bitcoin PR bitcoin/bitcoin#27482 )
2025-04-14 09:02:47 +02:00
Thomas Trevethan
9406f21187
Merge e695d8536e into merged_master (Bitcoin PR bitcoin/bitcoin#26177 )
2025-04-11 12:02:49 +01:00
Sjors Provoost
e85f386c4b
consensus: enable BIP94 on regtest
2024-08-20 13:25:00 +02:00
Sjors Provoost
dd154b0568
consensus: lower regtest nPowTargetTimespan to 144
...
This currently has no effect due to fPowNoRetargeting,
except for the getnetworkhashps when called with -1.
It will when the next commit enforces the timewarp attack mitigation on regtest.
2024-08-20 10:07:30 +02:00
Ava Chow
0a379a129b
Merge bitcoin/bitcoin#28553 : validation: assumeutxo params mainnet
...
1610643c8b1610643c8b1610643c8b1610643c8b1610643c8b1610643c8b
2024-08-14 12:16:28 -04:00
Fabian Jahr
b0ec8716bf
chainparams: Handle Testnet4 in GetNetworkForMagic
2024-08-10 22:19:42 +02:00
Sjors Provoost
1610643c8b
chainparams: add mainnet assumeutxo param at height 840_000
2024-08-10 08:53:42 +02:00
Fabian Jahr
1163b08378
chainparams: Add initial minimum chain work for Testnet4
...
This chainwork was observed at height 38487.
2024-08-07 21:39:19 +02:00
Fabian Jahr
74a04f9e7a
testnet: Introduce Testnet4
2024-08-06 01:38:10 +02:00
Hodlinator
2d9d752e4f
scripted-diff: Replace uint256S("str") -> uint256{"str"}
...
-BEGIN VERIFY SCRIPT-
sed -i --regexp-extended -e 's/\buint256S\("(0x)?([^"]{64})"\)/uint256{"\2"}/g' $(git grep -l uint256S)
-END VERIFY SCRIPT-
2024-08-05 14:51:48 +02:00
Hodlinator
c06f2368e2
refactor: Hand-replace some uint256S -> uint256
...
chainparams.cpp - workaround for MSVC bug triggering C7595 - Calling consteval constructors in initializer lists fails, but works on GCC (13.2.0) & Clang (17.0.6).
2024-08-05 14:51:47 +02:00
Fabian Jahr
bf0efb4fc7
scripted-diff: Modernize naming of nChainTx and nTxCount
...
-BEGIN VERIFY SCRIPT-
sed -i 's/nChainTx/m_chain_tx_count/g' $(git grep -l 'nChainTx' ./src)
sed -i 's/nTxCount/tx_count/g' $(git grep -l 'nTxCount' ./src)
-END VERIFY SCRIPT-
2024-08-04 14:24:43 +02:00
Martin Zumsande
de71d4dece
fuzz: improve utxo_snapshot target
...
Add the possibility of giving more guidance to the creation of the
metadata and/or coins, so that the fuzzer gets the chance
to reach more error conditions in ActivateSnapshot and sometimes
successfully creates a valid snapshot.
This also changes the asserts for the success case that were outdated,
and only didn't result in a crash because the fuzzer wasn't able
to reach this code before.
2024-07-04 20:12:47 -04:00
merge-script
3f0ee7655b
Merge bitcoin/bitcoin#30007 : chainparams: Add achow101 DNS seeder
...
2721d64989https://github.com/achow101/dnsseedrs ) and have been running it for the past 2 months now. I believe it is ready/good enough to be used as an additional DNS seeder for all of our supported public networks.
ACKs for top commit:
laanwj:
ACK 2721d64989https://github.com/bitcoin/bitcoin/pull/30007/commits/2721d64989c2b2114890586b7efd01ab4b062ca6~~
mzumsande:
ACK 2721d649892721d64989
2024-06-26 11:43:58 +01:00
