Merge pull request #1481 from ardriveapp/dev

PE-5027: Release App v2.24.2
ardriveapp · Nov 14, 2023 · 94ae06c · 94ae06c
2 parents 1a8585e + e9f7f69
commit 94ae06c
Show file tree

Hide file tree

Showing 34 changed files with 1,037 additions and 215 deletions.
diff --git a/.gitignore b/.gitignore
@@ -43,6 +43,7 @@ macos/flutter/ephemeral
 linux/flutter/ephemeral
 windows/flutter/ephemeral
 
+scripts/build/.last_build_id
 # Web related
 
 # Symbolication related

diff --git a/android/fastlane/metadata/android/en-US/changelogs/77.txt b/android/fastlane/metadata/android/en-US/changelogs/77.txt
@@ -0,0 +1,3 @@
+- Including additional fields for wallets when generated in the Android app.
+- Fixing issue to include $U tags on D2N bundles.
+- Optimizing PST retrieval by excluding Verto and Redstone Cache.
diff --git a/lib/blocs/upload/upload_cubit.dart b/lib/blocs/upload/upload_cubit.dart
@@ -12,7 +12,6 @@ import 'package:ardrive/entities/file_entity.dart';
 import 'package:ardrive/entities/folder_entity.dart';
 import 'package:ardrive/main.dart';
 import 'package:ardrive/models/models.dart';
-import 'package:ardrive/services/services.dart';
 import 'package:ardrive/turbo/services/upload_service.dart';
 import 'package:ardrive/turbo/utils/utils.dart';
 import 'package:ardrive/utils/logger/logger.dart';
