Skip to content

fix: data contract proof doesn't work with new auto fields #2501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
QuantumExplorer merged 2 commits into from
Mar 17, 2025
Merged

fix: data contract proof doesn't work with new auto fields #2501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
500d057
fix: data contract proof doesn't work with new auto fields
shumkov Mar 17, 2025
7ab3ba8
fix: inverted condition
shumkov Mar 17, 2025
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
31 changes: 31 additions & 0 deletions packages/rs-dpp/src/data_contract/serialized_version/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,37 @@ impl DataContractInSerializationFormat {
DataContractInSerializationFormat::V1(v1) => &v1.tokens,
}
}

pub fn eq_without_auto_fields(&self, other: &Self) -> bool {
match (self, other) {
(
DataContractInSerializationFormat::V0(v0_self),
DataContractInSerializationFormat::V0(v0_other),
) => v0_self == v0_other,
(
DataContractInSerializationFormat::V1(v1_self),
DataContractInSerializationFormat::V1(v1_other),
) => {
v1_self.id == v1_other.id
&& v1_self.config == v1_other.config
&& v1_self.version == v1_other.version
&& v1_self.owner_id == v1_other.owner_id
&& v1_self.schema_defs == v1_other.schema_defs
&& v1_self.document_schemas == v1_other.document_schemas
&& v1_self.groups == v1_other.groups
&& v1_self.tokens == v1_other.tokens
}
// Cross-version comparisons return false
(
DataContractInSerializationFormat::V0(_),
DataContractInSerializationFormat::V1(_),
)
| (
DataContractInSerializationFormat::V1(_),
DataContractInSerializationFormat::V0(_),
) => false,
}
}
}

impl TryFromPlatformVersioned<DataContractV0> for DataContractInSerializationFormat {
Expand Down
6 changes: 5 additions & 1 deletion ...ive/src/verify/state_transition/verify_state_transition_was_executed_with_proof/v0/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,13 @@ impl Drive {
let contract_for_serialization: DataContractInSerializationFormat = contract
.clone()
.try_into_platform_versioned(platform_version)?;
if &contract_for_serialization != data_contract_create.data_contract() {

if !contract_for_serialization
.eq_without_auto_fields(data_contract_create.data_contract())
{
return Err(Error::Proof(ProofError::IncorrectProof(format!("proof of state transition execution did not contain exact expected contract after create with id {}", data_contract_create.data_contract().id()))));
}

Ok((root_hash, VerifiedDataContract(contract)))
}
StateTransition::DataContractUpdate(data_contract_update) => {
Expand Down