Merge branch 'bb02p-bl'

Author: benma

backend/devices/bitbox02bootloader/assets/firmware-bb02plus-btconly.v9.22.0.signed.bin.gz

@@ -32,6 +32,8 @@ var intermediateFirmwareBinaryBTCOnly_9_17_1 []byte
 //go:embed assets/firmware.v9.17.1.signed.bin.gz
 var intermediateFirmwareBinaryMulti_9_17_1 []byte
 
+// BitBox02
+
 //go:embed assets/firmware-btc.v9.22.0.signed.bin.gz
 var firmwareBinaryBTCOnly []byte
 var firmwareVersionBTCOnly = semver.NewSemVer(9, 22, 0)
@@ -42,6 +44,18 @@ var firmwareBinaryMulti []byte
 var firmwareVersionMulti = semver.NewSemVer(9, 22, 0)
 var firmwareMonotonicVersionMulti uint32 = 42
 
+// BitBox02 Plus. TODO: these are placeholder entries.
+
+//go:embed assets/firmware-bb02plus-btconly.v9.22.0.signed.bin.gz
+var firmwareBB02PlusBinaryBTCOnly []byte
+var firmwareBB02PlusVersionBTCOnly = semver.NewSemVer(9, 22, 0)
+var firmwareBB02PlusMonotonicVersionBtcOnly uint32 = 42
+
+//go:embed assets/firmware-bb02plus-multi.v9.22.0.signed.bin.gz
+var firmwareBB02PlusBinaryMulti []byte
+var firmwareBB02PlusVersionMulti = semver.NewSemVer(9, 22, 0)
+var firmwareBB02PlusMonotonicVersionMulti uint32 = 42
+
 type firmwareInfo struct {
 	version          *semver.SemVer
 	monotonicVersion uint32
@@ -75,6 +89,7 @@ func (fi firmwareInfo) firmwareHash() ([]byte, error) {
 // The intermediate upgrades, when run, bump the monotonic version by one so we know whether it has
 // booted/run at least once.
 var bundledFirmwares = map[bitbox02common.Product][]firmwareInfo{
+	// BitBox02
 	bitbox02common.ProductBitBox02Multi: {
 		{
 			version:          semver.NewSemVer(9, 17, 1),
@@ -99,6 +114,21 @@ var bundledFirmwares = map[bitbox02common.Product][]firmwareInfo{
 			binaryGzip:       firmwareBinaryBTCOnly,
 		},
 	},
+	// BitBox02 Plus.
+	bitbox02common.ProductBitBox02PlusMulti: {
+		{
+			version:          firmwareBB02PlusVersionMulti,
+			monotonicVersion: firmwareBB02PlusMonotonicVersionMulti,
+			binaryGzip:       firmwareBB02PlusBinaryMulti,
+		},
+	},
+	bitbox02common.ProductBitBox02PlusBTCOnly: {
+		{
+			version:          firmwareBB02PlusVersionBTCOnly,
+			monotonicVersion: firmwareBB02PlusMonotonicVersionBtcOnly,
+			binaryGzip:       firmwareBB02PlusBinaryBTCOnly,
+		},
+	},
 }
 
 // BundledFirmwareVersion returns the version of newest bundled firmware. Returns nil if none is

backend/devices/bitbox02bootloader/assets/firmware-bb02plus-multi.v9.22.0.signed.bin.gz

@@ -81,12 +81,21 @@ func TestFirmwaresOrdered(t *testing.T) {
 
 func TestNextFirmware(t *testing.T) {
 	for product, firmwares := range bundledFirmwares {
-		fwInfo, err := nextFirmware(product, 1)
-		require.NoError(t, err)
-		require.Equal(t, uint32(36), fwInfo.monotonicVersion)
+		switch product {
+		case bitbox02common.ProductBitBox02Multi, bitbox02common.ProductBitBox02BTCOnly:
+			fwInfo, err := nextFirmware(product, 1)
+			require.NoError(t, err)
+			require.Equal(t, uint32(36), fwInfo.monotonicVersion)
 
-		fwInfo, err = nextFirmware(product, 36)
-		require.NoError(t, err)
-		require.Equal(t, &firmwares[len(firmwares)-1], fwInfo)
+			fwInfo, err = nextFirmware(product, 36)
+			require.NoError(t, err)
+			require.Equal(t, &firmwares[len(firmwares)-1], fwInfo)
+		case bitbox02common.ProductBitBox02PlusMulti, bitbox02common.ProductBitBox02PlusBTCOnly:
+			fwInfo, err := nextFirmware(product, 1)
+			require.NoError(t, err)
+			require.Equal(t, &firmwares[len(firmwares)-1], fwInfo)
+		default:
+			require.Fail(t, "unknown product")
+		}
 	}
 }