Fix PayNyms: use PayNym.rs

lib/models/paynym/paynym_account_lite.dart

@@ -1,37 +1,56 @@
-/* 
+/*
  * This file is part of Stack Wallet.
- * 
+ *
  * Copyright (c) 2023 Cypher Stack
  * All Rights Reserved.
  * The code is distributed under GPLv3 license, see LICENSE file for details.
  * Generated by Cypher Stack on 2023-05-26
  *
  */
 
+import 'package:bip47/bip47.dart';
+import 'package:bitcoindart/bitcoindart.dart' as bitcoindart;
+
 class PaynymAccountLite {
   final String nymId;
   final String nymName;
   final String code;
   final bool segwit;
+  final bool taproot;
 
   PaynymAccountLite(
     this.nymId,
     this.nymName,
     this.code,
-    this.segwit,
-  );
+    this.segwit, {
+    this.taproot = false,
+  });
 
   PaynymAccountLite.fromMap(Map<String, dynamic> map)
       : nymId = map["nymId"] as String,
         nymName = map["nymName"] as String,
         code = map["code"] as String,
-        segwit = map["segwit"] as bool;
+        segwit = map["segwit"] as bool,
+        taproot = map["taproot"] as bool? ?? inferTaproot(map["code"] as String);
+
+  static bool inferTaproot(String paymentCodeString) {
+    try {
+      final pCode = PaymentCode.fromPaymentCode(
+        paymentCodeString,
+        networkType: bitcoindart.bitcoin,
+      );
+      return pCode.isTaprootEnabled();
+    } catch (_) {
+      return false;
+    }
+  }
 
   Map<String, dynamic> toMap() => {
         "nymId": nymId,
         "nymName": nymName,
         "code": code,
         "segwit": segwit,
+        "taproot": taproot,
       };
 
   @override

lib/models/paynym/paynym_claim.dart

@@ -15,7 +15,7 @@ class PaynymClaim {
   PaynymClaim(this.claimed, this.token);
 
   PaynymClaim.fromMap(Map<String, dynamic> map)
-      : claimed = map["claimed"] as String,
+      : claimed = map["claimed"].toString(),
         token = map["token"] as String;
 
   Map<String, dynamic> toMap() => {

lib/pages/paynym/paynym_claim_view.dart

@@ -192,8 +192,11 @@ class _PaynymClaimViewState extends ConsumerState<PaynymClaimView> {
 
                   if (shouldCancel) return;
 
-                  // get payment code
-                  final pCode = await wallet.getPaymentCode(isSegwit: false);
+                  // get payment code with taproot + segwit feature bits
+                  final pCode = await wallet.getPaymentCode(
+                    isSegwit: true,
+                    isTaproot: true,
+                  );
 
                   if (shouldCancel) return;
 
@@ -206,21 +209,33 @@ class _PaynymClaimViewState extends ConsumerState<PaynymClaimView> {
                   if (shouldCancel) return;
 
                   if (created.value!.claimed) {
-                    // payment code already claimed
+                    // payment code already claimed — load account and navigate
                     debugPrint("pcode already claimed!!");
 
-                    // final account =
-                    //     await ref.read(paynymAPIProvider).nym(pCode.toString());
-                    // if (!account.value!.segwit) {
-                    //   for (int i = 0; i < 100; i++) {
-                    //     final result = await _addSegwitCode(account.value!);
-                    //     if (result == true) {
-                    //       break;
-                    //     }
-                    //   }
-                    // }
+                    final account = await ref
+                        .read(paynymAPIProvider)
+                        .nym(pCode.toString());
 
-                    if (mounted) {
+                    if (shouldCancel) return;
+
+                    if (account.value != null && mounted) {
+                      ref.read(myPaynymAccountStateProvider.state).state =
+                          account.value!;
+                      if (isDesktop) {
+                        Navigator.of(context, rootNavigator: true).pop();
+                        Navigator.of(context).pop();
+                      } else {
+                        Navigator.of(context).popUntil(
+                          ModalRoute.withName(
+                            WalletView.routeName,
+                          ),
+                        );
+                      }
+                      await Navigator.of(context).pushNamed(
+                        PaynymHomeView.routeName,
+                        arguments: widget.walletId,
+                      );
+                    } else if (mounted) {
                       if (isDesktop) {
                         Navigator.of(context, rootNavigator: true).pop();
                         Navigator.of(context).pop();
@@ -240,22 +255,38 @@ class _PaynymClaimViewState extends ConsumerState<PaynymClaimView> {
                   final token =
                       await ref.read(paynymAPIProvider).token(pCode.toString());
 
+                  debugPrint("token result: $token");
+
                   if (shouldCancel) return;
 
+                  if (token.value == null) {
+                    debugPrint("token fetch failed: ${token.message}");
+                    if (mounted) {
+                      Navigator.of(context, rootNavigator: isDesktop).pop();
+                    }
+                    return;
+                  }
+
                   // sign token with notification private key
                   final signature =
                       await wallet.signStringWithNotificationKey(token.value!);
 
+                  debugPrint("signature: $signature");
+
                   if (shouldCancel) return;
 
                   // claim paynym account
                   final claim = await ref
                       .read(paynymAPIProvider)
                       .claim(token.value!, signature);
 
+                  debugPrint("claim result: $claim");
+
                   if (shouldCancel) return;
 
-                  if (claim.value?.claimed == pCode.toString()) {
+                  if (claim.statusCode == 200 ||
+                      claim.value?.claimed == pCode.toString() ||
+                      claim.value?.claimed == "true") {
                     final account =
                         await ref.read(paynymAPIProvider).nym(pCode.toString());
                     // if (!account.value!.segwit) {
@@ -286,6 +317,13 @@ class _PaynymClaimViewState extends ConsumerState<PaynymClaimView> {
                       );
                     }
                   } else if (mounted && !shouldCancel) {
+                    debugPrint(
+                      "claim failed or mismatch: "
+                      "claimed=${claim.value?.claimed}, "
+                      "expected=${pCode.toString()}, "
+                      "statusCode=${claim.statusCode}, "
+                      "message=${claim.message}",
+                    );
                     Navigator.of(context, rootNavigator: isDesktop).pop();
                   }
                 },

lib/utilities/paynym_is_api.dart

@@ -65,10 +65,16 @@ class PaynymIsApi {
     // debugPrint("Paynym response code: ${response.code}");
     // debugPrint("Paynym response body: ${response.body}");
 
-    return Tuple2(
-      jsonDecode(response.body) as Map<String, dynamic>,
-      response.code,
-    );
+    Map<String, dynamic> parsedBody;
+    try {
+      final bodyStr = response.body.trim();
+      parsedBody = bodyStr.isEmpty
+          ? {}
+          : jsonDecode(bodyStr) as Map<String, dynamic>;
+    } catch (_) {
+      parsedBody = {};
+    }
+    return Tuple2(parsedBody, response.code);
   }
 
   // ### `/api/v1/create`
@@ -357,11 +363,16 @@ class PaynymIsApi {
     switch (result.item2) {
       case 200:
         message = "Payment code successfully claimed";
-        value = PaynymClaim.fromMap(result.item1);
+        if (result.item1.isNotEmpty) {
+          value = PaynymClaim.fromMap(result.item1);
+        }
         break;
       case 400:
         message = "Bad request";
         break;
+      case 401:
+        message = "Unauthorized token or signature";
+        break;
       default:
         message = result.item1["message"] as String? ?? "Unknown error";
     }