Cyjan ltc

.fvmrc

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

.github/workflows/build_release.yaml

@@ -5,6 +5,8 @@ on: [push]
 jobs:
     app_android:
         runs-on: ubuntu-latest
+        env:
+            ANDROID_NDK_VERSION: 28.2.13676358
         steps:
             - uses: actions/checkout@v4
               with:
@@ -20,14 +22,17 @@ jobs:
               with:
                 distribution: 'zulu'
                 java-version: '17'
-            - name: Flutter pub get
+            - name: Git submodule update
               run: |
-                flutter pub get
-            - name: Prepare dev
-              run: ./.tooling/prepare_dev.sh
+                git submodule update --init --recursive
             - name: Build monero_c
               run: |
                 make libs_android_download
+            - name: Flutter pub get
+              run: |
+                flutter pub get
+            - name: Prepare dev
+              run: make prepare_dev
             - name: Build apk
               run: |
                 flutter build apk --profile

.github/workflows/lint.yaml

@@ -4,7 +4,9 @@ on: [push]
 
 jobs:
   format:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+    env:
+        ANDROID_NDK_VERSION: 28.2.13676358
     steps:
       - uses: actions/checkout@v4
         with:
@@ -20,6 +22,13 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: '17'
+      - name: Git submodule update
+        run: |
+          git submodule update --init --recursive
+      - name: Build monero_c
+        run: |
+          make libs_android_download
+
       - name: Flutter pub get
         run: |
           flutter pub get

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "external/cake_wallet"]
+	path = external/cake_wallet
+	url = https://github.com/cake-tech/cake_wallet

.tooling/format.sh

@@ -15,7 +15,7 @@ pushd lib/l10n
 popd
 
 dart run build_runner build --delete-conflicting-outputs
-dart fix --apply .
-dart format .
+dart fix --apply lib/
+dart format lib/
 
 flutter gen-l10n

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-  "dart.flutterSdkPath": ".fvm/versions/3.29.3"
+  "dart.flutterSdkPath": ".fvm/versions/3.32.0"
 }

Makefile

@@ -1,12 +1,12 @@
 include .env
 UNAME := $(shell uname)
 
-libs_android_download:
+libs_android_download: mwebd_android
 	./build_moneroc.sh --prebuild --coin ${COIN} --tag ${MONERO_C_TAG} --triplet x86_64-linux-android  --location android/app/src/main/jniLibs/x86_64
 	./build_moneroc.sh --prebuild --coin ${COIN} --tag ${MONERO_C_TAG} --triplet aarch64-linux-android --location android/app/src/main/jniLibs/arm64-v8a
 	./build_moneroc.sh --prebuild --coin ${COIN} --tag ${MONERO_C_TAG} --triplet armv7a-linux-androideabi --location android/app/src/main/jniLibs/armeabi-v7a
 
-libs_android_build:
+libs_android_build: mwebd_android
 ifneq ($(UNAME), Linux)
 	echo Only Linux hosts can build for android, try $(MAKE) libs_android_download
 	exit 1
@@ -15,15 +15,15 @@ endif
 	./build_moneroc.sh --coin ${COIN} --tag ${MONERO_C_TAG} --triplet aarch64-linux-android --location android/app/src/main/jniLibs/arm64-v8a
 	./build_moneroc.sh --coin ${COIN} --tag ${MONERO_C_TAG} --triplet armv7a-linux-androideabi --location android/app/src/main/jniLibs/armeabi-v7a
 
-libs_android_build_ci:
+libs_android_build_ci: mwebd_android
 	./build_moneroc.sh --coin ${COIN} --tag ${MONERO_C_TAG} --triplet aarch64-linux-android --location android/app/src/main/jniLibs/arm64-v8a
 
-libs_ios_download:
+libs_ios_download: mwebd_ios
 	./build_moneroc.sh --prebuild --coin ${COIN} --tag ${MONERO_C_TAG} --triplet aarch64-apple-ios --location ios/native_libs/ios-arm64
 	./build_moneroc.sh --prebuild --coin ${COIN} --tag ${MONERO_C_TAG} --triplet aarch64-apple-iossimulator --location ios/native_libs/ios-arm64-simulator
 	cd ios && ./gen_framework.sh
 
-libs_ios_build:
+libs_ios_build: mwebd_ios
 ifneq ($(UNAME), Darwin)
 	echo Only Darwin hosts can build for iOS, try $(MAKE) libs_ios_download
 	exit 1
