opt(torii): avoid calculating poseidon hash where possible (#2394)

* opt(torii): avoid calculating poseidon hash where possible commit-id:3b4d856a * add script to spam spawn-and-move with bunch of entities * feat: emit entity id for StoreSetRecord * fix: run fmt checkers --------- Co-authored-by: glihm <[email protected]>
dojoengine · Sep 8, 2024 · 6b9da83 · 6b9da83
1 parent f8784c4
commit 6b9da83
Show file tree

Hide file tree

Showing 30 changed files with 384 additions and 148 deletions.
diff --git a/bin/sozo/tests/test_data/policies.json b/bin/sozo/tests/test_data/policies.json
@@ -27,6 +27,10 @@
     "target": "0x2d24481107b55ecd73c4d1b62f6bfe8c42a224447b71db7dcec2eab484d53cd",
     "method": "set_player_server_profile"
   },
+  {
+    "target": "0x2d24481107b55ecd73c4d1b62f6bfe8c42a224447b71db7dcec2eab484d53cd",
+    "method": "set_models"
+  },
   {
     "target": "0x2d24481107b55ecd73c4d1b62f6bfe8c42a224447b71db7dcec2eab484d53cd",
     "method": "enter_dungeon"

diff --git a/crates/dojo-core/src/world/world_contract.cairo b/crates/dojo-core/src/world/world_contract.cairo
@@ -231,6 +231,7 @@ pub mod world {
     #[derive(Drop, starknet::Event)]
     pub struct StoreSetRecord {
         pub table: felt252,
+        pub entity_id: felt252,
         pub keys: Span<felt252>,
         pub values: Span<felt252>,
     }
@@ -1091,7 +1092,7 @@ pub mod world {
                     let entity_id = entity_id_from_keys(keys);
                     self.write_model_entity(model_selector, entity_id, values, layout);
                     EventEmitter::emit(
-                        ref self, StoreSetRecord { table: model_selector, keys, values }
+                        ref self, StoreSetRecord { table: model_selector, keys, values, entity_id }
                     );
                 },
                 ModelIndex::Id(entity_id) => {

diff --git a/...s/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/abis/dojo-world.json b/...s/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/abis/dojo-world.json
@@ -939,6 +939,11 @@
         "type": "core::felt252",
         "kind": "data"
       },
+      {
+        "name": "entity_id",
+        "type": "core::felt252",
+        "kind": "data"
+      },
       {
         "name": "keys",
         "type": "core::array::Span::<core::felt252>",

diff --git a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-world.toml b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-world.toml
@@ -1,6 +1,6 @@
 kind = "Class"
-class_hash = "0xa349b743d361ce4567361475a89b84a386bb383448c6926954e5fe0b525597"
-original_class_hash = "0xa349b743d361ce4567361475a89b84a386bb383448c6926954e5fe0b525597"
+class_hash = "0x6f4515274ee23404789c3351a77107d0ec07508530119822046600ca6948d6e"
+original_class_hash = "0x6f4515274ee23404789c3351a77107d0ec07508530119822046600ca6948d6e"
 abi = "manifests/dev/base/abis/dojo-world.json"
 tag = "dojo-world"
 manifest_name = "dojo-world"
diff --git a/crates/dojo-world/src/contracts/abi/world.rs b/crates/dojo-world/src/contracts/abi/world.rs
@@ -945,6 +945,11 @@ abigen!(
         "type": "core::felt252",
         "kind": "data"
       },
+      {
+        "name": "entity_id",
+        "type": "core::felt252",
+        "kind": "data"
+      },
       {
         "name": "keys",
         "type": "core::array::Span::<core::felt252>",

diff --git a/crates/sozo/ops/src/tests/model.rs b/crates/sozo/ops/src/tests/model.rs
@@ -58,7 +58,8 @@ async fn test_model_ops() {
         )
         .await
         .unwrap(),
-        Felt::from_hex("0x5581faa4aa9c7cf1903a7e07f28707a0a599b602ca13f3d2f88d68322e240d").unwrap()
+        Felt::from_hex("0x68e3a53988f20d84c6652f25d6add070633a5d05f8c4ac68285cacb228afa14")
+            .unwrap()
     );
 
     let layout =

diff --git a/crates/torii/core/src/processors/mod.rs b/crates/torii/core/src/processors/mod.rs
@@ -19,8 +19,8 @@ pub mod store_update_member;
 pub mod store_update_record;
 
 const MODEL_INDEX: usize = 0;
-const NUM_KEYS_INDEX: usize = 1;
 const ENTITY_ID_INDEX: usize = 1;
+const NUM_KEYS_INDEX: usize = 2;
 
 #[async_trait]
 pub trait EventProcessor<P>

diff --git a/crates/torii/core/src/processors/store_set_record.rs b/crates/torii/core/src/processors/store_set_record.rs
@@ -7,8 +7,8 @@ use starknet::providers::Provider;
 use tracing::info;
 
 use super::EventProcessor;
-use crate::processors::{MODEL_INDEX, NUM_KEYS_INDEX};
-use crate::sql::Sql;
+use crate::processors::{ENTITY_ID_INDEX, MODEL_INDEX, NUM_KEYS_INDEX};
+use crate::sql::{felts_sql_string, Sql};
 
 pub(crate) const LOG_TARGET: &str = "torii_core::processors::store_set_record";
 
@@ -46,9 +46,9 @@ where
         event_id: &str,
         event: &Event,
     ) -> Result<(), Error> {
-        let selector = event.data[MODEL_INDEX];
+        let model_id = event.data[MODEL_INDEX];
 
-        let model = db.model(selector).await?;
+        let model = db.model(model_id).await?;
 
         info!(
             target: LOG_TARGET,
@@ -60,6 +60,7 @@ where
         let keys_end: usize =
             keys_start + event.data[NUM_KEYS_INDEX].to_usize().context("invalid usize")?;
         let keys = event.data[keys_start..keys_end].to_vec();
+        let keys_str = felts_sql_string(&keys);
 
         // keys_end is already the length of the values array.
 
@@ -68,12 +69,14 @@ where
             values_start + event.data[keys_end].to_usize().context("invalid usize")?;
 
         let values = event.data[values_start..values_end].to_vec();
+        let entity_id = event.data[ENTITY_ID_INDEX];
+
         let mut keys_and_unpacked = [keys, values].concat();
 
         let mut entity = model.schema;
         entity.deserialize(&mut keys_and_unpacked)?;
 
-        db.set_entity(entity, event_id, block_timestamp).await?;
+        db.set_entity(entity, event_id, block_timestamp, entity_id, model_id, &keys_str).await?;
         Ok(())
     }
 }
diff --git a/crates/torii/core/src/processors/store_update_record.rs b/crates/torii/core/src/processors/store_update_record.rs
@@ -9,7 +9,7 @@ use tracing::info;
 
 use super::EventProcessor;
 use crate::processors::{ENTITY_ID_INDEX, MODEL_INDEX};
-use crate::sql::Sql;
+use crate::sql::{felts_sql_string, Sql};
 
 pub(crate) const LOG_TARGET: &str = "torii_core::processors::store_update_record";
 
@@ -47,10 +47,10 @@ where
         event_id: &str,
         event: &Event,
     ) -> Result<(), Error> {
-        let selector = event.data[MODEL_INDEX];
+        let model_id = event.data[MODEL_INDEX];
         let entity_id = event.data[ENTITY_ID_INDEX];
 
-        let model = db.model(selector).await?;
+        let model = db.model(model_id).await?;
 
         info!(
             target: LOG_TARGET,
@@ -71,12 +71,14 @@ where
         // Keys are read from the db, since we don't have access to them when only
         // the entity id is passed.
         let keys = db.get_entity_keys(entity_id, &tag).await?;
+
+        let keys_str = felts_sql_string(&keys);
         let mut keys_and_unpacked = [keys, values].concat();
 
         let mut entity = model.schema;
         entity.deserialize(&mut keys_and_unpacked)?;
 
-        db.set_entity(entity, event_id, block_timestamp).await?;
+        db.set_entity(entity, event_id, block_timestamp, entity_id, model_id, &keys_str).await?;
         Ok(())
     }
 }
diff --git a/crates/torii/core/src/sql.rs b/crates/torii/core/src/sql.rs
@@ -165,37 +165,28 @@ impl Sql {
         entity: Ty,
         event_id: &str,
         block_timestamp: u64,
+        entity_id: Felt,
+        model_id: Felt,
+        keys_str: &str,
     ) -> Result<()> {
-        let keys = if let Ty::Struct(s) = &entity {
-            let mut keys = Vec::new();
-            for m in s.keys() {
-                keys.extend(m.serialize()?);
-            }
-            keys
-        } else {
-            return Err(anyhow!("Entity is not a struct"));
-        };
-
         let namespaced_name = entity.name();
-        let (model_namespace, model_name) = namespaced_name.split_once('-').unwrap();
 
-        let entity_id = format!("{:#x}", poseidon_hash_many(&keys));
-        let model_id = format!("{:#x}", compute_selector_from_names(model_namespace, model_name));
+        let entity_id = format!("{:#x}", entity_id);
+        let model_id = format!("{:#x}", model_id);
 
         self.query_queue.enqueue(
             "INSERT INTO entity_model (entity_id, model_id) VALUES (?, ?) ON CONFLICT(entity_id, \
              model_id) DO NOTHING",
             vec![Argument::String(entity_id.clone()), Argument::String(model_id.clone())],
         );
 
-        let keys_str = felts_sql_string(&keys);
         let insert_entities = "INSERT INTO entities (id, keys, event_id, executed_at) VALUES (?, \
                                ?, ?, ?) ON CONFLICT(id) DO UPDATE SET \
                                updated_at=CURRENT_TIMESTAMP, executed_at=EXCLUDED.executed_at, \
                                event_id=EXCLUDED.event_id RETURNING *";
         let mut entity_updated: EntityUpdated = sqlx::query_as(insert_entities)
             .bind(&entity_id)
-            .bind(&keys_str)
+            .bind(keys_str)
             .bind(event_id)
             .bind(utc_dt_string_from_timestamp(block_timestamp))
             .fetch_one(&self.pool)
@@ -1184,7 +1175,7 @@ impl Sql {
     }
 }
 
-fn felts_sql_string(felts: &[Felt]) -> String {
+pub fn felts_sql_string(felts: &[Felt]) -> String {
     felts.iter().map(|k| format!("{:#x}", k)).collect::<Vec<String>>().join(FELT_DELIMITER)
         + FELT_DELIMITER
 }