update

Author: kariy

Cargo.lock

@@ -15,28 +15,18 @@ version = "0.1.2"
 rika-args = { path = "args" }
 rika = { path = "rika" }
 
-async-trait = "0.1.60"
-cairo-lang-starknet = "2.5.3"
 chrono = "0.4.23"
 clap = { version = "4.1.8", features = ["derive", "env"] }
 clap_complete = "4.1.0"
-comfy-table = "6.1.4"
-crypto-bigint = "0.5.3"
-dunce = "1.0.3"
 eyre = "0.6.8"
 hex = "0.4.3"
-home = "0.5.4"
-inquire = "0.6.2"
-rand = "0.8.5"
 reqwest = { version = "0.11.12", features = [
-    "json",
-    "rustls-tls",
+  "json",
+  "rustls-tls",
 ], default-features = false }
-serde = "1.0.145"
-serde_json = "1.0.85"
-shellexpand = "3.0.0"
 starknet = "0.8.0"
-starknet-keystore = { git = "https://github.com/kariy/starknet-keystore-rs" }
+serde_json = "1.0.85"
+
+async-trait = "0.1.60"
 thiserror = "1.0.40"
-tokio = { version = "1.24.2", features = ["full"] }
-walkdir = "2.3.2"
+shellexpand = "3.0.0"

Cargo.toml

@@ -6,11 +6,19 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-reqwest = { version = "0.11.12", features = [
-    "json",
-    "rustls-tls",
-], default-features = false }
-clap = { version = "4.1.8", features = ["derive", "env"] }
-clap_complete = "4.1.0"
+reqwest.workspace = true
+clap.workspace = true
+clap_complete.workspace = true
+dunce = "1.0.3"
 eyre.workspace = true
-starknet = "0.8.0"
+starknet.workspace = true
+serde = "1.0.145"
+inquire = "0.6.2"
+hex.workspace = true
+serde_json.workspace = true
+rand = "0.8.5"
+starknet-keystore = { git = "https://github.com/kariy/starknet-keystore-rs" }
+walkdir = "2.3.2"
+shellexpand.workspace = true
+home = "0.5.4"
+thiserror.workspace = true

args/Cargo.toml

@@ -1,9 +1,10 @@
 pub mod simple_account;
 
-use super::{account::simple_account::SimpleWallet, parser::PathParser};
+use super::account::simple_account::SimpleWallet;
 use crate::opts::account::{utils::get_main_keystore_dir, WalletOptions};
 use crate::opts::starknet::StarknetChain;
-use crate::rika::utils::parse_hex_or_str_as_felt;
+use crate::utils::canonicalize_path;
+use crate::utils::parse_hex_or_str_as_felt;
 
 use std::path::PathBuf;
 use std::str::FromStr;
