Byron Hambly
b958e586ef
Fix for calling GetAmount on potentially blinded output
...
Introduced in 103069c46cbitcoin/bitcoin#22100
2023-08-08 14:11:12 +02:00
Byron Hambly
941940e946
Fix unnecessary pvChecks arg introduced in df8f97d63b in merge of Bitcoin PR bitcoin/bitcoin#23157
2023-08-08 10:10:00 +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
James Dorfman
265ba04f55
Add extra optimization initally left out during the merge of bitcoin/bitcoin#23114 in 81d5607ec8
2023-07-21 01:58:35 +00:00
James Dorfman
2ab19eb125
Fix failing unit tests left over from the merge of bitcoin/bitcoin#24343 in eef2269720
2023-07-21 01:34:39 +00:00
Byron Hambly
8dbf577aaa
Merge cfc10a5dd6 into merged_master (Elements PR #1232 )
2023-07-03 13:48:57 +00:00
Byron Hambly
88d211dbfd
Merge de942511a6 into merged_master (Elements PR #1239 )
...
bitcoin/bitcoin#23381 refactored PolicyScriptChecks to store the
precomputed txdata in the workspace, so I have added the genesis hash to
the transform of the workspaces in AcceptMultipleTransactions.
I don't think there was a specific test for this, so during review it
may be worth checking this thoroughly. We also need a test to cover
this.
2023-07-03 13:32:10 +00:00
Byron Hambly
60205139a1
Merge ee18b6b038 into merged_master (Elements PR #1236 )
2023-07-03 12:49:13 +00:00
Byron Hambly
5e994b4aa6
Merge 1443d302ae into merged_master (Elements PR #1231 )
2023-07-03 12:27:53 +00:00
Byron Hambly
d4f242b3c3
Merge 6b826d5004 into merged_master (Elements PR #1225 )
2023-07-03 12:14:31 +00:00
Byron Hambly
2d596f1fe1
Merge 8c9268c4bf into merged_master (Elements PR #1223 )
2023-07-03 12:06:08 +00:00
Byron Hambly
9baaa43e40
Merge 63d79dda82 into merged_master (Elements PR #1222 )
2023-07-03 11:57:46 +00:00
Byron Hambly
b6d963eea1
Merge 619f8a27ad into merged_master (Bitcoin PR bitcoin/bitcoin#24304 )
2023-07-03 11:19:58 +00:00
Byron Hambly
6f90a02548
Merge 30308cc380 into merged_master (Bitcoin PR bitcoin/bitcoin#20196 )
2023-07-03 11:17:52 +00:00
Byron Hambly
b4dbe6d445
Merge 08bcfa2767 into merged_master (Bitcoin PR bitcoin/bitcoin#24375 )
2023-07-03 10:26:26 +00:00
Byron Hambly
5b079a5ef1
Merge 8b6cd42c62 into merged_master (Bitcoin PR bitcoin/bitcoin#24165 )
2023-07-03 10:16:01 +00:00
Byron Hambly
7a7253639a
Merge 267917f563 into merged_master (Bitcoin PR bitcoin/bitcoin#23304 )
2023-07-03 10:06:51 +00:00
Byron Hambly
1dc6ad6ea9
Merge ba11eb354b into merged_master (Bitcoin PR bitcoin/bitcoin#23542 )
2023-07-03 09:44:18 +00:00
Byron Hambly
7d91422a87
Merge 848b11615b into merged_master (Bitcoin PR bitcoin/bitcoin#22834 )
2023-07-03 09:33:46 +00:00
Byron Hambly
055d634477
Merge 024b8e12a5 into merged_master (Bitcoin PR bitcoin/bitcoin#24451 )
...
All conflicts in the locale translation files were resolved by taking
the upstream version of the files.
Conflicts:
src/qt/locale/bitcoin_ar.ts
src/qt/locale/bitcoin_ca.ts
src/qt/locale/bitcoin_cs.ts
src/qt/locale/bitcoin_da.ts
src/qt/locale/bitcoin_de.ts
src/qt/locale/bitcoin_en_GB.ts
src/qt/locale/bitcoin_es.ts
src/qt/locale/bitcoin_es_CL.ts
src/qt/locale/bitcoin_fi.ts
src/qt/locale/bitcoin_fil.ts
src/qt/locale/bitcoin_fr.ts
src/qt/locale/bitcoin_he.ts
src/qt/locale/bitcoin_hr.ts
src/qt/locale/bitcoin_hu.ts
src/qt/locale/bitcoin_it.ts
src/qt/locale/bitcoin_ja.ts
src/qt/locale/bitcoin_nb.ts
src/qt/locale/bitcoin_nl.ts
src/qt/locale/bitcoin_pl.ts
src/qt/locale/bitcoin_pt.ts
src/qt/locale/bitcoin_pt_BR.ts
src/qt/locale/bitcoin_sk.ts
src/qt/locale/bitcoin_sl.ts
src/qt/locale/bitcoin_sv.ts
src/qt/locale/bitcoin_szl.ts
src/qt/locale/bitcoin_uk.ts
src/qt/locale/bitcoin_vi.ts
src/qt/locale/bitcoin_zh_CN.ts
src/qt/locale/bitcoin_zh_TW.ts
2023-07-03 09:24:26 +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
b2b09ea422
Merge c7da61dcc3 into merged_master (Bitcoin PR bitcoin/bitcoin#24403 )
2023-07-02 16:55:32 +00:00
Byron Hambly
dfb7101d8d
Merge b71a07778f into merged_master (Bitcoin PR bitcoin/bitcoin#24417 )
2023-07-02 16:47:44 +00:00
Byron Hambly
816db0450b
Merge 40ab879f11 into merged_master (Bitcoin PR bitcoin/bitcoin#24418 )
2023-07-02 16:39:55 +00:00
Byron Hambly
a573a48bf9
Merge 292a841553 into merged_master (Bitcoin PR bitcoin/bitcoin#24449 )
2023-07-02 16:32:16 +00:00
Byron Hambly
92d15f851b
Merge ee8c997125 into merged_master (Bitcoin PR bitcoin/bitcoin#24402 )
2023-07-02 16:24:37 +00:00
Byron Hambly
8211047b9c
Merge b00b60ed4f into merged_master (Bitcoin PR bitcoin/bitcoin#24201 )
2023-07-02 15:50:25 +00:00
Byron Hambly
eb904fd1ef
Merge c07287d34c into merged_master (Bitcoin PR bitcoin/bitcoin#24438 )
2023-07-02 15:34:56 +00:00
Byron Hambly
c6568c55d2
Merge 37637bea3a into merged_master (Bitcoin PR bitcoin/bitcoin#24434 )
2023-07-02 15:19:31 +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
b80c04e05a
Merge 358fe779cb into merged_master (Bitcoin PR bitcoin/bitcoin#24381 )
2023-07-02 14:47:05 +00:00
Byron Hambly
a13d9d44d8
Merge 9977e1658c into merged_master (Bitcoin PR bitcoin/bitcoin#24372 )
2023-07-02 14:23:10 +00:00
Byron Hambly
6c57005ffe
Merge 16d05cf6b9 into merged_master (Bitcoin PR bitcoin/bitcoin#24406 )
2023-07-02 14:13:58 +00:00
Byron Hambly
51fbed170b
Merge 3c565302aa into merged_master (Bitcoin PR bitcoin/bitcoin#24409 )
2023-07-02 13:45:31 +00:00
Byron Hambly
7519698942
Merge c44e734dca into merged_master (Bitcoin PR bitcoin/bitcoin#24377 )
2023-07-02 07:42:29 +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
f07b1a5265
Merge e200919cbe into merged_master (Bitcoin PR bitcoin/bitcoin#24305 )
2023-07-02 07:00:50 +00:00
Byron Hambly
a7beef6e4a
Merge bc49650b7c into merged_master (Bitcoin PR bitcoin/bitcoin#24310 )
2023-07-02 06:52:34 +00:00
Byron Hambly
0a40f92e72
Merge 00f8492eeb into merged_master (Bitcoin PR bitcoin-core/gui#547 )
2023-07-02 06:44:51 +00:00
Byron Hambly
d8cfd68e37
Merge 48a90c61e2 into merged_master (Bitcoin PR bitcoin/bitcoin#24370 )
2023-07-02 06:36:21 +00:00
Byron Hambly
1fe3769ff8
Merge e44423c9d3 into merged_master (Bitcoin PR bitcoin/bitcoin#24224 )
2023-07-02 06:23:04 +00:00
Byron Hambly
8576423f9a
Merge 1337b93f50 into merged_master (Bitcoin PR bitcoin/bitcoin#24339 )
2023-07-02 05:40:34 +00:00
Byron Hambly
545d29ca21
Merge 85ae549a46 into merged_master (Bitcoin PR bitcoin/bitcoin#24137 )
2023-07-02 05:40:27 +00:00
Byron Hambly
eef2269720
Merge 72f97289c4 into merged_master (Bitcoin PR bitcoin/bitcoin#24343 )
...
Had to change some hashes in descriptor_tests, presumably because of the
differences between when Elements and Bitcoin when it comes to Taproot.
Please review this carefully and investigate the FIXME
2023-07-02 05:17:22 +00:00
Byron Hambly
5ec7209e95
Merge cf22191fd8 into merged_master (Bitcoin PR bitcoin/bitcoin#24072 )
2023-07-01 07:59:26 +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
6db2626dc4
Merge abaf943477 into merged_master (Bitcoin PR bitcoin/bitcoin#24231 )
2023-07-01 07:29:28 +00:00
Byron Hambly
9c6e41c9e4
Merge 7cc39b1838 into merged_master (Bitcoin PR bitcoin/bitcoin#24347 )
2023-07-01 07:10:37 +00:00
Byron Hambly
8e2689815c
Merge 5f44c5c428 into merged_master (Bitcoin PR bitcoin/bitcoin#24133 )
2023-07-01 07:02:48 +00:00
Byron Hambly
8d54ffa2af
Merge ffcbaf569e into merged_master (Bitcoin PR bitcoin/bitcoin#24369 )
2023-07-01 06:53:56 +00:00
