From 44e54ad555396c2f8534b3f3334887ba6d68abdb Mon Sep 17 00:00:00 2001 From: Some Random Crypto Guy Date: Mon, 18 Aug 2025 15:51:45 +0100 Subject: [PATCH] fixed pre-Carrot sweep_all command; bumped RC version --- src/simplewallet/simplewallet.cpp | 3 ++- src/version.cpp.in | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index c5ff378bd..fae3b7174 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -7705,7 +7705,6 @@ bool simple_wallet::sweep_unmixable(const std::vector &args_) bool simple_wallet::sweep_main(uint32_t account, uint64_t below, bool locked, const std::vector &args_) { CHECK_IF_BACKGROUND_SYNCING("cannot sweep"); - std::string asset_type = (args_.size() > 1) ? args_.back() : (m_wallet->get_current_hard_fork() >= HF_VERSION_SALVIUM_ONE_PROOFS) ? "SAL1" : "SAL"; auto print_usage = [this, account, below]() { if (below) @@ -7838,6 +7837,8 @@ bool simple_wallet::sweep_main(uint32_t account, uint64_t below, bool locked, co } } + std::string asset_type = (m_wallet->get_current_hard_fork() >= HF_VERSION_SALVIUM_ONE_PROOFS) ? "SAL1" : "SAL"; + std::vector extra; bool payment_id_seen = false; if (local_args.size() >= 2) diff --git a/src/version.cpp.in b/src/version.cpp.in index aaf7371d3..5213788f5 100644 --- a/src/version.cpp.in +++ b/src/version.cpp.in @@ -1,5 +1,5 @@ #define DEF_SALVIUM_VERSION_TAG "@VERSIONTAG@" -#define DEF_SALVIUM_VERSION "0.9.9-rc8" +#define DEF_SALVIUM_VERSION "0.9.9-rc9" #define DEF_MONERO_VERSION_TAG "release" #define DEF_MONERO_VERSION "0.18.3.4" #define DEF_MONERO_RELEASE_NAME "One"