various masternode related fixes and improvements

julian-CStack · julian-CStack · commit a088e2c06145 · 2026-01-13T16:21:58.000-06:00
diff --git a/lib/pages/masternodes/create_masternode_view.dart b/lib/pages/masternodes/create_masternode_view.dart
@@ -11,11 +11,16 @@ import '../../widgets/desktop/desktop_dialog_close_button.dart';
 import 'sub_widgets/register_masternode_form.dart';
 
 class CreateMasternodeView extends ConsumerStatefulWidget {
-  const CreateMasternodeView({super.key, required this.firoWalletId});
+  const CreateMasternodeView({
+    super.key,
+    required this.firoWalletId,
+    this.popTxidOnSuccess = true,
+  });
 
   static const routeName = "/createMasternodeView";
 
   final String firoWalletId;
+  final bool popTxidOnSuccess;
 
   @override
   ConsumerState<CreateMasternodeView> createState() =>
@@ -100,7 +105,14 @@ class _CreateMasternodeDialogState extends ConsumerState<CreateMasternodeView> {
             ),
           ),
         ),
-        child: RegisterMasternodeForm(firoWalletId: widget.firoWalletId),
+        child: RegisterMasternodeForm(
+          firoWalletId: widget.firoWalletId,
+          onRegistrationSuccess: (txid) {
+            if (widget.popTxidOnSuccess && mounted) {
+              Navigator.of(context, rootNavigator: Util.isDesktop).pop(txid);
+            }
+          },
+        ),
       ),
     );
   }
diff --git a/lib/pages/masternodes/masternodes_home_view.dart b/lib/pages/masternodes/masternodes_home_view.dart
@@ -5,6 +5,7 @@ import 'package:flutter_svg/svg.dart';
 import '../../providers/global/wallets_provider.dart';
 import '../../themes/stack_colors.dart';
 import '../../utilities/assets.dart';
+import '../../utilities/logger.dart';
 import '../../utilities/text_styles.dart';
 import '../../utilities/util.dart';
 import '../../wallets/wallet/impl/firo_wallet.dart';
@@ -14,6 +15,7 @@ import '../../widgets/desktop/desktop_scaffold.dart';
 import '../../widgets/desktop/primary_button.dart';
 import '../../widgets/dialogs/s_dialog.dart';
 import '../../widgets/loading_indicator.dart';
+import '../../widgets/stack_dialog.dart';
 import 'create_masternode_view.dart';
 import 'sub_widgets/masternodes_list.dart';
 import 'sub_widgets/masternodes_table_desktop.dart';
