Merge pull request #1648 from ardriveapp/fix-turbo-uploads

fix uploads to turbo
ardriveapp · Mar 1, 2024 · 8a30769 · 8a30769
2 parents c518c90 + 7321ae6
commit 8a30769
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/packages/ardrive_uploader/lib/src/data_bundler.dart b/packages/ardrive_uploader/lib/src/data_bundler.dart
@@ -32,6 +32,7 @@ abstract class DataBundler<T> {
     required ARFSUploadMetadata metadata,
     required Wallet wallet,
     SecretKey? driveKey,
+    List<DataItemFile>? dataItemFiles,
     Function? onStartMetadataCreation,
     Function? onFinishMetadataCreation,
     Function? onStartBundleCreation,
@@ -69,6 +70,7 @@ class DataTransactionBundler implements DataBundler<TransactionResult> {
     required IOFile file,
     required ARFSUploadMetadata metadata,
     required Wallet wallet,
+    List<DataItemFile>? dataItemFiles,
     SecretKey? driveKey,
     Function? onStartEncryption,
     Function? onStartBundling,
@@ -77,7 +79,7 @@ class DataTransactionBundler implements DataBundler<TransactionResult> {
     Function? onStartBundleCreation,
     Function? onFinishBundleCreation,
   }) async {
-    final dataItemFiles = await createDataItemsForFile(
+    dataItemFiles ??= await createDataItemsForFile(
       file: file,
       metadata: metadata,
       wallet: wallet,
@@ -336,6 +338,7 @@ class BDIDataBundler implements DataBundler<DataItemResult> {
     required Wallet wallet,
     SecretKey? driveKey,
     Function? onStartBundling,
+    List<DataItemFile>? dataItemFiles,
     Function? onStartMetadataCreation,
     Function? onFinishMetadataCreation,
     Function? onStartBundleCreation,

diff --git a/packages/ardrive_uploader/lib/src/upload_strategy.dart b/packages/ardrive_uploader/lib/src/upload_strategy.dart
@@ -194,6 +194,7 @@ class UploadFileUsingBundleStrategy extends UploadFileStrategy {
   }) async {
     final bundle = await _dataBundler.createDataBundle(
       file: task.file,
+      dataItemFiles: dataItems,
       metadata: task.metadata,
       wallet: wallet,
       driveKey: task.encryptionKey,

diff --git a/packages/ardrive_uploader/lib/src/utils/data_bundler_utils.dart b/packages/ardrive_uploader/lib/src/utils/data_bundler_utils.dart
@@ -5,7 +5,7 @@ Future<List<DataItemResult>> createDataItemResultFromDataItemFiles(
   Wallet wallet,
 ) async {
   final List<DataItemResult> dataItemList = [];
-  final dataItemCount = dataItemList.length;
+  final dataItemCount = dataItems.length;
   for (var i = 0; i < dataItemCount; i++) {
     final dataItem = dataItems[i];
     await createDataItemTaskEither(

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