- lock SetCurrencyConversionExchange during an operation to prevent a…

… race

- stop retryGetTicker when the ctx is done

libwallet/assets_config.go

@@ -177,6 +177,8 @@ func (mgr *AssetsManager) GetCurrencyConversionExchange() string {
 
 // SetCurrencyConversionExchange sets the currency conversion exchange.
 func (mgr *AssetsManager) SetCurrencyConversionExchange(xc string) {
+	mgr.rateMutex.Lock()
+	defer mgr.rateMutex.Unlock()
 	mgr.saveAppConfigValue(sharedW.CurrencyConversionConfigKey, xc)
 	go func() {
 		err := mgr.RateSource.ToggleSource(xc)

libwallet/assets_manager.go

@@ -64,6 +64,7 @@ type AssetsManager struct {
 	InstantSwap     *instantswap.InstantSwap
 	ExternalService *ext.Service
 	RateSource      ext.RateSource
+	rateMutex       sync.Mutex
 
 	dexcMtx     sync.RWMutex
 	dexcCtx     context.Context

libwallet/ext/rate_source.go

@@ -360,14 +360,20 @@ func (cs *CommonRateSource) retryGetTicker(market values.Market) (*Ticker, error
 	var err error
 	backoff := 1 * time.Second
 	for i := 0; i < 3; i++ {
-		newTicker, err = cs.getTicker(market)
-		if err == nil {
-			return newTicker, nil
+		select {
+		case <-cs.ctx.Done():
+			log.Errorf("fetching ticker canceled: %v", cs.ctx.Err())
+			return nil, cs.ctx.Err()
+		default:
+			newTicker, err = cs.getTicker(market)
+			if err == nil {
+				return newTicker, nil
+			}
+
+			log.Errorf("fetching ticker %d failed: %v. Retrying in %v\n", i+1, err, backoff)
+			time.Sleep(backoff)
+			backoff *= 2 // Exponential backoff
 		}
-
-		log.Errorf("fetching ticker %d failed: %v. Retrying in %v\n", i+1, err, backoff)
-		time.Sleep(backoff)
-		backoff *= 2 // Exponential backoff
 	}
 	if cs.disableConversionExchange != nil {
 		cs.disableConversionExchange()