Merge pull request #9 from wakumo/fix/request-params

fix(request-params): allow params as dynamic for serializable in native
wakumo · Apr 14, 2023 · 826fbd2 · 826fbd2
2 parents 4c20d0b + f7fa5ca
commit 826fbd2
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,3 +21,7 @@
 ## 1.0.2
 
 * Add `redirect` field into AppMetadata
+
+## 1.0.3
+
+* Update session request params, add example for sending request
diff --git a/android/src/main/kotlin/com/avacus/wallet_connect_v2/WalletConnectV2Plugin.kt b/android/src/main/kotlin/com/avacus/wallet_connect_v2/WalletConnectV2Plugin.kt
@@ -74,7 +74,7 @@ class WalletConnectV2Plugin : FlutterPlugin, MethodCallHandler, ActivityAware,
                         // TODO: it should be have redirect here!
                         // https://github.com/WalletConnect/WalletConnectKotlinV2/issues/792
                         onEvent(
-                            name = "proposal", data = sessionProposal.toFlutterValue(null)
+                            name = "proposal", data = sessionProposal.toFlutterValue()
                         )
                     }
 

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -355,6 +355,7 @@ class _HomeViewState extends State<HomeView> with WidgetsBindingObserver {
                                           'eip155': ProposalNamespace(chains: [
                                             'eip155:1'
                                           ], methods: [
+                                            "eth_signTransaction",
                                             "eth_sendTransaction",
                                             "personal_sign",
                                             "eth_signTypedData"
@@ -372,15 +373,18 @@ class _HomeViewState extends State<HomeView> with WidgetsBindingObserver {
                                           CrossAxisAlignment.start,
                                       children: [
                                         Text('Topic: $_dappTopic'),
-                                        Row(
-                                          mainAxisAlignment:
-                                              MainAxisAlignment.spaceBetween,
+                                        Wrap(
                                           children: [
                                             TextButton(
-                                                child: const Text(
-                                                    'Send personal_sign Request'),
+                                                child:
+                                                    const Text('personal_sign'),
                                                 onPressed: () =>
                                                     onSendPersonalMessageTest()),
+                                            TextButton(
+                                                child: const Text(
+                                                    'eth_signTransaction'),
+                                                onPressed: () =>
+                                                    onSendTransactionTest()),
                                             TextButton(
                                                 child: const Text('Disconnect'),
                                                 onPressed: () async {
@@ -564,6 +568,29 @@ class _HomeViewState extends State<HomeView> with WidgetsBindingObserver {
     session.peer.redirect?.launch();
   }
 
+  void onSendTransactionTest() async {
+    final session =
+        _sessions.firstWhere((element) => element.topic == _dappTopic!);
+    await _walletConnectV2Plugin.sendRequest(
+        request: Request(
+            method: 'eth_signTransaction',
+            chainId: 'eip155:1',
+            topic: _dappTopic!,
+            params: [
+          {
+            "from": "0xb60e8dd61c5d32be8058bb8eb970870f07233155",
+            "to": "0xd46e8dd67c5d32be8058bb8eb970870f07244567",
+            "gas": "0x76c0", // 30400
+            "gasPrice": "0x9184e72a000", // 10000000000000
+            "value": "0x9184e72a", // 2441406250
+            "data":
+                "0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675"
+          }
+        ]));
+    // TODO: don't forget to check if where is the source come from to determine launch or not
+    session.peer.redirect?.launch();
+  }
+
   Future _refreshSessions() async {
     try {
       final sessions = await _walletConnectV2Plugin.getActivatedSessions();

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -651,7 +651,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.2"
+    version: "1.0.3"
   watcher:
     dependency: transitive
     description:

diff --git a/ios/Classes/SwiftWalletConnectV2Plugin.swift b/ios/Classes/SwiftWalletConnectV2Plugin.swift
@@ -255,7 +255,7 @@ public class SwiftWalletConnectV2Plugin: NSObject, FlutterPlugin, FlutterStreamH
                     let topic = arguments["topic"] as! String
                     let method = arguments["method"] as! String
                     let chainId = Blockchain(arguments["chainId"] as! String)!
-                    let requestParams = AnyCodable(arguments["params"] as! [String])
+                    let requestParams: AnyCodable = try! JSONDecoder().decode(AnyCodable.self, from: JSONSerialization.data(withJSONObject: arguments["params"]!))
                     let request = Request(topic: topic, method: method, params: requestParams, chainId: chainId)
                     try await Sign.instance.request(params: request)
                 } catch let error {

diff --git a/lib/src/model/request.dart b/lib/src/model/request.dart
@@ -7,7 +7,7 @@ class Request {
   final String method;
   final String chainId;
   final String topic;
-  final List<String> params;
+  final dynamic params;
 
   Request(
       {required this.method,

diff --git a/lib/src/model/request.g.dart b/lib/src/model/request.g.dart
diff --git a/lib/src/model/session_update.dart b/lib/src/model/session_update.dart
@@ -12,4 +12,4 @@ class SessionUpdate {
       _$SessionUpdateFromJson(json);
 
   Map<String, dynamic> toJson() => _$SessionUpdateToJson(this);
-}
+}
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: wallet_connect_v2
-description: Wallet Connect V2 for Flutter, available for both Wallet and DApp to interact with Blockchain easier
-version: 1.0.2
+description: Wallet Connect V2 for Flutter, available for both Wallet and DApp to interact easier
+version: 1.0.3
 homepage: https://avacus.cc
 repository: https://github.com/wakumo/flutter-wallet-connect-v2
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,4 +12,4 @@ class SessionUpdate { @@
           _$SessionUpdateFromJson(json);
       Map<String, dynamic> toJson() => _$SessionUpdateToJson(this);
-    }
+    }