Merge branch 'xpubs'

Author: benma

api/firmware/btc.go

@@ -162,6 +162,57 @@ func (device *Device) BTCXPub(
 	return pubResponse.Pub.Pub, nil
 }
 
+// BTCXPubs queries the device for multiple xpubs at a time. On firmware <v9.24.0, this falls back
+// to calling `BTCXPub()` for each keypath.
+func (device *Device) BTCXPubs(
+	coin messages.BTCCoin,
+	keypaths [][]uint32,
+	xpubType messages.BTCXpubsRequest_XPubType) ([]string, error) {
+	keypathMsgs := make([]*messages.Keypath, len(keypaths))
+	if !device.version.AtLeast(semver.NewSemVer(9, 24, 0)) {
+		// Fallback to fetching them one-by-one on older firmware.
+		xpubTypeConverted, ok := map[messages.BTCXpubsRequest_XPubType]messages.BTCPubRequest_XPubType{
+			messages.BTCXpubsRequest_XPUB: messages.BTCPubRequest_XPUB,
+			messages.BTCXpubsRequest_TPUB: messages.BTCPubRequest_TPUB,
+		}[xpubType]
+		if !ok {
+			return nil, errp.New("unrecongized xpubType")
+		}
+		xpubs := make([]string, len(keypaths))
+		for i, keypath := range keypaths {
+			xpub, err := device.BTCXPub(coin, keypath, xpubTypeConverted, false)
+			if err != nil {
+				return nil, err
+			}
+			xpubs[i] = xpub
+		}
+		return xpubs, nil
+	}
+
+	for i, keypath := range keypaths {
+		keypathMsgs[i] = &messages.Keypath{Keypath: keypath}
+	}
+	request := &messages.BTCRequest{
+		Request: &messages.BTCRequest_Xpubs{
+			Xpubs: &messages.BTCXpubsRequest{
+				Coin:     coin,
+				XpubType: xpubType,
+				Keypaths: keypathMsgs,
+			},
+		},
+	}
+	response, err := device.queryBTC(request)
+	if err != nil {
+		return nil, err
+	}
+
+	pubsResponse, ok := response.Response.(*messages.BTCResponse_Pubs)
+	if !ok {
+		return nil, errp.New("unexpected response")
+	}
+	return pubsResponse.Pubs.Pubs, nil
+}
+
 // BTCAddress queries the device for a btc, ltc, tbtc, tltc address.
 func (device *Device) BTCAddress(
 	coin messages.BTCCoin,

api/firmware/btc_test.go

@@ -106,7 +106,7 @@ func TestNewXPub(t *testing.T) {
 	}, xpub)
 }
 
-func TestBTCXpub(t *testing.T) {
+func TestSimulatorBTCXpub(t *testing.T) {
 	testInitializedSimulators(t, func(t *testing.T, device *Device, stdOut *bytes.Buffer) {
 		t.Helper()
 		xpub, err := device.BTCXPub(messages.BTCCoin_TBTC, []uint32{
@@ -119,6 +119,39 @@ func TestBTCXpub(t *testing.T) {
 	})
 }
 
+func TestSimulatorBTCXPubs(t *testing.T) {
+	testInitializedSimulators(t, func(t *testing.T, device *Device, stdOut *bytes.Buffer) {
+		t.Helper()
+		xpubs, err := device.BTCXPubs(messages.BTCCoin_TBTC,
+			[][]uint32{
+				{
+					49 + hardenedKeyStart,
+					1 + hardenedKeyStart,
+					0 + hardenedKeyStart,
+				},
+				{
+					84 + hardenedKeyStart,
+					1 + hardenedKeyStart,
+					0 + hardenedKeyStart,
+				},
+				{
+					86 + hardenedKeyStart,
+					1 + hardenedKeyStart,
+					0 + hardenedKeyStart,
+				},
+			}, messages.BTCXpubsRequest_TPUB)
+
+		require.NoError(t, err)
+		require.Equal(t,
+			[]string{
+				"tpubDCNtvuCS9oj3psPNfXZXuGjcQ5rSBi3MzigjBqqwQohWWetoRdLzT5v2uJq6KBTwxj1FYvuPTr7RoWkN4cmubDy5wW8SU3q9xYnDRpQepiT",
+				"tpubDCYNsKenq7Cuuf4fHsu2fsWA7Wb5cTD2qRUrw6uHbNNYQoNkEoJk4hgNhxbnGss5gnEe2MpqN2qbRVqWJGmuofAWmwFFi4CZ9Tg1LHKJDhF",
+				"tpubDDc6eecoyYxL4g3WKYpbbinyUmnfVikQCzHTPd6rJQivaPqGKBFiueQqWoAYonB8hAEXGM1ak7LqrnwczH24EbW7jbG5bNK5rncmRXtv7nG",
+			},
+			xpubs)
+	})
+}
+
 func TestSimulatorBTCAddress(t *testing.T) {
 	testInitializedSimulators(t, func(t *testing.T, device *Device, stdOut *bytes.Buffer) {
 		t.Helper()
@@ -212,7 +245,7 @@ func TestSimulatorBTCSignMessage(t *testing.T) {
 	})
 }
 
-func TestSimulatorBTCXPub(t *testing.T) {
+func TestBTCXPub(t *testing.T) {
 	testConfigurations(t, func(t *testing.T, env *testEnv) {
 		t.Helper()
 		expected := "mocked-xpub"

api/firmware/device_test.go

@@ -536,7 +536,12 @@ func TestSimulatorProduct(t *testing.T) {
 	testSimulators(t, func(t *testing.T, device *Device, stdOut *bytes.Buffer) {
 		t.Helper()
 		require.NoError(t, device.Init())
-		require.Equal(t, common.ProductBitBox02Multi, device.Product())
+		// Since v9.24.0, the simulator simulates a Nova device.
+		if device.Version().AtLeast(semver.NewSemVer(9, 24, 0)) {
+			require.Equal(t, common.ProductBitBox02PlusMulti, device.Product())
+		} else {
+			require.Equal(t, common.ProductBitBox02Multi, device.Product())
+		}
 	})
 }