diff --git a/src/cryptonote_basic/cryptonote_format_utils.cpp b/src/cryptonote_basic/cryptonote_format_utils.cpp index f06bdf53f..bc447c74c 100644 --- a/src/cryptonote_basic/cryptonote_format_utils.cpp +++ b/src/cryptonote_basic/cryptonote_format_utils.cpp @@ -1256,6 +1256,11 @@ namespace cryptonote << o.target.type().name() << " and " << tx.vout[0].target.type().name() << ", " << "expected matching variant types in transaction id=" << get_transaction_hash(tx)); } + + // Verify the asset type + std::string asset_type; + CHECK_AND_ASSERT_MES(cryptonote::get_output_asset_type(o, asset_type), false, "failed to get asset type"); + CHECK_AND_ASSERT_MES(asset_type == "SAL", false, "wrong output asset type:" << asset_type); } return true; } diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h index d0c8c48dd..194b15ff4 100644 --- a/src/cryptonote_config.h +++ b/src/cryptonote_config.h @@ -216,7 +216,7 @@ #define HF_VERSION_ENABLE_ORACLE 2 #define HF_VERSION_SLIPPAGE_YIELD 2 -#define TESTNET_VERSION 8 +#define TESTNET_VERSION 9 #define STAGENET_VERSION 1 #define PER_KB_FEE_QUANTIZATION_DECIMALS 8 diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 9944ce079..134543fc9 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -3555,7 +3555,7 @@ bool Blockchain::check_tx_outputs(const transaction& tx, tx_verification_context } } - // from v15, require view tags on outputs + // from v15, require view tags and asset types on outputs if (!check_output_types(tx, hf_version)) { tvc.m_invalid_output = true; diff --git a/src/version.cpp.in b/src/version.cpp.in index 38c1d4ee1..c5e1a1d39 100644 --- a/src/version.cpp.in +++ b/src/version.cpp.in @@ -1,5 +1,5 @@ #define DEF_SALVIUM_VERSION_TAG "@VERSIONTAG@" -#define DEF_SALVIUM_VERSION "0.3.2" +#define DEF_SALVIUM_VERSION "0.3.3" #define DEF_MONERO_VERSION_TAG "release" #define DEF_MONERO_VERSION "0.18.3.3" #define DEF_MONERO_RELEASE_NAME "Zero"