diff --git a/src/currency_core/currency_format_utils.cpp b/src/currency_core/currency_format_utils.cpp index 569082bf..9f149027 100644 --- a/src/currency_core/currency_format_utils.cpp +++ b/src/currency_core/currency_format_utils.cpp @@ -1827,8 +1827,6 @@ namespace currency CHECK_AND_ASSERT_MES(r, false, "Failed to derive_public_key_from_tx_and_account_pub_key()"); //also assign this asset id to destinations asset_id_for_destinations = get_asset_id_from_descriptor(pado->descriptor); - //TODO: temporary - summary_inputs_money += pado->descriptor.current_supply; } } @@ -1973,6 +1971,8 @@ namespace currency } CHECK_AND_ASSERT_MES(pado, false, "pado is null ??"); pado->descriptor.current_supply = amount_of_assets; + //TODO: temporary + summary_inputs_money += amount_of_assets; } diff --git a/tests/core_tests/chaingen_main.cpp b/tests/core_tests/chaingen_main.cpp index 12a0de86..e20bceea 100644 --- a/tests/core_tests/chaingen_main.cpp +++ b/tests/core_tests/chaingen_main.cpp @@ -1060,6 +1060,8 @@ int main(int argc, char* argv[]) GENERATE_AND_PLAY(isolate_auditable_and_proof); GENERATE_AND_PLAY(zarcanum_basic_test); + GENERATE_AND_PLAY(multiassets_basic_test); + // GENERATE_AND_PLAY(gen_block_reward); diff --git a/tests/core_tests/chaingen_tests_list.h b/tests/core_tests/chaingen_tests_list.h index c4eac1be..cf3fbb7d 100644 --- a/tests/core_tests/chaingen_tests_list.h +++ b/tests/core_tests/chaingen_tests_list.h @@ -41,3 +41,4 @@ #include "atomic_tests.h" #include "isolate_auditable_and_proof.h" #include "zarcanum_test.h" +#include "multiassets_test.h" diff --git a/tests/core_tests/multiassets_test.cpp b/tests/core_tests/multiassets_test.cpp new file mode 100644 index 00000000..edecf951 --- /dev/null +++ b/tests/core_tests/multiassets_test.cpp @@ -0,0 +1,110 @@ +// Copyright (c) 2014-2018 Zano Project +// Copyright (c) 2014-2018 The Louisdor Project +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include "chaingen.h" +#include "multiassets_test.h" +#include "wallet_test_core_proxy.h" + +#include "random_helper.h" + +#define AMOUNT_TO_TRANSFER_MULTIASSETS_BASIC (TESTS_DEFAULT_FEE) + +#define AMOUNT_ASSETS_TO_TRANSFER_MULTIASSETS_BASIC 500000000000000000 + + + +using namespace currency; + +//------------------------------------------------------------------------------ +multiassets_basic_test::multiassets_basic_test() +{ + REGISTER_CALLBACK_METHOD(multiassets_basic_test, configure_core); + REGISTER_CALLBACK_METHOD(multiassets_basic_test, c1); + + m_hardforks.set_hardfork_height(1, 1); + m_hardforks.set_hardfork_height(2, 1); + m_hardforks.set_hardfork_height(3, 1); + m_hardforks.set_hardfork_height(4, 1); +} + +bool multiassets_basic_test::generate(std::vector& events) const +{ + m_accounts.resize(MINER_ACC_IDX+1); + account_base& miner_acc = m_accounts[MINER_ACC_IDX]; + miner_acc.generate(); + + MAKE_GENESIS_BLOCK(events, blk_0, miner_acc, test_core_time::get_time()); + DO_CALLBACK(events, "configure_core"); // default configure_core callback will initialize core runtime config with m_hardforks + set_hard_fork_heights_to_generator(generator); + //TODO: Need to make sure REWIND_BLOCKS_N and other coretests codebase are capable of following hardfork4 rules + //in this test hardfork4 moment moved to runtime section + REWIND_BLOCKS_N(events, blk_0r, blk_0, miner_acc, CURRENCY_MINED_MONEY_UNLOCK_WINDOW + 3); + + DO_CALLBACK(events, "c1"); + + return true; +} + +bool multiassets_basic_test::c1(currency::core& c, size_t ev_index, const std::vector& events) +{ + bool r = false; + std::shared_ptr miner_wlt = init_playtime_test_wallet(events, c, MINER_ACC_IDX); + account_base alice_acc; + alice_acc.generate(); + std::shared_ptr alice_wlt = init_playtime_test_wallet(events, c, alice_acc); + + miner_wlt->refresh(); + + asset_descriptor_base adb = AUTO_VAL_INIT(adb); + adb.total_max_supply = 1000000000000000000; //1M coins + adb.full_name = "Test coins"; + adb.ticker = "TCT"; + adb.decimal_point = 12; + + std::vector destinations(2); + destinations[0].addr.push_back(miner_wlt->get_account().get_public_address()); + destinations[0].amount = AMOUNT_ASSETS_TO_TRANSFER_MULTIASSETS_BASIC; + destinations[0].asset_id = currency::ffff_hash; + destinations[1].addr.push_back(alice_wlt->get_account().get_public_address()); + destinations[1].amount = AMOUNT_ASSETS_TO_TRANSFER_MULTIASSETS_BASIC; + destinations[1].asset_id = currency::ffff_hash; + + currency::transaction tx = AUTO_VAL_INIT(tx); + crypto::hash asset_id = currency::null_hash; + miner_wlt->publish_new_asset(adb, destinations, tx, asset_id); + + //pass over hardfork + r = mine_next_pow_blocks_in_playtime(miner_wlt->get_account().get_public_address(), c, CURRENCY_MINED_MONEY_UNLOCK_WINDOW); + CHECK_AND_ASSERT_MES(r, false, "mine_next_pow_blocks_in_playtime failed"); + + + miner_wlt->refresh(); + alice_wlt->refresh(); + uint64_t mined = 0; + std::unordered_map balances; + miner_wlt->balance(balances, mined); + + auto it_asset = balances.find(asset_id); + auto it_native = balances.find(currency::null_hash); + + + CHECK_AND_ASSERT_MES(it_asset != balances.end() && it_native != balances.end(), false, "Failed to find needed asset in result balances"); + CHECK_AND_ASSERT_MES(it_asset->second.total == AMOUNT_ASSETS_TO_TRANSFER_MULTIASSETS_BASIC, false, "Failed to find needed asset in result balances"); + CHECK_AND_ASSERT_MES(it_native->second.total == 0, false, "Failed to find needed asset in result balances"); + + + balances.clear(); + alice_wlt->balance(balances, mined); + + it_asset = balances.find(asset_id); + it_native = balances.find(currency::null_hash); + + CHECK_AND_ASSERT_MES(it_asset != balances.end() && it_native != balances.end(), false, "Failed to find needed asset in result balances"); + CHECK_AND_ASSERT_MES(it_asset->second.total == AMOUNT_ASSETS_TO_TRANSFER_MULTIASSETS_BASIC, false, "Failed to find needed asset in result balances"); + CHECK_AND_ASSERT_MES(it_native->second.total == 0, false, "Failed to find needed asset in result balances"); + + + return true; +} diff --git a/tests/core_tests/multiassets_test.h b/tests/core_tests/multiassets_test.h new file mode 100644 index 00000000..46889ef8 --- /dev/null +++ b/tests/core_tests/multiassets_test.h @@ -0,0 +1,16 @@ +// Copyright (c) 2014-2018 Zano Project +// Copyright (c) 2014-2018 The Louisdor Project +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#pragma once +#include "chaingen.h" +#include "wallet_tests_basic.h" + + +struct multiassets_basic_test : public wallet_test +{ + multiassets_basic_test(); + bool generate(std::vector& events) const; + bool c1(currency::core& c, size_t ev_index, const std::vector& events); +}; diff --git a/tests/unit_tests/proxy_to_coretests.cpp b/tests/unit_tests/proxy_to_coretests.cpp new file mode 100644 index 00000000..219fab7a --- /dev/null +++ b/tests/unit_tests/proxy_to_coretests.cpp @@ -0,0 +1,12 @@ +// Copyright (c) 2012-2022 The Zano project +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include "gtest/gtest.h" + +#include "common/util.h" +#include "p2p/net_peerlist.h" +#include "core_tests/chaingen.h" + + +//TODO \ No newline at end of file