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
46752 commits 49 branches 359 tags 252 MiB
Commit graph

133 commits

Author SHA1 Message Date
Byron Hambly
e34355c770 Merge 10a8e36813 into merged_master (Elements PR #1428) 2025-07-10 11:20:33 +02:00
Byron Hambly
2e41574d5a Merge ecb20563b6 into merged_master (Bitcoin PR bitcoin/bitcoin#28123) 2025-07-04 18:23:38 +02:00
Byron Hambly
6c55760a2d Merge 7ef2d4ee4d into merged_master (Bitcoin PR bitcoin/bitcoin#28244) 2025-07-04 17:24:18 +02:00
Byron Hambly
ddf4e4ccb4 Merge f0758d8a66 into merged_master (Bitcoin PR bitcoin/bitcoin#27757) 2025-06-27 14:40:38 +02:00
Byron Hambly
7f25cff4a2 Merge 34ac3f438a into merged_master (Bitcoin PR bitcoin/bitcoin#26485) 2025-06-27 11:24:52 +02:00
Byron Hambly
5b856b6f5f Merge fa53611cf1 into merged_master (Bitcoin PR bitcoin/bitcoin#26076) 2025-05-16 11:10:32 +02:00
Byron Hambly
2774757c03 Merge 071308860a into merged_master (Bitcoin PR bitcoin/bitcoin#25680) 2025-05-14 14:30:47 +02:00
Byron Hambly
dbf777c321 Merge 6a167325f0 into merged_master (Bitcoin PR bitcoin/bitcoin#27279) 2025-04-12 17:24:00 +02:00
Byron Hambly
0d6796ec53 Merge cae0608ad4 into merged_master (Bitcoin PR bitcoin/bitcoin#27217) 2025-04-12 17:04:51 +02:00
Byron Hambly
e23e51f9ef Merge 369d4c03b7 into merged_master (Bitcoin PR bitcoin/bitcoin#27254) 2025-04-12 12:19:09 +02:00
Byron Hambly
e04de3e652 Merge 3963067555 into merged_master (Bitcoin PR bitcoin/bitcoin#26642) 2025-04-11 22:28:06 +02:00
Tom Trevethan
a4e12fd05b Merge 1ff135ca7f into merged_master (Bitcoin PR bitcoin/bitcoin#26194) 2025-04-09 19:00:05 +00:00
Tom Trevethan
03de06468f Merge 80f4979322 into merged_master (Bitcoin PR bitcoin/bitcoin#26347) 2025-04-08 12:12:39 +00:00
Byron Hambly
9fdd02a17b Merge 27772d8009 into merged_master (Bitcoin PR bitcoin/bitcoin#26889) 2025-04-07 08:11:43 +02:00
Tom Trevethan
0761b58003 Merge 1c8b80f440 into merged_master (Bitcoin PR bitcoin/bitcoin#15294) 2025-04-04 14:37:56 +00:00
Byron Hambly
c0a9017312 Merge a8c1ea50c7 into merged_master (Bitcoin PR bitcoin/bitcoin#26919) 2025-04-04 09:27:27 +02:00
Byron Hambly
27a72d99f5 Merge 7799f53542 into merged_master (Bitcoin PR bitcoin/bitcoin#26039) 2025-04-02 23:02:13 +02:00
Byron Hambly
2dbe0639f3 Merge 68f88bc03f into merged_master (Bitcoin PR bitcoin/bitcoin#26186) 2025-04-01 20:16:53 +02:00
Byron Hambly
b4405ba453 Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750) 2025-03-31 16:37:52 +02:00
Byron Hambly
d11cdab5ae Merge 66c08e741d into merged_master (Bitcoin PR bitcoin/bitcoin#24865) 2025-03-31 09:12:26 +02:00
Tom Trevethan
bf45fb4395 Merge 8ccab65f28 into merged_master (Bitcoin PR bitcoin/bitcoin#26238) 2025-03-18 11:09:37 +00:00
Pablo Greco
c878b2587b wallet: Show full pak entry in getwalletpakinfo 2025-03-04 07:16:05 -08:00
Byron Hambly
ca0a68b350
Merge UP TO 551c8e9526 into merged_master (UP TO bitcoin/bitcoin#26349) 
Includes FIXMEs for a few functional tests
 2025-02-05 09:50:17 +02:00
Byron Hambly
8499b13762
lint: fix lint issues 2024-12-03 14:02:33 +02:00
Byron Hambly
2d4094eb0b Merge 5291933fed into merged_master (Bitcoin PR bitcoin/bitcoin#25768) 2024-11-26 12:31:26 +02:00
Byron Hambly
779cbdf071 Merge 3118425ff9 into merged_master (Bitcoin PR bitcoin/bitcoin#25931) 2024-11-26 10:21:31 +02:00
Byron Hambly
76cb28e552 Merge bbbc26dcfc into merged_master (Bitcoin PR bitcoin/bitcoin#25924) 2024-11-22 09:27:25 +02:00
Byron Hambly
a4fa9c6ada
Merge 59bd6b6d37 into merged_master (Bitcoin PR bitcoin/bitcoin#24699) 2024-10-29 14:19:22 +02:00
Byron Hambly
3752705c6a Merge 7f79746bf0 into merged_master (Bitcoin PR bitcoin/bitcoin#25705) 2024-10-20 18:44:48 +02:00
Byron Hambly
b9abd5638d Merge a65f6d8cbb into merged_master (Bitcoin PR bitcoin/bitcoin#25699) 2024-10-18 14:44:59 +02:00
Byron Hambly
6742dac5d2 Merge 4aaa3b5200 into merged_master (Bitcoin PR bitcoin/bitcoin#25351) 2024-10-17 10:12:52 +02:00
James Dorfman
bc4e2c0dbd Merge 51eebe082d into merged_master (Bitcoin PR bitcoin/bitcoin#25368) 2024-09-10 20:09:57 +00:00
James Dorfman
c643e814fd Merge e82d8069bc into merged_master (Bitcoin PR bitcoin/bitcoin#25276) 2024-09-09 17:20:47 +00:00
James Dorfman
25c2ea0027 Merge 86cc31dab6 into merged_master (Bitcoin PR bitcoin/bitcoin#25249) 2024-09-06 19:20:19 +00:00
James Dorfman
06a6044137 Merge 0de36941ec into merged_master (Bitcoin PR bitcoin/bitcoin#25153) 2024-08-13 06:00:38 +00:00
James Dorfman
de50331cdd Merge f4005af3ec into merged_master (Bitcoin PR bitcoin/bitcoin#24977) 2024-08-02 18:09:01 +00:00
James Dorfman
84f5f4cf9c Merge f436bfd126 into merged_master (Bitcoin PR bitcoin/bitcoin#22953) 2024-08-02 05:19:51 +00:00
James Dorfman
1af96cd932 Merge b1c5991eeb into merged_master (Bitcoin PR bitcoin/bitcoin#24812) 2024-08-01 21:46:36 +00:00
James Dorfman
38cf680443 Merge 41720a1f54 into merged_master (Bitcoin PR bitcoin/bitcoin#24786) 2024-07-29 19:42:59 +00:00
James Dorfman
100d6e7c28 Merge f66c827c2d into merged_master (Bitcoin PR bitcoin/bitcoin#24502) 
Changed a bech32m address in the wallet_basic test to blech32m (for elements).
Also changed an error message in the wallet to say "blech32m" instead of "bech32m".
 2024-04-08 04:17:28 +00:00
fanquake
ecb20563b6
Merge bitcoin/bitcoin#28123: Bugfix: RPC: Remove quotes from non-string oneline descriptions 
5e3e83b005 RPC/Mining: Document template_request better for getblocktemplate (Luke Dashjr)
de319c6175 RPC/rpcdoccheck: Error if a oneline_description has a quote for a non-string (Luke Dashjr)
7c61e9df90 Bugfix: RPC: Remove quotes from non-string oneline descriptions (Luke Dashjr)

Pull request description:

  Various JSON Object parameters had a `oneline_description` with quote characters. Fix those, and extend `rpcdoccheck` to detect them.

  Also, slightly improve GBT's oneline description for template_request.

ACKs for top commit:
  MarcoFalke:
    review ACK 5e3e83b005

Tree-SHA512: 363d1669a661d0acfc19fddb57e777d781c7246f330cf62160e77dde10a6adcb0249db748127067da1afe1b7d17c71cf611d9fdc3664d6bf5b3f30105637769a
 2023-08-17 13:58:31 +01:00
Andrew Chow
91d924ede1 Rename script/standard.{cpp/h} to script/solver.{cpp/h} 
Since script/standard only contains things that are used by the Solver
and its callers, rename the files to script/solver.
 2023-08-14 17:39:49 -04:00
Luke Dashjr
7c61e9df90 Bugfix: RPC: Remove quotes from non-string oneline descriptions 2023-07-22 01:03:18 +00:00
Byron Hambly
4988afcbc2 Merge 3ace3a17c9 into merged_master (Bitcoin PR bitcoin/bitcoin#20744) 2023-06-30 07:38:29 +00:00
Byron Hambly
7878ba47b9 Merge c561f2f06e into merged_master (Bitcoin PR bitcoin/bitcoin#23497) 2023-06-19 09:28:31 +00:00
James Dorfman
81119e6161 Merge fa74718414 into merged_master (Bitcoin PR bitcoin/bitcoin#24026) 2023-06-15 20:36:05 +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
f209652f80 Merge ce463cf450 into merged_master (Bitcoin PR bitcoin/bitcoin#23750) 2023-06-13 13:51:56 +00:00
Byron Hambly
8bff356855 Merge a30642926a into merged_master (Bitcoin PR bitcoin/bitcoin#23721) 2023-06-13 13:41:22 +00:00
Byron Hambly
5854e5e087 Merge 7908772244 into merged_master (Bitcoin PR bitcoin/bitcoin#23703) 2023-06-06 11:15:42 +00:00