From 79207743b84a404041e60ce7492c2cf3944eb93c Mon Sep 17 00:00:00 2001 From: Jaquee Date: Fri, 4 Aug 2017 23:28:38 +0200 Subject: walletAPI: init() lightwallet and SSL support --- src/wallet/api/wallet.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/wallet/api/wallet.h') diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h index 020c5e46a..30af9550e 100644 --- a/src/wallet/api/wallet.h +++ b/src/wallet/api/wallet.h @@ -83,7 +83,7 @@ public: bool store(const std::string &path); std::string filename() const; std::string keysFilename() const; - bool init(const std::string &daemon_address, uint64_t upper_transaction_size_limit = 0, const std::string &daemon_username = "", const std::string &daemon_password = ""); + bool init(const std::string &daemon_address, uint64_t upper_transaction_size_limit = 0, const std::string &daemon_username = "", const std::string &daemon_password = "", bool use_ssl = false, bool lightWallet = false); bool connectToDaemon(); ConnectionStatus connected() const; void setTrustedDaemon(bool arg); @@ -151,7 +151,7 @@ private: bool daemonSynced() const; void stopRefresh(); bool isNewWallet() const; - bool doInit(const std::string &daemon_address, uint64_t upper_transaction_size_limit); + bool doInit(const std::string &daemon_address, uint64_t upper_transaction_size_limit = 0, bool ssl = false); private: friend class PendingTransactionImpl; -- cgit v1.2.3 From fc9229342dfe56655415c190b84cec267d041540 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Fri, 4 Aug 2017 23:31:33 +0200 Subject: walletAPI: add lightwallet login() and importWalletRequest() --- src/wallet/api/wallet.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/wallet/api/wallet.h') diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h index 30af9550e..ecb218ea0 100644 --- a/src/wallet/api/wallet.h +++ b/src/wallet/api/wallet.h @@ -143,6 +143,8 @@ public: virtual void pauseRefresh(); virtual bool parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &amount, std::string &tx_description, std::string &recipient_name, std::vector &unknown_parameters, std::string &error); virtual std::string getDefaultDataDir() const; + virtual bool lightWalletLogin(bool &isNewWallet) const; + virtual bool lightWalletImportWalletRequest(std::string &payment_id, uint64_t &fee, bool &new_request, bool &request_fulfilled, std::string &payment_address, std::string &status); private: void clearStatus() const; -- cgit v1.2.3