aboutsummaryrefslogtreecommitdiff
path: root/src/simplewallet/simplewallet.h
diff options
context:
space:
mode:
authorJollyMort <jm-uduq3axu@unseeni.net>2017-07-29 01:41:24 +0200
committerJollyMort <jm-uduq3axu@unseeni.net>2017-07-29 02:36:21 +0200
commit40fc9d7b68ad454355af1fae6c2c13e72bd0c662 (patch)
tree37abe7f9ec3fb0607aa7ed2cd840ce77dd9b58dd /src/simplewallet/simplewallet.h
parentMerge pull request #2159 (diff)
downloadmonero-40fc9d7b68ad454355af1fae6c2c13e72bd0c662.tar.xz
Add option to join multisig wallet pieces together
Asks user for all the data required to merge secret keys from multisig wallets into one master wallet, which then gets full control of the multisig wallet. The resulting wallet will be the same as any other regular wallet.
Diffstat (limited to '')
-rw-r--r--src/simplewallet/simplewallet.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h
index e04352295..b73c6a941 100644
--- a/src/simplewallet/simplewallet.h
+++ b/src/simplewallet/simplewallet.h
@@ -264,6 +264,7 @@ namespace cryptonote
std::string m_generate_new;
std::string m_generate_from_view_key;
std::string m_generate_from_keys;
+ std::string m_generate_from_multisig_keys;
std::string m_generate_from_json;
std::string m_import_path;