diff --git a/tests/core_tests/chaingen_main.cpp b/tests/core_tests/chaingen_main.cpp index 68ff8c68..77323a26 100644 --- a/tests/core_tests/chaingen_main.cpp +++ b/tests/core_tests/chaingen_main.cpp @@ -987,7 +987,7 @@ int main(int argc, char* argv[]) GENERATE_AND_PLAY(gen_uint_overflow_2); - // Hardfok1 tests + // Hardfok 1 tests GENERATE_AND_PLAY(before_hard_fork_1_cumulative_difficulty); GENERATE_AND_PLAY(inthe_middle_hard_fork_1_cumulative_difficulty); GENERATE_AND_PLAY(after_hard_fork_1_cumulative_difficulty); @@ -998,10 +998,13 @@ int main(int argc, char* argv[]) GENERATE_AND_PLAY(hard_fork_1_chain_switch_pow_only); GENERATE_AND_PLAY(hard_fork_1_checkpoint_basic_test); GENERATE_AND_PLAY(hard_fork_1_pos_locked_height_vs_time); - //GENERATE_AND_PLAY(gen_block_reward); */ - + + // Hardfork 2 tests + GENERATE_AND_PLAY(hard_fork_2_tx_payer_in_wallet); + // GENERATE_AND_PLAY(gen_block_reward); + // END OF TESTS */ size_t failed_postponed_tests_count = 0; uint64_t total_time = 0; diff --git a/tests/core_tests/hard_fork_2.cpp b/tests/core_tests/hard_fork_2.cpp index 2a1ab65a..665d19b7 100644 --- a/tests/core_tests/hard_fork_2.cpp +++ b/tests/core_tests/hard_fork_2.cpp @@ -4,6 +4,7 @@ #include "chaingen.h" #include "hard_fork_2.h" +#include "../../src/wallet/wallet_rpc_server.h" //#include "pos_block_builder.h" //#include "tx_builder.h" //#include "random_helper.h" @@ -46,6 +47,9 @@ bool hard_fork_2_tx_payer_in_wallet::generate(std::vector& eve account_base& alice_acc = m_accounts[ALICE_ACC_IDX]; alice_acc.generate(); MAKE_GENESIS_BLOCK(events, blk_0, miner_acc, test_core_time::get_time()); + generator.set_hardfork_height(1, m_hardfork_height); + generator.set_hardfork_height(2, m_hardfork_height); + DO_CALLBACK(events, "configure_core"); REWIND_BLOCKS_N(events, blk_0r, blk_0, miner_acc, CURRENCY_MINED_MONEY_UNLOCK_WINDOW + 3); DO_CALLBACK(events, "c1"); @@ -61,13 +65,97 @@ bool hard_fork_2_tx_payer_in_wallet::c1(currency::core& c, size_t ev_index, cons bool r = false, stub_bool = false; CHECK_AND_ASSERT_MES(c.get_pool_transactions_count() == 0, false, "Incorrect txs count in the pool: " << c.get_pool_transactions_count()); std::shared_ptr miner_wlt = init_playtime_test_wallet(events, c, m_accounts[MINER_ACC_IDX]); + std::shared_ptr alice_wlt = init_playtime_test_wallet(events, c, m_accounts[ALICE_ACC_IDX]); - CHECK_AND_ASSERT_MES(refresh_wallet_and_check_balance("", "Miner", miner_wlt, COIN * (CURRENCY_MINED_MONEY_UNLOCK_WINDOW + 3), true), false, ""); + miner_wlt->refresh(); - /*r = mine_next_pow_block_in_playtime(m_accounts[MINER_ACC_IDX].get_public_address(), c); + // wallet RPC server + tools::wallet_rpc_server miner_wlt_rpc(*miner_wlt); + epee::json_rpc::error je; + tools::wallet_rpc_server::connection_context ctx; + + tools::wallet_public::COMMAND_RPC_TRANSFER::request req = AUTO_VAL_INIT(req); + tools::wallet_public::transfer_destination td{ MK_TEST_COINS(1), m_accounts[ALICE_ACC_IDX].get_public_address_str() }; + req.destinations.push_back(td); + req.fee = TESTS_DEFAULT_FEE; + req.push_payer = true; + + tools::wallet_public::COMMAND_RPC_TRANSFER::response res = AUTO_VAL_INIT(res); + + r = miner_wlt_rpc.on_transfer(req, res, je, ctx); + CHECK_AND_ASSERT_MES(r, false, "on_transfer failed"); + + CHECK_AND_ASSERT_MES(c.get_pool_transactions_count() == 1, false, "Incorrect txs count in the pool: " << c.get_pool_transactions_count()); + + crypto::hash tx_hash = null_hash; + CHECK_AND_ASSERT_MES(epee::string_tools::hex_to_pod(res.tx_hash, tx_hash), false, ""); + + transaction tx = AUTO_VAL_INIT(tx); + CHECK_AND_ASSERT_MES(c.get_transaction(tx_hash, tx), false, ""); + + r = have_type_in_variant_container(tx.extra); + CHECK_AND_ASSERT_MES(r, false, "tx_payer_old is not found in extra"); + + r = !have_type_in_variant_container(tx.extra); + CHECK_AND_ASSERT_MES(r, false, "tx_payer is found in extra"); + + r = mine_next_pow_block_in_playtime(m_accounts[MINER_ACC_IDX].get_public_address(), c); CHECK_AND_ASSERT_MES(r, false, "mine_next_pow_block_in_playtime failed"); CHECK_AND_ASSERT_MES(c.get_pool_transactions_count() == 0, false, "Incorrect txs count in the pool: " << c.get_pool_transactions_count()); - */ + + std::shared_ptr l(new wlt_lambda_on_transfer2_wrapper( + [&](const tools::wallet_public::wallet_transfer_info& wti, uint64_t balance, uint64_t unlocked_balance, uint64_t total_mined) -> bool { + CHECK_AND_ASSERT_MES(wti.show_sender, false, "show_sender is false"); + CHECK_AND_ASSERT_MES(wti.remote_addresses.size() == 1, false, "incorrect wti.remote_addresses.size() = " << wti.remote_addresses.size()); + CHECK_AND_ASSERT_MES(wti.remote_addresses.front() == m_accounts[MINER_ACC_IDX].get_public_address_str(), false, "wti.remote_addresses.front is incorrect"); + return true; + } + )); + alice_wlt->callback(l); + + CHECK_AND_ASSERT_MES(refresh_wallet_and_check_balance("", "Alice", alice_wlt, MK_TEST_COINS(1)), false, ""); + + // mine blocks 15, 16, 17 to activate HF2 + r = mine_next_pow_blocks_in_playtime(m_accounts[MINER_ACC_IDX].get_public_address(), c, 3); + CHECK_AND_ASSERT_MES(r, false, "mine_next_pow_blocks_in_playtime failed"); + CHECK_AND_ASSERT_MES(c.get_pool_transactions_count() == 0, false, "Incorrect txs count in the pool: " << c.get_pool_transactions_count()); + + miner_wlt->refresh(); + alice_wlt->refresh(); + + // check again + req.destinations.front().amount = MK_TEST_COINS(2); + r = miner_wlt_rpc.on_transfer(req, res, je, ctx); + CHECK_AND_ASSERT_MES(r, false, "on_transfer failed"); + CHECK_AND_ASSERT_MES(c.get_pool_transactions_count() == 1, false, "Incorrect txs count in the pool: " << c.get_pool_transactions_count()); + + tx_hash = null_hash; + CHECK_AND_ASSERT_MES(epee::string_tools::hex_to_pod(res.tx_hash, tx_hash), false, ""); + CHECK_AND_ASSERT_MES(c.get_transaction(tx_hash, tx), false, ""); + + r = have_type_in_variant_container(tx.extra); + CHECK_AND_ASSERT_MES(r, false, "tx_payer is not found in extra"); + r = !have_type_in_variant_container(tx.extra); + CHECK_AND_ASSERT_MES(r, false, "tx_payer_old is found in extra"); + + r = mine_next_pow_block_in_playtime(m_accounts[MINER_ACC_IDX].get_public_address(), c); + CHECK_AND_ASSERT_MES(r, false, "mine_next_pow_block_in_playtime failed"); + CHECK_AND_ASSERT_MES(c.get_pool_transactions_count() == 0, false, "Incorrect txs count in the pool: " << c.get_pool_transactions_count()); + + std::shared_ptr l2(new wlt_lambda_on_transfer2_wrapper( + [&](const tools::wallet_public::wallet_transfer_info& wti, uint64_t balance, uint64_t unlocked_balance, uint64_t total_mined) -> bool { + CHECK_AND_ASSERT_MES(wti.amount == MK_TEST_COINS(2), false, "incorrect wti.amount = " << print_money_brief(wti.amount)); + CHECK_AND_ASSERT_MES(wti.show_sender, false, "show_sender is false"); + CHECK_AND_ASSERT_MES(wti.remote_addresses.size() == 1, false, "incorrect wti.remote_addresses.size() = " << wti.remote_addresses.size()); + CHECK_AND_ASSERT_MES(wti.remote_addresses.front() == m_accounts[MINER_ACC_IDX].get_public_address_str(), false, "wti.remote_addresses.front is incorrect"); + return true; + } + )); + alice_wlt->callback(l2); + + CHECK_AND_ASSERT_MES(refresh_wallet_and_check_balance("", "Alice", alice_wlt, MK_TEST_COINS(3)), false, ""); + + return true; } diff --git a/tests/core_tests/hard_fork_2.h b/tests/core_tests/hard_fork_2.h index 8e981f4b..18769717 100644 --- a/tests/core_tests/hard_fork_2.h +++ b/tests/core_tests/hard_fork_2.h @@ -14,7 +14,7 @@ struct hard_fork_2_base_test : virtual public test_chain_unit_enchanced size_t m_hardfork_height; }; -struct hard_fork_2_tx_payer_in_wallet : public hard_fork_2_base_test, public wallet_test +struct hard_fork_2_tx_payer_in_wallet : public wallet_test, public hard_fork_2_base_test { hard_fork_2_tx_payer_in_wallet(); bool generate(std::vector& events) const;