From e7843902c8c821cd9fcb711a94b4c9360230bdcd Mon Sep 17 00:00:00 2001 From: evoskuil Date: Fri, 24 Jan 2025 17:35:25 -0500 Subject: [PATCH 1/2] Style. --- .../bitcoin/system/impl/machine/interpreter.ipp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/include/bitcoin/system/impl/machine/interpreter.ipp b/include/bitcoin/system/impl/machine/interpreter.ipp index 4e140756b8..9ade66d829 100644 --- a/include/bitcoin/system/impl/machine/interpreter.ipp +++ b/include/bitcoin/system/impl/machine/interpreter.ipp @@ -1721,11 +1721,18 @@ code interpreter::connect_witness(const context& state, // A defined version indicates bip141 is active. interpreter program(tx, it, script, state.flags, version, stack); if ((ec = program.run())) + { return ec; - - // A v0 script must succeed with a clean true stack (bip141). - return program.is_true(true) ? error::script_success : - error::stack_false; + } + else if (!program.is_true(true)) + { + // A v0 script must succeed with a clean true stack (bip141). + return error::stack_false; + } + else + { + return error::script_success; + } } // These versions are reserved for future extensions (bip141). From 4073197695e66aeaca9da55746646ea7f732fbea Mon Sep 17 00:00:00 2001 From: evoskuil Date: Fri, 24 Jan 2025 17:37:42 -0500 Subject: [PATCH 2/2] Remove bad include. --- include/bitcoin/system/impl/machine/interpreter.ipp | 1 - 1 file changed, 1 deletion(-) diff --git a/include/bitcoin/system/impl/machine/interpreter.ipp b/include/bitcoin/system/impl/machine/interpreter.ipp index 9ade66d829..3091b45f8d 100644 --- a/include/bitcoin/system/impl/machine/interpreter.ipp +++ b/include/bitcoin/system/impl/machine/interpreter.ipp @@ -19,7 +19,6 @@ #ifndef LIBBITCOIN_SYSTEM_MACHINE_INTERPRETER_IPP #define LIBBITCOIN_SYSTEM_MACHINE_INTERPRETER_IPP -#include "bitcoin/system/chain/prevout.hpp" #include #include #include