Merge branch 'simulatorQT'

Author: bznein

README.md

@@ -103,6 +103,8 @@ In order to do so:
 
 If the simulator is listening on a custom port, `--simulatorPort=<port>` must also be provided.
 
+Note: the simulator is currently only supported in the servewallet and in the Qt app and only when the app runs in testnet mode.
+
 #### Watch and build the UI
 
 Run `make webdev` to develop the UI inside a web browser (for quick development, automatic rebuilds

backend/bridgecommon/bridgecommon.go

@@ -287,6 +287,7 @@ func (env *BackendEnvironment) BluetoothConnect(identifier string) {
 // Serve serves the BitBox API for use in a native client.
 func Serve(
 	testnet bool,
+	simulator bool,
 	gapLimits *btctypes.GapLimits,
 	communication NativeCommunication,
 	backendEnvironment backend.Environment) {
@@ -305,6 +306,11 @@ func Serve(
 		WithField("version", versioninfo.Version).
 		Info("environment")
 
+	if simulator {
+		log.Info("Simulator mode enabled, ensuring testnet mode is enabled")
+		testnet = true
+	}
+
 	var err error
 	globalBackend, err = backend.NewBackend(
 		arguments.NewArguments(

backend/bridgecommon/bridgecommon_test.go

@@ -78,6 +78,7 @@ func (e environment) BluetoothConnect(string) {}
 // TestServeShutdownServe checks that you can call Serve twice in a row.
 func TestServeShutdownServe(t *testing.T) {
 	bridgecommon.Serve(
+		false,
 		false,
 		nil,
 		communication{},
@@ -88,6 +89,7 @@ func TestServeShutdownServe(t *testing.T) {
 	done := make(chan struct{})
 	go func() {
 		bridgecommon.Serve(
+			false,
 			false,
 			nil,
 			communication{},

backend/mobileserver/mobileserver.go

@@ -185,6 +185,7 @@ func Serve(dataDir string, testnet bool, environment GoEnvironmentInterface, goA
 
 	bridgecommon.Serve(
 		testnet,
+		false,
 		nil,
 		goAPI,
 		&bridgecommon.BackendEnvironment{

cmd/servewallet/main.go

@@ -75,7 +75,7 @@ func (webdevEnvironment) DeviceInfos() []usb.DeviceInfo {
 	testDeviceInfo := simulator.TestDeviceInfo()
 	if testDeviceInfo != nil {
 		// We are in "test device" mode.
-		return []usb.DeviceInfo{*testDeviceInfo}
+		return []usb.DeviceInfo{testDeviceInfo}
 	}
 	return usb.DeviceInfos()
 }

frontends/qt/server/server.go

@@ -68,6 +68,7 @@ import (
 
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/bridgecommon"
 	btctypes "github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc/types"
+	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/devices/bitbox02/simulator"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/devices/usb"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/mobileserver"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/logging"
@@ -109,6 +110,14 @@ func setOnline(isReachable bool) {
 	bridgecommon.SetOnline(isReachable)
 }
 
+func deviceInfos() []usb.DeviceInfo {
+	testDeviceInfo := simulator.TestDeviceInfo()
+	if testDeviceInfo != nil {
+		return []usb.DeviceInfo{testDeviceInfo}
+	}
+	return usb.DeviceInfos()
+}
+
 //export serve
 func serve(
 	cppHeapFreeFn C.cppHeapFree,
@@ -121,6 +130,8 @@ func serve(
 	log := logging.Get().WithGroup("server")
 	log.WithField("args", os.Args).Info("Started Qt application")
 	testnet := flag.Bool("testnet", false, "activate testnets")
+	simulatorPort := flag.Int("simulatorPort", 15423, "port for the BitBox02 simulator")
+	useSimulator := flag.Bool("simulator", false, "use the BitBox02 simulator. It implies --testnet.")
 
 	if runtime.GOOS == "darwin" {
 		// eat "-psn_xxxx" on Mac, which is passed when starting an app from Finder for the first time.
@@ -146,12 +157,17 @@ func serve(
 		}
 	}
 
+	if *useSimulator {
+		simulator.Init(*simulatorPort)
+	}
+
 	// Capture C string early to avoid potential use when it's already popped
 	// from the stack.
 	nativeLocale := C.GoString(preferredLocale)
 
 	bridgecommon.Serve(
 		*testnet,
+		*useSimulator,
 		gapLimits,
 		&nativeCommunication{
 			respond: func(queryID int, response string) {
@@ -171,7 +187,7 @@ func serve(
 				defer C.free(unsafe.Pointer(cText))
 				C.notifyUser(notifyUserFn, cText)
 			},
-			DeviceInfosFunc:     usb.DeviceInfos,
+			DeviceInfosFunc:     deviceInfos,
 			SystemOpenFunc:      system.Open,
 			UsingMobileDataFunc: func() bool { return false },
 			NativeLocaleFunc:    func() string { return nativeLocale },