minor

2 files changed, 9 insertions, 39 deletions

diff --git a/contrib/depends/Makefile b/contrib/depends/Makefile
index ab410f4..34dc333 100644
--- a/contrib/depends/Makefile
+++ b/contrib/depends/Makefile
@@ -4,7 +4,7 @@ HOST ?=
 
 BOOST_VERSION ?= 1_90_0
 PACKAGES = native/protobuf,native/cmake,native/python@3.14,native/git,native/_,native/make,native/cmake-toolchain,icu4c,boost@$(BOOST_VERSION),zeromq,unbound,sodium,openssl,libiconv,zlib,protobuf
-SIMPLYBS_HASH = bcd7bd15e61909fda1a84a5af337c86d9ce14b37
+SIMPLYBS_HASH = 2091e0883265ad13cc9506ec1e7c0fb3c09ca646
 
 all: simplybs $(if $(HOST),sbs-build-$(HOST),)
 	@if [ -z "$(HOST)" ]; then \
diff --git a/patches/monero/0021-trezor-import-export-sign-functions.patch b/patches/monero/0021-trezor-import-export-sign-functions.patch
index 6129263..80a10f5 100644
--- a/patches/monero/0021-trezor-import-export-sign-functions.patch
+++ b/patches/monero/0021-trezor-import-export-sign-functions.patch
@@ -1,22 +1,22 @@
-From 8a56c766201269bd06319b30bd7400fdb4610a27 Mon Sep 17 00:00:00 2001
+From f3f83fa435bf5ce6b54bd724eb934ce27007e8db Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Fri, 8 May 2026 21:40:35 -0400
 Subject: [PATCH] trezor import/export/sign functions
 
 ---
- src/device_trezor/trezor/protocol.cpp   | 250 ++++++++++++++++++++++++
+ src/device_trezor/trezor/protocol.cpp   | 220 ++++++++++++++++++++++++
  src/device_trezor/trezor/protocol.hpp   |   8 +
- src/wallet/api/unsigned_transaction.cpp |  60 ++++++
+ src/wallet/api/unsigned_transaction.cpp |  60 +++++++
  src/wallet/api/unsigned_transaction.h   |   1 +
- src/wallet/api/wallet.cpp               |  31 ++-
+ src/wallet/api/wallet.cpp               |  31 +++-
  src/wallet/api/wallet.h                 |   2 +
  src/wallet/api/wallet2_api.h            |  14 ++
- src/wallet/wallet2.cpp                  | 144 ++++++++++++++
+ src/wallet/wallet2.cpp                  | 144 ++++++++++++++++
  src/wallet/wallet2.h                    |   3 +-
- 9 files changed, 511 insertions(+), 2 deletions(-)
+ 9 files changed, 481 insertions(+), 2 deletions(-)
 
 diff --git a/src/device_trezor/trezor/protocol.cpp b/src/device_trezor/trezor/protocol.cpp
-index 0e59a16ba..4f146e3f1 100644
+index 0e59a16ba..afd1498d2 100644
 --- a/src/device_trezor/trezor/protocol.cpp
 +++ b/src/device_trezor/trezor/protocol.cpp
 @@ -29,12 +29,17 @@
@@ -48,7 +48,7 @@ index 0e59a16ba..4f146e3f1 100644
    void Signer::set_tx_input(MoneroTransactionSourceEntry * dst, size_t idx, bool need_ring_keys, bool need_ring_indices){
      const cryptonote::tx_source_entry & src = cur_tx().sources[idx];
      const tools::wallet2::transfer_details & transfer = get_source_transfer(idx);
-@@ -1096,6 +1105,247 @@ namespace tx {
+@@ -1096,6 +1105,217 @@ namespace tx {
      memwipe(plaintext.get(), keys_len);
    }
  
@@ -145,36 +145,6 @@ index 0e59a16ba..4f146e3f1 100644
 +    }
 +    if (e.has_subaddr_minor())
 +      o.AddMember("subaddr_minor", e.subaddr_minor(), a);
-+    if (e.has_multisig_klrki())
-+    {
-+      const auto &ms = e.multisig_klrki();
-+      const bool any = (ms.has_k() && !ms.k().empty()) || (ms.has_l() && !ms.l().empty()) || (ms.has_r() && !ms.r().empty()) || (ms.has_ki() && !ms.ki().empty());
-+      if (any)
-+      {
-+        rapidjson::Value mso(rapidjson::kObjectType);
-+        if (ms.has_k())
-+        {
-+          const std::string h = bin_to_hex_lower(ms.k());
-+          mso.AddMember("K", rapidjson::Value(h.c_str(), static_cast<rapidjson::SizeType>(h.size()), a), a);
-+        }
-+        if (ms.has_l())
-+        {
-+          const std::string h = bin_to_hex_lower(ms.l());
-+          mso.AddMember("L", rapidjson::Value(h.c_str(), static_cast<rapidjson::SizeType>(h.size()), a), a);
-+        }
-+        if (ms.has_r())
-+        {
-+          const std::string h = bin_to_hex_lower(ms.r());
-+          mso.AddMember("R", rapidjson::Value(h.c_str(), static_cast<rapidjson::SizeType>(h.size()), a), a);
-+        }
-+        if (ms.has_ki())
-+        {
-+          const std::string h = bin_to_hex_lower(ms.ki());
-+          mso.AddMember("ki", rapidjson::Value(h.c_str(), static_cast<rapidjson::SizeType>(h.size()), a), a);
-+        }
-+        o.AddMember("multisig_klrki", mso, a);
-+      }
-+    }
 +    return o;
 +  }
 +