Byron Hambly
12dda5542d
Merge 1c41fb9181 into merged_master (Bitcoin PR bitcoin/bitcoin#23812 )
2023-06-13 17:02:59 +00:00
Byron Hambly
cbb591af1d
Merge 70d6a09f5c into merged_master (Bitcoin PR bitcoin/bitcoin#17631 )
2023-06-13 16:55:02 +00:00
Byron Hambly
6820bd56eb
Merge 6b212cbbb9 into merged_master (Bitcoin PR bitcoin/bitcoin#23720 )
2023-06-13 14:10:35 +00:00
Byron Hambly
84376ef08c
Merge df6e961c41 into merged_master (Bitcoin PR bitcoin/bitcoin#23777 )
2023-06-13 14:10:29 +00:00
Byron Hambly
8bff356855
Merge a30642926a into merged_master (Bitcoin PR bitcoin/bitcoin#23721 )
2023-06-13 13:41:22 +00:00
Byron Hambly
81fcbe8729
Merge 98c362a4d3 into merged_master (Bitcoin PR bitcoin/bitcoin#23782 )
2023-06-13 13:33:55 +00:00
Byron Hambly
8edcc34130
Merge 60b5795133 into merged_master (Bitcoin PR bitcoin/bitcoin#23758 )
2023-06-13 12:26:03 +00:00
Byron Hambly
d90eaec39b
Merge 7006496a5c into merged_master (Bitcoin PR bitcoin/bitcoin#23756 )
2023-06-13 11:22:13 +00:00
Byron Hambly
84fc24a4a1
Merge 9015d11842 into merged_master (Bitcoin PR bitcoin/bitcoin#23774 )
2023-06-13 10:24:35 +00:00
Byron Hambly
54c9ee347d
Merge 9635760ce8 into merged_master (Bitcoin PR bitcoin/bitcoin#22777 )
2023-06-13 10:06:36 +00:00
Byron Hambly
e0583f04ee
Merge 5dd28e5cff into merged_master (Bitcoin PR bitcoin/bitcoin#23755 )
2023-06-13 08:58:20 +00:00
Byron Hambly
dee88aa19a
Merge c8fac372c2 into merged_master (Bitcoin PR bitcoin/bitcoin#23648 )
2023-06-13 08:42:18 +00:00
Byron Hambly
85106c0a56
Merge bf66e258a8 into merged_master (Bitcoin PR bitcoin/bitcoin#23365 )
2023-06-13 08:34:16 +00:00
James Dorfman
b0afaee332
Merge eb63b8fab9 into merged_master (Bitcoin PR bitcoin/bitcoin#23718 )
2023-06-13 05:47:02 +00:00
James Dorfman
86f68b94d0
Merge ac92ab6da5 into merged_master (Bitcoin PR bitcoin/bitcoin#23113 )
2023-06-13 05:02:03 +00:00
James Dorfman
79d86d3a03
Merge 90deb9f980 into merged_master (Bitcoin PR bitcoin/bitcoin#23740 )
2023-06-13 04:40:50 +00:00
James Dorfman
3ef3a3ba00
Merge 011d6e429b into merged_master (Bitcoin PR bitcoin/bitcoin#22514 )
2023-06-12 17:32:45 +00:00
Byron Hambly
70c69d94f6
Merge 9f7661c0c4 into merged_master (Bitcoin PR bitcoin/bitcoin#19499 )
2023-06-12 13:11:30 +00:00
Byron Hambly
b80f2e6593
Merge 09ad512369 into merged_master (Bitcoin PR bitcoin/bitcoin#23628 )
2023-06-12 12:43:53 +00:00
Byron Hambly
87960114d8
Merge 2f26d8ec70 into merged_master (Bitcoin PR bitcoin/bitcoin#23725 )
2023-06-12 12:36:20 +00:00
Byron Hambly
e3ab195851
Merge c840ab0231 into merged_master (Bitcoin PR bitcoin/bitcoin#22019 )
...
This was a complicated merge that had to be modified from upstream to work with multi-assets,
so it should be reviewed carefully
2023-06-12 12:36:04 +00:00
Byron Hambly
32bcb2de54
Merge 09e60df115 into merged_master (Bitcoin PR bitcoin/bitcoin#23723 )
2023-06-06 11:56:36 +00:00
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
