From d2e599e29241ec536f2569682cf25befd5c82162 Mon Sep 17 00:00:00 2001 From: AyushBherwani1998 Date: Wed, 4 Dec 2024 23:29:02 +0530 Subject: [PATCH 1/3] update examples --- .../ios/Podfile.lock | 24 +++++++++---------- .../ios/Runner/AppDelegate.swift | 2 +- .../pubspec.lock | 4 ++-- .../pubspec.yaml | 2 +- .../flutter-auth0-example/ios/Podfile.lock | 2 +- flutter/flutter-auth0-example/pubspec.lock | 4 ++-- flutter/flutter-auth0-example/pubspec.yaml | 2 +- .../flutter-firebase-example/ios/Podfile.lock | 24 +++++++++---------- .../flutter-firebase-example/lib/main.dart | 1 - flutter/flutter-firebase-example/pubspec.lock | 12 +++++----- flutter/flutter-firebase-example/pubspec.yaml | 5 +--- flutter/flutter-playground/ios/Podfile.lock | 24 +++++++++---------- flutter/flutter-playground/pubspec.lock | 10 ++++---- flutter/flutter-playground/pubspec.yaml | 5 +--- flutter/flutter-quick-start/ios/Podfile.lock | 24 +++++++++---------- flutter/flutter-quick-start/lib/main.dart | 12 +++++++--- flutter/flutter-quick-start/pubspec.lock | 8 +++---- flutter/flutter-quick-start/pubspec.yaml | 4 ++-- .../flutter-solana-example/ios/Podfile.lock | 24 +++++++++---------- flutter/flutter-solana-example/pubspec.lock | 10 ++++---- flutter/flutter-solana-example/pubspec.yaml | 5 +--- 21 files changed, 102 insertions(+), 106 deletions(-) diff --git a/flutter/flutter-aggregate-verifier-example/ios/Podfile.lock b/flutter/flutter-aggregate-verifier-example/ios/Podfile.lock index a8a5a1286..921f08f4e 100644 --- a/flutter/flutter-aggregate-verifier-example/ios/Podfile.lock +++ b/flutter/flutter-aggregate-verifier-example/ios/Podfile.lock @@ -1,22 +1,22 @@ PODS: - BigInt (5.2.0) - - curvelib.swift (1.0.1) + - curvelib.swift (2.0.0) - Flutter (1.0.0) - KeychainSwift (20.0.0) - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS - - TorusSessionManager (4.0.2): - - curvelib.swift (~> 1.0.1) + - TorusSessionManager (6.0.1): + - curvelib.swift (~> 2.0.0) - KeychainSwift (~> 20.0.0) - - Web3Auth (9.0.0): + - Web3Auth (10.0.1): - BigInt (~> 5.2.0) - - curvelib.swift (~> 1.0.1) + - curvelib.swift (~> 2.0.0) - KeychainSwift (~> 20.0.0) - - TorusSessionManager (~> 4.0.2) + - TorusSessionManager (~> 6.0.1) - web3auth_flutter (2.0.1): - Flutter - - Web3Auth (~> 9.0.0) + - Web3Auth (~> 10.0.1) DEPENDENCIES: - Flutter (from `Flutter`) @@ -41,14 +41,14 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: BigInt: f668a80089607f521586bbe29513d708491ef2f7 - curvelib.swift: d0746ae82bee34016c06da3567a97e493b3c979f + curvelib.swift: b9223e5cac801effed8a5fe8968e952b3fe427a5 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 KeychainSwift: 0ce6a4d13f7228054d1a71bb1b500448fb2ab837 shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 - TorusSessionManager: 05a1a8f3265d0949a1a342c4ba2c52882445b614 - Web3Auth: 086b5152a43df347ceff196c0ce67f6330838884 - web3auth_flutter: bc5ffefe573c72f7fb1814573269952b045b7b22 + TorusSessionManager: 9c9871718233dc020ab4fde9bdf37802f01dae10 + Web3Auth: c7fddb06065c213bf4fd8badd166201ab31cb29b + web3auth_flutter: 816f64706f40f7fc08698c77e53cd3c7ad0736f3 PODFILE CHECKSUM: 775997f741c536251164e3eacf6e34abf2eb7a17 -COCOAPODS: 1.14.3 +COCOAPODS: 1.15.2 diff --git a/flutter/flutter-aggregate-verifier-example/ios/Runner/AppDelegate.swift b/flutter/flutter-aggregate-verifier-example/ios/Runner/AppDelegate.swift index 70693e4a8..b63630348 100644 --- a/flutter/flutter-aggregate-verifier-example/ios/Runner/AppDelegate.swift +++ b/flutter/flutter-aggregate-verifier-example/ios/Runner/AppDelegate.swift @@ -1,7 +1,7 @@ import UIKit import Flutter -@UIApplicationMain +@main @objc class AppDelegate: FlutterAppDelegate { override func application( _ application: UIApplication, diff --git a/flutter/flutter-aggregate-verifier-example/pubspec.lock b/flutter/flutter-aggregate-verifier-example/pubspec.lock index d72f433aa..3f6028589 100644 --- a/flutter/flutter-aggregate-verifier-example/pubspec.lock +++ b/flutter/flutter-aggregate-verifier-example/pubspec.lock @@ -473,10 +473,10 @@ packages: dependency: "direct main" description: name: web3auth_flutter - sha256: "6590bf131dc773fda6a07ec6ee5ac2f63aa7bdaf36977fa3335b84f3083089d2" + sha256: "94eab6cebc241bcb9d2e00e857d97c0635a2778acc886db269bf41f91e794985" url: "https://pub.dev" source: hosted - version: "5.0.4" + version: "6.0.1" web3dart: dependency: "direct main" description: diff --git a/flutter/flutter-aggregate-verifier-example/pubspec.yaml b/flutter/flutter-aggregate-verifier-example/pubspec.yaml index 8da0d62ed..05db061c2 100644 --- a/flutter/flutter-aggregate-verifier-example/pubspec.yaml +++ b/flutter/flutter-aggregate-verifier-example/pubspec.yaml @@ -35,7 +35,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 - web3auth_flutter: ^5.0.4 + web3auth_flutter: ^6.0.1 web3dart: ^2.7.2 shared_preferences: ^2.2.2 http: ^1.2.0 diff --git a/flutter/flutter-auth0-example/ios/Podfile.lock b/flutter/flutter-auth0-example/ios/Podfile.lock index a8a5a1286..6da386cc2 100644 --- a/flutter/flutter-auth0-example/ios/Podfile.lock +++ b/flutter/flutter-auth0-example/ios/Podfile.lock @@ -51,4 +51,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 775997f741c536251164e3eacf6e34abf2eb7a17 -COCOAPODS: 1.14.3 +COCOAPODS: 1.15.2 diff --git a/flutter/flutter-auth0-example/pubspec.lock b/flutter/flutter-auth0-example/pubspec.lock index d72f433aa..3f6028589 100644 --- a/flutter/flutter-auth0-example/pubspec.lock +++ b/flutter/flutter-auth0-example/pubspec.lock @@ -473,10 +473,10 @@ packages: dependency: "direct main" description: name: web3auth_flutter - sha256: "6590bf131dc773fda6a07ec6ee5ac2f63aa7bdaf36977fa3335b84f3083089d2" + sha256: "94eab6cebc241bcb9d2e00e857d97c0635a2778acc886db269bf41f91e794985" url: "https://pub.dev" source: hosted - version: "5.0.4" + version: "6.0.1" web3dart: dependency: "direct main" description: diff --git a/flutter/flutter-auth0-example/pubspec.yaml b/flutter/flutter-auth0-example/pubspec.yaml index 8da0d62ed..05db061c2 100644 --- a/flutter/flutter-auth0-example/pubspec.yaml +++ b/flutter/flutter-auth0-example/pubspec.yaml @@ -35,7 +35,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 - web3auth_flutter: ^5.0.4 + web3auth_flutter: ^6.0.1 web3dart: ^2.7.2 shared_preferences: ^2.2.2 http: ^1.2.0 diff --git a/flutter/flutter-firebase-example/ios/Podfile.lock b/flutter/flutter-firebase-example/ios/Podfile.lock index f8380ee61..374c3d5cb 100644 --- a/flutter/flutter-firebase-example/ios/Podfile.lock +++ b/flutter/flutter-firebase-example/ios/Podfile.lock @@ -1,6 +1,6 @@ PODS: - BigInt (5.2.0) - - curvelib.swift (1.0.1) + - curvelib.swift (2.0.0) - Firebase/Auth (10.18.0): - Firebase/CoreOnly - FirebaseAuth (~> 10.18.0) @@ -50,17 +50,17 @@ PODS: - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS - - TorusSessionManager (4.0.2): - - curvelib.swift (~> 1.0.1) + - TorusSessionManager (6.0.1): + - curvelib.swift (~> 2.0.0) - KeychainSwift (~> 20.0.0) - - Web3Auth (9.0.0): + - Web3Auth (10.0.1): - BigInt (~> 5.2.0) - - curvelib.swift (~> 1.0.1) + - curvelib.swift (~> 2.0.0) - KeychainSwift (~> 20.0.0) - - TorusSessionManager (~> 4.0.2) + - TorusSessionManager (~> 6.0.1) - web3auth_flutter (2.0.1): - Flutter - - Web3Auth (~> 9.0.0) + - Web3Auth (~> 10.0.1) DEPENDENCIES: - firebase_auth (from `.symlinks/plugins/firebase_auth/ios`) @@ -100,7 +100,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: BigInt: f668a80089607f521586bbe29513d708491ef2f7 - curvelib.swift: d0746ae82bee34016c06da3567a97e493b3c979f + curvelib.swift: b9223e5cac801effed8a5fe8968e952b3fe427a5 Firebase: 414ad272f8d02dfbf12662a9d43f4bba9bec2a06 firebase_auth: 8e9ec02991ca4659111cc671c84d0c010b6bfb26 firebase_core: 0af4a2b24f62071f9bf283691c0ee41556dcb3f5 @@ -115,10 +115,10 @@ SPEC CHECKSUMS: PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4 RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21 shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c - TorusSessionManager: 05a1a8f3265d0949a1a342c4ba2c52882445b614 - Web3Auth: 086b5152a43df347ceff196c0ce67f6330838884 - web3auth_flutter: bc5ffefe573c72f7fb1814573269952b045b7b22 + TorusSessionManager: 9c9871718233dc020ab4fde9bdf37802f01dae10 + Web3Auth: c7fddb06065c213bf4fd8badd166201ab31cb29b + web3auth_flutter: 816f64706f40f7fc08698c77e53cd3c7ad0736f3 PODFILE CHECKSUM: 775997f741c536251164e3eacf6e34abf2eb7a17 -COCOAPODS: 1.14.3 +COCOAPODS: 1.15.2 diff --git a/flutter/flutter-firebase-example/lib/main.dart b/flutter/flutter-firebase-example/lib/main.dart index 602a4a0da..ab54a9e96 100644 --- a/flutter/flutter-firebase-example/lib/main.dart +++ b/flutter/flutter-firebase-example/lib/main.dart @@ -294,7 +294,6 @@ class _MyAppState extends State with WidgetsBindingObserver { return Web3AuthFlutter.login( LoginParams( loginProvider: Provider.jwt, - mfaLevel: MFALevel.OPTIONAL, extraLoginOptions: ExtraLoginOptions( id_token: idToken, domain: 'firebase', diff --git a/flutter/flutter-firebase-example/pubspec.lock b/flutter/flutter-firebase-example/pubspec.lock index 794b90ad6..81fdfbe40 100644 --- a/flutter/flutter-firebase-example/pubspec.lock +++ b/flutter/flutter-firebase-example/pubspec.lock @@ -175,7 +175,7 @@ packages: source: sdk version: "0.0.0" flutter_lints: - dependency: "direct overridden" + dependency: "direct dev" description: name: flutter_lints sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7 @@ -529,10 +529,10 @@ packages: dependency: "direct main" description: name: web3auth_flutter - sha256: "6590bf131dc773fda6a07ec6ee5ac2f63aa7bdaf36977fa3335b84f3083089d2" + sha256: "94eab6cebc241bcb9d2e00e857d97c0635a2778acc886db269bf41f91e794985" url: "https://pub.dev" source: hosted - version: "5.0.4" + version: "6.0.1" web3dart: dependency: "direct main" description: @@ -542,13 +542,13 @@ packages: source: hosted version: "2.7.2" win32: - dependency: "direct overridden" + dependency: transitive description: name: win32 - sha256: "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec" + sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb" url: "https://pub.dev" source: hosted - version: "5.5.5" + version: "5.5.0" xdg_directories: dependency: transitive description: diff --git a/flutter/flutter-firebase-example/pubspec.yaml b/flutter/flutter-firebase-example/pubspec.yaml index 8386f3a27..e2cde9658 100644 --- a/flutter/flutter-firebase-example/pubspec.yaml +++ b/flutter/flutter-firebase-example/pubspec.yaml @@ -35,7 +35,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 - web3auth_flutter: ^5.0.4 + web3auth_flutter: ^6.0.1 firebase_core: ^2.24.2 firebase_auth: ^4.16.0 web3dart: ^2.7.2 @@ -46,9 +46,6 @@ dev_dependencies: flutter_test: sdk: flutter -dependency_overrides: - win32: ^5.5.4 - # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is # activated in the `analysis_options.yaml` file located at the root of your diff --git a/flutter/flutter-playground/ios/Podfile.lock b/flutter/flutter-playground/ios/Podfile.lock index b3f321502..21dc572f3 100644 --- a/flutter/flutter-playground/ios/Podfile.lock +++ b/flutter/flutter-playground/ios/Podfile.lock @@ -1,19 +1,19 @@ PODS: - BigInt (5.2.0) - - curvelib.swift (1.0.1) + - curvelib.swift (2.0.0) - Flutter (1.0.0) - KeychainSwift (20.0.0) - - TorusSessionManager (4.0.2): - - curvelib.swift (~> 1.0.1) + - TorusSessionManager (6.0.1): + - curvelib.swift (~> 2.0.0) - KeychainSwift (~> 20.0.0) - - Web3Auth (9.0.0): + - Web3Auth (10.0.1): - BigInt (~> 5.2.0) - - curvelib.swift (~> 1.0.1) + - curvelib.swift (~> 2.0.0) - KeychainSwift (~> 20.0.0) - - TorusSessionManager (~> 4.0.2) + - TorusSessionManager (~> 6.0.1) - web3auth_flutter (2.0.1): - Flutter - - Web3Auth (~> 9.0.0) + - Web3Auth (~> 10.0.1) DEPENDENCIES: - Flutter (from `Flutter`) @@ -35,13 +35,13 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: BigInt: f668a80089607f521586bbe29513d708491ef2f7 - curvelib.swift: d0746ae82bee34016c06da3567a97e493b3c979f + curvelib.swift: b9223e5cac801effed8a5fe8968e952b3fe427a5 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 KeychainSwift: 0ce6a4d13f7228054d1a71bb1b500448fb2ab837 - TorusSessionManager: 05a1a8f3265d0949a1a342c4ba2c52882445b614 - Web3Auth: 086b5152a43df347ceff196c0ce67f6330838884 - web3auth_flutter: bc5ffefe573c72f7fb1814573269952b045b7b22 + TorusSessionManager: 9c9871718233dc020ab4fde9bdf37802f01dae10 + Web3Auth: c7fddb06065c213bf4fd8badd166201ab31cb29b + web3auth_flutter: 816f64706f40f7fc08698c77e53cd3c7ad0736f3 PODFILE CHECKSUM: 1959d098c91d8a792531a723c4a9d7e9f6a01e38 -COCOAPODS: 1.14.3 +COCOAPODS: 1.15.2 diff --git a/flutter/flutter-playground/pubspec.lock b/flutter/flutter-playground/pubspec.lock index 6c98a0dc4..aca344a65 100644 --- a/flutter/flutter-playground/pubspec.lock +++ b/flutter/flutter-playground/pubspec.lock @@ -292,13 +292,13 @@ packages: source: hosted version: "1.9.0" pinenacl: - dependency: "direct overridden" + dependency: transitive description: name: pinenacl - sha256: "57e907beaacbc3c024a098910b6240758e899674de07d6949a67b52fd984cbdf" + sha256: "3a5503637587d635647c93ea9a8fecf48a420cc7deebe6f1fc85c2a5637ab327" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.5.1" pointycastle: dependency: transitive description: @@ -460,10 +460,10 @@ packages: dependency: "direct main" description: name: web3auth_flutter - sha256: "6590bf131dc773fda6a07ec6ee5ac2f63aa7bdaf36977fa3335b84f3083089d2" + sha256: "94eab6cebc241bcb9d2e00e857d97c0635a2778acc886db269bf41f91e794985" url: "https://pub.dev" source: hosted - version: "5.0.4" + version: "6.0.1" web3dart: dependency: "direct main" description: diff --git a/flutter/flutter-playground/pubspec.yaml b/flutter/flutter-playground/pubspec.yaml index 07f3fd6cd..238abcdc4 100644 --- a/flutter/flutter-playground/pubspec.yaml +++ b/flutter/flutter-playground/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: http: ^1.2.0 provider: ^6.1.2 solana: ^0.31.0 - web3auth_flutter: ^5.0.4 + web3auth_flutter: ^6.0.1 web3dart: ^2.7.2 dev_dependencies: @@ -22,9 +22,6 @@ dev_dependencies: sdk: flutter flutter_lints: ^2.0.0 -dependency_overrides: - pinenacl: ^0.6.0 - flutter: uses-material-design: true diff --git a/flutter/flutter-quick-start/ios/Podfile.lock b/flutter/flutter-quick-start/ios/Podfile.lock index 002485101..ab2e05b45 100644 --- a/flutter/flutter-quick-start/ios/Podfile.lock +++ b/flutter/flutter-quick-start/ios/Podfile.lock @@ -1,22 +1,22 @@ PODS: - BigInt (5.2.0) - - curvelib.swift (1.0.1) + - curvelib.swift (2.0.0) - Flutter (1.0.0) - KeychainSwift (20.0.0) - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS - - TorusSessionManager (4.0.2): - - curvelib.swift (~> 1.0.1) + - TorusSessionManager (6.0.1): + - curvelib.swift (~> 2.0.0) - KeychainSwift (~> 20.0.0) - - Web3Auth (9.0.0): + - Web3Auth (10.0.1): - BigInt (~> 5.2.0) - - curvelib.swift (~> 1.0.1) + - curvelib.swift (~> 2.0.0) - KeychainSwift (~> 20.0.0) - - TorusSessionManager (~> 4.0.2) + - TorusSessionManager (~> 6.0.1) - web3auth_flutter (2.0.1): - Flutter - - Web3Auth (~> 9.0.0) + - Web3Auth (~> 10.0.1) DEPENDENCIES: - Flutter (from `Flutter`) @@ -41,14 +41,14 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: BigInt: f668a80089607f521586bbe29513d708491ef2f7 - curvelib.swift: d0746ae82bee34016c06da3567a97e493b3c979f + curvelib.swift: b9223e5cac801effed8a5fe8968e952b3fe427a5 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 KeychainSwift: 0ce6a4d13f7228054d1a71bb1b500448fb2ab837 shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 - TorusSessionManager: 05a1a8f3265d0949a1a342c4ba2c52882445b614 - Web3Auth: 086b5152a43df347ceff196c0ce67f6330838884 - web3auth_flutter: bc5ffefe573c72f7fb1814573269952b045b7b22 + TorusSessionManager: 9c9871718233dc020ab4fde9bdf37802f01dae10 + Web3Auth: c7fddb06065c213bf4fd8badd166201ab31cb29b + web3auth_flutter: 816f64706f40f7fc08698c77e53cd3c7ad0736f3 PODFILE CHECKSUM: 617d992413452517fc165846a57084923e4df00d -COCOAPODS: 1.14.3 +COCOAPODS: 1.15.2 diff --git a/flutter/flutter-quick-start/lib/main.dart b/flutter/flutter-quick-start/lib/main.dart index 1e44f39e8..80363aa48 100644 --- a/flutter/flutter-quick-start/lib/main.dart +++ b/flutter/flutter-quick-start/lib/main.dart @@ -78,10 +78,14 @@ class _MyAppState extends State with WidgetsBindingObserver { buildEnv: BuildEnv.production, // 259200 allows user to stay authenticated for 3 days with Web3Auth. // Default is 86400, which is 1 day. - sessionTime: 259200, + sessionTime: 40, )); - await Web3AuthFlutter.initialize(); + try { + await Web3AuthFlutter.initialize(); + } catch (e) { + log("Error initializing Web3Auth: $e"); + } // IMP END - Initialize Web3Auth final String res = await Web3AuthFlutter.getPrivKey(); @@ -260,10 +264,12 @@ class _MyAppState extends State with WidgetsBindingObserver { try { log(userEmail); // IMP START - Login - return await Web3AuthFlutter.login(LoginParams( + final response = Web3AuthFlutter.login(LoginParams( loginProvider: Provider.email_passwordless, extraLoginOptions: ExtraLoginOptions(login_hint: userEmail), )); + log(response.toString()); + return response; // IMP END - Login } catch (e) { log("Error during email/passwordless login: $e"); diff --git a/flutter/flutter-quick-start/pubspec.lock b/flutter/flutter-quick-start/pubspec.lock index 65fd872fb..9bd1a0301 100644 --- a/flutter/flutter-quick-start/pubspec.lock +++ b/flutter/flutter-quick-start/pubspec.lock @@ -473,10 +473,10 @@ packages: dependency: "direct main" description: name: web3auth_flutter - sha256: "6590bf131dc773fda6a07ec6ee5ac2f63aa7bdaf36977fa3335b84f3083089d2" + sha256: "94eab6cebc241bcb9d2e00e857d97c0635a2778acc886db269bf41f91e794985" url: "https://pub.dev" source: hosted - version: "5.0.4" + version: "6.0.1" web3dart: dependency: "direct main" description: @@ -489,10 +489,10 @@ packages: dependency: "direct overridden" description: name: win32 - sha256: "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec" + sha256: "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69" url: "https://pub.dev" source: hosted - version: "5.5.5" + version: "5.9.0" xdg_directories: dependency: transitive description: diff --git a/flutter/flutter-quick-start/pubspec.yaml b/flutter/flutter-quick-start/pubspec.yaml index 35892e28f..614476ea4 100644 --- a/flutter/flutter-quick-start/pubspec.yaml +++ b/flutter/flutter-quick-start/pubspec.yaml @@ -36,7 +36,7 @@ dependencies: # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 # // IMP START - Installation - web3auth_flutter: ^5.0.4 + web3auth_flutter: ^6.0.1 # // IMP END - Installation web3dart: ^2.7.2 shared_preferences: ^2.2.2 @@ -45,7 +45,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - + dependency_overrides: win32: ^5.5.4 diff --git a/flutter/flutter-solana-example/ios/Podfile.lock b/flutter/flutter-solana-example/ios/Podfile.lock index b3f321502..21dc572f3 100644 --- a/flutter/flutter-solana-example/ios/Podfile.lock +++ b/flutter/flutter-solana-example/ios/Podfile.lock @@ -1,19 +1,19 @@ PODS: - BigInt (5.2.0) - - curvelib.swift (1.0.1) + - curvelib.swift (2.0.0) - Flutter (1.0.0) - KeychainSwift (20.0.0) - - TorusSessionManager (4.0.2): - - curvelib.swift (~> 1.0.1) + - TorusSessionManager (6.0.1): + - curvelib.swift (~> 2.0.0) - KeychainSwift (~> 20.0.0) - - Web3Auth (9.0.0): + - Web3Auth (10.0.1): - BigInt (~> 5.2.0) - - curvelib.swift (~> 1.0.1) + - curvelib.swift (~> 2.0.0) - KeychainSwift (~> 20.0.0) - - TorusSessionManager (~> 4.0.2) + - TorusSessionManager (~> 6.0.1) - web3auth_flutter (2.0.1): - Flutter - - Web3Auth (~> 9.0.0) + - Web3Auth (~> 10.0.1) DEPENDENCIES: - Flutter (from `Flutter`) @@ -35,13 +35,13 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: BigInt: f668a80089607f521586bbe29513d708491ef2f7 - curvelib.swift: d0746ae82bee34016c06da3567a97e493b3c979f + curvelib.swift: b9223e5cac801effed8a5fe8968e952b3fe427a5 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 KeychainSwift: 0ce6a4d13f7228054d1a71bb1b500448fb2ab837 - TorusSessionManager: 05a1a8f3265d0949a1a342c4ba2c52882445b614 - Web3Auth: 086b5152a43df347ceff196c0ce67f6330838884 - web3auth_flutter: bc5ffefe573c72f7fb1814573269952b045b7b22 + TorusSessionManager: 9c9871718233dc020ab4fde9bdf37802f01dae10 + Web3Auth: c7fddb06065c213bf4fd8badd166201ab31cb29b + web3auth_flutter: 816f64706f40f7fc08698c77e53cd3c7ad0736f3 PODFILE CHECKSUM: 1959d098c91d8a792531a723c4a9d7e9f6a01e38 -COCOAPODS: 1.14.3 +COCOAPODS: 1.15.2 diff --git a/flutter/flutter-solana-example/pubspec.lock b/flutter/flutter-solana-example/pubspec.lock index 40891d2fb..330373f42 100644 --- a/flutter/flutter-solana-example/pubspec.lock +++ b/flutter/flutter-solana-example/pubspec.lock @@ -244,13 +244,13 @@ packages: source: hosted version: "1.9.0" pinenacl: - dependency: "direct overridden" + dependency: transitive description: name: pinenacl - sha256: "57e907beaacbc3c024a098910b6240758e899674de07d6949a67b52fd984cbdf" + sha256: "3a5503637587d635647c93ea9a8fecf48a420cc7deebe6f1fc85c2a5637ab327" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.5.1" pointycastle: dependency: transitive description: @@ -356,10 +356,10 @@ packages: dependency: "direct main" description: name: web3auth_flutter - sha256: "6590bf131dc773fda6a07ec6ee5ac2f63aa7bdaf36977fa3335b84f3083089d2" + sha256: "94eab6cebc241bcb9d2e00e857d97c0635a2778acc886db269bf41f91e794985" url: "https://pub.dev" source: hosted - version: "5.0.4" + version: "6.0.1" web_socket_channel: dependency: transitive description: diff --git a/flutter/flutter-solana-example/pubspec.yaml b/flutter/flutter-solana-example/pubspec.yaml index 47f3c28a3..86b0993bd 100644 --- a/flutter/flutter-solana-example/pubspec.yaml +++ b/flutter/flutter-solana-example/pubspec.yaml @@ -12,10 +12,7 @@ dependencies: get_it: ^7.6.4 hex: ^0.2.0 solana: ^0.31.0 - web3auth_flutter: ^5.0.4 - -dependency_overrides: - pinenacl: ^0.6.0 + web3auth_flutter: ^6.0.1 dev_dependencies: flutter_test: From f4efc9954736e1cdbde3c2189d8f810ecca3a3f1 Mon Sep 17 00:00:00 2001 From: AyushBherwani1998 Date: Tue, 10 Dec 2024 16:27:18 +0530 Subject: [PATCH 2/3] update examples to latest alpha --- .../android/app/src/main/AndroidManifest.xml | 2 +- .../ios/Podfile.lock | 10 +- .../lib/main.dart | 12 +- .../pubspec.lock | 143 +++++++------- .../pubspec.yaml | 7 +- .../android/app/src/main/AndroidManifest.xml | 2 +- .../flutter-auth0-example/ios/Podfile.lock | 24 +-- .../ios/Runner/AppDelegate.swift | 2 +- flutter/flutter-auth0-example/lib/main.dart | 8 +- flutter/flutter-auth0-example/pubspec.lock | 143 +++++++------- flutter/flutter-auth0-example/pubspec.yaml | 7 +- .../android/app/build.gradle | 5 +- .../android/app/src/main/AndroidManifest.xml | 2 +- .../flutter-firebase-example/ios/Podfile.lock | 104 ++++++----- .../ios/Runner/AppDelegate.swift | 2 +- .../flutter-firebase-example/lib/main.dart | 88 +++++++-- flutter/flutter-firebase-example/pubspec.lock | 175 ++++++++---------- flutter/flutter-firebase-example/pubspec.yaml | 11 +- .../android/app/build.gradle | 2 +- .../android/app/src/main/AndroidManifest.xml | 2 +- flutter/flutter-playground/ios/Podfile.lock | 8 +- .../ios/Runner/AppDelegate.swift | 2 +- .../lib/core/utils/web3auth_utils.dart | 4 +- flutter/flutter-playground/lib/main.dart | 16 +- flutter/flutter-playground/pubspec.lock | 89 ++++----- flutter/flutter-playground/pubspec.yaml | 9 +- .../android/app/src/main/AndroidManifest.xml | 2 +- flutter/flutter-quick-start/ios/Podfile.lock | 10 +- .../ios/Runner/AppDelegate.swift | 2 +- flutter/flutter-quick-start/lib/main.dart | 7 +- flutter/flutter-quick-start/pubspec.lock | 141 +++++++------- flutter/flutter-quick-start/pubspec.yaml | 10 +- .../android/app/build.gradle | 2 +- .../android/app/src/main/AndroidManifest.xml | 2 +- .../flutter-solana-example/ios/Podfile.lock | 8 +- .../ios/Runner/AppDelegate.swift | 2 +- flutter/flutter-solana-example/lib/main.dart | 10 +- flutter/flutter-solana-example/pubspec.lock | 85 +++++---- flutter/flutter-solana-example/pubspec.yaml | 11 +- 39 files changed, 617 insertions(+), 554 deletions(-) diff --git a/flutter/flutter-aggregate-verifier-example/android/app/src/main/AndroidManifest.xml b/flutter/flutter-aggregate-verifier-example/android/app/src/main/AndroidManifest.xml index 831ac22d6..65a164c89 100644 --- a/flutter/flutter-aggregate-verifier-example/android/app/src/main/AndroidManifest.xml +++ b/flutter/flutter-aggregate-verifier-example/android/app/src/main/AndroidManifest.xml @@ -31,7 +31,7 @@ - + diff --git a/flutter/flutter-aggregate-verifier-example/ios/Podfile.lock b/flutter/flutter-aggregate-verifier-example/ios/Podfile.lock index 921f08f4e..8ca4ef1eb 100644 --- a/flutter/flutter-aggregate-verifier-example/ios/Podfile.lock +++ b/flutter/flutter-aggregate-verifier-example/ios/Podfile.lock @@ -9,14 +9,14 @@ PODS: - TorusSessionManager (6.0.1): - curvelib.swift (~> 2.0.0) - KeychainSwift (~> 20.0.0) - - Web3Auth (10.0.1): + - Web3Auth (11.0.0): - BigInt (~> 5.2.0) - curvelib.swift (~> 2.0.0) - KeychainSwift (~> 20.0.0) - TorusSessionManager (~> 6.0.1) - web3auth_flutter (2.0.1): - Flutter - - Web3Auth (~> 10.0.1) + - Web3Auth (~> 11.0.0) DEPENDENCIES: - Flutter (from `Flutter`) @@ -44,10 +44,10 @@ SPEC CHECKSUMS: curvelib.swift: b9223e5cac801effed8a5fe8968e952b3fe427a5 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 KeychainSwift: 0ce6a4d13f7228054d1a71bb1b500448fb2ab837 - shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 + shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 TorusSessionManager: 9c9871718233dc020ab4fde9bdf37802f01dae10 - Web3Auth: c7fddb06065c213bf4fd8badd166201ab31cb29b - web3auth_flutter: 816f64706f40f7fc08698c77e53cd3c7ad0736f3 + Web3Auth: 407db5f308ac801d6e110e53c482a28977c49516 + web3auth_flutter: f5d75a5b84c082601b617ff018f616d230083a6d PODFILE CHECKSUM: 775997f741c536251164e3eacf6e34abf2eb7a17 diff --git a/flutter/flutter-aggregate-verifier-example/lib/main.dart b/flutter/flutter-aggregate-verifier-example/lib/main.dart index 16192b88b..d45e8808b 100644 --- a/flutter/flutter-aggregate-verifier-example/lib/main.dart +++ b/flutter/flutter-aggregate-verifier-example/lib/main.dart @@ -58,7 +58,7 @@ class _MyAppState extends State with WidgetsBindingObserver { Uri redirectUrl; if (Platform.isAndroid) { - redirectUrl = Uri.parse('w3a://com.example.w3aflutter/auth'); + redirectUrl = Uri.parse('w3a://com.example.w3aflutter'); } else if (Platform.isIOS) { redirectUrl = Uri.parse('com.example.w3aflutter://openlogin'); } else { @@ -105,7 +105,11 @@ class _MyAppState extends State with WidgetsBindingObserver { ), ); - await Web3AuthFlutter.initialize(); + try { + await Web3AuthFlutter.initialize(); + } catch (e) { + log(e.toString()); + } final String res = await Web3AuthFlutter.getPrivKey(); log(res); @@ -121,7 +125,7 @@ class _MyAppState extends State with WidgetsBindingObserver { return MaterialApp( home: Scaffold( appBar: AppBar( - title: const Text('Web3Auth Flutter Auth0 Example'), + title: const Text('Web3Auth Flutter Aggregate Example'), ), body: SingleChildScrollView( child: Center( @@ -154,7 +158,7 @@ class _MyAppState extends State with WidgetsBindingObserver { height: 10, ), const Text( - 'Welcome to Web3Auth Flutter Auth0 Example', + 'Welcome to Web3Auth Flutter Aggregate Example', style: TextStyle(fontSize: 14), ), const SizedBox( diff --git a/flutter/flutter-aggregate-verifier-example/pubspec.lock b/flutter/flutter-aggregate-verifier-example/pubspec.lock index 3f6028589..8efc91445 100644 --- a/flutter/flutter-aggregate-verifier-example/pubspec.lock +++ b/flutter/flutter-aggregate-verifier-example/pubspec.lock @@ -45,26 +45,26 @@ packages: dependency: transitive description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" crypto: dependency: transitive description: name: crypto - sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.6" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.8" eip1559: dependency: transitive description: @@ -93,26 +93,26 @@ packages: dependency: transitive description: name: ffi - sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.1.3" file: dependency: transitive description: name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "7.0.1" fixnum: dependency: transitive description: name: fixnum - sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" flutter: dependency: "direct main" description: flutter @@ -122,10 +122,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7 + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "5.0.0" flutter_test: dependency: "direct dev" description: flutter @@ -140,10 +140,10 @@ packages: dependency: "direct main" description: name: http - sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.2" http_parser: dependency: transitive description: @@ -156,18 +156,18 @@ packages: dependency: transitive description: name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf url: "https://pub.dev" source: hosted - version: "0.6.7" + version: "0.7.1" json_rpc_2: dependency: transitive description: name: json_rpc_2 - sha256: "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e" + sha256: "246b321532f0e8e2ba474b4d757eaa558ae4fdd0688fdbc1e1ca9705f9b8ca0e" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" leak_tracker: dependency: transitive description: @@ -196,10 +196,10 @@ packages: dependency: transitive description: name: lints - sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 + sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "5.0.0" matcher: dependency: transitive description: @@ -236,34 +236,34 @@ packages: dependency: transitive description: name: path_provider_linux - sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379 + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 url: "https://pub.dev" source: hosted - version: "2.1.7" + version: "2.2.1" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - sha256: f0abc8ebd7253741f05488b4813d936b4d07c6bae3e86148a09e342ee4b08e76 + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.1.2" path_provider_windows: dependency: transitive description: name: path_provider_windows - sha256: bcabbe399d4042b8ee687e17548d5d3f527255253b4a639f5f8d2094a9c2b45c + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.3.0" platform: dependency: transitive description: name: platform - sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.6" plugin_platform_interface: dependency: transitive description: @@ -276,18 +276,10 @@ packages: dependency: transitive description: name: pointycastle - sha256: "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29" + sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe" url: "https://pub.dev" source: hosted - version: "3.7.4" - process: - dependency: transitive - description: - name: process - sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" - url: "https://pub.dev" - source: hosted - version: "4.2.4" + version: "3.9.1" sec: dependency: transitive description: @@ -300,58 +292,58 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02" + sha256: "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.3.3" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06" + sha256: "7f172d1b06de5da47b6264c2692ee2ead20bbbc246690427cdb4fc301cd0c549" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.4" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c" + sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d" url: "https://pub.dev" source: hosted - version: "2.3.5" + version: "2.5.3" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa" + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b" + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" + sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.4.2" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59" + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" sky_engine: dependency: transitive description: flutter @@ -425,18 +417,18 @@ packages: dependency: transitive description: name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" uuid: dependency: transitive description: name: uuid - sha256: cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8 + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "4.3.3" + version: "4.5.1" vector_math: dependency: transitive description: @@ -465,42 +457,35 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "1.1.0" web3auth_flutter: dependency: "direct main" description: - name: web3auth_flutter - sha256: "94eab6cebc241bcb9d2e00e857d97c0635a2778acc886db269bf41f91e794985" - url: "https://pub.dev" - source: hosted - version: "6.0.1" + path: "." + ref: "feat/update_pnp_swift_dep" + resolved-ref: "9f1fa58fb738a3e4851bdc28309aa24c12718e24" + url: "https://github.com/web3auth/web3auth-flutter-sdk.git" + source: git + version: "6.1.0" web3dart: dependency: "direct main" description: name: web3dart - sha256: "31f93cf84b8c874d7ffb363959249d7e479115fe12cf46f30b037dcad6750b22" + sha256: "885e5e8f0cc3c87c09f160a7fce6279226ca41316806f7ece2001959c62ecced" url: "https://pub.dev" source: hosted - version: "2.7.2" - win32: - dependency: transitive - description: - name: win32 - sha256: d13ac5deea7327f027b3b97ee19ee210f68256ecf3f1a304bcfb992ee947637c - url: "https://pub.dev" - source: hosted - version: "3.1.1" + version: "2.7.3" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: "11541eedefbcaec9de35aa82650b695297ce668662bbd6e3911a7fabdbde589f" + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" url: "https://pub.dev" source: hosted - version: "0.2.0+2" + version: "1.1.0" sdks: - dart: ">=3.3.0 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + dart: ">=3.5.0 <4.0.0" + flutter: ">=3.24.0" diff --git a/flutter/flutter-aggregate-verifier-example/pubspec.yaml b/flutter/flutter-aggregate-verifier-example/pubspec.yaml index 05db061c2..c6173a4ac 100644 --- a/flutter/flutter-aggregate-verifier-example/pubspec.yaml +++ b/flutter/flutter-aggregate-verifier-example/pubspec.yaml @@ -35,7 +35,10 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 - web3auth_flutter: ^6.0.1 + web3auth_flutter: + git: + url: https://github.com/web3auth/web3auth-flutter-sdk.git + ref: feat/update_pnp_swift_dep web3dart: ^2.7.2 shared_preferences: ^2.2.2 http: ^1.2.0 @@ -49,7 +52,7 @@ dev_dependencies: # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^3.0.1 + flutter_lints: ^5.0.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/flutter/flutter-auth0-example/android/app/src/main/AndroidManifest.xml b/flutter/flutter-auth0-example/android/app/src/main/AndroidManifest.xml index 831ac22d6..65a164c89 100644 --- a/flutter/flutter-auth0-example/android/app/src/main/AndroidManifest.xml +++ b/flutter/flutter-auth0-example/android/app/src/main/AndroidManifest.xml @@ -31,7 +31,7 @@ - + diff --git a/flutter/flutter-auth0-example/ios/Podfile.lock b/flutter/flutter-auth0-example/ios/Podfile.lock index 6da386cc2..8ca4ef1eb 100644 --- a/flutter/flutter-auth0-example/ios/Podfile.lock +++ b/flutter/flutter-auth0-example/ios/Podfile.lock @@ -1,22 +1,22 @@ PODS: - BigInt (5.2.0) - - curvelib.swift (1.0.1) + - curvelib.swift (2.0.0) - Flutter (1.0.0) - KeychainSwift (20.0.0) - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS - - TorusSessionManager (4.0.2): - - curvelib.swift (~> 1.0.1) + - TorusSessionManager (6.0.1): + - curvelib.swift (~> 2.0.0) - KeychainSwift (~> 20.0.0) - - Web3Auth (9.0.0): + - Web3Auth (11.0.0): - BigInt (~> 5.2.0) - - curvelib.swift (~> 1.0.1) + - curvelib.swift (~> 2.0.0) - KeychainSwift (~> 20.0.0) - - TorusSessionManager (~> 4.0.2) + - TorusSessionManager (~> 6.0.1) - web3auth_flutter (2.0.1): - Flutter - - Web3Auth (~> 9.0.0) + - Web3Auth (~> 11.0.0) DEPENDENCIES: - Flutter (from `Flutter`) @@ -41,13 +41,13 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: BigInt: f668a80089607f521586bbe29513d708491ef2f7 - curvelib.swift: d0746ae82bee34016c06da3567a97e493b3c979f + curvelib.swift: b9223e5cac801effed8a5fe8968e952b3fe427a5 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 KeychainSwift: 0ce6a4d13f7228054d1a71bb1b500448fb2ab837 - shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 - TorusSessionManager: 05a1a8f3265d0949a1a342c4ba2c52882445b614 - Web3Auth: 086b5152a43df347ceff196c0ce67f6330838884 - web3auth_flutter: bc5ffefe573c72f7fb1814573269952b045b7b22 + shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 + TorusSessionManager: 9c9871718233dc020ab4fde9bdf37802f01dae10 + Web3Auth: 407db5f308ac801d6e110e53c482a28977c49516 + web3auth_flutter: f5d75a5b84c082601b617ff018f616d230083a6d PODFILE CHECKSUM: 775997f741c536251164e3eacf6e34abf2eb7a17 diff --git a/flutter/flutter-auth0-example/ios/Runner/AppDelegate.swift b/flutter/flutter-auth0-example/ios/Runner/AppDelegate.swift index 70693e4a8..b63630348 100644 --- a/flutter/flutter-auth0-example/ios/Runner/AppDelegate.swift +++ b/flutter/flutter-auth0-example/ios/Runner/AppDelegate.swift @@ -1,7 +1,7 @@ import UIKit import Flutter -@UIApplicationMain +@main @objc class AppDelegate: FlutterAppDelegate { override func application( _ application: UIApplication, diff --git a/flutter/flutter-auth0-example/lib/main.dart b/flutter/flutter-auth0-example/lib/main.dart index 3a1bf5d4e..5f62d4a3e 100644 --- a/flutter/flutter-auth0-example/lib/main.dart +++ b/flutter/flutter-auth0-example/lib/main.dart @@ -58,7 +58,7 @@ class _MyAppState extends State with WidgetsBindingObserver { Uri redirectUrl; if (Platform.isAndroid) { - redirectUrl = Uri.parse('w3a://com.example.w3aflutter/auth'); + redirectUrl = Uri.parse('w3a://com.example.w3aflutter'); } else if (Platform.isIOS) { redirectUrl = Uri.parse('com.example.w3aflutter://openlogin'); } else { @@ -97,7 +97,11 @@ class _MyAppState extends State with WidgetsBindingObserver { ), ); - await Web3AuthFlutter.initialize(); + try { + await Web3AuthFlutter.initialize(); + } catch (e) { + log(e.toString()); + } final String res = await Web3AuthFlutter.getPrivKey(); log(res); diff --git a/flutter/flutter-auth0-example/pubspec.lock b/flutter/flutter-auth0-example/pubspec.lock index 3f6028589..8efc91445 100644 --- a/flutter/flutter-auth0-example/pubspec.lock +++ b/flutter/flutter-auth0-example/pubspec.lock @@ -45,26 +45,26 @@ packages: dependency: transitive description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" crypto: dependency: transitive description: name: crypto - sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.6" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.8" eip1559: dependency: transitive description: @@ -93,26 +93,26 @@ packages: dependency: transitive description: name: ffi - sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.1.3" file: dependency: transitive description: name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "7.0.1" fixnum: dependency: transitive description: name: fixnum - sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" flutter: dependency: "direct main" description: flutter @@ -122,10 +122,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7 + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "5.0.0" flutter_test: dependency: "direct dev" description: flutter @@ -140,10 +140,10 @@ packages: dependency: "direct main" description: name: http - sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.2" http_parser: dependency: transitive description: @@ -156,18 +156,18 @@ packages: dependency: transitive description: name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf url: "https://pub.dev" source: hosted - version: "0.6.7" + version: "0.7.1" json_rpc_2: dependency: transitive description: name: json_rpc_2 - sha256: "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e" + sha256: "246b321532f0e8e2ba474b4d757eaa558ae4fdd0688fdbc1e1ca9705f9b8ca0e" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" leak_tracker: dependency: transitive description: @@ -196,10 +196,10 @@ packages: dependency: transitive description: name: lints - sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 + sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "5.0.0" matcher: dependency: transitive description: @@ -236,34 +236,34 @@ packages: dependency: transitive description: name: path_provider_linux - sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379 + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 url: "https://pub.dev" source: hosted - version: "2.1.7" + version: "2.2.1" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - sha256: f0abc8ebd7253741f05488b4813d936b4d07c6bae3e86148a09e342ee4b08e76 + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.1.2" path_provider_windows: dependency: transitive description: name: path_provider_windows - sha256: bcabbe399d4042b8ee687e17548d5d3f527255253b4a639f5f8d2094a9c2b45c + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.3.0" platform: dependency: transitive description: name: platform - sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.6" plugin_platform_interface: dependency: transitive description: @@ -276,18 +276,10 @@ packages: dependency: transitive description: name: pointycastle - sha256: "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29" + sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe" url: "https://pub.dev" source: hosted - version: "3.7.4" - process: - dependency: transitive - description: - name: process - sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" - url: "https://pub.dev" - source: hosted - version: "4.2.4" + version: "3.9.1" sec: dependency: transitive description: @@ -300,58 +292,58 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02" + sha256: "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.3.3" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06" + sha256: "7f172d1b06de5da47b6264c2692ee2ead20bbbc246690427cdb4fc301cd0c549" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.4" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c" + sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d" url: "https://pub.dev" source: hosted - version: "2.3.5" + version: "2.5.3" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa" + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b" + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" + sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.4.2" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59" + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" sky_engine: dependency: transitive description: flutter @@ -425,18 +417,18 @@ packages: dependency: transitive description: name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" uuid: dependency: transitive description: name: uuid - sha256: cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8 + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "4.3.3" + version: "4.5.1" vector_math: dependency: transitive description: @@ -465,42 +457,35 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "1.1.0" web3auth_flutter: dependency: "direct main" description: - name: web3auth_flutter - sha256: "94eab6cebc241bcb9d2e00e857d97c0635a2778acc886db269bf41f91e794985" - url: "https://pub.dev" - source: hosted - version: "6.0.1" + path: "." + ref: "feat/update_pnp_swift_dep" + resolved-ref: "9f1fa58fb738a3e4851bdc28309aa24c12718e24" + url: "https://github.com/web3auth/web3auth-flutter-sdk.git" + source: git + version: "6.1.0" web3dart: dependency: "direct main" description: name: web3dart - sha256: "31f93cf84b8c874d7ffb363959249d7e479115fe12cf46f30b037dcad6750b22" + sha256: "885e5e8f0cc3c87c09f160a7fce6279226ca41316806f7ece2001959c62ecced" url: "https://pub.dev" source: hosted - version: "2.7.2" - win32: - dependency: transitive - description: - name: win32 - sha256: d13ac5deea7327f027b3b97ee19ee210f68256ecf3f1a304bcfb992ee947637c - url: "https://pub.dev" - source: hosted - version: "3.1.1" + version: "2.7.3" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: "11541eedefbcaec9de35aa82650b695297ce668662bbd6e3911a7fabdbde589f" + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" url: "https://pub.dev" source: hosted - version: "0.2.0+2" + version: "1.1.0" sdks: - dart: ">=3.3.0 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + dart: ">=3.5.0 <4.0.0" + flutter: ">=3.24.0" diff --git a/flutter/flutter-auth0-example/pubspec.yaml b/flutter/flutter-auth0-example/pubspec.yaml index 05db061c2..c6173a4ac 100644 --- a/flutter/flutter-auth0-example/pubspec.yaml +++ b/flutter/flutter-auth0-example/pubspec.yaml @@ -35,7 +35,10 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 - web3auth_flutter: ^6.0.1 + web3auth_flutter: + git: + url: https://github.com/web3auth/web3auth-flutter-sdk.git + ref: feat/update_pnp_swift_dep web3dart: ^2.7.2 shared_preferences: ^2.2.2 http: ^1.2.0 @@ -49,7 +52,7 @@ dev_dependencies: # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^3.0.1 + flutter_lints: ^5.0.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/flutter/flutter-firebase-example/android/app/build.gradle b/flutter/flutter-firebase-example/android/app/build.gradle index 7c3828b64..72c4c2cba 100644 --- a/flutter/flutter-firebase-example/android/app/build.gradle +++ b/flutter/flutter-firebase-example/android/app/build.gradle @@ -45,8 +45,9 @@ android { applicationId "com.example.w3aflutter" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. - minSdkVersion 33 //flutter.minSdkVersion - targetSdkVersion 33 //flutter.targetSdkVersion + minSdkVersion 26 //flutter.minSdkVersion + targetSdkVersion 34 //flutter.targetSdkVersion + compileSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/flutter/flutter-firebase-example/android/app/src/main/AndroidManifest.xml b/flutter/flutter-firebase-example/android/app/src/main/AndroidManifest.xml index 831ac22d6..863b6e3a8 100644 --- a/flutter/flutter-firebase-example/android/app/src/main/AndroidManifest.xml +++ b/flutter/flutter-firebase-example/android/app/src/main/AndroidManifest.xml @@ -31,7 +31,7 @@ - + diff --git a/flutter/flutter-firebase-example/ios/Podfile.lock b/flutter/flutter-firebase-example/ios/Podfile.lock index 374c3d5cb..f14fabb1c 100644 --- a/flutter/flutter-firebase-example/ios/Podfile.lock +++ b/flutter/flutter-firebase-example/ios/Podfile.lock @@ -1,51 +1,61 @@ PODS: - BigInt (5.2.0) - curvelib.swift (2.0.0) - - Firebase/Auth (10.18.0): + - Firebase/Auth (11.4.0): - Firebase/CoreOnly - - FirebaseAuth (~> 10.18.0) - - Firebase/CoreOnly (10.18.0): - - FirebaseCore (= 10.18.0) - - firebase_auth (4.16.0): - - Firebase/Auth (= 10.18.0) + - FirebaseAuth (~> 11.4.0) + - Firebase/CoreOnly (11.4.0): + - FirebaseCore (= 11.4.0) + - firebase_auth (5.3.4): + - Firebase/Auth (= 11.4.0) - firebase_core - Flutter - - firebase_core (2.24.2): - - Firebase/CoreOnly (= 10.18.0) + - firebase_core (3.8.1): + - Firebase/CoreOnly (= 11.4.0) - Flutter - - FirebaseAppCheckInterop (10.20.0) - - FirebaseAuth (10.18.0): - - FirebaseAppCheckInterop (~> 10.17) - - FirebaseCore (~> 10.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - - GoogleUtilities/Environment (~> 7.8) - - GTMSessionFetcher/Core (< 4.0, >= 2.1) + - FirebaseAppCheckInterop (11.6.0) + - FirebaseAuth (11.4.0): + - FirebaseAppCheckInterop (~> 11.0) + - FirebaseAuthInterop (~> 11.0) + - FirebaseCore (~> 11.4) + - FirebaseCoreExtension (~> 11.4) + - GoogleUtilities/AppDelegateSwizzler (~> 8.0) + - GoogleUtilities/Environment (~> 8.0) + - GTMSessionFetcher/Core (< 5.0, >= 3.4) - RecaptchaInterop (~> 100.0) - - FirebaseCore (10.18.0): - - FirebaseCoreInternal (~> 10.0) - - GoogleUtilities/Environment (~> 7.12) - - GoogleUtilities/Logger (~> 7.12) - - FirebaseCoreInternal (10.20.0): - - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseAuthInterop (11.6.0) + - FirebaseCore (11.4.0): + - FirebaseCoreInternal (~> 11.0) + - GoogleUtilities/Environment (~> 8.0) + - GoogleUtilities/Logger (~> 8.0) + - FirebaseCoreExtension (11.4.1): + - FirebaseCore (~> 11.0) + - FirebaseCoreInternal (11.6.0): + - "GoogleUtilities/NSData+zlib (~> 8.0)" - Flutter (1.0.0) - - GoogleUtilities/AppDelegateSwizzler (7.12.0): + - GoogleUtilities/AppDelegateSwizzler (8.0.2): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.12.0): - - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.12.0): + - GoogleUtilities/Privacy + - GoogleUtilities/Environment (8.0.2): + - GoogleUtilities/Privacy + - GoogleUtilities/Logger (8.0.2): - GoogleUtilities/Environment - - GoogleUtilities/Network (7.12.0): + - GoogleUtilities/Privacy + - GoogleUtilities/Network (8.0.2): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Privacy - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.12.0)" - - GoogleUtilities/Reachability (7.12.0): + - "GoogleUtilities/NSData+zlib (8.0.2)": + - GoogleUtilities/Privacy + - GoogleUtilities/Privacy (8.0.2) + - GoogleUtilities/Reachability (8.0.2): - GoogleUtilities/Logger - - GTMSessionFetcher/Core (3.2.0) + - GoogleUtilities/Privacy + - GTMSessionFetcher/Core (4.1.0) - KeychainSwift (20.0.0) - - PromisesObjC (2.3.1) - RecaptchaInterop (100.0.0) - shared_preferences_foundation (0.0.1): - Flutter @@ -53,14 +63,14 @@ PODS: - TorusSessionManager (6.0.1): - curvelib.swift (~> 2.0.0) - KeychainSwift (~> 20.0.0) - - Web3Auth (10.0.1): + - Web3Auth (11.0.1): - BigInt (~> 5.2.0) - curvelib.swift (~> 2.0.0) - KeychainSwift (~> 20.0.0) - TorusSessionManager (~> 6.0.1) - web3auth_flutter (2.0.1): - Flutter - - Web3Auth (~> 10.0.1) + - Web3Auth (~> 11.0.1) DEPENDENCIES: - firebase_auth (from `.symlinks/plugins/firebase_auth/ios`) @@ -76,12 +86,13 @@ SPEC REPOS: - Firebase - FirebaseAppCheckInterop - FirebaseAuth + - FirebaseAuthInterop - FirebaseCore + - FirebaseCoreExtension - FirebaseCoreInternal - GoogleUtilities - GTMSessionFetcher - KeychainSwift - - PromisesObjC - RecaptchaInterop - TorusSessionManager - Web3Auth @@ -101,23 +112,24 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: BigInt: f668a80089607f521586bbe29513d708491ef2f7 curvelib.swift: b9223e5cac801effed8a5fe8968e952b3fe427a5 - Firebase: 414ad272f8d02dfbf12662a9d43f4bba9bec2a06 - firebase_auth: 8e9ec02991ca4659111cc671c84d0c010b6bfb26 - firebase_core: 0af4a2b24f62071f9bf283691c0ee41556dcb3f5 - FirebaseAppCheckInterop: e81bdb1cdb82f8e0cef353ba5018a8402682032c - FirebaseAuth: 12314b438fa76048540c8fb86d6cfc9e08595176 - FirebaseCore: 2322423314d92f946219c8791674d2f3345b598f - FirebaseCoreInternal: efeeb171ac02d623bdaefe121539939821e10811 + Firebase: cf1b19f21410b029b6786a54e9764a0cacad3c99 + firebase_auth: c4bdd9d7b338ac004008cb5024a643584e0ec03f + firebase_core: 418aed674e9a0b8b6088aec16cde82a811f6261f + FirebaseAppCheckInterop: 347aa09a805219a31249b58fc956888e9fcb314b + FirebaseAuth: c359af98bd703cbf4293eec107a40de08ede6ce6 + FirebaseAuthInterop: a919d415797d23b7bfe195a04f322b86c65020ef + FirebaseCore: e0510f1523bc0eb21653cac00792e1e2bd6f1771 + FirebaseCoreExtension: f1bc67a4702931a7caa097d8e4ac0a1b0d16720e + FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34 - GTMSessionFetcher: 41b9ef0b4c08a6db4b7eb51a21ae5183ec99a2c8 + GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d + GTMSessionFetcher: 923b710231ad3d6f3f0495ac1ced35421e07d9a6 KeychainSwift: 0ce6a4d13f7228054d1a71bb1b500448fb2ab837 - PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4 RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21 - shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c + shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 TorusSessionManager: 9c9871718233dc020ab4fde9bdf37802f01dae10 - Web3Auth: c7fddb06065c213bf4fd8badd166201ab31cb29b - web3auth_flutter: 816f64706f40f7fc08698c77e53cd3c7ad0736f3 + Web3Auth: 5defaf109aa7583d4f9b198daa99b4f24f25038a + web3auth_flutter: 5ecf271e85c16e999bfc774ff9cd4fab6d4e91b6 PODFILE CHECKSUM: 775997f741c536251164e3eacf6e34abf2eb7a17 diff --git a/flutter/flutter-firebase-example/ios/Runner/AppDelegate.swift b/flutter/flutter-firebase-example/ios/Runner/AppDelegate.swift index 70693e4a8..b63630348 100644 --- a/flutter/flutter-firebase-example/ios/Runner/AppDelegate.swift +++ b/flutter/flutter-firebase-example/ios/Runner/AppDelegate.swift @@ -1,7 +1,7 @@ import UIKit import Flutter -@UIApplicationMain +@main @objc class AppDelegate: FlutterAppDelegate { override func application( _ application: UIApplication, diff --git a/flutter/flutter-firebase-example/lib/main.dart b/flutter/flutter-firebase-example/lib/main.dart index ab54a9e96..806f93e4d 100644 --- a/flutter/flutter-firebase-example/lib/main.dart +++ b/flutter/flutter-firebase-example/lib/main.dart @@ -32,16 +32,17 @@ class MyApp extends StatefulWidget { class _MyAppState extends State with WidgetsBindingObserver { String _result = ''; bool logoutVisible = false; - String rpcUrl = 'https://rpc.ankr.com/eth_sepolia'; + String rpcUrl = 'https://eth.llamarpc.com'; + LoginParams? loginParams; @override void initState() { super.initState(); initPlatformState(); - WidgetsBinding.instance.addObserver(this); + WidgetsBinding.instance.addObserver(this); } - @override + @override void dispose() { super.dispose(); WidgetsBinding.instance.removeObserver(this); @@ -55,8 +56,6 @@ class _MyAppState extends State with WidgetsBindingObserver { } } - - // Platform messages are asynchronous, so we initialize in an async method. Future initPlatformState() async { await Firebase.initializeApp( @@ -68,7 +67,7 @@ class _MyAppState extends State with WidgetsBindingObserver { Uri redirectUrl; if (Platform.isAndroid) { - redirectUrl = Uri.parse('w3a://com.example.w3aflutter/auth'); + redirectUrl = Uri.parse('w3a://com.example.w3aflutter'); } else if (Platform.isIOS) { redirectUrl = Uri.parse('com.example.w3aflutter://openlogin'); } else { @@ -108,7 +107,11 @@ class _MyAppState extends State with WidgetsBindingObserver { ), ); - await Web3AuthFlutter.initialize(); + try { + await Web3AuthFlutter.initialize(); + } catch (e) { + log(e.toString()); + } final String res = await Web3AuthFlutter.getPrivKey(); log(res); @@ -225,6 +228,18 @@ class _MyAppState extends State with WidgetsBindingObserver { onPressed: _sendTransaction, child: const Text('Send Transaction'), ), + ElevatedButton( + onPressed: _launchWalletUI, + child: const Text('Launch Wallet UI'), + ), + ElevatedButton( + onPressed: _enableMFA, + child: const Text('Enable MFA'), + ), + ElevatedButton( + onPressed: _transactionConfirmationUI, + child: const Text('Transaction Confirmation UI'), + ), ], ), ), @@ -275,12 +290,53 @@ class _MyAppState extends State with WidgetsBindingObserver { }; } + Future _enableMFA() async { + try { + final idToken = await FirebaseAuth.instance.currentUser?.getIdToken(true); + if (idToken == null) { + throw Exception('No user found'); + } + loginParams = LoginParams( + loginProvider: Provider.jwt, + extraLoginOptions: ExtraLoginOptions( + id_token: idToken, + domain: 'firebase', + ), + ); + await Web3AuthFlutter.enableMFA(loginParams: loginParams!); + } catch (e) { + log(e.toString()); + } + } + + Future _transactionConfirmationUI() async { + final result = await Web3AuthFlutter.request( + ChainConfig(chainId: "0x1", rpcTarget: rpcUrl), + "personal_sign", + [ + "Hello, World!", + await _getAddress(), + ], + ); + + log(result.toJson().toString()); + } + + Future _launchWalletUI() async { + Web3AuthFlutter.launchWalletServices(ChainConfig( + chainId: '1', + rpcTarget: rpcUrl, + )); + + return; + } + Future _withJWT() async { String idToken = ""; try { final credential = await FirebaseAuth.instance.signInWithEmailAndPassword( - email: 'custom+id_token@firebase.login', - password: 'Welcome@W3A', + email: 'flutter@pnp.com', + password: 'flutter', ); idToken = await credential.user?.getIdToken(true) ?? ''; } on FirebaseAuthException catch (e) { @@ -291,15 +347,15 @@ class _MyAppState extends State with WidgetsBindingObserver { } } - return Web3AuthFlutter.login( - LoginParams( - loginProvider: Provider.jwt, - extraLoginOptions: ExtraLoginOptions( - id_token: idToken, - domain: 'firebase', - ), + loginParams = LoginParams( + loginProvider: Provider.jwt, + extraLoginOptions: ExtraLoginOptions( + id_token: idToken, + domain: 'firebase', ), ); + + return Web3AuthFlutter.login(loginParams!); } Future _getAddress() async { diff --git a/flutter/flutter-firebase-example/pubspec.lock b/flutter/flutter-firebase-example/pubspec.lock index 81fdfbe40..29c214cae 100644 --- a/flutter/flutter-firebase-example/pubspec.lock +++ b/flutter/flutter-firebase-example/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: f5628cd9c92ed11083f425fd1f8f1bc60ecdda458c81d73b143aeda036c35fe7 + sha256: eae3133cbb06de9205899b822e3897fc6a8bc278ad4c944b4ce612689369694b url: "https://pub.dev" source: hosted - version: "1.3.16" + version: "1.3.47" async: dependency: transitive description: @@ -53,26 +53,26 @@ packages: dependency: transitive description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" crypto: dependency: transitive description: name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.6" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.8" eip1559: dependency: transitive description: @@ -109,66 +109,66 @@ packages: dependency: transitive description: name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "7.0.1" firebase_auth: dependency: "direct main" description: name: firebase_auth - sha256: "279b2773ff61afd9763202cb5582e2b995ee57419d826b9af6517302a59b672f" + sha256: "03483af6e67b7c4b696ca9386989a6cd5593569e1ac5af6907ea5f7fd9c16d8b" url: "https://pub.dev" source: hosted - version: "4.16.0" + version: "5.3.4" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface - sha256: "3c9cfaccb7549492edf5b0c67c6dd1c6727c7830891aa6727f2fb225f0226626" + sha256: "3e1409f48c48930635705b1237ebbdee8c54c19106a0a4fb321dbb4b642820c4" url: "https://pub.dev" source: hosted - version: "7.0.9" + version: "7.4.10" firebase_auth_web: dependency: transitive description: name: firebase_auth_web - sha256: c7b1379ccef7abf4b6816eede67a868c44142198e42350f51c01d8fc03f95a7d + sha256: d83fe95c44d73c9c29b006ac7df3aa5e1b8ce92b62edc44e8f86250951fe2cd0 url: "https://pub.dev" source: hosted - version: "5.8.13" + version: "5.13.5" firebase_core: dependency: "direct main" description: name: firebase_core - sha256: "96607c0e829a581c2a483c658f04e8b159964c3bae2730f73297070bc85d40bb" + sha256: fef81a53ba1ca618def1f8bef4361df07968434e62cb204c1fb90bb880a03da2 url: "https://pub.dev" source: hosted - version: "2.24.2" + version: "3.8.1" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface - sha256: c437ae5d17e6b5cc7981cf6fd458a5db4d12979905f9aafd1fea930428a9fe63 + sha256: b94b217e3ad745e784960603d33d99471621ecca151c99c670869b76e50ad2a6 url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "5.3.1" firebase_core_web: dependency: transitive description: name: firebase_core_web - sha256: d585bdf3c656c3f7821ba1bd44da5f13365d22fcecaf5eb75c4295246aaa83c0 + sha256: "9e69806bb3d905aeec3c1242e0e1475de6ea6d48f456af29d598fb229a2b4e5e" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.18.2" fixnum: dependency: transitive description: name: fixnum - sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" flutter: dependency: "direct main" description: flutter @@ -178,10 +178,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7 + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "5.0.0" flutter_test: dependency: "direct dev" description: flutter @@ -196,10 +196,10 @@ packages: dependency: "direct main" description: name: http - sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.2" http_parser: dependency: transitive description: @@ -212,18 +212,18 @@ packages: dependency: transitive description: name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf url: "https://pub.dev" source: hosted - version: "0.6.7" + version: "0.7.1" json_rpc_2: dependency: transitive description: name: json_rpc_2 - sha256: "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e" + sha256: "246b321532f0e8e2ba474b4d757eaa558ae4fdd0688fdbc1e1ca9705f9b8ca0e" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" leak_tracker: dependency: transitive description: @@ -252,10 +252,10 @@ packages: dependency: transitive description: name: lints - sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 + sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "5.0.0" matcher: dependency: transitive description: @@ -292,58 +292,50 @@ packages: dependency: transitive description: name: path_provider_linux - sha256: ffbb8cc9ed2c9ec0e4b7a541e56fd79b138e8f47d2fb86815f15358a349b3b57 + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 url: "https://pub.dev" source: hosted - version: "2.1.11" + version: "2.2.1" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec" + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" url: "https://pub.dev" source: hosted - version: "2.0.6" + version: "2.1.2" path_provider_windows: dependency: transitive description: name: path_provider_windows - sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96" + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 url: "https://pub.dev" source: hosted - version: "2.1.7" + version: "2.3.0" platform: dependency: transitive description: name: platform - sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.6" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.8" pointycastle: dependency: transitive description: name: pointycastle - sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c" + sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe" url: "https://pub.dev" source: hosted - version: "3.7.3" - process: - dependency: transitive - description: - name: process - sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" - url: "https://pub.dev" - source: hosted - version: "4.2.4" + version: "3.9.1" sec: dependency: transitive description: @@ -356,58 +348,58 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02" + sha256: "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.3.3" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "6478c6bbbecfe9aced34c483171e90d7c078f5883558b30ec3163cf18402c749" + sha256: "7f172d1b06de5da47b6264c2692ee2ead20bbbc246690427cdb4fc301cd0c549" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.3.4" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: e014107bb79d6d3297196f4f2d0db54b5d1f85b8ea8ff63b8e8b391a02700feb + sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.5.3" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: "9d387433ca65717bbf1be88f4d5bb18f10508917a8fa2fb02e0fd0d7479a9afa" + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.4.1" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - sha256: d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.4.1" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: "74083203a8eae241e0de4a0d597dbedab3b8fef5563f33cf3c12d7e93c655ca5" + sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.4.2" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: "5e588e2efef56916a3b229c3bfe81e6a525665a454519ca51dbcc4236a274173" + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.4.1" sky_engine: dependency: transitive description: flutter @@ -481,18 +473,18 @@ packages: dependency: transitive description: name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" uuid: dependency: transitive description: name: uuid - sha256: cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8 + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "4.3.3" + version: "4.5.1" vector_math: dependency: transitive description: @@ -513,50 +505,43 @@ packages: dependency: transitive description: name: wallet - sha256: "569c91c2af13a9e1119c001f9c09218eccf3f383eb8d15ba13a5b558010c1bc0" + sha256: "687fd89a16557649b26189e597792962f405797fc64113e8758eabc2c2605c32" url: "https://pub.dev" source: hosted - version: "0.0.12+1" + version: "0.0.13" web: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "1.1.0" web3auth_flutter: dependency: "direct main" description: - name: web3auth_flutter - sha256: "94eab6cebc241bcb9d2e00e857d97c0635a2778acc886db269bf41f91e794985" - url: "https://pub.dev" - source: hosted - version: "6.0.1" + path: "." + ref: "feat/update_pnp_swift_dep" + resolved-ref: "7f40219b0262ed1bc1e5e7eaff31650fdf345ea5" + url: "https://github.com/web3auth/web3auth-flutter-sdk.git" + source: git + version: "6.1.0" web3dart: dependency: "direct main" description: name: web3dart - sha256: "31f93cf84b8c874d7ffb363959249d7e479115fe12cf46f30b037dcad6750b22" - url: "https://pub.dev" - source: hosted - version: "2.7.2" - win32: - dependency: transitive - description: - name: win32 - sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb" + sha256: "885e5e8f0cc3c87c09f160a7fce6279226ca41316806f7ece2001959c62ecced" url: "https://pub.dev" source: hosted - version: "5.5.0" + version: "2.7.3" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1 + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.0" sdks: - dart: ">=3.3.0 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + dart: ">=3.5.0 <4.0.0" + flutter: ">=3.24.0" diff --git a/flutter/flutter-firebase-example/pubspec.yaml b/flutter/flutter-firebase-example/pubspec.yaml index e2cde9658..979e90256 100644 --- a/flutter/flutter-firebase-example/pubspec.yaml +++ b/flutter/flutter-firebase-example/pubspec.yaml @@ -35,9 +35,12 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 - web3auth_flutter: ^6.0.1 - firebase_core: ^2.24.2 - firebase_auth: ^4.16.0 + web3auth_flutter: + git: + url: https://github.com/web3auth/web3auth-flutter-sdk.git + ref: feat/update_pnp_swift_dep + firebase_core: ^3.8.1 + firebase_auth: ^5.3.4 web3dart: ^2.7.2 shared_preferences: ^2.2.2 http: ^1.2.0 @@ -51,7 +54,7 @@ dev_dependencies: # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^3.0.1 + flutter_lints: ^5.0.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/flutter/flutter-playground/android/app/build.gradle b/flutter/flutter-playground/android/app/build.gradle index 6243279e7..eac82ea42 100644 --- a/flutter/flutter-playground/android/app/build.gradle +++ b/flutter/flutter-playground/android/app/build.gradle @@ -45,7 +45,7 @@ android { applicationId "com.example.flutterplayground" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. - minSdkVersion 24 + minSdkVersion 26 targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/flutter/flutter-playground/android/app/src/main/AndroidManifest.xml b/flutter/flutter-playground/android/app/src/main/AndroidManifest.xml index de1f83f04..a03d99b42 100644 --- a/flutter/flutter-playground/android/app/src/main/AndroidManifest.xml +++ b/flutter/flutter-playground/android/app/src/main/AndroidManifest.xml @@ -30,7 +30,7 @@ - + - + diff --git a/flutter/flutter-quick-start/ios/Podfile.lock b/flutter/flutter-quick-start/ios/Podfile.lock index ab2e05b45..d9810c253 100644 --- a/flutter/flutter-quick-start/ios/Podfile.lock +++ b/flutter/flutter-quick-start/ios/Podfile.lock @@ -9,14 +9,14 @@ PODS: - TorusSessionManager (6.0.1): - curvelib.swift (~> 2.0.0) - KeychainSwift (~> 20.0.0) - - Web3Auth (10.0.1): + - Web3Auth (11.0.0): - BigInt (~> 5.2.0) - curvelib.swift (~> 2.0.0) - KeychainSwift (~> 20.0.0) - TorusSessionManager (~> 6.0.1) - web3auth_flutter (2.0.1): - Flutter - - Web3Auth (~> 10.0.1) + - Web3Auth (~> 11.0.0) DEPENDENCIES: - Flutter (from `Flutter`) @@ -44,10 +44,10 @@ SPEC CHECKSUMS: curvelib.swift: b9223e5cac801effed8a5fe8968e952b3fe427a5 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 KeychainSwift: 0ce6a4d13f7228054d1a71bb1b500448fb2ab837 - shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 + shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 TorusSessionManager: 9c9871718233dc020ab4fde9bdf37802f01dae10 - Web3Auth: c7fddb06065c213bf4fd8badd166201ab31cb29b - web3auth_flutter: 816f64706f40f7fc08698c77e53cd3c7ad0736f3 + Web3Auth: 407db5f308ac801d6e110e53c482a28977c49516 + web3auth_flutter: f5d75a5b84c082601b617ff018f616d230083a6d PODFILE CHECKSUM: 617d992413452517fc165846a57084923e4df00d diff --git a/flutter/flutter-quick-start/ios/Runner/AppDelegate.swift b/flutter/flutter-quick-start/ios/Runner/AppDelegate.swift index 70693e4a8..b63630348 100644 --- a/flutter/flutter-quick-start/ios/Runner/AppDelegate.swift +++ b/flutter/flutter-quick-start/ios/Runner/AppDelegate.swift @@ -1,7 +1,7 @@ import UIKit import Flutter -@UIApplicationMain +@main @objc class AppDelegate: FlutterAppDelegate { override func application( _ application: UIApplication, diff --git a/flutter/flutter-quick-start/lib/main.dart b/flutter/flutter-quick-start/lib/main.dart index 80363aa48..5d520c5e5 100644 --- a/flutter/flutter-quick-start/lib/main.dart +++ b/flutter/flutter-quick-start/lib/main.dart @@ -62,7 +62,7 @@ class _MyAppState extends State with WidgetsBindingObserver { String clientId = 'BPi5PB_UiIZ-cPz1GtV5i1I2iOSOHuimiXBI0e-Oe_u6X3oVAbCiAZOTEBtTXw4tsluTITPqA8zMsfxIKMjiqNQ'; if (Platform.isAndroid) { - redirectUrl = Uri.parse('w3a://com.example.w3aflutter/auth'); + redirectUrl = Uri.parse('w3a://com.example.w3aflutter'); } else if (Platform.isIOS) { redirectUrl = Uri.parse('com.example.w3aflutter://auth'); // IMP END - Get your Web3Auth Client ID from Dashboard @@ -78,7 +78,7 @@ class _MyAppState extends State with WidgetsBindingObserver { buildEnv: BuildEnv.production, // 259200 allows user to stay authenticated for 3 days with Web3Auth. // Default is 86400, which is 1 day. - sessionTime: 40, + sessionTime: 259200, )); try { @@ -320,13 +320,14 @@ class _MyAppState extends State with WidgetsBindingObserver { final credentials = EthPrivateKey.fromHex(privateKey); final address = credentials.address; + log("Address: $address"); // Get the balance in wei final weiBalance = await client.getBalance(address); // Convert wei to ether final etherBalance = EtherAmount.fromBigInt( EtherUnit.ether, - weiBalance.getInEther, + weiBalance.getInWei, ); log(etherBalance.toString()); diff --git a/flutter/flutter-quick-start/pubspec.lock b/flutter/flutter-quick-start/pubspec.lock index 9bd1a0301..8efc91445 100644 --- a/flutter/flutter-quick-start/pubspec.lock +++ b/flutter/flutter-quick-start/pubspec.lock @@ -45,26 +45,26 @@ packages: dependency: transitive description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" crypto: dependency: transitive description: name: crypto - sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.6" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.8" eip1559: dependency: transitive description: @@ -101,31 +101,31 @@ packages: dependency: transitive description: name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "7.0.1" fixnum: dependency: transitive description: name: fixnum - sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" flutter: dependency: "direct main" description: flutter source: sdk version: "0.0.0" flutter_lints: - dependency: "direct overridden" + dependency: "direct dev" description: name: flutter_lints - sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7 + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "5.0.0" flutter_test: dependency: "direct dev" description: flutter @@ -140,10 +140,10 @@ packages: dependency: "direct main" description: name: http - sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.2" http_parser: dependency: transitive description: @@ -156,18 +156,18 @@ packages: dependency: transitive description: name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf url: "https://pub.dev" source: hosted - version: "0.6.7" + version: "0.7.1" json_rpc_2: dependency: transitive description: name: json_rpc_2 - sha256: "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e" + sha256: "246b321532f0e8e2ba474b4d757eaa558ae4fdd0688fdbc1e1ca9705f9b8ca0e" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" leak_tracker: dependency: transitive description: @@ -196,10 +196,10 @@ packages: dependency: transitive description: name: lints - sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 + sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "5.0.0" matcher: dependency: transitive description: @@ -236,34 +236,34 @@ packages: dependency: transitive description: name: path_provider_linux - sha256: "525ad5e07622d19447ad740b1ed5070031f7a5437f44355ae915ff56e986429a" + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 url: "https://pub.dev" source: hosted - version: "2.1.9" + version: "2.2.1" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec" + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" url: "https://pub.dev" source: hosted - version: "2.0.6" + version: "2.1.2" path_provider_windows: dependency: transitive description: name: path_provider_windows - sha256: "642ddf65fde5404f83267e8459ddb4556316d3ee6d511ed193357e25caa3632d" + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.3.0" platform: dependency: transitive description: name: platform - sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.6" plugin_platform_interface: dependency: transitive description: @@ -276,18 +276,10 @@ packages: dependency: transitive description: name: pointycastle - sha256: "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29" - url: "https://pub.dev" - source: hosted - version: "3.7.4" - process: - dependency: transitive - description: - name: process - sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe" url: "https://pub.dev" source: hosted - version: "4.2.4" + version: "3.9.1" sec: dependency: transitive description: @@ -300,58 +292,58 @@ packages: dependency: "direct main" description: name: shared_preferences - sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02" + sha256: "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.3.3" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06" + sha256: "7f172d1b06de5da47b6264c2692ee2ead20bbbc246690427cdb4fc301cd0c549" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.3.4" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c" + sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d" url: "https://pub.dev" source: hosted - version: "2.3.5" + version: "2.5.3" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa" + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b" + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" + sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.4.2" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59" + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" sky_engine: dependency: transitive description: flutter @@ -425,18 +417,18 @@ packages: dependency: transitive description: name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.4.0" uuid: dependency: transitive description: name: uuid - sha256: cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8 + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "4.3.3" + version: "4.5.1" vector_math: dependency: transitive description: @@ -465,42 +457,35 @@ packages: dependency: transitive description: name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "1.1.0" web3auth_flutter: dependency: "direct main" description: - name: web3auth_flutter - sha256: "94eab6cebc241bcb9d2e00e857d97c0635a2778acc886db269bf41f91e794985" - url: "https://pub.dev" - source: hosted - version: "6.0.1" + path: "." + ref: "feat/update_pnp_swift_dep" + resolved-ref: "9f1fa58fb738a3e4851bdc28309aa24c12718e24" + url: "https://github.com/web3auth/web3auth-flutter-sdk.git" + source: git + version: "6.1.0" web3dart: dependency: "direct main" description: name: web3dart - sha256: "31f93cf84b8c874d7ffb363959249d7e479115fe12cf46f30b037dcad6750b22" + sha256: "885e5e8f0cc3c87c09f160a7fce6279226ca41316806f7ece2001959c62ecced" url: "https://pub.dev" source: hosted - version: "2.7.2" - win32: - dependency: "direct overridden" - description: - name: win32 - sha256: "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69" - url: "https://pub.dev" - source: hosted - version: "5.9.0" + version: "2.7.3" xdg_directories: dependency: transitive description: name: xdg_directories - sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1 + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.0" sdks: - dart: ">=3.3.0 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + dart: ">=3.5.0 <4.0.0" + flutter: ">=3.24.0" diff --git a/flutter/flutter-quick-start/pubspec.yaml b/flutter/flutter-quick-start/pubspec.yaml index 614476ea4..d1bc8de84 100644 --- a/flutter/flutter-quick-start/pubspec.yaml +++ b/flutter/flutter-quick-start/pubspec.yaml @@ -36,7 +36,10 @@ dependencies: # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 # // IMP START - Installation - web3auth_flutter: ^6.0.1 + web3auth_flutter: + git: + url: https://github.com/web3auth/web3auth-flutter-sdk.git + ref: feat/update_pnp_swift_dep # // IMP END - Installation web3dart: ^2.7.2 shared_preferences: ^2.2.2 @@ -45,16 +48,13 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - -dependency_overrides: - win32: ^5.5.4 # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^3.0.1 + flutter_lints: ^5.0.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/flutter/flutter-solana-example/android/app/build.gradle b/flutter/flutter-solana-example/android/app/build.gradle index 184114022..6e01f8295 100644 --- a/flutter/flutter-solana-example/android/app/build.gradle +++ b/flutter/flutter-solana-example/android/app/build.gradle @@ -45,7 +45,7 @@ android { applicationId "com.example.flutter_solana_example" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. - minSdkVersion 24 + minSdkVersion 26 targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/flutter/flutter-solana-example/android/app/src/main/AndroidManifest.xml b/flutter/flutter-solana-example/android/app/src/main/AndroidManifest.xml index 7c8c27121..2622cd7ef 100644 --- a/flutter/flutter-solana-example/android/app/src/main/AndroidManifest.xml +++ b/flutter/flutter-solana-example/android/app/src/main/AndroidManifest.xml @@ -29,7 +29,7 @@ - +