From 6fb167308c35b00ec7ea1beb73a0942e5fb4f566 Mon Sep 17 00:00:00 2001
From: Some Random Crypto Guy <somerandomcryptoguy@protonmail.com>
Date: Mon, 23 Mar 2026 10:16:26 +0000
Subject: [PATCH] fixed small asset_type issue for sweep; added HF11 block
 height

---
 README.md                         | 10 +++++-----
 src/hardforks/hardforks.cpp       |  3 +++
 src/simplewallet/simplewallet.cpp | 27 +++++++++++++++++++++++----
 src/version.cpp.in                |  2 +-
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index ea788f6bd..a9eae06a0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Salvium One v1.0.7
+# Salvium One v1.1.0
 
 Copyright (c) 2023-2025, Salvium
 Portions Copyright (c) 2014-2023, The Monero Project
@@ -172,7 +172,7 @@ invokes cmake commands as needed.
 
     ```bash
     cd salvium
-    git checkout v1.0.7
+    git checkout v1.1.0
     make
     ```
 
@@ -251,7 +251,7 @@ Tested on a Raspberry Pi Zero with a clean install of minimal Raspbian Stretch (
     ```bash
     git clone https://github.com/salvium/salvium
     cd salvium
-    git checkout v1.0.7
+    git checkout v1.1.0
     ```
 
 * Build:
@@ -370,10 +370,10 @@ application.
     cd salvium
     ```
 
-* If you would like a specific [version/tag](https://github.com/salvium/salvium/tags), do a git checkout for that version. eg. 'v1.0.7'. If you don't care about the version and just want binaries from master, skip this step:
+* If you would like a specific [version/tag](https://github.com/salvium/salvium/tags), do a git checkout for that version. eg. 'v1.1.0'. If you don't care about the version and just want binaries from master, skip this step:
 
     ```bash
-    git checkout v1.0.7
+    git checkout v1.1.0
     ```
 
 * If you are on a 64-bit system, run:
diff --git a/src/hardforks/hardforks.cpp b/src/hardforks/hardforks.cpp
index 9fa111fa4..787f8f53b 100644
--- a/src/hardforks/hardforks.cpp
+++ b/src/hardforks/hardforks.cpp
@@ -61,6 +61,9 @@ const hardfork_t mainnet_hard_forks[] = {
 
   // version 10 Carrot - including treasury mint - starts from block 334750, which is on or around the 13th of October, 2025. Fork time finalised on 2025-09-29. No fork voting occurs for the v10 fork.
   {10, 334750, 0, 1759142500 },
+
+  // version 11 Two Milestone 1 - starts from block 465000, which is on or around the 13th of April, 2026. Fork time finalised on 2026-03-20. No fork voting occurs for the v11 fork.
+  {11, 465000, 0, 1759142500 },
 };
 const size_t num_mainnet_hard_forks = sizeof(mainnet_hard_forks) / sizeof(mainnet_hard_forks[0]);
 const uint64_t mainnet_hard_fork_version_1_till = ((uint64_t)-1);
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 28fa69def..e562d7a9e 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -8072,11 +8072,30 @@ 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";
   if (local_args.size() >= 2)
   {
-    std::string asset_type_check = local_args.back();
-    if (cryptonote::is_valid_asset_type(asset_type_check)) {
-      asset_type = asset_type_check;
-      local_args.pop_back();
+    std::string strLastArg = local_args.back();
+    if (strLastArg == "SAL" or strLastArg == "SAL1") {
+      asset_type = strLastArg;
+    } else {
+      std::transform(strLastArg.begin() + 3, strLastArg.end(), strLastArg.begin() + 3, ::toupper);
+      std::vector<std::string> asset_types = m_wallet->list_asset_types();
+
+      // check if the last argument is a known asset type
+      bool found = false;
+      for (const auto& asset : asset_types) {
+        if (strLastArg == asset) {
+          asset_type = strLastArg;
+          found = true;
+          break;
+        }
+      }
+    
+      if (!found) {
+        fail_msg_writer() << tr("Unknown asset type: ") << strLastArg;
+        return true;
+      }
     }
+
+    local_args.pop_back();
   }
   
   cryptonote::address_parse_info info;
diff --git a/src/version.cpp.in b/src/version.cpp.in
index bc9d74c6c..f50e0f282 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 "1.1.0-rc6"
+#define DEF_SALVIUM_VERSION "1.1.0"
 #define DEF_MONERO_VERSION_TAG "release"
 #define DEF_MONERO_VERSION "0.18.4.0"
 #define DEF_MONERO_RELEASE_NAME "One"