Byron Hambly
1413ea774b
Merge 68ca8677e0 into merged_master (Bitcoin PR bitcoin/bitcoin#23716 )
2023-06-06 10:11:17 +00:00
Byron Hambly
085f710c02
Merge 1b76b18f8a into merged_master (Bitcoin PR bitcoin/bitcoin#23585 )
2023-06-06 10:01:57 +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
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
fabef7c840
Merge 099325a759 into merged_master (Bitcoin PR bitcoin/bitcoin#23616 )
...
Co-authored-by: James Dorfman <dorfmanjames@gmail.com>
2023-06-06 08:46:01 +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
d9a9a626b0
Merge 0d101050ef into merged_master (Bitcoin PR bitcoin/bitcoin#23678 )
2023-06-05 11:20:10 +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
James Dorfman
51414e1a44
Merge 6db7e43d42 into merged_master (Bitcoin PR bitcoin/bitcoin#23677 )
2023-06-02 15:00:19 +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
3d1ccd39fb
Merge 61b82a8175 into merged_master (Bitcoin PR bitcoin/bitcoin#23593 )
2023-06-02 12:39:51 +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
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
2512cffc66
Merge 6223e550c5 into merged_master (Bitcoin PR bitcoin/bitcoin#23685 )
2023-06-02 11:01:14 +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
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
