Byron Hambly
c7c59a27a9
Merge 926fc2a0d4 into merged_master (Bitcoin PR bitcoin/bitcoin#23707 )
2023-06-06 09:35:00 +00:00
Byron Hambly
8436894eec
Merge 577bd51a4b into merged_master (Bitcoin PR bitcoin/bitcoin#23702 )
2023-06-06 09:26:49 +00:00
Byron Hambly
b2aeec482f
Merge b692e61d61 into merged_master (Bitcoin PR bitcoin/bitcoin#23254 )
2023-06-06 09:19:04 +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
f97b7f0c64
Merge 84d921e79c into merged_master (Bitcoin PR bitcoin/bitcoin#23465 )
2023-06-06 09:00:13 +00:00
Byron Hambly
eed72186c7
Merge fa3fb46b81 into merged_master (Bitcoin PR bitcoin/bitcoin#23667 )
...
This merge from upstream split the rpcwallet file out into separate
files. Leftover Elements specific funtions were moved into
wallet/rpc/elements.cpp
Co-authored-by: James Dorfman <dorfmanjames@gmail.com>
2023-06-06 08:32: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
9ff4b8e6d6
Merge eaf1c56502 into merged_master (Bitcoin PR bitcoin/bitcoin#23692 )
2023-06-02 15:51:00 +00:00
James Dorfman
a5a9e11b83
Merge 13f41855c5 into merged_master (Bitcoin PR bitcoin/bitcoin#23694 )
2023-06-02 15:43:00 +00:00
James Dorfman
669c52f7e8
Merge 4fd0ce75c5 into merged_master (Bitcoin PR bitcoin/bitcoin#22689 )
2023-06-02 15:34:33 +00:00
James Dorfman
360bf6eb36
Merge 95fe477fd1 into merged_master (Bitcoin PR bitcoin/bitcoin#23693 )
2023-06-02 15:17:50 +00:00
Byron Hambly
c7e8ed8105
Merge 6ac8c4f700 into merged_master (Bitcoin PR bitcoin/bitcoin#23634 )
2023-06-02 13:47:17 +00:00
Byron Hambly
71d3dbb805
Merge abc26fa378 into merged_master (Bitcoin PR bitcoin/bitcoin#22856 )
2023-06-02 13:07:08 +00:00
Byron Hambly
16ce576d1d
Merge e457513eb1 into merged_master (Bitcoin PR bitcoin/bitcoin#23631 )
2023-06-02 12:58:30 +00:00
Byron Hambly
99df552f36
Merge 084c81c8b6 into merged_master (Bitcoin PR bitcoin/bitcoin#23547 )
2023-06-02 12:50:20 +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
e4003da763
Merge b7e63306e8 into merged_master (Bitcoin PR bitcoin/bitcoin#23687 )
2023-06-02 12:06:39 +00:00
Byron Hambly
5928338d05
Merge 9a53ba4618 into merged_master (Bitcoin PR bitcoin/bitcoin#23676 )
2023-06-02 11:42:11 +00:00
Byron Hambly
858b1793b6
Merge 42b25025fa into merged_master (Bitcoin PR bitcoin/bitcoin#23644 )
2023-06-02 11:28:46 +00:00
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
a120b7925d
Merge 22feb7fee9 into merged_master (Bitcoin PR bitcoin/bitcoin#23577 )
2023-06-02 08:34:54 +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
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
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
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
e9be7bfc96
Merge 383d350bd5 into merged_master (Bitcoin PR bitcoin/bitcoin#22513 )
2023-05-31 13:50:36 +00:00
