Commit graph

39093 commits

Author SHA1 Message Date
Russell O'Connor
c211d1a4d9 Merge commit '37adf7d72d' into simplicity 2025-02-18 13:11:04 -05:00
Russell O'Connor
37adf7d72d Squashed 'src/simplicity/' changes from 4858b89526..b549192109
b549192109 codespell: fix typos

git-subtree-dir: src/simplicity
git-subtree-split: b5491921095b28bc554c325a7d05274690483a6f
2025-02-18 13:11:04 -05:00
Byron Hambly
12c586a3bf
Merge pull request #1417 from psgreco/master-fix-win64native
Fix Win64 native unit test
2025-02-18 16:05:44 +02:00
Byron Hambly
c9c21cf7df
Merge pull request #1416 from apoelstra/2025-02--psbt-fix
pset: fix NULL pointer dereference when deserializing malformed PSETs over RPC
2025-02-18 15:06:38 +02:00
Jon Atack
7f56623441 Put lock logging behind DEBUG_LOCKCONTENTION preprocessor directive 2025-02-15 00:22:57 -08:00
Andrew Poelstra
0bff9b06f7
psbt: guard against empty PSBT transaction
There is a crashing bug in psbt.h which works as follows. This occurs in
the psbt_deserialize_input fuzz test, which deserializes an input and
then tries to reserialize it. Here a PSET input may contain a mainchain
transaction, which is where our trouble is.

The process is as follows:

1. On line 901, we create a CTransactionRef, which is a newtype around
   std::shared_ptr<CTransaction> which defaults to being null.
2. On line 903 we then call `UnserializeFromVector` to populate this,
   where this is a helper function which attempts to read some number of
   objects from a byte vector, i.e. a length-prefixed blob.
3. HOWEVER, `UnserializeFromVector` when given an empty vector, decides
   that it has successfully deserialized zero elements, and returns.
4. Then, on line 904 we assign the CTransactionRef, which is a valid
   std::shared_ptr whose internal pointer is NULL, to `m_peg_in_tx`,
   which is a variant of monostate, Bitcoin::CTransactionRef, and
   CTransactionRef. Its variant changes from the default monostate
   to CTransactionRef.
5. Then, on line 419, we call `std::get_if<CTransactionRef>` on this
   object, which returns a std::optional<CTransactionRef>. Because
   `m_peg_in_tx` is in the `CTransactionRef` variant, this succeeds,
   returning a true std::optional containing a valid std::shared_ptr
   which contains a NULL pointer.
6. Then, on line 420, we call `if (peg_in_tx)`, which is true, because
   we have a true std::optional. We then dereference it on line 423,
   which is perfectly legal, to get our std::shared_ptr, and pass this
   shared pointer to SerializeToVector.
7. SerializeToVector passes through like 6 layers of serialize.h
   obfuscation and eventually dereferences the shared pointer, but
   because it's NULL, this is a NULL pointer dereference, and we get a
   crash.

There are two lessons here:

1. Don't use C++. As I say in acf709b3ab,
   where I introduced some of the offending code here (but only by
   replacing boost stuff with their STL equivalents; the bug existed
   before I did this), "what a trainwreck of a language".
2. Don't use `UnserializeFromVector` and expect it to throw if the data
   you're deserializing is malformed. If it's malformed in the sense of
   being empty, it will "succeed" and silently do nothing.

I glanced at every other instance of UnserializeFromVector to check what
will happen when it's passed an empty string. I believe there are no
other cases where it will fail to initialize a NULL pointer, so I
believe that this will not cause other crashes. But I also believe that
the behavior in this case is almost always wrong and that we parse
malformed PSETs in crazy and incorrect ways all over the place.

If anybody has a problem with this, I encourage you to go review the
Bitcoin PSBT2 PRs, which this stuff is based on, which have been
languishing in rebase hell for the better part of a decade. Don't blame
the author for not writing perfect code in a hostile language with no
support.

