mirror of
https://github.com/monero-project/monero.git
synced 2025-08-22 15:49:35 -04:00
Merge pull request #7852
8d94d08
replace 'multisig()' with 'get_multisig_status()' using multisig_account_status and including '.kex_is_done' member (koe)
This commit is contained in:
commit
3a47cdad13
11 changed files with 197 additions and 154 deletions
|
@ -57,6 +57,7 @@
|
|||
#include "common/util.h"
|
||||
#include "crypto/chacha.h"
|
||||
#include "crypto/hash.h"
|
||||
#include "multisig/multisig_account.h"
|
||||
#include "ringct/rctTypes.h"
|
||||
#include "ringct/rctOps.h"
|
||||
#include "checkpoints/checkpoints.h"
|
||||
|
@ -1059,7 +1060,7 @@ private:
|
|||
|
||||
cryptonote::network_type nettype() const { return m_nettype; }
|
||||
bool watch_only() const { return m_watch_only; }
|
||||
bool multisig(bool *ready = NULL, uint32_t *threshold = NULL, uint32_t *total = NULL) const;
|
||||
multisig::multisig_account_status get_multisig_status() const;
|
||||
bool has_multisig_partial_key_images() const;
|
||||
bool has_unknown_key_images() const;
|
||||
bool get_multisig_seed(epee::wipeable_string& seed, const epee::wipeable_string &passphrase = std::string()) const;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue