refactor: remove string ticker-based coin pair model in favour of quote

Author: takenagain

packages/komodo_cex_market_data/lib/src/binance/data/binance_repository.dart

@@ -93,14 +93,17 @@ class BinanceRepository implements CexRepository {
 
   @override
   Future<CoinOhlc> getCoinOhlc(
-    CexCoinPair symbol,
+    AssetId assetId,
+    QuoteCurrency quoteCurrency,
     GraphInterval interval, {
     DateTime? startAt,
     DateTime? endAt,
     int? limit,
   }) async {
-    if (symbol.baseCoinTicker.toUpperCase() ==
-        symbol.relCoinTicker.toUpperCase()) {
+    final baseTicker = resolveTradingSymbol(assetId);
+    final relTicker = quoteCurrency.binanceId;
+
+    if (baseTicker.toUpperCase() == relTicker.toUpperCase()) {
       throw ArgumentError('Base and rel coin tickers cannot be the same');
     }
 
@@ -112,8 +115,10 @@ class BinanceRepository implements CexRepository {
     Exception? lastException;
     for (final baseUrl in binanceApiEndpoint) {
       try {
+        final symbolString =
+            '${baseTicker.toUpperCase()}${relTicker.toUpperCase()}';
         return await _binanceProvider.fetchKlines(
-          symbol.toString(),
+          symbolString,
           intervalAbbreviation,
           startUnixTimestampMilliseconds: startUnixTimestamp,
           endUnixTimestampMilliseconds: endUnixTimestamp,
@@ -156,7 +161,8 @@ class BinanceRepository implements CexRepository {
     final startAt = endAt.subtract(const Duration(days: 1));
 
     final ohlcData = await getCoinOhlc(
-      CexCoinPair(baseCoinTicker: trimmedCoinId, relCoinTicker: fiatCurrencyId),
+      assetId,
+      fiatCurrency,
       GraphInterval.oneDay,
       startAt: startAt,
       endAt: endAt,
@@ -197,10 +203,8 @@ class BinanceRepository implements CexRepository {
           i + 500 > daysDiff ? endDate : startDate.add(Duration(days: i + 500));
 
       final ohlcData = await getCoinOhlc(
-        CexCoinPair(
-          baseCoinTicker: trimmedCoinId,
-          relCoinTicker: fiatCurrencyId,
-        ),
+        assetId,
+        fiatCurrency,
         GraphInterval.oneDay,
         startAt: batchStartDate,
         endAt: batchEndDate,

packages/komodo_cex_market_data/lib/src/bootstrap/market_data_bootstrap.dart

@@ -65,11 +65,15 @@ class MarketDataBootstrap {
     MarketDataConfig config,
   ) async {
     if (config.enableCoinGecko) {
-      container.registerSingleton<ICoinGeckoProvider>(CoinGeckoCexProvider());
+      container.registerSingletonAsync<ICoinGeckoProvider>(
+        () async => CoinGeckoCexProvider(),
+      );
     }
 
     if (config.enableKomodoPrice) {
-      container.registerSingleton<IKomodoPriceProvider>(KomodoPriceProvider());
+      container.registerSingletonAsync<IKomodoPriceProvider>(
+        () async => KomodoPriceProvider(),
+      );
     }
   }
 
@@ -87,7 +91,7 @@ class MarketDataBootstrap {
     if (config.enableCoinGecko) {
       container.registerSingletonAsync<CoinGeckoRepository>(
         () async => CoinGeckoRepository(
-          coinGeckoProvider: container<ICoinGeckoProvider>(),
+          coinGeckoProvider: await container.getAsync<ICoinGeckoProvider>(),
         ),
         dependsOn: [ICoinGeckoProvider],
       );
@@ -96,7 +100,7 @@ class MarketDataBootstrap {
     if (config.enableKomodoPrice) {
       container.registerSingletonAsync<KomodoPriceRepository>(
         () async => KomodoPriceRepository(
-          cexPriceProvider: container<IKomodoPriceProvider>(),
+          cexPriceProvider: await container.getAsync<IKomodoPriceProvider>(),
         ),
         dependsOn: [IKomodoPriceProvider],
       );
@@ -123,15 +127,15 @@ class MarketDataBootstrap {
 
     // Add repositories in priority order
     if (config.enableKomodoPrice) {
-      repositories.add(container<KomodoPriceRepository>());
+      repositories.add(await container.getAsync<KomodoPriceRepository>());
     }
 
     if (config.enableBinance) {
-      repositories.add(container<BinanceRepository>());
+      repositories.add(await container.getAsync<BinanceRepository>());
     }
 
     if (config.enableCoinGecko) {
-      repositories.add(container<CoinGeckoRepository>());
+      repositories.add(await container.getAsync<CoinGeckoRepository>());
     }
 
     // Add any custom repositories

packages/komodo_cex_market_data/lib/src/cex_repository.dart

@@ -46,7 +46,8 @@ abstract class CexRepository {
   ///   await repo.getCoinOhlc('BTCUSDT', '1d', limit: 100);
   /// ```
   Future<CoinOhlc> getCoinOhlc(
-    CexCoinPair symbol,
+    AssetId assetId,
+    QuoteCurrency quoteCurrency,
     GraphInterval interval, {
     DateTime? startAt,
     DateTime? endAt,

packages/komodo_cex_market_data/lib/src/coingecko/data/coingecko_repository.dart

@@ -1,5 +1,3 @@
-import 'dart:developer';
-
 import 'package:async/async.dart';
 import 'package:decimal/decimal.dart';
 import 'package:komodo_cex_market_data/src/cex_repository.dart';
@@ -8,8 +6,6 @@ import 'package:komodo_cex_market_data/src/coingecko/models/coin_historical_data
 import 'package:komodo_cex_market_data/src/id_resolution_strategy.dart';
 import 'package:komodo_cex_market_data/src/models/models.dart';
 import 'package:komodo_cex_market_data/src/repository_selection_strategy.dart';
-import 'package:komodo_defi_types/komodo_defi_type_utils.dart'
-    show BackoffStrategy, ExponentialBackoff, retry;
 import 'package:komodo_defi_types/komodo_defi_types.dart';
 
 /// The number of seconds in a day.
@@ -23,21 +19,12 @@ class CoinGeckoRepository implements CexRepository {
   /// Creates a new instance of [CoinGeckoRepository].
   CoinGeckoRepository({
     required this.coinGeckoProvider,
-    BackoffStrategy? defaultBackoffStrategy,
     bool enableMemoization = true,
-  }) : _defaultBackoffStrategy =
-           defaultBackoffStrategy ??
-           ExponentialBackoff(
-             initialDelay: const Duration(milliseconds: 300),
-             maxDelay: const Duration(seconds: 5),
-             withJitter: true,
-           ),
-       _idResolutionStrategy = CoinGeckoIdResolutionStrategy(),
+  }) : _idResolutionStrategy = CoinGeckoIdResolutionStrategy(),
        _enableMemoization = enableMemoization;
 
   /// The CoinGecko provider to use for fetching data.
   final ICoinGeckoProvider coinGeckoProvider;
-  final BackoffStrategy _defaultBackoffStrategy;
   final IdResolutionStrategy _idResolutionStrategy;
   final bool _enableMemoization;
 
@@ -61,7 +48,7 @@ class CoinGeckoRepository implements CexRepository {
   @override
   Future<List<CexCoin>> getCoinList() async {
     if (_enableMemoization) {
-      return _coinListMemoizer.runOnce(() => _fetchCoinListInternal());
+      return _coinListMemoizer.runOnce(_fetchCoinListInternal);
     } else {
       // Warning: Direct API calls without memoization can lead to API rate limiting
       // and unnecessary network requests. Use this mode sparingly.
@@ -91,7 +78,8 @@ class CoinGeckoRepository implements CexRepository {
 
   @override
   Future<CoinOhlc> getCoinOhlc(
-    CexCoinPair symbol,
+    AssetId assetId,
+    QuoteCurrency quoteCurrency,
     GraphInterval interval, {
     DateTime? startAt,
     DateTime? endAt,
@@ -103,11 +91,14 @@ class CoinGeckoRepository implements CexRepository {
       days = (timeDelta.inSeconds.toDouble() / secondsInDay).ceil();
     }
 
+    // Use the same ticker resolution as other methods
+    final tradingSymbol = resolveTradingSymbol(assetId);
+
     // If the request is within the CoinGecko limit, make a single request
     if (days <= maxCoinGeckoDays) {
       return coinGeckoProvider.fetchCoinOhlc(
-        symbol.baseCoinTicker,
-        symbol.relCoinTicker,
+        tradingSymbol,
+        quoteCurrency.coinGeckoId,
         days,
       );
     }
@@ -124,15 +115,17 @@ class CoinGeckoRepository implements CexRepository {
     var currentStart = startAt;
 
     while (currentStart.isBefore(endAt)) {
-      final currentEnd = currentStart.add(Duration(days: maxCoinGeckoDays));
+      final currentEnd = currentStart.add(
+        const Duration(days: maxCoinGeckoDays),
+      );
       final batchEndDate = currentEnd.isAfter(endAt) ? endAt : currentEnd;
 
       final batchDays = batchEndDate.difference(currentStart).inDays;
       if (batchDays <= 0) break;
 
       final batchOhlc = await coinGeckoProvider.fetchCoinOhlc(
-        symbol.baseCoinTicker,
-        symbol.relCoinTicker,
+        tradingSymbol,
+        quoteCurrency.coinGeckoId,
         batchDays,
       );
 
@@ -153,64 +146,14 @@ class CoinGeckoRepository implements CexRepository {
     return _idResolutionStrategy.canResolve(assetId);
   }
 
-  /// Maps any currency to the appropriate CoinGecko vs_currency
-  /// Handles stablecoin -> fiat conversion and validates against supported currencies
-  String _mapFiatCurrencyToCoingecko(QuoteCurrency fiatCurrency) {
-    // Use the QuoteCurrency's coinGeckoId which handles all mappings
-    final mappedCurrency = fiatCurrency.coinGeckoId;
-
-    // Verify the mapped currency is actually supported by CoinGecko
-    if (_cachedFiatCurrencies?.contains(mappedCurrency.toUpperCase()) == true) {
-      return mappedCurrency;
-    }
-
-    // For stablecoins, never fall back to the stablecoin symbol itself
-    // Always prefer the underlying fiat currency
-    final isStablecoin = fiatCurrency.maybeWhen(
-      stablecoin: (_, __, ___) => true,
-      orElse: () => false,
-    );
-
-    if (!isStablecoin) {
-      // Fallback: Check if the original currency is directly supported (only for non-stablecoins)
-      final original = fiatCurrency.symbol.toLowerCase();
-      if (_cachedFiatCurrencies?.contains(original.toUpperCase()) == true) {
-        return original;
-      }
-    }
-
-    // For stablecoins, if the underlying fiat is not supported, 
-    // still return the underlying fiat currency (don't fallback to stablecoin symbol)
-    // This ensures we never use stablecoin symbols like 'usdt' as vs_currency
-    if (isStablecoin) {
-      return mappedCurrency; // This is already the underlying fiat from coinGeckoId
-    }
-
-    // Throw exception instead of silently falling back to USD
-    // This prevents incorrect price data without warning
-    throw UnsupportedError(
-      'Currency ${fiatCurrency.symbol} (mapped to $mappedCurrency) is not supported by CoinGecko. '
-      'Supported currencies: ${_cachedFiatCurrencies?.join(', ') ?? 'unknown (cache not loaded)'}',
-    );
-  }
-
-  /// Maps currency for supports() method - returns null instead of throwing for unsupported currencies
-  String? _mapFiatCurrencyToCoingeckoSafe(QuoteCurrency fiatCurrency) {
-    try {
-      return _mapFiatCurrencyToCoingecko(fiatCurrency);
-    } on UnsupportedError {
-      return null;
-    }
-  }
-
   @override
   Future<Decimal> getCoinFiatPrice(
     AssetId assetId, {
     DateTime? priceDate,
     QuoteCurrency fiatCurrency = Stablecoin.usdt,
   }) async {
     final tradingSymbol = resolveTradingSymbol(assetId);
-    final mappedFiatId = _mapFiatCurrencyToCoingecko(fiatCurrency);
+    final mappedFiatId = fiatCurrency.coinGeckoId;
 
     final coinPrice = await coinGeckoProvider.fetchCoinHistoricalMarketData(
       id: tradingSymbol,
@@ -247,14 +190,13 @@ class CoinGeckoRepository implements CexRepository {
     QuoteCurrency fiatCurrency = Stablecoin.usdt,
   }) async {
     final tradingSymbol = resolveTradingSymbol(assetId);
-    final mappedFiatId = _mapFiatCurrencyToCoingecko(fiatCurrency);
+    final mappedFiatId = fiatCurrency.coinGeckoId;
 
     if (tradingSymbol.toUpperCase() == mappedFiatId.toUpperCase()) {
       throw ArgumentError('Coin and fiat coin cannot be the same');
     }
 
     dates.sort();
-    final trimmedCoinId = tradingSymbol.replaceAll(RegExp('-segwit'), '');
 
     if (dates.isEmpty) {
       return {};
@@ -275,7 +217,8 @@ class CoinGeckoRepository implements CexRepository {
               : startDate.add(Duration(days: i + maxCoinGeckoDays));
 
       final ohlcData = await getCoinOhlc(
-        CexCoinPair(baseCoinTicker: trimmedCoinId, relCoinTicker: mappedFiatId),
+        assetId,
+        fiatCurrency,
         GraphInterval.oneDay,
         startAt: batchStartDate,
         endAt: batchEndDate,
@@ -304,7 +247,7 @@ class CoinGeckoRepository implements CexRepository {
     QuoteCurrency fiatCurrency = Stablecoin.usdt,
   }) async {
     final tradingSymbol = resolveTradingSymbol(assetId);
-    final mappedFiatId = _mapFiatCurrencyToCoingecko(fiatCurrency);
+    final mappedFiatId = fiatCurrency.coinGeckoId;
 
     if (tradingSymbol.toUpperCase() == mappedFiatId.toUpperCase()) {
       throw ArgumentError('Coin and fiat coin cannot be the same');
@@ -332,19 +275,12 @@ class CoinGeckoRepository implements CexRepository {
     PriceRequestType requestType,
   ) async {
     final coins = await getCoinList();
-    final mappedFiat = _mapFiatCurrencyToCoingeckoSafe(fiatCurrency);
-
-    // If currency mapping failed, it's not supported
-    if (mappedFiat == null) {
-      return false;
-    }
+    final mappedFiat = fiatCurrency.coinGeckoId;
 
     // Use the same logic as resolveTradingSymbol to find the coin
     final tradingSymbol = resolveTradingSymbol(assetId);
     final supportsAsset = coins.any(
-      (c) =>
-          c.id.toLowerCase() == tradingSymbol.toLowerCase() ||
-          c.symbol.toLowerCase() == tradingSymbol.toLowerCase(),
+      (c) => c.id.toLowerCase() == tradingSymbol.toLowerCase(),
     );
     final supportsFiat =
         _cachedFiatCurrencies?.contains(mappedFiat.toUpperCase()) ?? false;