feat: send token

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

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 = 56;
+const int latestVersion = 58;
 
 const _tables = [
   OutgoingTransferRows,
@@ -39,6 +39,7 @@ const _tables = [
   TransactionRequestRows,
   TokenBalanceRows,
   ConversionRatesRows,
+  TokenRows,
 ];
 
 @lazySingleton
@@ -116,19 +117,16 @@ class MyDatabase extends _$MyDatabase {
           if (from < 51) {
             await m.addColumn(transactionRows, transactionRows.amount);
           }
-
           if (from < 52) {
             await m.createTable(tokenBalanceRows);
           }
-
           if (from < 53) {
             await m.addColumn(onRampOrderRows, onRampOrderRows.authToken);
             await m.addColumn(onRampOrderRows, onRampOrderRows.moreInfoUrl);
             await m.addColumn(onRampOrderRows, onRampOrderRows.stellarTxHash);
             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);
@@ -158,6 +156,12 @@ class MyDatabase extends _$MyDatabase {
           if (from < 56) {
             await m.createTable(conversionRatesRows);
           }
+          if (from < 57) {
+            await m.createTable(tokenRows);
+          }
+          if (from < 58) {
+            await m.addColumn(transactionRows, transactionRows.tokenAddress);
+          }
         },
       );
 }
@@ -283,6 +287,7 @@ class TransactionRows extends Table {
 
   TextColumn get id => text()();
   DateTimeColumn get created => dateTime().nullable()();
+  TextColumn get tokenAddress => text()();
   TextColumn get encodedTx => text()();
   IntColumn get status => intEnum<TxCommonStatus>()();
   IntColumn get amount => integer().nullable()();
@@ -325,3 +330,36 @@ 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};
+}
+
+class TagsConverter extends TypeConverter<List<String>, String> {
+  const TagsConverter();
+
+  @override
+  List<String> fromSql(String fromDb) {
+    if (fromDb.isEmpty) return [];
+
+    return fromDb.split(',');
+  }
+
+  @override
+  String toSql(List<String> value) {
+    if (value.isEmpty) return '';
+
+    return value.join(',');
+  }
+}

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),

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(),
       );
 }
 

packages/espressocash_app/lib/features/activities/data/transaction_repository.dart

@@ -1,31 +1,49 @@
 import 'dart:async';
 
+import 'package:async/async.dart';
 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:get_it/get_it.dart';
 import 'package:injectable/injectable.dart';
+import 'package:intl/intl.dart';
 import 'package:rxdart/rxdart.dart';
+import 'package:solana/base58.dart';
+import 'package:solana/dto.dart' hide Transaction;
 import 'package:solana/encoder.dart';
+import 'package:solana/solana.dart';
 
 import '../../../data/db/db.dart';
+import '../../../di.dart';
+import '../../../utils/async_cache.dart';
+import '../../accounts/auth_scope.dart';
+import '../../accounts/models/ec_wallet.dart';
 import '../../currency/models/amount.dart';
 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 '../../tokens/data/token_repository.dart';
+import '../../tokens/token.dart';
 import '../../transaction_request/service/tr_service.dart';
 import '../models/activity.dart';
 import '../models/transaction.dart';
 import 'activity_builder.dart';
 
