diff --git a/src/crypto/crypto.cpp b/src/crypto/crypto.cpp
index 9b9dc64..bf4f2a5 100644
--- a/src/crypto/crypto.cpp
+++ b/src/crypto/crypto.cpp
@@ -543,7 +543,7 @@ namespace crypto {
       ge_frombytes_vartime(&D_p3, &dbg_D);
       mx25519_pubkey D_x25519;
       ge_p3_to_x25519(D_x25519.data, &D_p3);
-      assert((uint8_t *)D.data == D_x25519.data);
+      assert(memcmp(D.data, D_x25519.data, 32) == 0);
     }
 #endif
 
@@ -886,4 +886,4 @@ POP_WARNINGS
       ki.data[31] ^= 0x80;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 19a1593..99f6cd4 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -13332,10 +13332,23 @@ std::string wallet2::get_tx_proof(const cryptonote::transaction &tx, const crypt
 
   // check if this address actually received any funds
   crypto::key_derivation derivation;
-  THROW_WALLET_EXCEPTION_IF(!crypto::generate_key_derivation(shared_secret[0], rct::rct2sk(rct::I), derivation), error::wallet_internal_error, "Failed to generate key derivation");
   std::vector<crypto::key_derivation> additional_derivations(num_sigs - 1);
-  for (size_t i = 1; i < num_sigs; ++i)
-    THROW_WALLET_EXCEPTION_IF(!crypto::generate_key_derivation(shared_secret[i], rct::rct2sk(rct::I), additional_derivations[i - 1]), error::wallet_internal_error, "Failed to generate key derivation");
+  
+  if (address.m_is_carrot)
+  {
+    // For carrot addresses, shared_secret is already in x25519 format and can be used directly as derivation
+    memcpy(&derivation, &shared_secret[0], sizeof(crypto::key_derivation));
+    for (size_t i = 1; i < num_sigs; ++i)
+      memcpy(&additional_derivations[i - 1], &shared_secret[i], sizeof(crypto::key_derivation));
+  }
+  else
+  {
+    // For regular addresses, generate key derivation from shared secret
+    THROW_WALLET_EXCEPTION_IF(!crypto::generate_key_derivation(shared_secret[0], rct::rct2sk(rct::I), derivation), error::wallet_internal_error, "Failed to generate key derivation");
+    for (size_t i = 1; i < num_sigs; ++i)
+      THROW_WALLET_EXCEPTION_IF(!crypto::generate_key_derivation(shared_secret[i], rct::rct2sk(rct::I), additional_derivations[i - 1]), error::wallet_internal_error, "Failed to generate key derivation");
+  }
+  
   uint64_t received;
   check_tx_key_helper(tx, derivation, additional_derivations, address, received);
   // SRCG: if this returns 0 received, but it's an AUDIT TX, then that is EXPECTED
@@ -13486,15 +13499,28 @@ bool wallet2::check_tx_proof(const cryptonote::transaction &tx, const cryptonote
 
   if (std::any_of(good_signature.begin(), good_signature.end(), [](int i) { return i > 0; }))
   {
-    // obtain key derivation by multiplying scalar 1 to the shared secret
+    // obtain key derivation by multiplying scalar 1 to the shared secret (or use directly for carrot)
     crypto::key_derivation derivation;
-    if (good_signature[0])
-      THROW_WALLET_EXCEPTION_IF(!crypto::generate_key_derivation(shared_secret[0], rct::rct2sk(rct::I), derivation), error::wallet_internal_error, "Failed to generate key derivation");
-
     std::vector<crypto::key_derivation> additional_derivations(num_sigs - 1);
-    for (size_t i = 1; i < num_sigs; ++i)
-      if (good_signature[i])
-        THROW_WALLET_EXCEPTION_IF(!crypto::generate_key_derivation(shared_secret[i], rct::rct2sk(rct::I), additional_derivations[i - 1]), error::wallet_internal_error, "Failed to generate key derivation");
+    
+    if (address.m_is_carrot)
+    {
+      // For carrot addresses, shared_secret is already in x25519 format and can be used directly as derivation
+      if (good_signature[0])
+        memcpy(&derivation, &shared_secret[0], sizeof(crypto::key_derivation));
+      for (size_t i = 1; i < num_sigs; ++i)
+        if (good_signature[i])
+          memcpy(&additional_derivations[i - 1], &shared_secret[i], sizeof(crypto::key_derivation));
+    }
+    else
+    {
+      // For regular addresses, generate key derivation from shared secret
+      if (good_signature[0])
+        THROW_WALLET_EXCEPTION_IF(!crypto::generate_key_derivation(shared_secret[0], rct::rct2sk(rct::I), derivation), error::wallet_internal_error, "Failed to generate key derivation");
+      for (size_t i = 1; i < num_sigs; ++i)
+        if (good_signature[i])
+          THROW_WALLET_EXCEPTION_IF(!crypto::generate_key_derivation(shared_secret[i], rct::rct2sk(rct::I), additional_derivations[i - 1]), error::wallet_internal_error, "Failed to generate key derivation");
+    }
 
     check_tx_key_helper(tx, derivation, additional_derivations, address, received);
     return true;