mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 20:42:59 +01:00
f812de4e66
d2774c09cfcc6c5c967d40bb094eabc8c0bdb6bf Clear any input_errors for an input after it is signed (Andrew Chow)
dc174881ad8498a6905ba282a48077bc5c8037a7 Replace GetSigningProvider with GetSolvingProvider (Andrew Chow)
6a9c429084b40356aa36aa67992da35f61c2f6a2 Move direct calls to MessageSign into new SignMessage functions in CWallet and ScriptPubKeyMan (Andrew Chow)
82a30fade70a2a95c2bbeac4aa06dafda600479d Move key and script filling and signing from CWallet::FillPSBT to ScriptPubKeyMan::FillPSBT (Andrew Chow)
3d70dd99f9f74eef70b19ff6f6f850adc0d5ef8f Move FillPSBT to be a member of CWallet (Andrew Chow)
a4af324d15c1ee43c2abd11a304ae18c7ee82eb0 Use CWallet::SignTransaction in CreateTransaction and signrawtransactionwithwallet (Andrew Chow)
f37de927442d3f024926a66c436d59e391c8696a Implement CWallet::SignTransaction using ScriptPubKeyMan::SignTransaction (Andrew Chow)
d999dd588cab0ff479bc7bee8c9fc33880265ec6 Add SignTransaction function to ScriptPubKeyMan and LegacyScriptPubKeyMan (Andrew Chow)
2c52b59d0a44a86d94fee4e437978d822862c542 Refactor rawtransaction's SignTransaction into generic SignTransaction function (Andrew Chow)
Pull request description:
Following #17261, the way to sign transactions, PSBTs, and messages was to use `GetSigningProvider()` and get a `SigningProvider` containing the private keys. However this may not be feasible for future `ScriptPubKeyMan`s, such as for hardware wallets. Instead of exporting a `SigningProvider` containing private keys, we need to pass these things into the `ScriptPubKeyMan` (via `CWallet`) so that they can do whatever is needed internally to sign them. This is largely a refactor as the logic of processing transactions, PSBTs, and messages for is moved into `LegacyScriptPubKeyMan` and `CWallet` instead of being handled by the caller (e.g. `signrawtransaction`).
To help with this, I've refactored the 3(!) implementations of a `SignTransaction()` function into one generic one. This function will be called by `signrawtransactionwithkey` and `LegacyScriptPubKeyMan::SignTransaction()`. `CWallet::CreateTransaction()` is changed to call `CWallet::SignTransaction()` which in turn, calls `LegacyScriptPubKeyMan::SignTransaction()`. Other `ScriptPubKeyMan`s may implement `SignTransaction()` differently.
`FillPSBT()` is moved to be a member function of `CWallet` and the `psbtwallet.cpp/h` files removed. It is further split so that `CWallet` handles filling the UTXOs while the `ScriptPubKeyMan` handles adding keys, derivation paths, scripts, and signatures. In the end `LegacyScriptPubKeyMan::FillPSBT` still calls `SignPSBTInput`, but the `SigningProvider` is internal to `LegacyScriptPubKeyMan`. Other `ScriptPubKeyMan`s may do something different.
A new `SignMessage()` function is added to both `CWallet` and `ScriptPubKeyMan`. Instead of having the caller (i.e. `signmessage` or the sign message dialog) get the private key, hash the message, and sign, `ScriptPubKeyMan` will now handle that (`CWallet` passes through to the `ScriptPubKeyMan`s as it does for many functions). This signing code is thus consolidated into `LegacyScriptPubKeyMan::SignMessage()`, though other `ScriptPubKeyMan`s may implement it differently. Additionally, a `SigningError` enum is introduced for the different errors that we expect to see from `SignMessage()`.
Lastly, `GetSigningProvider()` is renamed to `GetPublicSigningProvider()`. It will now only provide pubkeys, key origins, and scripts. `LegacySigningProvider` has it's `GetKey` and `HaveKey` functions changed to only return false. Future implementations should return `HidingSigningProvider`s where private keys are hidden.
Other things like `dumpprivkey` and `dumpwallet` are not changed because they directly need and access the `LegacyScriptPubKeyMan` so are not relevant to future changes.
ACKs for top commit:
instagibbs:
reACK d2774c09cf
Sjors:
re-utACK d2774c09cfcc6c5c967d40bb094eabc8c0bdb6bf
meshcollider:
re-utACK d2774c09cfcc6c5c967d40bb094eabc8c0bdb6bf
Tree-SHA512: 89c83e7e7e9315e283fae145a2264648a9d7f7ace8f3281cb3f44f0b013c988d67ba4fa9726e50c643c0ed921bdd269adaec984840d11acf4a681f3e8a582cc1
77 lines
2.2 KiB
C++
77 lines
2.2 KiB
C++
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
// Copyright (c) 2009-2020 The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#ifndef BITCOIN_UTIL_MESSAGE_H
|
|
#define BITCOIN_UTIL_MESSAGE_H
|
|
|
|
#include <key.h> // For CKey
|
|
#include <uint256.h>
|
|
|
|
#include <string>
|
|
|
|
extern const std::string MESSAGE_MAGIC;
|
|
|
|
/** The result of a signed message verification.
|
|
* Message verification takes as an input:
|
|
* - address (with whose private key the message is supposed to have been signed)
|
|
* - signature
|
|
* - message
|
|
*/
|
|
enum class MessageVerificationResult {
|
|
//! The provided address is invalid.
|
|
ERR_INVALID_ADDRESS,
|
|
|
|
//! The provided address is valid but does not refer to a public key.
|
|
ERR_ADDRESS_NO_KEY,
|
|
|
|
//! The provided signature couldn't be parsed (maybe invalid base64).
|
|
ERR_MALFORMED_SIGNATURE,
|
|
|
|
//! A public key could not be recovered from the provided signature and message.
|
|
ERR_PUBKEY_NOT_RECOVERED,
|
|
|
|
//! The message was not signed with the private key of the provided address.
|
|
ERR_NOT_SIGNED,
|
|
|
|
//! The message verification was successful.
|
|
OK
|
|
};
|
|
|
|
enum class SigningResult {
|
|
OK, //!< No error
|
|
PRIVATE_KEY_NOT_AVAILABLE,
|
|
SIGNING_FAILED,
|
|
};
|
|
|
|
/** Verify a signed message.
|
|
* @param[in] address Signer's bitcoin address, it must refer to a public key.
|
|
* @param[in] signature The signature in base64 format.
|
|
* @param[in] message The message that was signed.
|
|
* @return result code */
|
|
MessageVerificationResult MessageVerify(
|
|
const std::string& address,
|
|
const std::string& signature,
|
|
const std::string& message);
|
|
|
|
/** Sign a message.
|
|
* @param[in] privkey Private key to sign with.
|
|
* @param[in] message The message to sign.
|
|
* @param[out] signature Signature, base64 encoded, only set if true is returned.
|
|
* @return true if signing was successful. */
|
|
bool MessageSign(
|
|
const CKey& privkey,
|
|
const std::string& message,
|
|
std::string& signature);
|
|
|
|
/**
|
|
* Hashes a message for signing and verification in a manner that prevents
|
|
* inadvertently signing a transaction.
|
|
*/
|
|
uint256 MessageHash(const std::string& message);
|
|
|
|
std::string SigningResultString(const SigningResult res);
|
|
|
|
#endif // BITCOIN_UTIL_MESSAGE_H
|