Torii indexer update db tables

dojoengine · Oct 5, 2023 · e444941 · e444941
1 parent b9bb438
commit e444941
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 32 deletions.
diff --git a/crates/torii/core/src/engine.rs b/crates/torii/core/src/engine.rs
@@ -232,16 +232,19 @@ async fn process_event<P: Provider + Sync>(
     db: &mut Sql,
     provider: &P,
     processors: &[Box<dyn EventProcessor<P>>],
-    _block: &BlockWithTxs,
+    block: &BlockWithTxs,
     invoke_receipt: &InvokeTransactionReceipt,
     event: &Event,
     event_idx: usize,
 ) -> Result<(), Box<dyn Error>> {
-    db.store_event(event, event_idx, invoke_receipt.transaction_hash);
+    let block_event_id = format!("0x{:064x}:0x{:04x}", block.block_number, event_idx);
 
+    db.store_event(event, &block_event_id, invoke_receipt.transaction_hash);
     for processor in processors {
         if get_selector_from_name(&processor.event_key())? == event.keys[0] {
-            processor.process(world, db, provider, invoke_receipt, event, event_idx).await?;
+            processor
+                .process(world, db, provider, block, invoke_receipt, event, &block_event_id)
+                .await?;
         }
     }
 

diff --git a/crates/torii/core/src/processors/mod.rs b/crates/torii/core/src/processors/mod.rs
@@ -14,14 +14,17 @@ pub mod store_set_record;
 #[async_trait]
 pub trait EventProcessor<P: Provider + Sync> {
     fn event_key(&self) -> String;
+
+    #[allow(clippy::too_many_arguments)]
     async fn process(
         &self,
         world: &WorldContractReader<'_, P>,
         db: &mut Sql,
         provider: &P,
+        block: &BlockWithTxs,
         invoke_receipt: &InvokeTransactionReceipt,
         event: &Event,
-        event_idx: usize,
+        block_event_id: &str,
     ) -> Result<(), Error>;
 }
 

diff --git a/crates/torii/core/src/processors/register_model.rs b/crates/torii/core/src/processors/register_model.rs
@@ -1,6 +1,6 @@
 use anyhow::{Error, Ok, Result};
 use async_trait::async_trait;
-use starknet::core::types::{BlockId, BlockTag, Event, InvokeTransactionReceipt};
+use starknet::core::types::{BlockId, BlockTag, BlockWithTxs, Event, InvokeTransactionReceipt};
 use starknet::core::utils::parse_cairo_short_string;
 use starknet::providers::Provider;
 use torii_client::contract::world::WorldContractReader;
@@ -23,9 +23,10 @@ impl<P: Provider + Sync + 'static> EventProcessor<P> for RegisterModelProcessor
         world: &WorldContractReader<'_, P>,
         db: &mut Sql,
         _provider: &P,
+        _block: &BlockWithTxs,
         _invoke_receipt: &InvokeTransactionReceipt,
         event: &Event,
-        _event_idx: usize,
+        _block_event_id: &str,
     ) -> Result<(), Error> {
         let name = parse_cairo_short_string(&event.data[0])?;
 

diff --git a/crates/torii/core/src/processors/register_system.rs b/crates/torii/core/src/processors/register_system.rs
@@ -1,7 +1,7 @@
 use anyhow::{Error, Ok, Result};
 use async_trait::async_trait;
 use dojo_world::manifest::System;
-use starknet::core::types::{Event, InvokeTransactionReceipt};
+use starknet::core::types::{BlockWithTxs, Event, InvokeTransactionReceipt};
 use starknet::core::utils::parse_cairo_short_string;
 use starknet::providers::Provider;
 use torii_client::contract::world::WorldContractReader;
@@ -24,9 +24,10 @@ impl<P: Provider + Sync> EventProcessor<P> for RegisterSystemProcessor {
         _world: &WorldContractReader<'_, P>,
         db: &mut Sql,
         _provider: &P,
+        _block: &BlockWithTxs,
         _invoke_receipt: &InvokeTransactionReceipt,
         event: &Event,
-        _event_idx: usize,
+        _block_event_id: &str,
     ) -> Result<(), Error> {
         let name = parse_cairo_short_string(&event.data[0])?;
 

diff --git a/crates/torii/core/src/processors/store_set_record.rs b/crates/torii/core/src/processors/store_set_record.rs
@@ -1,6 +1,6 @@
 use anyhow::{Error, Ok, Result};
 use async_trait::async_trait;
-use starknet::core::types::{BlockId, BlockTag, Event, InvokeTransactionReceipt};
+use starknet::core::types::{BlockId, BlockTag, BlockWithTxs, Event, InvokeTransactionReceipt};
 use starknet::core::utils::parse_cairo_short_string;
 use starknet::providers::Provider;
 use starknet_crypto::FieldElement;
@@ -27,17 +27,18 @@ impl<P: Provider + Sync + 'static> EventProcessor<P> for StoreSetRecordProcessor
         world: &WorldContractReader<'_, P>,
         db: &mut Sql,
         _provider: &P,
-        transaction_receipt: &InvokeTransactionReceipt,
+        _block: &BlockWithTxs,
+        _transaction_receipt: &InvokeTransactionReceipt,
         event: &Event,
-        event_idx: usize,
+        block_event_id: &str,
     ) -> Result<(), Error> {
         let name = parse_cairo_short_string(&event.data[MODEL_INDEX])?;
         info!("store set record: {}", name);
 
         let model = world.model(&name, BlockId::Tag(BlockTag::Pending)).await?;
         let keys = values_at(&event.data, NUM_KEYS_INDEX)?;
         let entity = model.entity(keys, BlockId::Tag(BlockTag::Pending)).await?;
-        db.set_entity(entity, transaction_receipt.block_number, event_idx).await?;
+        db.set_entity(entity, block_event_id).await?;
         Ok(())
     }
 }

