aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/wallet/api')
-rw-r--r--src/wallet/api/wallet.cpp80
-rw-r--r--src/wallet/api/wallet.h2
-rw-r--r--src/wallet/api/wallet2_api.h8
3 files changed, 4 insertions, 86 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index 38184fb51..3f192b11b 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -209,38 +209,6 @@ struct Wallet2CallbackImpl : public tools::i_wallet2_callback
// TODO;
}
- // Light wallet callbacks
- virtual void on_lw_new_block(uint64_t height)
- {
- if (m_listener) {
- m_listener->newBlock(height);
- }
- }
-
- virtual void on_lw_money_received(uint64_t height, const crypto::hash &txid, uint64_t amount)
- {
- if (m_listener) {
- std::string tx_hash = epee::string_tools::pod_to_hex(txid);
- m_listener->moneyReceived(tx_hash, amount);
- }
- }
-
- virtual void on_lw_unconfirmed_money_received(uint64_t height, const crypto::hash &txid, uint64_t amount)
- {
- if (m_listener) {
- std::string tx_hash = epee::string_tools::pod_to_hex(txid);
- m_listener->unconfirmedMoneyReceived(tx_hash, amount);
- }
- }
-
- virtual void on_lw_money_spent(uint64_t height, const crypto::hash &txid, uint64_t amount)
- {
- if (m_listener) {
- std::string tx_hash = epee::string_tools::pod_to_hex(txid);
- m_listener->moneySpent(tx_hash, amount);
- }
- }
-
virtual void on_device_button_request(uint64_t code)
{
if (m_listener) {
@@ -950,42 +918,11 @@ string WalletImpl::keysFilename() const
bool WalletImpl::init(const std::string &daemon_address, uint64_t upper_transaction_size_limit, const std::string &daemon_username, const std::string &daemon_password, bool use_ssl, bool lightWallet, const std::string &proxy_address)
{
clearStatus();
- m_wallet->set_light_wallet(lightWallet);
if(daemon_username != "")
m_daemon_login.emplace(daemon_username, daemon_password);
return doInit(daemon_address, proxy_address, upper_transaction_size_limit, use_ssl);
}
-bool WalletImpl::lightWalletLogin(bool &isNewWallet) const
-{
- return m_wallet->light_wallet_login(isNewWallet);
-}
-
-bool WalletImpl::lightWalletImportWalletRequest(std::string &payment_id, uint64_t &fee, bool &new_request, bool &request_fulfilled, std::string &payment_address, std::string &status)
-{
- try
- {
- tools::COMMAND_RPC_IMPORT_WALLET_REQUEST::response response;
- if(!m_wallet->light_wallet_import_wallet_request(response)){
- setStatusError(tr("Failed to send import wallet request"));
- return false;
- }
- fee = response.import_fee;
- payment_id = response.payment_id;
- new_request = response.new_request;
- request_fulfilled = response.request_fulfilled;
- payment_address = response.payment_address;
- status = response.status;
- }
- catch (const std::exception &e)
- {
- LOG_ERROR("Error sending import wallet request: " << e.what());
- setStatusError(e.what());
- return false;
- }
- return true;
-}
-
void WalletImpl::setRefreshFromBlockHeight(uint64_t refresh_from_block_height)
{
m_wallet->set_refresh_from_block_height(refresh_from_block_height);
@@ -1018,9 +955,6 @@ uint64_t WalletImpl::unlockedBalance(uint32_t accountIndex) const
uint64_t WalletImpl::blockChainHeight() const
{
- if(m_wallet->light_wallet()) {
- return m_wallet->get_light_wallet_scanned_block_height();
- }
return m_wallet->get_blockchain_current_height();
}
uint64_t WalletImpl::approximateBlockChainHeight() const
@@ -1035,9 +969,6 @@ uint64_t WalletImpl::estimateBlockChainHeight() const
uint64_t WalletImpl::daemonBlockChainHeight() const
{
- if(m_wallet->light_wallet()) {
- return m_wallet->get_light_wallet_scanned_block_height();
- }
if (!m_is_connected)
return 0;
std::string err;
@@ -1054,9 +985,6 @@ uint64_t WalletImpl::daemonBlockChainHeight() const
uint64_t WalletImpl::daemonBlockChainTargetHeight() const
{
- if(m_wallet->light_wallet()) {
- return m_wallet->get_light_wallet_blockchain_height();
- }
if (!m_is_connected)
return 0;
std::string err;
@@ -2177,13 +2105,12 @@ Wallet::ConnectionStatus WalletImpl::connected() const
m_is_connected = m_wallet->check_connection(&version, NULL, DEFAULT_CONNECTION_TIMEOUT_MILLIS, &wallet_is_outdated, &daemon_is_outdated);
if (!m_is_connected)
{
- if (!m_wallet->light_wallet() && (wallet_is_outdated || daemon_is_outdated))
+ if (wallet_is_outdated || daemon_is_outdated)
return Wallet::ConnectionStatus_WrongVersion;
else
return Wallet::ConnectionStatus_Disconnected;
}
- // Version check is not implemented in light wallets nodes/wallets
- if (!m_wallet->light_wallet() && (version >> 16) != CORE_RPC_VERSION_MAJOR)
+ if ((version >> 16) != CORE_RPC_VERSION_MAJOR)
return Wallet::ConnectionStatus_WrongVersion;
return Wallet::ConnectionStatus_Connected;
}
@@ -2277,7 +2204,7 @@ void WalletImpl::doRefresh()
LOG_PRINT_L3(__FUNCTION__ << ": doRefresh, rescan = "<<rescan);
// Syncing daemon and refreshing wallet simultaneously is very resource intensive.
// Disable refresh if wallet is disconnected or daemon isn't synced.
- if (m_wallet->light_wallet() || daemonSynced()) {
+ if (daemonSynced()) {
if(rescan)
m_wallet->rescan_blockchain(false);
m_wallet->refresh(trustedDaemon());
@@ -2368,7 +2295,6 @@ bool WalletImpl::doInit(const string &daemon_address, const std::string &proxy_a
// in case new wallet, this will force fast-refresh (pulling hashes instead of blocks)
// If daemon isn't synced a calculated block height will be used instead
- //TODO: Handle light wallet scenario where block height = 0.
if (isNewWallet() && daemonSynced()) {
LOG_PRINT_L2(__FUNCTION__ << ":New Wallet - fast refresh until " << daemonBlockChainHeight());
m_wallet->set_refresh_from_block_height(daemonBlockChainHeight());
diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h
index c44d05968..d1bf4f759 100644
--- a/src/wallet/api/wallet.h
+++ b/src/wallet/api/wallet.h
@@ -208,8 +208,6 @@ public:
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<std::string> &unknown_parameters, std::string &error) override;
virtual std::string make_uri(const std::string &address, const std::string &payment_id, uint64_t amount, const std::string &tx_description, const std::string &recipient_name, std::string &error) const override;
virtual std::string getDefaultDataDir() const override;
- virtual bool lightWalletLogin(bool &isNewWallet) const override;
- virtual bool lightWalletImportWalletRequest(std::string &payment_id, uint64_t &fee, bool &new_request, bool &request_fulfilled, std::string &payment_address, std::string &status) override;
virtual bool blackballOutputs(const std::vector<std::string> &outputs, bool add) override;
virtual bool blackballOutput(const std::string &amount, const std::string &offset) override;
virtual bool unblackballOutput(const std::string &amount, const std::string &offset) override;
diff --git a/src/wallet/api/wallet2_api.h b/src/wallet/api/wallet2_api.h
index a363636df..ab3d9732e 100644
--- a/src/wallet/api/wallet2_api.h
+++ b/src/wallet/api/wallet2_api.h
@@ -541,7 +541,7 @@ struct Wallet
* \param upper_transaction_size_limit
* \param daemon_username
* \param daemon_password
- * \param lightWallet - start wallet in light mode, connect to a openmonero compatible server.
+ * \param lightWallet - deprecated
* \param proxy_address - set proxy address, empty string to disable
* \return - true on success
*/
@@ -1065,12 +1065,6 @@ struct Wallet
//! secondary key reuse mitigation
virtual void keyReuseMitigation2(bool mitigation) = 0;
- //! Light wallet authenticate and login
- virtual bool lightWalletLogin(bool &isNewWallet) const = 0;
-
- //! Initiates a light wallet import wallet request
- virtual bool lightWalletImportWalletRequest(std::string &payment_id, uint64_t &fee, bool &new_request, bool &request_fulfilled, std::string &payment_address, std::string &status) = 0;
-
//! locks/unlocks the keys file; returns true on success
virtual bool lockKeysFile() = 0;
virtual bool unlockKeysFile() = 0;
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-24 06:07:42 +0000