update

Cargo.toml

@@ -5,7 +5,7 @@ members = [
     "crates/context-macro",
     "crates/fmt",
     "crates/ops",
-    "crates/rika",
+    # "crates/rika",
     "crates/waiter",
 ]
 resolver = "2"
@@ -24,6 +24,7 @@ rika-args = { path = "crates/args" }
 rika-fmt = { path = "crates/fmt" }
 rika-ops = { path = "crates/ops" }
 
+alloy-primitives = "0.7.0"
 chrono = "0.4.23"
 clap = { version = "4.1.8", features = [ "derive", "env" ] }
 clap_complete = "4.1.0"

bin/src/cli.rs

@@ -21,17 +21,18 @@ pub mod rpc {
 
     pub fn execute(command: RpcCommands) -> Result<()> {
         match command {
-            RpcCommands::Call(args) => ops::rpc::call::call(args)?,
-            RpcCommands::Balance(args) => ops::rpc::balance::get(args)?,
-            RpcCommands::Tx(args) => ops::rpc::transaction::get(args)?,
-            RpcCommands::TxCount(args) => ops::rpc::transaction::count(args)?,
-            RpcCommands::TxStatus(args) => ops::rpc::transaction::status(args)?,
+            // RpcCommands::Call(args) => ops::rpc::call::call(args)?,
+            // RpcCommands::Balance(args) => ops::rpc::balance::get(args)?,
+            // RpcCommands::Tx(args) => ops::rpc::transaction::get(args)?,
+            // RpcCommands::TxCount(args) => ops::rpc::transaction::count(args)?,
+            // RpcCommands::TxStatus(args) => ops::rpc::transaction::status(args)?,
             RpcCommands::Receipt(args) => ops::rpc::transaction::receipt(args)?,
-            RpcCommands::Rpc(args) => ops::rpc::raw::send(args)?,
-            RpcCommands::Block(args) => ops::rpc::block::get(args)?,
-            RpcCommands::Age(args) => ops::rpc::block::age(args)?,
-            RpcCommands::BlockNumber(args) => ops::rpc::block::number(args)?,
-
+            // RpcCommands::Rpc(args) => ops::rpc::raw::send(args)?,
+            // RpcCommands::Block(args) => ops::rpc::block::get(args)?,
+            // RpcCommands::Age(args) => ops::rpc::block::age(args)?,
+            // RpcCommands::BlockNumber(args) => ops::rpc::block::number(args)?,
+            // RpcCommands::ChainId(args) => ops::rpc::chain::id(args)?,
+            // RpcCommands::Syncing(args) => ops::rpc::chain::syncing(args)?,
             _ => {
                 unimplemented!("This command is not implemented yet")
             }

crates/args/Cargo.toml

@@ -6,6 +6,8 @@ version.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+rika-fmt.workspace = true
+
 chrono.workspace = true
 clap.workspace = true
 clap_complete.workspace = true

crates/args/src/commands/rpc/block.rs

@@ -1,7 +1,8 @@
 use clap::Parser;
+use serde_json::Value;
 use starknet::core::types::BlockId;
 
-use crate::opts::display::DisplayOptions;
+use crate::opts::display::{DisplayOptions, JsonDisplay};
 use crate::opts::starknet::StarknetOptions;
 use crate::parser::BlockIdParser;
 
@@ -46,7 +47,7 @@ pub struct BlockArgs {
 
     #[command(flatten)]
     #[command(next_help_heading = "Display options")]
-    pub display: DisplayOptions,
+    pub display: DisplayOptions<JsonDisplay<Value>>,
 
     #[command(flatten)]
     #[command(next_help_heading = "Starknet options")]

crates/args/src/commands/rpc/chain.rs

@@ -1,17 +1,20 @@
 use clap::Parser;
 
-use crate::opts::starknet::StarknetOptions;
+use crate::opts::{display::DisplayOptions, starknet::StarknetOptions};
 
 #[derive(Debug, Parser)]
 pub struct ChainIdArgs {
     #[command(flatten)]
     #[command(next_help_heading = "Starknet options")]
-    starknet: StarknetOptions,
+    pub starknet: StarknetOptions,
 }
 
 #[derive(Debug, Parser)]
 pub struct SyncingArgs {
+    // #[command(flatten)]
+    // #[command(next_help_heading = "Display options")]
+    // pub display: DisplayOptions,
     #[command(flatten)]
     #[command(next_help_heading = "Starknet options")]
-    starknet: StarknetOptions,
+    pub starknet: StarknetOptions,
 }

crates/args/src/commands/rpc/state_update.rs

@@ -15,10 +15,9 @@ pub struct StateUpdateArgs {
     )]
     block_id: BlockId,
 
-    #[command(flatten)]
-    #[command(next_help_heading = "Display options")]
-    display: DisplayOptions,
-
+    // #[command(flatten)]
+    // #[command(next_help_heading = "Display options")]
+    // display: DisplayOptions,
     #[command(flatten)]
     #[command(next_help_heading = "Starknet options")]
     starknet: StarknetOptions,

crates/args/src/commands/rpc/transaction.rs

@@ -1,7 +1,9 @@
 use clap::Parser;
-use starknet::core::types::{BlockId, FieldElement};
+use starknet::core::types::{
+    BlockId, FieldElement, MaybePendingTransactionReceipt, Transaction, TransactionStatus,
+};
 
-use crate::opts::display::DisplayOptions;
+use crate::opts::display::{DisplayOptions, JsonDisplay};
 use crate::opts::starknet::StarknetOptions;
 use crate::parser::BlockIdParser;
 
@@ -12,7 +14,7 @@ pub struct TxArgs {
 
     #[command(flatten)]
     #[command(next_help_heading = "Display options")]
-    pub display: DisplayOptions,
+    pub display: DisplayOptions<JsonDisplay<Transaction>>,
 
     #[command(flatten)]
     #[command(next_help_heading = "Starknet options")]
@@ -29,6 +31,9 @@ pub struct TxCountArgs {
     )]
     pub block_id: BlockId,
 
+    #[command(flatten)]
+    pub display: DisplayOptions,
+
     #[command(flatten)]
     #[command(next_help_heading = "Starknet options")]
     pub starknet: StarknetOptions,
@@ -39,6 +44,10 @@ pub struct TxStatusArgs {
     #[arg(value_name = "TX_HASH")]
     pub hash: FieldElement,
 
+    #[command(flatten)]
+    #[command(next_help_heading = "Display options")]
+    pub display: DisplayOptions<JsonDisplay<TransactionStatus>>,
+
     #[command(flatten)]
     #[command(next_help_heading = "Starknet options")]
     pub starknet: StarknetOptions,
@@ -51,7 +60,7 @@ pub struct ReceiptArgs {
 
     #[command(flatten)]
     #[command(next_help_heading = "Display options")]
-    pub display: DisplayOptions,
+    pub display: DisplayOptions<JsonDisplay<MaybePendingTransactionReceipt>>,
 
     #[command(flatten)]
     #[command(next_help_heading = "Starknet options")]

crates/args/src/lib.rs

@@ -2,7 +2,7 @@
 
 pub mod account;
 pub mod commands;
-pub mod fmt;
+// pub mod fmt;
 pub mod opts;
 pub mod parser;
 mod utils;

crates/args/src/opts/display/mod.rs

@@ -4,20 +4,27 @@ use clap::Args;
 use eyre::Result;
 
 pub use self::json::JsonDisplay;
-use crate::fmt::Pretty;
+use rika_fmt::Pretty;
 
 #[derive(Debug, Args)]
-pub struct DisplayOptions<T>
+pub struct DisplayOptions<T = NullDisplayOptions>
 where
-    T: Args + RawDisplay,
+    T: Args,
 {
     #[command(flatten)]
     pub raw_format: T,
 }
 
+impl DisplayOptions {
+    pub fn print(&self, value: impl std::fmt::Display) -> Result<()> {
+        println!("{value}");
+        Ok(())
+    }
+}
+
 impl<T> DisplayOptions<T>
 where
-    T: RawDisplay + Args,
+    T: Args + RawDisplay,
 {
     pub fn print(&self, value: <T as RawDisplay>::Value) -> Result<()>
     where
@@ -44,3 +51,6 @@ pub trait RawDisplay {
         false
     }
 }
+
+#[derive(Debug, Args)]
+pub struct NullDisplayOptions;

crates/fmt/Cargo.toml

@@ -9,6 +9,8 @@ version.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+alloy-primitives.workspace = true
+bigdecimal = "0.4.3"
 chrono.workspace = true
 prettytable-rs = "0.10.0"
 starknet.workspace = true

crates/fmt/src/lib.rs

@@ -1,16 +1,9 @@
-use std::vec;
+mod rpc;
+pub mod utils;
 
-use chrono::{Local, TimeZone};
-use prettytable::format::consts::FORMAT_NO_LINESEP_WITH_TITLE;
+use prettytable::format::TableFormat;
 use prettytable::Table;
-use starknet::core::types::{
-    DataAvailabilityMode, DeclareTransaction, DeployAccountTransaction, FieldElement,
-    MaybePendingBlockWithTxHashes, TransactionExecutionStatus, TransactionStatus,
-};
-use starknet::core::types::{
-    Event, InvokeTransaction, MaybePendingBlockWithTxs, MaybePendingTransactionReceipt, MsgToL1,
-    Transaction, TransactionReceipt,
-};
+use starknet::core::types::FieldElement;
 
 /// Display trait for pretty printing
 pub trait Pretty {
@@ -25,15 +18,22 @@ impl<T: Tabular> Pretty for T {
 
 /// Display trait for types that can be tabulated
 pub trait Tabular {
-    /// Convert the type to a prettytable::Table
-    fn tablify(&self) -> Table;
+    /// Build the table using the given table.
+    fn build_table(&self, table: &mut Table);
 
-    /// Get the default table format
-    fn with_default_table() -> Table {
+    /// Convert the type to a prettytable::Table
+    fn tablify(&self) -> Table {
         let mut table = Table::new();
-        table.set_format(*FORMAT_NO_LINESEP_WITH_TITLE);
+        table.set_format(Self::format());
+        self.build_table(&mut table);
         table
     }
+
+    /// Get the default table format
+    fn format() -> TableFormat {
+        use prettytable::format::consts::FORMAT_BOX_CHARS;
+        *FORMAT_BOX_CHARS
+    }
 }
 
 /// Macro for implementing the [Pretty] trait for types implement [LowerHex](std::fmt::LowerHex) trait.
@@ -50,3 +50,12 @@ macro_rules! pretty_for_lower_hex {
 }
 
 pretty_for_lower_hex!(FieldElement, u64);
+
+impl<T: Pretty> Pretty for Vec<T> {
+    fn prettify(&self) -> String {
+        self.iter()
+            .map(|i| i.prettify())
+            .collect::<Vec<String>>()
+            .join("\n")
+    }
+}