After this PR I ran the fuzzer for 16 hours on a 192-thread machine (so
3072 CPU-hours) and didn't see any more crashes.
2025-02-14 18:08:45 +00:00
Andrew Poelstra
f7826f9199
psbt: avoid assigning non-boolean values to bool (ubsan)
ubsan doesn't like assigning arbitrary uint8_t values to bool. It's easy
to avoid doing, so do it. (We do this specifically in PSET since that's
Elements-specific code, but the same issue is present in Bitcoin in the
Unserialize impl for bool in serialize.h. Upstream this is only used in
the wallet database, where it may be that non 0/1 values are impossible
(absent a corrupt wallet).
2025-02-14 18:07:48 +00:00
Byron Hambly
e343610b99
Merge pull request #1414 from apoelstra/2025-02--fuzz-update
fuzz: minor updates to the Simplicity fuzz tests
2025-02-14 16:23:16 +02:00
Andrew Poelstra
a2d24eff9e
fuzz: remove dead code from simplicity_tx.cpp 2025-02-13 23:09:51 +00:00
Andrew Poelstra
69c241592f
fuzz: update simplicity_tx target to hit simplicity CMR error 2025-02-13 23:08:57 +00:00
Pablo Greco
0397d22941
Merge pull request #1409 from ElementsProject/simplicity
Simplicity
2025-02-13 10:07:47 -08:00
Pablo Greco
24b43eaa66
Merge pull request #1413 from delta1/lint-merge-prs
lint: fix shellcheck, spelling, and locale
2025-02-13 06:51:24 -08:00
Byron Hambly
b8cf7b768d
Merge pull request #1412 from psgreco/master-fix-macos
CI: Fix macos native build
2025-02-13 16:34:20 +02:00
Byron Hambly
2f1b86e84a
lint: fix shellcheck, spelling, and locale 2025-02-13 16:08:39 +02:00
Pablo Greco
49f151f013 Apply acc06bc91f fix also to pip upgrade 2025-02-13 05:46:30 -08:00
Pablo Greco
a121cf0e63 Manually pick acc06bc91f from bitcoin 2025-02-13 05:46:30 -08:00
Hennadii Stepanov
cde308e667 ci: Use macos-ventura-xcode:14.1 image for "macOS native" task
Github-Pull: #26388
Rebased-From: da16893474
2025-02-13 05:46:30 -08:00
Hennadii Stepanov
93218750de ci: Make getopt path architecture agnostic
Github-Pull: #26388
Rebased-From: 702836530f
2025-02-13 05:46:30 -08:00
Hennadii Stepanov
d789538aab ci: Improve naming related to "macOS 12 native x86_64" task
Github-Pull: #25444
Rebased-From: 0bb7a1f71d
2025-02-13 05:46:30 -08:00
Hennadii Stepanov
6e6c6d07b7 ci, refactor: Add MACOS_NATIVE_TASK_TEMPLATE
A native macOS task does not aware of Linux container settings, and it
does not use the `depends_built_cache`.

Github-Pull: #25444
Rebased-From: 8e017f3288
2025-02-13 05:46:30 -08:00
Byron Hambly
8a948be6df
Merge pull request #1210 from gwillen/feature-andrew-merge-script
Check in Andrew's script for merging changes into Elements integration branch
2025-02-13 09:48:39 +02:00
Byron Hambly
5cb3acef29
Merge pull request #1310 from GoodDaisy/master
Fix typos
2025-02-13 09:47:55 +02:00
Byron Hambly
077ae2d91a
Merge pull request #1408 from psgreco/master-fix-win64
Fix native win64 build (part 2)
2025-02-13 09:04:51 +02:00
Pablo Greco
5bff237cb4 CI: Win64 native: do not fail on functional tests
Windows native builds are really a best effort, but not a blocker.
Let's keep running them to see what we can fix, but keeping a green
pipeline. Also disabled a couple of long-running tests due to being
close to the timeout
2025-02-12 11:16:14 -08:00
Pablo Greco
e3011270b8 Win64: set the right TargetName in native builds 2025-02-12 11:16:14 -08:00
Russell O'Connor
9fc3797c7e Squashed 'src/simplicity/' changes from c2d4c3d07b..4858b89526
4858b89526 Remove unneed UBOUNDED_MAX checks

git-subtree-dir: src/simplicity
git-subtree-split: 4858b895261665cbe1b777c821e63c24ba3c625b
2025-02-12 14:05:32 -05:00
Russell O'Connor
b475a32abd Merge commit '9fc3797c7e' into simplicity 2025-02-12 14:05:32 -05:00
Byron Hambly
e41b225107
Merge pull request #1384 from apoelstra/2024-12--simple-fuzz
simplicity: add fuzz target
2025-02-12 14:15:27 +02:00
Byron Hambly
a259bc3693
Merge pull request #1341 from delta1/discount-test-vectors
test: add discountvsize test vectors
2025-02-12 12:38:20 +02:00
Byron Hambly
2c9c6cd7a0 test: add discountvsize test vectors 2025-02-11 11:21:18 -08:00
Andrew Poelstra
bd852baca6
ci: add more ubsan suppressions 2025-02-11 16:12:29 +00:00
Andrew Poelstra
3fe5d12c57
fuzz: simplicity: use zero CMR for invalid programs
When we have an invalid program, use a zero CMR and create a valid
control block/taptweak. Otherwise we fail to hit the Simplicity logic at
all with bad programs.

#
# You are committing on CAMUS
#

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch 2024-12--simple-fuzz
# Changes to be committed:
#	modified:   src/test/fuzz/simplicity_tx.cpp
#
# Untracked files:
#	reduced-corpus/
#	run-fuzz-merge-dir-CPzq/
#	run-fuzz-merge-dir-sscf/
#
2025-02-11 16:12:29 +00:00
Andrew Poelstra
eea423e3d6
fuzz: add second simplicity fuzz test
The first fuzztest takes a Simplicity program and a transaction and
directly calls the Simplicity interpreter with some context cobbled
together from the transaction. It also tries messing with the budget
and computes AMRs to check that the AMR-check works, even though on
the blockchain AMRs are never used.

It also attempts mangling programs to directly fuzz the parser, type
inference and CMR checking.

THIS test, on the other hand, takes a transaction, looks for Simplicity
programs (or witnesses which look like Simplicity programs), computes
their CMRs to produce a correct corresponding scriptPubKey, creates
scriptchecks, and executes them. This should do an end-to-end coverage
of the whole Simplicity consensus logic, including all the new branches
in interpreter.cpp.

To produce seeds for this, I have a a local fuzz target which uses
rust-simplicity and rust-elements to produce programs, deep Taproot trees,
and transactions. I run this to get high coverage, then dump the
resulting complete transactions to disk, where they can be used as
seeds for this test.
2025-02-11 16:12:29 +00:00
Andrew Poelstra
a87e4cf70b
simplicity: rewrite fuzz target
This fuzz target takes its seeds in a simple and well-defined format: a
four-byte LE budget, then a transaction, Simplicity program and witness,
each prefixed by a four-byte LE length. The fuzz target extracts any
additional randomness it needs from the txid of the first input of the
transaction, since this data is not interpreted in any other way we
therefore won't confuse the fuzzer.

The reason for this design, rather than a more typical "just query the
fuzzer when you need stuff", is to make it possible to fairly easily
generate test vectors from sources other than this fuzz test. (For
example, I have an alternate target which uses Rust code to generate
well-formed Simplicity programs, which quickly gets high coverage at the
expense of being an unmaintainable mess.)

This commit includes a .c file with a small function to comute the AMR
of a program. This is needed to pass a correct AMR to the Simplicity
interpreter, to exercise all the AMR-checking paths. In practice this is
not really necessary; Elements passes NULL to disable these AMR checks.
2025-02-11 16:12:28 +00:00
Byron Hambly
52642b1afd
simplicity: add fuzz target 2025-02-11 16:12:28 +00:00
Byron Hambly
d020546243
Merge pull request #1401 from apoelstra/2025-02--fuzz-fixes-2
more fuzzer fixes (continuation of #1399)
2025-02-11 17:58:42 +02:00
Byron Hambly
d7efd310f8
Merge pull request #1400 from psgreco/master-fixbuild
Fix build in master with newer environments
2025-02-11 17:56:44 +02:00
Pablo Greco
04b114c148 CI: Cirrus: use -j2 in TSan to stabilize 2025-02-11 06:14:51 -08:00
Pablo Greco
276e405ab0 CI: Cirrus: Avoid using -j3 in some jobs when elements has -j3 as the global limit 2025-02-11 06:14:51 -08:00
Pablo Greco
b703da1148 Fix build with gcc-15 2025-02-11 06:14:51 -08:00
fanquake
8251fc8162 23.x Add missing includes to fix gcc-13 compile error
Additional include fixes are required to make the 23.x branch compile
using GCC 13.

(cherry picked from commit af86266165)
2025-02-11 06:14:51 -08:00
MarcoFalke
f64aa1e6c6 Add missing includes to fix gcc-13 compile error
(cherry picked from commit fadeb6b103)
2025-02-11 06:14:51 -08:00
Hennadii Stepanov
f8b1bb7070 build: Fix Boost.Process test for Boost 1.78
(cherry picked from commit 532c64a726)
2025-02-11 06:14:51 -08:00
Hennadii Stepanov
8a1500c63e build: Fix Boost.Process detection on macOS arm64
Could be tested as follows:
```
% brew install boost@1.76
% ./autogen.sh
% ./configure --with-boost='/opt/homebrew/opt/boost@1.76'
```

(cherry picked from commit 1d4157a42b)
2025-02-11 06:14:51 -08:00
MarcoFalke
56eec70de4
Fix signed integer overflow in prioritisetransaction RPC
Cherry-pick of fa52cf8e11
https://github.com/bitcoin/bitcoin/pull/23418 (2/2)
2025-02-11 13:47:57 +00:00
MarcoFalke
6043ab449e
refactor: Replace feeDelta by m_modified_fee
* feeDelta tracked the delta (to be applied on top of the actual fee)
* m_modified_fee tracks the actual fee with the delta included
* Instead of passing in the new total delta to the Updater, pass in by
  how much the total delta should be modified.

This is needed for the next commit, but makes sense on its own because
the same is done by UpdateDescendantState and UpdateAncestorState.

Cherry-pick of fa52cf8e11
https://github.com/bitcoin/bitcoin/pull/23418 (1/2)
2025-02-11 13:47:56 +00: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
363c5101c2
fuzz: change int to unsigned in witness_program
Avoids a signed/unsigned integer conversion.
2025-02-11 04:04:25 +00:00
Andrew Poelstra
b90ef38727
ubsan: add suppression for simplicity 2025-02-11 03:00:51 +00:00