Byron Hambly
ac6e63d23a
lint: fix lint-includes
2025-08-08 12:49:19 +02:00
Byron Hambly
560c5e317b
Merge c2d4e40e45 into merged_master (Bitcoin PR bitcoin/bitcoin#28651 )
2025-08-07 13:30:45 +02:00
Byron Hambly
3f12670fa4
Merge 90f7d8a7f9 into merged_master (Bitcoin PR bitcoin/bitcoin#28539 )
...
ELEMENTS FIXME
2025-08-07 12:16:06 +02:00
Byron Hambly
69492d27da
Merge 08ea835220 into merged_master (Bitcoin PR bitcoin/bitcoin#28583 )
2025-08-07 10:05:15 +02:00
Byron Hambly
bbde7e222c
Merge 744157ef1a into merged_master (Bitcoin PR bitcoin/bitcoin#28602 )
2025-08-06 20:37:13 +02:00
Byron Hambly
d24651b7c4
Merge db283a6b6f into merged_master (Bitcoin PR bitcoin/bitcoin#27255 )
2025-08-06 20:29:29 +02:00
Byron Hambly
5c091cc7ab
Merge 6e5cf8e953 into merged_master (Bitcoin PR bitcoin/bitcoin#28587 )
2025-08-06 15:40:02 +02:00
Byron Hambly
e826a411ec
Merge 48b8910d12 into merged_master (Bitcoin PR bitcoin/bitcoin#28508 )
...
GetHash now manually implemented for CBlockHeader. SER_GETHASH removed,
so CProof now always serializes `solution`. CBlockHeader::GetHash copies
from Serialize, but only includes `challenge` of CProof, and no signblock witness
This needs to be tested with liquidv1 chain
2025-08-05 14:12:48 +02:00
Byron Hambly
236ccf7924
Merge 8e0d9796da into merged_master (Bitcoin PR bitcoin/bitcoin#25284 )
2025-07-18 15:00:47 +02:00
Byron Hambly
b456503d27
Merge d2ccca253f into merged_master (Bitcoin PR bitcoin/bitcoin#26567 )
...
Modified to keep using dummy signing until we can update to the
descriptor method introduced in this PR from upstream
2025-07-18 14:38:53 +02:00
Byron Hambly
833114cc24
Merge b379bb2465 into merged_master (Elements PR #1459 )
2025-07-18 11:45:30 +02:00
Byron Hambly
7f52ed9784
Merge 03a536f1ed into merged_master (Bitcoin PR bitcoin/bitcoin#28284 )
2025-07-05 08:37:18 +02:00
Byron Hambly
6c55760a2d
Merge 7ef2d4ee4d into merged_master (Bitcoin PR bitcoin/bitcoin#28244 )
2025-07-04 17:24:18 +02:00
Byron Hambly
ea86e8f268
Merge 7edce77ff3 into merged_master (Bitcoin PR bitcoin/bitcoin#28067 )
2025-07-03 09:42:33 +02:00
Byron Hambly
fe065eec99
Merge bc88f3ab90 into merged_master (Bitcoin PR bitcoin/bitcoin#27997 )
2025-07-01 13:34:19 +02:00
Byron Hambly
bc6f151cb8
Merge f08d914a67 into merged_master (Bitcoin PR bitcoin/bitcoin#27920 )
2025-06-30 15:29:17 +02:00
Byron Hambly
edc585d157
Merge 9564f98fee into merged_master (Bitcoin PR bitcoin/bitcoin#27636 )
2025-06-25 11:40:46 +02:00
Russell O'Connor
0a0a69f315
Update Simplicity integeration
...
This Simplicity update has
- renamed a few types
- moved some files around
- added a minCost parameter, currently set to 0
- added a new error code
2025-06-24 11:38:08 -04:00
Byron Hambly
5b856b6f5f
Merge fa53611cf1 into merged_master (Bitcoin PR bitcoin/bitcoin#26076 )
2025-05-16 11:10:32 +02:00
Byron Hambly
5ac82e15a9
Merge 669af32632 into merged_master (Bitcoin PR bitcoin/bitcoin#27419 )
2025-05-09 11:47:45 +02:00
Byron Hambly
833eaacade
ci: use 24.04 instead of lunar for tidy and fuzz ci
2025-04-29 13:49:55 +02:00
Byron Hambly
0b1508bf01
ci: fix lint issues
2025-04-17 11:06:32 +02:00
Byron Hambly
82f8b9e1ff
Merge 0eb2ea5cbe into merged_master (Elements PR #1425 )
2025-04-15 11:19:51 +02:00
Byron Hambly
bf0900c0a0
Merge 5150e28010 into merged_master (Bitcoin PR bitcoin/bitcoin#27382 )
2025-04-12 12:06:26 +02:00
Byron Hambly
e04de3e652
Merge 3963067555 into merged_master (Bitcoin PR bitcoin/bitcoin#26642 )
2025-04-11 22:28:06 +02:00
Byron Hambly
e24c402fac
Merge b175bdb9b2 into merged_master (Bitcoin PR bitcoin/bitcoin#27238 )
2025-04-10 08:26:17 +02:00
Byron Hambly
afe6c13f41
Merge 236cd231d0 into merged_master (Bitcoin PR bitcoin/bitcoin#27197 )
2025-04-09 13:20:57 +02:00
Byron Hambly
f3fcbc07b0
Merge cb40639bdf into merged_master (Bitcoin PR bitcoin/bitcoin#27165 )
2025-04-09 13:11:08 +02:00
Tom Trevethan
c222787622
Merge b7702bd546 into merged_master (Bitcoin PR bitcoin/bitcoin#25943 )
2025-04-08 20:00:25 +00:00
Byron Hambly
c7bff919f0
Merge fb82d91a9c into merged_master (Bitcoin PR bitcoin/bitcoin#24149 )
2025-04-05 22:44:14 +02:00
Byron Hambly
071319a7cc
Merge fb2f093479 into merged_master (Bitcoin PR bitcoin/bitcoin#27097 )
2025-04-05 17:32:19 +02:00
Byron Hambly
2ba842104d
Merge 550e6bd227 into merged_master (Bitcoin PR bitcoin/bitcoin#26935 )
2025-04-05 10:57:32 +02:00
Tom Trevethan
0761b58003
Merge 1c8b80f440 into merged_master (Bitcoin PR bitcoin/bitcoin#15294 )
2025-04-04 14:37:56 +00:00
Byron Hambly
384af117e5
Merge 30f553d457 into merged_master (Bitcoin PR bitcoin/bitcoin#26707 )
2025-04-04 10:50:48 +02:00
Byron Hambly
44e0c0fe10
Merge 58da1619be into merged_master (Bitcoin PR bitcoin/bitcoin#25877 )
2025-04-03 21:23:59 +02:00
Byron Hambly
e9d7ca4858
Merge 07c54de550 into merged_master (Bitcoin PR bitcoin/bitcoin#26691 )
2025-04-02 09:40:04 +02:00
Tom Trevethan
694c51a39f
Merge 3212d104f4 into merged_master (Bitcoin PR bitcoin/bitcoin#23829 )
2025-04-01 15:23:27 +00:00
Byron Hambly
b4405ba453
Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750 )
2025-03-31 16:37:52 +02:00
Russell O'Connor
3a80782963
Avoid double free in simplicity pointer when copying PrecomputedTransactionData
...
We cannot put a raw pointer into a class that has a default copy constructor.
2025-03-03 17:35:07 -05: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