-@injectable
+part '../services/tx_updater.dart';
+
+@Singleton(scope: authScope)
 class TransactionRepository {
-  const TransactionRepository(this._db, this._tokens);
+  TransactionRepository(this._db, this._client, this._wallet) {
+    update();
+  }
 
+  final SolanaClient _client;
+  final ECWallet _wallet;
   final MyDatabase _db;
-  final TokenList _tokens;
+
+  final AsyncCache<void> _callCache = AsyncCache.ephemeral();
 
   Stream<IList<String>> watchAll() {
     final query = _db.select(_db.transactionRows)
@@ -34,6 +52,38 @@ class TransactionRepository {
     return query.map((row) => row.id).watch().map((event) => event.toIList());
   }
 
+  Stream<IList<String>> watchByAddress(String tokenAddress) {
+    final query = _db.select(_db.transactionRows)
+      ..where((t) => t.tokenAddress.equals(tokenAddress))
+      ..orderBy([(t) => OrderingTerm.desc(t.created)]);
+
+    return query.map((row) => row.id).watch().map((event) => event.toIList());
+  }
+
+  Stream<Map<String, IList<TxCommon>>> watchGroupedByDate(String tokenAddress) {
+    final query = _db.select(_db.transactionRows)
+      ..where((t) => t.tokenAddress.equals(tokenAddress))
+      ..orderBy([(t) => OrderingTerm.desc(t.created)]);
+
+    return query.watch().asyncMap((rows) async {
+      final grouped = <String, IList<TxCommon>>{};
+      for (final row in rows) {
+        final model = await row.toModel();
+        final created = model.created;
+        if (created != null) {
+          final date = DateFormat('yyyy-MM-dd').format(created);
+          grouped.update(
+            date,
+            (list) => list.add(model),
+            ifAbsent: () => IList([model]),
+          );
+        }
+      }
+
+      return grouped;
+    });
+  }
+
   Stream<IList<String>> watchCount(int count) {
     final query = _db.select(_db.transactionRows)
       ..limit(count)
@@ -46,29 +96,19 @@ class TransactionRepository {
     final query = _db.select(_db.transactionRows)
       ..where((tbl) => tbl.id.equals(id));
 
-    return query.watchSingle().asyncExpand((row) => _match(row.toModel()));
-  }
-
-  Future<void> saveAll(
-    Iterable<TxCommon> txs, {
-    required bool clear,
-  }) {
-    Future<void> save() => _db.batch(
-          (batch) => batch.insertAll(
-            _db.transactionRows,
-            txs.map((e) => e.toRow()),
-            mode: InsertMode.insertOrReplace,
-          ),
+    return query.watchSingle().asyncMap(
+          (row) async => row.toModel().then((value) => _match(value).first),
         );
-
-    return clear
-        ? _db.transaction(() async {
-            await _db.delete(_db.transactionRows).go();
-            await save();
-          })
-        : save();
   }
 
+  Future<void> saveAll(Iterable<TxCommon> txs) => _db.batch(
+        (batch) => batch.insertAll(
+          _db.transactionRows,
+          txs.map((e) => e.toRow()),
+          mode: InsertMode.insertOrReplace,
+        ),
+      );
+
   Future<String?> mostRecentTxId() async {
     final query = _db.select(_db.transactionRows)
       ..orderBy([(t) => OrderingTerm.desc(t.created)])
@@ -96,13 +136,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(),
@@ -149,20 +189,29 @@ class TransactionRepository {
 }
 
 extension TransactionRowExt on TransactionRow {
-  TxCommon toModel() => TxCommon(
-        SignedTx.decode(encodedTx),
-        created: created,
-        status: status,
-        amount: amount?.let(
-          (it) => CryptoAmount(value: it, cryptoCurrency: Currency.usdc),
-        ),
-      );
+  Future<TxCommon> toModel() =>
+      sl<TokenRepository>().getToken(tokenAddress).letAsync(
+            (e) => TxCommon(
+              SignedTx.decode(encodedTx),
+              created: created,
+              status: status,
+              amount: amount?.let(
+                (it) => CryptoAmount(
+                  value: it,
+                  cryptoCurrency: CryptoCurrency(
+                    token: e ?? Token.unk,
+                  ),
+                ),
+              ),
+            ),
+          );
 }
 
 extension on TxCommon {
   TransactionRow toRow() => TransactionRow(
         id: tx.id,
         created: created,
+        tokenAddress: amount?.cryptoCurrency.token.address ?? Token.unk.address,
         encodedTx: tx.encode(),
         status: status,
         amount: amount?.value,

packages/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()