Merge pull request #1921 from ardriveapp/dev

PE-7141: Release ArDrive v2.57.2
ardriveapp · Nov 19, 2024 · b482359 · b482359
2 parents d2f596a + 6bb1367
commit b482359
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 15 deletions.
diff --git a/lib/blocs/upload/upload_cubit.dart b/lib/blocs/upload/upload_cubit.dart
@@ -150,7 +150,7 @@ class UploadCubit extends Cubit<UploadState> {
             fileId: manifestModels[i].existingManifestFileId,
           )
           .getSingle();
-      
+
       await _createManifestCubit.prepareManifestTx(
         manifestName: manifestFileEntry.name,
         folderId: manifestFileEntry.parentFolderId,
@@ -886,6 +886,10 @@ class UploadCubit extends Cubit<UploadState> {
       if (state is UploadReady) {
         emit((state as UploadReady).copyWith(arnsRecords: value));
       }
+    }).catchError((e) {
+      logger.e(
+          'Error getting ant records for wallet. Proceeding with the upload...',
+          e);
     });
 
     _files
@@ -1032,9 +1036,14 @@ class UploadCubit extends Cubit<UploadState> {
       }
 
       if (manifestFileEntries.isNotEmpty) {
-        // load arns names
-        await _arnsRepository
-            .getAntRecordsForWallet(_auth.currentUser.walletAddress);
+        try {
+          await _arnsRepository
+              .getAntRecordsForWallet(_auth.currentUser.walletAddress);
+        } catch (e) {
+          logger.e(
+              'Error getting ant records for wallet. Proceeding with the upload...',
+              e);
+        }
       }
 
       emit(

diff --git a/lib/main.dart b/lib/main.dart
@@ -75,6 +75,7 @@ late ConfigService configService;
 late ArweaveService arweave;
 late TurboUploadService _turboUpload;
 late PaymentService _turboPayment;
+late Database db;
 
 void main() async {
   await runZonedGuarded(() async {
@@ -129,11 +130,14 @@ Future<void> _initializeServices() async {
 
   final config = configService.config;
 
+  db = Database();
+
   arweave = ArweaveService(
     Arweave(
       gatewayUrl: Uri.parse(config.defaultArweaveGatewayForDataRequest.url),
     ),
     ArDriveCrypto(),
+    db.driveDao,
     configService,
   );
   _turboUpload = config.useTurboUpload
@@ -395,7 +399,7 @@ class AppState extends State<App> {
             ),
           ),
         ),
-        RepositoryProvider<Database>(create: (_) => Database()),
+        RepositoryProvider<Database>(create: (_) => db),
         RepositoryProvider<ProfileDao>(
             create: (context) => context.read<Database>().profileDao),
         RepositoryProvider<DriveDao>(

diff --git a/lib/services/arweave/arweave_service.dart b/lib/services/arweave/arweave_service.dart
@@ -4,6 +4,7 @@ import 'dart:convert';
 
 import 'package:ardrive/core/crypto/crypto.dart';
 import 'package:ardrive/entities/entities.dart';
+import 'package:ardrive/models/daos/drive_dao/drive_dao.dart';
 import 'package:ardrive/services/arweave/arweave_service_exception.dart';
 import 'package:ardrive/services/arweave/error/gateway_error.dart';
 import 'package:ardrive/services/arweave/get_segmented_transaction_from_drive_strategy.dart';
@@ -42,12 +43,13 @@ const kMaxNumberOfTransactionsPerPage = 100;
 class ArweaveService {
   Arweave client;
   final ArDriveCrypto _crypto;
-
+  final DriveDao _driveDao;
   final ArtemisClient _gql;
 
   ArweaveService(
     this.client,
     this._crypto,
+    this._driveDao,
     ConfigService configService, {
     ArtemisClient? artemisClient,
   }) : _gql = artemisClient ??
@@ -588,15 +590,26 @@ class ArweaveService {
           continue;
         }
 
-        final driveKey =
-            driveTx.getTag(EntityTag.drivePrivacy) == DrivePrivacyTag.private
-                ? await _crypto.deriveDriveKey(
-                    wallet,
-                    driveTx.getTag(EntityTag.driveId)!,
-                    password,
-                  )
-                : null;
+        SecretKey? driveKey;
+
+        if (driveTx.getTag(EntityTag.drivePrivacy) == DrivePrivacyTag.private) {
+          driveKey = await _driveDao.getDriveKeyFromMemory(
+            driveTx.getTag(EntityTag.driveId)!,
+          );
+
+          if (driveKey == null) {
+            driveKey = await _crypto.deriveDriveKey(
+              wallet,
+              driveTx.getTag(EntityTag.driveId)!,
+              password,
+            );
 
+            _driveDao.putDriveKeyInMemory(
+              driveID: driveTx.getTag(EntityTag.driveId)!,
+              driveKey: driveKey,
+            );
+          }
+        }
         try {
           final drive = await DriveEntity.fromTransaction(
             driveTx,

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Secure, permanent storage
 
 publish_to: 'none'
 
-version: 2.57.1
+version: 2.57.2
 
 environment:
   sdk: '>=3.2.0 <4.0.0'