client/core: do not disable accounts with unspent bonds

client/core/account.go

@@ -54,10 +54,13 @@ func (c *Core) AccountDisable(pw []byte, addr string) error {
 		return newError(unknownDEXErr, "error retrieving dex conn: %w", err)
 	}
 
-	// Check active orders.
+	// Check active orders or bonds.
 	if dc.hasActiveOrders() {
 		return fmt.Errorf("cannot disable account with active orders")
 	}
+	if dc.hasUnspentBond() {
+		return fmt.Errorf("cannot disable account with unspent bonds")
+	}
 
 	err = c.db.DisableAccount(dc.acct.host)
 	if err != nil {

client/core/core.go

@@ -2775,11 +2775,17 @@ func (dc *dexConnection) bondTotal(assetID uint32) (total, active uint64) {
 	return dc.bondTotalInternal(assetID)
 }
 
-func (dc *dexConnection) hasUnspentBond(assetID uint32) bool {
+func (dc *dexConnection) hasUnspentAssetBond(assetID uint32) bool {
 	total, _ := dc.bondTotal(assetID)
 	return total > 0
 }
 
+func (dc *dexConnection) hasUnspentBond() bool {
+	dc.acct.authMtx.RLock()
+	defer dc.acct.authMtx.RUnlock()
+	return len(dc.acct.bonds) > 0 || len(dc.acct.pendingBonds) > 0 || len(dc.acct.expiredBonds) > 0
+}
+
 // isActiveBondAsset indicates if a wallet (or it's parent if the asset is a
 // token, or it's children if it's a base asset) is needed for bonding on any
 // configured DEX. includeLive should be set to consider all existing unspent
@@ -2808,7 +2814,7 @@ func (c *Core) isActiveBondAsset(assetID uint32, includeLive bool) bool {
 		}
 		if includeLive {
 			for id := range assetIDs {
-				if dc.hasUnspentBond(id) {
+				if dc.hasUnspentAssetBond(id) {
 					return true
 				}
 			}