aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/coincontrol.h1
-rw-r--r--src/wallet/interfaces.cpp1
-rw-r--r--src/wallet/rpc/addresses.cpp5
-rw-r--r--src/wallet/rpc/backup.cpp8
-rw-r--r--src/wallet/rpc/coins.cpp3
-rw-r--r--src/wallet/rpc/spend.cpp1
-rw-r--r--src/wallet/scriptpubkeyman.cpp2
-rw-r--r--src/wallet/scriptpubkeyman.h3
-rw-r--r--src/wallet/spend.cpp2
-rw-r--r--src/wallet/test/ismine_tests.cpp3
-rw-r--r--src/wallet/test/scriptpubkeyman_tests.cpp2
-rw-r--r--src/wallet/test/spend_tests.cpp1
-rw-r--r--src/wallet/test/util.h2
-rw-r--r--src/wallet/test/wallet_tests.cpp2
-rw-r--r--src/wallet/wallet.cpp1
-rw-r--r--src/wallet/wallet.h1
-rw-r--r--src/wallet/walletdb.cpp1
-rw-r--r--src/wallet/walletdb.h1
18 files changed, 26 insertions, 14 deletions
diff --git a/src/wallet/coincontrol.h b/src/wallet/coincontrol.h
index 7ff8fee5bc..71593e236f 100644
--- a/src/wallet/coincontrol.h
+++ b/src/wallet/coincontrol.h
@@ -11,7 +11,6 @@
#include <primitives/transaction.h>
#include <script/keyorigin.h>
#include <script/signingprovider.h>
-#include <script/standard.h>
#include <algorithm>
#include <map>
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
index cd438cfe2f..5f2aee6923 100644
--- a/src/wallet/interfaces.cpp
+++ b/src/wallet/interfaces.cpp
@@ -11,7 +11,6 @@
#include <policy/fees.h>
#include <primitives/transaction.h>
#include <rpc/server.h>
-#include <script/standard.h>
#include <support/allocators/secure.h>
#include <sync.h>
#include <uint256.h>
diff --git a/src/wallet/rpc/addresses.cpp b/src/wallet/rpc/addresses.cpp
index a8ef0a5731..c1b99a4f97 100644
--- a/src/wallet/rpc/addresses.cpp
+++ b/src/wallet/rpc/addresses.cpp
@@ -5,6 +5,8 @@
#include <core_io.h>
#include <key_io.h>
#include <rpc/util.h>
+#include <script/script.h>
+#include <script/solver.h>
#include <util/bip32.h>
#include <util/translation.h>
#include <wallet/receive.h>
@@ -440,10 +442,9 @@ public:
UniValue operator()(const ScriptHash& scripthash) const
{
- CScriptID scriptID(scripthash);
UniValue obj(UniValue::VOBJ);
CScript subscript;
- if (provider && provider->GetCScript(scriptID, subscript)) {
+ if (provider && provider->GetCScript(ToScriptID(scripthash), subscript)) {
ProcessSubScript(subscript, obj);
}
return obj;
diff --git a/src/wallet/rpc/backup.cpp b/src/wallet/rpc/backup.cpp
index af8043f158..d100b69d3c 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>
@@ -1297,12 +1297,12 @@ RPCHelpMan importmulti()
},
},
},
- RPCArgOptions{.oneline_description="\"requests\""}},
+ RPCArgOptions{.oneline_description="requests"}},
{"options", RPCArg::Type::OBJ_NAMED_PARAMS, RPCArg::Optional::OMITTED, "",
{
{"rescan", RPCArg::Type::BOOL, RPCArg::Default{true}, "Scan the chain and mempool for wallet transactions after all imports."},
},
- RPCArgOptions{.oneline_description="\"options\""}},
+ RPCArgOptions{.oneline_description="options"}},
},
RPCResult{
RPCResult::Type::ARR, "", "Response is an array with the same size as the input that has the execution result",
@@ -1617,7 +1617,7 @@ RPCHelpMan importdescriptors()
},
},
},
- RPCArgOptions{.oneline_description="\"requests\""}},
+ RPCArgOptions{.oneline_description="requests"}},
},
RPCResult{
RPCResult::Type::ARR, "", "Response is an array with the same size as the input that has the execution result",
diff --git a/src/wallet/rpc/coins.cpp b/src/wallet/rpc/coins.cpp
index 22f0f0b83c..6f0623cdf5 100644
--- a/src/wallet/rpc/coins.cpp
+++ b/src/wallet/rpc/coins.cpp
@@ -6,6 +6,7 @@
#include <hash.h>
#include <key_io.h>
#include <rpc/util.h>
+#include <script/script.h>
#include <util/moneystr.h>
#include <wallet/coincontrol.h>
#include <wallet/receive.h>
@@ -672,7 +673,7 @@ RPCHelpMan listunspent()
std::unique_ptr<SigningProvider> provider = pwallet->GetSolvingProvider(scriptPubKey);
if (provider) {
if (scriptPubKey.IsPayToScriptHash()) {
- const CScriptID& hash = CScriptID(std::get<ScriptHash>(address));
+ const CScriptID hash = ToScriptID(std::get<ScriptHash>(address));
CScript redeemScript;
if (provider->GetCScript(hash, redeemScript)) {
entry.pushKV("redeemScript", HexStr(redeemScript));
diff --git a/src/wallet/rpc/spend.cpp b/src/wallet/rpc/spend.cpp
index b695d4bed3..0e3f10dc76 100644
--- a/src/wallet/rpc/spend.cpp
+++ b/src/wallet/rpc/spend.cpp
@@ -8,6 +8,7 @@
#include <policy/policy.h>
#include <rpc/rawtransaction_util.h>
#include <rpc/util.h>
+#include <script/script.h>
#include <util/fees.h>
#include <util/rbf.h>
#include <util/translation.h>
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index 5b110b4d14..1f510d1c58 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -7,7 +7,9 @@
#include <logging.h>
#include <outputtype.h>
#include <script/descriptor.h>
+#include <script/script.h>
#include <script/sign.h>
+#include <script/solver.h>
#include <util/bip32.h>
#include <util/strencodings.h>
#include <util/string.h>
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
index 72051493a9..ec7b017720 100644
--- a/src/wallet/scriptpubkeyman.h
+++ b/src/wallet/scriptpubkeyman.h
@@ -5,11 +5,12 @@
#ifndef BITCOIN_WALLET_SCRIPTPUBKEYMAN_H
#define BITCOIN_WALLET_SCRIPTPUBKEYMAN_H
+#include <addresstype.h>
#include <logging.h>
#include <psbt.h>
#include <script/descriptor.h>
+#include <script/script.h>
#include <script/signingprovider.h>
-#include <script/standard.h>
#include <util/error.h>
#include <util/message.h>
#include <util/result.h>
diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp
index a3728223fb..c0ee00e097 100644
--- a/src/wallet/spend.cpp
+++ b/src/wallet/spend.cpp
@@ -11,7 +11,9 @@
#include <numeric>
#include <policy/policy.h>
#include <primitives/transaction.h>
+#include <script/script.h>
#include <script/signingprovider.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 fd0718fbb9..95d5c1b9ce 100644
--- a/src/wallet/test/ismine_tests.cpp
+++ b/src/wallet/test/ismine_tests.cpp
@@ -6,7 +6,8 @@
#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>
#include <wallet/wallet.h>
diff --git a/src/wallet/test/scriptpubkeyman_tests.cpp b/src/wallet/test/scriptpubkeyman_tests.cpp
index d4997c418a..15bff04221 100644
--- a/src/wallet/test/scriptpubkeyman_tests.cpp
+++ b/src/wallet/test/scriptpubkeyman_tests.cpp
@@ -3,8 +3,8 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <key.h>
-#include <script/standard.h>
#include <test/util/setup_common.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 6e87d1cb49..b5ea275bcb 100644
--- a/src/wallet/test/spend_tests.cpp
+++ b/src/wallet/test/spend_tests.cpp
@@ -4,6 +4,7 @@
#include <consensus/amount.h>
#include <policy/fees.h>
+#include <script/solver.h>
#include <validation.h>
#include <wallet/coincontrol.h>
#include <wallet/spend.h>
diff --git a/src/wallet/test/util.h b/src/wallet/test/util.h
index 2a1fe639de..8bd238648f 100644
--- a/src/wallet/test/util.h
+++ b/src/wallet/test/util.h
@@ -5,7 +5,7 @@
#ifndef BITCOIN_WALLET_TEST_UTIL_H
#define BITCOIN_WALLET_TEST_UTIL_H
-#include <script/standard.h>
+#include <addresstype.h>
#include <wallet/db.h>
#include <memory>
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index dd914f159c..4abf6441d2 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -9,11 +9,13 @@
#include <stdint.h>
#include <vector>
+#include <addresstype.h>
#include <interfaces/chain.h>
#include <key_io.h>
#include <node/blockstorage.h>
#include <policy/policy.h>
#include <rpc/server.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 7df4a2afa2..52f6e8e243 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -26,6 +26,7 @@
#include <script/descriptor.h>
#include <script/script.h>
#include <script/signingprovider.h>
+#include <script/solver.h>
#include <support/cleanse.h>
#include <txmempool.h>
#include <util/bip32.h>
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 3d88fab74e..e2be6a206a 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -6,6 +6,7 @@
#ifndef BITCOIN_WALLET_WALLET_H
#define BITCOIN_WALLET_WALLET_H
+#include <addresstype.h>
#include <consensus/amount.h>
#include <interfaces/chain.h>
#include <interfaces/handler.h>
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 8212c04464..92eca46f05 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -8,6 +8,7 @@
#include <common/system.h>
#include <key_io.h>
#include <protocol.h>
+#include <script/script.h>
#include <serialize.h>
#include <sync.h>
#include <util/bip32.h>
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 8f7c2f030c..dad0b18a78 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -7,7 +7,6 @@
#define BITCOIN_WALLET_WALLETDB_H
#include <script/sign.h>
-#include <script/standard.h>
#include <wallet/db.h>
#include <wallet/walletutil.h>
#include <key.h>
generated by cgit v1.2.3 (git 2.26.2) at 2024-09-18 02:01:42 +0000