Merge pull request #292 from monadicus/feat-aot-env

feat(aot): support PRIVATE_KEY env and other cli options

crates/aot/Cargo.toml

@@ -30,7 +30,7 @@ axum.workspace = true
 bincode.workspace = true
 bech32.workspace = true
 checkpoint = { workspace = true, features = ["write"] }
-clap.workspace = true
+clap = { workspace = true, features = ["env"] }
 clap-stdin.workspace = true
 colored.workspace = true
 crossterm = { workspace = true, optional = true }

crates/aot/src/auth/args.rs

@@ -190,10 +190,10 @@ impl<N: Network> From<Authorization<N>> for ProxyAuthorization<N> {
 #[group(multiple = false)]
 pub struct FeeKey<N: Network> {
     /// Specify the account private key of the node
-    #[clap(long = "fee-private-key")]
+    #[clap(env, long)]
     pub fee_private_key: Option<PrivateKey<N>>,
     /// Specify the account private key of the node
-    #[clap(long = "fee-private-key-file")]
+    #[clap(env, long)]
     pub fee_private_key_file: Option<PathBuf>,
 }
 

crates/aot/src/auth/auth_deploy.rs

@@ -13,7 +13,7 @@ use crate::Network;
 #[derive(Debug, Args)]
 pub struct AuthDeployOptions<N: Network> {
     /// The query to use for the program.
-    #[clap(short, long)]
+    #[clap(env, short, long)]
     pub query: Option<String>,
     /// The program to deploy.
     /// This can be a file or stdin.

crates/aot/src/auth/auth_program.rs

@@ -8,7 +8,7 @@ use crate::{Authorization, Key, Network, Value};
 #[derive(Debug, Args)]
 pub struct AuthProgramOptions<N: Network> {
     /// Query to load the program with.
-    #[clap(short, long)]
+    #[clap(env, short, long)]
     pub query: Option<String>,
     /// Program ID and function name (eg. credits.aleo/transfer_public)
     locator: Locator<N>,

crates/aot/src/auth/execute.rs

@@ -25,7 +25,7 @@ pub struct Execute<N: Network> {
     #[arg(short, long, value_enum, default_value_t = ExecMode::Local)]
     pub exec_mode: ExecMode,
     /// Query endpoint.
-    #[arg(short, long)]
+    #[arg(env, short, long)]
     pub query: String,
     /// Whether to broadcast the transaction.
     #[arg(short, long, default_value_t = false)]

crates/aot/src/auth/mod.rs

@@ -42,7 +42,7 @@ pub enum AuthCommand<N: Network> {
 #[derive(Debug, Args)]
 pub struct CostCommand<N: Network> {
     /// The query to use for the program.
-    #[clap(long)]
+    #[clap(env, short, long)]
     query: Option<String>,
     #[clap(flatten)]
     auth: AuthArgs<N>,

crates/aot/src/genesis.rs

@@ -39,7 +39,7 @@ impl<N: Network, T: DeserializeOwned> FromStr for AddressMap<N, T> {
 pub struct Genesis<N: Network> {
     /// The private key to use when generating the genesis block. Generates one
     /// randomly if not passed.
-    #[clap(short, long)]
+    #[clap(env, short, long)]
     pub genesis_key: Option<PrivateKey<N>>,
 
     /// Where to write the genesis block to.

crates/aot/src/key.rs

@@ -11,10 +11,10 @@ use crate::{Network, PrivateKey};
 #[group(required = true, multiple = false)]
 pub struct Key<N: Network> {
     /// Specify the account private key of the node
-    #[clap(long = "private-key")]
+    #[clap(env, long)]
     pub private_key: Option<PrivateKey<N>>,
     /// Specify the account private key of the node
-    #[clap(long = "private-key-file")]
+    #[clap(env, long)]
     pub private_key_file: Option<PathBuf>,
 }