Merge pull request #1734 from SatoshiPortal/develop

6.5.0

Author: i5hi

.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.29.3"
+  "flutter": "3.38.5"
 }

.github/workflows/analyze_and_test.yml

@@ -15,14 +15,14 @@ jobs:
 
       - name: Install FVM
         run: |
-          curl -fsSL https://fvm.app/install.sh | bash
-          echo "$HOME/.pub-cache/bin" >> $GITHUB_PATH
+          curl -fsSL https://fvm.app/install.sh | bash -s -- 4.0.5
+          echo "$HOME/fvm/bin" >> $GITHUB_PATH
 
       - run: make fvm-check
       - run: make clean
       - run: make deps
       - run: make build-runner
-      - run: make l10n
+      - run: make translations
 
       - name: Create .env file
         run: |

.github/workflows/claude.yml

@@ -0,0 +1,28 @@
+name: Claude Code
+
+on:
+  issue_comment:
+    types: [created]
+  pull_request_review_comment:
+    types: [created]
+
+permissions:
+  id-token: write      # needed for OIDC
+  contents: write       # so it can write the repo
+  issues: write        # so it can comment on issues
+  pull-requests: write # so it can comment on PRs
+
+jobs:
+  claude:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0       # Fetch full history for branch operations
+          persist-credentials: true  # Keep credentials for subsequent git commands
+
+      - uses: anthropics/claude-code-action@v1
+        with:
+          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
+          claude_args: "--model claude-opus-4-5-20251101"

ARCHITECTURE.md

@@ -134,6 +134,11 @@ In this project, BLoCs/Cubits are used for state management, but other solutions
 - The **domain and presentation layer should use entities**, not models.
 - Only the **data layer should use models**, and transform them to entities.
 
+### Rules for AI:
+- Always follow the architecture of the project when developing features.
+- Always use colors from the theme; never use raw colors. When the user explains something using raw color language; find the closest color in the theme and based on the application use a color from the theme that would make sense in dark mode too but do not try to change the color theme file by yourself ever.
+- 
+
 ### Further reading
 
 You can read more about Clean Architecture principles applied to Flutter in the following articles:

README.md

