chore: improve output of -h/--help

cli/src/cast.rs

@@ -133,7 +133,7 @@ async fn main() -> eyre::Result<()> {
         }
         Subcommands::ToUnit { value, unit } => {
             let val = unwrap_or_stdin(value)?;
-            println!("{}", SimpleCast::to_unit(val, unit.unwrap_or_else(|| String::from("wei")))?);
+            println!("{}", SimpleCast::to_unit(val, unit)?);
         }
         Subcommands::ToWei { value, unit } => {
             let val = unwrap_or_stdin(value)?;
@@ -159,7 +159,7 @@ async fn main() -> eyre::Result<()> {
             let provider = Provider::try_from(eth.rpc_url()?)?;
             let mut builder = TxBuilder::new(
                 &provider,
-                eth.from.unwrap_or(Address::zero()),
+                eth.wallet.from.unwrap_or(Address::zero()),
                 address,
                 eth.chain,
                 false,
@@ -322,7 +322,7 @@ async fn main() -> eyre::Result<()> {
                         .await?;
                     }
                 }
-            } else if let Some(from) = eth.from {
+            } else if let Some(from) = eth.wallet.from {
                 if resend {
                     nonce = Some(provider.get_transaction_count(from, None).await?);
                 }
@@ -391,8 +391,8 @@ async fn main() -> eyre::Result<()> {
         Subcommands::AbiEncode { sig, args } => {
             println!("{}", SimpleCast::abi_encode(&sig, &args)?);
         }
-        Subcommands::Index { from_type, to_type, from_value, slot_number } => {
-            let encoded = SimpleCast::index(&from_type, &to_type, &from_value, &slot_number)?;
+        Subcommands::Index { key_type, value_type, key, slot_number } => {
+            let encoded = SimpleCast::index(&key_type, &value_type, &key, &slot_number)?;
             println!("{}", encoded);
         }
         Subcommands::FourByte { selector } => {
@@ -669,7 +669,6 @@ async fn main() -> eyre::Result<()> {
                 // TODO: Figure out better way to get wallet only.
                 let wallet = EthereumOpts {
                     wallet,
-                    from: None,
                     rpc_url: Some("http://localhost:8545".to_string()),
                     flashbots: false,
                     chain: Chain::Mainnet,
@@ -690,7 +689,6 @@ async fn main() -> eyre::Result<()> {
                 // TODO: Figure out better way to get wallet only.
                 let wallet = EthereumOpts {
                     wallet,
-                    from: None,
                     rpc_url: Some("http://localhost:8545".to_string()),
                     flashbots: false,
                     chain: Chain::Mainnet,

cli/src/cmd/cast/call.rs

@@ -49,7 +49,7 @@ impl figment::Provider for CallArgs {
             dict.insert("eth_rpc_url".to_string(), Value::from(rpc_url.to_string()));
         }
 
-        if let Some(from) = self.eth.from {
+        if let Some(from) = self.eth.wallet.from {
             dict.insert("sender".to_string(), Value::from(format!("{:?}", from)));
         }
 

cli/src/cmd/forge/bind.rs

@@ -40,15 +40,15 @@ pub struct BindArgs {
 
     #[clap(
         long = "crate-name",
-        help = "The name of the rust crate to generate. This should be a valid crates.io crate name. However, it is not currently validated by this command.",
+        help = "The name of the Rust crate to generate. This should be a valid crates.io crate name. However, it is not currently validated by this command.",
         default_value = DEFAULT_CRATE_NAME,
     )]
     #[serde(skip)]
     crate_name: String,
 
     #[clap(
         long = "crate-version",
-        help = "The version of the rust crate to generate. This should be a standard semver version string. However, it is not currently validated by this command.",
+        help = "The version of the Rust crate to generate. This should be a standard semver version string. However, it is not currently validated by this command.",
         default_value = DEFAULT_CRATE_VERSION,
     )]
     #[serde(skip)]
@@ -59,7 +59,7 @@ pub struct BindArgs {
 
     #[clap(
         long = "overwrite",
-        help = "Overwrite existing generated bindings. If set to false, the command will check that the bindings are correct, and then exit. If set to true, it will instead delete and overwrite the bindings."
+        help = "Overwrite existing generated bindings. By default, the command will check that the bindings are correct, and then exit. If --overwrite is passed, it will instead delete and overwrite the bindings."
     )]
     #[serde(skip)]
     overwrite: bool,