Merge branch 'main' into main_android

TalaoDAO · Nov 7, 2023 · 14f7684 · 14f7684
2 parents e7c548b + 84d7eaa
commit 14f7684
Show file tree

Hide file tree

Showing 20 changed files with 429 additions and 213 deletions.
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -8,5 +8,4 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
 </manifest>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -6,7 +6,6 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <queries>
         <!-- If your app opens https URLs -->
         <intent>

diff --git a/lib/app/shared/constants/parameters.dart b/lib/app/shared/constants/parameters.dart
@@ -62,4 +62,8 @@ class Parameters {
   ];
 
   static const walletConnectEvents = ['chainChanged', 'accountsChanged'];
+
+  static const String clientId = 'urn:altme:0001';
+  static const String clientSecret =
+      'urn:uuid:f2e1b84a-930b-4250-a6c6-f35cabf698c8';
 }
diff --git a/lib/app/shared/constants/secure_storage_keys.dart b/lib/app/shared/constants/secure_storage_keys.dart
@@ -36,8 +36,8 @@ class SecureStorageKeys {
       'enableCryptographicHolderBinding';
   static const String enableScopeParameter = 'enableScopeParameter';
   static const String isPreRegisteredWallet = 'isPreRegisteredWallet';
-  static const String clientSecret = 'clientSecret';
   static const String clientId = 'clientId';
+  static const String clientSecret = 'clientSecret';
 
   static const String pinCode = 'pinCode';
   static const String data = 'data';

diff --git a/lib/app/shared/constants/urls.dart b/lib/app/shared/constants/urls.dart
@@ -71,7 +71,14 @@ class Urls {
   static const String talaoIpfsGateway = 'https://talao.mypinata.cloud/ipfs/';
 
   /// main tezos rpc
-  static const mainnetRPC = 'https://rpc.tzstats.com';
+  static const mainnetRPC = [
+    'https://mainnet.ecadinfra.com',
+    'https://mainnet.api.tez.ie',
+    'https://rpc.tzbeta.net',
+    'https://mainnet.tezos.marigold.dev',
+    'https://rpc.tzstats.com',
+  ];
+
   static const ghostnetRPC = 'https://rpc.tzkt.io/ghostnet';
 
   static const coinGeckoBase = 'https://pro-api.coingecko.com/api/v3/';

diff --git a/lib/app/shared/models/blockchain_network/blockchain_network.dart b/lib/app/shared/models/blockchain_network/blockchain_network.dart
@@ -24,7 +24,7 @@ class BlockchainNetwork extends Equatable {
   final String networkname;
   final String apiUrl;
   final String apiKey;
-  final String rpcNodeUrl;
+  final dynamic rpcNodeUrl;
   final String? title;
   final String? subTitle;
   final BlockchainType type;

diff --git a/lib/dashboard/connection/operation/cubit/operation_cubit.dart b/lib/dashboard/connection/operation/cubit/operation_cubit.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
+import 'dart:math';
 
 import 'package:altme/app/app.dart';
 import 'package:altme/connection_bridge/connection_bridge.dart';
@@ -353,11 +354,11 @@ class OperationCubit extends Cubit<OperationState> {
             case BlockchainType.ethereum:
               rpcUrl = await web3RpcMainnetInfuraURL();
             case BlockchainType.fantom:
-              rpcUrl = FantomNetwork.mainNet().rpcNodeUrl;
+              rpcUrl = FantomNetwork.mainNet().rpcNodeUrl as String;
             case BlockchainType.polygon:
-              rpcUrl = PolygonNetwork.mainNet().rpcNodeUrl;
+              rpcUrl = PolygonNetwork.mainNet().rpcNodeUrl as String;
             case BlockchainType.binance:
-              rpcUrl = BinanceNetwork.mainNet().rpcNodeUrl;
+              rpcUrl = BinanceNetwork.mainNet().rpcNodeUrl as String;
           }
 
           log.i('rpcUrl - $rpcUrl');
@@ -481,10 +482,12 @@ class OperationCubit extends Cubit<OperationState> {
       switch (beaconRequest.request!.network!.type!) {
         case NetworkType.mainnet:
           baseUrl = TezosNetwork.mainNet().apiUrl;
-          rpcNodeUrl = TezosNetwork.mainNet().rpcNodeUrl;
+          final rpcNodeUrlList =
+              TezosNetwork.mainNet().rpcNodeUrl as List<String>;
+          rpcNodeUrl = rpcNodeUrlList[Random().nextInt(rpcNodeUrlList.length)];
         case NetworkType.ghostnet:
           baseUrl = TezosNetwork.ghostnet().apiUrl;
-          rpcNodeUrl = TezosNetwork.ghostnet().rpcNodeUrl;
+          rpcNodeUrl = TezosNetwork.ghostnet().rpcNodeUrl as String;
         case NetworkType.mondaynet:
         case NetworkType.delphinet:
         case NetworkType.edonet: