James Dorfman
0ea088b896
Merge b8f498f80d into merged_master (Bitcoin PR bitcoin/bitcoin#24535 )
2024-01-08 19:52:28 +00:00
James Dorfman
aa80572b01
Merge e3206c9445 into merged_master (Bitcoin PR bitcoin/bitcoin#24605 )
...
Please review my changes in test/functional/test_framework/wallet.py.
Confirm that my change of the return value from 1 --> 2 was correct.
That fixed a failing test. I think it's needed because in elements we
have an extra fee output.
2024-01-08 19:45:18 +00:00
Byron Hambly
93ade4baa3
Merge e66630cc87 into merged_master (Bitcoin PR bitcoin/bitcoin#13226 )
2023-10-16 13:12:42 +00:00
Byron Hambly
985db294cb
Merge 91d12344b1 into merged_master (Bitcoin PR bitcoin/bitcoin#24613 )
2023-10-16 13:03:58 +00:00
Byron Hambly
6768c48aee
Merge 6c72f3192a into merged_master (Bitcoin PR bitcoin/bitcoin#23880 )
2023-10-16 12:54:38 +00:00
Byron Hambly
4b7ad19bcb
Merge 75e34ed718 into merged_master (Bitcoin PR bitcoin/bitcoin#24601 )
2023-10-16 12:41:29 +00:00
Byron Hambly
e6077411e8
Merge ae005a647f into merged_master (Bitcoin PR bitcoin-core/gui#554 )
2023-10-16 12:31:55 +00:00
Byron Hambly
e4f868fb3a
Merge 2320d31aaa into merged_master (Bitcoin PR bitcoin/bitcoin#24608 )
2023-10-16 12:23:18 +00:00
Byron Hambly
13a3eadcc0
Merge 66e2d21ef2 into merged_master (Bitcoin PR bitcoin/bitcoin#24578 )
2023-10-16 11:55:39 +00:00
Byron Hambly
51288f4f73
Merge a7b3123fea into merged_master (Bitcoin PR bitcoin/bitcoin#24609 )
2023-10-16 11:46:33 +00:00
Byron Hambly
b2ee18db0a
Merge a17df4e876 into merged_master (Bitcoin PR bitcoin/bitcoin#24603 )
2023-10-16 11:37:55 +00:00
Byron Hambly
4edf51d8da
Merge e09cf64c48 into merged_master (Bitcoin PR bitcoin/bitcoin#24585 )
2023-10-16 11:29:11 +00:00
Byron Hambly
4ae6b79c8f
Merge 8435d7f11a into merged_master (Bitcoin PR bitcoin/bitcoin#24597 )
2023-10-16 11:18:58 +00:00
Byron Hambly
fbd708bbca
Merge bf2c0fb2a2 into merged_master (Bitcoin PR bitcoin/bitcoin#24472 )
2023-10-16 11:10:36 +00:00
Byron Hambly
fa21dc5b5d
Merge 601bfc417d into merged_master (Bitcoin PR bitcoin/bitcoin#24515 )
2023-10-16 10:58:18 +00:00
Byron Hambly
ec293ef76f
Merge aece566249 into merged_master (Bitcoin PR bitcoin-core/gui#555 )
...
This merge had a conflict in the send coins dialog, so it should be
confirmed during review that it still works correctly.
2023-10-16 10:54:11 +00:00
Byron Hambly
5f4ffe85a0
Merge 74f8c551e9 into merged_master (Bitcoin PR bitcoin/bitcoin#24553 )
2023-10-16 09:36:59 +00:00
Byron Hambly
426c048ee6
Merge d6cb4e8ff0 into merged_master (Bitcoin PR bitcoin/bitcoin#24549 )
2023-10-16 09:28:15 +00:00
Byron Hambly
8710c36d13
Merge 9b56b2e2a7 into merged_master (Bitcoin PR bitcoin/bitcoin#24588 )
2023-10-16 09:19:33 +00:00
Byron Hambly
6ac1fdb569
Merge 114754adf4 into merged_master (Bitcoin PR bitcoin/bitcoin#24519 )
2023-10-16 09:05:55 +00:00
Byron Hambly
8a8b029f97
Merge b8992f2d4a into merged_master (Bitcoin PR bitcoin/bitcoin#24592 )
2023-10-16 08:57:05 +00:00
Byron Hambly
e592d94373
Merge 3617d22562 into merged_master (Bitcoin PR bitcoin/bitcoin#14752 )
2023-10-16 08:38:28 +00:00
Byron Hambly
5255689011
Merge 4bdc990daf into merged_master (Bitcoin PR bitcoin/bitcoin#24573 )
2023-10-16 08:29:50 +00:00
Byron Hambly
f32c2f4e73
Merge e4d61d9759 into merged_master (Bitcoin PR bitcoin/bitcoin#18815 )
2023-10-16 08:21:11 +00:00
James Dorfman
8a8d08237e
Merge ee4780028d into merged_master (Bitcoin PR bitcoin/bitcoin#23565 )
2023-10-16 04:28:29 +00:00
James Dorfman
e382a490a7
Merge 310ba92494 into merged_master (Bitcoin PR bitcoin/bitcoin#24537 )
2023-10-16 04:28:12 +00:00
James Dorfman
8715ef526d
Merge 7b83c7d609 into merged_master (Bitcoin PR bitcoin/bitcoin#24510 )
2023-10-15 23:34:23 +00:00
James Dorfman
3f110a3fe4
Merge 28bdaa3f76 into merged_master (Bitcoin PR bitcoin/bitcoin#24080 )
2023-10-15 22:22:18 +00:00
James Dorfman
f3ee905625
Merge e0881aa5f0 into merged_master (Bitcoin PR bitcoin/bitcoin#24505 )
2023-10-15 21:39:09 +00:00
Byron Hambly
b7467fc044
Merge e04720ec33 into merged_master (Bitcoin PR bitcoin/bitcoin#24528 )
2023-10-15 13:33:48 +00:00
Byron Hambly
75b07c4252
Merge 2860a91df0 into merged_master (Bitcoin PR bitcoin/bitcoin#24527 )
2023-10-15 11:57:43 +00:00
Byron Hambly
53d81644ad
Merge f94784f5bc into merged_master (Bitcoin PR bitcoin/bitcoin#24533 )
2023-10-15 11:49:10 +00:00
Byron Hambly
25b65b9f3a
Merge deb847b757 into merged_master (Bitcoin PR bitcoin/bitcoin#24491 )
2023-10-14 21:53:48 +00:00
Byron Hambly
6b0e196c44
Merge fd381d86b1 into merged_master (Bitcoin PR bitcoin/bitcoin#24526 )
2023-10-14 19:51:08 +00:00
Byron Hambly
35e8c6d908
Merge e7db4e245a into merged_master (Bitcoin PR bitcoin/bitcoin#24164 )
2023-10-14 19:42:34 +00:00
Byron Hambly
40e776c576
Merge c109e7d51c into merged_master (Bitcoin PR bitcoin/bitcoin#24530 )
2023-10-14 17:11:39 +00:00
Byron Hambly
a1e559fe38
Merge a81717443f into merged_master (Bitcoin PR bitcoin/bitcoin#24453 )
2023-10-14 16:43:10 +00:00
Byron Hambly
4c573ba511
Merge 23e8c702bc into merged_master (Bitcoin PR bitcoin/bitcoin#24421 )
2023-10-14 16:21:34 +00:00
Byron Hambly
ccc03f15d3
Merge bb0b39ce6f into merged_master (Bitcoin PR bitcoin/bitcoin#24524 )
2023-10-14 13:06:28 +00:00
Byron Hambly
dd03b3cdee
Merge ce1fabe545 into merged_master (Bitcoin PR bitcoin/bitcoin#24509 )
2023-10-14 12:57:57 +00:00
Byron Hambly
4de9c13946
Merge f661da70b9 into merged_master (Bitcoin PR bitcoin/bitcoin#24521 )
2023-10-14 12:49:04 +00:00
Byron Hambly
bdfb01f6e1
Merge 93feabcb30 into merged_master (Bitcoin PR bitcoin-core/gui#563 )
2023-10-14 12:40:23 +00:00
Byron Hambly
0beb097d24
Merge 597ee30b5e into merged_master (Bitcoin PR bitcoin/bitcoin#24522 )
2023-10-14 12:18:18 +00:00
Byron Hambly
755a0686e5
Merge 6c37eae0ad into merged_master (Bitcoin PR bitcoin/bitcoin#24404 )
2023-10-14 12:09:09 +00:00
Byron Hambly
2375fc7d0e
Merge 4f5d3ce5a0 into merged_master (Bitcoin PR bitcoin/bitcoin#24486 )
2023-10-14 12:00:47 +00:00
Byron Hambly
ca3f6da75f
Merge 76d44e832f into merged_master (Bitcoin PR bitcoin/bitcoin#24469 )
2023-10-14 11:52:24 +00:00
Byron Hambly
ff3a636061
Merge d1a940f729 into merged_master (Bitcoin PR bitcoin/bitcoin#24520 )
2023-10-14 11:33:22 +00:00
Byron Hambly
4765c2a4c8
Merge 05957a888d into merged_master (Bitcoin PR bitcoin/bitcoin#24516 )
2023-10-14 11:15:45 +00:00
Byron Hambly
c3e42873de
Merge 5e33620ad8 into merged_master (Bitcoin PR bitcoin/bitcoin#24371 )
2023-10-14 11:06:17 +00:00
Byron Hambly
de49557de2
Merge 430acb7d2a into merged_master (Bitcoin PR bitcoin/bitcoin#24506 )
2023-10-14 10:57:57 +00:00
