-
Notifications
You must be signed in to change notification settings - Fork 1.9k
feat-add: anchor cli balance #3939
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
dotslashapaar
wants to merge
1
commit into
solana-foundation:master
from
dotslashapaar:feat/anchor-cli-balance
+58
−0
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -350,6 +350,16 @@ pub enum Command { | |||||||||
| #[clap(value_enum)] | ||||||||||
| shell: clap_complete::Shell, | ||||||||||
| }, | ||||||||||
| #[clap(name = "balance", alias = "balance")] | ||||||||||
| /// Get your balance | ||||||||||
| Balance { | ||||||||||
| /// Account balance to check (defaults to configured wallet) | ||||||||||
| #[clap(index = 1, value_name = "ACCOUNT_ADDRESS")] | ||||||||||
| pubkey: Option<Pubkey>, | ||||||||||
|
Comment on lines
+357
to
+358
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
For consistency with other options |
||||||||||
| /// Display balance in lamports instead of SOL | ||||||||||
| #[clap(long)] | ||||||||||
| lamports: bool, | ||||||||||
| }, | ||||||||||
| } | ||||||||||
|
|
||||||||||
| #[derive(Debug, Parser)] | ||||||||||
|
|
@@ -915,6 +925,7 @@ fn process_command(opts: Opts) -> Result<()> { | |||||||||
| ); | ||||||||||
| Ok(()) | ||||||||||
| } | ||||||||||
| Command::Balance { pubkey, lamports } => balance(&opts.cfg_override, pubkey, lamports), | ||||||||||
| } | ||||||||||
| } | ||||||||||
|
|
||||||||||
|
|
@@ -4417,6 +4428,53 @@ fn create_client<U: ToString>(url: U) -> RpcClient { | |||||||||
| RpcClient::new_with_commitment(url, CommitmentConfig::confirmed()) | ||||||||||
| } | ||||||||||
|
|
||||||||||
| fn balance(cfg_override: &ConfigOverride, pubkey: Option<Pubkey>, lamports: bool) -> Result<()> { | ||||||||||
| // Get config or use defaults when outside workspace | ||||||||||
| let (cluster_url, wallet_path) = match Config::discover(cfg_override) { | ||||||||||
| Ok(Some(cfg)) => ( | ||||||||||
| cfg.provider.cluster.url().to_string(), | ||||||||||
| cfg.provider.wallet.to_string(), | ||||||||||
| ), | ||||||||||
| _ => { | ||||||||||
| // Default to mainnet and standard Solana CLI keypair path | ||||||||||
| let default_cluster = "https://api.mainnet-beta.solana.com".to_string(); | ||||||||||
| let default_keypair = dirs::home_dir() | ||||||||||
| .map(|home| { | ||||||||||
| home.join(".config/solana/id.json") | ||||||||||
| .to_string_lossy() | ||||||||||
| .to_string() | ||||||||||
| }) | ||||||||||
| .unwrap_or_else(|| "~/.config/solana/id.json".to_string()); | ||||||||||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||||||||||
| (default_cluster, default_keypair) | ||||||||||
| } | ||||||||||
| }; | ||||||||||
|
|
||||||||||
| // Create RPC client from cluster URL | ||||||||||
| let client = RpcClient::new(cluster_url); | ||||||||||
|
|
||||||||||
| // Determine the actual pubkey to check | ||||||||||
| let actual_pubkey = if let Some(pubkey) = pubkey { | ||||||||||
| pubkey | ||||||||||
| } else { | ||||||||||
| // Load keypair from wallet path and get pubkey | ||||||||||
| let keypair = Keypair::read_from_file(wallet_path) | ||||||||||
| .map_err(|e| anyhow!("Failed to read keypair: {}", e))?; | ||||||||||
| keypair.pubkey() | ||||||||||
| }; | ||||||||||
|
|
||||||||||
| // Get balance | ||||||||||
| let balance = client.get_balance(&actual_pubkey)?; | ||||||||||
|
|
||||||||||
| // Format and display output | ||||||||||
| if lamports { | ||||||||||
| println!("{}", balance); | ||||||||||
| } else { | ||||||||||
| println!("{:.9} SOL", balance as f64 / 1_000_000_000.0); | ||||||||||
| } | ||||||||||
|
|
||||||||||
| Ok(()) | ||||||||||
| } | ||||||||||
|
|
||||||||||
| #[cfg(test)] | ||||||||||
| mod tests { | ||||||||||
| use super::*; | ||||||||||
|
|
||||||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.