ivanlele
b9a1c93e74
Merge e53310c47a into merged_master (Bitcoin PR bitcoin/bitcoin#30529 )
2026-04-16 10:38:16 +00:00
ivanlele
d4e0018418
Merge 4a31f8ccc9 into merged_master (Bitcoin PR bitcoin/bitcoin#31156 )
2026-04-02 09:53:30 +00:00
ivanlele
d06014267a
Merge da083d4bbd into merged_master (Bitcoin PR bitcoin/bitcoin#29775 )
2026-03-11 17:10:37 +00:00
ikripaka
006073614d
Merge 011a895a82 into merged_master (Bitcoin PR bitcoin/bitcoin#29015 )
2026-02-27 22:51:31 +00:00
Byron Hambly
9e5aaef647
Merge 7791d31bcf into merged_master (Elements PR #1499 )
2026-02-12 12:17:19 +02:00
Byron Hambly
a18a88b31b
grammar: prefer peg-in to pegin in messages
2026-01-15 18:10:52 +02:00
Byron Hambly
94cde59dc3
subsidy: add chainparams and init
2026-01-15 18:10:50 +02:00
Byron Hambly
5477e96d25
ci: lint fixes
2025-12-05 09:39:59 +02:00
Tom Trevethan
2dd017d98c
added unlimitedissuance config option for CLiquidV1TestParams
2025-09-30 11:40:24 +01:00
Tom Trevethan
a937d53a23
moved acceptunlimitedissuances to chainparams and set defaults
2025-09-26 14:15:46 +01:00
Byron Hambly
06b314fd30
Merge a2e111b8a3 into merged_master (Bitcoin PR bitcoin/bitcoin#27765 )
2025-06-25 09:45:45 +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
Pablo Greco
ea5d6fdf81
Merge pull request #1427 from apoelstra/2025-03--simplicity-activation
...
simplicity: activate on first week of unanimous signalling after block 3333333
2025-04-15 10:35:59 -07:00
Andrew Poelstra
308a393239
simplicity: activate on first week of unanimous signalling after block 3333333
...
This block passed on April 14 (so we will activate as soon as this is
merged and there is a week of unaminous signalling), and its a nice memorable
number.
2025-04-15 15:56:22 +00:00
Pablo Greco
b54db2aec2
Avoid adding invalid seeds to liquidtestnet
2025-04-14 03:51:06 -07:00
wiz
5d82808b61
Add liquid.network DNS seed
2025-04-12 13:54:21 +09:00
Thomas Trevethan
9406f21187
Merge e695d8536e into merged_master (Bitcoin PR bitcoin/bitcoin#26177 )
2025-04-11 12:02:49 +01:00
Byron Hambly
b4405ba453
Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750 )
2025-03-31 16:37:52 +02:00
Byron Hambly
1bb6c424c2
simplicity: change deployment to version bit 21
2025-03-25 09:29:04 +02:00
Martin Zumsande
b670213579
test: set segwit height back to 0 on regtest
...
This was changed in #22818 from 0 to 1. Since it changes
BLOCK_OPT_WIT of the genesis block, older versions of bitcoin
core would not read regtest directories created with newer versions
without a reindex.
Github-Pull: bitcoin#24527
Rebased-From: 5ce3057
2025-03-10 11:51:38 +00:00
Ryan Ofsky
3c2920ec98
refactor: Avoid using IsArgSet() on -signetseednode and -signetchallenge list options
...
This commit does not change behavior because negation of -signetseednode and
-signetchallenge parameters has been disallowed since these were introduced in
#18267 , so calling IsArgSet() is equivalent to checking if GetArgs() returns a
non-empty list.
2025-02-13 12:30:15 -05:00
Ryan Ofsky
d05668922a
refactor: Avoid using IsArgSet() on -debug, -loglevel, and -vbparams list options
...
This commit does not change behavior, it just drops unnecessary IsArgSet()
calls for -debug, -loglevel, and -vbparams options. The calls are unnecessary
because GetArgs() already returns empty arrays if these arguments are not
specified.
2025-02-13 12:30:15 -05:00
Byron Hambly
ffa0c01a17
Merge cc2ecbb978 into merged_master (Elements PR #1378 )
2025-01-06 11:39:25 +02:00
Byron Hambly
8499b13762
lint: fix lint issues
2024-12-03 14:02:33 +02:00
Byron Hambly
d78604da4c
Merge 2534141e19 into merged_master (Elements PR ElementsProject/elements#1219 )
2024-12-02 08:51:39 +02:00
Byron Hambly
dcef84b6be
Merge 447f50e4ae into merged_master (Bitcoin PR bitcoin/bitcoin#25946 )
2024-11-26 12:39:48 +02:00
Pablo Greco
22cc8dfe34
Accept by default discountct in liquidv1
2024-11-18 05:00:12 -08: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
Byron Hambly
28d35f619e
Merge 510ac41eac into merged_master (Bitcoin PR bitcoin/bitcoin#25331 )
2024-10-18 13:14:02 +02:00
Andrew Poelstra
57ab101352
simplicity: copy activation threshold/period from taproot
...
Copy the parameters for mainnet because they seem to have worked fine
for Taproot and are therefore a good starting point for Simplicity.
Copy them for regtest so that we can also copy the functional test for
activation, without needing to change a whole bunch of numbers.
2024-10-08 14:41:40 +00:00
Andrew Poelstra
3621e7adc0
liquid testnet: enable simplicity at all times
...
This will effectively activate Simplicity as soon as the sole Liquid
Testnet signer is updated.
2024-10-08 14:41:39 +00:00
Andrew Poelstra
850b82095c
disable simplicity on regtest
...
We want to test Simplicity activation using evbparams.
2024-10-08 14:41:39 +00:00
James Dorfman
db0c6bd4fe
Merge 86ffda8a7d into merged_master (Elements PR #1360 )
2024-10-08 06:01:00 +00:00
James Dorfman
a61b1d1240
Merge e1d6b66ead into merged_master (Elements PR #1346 )
2024-10-08 05:35:12 +00:00
Russell O'Connor
bcd508f409
Add Simplicity Deployment structure
2024-10-07 14:39:10 -04:00
Pablo Greco
5c04f7d9a0
Accept discount-ct by default in liquidtestnet
2024-08-19 08:29:18 -07:00
Fabian Jahr
74a04f9e7a
testnet: Introduce Testnet4
2024-08-06 01:38:10 +02:00
James Dorfman
84f5f4cf9c
Merge f436bfd126 into merged_master (Bitcoin PR bitcoin/bitcoin#22953 )
2024-08-02 05:19:51 +00:00
Byron Hambly
47d6c34382
discount: fix override for creatediscountct
2024-07-24 09:34:16 +02:00
James Dorfman
9c1d4cc8ff
Merge a4d7ac7bbe into merged_master (Elements PR #1317 )
2024-05-24 16:13:46 +00:00
James Dorfman
05aec5204c
Merge 99e502f90c into merged_master (Elements PR #1324 )
2024-05-24 15:27:04 +00:00
Ryan Ofsky
4f74c59334
util: Move util/string.h functions to util namespace
...
There are no changes to behavior. Changes in this commit are all additions, and
are easiest to review using "git diff -U0 --word-diff-regex=." options.
Motivation for this change is to keep util functions with really generic names
like "Split" and "Join" out of the global namespace so it is easier to see
where these functions are defined, and so they don't interfere with function
overloading, especially since the util library is a dependency of the kernel
library and intended to be used with external code.
2024-05-16 10:16:08 -05:00
Byron Hambly
c1661b251a
discount: introduce config args
2024-05-14 19:03:17 +02:00
snoppy
605acb0a40
chore: fix typos
2024-03-31 23:07:05 +08:00
James Dorfman
087b2f13f4
Merge 7c08d81e11 into merged_master (Bitcoin PR bitcoin/bitcoin#23536 )
2024-03-19 19:58:32 +00:00
Byron Hambly
75b07c4252
Merge 2860a91df0 into merged_master (Bitcoin PR bitcoin/bitcoin#24527 )
2023-10-15 11:57:43 +00:00
Byron Hambly
816db0450b
Merge 40ab879f11 into merged_master (Bitcoin PR bitcoin/bitcoin#24418 )
2023-07-02 16:39:55 +00:00
Byron Hambly
47626b5a64
Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912 )
2023-06-14 15:44:11 +00:00
MarcoFalke
fa6b11a556
test: Throw error when -signetchallenge is non-hex
2023-05-25 19:24:05 +02:00