@@ -33,13 +35,40 @@ class MasternodesHomeView extends ConsumerStatefulWidget {
 class _MasternodesHomeViewState extends ConsumerState<MasternodesHomeView> {
   late Future<List<MasternodeInfo>> _masternodesFuture;
 
-  void _showDesktopCreateMasternodeDialog() {
-    showDialog<void>(
+  Future<void> _showDesktopCreateMasternodeDialog() async {
+    final txid = await showDialog<Object>(
       context: context,
       barrierDismissible: true,
       builder: (context) =>
           SDialog(child: CreateMasternodeView(firoWalletId: widget.walletId)),
     );
+    _handleSuccessTxid(txid);
+  }
+
+  void _handleSuccessTxid(Object? txid) {
+    Logging.instance.i(
+      "$runtimeType _handleSuccessTxid($txid) called where mounted=$mounted",
+    );
+    if (mounted && txid is String) {
+      setState(() {
+        _masternodesFuture =
+            (ref.read(pWallets).getWallet(widget.walletId) as FiroWallet)
+                .getMyMasternodes();
+      });
+
+      showDialog<void>(
+        context: context,
+        builder: (_) => StackOkDialog(
+          title: "Masternode Registration Submitted",
+          message:
+              "Masternode registration submitted, your masternode will "
+              "appear in the list after the tx is confirmed.\n\nTransaction"
+              " ID: $txid",
+          desktopPopRootNavigator: Util.isDesktop,
+          maxWidth: Util.isDesktop ? 400 : null,
+        ),
+      );
+    }
   }
 
   @override
@@ -155,11 +184,12 @@ class _MasternodesHomeViewState extends ConsumerState<MasternodesHomeView> {
                         width: 20,
                         height: 20,
                       ),
-                      onPressed: () {
-                        Navigator.of(context).pushNamed(
+                      onPressed: () async {
+                        final txid = await Navigator.of(context).pushNamed(
                           CreateMasternodeView.routeName,
                           arguments: widget.walletId,
                         );
+                        _handleSuccessTxid(txid);
                       },
                     ),
                   ),
@@ -199,14 +229,15 @@ class _MasternodesHomeViewState extends ConsumerState<MasternodesHomeView> {
                         label: "Create Your First Masternode",
                         horizontalContentPadding: 16,
                         buttonHeight: Util.isDesktop ? .l : null,
-                        onPressed: () {
+                        onPressed: () async {
                           if (Util.isDesktop) {
-                            _showDesktopCreateMasternodeDialog();
+                            await _showDesktopCreateMasternodeDialog();
                           } else {
-                            Navigator.of(context).pushNamed(
+                            final txid = await Navigator.of(context).pushNamed(
                               CreateMasternodeView.routeName,
                               arguments: widget.walletId,
                             );
+                            _handleSuccessTxid(txid);
                           }
                         },
                       ),
diff --git a/lib/pages/masternodes/sub_widgets/register_masternode_form.dart b/lib/pages/masternodes/sub_widgets/register_masternode_form.dart
@@ -11,17 +11,24 @@ import '../../../utilities/text_styles.dart';
 import '../../../utilities/util.dart';
 import '../../../wallets/isar/providers/wallet_info_provider.dart';
 import '../../../wallets/wallet/impl/firo_wallet.dart';
+import '../../../widgets/conditional_parent.dart';
 import '../../../widgets/desktop/primary_button.dart';
 import '../../../widgets/desktop/secondary_button.dart';
 import '../../../widgets/rounded_container.dart';
 import '../../../widgets/stack_dialog.dart';
 import '../../../widgets/textfields/adaptive_text_field.dart';
 
 class RegisterMasternodeForm extends ConsumerStatefulWidget {
-  const RegisterMasternodeForm({super.key, required this.firoWalletId});
+  const RegisterMasternodeForm({
+    super.key,
+    required this.firoWalletId,
+    required this.onRegistrationSuccess,
+  });
 
   final String firoWalletId;
 
+  final void Function(String) onRegistrationSuccess;
+
   @override
   ConsumerState<RegisterMasternodeForm> createState() =>
       _RegisterMasternodeFormState();
@@ -53,11 +60,18 @@ class _RegisterMasternodeFormState
 
   void _validate() {
     if (mounted) {
+      final percent = double.tryParse(_operatorRewardController.text);
       setState(() {
         _enableCreateButton = [
-          _ipAndPortController.text.trim().isNotEmpty,
+          _ipAndPortController.text
+                  .trim()
+                  .split(":")
+                  .where((e) => e.isNotEmpty)
+                  .length ==
+              2,
           _operatorPubKeyController.text.trim().isNotEmpty,
-          _operatorRewardController.text.trim().isNotEmpty,
+          percent != null && !percent.isNegative,
+          percent != null && percent <= 100.0,
           _payoutAddressController.text.trim().isNotEmpty,
         ].every((e) => e);
       });
@@ -70,11 +84,16 @@ class _RegisterMasternodeFormState
     final port = int.parse(parts[1]);
     final operatorPubKey = _operatorPubKeyController.text.trim();
     final votingAddress = _votingAddressController.text.trim();
-    final operatorReward = _operatorRewardController.text.trim().isNotEmpty
-        ? (double.parse(_operatorRewardController.text.trim()) * 100).floor()
-        : 0;
     final payoutAddress = _payoutAddressController.text.trim();
 
+    // according to https://github.com/cypherstack/stack_wallet/blob/c898a70f808ed5490b8dd23571f5f162d9e38158/lib/wallets/wallet/impl/firo_wallet.dart#L1064
+    // this should be a percent of 10000
+    final operatorPercent = double.parse(_operatorRewardController.text);
+    final operatorReward = (10000 * (operatorPercent / 100)).round().clamp(
+      0,
+      10000,
+    );
+
     final wallet =
         ref.read(pWallets).getWallet(widget.firoWalletId) as FiroWallet;
 
@@ -105,41 +124,33 @@ class _RegisterMasternodeFormState
       Exception? ex;
 
       final txId = await showLoading(
-        whileFuture: _registerMasternode(),
+        whileFutureAlt: _registerMasternode,
         context: context,
         message: "Creating and submitting masternode registration...",
         delay: const Duration(seconds: 1),
         onException: (e) => ex = e,
       );
 
       if (mounted) {
-        final String title;
-        String message;
         if (ex != null || txId == null) {
-          message = ex?.toString().trim() ?? "Unknown error: txId=$txId";
+          String message = ex?.toString().trim() ?? "Unknown error: txId=$txId";
           const exceptionPrefix = "Exception:";
           while (message.startsWith(exceptionPrefix) &&
               message.length > exceptionPrefix.length) {
             message = message.substring(exceptionPrefix.length).trim();
           }
-          title = "Registration failed";
+          await showDialog<void>(
+            context: context,
+            builder: (_) => StackOkDialog(
+              title: "Registration failed",
+              message: message,
+              desktopPopRootNavigator: Util.isDesktop,
+              maxWidth: Util.isDesktop ? 400 : null,
+            ),
+          );
         } else {
-          title = "Masternode Registration Submitted";
-          message =
-              "Masternode registration submitted, your masternode will "
-              "appear in the list after the tx is confirmed.\n\nTransaction"
-              " ID: $txId";
+          widget.onRegistrationSuccess.call(txId);
         }
-
-        await showDialog<void>(
-          context: context,
-          builder: (_) => StackOkDialog(
-            title: title,
-            message: message,
-            desktopPopRootNavigator: Util.isDesktop,
-            maxWidth: Util.isDesktop ? 400 : null,
-          ),
-        );
       }
     }).execute;
   }
@@ -180,26 +191,23 @@ class _RegisterMasternodeFormState
       mainAxisSize: MainAxisSize.min,
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Flexible(
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Flexible(
-                child: RoundedContainer(
-                  color: infoColorBG,
-                  child: Padding(
-                    padding: const EdgeInsets.all(8.0),
-                    child: Text(
-                      infoMessage,
-                      style: STextStyles.w600_14(
-                        context,
-                      ).copyWith(color: infoColor),
-                    ),
+        Row(
+          children: [
+            Expanded(
+              child: RoundedContainer(
+                color: infoColorBG,
+                child: Padding(
+                  padding: const EdgeInsets.all(8.0),
+                  child: Text(
+                    infoMessage,
+                    style: STextStyles.w600_14(
+                      context,
+                    ).copyWith(color: infoColor),
                   ),
                 ),
               ),
-            ],
-          ),
+            ),
+          ],
         ),
 
         SizedBox(height: Util.isDesktop ? 24 : 16),
@@ -254,27 +262,32 @@ class _RegisterMasternodeFormState
           onChangedComprehensive: (_) => _validate(),
         ),
 
-        Util.isDesktop ? const SizedBox(height: 32) : const Spacer(),
+        Util.isDesktop
+            ? const SizedBox(height: 32)
+            : const SizedBox(height: 16),
+        if (!Util.isDesktop) const Spacer(),
 
-        Row(
-          children: [
-            Expanded(
-              child: SecondaryButton(
-                label: "Cancel",
-                onPressed: Navigator.of(context).pop,
-                buttonHeight: Util.isDesktop ? .l : null,
-              ),
-            ),
-            SizedBox(width: Util.isDesktop ? 24 : 16),
-            Expanded(
-              child: PrimaryButton(
-                label: "Create",
-                enabled: _enableCreateButton,
-                onPressed: _enableCreateButton ? _register : null,
-                buttonHeight: Util.isDesktop ? .l : null,
+        ConditionalParent(
+          condition: Util.isDesktop,
+          builder: (child) => Row(
+            children: [
+              Expanded(
+                child: SecondaryButton(
+                  label: "Cancel",
+                  onPressed: Navigator.of(context).pop,
+                  buttonHeight: .l,
+                ),
               ),
-            ),
-          ],
+              const SizedBox(width: 24),
+              Expanded(child: child),
+            ],
+          ),
+          child: PrimaryButton(
+            label: "Create",
+            enabled: _enableCreateButton,
+            onPressed: _enableCreateButton ? _register : null,
+            buttonHeight: Util.isDesktop ? .l : null,
+          ),
         ),
       ],
     );
diff --git a/lib/wallets/wallet/impl/firo_wallet.dart b/lib/wallets/wallet/impl/firo_wallet.dart
@@ -34,7 +34,7 @@ class MasternodeInfo {
   final String collateralHash;
   final int collateralIndex;
   final String collateralAddress;
-  final int operatorReward;
+  final double operatorReward;
   final String serviceAddr;
   final int servicePort;
   final int registeredHeight;
@@ -1181,7 +1181,7 @@ class FiroWallet<T extends ElectrumXCurrencyInterface> extends Bip39HDWallet<T>
               collateralHash: info["collateralHash"] as String,
               collateralIndex: info["collateralIndex"] as int,
               collateralAddress: info["collateralAddress"] as String,
-              operatorReward: info["operatorReward"] as int,
+              operatorReward: double.parse(info["operatorReward"].toString()),
               serviceAddr: (info["state"]["service"] as String).substring(
                 0,
                 (info["state"]["service"] as String).lastIndexOf(":"),
