fix: defaults loading in Address Provider

Tests/WalletConnectSharp.Sign.Test/SignTests.cs

@@ -395,6 +395,10 @@ public async Task TestTwoUniqueSessionRequestResponseUsingAddressProviderDefault
 
             var dappClient = ClientA;
             var walletClient = ClientB;
+
+            await dappClient.AddressProvider.LoadDefaultsAsync();
+            await walletClient.AddressProvider.LoadDefaultsAsync();
+
             if (!dappClient.AddressProvider.HasDefaultSession && !walletClient.AddressProvider.HasDefaultSession)
             {
                 var testAddress = "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045";
@@ -579,17 +583,18 @@ public async Task TestAddressProviderDefaultsSaving()
 
             var defaultSessionTopic = _cryptoFixture.ClientA.AddressProvider.DefaultSession.Topic;
 
+            Assert.NotNull(defaultSessionTopic);
+
             _cryptoFixture.StorageOverrideA = _cryptoFixture.ClientA.Core.Storage;
             _cryptoFixture.StorageOverrideB = _cryptoFixture.ClientB.Core.Storage;
 
             await Task.Delay(500);
 
             await _cryptoFixture.DisposeAndReset();
 
-            _testOutputHelper.WriteLine(string.Join(",", _cryptoFixture.ClientB.Core.Crypto.KeyChain.Keychain.Values));
-
             await Task.Delay(500);
 
+            await _cryptoFixture.ClientA.AddressProvider.LoadDefaultsAsync();
             var reloadedDefaultSessionTopic = _cryptoFixture.ClientA.AddressProvider.DefaultSession.Topic;
 
             Assert.Equal(defaultSessionTopic, reloadedDefaultSessionTopic);

WalletConnectSharp.Sign/Controllers/AddressProvider.cs

@@ -1,4 +1,5 @@
-using WalletConnectSharp.Sign.Interfaces;
+using WalletConnectSharp.Common.Utils;
+using WalletConnectSharp.Sign.Interfaces;
 using WalletConnectSharp.Sign.Models;
 using WalletConnectSharp.Sign.Models.Engine.Events;
 
@@ -100,12 +101,17 @@ public virtual async Task SaveDefaults()
         await _client.Core.Storage.SetItem($"{Context}-default-session", _state);
     }
 
-    public virtual async Task LoadDefaults()
+    public virtual async Task LoadDefaultsAsync()
     {
         var key = $"{Context}-default-session";
         if (await _client.Core.Storage.HasItem(key))
         {
-            _state = await _client.Core.Storage.GetItem<DefaultData>(key);
+            var state = await _client.Core.Storage.GetItem<DefaultData>(key);
+            var sessionExpiry = state.Session.Expiry;
+
+            _state = sessionExpiry != null && !Clock.IsExpired(sessionExpiry.Value)
+                ? state
+                : new DefaultData();
         }
         else
         {
@@ -191,11 +197,6 @@ private async Task UpdateDefaultChainIdAndNamespaceAsync()
         }
     }
 
-    public async Task InitAsync()
-    {
-        await this.LoadDefaults();
-    }
-
     public async Task SetDefaultNamespaceAsync(string @namespace)
     {
         if (string.IsNullOrWhiteSpace(@namespace))

WalletConnectSharp.Sign/Interfaces/IAddressProvider.cs

@@ -16,15 +16,14 @@ public interface IAddressProvider : IModule
     string DefaultChainId { get; }
 
     ISession Sessions { get; }
-
-
-    Task InitAsync();
-
+
     Task SetDefaultNamespaceAsync(string @namespace);
 
     Task SetDefaultChainIdAsync(string chainId);
 
     Caip25Address CurrentAddress(string chainId = null, SessionStruct session = default);
 
     IEnumerable<Caip25Address> AllAddresses(string @namespace = null, SessionStruct session = default);
+
+    public Task LoadDefaultsAsync();
 }

WalletConnectSharp.Sign/WalletConnectSignClient.cs

@@ -488,7 +488,6 @@ private async Task Initialize()
             await Session.Init();
             await Proposal.Init();
             await Engine.Init();
-            await AddressProvider.InitAsync();
         }
 
         public void Dispose()