@@ -32,13 +32,18 @@ endif
 	./build_moneroc.sh --coin ${COIN} --tag ${MONERO_C_TAG} --triplet aarch64-apple-iossimulator --location ios/native_libs/ios-arm64-simulator
 	cd ios && ./gen_framework.sh
 
-cupcake_android_monero:
-	dart run build_runner build --delete-conflicting-outputs
-	flutter build apk --dart-define=COIN_MONERO=true
+cupcake_android:
+	flutter build apk
 
-cupcake_ios_monero:
-	dart run build_runner build --delete-conflicting-outputs
-	flutter build ios --no-codesign --dart-define=COIN_MONERO=true
+cupcake_ios:
+	flutter build ios --no-codesign
+
+mwebd_android:
+	cd external/cake_wallet/scripts/android && bash ./build_mwebd.sh --dont-install
+
+mwebd_ios:
+	cd external/cake_wallet/scripts/ios && bash ./build_mwebd.sh --dont-install
 
 prepare_dev:
+	cd external/cake_wallet/scripts && bash ./prepare_torch.sh
 	./.tooling/prepare_dev.sh

README.md

@@ -9,7 +9,7 @@ To build:
 ```bash
 $ make libs_android_build # or libs_android_download, libs_ios_build, libs_ios_download
 $ make prepare_dev # load dev signing key (not required on iOS)
-$ make cupcake_android_monero # or cupcake_
+$ make cupcake_android # or cupcake_ios
 ```
 
 ### Adding other coins

analysis_options.yaml

@@ -5,6 +5,8 @@ analyzer:
     overridden_fields: ignore
   exclude:
     - '**.g.dart'
+    - 'external/**'
+
 include: package:flutter_lints/flutter.yaml
 
 linter:

android/app/build.gradle

