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
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
James Dorfman
c8526de70a
Merge 67b9416540 into merged_master (Bitcoin PR bitcoin/bitcoin#21562 )
2023-03-31 18:42:53 +00:00
Byron Hambly
d60b269083
Merge 31fef69c03 into merged_master (Bitcoin PR bitcoin/bitcoin#22047 )
2023-03-31 18:32:13 +00:00
Glenn Willen
2aedf15ba5
Merge 5e213822f8 into merged_master (Bitcoin PR bitcoin/bitcoin#22530 )
2023-03-28 01:15:12 +00:00
Glenn Willen
a9a906021e
Merge be175cef24 into merged_master (Bitcoin PR bitcoin/bitcoin#22557 )
2023-03-28 00:28:49 +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
ac88de9825
Merge f372623807 into merged_master (Bitcoin PR bitcoin/bitcoin#22495 )
2023-03-27 23:56:34 +00:00
Glenn Willen
c3aa54eb50
Merge 7075a52b67 into merged_master (Bitcoin PR bitcoin/bitcoin#22155 )
2023-03-27 23:42:38 +00:00
James Dorfman
fe30f7c34f
Merge 1488f55fa5 into merged_master (Bitcoin PR bitcoin/bitcoin#22454 )
2023-03-26 06:21:06 +00:00
James Dorfman
8eed269298
Merge 2aa937e97a into merged_master (Bitcoin PR bitcoin/bitcoin#22453 )
2023-03-24 22:00:06 +00:00
James Dorfman
dae753ea4e
Merge 2735e111eb into merged_master (Bitcoin PR bitcoin/bitcoin#22444 )
2023-03-24 21:24:58 +00:00
James Dorfman
d890a24f96
Merge 401db600b0 into merged_master (Bitcoin PR bitcoin/bitcoin#22517 )
2023-03-24 20:14:31 +00:00
James Dorfman
a124f16efc
Merge fd557ceb88 into merged_master (Bitcoin PR bitcoin/bitcoin#13533 )
...
Temporarily disable failing tests that use elements-specific interpreter flags
2023-03-24 19:33:46 +00:00
Glenn Willen
7050d04a75
Merge 7925f3aba8 into merged_master (Bitcoin PR bitcoin/bitcoin#22383 )
2023-03-22 03:54:56 +00: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
