feat: store token list localdb (#1498)

Co-authored-by: Kirill Bubochkin <[email protected]> Co-authored-by: Justin Enerio <[email protected]> Co-authored-by: Vlad Sumin <[email protected]>
espresso-cash · Sep 12, 2024 · 6be502c · 6be502c
1 parent 9ec55e8
commit 6be502c
Show file tree

Hide file tree

Showing 35 changed files with 790 additions and 471 deletions.
diff --git a/packages/espressocash_app/Makefile b/packages/espressocash_app/Makefile
@@ -10,7 +10,7 @@ splash:
 	dart run flutter_native_splash:create
 
 update_tokens:
-	dart run tool/update_token_list.dart
+	dart run tool/update_tokens.dart
 
 flutter_test:
 	dart run $(DART_TEST_DEFINITIONS) tool/tests_setup.dart

diff --git a/packages/espressocash_app/assets/tokens/tokens.csv.gz b/packages/espressocash_app/assets/tokens/tokens.csv.gz
diff --git a/packages/espressocash_app/lib/data/db/db.dart b/packages/espressocash_app/lib/data/db/db.dart
@@ -24,7 +24,7 @@ class OutgoingTransferRows extends Table {
   Set<Column<Object>> get primaryKey => {id};
 }
 
-const int latestVersion = 57;
+const int latestVersion = 58;
 
 const _tables = [
   OutgoingTransferRows,
@@ -39,6 +39,7 @@ const _tables = [
   TransactionRequestRows,
   TokenBalanceRows,
   ConversionRatesRows,
+  TokenRows,
 ];
 
 @lazySingleton
@@ -128,7 +129,6 @@ class MyDatabase extends _$MyDatabase {
             await m.addColumn(onRampOrderRows, onRampOrderRows.referenceNumber);
             await m.addColumn(onRampOrderRows, onRampOrderRows.feeAmount);
           }
-
           if (from >= 40 && from < 54) {
             await m.addColumn(offRampOrderRows, offRampOrderRows.authToken);
             await m.addColumn(offRampOrderRows, offRampOrderRows.moreInfoUrl);
@@ -161,6 +161,9 @@ class MyDatabase extends _$MyDatabase {
           if (from < 57) {
             await m.addColumn(onRampOrderRows, onRampOrderRows.bridgeAmount);
           }
+          if (from < 58) {
+            await m.createTable(tokenRows);
+          }
         },
       );
 }
@@ -329,3 +332,18 @@ class ConversionRatesRows extends Table {
   @override
   Set<Column<Object>> get primaryKey => {token, fiatCurrency};
 }
+
+class TokenRows extends Table {
+  const TokenRows();
+
+  IntColumn get chainId => integer()();
+  TextColumn get address => text()();
+  TextColumn get symbol => text()();
+  TextColumn get name => text()();
+  IntColumn get decimals => integer()();
+  TextColumn get logoURI => text().nullable()();
+  BoolColumn get isStablecoin => boolean()();
+
+  @override
+  Set<Column> get primaryKey => {chainId, address};
+}
diff --git a/packages/espressocash_app/lib/di.dart b/packages/espressocash_app/lib/di.dart
@@ -8,7 +8,6 @@ import 'package:solana/solana.dart';
 
 import 'config.dart';
 import 'di.config.dart';
-import 'features/tokens/token_list.dart';
 
 final sl = GetIt.instance;
 
@@ -28,9 +27,6 @@ abstract class AppModule {
   @lazySingleton
   Dio get dio => Dio();
 
-  @lazySingleton
-  TokenList get tokenList => TokenList();
-
   @lazySingleton
   SolanaClient get solanaClient => SolanaClient(
         rpcUrl: Uri.parse(solanaRpcUrl),

diff --git a/packages/espressocash_app/lib/features/activities/data/activity_builder.dart b/packages/espressocash_app/lib/features/activities/data/activity_builder.dart
@@ -2,7 +2,6 @@ import '../../../data/db/db.dart';
 import '../../outgoing_direct_payments/data/repository.dart';
 import '../../outgoing_dln_payments/data/repository.dart';
 import '../../outgoing_link_payments/data/repository.dart';
-import '../../tokens/token_list.dart';
 import '../../transaction_request/models/transaction_request.dart';
 import '../models/activity.dart';
 
@@ -14,10 +13,10 @@ extension PaymentRequestRowToActivityExt on PaymentRequestRow {
 }
 
 extension ODPRowToActivityExt on ODPRow {
-  Activity toActivity(TokenList tokens) => Activity.outgoingDirectPayment(
+  Future<Activity> toActivity() async => Activity.outgoingDirectPayment(
         id: id,
         created: created,
-        data: toModel(tokens),
+        data: await toModel(),
       );
 }
 
@@ -30,10 +29,10 @@ extension OutgoingDlnPaymentRowToActivityExt on OutgoingDlnPaymentRow {
 }
 
 extension OLPRowToActivityExt on OLPRow {
-  Activity toActivity(TokenList tokens) => Activity.outgoingLinkPayment(
+  Future<Activity> toActivity() async => Activity.outgoingLinkPayment(
         id: id,
         created: created,
-        data: toModel(tokens),
+        data: await toModel(),
       );
 }
 

diff --git a/packages/espressocash_app/lib/features/activities/data/transaction_repository.dart b/packages/espressocash_app/lib/features/activities/data/transaction_repository.dart
@@ -14,18 +14,16 @@ import '../../currency/models/currency.dart';
 import '../../outgoing_direct_payments/data/repository.dart';
 import '../../outgoing_link_payments/data/repository.dart';
 import '../../payment_request/data/repository.dart';
-import '../../tokens/token_list.dart';
 import '../../transaction_request/service/tr_service.dart';
 import '../models/activity.dart';
 import '../models/transaction.dart';
 import 'activity_builder.dart';
 
 @injectable
 class TransactionRepository {
-  const TransactionRepository(this._db, this._tokens);
+  const TransactionRepository(this._db);
 
   final MyDatabase _db;
-  final TokenList _tokens;
 
   Stream<IList<String>> watchAll() {
     final query = _db.select(_db.transactionRows)
@@ -96,13 +94,13 @@ class TransactionRepository {
 
     final odp = _db.oDPRows.findActivityOrNull(
       where: (row) => row.txId.equals(txId),
-      builder: (pr) => pr.toActivity(_tokens),
+      builder: (pr) => pr.toActivity(),
       ignoreWhen: (row) => row.status != ODPStatusDto.success,
     );
 
     final olp = _db.oLPRows.findActivityOrNull(
       where: (row) => row.txId.equals(txId),
-      builder: (pr) => pr.toActivity(_tokens),
+      builder: (pr) => pr.toActivity(),
       ignoreWhen: (row) => const [OLPStatusDto.withdrawn, OLPStatusDto.canceled]
           .contains(row.status)
           .not(),

diff --git a/...ages/espressocash_app/lib/features/activities/services/pending_activities_repository.dart b/...ages/espressocash_app/lib/features/activities/services/pending_activities_repository.dart
@@ -10,7 +10,6 @@ import '../../outgoing_link_payments/data/repository.dart';
 import '../../payment_request/data/repository.dart';
 import '../../ramp/services/off_ramp_order_service.dart';
 import '../../ramp/services/on_ramp_order_service.dart';
-import '../../tokens/token_list.dart';
 import '../../transaction_request/service/tr_service.dart';
 import '../data/activity_builder.dart';
 import '../models/activity.dart';
@@ -19,14 +18,12 @@ import '../models/activity.dart';
 class PendingActivitiesRepository {
   const PendingActivitiesRepository(
     this._db,
-    this._tokens,
     this._onRampOrderService,
     this._offRampOrderService,
     this._trService,
   );
 
   final MyDatabase _db;
-  final TokenList _tokens;
   final OnRampOrderService _onRampOrderService;
   final OffRampOrderService _offRampOrderService;
   final TRService _trService;
@@ -49,10 +46,14 @@ class PendingActivitiesRepository {
 
     final oprStream =
         opr.watch().map((rows) => rows.map((r) => r.toActivity()));
-    final odpStream =
-        odp.watch().map((rows) => rows.map((r) => r.toActivity(_tokens)));
-    final olpStream =
-        olp.watch().map((rows) => rows.map((r) => r.toActivity(_tokens)));
+
+    final odpStream = odp
+        .watch()
+        .asyncMap((rows) async => Future.wait(rows.map((r) => r.toActivity())));
+
+    final olpStream = olp
+        .watch()
+        .asyncMap((rows) async => Future.wait(rows.map((r) => r.toActivity())));
 
     final outgoingDlnStream = outgoingDlnPayment
         .watch()

diff --git a/packages/espressocash_app/lib/features/activities/widgets/payment_request_tile.dart b/packages/espressocash_app/lib/features/activities/widgets/payment_request_tile.dart
@@ -25,37 +25,43 @@ class PaymentRequestTile extends StatefulWidget {
 }
 
 class _PaymentRequestTileState extends State<PaymentRequestTile> {
-  late Stream<PaymentRequest> _stream;
+  late Stream<(PaymentRequest, String)> _stream;
 
   @override
   void initState() {
     super.initState();
-    _stream = watchPaymentRequest(widget.id);
+    _stream = watchPaymentRequest(widget.id).asyncMap((p) async {
+      if (!mounted) return (p, '');
+
+      return (p, await p.formattedAmount(DeviceLocale.localeOf(context)));
+    });
   }
 
   @override
-  Widget build(BuildContext context) => StreamBuilder<PaymentRequest>(
+  Widget build(BuildContext context) => StreamBuilder<(PaymentRequest, String)>(
         stream: _stream,
         builder: (context, snapshot) {
           final data = snapshot.data;
 
-          return data == null
+          return (data == null)
               ? SizedBox.shrink(key: ValueKey(widget.id))
               : CpActivityTile(
                   key: ValueKey(widget.id),
                   title: context.l10n.paymentRequestTitle,
                   icon: Assets.icons.paymentIcon.svg(),
-                  timestamp: context.formatDate(data.created),
-                  incomingAmount:
-                      data.formattedAmount(DeviceLocale.localeOf(context)),
-                  status: switch (data.state) {
+                  timestamp: context.formatDate(data.$1.created),
+                  incomingAmount: data.$2,
+                  status: switch (data.$1.state) {
                     PaymentRequestState.initial =>
                       CpActivityTileStatus.inProgress,
                     PaymentRequestState.completed =>
                       CpActivityTileStatus.success,
                     PaymentRequestState.error => CpActivityTileStatus.failure,
                   },
-                  onTap: () => PaymentRequestScreen.push(context, id: data.id),
+                  onTap: () => PaymentRequestScreen.push(
+                    context,
+                    id: data.$1.id,
+                  ),
                   showIcon: widget.showIcon,
                 );
         },

diff --git a/packages/espressocash_app/lib/features/app_lock/widgets/pin_input_display_widget.dart b/packages/espressocash_app/lib/features/app_lock/widgets/pin_input_display_widget.dart
@@ -52,7 +52,6 @@ class _PinInputDisplayWidgetState extends State<PinInputDisplayWidget> {
           Text(
             message.toUpperCase(),
             style: Theme.of(context).textTheme.titleSmall?.copyWith(
-                  fontFamily: 'Roboto App',
                   fontWeight: FontWeight.w700,
                   fontSize: 17,
                 ),

diff --git a/packages/espressocash_app/lib/features/balances/data/repository.dart b/packages/espressocash_app/lib/features/balances/data/repository.dart
@@ -1,4 +1,5 @@
 import 'package:collection/collection.dart';
+import 'package:dfunc/dfunc.dart';
 import 'package:drift/drift.dart';
 import 'package:fast_immutable_collections/fast_immutable_collections.dart';
 import 'package:injectable/injectable.dart';
@@ -7,15 +8,15 @@ import '../../../data/db/db.dart';
 import '../../accounts/auth_scope.dart';
 import '../../currency/models/amount.dart';
 import '../../currency/models/currency.dart';
+import '../../tokens/data/token_repository.dart';
 import '../../tokens/token.dart';
-import '../../tokens/token_list.dart';
 
 @Singleton(scope: authScope)
 class TokenBalancesRepository {
-  const TokenBalancesRepository(this._db, this._tokens);
+  const TokenBalancesRepository(this._db, this._tokenRepository);
 
   final MyDatabase _db;
-  final TokenList _tokens;
+  final TokenRepository _tokenRepository;
 
   Future<CryptoAmount> read(Token token) async {
     final query = _db.tokenBalanceRows.select()
@@ -36,10 +37,9 @@ class TokenBalancesRepository {
       ..where((tbl) => tbl.amount.isBiggerThanValue(0));
 
     return query.get().then(
-          (rows) => rows
-              .map((row) => _tokens.findTokenByMint(row.token))
-              .whereNotNull()
-              .toISet(),
+          (rows) => Future.wait(
+            rows.map((row) async => _tokenRepository.getToken(row.token)),
+          ).then((tokens) => tokens.whereNotNull().toISet()),
         );
   }
 
@@ -53,11 +53,10 @@ class TokenBalancesRepository {
             tbl.token.isNotIn(ignoreTokens.map((e) => e.address).toList()),
       );
 
-    return query.watch().map(
-          (rows) => rows
-              .map((row) => _tokens.findTokenByMint(row.token))
-              .whereNotNull()
-              .toISet(),
+    return query.watch().asyncMap(
+          (rows) async => Future.wait(
+            rows.map((row) async => _tokenRepository.getToken(row.token)),
+          ).then((tokens) => tokens.whereNotNull().toISet()),
         );
   }
 
@@ -71,25 +70,19 @@ class TokenBalancesRepository {
             tbl.token.isNotIn(ignoreTokens.map((e) => e.address).toList()),
       );
 
-    return query.watch().map(
-          (rows) => rows
-              .map((row) {
-                final token = _tokens.findTokenByMint(row.token);
-
-                if (ignoreTokens.contains(token)) {
-                  return null;
-                }
-
-                return token == null
-                    ? null
-                    : CryptoAmount(
+    return query.watch().asyncMap(
+          (rows) async => Future.wait(
+            rows.map(
+              (row) async => _tokenRepository.getToken(row.token).letAsync(
+                    (token) => token?.let(
+                      (t) => CryptoAmount(
                         value: row.amount,
-                        cryptoCurrency: CryptoCurrency(token: token),
-                      );
-              })
-              .whereNotNull()
-              .sortedBy((element) => element.token.name)
-              .toIList(),
+                        cryptoCurrency: CryptoCurrency(token: t),
+                      ),
+                    ),
+                  ),
+            ),
+          ).then((balances) => balances.whereNotNull().toIList()),
         );
   }