Merge remote-tracking branch 'upstream/master' into staging-watchonly

There was a conflict in:
	backend/config/accounts.go

Author: thisconnect

.github/workflows/ci.yml

@@ -86,7 +86,7 @@ jobs:
           path: frontends/qt/build/linux/bitbox-*.rpm
           name: BitBoxApp-linux-${{github.sha}}.rpm
   macos:
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
       - name: Clone the repo
         uses: actions/checkout@v2

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 - Drop support for SAI token
+- Log Javascript console messages in the app log.txt
+- Add amounts hiding feature to enhance privacy when using the app in public
 
 ## 4.39.0
 - Bundle BitBox02 firmware version v9.15.0

backend/config/accounts.go

@@ -126,3 +126,19 @@ func (cfg *AccountsConfig) GetOrAddKeystore(rootFingerprint []byte) *Keystore {
 	cfg.Keystores = append(cfg.Keystores, ks)
 	return ks
 }
+
+// migrateActiveTokens removes tokens from AccountsConfig.
+func migrateActiveTokens(accountsConf *AccountsConfig) error {
+	for _, account := range accountsConf.Accounts {
+		if account.CoinCode != coin.CodeETH {
+			continue
+		}
+
+		err := account.SetTokenActive("eth-erc20-sai0x89d", false)
+		if err != nil {
+			return err
+		}
+
+	}
+	return nil
+}

backend/config/config.go

@@ -269,12 +269,6 @@ func NewConfig(appConfigFilename string, accountsConfigFilename string) (*Config
 	return config, nil
 }
 
