add ops crate

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = [ "bin", "crates/args", "crates/rika", "crates/waiter" ]
+members = [ "bin", "crates/args", "crates/ops", "crates/rika", "crates/waiter" ]
 resolver = "2"
 
 [workspace.package]
@@ -13,6 +13,7 @@ version = "0.1.0"
 
 [workspace.dependencies]
 rika-args = { path = "crates/args" }
+rika-ops = { path = "crates/ops" }
 
 chrono = "0.4.23"
 clap = { version = "4.1.8", features = [ "derive", "env" ] }

bin/Cargo.toml

@@ -13,5 +13,6 @@ clap.workspace = true
 color-eyre = "0.6.3"
 eyre.workspace = true
 rika-args.workspace = true
+rika-ops.workspace = true
 starknet.workspace = true
 tokio = { version = "1.36.0", features = [ "full" ] }

bin/src/main.rs

@@ -1,8 +1,7 @@
-mod utils;
-
 use clap::Parser;
 use eyre::Result;
 use rika_args::commands::{App, Commands};
+use rika_ops as ops;
 
 fn main() -> Result<()> {
     color_eyre::install()?;
@@ -12,19 +11,10 @@ fn main() -> Result<()> {
 
 fn execute(args: App) -> Result<()> {
     match args.command {
-        Commands::Receipt(_) => {
-            // args::execute()
-            // let provider = starknet.provider();
-            // let result = utils::block_on(provider.get_transaction_receipt(hash))?;
-            // display.display(result)?;
-        }
-
-        Commands::Tx(_) => {
-            // args::execute()
-            // let provider = starknet.provider();
-            // let result = utils::block_on(provider.get_transaction_by_hash(hash))?;
-            // display.display(result)?;
-        }
+        Commands::Tx(args) => ops::transaction::get(args)?,
+        Commands::TxCount(args) => ops::transaction::count(args)?,
+        Commands::TxStatus(args) => ops::transaction::status(args)?,
+        Commands::Receipt(args) => ops::transaction::receipt(args)?,
 
         _ => {
             unimplemented!("This command is not implemented yet")

crates/args/src/commands/transaction.rs

@@ -8,15 +8,15 @@ use crate::parser::BlockIdParser;
 #[derive(Debug, Parser)]
 pub struct TxArgs {
     #[arg(value_name = "TX_HASH")]
-    hash: FieldElement,
+    pub hash: FieldElement,
 
     #[command(flatten)]
     #[command(next_help_heading = "Display options")]
-    display: DisplayOptions,
+    pub display: DisplayOptions,
 
     #[command(flatten)]
     #[command(next_help_heading = "Starknet options")]
-    starknet: StarknetOptions,
+    pub starknet: StarknetOptions,
 }
 
 #[derive(Debug, Parser)]
@@ -27,33 +27,33 @@ pub struct TxCountArgs {
     #[arg(
         help = "The hash of the requested block, or number (height) of the requested block, or a block tag (e.g. latest, pending)."
     )]
-    block_id: BlockId,
+    pub block_id: BlockId,
 
     #[command(flatten)]
     #[command(next_help_heading = "Starknet options")]
-    starknet: StarknetOptions,
+    pub starknet: StarknetOptions,
 }
 
 #[derive(Debug, Parser)]
 pub struct TxStatusArgs {
     #[arg(value_name = "TX_HASH")]
-    hash: FieldElement,
+    pub hash: FieldElement,
 
     #[command(flatten)]
     #[command(next_help_heading = "Starknet options")]
-    starknet: StarknetOptions,
+    pub starknet: StarknetOptions,
 }
 
 #[derive(Debug, Parser)]
 pub struct ReceiptArgs {
     #[arg(value_name = "TX_HASH")]
-    hash: FieldElement,
+    pub hash: FieldElement,
 
     #[command(flatten)]
     #[command(next_help_heading = "Display options")]
-    display: DisplayOptions,
+    pub display: DisplayOptions,
 
     #[command(flatten)]
     #[command(next_help_heading = "Starknet options")]
-    starknet: StarknetOptions,
+    pub starknet: StarknetOptions,
 }

crates/args/src/fmt.rs

@@ -6,6 +6,7 @@ use comfy_table::presets::UTF8_FULL;
 use comfy_table::Table;
 use starknet::core::types::{
     DataAvailabilityMode, DeclareTransaction, DeployAccountTransaction, FieldElement,
+    TransactionExecutionStatus, TransactionStatus,
 };
 use starknet::core::types::{
     Event, InvokeTransaction, MaybePendingBlockWithTxs, MaybePendingTransactionReceipt, MsgToL1,
@@ -465,3 +466,31 @@ impl Pretty for DataAvailabilityMode {
         }
     }
 }
+
+impl Pretty for TransactionStatus {
+    fn prettify(&self) -> String {
+        match self {
+            TransactionStatus::AcceptedOnL1(s) => {
+                format!("ACCEPTED ON L1 ({})", s.prettify())
+            }
+            TransactionStatus::AcceptedOnL2(s) => {
+                format!("ACCEPTED ON L2 ({})", s.prettify())
+            }
+            TransactionStatus::Received => format!("RECEIVED"),
+            TransactionStatus::Rejected => format!("REJECTED"),
+        }
+    }
+}
+
+impl Pretty for TransactionExecutionStatus {
+    fn prettify(&self) -> String {
+        match self {
+            TransactionExecutionStatus::Succeeded => {
+                format!("Succeeded")
+            }
+            TransactionExecutionStatus::Reverted => {
+                format!("Reverted")
+            }
+        }
+    }
+}

crates/ops/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+authors.workspace = true
+description.workspace = true
+edition.workspace = true
+name = "rika-ops"
+repository.workspace = true
+version.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+eyre.workspace = true
+rika-args.workspace = true
+starknet.workspace = true
+thiserror.workspace = true
+tokio = { version = "1.37.0", features = [ "full" ] }

crates/ops/src/lib.rs

@@ -0,0 +1,2 @@
+pub mod transaction;
+mod utils;

crates/ops/src/transaction.rs

@@ -0,0 +1,56 @@
+use eyre::Result;
+use rika_args::{
+    commands::transaction::{ReceiptArgs, TxArgs, TxCountArgs, TxStatusArgs},
+    fmt::Pretty,
+};
+use starknet::providers::Provider;
+
+use crate::utils;
+
+pub fn get(args: TxArgs) -> Result<()> {
+    let TxArgs {
+        hash,
+        display,
+        starknet,
+    } = args;
+
+    let provider = starknet.provider();
+    let result = utils::block_on(provider.get_transaction_by_hash(hash))?;
+    display.display(result)?;
+
+    Ok(())
+}
+
+pub fn count(args: TxCountArgs) -> Result<()> {
+    let TxCountArgs { block_id, starknet } = args;
+
+    let provider = starknet.provider();
+    let count = utils::block_on(provider.get_block_transaction_count(block_id))?;
+    println!("{count}");
+
+    Ok(())
+}
+
+pub fn status(args: TxStatusArgs) -> Result<()> {
+    let TxStatusArgs { hash, starknet } = args;
+
+    let provider = starknet.provider();
+    let status = utils::block_on(provider.get_transaction_status(hash))?;
+    println!("{}", status.prettify());
+
+    Ok(())
+}
+
+pub fn receipt(args: ReceiptArgs) -> Result<()> {
+    let ReceiptArgs {
+        hash,
+        display,
+        starknet,
+    } = args;
+
+    let provider = starknet.provider();
+    let receipt = utils::block_on(provider.get_transaction_receipt(hash))?;
+    display.display(receipt)?;
+
+    Ok(())
+}