Merge branch 'staging-send-to-self-dropdown'

Author: thisconnect

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## Unreleased
+- Add a dropdown on the "Receiver address" input in the send screen to select an account
 - Add feedback link to guide and about settings
 - Move active currencies to top of currency dropdown
 

backend/devices/bitbox02/keystore.go

@@ -556,3 +556,10 @@ func (keystore *keystore) SupportsPaymentRequests() error {
 	}
 	return keystorePkg.ErrFirmwareUpgradeRequired
 }
+
+// Features reports optional capabilities supported by the BitBox02 keystore.
+func (keystore *keystore) Features() *keystorePkg.Features {
+	return &keystorePkg.Features{
+		SupportsSendToSelf: keystore.device.Version().AtLeast(semver.NewSemVer(9, 22, 0)),
+	}
+}

backend/handlers/handlers.go

@@ -220,6 +220,7 @@ func NewHandlers(
 	getAPIRouterNoError(apiRouter)("/dev-servers", handlers.getDevServers).Methods("GET")
 	getAPIRouterNoError(apiRouter)("/account-add", handlers.postAddAccount).Methods("POST")
 	getAPIRouterNoError(apiRouter)("/keystores", handlers.getKeystores).Methods("GET")
+	getAPIRouterNoError(apiRouter)("/keystore/{rootFingerprint}/features", handlers.getKeystoreFeatures).Methods("GET")
 	getAPIRouterNoError(apiRouter)("/accounts", handlers.getAccounts).Methods("GET")
 	getAPIRouter(apiRouter)("/accounts/balance-summary", handlers.getAccountsBalanceSummary).Methods("GET")
 	getAPIRouterNoError(apiRouter)("/set-account-active", handlers.postSetAccountActive).Methods("POST")
@@ -401,6 +402,8 @@ type accountJSON struct {
 	IsToken               bool               `json:"isToken"`
 	ActiveTokens          []activeToken      `json:"activeTokens,omitempty"`
 	BlockExplorerTxPrefix string             `json:"blockExplorerTxPrefix"`
+	// Number of the account per coin per keystore, starting at 0. Nil if unknown.
+	AccountNumber *uint16 `json:"accountNumber"`
 }
 
 func newAccountJSON(
@@ -411,6 +414,11 @@ func newAccountJSON(
 	eth, ok := account.Coin().(*eth.Coin)
 	isToken := ok && eth.ERC20Token() != nil
 	watch := account.Config().Config.Watch
+	var accountNumberPtr *uint16
+	accountNumber, err := account.Config().Config.SigningConfigurations.AccountNumber()
+	if err == nil {
+		accountNumberPtr = &accountNumber
+	}
 	return &accountJSON{
 		Keystore: keystoreJSON{
 			Keystore:  keystore,
@@ -427,6 +435,7 @@ func newAccountJSON(
 		IsToken:               isToken,
 		ActiveTokens:          activeTokens,
 		BlockExplorerTxPrefix: account.Coin().BlockExplorerTransactionURLPrefix(),
+		AccountNumber:         accountNumberPtr,
 	}
 }
 
@@ -598,6 +607,55 @@ func (handlers *Handlers) getKeystores(*http.Request) interface{} {
 	return keystores
 }
 
+func (handlers *Handlers) getKeystoreFeatures(r *http.Request) interface{} {
+	type response struct {
+		Success      bool               `json:"success"`
+		ErrorMessage string             `json:"errorMessage,omitempty"`
+		Features     *keystore.Features `json:"features,omitempty"`
+	}
+
+	rootFingerprintHex := mux.Vars(r)["rootFingerprint"]
+	rootFingerprint, err := hex.DecodeString(rootFingerprintHex)
+	if err != nil {
+		handlers.log.WithError(err).Error("invalid root fingerprint for features request")
+		return response{
+			Success:      false,
+			ErrorMessage: err.Error(),
+		}
+	}
+
+	connectedKeystore := handlers.backend.Keystore()
+	if connectedKeystore == nil {
+		handlers.log.Warn("features requested but no keystore connected")
+		return response{
+			Success:      false,
+			ErrorMessage: "keystore not connected",
+		}
+	}
+
+	connectedRootFingerprint, err := connectedKeystore.RootFingerprint()
+	if err != nil {
+		handlers.log.WithError(err).Error("could not determine connected keystore root fingerprint")
+		return response{
+			Success:      false,
+			ErrorMessage: err.Error(),
+		}
+	}
+
+	if !bytes.Equal(rootFingerprint, connectedRootFingerprint) {
+		handlers.log.WithField("requested", rootFingerprintHex).Warn("features requested for non-connected keystore")
+		return response{
+			Success:      false,
+			ErrorMessage: "wrong keystore connected",
+		}
+	}
+
+	return response{
+		Success:  true,
+		Features: connectedKeystore.Features(),
+	}
+}
+
 func (handlers *Handlers) getAccounts(*http.Request) interface{} {
 	persistedAccounts := handlers.backend.Config().AccountsConfig()
 

backend/keystore/keystore.go

@@ -150,4 +150,14 @@ type Keystore interface {
 
 	// SupportsPaymentRequests returns nil if the device supports silent payments, or an error indicating why it is not supported.
 	SupportsPaymentRequests() error
+
+	// Features reports optional capabilities supported by this keystore.
+	Features() *Features
+}
+
+// Features enumerates optional capabilities that can differ per keystore implementation.
+type Features struct {
+	// SupportsSendToSelf indicates whether the keystore can explicitly verify outputs that belong to
+	// the same keystore (used for the send-to-self recipient dropdown flow).
+	SupportsSendToSelf bool `json:"supportsSendToSelf"`
 }

backend/keystore/mocks/keystore.go

@@ -201,6 +201,13 @@ func (keystore *Keystore) BTCXPubs(
 	return xpubs, nil
 }
 
+// Features reports optional capabilities supported by the software keystore.
+func (keystore *Keystore) Features() *keystorePkg.Features {
+	return &keystorePkg.Features{
+		SupportsSendToSelf: true,
+	}
+}
+
 func (keystore *Keystore) signBTCTransaction(btcProposedTx *btc.ProposedTransaction) error {
 	keystore.log.Info("Sign transaction.")
 	transaction := btcProposedTx.TXProposal.Psbt.UnsignedTx

backend/keystore/software/software.go

@@ -202,6 +202,15 @@ func (configuration *Configuration) String() string {
 // fingerprint.
 type Configurations []*Configuration
 
+// AccountNumber returns the first config's account number. It assumes all configurations have the
+// same account number.
+func (configs Configurations) AccountNumber() (uint16, error) {
+	for _, config := range configs {
+		return config.AccountNumber()
+	}
+	return 0, errp.New("no configs")
+}
+
 // RootFingerprint gets the fingerprint of the first config (assuming that all configurations have
 // the same rootFingerprint). Returns an error if the list has no entries or does not contain a
 // known config.

backend/signing/configuration.go

@@ -148,3 +148,20 @@ func TestAccountNumber(t *testing.T) {
 	require.Error(t, err)
 	require.Equal(t, uint16(0), num)
 }
+
+func TestAccountNumberOnConfigurations(t *testing.T) {
+	xpub, err := hdkeychain.NewMaster(make([]byte, 32), &chaincfg.TestNet3Params)
+	require.NoError(t, err)
+	xpub, err = xpub.Neuter()
+	require.NoError(t, err)
+	rootFingerprint := []byte{1, 2, 3, 4}
+
+	cfg1 := NewBitcoinConfiguration(
+		ScriptTypeP2WPKH, rootFingerprint, mustKeypath("m/48'/0'/10'"), xpub)
+	cfg2 := NewBitcoinConfiguration(
+		ScriptTypeP2WPKH, rootFingerprint, mustKeypath("m/84'/0'/10'"), xpub)
+	cfgs := Configurations{cfg1, cfg2}
+	num, err := cfgs.AccountNumber()
+	require.NoError(t, err)
+	require.Equal(t, uint16(10), num)
+}

backend/signing/configuration_test.go

@@ -74,6 +74,7 @@ export type TAccount = {
   activeTokens?: TActiveToken[];
   blockExplorerTxPrefix: string;
   bitsuranceStatus?: TDetailStatus;
+  accountNumber?: number;
 };
 
 export const getAccounts = (): Promise<TAccount[]> => {

frontends/web/src/api/account.ts

@@ -22,6 +22,16 @@ export type { TUnsubscribe };
 type TKeystore = { type: 'hardware' | 'software' };
 export type TKeystores = TKeystore[];
 
+export type TKeystoreFeatures = {
+  supportsSendToSelf: boolean;
+};
+
+export type TKeystoreFeaturesResponse = {
+  success: boolean;
+  features?: TKeystoreFeatures | null;
+  errorMessage?: string;
+};
+
 export const subscribeKeystores = (
   cb: (keystores: TKeystores) => void
 ) => {
@@ -43,3 +53,7 @@ export const deregisterTest = (): Promise<null> => {
 export const connectKeystore = (rootFingerprint: string): Promise<{ success: boolean }> => {
   return apiPost('connect-keystore', { rootFingerprint });
 };
+
+export const getKeystoreFeatures = (rootFingerprint: string): Promise<TKeystoreFeaturesResponse> => {
+  return apiGet(`keystore/${rootFingerprint}/features`);
+};