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

Author: thisconnect

.containerversion

@@ -1 +1 @@
-33
+34

.github/workflows/ci.yml

@@ -239,8 +239,6 @@ jobs:
       - name: Build Windows app
         run: |
           make qt-windows
-          cd frontends/qt
-          makensis setup.nsi
       - name: Upload Installer
         id: upload
         uses: actions/upload-artifact@v4

.github/workflows/playwright.yml

@@ -10,11 +10,66 @@ on:
   workflow_dispatch:
 
 jobs:
+  compute-version:
+    name: Compute firmware container version
+    runs-on: ubuntu-latest
+    outputs:
+      firmware_version: ${{ steps.get_version.outputs.firmware_version }}
+    steps:
+      - name: Checkout firmware repo
+        uses: actions/checkout@v4
+        with:
+          repository: BitBoxSwiss/bitbox02-firmware
+          path: bitbox02-firmware
+
+      - name: Read .containerversion
+        id: get_version
+        run: |
+          version=$(cat bitbox02-firmware/.containerversion)
+          echo "Firmware version: $version"
+          echo "firmware_version=$version" >> $GITHUB_OUTPUT
+
+  build-simulator:
+    name: Build simulator in container
+    runs-on: ubuntu-latest
+    needs: compute-version
+    container:
+      image: shiftcrypto/firmware_v2:${{ needs.compute-version.outputs.firmware_version }}
+    steps:
+      - name: Checkout firmware repo
+        uses: actions/checkout@v4
+        with:
+          repository: BitBoxSwiss/bitbox02-firmware
+          submodules: true
+          path: bitbox02-firmware
+
+      - name: Fetch tags
+        working-directory: bitbox02-firmware
+        run: git fetch --tags
+
+      - name: Build simulator
+        working-directory: bitbox02-firmware
+        run: make simulator
+
+      - name: Upload simulator binary
+        uses: actions/upload-artifact@v4
+        with:
+          name: simulator-binary
+          path: bitbox02-firmware/build-build-noasan/bin/simulator
+
   run-tests:
     runs-on: ubuntu-latest
+    needs: build-simulator
     steps:
       - uses: actions/checkout@v3
 
+      - name: Download simulator artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: simulator-binary
+          path: ./simulator-bin
+
+
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
@@ -28,13 +83,19 @@ jobs:
       - name: Install Playwright browsers
         run: |
           cd frontends/web
-          npx playwright install --with-deps
+          npx playwright install --with-deps chromium webkit
+
+
+      - name: Restore executable permission
+        run: chmod +x simulator-bin/simulator
 
       - name: Run Playwright tests
+        env:
+          SIMULATOR_PATH: ${{ github.workspace }}/simulator-bin/simulator
         run: make webe2etest
 
       - name: Upload Playwright artifacts
-        if: failure()
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: playwright-artifacts

APP_VERSION

@@ -0,0 +1 @@
+4.49.0

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
 ## Unreleased
+- Add a dropdown on the "Receiver address" input in the send screen to select an account
+
+## v4.49.0
 - macOS: fix potential USB communication issue with BitBox02 bootloaders <v1.1.2 and firmwares <v9.23.1
 - Added BTC Direct sell option
 - Added a banner to remind user to backup their seed phrase when an account reaches a certain threshold.
@@ -21,19 +24,23 @@
 - More efficient account initialization by fetching all account Bitcoin xpubs at once
 - Enable search transactions by note, address, or txid
 - Move "Export" (export transactions) to account info page
-- Add a dropdown on the "Receiver address" input in the send screen to select an account
+- Show coinfinty logo when requesting an address
+- Update decimal formatting for stablecoin transactions
+- Change block explorer to mempool.space
+- Integrate Bitrefill and add spending section
+
+## v4.48.8
+- Bundle BitBox02 Nova firmware version v9.23.3
 
 ## v4.48.7
 - ios: fix Pocket user verification button
-- Change block explorer to mempool.space
 
 ## v4.48.6
 - Android: restore support for Android 6 and Android 5
 
 ## v4.48.5
 - Bundle BitBox02 firmware version v9.23.2
 - iOS: fix wrong timezone when confirming time on BitBox02 (it would always show the time in UTC)
