torii!: change type of id in erc_transfers

crates/torii/core/src/engine.rs

@@ -610,6 +610,8 @@
         let mut unique_contracts = HashSet::new();
         // Contract -> Cursor
         for (event_idx, event) in events.iter().enumerate() {
+            // NOTE: erc* processors expect the event_id to be in this format to get
+            // transaction_hash:
             let event_id =
                 format!("{:#064x}:{:#x}:{:#04x}", block_number, transaction_hash, event_idx);
 
@@ -681,6 +683,8 @@
 
                 unique_contracts.insert(event.from_address);
 
+                // NOTE: erc* processors expect the event_id to be in this format to get
+                // transaction_hash:
                 let event_id =
                     format!("{:#064x}:{:#x}:{:#04x}", block_number, *transaction_hash, event_idx);
 
@@ -899,3 +903,8 @@
         MaybePendingBlockWithTxHashes::PendingBlock(block) => Ok(block.timestamp),
     }
 }
+
+// event_id format: block_number:transaction_hash:event_idx
+pub fn get_transaction_hash_from_event_id(event_id: &str) -> String {
+    event_id.split(':').nth(1).unwrap().to_string()
+}

crates/torii/core/src/processors/erc20_legacy_transfer.rs

@@ -40,7 +40,7 @@
         db: &mut Sql,
         _block_number: u64,
         block_timestamp: u64,
-        _event_id: &str,
+        event_id: &str,
         event: &Event,
     ) -> Result<(), Error> {
         let token_address = event.from_address;
@@ -50,8 +50,16 @@
         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, world.provider(), block_timestamp)
-            .await?;
+        db.handle_erc20_transfer(
+            token_address,
+            from,
+            to,
+            value,
+            world.provider(),
+            block_timestamp,
+            event_id,
+        )
+        .await?;
         debug!(target: LOG_TARGET,from = ?from, to = ?to, value = ?value, "Legacy ERC20 Transfer");
 
         Ok(())

crates/torii/core/src/processors/erc20_transfer.rs

@@ -40,7 +40,7 @@
         db: &mut Sql,
         _block_number: u64,
         block_timestamp: u64,
-        _event_id: &str,
+        event_id: &str,
         event: &Event,
     ) -> Result<(), Error> {
         let token_address = event.from_address;
@@ -50,8 +50,16 @@
         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, world.provider(), block_timestamp)
-            .await?;
+        db.handle_erc20_transfer(
+            token_address,
+            from,
+            to,
+            value,
+            world.provider(),
+            block_timestamp,
+            event_id,
+        )
+        .await?;
         debug!(target: LOG_TARGET,from = ?from, to = ?to, value = ?value, "ERC20 Transfer");
 
         Ok(())

crates/torii/core/src/processors/erc721_legacy_transfer.rs

@@ -40,7 +40,7 @@
         db: &mut Sql,
         _block_number: u64,
         block_timestamp: u64,
-        _event_id: &str,
+        event_id: &str,
         event: &Event,
     ) -> Result<(), Error> {
         let token_address = event.from_address;
@@ -57,6 +57,7 @@
             token_id,
             world.provider(),
             block_timestamp,
+            event_id,
         )
         .await?;
         debug!(target: LOG_TARGET, from = ?from, to = ?to, token_id = ?token_id, "ERC721 Transfer");

crates/torii/core/src/processors/erc721_transfer.rs

@@ -40,7 +40,7 @@
         db: &mut Sql,
         _block_number: u64,
         block_timestamp: u64,
-        _event_id: &str,
+        event_id: &str,
         event: &Event,
     ) -> Result<(), Error> {
         let token_address = event.from_address;
@@ -57,6 +57,7 @@
             token_id,
             world.provider(),
             block_timestamp,
+            event_id,
         )
         .await?;
         debug!(target: LOG_TARGET, from = ?from, to = ?to, token_id = ?token_id, "ERC721 Transfer");

crates/torii/core/src/sql/erc.rs

@@ -25,6 +25,7 @@
         amount: U256,
         provider: &P,
         block_timestamp: u64,
