change table schema and core implementation

dojoengine · Aug 18, 2024 · 62a4f34 · 62a4f34
1 parent 705b55a
commit 62a4f34
Show file tree

Hide file tree

Showing 7 changed files with 263 additions and 95 deletions.
diff --git a/bin/torii/src/main.rs b/bin/torii/src/main.rs
@@ -194,9 +194,14 @@ async fn main() -> anyhow::Result<()> {
     // Get world address
     let world = WorldContractReader::new(args.world_address, &provider);
 
+    let erc_contracts = config
+        .erc_contracts
+        .iter()
+        .map(|contract| (contract.contract_address, contract.clone()))
+        .collect();
     let class_hash =
         provider.get_class_hash_at(BlockId::Tag(BlockTag::Pending), args.world_address).await?;
-    let db = Sql::new(pool.clone(), args.world_address, class_hash).await?;
+    let db = Sql::new(pool.clone(), args.world_address, class_hash, &erc_contracts).await?;
     let processors = Processors {
         event: vec![
             Box::new(RegisterModelProcessor),
@@ -229,11 +234,7 @@ async fn main() -> anyhow::Result<()> {
         },
         shutdown_tx.clone(),
         Some(block_tx),
-        config
-            .erc_contracts
-            .iter()
-            .map(|contract| (contract.contract_address, contract.clone()))
-            .collect(),
+        erc_contracts,
     );
 
     let shutdown_rx = shutdown_tx.subscribe();

diff --git a/crates/torii/core/src/processors/erc20_legacy_transfer.rs b/crates/torii/core/src/processors/erc20_legacy_transfer.rs
@@ -35,7 +35,7 @@ where
 
     async fn process(
         &self,
-        _world: &WorldContractReader<P>,
+        world: &WorldContractReader<P>,
         db: &mut Sql,
         _block_number: u64,
         _block_timestamp: u64,
@@ -50,7 +50,7 @@ where
         let value = U256Cainome::cairo_deserialize(&event.data, 2)?;
         let value = U256::from_words(value.low, value.high);
 
-        db.handle_erc20_transfer(token_address, from, to, value).await?;
+        db.handle_erc20_transfer(token_address, from, to, value, world.provider()).await?;
         info!(target: LOG_TARGET,from = ?from, to = ?to, value = ?value, "Legacy ERC20 Transfer");
 
         Ok(())

diff --git a/crates/torii/core/src/processors/erc20_transfer.rs b/crates/torii/core/src/processors/erc20_transfer.rs
@@ -35,7 +35,7 @@ where
 
     async fn process(
         &self,
-        _world: &WorldContractReader<P>,
+        world: &WorldContractReader<P>,
         db: &mut Sql,
         _block_number: u64,
         _block_timestamp: u64,
@@ -50,7 +50,7 @@ where
         let value = U256Cainome::cairo_deserialize(&event.data, 0)?;
         let value = U256::from_words(value.low, value.high);
 
-        db.handle_erc20_transfer(token_address, from, to, value).await?;
+        db.handle_erc20_transfer(token_address, from, to, value, world.provider()).await?;
         info!(target: LOG_TARGET,from = ?from, to = ?to, value = ?value, "ERC20 Transfer");
 
         Ok(())

diff --git a/crates/torii/core/src/processors/erc721_transfer.rs b/crates/torii/core/src/processors/erc721_transfer.rs
@@ -36,7 +36,7 @@ where
 
     async fn process(
         &self,
-        _world: &WorldContractReader<P>,
+        world: &WorldContractReader<P>,
         db: &mut Sql,
         _block_number: u64,
         _block_timestamp: u64,
@@ -51,7 +51,7 @@ where
         let token_id = U256Cainome::cairo_deserialize(&event.keys, 3)?;
         let token_id = U256::from_words(token_id.low, token_id.high);
 
-        db.handle_erc721_transfer(token_address, from, to, token_id).await?;
+        db.handle_erc721_transfer(token_address, from, to, token_id, world.provider()).await?;
         info!(target: LOG_TARGET, from = ?from, to = ?to, token_id = ?token_id, "ERC721 Transfer");
 
         Ok(())