Merge pull request #27 from wakumo/fix/required-namespace

fix(proposal): declare required namespace nullable
wakumo · Dec 19, 2023 · f5d9f5a · f5d9f5a
2 parents 18de9c9 + 62af1f6
commit f5d9f5a
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -48,3 +48,7 @@
 
 * Upgrade to the latest SDK Android Bom 1.19.1
 * Wrap session extend callback to fire session update event to Flutter
+
+## 1.0.9
+
+* Declare namespaces nullable
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -91,9 +91,9 @@ class _HomeViewState extends State<HomeView> with WidgetsBindingObserver {
       setState(() {
         _isLoading = false;
       });
-      if (proposal.namespaces.length != 1 ||
-          !proposal.namespaces.containsKey('eip155') ||
-          proposal.namespaces['eip155']?.chains == null) {
+      if (proposal.namespaces?.length != 1 ||
+          proposal.namespaces?.containsKey('eip155') != true ||
+          proposal.namespaces?['eip155']?.chains == null) {
         _showDialog(
             child:
                 const Text('Please choose Ethereum networks only to do test!'));
@@ -128,18 +128,18 @@ class _HomeViewState extends State<HomeView> with WidgetsBindingObserver {
       if (isApprove == true) {
         try {
           final requiredMethods =
-              proposal.namespaces['eip155']?.methods ?? <String>[];
+              proposal.namespaces?['eip155']?.methods ?? <String>[];
           final requiredEvents =
-              proposal.namespaces['eip155']?.events ?? <String>[];
+              proposal.namespaces?['eip155']?.events ?? <String>[];
 
           final optionalMethods =
               proposal.optionalNamespaces?['eip155']?.methods ?? <String>[];
           final optionalEvents =
               proposal.optionalNamespaces?['eip155']?.events ?? <String>[];
 
           final List<String> chainList = [];
-          chainList.addAll(proposal.namespaces['eip155']!.chains!);
-          chainList.addAll(proposal.optionalNamespaces!['eip155']!.chains!);
+          chainList.addAll(proposal.namespaces?['eip155']?.chains ?? []);
+          chainList.addAll(proposal.optionalNamespaces?['eip155']?.chains ?? []);
           final chainIDs = chainList.toSet().toList();
 
           final approval = SessionApproval(id: proposal.id, namespaces: {
@@ -355,7 +355,7 @@ class _HomeViewState extends State<HomeView> with WidgetsBindingObserver {
                               TextButton(
                                   onPressed: () {
                                     Clipboard.setData(
-                                        ClipboardData(text: _uriDisplay));
+                                        ClipboardData(text: _uriDisplay ?? ''));
                                   },
                                   child: const Text('Copy')),
                               TextButton(

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -29,10 +29,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
   bip32:
     dependency: "direct main"
     description:
@@ -109,10 +109,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -141,10 +141,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.0"
+    version: "1.17.2"
   convert:
     dependency: transitive
     description:
@@ -324,26 +324,26 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.13"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.9.1"
   package_config:
     dependency: transitive
     description:
@@ -356,10 +356,10 @@ packages:
     dependency: transitive
     description:
       name: path
-      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.3"
   path_provider_linux:
     dependency: transitive
     description:
@@ -521,10 +521,10 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   stack_trace:
     dependency: transitive
     description:
@@ -569,10 +569,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.16"
+    version: "0.6.0"
   typed_data:
     dependency: transitive
     description:
@@ -667,7 +667,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.7"
+    version: "1.0.9"
   watcher:
     dependency: transitive
     description:
@@ -676,6 +676,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4-beta"
   web3dart:
     dependency: "direct main"
     description:
@@ -709,5 +717,5 @@ packages:
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=2.18.5 <3.0.0"
+  dart: ">=3.1.0-185.0.dev <4.0.0"
   flutter: ">=3.3.0"
diff --git a/lib/src/model/session_proposal.dart b/lib/src/model/session_proposal.dart
@@ -9,7 +9,7 @@ part 'session_proposal.g.dart';
 class SessionProposal {
   final String id;
   final AppMetadata proposer;
-  final Map<String, ProposalNamespace> namespaces;
+  final Map<String, ProposalNamespace>? namespaces;
   @JsonKey(includeIfNull: false)
   final Map<String, ProposalNamespace>? optionalNamespaces;
 

diff --git a/lib/src/model/session_proposal.g.dart b/lib/src/model/session_proposal.g.dart
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,11 +1,11 @@
 name: wallet_connect_v2
 description: Wallet Connect V2 for Flutter, available for both Wallet and DApp to interact easier
-version: 1.0.8
+version: 1.0.9
 homepage: https://avacus.cc
 repository: https://github.com/wakumo/flutter-wallet-connect-v2
 
 environment:
-  sdk: '>=2.18.5 <3.0.0'
+  sdk: '>=2.18.5 <4.0.0'
   flutter: ">=2.5.0"
 
 dependencies: