Skip to content

Commit

Permalink
feat: improve errors if wallet subaccount doesnt exist (#82)
Browse files Browse the repository at this point in the history
* fix: include wallet name in rpc error

* feat: check if subaccount exists on startup
  • Loading branch information
jackstar12 authored Feb 5, 2024
1 parent cf217f2 commit ab6d150
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
9 changes: 8 additions & 1 deletion onchain/wallet/wallet.go
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ func Login(credentials *Credentials) (*Wallet, error) {
if credentials.Encrypted() {
return nil, errors.New("credentials are encrypted")
}
wallet := &Wallet{currency: credentials.Currency, name: credentials.Name, subaccount: credentials.Subaccount}
wallet := &Wallet{currency: credentials.Currency, name: credentials.Name}
login := make(map[string]any)

if credentials.Mnemonic != "" {
Expand Down Expand Up @@ -451,6 +451,13 @@ func Login(credentials *Credentials) (*Wallet, error) {
return nil, err
}
logger.Debugf("Logged in: %v", result)

if credentials.Subaccount != nil {
if _, err := wallet.SetSubaccount(credentials.Subaccount); err != nil {
logger.Errorf("Failed to set subaccount for wallet %s. You might have to resync it using GetSubaccounts: %v", credentials.Name, err)
}
}

return wallet, nil
}

Expand Down
4 changes: 2 additions & 2 deletions rpcserver/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ func (server *routedBoltzServer) serializeWallet(wal onchain.Wallet) (*boltzrpc.
balance, err := wal.GetBalance()
if err != nil {
if !errors.Is(err, wallet.ErrSubAccountNotSet) {
return nil, handleError(err)
return nil, handleError(fmt.Errorf("could not get balance for wallet %s: %w", wal.Name(), err))
}
} else {
result.Balance = serializeWalletBalance(balance)
Expand All @@ -759,7 +759,7 @@ func (server *routedBoltzServer) GetWallets(_ context.Context, request *boltzrpc
if (currency == "" || current.Currency() == currency) && (!current.Readonly() || request.GetIncludeReadonly()) {
wallet, err := server.serializeWallet(current)
if err != nil {
return nil, handleError(err)
return nil, err
}
response.Wallets = append(response.Wallets, wallet)
}
Expand Down

0 comments on commit ab6d150

Please sign in to comment.