Merge branch 'coincontrol'

Author: strmci

CHANGELOG.md

@@ -12,6 +12,7 @@
 - Fix Wallet Connect issue where account unspecified by the connecting dapp caused a UI crash
 - Fix Wallet Connect issue with required/optionalNamespace and handling all possible namespace definitions
 - Add Satoshi as an option in active currencies
+- Show address re-use warning and group UTXOs with the same address together in coin control.
 
 ## 4.42.0
 - Preselect backup when there's only one backup available

backend/coins/btc/handlers/handlers.go

@@ -324,16 +324,27 @@ func (handlers *Handlers) getUTXOs(*http.Request) (interface{}, error) {
 		return result, errp.New("Interface must be of type btc.Account")
 	}
 
+	addressCounts := make(map[string]int)
+
 	for _, output := range t.SpendableOutputs() {
+		address := output.Address.EncodeForHumans()
+		addressCounts[address]++
+	}
+
+	for _, output := range t.SpendableOutputs() {
+		address := output.Address.EncodeForHumans()
+		addressReused := addressCounts[address] > 1
+
 		result = append(result,
 			map[string]interface{}{
-				"outPoint":   output.OutPoint.String(),
-				"txId":       output.OutPoint.Hash.String(),
-				"txOutput":   output.OutPoint.Index,
-				"amount":     handlers.formatBTCAmountAsJSON(btcutil.Amount(output.TxOut.Value), false),
-				"address":    output.Address.EncodeForHumans(),
-				"scriptType": output.Address.Configuration.ScriptType(),
-				"note":       handlers.account.TxNote(output.OutPoint.Hash.String()),
+				"outPoint":      output.OutPoint.String(),
+				"txId":          output.OutPoint.Hash.String(),
+				"txOutput":      output.OutPoint.Index,
+				"amount":        handlers.formatBTCAmountAsJSON(btcutil.Amount(output.TxOut.Value), false),
+				"address":       address,
+				"scriptType":    output.Address.Configuration.ScriptType(),
+				"note":          handlers.account.TxNote(output.OutPoint.Hash.String()),
+				"addressReused": addressReused,
 			})
 	}
 

frontends/web/src/api/account.ts

@@ -369,6 +369,7 @@ export type TUTXO = {
   amount: IAmount;
   note: string;
   scriptType: ScriptType;
+  addressReused: boolean;
 };
 
 export const getUTXOs = (code: AccountCode): Promise<TUTXO[]> => {

frontends/web/src/components/badge/badge.module.css

@@ -3,7 +3,7 @@
   border: 1px solid;
   display: inline-block;
   font-size: var(--size-small);
-  line-height: 14px;
+  line-height: 1;
   padding: var(--space-eight) 10px;
   white-space: nowrap;
 }
@@ -42,3 +42,10 @@
   border-color: var(--color-darkyellow);
   color: var(--color-olive);
 }
+
+/* swiss-red with different opacities */
+.danger {
+  background: rgba(255, 0, 0, 0.2);
+  border-color: rgba(255, 0, 0, 0.33);
+  color: rgba(255, 0, 0, 1);
+}

frontends/web/src/components/badge/badge.tsx

@@ -17,7 +17,7 @@
 import { ReactElement, ReactNode } from 'react';
 import style from './badge.module.css';
 
