Byron Hambly
ca596d446a
Merge 529ed33362 into merged_master (Bitcoin PR bitcoin/bitcoin#23715 )
2023-06-06 10:18:36 +00:00
Byron Hambly
1413ea774b
Merge 68ca8677e0 into merged_master (Bitcoin PR bitcoin/bitcoin#23716 )
2023-06-06 10:11:17 +00:00
Byron Hambly
3de9eba023
Merge c4ae714f55 into merged_master (Bitcoin PR bitcoin/bitcoin#23714 )
2023-06-06 09:54:08 +00:00
Byron Hambly
4c0504b349
Merge f727d814bd into merged_master (Bitcoin PR bitcoin/bitcoin#23712 )
2023-06-06 09:46:12 +00:00
Byron Hambly
b0b2f3deff
Merge f6013265b7 into merged_master (Bitcoin PR bitcoin/bitcoin#20295 )
2023-06-06 09:10:04 +00:00
Byron Hambly
91f2b1114e
Merge 63c63b5533 into merged_master (Bitcoin PR bitcoin/bitcoin#14707 )
2023-06-05 11:19:58 +00:00
James Dorfman
669c52f7e8
Merge 4fd0ce75c5 into merged_master (Bitcoin PR bitcoin/bitcoin#22689 )
2023-06-02 15:34:33 +00:00
Byron Hambly
49b9c8e46b
Merge 89ea2b3809 into merged_master (Bitcoin PR bitcoin/bitcoin#20583 )
2023-06-02 12:25:30 +00:00
Byron Hambly
9f680f065f
Merge 08dcc5912d into merged_master (Bitcoin PR bitcoin/bitcoin#23688 )
2023-06-02 11:19:56 +00:00
Byron Hambly
f936d6d2fa
Merge 877f3aa85c into merged_master (Bitcoin PR bitcoin/bitcoin#23686 )
2023-06-02 11:11:36 +00:00
Byron Hambly
207616f18e
Merge 695ba2fe54 into merged_master (Bitcoin PR bitcoin/bitcoin#23486 )
...
Added the additional elements output types of "true" and "fee" to the
decodescript lambdas, we should confirm that this is correct for the fee
outputs. ie. that it is acceptable to permit fee outputs to be wrapped
2023-06-02 10:09:13 +00:00
Byron Hambly
60beb95b69
Merge 32d9f3770a into merged_master (Bitcoin PR bitcoin/bitcoin#23596 )
2023-06-02 08:38:00 +00:00
Byron Hambly
a120b7925d
Merge 22feb7fee9 into merged_master (Bitcoin PR bitcoin/bitcoin#23577 )
2023-06-02 08:34:54 +00:00
Byron Hambly
e129d42b92
Merge d20d6ac545 into merged_master (Bitcoin PR bitcoin/bitcoin#23672 )
...
Updated the addresses and scripts in rpc_decodescript.json to work with
elements
2023-06-02 08:14:30 +00:00
James Dorfman
8a53a72f27
Merge 42b35f17d5 into merged_master (Bitcoin PR bitcoin/bitcoin#23681 )
2023-06-02 05:52:27 +00:00
Byron Hambly
1348eb8356
Merge 927a9b0777 into merged_master (Bitcoin PR bitcoin/bitcoin#23659 )
2023-06-01 13:32:06 +00:00
Byron Hambly
ee125b1ac7
Merge bce58bbb3d into merged_master (Bitcoin PR bitcoin/bitcoin#22929 )
...
The test failures in wallet_listtransactions.py are fixed by #23659
2023-06-01 13:30:17 +00:00
Byron Hambly
50957f3e4b
Merge 26a1147ce5 into merged_master (Bitcoin PR bitcoin/bitcoin#23636 )
2023-06-01 12:04:07 +00:00
Byron Hambly
42d0d33457
Merge 6acda4b00b into merged_master (Bitcoin PR bitcoin/bitcoin#23155 )
2023-06-01 11:31:51 +00:00
Byron Hambly
35ef582d8d
Merge 282cc0cda7 into merged_master (Bitcoin PR bitcoin/bitcoin#23626 )
2023-06-01 11:12:14 +00:00
Byron Hambly
df7706fbf9
Merge a377510e3a into merged_master (Bitcoin PR bitcoin/bitcoin#23643 )
2023-06-01 10:10:40 +00:00
Byron Hambly
2da6d2363d
Merge 4633199cc8 into merged_master (Bitcoin PR bitcoin/bitcoin#22677 )
2023-06-01 09:42:34 +00:00
James Dorfman
b7ee0e8b7f
Merge aef8c7cf82 into merged_master (Bitcoin PR bitcoin/bitcoin#23289 )
2023-06-01 05:52:23 +00:00
James Dorfman
4c01837482
Merge c5712d172e into merged_master (Bitcoin PR bitcoin/bitcoin#23506 )
2023-06-01 05:44:25 +00:00
James Dorfman
5aadbb7a9d
Merge 63c0d0e937 into merged_master (Bitcoin PR bitcoin/bitcoin#21327 )
...
I commented out a few new lines at the bottom of test/functional/p2p_ibd_txrelay.py
It tests that nodes process certain transactions, after IBD. These new assertions
from upstream are failing, but it may be because our IBD / tx sharing logic is different.
We should revisit this.
2023-06-01 05:27:06 +00:00
Byron Hambly
e9be7bfc96
Merge 383d350bd5 into merged_master (Bitcoin PR bitcoin/bitcoin#22513 )
2023-05-31 13:50:36 +00:00
Byron Hambly
6f1067c437
Merge a574f4ad39 into merged_master (Bitcoin PR bitcoin/bitcoin#23392 )
2023-05-31 11:42:45 +00:00
Byron Hambly
eb7b15c660
Merge 4f8b1f8759 into merged_master (Bitcoin PR bitcoin/bitcoin#23608 )
2023-05-31 10:24:48 +00:00
Byron Hambly
32a72637f7
Merge 16d698cdcf into merged_master (Bitcoin PR bitcoin/bitcoin#23517 )
2023-05-31 09:33:07 +00:00
James Dorfman
d6b64dd58b
Merge 791dd1f41e into merged_master (Bitcoin PR bitcoin/bitcoin#23538 )
2023-05-31 07:04:30 +00:00
James Dorfman
c134b5a012
Merge 064c729a96 into merged_master (Bitcoin PR bitcoin/bitcoin#23512 )
2023-05-31 06:23:55 +00:00
Byron Hambly
eee64b5289
Merge 95d19f8c1a into merged_master (Bitcoin PR bitcoin/bitcoin#16807 )
...
I did not do a great job with this merge, and it could use some
improvement. Commented out some of the assertions in
rpc_invalid_address_message.py
2023-05-30 15:27:30 +00:00
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
