Updated bitcoin slow transaction priority. Changed version to 4.1.6.
M committed
Apr 21, 2021 at 11:59 UTC
d23228ac01f85339cfd4ba2859a52f2941a21e1a
5 files changed
+18
-13
ios/Runner.xcodeproj/project.pbxproj
+6
-6
@@ -358,7 +358,7 @@
358
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
359
CLANG_ENABLE_MODULES = YES;
360
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
361
- CURRENT_PROJECT_VERSION = 34;
361
+ CURRENT_PROJECT_VERSION = 35;
362
DEVELOPMENT_TEAM = 32J6BB6VUS;
363
ENABLE_BITCODE = NO;
364
FRAMEWORK_SEARCH_PATHS = (
@@ -375,7 +375,7 @@
375
"$(inherited)",
376
"$(PROJECT_DIR)/Flutter",
377
);
378
- MARKETING_VERSION = 4.1.5;
378
+ MARKETING_VERSION = 4.1.6;
379
PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet;
380
PRODUCT_NAME = "$(TARGET_NAME)";
381
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -501,7 +501,7 @@
501
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
502
CLANG_ENABLE_MODULES = YES;
503
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
504
- CURRENT_PROJECT_VERSION = 34;
504
+ CURRENT_PROJECT_VERSION = 35;
505
DEVELOPMENT_TEAM = 32J6BB6VUS;
506
ENABLE_BITCODE = NO;
507
FRAMEWORK_SEARCH_PATHS = (
@@ -518,7 +518,7 @@
518
"$(inherited)",
519
"$(PROJECT_DIR)/Flutter",
520
);
521
- MARKETING_VERSION = 4.1.5;
521
+ MARKETING_VERSION = 4.1.6;
522
PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet;
523
PRODUCT_NAME = "$(TARGET_NAME)";
524
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -536,7 +536,7 @@
536
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
537
CLANG_ENABLE_MODULES = YES;
538
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
539
- CURRENT_PROJECT_VERSION = 34;
539
+ CURRENT_PROJECT_VERSION = 35;
540
DEVELOPMENT_TEAM = 32J6BB6VUS;
541
ENABLE_BITCODE = NO;
542
FRAMEWORK_SEARCH_PATHS = (
@@ -553,7 +553,7 @@
553
"$(inherited)",
554
"$(PROJECT_DIR)/Flutter",
555
);
556
- MARKETING_VERSION = 4.1.5;
556
+ MARKETING_VERSION = 4.1.6;
557
PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet;
558
PRODUCT_NAME = "$(TARGET_NAME)";
559
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
lib/bitcoin/bitcoin_transaction_priority.dart
+1
-1
@@ -32,7 +32,7 @@ class BitcoinTransactionPriority extends TransactionPriority {
32
33
switch (this) {
34
case BitcoinTransactionPriority.slow:
35
- label = S.current.transaction_priority_slow;
35
+ label = '${S.current.transaction_priority_slow} ~24hrs';
36
break;
37
case BitcoinTransactionPriority.medium:
38
label = S.current.transaction_priority_medium;
lib/bitcoin/electrum.dart
+9
-4
@@ -305,10 +305,15 @@ class ElectrumClient {
305
Future<List<int>> feeRates() async {
306
final topDoubleString = await estimatefee(p: 1);
307
final middleDoubleString = await estimatefee(p: 20);
308
- final bottomDoubleString = await estimatefee(p: 150);
309
- final top = (stringDoubleToBitcoinAmount(topDoubleString.toString()) / 1000).round();
310
- final middle = (stringDoubleToBitcoinAmount(middleDoubleString.toString()) / 1000).round();
311
- final bottom = (stringDoubleToBitcoinAmount(bottomDoubleString.toString()) / 1000).round();
308
+ final bottomDoubleString = await estimatefee(p: 100);
309
+ final top = (stringDoubleToBitcoinAmount(topDoubleString.toString()) / 1000)
310
+ .round();
311
+ final middle =
312
+ (stringDoubleToBitcoinAmount(middleDoubleString.toString()) / 1000)
313
+ .round();
314
+ final bottom =
315
+ (stringDoubleToBitcoinAmount(bottomDoubleString.toString()) / 1000)
316
+ .round();
317
318
return [bottom, middle, top];
319
}
lib/store/app_store.dart
+1
-1
@@ -29,7 +29,7 @@ abstract class AppStoreBase with Store {
29
NodeListStore nodeListStore;
30
31
@action
32
- void changeCurrentWallet(WalletBase wallet) {
32
+ void changeCurrentWallet(WalletBase<Balance> wallet) {
33
this.wallet?.close();
34
this.wallet = wallet;
35
}
pubspec.yaml
+1
-1
@@ -11,7 +11,7 @@ description: Cake Wallet.
11
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
12
# Read more about iOS versioning at
13
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
14
-version: 4.1.5+44
14
+version: 4.1.6+45
15
16
environment:
17
sdk: ">=2.7.0 <3.0.0"