Commit graph

55 commits

Author SHA1 Message Date
ivanlele
bfcb225d88
Merge 2666d83da5 into merged_master (Bitcoin PR bitcoin/bitcoin#30893) 2026-04-03 14:08:28 +00:00
ikripaka
f953ab649c
Merge 2c7a4231db into merged_master (Bitcoin PR bitcoin/bitcoin#30569) 2026-03-20 10:24:26 +00:00
ivanlele
aa41e29f97
Merge 3a29ff5dea into merged_master (Bitcoin PR bitcoin/bitcoin#30463) 2026-03-09 16:54:19 +00:00
Byron Hambly
b4405ba453 Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750) 2025-03-31 16:37:52 +02:00
Byron Hambly
6f984c79ec
Merge 5cb3acef29 into merged_master (Elements PR #1310) 2025-02-13 11:10:29 +02:00
James Dorfman
3e5580265d Merge 8efa73e7ce into merged_master (Bitcoin PR bitcoin/bitcoin#25557) 2024-10-16 06:40:15 +00:00
James Dorfman
6e9f70937f Merge 87d012324a into merged_master (Bitcoin PR bitcoin/bitcoin#25454) 2024-10-09 18:16:23 +00:00
James Dorfman
a0026906ad Merge 1f932de673 into merged_master (Bitcoin PR bitcoin/bitcoin#25253) 2024-09-06 18:31:39 +00:00
James Dorfman
1aff5fa9e9 Merge 5f65afff9c into merged_master (Bitcoin PR bitcoin/bitcoin#24178) 2024-09-06 18:21:45 +00:00
GoodDaisy
3516afccf7 fix typo in test/bitcoin_functional/functional/README.md 2024-01-12 21:48:42 +08:00
Pablo Greco
3dfd7a4e9f Linter fixes 2023-08-31 14:47:07 -07:00
Byron Hambly
bd68371fb6 Merge ffdab41f94 into merged_master (Bitcoin PR bitcoin/bitcoin#23474) 2023-05-26 10:32:04 +00:00
Byron Hambly
af3fe60b69 Merge 94db963de5 into merged_master (Bitcoin PR bitcoin/bitcoin#23300) 2023-05-17 13:44:36 +00:00
James Dorfman
ae89c4bc51 Merge a5d00d4baf into merged_master (Bitcoin PR bitcoin/bitcoin#22788) 2023-04-21 04:02:55 +00:00
Byron Hambly
1acda7580c Merge adccbb380b into merged_master (Bitcoin PR bitcoin/bitcoin#21862) 2023-04-11 08:09:30 +00:00
Byron Hambly
e7704c0b25 Merge 38975eccd4 into merged_master (Bitcoin PR bitcoin/bitcoin#22229) 2023-04-10 10:17:32 +00:00
Byron Hambly
4cc48afd88 Merge 0b5344b0d1 into merged_master (Bitcoin PR bitcoin/bitcoin#22632) 2023-04-09 06:06:34 +00:00
Glenn Willen
5889a844db Merge 2dda79cf61 into merged_master (Elements PR ElementsProject/elements#1094) 2022-04-21 15:54:34 -07:00
Glenn Willen
f035196ceb Merge 586e5c7dd7 into merged_master (Elements PR ElementsProject/elements#1062) 2022-04-20 21:51:53 -07:00
Glenn Willen
bf7f050aeb Raise max P2P message size to account for larger elements dynafed header size 2022-03-01 14:21:52 -08:00
Pablo Greco
85c3c2b819 Deprecate con_dyna_deploy_start in favor of evbparams 2021-11-23 14:36:03 +00:00
Andrew Poelstra
27930edc9c Merge 4a540683ec into merged_master (Bitcoin PR #20813) 2021-06-16 14:11:07 +00:00
Andrew Poelstra
6f267e338a Merge 47fc883106 into merged_master (Bitcoin PR #19967) 2020-12-01 14:36:58 +00:00
Gregory Sanders
9a51d08eda Fix address string assertions in tests 2019-11-26 09:03:45 -05:00
Gregory Sanders
bf2f1c6217 Reduce min relay to 100 sat/vkB 2019-10-14 10:17:32 -04:00
Gregory Sanders
47db75e39f Dynafed RPC support, tests, and deployment for custom chains 2019-09-05 10:51:09 -04:00
Steven Roose
0a6f0551d2
Rename -con_connect_coinbase to -con_connect_genesis_outputs 2019-06-05 10:02:41 +01:00
Steven Roose
473e1e9ca1
MERGE-FIX: Fix compatibility functional tests 2019-05-22 16:54:46 +01:00
Steven Roose
420e38ae8f
MERGE-FIX: Update compatibility functional tests
I should have split this into one commit copying the entire folder and
one where I fix the ELEMENTS-based things. However, grepping the diff
for "elements" case-insensitive makes you catch all differences.
The next commit will contain the more subtle differences.
2019-05-21 12:52:40 +01:00
Steven Roose
872d39fbe8
Prevent Travis from failing when tests are disabled 2019-05-15 09:11:14 +01:00
Steven Roose
bf4f1d0094
MERGE-FIX: Disable p2p_invalid_messages tests to fix later 2019-05-14 15:10:18 +01:00
Steven Roose
71723f794f
MERGE-FIX: Adapt bitcoin_functional 2019-05-03 17:46:17 +01:00
Steven Roose
449ac89f39
MERGE-FIX: Copy bitcoin_functional from upstream 2019-05-03 17:46:15 +01:00
Steven Roose
7f894ae00b
UPSTREAM MERGE BROKEN: Merge commit 'f617e05c38' into master 2019-05-01 19:18:18 +01:00
Gregory Sanders
91294ca01a Adapt Elements default adress prefix bytes to elements-0.14 style 2019-04-10 16:08:39 -04:00
Steven Roose
e1cd00cc6c Change branding from bitcoin to elements 2019-03-22 10:12:04 +00:00
Steven Roose
aba54b3f92
Make validatepegin default to true if has parent chain 2019-03-21 17:55:02 +00:00
Steven Roose
43f8b459dc
[BROKEN] Adapt bitcoin_functional tests to CA 2019-03-20 12:06:00 +00:00
Steven Roose
04d06917d2
Rename con_elementswitness to con_elementsmode
It will have effect on more than just witness structure from now on.
2019-03-20 12:05:44 +00:00
Gregory Sanders
b8820d1836 Activate CSV from genesis block for custom chains 2019-02-14 09:05:10 -05:00
Steven Roose
6ed8fd8ab0 Add -con_elementswitness flag and global variable 2019-02-13 11:42:38 +00:00
Gregory Sanders
9d9ee3d514 MERGE FIX: Adapt bitcoin_functional sync to regtest2 2019-01-31 10:55:31 +00:00
Gregory Sanders
7c97d6a811 MERGE FIX: sync up bitcoin_functional 2019-01-31 10:55:27 +00:00
Gregory Sanders
c62fab2d69 UPSTREAM MERGE BROKEN: Merge commit '3832c25f17' into merge_14225 2019-01-28 18:14:25 +00:00
Gregory Sanders
f1dbd1cf3d -multi_data_permitted: Allow >1 op_return output by policy 2019-01-24 11:06:59 -05:00
Gregory Sanders
d78f0763a1 Signed blocks by default for custom chains 2018-12-19 11:38:43 -05:00
Gregory Sanders
c00d83f126 Set walletrbf default to 1 2018-12-18 16:08:44 -05:00
Gregory Sanders
1ac14fc958 restore bitcoin regtest gen block using -genesis_style
- also regenerate test data for getblockstats
2018-12-18 10:27:43 -08:00
Carl Dong
e04f6c7018 Activate BIPs 34, 65, 66 at block 0
- Reinstate Bitcoin BIP activation heights for tests
- Add tests for block v4 after genesis block
2018-12-17 02:53:37 -08:00
Gregory Sanders
2bfabb3e4f blockheaders include block height, nodes validate it
The block height validation is gated by the startup option
`con_blockheightinheader`, accesible in custom chains only
using option `chain=<name>`. Only if set to true will this
field be (de)serialized and evaluated in consensus logic.
Otherwise the field is simply ignored, other than being
stored in memory as the default value 0.
2018-11-27 09:46:25 -05:00