diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-09-26 23:16:25 +0100 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-12-17 16:12:15 +0000 |
| commit | 66e34e85b1ef3e49ea9290bd69cce2974840fc32 (patch) | |
| tree | 618a7336e476189da36fb62f0df06e0fdb7b3809 /src/wallet/wallet2.h | |
| parent | N-1/N multisig (diff) | |
| download | monero-66e34e85b1ef3e49ea9290bd69cce2974840fc32.tar.xz | |
add multisig core test and factor multisig building blocks
Diffstat (limited to 'src/wallet/wallet2.h')
| -rw-r--r-- | src/wallet/wallet2.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 5f973fef5..8abc42ff3 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -477,6 +477,10 @@ namespace tools /*! * \brief Finalizes creation of a multisig wallet */ + bool finalize_multisig(const epee::wipeable_string &password, const std::vector<std::string> &info); + /*! + * \brief Finalizes creation of a multisig wallet + */ bool finalize_multisig(const epee::wipeable_string &password, std::unordered_set<crypto::public_key> pkeys, std::vector<crypto::public_key> signers); /*! * Get a packaged multisig information string @@ -642,7 +646,7 @@ namespace tools bool load_multisig_tx_from_file(const std::string &filename, multisig_tx_set &exported_txs, std::function<bool(const multisig_tx_set&)> accept_func = NULL); bool sign_multisig_tx_from_file(const std::string &filename, std::vector<crypto::hash> &txids, std::function<bool(const multisig_tx_set&)> accept_func); bool sign_multisig_tx(multisig_tx_set &exported_txs, std::vector<crypto::hash> &txids); - bool sign_multisig_tx_from_file(multisig_tx_set &exported_txs, const std::string &filename, std::vector<crypto::hash> &txids); + bool sign_multisig_tx_to_file(multisig_tx_set &exported_txs, const std::string &filename, std::vector<crypto::hash> &txids); std::vector<pending_tx> create_unmixable_sweep_transactions(bool trusted_daemon); bool check_connection(uint32_t *version = NULL, uint32_t timeout = 200000); void get_transfers(wallet2::transfer_container& incoming_transfers) const; |