Update torii params

cartridge-gg · Oct 30, 2024 · 4ad318d · 4ad318d
1 parent 260ba82
commit 4ad318d
Show file tree

Hide file tree

Showing 6 changed files with 302 additions and 15 deletions.
diff --git a/cli/src/command/deployments/create.rs b/cli/src/command/deployments/create.rs
@@ -69,9 +69,12 @@ impl CreateArgs {
                     torii: Some(CreateToriiConfigInput {
                         rpc: Some(config.rpc.clone().unwrap_or("".to_string())),
                         world: format!("{:#x}", config.world),
-                        start_block: Some(config.start_block.unwrap_or(0)),
+                        contracts: config.contracts.clone(),
+                        start_block: config.start_block,
                         index_pending: config.index_pending,
                         polling_interval: config.polling_interval,
+                        index_transactions: config.index_transactions,
+                        index_raw_events: config.index_raw_events,
                     }),
                     saya: None,
                 }),
@@ -132,8 +135,21 @@ impl CreateArgs {
                 println!("\nConfiguration:");
                 println!("  World: {}", config.world);
                 println!("  RPC: {}", config.rpc);
-                println!("  Start Block: {}", config.start_block.unwrap_or(0));
-                println!("  Index Pending: {}", config.index_pending.unwrap_or(false));
+                if let Some(contracts) = config.contracts {
+                    println!("  Contracts: {}", contracts);
+                }
+                if let Some(start_block) = config.start_block {
+                    println!("  Start Block: {}", start_block);
+                }
+                if let Some(index_pending) = config.index_pending {
+                    println!("  Index Pending: {}", index_pending);
+                }
+                if let Some(index_raw_events) = config.index_raw_events {
+                    println!("  Index Raw Events: {}", index_raw_events);
+                }
+                if let Some(index_transactions) = config.index_transactions {
+                    println!("  Index Transactions: {}", index_transactions);
+                }
                 println!("\nEndpoints:");
                 println!("  GRAPHQL: {}", config.graphql);
                 println!("  GRPC: {}", config.grpc);

diff --git a/cli/src/command/deployments/describe.rs b/cli/src/command/deployments/describe.rs
@@ -52,11 +52,21 @@ impl DescribeArgs {
                     println!("  Version: {}", config.version);
                     println!("  World: {}", config.world);
                     println!("  RPC: {}", config.rpc);
-                    println!("  Start Block: {}", config.start_block.unwrap_or(0));
-                    println!(
-                        "  Indexing Pending: {}",
-                        config.index_pending.unwrap_or(false)
-                    );
+                    if let Some(contracts) = config.contracts {
+                        println!("  Contracts: {}", contracts);
+                    }
+                    if let Some(start_block) = config.start_block {
+                        println!("  Start Block: {}", start_block);
+                    }
+                    if let Some(index_pending) = config.index_pending {
+                        println!("  Index Pending: {}", index_pending);
+                    }
+                    if let Some(index_raw_events) = config.index_raw_events {
+                        println!("  Index Raw Events: {}", index_raw_events);
+                    }
+                    if let Some(index_transactions) = config.index_transactions {
+                        println!("  Index Transactions: {}", index_transactions);
+                    }
                     println!("\nEndpoints:");
                     println!("  GraphQL: {}", config.graphql);
                     println!("  GRPC: {}", config.grpc);

diff --git a/cli/src/command/deployments/services/torii.rs b/cli/src/command/deployments/services/torii.rs
@@ -18,6 +18,11 @@ pub struct ToriiCreateArgs {
     #[arg(help = "World address.")]
     pub world: Felt,
 
+    #[arg(short, long)]
+    #[arg(value_name = "contracts")]
+    #[arg(help = "Contract addresses to index")]
+    pub contracts: Option<String>,
+
     #[arg(short, long)]
     #[arg(help = "Specify a block to start indexing from.")]
     pub start_block: Option<u64>,
@@ -29,6 +34,16 @@ pub struct ToriiCreateArgs {
     #[arg(long)]
     #[arg(help = "Polling interval in milliseconds.")]
     pub polling_interval: Option<u64>,
+
+    #[arg(long)]
+    #[arg(value_name = "index_transactions")]
+    #[arg(help = "Whether or not to index world transactions")]
+    pub index_transactions: Option<bool>,
+
+    #[arg(long)]
+    #[arg(value_name = "index_raw_events")]
+    #[arg(help = "Whether or not to index raw events")]
+    pub index_raw_events: Option<bool>,
 }
 
 #[derive(Clone, Debug, Args, serde::Serialize)]