diff --git a/android/app/build.gradle b/android/app/build.gradle index 2ecb7b0eea..8667240328 100644 --- a/android/app/build.gradle +++ b/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" diff --git a/cw_bitcoin/pubspec.lock b/cw_bitcoin/pubspec.lock index 67b4423c11..99e49a97be 100644 --- a/cw_bitcoin/pubspec.lock +++ b/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: diff --git a/cw_bitcoin/pubspec.yaml b/cw_bitcoin/pubspec.yaml index f76d8c324e..6949225286 100644 --- a/cw_bitcoin/pubspec.yaml +++ b/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 diff --git a/lib/entities/wallet.dart b/lib/entities/wallet.dart deleted file mode 100644 index 3e77b5ee7d..0000000000 --- a/lib/entities/wallet.dart +++ /dev/null @@ -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 onBalanceChange; - -// Observable syncStatus; - -// Observable get onNameChange; - -// Observable get onAddressChange; - -// String get name; - -// String get address; - -// Future updateInfo(); - -// Future getFilename(); - -// Future getName(); - -// Future getAddress(); - -// Future getSeed(); - -// Future> getKeys(); - -// Future getFullBalance(); - -// Future getUnlockedBalance(); - -// Future getCurrentHeight(); - -// Future getNodeHeight(); - -// Future isConnected(); - -// Future close(); - -// TransactionHistory getHistory(); - -// Future connectToNode({Node node, bool useSSL = false, bool isLightWallet = false}); - -// Future startSync(); - -// Future createTransaction( -// TransactionCreationCredentials credentials); - -// Future rescan({int restoreHeight = 0}); -//} diff --git a/lib/entities/wallets_manager.dart b/lib/entities/wallets_manager.dart deleted file mode 100644 index 72c80de978..0000000000 --- a/lib/entities/wallets_manager.dart +++ /dev/null @@ -1,18 +0,0 @@ -import 'package:cake_wallet/entities/wallet.dart'; -import 'package:cake_wallet/entities/wallet_description.dart'; - -abstract class WalletsManager { - Future create(String name, String password, String language); - - Future restoreFromSeed( - String name, String password, String seed, int restoreHeight); - - Future restoreFromKeys(String name, String password, String language, - int restoreHeight, String address, String viewKey, String spendKey); - - Future openWallet(String name, String password); - - Future isWalletExit(String name); - - Future remove(WalletDescription wallet); -} \ No newline at end of file diff --git a/pubspec_base.yaml b/pubspec_base.yaml index b0a4c1c288..fc7b60d118 100644 --- a/pubspec_base.yaml +++ b/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