From cbde471d9182ae3e5c424fa7d7c088c1e04b39a2 Mon Sep 17 00:00:00 2001
From: Some Random Crypto Guy <somerandomcryptoguy@protonmail.com>
Date: Thu, 12 Jun 2025 16:54:08 +0100
Subject: [PATCH] fixed GCC issue with fields initialised in wrong order

---
 src/carrot_impl/format_utils.cpp | 6 +++---
 src/wallet/tx_builder.cpp        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/carrot_impl/format_utils.cpp b/src/carrot_impl/format_utils.cpp
index 52f652ad3..5b8183360 100644
--- a/src/carrot_impl/format_utils.cpp
+++ b/src/carrot_impl/format_utils.cpp
@@ -226,9 +226,9 @@ cryptonote::transaction store_carrot_to_transaction_v1(const std::vector<CarrotE
         //L
         tx.vin.emplace_back(cryptonote::txin_to_key{ //@TODO: can save 2 bytes by using slim input type
             .amount = 0,
+            .asset_type = "SAL1",
             .key_offsets = cryptonote::absolute_output_offsets_to_relative(key_offsets),
-            .k_image = key_images.at(i),
-            .asset_type = "SAL1"
+            .k_image = key_images.at(i)
         });
     }
 
@@ -238,9 +238,9 @@ cryptonote::transaction store_carrot_to_transaction_v1(const std::vector<CarrotE
         //K_o,vt,anchor_enc
         tx.vout.push_back(cryptonote::tx_out{0, cryptonote::txout_to_carrot_v1{
             .key = enote.onetime_address,
+            .asset_type = enote.asset_type,
             .view_tag = enote.view_tag,
             .encrypted_janus_anchor = enote.anchor_enc,
-            .asset_type = enote.asset_type,
         }});
 
         //a_enc
diff --git a/src/wallet/tx_builder.cpp b/src/wallet/tx_builder.cpp
index dae128482..9b6936b05 100644
--- a/src/wallet/tx_builder.cpp
+++ b/src/wallet/tx_builder.cpp
@@ -128,8 +128,8 @@ static bool build_payment_proposals(std::vector<carrot::CarrotPaymentProposalV1>
         normal_payment_proposals_inout.push_back(carrot::CarrotPaymentProposalV1{
             .destination = dest,
             .amount = tx_dest_entry.amount,
+            .asset_type = tx_dest_entry.asset_type,
             .randomness = carrot::gen_janus_anchor(),
-            .asset_type = tx_dest_entry.asset_type
         });
     }