Byron Hambly
b4405ba453
Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750 )
2025-03-31 16:37:52 +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 48174c0f28bitcoin/bitcoin#26240 : rpc: Adjust RPCTypeCheckObj error string
1668417474 2022-11-14T10:17:54+01:00 59e00c7e03bitcoin/bitcoin#25714 : univalue: Avoid std::string copies
1668111238 2022-11-10T15:13:58-05:00 7ef730ca84bitcoin/bitcoin#26483 : test: Don't pass add_to_wallet option to walletcreatefundedpsbt
1668004459 2022-11-09T15:34:19+01:00 9dce30194bbitcoin/bitcoin#26472 : test: add missing bech32m / BIP86 test-cases to wallet_descriptor.py
1667992471 2022-11-09T12:14:31+01:00 44ca5d5e87bitcoin/bitcoin#26473 : test: Avoid collision with valid path names in `getarg_tests/logargs`
1667640759 2022-11-05T10:32:39+01:00 50422b770abitcoin/bitcoin#26419 : log: mempool: log removal reason in validation interface
1667636699 2022-11-05T09:24:59+01:00 ce57dbac90bitcoin/bitcoin#26449 : rpc: doc: add missing option "bech32m" for `change_type` parameters
1667577253 2022-11-04T15:54:13+00:00 ae6bb6e71ebitcoin/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
Byron Hambly
301f7c9225
Merge 368010a308 into merged_master (Elements PR #1390 )
2025-02-11 15:06:18 +02: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
Russell O'Connor
31d94775b3
Update to latest Simplicity
...
The main difference is that there is now explicit simplicity deallocation functions to go with the allocation functions in the API.
There are some minor changes to error message text.
The deserialization code is now automatically generated.
The are some other minor internal changes.
2025-02-04 12:14:25 -05:00
Andrew Poelstra
1c871c8c20
interpreter: fix use-after-free in Simplicity init code
...
We have the code fragment `txTo.GetHash().begin()`, which takes a
transaction, computes its txid as a uint256, and then saves a pointer to
the internal data of the uint256.
However, in C++, expressions of the form a.b().c() lead to the return
value of `b` being dropped immediately after the call to `c`. This is
fine if `c` is something like `GetHex` which returns a new independently
allocated object with no pointers to its input. It is not fine for
`begin` which returns a pointer into the return value of `GetHash`.
So this fragment returns a dangling pointer, which is later used by the
Simplicity interpreter, leading to UB.
In practice this code appeared to work, possibly because the stack
layout was such that it actually did work ok. Or possibly because we
don't test with enough fidelity to tell that Simplicity's view of the
txid of a transaction was mangled.
2025-01-31 11:39:07 -05: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
d78604da4c
Merge 2534141e19 into merged_master (Elements PR ElementsProject/elements#1219 )
2024-12-02 08:51:39 +02:00
Byron Hambly
c3fa0dddac
Merge 55e1deb745 into merged_master (Bitcoin PR bitcoin/bitcoin#25540 )
2024-11-27 11:26:08 +02:00
Byron Hambly
e1e241d410
Merge 7921026a24 into merged_master (Bitcoin PR bitcoin/bitcoin#19602 )
...
FIXME for test_other_watchonly in the new wallet migration test
2024-11-26 11:21:27 +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
b07694187c
Merge 607d5a46aa into merged_master (Bitcoin PR bitcoin/bitcoin#23202 )
...
added a FIXME for the new bumpfee tests on non-owned inputs
2024-11-04 15:03:28 +02:00
Byron Hambly
367b7b253a
Merge 888628cee0 into merged_master (Bitcoin PR bitcoin/bitcoin#25827 )
2024-11-03 17:22:22 +02:00
Byron Hambly
06009b9841
Merge a8f69541ad into merged_master (Bitcoin PR bitcoin/bitcoin#25748 )
2024-11-03 16:54:57 +02:00
Byron Hambly
52699c29d7
Merge e078ee9d9d into merged_master (Bitcoin PR bitcoin/bitcoin#25664 )
2024-11-01 15:14:19 +02:00
Byron Hambly
5104b4635b
Merge 93999a5fbe into merged_master (Bitcoin PR bitcoin/bitcoin#25642 )
2024-11-01 13:41:41 +02:00
Byron Hambly
85cd9e605d
Merge ac59112a6a into merged_master (Bitcoin PR bitcoin/bitcoin#23480 )
2024-10-30 09:49:14 +02:00
Byron Hambly
79d275ea14
Merge 7312effe6a into merged_master (Bitcoin PR bitcoin/bitcoin#25527 )
2024-10-25 11:03:47 +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
50a5a78d8d
Merge 5215c80edc into merged_master (Bitcoin PR bitcoin/bitcoin#25709 )
2024-10-24 13:06:05 +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
28d35f619e
Merge 510ac41eac into merged_master (Bitcoin PR bitcoin/bitcoin#25331 )
2024-10-18 13:14:02 +02:00
James Dorfman
d94f55ff58
Merge 85b601e043 into merged_master (Bitcoin PR bitcoin/bitcoin#24148 )
2024-10-16 06:54:02 +00:00
Russell O'Connor
1698454c2a
Add Simplicity verification
...
Unactivated.
2024-10-07 14:39:09 -04:00
Russell O'Connor
96fb8f5d15
Store hash_genesis_block in PrecomputedTransactionData.
...
This will be used by Simplicity.
2024-10-07 14:39:09 -04:00
Russell O'Connor
52b92b8213
Cherry-pick < https://github.com/bitcoin/bitcoin/pull/27122 >
...
Simplicity needs this fix.
2024-10-07 14:38:13 -04:00
Byron Hambly
2d07ef8fc1
Merge 5bf65ec66e into merged_master (Bitcoin PR bitcoin/bitcoin#22558 )
2024-09-19 13:24:19 +02:00
James Dorfman
a52fff5abe
Merge 695ca641a4 into merged_master (Bitcoin PR bitcoin/bitcoin#24860 )
2024-09-09 17:06:48 +00:00
James Dorfman
bcc0b07392
Merge cacbdbaa95 into merged_master (Bitcoin PR bitcoin/bitcoin#25132 )
2024-09-06 06:39:01 +00:00
James Dorfman
f9c08c4566
Merge 66e3b16b8b into merged_master (Bitcoin PR bitcoin/bitcoin#25184 )
2024-08-13 22:08:12 +00:00
James Dorfman
31df518140
Merge 7b3343f300 into merged_master (Bitcoin PR bitcoin/bitcoin#25108 )
2024-08-13 04:20:55 +00:00
James Dorfman
cf81ccbd1f
Merge b557a24be9 into merged_master (Bitcoin PR bitcoin/bitcoin#19426 )
2024-08-09 16:00:17 +00:00
James Dorfman
d7c7eadebe
Merge 30c1c6ed80 into merged_master (Bitcoin PR bitcoin/bitcoin#24979 )
2024-08-02 05:29:00 +00:00
James Dorfman
b4321ae5f1
Merge 8103fffe5c into merged_master (Bitcoin PR bitcoin/bitcoin#24906 )
2024-08-01 16:36:50 +00:00
James Dorfman
38cf680443
Merge 41720a1f54 into merged_master (Bitcoin PR bitcoin/bitcoin#24786 )
2024-07-29 19:42:59 +00:00
James Dorfman
94e058d3b7
Merge d492dc1cda into merged_master (Bitcoin PR bitcoin/bitcoin#24147 )
2024-07-08 17:49:09 +00:00
James Dorfman
b3a377c2d0
Merge 0da559e02e into merged_master (Bitcoin PR bitcoin/bitcoin#24661 )
2024-07-08 15:17:32 +00:00
James Dorfman
dbbde2d123
Merge df8e57296c into merged_master (Elements PR ElementsProject/elements#1286 )
2024-05-24 06:48:04 +00:00
James Dorfman
a0093e2760
Merge d6f225f5c9 into merged_master (Bitcoin PR bitcoin/bitcoin#24462 )
2024-01-09 00:06:54 +00:00
Christian Lewe
f4243128ee
Script: Move SCRIPT_ERR_COUNT
...
SCRIPT_ERR_COUNT is a pseudo error that returns the number of errors.
It must always be last in the enum.
2023-11-10 17:04:29 +01:00
Byron Hambly
35e8c6d908
Merge e7db4e245a into merged_master (Bitcoin PR bitcoin/bitcoin#24164 )
2023-10-14 19:42:34 +00:00
Byron Hambly
45f83fd396
Merge bada9636d7 into merged_master (Bitcoin PR bitcoin/bitcoin#24043 )
2023-10-13 07:53:59 +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
e7f3a397f2
Merge 5034b7fa3b into merged_master (Bitcoin PR bitcoin/bitcoin#24217 )
2023-06-30 09:16:02 +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
23ffcd4fc8
Merge bd482b3ffe into merged_master (Bitcoin PR bitcoin/bitcoin#24105 )
2023-06-21 11:44:35 +00:00
Byron Hambly
d3148d2497
Merge a1e04e1079 into merged_master (Bitcoin PR bitcoin/bitcoin#23926 )
2023-06-14 16:12:54 +00:00
Byron Hambly
47626b5a64
Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912 )
2023-06-14 15:44:11 +00:00
James Dorfman
536c7fee81
Merge 50c502f54a into merged_master (Bitcoin PR bitcoin/bitcoin#17034 )
2023-06-13 03:51:10 +00:00
