Skip to content

Commit b777e84

Browse files
committed
legacy spkm: Move CanProvide to LegacyDataSPKM
This function will be needed in migration
1 parent b1ab927 commit b777e84

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/wallet/scriptpubkeyman.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ std::unique_ptr<SigningProvider> LegacyDataSPKM::GetSolvingProvider(const CScrip
591591
return std::make_unique<LegacySigningProvider>(*this);
592592
}
593593

594-
bool LegacyScriptPubKeyMan::CanProvide(const CScript& script, SignatureData& sigdata)
594+
bool LegacyDataSPKM::CanProvide(const CScript& script, SignatureData& sigdata)
595595
{
596596
IsMineResult ismine = IsMineInner(*this, script, IsMineSigVersion::TOP, /* recurse_scripthash= */ false);
597597
if (ismine == IsMineResult::SPENDABLE || ismine == IsMineResult::WATCH_ONLY) {

src/wallet/scriptpubkeyman.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ class LegacyDataSPKM : public ScriptPubKeyMan, public FillableSigningProvider
318318
uint256 GetID() const override { return uint256::ONE; }
319319
// TODO: Remove IsMine when deleting LegacyScriptPubKeyMan
320320
isminetype IsMine(const CScript& script) const override;
321+
bool CanProvide(const CScript& script, SignatureData& sigdata) override;
321322

322323
// FillableSigningProvider overrides
323324
bool HaveKey(const CKeyID &address) const override;
@@ -486,8 +487,6 @@ class LegacyScriptPubKeyMan : public LegacyDataSPKM
486487

487488
bool CanGetAddresses(bool internal = false) const override;
488489

489-
bool CanProvide(const CScript& script, SignatureData& sigdata) override;
490-
491490
bool SignTransaction(CMutableTransaction& tx, const std::map<COutPoint, Coin>& coins, int sighash, std::map<int, bilingual_str>& input_errors) const override;
492491
SigningResult SignMessage(const std::string& message, const PKHash& pkhash, std::string& str_sig) const override;
493492
std::optional<common::PSBTError> FillPSBT(PartiallySignedTransaction& psbt, const PrecomputedTransactionData& txdata, int sighash_type = SIGHASH_DEFAULT, bool sign = true, bool bip32derivs = false, int* n_signed = nullptr, bool finalize = true) const override;

0 commit comments

Comments
 (0)