Commit graph

22865 commits

Author SHA1 Message Date
James Dorfman
36ec6be7f7 Merge e35c4a3d80 into merged_master (Bitcoin PR bitcoin/bitcoin#22732) 2023-04-10 03:05:00 +00:00
James Dorfman
c04879d4fd Merge b5c468cfe3 into merged_master (Bitcoin PR bitcoin/bitcoin#22725) 2023-04-10 02:42:44 +00:00
James Dorfman
640ebd5e5a Merge 62cb4009c2 into merged_master (Bitcoin PR bitcoin/bitcoin#22215) 2023-04-10 02:27:52 +00:00
James Dorfman
a9729de287 Merge f3dbd1c2b2 into merged_master (Bitcoin PR bitcoin/bitcoin#22627) 2023-04-10 01:49:16 +00:00
James Dorfman
c9f046f83a Merge df30375788 into merged_master (Bitcoin PR bitcoin/bitcoin#22715) 2023-04-10 01:25:51 +00:00
Byron Hambly
3fa04f26a6 Merge 42b00a3758 into merged_master (Bitcoin PR bitcoin/bitcoin#22649) 2023-04-09 14:16:50 +00:00
Byron Hambly
05ff2df890 Merge 3facf0a8ae into merged_master (Bitcoin PR bitcoin/bitcoin#22685) 2023-04-09 08:57:41 +00:00
Byron Hambly
0b24fc8b89 Merge 820129aee9 into merged_master (Bitcoin PR bitcoin/bitcoin#22686) 2023-04-09 08:57:30 +00:00
Byron Hambly
af678f364b Merge 502d22ceed into merged_master (Bitcoin PR bitcoin/bitcoin#22541) 2023-04-09 08:16:58 +00:00
Byron Hambly
a9a732865a Merge adf9bcfc37 into merged_master (Bitcoin PR bitcoin/bitcoin#22696) 2023-04-09 07:35:22 +00:00
Byron Hambly
a797e5e55a Merge 4c87665707 into merged_master (Bitcoin PR bitcoin/bitcoin#22604) 2023-04-09 07:26:48 +00:00
Byron Hambly
6abf0bc3bc Merge 803ef70fd9 into merged_master (Bitcoin PR bitcoin/bitcoin#20233) 2023-04-09 07:15:39 +00:00
Byron Hambly
e7bffde774 Merge 439e58c4d8 into merged_master (Bitcoin PR bitcoin-core/gui#360) 2023-04-09 07:07:29 +00:00
Byron Hambly
c98940674c Merge 9948f114f8 into merged_master (Bitcoin PR bitcoin-core/gui#390) 2023-04-09 06:58:50 +00:00
Byron Hambly
8875f3d2bd Merge e614cc8cd8 into merged_master (Bitcoin PR bitcoin-core/gui#399) 2023-04-09 06:50:07 +00:00
Byron Hambly
6153d1ab27 Merge 77e23ca945 into merged_master (Bitcoin PR bitcoin-core/gui#317) 2023-04-09 06:29:46 +00:00
Byron Hambly
70d30ba631 Merge 3d9cdb1689 into merged_master (Bitcoin PR bitcoin-core/gui#354) 2023-04-09 06:21:15 +00:00
Byron Hambly
e536247471 Merge c3545a7396 into merged_master (Bitcoin PR bitcoin/bitcoin#22653) 2023-04-09 06:06:44 +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
e43446ce3d Merge ce0913148b into merged_master (Bitcoin PR bitcoin/bitcoin#22547) 2023-04-09 05:27:10 +00:00
Byron Hambly
8599606ab3 Merge 21438d55d5 into merged_master (Bitcoin PR bitcoin/bitcoin#21800) 2023-04-09 05:08:13 +00:00
Byron Hambly
a20c67310c Merge b1a672d158 into merged_master (Bitcoin PR bitcoin/bitcoin#22337) 2023-04-07 11:57:51 +00:00
Byron Hambly
238953d3bf Merge a162edfdd1 into merged_master (Bitcoin PR bitcoin/bitcoin#22359) 2023-04-07 06:48:57 +00:00
James Dorfman
08c7948081 Merge 8fa03c4ddf into merged_master (Bitcoin PR bitcoin/bitcoin#21500) 2023-04-07 06:06:53 +00:00
James Dorfman
ced60a58b1 Merge db94d74f24 into merged_master (Bitcoin PR bitcoin/bitcoin#22657) 2023-04-07 05:55:37 +00:00
James Dorfman
17f63c55a2 Merge 03826aecc5 into merged_master (Bitcoin PR bitcoin-core/gui#396) 2023-04-07 05:46:14 +00:00
James Dorfman
1d3c63e17b Merge 7ebc4c6689 into merged_master (Bitcoin PR bitcoin-core/gui#379) 2023-04-07 05:36:23 +00:00
James Dorfman
e6ef3fd339 Merge d67330d112 into merged_master (Bitcoin PR bitcoin/bitcoin#21129) 2023-04-07 05:04:45 +00:00
James Dorfman
4cf44588ac Merge c4b42aa4ff into merged_master (Bitcoin PR bitcoin/bitcoin#22630) 2023-04-06 23:15:15 +00:00
James Dorfman
dfb1b6a09a Merge 7d60f7ec6b into merged_master (Bitcoin PR bitcoin/bitcoin#22277) 2023-04-06 22:58:56 +00:00
James Dorfman
815f4d545d Merge dd981b5e84 into merged_master (Bitcoin PR bitcoin/bitcoin#22618) 2023-04-06 20:54:28 +00:00
Byron Hambly
014ce00cbd Merge e9472e6828 into merged_master (Bitcoin PR bitcoin-core/gui#393) 2023-04-06 14:20:03 +00:00
Byron Hambly
72b651b5f4 Merge be37037e8e into merged_master (Bitcoin PR bitcoin-core/gui#337) 2023-04-06 14:11:17 +00:00
Byron Hambly
1d89a2fdfa Merge 4f1a75b1aa into merged_master (Bitcoin PR bitcoin/bitcoin#22621) 2023-04-06 13:59:37 +00:00
Byron Hambly
b9ff9a6259 Merge 513e1071a1 into merged_master (Bitcoin PR bitcoin/bitcoin#22616) 2023-04-06 13:35:05 +00:00
Byron Hambly
5f259e46c1 Merge 5b2d8661c9 into merged_master (Bitcoin PR bitcoin/bitcoin#22577) 2023-04-06 13:24:41 +00:00
Byron Hambly
863bcd30b5 Merge 3308c61091 into merged_master (Bitcoin PR bitcoin/bitcoin#22576) 2023-04-06 13:13:10 +00:00
Byron Hambly
9768c23819 Merge eaf09bda4a into merged_master (Bitcoin PR bitcoin/bitcoin#22609) 2023-04-06 13:04:44 +00:00
Byron Hambly
e7d25c0bcf Merge 31a481be29 into merged_master (Bitcoin PR bitcoin/bitcoin#22597) 2023-04-06 12:49:42 +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
1940b08f56 Merge 5cf28d5203 into merged_master (Bitcoin PR bitcoin/bitcoin#22496) 2023-04-06 10:35:23 +00:00
Byron Hambly
1fc280bcdf upgrade secp256k1 to latest version of secp256k1-zkp
copied secp256k1-zkp source from commit 1d256089004a19bdbead7c5676e52c8e07b09fce of
secp256k1-zkp repo

1d25608900

one failing test case in feature_tapscript_opcodes.py commented out and
marked with Elements FIXME
2023-04-05 15:23:20 +02:00
Byron Hambly
09333e2aca Merge 71797beec5 into merged_master (Bitcoin PR bitcoin/bitcoin#22448) 2023-04-05 13:40:55 +02:00
Byron Hambly
d7c38ee168
Merge 10fbb37268 into merged_master (Bitcoin PR bitcoin/bitcoin#22098) 2023-04-04 19:29:03 +02:00
Byron Hambly
05f9a1a7c2 Merge 06788c6705 into merged_master (Bitcoin PR bitcoin/bitcoin#21528) 2023-04-04 11:04:30 +02:00
James Dorfman
74c7a26963 Merge efd6f904c7 into merged_master (Bitcoin PR bitcoin/bitcoin#22570) 2023-04-03 23:52:22 +00:00
James Dorfman
c8a00de47f Merge 2f60d9fce6 into merged_master (Bitcoin PR bitcoin/bitcoin#21940) 2023-04-03 20:45:51 +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
9fafaa6b31 Merge d23570098c into merged_master (Bitcoin PR bitcoin/bitcoin#21882) 2023-03-31 19:46:32 +00:00
James Dorfman
ea7450b099 Merge 4b1fb50def into merged_master (Bitcoin PR bitcoin/bitcoin#22528) 2023-03-31 18:53:21 +00:00