diff options
| author | naughtyfox <mail.for.milo@gmail.com> | 2018-07-12 12:55:52 +0300 |
|---|---|---|
| committer | naughtyfox <mail.for.milo@gmail.com> | 2018-10-01 19:16:56 +0300 |
| commit | 9f3963e8235826704b7bc6ef9e3b90613a72e16c (patch) | |
| tree | 303e65a2dcbaf40520e68d11cdcb7efcb41cff57 /src/wallet/wallet2.h | |
| parent | Merge pull request #4423 (diff) | |
| download | monero-9f3963e8235826704b7bc6ef9e3b90613a72e16c.tar.xz | |
Arbitrary M/N multisig schemes:
* support in wallet2
* support in monero-wallet-cli
* support in monero-wallet-rpc
* support in wallet api
* support in monero-gen-trusted-multisig
* unit tests for multisig wallets creation
Diffstat (limited to '')
| -rw-r--r-- | src/wallet/wallet2.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index acbc09c36..440ac709b 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -573,6 +573,14 @@ namespace tools const std::vector<crypto::secret_key> &view_keys, const std::vector<crypto::public_key> &spend_keys, uint32_t threshold); + std::string exchange_multisig_keys(const epee::wipeable_string &password, + const std::vector<std::string> &info); + /*! + * \brief Any but first round of keys exchange + */ + std::string exchange_multisig_keys(const epee::wipeable_string &password, + std::unordered_set<crypto::public_key> pkeys, + std::vector<crypto::public_key> signers); /*! * \brief Finalizes creation of a multisig wallet */ @@ -1245,6 +1253,12 @@ namespace tools bool get_rct_distribution(uint64_t &start_height, std::vector<uint64_t> &distribution); uint64_t get_segregation_fork_height() const; + void unpack_multisig_info(const std::vector<std::string>& info, + std::vector<crypto::public_key> &public_keys, + std::vector<crypto::secret_key> &secret_keys) const; + bool unpack_extra_multisig_info(const std::vector<std::string>& info, + std::vector<crypto::public_key> &signers, + std::unordered_set<crypto::public_key> &pkeys) const; void cache_tx_data(const cryptonote::transaction& tx, const crypto::hash &txid, tx_cache_data &tx_cache_data) const; @@ -1295,6 +1309,9 @@ namespace tools bool m_multisig; /*!< if > 1 spend secret key will not match spend public key */ uint32_t m_multisig_threshold; std::vector<crypto::public_key> m_multisig_signers; + //in case of general M/N multisig wallet we should perform N - M + 1 key exchange rounds and remember how many rounds are passed. + uint32_t m_multisig_rounds_passed; + std::vector<crypto::public_key> m_multisig_derivations; bool m_always_confirm_transfers; bool m_print_ring_members; bool m_store_tx_info; /*!< request txkey to be returned in RPC, and store in the wallet cache file */ |