TalaoDAO · hawkbee1 · Nov 8, 2023 · Nov 8, 2023 · Nov 8, 2023 · Nov 8, 2023
diff --git a/lib/app/shared/constants/parameters.dart b/lib/app/shared/constants/parameters.dart
@@ -66,4 +66,6 @@ class Parameters {
   static const String clientId = 'urn:altme:0001';
   static const String clientSecret =
       'urn:uuid:f2e1b84a-930b-4250-a6c6-f35cabf698c8';
+
+  static const int maxEntries = 3;
 }
diff --git a/lib/app/shared/constants/secure_storage_keys.dart b/lib/app/shared/constants/secure_storage_keys.dart
@@ -35,7 +35,7 @@ class SecureStorageKeys {
   static const String enableCryptographicHolderBinding =
       'enableCryptographicHolderBinding';
   static const String enableScopeParameter = 'enableScopeParameter';
-  static const String isPreRegisteredWallet = 'isPreRegisteredWallet';
+  static const String useBasicClientAuthentication = 'isPreRegisteredWallet';
   static const String clientId = 'clientId';
   static const String clientSecret = 'clientSecret';
 

diff --git a/lib/app/shared/extension/extension.dart b/lib/app/shared/extension/extension.dart
@@ -1,3 +1,4 @@
 export 'credential_status.dart';
 export 'iterable_extension.dart';
 export 'string_extension.dart';
+export 'unit8List_extension.dart';
diff --git a/lib/app/shared/extension/unit8List_extension.dart b/lib/app/shared/extension/unit8List_extension.dart
@@ -0,0 +1,21 @@
+import 'dart:typed_data';
+
+extension Uint8ListExtension on Uint8List {
+  Uint8List get filterPayload {
+    final tester = Uint8List.fromList([5, 1]);
+
+    if (length <= 6) {
+      return this;
+    }
+
+    if (this[0] != tester[0]) {
+      return this;
+    }
+
+    if (this[1] != tester[1]) {
+      return this;
+    }
+
+    return sublist(6);
+  }
+}
diff --git a/lib/dashboard/connection/operation/cubit/operation_cubit.dart b/lib/dashboard/connection/operation/cubit/operation_cubit.dart
@@ -458,122 +458,141 @@ class OperationCubit extends Cubit<OperationState> {
     emit(state.copyWith(status: AppStatus.goBack));
   }
 
+  String? rpcNodeUrlForTransaction;
+
   Future<OperationsList> getBeaonOperationList({
     required bool preCheckBalance,
   }) async {
-    try {
-      log.i('getOperationList');
+    int retryCount = 0;
+    const maxRetries = Parameters.maxEntries;
+    while (retryCount < maxRetries) {
+      try {
+        log.i('getOperationList');
 
-      final BeaconRequest beaconRequest = beaconCubit.state.beaconRequest!;
+        final BeaconRequest beaconRequest = beaconCubit.state.beaconRequest!;
 
-      final CryptoAccountData? currentAccount = walletCubit
-          .getCryptoAccountData(beaconRequest.request!.sourceAddress!);
+        final CryptoAccountData? currentAccount = walletCubit
+            .getCryptoAccountData(beaconRequest.request!.sourceAddress!);
 
-      if (currentAccount == null) {
-        throw ResponseMessage(
-          message: ResponseString
-              .RESPONSE_STRING_SOMETHING_WENT_WRONG_TRY_AGAIN_LATER,
-        );
-      }
+        if (currentAccount == null) {
+          throw ResponseMessage(
+            message: ResponseString
+                .RESPONSE_STRING_SOMETHING_WENT_WRONG_TRY_AGAIN_LATER,
+          );
+        }
+
+        late String baseUrl;
 
-      late String baseUrl;
-      late String rpcNodeUrl;
+        final NetworkType? networkType = beaconRequest.request?.network?.type;
 
-      switch (beaconRequest.request!.network!.type!) {
-        case NetworkType.mainnet:
+        if (networkType == null) {
+          throw ResponseMessage(
+            message: ResponseString
+                .RESPONSE_STRING_SOMETHING_WENT_WRONG_TRY_AGAIN_LATER,
+          );
+        }
+
+        if (networkType == NetworkType.mainnet) {
           baseUrl = TezosNetwork.mainNet().apiUrl;
           final rpcNodeUrlList =
               TezosNetwork.mainNet().rpcNodeUrl as List<String>;
-          rpcNodeUrl = rpcNodeUrlList[Random().nextInt(rpcNodeUrlList.length)];
-        case NetworkType.ghostnet:
+
+          rpcNodeUrlForTransaction ??=
+              rpcNodeUrlList[Random().nextInt(rpcNodeUrlList.length)];
+        } else if (networkType == NetworkType.ghostnet) {
           baseUrl = TezosNetwork.ghostnet().apiUrl;
-          rpcNodeUrl = TezosNetwork.ghostnet().rpcNodeUrl as String;
-        case NetworkType.mondaynet:
-        case NetworkType.delphinet:
-        case NetworkType.edonet:
-        case NetworkType.florencenet:
-        case NetworkType.granadanet:
-        case NetworkType.hangzhounet:
-        case NetworkType.ithacanet:
-        case NetworkType.jakartanet:
-        case NetworkType.kathmandunet:
-        case NetworkType.custom:
+          rpcNodeUrlForTransaction =
+              TezosNetwork.ghostnet().rpcNodeUrl as String;
+        } else {
           throw ResponseMessage(
             message: ResponseString
                 .RESPONSE_STRING_SOMETHING_WENT_WRONG_TRY_AGAIN_LATER,
           );
-      }
-
-      // TezartError also handles low balance
-
-      if (preCheckBalance) {
-        /// check xtz balance
-        log.i('checking xtz');
-        final int balance = await dioClient.get(
-          '$baseUrl/v1/accounts/${beaconRequest.request!.sourceAddress!}/balance',
-        ) as int;
-        log.i('total xtz - $balance');
-        final formattedBalance = int.parse(
-          balance.toStringAsFixed(6).replaceAll('.', '').replaceAll(',', ''),
-        );
+        }
 
-        final amount = int.parse(beaconRequest.operationDetails!.first.amount!);
+        // TezartError also handles low balance
+
+        if (preCheckBalance) {
+          /// check xtz balance
+          log.i('checking xtz');
+          final int balance = await dioClient.get(
+            '$baseUrl/v1/accounts/${beaconRequest.request!.sourceAddress!}/balance',
+          ) as int;
+          log.i('total xtz - $balance');
+          final formattedBalance = int.parse(
+            balance.toStringAsFixed(6).replaceAll('.', '').replaceAll(',', ''),
+          );
 
-        if (amount >= formattedBalance) {
-          emit(
-            state.copyWith(
-              message: StateMessage.error(
-                messageHandler: ResponseMessage(
-                  message:
-                      ResponseString.RESPONSE_STRING_transactionIsLikelyToFail,
+          final amount =
+              int.parse(beaconRequest.operationDetails!.first.amount!);
+
+          if (amount >= formattedBalance) {
+            emit(
+              state.copyWith(
+                message: StateMessage.error(
+                  messageHandler: ResponseMessage(
+                    message: ResponseString
+                        .RESPONSE_STRING_transactionIsLikelyToFail,
+                  ),
                 ),
               ),
-            ),
-          );
+            );
+          }
         }
-      }
-
-      final client = TezartClient(rpcNodeUrl);
-      final keystore =
-          keyGenerator.getKeystore(secretKey: currentAccount.secretKey);
 
-      final operationList = OperationsList(
-        source: keystore,
-        publicKey: keystore.publicKey,
-        rpcInterface: client.rpcInterface,
-      );
+        final client = TezartClient(rpcNodeUrlForTransaction!);
+        final keystore =
+            keyGenerator.getKeystore(secretKey: currentAccount.secretKey);
 
-      final List<Operation> operations = getBeaonOperation();
-      for (final element in operations) {
-        operationList.appendOperation(element);
-      }
+        final operationList = OperationsList(
+          source: keystore,
+          publicKey: keystore.publicKey,
+          rpcInterface: client.rpcInterface,
+        );
 
-      final isReveal = await client.isKeyRevealed(keystore.address);
-      if (!isReveal) {
-        operationList.prependOperation(RevealOperation());
-      }
-      log.i(
-        'publicKey: ${keystore.publicKey} '
-        'amount: ${state.amount} '
-        'networkFee: ${state.fee} '
-        'address: ${keystore.address} =>To address: '
-        '${beaconRequest.operationDetails!.first.destination!}',
-      );
+        final List<Operation> operations = getBeaonOperation();
+        for (final element in operations) {
+          operationList.appendOperation(element);
+        }
 
-      return operationList;
-    } catch (e, s) {
-      log.e('error : $e, s: $s');
-      if (e is MessageHandler) {
-        rethrow;
-      } else if (e is TezartNodeError) {
-        log.e('e: $e , metadata: ${e.metadata} , s: $s');
-        rethrow;
-      } else {
-        throw ResponseMessage(
-          message: ResponseString.RESPONSE_STRING_OPERATION_FAILED,
+        final isReveal = await client.isKeyRevealed(keystore.address);
+        if (!isReveal) {
+          operationList.prependOperation(RevealOperation());
+        }
+        log.i(
+          'publicKey: ${keystore.publicKey} '
+          'amount: ${state.amount} '
+          'networkFee: ${state.fee} '
+          'address: ${keystore.address} =>To address: '
+          '${beaconRequest.operationDetails!.first.destination!}',
         );
+
+        return operationList;
+      } catch (e, s) {
+        log.e('error : $e, s: $s');
+        retryCount++;
+        log.i('retryCount: $retryCount');
+
+        if (e is MessageHandler) {
+          rethrow;
+        } else if (e is TezartNodeError) {
+          log.e('e: $e , metadata: ${e.metadata} , s: $s');
+          if (retryCount < maxRetries) {
+            await Future<void>.delayed(const Duration(seconds: 1));
+          } else {
+            rethrow;
+          }
+        } else {
+          throw ResponseMessage(
+            message: ResponseString.RESPONSE_STRING_OPERATION_FAILED,
+          );
+        }
       }
     }
+
+    throw ResponseMessage(
+      message: ResponseString.RESPONSE_STRING_OPERATION_FAILED,
+    );
   }
 
   List<Operation> getBeaonOperation() {

diff --git a/lib/dashboard/connection/sign_payload/cubit/sign_payload_cubit.dart b/lib/dashboard/connection/sign_payload/cubit/sign_payload_cubit.dart
@@ -71,7 +71,8 @@ class SignPayloadCubit extends Cubit<SignPayloadState> {
             encodedPayload = stringToHexPrefixedWith05(payload: payload);
             signingType = SigningType.raw;
           }
-          final bytes = hexToBytes(encodedPayload);
+          final bytes = hexToBytes(encodedPayload).filterPayload;
+
           payloadMessage = utf8.decode(bytes, allowMalformed: true);
 
         case ConnectionBridgeType.walletconnect:

diff --git a/lib/dashboard/connection/sign_payload/view/sign_payload_page.dart b/lib/dashboard/connection/sign_payload/view/sign_payload_page.dart
@@ -187,7 +187,7 @@ class _SignPayloadViewState extends State<SignPayloadView> {
                         textAlign: TextAlign.left,
                         style: Theme.of(context).textTheme.titleLarge,
                       ),
-                      const SizedBox(height: Sizes.spaceXLarge),
+                      const SizedBox(height: Sizes.spaceXSmall),
                       Text(
                         message,
                         textAlign: TextAlign.left,

diff --git a/lib/dashboard/drawer/ssi/advanced_settings2/oidc4vc_settngs/view/oidc4vc_settings_menu.dart b/lib/dashboard/drawer/ssi/advanced_settings2/oidc4vc_settngs/view/oidc4vc_settings_menu.dart
@@ -43,7 +43,7 @@ class Oidc4vcSettingMenuView extends StatelessWidget {
           const SubjectSyntaxTypeWidget(),
           const CryptographicHolderBindingWidget(),
           const ScopeParameterWidget(),
-          const PreRegisteredWalletWidget(),
+          const ClientAuthenticationWidget(),
           DrawerItem(
             title: l10n.clientMetadata,
             onTap: () {