diff --git a/crates/torii/core/src/sql.rs b/crates/torii/core/src/sql.rs
@@ -129,7 +129,7 @@ impl Sql {
         Ok(())
     }
 
-    pub async fn set_entity(&mut self, entity: Ty, block_num: u64, event_idx: usize) -> Result<()> {
+    pub async fn set_entity(&mut self, entity: Ty, block_event_id: &str) -> Result<()> {
         let keys = if let Ty::Struct(s) = &entity {
             let mut keys = Vec::new();
             for m in s.keys() {
@@ -155,15 +155,14 @@ impl Sql {
 
         let keys_str = felts_sql_string(&keys);
         self.query_queue.push(format!(
-            "INSERT INTO entities (id, keys, model_names) VALUES ('{}', '{}', '{}') ON \
-             CONFLICT(id) DO UPDATE SET model_names=excluded.model_names, \
+            "INSERT INTO entities (id, keys, model_names, block_event_id) VALUES ('{}', '{}', \
+             '{}', '{}') ON CONFLICT(id) DO UPDATE SET model_names=excluded.model_names, \
              updated_at=CURRENT_TIMESTAMP",
-            entity_id, keys_str, model_names
+            entity_id, keys_str, model_names, block_event_id
         ));
 
         let path = vec![entity.name()];
-        let id = format!("0x{:064x}:0x{:04x}", block_num, event_idx);
-        self.build_set_entity_queries_recursive(path, &id, &entity_id, &entity);
+        self.build_set_entity_queries_recursive(path, block_event_id, &entity_id, &entity);
 
         self.execute().await?;
 
@@ -177,6 +176,7 @@ impl Sql {
             id: entity_id.clone(),
             keys: keys_str,
             model_names,
+            block_event_id: block_event_id.to_string(),
             created_at,
             updated_at: Utc::now(),
         });
@@ -219,15 +219,19 @@ impl Sql {
         self.query_queue.push(query);
     }
 
-    pub fn store_event(&mut self, event: &Event, event_idx: usize, transaction_hash: FieldElement) {
+    pub fn store_event(
+        &mut self,
+        event: &Event,
+        block_event_id: &str,
+        transaction_hash: FieldElement,
+    ) {
         let keys_str = felts_sql_string(&event.keys);
         let data_str = felts_sql_string(&event.data);
 
-        let id = format!("0x{:064x}:0x{:04x}", transaction_hash, event_idx);
         let query = format!(
             "INSERT OR IGNORE INTO events (id, keys, data, transaction_hash) VALUES ('{}', '{}', \
              '{}', '{:#x}')",
-            id, keys_str, data_str, transaction_hash
+            block_event_id, keys_str, data_str, transaction_hash
         );
 
         self.query_queue.push(query);

diff --git a/crates/torii/core/src/sql_test.rs b/crates/torii/core/src/sql_test.rs
@@ -92,13 +92,14 @@ async fn test_load_from_remote() {
     assert_eq!(packed_size, 1);
     assert_eq!(unpacked_size, 2);
 
+    let block_event_id = format!("0x{:064x}:0x{:04x}", 42, 69);
     db.store_event(
         &Event {
             from_address: FieldElement::ONE,
             keys: Vec::from([FieldElement::TWO]),
             data: Vec::from([FieldElement::TWO, FieldElement::THREE]),
         },
-        0,
+        &block_event_id,
         FieldElement::THREE,
     );
 

diff --git a/crates/torii/core/src/types.rs b/crates/torii/core/src/types.rs
@@ -34,6 +34,7 @@ pub struct Entity {
     pub id: String,
     pub keys: String,
     pub model_names: String,
+    pub block_event_id: String,
     pub created_at: DateTime<Utc>,
     pub updated_at: DateTime<Utc>,
 }

diff --git a/crates/torii/graphql/src/object/entity.rs b/crates/torii/graphql/src/object/entity.rs
@@ -32,6 +32,7 @@ impl Default for EntityObject {
                 (Name::new("id"), TypeData::Simple(TypeRef::named(TypeRef::ID))),
                 (Name::new("keys"), TypeData::Simple(TypeRef::named_list(TypeRef::STRING))),
                 (Name::new("modelNames"), TypeData::Simple(TypeRef::named(TypeRef::STRING))),
+                (Name::new("blockEventId"), TypeData::Simple(TypeRef::named(TypeRef::STRING))),
                 (
                     Name::new("createdAt"),
                     TypeData::Simple(TypeRef::named(GraphqlType::DateTime.to_string())),
@@ -52,6 +53,7 @@ impl EntityObject {
             (Name::new("id"), Value::from(entity.id)),
             (Name::new("keys"), Value::from(keys)),
             (Name::new("modelNames"), Value::from(entity.model_names)),
+            (Name::new("blockEventId"), Value::from(entity.block_event_id)),
             (
                 Name::new("createdAt"),
                 Value::from(entity.created_at.format("%Y-%m-%d %H:%M:%S").to_string()),

diff --git a/crates/torii/graphql/src/tests/mod.rs b/crates/torii/graphql/src/tests/mod.rs
@@ -184,8 +184,7 @@ pub async fn entity_fixtures(db: &mut Sql) {
                 },
             ],
         }),
-        0,
-        0,
+        &format!("0x{:064x}:0x{:04x}", 0, 0),
     )
     .await
     .unwrap();
@@ -220,8 +219,7 @@ pub async fn entity_fixtures(db: &mut Sql) {
                 },
             ],
         }),
-        0,
-        1,
+        &format!("0x{:064x}:0x{:04x}", 0, 1),
     )
     .await
     .unwrap();
@@ -258,8 +256,7 @@ pub async fn entity_fixtures(db: &mut Sql) {
                 },
             ],
         }),
-        0,
-        2,
+        &format!("0x{:064x}:0x{:04x}", 0, 2),
     )
     .await
     .unwrap();
@@ -294,8 +291,7 @@ pub async fn entity_fixtures(db: &mut Sql) {
                 },
             ],
         }),
-        0,
-        3,
+        &format!("0x{:064x}:0x{:04x}", 0, 3),
     )
     .await
     .unwrap();

diff --git a/crates/torii/migrations/20230316154230_setup.sql b/crates/torii/migrations/20230316154230_setup.sql
@@ -67,13 +67,13 @@ CREATE TABLE entities (
     id TEXT NOT NULL PRIMARY KEY,
     keys TEXT,
     model_names TEXT,
+    block_event_id TEXT NOT NULL,
     created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
     updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 
 CREATE INDEX idx_entities_keys ON entities (keys);
-
-CREATE INDEX idx_entities_keys_create_on ON entities (keys, created_at);
+CREATE INDEX idx_entities_block_event_id ON entities (block_event_id);
 
 CREATE TABLE events (
     id TEXT NOT NULL PRIMARY KEY,