feat: add EventValue for ABI

Cargo.toml

@@ -192,8 +192,10 @@ rpassword = "7.2.0"
 rstest = "0.18.2"
 rstest_reuse = "0.6.0"
 salsa = "0.16.1"
-scarb = { git = "https://github.com/dojoengine/scarb", rev = "a6d3b5b17b288502fe9cc63c96c0ae22fd175857" }
-scarb-ui = { git = "https://github.com/dojoengine/scarb", rev = "a6d3b5b17b288502fe9cc63c96c0ae22fd175857" }
+#scarb = { git = "https://github.com/dojoengine/scarb", rev = "a6d3b5b17b288502fe9cc63c96c0ae22fd175857" }
+#scarb-ui = { git = "https://github.com/dojoengine/scarb", rev = "a6d3b5b17b288502fe9cc63c96c0ae22fd175857" }
+scarb = { path = "/Users/glihm/swm/scarb/scarb" }
+scarb-ui = { path = "/Users/glihm/swm/scarb/utils/scarb-ui" }
 semver = "1.0.5"
 serde = { version = "1.0", features = [ "derive" ] }
 serde_json = { version = "1.0", features = [ "arbitrary_precision" ] }

crates/dojo/core/src/event/event.cairo

@@ -50,4 +50,3 @@ pub impl EventImpl<E, +ModelParser<E>, +EventDefinition<E>, +Serde<E>, +Introspe
         dojo::utils::selector_from_namespace_and_name(namespace_hash, @Self::name())
     }
 }
-

crates/dojo/lang/src/attribute_macros/event.rs

@@ -81,6 +81,17 @@ impl DojoEvent {
             });
         }
 
+        let members_values = members
+            .iter()
+            .filter_map(|m| {
+                if m.key {
+                    None
+                } else {
+                    Some(RewriteNode::Text(format!("pub {}: {},\n", m.name, m.ty)))
+                }
+            })
+            .collect::<Vec<_>>();
+
         let member_names = members
             .iter()
             .map(|member| RewriteNode::Text(format!("{},\n", member.name.clone())))
@@ -96,9 +107,7 @@ impl DojoEvent {
         // and do not derive IntrospectPacked.
         if derive_attr_names.contains(&DOJO_PACKED_DERIVE.to_string()) {
             diagnostics.push(PluginDiagnostic {
-                message: format!(
-                    "Event should derive {DOJO_INTROSPECT_DERIVE} instead of {DOJO_PACKED_DERIVE}."
-                ),
+                message: format!("Deriving {DOJO_PACKED_DERIVE} on event is not allowed."),
                 stable_ptr: struct_ast.name(db).stable_ptr().untyped(),
                 severity: Severity::Error,
             });
@@ -125,6 +134,7 @@ impl DojoEvent {
                 ("serialized_keys".to_string(), RewriteNode::new_modified(serialized_keys)),
                 ("serialized_values".to_string(), RewriteNode::new_modified(serialized_values)),
                 ("unique_hash".to_string(), RewriteNode::Text(unique_hash)),
+                ("members_values".to_string(), RewriteNode::new_modified(members_values)),
             ]),
         );
 

crates/dojo/lang/src/attribute_macros/patches/event.patch.cairo

@@ -1,3 +1,11 @@
+// EventValue on it's own does nothing since events are always emitted and
+// never read from the storage. However, it's required by the ABI to
+// ensure that the event definition contains both keys and values easily distinguishable.
+// Only derives strictly required traits.
+#[derive(Drop, Serde)]
+pub struct $type_name$Value {
+    $members_values$
+}
 
 pub impl $type_name$Definition of dojo::event::EventDefinition<$type_name$>{
     #[inline(always)]
@@ -24,6 +32,7 @@ pub impl $type_name$EventImpl = dojo::event::event::EventImpl<$type_name$>;
 #[starknet::contract]
 pub mod e_$type_name$ {
     use super::$type_name$;
+    use super::$type_name$Value;
 
     #[storage]
     struct Storage {}
@@ -47,6 +56,13 @@ pub mod e_$type_name$ {
             let _event = event;
         }
 
+        // Outputs EventValue to allow a simple diff from the ABI compared to the
+        // event to retrieved the keys of an event.
+        #[external(v0)]
+        fn ensure_values(self: @ContractState, value: $type_name$Value) {
+            let _value = value;
+        }
+
         // Ensures the generated contract has a unique classhash, using
         // a hardcoded hash computed on event and member names.
         #[external(v0)]