James Dorfman
d0023d747b
Merge fa92777448 into merged_master (Bitcoin PR bitcoin/bitcoin#22736 )
2023-04-20 21:30:28 +00:00
James Dorfman
103069c46c
fixes for Bitcoin PR bitcoin/bitcoin#22100
...
comments out one failing assertion in wallet_tests unit test
and one failing assertion in rpc_fundrawtransaction.py
2023-04-20 12:27:33 +00:00
James Dorfman
3e939cca81
Merge 629c4ab2e3 into merged_master (Bitcoin PR bitcoin/bitcoin#22100 )
2023-04-14 06:13:01 +00:00
Byron Hambly
01372df8d5
Merge b997dd211e into merged_master (Bitcoin PR bitcoin/bitcoin#22809 )
2023-04-13 12:18:40 +00:00
James Dorfman
a6c8382161
Merge 7e75400bb5 into merged_master (Bitcoin PR bitcoin/bitcoin#22437 )
2023-04-13 10:19:44 +00:00
Byron Hambly
1acda7580c
Merge adccbb380b into merged_master (Bitcoin PR bitcoin/bitcoin#21862 )
2023-04-11 08:09:30 +00:00
Byron Hambly
bc7fa0e302
Merge 0492b56e38 into merged_master (Bitcoin PR bitcoin/bitcoin#22738 )
2023-04-11 07:19:54 +00:00
Byron Hambly
e7eb780785
Merge f046131481 into merged_master (Bitcoin PR bitcoin/bitcoin#22797 )
2023-04-11 05:58:47 +00:00
James Dorfman
c8c66f0dc3
Merge eb09c26724 into merged_master (Bitcoin PR bitcoin/bitcoin#22741 )
2023-04-11 05:41:32 +00:00
James Dorfman
2e16bd7fe2
Merge f6f7a12462 into merged_master (Bitcoin PR bitcoin/bitcoin#22622 )
2023-04-11 01:32:44 +00:00
James Dorfman
5b302d366b
Merge 489beb3984 into merged_master (Bitcoin PR bitcoin/bitcoin#22641 )
2023-04-11 01:24:28 +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
5d5f55006d
Merge 4fc15d1566 into merged_master (Bitcoin PR bitcoin/bitcoin#22707 )
2023-04-10 12:37:09 +00:00
Byron Hambly
830f71c085
Merge 999f8b24cc into merged_master (Bitcoin PR bitcoin/bitcoin#22568 )
2023-04-10 11:11:59 +00:00
Byron Hambly
1096d6e13a
Merge 92f3a4b4d0 into merged_master (Bitcoin PR bitcoin/bitcoin#22742 )
2023-04-10 11:03:49 +00:00
Byron Hambly
e7704c0b25
Merge 38975eccd4 into merged_master (Bitcoin PR bitcoin/bitcoin#22229 )
2023-04-10 10:17:32 +00:00
James Dorfman
a60b054c1a
Merge b935abb9eb into merged_master (Bitcoin PR bitcoin/bitcoin#22684 )
2023-04-10 00:55:18 +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
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
a797e5e55a
Merge 4c87665707 into merged_master (Bitcoin PR bitcoin/bitcoin#22604 )
2023-04-09 07:26:48 +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
8599606ab3
Merge 21438d55d5 into merged_master (Bitcoin PR bitcoin/bitcoin#21800 )
2023-04-09 05:08:13 +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
62076b5b7e
Merge f4328ebef5 into merged_master (Bitcoin PR bitcoin/bitcoin#22619 )
2023-04-07 04:34:13 +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
2fc4d3b485
Merge 87257d860e into merged_master (Bitcoin PR bitcoin/bitcoin#22532 )
2023-04-06 11:48:33 +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
4c98b9a947
test: remove blind_details dir at end of wallet_recovery test
2023-04-06 10:34:33 +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
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
Byron Hambly
884d58e0e1
Merge b620b2d58a into merged_master (Bitcoin PR bitcoin/bitcoin#22378 )
2023-04-04 11:00:11 +02:00
James Dorfman
ebc6e3967f
Merge bb60960750 into merged_master (Bitcoin PR bitcoin/bitcoin#22593 )
2023-04-03 20:34:45 +00:00
Byron Hambly
e17125c41b
Merge f2e41d1109 into merged_master (Bitcoin PR bitcoin/bitcoin#22429 )
2023-04-03 15:12:22 +02:00
Byron Hambly
9b98dc8ab1
Merge da1c0c64fd into merged_master (Bitcoin PR bitcoin/bitcoin#22330 )
2023-04-03 14:50:19 +02:00
James Dorfman
4a1391ccb8
Merge 78f040a6b3 into merged_master (Bitcoin PR bitcoin/bitcoin#22490 )
2023-04-03 03:29:18 +00:00
James Dorfman
a67d82ef3f
Merge b6c3fceed6 into merged_master (Bitcoin PR bitcoin/bitcoin#22520 )
2023-04-01 05:00:53 +00:00
James Dorfman
91c9659306
Merge 24fb69dca4 into merged_master (Bitcoin PR bitcoin/bitcoin#22139 )
2023-03-31 19:25:06 +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
fac566dd39
Merge 93878d2ab5 into merged_master (Bitcoin PR bitcoin/bitcoin#22423 )
2023-03-28 00:59:31 +00:00
Glenn Willen
55a5e2f921
Merge 548ca1d3a5 into merged_master (Bitcoin PR bitcoin/bitcoin#22550 )
2023-03-28 00:44:23 +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
Glenn Willen
72a0ba0291
Merge cac38cdd02 into merged_master (Bitcoin PR bitcoin/bitcoin#21832 )
2023-03-21 03:59:44 +00:00
James Dorfman
4859871d82
Merge 40fed336b2 into merged_master (Bitcoin PR bitcoin/bitcoin#22510 )
2023-03-17 15:33:09 +00:00
James Dorfman
c5226be2a5
Merge 458d6ac23b into merged_master (Bitcoin PR bitcoin/bitcoin#22407 )
2023-03-17 14:24:43 +00:00
James Dorfman
544ccad427
Merge 58b5fa0dbf into merged_master (Elements PR #1186 )
2023-03-13 05:27:12 +00:00
James Dorfman
7c66f57fb9
Merge ae220b8545 into merged_master (Elements PR #1184 )
2023-03-13 05:27:11 +00:00
