diff options
31 files changed, 37 insertions, 35 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 3efc008e33..c17953611f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -265,7 +265,7 @@ BITCOIN_CORE_H = \ script/sigcache.h \ script/sign.h \ script/signingprovider.h \ - script/standard.h \ + script/solver.h \ shutdown.h \ signet.h \ streams.h \ @@ -699,7 +699,7 @@ libbitcoin_common_a_SOURCES = \ script/miniscript.cpp \ script/sign.cpp \ script/signingprovider.cpp \ - script/standard.cpp \ + script/solver.cpp \ warnings.cpp \ $(BITCOIN_CORE_H) @@ -960,7 +960,7 @@ libbitcoinkernel_la_SOURCES = \ script/script.cpp \ script/script_error.cpp \ script/sigcache.cpp \ - script/standard.cpp \ + script/solver.cpp \ signet.cpp \ streams.cpp \ support/cleanse.cpp \ diff --git a/src/addresstype.cpp b/src/addresstype.cpp index 96428df846..d96b820bc7 100644 --- a/src/addresstype.cpp +++ b/src/addresstype.cpp @@ -4,7 +4,7 @@ #include <addresstype.h> #include <script/script.h> -#include <script/standard.h> +#include <script/solver.h> #include <hash.h> #include <pubkey.h> #include <uint256.h> diff --git a/src/common/bloom.cpp b/src/common/bloom.cpp index fd3276b5a7..5c3ad882a1 100644 --- a/src/common/bloom.cpp +++ b/src/common/bloom.cpp @@ -8,7 +8,7 @@ #include <primitives/transaction.h> #include <random.h> #include <script/script.h> -#include <script/standard.h> +#include <script/solver.h> #include <span.h> #include <streams.h> #include <util/fastrange.h> diff --git a/src/core_write.cpp b/src/core_write.cpp index 54ca306f60..7cf019a42e 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -11,7 +11,7 @@ #include <key_io.h> #include <script/descriptor.h> #include <script/script.h> -#include <script/standard.h> +#include <script/solver.h> #include <serialize.h> #include <streams.h> #include <undo.h> diff --git a/src/key_io.cpp b/src/key_io.cpp index b7fe4d2423..a061165613 100644 --- a/src/key_io.cpp +++ b/src/key_io.cpp @@ -7,7 +7,7 @@ #include <base58.h> #include <bech32.h> #include <script/interpreter.h> -#include <script/standard.h> +#include <script/solver.h> #include <util/strencodings.h> #include <algorithm> diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp index 41b5b2d0f1..d08ec4fb7f 100644 --- a/src/policy/policy.cpp +++ b/src/policy/policy.cpp @@ -15,7 +15,7 @@ #include <primitives/transaction.h> #include <script/interpreter.h> #include <script/script.h> -#include <script/standard.h> +#include <script/solver.h> #include <serialize.h> #include <span.h> diff --git a/src/policy/policy.h b/src/policy/policy.h index 79e6725e73..687d1881cb 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -10,7 +10,7 @@ #include <consensus/consensus.h> #include <primitives/transaction.h> #include <script/interpreter.h> -#include <script/standard.h> +#include <script/solver.h> #include <cstdint> #include <string> diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp index b3b0e85c94..f5b86f44a6 100644 --- a/src/qt/test/wallettests.cpp +++ b/src/qt/test/wallettests.cpp @@ -24,7 +24,7 @@ #include <qt/transactiontablemodel.h> #include <qt/transactionview.h> #include <qt/walletmodel.h> -#include <script/standard.h> +#include <script/solver.h> #include <test/util/setup_common.h> #include <validation.h> #include <wallet/test/util.h> diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index eb0200ccf5..9198529378 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -30,7 +30,7 @@ #include <script/script.h> #include <script/sign.h> #include <script/signingprovider.h> -#include <script/standard.h> +#include <script/solver.h> #include <uint256.h> #include <undo.h> #include <util/bip32.h> diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp index 4c1aa9ee03..2732f1297a 100644 --- a/src/rpc/util.cpp +++ b/src/rpc/util.cpp @@ -12,7 +12,7 @@ #include <rpc/util.h> #include <script/descriptor.h> #include <script/signingprovider.h> -#include <script/standard.h> +#include <script/solver.h> #include <tinyformat.h> #include <util/check.h> #include <util/result.h> diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp index 3d8497ef19..436ea9c093 100644 --- a/src/script/descriptor.cpp +++ b/src/script/descriptor.cpp @@ -10,7 +10,7 @@ #include <script/miniscript.h> #include <script/script.h> #include <script/signingprovider.h> -#include <script/standard.h> +#include <script/solver.h> #include <uint256.h> #include <common/args.h> diff --git a/src/script/sign.cpp b/src/script/sign.cpp index c28773ed0e..92b7ad50b5 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -13,7 +13,7 @@ #include <script/miniscript.h> #include <script/script.h> #include <script/signingprovider.h> -#include <script/standard.h> +#include <script/solver.h> #include <uint256.h> #include <util/translation.h> #include <util/vector.h> diff --git a/src/script/standard.cpp b/src/script/solver.cpp index 40ae381f0f..1cd388b061 100644 --- a/src/script/standard.cpp +++ b/src/script/solver.cpp @@ -3,7 +3,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include <script/standard.h> +#include <script/solver.h> #include <pubkey.h> #include <script/interpreter.h> #include <script/script.h> diff --git a/src/script/standard.h b/src/script/solver.h index 2b743776b4..dc8f4c357d 100644 --- a/src/script/standard.h +++ b/src/script/solver.h @@ -3,8 +3,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_SCRIPT_STANDARD_H -#define BITCOIN_SCRIPT_STANDARD_H +// The Solver functions are used by policy and the wallet, but not consensus. + +#ifndef BITCOIN_SCRIPT_SOLVER_H +#define BITCOIN_SCRIPT_SOLVER_H #include <attributes.h> #include <script/script.h> @@ -61,4 +63,4 @@ std::optional<std::pair<int, std::vector<Span<const unsigned char>>>> MatchMulti /** Generate a multisig script. */ CScript GetScriptForMultisig(int nRequired, const std::vector<CPubKey>& keys); -#endif // BITCOIN_SCRIPT_STANDARD_H +#endif // BITCOIN_SCRIPT_SOLVER_H diff --git a/src/test/blockmanager_tests.cpp b/src/test/blockmanager_tests.cpp index 224a00ce46..553bb31ba1 100644 --- a/src/test/blockmanager_tests.cpp +++ b/src/test/blockmanager_tests.cpp @@ -6,7 +6,7 @@ #include <node/blockstorage.h> #include <node/context.h> #include <node/kernel_notifications.h> -#include <script/standard.h> +#include <script/solver.h> #include <util/chaintype.h> #include <validation.h> diff --git a/src/test/fuzz/key.cpp b/src/test/fuzz/key.cpp index 8faeb9e04f..a5a579d982 100644 --- a/src/test/fuzz/key.cpp +++ b/src/test/fuzz/key.cpp @@ -13,7 +13,7 @@ #include <script/script.h> #include <script/sign.h> #include <script/signingprovider.h> -#include <script/standard.h> +#include <script/solver.h> #include <streams.h> #include <test/fuzz/FuzzedDataProvider.h> #include <test/fuzz/fuzz.h> diff --git a/src/test/fuzz/script.cpp b/src/test/fuzz/script.cpp index 1cb7d01906..acc82f55f6 100644 --- a/src/test/fuzz/script.cpp +++ b/src/test/fuzz/script.cpp @@ -16,7 +16,7 @@ #include <script/script_error.h> #include <script/sign.h> #include <script/signingprovider.h> -#include <script/standard.h> +#include <script/solver.h> #include <streams.h> #include <test/fuzz/FuzzedDataProvider.h> #include <test/fuzz/fuzz.h> diff --git a/src/test/interfaces_tests.cpp b/src/test/interfaces_tests.cpp index 07f6175deb..29f0aea3b1 100644 --- a/src/test/interfaces_tests.cpp +++ b/src/test/interfaces_tests.cpp @@ -6,7 +6,7 @@ #include <consensus/validation.h> #include <interfaces/chain.h> #include <test/util/setup_common.h> -#include <script/standard.h> +#include <script/solver.h> #include <validation.h> #include <boost/test/unit_test.hpp> diff --git a/src/test/script_standard_tests.cpp b/src/test/script_standard_tests.cpp index 884e3d0634..1a205728d6 100644 --- a/src/test/script_standard_tests.cpp +++ b/src/test/script_standard_tests.cpp @@ -8,7 +8,7 @@ #include <key_io.h> #include <script/script.h> #include <script/signingprovider.h> -#include <script/standard.h> +#include <script/solver.h> #include <test/util/setup_common.h> #include <util/strencodings.h> diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index 1cf179c8e5..d63bfb9603 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -14,7 +14,7 @@ #include <script/sigcache.h> #include <script/sign.h> #include <script/signingprovider.h> -#include <script/standard.h> +#include <script/solver.h> #include <streams.h> #include <test/util/json.h> #include <test/util/random.h> diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp index 825413e023..ec9490d745 100644 --- a/src/test/sigopcount_tests.cpp +++ b/src/test/sigopcount_tests.cpp @@ -10,7 +10,7 @@ #include <pubkey.h> #include <script/interpreter.h> #include <script/script.h> -#include <script/standard.h> +#include <script/solver.h> #include <test/util/setup_common.h> #include <uint256.h> diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index 34dd2c3e9f..a4c0db8aea 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -19,7 +19,7 @@ #include <script/script_error.h> #include <script/sign.h> #include <script/signingprovider.h> -#include <script/standard.h> +#include <script/solver.h> #include <streams.h> #include <test/util/json.h> #include <test/util/random.h> diff --git a/src/wallet/rpc/addresses.cpp b/src/wallet/rpc/addresses.cpp index d2d391daf4..c1b99a4f97 100644 --- a/src/wallet/rpc/addresses.cpp +++ b/src/wallet/rpc/addresses.cpp @@ -6,7 +6,7 @@ #include <key_io.h> #include <rpc/util.h> #include <script/script.h> -#include <script/standard.h> +#include <script/solver.h> #include <util/bip32.h> #include <util/translation.h> #include <wallet/receive.h> diff --git a/src/wallet/rpc/backup.cpp b/src/wallet/rpc/backup.cpp index af8043f158..22c31436f1 100644 --- a/src/wallet/rpc/backup.cpp +++ b/src/wallet/rpc/backup.cpp @@ -12,7 +12,7 @@ #include <rpc/util.h> #include <script/descriptor.h> #include <script/script.h> -#include <script/standard.h> +#include <script/solver.h> #include <sync.h> #include <uint256.h> #include <util/bip32.h> diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp index 6ece0433a2..1f510d1c58 100644 --- a/src/wallet/scriptpubkeyman.cpp +++ b/src/wallet/scriptpubkeyman.cpp @@ -9,7 +9,7 @@ #include <script/descriptor.h> #include <script/script.h> #include <script/sign.h> -#include <script/standard.h> +#include <script/solver.h> #include <util/bip32.h> #include <util/strencodings.h> #include <util/string.h> diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp index 4985731641..c0ee00e097 100644 --- a/src/wallet/spend.cpp +++ b/src/wallet/spend.cpp @@ -13,7 +13,7 @@ #include <primitives/transaction.h> #include <script/script.h> #include <script/signingprovider.h> -#include <script/standard.h> +#include <script/solver.h> #include <util/check.h> #include <util/fees.h> #include <util/moneystr.h> diff --git a/src/wallet/test/ismine_tests.cpp b/src/wallet/test/ismine_tests.cpp index d06bcba6cf..95d5c1b9ce 100644 --- a/src/wallet/test/ismine_tests.cpp +++ b/src/wallet/test/ismine_tests.cpp @@ -6,7 +6,7 @@ #include <key_io.h> #include <node/context.h> #include <script/script.h> -#include <script/standard.h> +#include <script/solver.h> #include <script/signingprovider.h> #include <test/util/setup_common.h> #include <wallet/types.h> diff --git a/src/wallet/test/scriptpubkeyman_tests.cpp b/src/wallet/test/scriptpubkeyman_tests.cpp index d3d5aa578c..15bff04221 100644 --- a/src/wallet/test/scriptpubkeyman_tests.cpp +++ b/src/wallet/test/scriptpubkeyman_tests.cpp @@ -4,7 +4,7 @@ #include <key.h> #include <test/util/setup_common.h> -#include <script/standard.h> +#include <script/solver.h> #include <wallet/scriptpubkeyman.h> #include <wallet/wallet.h> #include <wallet/test/util.h> diff --git a/src/wallet/test/spend_tests.cpp b/src/wallet/test/spend_tests.cpp index 3dbb0a8c34..b5ea275bcb 100644 --- a/src/wallet/test/spend_tests.cpp +++ b/src/wallet/test/spend_tests.cpp @@ -4,7 +4,7 @@ #include <consensus/amount.h> #include <policy/fees.h> -#include <script/standard.h> +#include <script/solver.h> #include <validation.h> #include <wallet/coincontrol.h> #include <wallet/spend.h> diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp index 26285b936d..4abf6441d2 100644 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -15,7 +15,7 @@ #include <node/blockstorage.h> #include <policy/policy.h> #include <rpc/server.h> -#include <script/standard.h> +#include <script/solver.h> #include <test/util/logging.h> #include <test/util/random.h> #include <test/util/setup_common.h> diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 91fbd0c9be..fd9a3e5a30 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -26,7 +26,7 @@ #include <script/descriptor.h> #include <script/script.h> #include <script/signingprovider.h> -#include <script/standard.h> +#include <script/solver.h> #include <support/cleanse.h> #include <txmempool.h> #include <util/bip32.h> |