aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/api/wallet_manager.h
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-01-08 16:36:46 -0800
committerRiccardo Spagni <ric@spagni.net>2017-01-08 16:36:46 -0800
commit1736b7ef6b47cd82a47b61d19d9ffbb38ed02877 (patch)
tree379d2104ce45e9c5aa7239c31f0f1e6b7c375776 /src/wallet/api/wallet_manager.h
parentMerge pull request #1499 (diff)
parentwallet2_api: some new APIs to access daemon state (diff)
downloadmonero-1736b7ef6b47cd82a47b61d19d9ffbb38ed02877.tar.xz
Merge pull request #1500
c0a0fcaf wallet2_api: some new APIs to access daemon state (moneromooo-monero)
Diffstat (limited to 'src/wallet/api/wallet_manager.h')
-rw-r--r--src/wallet/api/wallet_manager.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/wallet/api/wallet_manager.h b/src/wallet/api/wallet_manager.h
index 214afc3fa..01752f69b 100644
--- a/src/wallet/api/wallet_manager.h
+++ b/src/wallet/api/wallet_manager.h
@@ -46,12 +46,14 @@ public:
std::vector<std::string> findWallets(const std::string &path);
std::string errorString() const;
void setDaemonAddress(const std::string &address);
- bool connected(uint32_t *version) const;
+ bool connected(uint32_t *version = NULL) const;
bool checkPayment(const std::string &address, const std::string &txid, const std::string &txkey, const std::string &daemon_address, uint64_t &received, uint64_t &height, std::string &error) const;
uint64_t blockchainHeight() const;
uint64_t blockchainTargetHeight() const;
uint64_t networkDifficulty() const;
double miningHashRate() const;
+ void hardForkInfo(uint8_t &version, uint64_t &earliest_height) const;
+ uint64_t blockTarget() const;
std::string resolveOpenAlias(const std::string &address, bool &dnssec_valid) const;
private: