Skip to content

Commit

Permalink
Merge branch 'main' into alias
Browse files Browse the repository at this point in the history
  • Loading branch information
fnando authored Jun 11, 2024
2 parents ea24a9a + 0eace80 commit d28e46f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions cmd/soroban-cli/src/commands/contract/bindings/typescript.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ pub struct Cmd {
pub wasm: Option<std::path::PathBuf>,
/// Where to place generated project
#[arg(long)]
output_dir: PathBuf,
pub output_dir: PathBuf,
/// Whether to overwrite output directory if it already exists
#[arg(long)]
overwrite: bool,
pub overwrite: bool,
/// The contract ID/address on the network
#[arg(long, visible_alias = "id")]
contract_id: String,
pub contract_id: String,
#[command(flatten)]
locator: locator::Args,
pub locator: locator::Args,
#[command(flatten)]
network: network::Args,
pub network: network::Args,
}

#[derive(thiserror::Error, Debug)]
Expand Down
8 changes: 4 additions & 4 deletions cmd/soroban-cli/src/commands/contract/deploy/wasm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,18 @@ use crate::{
pub struct Cmd {
/// WASM file to deploy
#[arg(long, group = "wasm_src")]
wasm: Option<std::path::PathBuf>,
pub wasm: Option<std::path::PathBuf>,
/// Hash of the already installed/deployed WASM file
#[arg(long = "wasm-hash", conflicts_with = "wasm", group = "wasm_src")]
wasm_hash: Option<String>,
pub wasm_hash: Option<String>,
/// Custom salt 32-byte salt for the token id
#[arg(
long,
help_heading = HEADING_RPC,
)]
salt: Option<String>,
pub salt: Option<String>,
#[command(flatten)]
config: config::Args,
pub config: config::Args,
#[command(flatten)]
pub fee: crate::fee::Args,
#[arg(long, short = 'i', default_value = "false")]
Expand Down

0 comments on commit d28e46f

Please sign in to comment.