rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-26 09:24:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Condition v2 txes on v3 hard fork

Browse source
This commit is contained in:
moneromooo-monero 2016-06-29 23:00:20 +01:00
parent 59a66e209a
commit f5465d8246
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/cryptonote_core/cryptonote_core.cpp
View file

@ -498,6 +498,15 @@ namespace cryptonote
} }
//std::cout << "!"<< tx.vin.size() << std::endl; //std::cout << "!"<< tx.vin.size() << std::endl;
uint8_t version = m_blockchain_storage.get_current_hard_fork_version();
const size_t max_tx_version = version == 1 ? 1 : 2;
if (tx.version == 0 || tx.version > max_tx_version)
{
// v2 is the latest one we know
tvc.m_verifivation_failed = true;
return false;
}
if(!check_tx_syntax(tx)) if(!check_tx_syntax(tx))
{ {
LOG_PRINT_L1("WRONG TRANSACTION BLOB, Failed to check tx " << tx_hash << " syntax, rejected"); LOG_PRINT_L1("WRONG TRANSACTION BLOB, Failed to check tx " << tx_hash << " syntax, rejected");

4
src/cryptonote_core/tx_pool.cpp
View file

@ -84,7 +84,9 @@ namespace cryptonote
tvc.m_verifivation_failed = true; tvc.m_verifivation_failed = true;
return false; return false;
} }
if (tx.version > 2) // TODO: max 1/2 needs to be conditioned by a hard fork
const size_t max_tx_version = version == 1 ? 1 : 2;
if (tx.version > max_tx_version)
{ {
// v2 is the latest one we know // v2 is the latest one we know
tvc.m_verifivation_failed = true; tvc.m_verifivation_failed = true;