From cf83295348064bae2476cb9fb2e682b387f83a82 Mon Sep 17 00:00:00 2001 From: Lee *!* Clagett Date: Fri, 16 May 2025 22:48:29 -0400 Subject: [PATCH] Fix git/merge issues --- src/backend.cpp | 29 ----------------------------- src/backend.h | 3 --- src/error.cpp | 3 --- src/error.h | 3 --- src/lwsf_config.h | 3 --- 5 files changed, 41 deletions(-) diff --git a/src/backend.cpp b/src/backend.cpp index 9e72568..1f33772 100644 --- a/src/backend.cpp +++ b/src/backend.cpp @@ -283,10 +283,7 @@ namespace lwsf { namespace internal { namespace backend wire::optional_field("attributes", wire::trusted_array(std::ref(self.attributes))), WIRE_FIELD(scan_height), WIRE_FIELD(restore_height), -<<<<<<< Updated upstream -======= WIRE_FIELD(requested_start), ->>>>>>> Stashed changes WIRE_FIELD_DEFAULTED(lookahead, config::default_lookahead), WIRE_FIELD_DEFAULTED(type, Monero::MAINNET), WIRE_FIELD(view), @@ -507,10 +504,6 @@ namespace lwsf { namespace internal { namespace backend if (!rescanning) { iter->second->height = std::nullopt; -<<<<<<< Updated upstream - iter->second->timestamp = std::nullopt; -======= ->>>>>>> Stashed changes iter->second->failed = false; } } @@ -796,10 +789,7 @@ namespace lwsf { namespace internal { namespace backend primary{}, refresh_error(), lookahead_error(default_subaddr_state), -<<<<<<< Updated upstream -======= import_error(), ->>>>>>> Stashed changes last_sync(), blockchain_height(0), per_byte_fee(0), @@ -888,17 +878,12 @@ namespace lwsf { namespace internal { namespace backend boost::unique_lock lock{sync}; { passed_login = false; -<<<<<<< Updated upstream - server_lookahead = 0; - lookahead_error = {error::subaddr_disabled}; -======= blockchain_height = 0; per_byte_fee = 0; fee_mask = 0; server_lookahead = 0; import_error = {}; lookahead_error = error::subaddr_disabled; ->>>>>>> Stashed changes const rpc::login_request login{ primary.address, primary.view.sec, true, primary.generated_locally }; @@ -998,10 +983,6 @@ namespace lwsf { namespace internal { namespace backend if (failed_login) { lock.lock(); -<<<<<<< Updated upstream - last_sync = now; -======= ->>>>>>> Stashed changes return refresh_error = failed_login; } } @@ -1261,13 +1242,9 @@ namespace lwsf { namespace internal { namespace backend { boost::unique_lock lock{sync}; -<<<<<<< Updated upstream - if (primary.requested_start < height) -======= if (primary.restore_height <= height) return import_error = {}; if (import_error && import_error == error::import_pending) ->>>>>>> Stashed changes return import_error; if (!passed_login) @@ -1300,11 +1277,8 @@ namespace lwsf { namespace internal { namespace backend case 0: return import_error = error::import_pending; case 1: -<<<<<<< Updated upstream -======= if (import->import_fee.value_or(rpc::uint64_string(0)) == rpc::uint64_string(0)) return import_error = error::import_pending; ->>>>>>> Stashed changes return import_error = error::import_invalid; case 2: break; @@ -1339,8 +1313,6 @@ namespace lwsf { namespace internal { namespace backend primary.addressbook[i] = address_book_entry{std::move(*import->payment_address), std::move(payment_id), std::move(description)}; return import_error = {}; -<<<<<<< Updated upstream -======= } expect> wallet::get_decoys(const rpc::get_random_outs_request& req) @@ -1349,7 +1321,6 @@ namespace lwsf { namespace internal { namespace backend if (!resp) return resp.error(); return {std::move(resp->amount_outs)}; ->>>>>>> Stashed changes } std::error_code wallet::send_tx(epee::byte_slice tx_bytes) diff --git a/src/backend.h b/src/backend.h index 19bd0fc..06e64c0 100644 --- a/src/backend.h +++ b/src/backend.h @@ -250,13 +250,10 @@ namespace lwsf { namespace internal { namespace backend cryptonote::account_public_address get_spend_account(const rpc::address_meta& index) const; std::string get_spend_address(const rpc::address_meta& index) const; -<<<<<<< Updated upstream -======= // End GROUP // `sync` mutex IS acquired for this group (until end). Do not hold this mutex ->>>>>>> Stashed changes //! Serialize `this` wallet to msgpack. Locks contents. expect to_bytes() const; diff --git a/src/error.cpp b/src/error.cpp index 885d3a5..d259089 100644 --- a/src/error.cpp +++ b/src/error.cpp @@ -55,8 +55,6 @@ namespace lwsf return "server has subaddresses disabled"; case error::subaddr_local: return "lwsf (local) limits on subaddresses too small"; -<<<<<<< Updated upstream -======= case error::tx_critical: return "Tx construction had critical error"; case error::tx_decoys: @@ -77,7 +75,6 @@ namespace lwsf return "Tx construction sweep with multiple destinations"; case error::tx_two_pid: return "Tx construction given two payment ids"; ->>>>>>> Stashed changes case error::unexpected_userinfo: return "Unexpected user+pass field in URL"; diff --git a/src/error.h b/src/error.h index 4e94748..ae8a4a9 100644 --- a/src/error.h +++ b/src/error.h @@ -45,8 +45,6 @@ namespace lwsf subaddr_ahead, //!< Server limits on subaddresses affects lookahead subaddr_disabled, //!< Server has subaddresses disabled subaddr_local, //!< Local limits on subaddresses too small -<<<<<<< Updated upstream -======= tx_critical, //!< Tx creation had critical error tx_decoys, //!< Tx creation failed due to invalid decoy response tx_extra, //!< Tx creation failed to generate tx extra @@ -57,7 +55,6 @@ namespace lwsf tx_size_mismatch, //!< Tx creation mismatch on amounts and destinations tx_two_pid, //!< Tx creation given two payment ids tx_sweep, //!< Tx creation requested sweep to multiple dests ->>>>>>> Stashed changes unexpected_userinfo,//!< Unexpected user+pass provided }; diff --git a/src/lwsf_config.h b/src/lwsf_config.h index e56928e..6ee0bfd 100644 --- a/src/lwsf_config.h +++ b/src/lwsf_config.h @@ -40,10 +40,7 @@ namespace lwsf { namespace config std::uint32_t minor = 0; }; -<<<<<<< Updated upstream -======= constexpr const std::size_t bulletproof_version = 4; ->>>>>>> Stashed changes constexpr const std::chrono::seconds connect_timeout{5}; constexpr const std::chrono::seconds daemon_status_cache{10}; constexpr const std::string_view default_account_name{"Untitled account"};