From 0813833b4efefe3d4980bd608fc5ba991bdd428e Mon Sep 17 00:00:00 2001 From: jdaev Date: Tue, 19 Oct 2021 08:27:17 -0400 Subject: [PATCH 01/18] fix: remove lastBlockHeight --- lib/blocs/sync/sync_cubit.dart | 3 +-- pubspec.lock | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/lib/blocs/sync/sync_cubit.dart b/lib/blocs/sync/sync_cubit.dart index b45f11ad66..4e3c139026 100644 --- a/lib/blocs/sync/sync_cubit.dart +++ b/lib/blocs/sync/sync_cubit.dart @@ -1,5 +1,4 @@ import 'dart:async'; -import 'dart:math'; import 'package:ardrive/entities/constants.dart'; import 'package:ardrive/entities/entities.dart'; @@ -134,7 +133,7 @@ class SyncCubit extends Cubit { // we are just starting 5 blocks before the lastBlockHeight to make sure it // picks up all files. 'after' indicates the cursor where it should start // syncing from. For first sync 'after' should be null or an empty string. - lastBlockHeight: max(drive.lastBlockHeight! - 5, drive.lastBlockHeight!), + // lastBlockHeight: max(drive.lastBlockHeight! - 5, drive.lastBlockHeight!), after: drive.syncCursor, driveKey: driveKey, owner: owner, diff --git a/pubspec.lock b/pubspec.lock index d52638d085..cea3adbb56 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -58,7 +58,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.1" + version: "2.6.1" bloc: dependency: transitive description: @@ -156,7 +156,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.3.1" + version: "1.2.0" checked_yaml: dependency: transitive description: @@ -268,7 +268,7 @@ packages: name: file url: "https://pub.dartlang.org" source: hosted - version: "6.1.2" + version: "6.1.0" file_selector: dependency: "direct main" description: @@ -648,7 +648,7 @@ packages: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.4" path_provider_linux: dependency: transitive description: @@ -718,7 +718,7 @@ packages: name: process url: "https://pub.dartlang.org" source: hosted - version: "4.2.3" + version: "4.2.1" provider: dependency: transitive description: @@ -835,7 +835,7 @@ packages: name: sqlite3 url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.1.2" sqlparser: dependency: transitive description: @@ -891,21 +891,21 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.17.10" + version: "1.16.8" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.2" + version: "0.3.0" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.4.0" + version: "0.3.19" timeago: dependency: "direct main" description: @@ -933,7 +933,7 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.0.12" + version: "6.0.10" url_launcher_linux: dependency: transitive description: @@ -989,7 +989,7 @@ packages: name: vm_service url: "https://pub.dartlang.org" source: hosted - version: "7.1.1" + version: "6.2.0" watcher: dependency: transitive description: @@ -1040,5 +1040,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.14.0 <3.0.0" - flutter: ">=2.5.0" + dart: ">=2.13.0 <3.0.0" + flutter: ">=2.2.0" From 9ff86f03caf6330fc2b46eb2a383929c4f8ba3dc Mon Sep 17 00:00:00 2001 From: jdaev Date: Thu, 21 Oct 2021 12:03:46 -0400 Subject: [PATCH 02/18] task: update flutter versions --- pubspec.lock | 97 ++++++++++++++++++++++++++++++++-------------------- pubspec.yaml | 10 +++--- 2 files changed, 64 insertions(+), 43 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index d52638d085..504a6bd4dc 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,21 +7,21 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "22.0.0" + version: "29.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "1.7.2" + version: "2.6.0" analyzer_plugin: dependency: transitive description: name: analyzer_plugin url: "https://pub.dartlang.org" source: hosted - version: "0.6.0" + version: "0.8.0" archive: dependency: transitive description: @@ -42,7 +42,7 @@ packages: name: artemis url: "https://pub.dartlang.org" source: hosted - version: "7.1.1-beta.1" + version: "7.2.3-beta" arweave: dependency: "direct main" description: @@ -65,14 +65,14 @@ packages: name: bloc url: "https://pub.dartlang.org" source: hosted - version: "7.2.1" + version: "8.0.0-dev.3" bloc_test: dependency: "direct dev" description: name: bloc_test url: "https://pub.dartlang.org" source: hosted - version: "8.2.0" + version: "9.0.0-dev.3" boolean_selector: dependency: transitive description: @@ -93,7 +93,7 @@ packages: name: build url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" build_config: dependency: transitive description: @@ -107,7 +107,7 @@ packages: name: build_daemon url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.0.1" build_resolvers: dependency: transitive description: @@ -121,14 +121,14 @@ packages: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.4" build_runner_core: dependency: transitive description: name: build_runner_core url: "https://pub.dartlang.org" source: hosted - version: "7.1.0" + version: "7.2.2" built_collection: dependency: transitive description: @@ -170,7 +170,7 @@ packages: name: cli_util url: "https://pub.dartlang.org" source: hosted - version: "0.3.3" + version: "0.3.5" clock: dependency: transitive description: @@ -226,7 +226,7 @@ packages: name: cryptography url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" dart_style: dependency: transitive description: @@ -234,6 +234,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.1" + drift: + dependency: transitive + description: + name: drift + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + drift_dev: + dependency: transitive + description: + name: drift_dev + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2" equatable: dependency: transitive description: @@ -275,7 +289,7 @@ packages: name: file_selector url: "https://pub.dartlang.org" source: hosted - version: "0.8.2" + version: "0.8.2+1" file_selector_macos: dependency: "direct main" description: @@ -322,7 +336,7 @@ packages: name: flutter_bloc url: "https://pub.dartlang.org" source: hosted - version: "7.3.0" + version: "8.0.0-dev.2" flutter_driver: dependency: "direct dev" description: flutter @@ -334,7 +348,7 @@ packages: name: flutter_dropzone url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "3.0.0" flutter_dropzone_platform_interface: dependency: transitive description: @@ -348,7 +362,7 @@ packages: name: flutter_dropzone_web url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "3.0.1" flutter_localizations: dependency: "direct main" description: flutter @@ -389,7 +403,7 @@ packages: name: glob url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" google_fonts: dependency: "direct main" description: @@ -403,14 +417,14 @@ packages: name: gql url: "https://pub.dartlang.org" source: hosted - version: "0.13.0" - gql_code_builder: + version: "0.13.1-alpha+1633799193898" + gql_code_builder2: dependency: transitive description: - name: gql_code_builder + name: gql_code_builder2 url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" + version: "0.3.0" gql_dedupe_link: dependency: transitive description: @@ -452,7 +466,7 @@ packages: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.13.3" + version: "0.13.4" http_client: dependency: "direct main" description: @@ -508,14 +522,14 @@ packages: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "4.1.0" + version: "4.3.0" json_serializable: dependency: "direct dev" description: name: json_serializable url: "https://pub.dartlang.org" source: hosted - version: "4.1.4" + version: "6.0.0" jwk: dependency: transitive description: @@ -550,28 +564,28 @@ packages: name: mime url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" mocktail: dependency: "direct dev" description: name: mocktail url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.2.0" moor: dependency: "direct main" description: name: moor url: "https://pub.dartlang.org" source: hosted - version: "4.5.0" + version: "4.6.1" moor_generator: dependency: "direct dev" description: name: moor_generator url: "https://pub.dartlang.org" source: hosted - version: "4.4.1" + version: "4.6.0" nested: dependency: transitive description: @@ -599,7 +613,7 @@ packages: name: package_info_plus url: "https://pub.dartlang.org" source: hosted - version: "1.0.6" + version: "1.3.0" package_info_plus_linux: dependency: transitive description: @@ -613,7 +627,7 @@ packages: name: package_info_plus_macos url: "https://pub.dartlang.org" source: hosted - version: "1.1.1" + version: "1.3.0" package_info_plus_platform_interface: dependency: transitive description: @@ -634,7 +648,7 @@ packages: name: package_info_plus_windows url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.4" path: dependency: transitive description: @@ -697,7 +711,7 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" pointycastle: dependency: transitive description: @@ -807,7 +821,14 @@ packages: name: source_gen url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.1.1" + source_helper: + dependency: transitive + description: + name: source_helper + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.0" source_map_stack_trace: dependency: transitive description: @@ -835,14 +856,14 @@ packages: name: sqlite3 url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" sqlparser: dependency: transitive description: name: sqlparser url: "https://pub.dartlang.org" source: hosted - version: "0.17.2" + version: "0.18.0" stack_trace: dependency: transitive description: @@ -975,7 +996,7 @@ packages: name: uuid url: "https://pub.dartlang.org" source: hosted - version: "3.0.4" + version: "3.0.5" vector_math: dependency: transitive description: @@ -996,7 +1017,7 @@ packages: name: watcher url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" web_socket_channel: dependency: transitive description: @@ -1024,7 +1045,7 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.2.9" + version: "2.2.10" xdg_directories: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 6595ddc47c..8a20159258 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -29,7 +29,7 @@ dependencies: url: https://github.com/ardriveapp/arweave-dart ref: fbd54e119b7e0357bd688a91aa49532c520e5b3a cryptography: ^2.0.1 - flutter_bloc: ^7.0.1 + flutter_bloc: ^8.0.0-dev.2 flutter_portal: ^0.4.0 file_selector: ^0.8.2 file_selector_web: ^0.8.1 @@ -49,7 +49,7 @@ dependencies: url_launcher: ^6.0.6 uuid: ^3.0.4 http_client: ^1.5.1 - flutter_dropzone: ^2.0.1 + flutter_dropzone: ^3.0.0 responsive_builder: ^0.4.1 package_info_plus: ^1.0.3 js: ^0.6.3 @@ -62,11 +62,11 @@ dev_dependencies: flutter_driver: sdk: flutter test: ^1.16.8 - bloc_test: ^8.0.2 + bloc_test: ^9.0.0-dev.3 build_runner: ^2.0.4 moor_generator: ^4.4.1 - mocktail: ^0.1.4 - json_serializable: ^4.1.3 + mocktail: ^0.2.0 + json_serializable: ^6.0.0 dependency_overrides: meta: 1.7.0 From 391bd04d0d52d3c414b9f50c310861893f6f6d56 Mon Sep 17 00:00:00 2001 From: jdaev Date: Thu, 21 Oct 2021 12:04:58 -0400 Subject: [PATCH 03/18] task: update action files --- .github/workflows/deploy-dev.yaml | 8 ++++---- .github/workflows/deploy-prod.yaml | 10 +++++----- .github/workflows/gitopia.yml | 6 +++--- .github/workflows/pr.yaml | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/deploy-dev.yaml b/.github/workflows/deploy-dev.yaml index 308b10c4f7..e1c9f26e64 100644 --- a/.github/workflows/deploy-dev.yaml +++ b/.github/workflows/deploy-dev.yaml @@ -6,11 +6,11 @@ on: workflow_dispatch: inputs: logLevel: - description: 'Log level' + description: "Log level" required: true - default: 'warning' + default: "warning" tags: - description: 'Test scenario tags' + description: "Test scenario tags" jobs: deploy: runs-on: ubuntu-latest @@ -20,7 +20,7 @@ jobs: persist-credentials: false - uses: subosito/flutter-action@v1 with: - flutter-version: '2.2.x' + flutter-version: "2.5.3" - name: Build app run: | flutter pub get diff --git a/.github/workflows/deploy-prod.yaml b/.github/workflows/deploy-prod.yaml index 52f41e03b1..4fc82740af 100644 --- a/.github/workflows/deploy-prod.yaml +++ b/.github/workflows/deploy-prod.yaml @@ -7,9 +7,9 @@ on: workflow_dispatch: inputs: logLevel: - description: 'Log level' + description: "Log level" required: true - default: 'warning' + default: "warning" jobs: deploy: @@ -20,7 +20,7 @@ jobs: persist-credentials: false - uses: subosito/flutter-action@v1 with: - flutter-version: '2.2.x' + flutter-version: "2.5.3" - name: Build app run: | flutter pub get @@ -29,6 +29,6 @@ jobs: flutter build web - uses: FirebaseExtended/action-hosting-deploy@v0 with: - repoToken: '${{ secrets.GITHUB_TOKEN }}' - firebaseServiceAccount: '${{ secrets.FIREBASE_CI_SERVICE_ACCOUNT }}' + repoToken: "${{ secrets.GITHUB_TOKEN }}" + firebaseServiceAccount: "${{ secrets.FIREBASE_CI_SERVICE_ACCOUNT }}" channelId: live diff --git a/.github/workflows/gitopia.yml b/.github/workflows/gitopia.yml index a931e7a592..2b853098da 100644 --- a/.github/workflows/gitopia.yml +++ b/.github/workflows/gitopia.yml @@ -19,6 +19,6 @@ jobs: - name: Mirror to Gitopia Action uses: gitopia/gitopia-mirror-action@v0.1.2 with: - gitopiaWallet: '${{ secrets.GITOPIA_WALLET }}' - branch: 'master' - remoteUrl: 'gitopia://qBRa782iJ4Nry0apjK0svfIJK-X_7mppep7bnDOH6_g/ardrive-web' + gitopiaWallet: "${{ secrets.GITOPIA_WALLET }}" + branch: "master" + remoteUrl: "gitopia://qBRa782iJ4Nry0apjK0svfIJK-X_7mppep7bnDOH6_g/ardrive-web" diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 8e38f2350e..47142b40c2 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -28,7 +28,7 @@ jobs: persist-credentials: false - uses: subosito/flutter-action@v1 with: - flutter-version: '2.2.x' + flutter-version: "2.5.3" - name: Build app run: | flutter pub get @@ -37,6 +37,6 @@ jobs: flutter build web --profile - uses: FirebaseExtended/action-hosting-deploy@v0 with: - repoToken: '${{ secrets.GITHUB_TOKEN }}' - firebaseServiceAccount: '${{ secrets.FIREBASE_CI_SERVICE_ACCOUNT }}' + repoToken: "${{ secrets.GITHUB_TOKEN }}" + firebaseServiceAccount: "${{ secrets.FIREBASE_CI_SERVICE_ACCOUNT }}" expires: 14d From 51541816432b83dccb73dbd3f8fb265544aa9c08 Mon Sep 17 00:00:00 2001 From: jdaev Date: Thu, 21 Oct 2021 12:10:40 -0400 Subject: [PATCH 04/18] task: remove quotes --- .github/workflows/deploy-dev.yaml | 8 ++++---- .github/workflows/deploy-prod.yaml | 10 +++++----- .github/workflows/gitopia.yml | 6 +++--- .github/workflows/pr.yaml | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/deploy-dev.yaml b/.github/workflows/deploy-dev.yaml index e1c9f26e64..ad4b92a867 100644 --- a/.github/workflows/deploy-dev.yaml +++ b/.github/workflows/deploy-dev.yaml @@ -6,11 +6,11 @@ on: workflow_dispatch: inputs: logLevel: - description: "Log level" + description: 'Log level' required: true - default: "warning" + default: 'warning' tags: - description: "Test scenario tags" + description: 'Test scenario tags' jobs: deploy: runs-on: ubuntu-latest @@ -20,7 +20,7 @@ jobs: persist-credentials: false - uses: subosito/flutter-action@v1 with: - flutter-version: "2.5.3" + flutter-version: '2.5.3' - name: Build app run: | flutter pub get diff --git a/.github/workflows/deploy-prod.yaml b/.github/workflows/deploy-prod.yaml index 4fc82740af..84953d8649 100644 --- a/.github/workflows/deploy-prod.yaml +++ b/.github/workflows/deploy-prod.yaml @@ -7,9 +7,9 @@ on: workflow_dispatch: inputs: logLevel: - description: "Log level" + description: 'Log level' required: true - default: "warning" + default: 'warning' jobs: deploy: @@ -20,7 +20,7 @@ jobs: persist-credentials: false - uses: subosito/flutter-action@v1 with: - flutter-version: "2.5.3" + flutter-version: '2.5.3' - name: Build app run: | flutter pub get @@ -29,6 +29,6 @@ jobs: flutter build web - uses: FirebaseExtended/action-hosting-deploy@v0 with: - repoToken: "${{ secrets.GITHUB_TOKEN }}" - firebaseServiceAccount: "${{ secrets.FIREBASE_CI_SERVICE_ACCOUNT }}" + repoToken: '${{ secrets.GITHUB_TOKEN }}' + firebaseServiceAccount: '${{ secrets.FIREBASE_CI_SERVICE_ACCOUNT }}' channelId: live diff --git a/.github/workflows/gitopia.yml b/.github/workflows/gitopia.yml index 2b853098da..a931e7a592 100644 --- a/.github/workflows/gitopia.yml +++ b/.github/workflows/gitopia.yml @@ -19,6 +19,6 @@ jobs: - name: Mirror to Gitopia Action uses: gitopia/gitopia-mirror-action@v0.1.2 with: - gitopiaWallet: "${{ secrets.GITOPIA_WALLET }}" - branch: "master" - remoteUrl: "gitopia://qBRa782iJ4Nry0apjK0svfIJK-X_7mppep7bnDOH6_g/ardrive-web" + gitopiaWallet: '${{ secrets.GITOPIA_WALLET }}' + branch: 'master' + remoteUrl: 'gitopia://qBRa782iJ4Nry0apjK0svfIJK-X_7mppep7bnDOH6_g/ardrive-web' diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 47142b40c2..f8063c5ae7 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -28,7 +28,7 @@ jobs: persist-credentials: false - uses: subosito/flutter-action@v1 with: - flutter-version: "2.5.3" + flutter-version: '2.5.3' - name: Build app run: | flutter pub get @@ -37,6 +37,6 @@ jobs: flutter build web --profile - uses: FirebaseExtended/action-hosting-deploy@v0 with: - repoToken: "${{ secrets.GITHUB_TOKEN }}" - firebaseServiceAccount: "${{ secrets.FIREBASE_CI_SERVICE_ACCOUNT }}" + repoToken: '${{ secrets.GITHUB_TOKEN }}' + firebaseServiceAccount: '${{ secrets.FIREBASE_CI_SERVICE_ACCOUNT }}' expires: 14d From 4ebc500b61effd2a60808073fde3fa4701d454ff Mon Sep 17 00:00:00 2001 From: jdaev Date: Thu, 21 Oct 2021 12:14:53 -0400 Subject: [PATCH 05/18] task: fix cast --- lib/blocs/upload/upload_cubit.dart | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/blocs/upload/upload_cubit.dart b/lib/blocs/upload/upload_cubit.dart index 817b708e1f..db50a9d051 100644 --- a/lib/blocs/upload/upload_cubit.dart +++ b/lib/blocs/upload/upload_cubit.dart @@ -104,8 +104,9 @@ class UploadCubit extends Cubit { return; } emit(UploadPreparationInProgress()); - final sizeLimit = - _targetDrive.isPrivate ? math.pow(10, 8) : 1.25 * math.pow(10, 9); + final sizeLimit = (_targetDrive.isPrivate + ? math.pow(10, 8) + : 1.25 * math.pow(10, 9)) as int; final tooLargeFiles = [ for (final file in files) if (await file.length() > sizeLimit) file.name From 7f93c93f354ac4e08fb4aa2a0e009651e915afd2 Mon Sep 17 00:00:00 2001 From: jdaev Date: Thu, 21 Oct 2021 12:29:09 -0400 Subject: [PATCH 06/18] task: update json annotation --- pubspec.lock | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 504a6bd4dc..f3bc91bb54 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -233,7 +233,7 @@ packages: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.2.0" drift: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 8a20159258..08fceb5bc3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -38,7 +38,7 @@ dependencies: google_fonts: ^2.1.0 intersperse: ^2.0.0 intl: ^0.17.0 - json_annotation: ^4.0.1 + json_annotation: ^4.3.0 mime: ^1.0.0 moor: ^4.4.1 path_provider: ^2.0.2 From 75c19a78c4a5e9faa9415fb3a144546407eb87e6 Mon Sep 17 00:00:00 2001 From: jdaev Date: Fri, 22 Oct 2021 13:45:53 -0400 Subject: [PATCH 07/18] fix: change blockHeight iterator from 5 to 30000 --- lib/blocs/sync/sync_cubit.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/blocs/sync/sync_cubit.dart b/lib/blocs/sync/sync_cubit.dart index 4e3c139026..76311cf679 100644 --- a/lib/blocs/sync/sync_cubit.dart +++ b/lib/blocs/sync/sync_cubit.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:math'; import 'package:ardrive/entities/constants.dart'; import 'package:ardrive/entities/entities.dart'; @@ -125,7 +126,6 @@ class SyncCubit extends Cubit { return; } } - final entityHistory = await _arweave.getNewEntitiesForDrive( drive.id, // Syncs from lastBlockHeight - 5 and paginates through them using the syncCursor @@ -133,7 +133,7 @@ class SyncCubit extends Cubit { // we are just starting 5 blocks before the lastBlockHeight to make sure it // picks up all files. 'after' indicates the cursor where it should start // syncing from. For first sync 'after' should be null or an empty string. - // lastBlockHeight: max(drive.lastBlockHeight! - 5, drive.lastBlockHeight!), + lastBlockHeight: max(drive.lastBlockHeight! - 30000, 0), after: drive.syncCursor, driveKey: driveKey, owner: owner, From b347048b381302cc3895e84673f608fbef0eac45 Mon Sep 17 00:00:00 2001 From: jdaev Date: Mon, 25 Oct 2021 10:34:26 -0400 Subject: [PATCH 08/18] fix: remove lastBlockHeight --- lib/blocs/sync/sync_cubit.dart | 3 +-- pubspec.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/blocs/sync/sync_cubit.dart b/lib/blocs/sync/sync_cubit.dart index 76311cf679..b938d2c612 100644 --- a/lib/blocs/sync/sync_cubit.dart +++ b/lib/blocs/sync/sync_cubit.dart @@ -1,5 +1,4 @@ import 'dart:async'; -import 'dart:math'; import 'package:ardrive/entities/constants.dart'; import 'package:ardrive/entities/entities.dart'; @@ -133,7 +132,7 @@ class SyncCubit extends Cubit { // we are just starting 5 blocks before the lastBlockHeight to make sure it // picks up all files. 'after' indicates the cursor where it should start // syncing from. For first sync 'after' should be null or an empty string. - lastBlockHeight: max(drive.lastBlockHeight! - 30000, 0), + // lastBlockHeight: max(drive.lastBlockHeight! - 30000, 0), after: drive.syncCursor, driveKey: driveKey, owner: owner, diff --git a/pubspec.lock b/pubspec.lock index cea3adbb56..262e8c1c28 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -58,7 +58,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" bloc: dependency: transitive description: @@ -156,7 +156,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" checked_yaml: dependency: transitive description: @@ -268,7 +268,7 @@ packages: name: file url: "https://pub.dartlang.org" source: hosted - version: "6.1.0" + version: "6.1.2" file_selector: dependency: "direct main" description: @@ -718,7 +718,7 @@ packages: name: process url: "https://pub.dartlang.org" source: hosted - version: "4.2.1" + version: "4.2.3" provider: dependency: transitive description: @@ -891,21 +891,21 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.16.8" + version: "1.17.10" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.3.19" + version: "0.4.0" timeago: dependency: "direct main" description: @@ -989,7 +989,7 @@ packages: name: vm_service url: "https://pub.dartlang.org" source: hosted - version: "6.2.0" + version: "7.1.1" watcher: dependency: transitive description: From 0eea8fc5ebe20c8f0b5270922e415ed4f14bb4f0 Mon Sep 17 00:00:00 2001 From: jdaev Date: Mon, 25 Oct 2021 19:29:15 -0400 Subject: [PATCH 09/18] fix: fix and cleanup sync - Save arweave currentblockheight for resuming sync - Recursively sync through blockheight --- lib/blocs/sync/sync_cubit.dart | 72 +++++++++++++---------- lib/services/arweave/arweave_service.dart | 6 +- 2 files changed, 45 insertions(+), 33 deletions(-) diff --git a/lib/blocs/sync/sync_cubit.dart b/lib/blocs/sync/sync_cubit.dart index b938d2c612..91167a6c95 100644 --- a/lib/blocs/sync/sync_cubit.dart +++ b/lib/blocs/sync/sync_cubit.dart @@ -91,13 +91,18 @@ class SyncCubit extends Cubit { } // Sync the contents of each drive attached in the app. - final driveIds = await _driveDao.allDrives().map((d) => d.id).get(); - final driveSyncProcesses = driveIds - .map((driveId) => _syncDrive(driveId).onError((error, stackTrace) { - print('Error syncing drive with id $driveId'); - print(error.toString() + stackTrace.toString()); - addError(error!); - })); + final driveIds = await _driveDao.allDrives().map((d) => d).get(); + final currentBlockHeight = await arweave.getCurrentBlockHeight(); + + final driveSyncProcesses = driveIds.map((drive) => _syncDrive( + drive.id, + lastBlockHeight: drive.lastBlockHeight!, + currentBlockheight: currentBlockHeight, + ).onError((error, stackTrace) { + print('Error syncing drive with id ${drive.id}'); + print(error.toString() + stackTrace.toString()); + addError(error!); + })); await Future.wait(driveSyncProcesses); await Future.wait([ @@ -111,7 +116,12 @@ class SyncCubit extends Cubit { emit(SyncIdle()); } - Future _syncDrive(String driveId) async { + Future _syncDrive( + String driveId, { + required int currentBlockheight, + required int lastBlockHeight, + String? syncCursor, + }) async { final drive = await _driveDao.driveById(driveId: driveId).getSingle(); final owner = await arweave.getOwnerForDriveEntityWithId(driveId); SecretKey? driveKey; @@ -127,13 +137,8 @@ class SyncCubit extends Cubit { } final entityHistory = await _arweave.getNewEntitiesForDrive( drive.id, - // Syncs from lastBlockHeight - 5 and paginates through them using the syncCursor - // Starts syncing from lastBlock - 5. 5 is an arbitrary position, - // we are just starting 5 blocks before the lastBlockHeight to make sure it - // picks up all files. 'after' indicates the cursor where it should start - // syncing from. For first sync 'after' should be null or an empty string. - // lastBlockHeight: max(drive.lastBlockHeight! - 30000, 0), - after: drive.syncCursor, + lastBlockHeight: lastBlockHeight, + after: syncCursor, driveKey: driveKey, owner: owner, ); @@ -142,15 +147,15 @@ class SyncCubit extends Cubit { final newEntities = entityHistory.blockHistory .map((b) => b.entities) .expand((entities) => entities); - + print(newEntities.length); //Handle newEntities being empty, i.e; There's nothing more to sync - if (newEntities.isEmpty) { + if ((newEntities.isEmpty || entityHistory.cursor == null)) { //Reset the sync cursor after every sync to pick up files from other instances of the app. //(Different tab, different window, mobile, desktop etc) await _driveDao.writeToDrive(DrivesCompanion( - id: Value(drive.id), - lastBlockHeight: Value(entityHistory.lastBlockHeight), - syncCursor: Value(null))); + id: Value(drive.id), + lastBlockHeight: Value(currentBlockheight), + )); emit(SyncEmpty()); return; } @@ -189,27 +194,30 @@ class SyncCubit extends Cubit { }); await generateFsEntryPaths(driveId, updatedFoldersById, updatedFilesById); - //Saves lastBlockHeight to query from for next sync. syncCursor is used to - //paginate through results. - await _driveDao.writeToDrive(DrivesCompanion( - id: Value(drive.id), - lastBlockHeight: Value(entityHistory.lastBlockHeight), - syncCursor: Value(entityHistory.cursor))); }); //In case of very large drives, instead of waiting 2 minutes for the next sync, //check if there's more to sync and start syncing here itself - if (entityHistory.cursor != null) { - await _syncDrive(driveId); - } + + await _driveDao.writeToDrive(DrivesCompanion( + id: Value(drive.id), + lastBlockHeight: Value(currentBlockheight), + syncCursor: Value(entityHistory.cursor), + )); + + await _syncDrive( + driveId, + syncCursor: entityHistory.cursor, + lastBlockHeight: lastBlockHeight, + currentBlockheight: currentBlockheight, + ); } /// Computes the new drive revisions from the provided entities, inserts them into the database, /// and returns the latest revision. Future _addNewDriveEntityRevisions( - Iterable newEntities, { - String? owner, - }) async { + Iterable newEntities, + ) async { DriveRevisionsCompanion? latestRevision; final newRevisions = []; diff --git a/lib/services/arweave/arweave_service.dart b/lib/services/arweave/arweave_service.dart index 4aa8d4dab0..b86e7ded08 100644 --- a/lib/services/arweave/arweave_service.dart +++ b/lib/services/arweave/arweave_service.dart @@ -22,6 +22,9 @@ class ArweaveService { .get('wallet/$address/balance') .then((res) => BigInt.parse(res.body)); + Future getCurrentBlockHeight() => + client.api.get('/').then((res) => json.decode(res.body)['height']); + /// Returns the pending transaction fees of the specified address that is not reflected by `getWalletBalance()`. Future getPendingTxFees(String address) async { final query = await _gql.execute(PendingTxFeesQuery( @@ -72,6 +75,7 @@ class ArweaveService { // If we encounter a transaction that has yet to be mined, we stop moving through history. // We can continue once the transaction is mined. if (transaction.block == null) { + // TODO: Revisit break; } @@ -97,7 +101,7 @@ class ArweaveService { driveKey: driveKey, ); } - + //TODO: Revisit if (blockHistory.isEmpty || transaction.block!.height != blockHistory.last.blockHeight) { blockHistory.add(BlockEntities(transaction.block!.height)); From fd08c95523c7624d20730767b76b6f3e92a1ab2b Mon Sep 17 00:00:00 2001 From: jdaev Date: Mon, 25 Oct 2021 20:16:32 -0400 Subject: [PATCH 10/18] task: cleanup code --- lib/blocs/sync/sync_cubit.dart | 25 +++++++++---------------- pubspec.lock | 2 +- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/lib/blocs/sync/sync_cubit.dart b/lib/blocs/sync/sync_cubit.dart index 91167a6c95..d31f2a4006 100644 --- a/lib/blocs/sync/sync_cubit.dart +++ b/lib/blocs/sync/sync_cubit.dart @@ -91,10 +91,10 @@ class SyncCubit extends Cubit { } // Sync the contents of each drive attached in the app. - final driveIds = await _driveDao.allDrives().map((d) => d).get(); + final drives = await _driveDao.allDrives().map((d) => d).get(); final currentBlockHeight = await arweave.getCurrentBlockHeight(); - final driveSyncProcesses = driveIds.map((drive) => _syncDrive( + final driveSyncProcesses = drives.map((drive) => _syncDrive( drive.id, lastBlockHeight: drive.lastBlockHeight!, currentBlockheight: currentBlockHeight, @@ -147,14 +147,14 @@ class SyncCubit extends Cubit { final newEntities = entityHistory.blockHistory .map((b) => b.entities) .expand((entities) => entities); - print(newEntities.length); - //Handle newEntities being empty, i.e; There's nothing more to sync + // Handle newEntities being empty, i.e; There's nothing more to sync if ((newEntities.isEmpty || entityHistory.cursor == null)) { - //Reset the sync cursor after every sync to pick up files from other instances of the app. - //(Different tab, different window, mobile, desktop etc) + // Reset the sync cursor after every sync to pick up files from other instances of the app. + // (Different tab, different window, mobile, desktop etc) await _driveDao.writeToDrive(DrivesCompanion( id: Value(drive.id), lastBlockHeight: Value(currentBlockheight), + syncCursor: Value(null), )); emit(SyncEmpty()); return; @@ -168,7 +168,7 @@ class SyncCubit extends Cubit { final latestFileRevisions = await _addNewFileEntityRevisions( driveId, newEntities.whereType()); - //Check and handle cases where there's no more revisions + // Check and handle cases where there's no more revisions final updatedDrive = latestDriveRevision != null ? await _computeRefreshedDriveFromRevision(latestDriveRevision) : null; @@ -196,15 +196,8 @@ class SyncCubit extends Cubit { await generateFsEntryPaths(driveId, updatedFoldersById, updatedFilesById); }); - //In case of very large drives, instead of waiting 2 minutes for the next sync, - //check if there's more to sync and start syncing here itself - - await _driveDao.writeToDrive(DrivesCompanion( - id: Value(drive.id), - lastBlockHeight: Value(currentBlockheight), - syncCursor: Value(entityHistory.cursor), - )); - + + // If there are more results to process, recurse. await _syncDrive( driveId, syncCursor: entityHistory.cursor, diff --git a/pubspec.lock b/pubspec.lock index 262e8c1c28..49451bab58 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -648,7 +648,7 @@ packages: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.5" path_provider_linux: dependency: transitive description: From b11e43c7252e958b16e3bde2005d44aac04de331 Mon Sep 17 00:00:00 2001 From: jdaev Date: Tue, 26 Oct 2021 09:36:04 -0400 Subject: [PATCH 11/18] task: change exit condition --- lib/blocs/sync/sync_cubit.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/blocs/sync/sync_cubit.dart b/lib/blocs/sync/sync_cubit.dart index d31f2a4006..6d3b37c117 100644 --- a/lib/blocs/sync/sync_cubit.dart +++ b/lib/blocs/sync/sync_cubit.dart @@ -148,7 +148,7 @@ class SyncCubit extends Cubit { .map((b) => b.entities) .expand((entities) => entities); // Handle newEntities being empty, i.e; There's nothing more to sync - if ((newEntities.isEmpty || entityHistory.cursor == null)) { + if ((newEntities.isEmpty && entityHistory.cursor == null)) { // Reset the sync cursor after every sync to pick up files from other instances of the app. // (Different tab, different window, mobile, desktop etc) await _driveDao.writeToDrive(DrivesCompanion( From 6b2eac607b6627b037cff19fa1898c4d3b613112 Mon Sep 17 00:00:00 2001 From: jdaev Date: Tue, 26 Oct 2021 11:40:26 -0400 Subject: [PATCH 12/18] fix: handle borked paths and files PE-519 --- lib/blocs/sync/sync_cubit.dart | 44 ++++++++++++++++++--------- lib/models/queries/drive_queries.moor | 3 +- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/lib/blocs/sync/sync_cubit.dart b/lib/blocs/sync/sync_cubit.dart index b45f11ad66..883874444b 100644 --- a/lib/blocs/sync/sync_cubit.dart +++ b/lib/blocs/sync/sync_cubit.dart @@ -165,6 +165,13 @@ class SyncCubit extends Cubit { final latestFileRevisions = await _addNewFileEntityRevisions( driveId, newEntities.whereType()); + latestFileRevisions.map((file) { + //If Parent-Folder-Id is missing put it in the root folder of the drive + if (!file.parentFolderId.present) { + file = file.copyWith(parentFolderId: Value(drive.rootFolderId)); + } + }); + //Check and handle cases where there's no more revisions final updatedDrive = latestDriveRevision != null ? await _computeRefreshedDriveFromRevision(latestDriveRevision) @@ -315,7 +322,8 @@ class SyncCubit extends Cubit { final newRevisions = []; for (final entity in newEntities) { - if (!latestRevisions.containsKey(entity.id)) { + if (!latestRevisions.containsKey(entity.id) && + entity.parentFolderId != null) { final revisions = await _driveDao .latestFileRevisionByFileId(driveId: driveId, fileId: entity.id!) .getSingleOrNull(); @@ -329,6 +337,9 @@ class SyncCubit extends Cubit { if (revisionPerformedAction == null) { continue; } + // If Parent-Folder-Id is missing for a file, put it in the rootfolder + + entity.parentFolderId = entity.parentFolderId ?? rootPath; final revision = entity.toRevisionCompanion(performedAction: revisionPerformedAction); @@ -497,22 +508,25 @@ class SyncCubit extends Cubit { final staleOrphanFiles = filesByIdMap.values .where((f) => !foldersByIdMap.containsKey(f.parentFolderId)); for (final staleOrphanFile in staleOrphanFiles) { - final parentPath = await _driveDao - .folderById( - driveId: driveId, folderId: staleOrphanFile.parentFolderId.value) - .map((f) => f.path) - .getSingleOrNull(); + if (staleOrphanFile.parentFolderId.value.isNotEmpty) { + final parentPath = await _driveDao + .folderById( + driveId: driveId, + folderId: staleOrphanFile.parentFolderId.value) + .map((f) => f.path) + .getSingleOrNull(); - if (parentPath != null) { - final filePath = parentPath + '/' + staleOrphanFile.name.value; + if (parentPath != null) { + final filePath = parentPath + '/' + staleOrphanFile.name.value; - await _driveDao.writeToFile(FileEntriesCompanion( - id: staleOrphanFile.id, - driveId: staleOrphanFile.driveId, - path: Value(filePath))); - } else { - print( - 'Stale orphan file ${staleOrphanFile.id.value} parent folder ${staleOrphanFile.parentFolderId.value} could not be found.'); + await _driveDao.writeToFile(FileEntriesCompanion( + id: staleOrphanFile.id, + driveId: staleOrphanFile.driveId, + path: Value(filePath))); + } else { + print( + 'Stale orphan file ${staleOrphanFile.id.value} parent folder ${staleOrphanFile.parentFolderId.value} could not be found.'); + } } } } diff --git a/lib/models/queries/drive_queries.moor b/lib/models/queries/drive_queries.moor index 818ef5f130..9693cb7726 100644 --- a/lib/models/queries/drive_queries.moor +++ b/lib/models/queries/drive_queries.moor @@ -32,7 +32,8 @@ folderById: WHERE driveId = :driveId AND id = :folderId; folderWithPath: SELECT * FROM folder_entries - WHERE driveId = :driveId AND path = :path; + WHERE driveId = :driveId AND path = :path + LIMIT 1; foldersInFolder ($order = ''): SELECT * FROM folder_entries From 78794166b871b1796bd13e88d2eb0c31661a73e2 Mon Sep 17 00:00:00 2001 From: jdaev Date: Tue, 26 Oct 2021 11:43:55 -0400 Subject: [PATCH 13/18] task: revert pubspec changes --- pubspec.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 948e4713f5..8b4b06939f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -835,7 +835,7 @@ packages: name: sqlite3 url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.2.0" sqlparser: dependency: transitive description: @@ -933,7 +933,7 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.0.10" + version: "6.0.12" url_launcher_linux: dependency: transitive description: @@ -1040,5 +1040,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.13.0 <3.0.0" - flutter: ">=2.2.0" \ No newline at end of file + dart: ">=2.14.0 <3.0.0" + flutter: ">=2.5.0" \ No newline at end of file From fdc1ea16322b3c832150a877cbac3adf3d79c9a2 Mon Sep 17 00:00:00 2001 From: jdaev Date: Tue, 26 Oct 2021 13:50:33 -0400 Subject: [PATCH 14/18] task: remove redundant code --- lib/blocs/sync/sync_cubit.dart | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/blocs/sync/sync_cubit.dart b/lib/blocs/sync/sync_cubit.dart index 883874444b..38b100000d 100644 --- a/lib/blocs/sync/sync_cubit.dart +++ b/lib/blocs/sync/sync_cubit.dart @@ -165,13 +165,6 @@ class SyncCubit extends Cubit { final latestFileRevisions = await _addNewFileEntityRevisions( driveId, newEntities.whereType()); - latestFileRevisions.map((file) { - //If Parent-Folder-Id is missing put it in the root folder of the drive - if (!file.parentFolderId.present) { - file = file.copyWith(parentFolderId: Value(drive.rootFolderId)); - } - }); - //Check and handle cases where there's no more revisions final updatedDrive = latestDriveRevision != null ? await _computeRefreshedDriveFromRevision(latestDriveRevision) From 251fe82f7f4e727c0c8d320d95866d3c1f4205a8 Mon Sep 17 00:00:00 2001 From: jdaev Date: Wed, 27 Oct 2021 12:07:53 -0400 Subject: [PATCH 15/18] task: version up --- pubspec.lock | 2 +- pubspec.yaml | 2 +- web/index.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 57ab9cdc07..f3bc91bb54 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1062,4 +1062,4 @@ packages: version: "3.1.0" sdks: dart: ">=2.14.0 <3.0.0" - flutter: ">=2.5.0" \ No newline at end of file + flutter: ">=2.5.0" diff --git a/pubspec.yaml b/pubspec.yaml index f93fa537ab..5c41514825 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -13,7 +13,7 @@ publish_to: 'none' # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.2.2 +version: 1.2.3 environment: sdk: '>=2.12.0 <3.0.0' diff --git a/web/index.html b/web/index.html index f6ba7f4491..b48e05dffd 100644 --- a/web/index.html +++ b/web/index.html @@ -35,7 +35,7 @@ - + From 67f2bef6be99a6a1b421239d285edaa0bb0f5fff Mon Sep 17 00:00:00 2001 From: jdaev Date: Thu, 28 Oct 2021 10:07:02 -0400 Subject: [PATCH 16/18] task: downgrade flutter to v2.2.3 --- .github/workflows/deploy-dev.yaml | 2 +- .github/workflows/deploy-prod.yaml | 2 +- .github/workflows/pr.yaml | 2 +- pubspec.lock | 89 ++++++++++++------------------ pubspec.yaml | 6 +- web/index.html | 2 +- 6 files changed, 41 insertions(+), 62 deletions(-) diff --git a/.github/workflows/deploy-dev.yaml b/.github/workflows/deploy-dev.yaml index ad4b92a867..0be010ac5b 100644 --- a/.github/workflows/deploy-dev.yaml +++ b/.github/workflows/deploy-dev.yaml @@ -20,7 +20,7 @@ jobs: persist-credentials: false - uses: subosito/flutter-action@v1 with: - flutter-version: '2.5.3' + flutter-version: '2.2.3' - name: Build app run: | flutter pub get diff --git a/.github/workflows/deploy-prod.yaml b/.github/workflows/deploy-prod.yaml index 84953d8649..9c1103d2dc 100644 --- a/.github/workflows/deploy-prod.yaml +++ b/.github/workflows/deploy-prod.yaml @@ -20,7 +20,7 @@ jobs: persist-credentials: false - uses: subosito/flutter-action@v1 with: - flutter-version: '2.5.3' + flutter-version: '2.2.3' - name: Build app run: | flutter pub get diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index f8063c5ae7..ca4c582d75 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -28,7 +28,7 @@ jobs: persist-credentials: false - uses: subosito/flutter-action@v1 with: - flutter-version: '2.5.3' + flutter-version: '2.2.3' - name: Build app run: | flutter pub get diff --git a/pubspec.lock b/pubspec.lock index f3bc91bb54..ac02ac9b17 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,21 +7,21 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "29.0.0" + version: "22.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "2.6.0" + version: "1.7.2" analyzer_plugin: dependency: transitive description: name: analyzer_plugin url: "https://pub.dartlang.org" source: hosted - version: "0.8.0" + version: "0.6.0" archive: dependency: transitive description: @@ -42,7 +42,7 @@ packages: name: artemis url: "https://pub.dartlang.org" source: hosted - version: "7.2.3-beta" + version: "7.1.1-beta.1" arweave: dependency: "direct main" description: @@ -58,7 +58,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.1" + version: "2.6.1" bloc: dependency: transitive description: @@ -93,7 +93,7 @@ packages: name: build url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.0" build_config: dependency: transitive description: @@ -107,7 +107,7 @@ packages: name: build_daemon url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.0" build_resolvers: dependency: transitive description: @@ -121,14 +121,14 @@ packages: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "2.1.4" + version: "2.1.2" build_runner_core: dependency: transitive description: name: build_runner_core url: "https://pub.dartlang.org" source: hosted - version: "7.2.2" + version: "7.1.0" built_collection: dependency: transitive description: @@ -156,7 +156,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.3.1" + version: "1.2.0" checked_yaml: dependency: transitive description: @@ -233,21 +233,7 @@ packages: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" - drift: - dependency: transitive - description: - name: drift - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.1" - drift_dev: - dependency: transitive - description: - name: drift_dev - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.2" + version: "2.1.1" equatable: dependency: transitive description: @@ -282,7 +268,7 @@ packages: name: file url: "https://pub.dartlang.org" source: hosted - version: "6.1.2" + version: "6.1.0" file_selector: dependency: "direct main" description: @@ -403,7 +389,7 @@ packages: name: glob url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.1" google_fonts: dependency: "direct main" description: @@ -418,13 +404,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.13.1-alpha+1633799193898" - gql_code_builder2: + gql_code_builder: dependency: transitive description: - name: gql_code_builder2 + name: gql_code_builder url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.2.0" gql_dedupe_link: dependency: transitive description: @@ -466,7 +452,7 @@ packages: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.13.4" + version: "0.13.3" http_client: dependency: "direct main" description: @@ -522,14 +508,14 @@ packages: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "4.3.0" + version: "4.1.0" json_serializable: dependency: "direct dev" description: name: json_serializable url: "https://pub.dartlang.org" source: hosted - version: "6.0.0" + version: "4.1.4" jwk: dependency: transitive description: @@ -578,14 +564,14 @@ packages: name: moor url: "https://pub.dartlang.org" source: hosted - version: "4.6.1" + version: "4.5.0" moor_generator: dependency: "direct dev" description: name: moor_generator url: "https://pub.dartlang.org" source: hosted - version: "4.6.0" + version: "4.4.1" nested: dependency: transitive description: @@ -662,7 +648,7 @@ packages: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.4" path_provider_linux: dependency: transitive description: @@ -732,7 +718,7 @@ packages: name: process url: "https://pub.dartlang.org" source: hosted - version: "4.2.3" + version: "4.2.1" provider: dependency: transitive description: @@ -821,14 +807,7 @@ packages: name: source_gen url: "https://pub.dartlang.org" source: hosted - version: "1.1.1" - source_helper: - dependency: transitive - description: - name: source_helper - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" + version: "1.0.3" source_map_stack_trace: dependency: transitive description: @@ -856,14 +835,14 @@ packages: name: sqlite3 url: "https://pub.dartlang.org" source: hosted - version: "1.3.1" + version: "1.1.2" sqlparser: dependency: transitive description: name: sqlparser url: "https://pub.dartlang.org" source: hosted - version: "0.18.0" + version: "0.17.2" stack_trace: dependency: transitive description: @@ -912,21 +891,21 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.17.10" + version: "1.16.8" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.2" + version: "0.3.0" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.4.0" + version: "0.3.19" timeago: dependency: "direct main" description: @@ -954,7 +933,7 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.0.12" + version: "6.0.10" url_launcher_linux: dependency: transitive description: @@ -1010,14 +989,14 @@ packages: name: vm_service url: "https://pub.dartlang.org" source: hosted - version: "7.1.1" + version: "6.2.0" watcher: dependency: transitive description: name: watcher url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.0" web_socket_channel: dependency: transitive description: @@ -1061,5 +1040,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.14.0 <3.0.0" - flutter: ">=2.5.0" + dart: ">=2.13.0 <3.0.0" + flutter: ">=2.2.0" diff --git a/pubspec.yaml b/pubspec.yaml index 5c41514825..1009f1c4a8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -13,7 +13,7 @@ publish_to: 'none' # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.2.3 +version: 1.2.4 environment: sdk: '>=2.12.0 <3.0.0' @@ -38,7 +38,7 @@ dependencies: google_fonts: ^2.1.0 intersperse: ^2.0.0 intl: ^0.17.0 - json_annotation: ^4.3.0 + json_annotation: ^4.1.0 mime: ^1.0.0 moor: ^4.4.1 path_provider: ^2.0.2 @@ -66,7 +66,7 @@ dev_dependencies: build_runner: ^2.0.4 moor_generator: ^4.4.1 mocktail: ^0.2.0 - json_serializable: ^6.0.0 + json_serializable: ^4.1.0 dependency_overrides: meta: 1.7.0 diff --git a/web/index.html b/web/index.html index b48e05dffd..6bc394e8dc 100644 --- a/web/index.html +++ b/web/index.html @@ -35,7 +35,7 @@ - + From 204af8654bccd77a3dc8cfb9b49a08dcbc20ccb4 Mon Sep 17 00:00:00 2001 From: jdaev Date: Thu, 28 Oct 2021 10:14:46 -0400 Subject: [PATCH 17/18] task: downgrade dropzone version --- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index ac02ac9b17..265172f5b3 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -334,7 +334,7 @@ packages: name: flutter_dropzone url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "2.1.0" flutter_dropzone_platform_interface: dependency: transitive description: @@ -348,7 +348,7 @@ packages: name: flutter_dropzone_web url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "2.1.1" flutter_localizations: dependency: "direct main" description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index 1009f1c4a8..80011c80d7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -49,7 +49,7 @@ dependencies: url_launcher: ^6.0.6 uuid: ^3.0.4 http_client: ^1.5.1 - flutter_dropzone: ^3.0.0 + flutter_dropzone: ^2.1.0 responsive_builder: ^0.4.1 package_info_plus: ^1.0.3 js: ^0.6.3 From 1d70f69a39c070bb372be68c1d380671f448744a Mon Sep 17 00:00:00 2001 From: jdaev Date: Thu, 28 Oct 2021 14:36:08 -0400 Subject: [PATCH 18/18] task: change version --- pubspec.yaml | 2 +- web/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 80011c80d7..52561c70bf 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -13,7 +13,7 @@ publish_to: 'none' # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.2.4 +version: 1.2.3 environment: sdk: '>=2.12.0 <3.0.0' diff --git a/web/index.html b/web/index.html index 6bc394e8dc..b48e05dffd 100644 --- a/web/index.html +++ b/web/index.html @@ -35,7 +35,7 @@ - +