fix signature check in wallet_extension

tools/walletextension/wallet_extension.go

@@ -275,13 +275,10 @@ func (w *WalletExtension) AddAddressToUser(hexUserID string, address string, sig
 	requestStartTime := time.Now()
 	addressFromMessage := gethcommon.HexToAddress(address)
 	// check if a message was signed by the correct address and if the signature is valid
-	sigAddrs, err := viewingkey.CheckEIP712Signature(hexUserID, signature, int64(w.config.TenChainID))
-	if err != nil {
-		return fmt.Errorf("signature is not valid: %w", err)
-	}
 
-	if sigAddrs.Hex() != address {
-		return fmt.Errorf("signature is not valid. Signature address %s!=%s ", sigAddrs, address)
+	isValidAndMatchesAddress := viewingkey.CheckIfSignatureIsValidAndMatchesAddress(hexUserID, signature, int64(w.config.TenChainID), &addressFromMessage)
+	if !isValidAndMatchesAddress {
+		return errors.New("signature is not valid or does not match the address in the message")
 	}
 
 	// register the account for that viewing key