LBRYCommunity/lbcwallet
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 14 Packages Wiki Activity

rpc: remove all address type alias in lookupKeyScope

Browse source 
Use the same address type name as bitcoind getnewaddress()
This commit is contained in:
Roy Lee 2022-08-21 19:22:55 -07:00
parent 78b8743ced
commit f27ea6094e
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
rpc/legacyrpc/methods.go
View file

@ -828,19 +828,21 @@ func renameAccount(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
return nil, w.RenameAccount(waddrmgr.KeyScopeBIP0044, account, cmd.NewAccount)
}
func lookupKeyScope(kind *string) (waddrmgr.KeyScope, error) {
func lookupKeyScope(kind *string) (*waddrmgr.KeyScope, error) {
if kind == nil {
return waddrmgr.KeyScopeBIP0044, nil
return nil, nil
}
switch strings.ToLower(*kind) {
case "legacy", "p2pkh": // could add "default" but it might be confused with the 1st parameter
return waddrmgr.KeyScopeBIP0044, nil
case "p2sh-p2wpkh", "p2sh-p2wkh", "p2sh-segwit":
return waddrmgr.KeyScopeBIP0049Plus, nil
case "p2wpkh", "p2wkh", "bech32":
return waddrmgr.KeyScopeBIP0084, nil
case "*":
return nil, nil
case "legacy":
return &waddrmgr.KeyScopeBIP0044, nil
case "p2sh-segwit":
return &waddrmgr.KeyScopeBIP0049Plus, nil
case "bech32":
return &waddrmgr.KeyScopeBIP0084, nil
}
return waddrmgr.KeyScopeBIP0044, fmt.Errorf("unrecognized address type: %s", *kind)
return &waddrmgr.KeyScopeBIP0044, fmt.Errorf("unrecognized address type: %s. Must be legacy, p2sh-segwit, or bech32", *kind)
}
// getNewAddress handles a getnewaddress request by returning a new
@ -861,12 +863,12 @@ func getNewAddress(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
return nil, err
}
account, err := w.AccountNumber(keyScope, acctName)
account, err := w.AccountNumber(*keyScope, acctName)
if err != nil {
return nil, err
}
addr, err := w.NewAddress(account, keyScope)
addr, err := w.NewAddress(account, *keyScope)
if err != nil {
return nil, err
}