Rename script/standard.{cpp/h} to script/solver.{cpp/h}

Since script/standard only contains things that are used by the Solver
and its callers, rename the files to script/solver.

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 \

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>

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>

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>

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>

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>
 

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>

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>

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>

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>

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>

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>

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>

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
+// The Solver functions are used by policy and the wallet, but not consensus.
-#define BITCOIN_SCRIPT_STANDARD_H
+
+#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

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>
 

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>

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>

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>

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>
 

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>

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>
 

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>