From f27ea6094e28eb2364cfaf7fb7d610edc87dd8f1 Mon Sep 17 00:00:00 2001
From: Roy Lee <roylee17@gmail.com>
Date: Sun, 21 Aug 2022 19:22:55 -0700
Subject: [PATCH] rpc: remove all address type alias in lookupKeyScope

Use the same address type name as bitcoind getnewaddress()
---
 rpc/legacyrpc/methods.go | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/rpc/legacyrpc/methods.go b/rpc/legacyrpc/methods.go
index 9221d6b..1003570 100644
--- a/rpc/legacyrpc/methods.go
+++ b/rpc/legacyrpc/methods.go
@@ -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
 	}