@@ -40,8 +39,6 @@ class UploadCubit extends Cubit<UploadState> {
 
   final ProfileCubit _profileCubit;
   final DriveDao _driveDao;
-  final ArweaveService _arweave;
-  final TurboUploadService _turbo;
   final PstService _pst;
   final UploadFileChecker _uploadFileChecker;
   final ArDriveAuth _auth;
@@ -100,8 +97,6 @@ class UploadCubit extends Cubit<UploadState> {
     required this.files,
     required ProfileCubit profileCubit,
     required DriveDao driveDao,
-    required ArweaveService arweave,
-    required TurboUploadService turbo,
     required PstService pst,
     required UploadFileChecker uploadFileChecker,
     required ArDriveAuth auth,
@@ -112,8 +107,6 @@ class UploadCubit extends Cubit<UploadState> {
   })  : _profileCubit = profileCubit,
         _uploadFileChecker = uploadFileChecker,
         _driveDao = driveDao,
-        _arweave = arweave,
-        _turbo = turbo,
         _pst = pst,
         _auth = auth,
         _arDriveUploadManager = arDriveUploadManager,
@@ -461,57 +454,34 @@ class UploadCubit extends Cubit<UploadState> {
     logger.d(
         'Wallet verified. Starting bundle preparation.... Number of bundles: ${uploadPlanForAr.bundleUploadHandles.length}. Number of V2 files: ${uploadPlanForAr.fileV2UploadHandles.length}');
 
-    if (configService.config.useNewUploader) {
-      if (_uploadMethod == UploadMethod.turbo) {
-        await _verifyIfUploadContainsLargeFilesUsingTurbo();
-        if ((_containsLargeTurboUpload ?? false) &&
-            !hasEmittedWarning &&
-            kIsWeb &&
-            !await AppPlatform.isChrome()) {
-          emit(
-            UploadShowingWarning(
-              reason: UploadWarningReason.fileTooLargeOnNonChromeBrowser,
-              uploadPlanForAR: uploadPlanForAr,
-              uploadPlanForTurbo: uploadPlanForTurbo,
-            ),
-          );
-          hasEmittedWarning = true;
-          return;
-        }
-      } else {
-        _containsLargeTurboUpload = false;
-      }
-
-      if (uploadFolders) {
-        await _uploadFolderUsingArDriveUploader();
+    if (_uploadMethod == UploadMethod.turbo) {
+      await _verifyIfUploadContainsLargeFilesUsingTurbo();
+      if ((_containsLargeTurboUpload ?? false) &&
+          !hasEmittedWarning &&
+          kIsWeb &&
+          !await AppPlatform.isChrome()) {
+        emit(
+          UploadShowingWarning(
+            reason: UploadWarningReason.fileTooLargeOnNonChromeBrowser,
+            uploadPlanForAR: uploadPlanForAr,
+            uploadPlanForTurbo: uploadPlanForTurbo,
+          ),
+        );
+        hasEmittedWarning = true;
         return;
       }
-
-      await _uploadUsingArDriveUploader();
-
-      return;
+    } else {
+      _containsLargeTurboUpload = false;
     }
 
-    logger.d('Uploading using the old uploader');
-    final uploader = _getUploader();
-
-    await for (final progress in uploader.uploadFromHandles(
-      bundleHandles: uploadPlan.bundleUploadHandles,
-      fileV2Handles: uploadPlan.fileV2UploadHandles.values.toList(),
-    )) {
-      emit(
-        UploadInProgress(
-          uploadPlan: uploadPlan,
-          progress: progress,
-        ),
-      );
+    if (uploadFolders) {
+      await _uploadFolderUsingArDriveUploader();
+      return;
     }
 
-    logger.d('Upload finished');
+    await _uploadUsingArDriveUploader();
 
-    unawaited(_profileCubit.refreshBalance());
-
-    emit(UploadComplete());
+    return;
   }
 
   Future<void> _uploadFolderUsingArDriveUploader() async {
@@ -543,6 +513,9 @@ class UploadCubit extends Cubit<UploadState> {
         parentFolderId: folder.parentFolderId,
         privacy: _targetDrive.isPrivate ? 'private' : 'public',
         entityId: folder.id,
+        type: _uploadMethod == UploadMethod.ar
+            ? UploadType.d2n
+            : UploadType.turbo,
       );
 
       entities.add((
@@ -568,6 +541,9 @@ class UploadCubit extends Cubit<UploadState> {
         parentFolderId: file.parentFolderId,
         privacy: _targetDrive.isPrivate ? 'private' : 'public',
         entityId: id,
+        type: _uploadMethod == UploadMethod.ar
+            ? UploadType.d2n
+            : UploadType.turbo,
       );
 
       entities.add((fileMetadata, file.ioFile));
@@ -662,6 +638,9 @@ class UploadCubit extends Cubit<UploadState> {
         entityId: revisionAction == RevisionAction.uploadNewVersion
             ? conflictingFiles[file.getIdentifier()]
             : null,
+        type: _uploadMethod == UploadMethod.ar
+            ? UploadType.d2n
+            : UploadType.turbo,
       );
 
       uploadFiles.add((args, file.ioFile));
@@ -826,74 +805,6 @@ class UploadCubit extends Cubit<UploadState> {
     }
   }
 
-  ArDriveUploaderFromHandles _getUploader() {
-    final wallet = _auth.currentUser.wallet;
-
-    final turboUploader = TurboUploader(_turbo, wallet);
-    final arweaveUploader = ArweaveBundleUploader(_arweave.client);
-
-    logger.d(
-        'Uploaders created: Turbo: $turboUploader, Arweave: $arweaveUploader');
-
-    final bundleUploader = BundleUploader(
-      turboUploader,
-      arweaveUploader,
-      _uploadMethod == UploadMethod.turbo,
-    );
-
-    final v2Uploader = FileV2Uploader(_arweave.client, _arweave);
-
-    final uploader = ArDriveUploaderFromHandles(
-      bundleUploader: bundleUploader,
-      fileV2Uploader: v2Uploader,
-      prepareBundle: (handle) async {
-        logger.d(
-            'Preparing bundle.. using turbo: ${_uploadMethod == UploadMethod.turbo}');
-
-        await handle.prepareAndSignBundleTransaction(
-          tabVisibilitySingleton: TabVisibilitySingleton(),
-          arweaveService: _arweave,
-          turboUploadService: _turbo,
-          pstService: _pst,
-          wallet: _auth.currentUser.wallet,
-          isArConnect: await _profileCubit.isCurrentProfileArConnect(),
-          useTurbo: _uploadMethod == UploadMethod.turbo,
-        );
-
-        logger.d('Bundle preparation finished');
-      },
-      prepareFile: (handle) async {
-        logger.d('Preparing file...');
-
-        await handle.prepareAndSignTransactions(
-          arweaveService: _arweave,
-          wallet: wallet,
-          pstService: _pst,
-        );
-      },
-      onFinishFileUpload: (handle) async {
-        unawaited(handle.writeFileEntityToDatabase(driveDao: _driveDao));
-      },
-      onFinishBundleUpload: (handle) async {
-        unawaited(handle.writeBundleItemsToDatabase(driveDao: _driveDao));
-      },
-      onUploadBundleError: (handle, error) async {
-        if (!hasEmittedError) {
-          addError(error);
-          hasEmittedError = true;
-        }
-      },
-      onUploadFileError: (handle, error) async {
-        if (!hasEmittedError) {
-          addError(error);
-          hasEmittedError = true;
-        }
-      },
-    );
-
-    return uploader;
-  }
-
   Future<void> skipLargeFilesAndCheckForConflicts() async {
     emit(UploadPreparationInProgress());
     final List<String> filesToSkip = await _uploadFileChecker

diff --git a/lib/components/upload_form.dart b/lib/components/upload_form.dart
@@ -124,8 +124,6 @@ Future<void> promptToUpload(
           parentFolderId: parentFolderId,
           files: selectedFiles,
           profileCubit: context.read<ProfileCubit>(),
-          arweave: context.read<ArweaveService>(),
-          turbo: context.read<TurboUploadService>(),
           pst: context.read<PstService>(),
           driveDao: context.read<DriveDao>(),
           uploadFolders: isFolderUpload,

diff --git a/lib/main.dart b/lib/main.dart
@@ -204,8 +204,6 @@ class AppState extends State<App> {
             communityOracle: CommunityOracle(
               ArDriveContractOracle(
                 [
-                  ContractOracle(VertoContractReader()),
-                  ContractOracle(RedstoneContractReader()),
                   ContractOracle(ARNSContractReader()),
                 ],
                 fallbackContractOracle: ContractOracle(

diff --git a/lib/pages/drive_detail/components/drive_file_drop_zone.dart b/lib/pages/drive_detail/components/drive_file_drop_zone.dart
@@ -164,8 +164,6 @@ class DriveFileDropZoneState extends State<DriveFileDropZone> {
               driveId: driveId,
               parentFolderId: parentFolderId,
               files: selectedFiles,
-              arweave: context.read<ArweaveService>(),
-              turbo: context.read<TurboUploadService>(),
               pst: context.read<PstService>(),
               profileCubit: context.read<ProfileCubit>(),
               driveDao: context.read<DriveDao>(),

diff --git a/lib/services/config/app_config.dart b/lib/services/config/app_config.dart
@@ -18,7 +18,6 @@ class AppConfig {
   final int autoSyncIntervalInSeconds;
   final bool enableSyncFromSnapshot;
   final bool enableSeedPhraseLogin;
-  final bool useNewUploader;
   final String stripePublishableKey;
   final bool forceNoFreeThanksToTurbo;
   final BigInt? fakeTurboCredits;
@@ -39,7 +38,6 @@ class AppConfig {
     this.enableSyncFromSnapshot = true,
     this.enableSeedPhraseLogin = true,
     required this.stripePublishableKey,
-    this.useNewUploader = false,
     this.forceNoFreeThanksToTurbo = false,
     this.fakeTurboCredits,
     this.topUpDryRun = false,
@@ -71,7 +69,6 @@ class AppConfig {
         : fakeTurboCredits ?? this.fakeTurboCredits;
 
     return AppConfig(
-      useNewUploader: useNewUploader ?? this.useNewUploader,
       defaultArweaveGatewayUrl:
           defaultArweaveGatewayUrl ?? this.defaultArweaveGatewayUrl,
       useTurboUpload: useTurboUpload ?? this.useTurboUpload,

diff --git a/packages/arconnect/pubspec.yaml b/packages/arconnect/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
   arweave:
     git:
       url: https://github.com/ardriveapp/arweave-dart.git
-      ref: v3.8.0
+      ref: v3.8.1
   ardrive_utils:
     path: ../ardrive_utils
   js: ^0.6.7

diff --git a/packages/arconnect/test/arconnect_test.dart b/packages/arconnect/test/arconnect_test.dart
@@ -1 +1,9 @@
-void main() {}
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  // TODO: Write tests
+  test('test', () {
+    var answer = 42;
+    expect(answer, 42);
+  });
+}
diff --git a/packages/ardrive_crypto/pubspec.yaml b/packages/ardrive_crypto/pubspec.yaml
@@ -14,9 +14,9 @@ dependencies:
   arweave:
     git:
       url: https://github.com/ardriveapp/arweave-dart.git
-      ref: v3.8.0
+      ref: v3.8.1
   ardrive_utils:
-    path: ../ardrive_utils 
+    path: ../ardrive_utils
   uuid: ^3.0.4
   webcrypto: ^0.5.3
   async: ^2.11.0

diff --git a/packages/ardrive_crypto/test/ardrive_crypto_test.dart b/packages/ardrive_crypto/test/ardrive_crypto_test.dart
@@ -1 +1,9 @@
+import 'package:flutter_test/flutter_test.dart';
 
+void main() {
+  // TODO: Write tests
+  test('test', () {
+    var answer = 42;
+    expect(answer, 42);
+  });
+}
diff --git a/packages/ardrive_uploader/.gitignore b/packages/ardrive_uploader/.gitignore
@@ -1,6 +1,7 @@
 # https://dart.dev/guides/libraries/private-files
 # Created by `dart pub`
 .dart_tool/
+/build/
 
 # Avoid committing pubspec.lock for library packages; see
 # https://dart.dev/guides/libraries/private-files#pubspeclock.

diff --git a/packages/ardrive_uploader/example/lib/main.dart b/packages/ardrive_uploader/example/lib/main.dart
@@ -126,6 +126,7 @@ class _UploadFormState extends State<UploadForm> {
         driveId: driveIdController.text,
         parentFolderId: parentFolderIdController.text,
         isPrivate: false,
+        type: UploadType.turbo,
       ),
       wallet: wallet,
     );

diff --git a/packages/ardrive_uploader/example/pubspec.yaml b/packages/ardrive_uploader/example/pubspec.yaml
@@ -39,7 +39,7 @@ dependencies:
   arweave:
     git:
       url: https://github.com/ardriveapp/arweave-dart.git
-      ref: v3.8.0
+      ref: v3.8.1
   ardrive_utils:
     path: ../../ardrive_utils
   # The following adds the Cupertino Icons font to your application.
@@ -50,7 +50,7 @@ dependencies:
   uuid: ^3.0.4
   cryptography: ^2.5.0
   dio: ^5.3.2
-  http: 
+  http:
 
 dev_dependencies:
   flutter_test:

diff --git a/packages/ardrive_uploader/lib/src/ardrive_uploader.dart b/packages/ardrive_uploader/lib/src/ardrive_uploader.dart
@@ -58,8 +58,6 @@ abstract class ArDriveUploader {
     pstService ??= PstService(
       communityOracle: CommunityOracle(
         ArDriveContractOracle([
-          ContractOracle(VertoContractReader()),
-          ContractOracle(RedstoneContractReader()),
           ContractOracle(SmartweaveContractReader()),
         ]),
       ),

diff --git a/packages/ardrive_uploader/lib/src/data_bundler.dart b/packages/ardrive_uploader/lib/src/data_bundler.dart
@@ -220,6 +220,7 @@ class DataTransactionBundler implements DataBundler<TransactionResult> {
           isPrivate: driveKey != null,
           driveId: driveId,
           parentFolderId: metadata.id,
+          type: this is BDIDataBundler ? UploadType.turbo : UploadType.d2n,
         ),
       );