mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-20 13:37:28 +02:00
Merge 01dc38bd01 into merged_master (Bitcoin PR bitcoin/bitcoin#30406)
This commit is contained in:
commit
f810342eeb
58 changed files with 91 additions and 86 deletions
|
|
@ -350,7 +350,7 @@ public:
|
|||
return false;
|
||||
}
|
||||
|
||||
virtual ~BaseSignatureChecker() {}
|
||||
virtual ~BaseSignatureChecker() = default;
|
||||
};
|
||||
|
||||
/** Enum to specify what *TransactionSignatureChecker's behavior should be
|
||||
|
|
|
|||
|
|
@ -305,7 +305,7 @@ struct InputStack {
|
|||
//! Data elements.
|
||||
std::vector<std::vector<unsigned char>> stack;
|
||||
//! Construct an empty stack (valid).
|
||||
InputStack() {}
|
||||
InputStack() = default;
|
||||
//! Construct a valid single-element stack (with an element up to 75 bytes).
|
||||
InputStack(std::vector<unsigned char> in) : size(in.size() + 1), stack(Vector(std::move(in))) {}
|
||||
//! Change availability
|
||||
|
|
|
|||
|
|
@ -492,7 +492,7 @@ protected:
|
|||
return *this;
|
||||
}
|
||||
public:
|
||||
CScript() { }
|
||||
CScript() = default;
|
||||
CScript(const_iterator pbegin, const_iterator pend) : CScriptBase(pbegin, pend) { }
|
||||
CScript(std::vector<unsigned char>::const_iterator pbegin, std::vector<unsigned char>::const_iterator pend) : CScriptBase(pbegin, pend) { }
|
||||
CScript(const unsigned char* pbegin, const unsigned char* pend) : CScriptBase(pbegin, pend) { }
|
||||
|
|
@ -652,7 +652,7 @@ struct CScriptWitness
|
|||
std::vector<std::vector<unsigned char> > stack{};
|
||||
|
||||
// Some compilers complain without a default constructor
|
||||
CScriptWitness() { }
|
||||
CScriptWitness() = default;
|
||||
|
||||
bool IsNull() const { return stack.empty(); }
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ struct CMutableTransaction;
|
|||
/** Interface for signature creators. */
|
||||
class BaseSignatureCreator {
|
||||
public:
|
||||
virtual ~BaseSignatureCreator() {}
|
||||
virtual ~BaseSignatureCreator() = default;
|
||||
virtual const BaseSignatureChecker& Checker() const =0;
|
||||
|
||||
/** Create a singular (non-script) signature. */
|
||||
|
|
@ -89,7 +89,7 @@ struct SignatureData {
|
|||
std::map<std::vector<uint8_t>, std::vector<uint8_t>> ripemd160_preimages; ///< Mapping from a RIPEMD160 hash to its preimage provided to solve a Script
|
||||
std::map<std::vector<uint8_t>, std::vector<uint8_t>> hash160_preimages; ///< Mapping from a HASH160 hash to its preimage provided to solve a Script
|
||||
|
||||
SignatureData() {}
|
||||
SignatureData() = default;
|
||||
explicit SignatureData(const CScript& script) : scriptSig(script) {}
|
||||
void MergeSignatureData(SignatureData sigdata);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ std::optional<std::vector<std::tuple<int, std::vector<unsigned char>, int>>> Inf
|
|||
class SigningProvider
|
||||
{
|
||||
public:
|
||||
virtual ~SigningProvider() {}
|
||||
virtual ~SigningProvider() = default;
|
||||
virtual bool GetCScript(const CScriptID &scriptid, CScript& script) const { return false; }
|
||||
virtual bool HaveCScript(const CScriptID &scriptid) const { return false; }
|
||||
virtual bool GetPubKey(const CKeyID &address, CPubKey& pubkey) const { return false; }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue