GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-19 13:27:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
35707 commits 49 branches 359 tags 252 MiB
Commit graph

1982 commits

Author SHA1 Message Date
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
Pablo Greco
a0585cec57 Fix naming in guix builds 2022-08-01 19:28:19 +00:00
Glenn Willen
8e16091da2 Improvements to pr review script 2022-06-08 08:18:15 -07:00
Glenn Willen
8896cf7093 ci: Fix spelling to satisfy linter 2022-05-25 11:48:35 -07:00
Glenn Willen
91b76ae562 Merge cf2eb09bc5 into merged_master (Elements PR ElementsProject/elements#954) 2022-04-21 16:11:57 -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
7595e7cf47 Ergonomic + other improvements to review-prs.py 2022-03-17 20:16:14 -07:00
Glenn Willen
7163ec023f Add semi-automated merge-review tool for Elements upstream merge process. 2022-03-17 20:16:14 -07:00
Pablo Greco
85c3c2b819 Deprecate con_dyna_deploy_start in favor of evbparams 2021-11-23 14:36:03 +00:00
Andrew Poelstra
242586cea6 lint: fix pylint issues 2021-10-15 00:20:23 +00:00
Andrew Poelstra
ba8273ac94 lint: fix non-pylint linter errors 
Includes fixing all the spelling mistakes that are our fault,
but not those present upstream in Core.
 2021-10-15 00:20:20 +00:00
Andrew Poelstra
7b69a940eb Merge 846ab81794 into merged_master (Elements PR ElementsProject/elements#1051) 2021-10-02 13:27:49 +00:00
Andrew Poelstra
c873a78ff4 pset tutorial: add combinepsbt safety checks, expand comments 2021-10-01 00:54:00 +00:00
Andrew Poelstra
57ea7e8a59 pset tutorial: expand a couple of comments, fix numbering 2021-10-01 00:54:00 +00:00
Andrew Poelstra
541d18a8e7 Merge 27f9f0beab into merged_master (Elements PR ElementsProject/elements#1042) 2021-09-18 03:56:00 +00:00
Andrew Poelstra
b4918dcf4b Merge 532d55d059 into merged_master (Elements PR ElementsProject/elements#1036) 2021-09-18 01:28:55 +00:00
Andrew Poelstra
048ca4a550 pset: fix logic bug in analyzepsbt so that the "blinder" role may be returned 2021-09-14 15:48:35 +00:00
Andrew Poelstra
ec27e74f21 pset_tutorial: write 2-party PSET coinjoin demo 2021-09-14 15:30:31 +00:00
Andrew Poelstra
a7643260a4 assets_tutorial: move Daemon into its own file 2021-09-14 15:28:59 +00:00
Andrew Poelstra
1d2dacb1e2 assets_tutorial: basically rewrite the whole thing 2021-09-07 17:49:15 +00:00
Andrew Poelstra
6a74528a40 assets_tutorial: clean up PIDs and temp directories correctly 2021-09-07 17:49:15 +00:00
Andrew Poelstra
6bd3df60e0 assets_tutorial: fix argument and path handling 2021-09-07 17:49:15 +00:00