diff --git a/android/app/build.gradle b/android/app/build.gradle
index 5b67a6f4e4..650b99789a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -48,7 +48,7 @@ if (flutterVersionName == null) {
android {
namespace 'com.komodoplatform.atomicdex'
- compileSdk 35
+ compileSdk 36
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
@@ -63,7 +63,7 @@ android {
defaultConfig {
applicationId "com.komodoplatform.atomicdex"
minSdkVersion 28
- targetSdkVersion 35
+ targetSdkVersion 36
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
diff --git a/app_theme/pubspec.lock b/app_theme/pubspec.lock
deleted file mode 100644
index c4cb968fff..0000000000
--- a/app_theme/pubspec.lock
+++ /dev/null
@@ -1,64 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
- characters:
- dependency: transitive
- description:
- name: characters
- sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
- url: "https://pub.dev"
- source: hosted
- version: "1.4.0"
- collection:
- dependency: transitive
- description:
- name: collection
- sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
- url: "https://pub.dev"
- source: hosted
- version: "1.19.1"
- flutter:
- dependency: "direct main"
- description: flutter
- source: sdk
- version: "0.0.0"
- material_color_utilities:
- dependency: transitive
- description:
- name: material_color_utilities
- sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
- url: "https://pub.dev"
- source: hosted
- version: "0.11.1"
- meta:
- dependency: transitive
- description:
- name: meta
- sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
- url: "https://pub.dev"
- source: hosted
- version: "1.16.0"
- plugin_platform_interface:
- dependency: "direct main"
- description:
- name: plugin_platform_interface
- sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
- url: "https://pub.dev"
- source: hosted
- version: "2.1.8"
- sky_engine:
- dependency: transitive
- description: flutter
- source: sdk
- version: "0.0.0"
- vector_math:
- dependency: transitive
- description:
- name: vector_math
- sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
- url: "https://pub.dev"
- source: hosted
- version: "2.2.0"
-sdks:
- dart: ">=3.8.1 <4.0.0"
- flutter: ">=3.35.1"
diff --git a/app_theme/pubspec.yaml b/app_theme/pubspec.yaml
index 4d11719378..27e1c6afc1 100644
--- a/app_theme/pubspec.yaml
+++ b/app_theme/pubspec.yaml
@@ -3,6 +3,8 @@ description: App theme.
version: 0.0.1
# homepage:
+resolution: workspace
+
environment:
sdk: ">=3.8.1 <4.0.0"
flutter: ">=3.35.2 <4.0.0"
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
index 8c6e56146e..d57061dd6b 100644
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
CFBundleVersion
1.0
MinimumOSVersion
- 12.0
+ 13.0
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 391a080413..d367030ef2 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -33,48 +33,48 @@ PODS:
- file_picker (0.0.1):
- DKImagePickerController/PhotoGallery
- Flutter
- - Firebase/Analytics (11.10.0):
+ - Firebase/Analytics (11.15.0):
- Firebase/Core
- - Firebase/Core (11.10.0):
+ - Firebase/Core (11.15.0):
- Firebase/CoreOnly
- - FirebaseAnalytics (~> 11.10.0)
- - Firebase/CoreOnly (11.10.0):
- - FirebaseCore (~> 11.10.0)
- - firebase_analytics (11.4.5):
- - Firebase/Analytics (= 11.10.0)
+ - FirebaseAnalytics (~> 11.15.0)
+ - Firebase/CoreOnly (11.15.0):
+ - FirebaseCore (~> 11.15.0)
+ - firebase_analytics (11.6.0):
+ - Firebase/Analytics (= 11.15.0)
- firebase_core
- Flutter
- - firebase_core (3.13.0):
- - Firebase/CoreOnly (= 11.10.0)
+ - firebase_core (3.15.2):
+ - Firebase/CoreOnly (= 11.15.0)
- Flutter
- - FirebaseAnalytics (11.10.0):
- - FirebaseAnalytics/AdIdSupport (= 11.10.0)
- - FirebaseCore (~> 11.10.0)
+ - FirebaseAnalytics (11.15.0):
+ - FirebaseAnalytics/Default (= 11.15.0)
+ - FirebaseCore (~> 11.15.0)
- FirebaseInstallations (~> 11.0)
- - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- - GoogleUtilities/MethodSwizzler (~> 8.0)
- - GoogleUtilities/Network (~> 8.0)
- - "GoogleUtilities/NSData+zlib (~> 8.0)"
+ - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+ - GoogleUtilities/MethodSwizzler (~> 8.1)
+ - GoogleUtilities/Network (~> 8.1)
+ - "GoogleUtilities/NSData+zlib (~> 8.1)"
- nanopb (~> 3.30910.0)
- - FirebaseAnalytics/AdIdSupport (11.10.0):
- - FirebaseCore (~> 11.10.0)
+ - FirebaseAnalytics/Default (11.15.0):
+ - FirebaseCore (~> 11.15.0)
- FirebaseInstallations (~> 11.0)
- - GoogleAppMeasurement (= 11.10.0)
- - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- - GoogleUtilities/MethodSwizzler (~> 8.0)
- - GoogleUtilities/Network (~> 8.0)
- - "GoogleUtilities/NSData+zlib (~> 8.0)"
+ - GoogleAppMeasurement/Default (= 11.15.0)
+ - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+ - GoogleUtilities/MethodSwizzler (~> 8.1)
+ - GoogleUtilities/Network (~> 8.1)
+ - "GoogleUtilities/NSData+zlib (~> 8.1)"
- nanopb (~> 3.30910.0)
- - FirebaseCore (11.10.0):
- - FirebaseCoreInternal (~> 11.10.0)
- - GoogleUtilities/Environment (~> 8.0)
- - GoogleUtilities/Logger (~> 8.0)
- - FirebaseCoreInternal (11.10.0):
- - "GoogleUtilities/NSData+zlib (~> 8.0)"
- - FirebaseInstallations (11.10.0):
- - FirebaseCore (~> 11.10.0)
- - GoogleUtilities/Environment (~> 8.0)
- - GoogleUtilities/UserDefaults (~> 8.0)
+ - FirebaseCore (11.15.0):
+ - FirebaseCoreInternal (~> 11.15.0)
+ - GoogleUtilities/Environment (~> 8.1)
+ - GoogleUtilities/Logger (~> 8.1)
+ - FirebaseCoreInternal (11.15.0):
+ - "GoogleUtilities/NSData+zlib (~> 8.1)"
+ - FirebaseInstallations (11.15.0):
+ - FirebaseCore (~> 11.15.0)
+ - GoogleUtilities/Environment (~> 8.1)
+ - GoogleUtilities/UserDefaults (~> 8.1)
- PromisesObjC (~> 2.4)
- Flutter (1.0.0)
- flutter_inappwebview_ios (0.0.1):
@@ -87,51 +87,57 @@ PODS:
- flutter_secure_storage_darwin (10.0.0):
- Flutter
- FlutterMacOS
- - GoogleAppMeasurement (11.10.0):
- - GoogleAppMeasurement/AdIdSupport (= 11.10.0)
- - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- - GoogleUtilities/MethodSwizzler (~> 8.0)
- - GoogleUtilities/Network (~> 8.0)
- - "GoogleUtilities/NSData+zlib (~> 8.0)"
+ - GoogleAdsOnDeviceConversion (2.1.0):
+ - GoogleUtilities/Logger (~> 8.1)
+ - GoogleUtilities/Network (~> 8.1)
- nanopb (~> 3.30910.0)
- - GoogleAppMeasurement/AdIdSupport (11.10.0):
- - GoogleAppMeasurement/WithoutAdIdSupport (= 11.10.0)
- - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- - GoogleUtilities/MethodSwizzler (~> 8.0)
- - GoogleUtilities/Network (~> 8.0)
- - "GoogleUtilities/NSData+zlib (~> 8.0)"
+ - GoogleAppMeasurement/Core (11.15.0):
+ - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+ - GoogleUtilities/MethodSwizzler (~> 8.1)
+ - GoogleUtilities/Network (~> 8.1)
+ - "GoogleUtilities/NSData+zlib (~> 8.1)"
- nanopb (~> 3.30910.0)
- - GoogleAppMeasurement/WithoutAdIdSupport (11.10.0):
- - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- - GoogleUtilities/MethodSwizzler (~> 8.0)
- - GoogleUtilities/Network (~> 8.0)
- - "GoogleUtilities/NSData+zlib (~> 8.0)"
+ - GoogleAppMeasurement/Default (11.15.0):
+ - GoogleAdsOnDeviceConversion (= 2.1.0)
+ - GoogleAppMeasurement/Core (= 11.15.0)
+ - GoogleAppMeasurement/IdentitySupport (= 11.15.0)
+ - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+ - GoogleUtilities/MethodSwizzler (~> 8.1)
+ - GoogleUtilities/Network (~> 8.1)
+ - "GoogleUtilities/NSData+zlib (~> 8.1)"
- nanopb (~> 3.30910.0)
- - GoogleUtilities/AppDelegateSwizzler (8.0.2):
+ - GoogleAppMeasurement/IdentitySupport (11.15.0):
+ - GoogleAppMeasurement/Core (= 11.15.0)
+ - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+ - GoogleUtilities/MethodSwizzler (~> 8.1)
+ - GoogleUtilities/Network (~> 8.1)
+ - "GoogleUtilities/NSData+zlib (~> 8.1)"
+ - nanopb (~> 3.30910.0)
+ - GoogleUtilities/AppDelegateSwizzler (8.1.0):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- GoogleUtilities/Privacy
- - GoogleUtilities/Environment (8.0.2):
+ - GoogleUtilities/Environment (8.1.0):
- GoogleUtilities/Privacy
- - GoogleUtilities/Logger (8.0.2):
+ - GoogleUtilities/Logger (8.1.0):
- GoogleUtilities/Environment
- GoogleUtilities/Privacy
- - GoogleUtilities/MethodSwizzler (8.0.2):
+ - GoogleUtilities/MethodSwizzler (8.1.0):
- GoogleUtilities/Logger
- GoogleUtilities/Privacy
- - GoogleUtilities/Network (8.0.2):
+ - GoogleUtilities/Network (8.1.0):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Privacy
- GoogleUtilities/Reachability
- - "GoogleUtilities/NSData+zlib (8.0.2)":
+ - "GoogleUtilities/NSData+zlib (8.1.0)":
- GoogleUtilities/Privacy
- - GoogleUtilities/Privacy (8.0.2)
- - GoogleUtilities/Reachability (8.0.2):
+ - GoogleUtilities/Privacy (8.1.0)
+ - GoogleUtilities/Reachability (8.1.0):
- GoogleUtilities/Logger
- GoogleUtilities/Privacy
- - GoogleUtilities/UserDefaults (8.0.2):
+ - GoogleUtilities/UserDefaults (8.1.0):
- GoogleUtilities/Logger
- GoogleUtilities/Privacy
- integration_test (0.0.1):
@@ -198,6 +204,7 @@ SPEC REPOS:
- FirebaseCore
- FirebaseCoreInternal
- FirebaseInstallations
+ - GoogleAdsOnDeviceConversion
- GoogleAppMeasurement
- GoogleUtilities
- nanopb
@@ -244,18 +251,19 @@ SPEC CHECKSUMS:
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
- Firebase: 1fe1c0a7d9aaea32efe01fbea5f0ebd8d70e53a2
- firebase_analytics: 1998960b8fa16fd0cd9e77a6f9fd35a2009ad65e
- firebase_core: 2d4534e7b489907dcede540c835b48981d890943
- FirebaseAnalytics: 4e42333f02cf78ed93703a5c36f36dd518aebdef
- FirebaseCore: 8344daef5e2661eb004b177488d6f9f0f24251b7
- FirebaseCoreInternal: ef4505d2afb1d0ebbc33162cb3795382904b5679
- FirebaseInstallations: 9980995bdd06ec8081dfb6ab364162bdd64245c3
- Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+ Firebase: d99ac19b909cd2c548339c2241ecd0d1599ab02e
+ firebase_analytics: 0e25ca1d4001ccedd40b4e5b74c0ec34e18f6425
+ firebase_core: 995454a784ff288be5689b796deb9e9fa3601818
+ FirebaseAnalytics: 6433dfd311ba78084fc93bdfc145e8cb75740eae
+ FirebaseCore: efb3893e5b94f32b86e331e3bd6dadf18b66568e
+ FirebaseCoreInternal: 9afa45b1159304c963da48addb78275ef701c6b4
+ FirebaseInstallations: 317270fec08a5d418fdbc8429282238cab3ac843
+ Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
flutter_secure_storage_darwin: ce237a8775b39723566dc72571190a3769d70468
- GoogleAppMeasurement: 36684bfb3ee034e2b42b4321eb19da3a1b81e65d
- GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
+ GoogleAdsOnDeviceConversion: 2be6297a4f048459e0ae17fad9bfd2844e10cf64
+ GoogleAppMeasurement: 700dce7541804bec33db590a5c496b663fbe2539
+ GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
komodo_defi_framework: b6929645df13ccb8d2c1c177ccf8b7bbb81f6859
local_auth_darwin: d2e8c53ef0c4f43c646462e3415432c4dab3ae19
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 4557b6e61f..f84a4524e3 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -371,7 +371,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
@@ -462,7 +462,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -512,7 +512,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
diff --git a/lib/bloc/app_bloc_root.dart b/lib/bloc/app_bloc_root.dart
index 923f77a49b..4cee603b84 100644
--- a/lib/bloc/app_bloc_root.dart
+++ b/lib/bloc/app_bloc_root.dart
@@ -6,7 +6,6 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:get_it/get_it.dart';
-import 'package:komodo_cex_market_data/komodo_cex_market_data.dart';
import 'package:komodo_defi_sdk/komodo_defi_sdk.dart';
import 'package:komodo_ui/komodo_ui.dart';
import 'package:shared_preferences/shared_preferences.dart';
@@ -51,6 +50,7 @@ import 'package:web_dex/bloc/trading_status/trading_status_bloc.dart';
import 'package:web_dex/bloc/trading_status/trading_status_repository.dart';
import 'package:web_dex/bloc/transaction_history/transaction_history_bloc.dart';
import 'package:web_dex/bloc/transaction_history/transaction_history_repo.dart';
+import 'package:web_dex/bloc/version_info/version_info_bloc.dart';
import 'package:web_dex/blocs/kmd_rewards_bloc.dart';
import 'package:web_dex/blocs/maker_form_bloc.dart';
import 'package:web_dex/blocs/orderbook_bloc.dart';
@@ -121,13 +121,12 @@ class AppBlocRoot extends StatelessWidget {
final transactionsRepo = performanceMode != null
? MockTransactionHistoryRepo(
performanceMode: performanceMode,
- demoDataGenerator: DemoDataCache.withDefaults(),
+ demoDataGenerator: DemoDataCache.withDefaults(komodoDefiSdk),
)
: SdkTransactionHistoryRepository(sdk: komodoDefiSdk);
final profitLossRepo = ProfitLossRepository.withDefaults(
transactionHistoryRepo: transactionsRepo,
- cexRepository: binanceRepository,
// Returns real data if performanceMode is null. Consider changing the
// other repositories to use this pattern.
demoMode: performanceMode,
@@ -136,7 +135,6 @@ class AppBlocRoot extends StatelessWidget {
final portfolioGrowthRepo = PortfolioGrowthRepository.withDefaults(
transactionHistoryRepo: transactionsRepo,
- cexRepository: binanceRepository,
demoMode: performanceMode,
coinsRepository: coinsRepository,
sdk: komodoDefiSdk,
@@ -187,13 +185,13 @@ class AppBlocRoot extends StatelessWidget {
CoinsBloc(komodoDefiSdk, coinsRepository)..add(CoinsStarted()),
),
BlocProvider(
- create: (context) =>
- PriceChartBloc(binanceRepository, komodoDefiSdk)..add(
- const PriceChartStarted(
- symbols: ['BTC'],
- period: Duration(days: 30),
- ),
+ create: (context) => PriceChartBloc(komodoDefiSdk)
+ ..add(
+ const PriceChartStarted(
+ symbols: ['BTC'],
+ period: Duration(days: 30),
),
+ ),
),
BlocProvider(
create: (context) => AssetOverviewBloc(
@@ -291,6 +289,13 @@ class AppBlocRoot extends StatelessWidget {
create: (context) =>
FaucetBloc(kdfSdk: context.read()),
),
+ BlocProvider(
+ lazy: false,
+ create: (context) =>
+ VersionInfoBloc(mm2Api: mm2Api, komodoDefiSdk: komodoDefiSdk)
+ ..add(const LoadVersionInfo())
+ ..add(const StartPeriodicPolling()),
+ ),
BlocProvider(
lazy: false,
create: (context) =>
diff --git a/lib/bloc/assets_overview/bloc/asset_overview_bloc.dart b/lib/bloc/assets_overview/bloc/asset_overview_bloc.dart
index 231e16316e..5182b22023 100644
--- a/lib/bloc/assets_overview/bloc/asset_overview_bloc.dart
+++ b/lib/bloc/assets_overview/bloc/asset_overview_bloc.dart
@@ -48,11 +48,8 @@ class AssetOverviewBloc extends Bloc {
event.walletId,
);
- final totalInvestment =
- await _investmentRepository.calculateTotalInvestment(
- event.walletId,
- [event.coin],
- );
+ final totalInvestment = await _investmentRepository
+ .calculateTotalInvestment(event.walletId, [event.coin]);
final profitAmount = profitLosses.lastOrNull?.profitLoss ?? 0.0;
// The percent which the user has gained or lost on their investment
@@ -108,18 +105,16 @@ class AssetOverviewBloc extends Bloc {
'USDT',
event.walletId,
);
- } catch (e) {
+ } catch (e, s) {
+ _log.shout('Failed to fetch profit/loss for ${coin.id.id}', e, s);
return Future.value([]);
}
});
final profitLosses = await Future.wait(profitLossesFutures);
- final totalInvestment =
- await _investmentRepository.calculateTotalInvestment(
- event.walletId,
- event.coins,
- );
+ final totalInvestment = await _investmentRepository
+ .calculateTotalInvestment(event.walletId, event.coins);
final profitAmount = profitLosses.fold(0.0, (sum, item) {
return sum + (item.lastOrNull?.profitLoss ?? 0.0);
@@ -128,8 +123,10 @@ class AssetOverviewBloc extends Bloc {
final double portfolioInvestmentReturnPercentage =
_calculateInvestmentReturnPercentage(profitAmount, totalInvestment);
// Total profit / total purchase amount
- final assetPortionPercentages =
- _calculateAssetPortionPercentages(profitLosses, profitAmount);
+ final assetPortionPercentages = _calculateAssetPortionPercentages(
+ profitLosses,
+ profitAmount,
+ );
emit(
PortfolioAssetsOverviewLoadSuccess(
@@ -164,20 +161,12 @@ class AssetOverviewBloc extends Bloc {
AssetOverviewSubscriptionRequested event,
Emitter emit,
) async {
- add(
- AssetOverviewLoadRequested(
- coin: event.coin,
- walletId: event.walletId,
- ),
- );
+ add(AssetOverviewLoadRequested(coin: event.coin, walletId: event.walletId));
_updateTimer?.cancel();
_updateTimer = Timer.periodic(event.updateFrequency, (_) {
add(
- AssetOverviewLoadRequested(
- coin: event.coin,
- walletId: event.walletId,
- ),
+ AssetOverviewLoadRequested(coin: event.coin, walletId: event.walletId),
);
});
}
diff --git a/lib/bloc/assets_overview/investment_repository.dart b/lib/bloc/assets_overview/investment_repository.dart
index 94ddd014a7..dacfefc48c 100644
--- a/lib/bloc/assets_overview/investment_repository.dart
+++ b/lib/bloc/assets_overview/investment_repository.dart
@@ -1,14 +1,14 @@
+import 'package:logging/logging.dart';
import 'package:web_dex/bloc/cex_market_data/profit_loss/models/fiat_value.dart';
import 'package:web_dex/bloc/cex_market_data/profit_loss/profit_loss_repository.dart';
import 'package:web_dex/model/coin.dart';
-import 'package:web_dex/shared/utils/utils.dart' as logger;
class InvestmentRepository {
- InvestmentRepository({
- required ProfitLossRepository profitLossRepository,
- }) : _profitLossRepository = profitLossRepository;
+ InvestmentRepository({required ProfitLossRepository profitLossRepository})
+ : _profitLossRepository = profitLossRepository;
final ProfitLossRepository _profitLossRepository;
+ final Logger _log = Logger('InvestmentRepository');
// TODO: Create a balance repository to fetch the current balance for a coin
// and also calculate its fiat value
@@ -46,8 +46,8 @@ class InvestmentRepository {
);
return totalPurchased;
- } catch (e) {
- logger.log('Failed to calculate total investment: $e', isError: true);
+ } catch (e, s) {
+ _log.shout('Failed to calculate total investment', e, s);
return FiatValue.usd(0);
}
});
diff --git a/lib/bloc/bridge_form/bridge_bloc.dart b/lib/bloc/bridge_form/bridge_bloc.dart
index 500d246f44..099e0327a7 100644
--- a/lib/bloc/bridge_form/bridge_bloc.dart
+++ b/lib/bloc/bridge_form/bridge_bloc.dart
@@ -1,10 +1,14 @@
import 'dart:async';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:komodo_defi_sdk/komodo_defi_sdk.dart';
-import 'package:komodo_defi_types/komodo_defi_types.dart';
+import 'package:komodo_defi_sdk/komodo_defi_sdk.dart' show KomodoDefiSdk;
+import 'package:komodo_defi_types/komodo_defi_type_utils.dart'
+ show LinearBackoff, retry;
+import 'package:komodo_defi_types/komodo_defi_types.dart' show KdfUser;
import 'package:rational/rational.dart';
+import 'package:web_dex/analytics/events/cross_chain_events.dart';
import 'package:web_dex/app_config/app_config.dart';
+import 'package:web_dex/bloc/analytics/analytics_bloc.dart';
import 'package:web_dex/bloc/bridge_form/bridge_event.dart';
import 'package:web_dex/bloc/bridge_form/bridge_repository.dart';
import 'package:web_dex/bloc/bridge_form/bridge_state.dart';
@@ -27,9 +31,6 @@ import 'package:web_dex/model/typedef.dart';
import 'package:web_dex/model/wallet.dart';
import 'package:web_dex/shared/utils/utils.dart';
import 'package:web_dex/views/dex/dex_helpers.dart';
-import 'package:komodo_defi_types/komodo_defi_type_utils.dart';
-import 'package:web_dex/bloc/analytics/analytics_bloc.dart';
-import 'package:web_dex/analytics/events/cross_chain_events.dart';
class BridgeBloc extends Bloc {
BridgeBloc({
@@ -38,12 +39,12 @@ class BridgeBloc extends Bloc {
required CoinsRepo coinsRepository,
required KomodoDefiSdk kdfSdk,
required AnalyticsBloc analyticsBloc,
- }) : _bridgeRepository = bridgeRepository,
- _dexRepository = dexRepository,
- _coinsRepository = coinsRepository,
- _kdfSdk = kdfSdk,
- _analyticsBloc = analyticsBloc,
- super(BridgeState.initial()) {
+ }) : _bridgeRepository = bridgeRepository,
+ _dexRepository = dexRepository,
+ _coinsRepository = coinsRepository,
+ _kdfSdk = kdfSdk,
+ _analyticsBloc = analyticsBloc,
+ super(BridgeState.initial()) {
on(_onInit);
on(_onReInit);
on(_onLogout);
@@ -80,8 +81,9 @@ class BridgeBloc extends Bloc {
sdk: _kdfSdk,
);
- _authorizationSubscription =
- _kdfSdk.auth.watchCurrentUser().listen((event) {
+ _authorizationSubscription = _kdfSdk.auth.watchCurrentUser().listen((
+ event,
+ ) {
_isLoggedIn = event != null;
if (!_isLoggedIn) add(const BridgeLogout());
});
@@ -101,30 +103,19 @@ class BridgeBloc extends Bloc {
Timer? _maxSellAmountTimer;
Timer? _preimageTimer;
- void _onInit(
- BridgeInit event,
- Emitter emit,
- ) {
+ void _onInit(BridgeInit event, Emitter emit) {
if (state.selectedTicker != null) return;
final Coin? defaultTickerCoin = _coinsRepository.getCoin(event.ticker);
- emit(state.copyWith(
- selectedTicker: () => defaultTickerCoin?.abbr,
- ));
+ emit(state.copyWith(selectedTicker: () => defaultTickerCoin?.abbr));
add(const BridgeUpdateTickers());
}
- Future _onReInit(
- BridgeReInit event,
- Emitter emit,
- ) async {
+ Future _onReInit(BridgeReInit event, Emitter emit) async {
_isLoggedIn = true;
- emit(state.copyWith(
- error: () => null,
- autovalidate: () => false,
- ));
+ emit(state.copyWith(error: () => null, autovalidate: () => false));
add(const BridgeUpdateMaxSellAmount(true));
@@ -135,37 +126,35 @@ class BridgeBloc extends Bloc {
_subscribeFees();
}
- void _onLogout(
- BridgeLogout event,
- Emitter emit,
- ) {
+ void _onLogout(BridgeLogout event, Emitter emit) {
_isLoggedIn = false;
- emit(state.copyWith(
- availableBalanceState: () => AvailableBalanceState.unavailable,
- maxSellAmount: () => null,
- preimageData: () => null,
- step: () => BridgeStep.form,
- ));
+ emit(
+ state.copyWith(
+ availableBalanceState: () => AvailableBalanceState.unavailable,
+ maxSellAmount: () => null,
+ preimageData: () => null,
+ step: () => BridgeStep.form,
+ ),
+ );
}
- void _onTickerChanged(
- BridgeTickerChanged event,
- Emitter emit,
- ) {
- emit(state.copyWith(
- selectedTicker: () => event.ticker,
- showTickerDropdown: () => false,
- sellCoin: () => null,
- sellAmount: () => null,
- bestOrders: () => null,
- bestOrder: () => null,
- buyAmount: () => null,
- maxSellAmount: () => null,
- availableBalanceState: () => AvailableBalanceState.unavailable,
- preimageData: () => null,
- error: () => null,
- ));
+ void _onTickerChanged(BridgeTickerChanged event, Emitter emit) {
+ emit(
+ state.copyWith(
+ selectedTicker: () => event.ticker,
+ showTickerDropdown: () => false,
+ sellCoin: () => null,
+ sellAmount: () => null,
+ bestOrders: () => null,
+ bestOrder: () => null,
+ buyAmount: () => null,
+ maxSellAmount: () => null,
+ availableBalanceState: () => AvailableBalanceState.unavailable,
+ preimageData: () => null,
+ error: () => null,
+ ),
+ );
}
Future _onUpdateTickers(
@@ -174,9 +163,7 @@ class BridgeBloc extends Bloc {
) async {
final CoinsByTicker tickers = await _bridgeRepository.getAvailableTickers();
- emit(state.copyWith(
- tickers: () => tickers,
- ));
+ emit(state.copyWith(tickers: () => tickers));
add(const BridgeUpdateSellCoins());
}
@@ -185,64 +172,71 @@ class BridgeBloc extends Bloc {
BridgeShowTickerDropdown event,
Emitter emit,
) {
- emit(state.copyWith(
- showTickerDropdown: () => event.show,
- showSourceDropdown: () => false,
- showTargetDropdown: () => false,
- ));
+ emit(
+ state.copyWith(
+ showTickerDropdown: () => event.show,
+ showSourceDropdown: () => false,
+ showTargetDropdown: () => false,
+ ),
+ );
}
void _onShowSourceDropdown(
BridgeShowSourceDropdown event,
Emitter emit,
) {
- emit(state.copyWith(
- showSourceDropdown: () => event.show,
- showTickerDropdown: () => false,
- showTargetDropdown: () => false,
- ));
+ emit(
+ state.copyWith(
+ showSourceDropdown: () => event.show,
+ showTickerDropdown: () => false,
+ showTargetDropdown: () => false,
+ ),
+ );
}
void _onShowTargetDropdown(
BridgeShowTargetDropdown event,
Emitter emit,
) {
- emit(state.copyWith(
- showTargetDropdown: () => event.show,
- showTickerDropdown: () => false,
- showSourceDropdown: () => false,
- ));
+ emit(
+ state.copyWith(
+ showTargetDropdown: () => event.show,
+ showTickerDropdown: () => false,
+ showSourceDropdown: () => false,
+ ),
+ );
}
Future _onUpdateSellCoins(
BridgeUpdateSellCoins event,
Emitter emit,
) async {
- final CoinsByTicker? sellCoins =
- await _bridgeRepository.getSellCoins(state.tickers);
+ final CoinsByTicker? sellCoins = await _bridgeRepository.getSellCoins(
+ state.tickers,
+ );
- emit(state.copyWith(
- sellCoins: () => sellCoins,
- ));
+ emit(state.copyWith(sellCoins: () => sellCoins));
}
Future _onSetSellCoin(
BridgeSetSellCoin event,
Emitter emit,
) async {
- emit(state.copyWith(
- sellCoin: () => event.coin,
- sellAmount: () => null,
- showSourceDropdown: () => false,
- bestOrders: () => null,
- bestOrder: () => null,
- buyAmount: () => null,
- maxSellAmount: () => null,
- availableBalanceState: () => AvailableBalanceState.initial,
- preimageData: () => null,
- error: () => null,
- autovalidate: () => false,
- ));
+ emit(
+ state.copyWith(
+ sellCoin: () => event.coin,
+ sellAmount: () => null,
+ showSourceDropdown: () => false,
+ bestOrders: () => null,
+ bestOrder: () => null,
+ buyAmount: () => null,
+ maxSellAmount: () => null,
+ availableBalanceState: () => AvailableBalanceState.initial,
+ preimageData: () => null,
+ error: () => null,
+ autovalidate: () => false,
+ ),
+ );
_autoActivateCoin(event.coin.abbr);
_subscribeMaxSellAmount();
@@ -262,39 +256,45 @@ class BridgeBloc extends Bloc {
final sellCoin = state.sellCoin;
if (sellCoin == null) return;
- final bestOrders = await _dexRepository.getBestOrders(BestOrdersRequest(
- coin: sellCoin.abbr,
- action: 'sell',
- type: BestOrdersRequestType.number,
- number: 1,
- ));
+ final bestOrders = await _dexRepository.getBestOrders(
+ BestOrdersRequest(
+ coin: sellCoin.abbr,
+ action: 'sell',
+ type: BestOrdersRequestType.number,
+ number: 1,
+ ),
+ );
/// Unsupported coins like ARRR cause downstream errors, so we need to
/// remove them from the list here
- bestOrders.result
- ?.removeWhere((coinId, _) => excludedAssetList.contains(coinId));
+ bestOrders.result?.removeWhere(
+ (coinId, _) => excludedAssetList.contains(coinId),
+ );
- emit(state.copyWith(
- bestOrders: () => bestOrders,
- ));
+ emit(state.copyWith(bestOrders: () => bestOrders));
}
void _onSelectBestOrder(
BridgeSelectBestOrder event,
Emitter emit,
) async {
- final bool switchingCoin = state.bestOrder != null &&
+ final bool switchingCoin =
+ state.bestOrder != null &&
event.order != null &&
state.bestOrder!.coin != event.order!.coin;
- emit(state.copyWith(
- bestOrder: () => event.order,
- showTargetDropdown: () => false,
- buyAmount: () => calculateBuyAmount(
- sellAmount: state.sellAmount, selectedOrder: event.order),
- error: () => null,
- autovalidate: switchingCoin ? () => false : null,
- ));
+ emit(
+ state.copyWith(
+ bestOrder: () => event.order,
+ showTargetDropdown: () => false,
+ buyAmount: () => calculateBuyAmount(
+ sellAmount: state.sellAmount,
+ selectedOrder: event.order,
+ ),
+ error: () => null,
+ autovalidate: switchingCoin ? () => false : null,
+ ),
+ );
if (!state.autovalidate) add(const BridgeVerifyOrderVolume());
@@ -303,22 +303,12 @@ class BridgeBloc extends Bloc {
_subscribeFees();
}
- void _onSetError(
- BridgeSetError event,
- Emitter emit,
- ) {
- emit(state.copyWith(
- error: () => event.error,
- ));
+ void _onSetError(BridgeSetError event, Emitter emit) {
+ emit(state.copyWith(error: () => event.error));
}
- void _onClearErrors(
- BridgeClearErrors event,
- Emitter emit,
- ) {
- emit(state.copyWith(
- error: () => null,
- ));
+ void _onClearErrors(BridgeClearErrors event, Emitter emit) {
+ emit(state.copyWith(error: () => null));
}
void _subscribeFees() {
@@ -346,8 +336,10 @@ class BridgeBloc extends Bloc {
) {
final Rational? maxSellAmount = state.maxSellAmount;
if (maxSellAmount == null) return;
- final Rational sellAmount =
- getFractionOfAmount(maxSellAmount, event.fraction);
+ final Rational sellAmount = getFractionOfAmount(
+ maxSellAmount,
+ event.fraction,
+ );
add(BridgeSetSellAmount(sellAmount));
}
@@ -355,8 +347,9 @@ class BridgeBloc extends Bloc {
BridgeSellAmountChange event,
Emitter emit,
) {
- final Rational? amount =
- event.value.isNotEmpty ? Rational.parse(event.value) : null;
+ final Rational? amount = event.value.isNotEmpty
+ ? Rational.tryParse(event.value)
+ : null;
if (amount == state.sellAmount) return;
@@ -367,13 +360,15 @@ class BridgeBloc extends Bloc {
BridgeSetSellAmount event,
Emitter emit,
) async {
- emit(state.copyWith(
- sellAmount: () => event.amount,
- buyAmount: () => calculateBuyAmount(
- selectedOrder: state.bestOrder,
- sellAmount: event.amount,
+ emit(
+ state.copyWith(
+ sellAmount: () => event.amount,
+ buyAmount: () => calculateBuyAmount(
+ selectedOrder: state.bestOrder,
+ sellAmount: event.amount,
+ ),
),
- ));
+ );
if (state.autovalidate) {
await _validator.validateForm();
@@ -389,50 +384,56 @@ class BridgeBloc extends Bloc {
) async {
if (state.sellCoin == null) {
_maxSellAmountTimer?.cancel();
- emit(state.copyWith(
- availableBalanceState: () => AvailableBalanceState.unavailable,
- ));
+ emit(
+ state.copyWith(
+ availableBalanceState: () => AvailableBalanceState.unavailable,
+ ),
+ );
return;
}
if (state.availableBalanceState == AvailableBalanceState.initial ||
event.setLoadingStatus) {
- emit(state.copyWith(
- availableBalanceState: () => AvailableBalanceState.loading,
- ));
+ emit(
+ state.copyWith(
+ availableBalanceState: () => AvailableBalanceState.loading,
+ ),
+ );
}
if (!_isLoggedIn) {
- emit(state.copyWith(
- availableBalanceState: () => AvailableBalanceState.unavailable,
- ));
+ emit(
+ state.copyWith(
+ availableBalanceState: () => AvailableBalanceState.unavailable,
+ ),
+ );
} else {
- Rational? maxSellAmount =
- await _dexRepository.getMaxTakerVolume(state.sellCoin!.abbr);
+ Rational? maxSellAmount = await _dexRepository.getMaxTakerVolume(
+ state.sellCoin!.abbr,
+ );
if (maxSellAmount != null) {
- emit(state.copyWith(
- maxSellAmount: () => maxSellAmount,
- availableBalanceState: () => AvailableBalanceState.success,
- ));
+ emit(
+ state.copyWith(
+ maxSellAmount: () => maxSellAmount,
+ availableBalanceState: () => AvailableBalanceState.success,
+ ),
+ );
} else {
maxSellAmount = await _frequentlyGetMaxTakerVolume();
- emit(state.copyWith(
- maxSellAmount: () => maxSellAmount,
- availableBalanceState: maxSellAmount == null
- ? () => AvailableBalanceState.failure
- : () => AvailableBalanceState.success,
- ));
+ emit(
+ state.copyWith(
+ maxSellAmount: () => maxSellAmount,
+ availableBalanceState: maxSellAmount == null
+ ? () => AvailableBalanceState.failure
+ : () => AvailableBalanceState.success,
+ ),
+ );
}
}
}
- void _onUpdateFees(
- BridgeUpdateFees event,
- Emitter emit,
- ) async {
- emit(state.copyWith(
- preimageData: () => null,
- ));
+ void _onUpdateFees(BridgeUpdateFees event, Emitter emit) async {
+ emit(state.copyWith(preimageData: () => null));
if (!_validator.canRequestPreimage) {
_preimageTimer?.cancel();
@@ -449,65 +450,45 @@ class BridgeBloc extends Bloc {
) async {
if (state.sellCoin == null) return;
if (!_isLoggedIn) {
- emit(state.copyWith(
- minSellAmount: () => null,
- ));
+ emit(state.copyWith(minSellAmount: () => null));
return;
}
- final Rational? minSellAmount =
- await _dexRepository.getMinTradingVolume(state.sellCoin!.abbr);
+ final Rational? minSellAmount = await _dexRepository.getMinTradingVolume(
+ state.sellCoin!.abbr,
+ );
- emit(state.copyWith(
- minSellAmount: () => minSellAmount,
- ));
+ emit(state.copyWith(minSellAmount: () => minSellAmount));
}
- void _onSetPreimage(
- BridgeSetPreimage event,
- Emitter emit,
- ) {
- emit(state.copyWith(
- preimageData: () => event.preimageData,
- ));
+ void _onSetPreimage(BridgeSetPreimage event, Emitter emit) {
+ emit(state.copyWith(preimageData: () => event.preimageData));
}
- void _onSetInProgress(
- BridgeSetInProgress event,
- Emitter emit,
- ) {
- emit(state.copyWith(
- inProgress: () => event.inProgress,
- ));
+ void _onSetInProgress(BridgeSetInProgress event, Emitter emit) {
+ emit(state.copyWith(inProgress: () => event.inProgress));
}
void _onSubmitClick(
BridgeSubmitClick event,
Emitter emit,
) async {
- emit(state.copyWith(
- inProgress: () => true,
- autovalidate: () => true,
- ));
+ emit(state.copyWith(inProgress: () => true, autovalidate: () => true));
await pauseWhile(() => _waitingForWallet || _activatingAssets);
final bool isValid = await _validator.validate();
- emit(state.copyWith(
- inProgress: () => false,
- step: () => isValid ? BridgeStep.confirm : BridgeStep.form,
- ));
+ emit(
+ state.copyWith(
+ inProgress: () => false,
+ step: () => isValid ? BridgeStep.confirm : BridgeStep.form,
+ ),
+ );
}
- void _onBackClick(
- BridgeBackClick event,
- Emitter emit,
- ) {
- emit(state.copyWith(
- step: () => BridgeStep.form,
- error: () => null,
- ));
+ void _onBackClick(BridgeBackClick event, Emitter emit) {
+ emit(state.copyWith(step: () => BridgeStep.form, error: () => null));
}
void _onSetWalletIsReady(
@@ -517,10 +498,7 @@ class BridgeBloc extends Bloc {
_waitingForWallet = !event.isReady;
}
- void _onStartSwap(
- BridgeStartSwap event,
- Emitter emit,
- ) async {
+ void _onStartSwap(BridgeStartSwap event, Emitter emit) async {
final sellCoin = state.sellCoin;
final bestOrder = state.bestOrder;
if (sellCoin != null && bestOrder != null) {
@@ -536,16 +514,16 @@ class BridgeBloc extends Bloc {
),
);
}
- emit(state.copyWith(
- inProgress: () => true,
- ));
- final SellResponse response = await _dexRepository.sell(SellRequest(
- base: state.sellCoin!.abbr,
- rel: state.bestOrder!.coin,
- volume: state.sellAmount!,
- price: state.bestOrder!.price,
- orderType: SellBuyOrderType.fillOrKill,
- ));
+ emit(state.copyWith(inProgress: () => true));
+ final SellResponse response = await _dexRepository.sell(
+ SellRequest(
+ base: state.sellCoin!.abbr,
+ rel: state.bestOrder!.coin,
+ volume: state.sellAmount!,
+ price: state.bestOrder!.price,
+ orderType: SellBuyOrderType.fillOrKill,
+ ),
+ );
final String? uuid = response.result?.uuid;
@@ -578,10 +556,12 @@ class BridgeBloc extends Bloc {
add(BridgeSetError(DexFormError(error: error)));
}
- emit(state.copyWith(
- inProgress: uuid == null ? () => false : null,
- swapUuid: () => uuid,
- ));
+ emit(
+ state.copyWith(
+ inProgress: uuid == null ? () => false : null,
+ swapUuid: () => uuid,
+ ),
+ );
}
void _verifyOrderVolume(
@@ -591,10 +571,7 @@ class BridgeBloc extends Bloc {
_validator.verifyOrderVolume();
}
- void _onClear(
- BridgeClear event,
- Emitter emit,
- ) {
+ void _onClear(BridgeClear event, Emitter emit) {
emit(BridgeState.initial());
}
@@ -621,8 +598,10 @@ class BridgeBloc extends Bloc {
if (abbr == null) return;
_activatingAssets = true;
- final List activationErrors =
- await activateCoinIfNeeded(abbr, _coinsRepository);
+ final List activationErrors = await activateCoinIfNeeded(
+ abbr,
+ _coinsRepository,
+ );
_activatingAssets = false;
if (activationErrors.isNotEmpty) {
@@ -638,20 +617,18 @@ class BridgeBloc extends Bloc {
bestOrders.forEach((key, value) => list.addAll(value));
- list.removeWhere(
- (order) {
- final Coin? item = _coinsRepository.getCoin(order.coin);
- if (item == null) return true;
+ list.removeWhere((order) {
+ final Coin? item = _coinsRepository.getCoin(order.coin);
+ if (item == null) return true;
- final sameTicker = abbr2Ticker(item.abbr) == abbr2Ticker(sellCoin.abbr);
- if (!sameTicker) return true;
+ final sameTicker = abbr2Ticker(item.abbr) == abbr2Ticker(sellCoin.abbr);
+ if (!sameTicker) return true;
- if (item.isSuspended) return true;
- if (item.walletOnly) return true;
+ if (item.isSuspended) return true;
+ if (item.walletOnly) return true;
- return false;
- },
- );
+ return false;
+ });
list.sort((a, b) => a.coin.compareTo(b.coin));
@@ -668,8 +645,12 @@ class BridgeBloc extends Bloc {
state.sellAmount,
);
} catch (e, s) {
- log(e.toString(),
- trace: s, path: 'bridge_bloc::_getFeesData', isError: true);
+ log(
+ e.toString(),
+ trace: s,
+ path: 'bridge_bloc::_getFeesData',
+ isError: true,
+ );
return DataFromService(error: TextError(error: 'Failed to request fees'));
}
}
diff --git a/lib/bloc/cex_market_data/mockup/generate_demo_data.dart b/lib/bloc/cex_market_data/mockup/generate_demo_data.dart
index c6d07d1a24..d6e466f803 100644
--- a/lib/bloc/cex_market_data/mockup/generate_demo_data.dart
+++ b/lib/bloc/cex_market_data/mockup/generate_demo_data.dart
@@ -1,22 +1,22 @@
import 'dart:math';
import 'package:decimal/decimal.dart';
-import 'package:komodo_cex_market_data/komodo_cex_market_data.dart';
+import 'package:komodo_defi_sdk/komodo_defi_sdk.dart';
import 'package:komodo_defi_types/komodo_defi_types.dart';
import 'package:uuid/uuid.dart';
import 'package:web_dex/bloc/cex_market_data/mockup/performance_mode.dart';
-// similar to generator implementation to allow for const constructor
-final _ohlcvCache = >{};
+// Cache for demo price history data
+final _priceHistoryCache = >{};
/// Generates semi-random transaction data for demo purposes. The transactions
-/// are generated based on the historical OHLCV data for the given coin. The
+/// are generated based on simulated historical price data for the given coin. The
/// transactions are generated in a way that the overall balance of the user
/// will increase or decrease based on the given performance mode.
class DemoDataGenerator {
- final CexRepository _ohlcRepo;
+ final KomodoDefiSdk _sdk;
final int randomSeed;
- final List coinPairs;
+ final List assetIds;
final Map transactionsPerMode;
final Map overallReturn;
final Map> buyProbabilities;
@@ -24,16 +24,9 @@ class DemoDataGenerator {
final double initialBalance;
const DemoDataGenerator(
- this._ohlcRepo, {
+ this._sdk, {
this.initialBalance = 1000.0,
- this.coinPairs = const [
- CexCoinPair.usdtPrice('KMD'),
- CexCoinPair.usdtPrice('LTC'),
- CexCoinPair.usdtPrice('MATIC'),
- CexCoinPair.usdtPrice('AVAX'),
- CexCoinPair.usdtPrice('FTM'),
- CexCoinPair.usdtPrice('ATOM'),
- ],
+ this.assetIds = const [], // Will be initialized with default list
this.transactionsPerMode = const {
PerformanceMode.good: 28,
PerformanceMode.mediocre: 52,
@@ -57,47 +50,118 @@ class DemoDataGenerator {
this.randomSeed = 42,
});
+ /// Default asset IDs for demo purposes
+ static final List defaultAssetIds = [
+ AssetId(
+ chainId: AssetChainId(chainId: 1),
+ derivationPath: '',
+ id: 'KMD',
+ name: 'Komodo',
+ subClass: CoinSubClass.smartChain,
+ symbol: AssetSymbol(assetConfigId: 'KMD'),
+ ),
+ AssetId(
+ chainId: AssetChainId(chainId: 2),
+ derivationPath: '',
+ id: 'LTC',
+ name: 'Litecoin',
+ subClass: CoinSubClass.smartChain,
+ symbol: AssetSymbol(assetConfigId: 'LTC'),
+ ),
+ AssetId(
+ chainId: AssetChainId(chainId: 137),
+ derivationPath: '',
+ id: 'MATIC',
+ name: 'Polygon',
+ subClass: CoinSubClass.matic,
+ symbol: AssetSymbol(assetConfigId: 'MATIC'),
+ ),
+ AssetId(
+ chainId: AssetChainId(chainId: 43114),
+ derivationPath: '',
+ id: 'AVAX',
+ name: 'Avalanche',
+ subClass: CoinSubClass.avx20,
+ symbol: AssetSymbol(assetConfigId: 'AVAX'),
+ ),
+ AssetId(
+ chainId: AssetChainId(chainId: 250),
+ derivationPath: '',
+ id: 'FTM',
+ name: 'Fantom',
+ subClass: CoinSubClass.ftm20,
+ symbol: AssetSymbol(assetConfigId: 'FTM'),
+ ),
+ AssetId(
+ chainId: AssetChainId(chainId: 118),
+ derivationPath: '',
+ id: 'ATOM',
+ name: 'Cosmos',
+ subClass: CoinSubClass.tendermint,
+ symbol: AssetSymbol(assetConfigId: 'ATOM'),
+ ),
+ ];
+
Future> generateTransactions(
String coinId,
PerformanceMode mode,
) async {
- if (_ohlcvCache.isEmpty) {
- _ohlcvCache.addAll(await fetchOhlcData());
+ if (_priceHistoryCache.isEmpty) {
+ await fetchPriceHistoryData();
}
- // Remove segwit suffix for cache key, as the ohlc data from cex providers
- // does not include the segwit suffix
- final cacheKey = coinId.replaceAll('-segwit', '');
- if (!_ohlcvCache.containsKey(CexCoinPair.usdtPrice(cacheKey))) {
+ // Try to match the coinId to one of our asset IDs
+ final actualAssetIds = assetIds.isEmpty ? defaultAssetIds : assetIds;
+ final assetId = actualAssetIds.cast().firstWhere(
+ (asset) =>
+ asset!.id.toLowerCase() == coinId.toLowerCase() ||
+ asset.symbol.assetConfigId.toLowerCase() == coinId.toLowerCase(),
+ orElse: () => null,
+ );
+
+ if (assetId == null || !_priceHistoryCache.containsKey(assetId)) {
return [];
}
- final ohlcvData = _ohlcvCache[CexCoinPair.usdtPrice(cacheKey)]!;
+
+ final priceHistory = _priceHistoryCache[assetId]!;
+ final priceEntries = priceHistory.entries.toList()
+ ..sort((a, b) => a.key.compareTo(b.key));
final numTransactions = transactionsPerMode[mode]!;
final random = Random(randomSeed);
- final buyProbalities = buyProbabilities[mode]!;
+ final buyProbabilities = this.buyProbabilities[mode]!;
final tradeAmounts = tradeAmountFactors[mode]!;
- double totalBalance = initialBalance / ohlcvData.last.close;
+
+ // Get the initial price for calculations
+ final initialPrice = priceEntries.first.value;
+ final finalPrice = priceEntries.last.value;
+ double totalBalance = initialBalance / initialPrice;
double targetFinalBalance =
- (initialBalance * overallReturn[mode]!) / ohlcvData.first.close;
+ (initialBalance * overallReturn[mode]!) / finalPrice;
List transactions = [];
for (int i = 0; i < numTransactions; i++) {
- final int index = (i * ohlcvData.length ~/ numTransactions)
- .clamp(0, ohlcvData.length - 1);
- final Ohlc ohlcv = ohlcvData[index];
+ final int index = (i * priceEntries.length ~/ numTransactions).clamp(
+ 0,
+ priceEntries.length - 1,
+ );
+ final priceEntry = priceEntries[index];
final int quarter = (i * 4 ~/ numTransactions).clamp(0, 3);
- final bool isBuy = random.nextDouble() < buyProbalities[quarter];
+ final bool isBuy = random.nextDouble() < buyProbabilities[quarter];
final bool isSameDay = random.nextDouble() < tradeAmounts[quarter];
final double tradeAmountFactor = tradeAmounts[quarter];
final double tradeAmount =
random.nextDouble() * tradeAmountFactor * totalBalance;
- final transaction =
- fromTradeAmount(coinId, tradeAmount, isBuy, ohlcv.closeTime);
+ final transaction = fromTradeAmount(
+ coinId,
+ tradeAmount,
+ isBuy,
+ priceEntry.key.millisecondsSinceEpoch,
+ );
transactions.add(transaction);
if (isSameDay) {
@@ -105,7 +169,7 @@ class DemoDataGenerator {
coinId,
-tradeAmount,
!isBuy,
- ohlcv.closeTime + 100,
+ priceEntry.key.millisecondsSinceEpoch + 100,
);
transactions.add(transaction);
}
@@ -131,8 +195,9 @@ class DemoDataGenerator {
double totalBalance,
List transactions,
) {
- final Decimal adjustmentFactor =
- Decimal.parse((targetFinalBalance / totalBalance).toString());
+ final Decimal adjustmentFactor = Decimal.parse(
+ (targetFinalBalance / totalBalance).toString(),
+ );
final adjustedTransactions = [];
for (var transaction in transactions) {
final netChange = transaction.balanceChanges.netChange;
@@ -154,33 +219,101 @@ class DemoDataGenerator {
return adjustedTransactions;
}
- Future>> fetchOhlcData() async {
- final ohlcvData = >{};
- final supportedCoins = await _ohlcRepo.getCoinList();
- for (final CexCoinPair coin in coinPairs) {
- final supportedCoin = supportedCoins.where(
- (element) => element.id == coin.baseCoinTicker,
- );
- if (supportedCoin.isEmpty) {
- continue;
+ /// Fetches simulated price history data for demo purposes.
+ /// This replaces the legacy CEX repository OHLC data fetching.
+ Future fetchPriceHistoryData() async {
+ final actualAssetIds = assetIds.isEmpty ? defaultAssetIds : assetIds;
+ for (final assetId in actualAssetIds) {
+ try {
+ // Try to fetch real price history from SDK if available
+ final now = DateTime.now();
+ final startDate = now.subtract(const Duration(days: 365));
+
+ // Generate daily intervals for the past year
+ final dates = [];
+ for (
+ var date = startDate;
+ date.isBefore(now);
+ date = date.add(const Duration(days: 1))
+ ) {
+ dates.add(date);
+ }
+
+ Map priceHistory;
+
+ try {
+ // Attempt to get real price data from SDK
+ final quoteCurrency = QuoteCurrency.fromString('USDT');
+ if (quoteCurrency != null) {
+ final sdkPriceHistory = await _sdk.marketData.fiatPriceHistory(
+ assetId,
+ dates,
+ quoteCurrency: quoteCurrency,
+ );
+
+ // Convert Decimal to double
+ priceHistory = sdkPriceHistory.map(
+ (key, value) => MapEntry(key, value.toDouble()),
+ );
+ } else {
+ throw Exception('Unable to create USDT quote currency');
+ }
+ } catch (e) {
+ // Fallback: generate simulated price data
+ priceHistory = _generateSimulatedPriceData(
+ startDate: startDate,
+ endDate: now,
+ initialPrice:
+ 50.0 +
+ Random(assetId.hashCode).nextDouble() *
+ 100, // Price between $50-$150
+ );
+ }
+
+ _priceHistoryCache[assetId] = priceHistory;
+ } catch (e) {
+ // If all else fails, generate basic simulated data
+ final now = DateTime.now();
+ final startDate = now.subtract(const Duration(days: 365));
+ final priceHistory = _generateSimulatedPriceData(
+ startDate: startDate,
+ endDate: now,
+ initialPrice:
+ 10.0 +
+ Random(assetId.hashCode).nextDouble() *
+ 90, // Price between $10-$100
+ );
+ _priceHistoryCache[assetId] = priceHistory;
}
+ }
+ }
- const interval = GraphInterval.oneDay;
- final startAt = DateTime.now().subtract(const Duration(days: 365));
+ /// Generates simulated price data for demo purposes
+ Map _generateSimulatedPriceData({
+ required DateTime startDate,
+ required DateTime endDate,
+ required double initialPrice,
+ }) {
+ final priceHistory = {};
+ final random = Random(randomSeed);
+ var currentPrice = initialPrice;
- final data =
- await _ohlcRepo.getCoinOhlc(coin, interval, startAt: startAt);
+ for (
+ var date = startDate;
+ date.isBefore(endDate);
+ date = date.add(const Duration(days: 1))
+ ) {
+ // Generate semi-realistic price movements (±5% daily change)
+ final changePercent = (random.nextDouble() - 0.5) * 0.1; // ±5%
+ currentPrice = currentPrice * (1 + changePercent);
- final twoWeeksAgo = DateTime.now().subtract(const Duration(days: 14));
- data.ohlc.addAll(
- await _ohlcRepo
- .getCoinOhlc(coin, GraphInterval.oneHour, startAt: twoWeeksAgo)
- .then((value) => value.ohlc),
- );
+ // Ensure price doesn't go below $1
+ currentPrice = currentPrice.clamp(1.0, double.infinity);
- ohlcvData[coin] = data.ohlc;
+ priceHistory[date] = currentPrice;
}
- return ohlcvData;
+
+ return priceHistory;
}
}
@@ -188,7 +321,7 @@ Transaction fromTradeAmount(
String coinId,
double tradeAmount,
bool isBuy,
- int closeTimestamp,
+ int timestampMilliseconds,
) {
const uuid = Uuid();
final random = Random(42);
@@ -215,7 +348,7 @@ Transaction fromTradeAmount(
spentByMe: Decimal.parse(isBuy ? tradeAmount.toString() : '0'),
totalAmount: Decimal.parse(tradeAmount.toString()),
),
- timestamp: DateTime.fromMillisecondsSinceEpoch(closeTimestamp),
+ timestamp: DateTime.fromMillisecondsSinceEpoch(timestampMilliseconds),
to: const ["address2"],
txHash: uuid.v4(),
memo: "memo",
diff --git a/lib/bloc/cex_market_data/mockup/generator.dart b/lib/bloc/cex_market_data/mockup/generator.dart
index b80a94bec0..d8f0194a39 100644
--- a/lib/bloc/cex_market_data/mockup/generator.dart
+++ b/lib/bloc/cex_market_data/mockup/generator.dart
@@ -1,37 +1,18 @@
import 'dart:async';
-import 'dart:convert';
-import 'package:flutter/services.dart';
-import 'package:komodo_cex_market_data/komodo_cex_market_data.dart';
+import 'package:komodo_defi_sdk/komodo_defi_sdk.dart';
import 'package:komodo_defi_types/komodo_defi_types.dart';
import 'package:web_dex/bloc/cex_market_data/mockup/generate_demo_data.dart';
import 'package:web_dex/bloc/cex_market_data/mockup/performance_mode.dart';
-final _supportedCoinsCache = >{};
final _transactionsCache = >>{};
class DemoDataCache {
DemoDataCache(this._generator);
- DemoDataCache.withDefaults()
- : _generator = DemoDataGenerator(
- BinanceRepository(binanceProvider: const BinanceProvider()),
- );
+ DemoDataCache.withDefaults(KomodoDefiSdk sdk)
+ : _generator = DemoDataGenerator(sdk);
final DemoDataGenerator _generator;
- Future> supportedCoinsDemoData() async {
- const cacheKey = 'supportedCoins';
- if (_supportedCoinsCache.containsKey(cacheKey)) {
- return _supportedCoinsCache[cacheKey]!;
- }
-
- final String response =
- await rootBundle.loadString('assets/debug/demo_trade_data.json');
- final data = json.decode(response) as Map;
- final result = (data['profit'] as Map).keys.toList();
- _supportedCoinsCache[cacheKey] = result;
- return result;
- }
-
Future> loadTransactionsDemoData(
PerformanceMode performanceMode,
String coin,
@@ -42,8 +23,10 @@ class DemoDataCache {
return _transactionsCache[cacheKey]![performanceMode]!;
}
- final result =
- await _generator.generateTransactions(cacheKey, performanceMode);
+ final result = await _generator.generateTransactions(
+ cacheKey,
+ performanceMode,
+ );
_transactionsCache.putIfAbsent(cacheKey, () => {});
_transactionsCache[cacheKey]![performanceMode] = result;
diff --git a/lib/bloc/cex_market_data/mockup/mock_portfolio_growth_repository.dart b/lib/bloc/cex_market_data/mockup/mock_portfolio_growth_repository.dart
index f27981068c..5bd32af820 100644
--- a/lib/bloc/cex_market_data/mockup/mock_portfolio_growth_repository.dart
+++ b/lib/bloc/cex_market_data/mockup/mock_portfolio_growth_repository.dart
@@ -1,4 +1,3 @@
-import 'package:komodo_cex_market_data/komodo_cex_market_data.dart';
import 'package:komodo_persistence_layer/komodo_persistence_layer.dart';
import 'package:web_dex/bloc/cex_market_data/mockup/generator.dart';
import 'package:web_dex/bloc/cex_market_data/mockup/mock_transaction_history_repository.dart';
@@ -9,7 +8,6 @@ import 'package:web_dex/bloc/cex_market_data/portfolio_growth/portfolio_growth_r
class MockPortfolioGrowthRepository extends PortfolioGrowthRepository {
MockPortfolioGrowthRepository({
- required super.cexRepository,
required super.transactionHistoryRepo,
required super.cacheProvider,
required this.performanceMode,
@@ -22,17 +20,14 @@ class MockPortfolioGrowthRepository extends PortfolioGrowthRepository {
required super.coinsRepository,
required super.sdk,
}) : super(
- cexRepository: BinanceRepository(
- binanceProvider: const BinanceProvider(),
- ),
- transactionHistoryRepo: MockTransactionHistoryRepo(
- performanceMode: performanceMode,
- demoDataGenerator: DemoDataCache.withDefaults(),
- ),
- cacheProvider: HiveLazyBoxProvider(
- name: GraphType.balanceGrowth.tableName,
- ),
- );
+ transactionHistoryRepo: MockTransactionHistoryRepo(
+ performanceMode: performanceMode,
+ demoDataGenerator: DemoDataCache.withDefaults(sdk),
+ ),
+ cacheProvider: HiveLazyBoxProvider(
+ name: GraphType.balanceGrowth.tableName,
+ ),
+ );
final PerformanceMode performanceMode;
}
diff --git a/lib/bloc/cex_market_data/portfolio_growth/portfolio_growth_bloc.dart b/lib/bloc/cex_market_data/portfolio_growth/portfolio_growth_bloc.dart
index fdaa810127..b66d1bc512 100644
--- a/lib/bloc/cex_market_data/portfolio_growth/portfolio_growth_bloc.dart
+++ b/lib/bloc/cex_market_data/portfolio_growth/portfolio_growth_bloc.dart
@@ -2,9 +2,11 @@ import 'dart:async';
import 'package:bloc/bloc.dart';
import 'package:bloc_concurrency/bloc_concurrency.dart';
+import 'package:decimal/decimal.dart';
import 'package:equatable/equatable.dart';
import 'package:komodo_defi_sdk/komodo_defi_sdk.dart';
import 'package:logging/logging.dart';
+import 'package:rational/rational.dart';
import 'package:web_dex/bloc/cex_market_data/charts.dart';
import 'package:web_dex/bloc/cex_market_data/portfolio_growth/portfolio_growth_repository.dart';
import 'package:web_dex/bloc/cex_market_data/sdk_auth_activation_extension.dart';
@@ -141,24 +143,35 @@ class PortfolioGrowthBloc
// recover at the cost of a longer first loading time.
}
- await emit.forEach(
- // computation is omitted, so null-valued events are emitted on a set
- // interval.
- Stream.periodic(event.updateFrequency).asyncMap((_) async {
- // Update prices before fetching chart data
- await portfolioGrowthRepository.updatePrices();
- return _fetchPortfolioGrowthChart(event);
- }),
- onData: (data) =>
- _handlePortfolioGrowthUpdate(data, event.selectedPeriod, event.coins),
- onError: (error, stackTrace) {
+ final periodicUpdate = Stream.periodic(event.updateFrequency)
+ .asyncMap((_) async {
+ // Update prices before fetching chart data
+ await portfolioGrowthRepository.updatePrices();
+ return _fetchPortfolioGrowthChart(event);
+ });
+
+ // Use await for here to allow for the async update handler. The previous
+ // implementation awaited the emit.forEach to ensure that cancelling the
+ // event handler with transformers would stop the previous periodic updates.
+ await for (final data in periodicUpdate) {
+ try {
+ emit(
+ await _handlePortfolioGrowthUpdate(
+ data,
+ event.selectedPeriod,
+ event.coins,
+ ),
+ );
+ } catch (error, stackTrace) {
_log.shout('Failed to load portfolio growth', error, stackTrace);
- return GrowthChartLoadFailure(
- error: TextError(error: 'Failed to load portfolio growth'),
- selectedPeriod: event.selectedPeriod,
+ emit(
+ GrowthChartLoadFailure(
+ error: TextError(error: 'Failed to load portfolio growth'),
+ selectedPeriod: event.selectedPeriod,
+ ),
);
- },
- );
+ }
+ }
}
Future> _removeUnsupportedCoins(
@@ -196,16 +209,16 @@ class PortfolioGrowthBloc
await portfolioGrowthRepository.updatePrices();
final totalBalance = _calculateTotalBalance(coins);
- final totalChange24h = _calculateTotalChange24h(coins);
- final percentageChange24h = _calculatePercentageChange24h(coins);
+ final totalChange24h = await _calculateTotalChange24h(coins);
+ final percentageChange24h = await _calculatePercentageChange24h(coins);
return PortfolioGrowthChartLoadSuccess(
portfolioGrowth: chart,
percentageIncrease: chart.percentageIncrease,
selectedPeriod: event.selectedPeriod,
totalBalance: totalBalance,
- totalChange24h: totalChange24h,
- percentageChange24h: percentageChange24h,
+ totalChange24h: totalChange24h.toDouble(),
+ percentageChange24h: percentageChange24h.toDouble(),
isUpdating: false,
);
}
@@ -241,27 +254,27 @@ class PortfolioGrowthBloc
return coinsCopy;
}
- PortfolioGrowthState _handlePortfolioGrowthUpdate(
+ Future _handlePortfolioGrowthUpdate(
ChartData growthChart,
Duration selectedPeriod,
List coins,
- ) {
+ ) async {
if (growthChart.isEmpty && state is PortfolioGrowthChartLoadSuccess) {
return state;
}
final percentageIncrease = growthChart.percentageIncrease;
final totalBalance = _calculateTotalBalance(coins);
- final totalChange24h = _calculateTotalChange24h(coins);
- final percentageChange24h = _calculatePercentageChange24h(coins);
+ final totalChange24h = await _calculateTotalChange24h(coins);
+ final percentageChange24h = await _calculatePercentageChange24h(coins);
return PortfolioGrowthChartLoadSuccess(
portfolioGrowth: growthChart,
percentageIncrease: percentageIncrease,
selectedPeriod: selectedPeriod,
totalBalance: totalBalance,
- totalChange24h: totalChange24h,
- percentageChange24h: percentageChange24h,
+ totalChange24h: totalChange24h.toDouble(),
+ percentageChange24h: percentageChange24h.toDouble(),
isUpdating: false,
);
}
@@ -282,32 +295,34 @@ class PortfolioGrowthBloc
}
/// Calculate the total 24h change in USD value
- double _calculateTotalChange24h(List coins) {
- // Calculate the 24h change by summing the change percentage of each coin
- // multiplied by its USD balance and divided by 100 (to convert percentage to decimal)
- return coins.fold(0.0, (sum, coin) {
- // Use the price change from the CexPrice if available
- final usdBalance = coin.lastKnownUsdBalance(sdk) ?? 0.0;
- // Get the coin price from the repository's prices cache
+ Future _calculateTotalChange24h(List coins) async {
+ Rational totalChange = Rational.zero;
+ for (final coin in coins) {
+ final double usdBalance = coin.lastKnownUsdBalance(sdk) ?? 0.0;
+ final usdBalanceDecimal = Decimal.parse(usdBalance.toString());
final price = portfolioGrowthRepository.getCachedPrice(
coin.id.symbol.configSymbol.toUpperCase(),
);
- final change24h = price?.change24h ?? 0.0;
- return sum + (change24h * usdBalance / 100);
- });
+ final change24h = price?.change24h ?? Decimal.zero;
+ totalChange += change24h * usdBalanceDecimal / Decimal.fromInt(100);
+ }
+ return totalChange;
}
/// Calculate the percentage change over 24h for the entire portfolio
- double _calculatePercentageChange24h(List coins) {
+ Future _calculatePercentageChange24h(List coins) async {
final double totalBalance = _calculateTotalBalance(coins);
- final double totalChange = _calculateTotalChange24h(coins);
+ final Rational totalBalanceRational = Rational.parse(
+ totalBalance.toString(),
+ );
+ final Rational totalChange = await _calculateTotalChange24h(coins);
// Avoid division by zero or very small balances
- if (totalBalance <= 0.01) {
- return 0.0;
+ if (totalBalanceRational <= Rational.fromInt(1, 100)) {
+ return Rational.zero;
}
// Return the percentage change
- return (totalChange / totalBalance) * 100;
+ return (totalChange / totalBalanceRational) * Rational.fromInt(100);
}
}
diff --git a/lib/bloc/cex_market_data/portfolio_growth/portfolio_growth_repository.dart b/lib/bloc/cex_market_data/portfolio_growth/portfolio_growth_repository.dart
index 63398b5f2d..16f71795ae 100644
--- a/lib/bloc/cex_market_data/portfolio_growth/portfolio_growth_repository.dart
+++ b/lib/bloc/cex_market_data/portfolio_growth/portfolio_growth_repository.dart
@@ -1,12 +1,19 @@
import 'dart:math' show Point;
+import 'package:decimal/decimal.dart';
import 'package:hive/hive.dart';
-import 'package:komodo_cex_market_data/komodo_cex_market_data.dart' as cex;
-import 'package:komodo_cex_market_data/komodo_cex_market_data.dart';
+import 'package:komodo_cex_market_data/komodo_cex_market_data.dart'
+ show
+ CoinOhlc,
+ GraphInterval,
+ GraphIntervalExtension,
+ OhlcGetters,
+ graphIntervalsInSeconds;
import 'package:komodo_defi_sdk/komodo_defi_sdk.dart';
import 'package:komodo_defi_types/komodo_defi_types.dart';
import 'package:komodo_persistence_layer/komodo_persistence_layer.dart';
import 'package:logging/logging.dart';
+import 'package:rational/rational.dart';
import 'package:web_dex/bloc/cex_market_data/charts.dart';
import 'package:web_dex/bloc/cex_market_data/mockup/mock_portfolio_growth_repository.dart';
import 'package:web_dex/bloc/cex_market_data/mockup/performance_mode.dart';
@@ -15,6 +22,7 @@ import 'package:web_dex/bloc/cex_market_data/models/models.dart';
import 'package:web_dex/bloc/cex_market_data/portfolio_growth/cache_miss_exception.dart';
import 'package:web_dex/bloc/coins_bloc/coins_repo.dart';
import 'package:web_dex/bloc/transaction_history/transaction_history_repo.dart';
+import 'package:web_dex/model/cex_price.dart' show CexPrice;
import 'package:web_dex/model/coin.dart';
import 'package:web_dex/shared/utils/extensions/legacy_coin_migration_extensions.dart';
@@ -22,23 +30,20 @@ import 'package:web_dex/shared/utils/extensions/legacy_coin_migration_extensions
class PortfolioGrowthRepository {
/// Create a new instance of the repository with the provided dependencies.
PortfolioGrowthRepository({
- required cex.CexRepository cexRepository,
required TransactionHistoryRepo transactionHistoryRepo,
required PersistenceProvider cacheProvider,
required CoinsRepo coinsRepository,
required KomodoDefiSdk sdk,
- }) : _transactionHistoryRepository = transactionHistoryRepo,
- _cexRepository = cexRepository,
- _graphCache = cacheProvider,
- _coinsRepository = coinsRepository,
- _sdk = sdk;
+ }) : _transactionHistoryRepository = transactionHistoryRepo,
+ _graphCache = cacheProvider,
+ _coinsRepository = coinsRepository,
+ _sdk = sdk;
/// Create a new instance of the repository with default dependencies.
/// The default dependencies are the [BinanceRepository] and the
/// [TransactionHistoryRepo].
factory PortfolioGrowthRepository.withDefaults({
required TransactionHistoryRepo transactionHistoryRepo,
- required cex.CexRepository cexRepository,
required CoinsRepo coinsRepository,
required KomodoDefiSdk sdk,
PerformanceMode? demoMode,
@@ -52,7 +57,6 @@ class PortfolioGrowthRepository {
}
return PortfolioGrowthRepository(
- cexRepository: cexRepository,
transactionHistoryRepo: transactionHistoryRepo,
cacheProvider: HiveLazyBoxProvider(
name: GraphType.balanceGrowth.tableName,
@@ -62,9 +66,6 @@ class PortfolioGrowthRepository {
);
}
- /// The CEX repository to fetch the spot price of the coins.
- final cex.CexRepository _cexRepository;
-
/// The transaction history repository to fetch the transactions.
final TransactionHistoryRepo _transactionHistoryRepository;
@@ -123,34 +124,13 @@ class PortfolioGrowthRepository {
}
if (useCache) {
- final cacheStopwatch = Stopwatch()..start();
- final String compoundKey = GraphCache.getPrimaryKey(
- coinId: coinId.id,
- fiatCoinId: fiatCoinId,
- graphType: GraphType.balanceGrowth,
- walletId: walletId,
- isHdWallet: currentUser.isHd,
+ return await _tryLoadCoinGrowthChartFromCache(
+ coinId,
+ fiatCoinId,
+ walletId,
+ currentUser,
+ methodStopwatch,
);
- final GraphCache? cachedGraph = await _graphCache.get(compoundKey);
- final cacheExists = cachedGraph != null;
- cacheStopwatch.stop();
-
- if (cacheExists) {
- _log.fine(
- 'Cache hit for ${coinId.id}: ${cacheStopwatch.elapsedMilliseconds}ms',
- );
- methodStopwatch.stop();
- _log.fine(
- 'getCoinGrowthChart completed in '
- '${methodStopwatch.elapsedMilliseconds}ms (cached)',
- );
- return cachedGraph.graph;
- } else {
- _log.fine(
- 'Cache miss ${coinId.id}: ${cacheStopwatch.elapsedMilliseconds}ms',
- );
- throw CacheMissException(compoundKey);
- }
}
final Coin coin = _coinsRepository.getCoinFromId(coinId)!;
@@ -161,17 +141,17 @@ class PortfolioGrowthRepository {
.fetchCompletedTransactions(coin.id)
.then((value) => value.toList())
.catchError((Object e) {
- txStopwatch.stop();
- _log.warning(
- 'Error fetching transactions for ${coin.id} '
- 'in ${txStopwatch.elapsedMilliseconds}ms: $e',
- );
- if (ignoreTransactionFetchErrors) {
- return List.empty();
- } else {
- throw e;
- }
- });
+ txStopwatch.stop();
+ _log.warning(
+ 'Error fetching transactions for ${coin.id} '
+ 'in ${txStopwatch.elapsedMilliseconds}ms: $e',
+ );
+ if (ignoreTransactionFetchErrors) {
+ return List.empty();
+ } else {
+ throw e;
+ }
+ });
txStopwatch.stop();
_log.fine(
'Fetched ${transactions.length} transactions for ${coin.id} '
@@ -215,10 +195,7 @@ class PortfolioGrowthRepository {
endAt ??= DateTime.now();
final String baseCoinId = coin.id.symbol.configSymbol.toUpperCase();
- final cex.GraphInterval interval = _getOhlcInterval(
- startAt,
- endDate: endAt,
- );
+ final GraphInterval interval = _getOhlcInterval(startAt, endDate: endAt);
_log.fine(
'Fetching OHLC data for $baseCoinId/$fiatCoinId '
@@ -226,32 +203,52 @@ class PortfolioGrowthRepository {
);
final ohlcStopwatch = Stopwatch()..start();
- cex.CoinOhlc ohlcData;
+ Map ohlcData;
// if the base coin is the same as the fiat coin, return a chart with a
// constant value of 1.0
if (baseCoinId.toLowerCase() == fiatCoinId.toLowerCase()) {
_log.fine('Using constant price for fiat coin: $baseCoinId');
- ohlcData = cex.CoinOhlc.fromConstantPrice(
- startAt: startAt,
- endAt: endAt,
- intervalSeconds: interval.toSeconds(),
+ ohlcData = Map.fromIterable(
+ CoinOhlc.fromConstantPrice(
+ startAt: startAt,
+ endAt: endAt,
+ intervalSeconds: interval.toSeconds(),
+ ).ohlc.map(
+ (ohlc) => MapEntry(
+ DateTime.fromMillisecondsSinceEpoch(ohlc.closeTimeMs),
+ ohlc.close,
+ ),
+ ),
);
} else {
- ohlcData = await _cexRepository.getCoinOhlc(
- cex.CexCoinPair(baseCoinTicker: baseCoinId, relCoinTicker: fiatCoinId),
- interval,
- startAt: startAt,
- endAt: endAt,
+ final totalSecs = endAt.difference(startAt).inSeconds;
+ final stepSecs = interval.toSeconds();
+ final steps = (totalSecs ~/ stepSecs) + 1; // include start and end
+ final safeSteps = steps > 0 ? steps : 1;
+ final dates = List.generate(
+ safeSteps,
+ (i) => startAt!.add(Duration(seconds: i * stepSecs)),
+ );
+
+ final quoteCurrency =
+ QuoteCurrency.fromString(fiatCoinId) ?? Stablecoin.usdt;
+
+ ohlcData = await _sdk.marketData.fiatPriceHistory(
+ coinId,
+ dates,
+ quoteCurrency: quoteCurrency,
);
}
ohlcStopwatch.stop();
_log.fine(
- 'Fetched ${ohlcData.ohlc.length} OHLC data points '
+ 'Fetched ${ohlcData.length} OHLC data points '
'in ${ohlcStopwatch.elapsedMilliseconds}ms',
);
- final List> portfolowGrowthChart =
- _mergeTransactionsWithOhlc(ohlcData, transactions);
+ final List> portfolowGrowthChart = _mergeTransactionsWithOhlc(
+ ohlcData,
+ transactions,
+ );
final cacheInsertStopwatch = Stopwatch()..start();
await _graphCache.insert(
GraphCache(
@@ -278,6 +275,43 @@ class PortfolioGrowthRepository {
return portfolowGrowthChart;
}
+ Future _tryLoadCoinGrowthChartFromCache(
+ AssetId coinId,
+ String fiatCoinId,
+ String walletId,
+ KdfUser currentUser,
+ Stopwatch methodStopwatch,
+ ) async {
+ final cacheStopwatch = Stopwatch()..start();
+ final String compoundKey = GraphCache.getPrimaryKey(
+ coinId: coinId.id,
+ fiatCoinId: fiatCoinId,
+ graphType: GraphType.balanceGrowth,
+ walletId: walletId,
+ isHdWallet: currentUser.isHd,
+ );
+ final GraphCache? cachedGraph = await _graphCache.get(compoundKey);
+ final cacheExists = cachedGraph != null;
+ cacheStopwatch.stop();
+
+ if (cacheExists) {
+ _log.fine(
+ 'Cache hit for ${coinId.id}: ${cacheStopwatch.elapsedMilliseconds}ms',
+ );
+ methodStopwatch.stop();
+ _log.fine(
+ 'getCoinGrowthChart completed in '
+ '${methodStopwatch.elapsedMilliseconds}ms (cached)',
+ );
+ return cachedGraph.graph;
+ } else {
+ _log.fine(
+ 'Cache miss ${coinId.id}: ${cacheStopwatch.elapsedMilliseconds}ms',
+ );
+ throw CacheMissException(compoundKey);
+ }
+ }
+
/// Get the growth chart for the portfolio based on the transactions
/// and the spot price of the coins in the fiat currency provided.
///
@@ -364,8 +398,9 @@ class PortfolioGrowthRepository {
charts.removeWhere((element) => element.isEmpty);
if (charts.isEmpty) {
_log.warning(
- 'getPortfolioGrowthChart: No valid charts found after filtering '
- 'empty charts in ${methodStopwatch.elapsedMilliseconds}ms');
+ 'getPortfolioGrowthChart: No valid charts found after filtering '
+ 'empty charts in ${methodStopwatch.elapsedMilliseconds}ms',
+ );
return ChartData.empty();
}
@@ -375,7 +410,9 @@ class PortfolioGrowthRepository {
// chart matches the current prices and ends at the current time.
// TODO: Move to the SDK when portfolio balance is implemented.
final double totalUsdBalance = coins.fold(
- 0, (prev, coin) => prev + (coin.lastKnownUsdBalance(_sdk) ?? 0));
+ 0,
+ (prev, coin) => prev + (coin.lastKnownUsdBalance(_sdk) ?? 0),
+ );
if (totalUsdBalance <= 0) {
_log.fine(
'Total USD balance is zero or negative, skipping balance point addition',
@@ -407,8 +444,10 @@ class PortfolioGrowthRepository {
);
}
- final filteredChart =
- mergedChart.filterDomain(startAt: startAt, endAt: endAt);
+ final filteredChart = mergedChart.filterDomain(
+ startAt: startAt,
+ endAt: endAt,
+ );
methodStopwatch.stop();
_log.fine(
@@ -420,29 +459,33 @@ class PortfolioGrowthRepository {
}
ChartData _mergeTransactionsWithOhlc(
- cex.CoinOhlc ohlcData,
+ Map ohlcData,
List transactions,
) {
final stopwatch = Stopwatch()..start();
_log.fine(
'Merging ${transactions.length} transactions with '
- '${ohlcData.ohlc.length} OHLC data points',
+ '${ohlcData.length} OHLC data points',
);
- if (transactions.isEmpty || ohlcData.ohlc.isEmpty) {
+ if (transactions.isEmpty || ohlcData.isEmpty) {
_log.warning('Empty transactions or OHLC data, returning empty chart');
return List.empty();
}
- final ChartData spotValues = ohlcData.ohlc.map((cex.Ohlc ohlc) {
+ final ChartData spotValues = ohlcData.entries.map((
+ MapEntry entry,
+ ) {
return Point(
- ohlc.closeTime.toDouble(),
- ohlc.close,
+ entry.key.millisecondsSinceEpoch.toDouble(),
+ entry.value.toDouble(),
);
}).toList();
- final portfolowGrowthChart =
- Charts.mergeTransactionsWithPortfolioOHLC(transactions, spotValues);
+ final portfolowGrowthChart = Charts.mergeTransactionsWithPortfolioOHLC(
+ transactions,
+ spotValues,
+ );
stopwatch.stop();
_log.fine(
@@ -469,7 +512,6 @@ class PortfolioGrowthRepository {
bool allowFiatAsBase = true,
}) async {
final Coin coin = _coinsRepository.getCoinFromId(coinId)!;
- final supportedCoins = await _cexRepository.getCoinList();
final coinTicker = coin.id.symbol.configSymbol.toUpperCase();
// Allow fiat coins through, as they are represented by a constant value,
// 1, in the repository layer and are not supported by the CEX API
@@ -477,12 +519,7 @@ class PortfolioGrowthRepository {
return true;
}
- final coinPair = CexCoinPair(
- baseCoinTicker: coinTicker,
- relCoinTicker: fiatCoinId.toUpperCase(),
- );
- final isCoinSupported = coinPair.isCoinSupported(supportedCoins);
- return !coin.isTestCoin && isCoinSupported;
+ return !coin.isTestCoin;
}
/// Get the OHLC interval for the chart based on the number of transactions
@@ -501,17 +538,18 @@ class PortfolioGrowthRepository {
/// final interval
/// = _getOhlcInterval(transactions, targetLength: 500);
/// ```
- cex.GraphInterval _getOhlcInterval(
+ GraphInterval _getOhlcInterval(
DateTime startDate, {
DateTime? endDate,
int targetLength = 500,
}) {
final DateTime lastDate = endDate ?? DateTime.now();
final duration = lastDate.difference(startDate);
- final int interval = duration.inSeconds.toDouble() ~/ targetLength;
- final intervalValue = cex.graphIntervalsInSeconds.entries.firstWhere(
- (entry) => entry.value >= interval,
- orElse: () => cex.graphIntervalsInSeconds.entries.last,
+ final int interval = duration.inSeconds ~/ targetLength;
+ final int safeInterval = interval > 0 ? interval : 1;
+ final intervalValue = graphIntervalsInSeconds.entries.firstWhere(
+ (entry) => entry.value >= safeInterval,
+ orElse: () => graphIntervalsInSeconds.entries.last,
);
return intervalValue.key;
}
@@ -522,18 +560,19 @@ class PortfolioGrowthRepository {
///
/// This method fetches the current prices for all coins and calculates
/// the 24h change by multiplying each coin's percentage change by its USD balance
- Future calculateTotalChange24h(List coins) async {
+ Future calculateTotalChange24h(List coins) async {
// Fetch current prices including 24h change data
final prices = await _coinsRepository.fetchCurrentPrices() ?? {};
// Calculate the 24h change by summing the change percentage of each coin
// multiplied by its USD balance and divided by 100 (to convert percentage to decimal)
- double totalChange = 0.0;
+ Rational totalChange = Rational.zero;
for (final coin in coins) {
final price = prices[coin.id.symbol.configSymbol.toUpperCase()];
- final change24h = price?.change24h ?? 0.0;
+ final change24h = price?.change24h ?? Decimal.zero;
final usdBalance = coin.lastKnownUsdBalance(_sdk) ?? 0.0;
- totalChange += (change24h * usdBalance / 100);
+ final usdBalanceDecimal = Decimal.parse(usdBalance.toString());
+ totalChange += (change24h * usdBalanceDecimal / Decimal.fromInt(100));
}
return totalChange;
}
diff --git a/lib/bloc/cex_market_data/price_chart/price_chart_bloc.dart b/lib/bloc/cex_market_data/price_chart/price_chart_bloc.dart
index 1412335485..24191a8f64 100644
--- a/lib/bloc/cex_market_data/price_chart/price_chart_bloc.dart
+++ b/lib/bloc/cex_market_data/price_chart/price_chart_bloc.dart
@@ -1,7 +1,9 @@
+import 'package:decimal/decimal.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:komodo_cex_market_data/komodo_cex_market_data.dart';
import 'package:komodo_defi_sdk/komodo_defi_sdk.dart';
import 'package:komodo_defi_types/komodo_defi_types.dart';
+import 'package:rational/rational.dart';
import 'package:web_dex/bloc/coins_bloc/asset_coin_extension.dart';
import 'package:web_dex/shared/utils/utils.dart';
@@ -10,18 +12,13 @@ import 'price_chart_event.dart';
import 'price_chart_state.dart';
class PriceChartBloc extends Bloc {
- PriceChartBloc(this.cexPriceRepository, this.sdk)
- : super(const PriceChartState()) {
+ PriceChartBloc(this._sdk) : super(const PriceChartState()) {
on(_onStarted);
on(_onIntervalChanged);
on(_onSymbolChanged);
}
- final BinanceRepository cexPriceRepository;
- final KomodoDefiSdk sdk;
- final KomodoPriceRepository _komodoPriceRepository = KomodoPriceRepository(
- cexPriceProvider: KomodoPriceProvider(),
- );
+ final KomodoDefiSdk _sdk;
void _onStarted(
PriceChartStarted event,
@@ -30,45 +27,52 @@ class PriceChartBloc extends Bloc {
emit(state.copyWith(status: PriceChartStatus.loading));
try {
Map fetchedCexCoins = state.availableCoins;
- if (state.availableCoins.isEmpty) {
- fetchedCexCoins = await _fetchCoinsFromCex();
- }
final List> futures = event.symbols
- .map((symbol) => sdk.getSdkAsset(symbol).id)
+ .map((symbol) => _sdk.getSdkAsset(symbol).id)
.map((symbol) async {
- try {
- final CoinOhlc ohlcData = await cexPriceRepository.getCoinOhlc(
- CexCoinPair.usdtPrice(symbol.symbol.assetConfigId),
- _dividePeriodToInterval(event.period),
- startAt: DateTime.now().subtract(event.period),
- endAt: DateTime.now(),
- );
-
- final rangeChangePercent = _calculatePercentageChange(
- ohlcData.ohlc.firstOrNull,
- ohlcData.ohlc.lastOrNull,
- );
-
- return PriceChartDataSeries(
- info: CoinPriceInfo(
- ticker: symbol.symbol.assetConfigId,
- id: fetchedCexCoins[symbol]!.id,
- name: fetchedCexCoins[symbol]!.name,
- selectedPeriodIncreasePercentage: rangeChangePercent ?? 0.0,
- ),
- data: ohlcData.ohlc.map((e) {
- return PriceChartSeriesPoint(
- usdValue: e.close,
- unixTimestamp: e.closeTime.toDouble(),
+ try {
+ final startAt = DateTime.now().subtract(event.period);
+ final endAt = DateTime.now();
+ final interval = _dividePeriodToInterval(event.period);
+
+ final dates = List.generate(
+ (endAt.difference(startAt).inSeconds / interval.toSeconds())
+ .toInt(),
+ (index) => startAt.add(
+ Duration(seconds: index * interval.toSeconds()),
+ ),
);
- }).toList(),
- );
- } catch (e) {
- log("Error fetching OHLC data for $symbol: $e");
- return null;
- }
- }).toList();
+ final ohlcData = await _sdk.marketData.fiatPriceHistory(
+ symbol,
+ dates,
+ );
+
+ final rangeChangePercent = _calculatePercentageChange(
+ ohlcData.values.firstOrNull,
+ ohlcData.values.lastOrNull,
+ )?.toDouble();
+
+ return PriceChartDataSeries(
+ info: CoinPriceInfo(
+ ticker: symbol.symbol.assetConfigId,
+ id: fetchedCexCoins[symbol]?.id ?? symbol.id,
+ name: fetchedCexCoins[symbol]?.name ?? symbol.name,
+ selectedPeriodIncreasePercentage: rangeChangePercent ?? 0.0,
+ ),
+ data: ohlcData.entries.map((e) {
+ return PriceChartSeriesPoint(
+ usdValue: e.value.toDouble(),
+ unixTimestamp: e.key.millisecondsSinceEpoch.toDouble(),
+ );
+ }).toList(),
+ );
+ } catch (e) {
+ log("Error fetching OHLC data for $symbol: $e");
+ return null;
+ }
+ })
+ .toList();
final data = await Future.wait(futures);
@@ -85,75 +89,21 @@ class PriceChartBloc extends Bloc {
);
} catch (e) {
emit(
- state.copyWith(
- status: PriceChartStatus.failure,
- error: e.toString(),
- ),
+ state.copyWith(status: PriceChartStatus.failure, error: e.toString()),
);
}
}
- Future> _fetchCoinsFromCex() async {
- final coinPrices = await _komodoPriceRepository.getKomodoPrices();
- final coins = (await cexPriceRepository.getCoinList())
- .where((coin) => coin.currencies.contains('USDT'))
- // `cexPriceRepository.getCoinList()` returns coins from a CEX
- // (e.g. Binance), some of which are not in our known/available
- // assets/coins list. This filter ensures that we only attempt to
- // fetch and display data for supported coins
- .where((coin) => sdk.assets.assetsFromTicker(coin.id).isNotEmpty)
- .map((coin) async {
- double? dayChangePercent = coinPrices[coin.symbol]?.change24h;
-
- if (dayChangePercent == null) {
- try {
- final coinOhlc = await cexPriceRepository.getCoinOhlc(
- CexCoinPair.usdtPrice(coin.symbol),
- GraphInterval.oneMinute,
- startAt: DateTime.now().subtract(const Duration(days: 1)),
- endAt: DateTime.now(),
- );
-
- dayChangePercent = _calculatePercentageChange(
- coinOhlc.ohlc.firstOrNull,
- coinOhlc.ohlc.lastOrNull,
- );
- } catch (e) {
- log("Error fetching OHLC data for ${coin.symbol}: $e");
- }
- }
- return CoinPriceInfo(
- ticker: coin.symbol,
- id: coin.id,
- name: coin.name,
- selectedPeriodIncreasePercentage: dayChangePercent ?? 0.0,
- );
- }).toList();
-
- final fetchedCexCoins = {
- for (var coin in await Future.wait(coins))
- sdk.getSdkAsset(coin.ticker).id: coin,
- };
-
- return fetchedCexCoins;
- }
-
- double? _calculatePercentageChange(Ohlc? first, Ohlc? last) {
+ Rational? _calculatePercentageChange(Decimal? first, Decimal? last) {
if (first == null || last == null) {
return null;
}
- // Calculate the typical price for the first and last OHLC entries
- final firstTypicalPrice =
- (first.open + first.high + first.low + first.close) / 4;
- final lastTypicalPrice =
- (last.open + last.high + last.low + last.close) / 4;
-
- if (firstTypicalPrice == 0) {
- return null;
+ if (first == Decimal.zero) {
+ return Rational.zero;
}
- return ((lastTypicalPrice - firstTypicalPrice) / firstTypicalPrice) * 100;
+ return ((last - first) / first) * Rational.fromInt(100);
}
void _onIntervalChanged(
@@ -164,11 +114,7 @@ class PriceChartBloc extends Bloc {
if (currentState.status != PriceChartStatus.success) {
return;
}
- emit(
- state.copyWith(
- selectedPeriod: event.period,
- ),
- );
+ emit(state.copyWith(selectedPeriod: event.period));
add(
PriceChartStarted(
symbols: currentState.data.map((e) => e.info.id).toList(),
@@ -182,10 +128,7 @@ class PriceChartBloc extends Bloc {
Emitter emit,
) {
add(
- PriceChartStarted(
- symbols: event.symbols,
- period: state.selectedPeriod,
- ),
+ PriceChartStarted(symbols: event.symbols, period: state.selectedPeriod),
);
}
diff --git a/lib/bloc/cex_market_data/profit_loss/demo_profit_loss_repository.dart b/lib/bloc/cex_market_data/profit_loss/demo_profit_loss_repository.dart
index e223f735f8..96eddc0706 100644
--- a/lib/bloc/cex_market_data/profit_loss/demo_profit_loss_repository.dart
+++ b/lib/bloc/cex_market_data/profit_loss/demo_profit_loss_repository.dart
@@ -1,4 +1,3 @@
-import 'package:komodo_cex_market_data/komodo_cex_market_data.dart';
import 'package:komodo_defi_sdk/komodo_defi_sdk.dart';
import 'package:komodo_persistence_layer/komodo_persistence_layer.dart';
import 'package:web_dex/bloc/cex_market_data/mockup/generator.dart';
@@ -12,7 +11,6 @@ class MockProfitLossRepository extends ProfitLossRepository {
MockProfitLossRepository({
required this.performanceMode,
required super.transactionHistoryRepo,
- required super.cexRepository,
required super.profitLossCacheProvider,
required super.profitLossCalculator,
required super.sdk,
@@ -24,21 +22,15 @@ class MockProfitLossRepository extends ProfitLossRepository {
String cacheTableName = 'mock_profit_loss',
}) {
return MockProfitLossRepository(
- profitLossCacheProvider:
- HiveLazyBoxProvider(name: cacheTableName),
- cexRepository: BinanceRepository(
- binanceProvider: const BinanceProvider(),
+ profitLossCacheProvider: HiveLazyBoxProvider(
+ name: cacheTableName,
),
performanceMode: performanceMode,
transactionHistoryRepo: MockTransactionHistoryRepo(
performanceMode: performanceMode,
- demoDataGenerator: DemoDataCache.withDefaults(),
- ),
- profitLossCalculator: RealisedProfitLossCalculator(
- BinanceRepository(
- binanceProvider: const BinanceProvider(),
- ),
+ demoDataGenerator: DemoDataCache.withDefaults(sdk),
),
+ profitLossCalculator: RealisedProfitLossCalculator(sdk),
sdk: sdk,
);
}
diff --git a/lib/bloc/cex_market_data/profit_loss/profit_loss_bloc.dart b/lib/bloc/cex_market_data/profit_loss/profit_loss_bloc.dart
index be9342df5d..080e547c1b 100644
--- a/lib/bloc/cex_market_data/profit_loss/profit_loss_bloc.dart
+++ b/lib/bloc/cex_market_data/profit_loss/profit_loss_bloc.dart
@@ -18,7 +18,7 @@ part 'profit_loss_state.dart';
class ProfitLossBloc extends Bloc {
ProfitLossBloc(this._profitLossRepository, this._sdk)
- : super(const ProfitLossInitial()) {
+ : super(const ProfitLossInitial()) {
// Use the restartable transformer for load events to avoid overlapping
// events if the user rapidly changes the period (i.e. faster than the
// previous event can complete).
@@ -47,8 +47,10 @@ class ProfitLossBloc extends Bloc {
Emitter emit,
) async {
try {
- final supportedCoins =
- await _removeUnsupportedCons(event.coins, event.fiatCoinId);
+ final supportedCoins = await _removeUnsupportedCons(
+ event.coins,
+ event.fiatCoinId,
+ );
// Charts for individual coins (coin details) are parsed here as well,
// and should be hidden if not supported.
if (supportedCoins.isEmpty && event.coins.length <= 1) {
@@ -59,9 +61,11 @@ class ProfitLossBloc extends Bloc {
);
}
- await _getProfitLossChart(event, supportedCoins, useCache: true)
- .then(emit.call)
- .catchError((Object error, StackTrace stackTrace) {
+ await _getProfitLossChart(
+ event,
+ supportedCoins,
+ useCache: true,
+ ).then(emit.call).catchError((Object error, StackTrace stackTrace) {
const errorMessage = 'Failed to load CACHED portfolio profit/loss';
_log.warning(errorMessage, error, stackTrace);
// ignore cached errors, as the periodic refresh attempts should recover
@@ -72,9 +76,11 @@ class ProfitLossBloc extends Bloc {
await _sdk.waitForEnabledCoinsToPassThreshold(supportedCoins);
final activeCoins = await _removeInactiveCoins(supportedCoins);
if (activeCoins.isNotEmpty) {
- await _getProfitLossChart(event, activeCoins, useCache: false)
- .then(emit.call)
- .catchError((Object e, StackTrace s) {
+ await _getProfitLossChart(
+ event,
+ activeCoins,
+ useCache: false,
+ ).then(emit.call).catchError((Object e, StackTrace s) {
_log.severe('Failed to load uncached profit/loss chart', e, s);
// Ignore un-cached errors, as a transaction loading exception should not
// make the graph disappear with a load failure emit, as the cached data
@@ -139,11 +145,7 @@ class ProfitLossBloc extends Bloc {
) async {
final coins = List.of(walletCoins);
for (final coin in coins) {
- final isCoinSupported = await _profitLossRepository.isCoinChartSupported(
- coin.id,
- fiatCoinId,
- );
- if (coin.isTestCoin || !isCoinSupported) {
+ if (coin.isTestCoin) {
coins.remove(coin);
}
}
@@ -207,15 +209,17 @@ class ProfitLossBloc extends Bloc {
useCache: useCache,
);
- final firstNonZeroProfitLossIndex =
- profitLosses.indexWhere((element) => element.profitLoss != 0);
+ final firstNonZeroProfitLossIndex = profitLosses.indexWhere(
+ (element) => element.profitLoss != 0,
+ );
if (firstNonZeroProfitLossIndex == -1) {
_log.info('No non-zero profit/loss data found for ${coin.abbr}');
return ChartData.empty();
}
- final nonZeroProfitLosses =
- profitLosses.sublist(firstNonZeroProfitLossIndex);
+ final nonZeroProfitLosses = profitLosses.sublist(
+ firstNonZeroProfitLossIndex,
+ );
return nonZeroProfitLosses.toChartData();
} catch (e, s) {
final cached = useCache ? 'cached' : 'uncached';
diff --git a/lib/bloc/cex_market_data/profit_loss/profit_loss_calculator.dart b/lib/bloc/cex_market_data/profit_loss/profit_loss_calculator.dart
index 41b02d2171..a8128968c3 100644
--- a/lib/bloc/cex_market_data/profit_loss/profit_loss_calculator.dart
+++ b/lib/bloc/cex_market_data/profit_loss/profit_loss_calculator.dart
@@ -1,12 +1,16 @@
-import 'package:komodo_cex_market_data/komodo_cex_market_data.dart';
+import 'package:decimal/decimal.dart';
+import 'package:komodo_defi_sdk/komodo_defi_sdk.dart';
import 'package:komodo_defi_types/komodo_defi_types.dart';
+import 'package:logging/logging.dart';
import 'package:web_dex/bloc/cex_market_data/profit_loss/extensions/profit_loss_transaction_extension.dart';
import 'package:web_dex/bloc/cex_market_data/profit_loss/models/price_stamped_transaction.dart';
import 'package:web_dex/bloc/cex_market_data/profit_loss/models/profit_loss.dart';
class ProfitLossCalculator {
- ProfitLossCalculator(this._cexRepository);
- final CexRepository _cexRepository;
+ ProfitLossCalculator(this._sdk);
+
+ final KomodoDefiSdk _sdk;
+ final Logger _log = Logger('ProfitLossCalculator');
/// Get the running profit/loss for a coin based on the transactions.
/// ProfitLoss = Proceeds - CostBasis
@@ -22,7 +26,7 @@ class ProfitLossCalculator {
/// Returns the list of [ProfitLoss] for the coin.
Future> getProfitFromTransactions(
List transactions, {
- required String coinId,
+ required AssetId coinId,
required String fiatCoinId,
}) async {
if (transactions.isEmpty) {
@@ -33,23 +37,35 @@ class ProfitLossCalculator {
final todayAtMidnight = _getDateAtMidnight(DateTime.now());
final transactionDates = _getTransactionDates(transactions);
- final coinUsdPrices =
- await _getTimestampedUsdPrices(coinId, transactionDates);
+ final coinUsdPrices = await _sdk.marketData.fiatPriceHistory(
+ coinId,
+ transactionDates,
+ );
final currentPrice =
coinUsdPrices[todayAtMidnight] ?? coinUsdPrices.values.last;
- final priceStampedTransactions =
- _priceStampTransactions(transactions, coinUsdPrices);
+ final priceStampedTransactions = _priceStampTransactions(
+ transactions,
+ coinUsdPrices,
+ );
return _calculateProfitLosses(priceStampedTransactions, currentPrice);
}
List _priceStampTransactions(
List transactions,
- Map usdPrices,
+ Map usdPrices,
) {
return transactions.map((transaction) {
- final usdPrice = usdPrices[_getDateAtMidnight(transaction.timestamp)]!;
- return UsdPriceStampedTransaction(transaction, usdPrice);
+ final DateTime midnightDate = _getDateAtMidnight(transaction.timestamp);
+ final Decimal? usdPrice = usdPrices[midnightDate];
+ if (usdPrice == null) {
+ _log.warning(
+ 'No USD price found for transaction ${transaction.id} '
+ 'at $midnightDate. Available prices: ${usdPrices.keys}',
+ );
+ throw Exception('No USD price found for transaction ${transaction.id}');
+ }
+ return UsdPriceStampedTransaction(transaction, usdPrice.toDouble());
}).toList();
}
@@ -58,20 +74,13 @@ class ProfitLossCalculator {
}
DateTime _getDateAtMidnight(DateTime date) {
- return DateTime(date.year, date.month, date.day);
- }
-
- Future> _getTimestampedUsdPrices(
- String coinId,
- List dates,
- ) async {
- final cleanCoinId = coinId.split('-').firstOrNull?.toUpperCase() ?? '';
- return _cexRepository.getCoinFiatPrices(cleanCoinId, dates);
+ final utcDate = date.toUtc();
+ return DateTime.utc(utcDate.year, utcDate.month, utcDate.day);
}
List _calculateProfitLosses(
List transactions,
- double currentPrice,
+ Decimal currentPrice,
) {
var state = _ProfitLossState();
final profitLosses = [];
@@ -102,8 +111,10 @@ class ProfitLossCalculator {
_ProfitLossState state,
UsdPriceStampedTransaction transaction,
) {
- final newHolding =
- (holdings: transaction.amount.toDouble(), price: transaction.priceUsd);
+ final newHolding = (
+ holdings: transaction.amount.toDouble(),
+ price: transaction.priceUsd,
+ );
return _ProfitLossState(
holdings: [...state.holdings, newHolding],
realizedProfitLoss: state.realizedProfitLoss,
@@ -124,8 +135,9 @@ class ProfitLossCalculator {
// calculate the cost basis (formula assumes positive "total" value).
var remainingToSell = transaction.amount.toDouble().abs();
var costBasis = 0.0;
- final newHoldings =
- List<({double holdings, double price})>.from(state.holdings);
+ final newHoldings = List<({double holdings, double price})>.from(
+ state.holdings,
+ );
while (remainingToSell > 0) {
final oldestBuy = newHoldings.first.holdings;
@@ -136,7 +148,7 @@ class ProfitLossCalculator {
} else {
newHoldings[0] = (
holdings: newHoldings[0].holdings - remainingToSell,
- price: newHoldings[0].price
+ price: newHoldings[0].price,
);
costBasis += remainingToSell * state.holdings.first.price;
remainingToSell = 0;
@@ -161,37 +173,28 @@ class ProfitLossCalculator {
);
}
- double _calculateProfitLoss(
- _ProfitLossState state,
- double currentPrice,
- ) {
- final currentValue = state.currentHoldings * currentPrice;
+ double _calculateProfitLoss(_ProfitLossState state, Decimal currentPrice) {
+ final currentValue = state.currentHoldings * currentPrice.toDouble();
final unrealizedProfitLoss = currentValue - state.totalInvestment;
return state.realizedProfitLoss + unrealizedProfitLoss;
}
}
class RealisedProfitLossCalculator extends ProfitLossCalculator {
- RealisedProfitLossCalculator(super.cexRepository);
+ RealisedProfitLossCalculator(super._sdk);
@override
- double _calculateProfitLoss(
- _ProfitLossState state,
- double currentPrice,
- ) {
+ double _calculateProfitLoss(_ProfitLossState state, Decimal currentPrice) {
return state.realizedProfitLoss;
}
}
class UnRealisedProfitLossCalculator extends ProfitLossCalculator {
- UnRealisedProfitLossCalculator(super.cexRepository);
+ UnRealisedProfitLossCalculator(super._sdk);
@override
- double _calculateProfitLoss(
- _ProfitLossState state,
- double currentPrice,
- ) {
- final currentValue = state.currentHoldings * currentPrice;
+ double _calculateProfitLoss(_ProfitLossState state, Decimal currentPrice) {
+ final currentValue = state.currentHoldings * currentPrice.toDouble();
final unrealizedProfitLoss = currentValue - state.totalInvestment;
return unrealizedProfitLoss;
}
diff --git a/lib/bloc/cex_market_data/profit_loss/profit_loss_repository.dart b/lib/bloc/cex_market_data/profit_loss/profit_loss_repository.dart
index ec47cdb7c0..05561e6fd7 100644
--- a/lib/bloc/cex_market_data/profit_loss/profit_loss_repository.dart
+++ b/lib/bloc/cex_market_data/profit_loss/profit_loss_repository.dart
@@ -2,8 +2,6 @@ import 'dart:async';
import 'dart:math';
import 'package:hive/hive.dart';
-import 'package:komodo_cex_market_data/komodo_cex_market_data.dart' as cex;
-import 'package:komodo_cex_market_data/komodo_cex_market_data.dart';
import 'package:komodo_defi_sdk/komodo_defi_sdk.dart';
import 'package:komodo_defi_types/komodo_defi_types.dart';
import 'package:komodo_persistence_layer/komodo_persistence_layer.dart';
@@ -20,23 +18,20 @@ import 'package:web_dex/bloc/transaction_history/transaction_history_repo.dart';
class ProfitLossRepository {
ProfitLossRepository({
required PersistenceProvider
- profitLossCacheProvider,
- required cex.CexRepository cexRepository,
+ profitLossCacheProvider,
required TransactionHistoryRepo transactionHistoryRepo,
required ProfitLossCalculator profitLossCalculator,
required KomodoDefiSdk sdk,
- }) : _transactionHistoryRepo = transactionHistoryRepo,
- _cexRepository = cexRepository,
- _profitLossCacheProvider = profitLossCacheProvider,
- _profitLossCalculator = profitLossCalculator,
- _sdk = sdk;
+ }) : _transactionHistoryRepo = transactionHistoryRepo,
+ _profitLossCacheProvider = profitLossCacheProvider,
+ _profitLossCalculator = profitLossCalculator,
+ _sdk = sdk;
/// Return a new instance of [ProfitLossRepository] with default values.
///
/// If [demoMode] is provided, it will return a [MockProfitLossRepository].
factory ProfitLossRepository.withDefaults({
required TransactionHistoryRepo transactionHistoryRepo,
- required cex.CexRepository cexRepository,
required KomodoDefiSdk sdk,
String cacheTableName = 'profit_loss',
PerformanceMode? demoMode,
@@ -51,16 +46,15 @@ class ProfitLossRepository {
return ProfitLossRepository(
transactionHistoryRepo: transactionHistoryRepo,
- profitLossCacheProvider:
- HiveLazyBoxProvider(name: cacheTableName),
- cexRepository: cexRepository,
- profitLossCalculator: RealisedProfitLossCalculator(cexRepository),
+ profitLossCacheProvider: HiveLazyBoxProvider(
+ name: cacheTableName,
+ ),
+ profitLossCalculator: RealisedProfitLossCalculator(sdk),
sdk: sdk,
);
}
final PersistenceProvider _profitLossCacheProvider;
- final cex.CexRepository _cexRepository;
final TransactionHistoryRepo _transactionHistoryRepo;
final ProfitLossCalculator _profitLossCalculator;
final KomodoDefiSdk _sdk;
@@ -86,61 +80,6 @@ class ProfitLossRepository {
);
}
- /// Check if the coin is supported by the CEX API for charting.
- /// This is used to filter out unsupported coins from the chart.
- ///
- /// [coinId] is the coin to check.
- /// [fiatCoinId] is the fiat coin id to convert the coin to.
- /// [allowFiatAsBase] is a flag to allow fiat coins as the base coin,
- /// without checking if they are supported by the CEX API.
- ///
- /// Returns `true` if the coin is supported by the CEX API for charting.
- /// Returns `false` if the coin is not supported by the CEX API for charting.
- Future isCoinChartSupported(
- AssetId coinId,
- String fiatCoinId, {
- bool allowFiatAsBase = false,
- }) async {
- final stopwatch = Stopwatch()..start();
- final coinTicker = coinId.symbol.configSymbol.toUpperCase();
- _log.fine(
- 'Checking if coin $coinTicker is supported for profit/loss calculation',
- );
-
- final supportedCoinsStopwatch = Stopwatch()..start();
- final supportedCoins = await _cexRepository.getCoinList();
- supportedCoinsStopwatch.stop();
- _log.fine(
- 'Fetched ${supportedCoins.length} supported coins in '
- '${supportedCoinsStopwatch.elapsedMilliseconds}ms',
- );
-
- // Allow fiat coins through, as they are represented by a constant value,
- // 1, in the repository layer and are not supported by the CEX API
- if (allowFiatAsBase && coinId.id == fiatCoinId.toUpperCase()) {
- stopwatch.stop();
- _log.fine(
- 'Coin $coinTicker is a fiat coin, supported: true '
- '(total: ${stopwatch.elapsedMilliseconds}ms)',
- );
- return true;
- }
-
- final coinPair = CexCoinPair(
- baseCoinTicker: coinTicker,
- relCoinTicker: fiatCoinId.toUpperCase(),
- );
- final isSupported = coinPair.isCoinSupported(supportedCoins);
-
- stopwatch.stop();
- _log.fine(
- 'Coin $coinTicker support check completed in '
- '${stopwatch.elapsedMilliseconds}ms, supported: $isSupported',
- );
-
- return isSupported;
- }
-
/// Get the profit/loss data for a coin based on the transactions
/// and the spot price of the coin in the fiat currency.
///
@@ -187,8 +126,8 @@ class ProfitLossRepository {
walletId: walletId,
isHdWallet: currentUser.isHd,
);
- final ProfitLossCache? profitLossCache =
- await _profitLossCacheProvider.get(compoundKey);
+ final ProfitLossCache? profitLossCache = await _profitLossCacheProvider
+ .get(compoundKey);
final bool cacheExists = profitLossCache != null;
cacheStopwatch.stop();
@@ -207,26 +146,10 @@ class ProfitLossRepository {
);
}
- final supportCheckStopwatch = Stopwatch()..start();
- final isCoinSupported = await isCoinChartSupported(
- coinId,
- fiatCoinId,
- );
- supportCheckStopwatch.stop();
-
- if (!isCoinSupported) {
- _log.fine(
- 'Coin ${coinId.id} is not supported for profit/loss calculation '
- '(checked in ${supportCheckStopwatch.elapsedMilliseconds}ms)',
- );
- methodStopwatch.stop();
- return [];
- }
-
final txStopwatch = Stopwatch()..start();
_log.fine('Fetching transactions for ${coinId.id}');
- final transactions =
- await _transactionHistoryRepo.fetchCompletedTransactions(coinId);
+ final transactions = await _transactionHistoryRepo
+ .fetchCompletedTransactions(coinId);
txStopwatch.stop();
_log.fine(
'Fetched ${transactions.length} transactions for ${coinId.id} '
@@ -260,12 +183,12 @@ class ProfitLossRepository {
_log.fine(
'Calculating profit/loss for ${coinId.id} with ${transactions.length} transactions',
);
- final List profitLosses =
- await _profitLossCalculator.getProfitFromTransactions(
- transactions,
- coinId: coinId.id,
- fiatCoinId: fiatCoinId,
- );
+ final List profitLosses = await _profitLossCalculator
+ .getProfitFromTransactions(
+ transactions,
+ coinId: coinId,
+ fiatCoinId: fiatCoinId,
+ );
calcStopwatch.stop();
_log.fine(
'Calculated ${profitLosses.length} profit/loss entries for ${coinId.id} '
diff --git a/lib/bloc/coins_bloc/coins_repo.dart b/lib/bloc/coins_bloc/coins_repo.dart
index 261ecbca26..32382b5dc4 100644
--- a/lib/bloc/coins_bloc/coins_repo.dart
+++ b/lib/bloc/coins_bloc/coins_repo.dart
@@ -529,7 +529,7 @@ class CoinsRepo {
double? getUsdPriceByAmount(String amount, String coinAbbr) {
final Coin? coin = getCoin(coinAbbr);
final double? parsedAmount = double.tryParse(amount);
- final double? usdPrice = coin?.usdPrice?.price;
+ final double? usdPrice = coin?.usdPrice?.price?.toDouble();
if (coin == null || usdPrice == null || parsedAmount == null) {
return null;
@@ -538,167 +538,43 @@ class CoinsRepo {
}
Future?> fetchCurrentPrices() async {
- try {
- // Try to use the SDK's price manager to get prices for active coins
- final activatedAssets = await _kdfSdk.assets.getActivatedAssets();
- // Filter out excluded and testnet assets, as they are not expected
- // to have valid prices available at any of the providers
- final validActivatedAssets = activatedAssets
- .where((asset) => !excludedAssetList.contains(asset.id.id))
- .where((asset) => !asset.protocol.isTestnet);
- for (final asset in validActivatedAssets) {
- try {
- // Use maybeFiatPrice to avoid errors for assets not tracked by CEX
- final fiatPrice = await _kdfSdk.marketData.maybeFiatPrice(asset.id);
- if (fiatPrice != null) {
- // Use configSymbol to lookup for backwards compatibility with the old,
- // string-based price list (and fallback)
- Decimal? change24h;
- try {
- change24h = await _kdfSdk.marketData.priceChange24h(asset.id);
- } catch (e) {
- _log.warning('Failed to get 24h change for ${asset.id.id}: $e');
- // Continue without 24h change data
- }
-
- _pricesCache[asset.id.symbol.configSymbol] = CexPrice(
- ticker: asset.id.id,
- price: fiatPrice.toDouble(),
- lastUpdated: DateTime.now(),
- change24h: change24h?.toDouble(),
- );
- }
- } catch (e) {
- _log.warning('Failed to get price for ${asset.id.id}: $e');
- }
- }
-
- // Still use the backup methods for other coins or if SDK fails
- final Map? fallbackPrices =
- await _updateFromMain() ?? await _updateFromFallback();
-
- if (fallbackPrices != null) {
- // Merge fallback prices with SDK prices (don't overwrite SDK prices)
- fallbackPrices.forEach((key, value) {
- if (!_pricesCache.containsKey(key)) {
- _pricesCache[key] = value;
+ // Try to use the SDK's price manager to get prices for active coins
+ final activatedAssets = await _kdfSdk.assets.getActivatedAssets();
+ // Filter out excluded and testnet assets, as they are not expected
+ // to have valid prices available at any of the providers
+ final validActivatedAssets = activatedAssets
+ .where((asset) => !excludedAssetList.contains(asset.id.id))
+ .where((asset) => !asset.protocol.isTestnet);
+ for (final asset in validActivatedAssets) {
+ try {
+ // Use maybeFiatPrice to avoid errors for assets not tracked by CEX
+ final fiatPrice = await _kdfSdk.marketData.maybeFiatPrice(asset.id);
+ if (fiatPrice != null) {
+ // Use configSymbol to lookup for backwards compatibility with the old,
+ // string-based price list (and fallback)
+ Decimal? change24h;
+ try {
+ change24h = await _kdfSdk.marketData.priceChange24h(asset.id);
+ } catch (e) {
+ _log.warning('Failed to get 24h change for ${asset.id.id}: $e');
+ // Continue without 24h change data
}
- });
- }
- } catch (e, s) {
- _log.shout('Error refreshing prices from SDK', e, s);
- // Fallback to the existing methods
- final Map? prices =
- await _updateFromMain() ?? await _updateFromFallback();
-
- if (prices != null) {
- _pricesCache = prices;
+ _pricesCache[asset.id.symbol.configSymbol] = CexPrice(
+ assetId: asset.id,
+ price: fiatPrice,
+ lastUpdated: DateTime.now(),
+ change24h: change24h,
+ );
+ }
+ } catch (e) {
+ _log.warning('Failed to get price for ${asset.id.id}: $e');
}
}
return _pricesCache;
}
- Future?> _updateFromMain() async {
- http.Response res;
- String body;
- try {
- res = await http.get(pricesUrlV3);
- body = res.body;
- } catch (e, s) {
- _log.shout('Error updating price from main: $e', e, s);
- return null;
- }
-
- Map? json;
- try {
- json = jsonDecode(body) as Map;
- } catch (e, s) {
- _log.shout('Error parsing of update price from main response', e, s);
- }
-
- if (json == null) return null;
- final Map prices = {};
- json.forEach((String priceTicker, dynamic pricesData) {
- final pricesJson = pricesData as Map? ?? {};
- prices[priceTicker] = CexPrice(
- ticker: priceTicker,
- price: double.tryParse(pricesJson['last_price'] as String? ?? '') ?? 0,
- lastUpdated: DateTime.fromMillisecondsSinceEpoch(
- (pricesJson['last_updated_timestamp'] as int? ?? 0) * 1000,
- ),
- priceProvider: cexDataProvider(
- pricesJson['price_provider'] as String? ?? '',
- ),
- change24h: double.tryParse(pricesJson['change_24h'] as String? ?? ''),
- changeProvider: cexDataProvider(
- pricesJson['change_24h_provider'] as String? ?? '',
- ),
- volume24h: double.tryParse(pricesJson['volume24h'] as String? ?? ''),
- volumeProvider: cexDataProvider(
- pricesJson['volume_provider'] as String? ?? '',
- ),
- );
- });
- return prices;
- }
-
- Future?> _updateFromFallback() async {
- final List ids =
- (await _kdfSdk.assets.getActivatedAssets())
- .map((c) => c.id.symbol.coinGeckoId ?? '')
- .toList()
- ..removeWhere((id) => id.isEmpty);
- final Uri fallbackUri = Uri.parse(
- 'https://api.coingecko.com/api/v3/simple/price?ids='
- '${ids.join(',')}&vs_currencies=usd',
- );
-
- http.Response res;
- String body;
- try {
- res = await http.get(fallbackUri);
- body = res.body;
- } catch (e, s) {
- _log.shout('Error updating price from fallback', e, s);
- return null;
- }
-
- Map? json;
- try {
- json = jsonDecode(body) as Map?;
- } catch (e, s) {
- _log.shout('Error parsing of update price from fallback response', e, s);
- }
-
- if (json == null) return null;
- final Map prices = {};
-
- for (final MapEntry entry in json.entries) {
- final coingeckoId = entry.key;
- final pricesData = entry.value as Map? ?? {};
- if (coingeckoId == 'test-coin') continue;
-
- // Coins with the same coingeckoId supposedly have same usd price
- // (e.g. KMD == KMD-BEP20)
- final Iterable samePriceCoins = getKnownCoins().where(
- (coin) => coin.coingeckoId == coingeckoId,
- );
-
- for (final Coin coin in samePriceCoins) {
- prices[coin.id.symbol.configSymbol] = CexPrice(
- ticker: coin.id.id,
- price: double.parse(pricesData['usd'].toString()),
- );
- }
- }
-
- return prices;
- }
-
- // updateTrezorBalances removed (TrezorRepo deleted)
-
/// Updates balances for active coins by querying the SDK
/// Yields coins that have balance changes
Stream updateIguanaBalances(Map walletCoins) async* {
diff --git a/lib/bloc/coins_bloc/coins_state.dart b/lib/bloc/coins_bloc/coins_state.dart
index 1e30bbc5fe..4037ac451d 100644
--- a/lib/bloc/coins_bloc/coins_state.dart
+++ b/lib/bloc/coins_bloc/coins_state.dart
@@ -70,7 +70,7 @@ class CoinsState extends Equatable {
/// Gets the 24h price change percentage for a given asset ID
double? get24hChangeForAsset(AssetId assetId) {
- return getPriceForAsset(assetId)?.change24h;
+ return getPriceForAsset(assetId)?.change24h?.toDouble();
}
/// Calculates the USD price for a given amount of a coin
@@ -90,7 +90,7 @@ class CoinsState extends Equatable {
final Coin? coin = coins[coinAbbr];
final double? parsedAmount = double.tryParse(amount);
final CexPrice? cexPrice = prices[coinAbbr.toUpperCase()];
- final double? usdPrice = cexPrice?.price;
+ final double? usdPrice = cexPrice?.price?.toDouble();
if (coin == null || usdPrice == null || parsedAmount == null) {
return null;
diff --git a/lib/bloc/fiat/fiat_onramp_form/fiat_form_bloc.dart b/lib/bloc/fiat/fiat_onramp_form/fiat_form_bloc.dart
index a7882f1eb6..979b0012a9 100644
--- a/lib/bloc/fiat/fiat_onramp_form/fiat_form_bloc.dart
+++ b/lib/bloc/fiat/fiat_onramp_form/fiat_form_bloc.dart
@@ -8,7 +8,7 @@ import 'package:decimal/decimal.dart';
import 'package:equatable/equatable.dart';
import 'package:flutter/foundation.dart';
import 'package:formz/formz.dart';
-import 'package:komodo_defi_sdk/komodo_defi_sdk.dart';
+import 'package:komodo_defi_sdk/komodo_defi_sdk.dart' show KomodoDefiSdk;
import 'package:komodo_defi_types/komodo_defi_type_utils.dart'
show ConstantBackoff, retry;
import 'package:komodo_defi_types/komodo_defi_types.dart';
@@ -34,11 +34,11 @@ class FiatFormBloc extends Bloc {
required KomodoDefiSdk sdk,
int pubkeysMaxRetryAttempts = 20,
Duration pubkeysRetryDelay = const Duration(milliseconds: 500),
- }) : _fiatRepository = repository,
- _sdk = sdk,
- _pubkeysMaxRetryAttempts = pubkeysMaxRetryAttempts,
- _pubkeysRetryDelay = pubkeysRetryDelay,
- super(FiatFormState.initial()) {
+ }) : _fiatRepository = repository,
+ _sdk = sdk,
+ _pubkeysMaxRetryAttempts = pubkeysMaxRetryAttempts,
+ _pubkeysRetryDelay = pubkeysRetryDelay,
+ super(FiatFormState.initial()) {
on(_onFiatSelected);
// Use restartable here since this is called for auth changes, which
// can happen frequently and we want to avoid race conditions.
@@ -187,8 +187,9 @@ class FiatFormBloc extends Bloc {
walletAddress: state.selectedAssetAddress!.address,
paymentMethod: state.selectedPaymentMethod,
sourceAmount: state.fiatAmount.value,
- returnUrlOnSuccess:
- BaseFiatProvider.successUrl(state.selectedAssetAddress!.address),
+ returnUrlOnSuccess: BaseFiatProvider.successUrl(
+ state.selectedAssetAddress!.address,
+ ),
);
if (!newOrder.error.isNone) {
@@ -199,11 +200,7 @@ class FiatFormBloc extends Bloc {
var checkoutUrl = newOrder.checkoutUrl as String? ?? '';
if (checkoutUrl.isEmpty) {
_log.severe('Invalid checkout URL received.');
- return emit(
- state.copyWith(
- fiatOrderStatus: FiatOrderStatus.failed,
- ),
- );
+ return emit(state.copyWith(fiatOrderStatus: FiatOrderStatus.failed));
}
// Only Ramp on web requires the intermediate html page to satisfy cors
@@ -223,12 +220,7 @@ class FiatFormBloc extends Bloc {
);
} catch (e, s) {
_log.shout('Error submitting fiat form', e, s);
- emit(
- state.copyWith(
- status: FiatFormStatus.failure,
- checkoutUrl: '',
- ),
- );
+ emit(state.copyWith(status: FiatFormStatus.failure, checkoutUrl: ''));
}
}
@@ -320,17 +312,10 @@ class FiatFormBloc extends Bloc {
FiatFormCoinAddressSelected event,
Emitter emit,
) {
- emit(
- state.copyWith(
- selectedAssetAddress: () => event.address,
- ),
- );
+ emit(state.copyWith(selectedAssetAddress: () => event.address));
}
- void _onModeUpdated(
- FiatFormModeUpdated event,
- Emitter emit,
- ) {
+ void _onModeUpdated(FiatFormModeUpdated event, Emitter emit) {
emit(state.copyWith(fiatMode: event.mode));
}
@@ -341,8 +326,9 @@ class FiatFormBloc extends Bloc {
try {
final fiatList = await _fiatRepository.getFiatList();
final coinList = await _fiatRepository.getCoinList();
- coinList
- .removeWhere((coin) => excludedAssetList.contains(coin.getAbbr()));
+ coinList.removeWhere(
+ (coin) => excludedAssetList.contains(coin.getAbbr()),
+ );
emit(state.copyWith(fiatList: fiatList, coinList: coinList));
} catch (e, s) {
_log.shout('Error loading currency list', e, s);
@@ -548,10 +534,7 @@ class FiatFormBloc extends Bloc {
);
} catch (e, s) {
_log.shout('Error updating payment methods', e, s);
- return state.copyWith(
- paymentMethods: [],
- providerError: () => null,
- );
+ return state.copyWith(paymentMethods: [], providerError: () => null);
}
}
diff --git a/lib/bloc/market_maker_bot/market_maker_order_list/market_maker_bot_order_list_repository.dart b/lib/bloc/market_maker_bot/market_maker_order_list/market_maker_bot_order_list_repository.dart
index 586185b44a..728df249c3 100644
--- a/lib/bloc/market_maker_bot/market_maker_order_list/market_maker_bot_order_list_repository.dart
+++ b/lib/bloc/market_maker_bot/market_maker_order_list/market_maker_bot_order_list_repository.dart
@@ -44,8 +44,9 @@ class MarketMakerBotOrderListRepository {
Future> getTradePairs() async {
final settings = await _settingsRepository.loadSettings();
final configs = settings.marketMakerBotSettings.tradeCoinPairConfigs;
- final makerOrders = (await _ordersService.getOrders())
- ?.where((order) => order.orderType == TradeSide.maker);
+ final makerOrders = (await _ordersService.getOrders())?.where(
+ (order) => order.orderType == TradeSide.maker,
+ );
final tradePairs = configs.map((TradeCoinPairConfig config) {
final order = makerOrders
@@ -87,7 +88,7 @@ class MarketMakerBotOrderListRepository {
final baseCoinBalance = baseCoin == null
? Decimal.zero
: _coinsRepository.lastKnownBalance(baseCoin.id)?.spendable ??
- Decimal.zero;
+ Decimal.zero;
return baseCoinBalance.toRational() *
Rational.parse(baseCoinBalance.toString());
}
@@ -97,19 +98,24 @@ class MarketMakerBotOrderListRepository {
TradeCoinPairConfig config,
MyOrder? order,
) {
- final double? baseUsdPrice =
- _coinsRepository.getCoin(config.baseCoinId)?.usdPrice?.price;
- final double? relUsdPrice =
- _coinsRepository.getCoin(config.relCoinId)?.usdPrice?.price;
+ final Decimal? baseUsdPrice = _coinsRepository
+ .getCoin(config.baseCoinId)
+ ?.usdPrice
+ ?.price;
+ final Decimal? relUsdPrice = _coinsRepository
+ .getCoin(config.relCoinId)
+ ?.usdPrice
+ ?.price;
final price = relUsdPrice != null && baseUsdPrice != null
? baseUsdPrice / relUsdPrice
: null;
Rational relAmount = Rational.zero;
if (price != null) {
- final double priceWithMargin = price * (1 + (config.margin / 100));
- final double amount = baseCoinAmount.toDouble() * priceWithMargin;
- return Rational.parse(amount.toString());
+ final Rational marginFraction =
+ Decimal.parse(config.margin.toString()) / Decimal.fromInt(100);
+ final Rational priceWithMargin = price * (Rational.one + marginFraction);
+ return baseCoinAmount * priceWithMargin;
}
return relAmount;
diff --git a/lib/bloc/market_maker_bot/market_maker_trade_form/market_maker_trade_form_state.dart b/lib/bloc/market_maker_bot/market_maker_trade_form/market_maker_trade_form_state.dart
index 72233b3d56..1c8e632cc9 100644
--- a/lib/bloc/market_maker_bot/market_maker_trade_form/market_maker_trade_form_state.dart
+++ b/lib/bloc/market_maker_bot/market_maker_trade_form/market_maker_trade_form_state.dart
@@ -97,7 +97,7 @@ class MarketMakerTradeFormState extends Equatable with FormzMixin {
? baseUsdPrice / relUsdPrice
: null;
- return price;
+ return price?.toDouble();
}
/// The price of the trade pair derived from the USD price of the coins
diff --git a/lib/bloc/nft_transactions/nft_txn_repository.dart b/lib/bloc/nft_transactions/nft_txn_repository.dart
index f8641cfda5..847bacee3b 100644
--- a/lib/bloc/nft_transactions/nft_txn_repository.dart
+++ b/lib/bloc/nft_transactions/nft_txn_repository.dart
@@ -99,7 +99,7 @@ class NftTxnRepository {
final coins = _coinsRepo.getKnownCoins();
for (final abbr in coinAbbr) {
final coin = coins.firstWhere((c) => c.abbr == abbr);
- _abbrToUsdPrices[abbr] = coin.usdPrice?.price;
+ _abbrToUsdPrices[abbr] = coin.usdPrice?.price?.toDouble();
}
}
}
diff --git a/lib/bloc/version_info/version_info_bloc.dart b/lib/bloc/version_info/version_info_bloc.dart
new file mode 100644
index 0000000000..41f7cb7842
--- /dev/null
+++ b/lib/bloc/version_info/version_info_bloc.dart
@@ -0,0 +1,182 @@
+import 'dart:async';
+
+import 'package:equatable/equatable.dart';
+import 'package:flutter/foundation.dart' show ValueGetter;
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:komodo_defi_sdk/komodo_defi_sdk.dart';
+import 'package:logging/logging.dart';
+import 'package:web_dex/app_config/package_information.dart';
+import 'package:web_dex/mm2/mm2_api/mm2_api.dart';
+
+part 'version_info_event.dart';
+part 'version_info_state.dart';
+
+class VersionInfoBloc extends Bloc {
+ VersionInfoBloc({
+ required Mm2Api mm2Api,
+ required KomodoDefiSdk komodoDefiSdk,
+ Duration? pollInterval,
+ }) : _mm2Api = mm2Api,
+ _komodoDefiSdk = komodoDefiSdk,
+ _pollInterval = pollInterval ?? const Duration(minutes: 5),
+ super(const VersionInfoInitial()) {
+ on(_onLoadVersionInfo);
+ on(_onStartPeriodicPolling);
+ on(_onStopPeriodicPolling);
+ on(_onPollVersionInfo);
+ }
+
+ final Mm2Api _mm2Api;
+ final KomodoDefiSdk _komodoDefiSdk;
+ final Duration _pollInterval;
+ Timer? _pollTimer;
+ static final Logger _logger = Logger('VersionInfoBloc');
+
+ Future _onLoadVersionInfo(
+ LoadVersionInfo event,
+ Emitter emit,
+ ) async {
+ emit(const VersionInfoLoading());
+
+ final appVersion = packageInformation.packageVersion;
+ final commitHash = packageInformation.commitHash != null
+ ? _tryParseCommitHash(packageInformation.commitHash!)
+ : null;
+
+ _logger.info(
+ 'Basic app info retrieved - Version: $appVersion, '
+ 'Commit: $commitHash',
+ );
+
+ final basicInfo = VersionInfoLoaded(
+ appVersion: appVersion,
+ commitHash: commitHash,
+ );
+ emit(basicInfo);
+
+ try {
+ final apiVersion = await _mm2Api.version();
+ if (apiVersion == null) {
+ _logger.severe('Failed to load MM2 API version');
+ }
+
+ final apiCommitHash = apiVersion != null
+ ? () => _tryParseCommitHash(apiVersion)
+ : null;
+ emit(basicInfo.copyWith(apiCommitHash: apiCommitHash));
+ _logger.info(
+ 'MM2 API version loaded successfully - Version: $apiVersion, '
+ 'Commit: $apiCommitHash',
+ );
+ } catch (e, s) {
+ _logger.severe('Failed to load MM2 API version', e, s);
+ // Continue without API version if it fails
+ }
+
+ try {
+ final currentCommit = await _komodoDefiSdk.assets.currentCoinsCommit;
+ final latestCommit = await _komodoDefiSdk.assets.latestCoinsCommit;
+ if (currentCommit == null || latestCommit == null) {
+ _logger.severe(
+ 'Failed to load SDK coins commits. '
+ 'Current commit: $currentCommit, latest commit: $latestCommit',
+ );
+ }
+
+ emit(
+ basicInfo.copyWith(
+ currentCoinsCommit: () => _tryParseCommitHash(currentCommit ?? '-'),
+ latestCoinsCommit: () => _tryParseCommitHash(latestCommit ?? '-'),
+ ),
+ );
+ _logger.info(
+ 'SDK coins commits loaded successfully - Current: $currentCommit, '
+ 'Latest: $latestCommit',
+ );
+ } catch (e, s) {
+ _logger.severe('Failed to load SDK coins commits', e, s);
+ // Continue without SDK commits if it fails
+ }
+ }
+
+ Future _onStartPeriodicPolling(
+ StartPeriodicPolling event,
+ Emitter emit,
+ ) async {
+ _logger.info('Starting periodic polling for version updates');
+
+ _pollTimer?.cancel();
+ _pollTimer = Timer.periodic(_pollInterval, (_) {
+ add(const PollVersionInfo());
+ });
+ }
+
+ Future _onStopPeriodicPolling(
+ StopPeriodicPolling event,
+ Emitter emit,
+ ) async {
+ _logger.info('Stopping periodic polling for version updates');
+ _pollTimer?.cancel();
+ _pollTimer = null;
+ }
+
+ @override
+ Future close() async {
+ _pollTimer?.cancel();
+ return super.close();
+ }
+
+ Future _onPollVersionInfo(
+ PollVersionInfo event,
+ Emitter emit,
+ ) async {
+ try {
+ _logger.fine('Polling for latest commit hash update');
+ final latestCommit = await _komodoDefiSdk.assets.latestCoinsCommit;
+ final currentCommit = await _komodoDefiSdk.assets.currentCoinsCommit;
+ if (latestCommit == null || currentCommit == null) {
+ _logger.severe(
+ 'Failed to poll commit hash updates. '
+ 'Latest commit: $latestCommit, current commit: $currentCommit',
+ );
+ return;
+ }
+
+ final parsedLatest = _tryParseCommitHash(latestCommit);
+ final parsedCurrent = _tryParseCommitHash(currentCommit);
+
+ if (state is VersionInfoLoaded) {
+ final currentState = state as VersionInfoLoaded;
+ if (currentState.latestCoinsCommit != parsedLatest ||
+ currentState.currentCoinsCommit != parsedCurrent) {
+ _logger.info(
+ 'Commit hash update detected - Current: $parsedCurrent, Latest: $parsedLatest',
+ );
+ emit(
+ currentState.copyWith(
+ currentCoinsCommit: () => parsedCurrent,
+ latestCoinsCommit: () => parsedLatest,
+ ),
+ );
+ }
+ }
+ } catch (e, s) {
+ _logger.severe('Failed to poll commit hash updates', e, s);
+ }
+ }
+
+ /// Returns the first 7 characters of the commit hash,
+ /// or the unmodified [commitHash] if it is not valid.
+ String _tryParseCommitHash(String commitHash) {
+ final RegExp regExp = RegExp(r'[0-9a-fA-F]{7,40}');
+ final Match? match = regExp.firstMatch(commitHash);
+
+ if (match == null || match.group(0) == null) {
+ _logger.fine('No valid commit hash pattern found in: $commitHash');
+ return commitHash;
+ }
+
+ // '!' is safe because we know that match.group(0) is not null
+ return match.group(0)!.substring(0, 7);
+ }
+}
diff --git a/lib/bloc/version_info/version_info_event.dart b/lib/bloc/version_info/version_info_event.dart
new file mode 100644
index 0000000000..6607436987
--- /dev/null
+++ b/lib/bloc/version_info/version_info_event.dart
@@ -0,0 +1,21 @@
+part of 'version_info_bloc.dart';
+
+abstract class VersionInfoEvent {
+ const VersionInfoEvent();
+}
+
+class LoadVersionInfo extends VersionInfoEvent {
+ const LoadVersionInfo();
+}
+
+class StartPeriodicPolling extends VersionInfoEvent {
+ const StartPeriodicPolling();
+}
+
+class StopPeriodicPolling extends VersionInfoEvent {
+ const StopPeriodicPolling();
+}
+
+class PollVersionInfo extends VersionInfoEvent {
+ const PollVersionInfo();
+}
diff --git a/lib/bloc/version_info/version_info_state.dart b/lib/bloc/version_info/version_info_state.dart
new file mode 100644
index 0000000000..adfe964e7c
--- /dev/null
+++ b/lib/bloc/version_info/version_info_state.dart
@@ -0,0 +1,69 @@
+part of 'version_info_bloc.dart';
+
+abstract class VersionInfoState extends Equatable {
+ const VersionInfoState();
+}
+
+class VersionInfoInitial extends VersionInfoState {
+ const VersionInfoInitial();
+
+ @override
+ List get props => [];
+}
+
+class VersionInfoLoading extends VersionInfoState {
+ const VersionInfoLoading();
+
+ @override
+ List get props => [];
+}
+
+class VersionInfoLoaded extends VersionInfoState {
+ const VersionInfoLoaded({
+ required this.appVersion,
+ required this.commitHash,
+ this.apiCommitHash,
+ this.currentCoinsCommit,
+ this.latestCoinsCommit,
+ });
+
+ final String? appVersion;
+ final String? commitHash;
+ final String? apiCommitHash;
+ final String? currentCoinsCommit;
+ final String? latestCoinsCommit;
+
+ VersionInfoLoaded copyWith({
+ ValueGetter? appVersion,
+ ValueGetter? commitHash,
+ ValueGetter? apiCommitHash,
+ ValueGetter? currentCoinsCommit,
+ ValueGetter? latestCoinsCommit,
+ }) {
+ return VersionInfoLoaded(
+ appVersion: appVersion?.call() ?? this.appVersion,
+ commitHash: commitHash?.call() ?? this.commitHash,
+ apiCommitHash: apiCommitHash?.call() ?? this.apiCommitHash,
+ currentCoinsCommit: currentCoinsCommit?.call() ?? this.currentCoinsCommit,
+ latestCoinsCommit: latestCoinsCommit?.call() ?? this.latestCoinsCommit,
+ );
+ }
+
+ @override
+ List get props => [
+ appVersion,
+ commitHash,
+ apiCommitHash,
+ currentCoinsCommit,
+ latestCoinsCommit,
+ ];
+}
+
+class VersionInfoError extends VersionInfoState {
+ const VersionInfoError(this.message);
+
+ final String message;
+
+ @override
+ List get props => [message];
+}
diff --git a/lib/main.dart b/lib/main.dart
index 3c7e1e6e81..d103a0bab8 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -81,6 +81,9 @@ Future main() async {
RepositoryProvider(create: (_) => mm2Api),
RepositoryProvider(create: (_) => coinsRepo),
RepositoryProvider(create: (_) => walletsRepository),
+ // TODO: Refactor in SDK to avoid use of this global variable.
+ // This is necessary for now for CoinSparkline.
+ RepositoryProvider(create: (_) => sparklineRepository),
],
child: const MyApp(),
),
diff --git a/lib/model/cex_price.dart b/lib/model/cex_price.dart
index be9f247628..bbf5d0d977 100644
--- a/lib/model/cex_price.dart
+++ b/lib/model/cex_price.dart
@@ -1,12 +1,56 @@
+import 'package:decimal/decimal.dart';
+import 'package:equatable/equatable.dart' show Equatable;
+import 'package:flutter/foundation.dart' show ValueGetter;
import 'package:komodo_cex_market_data/komodo_cex_market_data.dart'
as sdk_types;
+import 'package:komodo_defi_types/komodo_defi_types.dart' show AssetId;
typedef CexDataProvider = sdk_types.CexDataProvider;
CexDataProvider cexDataProvider(String string) {
return CexDataProvider.values.firstWhere(
- (e) => e.toString().split('.').last == string,
- orElse: () => CexDataProvider.unknown);
+ (e) => e.toString().split('.').last == string,
+ orElse: () => CexDataProvider.unknown,
+ );
}
-typedef CexPrice = sdk_types.CexPrice;
+@Deprecated(
+ 'Use the KomodoDefiSdk.marketData interface instead. '
+ 'This class will be removed in the future, and is only being kept during '
+ 'the transition to the new SDK.',
+)
+/// A temporary class to hold the price and change24h for a coin in a structure
+/// similar to the one used in the legacy coins bloc during the transition to
+/// to the SDK.
+class CexPrice extends Equatable {
+ const CexPrice({
+ required this.assetId,
+ required this.price,
+ required this.change24h,
+ required this.lastUpdated,
+ });
+
+ final AssetId assetId;
+ final Decimal? price;
+ final Decimal? change24h;
+ final DateTime lastUpdated;
+
+ @override
+ List get props => [assetId, price, change24h, lastUpdated];
+
+ CexPrice copyWith({
+ ValueGetter? price,
+ ValueGetter? change24h,
+ DateTime? lastUpdated,
+ }) {
+ return CexPrice(
+ assetId: assetId,
+ price: price?.call() ?? this.price,
+ change24h: change24h?.call() ?? this.change24h,
+ lastUpdated: lastUpdated ?? this.lastUpdated,
+ );
+ }
+
+ // Intentionally excluding to/from JSON methods since this class should not be
+ // used outside of the legacy coins bloc, especially not for serialization.
+}
diff --git a/lib/shared/utils/balances_formatter.dart b/lib/shared/utils/balances_formatter.dart
index 479187c4c6..9b088d011e 100644
--- a/lib/shared/utils/balances_formatter.dart
+++ b/lib/shared/utils/balances_formatter.dart
@@ -1,3 +1,4 @@
+import 'package:decimal/decimal.dart';
import 'package:rational/rational.dart';
import 'package:web_dex/model/coin.dart';
@@ -28,7 +29,6 @@ import 'package:web_dex/model/coin.dart';
/// ```
/// unit tests: [get_fiat_amount_tests]
double getFiatAmount(Coin coin, Rational amount) {
- final double usdPrice = coin.usdPrice?.price ?? 0.00;
- final Rational usdPriceRational = Rational.parse(usdPrice.toString());
- return (amount * usdPriceRational).toDouble();
+ final Decimal usdPrice = coin.usdPrice?.price ?? Decimal.zero;
+ return (amount * usdPrice.toRational()).toDouble();
}
diff --git a/lib/shared/utils/extensions/sdk_extensions.dart b/lib/shared/utils/extensions/sdk_extensions.dart
index bedfb05dd6..72b871d8bb 100644
--- a/lib/shared/utils/extensions/sdk_extensions.dart
+++ b/lib/shared/utils/extensions/sdk_extensions.dart
@@ -20,8 +20,10 @@ extension SdkBalances on Asset {
return sdk.balances.getBalance(id);
}
- Stream watchBalance(KomodoDefiSdk sdk,
- {bool activateIfNeeded = true}) {
+ Stream watchBalance(
+ KomodoDefiSdk sdk, {
+ bool activateIfNeeded = true,
+ }) {
return sdk.balances.watchBalance(id, activateIfNeeded: activateIfNeeded);
}
}
@@ -31,14 +33,13 @@ extension SdkPrices on Asset {
Future getFiatPrice(
KomodoDefiSdk sdk, {
DateTime? priceDate,
- String fiatCurrency = 'usdt',
+ QuoteCurrency quoteCurrency = Stablecoin.usdt,
}) async {
return (await sdk.marketData.maybeFiatPrice(
id,
priceDate: priceDate,
- fiatCurrency: fiatCurrency,
- ))
- ?.toDouble();
+ quoteCurrency: quoteCurrency,
+ ))?.toDouble();
}
// /// Gets historical fiat prices for specified dates
@@ -57,10 +58,10 @@ extension SdkPrices on Asset {
/// Watches for price updates and maintains the cache
Stream watchFiatPrice(
KomodoDefiSdk sdk, {
- String fiatCurrency = 'usdt',
+ QuoteCurrency quoteCurrency = Stablecoin.usdt,
}) async* {
while (true) {
- final price = await getFiatPrice(sdk, fiatCurrency: fiatCurrency);
+ final price = await getFiatPrice(sdk, quoteCurrency: quoteCurrency);
yield price;
await Future.delayed(const Duration(minutes: 1));
}
diff --git a/lib/views/dex/dex_helpers.dart b/lib/views/dex/dex_helpers.dart
index 20fbc527d5..a0bb7c2b83 100644
--- a/lib/views/dex/dex_helpers.dart
+++ b/lib/views/dex/dex_helpers.dart
@@ -1,3 +1,4 @@
+import 'package:decimal/decimal.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -22,16 +23,17 @@ class FiatAmount extends StatelessWidget {
final TextStyle? style;
const FiatAmount({
- Key? key,
+ super.key,
required this.coin,
required this.amount,
this.style,
- }) : super(key: key);
+ });
@override
Widget build(BuildContext context) {
- final TextStyle? textStyle =
- Theme.of(context).textTheme.bodySmall?.merge(style);
+ final TextStyle? textStyle = Theme.of(
+ context,
+ ).textTheme.bodySmall?.merge(style);
return Text(
getFormattedFiatAmount(context, coin.abbr, amount),
@@ -53,7 +55,9 @@ String getFormattedFiatAmount(
}
List applyFiltersForSwap(
- List swaps, TradingEntitiesFilter entitiesFilterData) {
+ List swaps,
+ TradingEntitiesFilter entitiesFilterData,
+) {
return swaps.where((swap) {
final String? sellCoin = entitiesFilterData.sellCoin;
final String? buyCoin = entitiesFilterData.buyCoin;
@@ -93,7 +97,9 @@ List applyFiltersForSwap(
}
List applyFiltersForOrders(
- List orders, TradingEntitiesFilter entitiesFilterData) {
+ List orders,
+ TradingEntitiesFilter entitiesFilterData,
+) {
return orders.where((order) {
final String? sellCoin = entitiesFilterData.sellCoin;
final String? buyCoin = entitiesFilterData.buyCoin;
@@ -118,7 +124,9 @@ List applyFiltersForOrders(
}
Map> getCoinAbbrMapFromOrderList(
- List list, bool isSellCoin) {
+ List list,
+ bool isSellCoin,
+) {
final Map> coinAbbrMap = isSellCoin
? list.fold>>({}, (previousValue, element) {
final List coinAbbrList = previousValue[element.base] ?? [];
@@ -136,7 +144,9 @@ Map> getCoinAbbrMapFromOrderList(
}
Map> getCoinAbbrMapFromSwapList(
- List list, bool isSellCoin) {
+ List list,
+ bool isSellCoin,
+) {
final Map