Skip to content
Closed
Changes from 3 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
60 changes: 52 additions & 8 deletions packages/rs-dpp/src/data_contract/serialized_version/v1/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use crate::data_contract::document_type::accessors::DocumentTypeV0Getters;

use crate::block::epoch::EpochIndex;
use crate::data_contract::associated_token::token_configuration::TokenConfiguration;
use crate::data_contract::group::v0::GroupV0;
use crate::data_contract::group::Group;
use crate::data_contract::v0::DataContractV0;
use crate::data_contract::v1::DataContractV1;
Expand Down Expand Up @@ -69,21 +70,64 @@ pub struct DataContractInSerializationFormatV1 {
pub description: Option<String>,
}

/// Deserialize `groups` map with stringified u16 keys and enum-wrapped `Group` values.
///
/// Accepts:
/// ```json
/// {
/// "0": {
/// "V0": {
/// "members": { "...": 1 },
/// "required_power": 3
/// }
/// }
/// }
/// ```
fn deserialize_u16_group_map<'de, D>(
deserializer: D,
) -> Result<BTreeMap<GroupContractPosition, Group>, D::Error>
where
D: serde::Deserializer<'de>,
{
let map: BTreeMap<String, Group> = BTreeMap::deserialize(deserializer)?;
map.into_iter()
.map(|(k, v)| {
k.parse::<GroupContractPosition>()
.map_err(serde::de::Error::custom)
.map(|key| (key, v))
})
.collect()
let map: BTreeMap<String, Value> = BTreeMap::deserialize(deserializer)?;

let mut out = BTreeMap::new();

for (key_str, group_value) in map {
// Parse key to GroupContractPosition
let key = key_str.parse::<GroupContractPosition>().map_err(|e| {
serde::de::Error::custom(format!("invalid group key '{}': {}", key_str, e))
})?;

// Extract the V0 variant manually
let group_obj = group_value.into_btree_string_map().map_err(|e| {
serde::de::Error::custom(format!("invalid group structure at '{}': {}", key_str, e))
})?;

let v0_payload = group_obj.get("V0").ok_or_else(|| {
serde::de::Error::custom(format!("missing 'V0' variant under group '{}'", key_str))
})?;

// Deserialize the GroupV0 struct and wrap in Group::V0
let serde_value: serde_json::Value = v0_payload.clone().try_into().map_err(|e| {
serde::de::Error::custom(format!(
"failed to convert platform_value::Value to serde_json::Value at '{}': {}",
key_str, e
))
})?;
let group_v0: GroupV0 = GroupV0::deserialize(&serde_value).map_err(|e| {
serde::de::Error::custom(format!(
"failed to deserialize GroupV0 at '{}': {}",
key_str, e
))
})?;

out.insert(key, Group::V0(group_v0));
}

Ok(out)
}

fn deserialize_u16_token_configuration_map<'de, D>(
deserializer: D,
) -> Result<BTreeMap<TokenContractPosition, TokenConfiguration>, D::Error>
Expand Down
Loading