-type TBadgeStyles = 'success' | 'warning'; // TODO: not yet implemented 'info' | 'danger'
+type TBadgeStyles = 'success' | 'warning' | 'danger'; // TODO: not yet implemented 'info'
 
 type TProps = {
   children?: ReactNode;

frontends/web/src/components/forms/radio.module.css

@@ -1,5 +1,6 @@
 .radio {
     --size-default: 14px;
+    line-height: 1.5;
 }
 
 .radio input {
@@ -11,7 +12,6 @@
     display: inline-flex;
     flex-direction: column;
     font-size: var(--size-default);
-    line-height: 1.5;
     margin-right: var(--space-half);
     padding-left: calc(var(--space-half) + var(--space-quarter));
     position: relative;

frontends/web/src/locales/en/app.json

@@ -1525,6 +1525,7 @@
     "button": "Review",
     "coincontrol": {
       "address": "Address",
+      "addressReused": "Address re-used",
       "outpoint": "Outpoint",
       "title": "Send from output"
     },
@@ -1790,6 +1791,7 @@
     "walletConnect": "WalletConnect"
   },
   "warning": {
+    "coincontrol": "One or more UTXOs have a reused address. Be aware the receiver will see all UTXOs associated with those addresses.",
     "receivePairing": "Please pair the BitBox to enable secure address verification. Go to 'Manage device' in the sidebar.",
     "sdcard": "Keep the microSD card stored separate from the BitBox, unless you want to manage backups.",
     "sendPairing": "Please pair the BitBox to securely verify transaction details. Go to 'Manage device' in the sidebar."

frontends/web/src/routes/account/send/utxos.module.css

@@ -74,7 +74,7 @@
 .transaction {
     display: flex;
     font-size: var(--size-default);
-    line-height: 1.4;
+    line-height: 1.5;
     white-space: nowrap;
 }
 

frontends/web/src/routes/account/send/utxos.tsx

@@ -32,6 +32,8 @@ import { ExternalLink } from '../../../components/icon';
 import { Amount } from '../../../components/amount/amount';
 import { FiatConversion } from '../../../components/rates/rates';
 import { getScriptName } from '../utils';
+import { Message } from '../../../components/message/message';
+import { Badge } from '../../../components/badge/badge';
 import style from './utxos.module.css';
 
 export type TSelectedUTXOs = {
@@ -56,6 +58,7 @@ export const UTXOs = ({
   const { t } = useTranslation();
   const [utxos, setUtxos] = useState<TUTXO[]>([]);
   const [selectedUTXOs, setSelectedUTXOs] = useState<TSelectedUTXOs>({});
+  const [reusedAddressUTXOs, setReusedAddressUTXOs] = useState(0);
 
   useEffect(() => {
     getUTXOs(accountCode).then(setUtxos);
@@ -71,14 +74,22 @@ export const UTXOs = ({
     return () => unsubscribe();
   }, [accountCode]);
 
-  const handleUTXOChange = (event: ChangeEvent<HTMLInputElement>) => {
+  const handleUTXOChange = (
+    event: ChangeEvent<HTMLInputElement>,
+    utxo: TUTXO,
+  ) => {
     const target = event.target;
-    const outPoint = target.dataset.outpoint as string;
     const proposedUTXOs = Object.assign({}, selectedUTXOs);
     if (target.checked) {
-      proposedUTXOs[outPoint] = true;
+      proposedUTXOs[utxo.outPoint] = true;
+      if (utxo.addressReused) {
+        setReusedAddressUTXOs(reusedAddressUTXOs + 1);
+      }
     } else {
-      delete proposedUTXOs[outPoint];
+      delete proposedUTXOs[utxo.outPoint];
+      if (utxo.addressReused) {
+        setReusedAddressUTXOs(reusedAddressUTXOs - 1);
+      }
     }
     setSelectedUTXOs(proposedUTXOs);
     onChange(proposedUTXOs);
@@ -98,8 +109,7 @@ export const UTXOs = ({
               <Checkbox
                 checked={!!selectedUTXOs[utxo.outPoint]}
                 id={'utxo-' + utxo.outPoint}
-                data-outpoint={utxo.outPoint}
-                onChange={handleUTXOChange}>
+                onChange={event => handleUTXOChange(event, utxo)}>
                 {utxo.note && (
                   <div className={style.note}>
                     <strong>{utxo.note}{' '}</strong>
@@ -124,6 +134,14 @@ export const UTXOs = ({
                       <span className={style.shrink}>
                         {utxo.address}
                       </span>
+                      <div className="m-left-quarter">
+                        {utxo.addressReused ?
+                          <Badge type="danger">
+                            {t('send.coincontrol.addressReused')}
+                          </Badge> :
+                          null
+                        }
+                      </div>
                     </div>
                     <div className={style.transaction}>
                       <span className={style.label}>
@@ -155,6 +173,13 @@ export const UTXOs = ({
       title={t('send.coincontrol.title')}
       large
       onClose={onClose}>
+      <div>
+        {(reusedAddressUTXOs > 0) && (
+          <Message type="warning">
+            {t('warning.coincontrol')}
+          </Message>
+        )}
+      </div>
       <div>
         { allScriptTypes.map(renderUTXOs) }
         <div className="buttons text-center m-top-none m-bottom-half">

frontends/web/src/routes/account/summary/accountssummary.module.css

@@ -1,6 +1,6 @@
 .accountName {
     display: flex;
-    align-items: center;
+    align-items: baseline;
 }
 
 .accountName p {

frontends/web/src/routes/buy/components/exchangeselectionradio.module.css

@@ -48,7 +48,6 @@
     color: var(--color-default);
     display: inline-block;
     font-weight: 400;
-    line-height: 22px;
     margin: 0;
 }
 .paymentMethodName img {

frontends/web/src/routes/buy/exchange.module.css

@@ -75,6 +75,7 @@
 }
 
 .radioButtonsContainer {
+    line-height: 1.5;
     min-height: 180px;
 }