fix(torii): offchain messages signature validation on first set

crates/torii/libp2p/src/server/mod.rs

@@ -267,44 +267,29 @@
                                 }
                             };
 
-                            if entity_identity.is_none() {
-                                // we can set the entity without checking identity
-                                if let Err(e) = self
-                                    .db
-                                    .set_entity(
-                                        ty,
-                                        &message_id.to_string(),
-                                        Utc::now().timestamp() as u64,
-                                    )
-                                    .await
-                                {
-                                    info!(
-                                        target: LOG_TARGET,
-                                        error = %e,
-                                        "Setting message."
-                                    );
-                                    continue;
-                                } else {
-                                    info!(
-                                        target: LOG_TARGET,
-                                        message_id = %message_id,
-                                        peer_id = %peer_id,
-                                        "Message set."
-                                    );
-                                    continue;
-                                }
-                            }
-
-                            let entity_identity = match Felt::from_str(&entity_identity.unwrap()) {
-                                Ok(identity) => identity,
-                                Err(e) => {
-                                    warn!(
-                                        target: LOG_TARGET,
-                                        error = %e,
-                                        "Parsing identity."
-                                    );
-                                    continue;
-                                }
+                            let entity_identity = match entity_identity {
+                                Some(identity) => match Felt::from_str(&identity) {
+                                    Ok(identity) => identity,
+                                    Err(e) => {
+                                        warn!(
+                                            target: LOG_TARGET,
+                                            error = %e,
+                                            "Parsing identity."
+                                        );
+                                        continue;
+                                    }
+                                },
+                                None => match get_identity_from_ty(&ty) {
+                                    Ok(identity) => identity,
+                                    Err(e) => {
+                                        warn!(
+                                            target: LOG_TARGET,
+                                            error = %e,
+                                            "Getting identity from message."
+                                        );
+                                        continue;
+                                    }
+                                },
                             };
 
                             // TODO: have a nonce in model to check
@@ -324,6 +309,8 @@
                                 };
 
                             let mut calldata = vec![message_hash];
+                            calldata.push(Felt::from(data.signature.len()));
+
                             calldata.extend(data.signature);
                             if !match self
                                 .provider
@@ -505,6 +492,21 @@
     Ok(cert)
 }
 
+fn get_identity_from_ty(ty: &Ty) -> Result<Felt, Error> {
+    let identity = ty
+        .as_struct()
+        .ok_or_else(|| Error::InvalidMessageError("Message is not a struct".to_string()))?
+        .get("identity")
+        .ok_or_else(|| Error::InvalidMessageError("No field identity".to_string()))?
+        .as_primitive()
+        .ok_or_else(|| Error::InvalidMessageError("Identity is not a primitive".to_string()))?
+        .as_contract_address()
+        .ok_or_else(|| {
+            Error::InvalidMessageError("Identity is not a contract address".to_string())
+        })?;
+    Ok(identity)
+}
+
 #[cfg(test)]
 mod tests {
     use tempfile::tempdir;