2039 commits

Author	SHA1	Message	Date
Byron Hambly	085f710c02	Merge 1b76b18f8a into merged_master (Bitcoin PR bitcoin/bitcoin#23585)	2023-06-06 10:01:57 +00:00
James Dorfman	32d7ad00b2	Merge c9b63ab61e into merged_master (Bitcoin PR bitcoin/bitcoin#23489)	2023-06-02 05:07:21 +00:00
James Dorfman	7d697c3b6e	Merge c9d7d0a653 into merged_master (Bitcoin PR bitcoin/bitcoin#23635)	2023-06-01 06:00:22 +00:00
James Dorfman	4c01837482	Merge c5712d172e into merged_master (Bitcoin PR bitcoin/bitcoin#23506)	2023-06-01 05:44:25 +00:00
Byron Hambly	936a252fea	Merge 913b7148a2 into merged_master (Bitcoin PR bitcoin/bitcoin#22902)	2023-05-31 11:50:48 +00:00
Byron Hambly	ccb90704b5	Merge 2a492d4ce5 into merged_master (Bitcoin PR bitcoin/bitcoin#23598)	2023-05-31 09:40:57 +00:00
Byron Hambly	364261e9d4	Merge 14fe4dbd4c into merged_master (Bitcoin PR bitcoin/bitcoin#23579)	2023-05-31 09:20:13 +00:00
James Dorfman	d94c120f97	Merge 19815b096c into merged_master (Bitcoin PR bitcoin/bitcoin#23535)	2023-05-26 16:09:27 +00:00
Byron Hambly	74f2207551	Merge 6bde42e29e into merged_master (Bitcoin PR bitcoin/bitcoin#23511)	2023-05-26 12:16:49 +00:00
James Dorfman	4a713e72bb	Merge aec631bccc into merged_master (Bitcoin PR bitcoin/bitcoin#23462)	2023-05-24 20:35:27 +00:00
Byron Hambly	bb299125fe	Merge a85442f62b into merged_master (Bitcoin PR bitcoin/bitcoin#22768)	2023-05-24 14:08:35 +00:00
Byron Hambly	81d5607ec8	Merge c1fb30633b into merged_master (Bitcoin PR bitcoin/bitcoin#23114)	2023-05-24 12:58:57 +00:00
Byron Hambly	b951f8d198	Merge 8346004ac8 into merged_master (Bitcoin PR bitcoin/bitcoin#23077)	2023-05-17 12:13:27 +00:00
James Dorfman	be1fc7ead9	Merge a7f28af437 into merged_master (Bitcoin PR bitcoin/bitcoin#22646)	2023-05-14 00:43:20 +00:00
Byron Hambly	4d11268e6a	Merge 4b24f6bbb5 into merged_master (Bitcoin PR bitcoin/bitcoin#23302)	2023-05-12 10:40:11 +00:00
Byron Hambly	31bb8332bc	Merge 3bf40d06a2 into merged_master (Bitcoin PR bitcoin/bitcoin#23212)	2023-05-11 13:15:28 +00:00
Byron Hambly	59e5eb0433	Merge 71a85fbd09 into merged_master (Bitcoin PR bitcoin/bitcoin#23148)	2023-05-11 10:36:49 +00:00
Byron Hambly	4024f43c52	Merge da13c7b18a into merged_master (Bitcoin PR bitcoin/bitcoin#22392)	2023-05-11 10:29:04 +00:00
Byron Hambly	19003587e0	Merge 113b863f07 into merged_master (Bitcoin PR bitcoin/bitcoin#23162)	2023-05-09 13:15:01 +00:00
Byron Hambly	4756e1f59a	Merge 8f022a59b8 into merged_master (Bitcoin PR bitcoin/bitcoin#22993)	2023-04-22 07:54:57 +00:00
James Dorfman	3a4b8b4c29	Merge 1260b7e483 into merged_master (Bitcoin PR bitcoin/bitcoin#23001)	2023-04-22 02:33:35 +00:00
Byron Hambly	2334307d42	Merge 245462b66c into merged_master (Bitcoin PR bitcoin/bitcoin#22418)	2023-04-13 12:10:09 +00:00
Byron Hambly	5457fa5cfd	Merge 9487b68f06 into merged_master (Bitcoin PR bitcoin/bitcoin#22847)	2023-04-13 10:59:12 +00:00
Byron Hambly	b47591a4e5	Merge 0f0c5d4e7d into merged_master (Bitcoin PR bitcoin/bitcoin#22842)	2023-04-11 09:04:59 +00:00
Byron Hambly	ba84856dea	Merge 718d9f2f77 into merged_master (Bitcoin PR bitcoin/bitcoin#22660)	2023-04-11 06:23:55 +00:00
James Dorfman	12444b20a3	Merge 1bbe289f20 into merged_master (Bitcoin PR bitcoin/bitcoin#22565)	2023-04-11 01:59:59 +00:00
Byron Hambly	639d71f0d1	Merge f5a406f003 into merged_master (Bitcoin PR bitcoin/bitcoin#22633)	2023-04-10 12:59:14 +00:00
Byron Hambly	1e553ee82d	Merge d3169349a9 into merged_master (Bitcoin PR bitcoin/bitcoin#22654)	2023-04-10 11:47:44 +00:00
James Dorfman	c29fb7f58a	Merge 90499358e9 into merged_master (Bitcoin PR bitcoin/bitcoin#22645)	2023-04-10 06:54:44 +00:00
James Dorfman	58ec10be63	Merge fdd80b0a53 into merged_master (Bitcoin PR bitcoin/bitcoin#22688)	2023-04-10 02:16:59 +00:00
Byron Hambly	278c0ea50a	Merge 11c7d001a9 into merged_master (Bitcoin PR bitcoin/bitcoin#22700)	2023-04-09 08:17:10 +00:00
Byron Hambly	4b01cf4a82	Merge be499aa07f into merged_master (Bitcoin PR bitcoin/bitcoin#22692)	2023-04-09 07:43:32 +00:00
Byron Hambly	e8ca61ce13	Merge 8193294cab into merged_master (Bitcoin PR bitcoin/bitcoin#22642)	2023-04-09 05:19:02 +00:00
Byron Hambly	7963ed1e26	Merge a9509fedc8 into merged_master (Bitcoin PR bitcoin/bitcoin#22643)	2023-04-09 05:10:47 +00:00
Byron Hambly	b0856d082c	Merge fd9c22ca69 into merged_master (Bitcoin PR bitcoin/bitcoin#22589)	2023-04-03 16:20:21 +02:00
James Dorfman	b9d55abee4	Merge 19434fa22a into merged_master (Bitcoin PR bitcoin/bitcoin#22516)	2023-03-31 19:36:06 +00:00
James Dorfman	d5b66ba229	Merge 8f76f9f613 into merged_master (Bitcoin PR bitcoin/bitcoin#22531)	2023-03-31 19:14:51 +00:00
James Dorfman	b5fd423101	Merge be92dc5876 into merged_master (Bitcoin PR bitcoin/bitcoin#22538)	2023-03-31 19:04:45 +00:00
Glenn Willen	4334fce793	Merge 61cefde7a7 into merged_master (Bitcoin PR bitcoin/bitcoin#22006)	2023-03-28 00:12:41 +00:00
Glenn Willen	a688f2cbb2	Merge 979f410e69 into merged_master (Bitcoin PR bitcoin/bitcoin#22561)	2023-03-27 23:57:35 +00:00
Glenn Willen	159694bcf5	Merge 2b5563bb1e into merged_master (Bitcoin PR bitcoin/bitcoin#22533)	2023-03-22 05:00:35 +00:00
Glenn Willen	cff2b0aae2	Merge 9df1906091 into merged_master (Bitcoin PR bitcoin/bitcoin#22511)	2023-03-22 04:41:10 +00:00
Glenn Willen	7fd21e5ae4	Merge e8b7b60d09 into merged_master (Bitcoin PR bitcoin/bitcoin#22526)	2023-03-22 04:21:15 +00:00
Pablo Greco	a5976a6364	Fix linter (trailing whitespace)	2023-02-24 09:53:40 -03:00
Glenn Willen	718ac5bd6b	Merge pull request #1118 from gwillen/feature-merge-workflow ... Improvements to pr review script	2023-02-14 10:47:22 -08:00
Andrew Poelstra	1339dae913	Merge ElementsProject/elements#1167: Add native support for liquidtestnet ... c6e074e25b liquidtestnet: Fix chain name in windows installer (Pablo Greco) d0f391cfdb liquidtestnet: Add style for Elements-Qt (Pablo Greco) 48ddfbf8d7 liquidtestnet: Add fixed seeds (Pablo Greco) 3b34c8e927 liquidtestnet: Add seed nodes (Pablo Greco) 0d1964766f liquidtestnet: Accept multi OP_RETURN (Pablo Greco) f955cb3d9c liquidtestnet: Add chainparams (Pablo Greco) 0fa20d006d CCustomParams: Move some defaults away from UpdateFromArgs (Pablo Greco) e9df51121f Add text version of the fixed seeds for liquidv1 and liquidtestnet (Pablo Greco) Pull request description: Currently using liquidtestnet requires a big config file, which is error-prone and uncomfortable for users, this MR adds support for just using `-chain=liquidtestnet`. There are a few things that need to be discussed/addressed 1. Main port (currently set to 18891 because that's the one used originally, and the one that's configured in `liquidtestnet.com`) 1. RPC and extra ports, I just chose some non-overlapping ports that are "close" to the ones in the other liquid/elements networks. 1. Icon color, I just used something different than `liquidv1` and `elementsregtest`, suggestions accepted 😉 1. `liquid-testnet.blockstream.com` is still using port 18892, it will be changed to 18891 soon. 1. both seeds are just CNAME dns records at the moment, they should be changed to real seed nodes (no changes in code required, but important for review) ACKs for top commit: delta1: ACK c6e074e wintercooled: ACK c6e074e25b apoelstra: utACK c6e074e25b Tree-SHA512: 48c17b8b90ba5a33ae987935ffb368737167f6ca5ae772f6dd8c0c5e7efb39355d81e2677cd02d3e22984f2592fdd67caaf838003902b3c827f6ade01f18a040	2022-11-23 15:31:39 +00:00
wintercooled	437e1e79f7	fix pset swap example	2022-11-18 12:34:18 +00:00
Pablo Greco	e9df51121f	Add text version of the fixed seeds for liquidv1 and liquidtestnet	2022-09-08 19:01:27 +00:00
Pablo Greco	7fb99ff33f	Fix Icon position in dmg	2022-08-11 21:29:05 +00:00
Pablo Greco	7ab26e5fd3	Fix elements naming in gitian builds	2022-08-01 19:28:21 +00:00