From 7654da1d8b16e32caf93846fc25039bd645ada36 Mon Sep 17 00:00:00 2001 From: sneurlax Date: Tue, 22 Nov 2022 11:48:52 -0600 Subject: [PATCH 1/8] remove Wownero if isDesktop or isLinux or isWindows or isMacOS, respectively --- .../add_wallet_view/sub_widgets/searchable_coin_list.dart | 5 +++++ lib/utilities/enums/coin_enum.dart | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/searchable_coin_list.dart b/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/searchable_coin_list.dart index d89d42bbf..38181b9e1 100644 --- a/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/searchable_coin_list.dart +++ b/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/searchable_coin_list.dart @@ -32,6 +32,11 @@ class SearchableCoinList extends ConsumerWidget { // remove firo testnet regardless _coins.remove(Coin.firoTestNet); + // Kidgloves for Wownero on desktop + if(isDesktop) { + _coins.remove(Coin.wownero); + } + return _coins; } diff --git a/lib/utilities/enums/coin_enum.dart b/lib/utilities/enums/coin_enum.dart index 48212bde8..f80c40f52 100644 --- a/lib/utilities/enums/coin_enum.dart +++ b/lib/utilities/enums/coin_enum.dart @@ -12,6 +12,7 @@ import 'package:stackwallet/services/coins/monero/monero_wallet.dart' as xmr; import 'package:stackwallet/services/coins/namecoin/namecoin_wallet.dart' as nmc; import 'package:stackwallet/services/coins/wownero/wownero_wallet.dart' as wow; +import 'dart:io' show Platform; enum Coin { bitcoin, @@ -36,8 +37,7 @@ enum Coin { firoTestNet, } -// remove firotestnet for now -const int kTestNetCoinCount = 4; +int kTestNetCoinCount = (Platform.isLinux || Platform.isWindows || Platform.isMacOS) ? 5 : 4; extension CoinExt on Coin { String get prettyName { From e2baf7372cc160259b641f396c24e11603dd2ce8 Mon Sep 17 00:00:00 2001 From: sneurlax Date: Tue, 22 Nov 2022 11:56:13 -0600 Subject: [PATCH 2/8] expand the ternary for readability --- lib/utilities/enums/coin_enum.dart | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/utilities/enums/coin_enum.dart b/lib/utilities/enums/coin_enum.dart index f80c40f52..648407809 100644 --- a/lib/utilities/enums/coin_enum.dart +++ b/lib/utilities/enums/coin_enum.dart @@ -37,7 +37,12 @@ enum Coin { firoTestNet, } -int kTestNetCoinCount = (Platform.isLinux || Platform.isWindows || Platform.isMacOS) ? 5 : 4; +if(Platform.isLinux || Platform.isWindows || Platform.isMacOS) { + int kTestNetCoinCount = 5; // Because we are removing Wownero from Desktop +} else { + // remove firotestnet for now + int kTestNetCoinCount = 4; +} extension CoinExt on Coin { String get prettyName { From e16bd90a6883f1738dfad14ddacd7598aa06bf66 Mon Sep 17 00:00:00 2001 From: julian-CStack Date: Thu, 23 Mar 2023 09:09:30 -0600 Subject: [PATCH 3/8] BCH 0-conf --- lib/services/coins/bitcoincash/bitcoincash_wallet.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/services/coins/bitcoincash/bitcoincash_wallet.dart b/lib/services/coins/bitcoincash/bitcoincash_wallet.dart index e69833047..a0c764ca3 100644 --- a/lib/services/coins/bitcoincash/bitcoincash_wallet.dart +++ b/lib/services/coins/bitcoincash/bitcoincash_wallet.dart @@ -45,7 +45,7 @@ import 'package:stackwallet/utilities/prefs.dart'; import 'package:tuple/tuple.dart'; import 'package:uuid/uuid.dart'; -const int MINIMUM_CONFIRMATIONS = 1; +const int MINIMUM_CONFIRMATIONS = 0; const int DUST_LIMIT = 546; const String GENESIS_HASH_MAINNET = From 3034cf11f2529948905bb85e02cbbaf1c355ffb3 Mon Sep 17 00:00:00 2001 From: sneurlax Date: Thu, 23 Mar 2023 18:29:25 -0500 Subject: [PATCH 4/8] Revert "remove Wownero if isDesktop" This reverts commit 7654da1d8b16e32caf93846fc25039bd645ada36. --- lib/utilities/enums/coin_enum.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/utilities/enums/coin_enum.dart b/lib/utilities/enums/coin_enum.dart index 47261aaec..2cc7b3363 100644 --- a/lib/utilities/enums/coin_enum.dart +++ b/lib/utilities/enums/coin_enum.dart @@ -42,6 +42,7 @@ enum Coin { } final int kTestNetCoinCount = 4; // Util.isDesktop ? 5 : 4; +// remove firotestnet for now extension CoinExt on Coin { String get prettyName { From 768c51c03b357657e18f628b764a26407a7ead94 Mon Sep 17 00:00:00 2001 From: sneurlax Date: Thu, 23 Mar 2023 18:36:17 -0500 Subject: [PATCH 5/8] Revert "disable wownero on desktop and xmr on windows" But still disable on windows This reverts commit 0062294488559010d4cd8a22f681100cbc3662b6 --- .../add_wallet_view/add_wallet_view.dart | 9 +++------ .../settings/settings_menu/nodes_settings.dart | 4 +--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart b/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart index a0190cfef..39e2e716b 100644 --- a/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart +++ b/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart @@ -46,12 +46,9 @@ class _AddWalletViewState extends State { _searchFieldController = TextEditingController(); _searchFocusNode = FocusNode(); coins.remove(Coin.firoTestNet); - if (isDesktop) { - coins.remove(Coin.wownero); - if (Platform.isWindows) { - coins.remove(Coin.monero); - } - } + if (Platform.isWindows) { + coins.remove(Coin.monero); + coins.remove(Coin.wonero); super.initState(); } diff --git a/lib/pages_desktop_specific/settings/settings_menu/nodes_settings.dart b/lib/pages_desktop_specific/settings/settings_menu/nodes_settings.dart index 8840383d7..4a9cecc65 100644 --- a/lib/pages_desktop_specific/settings/settings_menu/nodes_settings.dart +++ b/lib/pages_desktop_specific/settings/settings_menu/nodes_settings.dart @@ -54,12 +54,10 @@ class _NodesSettings extends ConsumerState { void initState() { _coins = _coins.toList(); _coins.remove(Coin.firoTestNet); - if (isDesktop) { - _coins.remove(Coin.wownero); if (Platform.isWindows) { _coins.remove(Coin.monero); + _coins.remove(Coin.wownero); } - } searchNodeController = TextEditingController(); searchNodeFocusNode = FocusNode(); From 9b91948b1101ee1cdaca451f13cd50f767463475 Mon Sep 17 00:00:00 2001 From: julian-CStack Date: Thu, 23 Mar 2023 17:53:56 -0600 Subject: [PATCH 6/8] BCH 0-conf test update --- test/services/coins/bitcoincash/bitcoincash_wallet_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/services/coins/bitcoincash/bitcoincash_wallet_test.dart b/test/services/coins/bitcoincash/bitcoincash_wallet_test.dart index 20ab88a53..bdc3c71e9 100644 --- a/test/services/coins/bitcoincash/bitcoincash_wallet_test.dart +++ b/test/services/coins/bitcoincash/bitcoincash_wallet_test.dart @@ -25,7 +25,7 @@ import 'bitcoincash_wallet_test_parameters.dart'; void main() async { group("bitcoincash constants", () { test("bitcoincash minimum confirmations", () async { - expect(MINIMUM_CONFIRMATIONS, 1); + expect(MINIMUM_CONFIRMATIONS, 0); }); test("bitcoincash dust limit", () async { expect(DUST_LIMIT, 546); From 5ccd96163c93b6c7fc832a75332dbe331539acb4 Mon Sep 17 00:00:00 2001 From: julian-CStack Date: Thu, 23 Mar 2023 19:01:20 -0600 Subject: [PATCH 7/8] fix --- .../add_wallet_views/add_wallet_view/add_wallet_view.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart b/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart index 39e2e716b..a672ef332 100644 --- a/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart +++ b/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart @@ -48,7 +48,8 @@ class _AddWalletViewState extends State { coins.remove(Coin.firoTestNet); if (Platform.isWindows) { coins.remove(Coin.monero); - coins.remove(Coin.wonero); + coins.remove(Coin.wownero); + } super.initState(); } From d582eb9062afba136d5509918712a2431cc9ec49 Mon Sep 17 00:00:00 2001 From: Diego Salazar Date: Thu, 23 Mar 2023 20:08:43 -0600 Subject: [PATCH 8/8] Bump version (v1.6.5, build 147) --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 11d4eac6c..80a9d758b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ description: Stack 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: 1.6.4+146 +version: 1.6.5+147 environment: sdk: ">=2.17.0 <3.0.0"