From d09b6137006b11b30f500e9637f055582d7be548 Mon Sep 17 00:00:00 2001 From: woodser Date: Fri, 5 Jul 2019 15:35:34 -0400 Subject: [PATCH] update constructor to create wallet from keys --- src/wallet/MoneroWallet.cpp | 4 ++-- src/wallet/MoneroWallet.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wallet/MoneroWallet.cpp b/src/wallet/MoneroWallet.cpp index 1c2abc6..7632f86 100644 --- a/src/wallet/MoneroWallet.cpp +++ b/src/wallet/MoneroWallet.cpp @@ -460,7 +460,7 @@ namespace monero { cout << "Mnemonic: " << string(fetchedMnemonic.data(), fetchedMnemonic.size()) << endl; } - MoneroWallet::MoneroWallet(const string& path, const string& password, const string& address, const string& viewKey, const string& spendKey, const MoneroNetworkType networkType, const string& daemonConnection, uint64_t restoreHeight, const string& language) { + MoneroWallet::MoneroWallet(const string& path, const string& password, const string& address, const string& viewKey, const string& spendKey, const MoneroNetworkType networkType, const MoneroRpcConnection& daemonConnection, uint64_t restoreHeight, const string& language) { cout << "MoneroWallet(7)" << endl; throw runtime_error("Not implemented"); } @@ -1367,7 +1367,7 @@ namespace monero { } // return tx - if (txs.size() != 1) throw runtime_error("Expected 1 transaction but was " + txs.size()); + if (txs.size() != 1) throw runtime_error("Expected 1 transaction but was " + boost::lexical_cast(txs.size())); return txs[0]; } diff --git a/src/wallet/MoneroWallet.h b/src/wallet/MoneroWallet.h index c958aaa..83645a5 100644 --- a/src/wallet/MoneroWallet.h +++ b/src/wallet/MoneroWallet.h @@ -138,7 +138,7 @@ namespace monero { * @param restoreHeight is the block height to restore (i.e. scan the chain) from (default = 0) * @param language is the wallet and mnemonic's language (default = "English") */ - MoneroWallet(const string& path, const string& password, const string& address, const string& viewKey, const string& spendKey, const MoneroNetworkType networkType, const string& daemonConnection, uint64_t restoreHeight, const string& language); + MoneroWallet(const string& path, const string& password, const string& address, const string& viewKey, const string& spendKey, const MoneroNetworkType networkType, const MoneroRpcConnection& daemonConnection, uint64_t restoreHeight, const string& language); /** * Construct a wallet by opening a wallet file on disk.