Byron Hambly
52bd78edf4
Merge 786ffb3ae4 into merged_master (Bitcoin PR bitcoin/bitcoin#17160 )
2023-06-02 10:53:09 +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
6089b0123d
Merge dca9ab48b8 into merged_master (Bitcoin PR bitcoin/bitcoin#23661 )
2023-06-02 08:54:50 +00:00
Byron Hambly
63ca721d82
Merge 8b2c0df83e into merged_master (Bitcoin PR bitcoin/bitcoin#23614 )
2023-06-02 08:46:11 +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
James Dorfman
17a0ee2762
Merge ea989deecc into merged_master (Bitcoin PR bitcoin-core/gui#493 )
2023-06-02 05:42:05 +00:00
James Dorfman
043d780db2
Merge 57982f419e into merged_master (Bitcoin PR bitcoin/bitcoin#23654 )
2023-06-02 05:15:27 +00:00
James Dorfman
32d7ad00b2
Merge c9b63ab61e into merged_master (Bitcoin PR bitcoin/bitcoin#23489 )
2023-06-02 05:07:21 +00:00
James Dorfman
71f8040ba1
Merge 345c8180d7 into merged_master (Bitcoin PR bitcoin/bitcoin#23630 )
2023-06-02 04:58:15 +00:00
James Dorfman
72a90148c8
Merge 8b1de78577 into merged_master (Bitcoin PR bitcoin/bitcoin#23413 )
2023-06-01 18:51:42 +00:00
James Dorfman
84d20582c4
Merge fd1c9e26d3 into merged_master (Bitcoin PR bitcoin/bitcoin#23653 )
2023-06-01 17:20:28 +00:00
James Dorfman
c5302defa7
Merge 0ee9a00f90 into merged_master (Bitcoin PR bitcoin/bitcoin#23652 )
2023-06-01 16:32:19 +00:00
Byron Hambly
915c3c5606
Merge 8b4d53e4d6 into merged_master (Bitcoin PR bitcoin/bitcoin#23647 )
2023-06-01 13:47:54 +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
1aedc97366
Merge ffe414bd9a into merged_master (Bitcoin PR bitcoin/bitcoin#23649 )
2023-06-01 13:32:01 +00:00
Byron Hambly
dc12edbc03
Merge 0b30bdd519 into merged_master (Bitcoin PR bitcoin/bitcoin#22014 )
2023-06-01 13:31:26 +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
bb09641184
Merge 0bd7ca9a03 into merged_master (Bitcoin PR bitcoin/bitcoin#23642 )
2023-06-01 11:55:11 +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
938c11a4f6
Merge af1067c4b7 into merged_master (Bitcoin PR bitcoin/bitcoin#23640 )
2023-06-01 11:02:46 +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
9b87adeca8
Merge df562d698a into merged_master (Bitcoin PR bitcoin/bitcoin#23637 )
2023-06-01 10:00:47 +00:00
Byron Hambly
2da6d2363d
Merge 4633199cc8 into merged_master (Bitcoin PR bitcoin/bitcoin#22677 )
2023-06-01 09:42:34 +00:00
Byron Hambly
5a723e538b
Merge 1c06e1a7b6 into merged_master (Bitcoin PR bitcoin/bitcoin#23437 )
2023-06-01 09:15:23 +00:00
Byron Hambly
28823f6118
Merge e7507f333b into merged_master (Bitcoin PR bitcoin/bitcoin#23639 )
2023-06-01 08:53:33 +00:00
Byron Hambly
77acfd01b8
Merge 205877e55f into merged_master (Bitcoin PR bitcoin/bitcoin#23546 )
2023-06-01 08:23:12 +00:00
Byron Hambly
a62fc9135c
Merge f2074eeb2d into merged_master (Bitcoin PR bitcoin/bitcoin#23601 )
2023-06-01 08:15:03 +00:00
James Dorfman
ec627f4ef0
Merge 9174bcf7da into merged_master (Bitcoin PR bitcoin/bitcoin#23590 )
2023-06-01 06:08:36 +00:00
James Dorfman
7d697c3b6e
Merge c9d7d0a653 into merged_master (Bitcoin PR bitcoin/bitcoin#23635 )
2023-06-01 06:00:22 +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
James Dorfman
0c2dff3a49
Merge ffdf8ee43e into merged_master (Bitcoin PR bitcoin/bitcoin#23602 )
2023-05-31 16:25:25 +00:00
Byron Hambly
ed2e32e27d
Merge 29074ba836 into merged_master (Bitcoin PR bitcoin/bitcoin#23618 )
2023-05-31 14:12:43 +00:00
Byron Hambly
53bdca0c11
Merge 8b07145796 into merged_master (Bitcoin PR bitcoin/bitcoin#23597 )
2023-05-31 14:04:23 +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
936a252fea
Merge 913b7148a2 into merged_master (Bitcoin PR bitcoin/bitcoin#22902 )
2023-05-31 11:50:48 +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
3e43f34618
Merge 014cae2ee8 into merged_master (Bitcoin PR bitcoin/bitcoin#23591 )
2023-05-31 11:32:20 +00:00
Byron Hambly
fc6cc52f79
Merge b4f647fa36 into merged_master (Bitcoin PR bitcoin/bitcoin#23397 )
2023-05-31 11:10:05 +00:00
Byron Hambly
0a873f6ef1
Merge e521c5589e into merged_master (Bitcoin PR bitcoin/bitcoin#23617 )
2023-05-31 10:32:32 +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
1ff9a8afda
Merge 4aa06f9447 into merged_master (Bitcoin PR bitcoin/bitcoin#23600 )
2023-05-31 10:16:38 +00:00
Byron Hambly
97c269b920
Merge 200d97faf2 into merged_master (Bitcoin PR bitcoin/bitcoin#22868 )
2023-05-31 10:07:29 +00:00
Byron Hambly
5f437437ea
Merge 111c3e06b3 into merged_master (Bitcoin PR bitcoin/bitcoin#23594 )
2023-05-31 09:49:03 +00:00
