Merge remote-tracking branch 'origin/staging' into julian

Author: julian-CStack

.gitignore

@@ -70,10 +70,6 @@ secp256k1.dll
 /lib/app_config.g.dart
 /android/app/src/main/app_icon-playstore.png
 
-# Dart generated files (Freezed, Riverpod, GoRouter etc..)
-lib/**/*.g.dart
-lib/**/*.freezed.dart
-
 ## other generated project files
 
 pubspec.yaml

lib/db/isar/main_db.dart

@@ -59,6 +59,7 @@ class MainDB {
         AddressSchema,
         AddressLabelSchema,
         EthContractSchema,
+        SolContractSchema,
         TransactionBlockExplorerSchema,
         StackThemeSchema,
         ContactEntrySchema,
@@ -69,6 +70,7 @@ class MainDB {
         WalletInfoMetaSchema,
         TokenWalletInfoSchema,
         FrostWalletInfoSchema,
+        WalletSolanaTokenInfoSchema,
       ],
       directory: (await StackFileSystem.applicationIsarDirectory()).path,
       // inspector: kDebugMode,
@@ -621,4 +623,26 @@ class MainDB {
       isar.writeTxn(() async {
         await isar.ethContracts.putAll(contracts);
       });
+
+  // ========== Solana =========================================================
+
+  // Solana tokens.
+
+  QueryBuilder<SolContract, SolContract, QWhere> getSolContracts() =>
+      isar.solContracts.where();
+
+  Future<SolContract?> getSolContract(String tokenMint) =>
+      isar.solContracts.where().addressEqualTo(tokenMint).findFirst();
+
+  SolContract? getSolContractSync(String tokenMint) =>
+      isar.solContracts.where().addressEqualTo(tokenMint).findFirstSync();
+
+  Future<int> putSolContract(SolContract token) => isar.writeTxn(() async {
+    return await isar.solContracts.put(token);
+  });
+
+  Future<void> putSolContracts(List<SolContract> tokens) =>
+      isar.writeTxn(() async {
+        await isar.solContracts.putAll(tokens);
+      });
 }

lib/models/add_wallet_list_entity/sub_classes/sol_token_entity.dart

@@ -0,0 +1,31 @@
+/*
+ * This file is part of Stack Wallet.
+ *
+ * Copyright (c) 2023 Cypher Stack
+ * All Rights Reserved.
+ * The code is distributed under GPLv3 license, see LICENSE file for details.
+ *
+ */
+
+import '../../../wallets/crypto_currency/crypto_currency.dart';
+import '../../isar/models/solana/sol_contract.dart';
+import '../add_wallet_list_entity.dart';
+
+class SolTokenEntity extends AddWalletListEntity {
+  SolTokenEntity(this.token);
+
+  final SolContract token;
+
+  @override
+  CryptoCurrency get cryptoCurrency => Solana(CryptoCurrencyNetwork.main);
+
+  @override
+  String get name => token.name;
+
+  @override
+  String get ticker => token.symbol;
+
+  @override
+  List<Object?> get props =>
+      [cryptoCurrency.identifier, name, ticker, token.address];
+}

lib/models/isar/models/blockchain_data/transaction.dart

@@ -261,4 +261,5 @@ enum TransactionSubType {
   sparkSpend, // firo specific
   ordinal,
   mweb,
+  splToken, // Solana token.
 }

lib/models/isar/models/blockchain_data/transaction.g.dart

@@ -9,5 +9,15 @@
  */
 
 abstract class Contract {
-  // for possible future use
+  /// Token/contract address (mint address for Solana, contract address for Ethereum).
+  String get address;
+
+  /// Token name.
+  String get name;
+
+  /// Token symbol.
+  String get symbol;
+
+  /// Token decimals.
+  int get decimals;
 }

lib/models/isar/models/blockchain_data/v2/transaction_v2.g.dart

@@ -9,6 +9,7 @@
  */
 
 import 'package:isar_community/isar.dart';
+
 import '../contract.dart';
 
 part 'eth_contract.g.dart';
@@ -26,13 +27,17 @@ class EthContract extends Contract {
 
   Id id = Isar.autoIncrement;
 
+  @override
   @Index(unique: true, replace: true)
   late final String address;
 
+  @override
   late final String name;
 
+  @override
   late final String symbol;
 
+  @override
   late final int decimals;
 
   late final String? abi;
@@ -50,21 +55,16 @@ class EthContract extends Contract {
     List<String>? walletIds,
     String? abi,
     String? otherData,
-  }) =>
-      EthContract(
-        address: address ?? this.address,
-        name: name ?? this.name,
-        symbol: symbol ?? this.symbol,
-        decimals: decimals ?? this.decimals,
-        type: type ?? this.type,
-        abi: abi ?? this.abi,
-      )..id = id ?? this.id;
+  }) => EthContract(
+    address: address ?? this.address,
+    name: name ?? this.name,
+    symbol: symbol ?? this.symbol,
+    decimals: decimals ?? this.decimals,
+    type: type ?? this.type,
+    abi: abi ?? this.abi,
+  )..id = id ?? this.id;
 }
 
 // Used in Isar db and stored there as int indexes so adding/removing values
 // in this definition should be done extremely carefully in production
-enum EthContractType {
-  unknown,
-  erc20,
-  erc721;
-}
+enum EthContractType { unknown, erc20, erc721 }

lib/models/isar/models/contract.dart

@@ -16,4 +16,6 @@ export 'blockchain_data/transaction.dart';
 export 'blockchain_data/utxo.dart';
 export 'ethereum/eth_contract.dart';
 export 'log.dart';
+export 'solana/sol_contract.dart';
 export 'transaction_note.dart';
+export '../../../wallets/isar/models/wallet_solana_token_info.dart';

lib/models/isar/models/ethereum/eth_contract.dart

@@ -0,0 +1,62 @@
+/*
+ * This file is part of Stack Wallet.
+ *
+ * Copyright (c) 2025 Cypher Stack
+ * All Rights Reserved.
+ * The code is distributed under GPLv3 license, see LICENSE file for details.
+ *
+ */
+
+import 'package:isar_community/isar.dart';
+
+import '../contract.dart';
+
+part 'sol_contract.g.dart';
+
+@collection
+class SolContract extends Contract {
+  SolContract({
+    required this.address,
+    required this.name,
+    required this.symbol,
+    required this.decimals,
+    this.logoUri,
+    this.metadataAddress,
+  });
+
+  Id id = Isar.autoIncrement;
+
+  @override
+  @Index(unique: true, replace: true)
+  late final String address; // Mint address.
+
+  @override
+  late final String name;
+
+  @override
+  late final String symbol;
+
+  @override
+  late final int decimals;
+
+  late final String? logoUri;
+
+  late final String? metadataAddress;
+
+  SolContract copyWith({
+    Id? id,
+    String? address,
+    String? name,
+    String? symbol,
+    int? decimals,
+    String? logoUri,
+    String? metadataAddress,
+  }) => SolContract(
+    address: address ?? this.address,
+    name: name ?? this.name,
+    symbol: symbol ?? this.symbol,
+    decimals: decimals ?? this.decimals,
+    logoUri: logoUri ?? this.logoUri,
+    metadataAddress: metadataAddress ?? this.metadataAddress,
+  )..id = id ?? this.id;
+}