Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 18 additions & 26 deletions packages/rs-dpp/src/state_transition/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ mod traits;

// pub mod state_transition_fee;

#[cfg(feature = "state-transition-validation")]
use crate::consensus::basic::UnsupportedFeatureError;
#[cfg(feature = "state-transition-signing")]
use crate::consensus::signature::InvalidSignaturePublicKeySecurityLevelError;
#[cfg(feature = "state-transition-validation")]
Expand Down Expand Up @@ -1167,32 +1169,22 @@ impl StateTransitionStructureValidation for StateTransition {
platform_version: &PlatformVersion,
) -> crate::validation::SimpleConsensusValidationResult {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe

Suggested change
) -> crate::validation::SimpleConsensusValidationResult {
) -> ConsensusValidationResult<bool> {

where bool:

  • true - correct
  • false - undecided

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is outside the normal pattern and confusing. The validation result would pass, but the bool would say it's valid? It's three tiers and hurts my brain.

match self {
StateTransition::DataContractCreate(_) => {
crate::validation::SimpleConsensusValidationResult::default()
}
StateTransition::DataContractUpdate(_) => {
crate::validation::SimpleConsensusValidationResult::default()
}
StateTransition::Batch(_) => {
crate::validation::SimpleConsensusValidationResult::default()
}
StateTransition::IdentityCreate(_) => {
crate::validation::SimpleConsensusValidationResult::default()
}
StateTransition::IdentityTopUp(_) => {
crate::validation::SimpleConsensusValidationResult::default()
}
StateTransition::IdentityCreditWithdrawal(_) => {
crate::validation::SimpleConsensusValidationResult::default()
}
StateTransition::IdentityUpdate(_) => {
crate::validation::SimpleConsensusValidationResult::default()
}
StateTransition::IdentityCreditTransfer(_) => {
crate::validation::SimpleConsensusValidationResult::default()
}
StateTransition::MasternodeVote(_) => {
crate::validation::SimpleConsensusValidationResult::default()
StateTransition::DataContractCreate(_)
| StateTransition::DataContractUpdate(_)
| StateTransition::Batch(_)
| StateTransition::IdentityCreate(_)
| StateTransition::IdentityTopUp(_)
| StateTransition::IdentityCreditWithdrawal(_)
| StateTransition::IdentityUpdate(_)
| StateTransition::IdentityCreditTransfer(_)
| StateTransition::MasternodeVote(_) => {
crate::validation::SimpleConsensusValidationResult::new_with_error(
UnsupportedFeatureError::new(
"structure validation for identity-based state transitions".to_string(),
platform_version.protocol_version,
)
.into(),
)
}
StateTransition::IdentityCreditTransferToAddresses(transition) => {
transition.validate_structure(platform_version)
Expand Down
26 changes: 25 additions & 1 deletion packages/rs-sdk/src/platform/transition/validation.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
use crate::Error;
use dpp::{
consensus::{basic::BasicError, ConsensusError},
state_transition::{StateTransition, StateTransitionStructureValidation},
version::PlatformVersion,
};

/// Checks if an error is an UnsupportedFeatureError
fn is_unsupported_feature_error(error: &ConsensusError) -> bool {
matches!(
error,
ConsensusError::BasicError(BasicError::UnsupportedFeatureError(_))
)
}

/// Ensures a state transition passes structure validation before broadcasting.
///
/// Note: UnsupportedFeatureError is allowed to pass through, as it indicates
/// that structure validation is not implemented for that state transition type
/// (e.g., identity-based state transitions). The platform will still perform
/// validation during execution.
pub(crate) fn ensure_valid_state_transition_structure(
state_transition: &StateTransition,
platform_version: &PlatformVersion,
Expand All @@ -13,6 +27,16 @@ pub(crate) fn ensure_valid_state_transition_structure(
if validation_result.is_valid() {
Ok(())
} else {
Err(validation_result.into())
// Allow UnsupportedFeatureError to pass through - this means structure
// validation is not implemented for this state transition type
let all_unsupported_feature_errors = validation_result
.errors
.iter()
.all(is_unsupported_feature_error);
if all_unsupported_feature_errors {
Ok(())
} else {
Err(validation_result.into())
}
}
}
Loading