add optional namespace (#1424)

* add optional namespace Signed-off-by: phuoc <[email protected]> * rm unused import Signed-off-by: phuoc <[email protected]> * check autonomy connect Signed-off-by: phuoc <[email protected]> * Update lib/model/connection_request_args.dart Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * priority require name space Signed-off-by: phuoc <[email protected]> * priority require name space Signed-off-by: phuoc <[email protected]> --------- Signed-off-by: phuoc <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
bitmark-inc · Dec 15, 2023 · 1f2aec9 · 1f2aec9
1 parent 13888b9
commit 1f2aec9
Show file tree

Hide file tree

Showing 5 changed files with 175 additions and 142 deletions.
diff --git a/android/app/src/main/kotlin/com/bitmark/autonomy_flutter/Wc2ConnectPlugin.kt b/android/app/src/main/kotlin/com/bitmark/autonomy_flutter/Wc2ConnectPlugin.kt
@@ -126,7 +126,10 @@ class Wc2ConnectPlugin(private val application: Application) : FlutterPlugin,
             override fun onSessionProposal(sessionProposal: Sign.Model.SessionProposal) {
                 Timber.d("[WalletDelegate] onSessionProposal $sessionProposal")
                 pendingProposals.add(sessionProposal)
-                val namespaces = sessionProposal.requiredNamespaces.mapValues { e ->
+                val requiredNamespaces = sessionProposal.requiredNamespaces.mapValues { e ->
+                    e.value.toProposalNamespace()
+                }
+                val optionalNamespaces = sessionProposal.optionalNamespaces.mapValues { e ->
                     e.value.toProposalNamespace()
                 }
                 val proposer = mapOf(
@@ -138,7 +141,8 @@ class Wc2ConnectPlugin(private val application: Application) : FlutterPlugin,
                 val params = mapOf(
                     "id" to sessionProposal.proposerPublicKey,
                     "proposer" to Gson().toJson(proposer),
-                    "requiredNamespaces" to Json.encodeToString(namespaces)
+                    "requiredNamespaces" to Json.encodeToString(requiredNamespaces),
+                    "optionalNamespaces" to Json.encodeToString(optionalNamespaces)
                 )
                 mainScope?.launch {
                     eventPublisher.emit(
@@ -247,14 +251,15 @@ class Wc2ConnectPlugin(private val application: Application) : FlutterPlugin,
             result.error("-1", "Proposal not found", null)
             return
         }
-        val namespaces = proposal.requiredNamespaces.mapValues {
+        val namespaces = (proposal.optionalNamespaces + proposal.requiredNamespaces).mapValues {
             Sign.Model.Namespace.Session(
                 chains = it.value.chains,
                 methods = it.value.methods,
                 events = it.value.events,
                 accounts = it.value.chains?.map { chain -> "$chain:$account" } ?: emptyList(),
             )
         }
+        Timber.d("Approve namespace: $namespaces")
         try {
             SignClient.approveSession(
                 Sign.Params.Approve(

diff --git a/ios/Runner/Wallet Connect 2.0/WC2ChannelHanler.swift b/ios/Runner/Wallet Connect 2.0/WC2ChannelHanler.swift
@@ -124,8 +124,16 @@ class WC2ChannelHandler: NSObject {
             return
         }
 
+        var allNamespaces = proposal.requiredNamespaces
+
+        if let optionalNamespaces = proposal.optionalNamespaces {
+            allNamespaces.merge(optionalNamespaces) { requiredNamespaces, _ in
+                return requiredNamespaces
+            }
+        }
+
         var sessionNamespaces = [String: SessionNamespace]()
-        proposal.requiredNamespaces.forEach {
+        allNamespaces.forEach {
             let caip2Namespace = $0.key
             let proposalNamespace = $0.value
             let accounts = Set(proposalNamespace.chains!.compactMap { Account($0.absoluteString + ":\(account)") })
@@ -165,10 +173,12 @@ extension WC2ChannelHandler: FlutterStreamHandler {
 
                 var params: [String: Any] = [:]
                 let proposer = try? JSONEncoder().encode(sessionProposal.proposer)
-                let namespaces = try? JSONEncoder().encode(sessionProposal.requiredNamespaces)
+                let requiredNamespaces = try? JSONEncoder().encode(sessionProposal.requiredNamespaces)
+                let optionalNamespaces = try? JSONEncoder().encode(sessionProposal.optionalNamespaces)
                 params["id"] = sessionProposal.id
                 params["proposer"] = proposer != nil ? String(data: proposer!, encoding: .utf8) : nil
-                params["requiredNamespaces"] = namespaces != nil ? String(data: namespaces!, encoding: .utf8) : nil
+                params["requiredNamespaces"] = requiredNamespaces != nil ? String(data: requiredNamespaces!, encoding: .utf8) : nil
+                params["optionalNamespaces"] = optionalNamespaces != nil ? String(data: optionalNamespaces!, encoding: .utf8) : nil
 
                 events([
                     "eventName": "onSessionProposal",

diff --git a/lib/model/connection_request_args.dart b/lib/model/connection_request_args.dart
@@ -5,8 +5,7 @@
 //  that can be found in the LICENSE file.
 //
 
-import 'package:autonomy_flutter/service/wc2_service.dart';
-import 'package:collection/collection.dart';
+import 'package:autonomy_flutter/model/wc2_request.dart';
 import 'package:tezart/tezart.dart';
 
 abstract class ConnectionRequest {
@@ -16,7 +15,7 @@ abstract class ConnectionRequest {
 
   bool get isBeaconConnect => false;
 
-  get id;
+  String get id;
 
   String? get name;
 
@@ -42,7 +41,7 @@ class BeaconRequest extends ConnectionRequest {
   bool get isBeaconConnect => true;
 
   @override
-  get id => _id;
+  String get id => _id;
 
   @override
   String? get name => appName;
@@ -70,6 +69,7 @@ class Wc2Proposal extends ConnectionRequest {
     this._id, {
     required this.proposer,
     required this.requiredNamespaces,
+    this.optionalNamespaces = const {},
   });
 
   @override
@@ -79,19 +79,20 @@ class Wc2Proposal extends ConnectionRequest {
   bool get isAutonomyConnect => _isAutonomyConnect();
 
   bool _isAutonomyConnect() {
-    final proposalMethods =
-        requiredNamespaces.values.map((e) => e.methods).flattened.toSet();
-    final unsupportedMethods =
-        proposalMethods.difference(Wc2Service.autonomyMethods);
-    return unsupportedMethods.isEmpty;
+    final proposalChains = allNamespaces.keys.toSet();
+    return proposalChains.contains(Wc2Chain.autonomy);
   }
 
   AppMetadata proposer;
   Map<String, Wc2Namespace> requiredNamespaces;
+  Map<String, Wc2Namespace> optionalNamespaces;
+
+  Map<String, Wc2Namespace> get allNamespaces =>
+      {...requiredNamespaces, ...optionalNamespaces};
   final String _id;
 
   @override
-  get id => _id;
+  String get id => _id;
 
   @override
   String? get name => proposer.name;
@@ -114,17 +115,17 @@ class AppMetadata {
   String description;
 
   factory AppMetadata.fromJson(Map<String, dynamic> json) => AppMetadata(
-        icons: List<String>.from(json["icons"].map((x) => x)),
-        name: json["name"],
-        url: json["url"],
-        description: json["description"],
+        icons: List<String>.from(json['icons'].map((x) => x)),
+        name: json['name'],
+        url: json['url'],
+        description: json['description'],
       );
 
   Map<String, dynamic> toJson() => {
-        "icons": List<dynamic>.from(icons.map((x) => x)),
-        "name": name,
-        "url": url,
-        "description": description,
+        'icons': List<dynamic>.from(icons.map((x) => x)),
+        'name': name,
+        'url': url,
+        'description': description,
       };
 }
 
@@ -140,14 +141,14 @@ class Wc2Namespace {
   List<dynamic> events;
 
   factory Wc2Namespace.fromJson(Map<String, dynamic> json) => Wc2Namespace(
-        chains: List<String>.from(json["chains"].map((x) => x)),
-        methods: List<String>.from(json["methods"].map((x) => x)),
-        events: List<dynamic>.from(json["events"].map((x) => x)),
+        chains: List<String>.from(json['chains'].map((x) => x)),
+        methods: List<String>.from(json['methods'].map((x) => x)),
+        events: List<dynamic>.from(json['events'].map((x) => x)),
       );
 
   Map<String, dynamic> toJson() => {
-        "chains": List<dynamic>.from(chains.map((x) => x)),
-        "methods": List<dynamic>.from(methods.map((x) => x)),
-        "events": List<dynamic>.from(events.map((x) => x)),
+        'chains': List<dynamic>.from(chains.map((x) => x)),
+        'methods': List<dynamic>.from(methods.map((x) => x)),
+        'events': List<dynamic>.from(events.map((x) => x)),
       };
 }