@@ -1,4 +1,4 @@
-[![Analyze](https://github.com/SatoshiPortal/bullbitcoin-mobile/actions/workflows/analyze.yml/badge.svg)](https://github.com/SatoshiPortal/bullbitcoin-mobile/actions/workflows/analyze.yml) [![Build](https://github.com/SatoshiPortal/bullbitcoin-mobile/actions/workflows/build.yml/badge.svg)](https://github.com/SatoshiPortal/bullbitcoin-mobile/actions/workflows/build.yml)
+[![Analyze and Test](https://github.com/SatoshiPortal/bullbitcoin-mobile/actions/workflows/analyze_and_test.yml/badge.svg?branch=develop)](https://github.com/SatoshiPortal/bullbitcoin-mobile/actions/workflows/analyze_and_test.yml)
 
 # About BULL Wallet
 
@@ -16,22 +16,13 @@ At launch, two wallets are generated: the Secure Bitcoin Wallet and the Instant
 
 Both these wallets are able to send and receive Lightning Network payments via the swap provider.
 
-## Core dependencies
+### Translations
 
-- [bdk](https://github.com/bitcoindevkit/bdk)
-- [bdk-flutter](https://github.com/LtbLightning/bdk-flutter)
-- [lwk](https://github.com/Blockstream/lwk)
-- [lwk-dart](https://github.com/SatoshiPortal/lwk-dart)
-- [boltz-rust](https://github.com/SatoshiPortal/boltz-rust)
-- [boltz-dart](https://github.com/SatoshiPortal/boltz-dart)
+[![Translation status](https://hosted.weblate.org/widget/bull/open-graph.png)](https://hosted.weblate.org/engage/bull/)
 
-## Default external service providers
+### [Dependencies](https://github.com/SatoshiPortal/bullbitcoin-mobile/blob/develop/pubspec.yaml#L9)
 
-- mempool.space API for fee estimates
-- mempool.bullbitcoin.com / mempool.space for transaction and address explorer
-- bullbitcoin.com API for fiat prices
-- bullbitcoin.com and blockstream.info electrum servers for blockchain data
-- boltz.exchange for swap services
+### [Default service providers](https://github.com/SatoshiPortal/bullbitcoin-mobile/blob/develop/lib/core/utils/constants.dart#L60)
 
 ### General features
 
@@ -68,8 +59,7 @@ We try to always use a wallet that is the same network as the recipient: if reci
 
 Automated selection of the wallet can be overridden by the user at any time. This will most likely trigger a warning that the user can choose to ignore.
 
-### Wallet security
-
+## Wallet security
 - An optional PIN from 4 to 8 digits can be set for access to the app.
 - The PIN is optional to prevent users from being accidentally locked out of a wallet without having first performed a backup.
 - Private keys are stored in secure storage and only accessed via the application when signing transactions, viewing the wallet’s private keys for back-up (mnemonic or xpriv). This prevents malicious applications from accessing the private keys. 
@@ -106,42 +96,20 @@ When installing the BULL Wallet app, a self-custodial wallet will be created, re
 
 When spending or selling Bitcoin, the exchange will create a payment invoice (BIP21) that will automatically be opened by the same application. All the user has to do is to confirm or reject that transaction. The experience will be functionally the same as that of a custodial exchange, with the exception that the user will have to do a backup of the Bitcoin wallet.
 
-## Current roadmap
-
-Suggestion to this roadmap can be proposed as Github issues.
-
-- [x] Bumping replace-by-fee transactions
-- [ ] Re-implement smarter coin selection and labelling
-- [x] One mnemonic: new wallets are always created as a BIP39 passphrase
-- [x] Good UX/UI for creating PSBTs from watch-only wallets
-- [x] Good UX/UI for decoding and broadcasting PSBTs
-- [x] Better UX/UI for importing watch-only wallets
-- [x] Integration of Coinkite's BBQR library to export public keys, export PSBTs and import PSBTs
-- [x] Bitcoin <> Liquid network swaps (depends on Boltz backend update)
-- [ ] Integrate a client-side passphrase strength estimator
-- [x] Encrypted cloud backups connected to a key server: RecoverBull
-- [ ] Store persistent encrypted wallet backup on device
-- [ ] Biometric authentication
-- [ ] Show fiat value of transactions at the approximated time they were made
-- [ ] Spanish and French translations
-- [x] Payjoin integration
-- [ ] Integrate Bull Bitcoin Fee multiple
-- [x] Auto-consolidation mode for spend
-- [ ] Small UTXO warning and consolidation suggestions
-- [ ] Configurable mempool explorer URLs
-- [ ] Configurable swap provider (similar to Electrum server)
+## Roadmap
+
+The roadmap is based on the Github issues. You can suggest your own ideas by creating a new issue. The issues are then prioritized by the maintainers according to their importance and feasibility.
 
 ## Acknowledgements 
 
-- The project is entirely financed by bullbitcoin.com 
+- The project is entirely financed by [bullbitcoin.com](https://bullbitcoin.com) 
 - Created by Francis Pouliot and Vishal Menon
-- Main developers: Vishal, Morteza and Sai
+- Maintainers: [i5hi](https://github.com/i5hi), [mocodesmo](https://github.com/mocodesmo), [ethicnology](https://github.com/ethicnology), [kumulynja](https://github.com/kumulynja), [basantagoswami](https://github.com/basantagoswami) and Q&A [kiranmetri](https://github.com/kiranmetri)
+- Thanks to all [contributors](https://github.com/SatoshiPortal/bullbitcoin-mobile/graphs/contributors)
 - Thanks to Raj for his work on Boltz-rust
 - Thanks to the BDK team: BitcoinZavior and ThunderBiscuit
 - Eternal gratitude to the Boltz team Michael and Killian
 - Thanks to Riccardo and the LWK team
 - Thanks to Blockstream for developing the Liquid Network 
 
 ![image](https://github.com/BullishNode/bullbitcoin-mobile/assets/75800272/a61e4ccc-897d-410f-b97b-37a7c2b240cb)
-
-This project is tested with BrowserStack

analysis_options.yaml

@@ -1,18 +1,17 @@
-include: package:lint/analysis_options.yaml
+include: package:lints/recommended.yaml
 
 linter:
   rules:
     avoid_classes_with_only_static_members: false
-    avoid_dynamic_calls: false
-    no_wildcard_variable_uses: false
-    unawaited_futures: true
     avoid_redundant_argument_values: false
+    avoid_dynamic_calls: false    
 
 
 analyzer:
+  errors:
+    todo: ignore
   exclude:
     - lib/**/*.g.dart
     - lib/**/*.freezed.dart
-    - maintainance/**
     - pubspec.yaml
 

android/app/build.gradle

@@ -23,7 +23,7 @@ def flutterVersionName = localProperties.getProperty('flutter.versionName') ?: '
 
 
 android {
-    compileSdk = 35
+    compileSdk = 36
 
     ndkVersion = "29.0.13113456"
     compileOptions {
@@ -43,7 +43,7 @@ android {
         applicationId = 'com.bullbitcoin.mobile'
         minSdkVersion 26
         // TODO: targetSdkVersion flutter.targetSdkVersion
-        targetSdkVersion 35
+        targetSdkVersion 36
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
 

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
     <!-- <uses-permission android:name="android.permission.NFC"/> -->
     <uses-feature android:name="android.hardware.bluetooth" android:required="false" />
     <uses-feature android:name="android.hardware.bluetooth_le" android:required="false" />  

android/build.gradle

@@ -8,7 +8,7 @@ subprojects {
         if (project.plugins.hasPlugin("com.android.application") ||
             project.plugins.hasPlugin("com.android.library")) {
             project.android {
-                compileSdk = 35
+                compileSdk = 36
                 buildToolsVersion "35.0.0"
             }
         }

integration_test/sqlite_transactions_test.dart

@@ -1,11 +1,8 @@
-import 'dart:convert';
-
 import 'package:bb_mobile/core/electrum/domain/value_objects/electrum_server_network.dart';
 import 'package:bb_mobile/core/electrum/frameworks/drift/datasources/electrum_remote_datasource.dart';
 import 'package:bb_mobile/core/electrum/frameworks/drift/models/electrum_server_model.dart';
 import 'package:bb_mobile/core/storage/sqlite_database.dart';
-import 'package:bb_mobile/core/transaction/data/transaction_repository.dart';
-import 'package:bb_mobile/core/transaction/domain/entities/tx.dart';
+import 'package:bb_mobile/core/transactions/bitcoin_transaction_repository.dart';
 import 'package:bb_mobile/core/utils/constants.dart';
 import 'package:bb_mobile/locator.dart';
 import 'package:bb_mobile/main.dart';
@@ -21,8 +18,9 @@ Future<void> main({bool isInitialized = false}) async {
       url: ApiServiceConstants.bbElectrumUrl,
       network: ElectrumServerNetwork.bitcoinMainnet,
     ),
+    sqlite: sqlite,
   );
-  final transactionRepository = TransactionRepository(
+  final transactionRepository = BitcoinTransactionRepository(
     electrumRemoteDatasource: electrumDatasource,
   );
 
@@ -33,58 +31,21 @@ Future<void> main({bool isInitialized = false}) async {
 
   tearDownAll(() {});
   group('Sqlite Integration Tests', () {
-    test('Fetch tx bytes from Electrum and store it into Sqlite', () async {
-      // Ensure the tx does not exists in sqlite
-      final sqliteTx =
-          await sqlite.managers.transactions
-              .filter((e) => e.txid(txid))
-              .getSingleOrNull();
-      expect(sqliteTx, isNull);
-
-      // Fetch the transaction from electrum
-      final txBytes = await electrumDatasource.getTransaction(txid);
-      // Converts the bytes into entity
-      final txEntity = await RawBitcoinTxEntity.fromBytes(txBytes);
-
-      // Store the transaction into sqlite
-      await sqlite.managers.transactions.create(
-        (t) => t(
-          txid: txEntity.txid,
-          version: txEntity.version,
-          size: txEntity.size.toString(),
-          vsize: txEntity.vsize.toString(),
-          locktime: txEntity.locktime,
-          vin: json.encode(txEntity.vin.map((e) => e.toJson()).toList()),
-          vout: json.encode(txEntity.vout.map((e) => e.toJson()).toList()),
-        ),
-      );
-
-      // Fetch the transaction locally from sqlite
-      final sqliteFetched =
-          await sqlite.managers.transactions
-              .filter((e) => e.txid(txid))
-              .getSingleOrNull();
-      expect(sqliteFetched, isNotNull);
-      expect(sqliteFetched!.txid, txid);
-    });
-
     test('Ensure the repository works', () async {
       // Ensure the tx does not exists in sqlite
-      var sqliteTx =
-          await sqlite.managers.transactions
-              .filter((e) => e.txid(txid))
-              .getSingleOrNull();
+      var sqliteTx = await sqlite.managers.transactions
+          .filter((e) => e.txid(txid))
+          .getSingleOrNull();
       expect(sqliteTx, isNull);
 
       // Fetch a transaction and cache it in sqlite if not present
       final tx = await transactionRepository.fetch(txid: txid);
       expect(tx.txid, txid);
 
       // Ensure the tx is now stored in sqlite
-      sqliteTx =
-          await sqlite.managers.transactions
-              .filter((e) => e.txid(txid))
-              .getSingleOrNull();
+      sqliteTx = await sqlite.managers.transactions
+          .filter((e) => e.txid(tx.txid))
+          .getSingleOrNull();
       expect(sqliteTx, isNotNull);
       expect(tx.txid, sqliteTx!.txid);
     });