diff --git a/packages/komodo_defi_framework/app_build/build_config.json b/packages/komodo_defi_framework/app_build/build_config.json index c9fe353..c38d0d0 100644 --- a/packages/komodo_defi_framework/app_build/build_config.json +++ b/packages/komodo_defi_framework/app_build/build_config.json @@ -28,7 +28,7 @@ "coins": { "fetch_at_build_enabled": true, "update_commit_on_build": true, - "bundled_coins_repo_commit": "eae824b3502f9da19cce891f93e8c2f98fbf534f", + "bundled_coins_repo_commit": "8a37a6cdb8f4f334f305899006b31415e3a49bf1", "coins_repo_api_url": "https://api.github.com/repos/KomodoPlatform/coins", "coins_repo_content_url": "https://komodoplatform.github.io/coins", "coins_repo_branch": "master", diff --git a/packages/komodo_defi_framework/pubspec.yaml b/packages/komodo_defi_framework/pubspec.yaml index c3206fc..179ba0d 100644 --- a/packages/komodo_defi_framework/pubspec.yaml +++ b/packages/komodo_defi_framework/pubspec.yaml @@ -20,19 +20,16 @@ dependencies: flutter_web_plugins: sdk: flutter http: ^1.2.2 - komodo_wallet_build_transformer: - path: ../komodo_wallet_build_transformer komodo_defi_types: path: ../komodo_defi_types - + komodo_wallet_build_transformer: + path: ../komodo_wallet_build_transformer logging: ^1.2.0 + path: any path_provider: ^2.1.4 plugin_platform_interface: ^2.0.2 web: ^1.1.0 - - - path: any dev_dependencies: build_runner: ^2.4.11 # build_web_compilers: ^4.0.10 @@ -40,12 +37,10 @@ dev_dependencies: flutter_lints: ^4.0.0 flutter_test: sdk: flutter + js: any very_good_analysis: ^6.0.0 yaml: ^3.1.2 - - - js: any flutter: plugin: platforms: @@ -58,7 +53,6 @@ flutter: windows: ffiPlugin: true linux: - ffiPlugin: true web: pluginClass: KomodoDefiFrameworkWeb diff --git a/packages/komodo_defi_local_auth/pubspec.yaml b/packages/komodo_defi_local_auth/pubspec.yaml index 0c44cc6..0733074 100644 --- a/packages/komodo_defi_local_auth/pubspec.yaml +++ b/packages/komodo_defi_local_auth/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: flutter: sdk: flutter flutter_bloc: ^8.1.6 - flutter_secure_storage: ^9.2.2 + flutter_secure_storage: ^9.2.4 komodo_defi_framework: path: ../komodo_defi_framework @@ -32,10 +32,3 @@ dev_dependencies: sdk: flutter mocktail: ^1.0.4 very_good_analysis: ^6.0.0 - -dependency_overrides: - flutter_secure_storage_web: - git: - url: https://github.com/mogol/flutter_secure_storage.git - ref: develop - path: flutter_secure_storage_web diff --git a/packages/komodo_defi_sdk/example/pubspec.yaml b/packages/komodo_defi_sdk/example/pubspec.yaml index 49ff7f9..6af1355 100644 --- a/packages/komodo_defi_sdk/example/pubspec.yaml +++ b/packages/komodo_defi_sdk/example/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: flutter: sdk: flutter flutter_bloc: ^8.1.6 - flutter_secure_storage: ^9.2.2 + flutter_secure_storage: ^9.2.4 komodo_defi_sdk: path: ../ @@ -31,12 +31,5 @@ dev_dependencies: js: any -dependency_overrides: - flutter_secure_storage_web: - git: - url: https://github.com/mogol/flutter_secure_storage.git - ref: develop - path: flutter_secure_storage_web - flutter: uses-material-design: true diff --git a/packages/komodo_defi_sdk/pubspec.yaml b/packages/komodo_defi_sdk/pubspec.yaml index 7414588..5d41b47 100644 --- a/packages/komodo_defi_sdk/pubspec.yaml +++ b/packages/komodo_defi_sdk/pubspec.yaml @@ -21,7 +21,7 @@ dependencies: decimal: ^3.0.2 flutter: sdk: flutter - flutter_secure_storage: ^9.2.2 + flutter_secure_storage: ^9.2.4 komodo_coins: path: ../komodo_coins @@ -43,13 +43,6 @@ dev_dependencies: test: ^1.25.2 very_good_analysis: ^6.0.0 -dependency_overrides: - flutter_secure_storage_web: - git: - url: https://github.com/mogol/flutter_secure_storage.git - ref: develop - path: flutter_secure_storage_web - # TODO: Move to a separate sub-package? # flutter: # assets: diff --git a/packages/komodo_defi_types/lib/komodo_defi_types.dart b/packages/komodo_defi_types/lib/komodo_defi_types.dart index 7a87367..88f4a32 100644 --- a/packages/komodo_defi_types/lib/komodo_defi_types.dart +++ b/packages/komodo_defi_types/lib/komodo_defi_types.dart @@ -12,10 +12,14 @@ export 'src/auth/auth_result.dart'; // export 'src/auth/exceptions/incorrect_password_exception.dart'; export 'src/auth/exceptions/auth_exception.dart'; export 'src/auth/kdf_user.dart'; - -// Aliased/proxied types -export 'src/exported_rpc_types.dart'; export 'src/komodo_defi_types_base.dart'; +// Aliased/proxied types +// TODO: Consider moving utils to a separate package. The rationale for +// including them here is that many are associated with the types in this +// package. +export 'src/utils/json_type_utils.dart'; +export 'src/utils/mnemonic_validator.dart'; +export 'src/utils/security_utils.dart'; export 'types.dart'; // Export activation params types diff --git a/packages/komodo_wallet_cli/pubspec.lock b/packages/komodo_wallet_cli/pubspec.lock index baf3535..fd82b82 100644 --- a/packages/komodo_wallet_cli/pubspec.lock +++ b/packages/komodo_wallet_cli/pubspec.lock @@ -5,23 +5,23 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77" + sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" url: "https://pub.dev" source: hosted - version: "73.0.0" + version: "76.0.0" _macros: dependency: transitive description: dart source: sdk - version: "0.3.2" + version: "0.3.3" analyzer: dependency: transitive description: name: analyzer - sha256: "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a" + sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" url: "https://pub.dev" source: hosted - version: "6.8.0" + version: "6.11.0" args: dependency: "direct main" description: @@ -193,10 +193,10 @@ packages: dependency: transitive description: name: macros - sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" url: "https://pub.dev" source: hosted - version: "0.1.2-main.4" + version: "0.1.3-main.0" matcher: dependency: transitive description: diff --git a/playground/macos/Flutter/GeneratedPluginRegistrant.swift b/playground/macos/Flutter/GeneratedPluginRegistrant.swift index 99130cd..89cb152 100644 --- a/playground/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/playground/macos/Flutter/GeneratedPluginRegistrant.swift @@ -6,12 +6,14 @@ import FlutterMacOS import Foundation import flutter_inappwebview_macos +import flutter_secure_storage_macos import path_provider_foundation import shared_preferences_foundation import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { InAppWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "InAppWebViewFlutterPlugin")) + FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) diff --git a/playground/pubspec.lock b/playground/pubspec.lock index 8bad960..fb3e89e 100644 --- a/playground/pubspec.lock +++ b/playground/pubspec.lock @@ -250,10 +250,26 @@ packages: dependency: "direct main" description: name: flutter_secure_storage - sha256: "9f3dd2ac3b6875b0fde5b04734789c3ef35ba3965c18e99dd564a7a2f8056df6" + sha256: "9cad52d75ebc511adfae3d447d5d13da15a55a92c9410e50f67335b6d21d16ea" url: "https://pub.dev" source: hosted - version: "4.2.1" + version: "9.2.4" + flutter_secure_storage_linux: + dependency: transitive + description: + name: flutter_secure_storage_linux + sha256: bf7404619d7ab5c0a1151d7c4e802edad8f33535abfbeff2f9e1fe1274e2d705 + url: "https://pub.dev" + source: hosted + version: "1.2.2" + flutter_secure_storage_macos: + dependency: transitive + description: + name: flutter_secure_storage_macos + sha256: "6c0a2795a2d1de26ae202a0d78527d163f4acbb11cde4c75c670f3a0fc064247" + url: "https://pub.dev" + source: hosted + version: "3.1.3" flutter_secure_storage_platform_interface: dependency: transitive description: @@ -263,14 +279,21 @@ packages: source: hosted version: "1.1.2" flutter_secure_storage_web: - dependency: "direct overridden" - description: - path: flutter_secure_storage_web - ref: develop - resolved-ref: "5a5692b609b3886cdd49b2ed06b9c079ecdff996" - url: "https://github.com/mogol/flutter_secure_storage.git" - source: git - version: "2.0.0-beta.1" + dependency: transitive + description: + name: flutter_secure_storage_web + sha256: f4ebff989b4f07b2656fb16b47852c0aab9fed9b4ec1c70103368337bc1886a9 + url: "https://pub.dev" + source: hosted + version: "1.2.1" + flutter_secure_storage_windows: + dependency: transitive + description: + name: flutter_secure_storage_windows + sha256: b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709 + url: "https://pub.dev" + source: hosted + version: "3.1.2" flutter_test: dependency: "direct dev" description: flutter @@ -333,10 +356,10 @@ packages: dependency: "direct dev" description: name: js - sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "0.7.1" + version: "0.6.7" json_annotation: dependency: transitive description: @@ -794,6 +817,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + win32: + dependency: transitive + description: + name: win32 + sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a" + url: "https://pub.dev" + source: hosted + version: "5.5.4" xdg_directories: dependency: transitive description: diff --git a/playground/pubspec.yaml b/playground/pubspec.yaml index f93cb42..b77c56a 100644 --- a/playground/pubspec.yaml +++ b/playground/pubspec.yaml @@ -2,8 +2,8 @@ name: komodo_defi_framework_example description: "Demonstrates how to use the komodo_defi_framework plugin." # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. -publish_to: 'none' # Remove this line if you wish to publish to pub.dev -repository: 'https://github.com/KomodoPlatform/komodo-defi-sdk-flutter/tree/dev/example' +publish_to: "none" # Remove this line if you wish to publish to pub.dev +repository: "https://github.com/KomodoPlatform/komodo-defi-sdk-flutter/tree/dev/example" # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 @@ -21,7 +21,7 @@ version: 1.0.0+1 environment: sdk: ^3.4.4 - flutter: '>=3.22.0 <3.25.0' + flutter: ">=3.22.0 <3.25.0" # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions @@ -46,7 +46,7 @@ dependencies: cupertino_icons: ^1.0.8 bip39: ^1.0.6 json_editor_flutter: ^1.4.2 - flutter_secure_storage: ^4.2.1 + flutter_secure_storage: ^9.2.4 shared_preferences: ^2.3.1 postman_collection: ^0.0.9 flutter_json_view: ^1.1.2 @@ -68,23 +68,15 @@ dev_dependencies: # rules and activating additional ones. flutter_lints: ^4.0.0 -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec + # For information on the generic Dart part of this file, see the + # following page: https://dart.dev/tools/pub/pubspec -# The following section is specific to Flutter packages. + # The following section is specific to Flutter packages. flutter_web_plugins: sdk: flutter js: any -dependency_overrides: - flutter_secure_storage_web: - git: - url: https://github.com/mogol/flutter_secure_storage.git - ref: develop - path: flutter_secure_storage_web - flutter: - # The following line ensures that the Material Icons font is # included with your application, so that you can use the icons in # the material Icons class. diff --git a/playground/windows/flutter/generated_plugin_registrant.cc b/playground/windows/flutter/generated_plugin_registrant.cc index f201e2b..6dfc5b4 100644 --- a/playground/windows/flutter/generated_plugin_registrant.cc +++ b/playground/windows/flutter/generated_plugin_registrant.cc @@ -7,11 +7,14 @@ #include "generated_plugin_registrant.h" #include +#include #include void RegisterPlugins(flutter::PluginRegistry* registry) { FlutterInappwebviewWindowsPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("FlutterInappwebviewWindowsPluginCApi")); + FlutterSecureStorageWindowsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin")); UrlLauncherWindowsRegisterWithRegistrar( registry->GetRegistrarForPlugin("UrlLauncherWindows")); } diff --git a/playground/windows/flutter/generated_plugins.cmake b/playground/windows/flutter/generated_plugins.cmake index e90fba7..04e78ac 100644 --- a/playground/windows/flutter/generated_plugins.cmake +++ b/playground/windows/flutter/generated_plugins.cmake @@ -4,6 +4,7 @@ list(APPEND FLUTTER_PLUGIN_LIST flutter_inappwebview_windows + flutter_secure_storage_windows url_launcher_windows )