From c35e2edbf160ac7454b5a9a7fe7ec94e751b79b1 Mon Sep 17 00:00:00 2001
From: Jason Elie Bou Kheir <5115126+jasonboukheir@users.noreply.github.com>
Date: Fri, 10 Jun 2022 23:37:12 -0700
Subject: [PATCH] fix(walletconnect): fix random id range and parsing

---
 .../CareBoo.AlgoSdk.WalletConnect.asmdef                      | 3 ++-
 .../CareBoo.AlgoSdk.WalletConnect/Models/WalletConnectRpc.cs  | 4 ++--
 Runtime/CareBoo.AlgoSdk.WalletConnect/WebSocketExtensions.cs  | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/CareBoo.AlgoSdk.WalletConnect.asmdef b/Runtime/CareBoo.AlgoSdk.WalletConnect/CareBoo.AlgoSdk.WalletConnect.asmdef
index 31a9fbb22..eb0ddcaf2 100644
--- a/Runtime/CareBoo.AlgoSdk.WalletConnect/CareBoo.AlgoSdk.WalletConnect.asmdef
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/CareBoo.AlgoSdk.WalletConnect.asmdef
@@ -12,7 +12,8 @@
         "GUID:533d98c0995854feb940a5ba96ec4e3f",
         "GUID:2ee6601452ca245499e63674423f6541",
         "GUID:427b0dd64d04a4a02b8413b20fc93483",
-        "GUID:70d524b45145c40acbd35603c8e43743"
+        "GUID:70d524b45145c40acbd35603c8e43743",
+        "GUID:d8b63aba1907145bea998dd612889d6b"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/WalletConnectRpc.cs b/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/WalletConnectRpc.cs
index 11886cd91..842a300a7 100644
--- a/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/WalletConnectRpc.cs
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/Models/WalletConnectRpc.cs
@@ -51,12 +51,12 @@ public static JsonRpcRequest SessionRequest(WalletConnectSessionRequest sessionR
         /// <summary>
         /// Gets a random, valid JsonRpcRequest id.
         /// </summary>
-        /// <returns>a <see cref="ulong"/> in the range [1, <see cref="ulong.MaxValue"/>]</returns>
+        /// <returns>a <see cref="ulong"/> in the range [1, <see cref="uint.MaxValue"/>]</returns>
         public static ulong GetRandomId()
         {
             ulong x = 0;
             while (x == 0)
-                x = AlgoSdk.Crypto.Random.Bytes<ulong>();
+                x = AlgoSdk.Crypto.Random.Bytes<uint>();
             return x;
         }
 
diff --git a/Runtime/CareBoo.AlgoSdk.WalletConnect/WebSocketExtensions.cs b/Runtime/CareBoo.AlgoSdk.WalletConnect/WebSocketExtensions.cs
index 904e86e48..85019c0f1 100644
--- a/Runtime/CareBoo.AlgoSdk.WalletConnect/WebSocketExtensions.cs
+++ b/Runtime/CareBoo.AlgoSdk.WalletConnect/WebSocketExtensions.cs
@@ -48,8 +48,10 @@ public static void Send(this IWebSocketClient client, NetworkMessage networkMess
             CancellationToken cancellationToken = default
             )
         {
+            if (cancellationToken.IsCancellationRequested)
+                throw new OperationCanceledException();
             if (client == null)
-                return null;
+                throw new ArgumentNullException(nameof(client));
             WebSocketEvent evt = client.Poll();
             while (evt.Type == WebSocketEventType.Nothing)
             {