Merge pull request #129 from WalletConnect/release/2.1.1

Release 2.1.1
WalletConnect · Oct 16, 2023 · ab63e99 · ab63e99
2 parents 86a0343 + 25aa38a
commit ab63e99
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <DefaultVersion>2.1.0</DefaultVersion>
+        <DefaultVersion>2.1.1</DefaultVersion>
         <DefaultTargetFrameworks>net6.0;netcoreapp3.1;netstandard2.1;</DefaultTargetFrameworks>
     </PropertyGroup>
     <PropertyGroup Label="C#">

diff --git a/WalletConnectSharp.Core/Controllers/Relayer.cs b/WalletConnectSharp.Core/Controllers/Relayer.cs
@@ -164,20 +164,6 @@ await Task.WhenAll(
             RegisterEventListeners();
 
             initialized = true;
-
-#pragma warning disable CS4014
-            Task.Run(async () =>
-#pragma warning restore CS4014
-            {
-                await Task.Delay(TimeSpan.FromSeconds(10));
-
-                if (this.Subscriber.Topics.Length == 0)
-                {
-                    // No topics subscribed to after init, closing transport
-                    await this.TransportClose();
-                    this.transportExplicityClosed = false;
-                }
-            });
         }
 
         protected virtual async Task CreateProvider()
@@ -477,7 +463,7 @@ private async Task ToEstablishConnection()
                 while (Provider.Connection.IsPaused)
                 {
                     WCLogger.Log("[Relayer] Waiting for connection to unpause");
-                    await Task.Delay(2);
+                    await Task.Delay(TimeSpan.FromSeconds(1));
                 }
                 return;
             }

diff --git a/WalletConnectSharp.Sign/Internals/EngineHandler.cs b/WalletConnectSharp.Sign/Internals/EngineHandler.cs
@@ -132,6 +132,7 @@ async Task IEnginePrivate.OnSessionSettleRequest(string topic, JsonRpcRequest<Se
             try
             {
                 await PrivateThis.IsValidSessionSettleRequest(@params);
+                var pairingTopic = @params.PairingTopic;
                 var relay = @params.Relay;
                 var controller = @params.Controller;
                 var expiry = @params.Expiry;
@@ -140,6 +141,7 @@ async Task IEnginePrivate.OnSessionSettleRequest(string topic, JsonRpcRequest<Se
                 var session = new SessionStruct()
                 {
                     Topic = topic,
+                    PairingTopic = pairingTopic,
                     Relay = relay,
                     Expiry = expiry,
                     Namespaces = namespaces,

diff --git a/WalletConnectSharp.Sign/Models/Engine/Methods/SessionSettle.cs b/WalletConnectSharp.Sign/Models/Engine/Methods/SessionSettle.cs
@@ -14,6 +14,12 @@ namespace WalletConnectSharp.Sign.Models.Engine.Methods
     [RpcResponseOptions(Clock.FIVE_MINUTES, 1103)]
     public class SessionSettle : IWcMethod
     {
+        /// <summary>
+        /// Pairing topic for this session
+        /// </summary>
+        [JsonProperty("pairingTopic")]
+        public string PairingTopic;
+
         /// <summary>
         /// The protocol options that should be used in this session
         /// </summary>

diff --git a/WalletConnectSharp.Sign/Models/SessionStruct.cs b/WalletConnectSharp.Sign/Models/SessionStruct.cs
@@ -16,6 +16,12 @@ public struct SessionStruct : IKeyHolder<string>
         [JsonProperty("topic")]
         public string Topic;
 
+        /// <summary>
+        /// The pairing topic of this session
+        /// </summary>
+        [JsonProperty("pairingTopic")]
+        public string PairingTopic;
+
         /// <summary>
         /// The relay protocol options this session is using
         /// </summary>