Byron Hambly
b50c367ff6
Merge 3a36ec83d0 into merged_master (Bitcoin PR bitcoin/bitcoin#23521 )
2023-05-29 13:17:22 +00:00
Byron Hambly
00f2e32c8e
Merge 47fe7445e7 into merged_master (Bitcoin PR bitcoin/bitcoin#22364 )
...
- some fixmes in this commit, related to invalid schnorr signatures
which need investigation
2023-05-29 12:58:36 +00:00
James Dorfman
995c3a627b
Merge 368831371d into merged_master (Bitcoin PR bitcoin/bitcoin#23558 )
2023-05-26 15:58:59 +00:00
James Dorfman
a51894bd5d
Merge 80ae64db6b into merged_master (Bitcoin PR bitcoin/bitcoin#23553 )
2023-05-26 14:59:42 +00:00
Byron Hambly
02b4c59511
Merge fe03f7a37f into merged_master (Bitcoin PR bitcoin/bitcoin#23540 )
2023-05-26 13:57:11 +00:00
Byron Hambly
6279c58b1a
Merge d94dc69ee4 into merged_master (Bitcoin PR bitcoin/bitcoin#23501 )
2023-05-26 13:18:58 +00:00
Byron Hambly
3eabe469a8
Merge 4a7f6e0d0c into merged_master (Bitcoin PR bitcoin/bitcoin#23524 )
2023-05-26 11:18:18 +00:00
Byron Hambly
bd68371fb6
Merge ffdab41f94 into merged_master (Bitcoin PR bitcoin/bitcoin#23474 )
2023-05-26 10:32:04 +00:00
Byron Hambly
1ca7d86b81
Merge 41e6909c07 into merged_master (Bitcoin PR bitcoin/bitcoin#23516 )
2023-05-26 09:32:13 +00:00
Byron Hambly
1beaa601b4
Merge 5ccab7187b into merged_master (Bitcoin PR bitcoin/bitcoin#23394 )
...
- commented out some script tests that need to be fixed
- commented out feature_taproot.py since it needs significant updates
2023-05-26 09:14:20 +00:00
Byron Hambly
2a6a83b69b
Merge fa2303989b into merged_master (Bitcoin PR bitcoin/bitcoin#23515 )
2023-05-25 08:43:30 +00:00
James Dorfman
4a713e72bb
Merge aec631bccc into merged_master (Bitcoin PR bitcoin/bitcoin#23462 )
2023-05-24 20:35:27 +00:00
James Dorfman
432b8883ec
Merge 41a1b5f58c into merged_master (Bitcoin PR bitcoin/bitcoin#23046 )
2023-05-24 18:31:31 +00:00
James Dorfman
b83a6e56ae
Merge 8251316acb into merged_master (Bitcoin PR bitcoin/bitcoin#23153 )
2023-05-24 18:23:31 +00:00
James Dorfman
4fbdbb640e
Merge ffcb4374c4 into merged_master (Bitcoin PR bitcoin/bitcoin#23498 )
2023-05-24 18:15:21 +00:00
Byron Hambly
3bb33ac420
Merge 9d2895157e into merged_master (Bitcoin PR bitcoin/bitcoin#23500 )
2023-05-24 14:00:43 +00:00
Byron Hambly
81d5607ec8
Merge c1fb30633b into merged_master (Bitcoin PR bitcoin/bitcoin#23114 )
2023-05-24 12:58:57 +00:00
Byron Hambly
7c051db697
Merge d217ee25a3 into merged_master (Bitcoin PR bitcoin/bitcoin#23420 )
2023-05-24 12:34:34 +00:00
Byron Hambly
efdff97eb0
Merge 4a8707741d into merged_master (Bitcoin PR bitcoin/bitcoin#22872 )
2023-05-24 11:46:09 +00:00
Byron Hambly
c6412b29d2
Merge ed479497bd into merged_master (Bitcoin PR bitcoin/bitcoin#23398 )
2023-05-24 10:35:24 +00:00
Byron Hambly
c2d548ae74
Merge 8f86820ff8 into merged_master (Bitcoin PR bitcoin/bitcoin#23370 )
2023-05-24 10:27:36 +00:00
Byron Hambly
2110cca82e
Merge 2539980e1d into merged_master (Bitcoin PR bitcoin/bitcoin#23371 )
...
- added a few fixme notes where necessary
- for some reason the given internal_key from upstream has a different
parity, causing verifytaprootcommitment to fail... which is why the
internal_key has been changed
- fixed up the rpc_blockchain test
2023-05-24 10:25:00 +00:00
Byron Hambly
af3fe60b69
Merge 94db963de5 into merged_master (Bitcoin PR bitcoin/bitcoin#23300 )
2023-05-17 13:44:36 +00:00
Byron Hambly
b951f8d198
Merge 8346004ac8 into merged_master (Bitcoin PR bitcoin/bitcoin#23077 )
2023-05-17 12:13:27 +00:00
Byron Hambly
14a31b99b1
Merge 24abd8312e into merged_master (Bitcoin PR bitcoin/bitcoin#22949 )
2023-05-17 08:32:34 +00:00
Byron Hambly
ecfa0d4a5a
Merge 994aaaa88d into merged_master (Bitcoin PR bitcoin/bitcoin#23380 )
2023-05-16 13:05:36 +00:00
Byron Hambly
ef3b7c2fc0
Merge 5574881ce3 into merged_master (Bitcoin PR bitcoin/bitcoin#23354 )
2023-05-16 12:49:09 +00:00
Byron Hambly
18c7997de0
Merge 8bac3b1096 into merged_master (Bitcoin PR bitcoin/bitcoin#23375 )
2023-05-16 12:39:37 +00:00
Byron Hambly
d7ac30d9f5
Merge c426e0dc6f into merged_master (Bitcoin PR bitcoin/bitcoin#22972 )
2023-05-16 12:38:35 +00:00
Byron Hambly
7e120e5e97
Merge ab25ef8c7f into merged_master (Bitcoin PR bitcoin/bitcoin#23305 )
2023-05-16 10:18:11 +00:00
Byron Hambly
99318f43e8
Merge d565d9b56d into merged_master (Bitcoin PR bitcoin/bitcoin#23312 )
2023-05-16 09:35:07 +00:00
Byron Hambly
60882e24e5
Merge beb45b8b14 into merged_master (Bitcoin PR bitcoin/bitcoin#23311 )
2023-05-16 09:13:09 +00:00
Byron Hambly
88564272f4
Merge 49e40f5704 into merged_master (Bitcoin PR bitcoin/bitcoin#22711 )
2023-05-15 13:39:04 +00:00
Byron Hambly
d3244c4db4
Merge a1d55ced09 into merged_master (Bitcoin PR bitcoin/bitcoin#23139 )
2023-05-15 12:01:49 +00:00
Byron Hambly
dc83a5d546
Merge 02feae54a5 into merged_master (Bitcoin PR bitcoin/bitcoin#23002 )
2023-05-14 11:15:42 +00:00
Byron Hambly
b35bd977ec
Merge 12ff8993bc into merged_master (Bitcoin PR bitcoin/bitcoin#23331 )
2023-05-14 10:23:07 +00:00
Byron Hambly
c1a05187a3
Merge 8a083bc5b5 into merged_master (Bitcoin PR bitcoin/bitcoin#23218 )
2023-05-14 09:58:38 +00:00
Byron Hambly
506268925f
Merge 88fc7950f8 into merged_master (Bitcoin PR bitcoin/bitcoin#23267 )
2023-05-14 09:19:47 +00:00
Byron Hambly
a27835cb7d
Merge 548ad5ef7f into merged_master (Bitcoin PR bitcoin/bitcoin#23281 )
2023-05-14 09:12:26 +00:00
Byron Hambly
117f3fef5b
Merge 9aa4ddb410 into merged_master (Bitcoin PR bitcoin/bitcoin#23287 )
2023-05-14 07:52:20 +00:00
James Dorfman
3b1c914a64
Merge c53e95f22c into merged_master (Bitcoin PR bitcoin/bitcoin#23137 )
2023-05-14 07:06:13 +00:00
James Dorfman
11a0b74612
Merge 69986de383 into merged_master (Bitcoin PR bitcoin/bitcoin#22839 )
2023-05-14 02:38:33 +00:00
James Dorfman
677e269c5c
Merge 1435161f64 into merged_master (Bitcoin PR bitcoin/bitcoin#23316 )
2023-05-14 01:36:16 +00:00
James Dorfman
3caddc4317
Merge 986003aff9 into merged_master (Bitcoin PR bitcoin/bitcoin#22918 )
2023-05-13 10:47:39 +00:00
Byron Hambly
dd79998bcb
Merge 2d2516196b into merged_master (Bitcoin PR bitcoin/bitcoin#23307 )
2023-05-12 11:38:33 +00:00
Byron Hambly
f4502739a1
Merge 077e98c6c2 into merged_master (Bitcoin PR bitcoin/bitcoin#23303 )
2023-05-12 11:30:49 +00:00
Byron Hambly
a4a976ee6f
Merge ff65b696f3 into merged_master (Bitcoin PR bitcoin/bitcoin#22067 )
2023-05-12 10:02:36 +00:00
Byron Hambly
f80332fee5
Merge 2e82af46e2 into merged_master (Bitcoin PR bitcoin/bitcoin#23207 )
2023-05-12 09:55:10 +00:00
Byron Hambly
8d0febc5c2
Merge ef596923a8 into merged_master (Bitcoin PR bitcoin/bitcoin#23080 )
2023-05-11 13:23:09 +00:00
Byron Hambly
31bb8332bc
Merge 3bf40d06a2 into merged_master (Bitcoin PR bitcoin/bitcoin#23212 )
2023-05-11 13:15:28 +00:00