-- Integrate Bitrefill and add spending section
 
 ## v4.48.4
 - macOS: fix potential USB communication issue with BitBox02 bootloaders <v1.1.2 and firmwares <v9.23.1

Dockerfile

@@ -24,7 +24,7 @@ RUN --mount=target=/mnt,source=scripts DEBIAN_FRONTEND=noninteractive /mnt/docke
 ARG SYS_GOPATH=/opt/go
 ENV PATH=${SYS_GOPATH}/bin:/usr/local/go/bin:$PATH
 
-RUN --mount=target=/mnt/Makefile,source=Makefile GOPATH=${SYS_GOPATH} make -C /mnt envinit
+RUN --mount=target=/mnt/Makefile,source=Makefile --mount=target=/mnt/version.mk.inc,source=version.mk.inc GOPATH=${SYS_GOPATH} make -C /mnt envinit
 
 ENV PATH=/opt/qt6/6.8.2/gcc_64/bin:/opt/qt6/6.8.2/gcc_64/libexec:$PATH
 

Makefile

@@ -15,6 +15,11 @@
 SHELL    := /bin/bash
 WEBROOT  := frontends/web
 
+include version.mk.inc
+
+GO_LDFLAGS := $(GO_VERSION_LDFLAGS)
+GO_RUN := go run -mod=vendor -ldflags "$(GO_LDFLAGS)"
+
 catch:
 	@echo "Choose a make target."
 envinit:
@@ -28,15 +33,17 @@ gomobileinit:
 	git clone https://github.com/BitBoxSwiss/mobile.git /tmp/mobile && cd /tmp/mobile/cmd/gomobile && go install .
 	gomobile init
 servewallet:
-	go run -mod=vendor ./cmd/servewallet
+	$(GO_RUN) ./cmd/servewallet
 servewallet-mainnet:
-	go run -mod=vendor ./cmd/servewallet -mainnet
+	$(GO_RUN) ./cmd/servewallet -mainnet
 servewallet-regtest:
-	rm -f appfolder.dev/cache/headers-rbtc.bin && rm -rf appfolder.dev/cache/account-*rbtc* && go run -mod=vendor ./cmd/servewallet -regtest
+	rm -f appfolder.dev/cache/headers-rbtc.bin && rm -rf appfolder.dev/cache/account-*rbtc* && $(GO_RUN) ./cmd/servewallet -regtest
 servewallet-prodservers:
-	go run -mod=vendor ./cmd/servewallet -devservers=false
+	$(GO_RUN) ./cmd/servewallet -devservers=false
 servewallet-mainnet-prodservers:
-	go run -mod=vendor ./cmd/servewallet -mainnet -devservers=false
+	$(GO_RUN) ./cmd/servewallet -mainnet -devservers=false
+servewallet-simulator:
+	$(GO_RUN) ./cmd/servewallet -simulator=true
 buildweb:
 	node --version
 	npm --version

README.md

@@ -84,6 +84,27 @@ Run `make servewallet` and `make webdev` in seperate terminals.
 Before the first use of `make webdev`, you also need to run `make buildweb`, to install the dev
 dependencies.
 
