James Dorfman
38cf680443
Merge 41720a1f54 into merged_master (Bitcoin PR bitcoin/bitcoin#24786 )
2024-07-29 19:42:59 +00:00
James Dorfman
5499524906
Merge d906329c28 into merged_master (Bitcoin PR bitcoin/bitcoin#24681 )
2024-07-29 19:05:12 +00:00
James Dorfman
1278b31bc7
Merge 372f1a3c25 into merged_master (Bitcoin PR bitcoin/bitcoin#24753 )
...
Please review this very very carefully. I don't think this is correct, but I wanted to move on with the merges.
Let's fix this.
2024-07-26 06:16:39 +00:00
James Dorfman
18d0ebdd77
Merge 27cfaeed1e into merged_master (Bitcoin PR bitcoin/bitcoin#24098 )
2024-07-09 02:27:59 +00:00
James Dorfman
94e058d3b7
Merge d492dc1cda into merged_master (Bitcoin PR bitcoin/bitcoin#24147 )
2024-07-08 17:49:09 +00:00
James Dorfman
b3a377c2d0
Merge 0da559e02e into merged_master (Bitcoin PR bitcoin/bitcoin#24661 )
2024-07-08 15:17:32 +00:00
James Dorfman
3081da4015
Merge 7ab9fc32d6 into merged_master (Bitcoin PR bitcoin/bitcoin#24724 )
2024-07-08 07:35:33 +00:00
James Dorfman
9616104db4
Merge a2e1590f67 into merged_master (Bitcoin PR bitcoin/bitcoin#24673 )
2024-07-08 06:22:20 +00:00
James Dorfman
7ed4614970
Merge 87dc1dc55f into merged_master (Bitcoin PR bitcoin/bitcoin#24714 )
2024-06-21 20:30:18 +00:00
James Dorfman
51ce17b418
Merge 1b65d4d37b into merged_master (Elements PR #1284 )
2024-05-24 07:10:54 +00:00
James Dorfman
e860ace1e4
Merge f089a0802c into merged_master (Bitcoin PR bitcoin/bitcoin#24692 )
2024-05-23 23:51:34 +00:00
James Dorfman
331c0eb2af
Merge 9e32adbb5c into merged_master (Bitcoin PR bitcoin/bitcoin#24523 )
2024-05-23 22:19:51 +00:00
James Dorfman
363d930f8e
Merge 9344697e57 into merged_master (Bitcoin PR bitcoin/bitcoin#21160 )
2024-03-19 20:07:00 +00:00
Byron Hambly
b9f9528b7c
Merge f0c9ba2b48 into merged_master (Bitcoin PR bitcoin/bitcoin#24205 )
2024-02-02 14:57:29 +02:00
James Dorfman
a0093e2760
Merge d6f225f5c9 into merged_master (Bitcoin PR bitcoin/bitcoin#24462 )
2024-01-09 00:06:54 +00:00
James Dorfman
ca4e1d45b3
Merge 44dbf918d3 into merged_master (Bitcoin PR bitcoin/bitcoin#24627 )
2024-01-08 21:14:52 +00:00
James Dorfman
08010b821f
test: fix failing schnorr sig creation in bip341_keypath_test_vectors
2023-11-09 06:31:49 +00:00
Byron Hambly
fbd708bbca
Merge bf2c0fb2a2 into merged_master (Bitcoin PR bitcoin/bitcoin#24472 )
2023-10-16 11:10:36 +00:00
Byron Hambly
e592d94373
Merge 3617d22562 into merged_master (Bitcoin PR bitcoin/bitcoin#14752 )
2023-10-16 08:38:28 +00:00
James Dorfman
3f110a3fe4
Merge 28bdaa3f76 into merged_master (Bitcoin PR bitcoin/bitcoin#24080 )
2023-10-15 22:22:18 +00:00
Byron Hambly
ca3f6da75f
Merge 76d44e832f into merged_master (Bitcoin PR bitcoin/bitcoin#24469 )
2023-10-14 11:52:24 +00:00
Byron Hambly
c3e42873de
Merge 5e33620ad8 into merged_master (Bitcoin PR bitcoin/bitcoin#24371 )
2023-10-14 11:06:17 +00:00
Byron Hambly
ccdc1ab80b
Merge 47bbd3ff4f into merged_master (Bitcoin PR bitcoin/bitcoin#24498 )
2023-10-14 10:46:50 +00:00
Byron Hambly
c070669f64
Merge 7003b6ab24 into merged_master (Bitcoin PR bitcoin/bitcoin#24138 )
2023-10-14 09:54:25 +00:00
Byron Hambly
b7ad3576f5
Merge 5e49b2a252 into merged_master (Bitcoin PR bitcoin/bitcoin#24050 )
2023-10-13 12:02:55 +00:00
Byron Hambly
47abcf869f
Merge cba41db327 into merged_master (Bitcoin PR bitcoin/bitcoin#24299 )
2023-10-13 10:36:29 +00:00
Byron Hambly
20fa7fa673
Merge 6687bb24ae into merged_master (Bitcoin PR bitcoin/bitcoin#24306 )
2023-10-13 09:02:49 +00:00
Byron Hambly
14bed9c103
Merge 4fae737f4b into merged_master (Bitcoin PR bitcoin/bitcoin#24441 )
2023-10-13 07:38:15 +00:00
James Dorfman
82a2555ad3
build: fix further ASAN issues in CI
2023-09-08 09:24:32 +02:00
Byron Hambly
69e09aa2ea
fix: comment out unused variable until tests are fixed
2023-09-07 16:06:03 +02:00
Byron Hambly
54660d006f
ci: fix unused member function warning in checkqueue.cpp
2023-09-07 13:32:06 +02:00
Byron Hambly
3911e7e2b3
build: fix compilation warnings
2023-09-01 16:39:08 +02:00
Byron Hambly
941940e946
Fix unnecessary pvChecks arg introduced in df8f97d63b in merge of Bitcoin PR bitcoin/bitcoin#23157
2023-08-08 10:10:00 +02:00
James Dorfman
265ba04f55
Add extra optimization initally left out during the merge of bitcoin/bitcoin#23114 in 81d5607ec8
2023-07-21 01:58:35 +00:00
James Dorfman
2ab19eb125
Fix failing unit tests left over from the merge of bitcoin/bitcoin#24343 in eef2269720
2023-07-21 01:34:39 +00:00
Byron Hambly
8dbf577aaa
Merge cfc10a5dd6 into merged_master (Elements PR #1232 )
2023-07-03 13:48:57 +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
b4dbe6d445
Merge 08bcfa2767 into merged_master (Bitcoin PR bitcoin/bitcoin#24375 )
2023-07-03 10:26:26 +00:00
Byron Hambly
5b079a5ef1
Merge 8b6cd42c62 into merged_master (Bitcoin PR bitcoin/bitcoin#24165 )
2023-07-03 10:16:01 +00:00
Byron Hambly
1dc6ad6ea9
Merge ba11eb354b into merged_master (Bitcoin PR bitcoin/bitcoin#23542 )
2023-07-03 09:44:18 +00:00
Byron Hambly
a573a48bf9
Merge 292a841553 into merged_master (Bitcoin PR bitcoin/bitcoin#24449 )
2023-07-02 16:32:16 +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
6c57005ffe
Merge 16d05cf6b9 into merged_master (Bitcoin PR bitcoin/bitcoin#24406 )
2023-07-02 14:13:58 +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
a7beef6e4a
Merge bc49650b7c into merged_master (Bitcoin PR bitcoin/bitcoin#24310 )
2023-07-02 06:52:34 +00:00
Byron Hambly
1fe3769ff8
Merge e44423c9d3 into merged_master (Bitcoin PR bitcoin/bitcoin#24224 )
2023-07-02 06:23:04 +00:00
Byron Hambly
eef2269720
Merge 72f97289c4 into merged_master (Bitcoin PR bitcoin/bitcoin#24343 )
...
Had to change some hashes in descriptor_tests, presumably because of the
differences between when Elements and Bitcoin when it comes to Taproot.
Please review this carefully and investigate the FIXME
2023-07-02 05:17:22 +00:00
Byron Hambly
9f8cb83e1f
Merge edc0d327f1 into merged_master (Bitcoin PR bitcoin/bitcoin#24349 )
2023-06-30 21:12:13 +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
fe4ab59cf5
Merge df0825046a into merged_master (Bitcoin PR bitcoin/bitcoin#24331 )
2023-06-30 19:41:59 +00:00
