diff --git a/concordium-contracts-common b/concordium-contracts-common index 30a8576a..ce309702 160000 --- a/concordium-contracts-common +++ b/concordium-contracts-common @@ -1 +1 @@ -Subproject commit 30a8576a40523114ffb65fb5e66b2b4818559a26 +Subproject commit ce3097028711d24de4f43978deec0a1c52fff2f4 diff --git a/concordium-std/CHANGELOG.md b/concordium-std/CHANGELOG.md index 648023f5..c66d820d 100644 --- a/concordium-std/CHANGELOG.md +++ b/concordium-std/CHANGELOG.md @@ -4,7 +4,9 @@ - Support adding attribute `#[concordium(repr(u))]` for enum types, where `u` is either `u8` or `u16`. Setting this changes the integer serialization used for the variant tags in derive macros such as `Serial`, `Deserial`, `DeserialWithState` and `SchemaType`. - Support adding attribute `#[concordium(tag = n)]` for enum variants, where `n` is some unsigned integer literal. Setting this attribute on a variant overrides the tag used in derive macros such as `Serial`, `Deserial`, `DeserialWithState` and `SchemaType`. Note that setting `#[concordium(repr(u*))]` is required when using this attribute. -- Support adding `#[concordium(forward = n)]`, for enum variants, where `n` is either an unsigned integer literal, `cis2_events`, `cis3_events`, `cis4_events` or an array of the same options. Setting this attribute on a variant overrides the (de)serialization to flatten with the (de)serialization of the inner field when using derive macros such as `Serial`, `Deserial`, `DeserialWithState` and `SchemaType`. Note that setting `#[concordium(repr(u*))]` is required when using this attribute. +- Support adding `#[concordium(forward = n)]`, for enum variants, where `n` is either an unsigned integer literal, `cis2_events`, `cis3_events`, `cis4_events` or an array of the same options. + Setting this attribute on a variant overrides the (de)serialization to flatten with the (de)serialization of the inner field when using derive macros such as `Serial`, `Deserial`, `DeserialWithState` and `SchemaType`. + Note that setting `#[concordium(repr(u*))]` is required when using this attribute. ## concordium-std 7.0.0 (2023-06-16) diff --git a/examples/cis2-wccd/src/lib.rs b/examples/cis2-wccd/src/lib.rs index 2a072a40..1aa0346b 100644 --- a/examples/cis2-wccd/src/lib.rs +++ b/examples/cis2-wccd/src/lib.rs @@ -187,6 +187,7 @@ struct SetPausedParams { /// A NewAdminEvent introduced by this smart contract. #[derive(Serial, SchemaType)] #[repr(transparent)] +#[concordium(transparent)] struct NewAdminEvent { /// New admin address. new_admin: Address,