Merge commit 'refs/pull/2830/head' of https://github.com/BitBoxSwiss/bitbox-wallet-app

Author: benma

backend/coins/btc/types/types_test.go

@@ -28,8 +28,8 @@ func TestSignatureDER(t *testing.T) {
 		[]byte("\xda\xfc\x5b\x9b\x48\x2e\x5c\x5c\xd0\x6b\xe6\x73\xde\x62\x97\xe5\xd5\x25\x9a\x4f\xab\x18\x51\x2a\x93\xfe\x00\x9b\xef\xb1\xeb\xc0"),
 	)
 	dummyMsg := make([]byte, 32)
-	sig, err := ecdsa.SignCompact(ecdsaSk, dummyMsg, true)
-	require.NoError(t, err)
+	sig := ecdsa.SignCompact(ecdsaSk, dummyMsg, true)
+	require.NotNil(t, sig)
 	require.Equal(t,
 		(&Signature{R: new(big.Int).SetBytes(sig[1:33]), S: new(big.Int).SetBytes(sig[33:])}).SerializeDER(),
 		[]byte("\x30\x45\x02\x21\x00\xe6\x21\xa7\x68\x6d\x51\xfb\x23\xe7\x61\xad\xff\x43\x67\x88\x1a\x6f\xb1\x6b\xc5\x63\x5f\xf3\x4e\xea\x39\xaf\xda\xf0\x33\xe4\xd7\x02\x20\x79\x98\x51\x2f\x52\xbd\x3d\xae\x10\x09\x51\xa6\xdf\x9e\x66\xbc\xb7\x8c\x19\x4d\xca\xa3\xc7\xfd\x24\x51\x18\x0b\x5c\xc9\x4d\x4e"),

backend/keystore/software/software.go

@@ -246,10 +246,8 @@ func (keystore *Keystore) SignTransaction(
 				}
 				keystore.log.Debug("Calculated legacy signature hash")
 			}
-			signature, err := ecdsa.SignCompact(prv, signatureHash, true)
-			if err != nil {
-				return err
-			}
+			signature := ecdsa.SignCompact(prv, signatureHash, true)
+
 			signatures[index] = &types.Signature{
 				R: new(big.Int).SetBytes(signature[1:33]),
 				S: new(big.Int).SetBytes(signature[33:]),

go.mod

@@ -3,10 +3,10 @@ module github.com/BitBoxSwiss/bitbox-wallet-app
 go 1.21
 
 require (
-	github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20240531104813-fa7f932bdd38
+	github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20240726181108-383ad4bcada4
 	github.com/BitBoxSwiss/block-client-go v0.0.0-20240516081043-0d604acd6519
 	github.com/btcsuite/btcd v0.24.2
-	github.com/btcsuite/btcd/btcec/v2 v2.3.3
+	github.com/btcsuite/btcd/btcec/v2 v2.3.4
 	github.com/btcsuite/btcd/btcutil v1.1.5
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
 	github.com/ethereum/go-ethereum v1.14.7
@@ -33,13 +33,13 @@ require (
 	github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f // indirect
 	github.com/cespare/cp v1.1.1 // indirect
 	github.com/consensys/bavard v0.1.13 // indirect
-	github.com/consensys/gnark-crypto v0.12.1 // indirect
-	github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
+	github.com/consensys/gnark-crypto v0.13.0 // indirect
+	github.com/crate-crypto/go-kzg-4844 v1.1.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/deckarep/golang-set/v2 v2.6.0 // indirect
 	github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
-	github.com/ethereum/c-kzg-4844 v1.0.2 // indirect
+	github.com/ethereum/c-kzg-4844 v1.0.3 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
@@ -49,14 +49,14 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
-	github.com/supranational/blst v0.3.12 // indirect
+	github.com/supranational/blst v0.3.13 // indirect
 	github.com/tklauser/go-sysconf v0.3.14 // indirect
 	github.com/tklauser/numcpus v0.8.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
+	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
 	golang.org/x/sync v0.7.0 // indirect
 	golang.org/x/sys v0.22.0 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	rsc.io/tmplfunc v0.0.3 // indirect
 )