+#### Local development with BB02 simulator
+
+The app can be used together with a [BB02 simulator](https://github.com/BitBoxSwiss/bitbox02-firmware/tree/master/test/simulator).
+
+In order to do so:
+
+* Build the simulator (checkout https://github.com/BitBoxSwiss/bitbox02-firmware/, then from the root repo run `make dockerdev` followed by `make simulator`)
+
+* Execute the simulator.
+
+  * Use `--port` if you want it to listen to a custom port (default is 15423)
+
+  * Set the environment variable `FAKE_MEMORY_FILEPATH` to a filepath if you want the simulator to write to file rather than in memory. This allows to re-use the same seed across different executions.
+
+* Launch the BBApp in simulator mode by providing a custom flag `--simulator`.
+
+
+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/accounts.go

@@ -1722,20 +1722,23 @@ func (backend *Backend) checkAccountUsed(account accounts.Interface) {
 			return
 		}
 	}
+
 	log := backend.log.WithField("accountCode", account.Config().Config.Code)
-	txs, err := account.Transactions()
-	if err != nil {
-		log.WithError(err).Error("discoverAccount")
-		return
-	}
+	if !account.Config().Config.Used {
+		txs, err := account.Transactions()
+		if err != nil {
+			log.WithError(err).Error("discoverAccount")
+			return
+		}
 
-	if len(txs) == 0 {
-		// Invoke this here too because even if an account is unused, we scan up to 5 accounts.
-		backend.maybeAddHiddenUnusedAccounts()
-		return
+		if len(txs) == 0 {
+			// Invoke this here too because even if an account is unused, we scan up to 5 accounts.
+			backend.maybeAddHiddenUnusedAccounts()
+			return
+		}
 	}
 	log.Info("marking account as used")
-	err = backend.config.ModifyAccountsConfig(func(accountsConfig *config.AccountsConfig) error {
+	err := backend.config.ModifyAccountsConfig(func(accountsConfig *config.AccountsConfig) error {
 		acct := accountsConfig.Lookup(account.Config().Config.Code)
 		if acct == nil {
 			return errp.Newf("could not find account")

backend/accounts_test.go

@@ -22,6 +22,7 @@ import (
 	"time"
 
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/accounts"
+	accountsMocks "github.com/BitBoxSwiss/bitbox-wallet-app/backend/accounts/mocks"
 	accountsTypes "github.com/BitBoxSwiss/bitbox-wallet-app/backend/accounts/types"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc/addresses"
@@ -1676,3 +1677,60 @@ func TestAccountsFiatAndCoinBalance(t *testing.T) {
 	}
 
 }
+
+func TestCheckAccountUsed(t *testing.T) {
+	b := newBackend(t, testnetDisabled, regtestDisabled)
+	b.tstCheckAccountUsed = nil
+	defer b.Close()
+	accountMocks := map[accountsTypes.Code]*accountsMocks.InterfaceMock{}
+	// A Transactions function that always returns one transaction, so the account is always used.
+	txFunc := func() (accounts.OrderedTransactions, error) {
+		return accounts.OrderedTransactions{&accounts.TransactionData{}}, nil
+	}
+
+	b.makeBtcAccount = func(config *accounts.AccountConfig, coin *btc.Coin, gapLimits *types.GapLimits, getAddress func(coinpkg.Code, blockchain.ScriptHashHex) (*addresses.AccountAddress, error), log *logrus.Entry) accounts.Interface {
+		accountMock := MockBtcAccount(t, config, coin, gapLimits, log)
+		accountMock.TransactionsFunc = txFunc
+		accountMocks[config.Config.Code] = accountMock
+		return accountMock
+	}
+
+	b.makeEthAccount = func(config *accounts.AccountConfig, coin *eth.Coin, httpClient *http.Client, log *logrus.Entry) accounts.Interface {
+		accountMock := MockEthAccount(config, coin, httpClient, log)
+		accountMock.TransactionsFunc = txFunc
+		accountMocks[config.Config.Code] = accountMock
+		return accountMock
+	}
+
+	ks1 := makeBitBox02Multi()
+
+	ks1Fingerprint, err := ks1.RootFingerprint()
+	require.NoError(t, err)
+
+	b.registerKeystore(ks1)
+	require.NoError(t, b.SetWatchonly(ks1Fingerprint, true))
+
+	accountsByKestore, err := b.AccountsByKeystore()
+	require.NoError(t, err)
+
+	accountList, ok := accountsByKestore[hex.EncodeToString(ks1Fingerprint)]
+	require.True(t, ok, "Expected accounts for keystore with fingerprint %s", hex.EncodeToString(ks1Fingerprint))
+
+	// Check all accounts, make sure they are set as used.
+	for _, acct := range accountList {
+		mock, ok := accountMocks[acct.Config().Config.Code]
+		require.True(t, ok, "No mock for account %s", acct.Config().Config.Code)
+
+		b.checkAccountUsed(acct)
+		// Ensure that Transactions is called
+		require.Len(t, mock.TransactionsCalls(), 1)
+		require.True(t, acct.Config().Config.Used)
+
+		// Call checkAccountUsed again, Transactions should not be called again.
+		b.checkAccountUsed(acct)
+		require.Len(t, mock.TransactionsCalls(), 1)
+		// And Used should still be true.
+		require.True(t, acct.Config().Config.Used)
+	}
+
+}