Byron Hambly
5ac82e15a9
Merge 669af32632 into merged_master (Bitcoin PR bitcoin/bitcoin#27419 )
2025-05-09 11:47:45 +02: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
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
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
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
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
Byron Hambly
a5f6936dd9
Merge feedb9c84e into merged_master (Bitcoin PR bitcoin/bitcoin#23268 )
2023-05-11 13:12:42 +00:00
James Dorfman
09180a78f9
Merge 3c776fdcec into merged_master (Bitcoin PR bitcoin/bitcoin#23122 )
2023-04-27 19:58:29 +00:00
Byron Hambly
b33a4cdb4f
elements: fixes for bitcoin/bitcoin#22976
2023-04-24 12:05:24 +00:00
Byron Hambly
723ede3bb9
Merge 68bbfcc250 into merged_master (Bitcoin PR bitcoin/bitcoin#23021 )
2023-04-24 11:28:34 +00:00
Byron Hambly
7856df2733
test: elements fixes for Bitcoin PR bitcoin/bitcoin#22818
2023-04-24 08:30:36 +00:00
Byron Hambly
13fb374543
Merge 8e9801bfc4 into merged_master (Bitcoin PR bitcoin/bitcoin#22818 )
2023-04-24 07:13:42 +00:00
TheCharlatan
be55f545d5
move-only: Extract common/args and common/config.cpp from util/system
...
This is an extraction of ArgsManager related functions from util/system
into their own common file.
Config file related functions are moved to common/config.cpp.
The background of this commit is an ongoing effort to decouple the
libbitcoinkernel library from the ArgsManager. The ArgsManager belongs
into the common library, since the kernel library should not depend on
it. See doc/design/libraries.md for more information on this rationale.
2023-04-19 10:48:30 +02:00
Byron Hambly
1acda7580c
Merge adccbb380b into merged_master (Bitcoin PR bitcoin/bitcoin#21862 )
2023-04-11 08:09:30 +00:00
Byron Hambly
4cc48afd88
Merge 0b5344b0d1 into merged_master (Bitcoin PR bitcoin/bitcoin#22632 )
2023-04-09 06:06:34 +00:00
Byron Hambly
570683e6ac
Merge ad0fc453cc into merged_master (Bitcoin PR bitcoin/bitcoin#16333 )
2023-04-06 11:43:11 +00:00
Byron Hambly
d7c38ee168
Merge 10fbb37268 into merged_master (Bitcoin PR bitcoin/bitcoin#22098 )
2023-04-04 19:29:03 +02:00
James Dorfman
17e6efe7fe
Merge 5d83e7d714 into merged_master (Bitcoin PR bitcoin/bitcoin#21090 )
...
We comment out a newly-added assert from the Bitcoin
side, because it's unclear how to replicate it
correctly in Elements.
Co-authored-by: Glenn Willen <gwillen@nerdnet.org>
2023-03-22 01:11:20 +00:00
Carl Dong
382b692a50
Split non/kernel chainparams
...
Moves chainparams code not using the ArgsManager to the kernel.
Subsequently use the kernel chainparams header now where possible in
order to further decouple chainparams call sites from gArgs.
2023-03-15 16:43:31 +01:00
Carl Dong
edabbc78a3
Add factory functions for Main/Test/Sig/Reg chainparams
...
This normalizes the behavior of initializing Main/Test/Sig/Reg
chainparams with RegTest/SigNet chainparams. These factory functions can
also easily be used from a context without an instantiated ArgsManager,
e.g. from libbitcoin kernel code, unlike the existing CreateChainParams
method.
2023-03-15 16:43:29 +01:00
Carl Dong
d938098398
Remove UpdateVersionBitsParameters
...
Moves setting struct member fields from a function to its call site.
This improves readability by surfacing the code.
2023-03-15 16:43:27 +01:00
Carl Dong
84b85786f0
Decouple RegTestChainParams from ArgsManager
...
RegTest chain params can now be initialized by configuring a
RegTestOptions struct, or with ArgsManager. This offers an interface for
creating RegTestChainParams without a gArgs object.
2023-03-15 16:42:42 +01:00
Carl Dong
76cd4e7c96
Decouple SigNetChainParams from ArgsManager
...
SigNet chain params can now be initialized by configuring a
SigNetOptions struct, or with ArgsManager. This offers an interface for
creating SigNetChainParams without a gArgs object.
2023-03-15 16:10:09 +01:00
Pablo Greco
4cbe3d4322
Allow starting regtest networks with p2wsh peg-in addresses
2023-02-07 18:16:43 -03:00
Hennadii Stepanov
306ccd4927
scripted-diff: Bump copyright headers
...
-BEGIN VERIFY SCRIPT-
./contrib/devtools/copyright_header.py update ./
-END VERIFY SCRIPT-
Commits of previous years:
- 2021: f47dda2c58fa0074e2d8aaaaad6ac9
2022-12-24 23:49:50 +00:00
Pablo Greco
48ddfbf8d7
liquidtestnet: Add fixed seeds
2022-09-08 19:02:07 +00:00
Pablo Greco
3b34c8e927
liquidtestnet: Add seed nodes
2022-09-08 19:01:54 +00:00
Pablo Greco
0d1964766f
liquidtestnet: Accept multi OP_RETURN
2022-09-08 19:01:39 +00:00
Pablo Greco
f955cb3d9c
liquidtestnet: Add chainparams
2022-09-08 19:01:27 +00:00
Pablo Greco
0fa20d006d
CCustomParams: Move some defaults away from UpdateFromArgs
2022-09-08 19:01:27 +00:00
