-
Notifications
You must be signed in to change notification settings - Fork 26
refactor: improve keypair loading logic #27
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
Open
asamuj
wants to merge
2
commits into
spool-labs:main
Choose a base branch
from
asamuj:refactor_keypair
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
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 |
|---|---|---|
| @@ -1,42 +1,37 @@ | ||
| use solana_sdk::signature::Keypair; | ||
| use std::path::PathBuf; | ||
| use anyhow::{Result, anyhow}; | ||
| use std::fs; | ||
| use std::path::{Path, PathBuf}; | ||
|
|
||
| pub fn create_keypair(path: &PathBuf) -> Result<Keypair> { | ||
| let keypair = Keypair::new(); | ||
| let bytes = keypair.to_bytes().to_vec(); | ||
| let json = serde_json::to_string(&bytes) | ||
| .map_err(|e| anyhow!("Failed to serialize keypair to JSON: {}", e))?; | ||
| fs::write(path, json) | ||
| .map_err(|e| anyhow!("Failed to write keypair file {}: {}", path.display(), e))?; | ||
| Ok(keypair) | ||
| } | ||
| use anyhow::{anyhow, Result}; | ||
| use solana_sdk::{signature::Keypair, signer::EncodableKey}; | ||
|
|
||
| pub fn load_keypair(path: &PathBuf) -> Result<Keypair> { | ||
| let data = fs::read_to_string(path) | ||
| .map_err(|e| anyhow!("Failed to read keypair file {}: {}", path.display(), e))?; | ||
| let bytes: Vec<u8> = serde_json::from_str(&data) | ||
| .map_err(|e| anyhow!("Failed to parse keypair JSON: {}", e))?; | ||
| Keypair::from_bytes(&bytes) | ||
| .map_err(|e| anyhow!("Failed to create keypair from bytes: {}", e)) | ||
| /// Returns the keypair path. If `keypair_path` is `None`, defaults to `~/.config/solana/id.json`. | ||
| pub fn get_keypair_path<F: AsRef<Path>>(keypair_path: Option<F>) -> PathBuf { | ||
| keypair_path | ||
| .map(|p| p.as_ref().to_path_buf()) | ||
| .unwrap_or_else(|| { | ||
| dirs::home_dir() | ||
| .expect("Could not find home directory") | ||
| .join(".config/solana/id.json") | ||
| }) | ||
| } | ||
|
|
||
| /// Loads the keypair from a specified path or the default Solana keypair location. | ||
| pub fn get_keypair_path(keypair_path: Option<PathBuf>) -> PathBuf { | ||
| keypair_path.unwrap_or_else(|| { | ||
| dirs::home_dir() | ||
| .expect("Could not find home directory") | ||
| .join(".config/solana/id.json") | ||
| }) | ||
| } | ||
| /// Loads a `Keypair` from the given path. | ||
| /// | ||
| /// - If the file does **not exist**, a new keypair is generated and written to the path. | ||
| /// - If the file exists but is **malformed** or **unreadable**, returns a detailed error. | ||
| pub fn load_keypair<F: AsRef<Path>>(path: F) -> Result<Keypair> { | ||
| let path = path.as_ref(); | ||
|
|
||
| pub fn get_payer(keypair_path: PathBuf) -> Result<Keypair> { | ||
| let payer = match load_keypair(&keypair_path) { | ||
| Ok(payer) => payer, | ||
| Err(_) => { | ||
| create_keypair(&keypair_path)? | ||
| } | ||
| }; | ||
| Ok(payer) | ||
| if path.exists() { | ||
| // Try to read keypair from file | ||
| return Keypair::read_from_file(path) | ||
| .map_err(|e| anyhow!("Failed to read keypair from {}: {}", path.display(), e)); | ||
| } | ||
|
|
||
| // File does not exist — generate and save new keypair | ||
| let keypair = Keypair::new(); | ||
| keypair | ||
| .write_to_file(path) | ||
| .map_err(|e| anyhow!("Failed to write new keypair to {}: {}", path.display(), e))?; | ||
|
|
||
| Ok(keypair) | ||
| } | ||
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.
Uh oh!
There was an error while loading. Please reload this page.