+        event_id: &str,
     ) -> Result<()> {
         // contract_address
         let token_id = felt_to_sql_string(&contract_address);
@@ -43,6 +44,7 @@
             amount,
             &token_id,
             block_timestamp,
+            event_id,
         )?;
 
         if from_address != Felt::ZERO {
@@ -79,6 +81,7 @@
         token_id: U256,
         provider: &P,
         block_timestamp: u64,
+        event_id: &str,
     ) -> Result<()> {
         // contract_address:id
         let token_id = felt_and_u256_to_sql_string(&contract_address, &token_id);
@@ -96,6 +99,7 @@
             U256::from(1u8),
             &token_id,
             block_timestamp,
+            event_id,
         )?;
 
         // from_address/contract_address:id
@@ -307,6 +311,7 @@
         Ok(())
     }
 
+    #[allow(clippy::too_many_arguments)]
     fn store_erc_transfer_event(
         &mut self,
         contract_address: Felt,
@@ -315,13 +320,16 @@
         amount: U256,
         token_id: &str,
         block_timestamp: u64,
+        event_id: &str,
     ) -> Result<()> {
-        let insert_query = "INSERT INTO erc_transfers (contract_address, from_address, \
-                            to_address, amount, token_id, executed_at) VALUES (?, ?, ?, ?, ?, ?)";
+        let insert_query = "INSERT INTO erc_transfers (id, contract_address, from_address, \
+                            to_address, amount, token_id, executed_at) VALUES (?, ?, ?, ?, ?, ?, \
+                            ?)";
 
         self.executor.send(QueryMessage::other(
             insert_query.to_string(),
             vec![
+                Argument::String(event_id.to_string()),
                 Argument::FieldElement(contract_address),
                 Argument::FieldElement(from),
                 Argument::FieldElement(to),

crates/torii/graphql/src/mapping.rs

@@ -146,25 +146,26 @@ lazy_static! {
     ]);
 
     pub static ref ERC_BALANCE_TYPE_MAPPING: TypeMapping = IndexMap::from([
-        (Name::new("balance"), TypeData::Simple(TypeRef::named(TypeRef::STRING))),
-        (Name::new("type"), TypeData::Simple(TypeRef::named(TypeRef::STRING))),
-        (Name::new("tokenMetadata"), TypeData::Simple(TypeRef::named(ERC_TOKEN_TYPE_NAME))),
+        (Name::new("balance"), TypeData::Simple(TypeRef::named_nn(TypeRef::STRING))),
+        (Name::new("type"), TypeData::Simple(TypeRef::named_nn(TypeRef::STRING))),
+        (Name::new("tokenMetadata"), TypeData::Simple(TypeRef::named_nn(ERC_TOKEN_TYPE_NAME))),
     ]);
 
     pub static ref ERC_TRANSFER_TYPE_MAPPING: TypeMapping = IndexMap::from([
-        (Name::new("from"), TypeData::Simple(TypeRef::named(TypeRef::STRING))),
-        (Name::new("to"), TypeData::Simple(TypeRef::named(TypeRef::STRING))),
-        (Name::new("amount"), TypeData::Simple(TypeRef::named(TypeRef::STRING))),
-        (Name::new("type"), TypeData::Simple(TypeRef::named(TypeRef::STRING))),
-        (Name::new("executedAt"), TypeData::Simple(TypeRef::named(TypeRef::STRING))),
-        (Name::new("tokenMetadata"), TypeData::Simple(TypeRef::named(ERC_TOKEN_TYPE_NAME))),
+        (Name::new("from"), TypeData::Simple(TypeRef::named_nn(TypeRef::STRING))),
+        (Name::new("to"), TypeData::Simple(TypeRef::named_nn(TypeRef::STRING))),
+        (Name::new("amount"), TypeData::Simple(TypeRef::named_nn(TypeRef::STRING))),
+        (Name::new("type"), TypeData::Simple(TypeRef::named_nn(TypeRef::STRING))),
+        (Name::new("executedAt"), TypeData::Simple(TypeRef::named_nn(TypeRef::STRING))),
+        (Name::new("tokenMetadata"), TypeData::Simple(TypeRef::named_nn(ERC_TOKEN_TYPE_NAME))),
+        (Name::new("transactionHash"), TypeData::Simple(TypeRef::named_nn(TypeRef::STRING))),
     ]);
 
     pub static ref ERC_TOKEN_TYPE_MAPPING: TypeMapping = IndexMap::from([
-        (Name::new("name"), TypeData::Simple(TypeRef::named(TypeRef::STRING))),
-        (Name::new("symbol"), TypeData::Simple(TypeRef::named(TypeRef::STRING))),
-        (Name::new("tokenId"), TypeData::Simple(TypeRef::named(TypeRef::STRING))),
-        (Name::new("decimals"), TypeData::Simple(TypeRef::named(TypeRef::STRING))),
-        (Name::new("contractAddress"), TypeData::Simple(TypeRef::named(TypeRef::STRING))),
+        (Name::new("name"), TypeData::Simple(TypeRef::named_nn(TypeRef::STRING))),
+        (Name::new("symbol"), TypeData::Simple(TypeRef::named_nn(TypeRef::STRING))),
+        (Name::new("tokenId"), TypeData::Simple(TypeRef::named_nn(TypeRef::STRING))),
+        (Name::new("decimals"), TypeData::Simple(TypeRef::named_nn(TypeRef::STRING))),
+        (Name::new("contractAddress"), TypeData::Simple(TypeRef::named_nn(TypeRef::STRING))),
     ]);
 }

crates/torii/graphql/src/object/erc/erc_transfer.rs

@@ -4,6 +4,7 @@
 use serde::Deserialize;
 use sqlx::{FromRow, Pool, Sqlite, SqliteConnection};
 use starknet_crypto::Felt;
+use torii_core::engine::get_transaction_hash_from_event_id;
 use torii_core::sql::utils::felt_to_sql_string;
 use tracing::warn;
 
@@ -70,6 +71,7 @@
     let query = format!(
         r#"
 SELECT
+    et.id,
     et.contract_address,
     et.from_address,
     et.to_address,
@@ -79,7 +81,7 @@
     t.name,
     t.symbol,
     t.decimals,
     c.contract_type
 FROM
     erc_transfers et
 JOIN
@@ -102,6 +104,7 @@
 
     for row in rows {
         let row = TransferQueryResultRaw::from_row(&row)?;
+        let transaction_hash = get_transaction_hash_from_event_id(&row.id);
 
         let transfer_value = match row.contract_type.to_lowercase().as_str() {
             "erc20" => {
@@ -121,6 +124,7 @@
                     (Name::new("type"), Value::String(row.contract_type)),
                     (Name::new("executedAt"), Value::String(row.executed_at)),
                     (Name::new("tokenMetadata"), token_metadata),
+                    (Name::new("transactionHash"), Value::String(transaction_hash)),
                 ]))
             }
             "erc721" => {
@@ -143,6 +147,7 @@
                     (Name::new("type"), Value::String(row.contract_type)),
                     (Name::new("executedAt"), Value::String(row.executed_at)),
                     (Name::new("tokenMetadata"), token_metadata),
+                    (Name::new("transactionHash"), Value::String(transaction_hash)),
                 ]))
             }
             _ => {
@@ -168,6 +173,7 @@
 #[derive(FromRow, Deserialize, Debug, Clone)]
 #[serde(rename_all = "camelCase")]
 struct TransferQueryResultRaw {
+    pub id: String,
     pub contract_address: String,
     pub from_address: String,
     pub to_address: String,

crates/torii/migrations/20240913104418_add_erc.sql

@@ -23,7 +23,7 @@ CREATE TABLE tokens (
 );
 
 CREATE TABLE erc_transfers (
-    id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    id TEXT NOT NULL PRIMARY KEY,
     contract_address TEXT NOT NULL,
     from_address TEXT NOT NULL,
     to_address TEXT NOT NULL,