Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions clap-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ name = "solana_clap_utils"
[dependencies]
chrono = { workspace = true, features = ["default"] }
clap = "2.33.0"
dirs-next = { workspace = true }
rpassword = { workspace = true }
solana-clock = { workspace = true }
solana-cluster-type = { workspace = true }
Expand Down
9 changes: 8 additions & 1 deletion clap-utils/src/keypair.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,17 @@ impl DefaultSigner {
}
})
.map_err(|_| {
// Use the system default path in the error message instead of the configured path
let default_path = dirs_next::home_dir()
.map(|mut path| {
path.extend([".config", "solana", "id.json"]);
path.to_str().unwrap_or(&self.path).to_string()
})
.unwrap_or_else(|| self.path.clone());
std::io::Error::other(format!(
"No default signer found, run \"solana-keygen new -o {}\" to create a new \
one",
self.path
default_path
))
})?;
*self.is_path_checked.borrow_mut() = true;
Expand Down
1 change: 1 addition & 0 deletions clap-v3-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ elgamal = ["dep:solana-zk-sdk"]
[dependencies]
chrono = { workspace = true, features = ["default"] }
clap = { version = "3.2.23", features = ["cargo"] }
dirs-next = { workspace = true }
rpassword = { workspace = true }
solana-clock = { workspace = true }
solana-cluster-type = { workspace = true }
Expand Down
9 changes: 8 additions & 1 deletion clap-v3-utils/src/keypair.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,17 @@ impl DefaultSigner {
}
})
.map_err(|_| {
// Use the system default path in the error message instead of the configured path
let default_path = dirs_next::home_dir()
.map(|mut path| {
path.extend([".config", "solana", "id.json"]);
path.to_str().unwrap_or(&self.path).to_string()
})
.unwrap_or_else(|| self.path.clone());
std::io::Error::other(format!(
"No default signer found, run \"solana-keygen new -o {}\" to create a new \
one",
self.path
default_path
))
})?;
*self.is_path_checked.borrow_mut() = true;
Expand Down
1 change: 1 addition & 0 deletions programs/sbf/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading