Changes type of chainId to String

josh-burton · josh-burton · commit 273f6f335e45 · 2022-01-11T15:29:07.000+13:00
diff --git a/README.md b/README.md
@@ -69,7 +69,7 @@ connector.on('disconnect', (session) => print(session));
 // Create a new session
 if (!connector.connected) {
     final session = await connector.createSession(
-        chainId: 4160,
+        chainId: '4160',
         onDisplayUri: (uri) => print(uri),
     );
 }
@@ -119,13 +119,13 @@ connector.on('disconnect', (session) => print(session));
 
 ```dart
 // Approve session
-await connector.approveSession(chainId: 4160, accounts: ['0x4292...931B3']);
+await connector.approveSession(chainId: '4160', accounts: ['0x4292...931B3']);
 
 // Reject session
 await connector.rejectSession(message: 'Optional error message');
 
 // Update session
-await connector.updateSession(SessionStatus(chainId: 4000, accounts: ['0x4292...931B3']));
+await connector.updateSession(SessionStatus(chainId: '4000', accounts: ['0x4292...931B3']));
 ```
 
 **Kill session**
diff --git a/example/dapp/lib/dapp.dart b/example/dapp/lib/dapp.dart
@@ -23,7 +23,7 @@ void main() async {
 
   // Check if connection is already established
   final session = await connector.createSession(
-    chainId: 4160,
+    chainId: '4160',
     onDisplayUri: (uri) => print(uri),
   );
   final sender = Address.fromAlgorandAddress(address: session.accounts[0]);
diff --git a/example/example.md b/example/example.md
@@ -39,7 +39,7 @@ connector.setDefaultProvider(AlgorandWCProvider(connector));
 
 // Check if connection is already established
 final session = await connector.createSession(
-    chainId: 4160,
+    chainId: '4160',
     onDisplayUri: (uri) => print(uri),
 );
 
diff --git a/example/mobile/lib/main.dart b/example/mobile/lib/main.dart
@@ -63,7 +63,7 @@ class _MyHomePageState extends State<MyHomePage> {
         child: const Icon(Icons.add),
         onPressed: () async {
           final session = await wc.connector.createSession(
-            chainId: 4160,
+            chainId: '4160',
             onDisplayUri: (uri) {
               // launch(uri);
               setState(() {
diff --git a/example/wallet/lib/wallet.dart b/example/wallet/lib/wallet.dart
@@ -4,7 +4,7 @@ void main() async {
   final connector = _buildApp();
   if (!connector.connected) {
     final session = await connector.createSession(
-      chainId: 4160,
+      chainId: '4160',
       onDisplayUri: (uri) {
         print(uri);
 
@@ -63,10 +63,10 @@ void _connectWallet({required String uri}) {
 
   // Subscribe to session requests
   connector.on('session_request', (payload) async {
-    await connector.approveSession(chainId: 4160, accounts: ['test']);
+    await connector.approveSession(chainId: '4160', accounts: ['test']);
 
     await connector
-        .updateSession(SessionStatus(chainId: 4000, accounts: ['test2']));
+        .updateSession(SessionStatus(chainId: '4000', accounts: ['test2']));
   });
 
   connector.on('disconnect', (message) async {
diff --git a/lib/src/api/walletconnect/wc_session_request.dart b/lib/src/api/walletconnect/wc_session_request.dart
@@ -8,7 +8,7 @@ part 'wc_session_request.g.dart';
 @JsonSerializable()
 class WCSessionRequest {
   @JsonKey(name: 'chainId')
-  final int? chainId;
+  final String? chainId;
 
   @JsonKey(name: 'peerId')
   final String? peerId;
diff --git a/lib/src/api/walletconnect/wc_session_request.g.dart b/lib/src/api/walletconnect/wc_session_request.g.dart
diff --git a/lib/src/api/walletconnect/wc_session_request_response.dart b/lib/src/api/walletconnect/wc_session_request_response.dart
@@ -11,7 +11,7 @@ class WCSessionRequestResponse {
   final bool approved;
 
   @JsonKey(name: 'chainId')
-  final int? chainId;
+  final String? chainId;
 
   @JsonKey(name: 'accounts', defaultValue: [])
   final List<String> accounts;
@@ -37,7 +37,7 @@ class WCSessionRequestResponse {
 
   /// Get the status of the session;
   SessionStatus get status => SessionStatus(
-        chainId: chainId ?? 0,
+        chainId: chainId ?? '0',
         accounts: accounts,
       );
 
diff --git a/lib/src/api/walletconnect/wc_session_request_response.g.dart b/lib/src/api/walletconnect/wc_session_request_response.g.dart
diff --git a/lib/src/api/walletconnect/wc_session_update_response.dart b/lib/src/api/walletconnect/wc_session_update_response.dart
@@ -7,8 +7,8 @@ class WCSessionUpdateResponse {
   @JsonKey(name: 'approved', defaultValue: false)
   final bool approved;
 
-  @JsonKey(name: 'chainId', defaultValue: 0)
-  final int chainId;
+  @JsonKey(name: 'chainId', defaultValue: '0')
+  final String chainId;
 
   @JsonKey(name: 'accounts', defaultValue: [])
   final List<String> accounts;
diff --git a/lib/src/api/walletconnect/wc_session_update_response.g.dart b/lib/src/api/walletconnect/wc_session_update_response.g.dart
diff --git a/lib/src/providers/wallet_connect_provider.dart b/lib/src/providers/wallet_connect_provider.dart
@@ -26,5 +26,5 @@ abstract class WalletConnectProvider {
   });
 
   /// Get the chain id.
-  int get chainId;
+  String get chainId;
 }
diff --git a/lib/src/providers/wc_algorand_provider.dart b/lib/src/providers/wc_algorand_provider.dart
@@ -63,5 +63,5 @@ class AlgorandWCProvider extends WalletConnectProvider {
 
   /// The chain id of the Algorand blockchain.
   @override
-  int get chainId => 4160;
+  String get chainId => '4160';
 }
diff --git a/lib/src/session/session_status.dart b/lib/src/session/session_status.dart
@@ -1,6 +1,6 @@
 /// Information regarding the current session.
 class SessionStatus {
-  final int chainId;
+  final String chainId;
   final List<String> accounts;
   final int? networkId;
   final String? rpcUrl;
@@ -13,7 +13,7 @@ class SessionStatus {
   });
 
   SessionStatus copyWith({
-    int? chainId,
+    String? chainId,
     List<String>? accounts,
     int? networkId,
     String? rpcUrl,
diff --git a/lib/src/session/wallet_connect_session.dart b/lib/src/session/wallet_connect_session.dart
@@ -14,7 +14,7 @@ class WalletConnectSession {
   int version;
   bool connected;
   List<String> accounts;
-  int chainId;
+  String chainId;
   String bridge = '';
 
   @KeyConverter()
@@ -33,7 +33,7 @@ class WalletConnectSession {
     this.protocol = 'wc',
     this.version = 1,
     this.connected = false,
-    this.chainId = 0,
+    this.chainId = '0',
     this.bridge = '',
     this.key,
     this.clientId = '',
diff --git a/lib/src/session/wallet_connect_session.g.dart b/lib/src/session/wallet_connect_session.g.dart
diff --git a/lib/src/walletconnect.dart b/lib/src/walletconnect.dart
@@ -155,7 +155,7 @@ class WalletConnect {
   }
 
   /// Create a new session.
-  Future<SessionStatus> connect({int? chainId}) async {
+  Future<SessionStatus> connect({String? chainId}) async {
     if (connected) {
       return SessionStatus(
         chainId: session.chainId,
@@ -168,7 +168,7 @@ class WalletConnect {
 
   /// Create a new session between the dApp and wallet.
   Future<SessionStatus> createSession({
-    int? chainId,
+    String? chainId,
     OnDisplayUriCallback? onDisplayUri,
   }) async {
     if (connected) {
@@ -210,7 +210,7 @@ class WalletConnect {
   /// Approve the session.
   Future approveSession({
     required List<String> accounts,
-    required int chainId,
+    required String chainId,
   }) async {
     if (connected) {
       throw WalletConnectException('Session currently connected');
