diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-04-02 12:02:49 +0900 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-04-02 12:02:49 +0900 |
| commit | 4ac6bdbb3fad4a848d6198cb66c7600e4f2fba1d (patch) | |
| tree | 29c0805afa191dde110f88ab1ae90109e8f4c651 /src/wallet/wallet2.h | |
| parent | Merge pull request #768 (diff) | |
| parent | wallet: make load_keys check types when loading JSON (diff) | |
| download | monero-4ac6bdbb3fad4a848d6198cb66c7600e4f2fba1d.tar.xz | |
Merge pull request #769
b4eada9 wallet: make load_keys check types when loading JSON (moneromooo-monero)
3e55725 wallet: make the JSON reading type safe (moneromooo-monero)
f8d05f3 common: new json_util.h (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet2.h')
| -rw-r--r-- | src/wallet/wallet2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index fc700a3de..b6466d3f6 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -378,7 +378,7 @@ namespace tools * \param keys_file_name Name of wallet file * \param password Password of wallet file */ - void load_keys(const std::string& keys_file_name, const std::string& password); + bool load_keys(const std::string& keys_file_name, const std::string& password); void process_new_transaction(const cryptonote::transaction& tx, uint64_t height, bool miner_tx); void process_new_blockchain_entry(const cryptonote::block& b, const cryptonote::block_complete_entry& bche, const crypto::hash& bl_id, uint64_t height); void detach_blockchain(uint64_t height); |