Byron Hambly
483d59e533
Merge df2f16666c into merged_master (Bitcoin PR bitcoin/bitcoin#26508 )
2025-03-03 12:10:24 +02:00
Byron Hambly
da8b6f2f7f
Merge d0b1f613c2 into merged_master (Bitcoin PR bitcoin/bitcoin#17786 )
2025-03-03 11:12:31 +02:00
Byron Hambly
5c10c048e6
Merge 7ed2768dca into merged_master (Elements PR #1421 )
2025-02-28 15:02:20 +02:00
Byron Hambly
7ea69ff0d8
Merge UP TO 48174c0f28 into merged_master (UP TO Bitcoin PR bitcoin/bitcoin#26240 )
...
FIXME in wallet_taproot.py functional test
1668424146 2022-11-14T12:09:06+01:00 48174c0f28 Bitcoin Merge bitcoin/bitcoin#26240 : rpc: Adjust RPCTypeCheckObj error string
1668417474 2022-11-14T10:17:54+01:00 59e00c7e03 Bitcoin Merge bitcoin/bitcoin#25714 : univalue: Avoid std::string copies
1668111238 2022-11-10T15:13:58-05:00 7ef730ca84 Bitcoin Merge bitcoin/bitcoin#26483 : test: Don't pass add_to_wallet option to walletcreatefundedpsbt
1668004459 2022-11-09T15:34:19+01:00 9dce30194b Bitcoin Merge bitcoin/bitcoin#26472 : test: add missing bech32m / BIP86 test-cases to wallet_descriptor.py
1667992471 2022-11-09T12:14:31+01:00 44ca5d5e87 Bitcoin Merge bitcoin/bitcoin#26473 : test: Avoid collision with valid path names in `getarg_tests/logargs`
1667640759 2022-11-05T10:32:39+01:00 50422b770a Bitcoin Merge bitcoin/bitcoin#26419 : log: mempool: log removal reason in validation interface
1667636699 2022-11-05T09:24:59+01:00 ce57dbac90 Bitcoin Merge bitcoin/bitcoin#26449 : rpc: doc: add missing option "bech32m" for `change_type` parameters
1667577253 2022-11-04T15:54:13+00:00 ae6bb6e71e Bitcoin Merge bitcoin/bitcoin#26418 : Fix signing of multi_a and rawtr scripts with wallets that only have corresponding keys
2025-02-27 15:15:49 +02:00
Pablo Greco
73c542ea58
Fix error reading cookie file on windows when path contains UTF-8
2025-02-23 14:34:19 -08:00
Pablo Greco
fe04483875
Avoid concatenating default path when mainchainrpccookiefile is an absolute path
2025-02-23 14:34:19 -08:00
Byron Hambly
1ba6aeea51
Merge 99c2ee7f9a into merged_master (Elements PR #1399 )
2025-02-12 14:47:53 +02:00
Byron Hambly
20dcf54d49
Merge 22089ac8f6 into merged_master (Elements PR #1372 )
2025-02-11 15:59:09 +02:00
Byron Hambly
ae2a8a49d6
Merge e9a914465d into merged_master (Elements PR #1385 )
2025-02-11 14:35:51 +02:00
Byron Hambly
99c2ee7f9a
Merge pull request #1399 from apoelstra/2025-02--fuzz-fixes
...
various bugfixes for new fuzz test vectors
2025-02-11 09:49:42 +02:00
Byron Hambly
22089ac8f6
Merge pull request #1372 from delta1/issues-1371
...
decodepsbt: add asset/assetcommitment to input.witness_utxo
2025-02-11 08:47:17 +02:00
Andrew Poelstra
bd4ae1bcc4
rpc: fix crash in getcompactsketch
...
This originates in 8723debb3d which has no
PR associated with it. We've really gotta stop putting thousands of
unreviewed commits into this project and rebasing the history away..
2025-02-11 02:58:41 +00:00
Byron Hambly
ca0a68b350
Merge UP TO 551c8e9526 into merged_master (UP TO bitcoin/bitcoin#26349 )
...
Includes FIXMEs for a few functional tests
2025-02-05 09:50:17 +02:00
Byron Hambly
a3e0ce2e8c
amountfromvalue: add arg to check moneyrange
2025-01-17 13:09:10 +02:00
Byron Hambly
c794f76ea8
asan: lock cs_main for calls to chainman
2025-01-06 15:29:01 +02:00
Byron Hambly
72cac1605e
doc: clean up some fixme comments
2024-12-20 11:45:04 +02:00
Byron Hambly
a6f8dc6a86
tidy: fixes for clang tidy ci job
2024-12-04 14:16:45 +02:00
Byron Hambly
8499b13762
lint: fix lint issues
2024-12-03 14:02:33 +02:00
Byron Hambly
70c819546f
Merge aa2420cd18 into merged_master (Elements PR #1368 )
2024-12-02 09:20:42 +02:00
Byron Hambly
09e2cad10f
Merge 08785aa75b into merged_master (Bitcoin PR bitcoin/bitcoin#25499 )
2024-11-27 10:47:04 +02:00
Byron Hambly
b80b3aeff4
Merge 3a7e0a210c into merged_master (Bitcoin PR bitcoin/bitcoin#24513 )
2024-11-26 14:42:49 +02:00
Byron Hambly
d7ccdef889
Merge 141540a71f into merged_master (Bitcoin PR bitcoin/bitcoin#25222 )
2024-11-26 13:55:27 +02:00
Byron Hambly
1d5e0e2049
Merge e9e943cfb7 into merged_master (Bitcoin PR bitcoin/bitcoin#26069 )
2024-11-26 13:37:58 +02:00
Byron Hambly
5501bf04b8
Merge ea67232cdb into merged_master (Bitcoin PR bitcoin/bitcoin#25962 )
2024-11-26 11:34:14 +02:00
Byron Hambly
68e38e5baf
Merge 01e1627e25 into merged_master (Bitcoin PR bitcoin/bitcoin#25872 )
2024-11-25 14:46:13 +02:00
Byron Hambly
54b236050d
Merge e9035f867a into merged_master (Bitcoin PR bitcoin/bitcoin#25717 )
...
The new minchainwork test was modified to use bitcoin regtest instead of
elements, which required a few changes and a FIXME.
2024-11-22 14:26:38 +02:00
Byron Hambly
4df571b12d
Merge 92bb7001d8 into merged_master (Bitcoin PR bitcoin/bitcoin#25902 )
2024-11-04 15:47:50 +02:00
Byron Hambly
7a022fb75d
Merge c5f0cbefa3 into merged_master (Bitcoin PR bitcoin/bitcoin#25775 )
2024-11-04 15:04:48 +02:00
Byron Hambly
1006327a13
Merge 9eaef10801 into merged_master (Bitcoin PR bitcoin/bitcoin#25707 )
2024-11-04 11:26:40 +02:00
Byron Hambly
fd9ee039c0
Merge 95d4744f02 into merged_master (Bitcoin PR bitcoin/bitcoin#19391 )
2024-11-03 14:48:48 +02:00
Byron Hambly
d6e6f35037
Merge c336f813b3 into merged_master (Bitcoin PR bitcoin/bitcoin#25504 )
2024-11-02 17:28:21 +02:00
Byron Hambly
248b93dd9f
decodepsbt: add asset/assetcommitment to input.witness_utxo
2024-11-01 09:22:18 +02:00
Byron Hambly
16f25771a0
Merge 35305c759a into merged_master (Bitcoin PR bitcoin/bitcoin#22751 )
...
This PR introduced a new RPC "simulaterawtransaction". It has been modified from
upstream and from ElementsProject/elements#1016
to work correctly with Elements blinded transactions and issued assets.
2024-10-29 10:15:55 +02:00
Byron Hambly
5d174dc4d0
Merge e038605585 into merged_master (Bitcoin PR bitcoin/bitcoin#24662 )
2024-10-25 12:07:59 +02:00
Byron Hambly
a1f37eeae6
Merge e09ad284c7 into merged_master (Bitcoin PR bitcoin/bitcoin#24675 )
2024-10-25 11:37:05 +02:00
Byron Hambly
12dbf6cb9d
Merge f6fdedf850 into merged_master (Bitcoin PR bitcoin/bitcoin#25648 )
2024-10-24 20:20:13 +02:00
Byron Hambly
641fbe39e8
Merge c5ba1d92b6 into merged_master (Bitcoin PR bitcoin/bitcoin#25610 )
2024-10-24 13:55:08 +02:00
Byron Hambly
da5b3cf786
Merge 9ba73758c9 into merged_master (Bitcoin PR bitcoin/bitcoin#24697 )
...
Also removes the redundant redeclaration of CheckMinimalPush from
interpreter.h that was moved to script.h in f4e289f384
2024-10-20 20:19:04 +02:00
Byron Hambly
b9abd5638d
Merge a65f6d8cbb into merged_master (Bitcoin PR bitcoin/bitcoin#25699 )
2024-10-18 14:44:59 +02:00
Byron Hambly
34a8aa2f32
Merge 73a0d6d0d4 into merged_master (Bitcoin PR bitcoin/bitcoin#25611 )
2024-10-18 14:09:35 +02:00
Byron Hambly
bcb3d32074
Merge f27d5f6305 into merged_master (Bitcoin PR bitcoin/bitcoin#25691 )
2024-10-18 13:54:51 +02:00
Byron Hambly
ad4ecee6c0
Merge 895937edb2 into merged_master (Bitcoin PR bitcoin/bitcoin#25285 )
2024-10-17 17:33:20 +02:00
Byron Hambly
21648b79ea
Merge 5560682a44 into merged_master (Bitcoin PR bitcoin/bitcoin#25645 )
2024-10-17 17:15:38 +02:00
Byron Hambly
ad90efac48
Merge 47c86a023d into merged_master (Bitcoin PR bitcoin/bitcoin#25466 )
2024-10-17 10:54:37 +02:00
Byron Hambly
299207b5d6
Merge 2bdce7f7ad into merged_master (Bitcoin PR bitcoin/bitcoin#25514 )
...
Note I did manually run the trim headers functional test successfully on
this commit, since it touched some of trim headers code.
2024-10-17 10:44:56 +02:00
Byron Hambly
076e809b74
Merge 821f5c824f into merged_master (Bitcoin PR bitcoin/bitcoin#25487 )
2024-10-17 09:16:23 +02:00
James Dorfman
e938673fbd
Merge 55b76ac1c0 into merged_master (Bitcoin PR bitcoin/bitcoin#25615 )
2024-10-16 07:07:54 +00:00
James Dorfman
bf5189aa76
Merge c30b3e90f0 into merged_master (Bitcoin PR bitcoin/bitcoin#25472 )
2024-10-16 05:44:43 +00:00
James Dorfman
a6d5d4ead6
Merge 46fcb52cb1 into merged_master (Bitcoin PR bitcoin/bitcoin#24944 )
2024-10-16 05:04:19 +00:00
James Dorfman
dbab4c012c
Merge a7f3479ba3 into merged_master (Bitcoin PR bitcoin/bitcoin#25353 )
2024-10-13 18:06:13 +00:00