-// SetBtcOnly sets non-bitcoin accounts in the config to false.
-func (config *Config) SetBtcOnly() {
-	config.appConfig.Backend.DeprecatedLitecoinActive = false
-	config.appConfig.Backend.DeprecatedEthereumActive = false
-}
-
 // SetBTCElectrumServers sets the BTC configuration to the provided electrumIP and electrumCert.
 func (config *Config) SetBTCElectrumServers(electrumAddress, electrumCert string) {
 	config.appConfig.Backend.BTC = btcCoinConfig{
@@ -441,19 +435,3 @@ func migrateUserLanguage(appconf *AppConfig) {
 		delete(frontconf, "userLanguage")
 	}
 }
-
-// migrateActiveTokens removes tokens from AccountsConfig.
-func migrateActiveTokens(accountsConf *AccountsConfig) error {
-	for _, account := range accountsConf.Accounts {
-		if account.CoinCode != coin.CodeETH {
-			continue
-		}
-
-		err := account.SetTokenActive("eth-erc20-sai0x89d", false)
-		if err != nil {
-			return err
-		}
-
-	}
-	return nil
-}

backend/config/config_test.go

@@ -0,0 +1,127 @@
+// Copyright 2023 Shift Crypto AG
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package config
+
+import (
+	"encoding/json"
+	"errors"
+	"os"
+	"testing"
+
+	"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/coin"
+	"github.com/digitalbitbox/bitbox-wallet-app/util/test"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNewConfig(t *testing.T) {
+	appConfigFilename := test.TstTempFile("appConfig")
+	accountsConfigFilename := test.TstTempFile("accountsConfig")
+
+	cfg, err := NewConfig(appConfigFilename, accountsConfigFilename)
+	require.NoError(t, err)
+
+	appJsonBytes, err := os.ReadFile(appConfigFilename)
+	require.NoError(t, err)
+	expectedAppJsonBytes, err := json.Marshal(NewDefaultAppConfig())
+	require.NoError(t, err)
+	require.JSONEq(t, string(expectedAppJsonBytes), string(appJsonBytes))
+
+	accountsJsonBytes, err := os.ReadFile(accountsConfigFilename)
+	require.NoError(t, err)
+	expectedAccountsJsonBytes, err := json.Marshal(newDefaultAccountsonfig())
+	require.NoError(t, err)
+	require.JSONEq(t, string(expectedAccountsJsonBytes), string(accountsJsonBytes))
+
+	// Load existing config.
+	cfg2, err := NewConfig(appConfigFilename, accountsConfigFilename)
+	require.NoError(t, err)
+	require.Equal(t, cfg, cfg2)
+}
+
+func TestSetAppConfig(t *testing.T) {
+	appConfigFilename := test.TstTempFile("appConfig")
+	accountsConfigFilename := test.TstTempFile("accountsConfig")
+
+	cfg, err := NewConfig(appConfigFilename, accountsConfigFilename)
+	require.NoError(t, err)
+
+	appCfg := cfg.AppConfig()
+	require.Equal(t, coin.BtcUnitDefault, appCfg.Backend.BtcUnit)
+	appCfg.Backend.BtcUnit = coin.BtcUnitSats
+	appCfg.Frontend = map[string]interface{}{"foo": "bar"}
+	require.NoError(t, cfg.SetAppConfig(appCfg))
+
+	cfg2, err := NewConfig(appConfigFilename, accountsConfigFilename)
+	require.NoError(t, err)
+	require.Equal(t, cfg, cfg2)
+	require.Equal(t, coin.BtcUnitSats, cfg2.AppConfig().Backend.BtcUnit)
+	require.Equal(t, map[string]interface{}{"foo": "bar"}, cfg2.AppConfig().Frontend)
+}
+
+func TestModifyAccountsConfig(t *testing.T) {
+	appConfigFilename := test.TstTempFile("appConfig")
+	accountsConfigFilename := test.TstTempFile("accountsConfig")
+
+	cfg, err := NewConfig(appConfigFilename, accountsConfigFilename)
+	require.NoError(t, err)
+
+	require.NoError(t, cfg.ModifyAccountsConfig(func(accountsCfg *AccountsConfig) error {
+		accountsCfg.Accounts = append(accountsCfg.Accounts, &Account{Used: true})
+		return nil
+	}))
+
+	cfg2, err := NewConfig(appConfigFilename, accountsConfigFilename)
+	require.NoError(t, err)
+	require.Equal(t, cfg, cfg2)
+	require.Equal(t, []*Account{{Used: true}}, cfg2.AccountsConfig().Accounts)
+
+	require.Error(t, cfg.ModifyAccountsConfig(func(accountsCfg *AccountsConfig) error {
+		return errors.New("error")
+	}))
+}
+
+// TestMigrationSaved tests that migrations are applied when a config is loaded, and that the
+// migrations are persisted.
+func TestMigrationsAtLoad(t *testing.T) {
+	appConfigFilename := test.TstTempFile("appConfig")
+	accountsConfigFilename := test.TstTempFile("accountsConfig")
+
+	// Persist a config that includes data that will be migrated.
+	cfg, err := NewConfig(appConfigFilename, accountsConfigFilename)
+	require.NoError(t, err)
+	appCfg := cfg.AppConfig()
+	appCfg.Frontend = map[string]interface{}{
+		"userLanguage": "de",
+	}
+	require.NoError(t, cfg.SetAppConfig(appCfg))
+	require.NoError(t, cfg.ModifyAccountsConfig(func(accountsCfg *AccountsConfig) error {
+		accountsCfg.Accounts = append(accountsCfg.Accounts,
+			&Account{CoinCode: coin.CodeETH, ActiveTokens: []string{"eth-erc20-sai0x89d"}})
+		return nil
+	}))
+
+	// Loading the conf applies the migrations.
+	cfg2, err := NewConfig(appConfigFilename, accountsConfigFilename)
+	require.NoError(t, err)
+	require.Equal(t, "de", cfg2.AppConfig().Backend.UserLanguage)
+	require.Equal(t,
+		[]*Account{{CoinCode: coin.CodeETH, ActiveTokens: nil}},
+		cfg2.AccountsConfig().Accounts)
+
+	// The migrations were persisted.
+	cfg3, err := NewConfig(appConfigFilename, accountsConfigFilename)
+	require.NoError(t, err)
+	require.Equal(t, cfg2, cfg3)
+}

frontends/qt/libserver.h

@@ -3,6 +3,8 @@
 #include <string.h>
 #include <stdint.h>
 
+typedef const char cchar_t;
+
 typedef void (*pushNotificationsCallback) (const char*);
 static void pushNotify(pushNotificationsCallback f, const char* msg) {
     f(msg);
@@ -37,9 +39,9 @@ extern "C" {
 #endif
 
 
-extern void backendCall(int p0, char* p1);
+extern void backendCall(int queryID, cchar_t* s);
 
-extern void handleURI(char* p0);
+extern void handleURI(cchar_t* uri);
 
 extern void serve(
     cppHeapFree cppHeapFreeFn,
@@ -50,7 +52,9 @@ extern void serve(
     getSaveFilenameCallback getSaveFilenameFn
 );
 
-extern void systemOpen(char* p0);
+extern void systemOpen(cchar_t* url);
+
+extern void goLog(cchar_t* msg);
 
 #ifdef __cplusplus
 }

frontends/qt/main.cpp

@@ -82,7 +82,7 @@ class BitBoxApp : public SingleApplication
                 // if the BitBoxApp is launched and also when it is already running, in which case
                 // it is brought to the foreground automatically.
 
-                handleURI(const_cast<char*>(openEvent->url().toString().toStdString().c_str()));
+                handleURI(openEvent->url().toString().toLocal8Bit().constData());
             }
         }
 
@@ -98,6 +98,13 @@ class WebEnginePage : public QWebEnginePage {
     QWebEnginePage* createWindow(QWebEnginePage::WebWindowType type) {
         return externalPage;
     }
+
+    virtual void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID)
+    {
+        // Log frontend console messages to the Go log.txt.
+        QString formattedMsg = QString("msg: %1; line %2; source: %3").arg(message).arg(lineNumber).arg(sourceID);
+        goLog(formattedMsg.toLocal8Bit().constData());
+    }
 };
 
 class RequestInterceptor : public QWebEngineUrlRequestInterceptor {
@@ -117,7 +124,7 @@ class RequestInterceptor : public QWebEngineUrlRequestInterceptor {
         if (onBuyPage) {
             if (info.firstPartyUrl().toString() == info.requestUrl().toString()) {
                 // A link with target=_blank was clicked.
-                systemOpen(const_cast<char*>(info.requestUrl().toString().toStdString().c_str()));
+                systemOpen(info.requestUrl().toString().toLocal8Bit().constData());
                 // No need to also load it in our page.
                 info.block(true);
             }
@@ -380,11 +387,11 @@ int main(int argc, char *argv[])
         [&](int instanceId, QByteArray message) {
             QString arg = QString::fromUtf8(message);
             qDebug() << "Received arg from secondary instance:" << arg;
-            handleURI(const_cast<char*>(arg.toStdString().c_str()));
+            handleURI(arg.toLocal8Bit().constData());
         });
     // Handle URI which the app was launched with in the primary instance.
     if (a.arguments().size() == 2) {
-        handleURI(const_cast<char*>(a.arguments()[1].toStdString().c_str()));
+        handleURI(a.arguments()[1].toLocal8Bit().constData());
     }
 
     return a.exec();

frontends/qt/server/server.def

@@ -1,2 +1,2 @@
 LIBRARY LIBSERVER
-EXPORTS serve backendCall handleURI systemOpen
+EXPORTS serve backendCall handleURI systemOpen goLog

frontends/qt/server/server.go

@@ -21,6 +21,9 @@ package main
 #include <stdint.h>
 #include <stdlib.h>
 
+// Workaround to be able to use `const char*` as a param type in the exported Go functions.
+typedef const char cchar_t;
+
 typedef void (*pushNotificationsCallback) (const char*);
 static void pushNotify(pushNotificationsCallback f, const char* msg) {
     f(msg);
@@ -87,7 +90,7 @@ func backendCall(queryID C.int, s *C.char) {
 }
 
 //export handleURI
-func handleURI(uri *C.char) {
+func handleURI(uri *C.cchar_t) {
 	bridgecommon.HandleURI(C.GoString(uri))
 }
 
@@ -179,13 +182,19 @@ func serve(
 }
 
 //export systemOpen
-func systemOpen(url *C.char) {
+func systemOpen(url *C.cchar_t) {
 	goURL := C.GoString(url)
 	if err := system.Open(goURL); err != nil {
 		logging.Get().WithGroup("server").WithError(err).Errorf("systemOpen: error opening %v", goURL)
 	}
 }
 
+//export goLog
+func goLog(msg *C.cchar_t) {
+	goMsg := C.GoString(msg)
+	logging.Get().WithGroup("qt-frontend").Info(goMsg)
+}
+
 // Don't remove - needed for the C compilation.
 func main() {
 }

frontends/qt/webclass.h

@@ -21,7 +21,7 @@ class WebClass : public QObject
     Q_OBJECT
 public slots:
     void call(int queryID, const QString& query) {
-        backendCall(queryID, const_cast<char*>(query.toStdString().c_str()));
+        backendCall(queryID, query.toLocal8Bit().constData());
     }
 signals:
     void gotResponse(int queryID, QString response);