forked from lthn/blockchain
coretest wallet_chain_switch_with_spending_the_same_ki + wallet fixes
This commit is contained in:
sowle
parent
1cb050b367
commit
fab4a7ddf1
8 changed files with 138 additions and 21 deletions
|
|
@ -134,9 +134,8 @@ namespace currency
|
|||
uint64_t get_core_time() const;
|
||||
bool get_aliases_from_tx_pool(std::list<extra_alias_entry>& aliases)const;
|
||||
bool get_aliases_from_tx_pool(std::map<std::string, size_t>& aliases)const;
|
||||
//crypto::hash get_last_core_hash() {return m_last_core_top_hash;}
|
||||
//void set_last_core_hash(const crypto::hash& h) { m_last_core_top_hash = h; }
|
||||
|
||||
|
||||
bool remove_stuck_transactions(); // made public to be called from coretests
|
||||
|
||||
private:
|
||||
bool on_tx_add(const transaction& tx, bool kept_by_block);
|
||||
|
|
@ -148,7 +147,6 @@ namespace currency
|
|||
|
||||
bool is_valid_contract_finalization_tx(const transaction &tx)const;
|
||||
void initialize_db_solo_options_values();
|
||||
bool remove_stuck_transactions();
|
||||
bool is_transaction_ready_to_go(tx_details& txd, const crypto::hash& id)const;
|
||||
bool validate_alias_info(const transaction& tx, bool is_in_block)const;
|
||||
bool get_key_images_from_tx_pool(std::unordered_set<crypto::key_image>& key_images)const;
|
||||
|
|
@ -181,7 +179,6 @@ namespace currency
|
|||
address_to_aliases_container m_db_alias_addresses;
|
||||
solo_options_container m_db_solo_options;
|
||||
tools::db::solo_db_value<uint64_t, uint64_t, solo_options_container> m_db_storage_major_compatibility_version;
|
||||
//crypto::hash m_last_core_top_hash;
|
||||
|
||||
|
||||
epee::math_helper::once_a_time_seconds<30> m_remove_stuck_tx_interval;
|
||||
|
|
|
|||
|
|
@ -1433,7 +1433,7 @@ bool wallet2::scan_unconfirmed_outdate_tx()
|
|||
bool tx_outdated = it->second.timestamp < time_limit;
|
||||
if (tx_outdated || is_tx_expired(it->second.tx, tx_expiration_ts_median))
|
||||
{
|
||||
WLT_LOG_BLUE("removing unconfirmed tx " << it->second.tx_hash << ", reason: " << (tx_outdated ? "outdated" : "expired"), LOG_LEVEL_0);
|
||||
WLT_LOG_BLUE("removing unconfirmed tx " << it->second.tx_hash << ", reason: " << (tx_outdated ? "outdated" : "expired") << ", tx_expiration_ts_median=" << tx_expiration_ts_median, LOG_LEVEL_0);
|
||||
//lookup all used transfer and update flags
|
||||
for (auto i : it->second.selected_indicies)
|
||||
{
|
||||
|
|
@ -1614,6 +1614,7 @@ void wallet2::detach_blockchain(uint64_t height)
|
|||
WLT_LOG_L0("Detaching blockchain on height " << height);
|
||||
size_t transfers_detached = 0;
|
||||
|
||||
// rollback incoming transfers from detaching subchain
|
||||
{
|
||||
auto it = std::find_if(m_transfers.begin(), m_transfers.end(), [&](const transfer_details& td){return td.m_ptx_wallet_info->m_block_height >= height; });
|
||||
if (it != m_transfers.end())
|
||||
|
|
@ -1623,7 +1624,8 @@ void wallet2::detach_blockchain(uint64_t height)
|
|||
for (size_t i = i_start; i != m_transfers.size(); i++)
|
||||
{
|
||||
auto it_ki = m_key_images.find(m_transfers[i].m_key_image);
|
||||
THROW_IF_TRUE_WALLET_EX(it_ki == m_key_images.end(), error::wallet_internal_error, "key image not found");
|
||||
WLT_THROW_IF_FALSE_WALLET_INT_ERR_EX(it_ki != m_key_images.end(), "key image " << m_transfers[i].m_key_image << " not found");
|
||||
WLT_THROW_IF_FALSE_WALLET_INT_ERR_EX(m_transfers[i].m_ptx_wallet_info->m_block_height >= height, "transfer #" << i << " block height is less than " << height);
|
||||
m_key_images.erase(it_ki);
|
||||
++transfers_detached;
|
||||
}
|
||||
|
|
@ -1636,14 +1638,14 @@ void wallet2::detach_blockchain(uint64_t height)
|
|||
m_local_bc_height -= blocks_detached;
|
||||
|
||||
//rollback spends
|
||||
// do not clear spent flag in spent transfers as corresponding txs are most likely in the pool
|
||||
// they will be moved into m_unconfirmed_txs for clearing in future (if tx will expire of removed from pool)
|
||||
for (size_t i = 0, sz = m_transfers.size(); i < sz; ++i)
|
||||
{
|
||||
auto& tr = m_transfers[i];
|
||||
if (tr.m_spent_height >= height)
|
||||
{
|
||||
uint32_t flags_before = tr.m_flags;
|
||||
tr.m_flags &= ~(WALLET_TRANSFER_DETAIL_FLAG_SPENT);
|
||||
WLT_LOG_BLUE("Transfer [" << i << "] marked as unspent, flags: " << flags_before << " -> " << tr.m_flags << ", reason: blockchain detach height " << height << " is lower or equal to transfer spent height " << tr.m_spent_height, LOG_LEVEL_1);
|
||||
WLT_LOG_BLUE("Transfer [" << i << "] spent height: " << tr.m_spent_height << " -> 0, reason: detaching blockchain", LOG_LEVEL_1);
|
||||
tr.m_spent_height = 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -1657,7 +1659,18 @@ void wallet2::detach_blockchain(uint64_t height)
|
|||
tr_hist_it = it; // note that tr_hist_it->height >= height
|
||||
}
|
||||
if (tr_hist_it != m_transfer_history.rend())
|
||||
m_transfer_history.erase(--tr_hist_it.base(), m_transfer_history.end());
|
||||
{
|
||||
auto it_from = --tr_hist_it.base();
|
||||
// before removing wti from m_transfer_history put it into m_unconfirmed_txs as txs from detached blocks are most likely moved into the pool
|
||||
for (auto it = it_from; it != m_transfer_history.end(); ++it)
|
||||
{
|
||||
if (!m_unconfirmed_txs.insert(std::make_pair(it->tx_hash, *it)).second)
|
||||
{
|
||||
WLT_LOG_ERROR("can't move wti from transfer history to unronfirmed txs because such it is already here, tx hash: " << it->tx_hash);
|
||||
}
|
||||
}
|
||||
m_transfer_history.erase(it_from, m_transfer_history.end());
|
||||
}
|
||||
|
||||
//rollback payments
|
||||
for (auto it = m_payments.begin(); it != m_payments.end(); )
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ ENABLE_CHANNEL_BY_DEFAULT("wallet");
|
|||
#define WLT_LOG_YELLOW(msg, log_level) LOG_PRINT_YELLOW("[W:" << m_log_prefix << "]" << msg, log_level)
|
||||
#define WLT_CHECK_AND_ASSERT_MES(expr, ret, msg) CHECK_AND_ASSERT_MES(expr, ret, "[W:" << m_log_prefix << "]" << msg)
|
||||
#define WLT_CHECK_AND_ASSERT_MES_NO_RET(expr, msg) CHECK_AND_ASSERT_MES_NO_RET(expr, "[W:" << m_log_prefix << "]" << msg)
|
||||
#define WLT_THROW_IF_FALSE_WALLET_INT_ERR_EX(cond, msg) THROW_IF_FALSE_WALLET_INT_ERR_EX(cond, "[W:" << m_log_prefix << "]" << msg)
|
||||
|
||||
namespace tools
|
||||
{
|
||||
|
|
|
|||
|
|
@ -812,7 +812,7 @@ int main(int argc, char* argv[])
|
|||
|
||||
GENERATE_AND_PLAY(wallet_rpc_integrated_address);
|
||||
GENERATE_AND_PLAY(wallet_rpc_integrated_address_transfer);
|
||||
|
||||
GENERATE_AND_PLAY(wallet_chain_switch_with_spending_the_same_ki);
|
||||
|
||||
// GENERATE_AND_PLAY(emission_test); // simulate 1 year of blockchain, too long run (1 y ~= 1 hr), by demand only
|
||||
// LOG_ERROR2("print_reward_change_first_blocks.log", currency::print_reward_change_first_blocks(525601).str()); // outputs first 1 year of blocks' rewards (simplier)
|
||||
|
|
|
|||
|
|
@ -318,6 +318,7 @@ bool escrow_altchain_meta_impl::c1(currency::core& c, size_t ev_index, const std
|
|||
size_t blocks_fetched = 0;
|
||||
alice_wlt->refresh(blocks_fetched);
|
||||
CHECK_AND_ASSERT_MES(blocks_fetched == se.expected_blocks, false, "Alice got " << blocks_fetched << " after refresh, but " << se.expected_blocks << " is expected");
|
||||
LOG_PRINT_GREEN("Alice's transfers:" << ENDL << alice_wlt->dump_trunsfers(), LOG_LEVEL_1);
|
||||
if (se.a_balance != UINT64_MAX)
|
||||
{
|
||||
uint64_t alice_balance = alice_wlt->balance();
|
||||
|
|
@ -329,13 +330,13 @@ bool escrow_altchain_meta_impl::c1(currency::core& c, size_t ev_index, const std
|
|||
alice_wlt->get_contracts(contracts);
|
||||
CHECK_AND_ASSERT_MES(check_contract_state(contracts, m_etd.cpd, static_cast<tools::wallet_rpc::escrow_contract_details_basic::contract_state>(se.a_state), "Alice"), false, "");
|
||||
}
|
||||
LOG_PRINT_GREEN("Alice's transfers:" << ENDL << alice_wlt->dump_trunsfers(), LOG_LEVEL_1);
|
||||
|
||||
LOG_PRINT_GREEN("Bob's wallet is refreshing...", LOG_LEVEL_1);
|
||||
bob_wlt->scan_tx_pool(stub);
|
||||
blocks_fetched = 0;
|
||||
bob_wlt->refresh(blocks_fetched);
|
||||
CHECK_AND_ASSERT_MES(blocks_fetched == se.expected_blocks, false, "Bob got " << blocks_fetched << " after refresh, but " << se.expected_blocks << " is expected");
|
||||
LOG_PRINT_GREEN("Bob's transfers:" << ENDL << bob_wlt->dump_trunsfers(), LOG_LEVEL_1);
|
||||
if (se.b_balance != UINT64_MAX)
|
||||
{
|
||||
uint64_t bob_balance = bob_wlt->balance();
|
||||
|
|
@ -347,7 +348,6 @@ bool escrow_altchain_meta_impl::c1(currency::core& c, size_t ev_index, const std
|
|||
bob_wlt->get_contracts(contracts);
|
||||
CHECK_AND_ASSERT_MES(check_contract_state(contracts, m_etd.cpd, static_cast<tools::wallet_rpc::escrow_contract_details_basic::contract_state>(se.b_state), "Bob"), false, "");
|
||||
}
|
||||
LOG_PRINT_GREEN("Bob's transfers:" << ENDL << bob_wlt->dump_trunsfers(), LOG_LEVEL_1);
|
||||
|
||||
mine_empty_block = true;
|
||||
}
|
||||
|
|
@ -413,7 +413,7 @@ bool escrow_altchain_meta_impl::c1(currency::core& c, size_t ev_index, const std
|
|||
}
|
||||
}
|
||||
|
||||
// c.get_tx_pool().remove_stuck_transactions(); ?
|
||||
c.get_tx_pool().remove_stuck_transactions();
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -340,7 +340,7 @@ struct escrow_altchain_meta_test_data<4>
|
|||
// 30- 31- 32- 33- 34- 35- chain A
|
||||
// p w (a) w | a w p - confirmed proposal, (a) - unconfirmed acceptance, a - confirmed acceptance, w - wallet refresh
|
||||
// | ! ! - block triggered chain switching
|
||||
// \- 34- 35- 36- 37- 38- 39- 40- 41- 42- chain B
|
||||
// \- 34- 35- 36- 37- 38- 39- 50- 51- 52- chain B
|
||||
// w t w w - wallet refresh, t - money transfer
|
||||
eam_test_data_t data = eam_test_data_t(alice_bob_start_amount, 2 /* only two transfer for both */, cpd, {
|
||||
// chain A
|
||||
|
|
@ -353,9 +353,16 @@ struct escrow_altchain_meta_test_data<4>
|
|||
eam_event_t(35, 0, eam_event_refresh_and_check(2, contract_states::contract_accepted, contract_states::contract_accepted, alice_bob_start_amount - a_proposal_fee - cpd.amount_a_pledge - cpd.amount_to_pay, alice_bob_start_amount - b_acceptance_fee - b_release_fee - cpd.amount_b_pledge)), // update 33..34
|
||||
eam_event_t(36, 0, eam_event_go_to("33")), // make block 33 being prev for the next one
|
||||
// chain B
|
||||
eam_event_t(40, 0, eam_event_refresh_and_check(6, eam_contract_state_none, eam_contract_state_none, alice_bob_start_amount - a_proposal_fee, alice_bob_start_amount)), // detach 34..35, update 34..39
|
||||
eam_event_t(41, 0, eam_event_transfer(wallet_test::ALICE_ACC_IDX, wallet_test::BOB_ACC_IDX, alice_bob_start_amount - a_proposal_fee - TESTS_DEFAULT_FEE, TESTS_DEFAULT_FEE)), // make sure money are completely unlocked
|
||||
eam_event_t(42, 0, eam_event_refresh_and_check(2, eam_contract_state_none, eam_contract_state_none, 0, 2 * alice_bob_start_amount - a_proposal_fee - TESTS_DEFAULT_FEE)), // update 41..42
|
||||
eam_event_t(50, 0, eam_event_refresh_and_check(16, eam_contract_state_none, eam_contract_state_none, alice_bob_start_amount - a_proposal_fee, alice_bob_start_amount)), // detach 34..35, update 34..49
|
||||
|
||||
// the following two line commened by sowle 2019-04-26
|
||||
// reason: tx linked with alt blocks are not removed from the pool on expiration or when outdated
|
||||
// so atm this test should wait until related alt block will be removed from the blockchain -> this will let tx pool to remove expired tx -> coins will be unlocked
|
||||
// should be tested differently somehow
|
||||
// TODO: need more attention here
|
||||
//
|
||||
//eam_event_t(51, 0, eam_event_transfer(wallet_test::ALICE_ACC_IDX, wallet_test::BOB_ACC_IDX, alice_bob_start_amount - a_proposal_fee - TESTS_DEFAULT_FEE, TESTS_DEFAULT_FEE)), // make sure money are completely unlocked
|
||||
//eam_event_t(52, 0, eam_event_refresh_and_check(2, eam_contract_state_none, eam_contract_state_none, 0, 2 * alice_bob_start_amount - a_proposal_fee - TESTS_DEFAULT_FEE)), // update 51..52
|
||||
});
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1376,8 +1376,8 @@ bool gen_wallet_transfers_and_chain_switch::generate(std::vector<test_event_entr
|
|||
alice_wlt->get_transfers(trs);
|
||||
CHECK_AND_ASSERT_MES(trs.size() == 2 && trs[0].is_spent() && trs[1].is_spent(), false, "Wrong transfers state");
|
||||
|
||||
// fast forward time to make txs outdated
|
||||
test_core_time::adjust(test_core_time::get_time() + CURRENCY_MEMPOOL_TX_LIVETIME + 1);
|
||||
// fast forward time to make tx_1 and tx_2 outdated (blk_3 is the block where tx_2 came with)
|
||||
test_core_time::adjust(get_actual_timestamp(blk_3) + CURRENCY_MEMPOOL_TX_LIVETIME + 1);
|
||||
|
||||
MAKE_NEXT_BLOCK(events, blk_5a, blk_4a, miner_acc);
|
||||
|
||||
|
|
@ -3122,3 +3122,95 @@ bool wallet_unconfirmed_tx_expiration::c1(currency::core& c, size_t ev_index, co
|
|||
|
||||
return true;
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
wallet_chain_switch_with_spending_the_same_ki::wallet_chain_switch_with_spending_the_same_ki()
|
||||
{
|
||||
REGISTER_CALLBACK_METHOD(wallet_chain_switch_with_spending_the_same_ki, c1);
|
||||
}
|
||||
|
||||
bool wallet_chain_switch_with_spending_the_same_ki::generate(std::vector<test_event_entry>& events) const
|
||||
{
|
||||
// Test outline
|
||||
// 1. A wallet has one unspent output
|
||||
// 2. wallet2::transfer() creates tx_0 that spends wallet's output
|
||||
// 3. tx_0 is successfully put into the blockchain
|
||||
// 4. Due to chain switch tx_0 is removed from the blockchain and get into the transaction pool
|
||||
// 5. Make sure the wallet can't spend that output
|
||||
// 6. After tx is expired make sure the wallet can spend that output
|
||||
|
||||
|
||||
m_accounts.resize(TOTAL_ACCS_COUNT);
|
||||
account_base& miner_acc = m_accounts[MINER_ACC_IDX]; miner_acc.generate();
|
||||
account_base& alice_acc = m_accounts[ALICE_ACC_IDX]; alice_acc.generate();
|
||||
account_base& bob_acc = m_accounts[BOB_ACC_IDX]; bob_acc.generate();
|
||||
|
||||
MAKE_GENESIS_BLOCK(events, blk_0, miner_acc, test_core_time::get_time());
|
||||
REWIND_BLOCKS_N(events, blk_0r, blk_0, miner_acc, CURRENCY_MINED_MONEY_UNLOCK_WINDOW);
|
||||
|
||||
MAKE_TX(events, tx_0, miner_acc, alice_acc, MK_TEST_COINS(30), blk_0r);
|
||||
MAKE_NEXT_BLOCK_TX1(events, blk_1, blk_0r, miner_acc, tx_0);
|
||||
|
||||
// rewind blocks to allow wallet be able to spend the coins
|
||||
REWIND_BLOCKS_N_WITH_TIME(events, blk_1r, blk_1, miner_acc, WALLET_DEFAULT_TX_SPENDABLE_AGE);
|
||||
|
||||
DO_CALLBACK(events, "c1");
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool wallet_chain_switch_with_spending_the_same_ki::c1(currency::core& c, size_t ev_index, const std::vector<test_event_entry>& events)
|
||||
{
|
||||
bool r = false;
|
||||
std::shared_ptr<tools::wallet2> alice_wlt = init_playtime_test_wallet(events, c, ALICE_ACC_IDX);
|
||||
|
||||
CHECK_AND_ASSERT_MES(refresh_wallet_and_check_balance("", "Alice", alice_wlt, MK_TEST_COINS(30), true, UINT64_MAX, MK_TEST_COINS(30)), false, "");
|
||||
|
||||
std::vector<tx_destination_entry> destinations { tx_destination_entry(MK_TEST_COINS(30) - TESTS_DEFAULT_FEE, m_accounts[BOB_ACC_IDX].get_public_address()) };
|
||||
try
|
||||
{
|
||||
// create tx_1
|
||||
alice_wlt->transfer(destinations, 0, 0, TESTS_DEFAULT_FEE, empty_extra, empty_attachment);
|
||||
}
|
||||
catch (std::exception &e)
|
||||
{
|
||||
CHECK_AND_ASSERT_MES(false, false, "alice_wlt->transfer() caused an exception: " << e.what());
|
||||
}
|
||||
|
||||
CHECK_AND_ASSERT_MES(c.get_pool_transactions_count() == 1, false, "Tx pool has incorrect number of txs: " << c.get_pool_transactions_count());
|
||||
|
||||
// mine blk_2 on height 22
|
||||
CHECK_AND_ASSERT_MES(mine_next_pow_block_in_playtime(m_accounts[MINER_ACC_IDX].get_public_address(), c), false, "");
|
||||
|
||||
CHECK_AND_ASSERT_MES(c.get_pool_transactions_count() == 0, false, "Tx pool has incorrect number of txs: " << c.get_pool_transactions_count());
|
||||
|
||||
// refresh wallet
|
||||
alice_wlt->refresh();
|
||||
// DO NOT scan_tx_pool here intentionally
|
||||
CHECK_AND_ASSERT_MES(check_balance_via_wallet(*alice_wlt, "Alice", MK_TEST_COINS(0)), false, "");
|
||||
|
||||
uint64_t blk_1r_height = c.get_top_block_height() - 1;
|
||||
crypto::hash blk_1r_id = c.get_block_id_by_height(blk_1r_height);
|
||||
block blk_2a = AUTO_VAL_INIT(blk_2a);
|
||||
r = mine_next_pow_block_in_playtime_with_given_txs(m_accounts[MINER_ACC_IDX].get_public_address(), c, std::vector<transaction>(), blk_1r_id, blk_1r_height + 1, &blk_2a);
|
||||
CHECK_AND_ASSERT_MES(r, false, "mine_next_pow_block_in_playtime_with_given_txs failed");
|
||||
|
||||
// one more to trigger chain switch
|
||||
block blk_3a = AUTO_VAL_INIT(blk_3a);
|
||||
r = mine_next_pow_block_in_playtime_with_given_txs(m_accounts[MINER_ACC_IDX].get_public_address(), c, std::vector<transaction>(), get_block_hash(blk_2a), get_block_height(blk_2a) + 1, &blk_3a);
|
||||
CHECK_AND_ASSERT_MES(r, false, "mine_next_pow_block_in_playtime_with_given_txs failed");
|
||||
|
||||
// make sure tx_1 has been moved back to the pool
|
||||
CHECK_AND_ASSERT_MES(c.get_pool_transactions_count() == 1, false, "Incorrect txs count in the pool: " << c.get_pool_transactions_count());
|
||||
CHECK_AND_ASSERT_MES(c.get_alternative_blocks_count() == 1, false, "Incorrect alt blocks count: " << c.get_alternative_blocks_count());
|
||||
|
||||
//const transaction& tx_1 = boost::get<transaction>(events[4 * CURRENCY_MINED_MONEY_UNLOCK_WINDOW + 3]);
|
||||
|
||||
// refresh wallet
|
||||
alice_wlt->refresh();
|
||||
// DO NOT scan_tx_pool here intentionally
|
||||
CHECK_AND_ASSERT_MES(check_balance_via_wallet(*alice_wlt, "Alice", MK_TEST_COINS(0)), false, "");
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -237,3 +237,10 @@ struct wallet_unconfirmed_tx_expiration : public wallet_test
|
|||
bool generate(std::vector<test_event_entry>& events) const;
|
||||
bool c1(currency::core& c, size_t ev_index, const std::vector<test_event_entry>& events);
|
||||
};
|
||||
|
||||
struct wallet_chain_switch_with_spending_the_same_ki : public wallet_test
|
||||
{
|
||||
wallet_chain_switch_with_spending_the_same_ki();
|
||||
bool generate(std::vector<test_event_entry>& events) const;
|
||||
bool c1(currency::core& c, size_t ev_index, const std::vector<test_event_entry>& events);
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue