Commit graph

6070 commits

Author SHA1 Message Date
James Dorfman
bb30fa363d Fix feature_taproot functional test which has been failing since
the merge of bitcoin/bitcoin#23394 in 1beaa601b4

Co-authored-by: Sanket Kanjalkar <sanket1729@gmail.com>
2023-08-11 16:39:14 +00:00
James Dorfman
1c5469b60c
Re-activate assertion which was disabled in the merge of bitcoin/bitcoin#23371 in 2110cca
A subsequent commit appears to have fixed that assertion. It works now.
2023-08-01 10:28:20 +02:00
James Dorfman
c1b2582a0b
Add elements-specific descriptions to assertions commented out in the merge of bitcoin/bitcoin#23201 in 7d759da52a 2023-08-01 10:28:19 +02:00
James Dorfman
8b21677a65 Add back comment which was deleted in the merge of bitcoin/bitcoin#23789 in fa3c0f4eaa 2023-07-24 17:50:33 +00:00
James Dorfman
b6f5c2de90 Add more detail to FIXME comment introduced in the merge of bitcoin/bitcoin#22019 in e3ab195851 2023-07-24 17:50:33 +00:00
James Dorfman
e815e6ad8c Rename 'bitcoin-cli' -> 'elements-cli' in logging change introduced in the merge of bitcoin/bitcoin#23712 in 4c0504b349 2023-07-24 17:50:33 +00:00
James Dorfman
bbfdbf732c Remove extraneous sync in rpc_signrawtransaction functional test
which should have been removed in the merge of bitcoin/bitcoin#23474 in bd68371fb6
2023-07-21 02:23:18 +00:00
James Dorfman
654752a8b3 Fix typos left over from the merge of bitcoin/bitcoin#23207 in f80332fee5 2023-07-21 01:39:36 +00:00
Byron Hambly
8dbf577aaa Merge cfc10a5dd6 into merged_master (Elements PR #1232) 2023-07-03 13:48:57 +00:00
Byron Hambly
5e994b4aa6 Merge 1443d302ae into merged_master (Elements PR #1231) 2023-07-03 12:27:53 +00:00
Byron Hambly
6f90a02548 Merge 30308cc380 into merged_master (Bitcoin PR bitcoin/bitcoin#20196) 2023-07-03 11:17:52 +00:00
Byron Hambly
7a7253639a Merge 267917f563 into merged_master (Bitcoin PR bitcoin/bitcoin#23304) 2023-07-03 10:06:51 +00:00
Byron Hambly
7d91422a87 Merge 848b11615b into merged_master (Bitcoin PR bitcoin/bitcoin#22834) 2023-07-03 09:33:46 +00:00
Byron Hambly
7e989c64b3 Merge 159f89c118 into merged_master (Bitcoin PR bitcoin/bitcoin#24365) 2023-07-02 17:03:39 +00:00
Byron Hambly
b2b09ea422 Merge c7da61dcc3 into merged_master (Bitcoin PR bitcoin/bitcoin#24403) 2023-07-02 16:55:32 +00:00
Byron Hambly
92d15f851b Merge ee8c997125 into merged_master (Bitcoin PR bitcoin/bitcoin#24402) 2023-07-02 16:24:37 +00:00
Byron Hambly
8211047b9c Merge b00b60ed4f into merged_master (Bitcoin PR bitcoin/bitcoin#24201) 2023-07-02 15:50:25 +00:00
Byron Hambly
1223ba95ca Merge f1ce67f09f into merged_master (Bitcoin PR bitcoin/bitcoin#19013) 2023-07-02 15:42:51 +00:00
Byron Hambly
b80c04e05a Merge 358fe779cb into merged_master (Bitcoin PR bitcoin/bitcoin#24381) 2023-07-02 14:47:05 +00:00
Byron Hambly
5002361bbd Merge f9b522e50d into merged_master (Bitcoin PR bitcoin/bitcoin#24426) 2023-07-02 14:31:10 +00:00
Byron Hambly
51fbed170b Merge 3c565302aa into merged_master (Bitcoin PR bitcoin/bitcoin#24409) 2023-07-02 13:45:31 +00:00
Byron Hambly
9ff19d7432 Merge f062abe529 into merged_master (Bitcoin PR bitcoin/bitcoin#24419) 2023-07-02 07:50:11 +00:00
Byron Hambly
0e89b30f95 Merge 8add59d77d into merged_master (Bitcoin PR bitcoin/bitcoin#24367) 2023-07-02 07:33:56 +00:00
Byron Hambly
5bbd79f15a Merge 98b9d607a8 into merged_master (Bitcoin PR bitcoin/bitcoin#24390) 2023-07-01 06:38:01 +00:00
Byron Hambly
ca0735a437 Merge 003523d239 into merged_master (Bitcoin PR bitcoin/bitcoin#24338) 2023-06-30 20:58:14 +00:00
Byron Hambly
b6546f3091 Merge 1e8aa02ec5 into merged_master (Bitcoin PR bitcoin/bitcoin#24117) 2023-06-30 17:42:41 +00:00
Byron Hambly
d2ee0b0b61 Merge 7164e00e1b into merged_master (Bitcoin PR bitcoin/bitcoin#24324) 2023-06-30 17:34:42 +00:00
Byron Hambly
71acfa3da7 Merge 6b8e4977b8 into merged_master (Bitcoin PR bitcoin/bitcoin#24342) 2023-06-30 17:03:39 +00:00
Byron Hambly
207c1ce338 Merge e0367e84b3 into merged_master (Bitcoin PR bitcoin/bitcoin#24301) 2023-06-30 15:43:32 +00:00
Byron Hambly
f9aca0e104 Merge fd25d3493d into merged_master (Bitcoin PR bitcoin/bitcoin#24319) 2023-06-30 15:07:15 +00:00
Byron Hambly
db3167a06b Merge 2d7ea201fc into merged_master (Bitcoin PR bitcoin/bitcoin#24307) 2023-06-30 12:57:14 +00:00
Byron Hambly
4cf3e8ce31 Merge 8796c2f568 into merged_master (Bitcoin PR bitcoin/bitcoin#24302) 2023-06-30 11:53:57 +00:00
Byron Hambly
9de9d8ac60 Merge 8ac79973f8 into merged_master (Bitcoin PR bitcoin/bitcoin#24196) 2023-06-30 11:03:12 +00:00
Byron Hambly
8719928e6e Merge 87b5b002ad into merged_master (Bitcoin PR bitcoin/bitcoin#24259) 2023-06-30 10:09:37 +00:00
Byron Hambly
900cf5f60d Merge eca694a4e7 into merged_master (Bitcoin PR bitcoin/bitcoin#24239) 2023-06-30 10:01:50 +00:00
Byron Hambly
2aa75b6d6d Merge 9392e1350c into merged_master (Bitcoin PR bitcoin/bitcoin#24195) 2023-06-30 09:45:52 +00:00
Byron Hambly
dfc4ef427a Merge fa65f26f4d into merged_master (Bitcoin PR bitcoin/bitcoin#24237) 2023-06-30 09:30:02 +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
75587174c7 Merge 219d728fcb into merged_master (Bitcoin PR bitcoin/bitcoin#24219) 2023-06-30 06:30:09 +00:00
Byron Hambly
fe699e1423 Merge a41976ab77 into merged_master (Bitcoin PR bitcoin/bitcoin#24223) 2023-06-30 06:22:27 +00:00
Byron Hambly
999b6ac80b Merge 02e1d8d06f into merged_master (Bitcoin PR bitcoin/bitcoin#24083) 2023-06-30 06:11:44 +00:00
Byron Hambly
76f85db4b9 Merge 36f8e99d24 into merged_master (Bitcoin PR bitcoin/bitcoin#24218) 2023-06-29 14:55:01 +00:00
Byron Hambly
d4245a7be2 Merge fcac16fff8 into merged_master (Bitcoin PR bitcoin/bitcoin#24190) 2023-06-29 14:47:21 +00:00
Byron Hambly
687f3b8fcd Merge 8f137e69ca into merged_master (Bitcoin PR bitcoin/bitcoin#24192) 2023-06-29 14:39:34 +00:00
Byron Hambly
fa65843810 Merge 0ff1391328 into merged_master (Bitcoin PR bitcoin/bitcoin#24191) 2023-06-29 14:31:17 +00:00
Byron Hambly
4b1d172451 Merge b25a752dfd into merged_master (Bitcoin PR bitcoin/bitcoin#24146) 2023-06-29 13:28:33 +00:00
Byron Hambly
b87b7f49ad Merge af7b077973 into merged_master (Bitcoin PR bitcoin/bitcoin#24203) 2023-06-29 12:42:57 +00:00
Byron Hambly
8d2a08af51 Merge 1245c62fef into merged_master (Bitcoin PR bitcoin/bitcoin#24139) 2023-06-29 11:59:03 +00:00
Byron Hambly
5931d7d47c Merge d4e92d8436 into merged_master (Bitcoin PR bitcoin/bitcoin#23508) 2023-06-29 11:46:17 +00:00
Byron Hambly
62697be8d9 Merge 3d223712d3 into merged_master (Bitcoin PR bitcoin/bitcoin#16795) 2023-06-28 16:32:17 +00:00