@@ -31,7 +31,7 @@ if (flutterVersionName == null) {
 android {
     namespace "com.cakewallet.cupcake"
     compileSdk flutter.compileSdkVersion
-    ndkVersion "27.3.13750724"
+    ndkVersion "29.0.14206865"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17

ios/Podfile.lock

@@ -1,6 +1,8 @@
 PODS:
   - bdk_flutter (0.31.3):
     - Flutter
+  - cw_mweb (0.0.1):
+    - Flutter
   - fast_scanner (5.1.1):
     - Flutter
   - Flutter (1.0.0)
@@ -50,6 +52,7 @@ PODS:
 
 DEPENDENCIES:
   - bdk_flutter (from `.symlinks/plugins/bdk_flutter/ios`)
+  - cw_mweb (from `.symlinks/plugins/cw_mweb/ios`)
   - fast_scanner (from `.symlinks/plugins/fast_scanner/ios`)
   - Flutter (from `Flutter`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
@@ -69,6 +72,8 @@ SPEC REPOS:
 EXTERNAL SOURCES:
   bdk_flutter:
     :path: ".symlinks/plugins/bdk_flutter/ios"
+  cw_mweb:
+    :path: ".symlinks/plugins/cw_mweb/ios"
   fast_scanner:
     :path: ".symlinks/plugins/fast_scanner/ios"
   Flutter:
@@ -93,19 +98,20 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
-  bdk_flutter: 86c9ba59ee282dee08c3a29599abe867d10a8b10
-  fast_scanner: 44c00940355a51258cd6c2085734193cd23d95bc
+  bdk_flutter: cef9180019b4c6b67a3e3dfb74611683fe140107
+  cw_mweb: 3aea2fb35b2bd04d8b2d21b83216f3b8fb768d85
+  fast_scanner: 2cb1ad3e69e645e9980fb4961396ce5804caa3e3
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
-  haptic_feedback: 8cb3ee0cb6b797946c2b0df9c99ebc8f7ed79c71
-  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
-  local_auth_darwin: fa4b06454df7df8e97c18d7ee55151c57e7af0de
-  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
+  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
+  haptic_feedback: fd1d8509833f58f164fc12122c0357fa9b2750e0
+  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
+  local_auth_darwin: d2e8c53ef0c4f43c646462e3415432c4dab3ae19
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
   sqlite3: 73513155ec6979715d3904ef53a8d68892d4032b
-  sqlite3_flutter_libs: 86f82662868ee26ff3451f73cac9c5fc2a1f57fa
-  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  sqlite3_flutter_libs: 83f8e9f5b6554077f1d93119fe20ebaa5f3a9ef1
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
 
 PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
 

lib/coins/abstract/address.dart

@@ -1,9 +1,29 @@
+import 'package:flutter/material.dart';
+
 class Address {
-  Address(this.address);
+  Address(this.label, this.address);
+  final AddressLabel label;
   final String address;
 
   @override
   String toString() {
     return address;
   }
 }
+
+abstract class AddressLabel {
+  String get label;
+  String get extra;
+  Widget icon(final Color color);
+}
+
+class UnknownLabel implements AddressLabel {
+  @override
+  String get label => "";
+
+  @override
+  String get extra => "";
+
+  @override
+  Widget icon(final Color color) => SizedBox.shrink();
+}

lib/coins/abstract/coin.dart

@@ -5,7 +5,7 @@ import 'package:cupcake/coins/abstract/wallet_info.dart';
 import 'package:cupcake/l10n/app_localizations.dart';
 import 'package:flutter/cupertino.dart';
 
-enum Coins { monero, bitcoin, unknown }
+enum Coins { monero, bitcoin, litecoin, unknown }
 
 abstract class Coin {
   static late AppLocalizations L;

lib/coins/abstract/wallet.dart

@@ -1,3 +1,4 @@
+import 'package:cupcake/coins/abstract/address.dart';
 import 'package:cupcake/coins/abstract/coin.dart';
 import 'package:cupcake/coins/abstract/wallet_info.dart';
 import 'package:cupcake/coins/abstract/wallet_seed_detail.dart';
@@ -28,13 +29,11 @@ abstract class CoinWallet {
 
   String get getAccountLabel;
 
-  String get getCurrentAddress;
-
   String get seed;
 
   String get passphrase;
 
-  String get primaryAddress;
+  List<Address> get address;
 
   String get walletName;
 

lib/coins/abstract/wallet_info.dart

@@ -1,6 +1,7 @@
 import 'package:cupcake/coins/abstract/coin.dart';
 import 'package:cupcake/coins/abstract/wallet.dart';
 import 'package:cupcake/coins/bitcoin/wallet_info.dart';
+import 'package:cupcake/coins/litecoin/wallet_info.dart';
 import 'package:cupcake/coins/monero/wallet_info.dart';
 import 'package:cupcake/utils/config.dart';
 import 'package:flutter/widgets.dart';
@@ -41,6 +42,8 @@ abstract class CoinWalletInfo {
         return MoneroWalletInfo(walletName);
       case Coins.bitcoin:
         return BitcoinWalletInfo(walletName);
+      case Coins.litecoin:
+        return LitecoinWalletInfo(walletName);
       case Coins.unknown:
         throw UnimplementedError("unknown coin");
     }

lib/coins/bitcoin/address.dart

@@ -1,8 +1,20 @@
 import 'package:cupcake/coins/abstract/address.dart';
+import 'package:flutter/material.dart';
 
-class BitcoinAddress implements Address {
-  BitcoinAddress(this.address);
+class BitcoinAddress extends Address {
+  BitcoinAddress(super.label, super.address);
+}
+
+class SegwitAddress implements AddressLabel {
+  @override
+  Widget icon(final Color color) => Icon(
+        Icons.currency_bitcoin,
+        color: color,
+      );
+
+  @override
+  String get extra => "";
 
   @override
-  final String address;
+  String get label => "SegWit";
 }

lib/coins/bitcoin/creation/common.dart

@@ -96,6 +96,7 @@ class BitcoinWalletCreation extends WalletCreation {
     await Future.delayed(Duration.zero); // do not call on build();
     seed.ctrl.clear();
     passphrase.ctrl.clear();
+    passphraseConfirm.ctrl.clear();
   }
 
   @override

lib/coins/bitcoin/creation/new_wallet.dart

@@ -15,19 +15,16 @@ class CreateBitcoinWalletCreationMethod extends CreationMethod {
     required this.walletPath,
     required this.walletPassword,
     required this.passphrase,
-    this.progressCallback,
   });
   final coin = Bitcoin();
   final AppLocalizations L;
 
-  final ProgressCallback? progressCallback;
   final String walletPath;
   final String walletPassword;
   final String passphrase;
 
   @override
   Future<CreationOutcome> create() async {
-    progressCallback?.call(description: L.generating_polyseed);
     final mnemonic = await Mnemonic.create(WordCount.words12);
 
     final keys = "${Bitcoin().getPathForWallet(p.basename(walletPath))}.keys";