@@ -20,7 +21,7 @@ pub enum WalletCommands {
     New {
         #[arg(long)]
         #[arg(value_name = "PATH")]
-        #[arg(value_parser(PathParser))]
+        #[arg(value_parser = canonicalize_path)]
         #[arg(help = "If provided, then keypair will be written to an encrypted JSON keystore.")]
         path: Option<PathBuf>,
 
@@ -60,7 +61,7 @@ pub enum WalletCommands {
     Sign {
         #[arg(short, long)]
         #[arg(value_name = "PATH")]
-        #[arg(value_parser(PathParser))]
+        #[arg(value_parser = canonicalize_path)]
         keystore: Option<PathBuf>,
 
         #[arg(short, long)]

args/src/account/mod.rs

@@ -1,9 +1,8 @@
+use super::account::WalletCommands;
 use super::parser::BlockIdParser;
 use super::rpc::RpcArgs;
-use super::send::{DeployArgs, InvokeArgs, LegacyDeclareArgs};
-use super::{account::WalletCommands, send::DeclareArgs};
 use crate::opts::starknet::StarknetOptions;
-use crate::rika::utils::parse_event_keys;
+use crate::utils::parse_event_keys;
 
 use clap::{Parser, Subcommand};
 use clap_complete::Shell;
@@ -292,14 +291,6 @@ pub enum Commands {
         contract: PathBuf,
     },
 
-    #[command(visible_alias = "dec")]
-    #[command(about = "Declare a new contract class.")]
-    Declare(DeclareArgs),
-
-    #[command(visible_alias = "dep")]
-    #[command(about = "Deploy a new contract.")]
-    Deploy(DeployArgs),
-
     #[command(visible_alias = "ec")]
     #[command(about = "Perform ECDSA operations over the STARK-friendly elliptic curve.")]
     Ecdsa {
@@ -314,7 +305,7 @@ pub enum Commands {
     )]
     Events {
         #[arg(num_args(0..))]
-        #[arg(help = r"The values used to filter the events. 
+        #[arg(help = r"The values used to filter the events.
 Example: 0x12,0x23 0x34,0x45 - Which will be parsed as [[0x12,0x23], [0x34,0x45]]")]
         #[arg(value_parser = parse_event_keys)]
         keys: Option<Vec<Vec<FieldElement>>>,
@@ -357,21 +348,13 @@ Example: 0x12,0x23 0x34,0x45 - Which will be parsed as [[0x12,0x23], [0x34,0x45]
         keys: Vec<FieldElement>,
     },
 
-    #[command(visible_alias = "inv")]
-    #[command(about = "Submit a new transaction to be added to the chain.")]
-    Invoke(InvokeArgs),
-
     #[command(visible_alias = "kck")]
     #[command(about = "Hash abritrary data using StarkNet keccak.")]
     Keccak {
         #[arg(value_name = "DATA")]
         data: String,
     },
 
-    #[command(visible_alias = "ldec")]
-    #[command(about = "Declare a new legacy contract class.")]
-    LegacyDeclare(LegacyDeclareArgs),
-
     #[command(visible_alias = "n1")]
     #[command(about = "Get the latest nonce associated with the address.")]
     Nonce {
@@ -394,9 +377,9 @@ Example: 0x12,0x23 0x34,0x45 - Which will be parsed as [[0x12,0x23], [0x34,0x45]
     #[command(about = "Calculate the Pedersen hash on two field elements.")]
     Pedersen {
         #[arg(value_name = "X")]
-        x: String,
+        x: FieldElement,
         #[arg(value_name = "Y")]
-        y: String,
+        y: FieldElement,
     },
 
     #[command(about = "Perform a raw JSON-RPC request.")]
@@ -487,17 +470,6 @@ Example: 0x12,0x23 0x34,0x45 - Which will be parsed as [[0x12,0x23], [0x34,0x45]
         starknet: StarknetOptions,
     },
 
-    #[command(visible_alias = "txp")]
-    #[command(name = "tx-pending")]
-    #[command(
-        about = "Get the transactions in the transaction pool, recognized by the sequencer."
-    )]
-    TransactionPending {
-        #[command(flatten)]
-        #[command(next_help_heading = "Starknet options")]
-        starknet: StarknetOptions,
-    },
-
     #[command(visible_alias = "txs")]
     #[command(name = "tx-status")]
     #[command(about = "Get the status of a transaction.")]
@@ -577,7 +549,7 @@ pub enum EcdsaCommand {
 
 #[cfg(test)]
 mod tests {
-    use crate::cmd::args::Commands;
+    use crate::args::Commands;
 
     use super::Args;
     use clap::{CommandFactory, Parser};

args/src/args.rs

@@ -3,4 +3,4 @@ pub mod args;
 pub mod opts;
 pub mod parser;
 pub mod rpc;
-pub mod send;
+mod utils;

args/src/lib.rs

@@ -1,7 +1,7 @@
 pub mod utils;
 
 use self::utils::get_from_keystore;
-use crate::cmd::account::simple_account::SimpleWallet;
+use crate::account::simple_account::SimpleWallet;
 
 use std::{path::PathBuf, str::FromStr};
 

args/src/mod.rs

@@ -1,4 +1,4 @@
-use crate::cmd::account::simple_account::SimpleWallet;
+use crate::account::simple_account::SimpleWallet;
 
 use std::fs;
 use std::path::{Path, PathBuf};
@@ -39,7 +39,9 @@ pub fn find_keystore_file(
 
     if path.is_dir() {
         let Some(account) = account else {
-            return Err(eyre!("unable to find the keystore with unknown account address"))
+            return Err(eyre!(
+                "unable to find the keystore with unknown account address"
+            ));
         };
 
         let (_, file) = walkdir::WalkDir::new(path)

args/src/opts/account/mod.rs

@@ -1,4 +1,4 @@
-use crate::cmd::parser::ChainParser;
+use crate::parser::ChainParser;
 
 use std::{fmt, str::FromStr};