wallet: implement ImportAccount

Author: yyforyongyu

wallet/account_manager.go

@@ -8,6 +8,7 @@ import (
 	"context"
 
 	"github.com/btcsuite/btcd/btcutil"
+	"github.com/btcsuite/btcd/btcutil/hdkeychain"
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/txscript"
 	"github.com/btcsuite/btcwallet/waddrmgr"
@@ -559,3 +560,29 @@ func (w *Wallet) Balance(ctx context.Context, conf int32,
 	return balance, nil
 }
 
+// ImportAccount imports a watch-only account from an extended public key.
+//
+// The time complexity of this method is dominated by the database lookup to
+// ensure the account name is unique within the scope.
+func (w *Wallet) ImportAccount(ctx context.Context, scope waddrmgr.KeyScope,
+	name string, accountPubKey *hdkeychain.ExtendedKey,
+	masterKeyFingerprint uint32, addrType *waddrmgr.AddressType,
+	dryRun bool) (*waddrmgr.AccountProperties, error) {
+
+	var (
+		props *waddrmgr.AccountProperties
+		err   error
+	)
+
+	if dryRun {
+		props, _, _, err = w.ImportAccountDryRun(
+			name, accountPubKey, masterKeyFingerprint, addrType, 0,
+		)
+	} else {
+		props, err = w.ImportAccountDeprecated(
+			name, accountPubKey, masterKeyFingerprint, addrType,
+		)
+	}
+
+	return props, err
+}

wallet/account_manager_test.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcd/btcutil"
+	"github.com/btcsuite/btcd/btcutil/hdkeychain"
 	"github.com/btcsuite/btcd/txscript"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btcwallet/waddrmgr"
@@ -498,4 +499,61 @@ func TestBalance(t *testing.T) {
 	)
 }
 
+// TestAccountManagerImportAccount tests that the ImportAccount method on the
+// AccountManager interface works as expected.
+func TestAccountManagerImportAccount(t *testing.T) {
+	t.Parallel()
+
+	// Create a new test wallet.
+	w, cleanup := testWallet(t)
+	defer cleanup()
 
+	// We'll start by creating a new account under the BIP0084 scope.
+	scope := waddrmgr.KeyScopeBIP0084
+	addrType := waddrmgr.WitnessPubKey
+	masterPriv := "tprv8ZgxMBicQKsPeWwrFuNjEGTTDSY4mRLwd2KDJAPGa1AY" +
+		"quw38bZqNMSuB3V1Va3hqJBo9Pt8Sx7kBQer5cNMrb8SYquoWPt9" +
+		"Y3BZdhdtUcw"
+	root, err := hdkeychain.NewKeyFromString(masterPriv)
+	require.NoError(t, err)
+	acctPubKey := deriveAcctPubKey(t, root, scope, hardenedKey(0))
+
+	// We should be able to import the account.
+	props, err := w.ImportAccount(
+		context.Background(), scope, testAccountName, acctPubKey,
+		root.ParentFingerprint(), &addrType, false,
+	)
+	require.NoError(t, err)
+	require.Equal(t, testAccountName, props.AccountName)
+
+	// We should be able to get the account by its name.
+	_, err = w.GetAccount(context.Background(), scope, testAccountName)
+	require.NoError(t, err)
+
+	// We should not be able to import an account with the same name.
+	_, err = w.ImportAccount(
+		context.Background(), scope, testAccountName, acctPubKey,
+		root.ParentFingerprint(), &addrType, false,
+	)
+	require.Error(t, err)
+	require.True(
+		t, waddrmgr.IsError(err, waddrmgr.ErrDuplicateAccount),
+		"expected ErrDuplicateAccount",
+	)
+
+	// We should be able to do a dry run of the import.
+	dryRunName := "dry run"
+	_, err = w.ImportAccount(
+		context.Background(), scope, dryRunName, acctPubKey,
+		root.ParentFingerprint(), &addrType, true,
+	)
+	require.NoError(t, err)
+
+	// The account should not have been imported.
+	_, err = w.GetAccount(context.Background(), scope, dryRunName)
+	require.Error(t, err)
+	require.True(
+		t, waddrmgr.IsError(err, waddrmgr.ErrAccountNotFound),
+		"expected ErrAccountNotFound",
+	)
+}