From 7bd2b6b38a6a52f38fae252b54b67d280e096180 Mon Sep 17 00:00:00 2001
From: Marco <marco@cypherstack.com>
Date: Mon, 29 Aug 2022 21:50:02 +0800
Subject: [PATCH 1/3] fixes firo but removes firo testnet
---
crypto_plugins/flutter_liblelantus | 2 +-
.../add_wallet_view/add_wallet_view.dart | 11 ++---------
lib/pages/address_book_views/address_book_view.dart | 4 +++-
.../subviews/address_book_filter_view.dart | 3 ++-
.../subviews/coin_select_sheet.dart | 8 +++++---
.../manage_nodes_views/manage_nodes_view.dart | 3 ++-
lib/services/coins/firo/firo_wallet.dart | 2 +-
lib/utilities/enums/coin_enum.dart | 3 ++-
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/crypto_plugins/flutter_liblelantus b/crypto_plugins/flutter_liblelantus
index 78533fa42..624204621 160000
--- a/crypto_plugins/flutter_liblelantus
+++ b/crypto_plugins/flutter_liblelantus
@@ -1 +1 @@
-Subproject commit 78533fa427ffc582b83cb67a766c8d38fac2abd8
+Subproject commit 6242046217abf47b61d9397ae447632b06f853fa
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 00dfaad94..45180c842 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
@@ -1,5 +1,3 @@
-import 'dart:io';
-
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/pages/add_wallet_views/add_wallet_view/sub_widgets/coin_select_item.dart';
@@ -15,15 +13,10 @@ class AddWalletView extends StatelessWidget {
static const routeName = "/addWallet";
- final _coins = Coin.values;
-
@override
Widget build(BuildContext context) {
- List<Coin> coins = _coins;
- if (Platform.isIOS) {
- coins = _coins;
- }
- debugPrint("BUILD: $runtimeType");
+ List<Coin> coins = [...Coin.values];
+ coins.remove(Coin.firoTestNet);
return Scaffold(
appBar: AppBar(
leading: AppBarBackButton(
diff --git a/lib/pages/address_book_views/address_book_view.dart b/lib/pages/address_book_views/address_book_view.dart
index 86a350c2b..4b7faaaeb 100644
--- a/lib/pages/address_book_views/address_book_view.dart
+++ b/lib/pages/address_book_views/address_book_view.dart
@@ -48,7 +48,9 @@ class _AddressBookViewState extends ConsumerState<AddressBookView> {
ref.refresh(addressBookFilterProvider);
if (widget.coin == null) {
- final coins = Coin.values.where((e) => !(e == Coin.epicCash)).toList();
+ List<Coin> coins =
+ Coin.values.where((e) => !(e == Coin.epicCash)).toList();
+ coins.remove(Coin.firoTestNet);
bool showTestNet = ref.read(prefsChangeNotifierProvider).showTestNetCoins;
diff --git a/lib/pages/address_book_views/subviews/address_book_filter_view.dart b/lib/pages/address_book_views/subviews/address_book_filter_view.dart
index acfd3c742..e990919de 100644
--- a/lib/pages/address_book_views/subviews/address_book_filter_view.dart
+++ b/lib/pages/address_book_views/subviews/address_book_filter_view.dart
@@ -23,7 +23,8 @@ class _AddressBookFilterViewState extends ConsumerState<AddressBookFilterView> {
@override
void initState() {
- final coins = Coin.values;
+ List<Coin> coins = [...Coin.values];
+ coins.remove(Coin.firoTestNet);
bool showTestNet = ref.read(prefsChangeNotifierProvider).showTestNetCoins;
diff --git a/lib/pages/address_book_views/subviews/coin_select_sheet.dart b/lib/pages/address_book_views/subviews/coin_select_sheet.dart
index 952845fdc..5008a688f 100644
--- a/lib/pages/address_book_views/subviews/coin_select_sheet.dart
+++ b/lib/pages/address_book_views/subviews/coin_select_sheet.dart
@@ -14,6 +14,8 @@ class CoinSelectSheet extends StatelessWidget {
@override
Widget build(BuildContext context) {
final maxHeight = MediaQuery.of(context).size.height * 0.60;
+ var coins_ = [...Coin.values];
+ coins_.remove(Coin.firoTestNet);
return Container(
decoration: const BoxDecoration(
color: CFColors.white,
@@ -68,10 +70,10 @@ class CoinSelectSheet extends StatelessWidget {
return ListView.builder(
shrinkWrap: true,
itemCount: showTestNet
- ? Coin.values.length
- : Coin.values.length - kTestNetCoinCount,
+ ? coins_.length
+ : coins_.length - kTestNetCoinCount,
itemBuilder: (builderContext, index) {
- final coin = Coin.values[index];
+ final coin = coins_[index];
return Padding(
padding: const EdgeInsets.symmetric(vertical: 4),
child: RawMaterialButton(
diff --git a/lib/pages/settings_views/global_settings_view/manage_nodes_views/manage_nodes_view.dart b/lib/pages/settings_views/global_settings_view/manage_nodes_views/manage_nodes_view.dart
index 91c12f8d1..09b3ac752 100644
--- a/lib/pages/settings_views/global_settings_view/manage_nodes_views/manage_nodes_view.dart
+++ b/lib/pages/settings_views/global_settings_view/manage_nodes_views/manage_nodes_view.dart
@@ -23,11 +23,12 @@ class ManageNodesView extends ConsumerStatefulWidget {
}
class _ManageNodesViewState extends ConsumerState<ManageNodesView> {
- List<Coin> _coins = Coin.values;
+ List<Coin> _coins = [...Coin.values];
@override
void initState() {
_coins = _coins.toList();
+ _coins.remove(Coin.firoTestNet);
super.initState();
}
diff --git a/lib/services/coins/firo/firo_wallet.dart b/lib/services/coins/firo/firo_wallet.dart
index 3083ab1a9..52dc22ba2 100644
--- a/lib/services/coins/firo/firo_wallet.dart
+++ b/lib/services/coins/firo/firo_wallet.dart
@@ -726,7 +726,7 @@ Future<String> _getMintScriptWrapper(
}
Future<void> _setTestnetWrapper(bool isTestnet) async {
- setTestnet(isTestnet);
+ // setTestnet(isTestnet);
}
/// Handles a single instance of a firo wallet
diff --git a/lib/utilities/enums/coin_enum.dart b/lib/utilities/enums/coin_enum.dart
index fba48e6f1..9e489dde4 100644
--- a/lib/utilities/enums/coin_enum.dart
+++ b/lib/utilities/enums/coin_enum.dart
@@ -22,7 +22,8 @@ enum Coin {
firoTestNet,
}
-const int kTestNetCoinCount = 3;
+// remove firotestnet for now
+const int kTestNetCoinCount = 2;
extension CoinExt on Coin {
String get prettyName {
From 4075b94df34db8284fe06b4eb9615fe5b22b8021 Mon Sep 17 00:00:00 2001
From: Marco <marco@cypherstack.com>
Date: Mon, 29 Aug 2022 21:54:51 +0800
Subject: [PATCH 2/3] add back firo send test
---
.../services/coins/firo/firo_wallet_test.dart | 36 +++++++++----------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/test/services/coins/firo/firo_wallet_test.dart b/test/services/coins/firo/firo_wallet_test.dart
index b9fae326c..416b361d0 100644
--- a/test/services/coins/firo/firo_wallet_test.dart
+++ b/test/services/coins/firo/firo_wallet_test.dart
@@ -128,24 +128,24 @@ void main() {
expect(result, 1);
});
- // test("isolateCreateJoinSplitTransaction success", () async {
- // final result = await isolateCreateJoinSplitTransaction(
- // 9000,
- // "aNmsUtzPzQ3SKWNjEH48GacMQJXWN5Rotm",
- // true,
- // TEST_MNEMONIC,
- // 2,
- // Decimal.ten,
- // SampleLelantus.lelantusEntries,
- // 459185,
- // Coin.firo,
- // firoNetwork,
- // [GetAnonymitySetSampleData.data],
- // "en_US",
- // );
- //
- // expect(result, isA<Map<String, dynamic>>());
- // });
+ test("isolateCreateJoinSplitTransaction success", () async {
+ final result = await isolateCreateJoinSplitTransaction(
+ 9000,
+ "aNmsUtzPzQ3SKWNjEH48GacMQJXWN5Rotm",
+ true,
+ TEST_MNEMONIC,
+ 2,
+ Decimal.ten,
+ SampleLelantus.lelantusEntries,
+ 459185,
+ Coin.firo,
+ firoNetwork,
+ [GetAnonymitySetSampleData.data],
+ "en_US",
+ );
+
+ expect(result, isA<Map<String, dynamic>>());
+ });
test("isolateEstimateJoinSplitFee", () async {
final result = await isolateEstimateJoinSplitFee(
From 78581ff128fd759bd456c9da611e48305e864589 Mon Sep 17 00:00:00 2001
From: Marco <marco@cypherstack.com>
Date: Mon, 29 Aug 2022 21:56:37 +0800
Subject: [PATCH 3/3] add back tests on push
---
.github/workflows/test.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 02876ffad..dce8dc3e9 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -1,6 +1,6 @@
#should deny
name: Test
-on: [pull_request]
+on: [push, pull_request]
jobs:
test:
runs-on: ubuntu-20.04