mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-08-15 01:03:23 +00:00
Merge pull request #5823
26072f1
blockchain: forbid v1 coinbase from v12 (moneromooo-monero)555dc7c
core: from v12, require consistent ring size for mixable txes (moneromooo-monero)d22dfb7
blockchain: reject rct signatures in coinbase txes from v12 (moneromooo-monero)
This commit is contained in:
commit
29e0f11305
6 changed files with 70 additions and 13 deletions
|
@ -640,3 +640,18 @@ bool gen_block_invalid_binary_format::check_all_blocks_purged(cryptonote::core&
|
|||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool gen_block_late_v1_coinbase_tx::generate(std::vector<test_event_entry>& events) const
|
||||
{
|
||||
BLOCK_VALIDATION_INIT_GENERATE();
|
||||
|
||||
block blk_1;
|
||||
generator.construct_block_manually(blk_1, blk_0, miner_account,
|
||||
test_generator::bf_major_ver | test_generator::bf_minor_ver,
|
||||
HF_VERSION_MIN_V2_COINBASE_TX, HF_VERSION_MIN_V2_COINBASE_TX);
|
||||
events.push_back(blk_1);
|
||||
|
||||
DO_CALLBACK(events, "check_block_purged");
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -206,3 +206,15 @@ struct gen_block_invalid_binary_format : public test_chain_unit_base
|
|||
private:
|
||||
size_t m_corrupt_blocks_begin_idx;
|
||||
};
|
||||
|
||||
struct gen_block_late_v1_coinbase_tx : public gen_block_verification_base<1>
|
||||
{
|
||||
bool generate(std::vector<test_event_entry>& events) const;
|
||||
};
|
||||
template<>
|
||||
struct get_test_options<gen_block_late_v1_coinbase_tx> {
|
||||
const std::pair<uint8_t, uint64_t> hard_forks[3] = {std::make_pair(1, 0), std::make_pair(HF_VERSION_MIN_V2_COINBASE_TX, 1), std::make_pair(0, 0)};
|
||||
const cryptonote::test_options test_options = {
|
||||
hard_forks, 0
|
||||
};
|
||||
};
|
||||
|
|
|
@ -133,6 +133,7 @@ int main(int argc, char* argv[])
|
|||
GENERATE_AND_PLAY(gen_block_has_invalid_tx);
|
||||
GENERATE_AND_PLAY(gen_block_is_too_big);
|
||||
GENERATE_AND_PLAY(gen_block_invalid_binary_format); // Takes up to 3 hours, if CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW == 500, up to 30 minutes, if CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW == 10
|
||||
GENERATE_AND_PLAY(gen_block_late_v1_coinbase_tx);
|
||||
|
||||
// Transaction verification tests
|
||||
GENERATE_AND_PLAY(gen_tx_big_version);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue