fix: chainid default not passed, expiry not passed

Author: gigajuwels

WalletConnectSharp.Core/Controllers/TypedMessageHandler.cs

@@ -263,10 +263,11 @@ public PublishOptions RpcResponseOptionsForType<T>()
         /// </summary>
         /// <param name="topic">The topic to send the request in</param>
         /// <param name="parameters">The typed request message to send</param>
+        /// <param name="expiry">An override to specify how long this request will live for. If null is given, then expiry will be taken from either T or TR attributed options</param>
         /// <typeparam name="T">The request type</typeparam>
         /// <typeparam name="TR">The response type</typeparam>
         /// <returns>The id of the request sent</returns>
-        public async Task<long> SendRequest<T, TR>(string topic, T parameters)
+        public async Task<long> SendRequest<T, TR>(string topic, T parameters, long? expiry = null)
         {
             var method = RpcMethodAttribute.MethodForType<T>();
 
@@ -275,6 +276,11 @@ public async Task<long> SendRequest<T, TR>(string topic, T parameters)
             var message = await this.Core.Crypto.Encode(topic, payload);
 
             var opts = RpcRequestOptionsFromType<T, TR>();
+
+            if (expiry != null)
+            {
+                opts.TTL = (long)expiry;
+            }
 
             (await this.Core.History.JsonRpcHistoryOfType<T, TR>()).Set(topic, payload, null);
 

WalletConnectSharp.Core/Interfaces/ITypedMessageHandler.cs

@@ -79,10 +79,11 @@ void HandleMessageType<T, TR>(Func<string, JsonRpcRequest<T>, Task> requestCallb
         /// </summary>
         /// <param name="topic">The topic to send the request in</param>
         /// <param name="parameters">The typed request message to send</param>
+        /// <param name="expiry">An override to specify how long this request will live for. If null is given, then expiry will be taken from either T or TR attributed options</param>
         /// <typeparam name="T">The request type</typeparam>
         /// <typeparam name="TR">The response type</typeparam>
         /// <returns>The id of the request sent</returns>
-        Task<long> SendRequest<T, TR>(string topic, T parameters);
+        Task<long> SendRequest<T, TR>(string topic, T parameters, long? expiry = null);
 
         /// <summary>
         /// Send a typed response message with the given request / response type pair T, TR to the given topic

WalletConnectSharp.Sign/Engine.cs

@@ -506,7 +506,7 @@ public async Task<IAcknowledgement> Extend(string topic)
         /// <typeparam name="T">The type of the request data. MUST define the RpcMethodAttribute</typeparam>
         /// <typeparam name="TR">The type of the response data.</typeparam>
         /// <returns>The response data as type TR</returns>
-        public async Task<TR> Request<T, TR>(string topic, T data, string chainId = null)
+        public async Task<TR> Request<T, TR>(string topic, T data, string chainId = null, long? expiry = null)
         {
             await IsValidSessionTopic(topic);
 
@@ -546,7 +546,7 @@ public async Task<TR> Request<T, TR>(string topic, T data, string chainId = null
 
             id[0] = await MessageHandler.SendRequest<SessionRequest<T>, TR>(topic, new SessionRequest<T>()
             {
-                ChainId = chainId,
+                ChainId = defaultChainId,
                 Request = request
             });
 

WalletConnectSharp.Sign/Interfaces/IEngineAPI.cs

@@ -103,10 +103,11 @@ public interface IEngineAPI
         /// <param name="topic">The topic of the session to send the request in</param>
         /// <param name="data">The data of the request</param>
         /// <param name="chainId">An (optional) chainId the request should be performed in</param>
+        /// <param name="expiry">An override to specify how long this request will live for. If null is given, then expiry will be taken from either T or TR attributed options</param>
         /// <typeparam name="T">The type of the request data. MUST define the RpcMethodAttribute</typeparam>
         /// <typeparam name="TR">The type of the response data.</typeparam>
         /// <returns>The response data as type TR</returns>
-        Task<TR> Request<T, TR>(string topic, T data, string chainId = null);
+        Task<TR> Request<T, TR>(string topic, T data, string chainId = null, long? expiry = null);
 
         /// <summary>
         /// Send a response to a request to the session in the given topic with the response data TR. This function

WalletConnectSharp.Sign/WalletConnectSignClient.cs

@@ -318,9 +318,9 @@ public Task<IAcknowledgement> Extend(string topic)
         /// <typeparam name="T">The type of the request data. MUST define the RpcMethodAttribute</typeparam>
         /// <typeparam name="TR">The type of the response data.</typeparam>
         /// <returns>The response data as type TR</returns>
-        public Task<TR> Request<T, TR>(string topic, T data, string chainId = null)
+        public Task<TR> Request<T, TR>(string topic, T data, string chainId = null, long? expiry = null)
         {
-            return Engine.Request<T, TR>(topic, data, chainId);
+            return Engine.Request<T, TR>(topic, data, chainId, expiry);
         }
 
         /// <summary>