Merge pull request #1894 from ardriveapp/PE-6948-hotfix

PE-6948: proceed upload despite the contract read error
ardriveapp · Nov 13, 2024 · c2a7d33 · c2a7d33
2 parents 0417c28 + 6b6a724
commit c2a7d33
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 15 deletions.
diff --git a/lib/core/upload/bundle_signer.dart b/lib/core/upload/bundle_signer.dart
@@ -59,7 +59,11 @@ class ArweaveBundleTransactionSigner implements BundleTransactionSigner {
 
     logger.i('Adding tip...');
 
-    await pstService.addCommunityTipToTx(bundleTx);
+    try {
+      await pstService.addCommunityTipToTx(bundleTx);
+    } catch (e) {
+      logger.e('Error adding community tip to transaction. Proceeding.', e);
+    }
 
     logger.i('Tip added');
 

diff --git a/lib/core/upload/cost_calculator.dart b/lib/core/upload/cost_calculator.dart
@@ -1,6 +1,7 @@
 import 'package:ardrive/services/arweave/arweave.dart';
 import 'package:ardrive/turbo/turbo.dart';
 import 'package:ardrive/utils/logger.dart';
+import 'package:ardrive_utils/ardrive_utils.dart';
 import 'package:arweave/utils.dart';
 import 'package:equatable/equatable.dart';
 import 'package:pst/pst.dart';
@@ -64,7 +65,12 @@ class UploadCostEstimateCalculatorForAR extends ArDriveUploadCostCalculator {
   }) async {
     final costInAR = await _arweaveService.getPrice(byteSize: totalSize);
 
-    final pstFee = await _pstService.getPSTFee(costInAR);
+    Winston pstFee = Winston(BigInt.zero);
+    try {
+      pstFee = await _pstService.getPSTFee(costInAR);
+    } catch (e) {
+      logger.e('Error adding community tip to transaction. Proceeding.', e);
+    }
 
     final totalCostAR = costInAR + pstFee.value;
 

diff --git a/lib/core/upload/transaction_signer.dart b/lib/core/upload/transaction_signer.dart
@@ -65,7 +65,11 @@ class ArweaveTransactionSigner implements TransactionSigner {
       ..addApplicationTags(version: version)
       ..addUTags();
 
-    await pstService.addCommunityTipToTx(dataTx);
+    try {
+      await pstService.addCommunityTipToTx(dataTx);
+    } catch (e) {
+      logger.e('Error adding community tip to transaction. Proceeding.', e);
+    }
 
     // Don't include the file's Content-Type tag if it is meant to be private.
     if (!isPrivate) {

diff --git a/lib/sync/domain/repositories/sync_repository.dart b/lib/sync/domain/repositories/sync_repository.dart
@@ -245,16 +245,20 @@ class _SyncRepository implements SyncRepository {
 
       logger.i('Syncing licenses...');
 
-      final licenseTxIds = <String>{};
-      final revisionsToSyncLicense = (await _driveDao
-          .allFileRevisionsWithLicenseReferencedButNotSynced()
-          .get())
-        ..retainWhere((rev) => licenseTxIds.add(rev.licenseTxId!));
-      logger.d('Found ${revisionsToSyncLicense.length} licenses to sync');
-
-      await _updateLicenses(
-        revisionsToSyncLicense: revisionsToSyncLicense,
-      );
+      try {
+        final licenseTxIds = <String>{};
+        final revisionsToSyncLicense = (await _driveDao
+            .allFileRevisionsWithLicenseReferencedButNotSynced()
+            .get())
+          ..retainWhere((rev) => licenseTxIds.add(rev.licenseTxId!));
+        logger.d('Found ${revisionsToSyncLicense.length} licenses to sync');
+
+        await _updateLicenses(
+          revisionsToSyncLicense: revisionsToSyncLicense,
+        );
+      } catch (e) {
+        logger.e('Error syncing licenses. Proceeding.', e);
+      }
 
       logger.i('Licenses synced');
 

diff --git a/packages/ardrive_uploader/lib/src/cost_calculator.dart b/packages/ardrive_uploader/lib/src/cost_calculator.dart
@@ -1,10 +1,10 @@
+import 'package:ardrive_uploader/src/utils/logger.dart';
 import 'package:ardrive_utils/ardrive_utils.dart';
 import 'package:arweave/arweave.dart';
 import 'package:arweave/utils.dart';
 // ignore: depend_on_referenced_packages
 import 'package:equatable/equatable.dart';
 import 'package:pst/pst.dart';
-import 'package:ardrive_uploader/src/utils/logger.dart';
 
 abstract class ArDriveUploadCostCalculator {
   Future<UploadCostEstimate> calculateCost({required int totalSize});
@@ -67,7 +67,14 @@ class UploadCostEstimateCalculatorForAR extends ArDriveUploadCostCalculator {
         .get('/price/$totalSize')
         .then((res) => BigInt.parse(res.body));
 
-    final pstFee = await _pstService.getPSTFee(costInAR);
+    late final Winston pstFee;
+
+    try {
+      pstFee = await _pstService.getPSTFee(costInAR);
+    } catch (e) {
+      logger.e('Error adding community tip to transaction. Proceeding.', e);
+      pstFee = Winston(BigInt.zero);
+    }
 
     final totalCostAR = costInAR + pstFee.value;