Skip to content
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.

Sign up for GitHub

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

Wait for wallet to load #4095

Merged
merged 8 commits into from
Dec 12, 2024
Merged

Wait for wallet to load #4095

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
702363e
Wait for wallet to load
raphjaph Nov 21, 2024
a8a4b8e
Same for wallet create
raphjaph Nov 21, 2024
1ce1e1a
Merge branch 'master' of github.com:ordinals/ord into wait-for-wallet
raphjaph Nov 23, 2024
907bb7f
Merge branch 'master' of github.com:ordinals/ord into wait-for-wallet
raphjaph Dec 10, 2024
e04ead9
Amend
raphjaph Dec 10, 2024
e1d616e
Merge branch 'master' of github.com:ordinals/ord into wait-for-wallet
raphjaph Dec 11, 2024
2fbe198
Amend
raphjaph Dec 11, 2024
bf09be2
Merge branch 'master' of github.com:ordinals/ord into wait-for-wallet
raphjaph Dec 11, 2024
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
31 changes: 28 additions & 3 deletions src/wallet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,9 +555,34 @@ impl Wallet {
});
}

settings
.bitcoin_rpc_client(Some(name.clone()))?
.call::<serde_json::Value>("importdescriptors", &[serde_json::to_value(descriptors)?])?;
loop {
match settings
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems wrong, shouldn't we only ever call import descriptors once, as opposed to in a loop?

.bitcoin_rpc_client(Some(name.clone()))?
.call::<serde_json::Value>(
"importdescriptors",
&[serde_json::to_value(descriptors.clone())?],
) {
Ok(_) => {
break;
}
Err(bitcoincore_rpc::Error::JsonRpc(bitcoincore_rpc::jsonrpc::Error::Rpc(err)))
if err.code == -4 && err.message == "Wallet already loading." =>
{
// wallet loading
thread::sleep(Duration::from_secs(3));
continue;
}
Err(bitcoincore_rpc::Error::JsonRpc(bitcoincore_rpc::jsonrpc::Error::Rpc(err)))
if err.code == -35 =>
{
// wallet already loaded
break;
}
Err(err) => {
bail!("Failed to import descriptors for wallet {}: {err}", name);
}
}
}

Ok(())
}
Expand Down
24 changes: 23 additions & 1 deletion src/wallet/wallet_constructor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,29 @@ impl WalletConstructor {
Wallet::check_version(self.settings.bitcoin_rpc_client(Some(self.name.clone()))?)?;

if !client.list_wallets()?.contains(&self.name) {
client.load_wallet(&self.name)?;
loop {
match client.load_wallet(&self.name) {
Ok(_) => {
break;
}
Err(bitcoincore_rpc::Error::JsonRpc(bitcoincore_rpc::jsonrpc::Error::Rpc(err)))
if err.code == -4 && err.message == "Wallet already loading." =>
{
// wallet loading
thread::sleep(Duration::from_secs(3));
continue;
}
Err(bitcoincore_rpc::Error::JsonRpc(bitcoincore_rpc::jsonrpc::Error::Rpc(err)))
if err.code == -35 =>
{
// wallet already loaded
break;
}
Err(err) => {
bail!("Failed to load wallet {}: {err}", self.name);
}
}
}
}

if client.get_wallet_info()?.private_keys_enabled {
Expand Down
Loading