Merge branch 'develop' into release

hyle-team · Jul 11, 2024 · 59ea013 · 59ea013
2 parents 337e882 + 45eeb8c
commit 59ea013
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/daemon/daemon_commands_handler.h b/src/daemon/daemon_commands_handler.h
@@ -817,6 +817,7 @@ class daemon_commands_handler
                                        "     amount cmt * 1/8: " << aop.amount_commitment << ENDL <<
                                        "     hidden supply:    " << (aop.descriptor.hidden_supply ? "yes" : "no") << ENDL <<
         "";
+      ++idx;
     }
 
     LOG_PRINT_L0(ss.str());

diff --git a/src/version.h.in b/src/version.h.in
@@ -8,6 +8,6 @@
 #define PROJECT_REVISION "0"
 #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION
 
-#define PROJECT_VERSION_BUILD_NO 332
+#define PROJECT_VERSION_BUILD_NO 333
 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO)
 #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]"
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
@@ -5420,7 +5420,7 @@ void wallet2::burn_asset(const crypto::public_key asset_id, uint64_t amount_to_b
   asset_descriptor_operation asset_burn_info = AUTO_VAL_INIT(asset_burn_info);
   asset_burn_info.descriptor = rsp.asset_descriptor;
 
-  CHECK_AND_ASSERT_THROW_MES(asset_burn_info.descriptor.current_supply > amount_to_burn, "Wrong amount to burn (current_supply" << asset_burn_info.descriptor.current_supply << " is less then " << amount_to_burn << ")");
+  CHECK_AND_ASSERT_THROW_MES(asset_burn_info.descriptor.current_supply >= amount_to_burn, "Wrong amount to burn (current_supply" << asset_burn_info.descriptor.current_supply << " is less then " << amount_to_burn << ")");
 
   currency::tx_destination_entry dst_to_burn = AUTO_VAL_INIT(dst_to_burn);
   dst_to_burn.amount = amount_to_burn;
-Original file line number
+Diff line change
@@ Expand Up / @@ -817,6 +817,7 @@ class daemon_commands_handler @@
                                            "     amount cmt * 1/8: " << aop.amount_commitment << ENDL <<
                                            "     hidden supply:    " << (aop.descriptor.hidden_supply ? "yes" : "no") << ENDL <<
             "";
+          ++idx;
         }
         LOG_PRINT_L0(ss.str());
@@ Expand Down @@