Change target sdk version to 30 for android project. Remove unused files.

android/app/build.gradle

@@ -46,7 +46,7 @@ android {
     defaultConfig {
         applicationId appProperties['id']
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

cw_bitcoin/pubspec.lock

@@ -29,6 +29,38 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.5.0"
+  bech32:
+    dependency: transitive
+    description:
+      path: "."
+      ref: cake
+      resolved-ref: "02fef082f20af13de00b4e64efb93a2c1e5e1cf2"
+      url: "https://github.com/cake-tech/bech32.git"
+    source: git
+    version: "0.2.0"
+  bip32:
+    dependency: transitive
+    description:
+      name: bip32
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.7"
+  bip39:
+    dependency: transitive
+    description:
+      name: bip39
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.3"
+  bitcoin_flutter:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: cake
+      resolved-ref: cbabfd87b6ce3cae6051a3e86ddb56e7a934e188
+      url: "https://github.com/cake-tech/bitcoin_flutter.git"
+    source: git
+    version: "2.0.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -36,6 +68,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
+  bs58check:
+    dependency: transitive
+    description:
+      name: bs58check
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
   build:
     dependency: transitive
     description:
@@ -147,14 +186,14 @@ packages:
       name: convert
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.1"
+    version: "2.1.1"
   crypto:
     dependency: transitive
     description:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.1"
+    version: "2.1.5"
   cw_core:
     dependency: "direct main"
     description:
@@ -175,7 +214,7 @@ packages:
       name: dartx
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.0"
+    version: "0.5.0"
   fake_async:
     dependency: transitive
     description:
@@ -235,13 +274,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.0"
+  hex:
+    dependency: transitive
+    description:
+      name: hex
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.2"
   hive:
     dependency: transitive
     description:
       name: hive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.0-nullsafety.2"
+    version: "1.4.4+1"
   hive_generator:
     dependency: "direct dev"
     description:
@@ -410,6 +456,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.3"
+  pointycastle:
+    dependency: transitive
+    description:
+      name: pointycastle
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.2"
   pool:
     dependency: transitive
     description:
@@ -438,6 +491,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.8"
+  rxdart:
+    dependency: "direct main"
+    description:
+      name: rxdart
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.26.0"
   shelf:
     dependency: transitive
     description:
@@ -519,7 +579,7 @@ packages:
       name: time
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "1.4.1"
   timing:
     dependency: transitive
     description:

cw_bitcoin/pubspec.yaml

@@ -18,7 +18,12 @@ dependencies:
   intl: ^0.17.0
   cw_core:
     path: ../cw_core
-
+  bitcoin_flutter:
+    git:
+      url: https://github.com/cake-tech/bitcoin_flutter.git
+      ref: cake
+  rxdart: ^0.26.0
+  
 dev_dependencies:
   flutter_test:
     sdk: flutter

lib/entities/wallet.dart

@@ -1,61 +0,0 @@
-//import 'package:mobx/mobx.dart';
-//import 'package:cw_core/sync_status.dart';
-//import 'package:cake_wallet/entities/transaction_history.dart';
-//import 'package:cw_core/wallet_type.dart';
-//import 'package:cake_wallet/entities/transaction_creation_credentials.dart';
-//import 'package:cake_wallet/entities/pending_transaction.dart';
-//import 'package:cw_core/balance.dart';
-//import 'package:cw_core/node.dart';
-
-//abstract class Wallet {
-//  WalletType getType();
-
-//  WalletType walletType;
-
-//  Observable<Balance> onBalanceChange;
-
-//  Observable<SyncStatus> syncStatus;
-
-//  Observable<String> get onNameChange;
-
-//  Observable<String> get onAddressChange;
-
-//  String get name;
-
-//  String get address;
-
-//  Future updateInfo();
-
-//  Future<String> getFilename();
-
-//  Future<String> getName();
-
-//  Future<String> getAddress();
-
-//  Future<String> getSeed();
-
-//  Future<Map<String, String>> getKeys();
-
-//  Future<String> getFullBalance();
-
-//  Future<String> getUnlockedBalance();
-
-//  Future<int> getCurrentHeight();
-
-//  Future<int> getNodeHeight();
-
-//  Future<bool> isConnected();
-
-//  Future close();
-
-//  TransactionHistory getHistory();
-
-//  Future connectToNode({Node node, bool useSSL = false, bool isLightWallet = false});
-
-//  Future startSync();
-
-//  Future<PendingTransaction> createTransaction(
-//      TransactionCreationCredentials credentials);
-
-//  Future rescan({int restoreHeight = 0});
-//}

lib/entities/wallets_manager.dart

@@ -1,18 +0,0 @@
-import 'package:cake_wallet/entities/wallet.dart';
-import 'package:cake_wallet/entities/wallet_description.dart';
-
-abstract class WalletsManager {
-  Future<Wallet> create(String name, String password, String language);
-
-  Future<Wallet> restoreFromSeed(
-      String name, String password, String seed, int restoreHeight);
-
-  Future<Wallet> restoreFromKeys(String name, String password, String language,
-      int restoreHeight, String address, String viewKey, String spendKey);
-
-  Future<Wallet> openWallet(String name, String password);
-
-  Future<bool> isWalletExit(String name);
-
-  Future remove(WalletDescription wallet);
-}

pubspec_base.yaml

@@ -45,10 +45,6 @@ dependencies:
   crypto: ^2.1.5
   password: ^1.0.0
   basic_utils: ^2.0.3
-  bitcoin_flutter:
-    git:
-      url: https://github.com/cake-tech/bitcoin_flutter.git
-      ref: cake
   get_it: ^6.0.0
   connectivity: ^3.0.3
   keyboard_actions: ^3.3.0