Updated bitcoin slow transaction priority. Changed version to 4.1.6.

cake-tech · Apr 21, 2021 · 20ccf52 · 20ccf52
1 parent e0d2b44
commit 20ccf52
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -358,7 +358,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 34;
+				CURRENT_PROJECT_VERSION = 35;
 				DEVELOPMENT_TEAM = 32J6BB6VUS;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -375,7 +375,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.1.5;
+				MARKETING_VERSION = 4.1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -501,7 +501,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 34;
+				CURRENT_PROJECT_VERSION = 35;
 				DEVELOPMENT_TEAM = 32J6BB6VUS;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -518,7 +518,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.1.5;
+				MARKETING_VERSION = 4.1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -536,7 +536,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 34;
+				CURRENT_PROJECT_VERSION = 35;
 				DEVELOPMENT_TEAM = 32J6BB6VUS;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -553,7 +553,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.1.5;
+				MARKETING_VERSION = 4.1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

diff --git a/lib/bitcoin/bitcoin_transaction_priority.dart b/lib/bitcoin/bitcoin_transaction_priority.dart
@@ -32,7 +32,7 @@ class BitcoinTransactionPriority extends TransactionPriority {
 
     switch (this) {
       case BitcoinTransactionPriority.slow:
-        label = S.current.transaction_priority_slow;
+        label = '${S.current.transaction_priority_slow} ~24hrs';
         break;
       case BitcoinTransactionPriority.medium:
         label = S.current.transaction_priority_medium;

diff --git a/lib/bitcoin/electrum.dart b/lib/bitcoin/electrum.dart
@@ -305,10 +305,15 @@ class ElectrumClient {
   Future<List<int>> feeRates() async {
     final topDoubleString = await estimatefee(p: 1);
     final middleDoubleString = await estimatefee(p: 20);
-    final bottomDoubleString = await estimatefee(p: 150);
-    final top = (stringDoubleToBitcoinAmount(topDoubleString.toString()) / 1000).round();
-    final middle = (stringDoubleToBitcoinAmount(middleDoubleString.toString()) / 1000).round();
-    final bottom = (stringDoubleToBitcoinAmount(bottomDoubleString.toString()) / 1000).round();
+    final bottomDoubleString = await estimatefee(p: 100);
+    final top = (stringDoubleToBitcoinAmount(topDoubleString.toString()) / 1000)
+        .round();
+    final middle =
+        (stringDoubleToBitcoinAmount(middleDoubleString.toString()) / 1000)
+            .round();
+    final bottom =
+        (stringDoubleToBitcoinAmount(bottomDoubleString.toString()) / 1000)
+            .round();
 
     return [bottom, middle, top];
   }

diff --git a/lib/store/app_store.dart b/lib/store/app_store.dart
@@ -29,7 +29,7 @@ abstract class AppStoreBase with Store {
   NodeListStore nodeListStore;
 
   @action
-  void changeCurrentWallet(WalletBase wallet) {
+  void changeCurrentWallet(WalletBase<Balance> wallet) {
     this.wallet?.close();
     this.wallet = wallet;
   }

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -11,7 +11,7 @@ description: Cake Wallet.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 4.1.5+44
+version: 4.1.6+45
 
 environment:
   sdk: ">=2.7.0 <3.0.0"