aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet.h
diff options
context:
space:
mode:
authorAnthony Towns <aj@erisian.com.au>2018-07-09 18:15:50 +1000
committerAnthony Towns <aj@erisian.com.au>2018-07-09 22:21:15 +1000
commit9a44db2e46af2b73e0dbaa929244161b18c15162 (patch)
treecaff85feeaa6af556416c94af0dd10e33c19a954 /src/wallet/wallet.h
parent88a15ebc8d317a6fd4851adb344ff944d497284c (diff)
downloadbitcoin-9a44db2e46af2b73e0dbaa929244161b18c15162.tar.xz
Add outputtype module
Moves OutputType into its own module
Diffstat (limited to 'src/wallet/wallet.h')
-rw-r--r--src/wallet/wallet.h27
1 files changed, 1 insertions, 26 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index b829394847..f065abd9b1 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -7,6 +7,7 @@
#define BITCOIN_WALLET_WALLET_H
#include <amount.h>
+#include <outputtype.h>
#include <policy/feerate.h>
#include <streams.h>
#include <tinyformat.h>
@@ -93,20 +94,6 @@ enum WalletFeature
FEATURE_LATEST = FEATURE_PRE_SPLIT_KEYPOOL
};
-enum class OutputType {
- LEGACY,
- P2SH_SEGWIT,
- BECH32,
-
- /**
- * Special output type for change outputs only. Automatically choose type
- * based on address type setting and the types other of non-change outputs
- * (see -changetype option documentation and implementation in
- * CWallet::TransactionChangeType for details).
- */
- CHANGE_AUTO,
-};
-
//! Default for -addresstype
constexpr OutputType DEFAULT_ADDRESS_TYPE{OutputType::P2SH_SEGWIT};
@@ -1266,18 +1253,6 @@ public:
}
};
-bool ParseOutputType(const std::string& str, OutputType& output_type);
-const std::string& FormatOutputType(OutputType type);
-
-/**
- * Get a destination of the requested type (if possible) to the specified key.
- * The caller must make sure LearnRelatedScripts has been called beforehand.
- */
-CTxDestination GetDestinationForKey(const CPubKey& key, OutputType);
-
-/** Get all destinations (potentially) supported by the wallet for the given key. */
-std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey& key);
-
/** RAII object to check and reserve a wallet rescan */
class WalletRescanReserver
{