d0s3t3ch/wownero
1
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero.git synced 2024-08-15 01:03:23 +00:00
Code Issues Projects Releases Wiki Activity

static mixin

Browse source
This commit is contained in:
wowario 2018-05-10 15:27:39 +03:00
parent 1611b65221
commit 4a55d6eaea
No known key found for this signature in database
GPG key ID: 24DCBE762DE9C111
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/cryptonote_core/blockchain.cpp
View file

@ -2613,7 +2613,7 @@ bool Blockchain::check_tx_inputs(transaction& tx, tx_verification_context &tvc,
{ {
size_t n_unmixable = 0, n_mixable = 0; size_t n_unmixable = 0, n_mixable = 0;
size_t mixin = std::numeric_limits<size_t>::max(); size_t mixin = std::numeric_limits<size_t>::max();
const size_t min_mixin = hf_version >= HF_VERSION_MIN_MIXIN_9 ? 9 : hf_version >= HF_VERSION_MIN_MIXIN_7 ? 7 : hf_version >= HF_VERSION_MIN_MIXIN_4 ? 4 : 2; const size_t min_mixin = hf_version >= HF_VERSION_MIN_MIXIN_7 ? 7 : hf_version >= HF_VERSION_MIN_MIXIN_4 ? 4 : 2;
for (const auto& txin : tx.vin) for (const auto& txin : tx.vin)
{ {
// non txin_to_key inputs will be rejected below // non txin_to_key inputs will be rejected below
@ -2642,6 +2642,9 @@ bool Blockchain::check_tx_inputs(transaction& tx, tx_verification_context &tvc,
} }
} }
// from v9, mixin is static
if (hf_version < HF_VERSION_MIN_MIXIN_9)
{
if (mixin < min_mixin) if (mixin < min_mixin)
{ {
if (n_unmixable == 0) if (n_unmixable == 0)
@ -2657,7 +2660,18 @@ bool Blockchain::check_tx_inputs(transaction& tx, tx_verification_context &tvc,
return false; return false;
} }
} }
else
{
const size_t mixin = DEFAULT_MIXIN;
const size_t min_mixin = DEFAULT_MIXIN;
if (mixin != min_mixin)
{
MERROR_VER("Tx " << get_transaction_hash(tx) << " has invalid ring size");
return false;
}
}
}
// min/max tx version based on HF, and we accept v1 txes if having a non mixable // min/max tx version based on HF, and we accept v1 txes if having a non mixable
const size_t max_tx_version = (hf_version <= 3) ? 1 : 2; const size_t max_tx_version = (hf_version <= 3) ? 1 : 2;
if (tx.version > max_tx_version) if (tx.version > max_tx_version)