zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6046 from nuttycom/bug/disabled_orchard_batch_validation2 

Replace "Disabled" Orchard AuthValidator with std::nullopt
This commit is contained in:
Kris Nuttycombe 2022-07-03 22:38:03 -06:00 committed by GitHub
parent 2e6a251de7 4600079618
commit a2d0f152fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.cpp
View File

@ -1245,7 +1245,7 @@ bool ContextualCheckShieldedInputs(
const PrecomputedTransactionData& txdata, const PrecomputedTransactionData& txdata,
CValidationState &state, CValidationState &state,
const CCoinsViewCache &view, const CCoinsViewCache &view,
orchard::AuthValidator& orchardAuth, std::optional<orchard::AuthValidator>& orchardAuth,
const Consensus::Params& consensus, const Consensus::Params& consensus,
uint32_t consensusBranchId, uint32_t consensusBranchId,
bool nu5Active, bool nu5Active,
@ -1380,7 +1380,9 @@ bool ContextualCheckShieldedInputs(
} }
// Queue Orchard bundle to be batch-validated. // Queue Orchard bundle to be batch-validated.
tx.GetOrchardBundle().QueueAuthValidation(orchardAuth, dataToBeSigned); if (orchardAuth.has_value()) {
tx.GetOrchardBundle().QueueAuthValidation(orchardAuth.value(), dataToBeSigned);
}
return true; return true;
} }
@ -2001,7 +2003,7 @@ bool AcceptToMemoryPool(
// This will be a single-transaction batch, which is still more efficient as every // This will be a single-transaction batch, which is still more efficient as every
// Orchard bundle contains at least two signatures. // Orchard bundle contains at least two signatures.
auto orchardAuth = orchard::AuthValidator::Batch(); std::optional<orchard::AuthValidator> orchardAuth = orchard::AuthValidator::Batch();
// Check shielded input signatures. // Check shielded input signatures.
if (!ContextualCheckShieldedInputs( if (!ContextualCheckShieldedInputs(
@ -2018,8 +2020,8 @@ bool AcceptToMemoryPool(
return false; return false;
} }
// Check Orchard bundle authorizations. // Check Orchard bundle authorizations. `orchardAuth` here is known to be non-null
if (!orchardAuth.Validate()) { if (!orchardAuth.value().Validate()) {
return state.DoS(100, false, REJECT_INVALID, "bad-orchard-bundle-authorization"); return state.DoS(100, false, REJECT_INVALID, "bad-orchard-bundle-authorization");
} }
@ -3073,7 +3075,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
auto verifier = fExpensiveChecks ? ProofVerifier::Strict() : ProofVerifier::Disabled(); auto verifier = fExpensiveChecks ? ProofVerifier::Strict() : ProofVerifier::Disabled();
// Disable Orchard batch signature validation if possible. // Disable Orchard batch signature validation if possible.
auto orchardAuth = fExpensiveChecks ? std::optional<orchard::AuthValidator> orchardAuth = fExpensiveChecks ?
orchard::AuthValidator::Batch() : orchard::AuthValidator::Disabled(); orchard::AuthValidator::Batch() : orchard::AuthValidator::Disabled();
// If in initial block download, and this block is an ancestor of a checkpoint, // If in initial block download, and this block is an ancestor of a checkpoint,
@ -3516,7 +3518,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
REJECT_INVALID, "bad-cb-amount"); REJECT_INVALID, "bad-cb-amount");
// Ensure Orchard signatures are valid (if we are checking them) // Ensure Orchard signatures are valid (if we are checking them)
if (!orchardAuth.Validate()) { if (orchardAuth.has_value() && !orchardAuth.value().Validate()) {
return state.DoS(100, return state.DoS(100,
error("ConnectBlock(): an Orchard bundle within the block is invalid"), error("ConnectBlock(): an Orchard bundle within the block is invalid"),
REJECT_INVALID, "bad-orchard-bundle-authorization"); REJECT_INVALID, "bad-orchard-bundle-authorization");

2
src/main.h
View File

@ -402,7 +402,7 @@ bool ContextualCheckShieldedInputs(
const PrecomputedTransactionData& txdata, const PrecomputedTransactionData& txdata,
CValidationState &state, CValidationState &state,
const CCoinsViewCache &view, const CCoinsViewCache &view,
orchard::AuthValidator& orchardAuth, std::optional<orchard::AuthValidator>& orchardAuth,
const Consensus::Params& consensus, const Consensus::Params& consensus,
uint32_t consensusBranchId, uint32_t consensusBranchId,
bool nu5Active, bool nu5Active,

4
src/rust/include/rust/orchard.h
View File

@ -161,8 +161,8 @@ public:
/// Creates a validation context that performs no validation. This can be /// Creates a validation context that performs no validation. This can be
/// used when avoiding duplicate effort such as during reindexing. /// used when avoiding duplicate effort such as during reindexing.
static AuthValidator Disabled() { static std::optional<AuthValidator> Disabled() {
return AuthValidator(); return std::nullopt;
} }
/// Queues an Orchard bundle for validation. /// Queues an Orchard bundle for validation.