James Dorfman
01b3a91bae
Merge e089c68aa1 (Bitcoin PR bitcoin/bitcoin#24725 )
2023-09-24 01:33:51 +00:00
James Dorfman
0497d1f894
build: fix additional ASAN issues in CI
2023-09-07 05:07:50 +00:00
James Dorfman
8783a30631
build: fix further ASAN issues in CI
2023-09-06 15:03:51 +02:00
Byron Hambly
860b2c3e4b
fix: move BlindDetails and IssuanceDetails to wallet.h
...
resolves the newly introduced circular dependencies correctly
2023-09-05 14:38:03 +02:00
Byron Hambly
4671addbe0
build: fix forward declaration of CRecipient
2023-09-01 18:13:19 +02:00
Pablo Greco
3dfd7a4e9f
Linter fixes
2023-08-31 14:47:07 -07:00
James Dorfman
d457ef7dbe
Merge 6802564be5 into merged_master (Elements PR #1246 )
2023-08-29 04:21:31 +00:00
Byron Hambly
b958e586ef
Fix for calling GetAmount on potentially blinded output
...
Introduced in 103069c46cbitcoin/bitcoin#22100
2023-08-08 14:11:12 +02:00
James Dorfman
6a42ca5f74
Remove unused mapValueFromPresetInputs variable from src/wallet/spend.cpp.
...
This variable was rendered unused in the merge of bitcoin/bitcoin#22019 in e3ab195851
2023-07-24 17:50:33 +00:00
Byron Hambly
49c3ea309e
fix: getnewaddress - don't blind bech32 addresses
...
fixes #1245
2023-07-19 12:40:22 +02:00
Byron Hambly
7a7253639a
Merge 267917f563 into merged_master (Bitcoin PR bitcoin/bitcoin#23304 )
2023-07-03 10:06:51 +00:00
Byron Hambly
7e989c64b3
Merge 159f89c118 into merged_master (Bitcoin PR bitcoin/bitcoin#24365 )
2023-07-02 17:03:39 +00:00
Byron Hambly
4fbfb0ccbe
Merge 8d6f9210d9 into merged_master (Bitcoin PR bitcoin/bitcoin#24401 )
2023-07-02 15:10:19 +00:00
Byron Hambly
0e89b30f95
Merge 8add59d77d into merged_master (Bitcoin PR bitcoin/bitcoin#24367 )
2023-07-02 07:33:56 +00:00
Byron Hambly
cde0f7744b
Merge 4acf2332d4 into merged_master (Bitcoin PR bitcoin/bitcoin#24376 )
2023-07-01 07:47:21 +00:00
Byron Hambly
eb78939513
Merge b304b65782 into merged_master (Bitcoin PR bitcoin/bitcoin#24359 )
2023-06-30 17:50:25 +00:00
Byron Hambly
db3167a06b
Merge 2d7ea201fc into merged_master (Bitcoin PR bitcoin/bitcoin#24307 )
2023-06-30 12:57:14 +00:00
Byron Hambly
04cea6bf40
Merge 8c0f02c69d into merged_master (Bitcoin PR bitcoin/bitcoin#24265 )
2023-06-30 11:33:00 +00:00
Byron Hambly
85c276279a
Merge 1e7564eca8 into merged_master (Bitcoin PR bitcoin/bitcoin#24251 )
2023-06-30 09:07:50 +00:00
Byron Hambly
4988afcbc2
Merge 3ace3a17c9 into merged_master (Bitcoin PR bitcoin/bitcoin#20744 )
2023-06-30 07:38:29 +00:00
Byron Hambly
999b6ac80b
Merge 02e1d8d06f into merged_master (Bitcoin PR bitcoin/bitcoin#24083 )
2023-06-30 06:11:44 +00:00
Byron Hambly
4e5e47d2d5
Merge 5f4c07b799 into merged_master (Bitcoin PR bitcoin/bitcoin#24136 )
2023-06-29 13:43:18 +00:00
Byron Hambly
a992ccaac2
Merge 196b459920 into merged_master (Bitcoin PR bitcoin/bitcoin#23438 )
2023-06-29 08:37:35 +00:00
Byron Hambly
063acc7793
Merge cf5bb048e8 into merged_master (Bitcoin PR bitcoin/bitcoin#22932 )
2023-06-28 17:12:24 +00:00
Byron Hambly
ccd7b72d79
Merge e30b6ea194 into merged_master (Bitcoin PR bitcoin/bitcoin#24067 )
2023-06-28 14:48:32 +00:00
Byron Hambly
7d759da52a
Merge b94d0c7af1 into merged_master (Bitcoin PR bitcoin/bitcoin#23201 )
...
This merge was a bit tricky, since in Elements the witnesses are not
part of the transaction inputs themselves. This merge should be reviewed
carefully.
2023-06-28 14:15:53 +00:00
Byron Hambly
8cc06b0c02
Merge a541e5d519 into merged_master (Bitcoin PR bitcoin/bitcoin#24104 )
2023-06-20 12:23:08 +00:00
Byron Hambly
7878ba47b9
Merge c561f2f06e into merged_master (Bitcoin PR bitcoin/bitcoin#23497 )
2023-06-19 09:28:31 +00:00
James Dorfman
81119e6161
Merge fa74718414 into merged_master (Bitcoin PR bitcoin/bitcoin#24026 )
2023-06-15 20:36:05 +00:00
James Dorfman
b016786156
Merge 80ceede7a0 into merged_master (Bitcoin PR bitcoin/bitcoin#23884 )
2023-06-15 20:23:35 +00:00
Byron Hambly
78a8032c1e
Merge 4ada74206a into merged_master (Bitcoin PR bitcoin/bitcoin#23974 )
2023-06-15 13:21:10 +00:00
Byron Hambly
13bb540284
Merge 801aaac2b3 into merged_master (Bitcoin PR bitcoin/bitcoin#23834 )
2023-06-15 09:35:17 +00:00
Byron Hambly
47626b5a64
Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912 )
2023-06-14 15:44:11 +00:00
Byron Hambly
4a20fecaa6
Merge 5d2344885b into merged_master (Bitcoin PR bitcoin/bitcoin#23840 )
2023-06-14 14:35:48 +00:00
Byron Hambly
4890a75f92
Merge bb655a6aac into merged_master (Bitcoin PR bitcoin/bitcoin#23883 )
2023-06-14 14:27:47 +00:00
Byron Hambly
01c3d7fbec
Merge f7367b88e1 into merged_master (Bitcoin PR bitcoin/bitcoin#23842 )
2023-06-14 06:43:35 +00:00
Byron Hambly
8886ceae12
Merge 63b5dfac21 into merged_master (Bitcoin PR bitcoin-core/gui#459 )
2023-06-14 05:54:10 +00:00
Byron Hambly
b8c1d97ef4
Merge 887796a5ff into merged_master (Bitcoin PR bitcoin/bitcoin#23341 )
2023-06-14 05:39:51 +00:00
Byron Hambly
fa3c0f4eaa
Merge 3ac38058ce into merged_master (Bitcoin PR bitcoin/bitcoin#23789 )
2023-06-14 05:39:34 +00:00
Byron Hambly
f209652f80
Merge ce463cf450 into merged_master (Bitcoin PR bitcoin/bitcoin#23750 )
2023-06-13 13:51:56 +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
49326aea37
Merge ab879d9885 into merged_master (Bitcoin PR bitcoin/bitcoin#23762 )
2023-06-13 09:06:27 +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
3ef3a3ba00
Merge 011d6e429b into merged_master (Bitcoin PR bitcoin/bitcoin#22514 )
2023-06-12 17:32:45 +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
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
3bd9a6517b
Merge 7ce8d74156 into merged_master (Bitcoin PR bitcoin/bitcoin#23346 )
2023-06-06 11:23:40 +00:00
Byron Hambly
5854e5e087
Merge 7908772244 into merged_master (Bitcoin PR bitcoin/bitcoin#23703 )
2023-06-06 11:15:42 +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
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
