From f2f21a49b19bea552130e7577e4f51502af42d04 Mon Sep 17 00:00:00 2001 From: akildemir Date: Tue, 20 May 2025 14:47:13 +0300 Subject: [PATCH] make pre-carrot construction & carrot receiving work. --- src/carrot_impl/format_utils.cpp | 3 +++ src/wallet/scanning_tools.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/carrot_impl/format_utils.cpp b/src/carrot_impl/format_utils.cpp index fe62fed7f..6ad1ae257 100644 --- a/src/carrot_impl/format_utils.cpp +++ b/src/carrot_impl/format_utils.cpp @@ -289,6 +289,9 @@ bool try_load_carrot_enote_from_transaction_v1(const cryptonote::transaction &tx //K_o enote_out.onetime_address = c->key; + // asset_type + enote_out.asset_type = c->asset_type; + //vt enote_out.view_tag = c->view_tag; diff --git a/src/wallet/scanning_tools.cpp b/src/wallet/scanning_tools.cpp index ec4c52815..169b6ee8b 100644 --- a/src/wallet/scanning_tools.cpp +++ b/src/wallet/scanning_tools.cpp @@ -109,7 +109,7 @@ static bool try_load_pre_carrot_enote(const bool is_coinbase, enote_out.local_output_index = local_output_index; - enote_out.encrypted_amount = tx.version == 2 && !is_coinbase; + enote_out.encrypted_amount = tx.version >= 2 && !is_coinbase; enote_out.short_amount = rct::is_rct_short_amount(tx.rct_signatures.type); if (enote_out.encrypted_amount)