WalletConnect · skibitsky · May 28, 2024 · May 28, 2024 · May 28, 2024
diff --git a/Tests/WalletConnectSharp.Sign.Test/SignTests.cs b/Tests/WalletConnectSharp.Sign.Test/SignTests.cs
@@ -1,11 +1,9 @@
 using WalletConnectSharp.Common.Model.Errors;
 using WalletConnectSharp.Common.Utils;
-using WalletConnectSharp.Crypto;
 using WalletConnectSharp.Network.Models;
 using WalletConnectSharp.Sign.Interfaces;
 using WalletConnectSharp.Sign.Models;
 using WalletConnectSharp.Sign.Models.Engine;
-using WalletConnectSharp.Storage;
 using WalletConnectSharp.Tests.Common;
 using Xunit;
 using Xunit.Abstractions;
@@ -786,8 +784,8 @@ public async Task TestAddressProviderChainIdChange()
 
             _ = await TestConnectMethod(ClientA, ClientB);
 
-            const string badChainId = "invalid:invalid";
-            await Assert.ThrowsAsync<InvalidOperationException>(() => ClientA.AddressProvider.SetDefaultChainIdAsync(badChainId));
+            const string badChainId = "badChainId";
+            await Assert.ThrowsAsync<ArgumentException>(() => ClientA.AddressProvider.SetDefaultChainIdAsync(badChainId));
 
             // Change the default chain id
             const string newChainId = "eip155:10";

diff --git a/WalletConnectSharp.Sign/Controllers/AddressProvider.cs b/WalletConnectSharp.Sign/Controllers/AddressProvider.cs
@@ -1,4 +1,5 @@
 using WalletConnectSharp.Common.Utils;
+using WalletConnectSharp.Core;
 using WalletConnectSharp.Sign.Interfaces;
 using WalletConnectSharp.Sign.Models;
 using WalletConnectSharp.Sign.Models.Engine.Events;
@@ -220,9 +221,9 @@ public async Task SetDefaultChainIdAsync(string chainId)
             throw new ArgumentNullException(nameof(chainId));
         }
 
-        if (!DefaultSession.Namespaces[DefaultNamespace].Chains.Contains(chainId))
+        if (!Utils.IsValidChainId(chainId))
         {
-            throw new InvalidOperationException($"Chain {chainId} is not available in the current session");
+            throw new ArgumentException("The format of 'chainId' is invalid. Must be in the format of 'namespace:chainId' (e.g. 'eip155:10'). See CAIP-2 for more information.");
         }
 
         DefaultChainId = chainId;

diff --git a/Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs b/Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs
                {
                    eventHandler -= internalHandler;
                }
                catch (Exception e)
                {
                    // ignored
                }
                {
                    eventHandler -= internalHandler;
                }
                catch (Exception e)
                {
                    // ignored
                }
diff --git a/Core Modules/WalletConnectSharp.Network.Websocket/WebsocketConnection.cs b/Core Modules/WalletConnectSharp.Network.Websocket/WebsocketConnection.cs
            }
        }

        public async void Dispose()
        {
            Dispose(true);
            GC.SuppressFinalize(this);
diff --git a/Core Modules/WalletConnectSharp.Crypto/Encoder/Base58Encoding.cs b/Core Modules/WalletConnectSharp.Crypto/Encoder/Base58Encoding.cs
 			//Contract.Requires<ArgumentNullException>(data != null);
 			//Contract.Ensures(//Contract.Result<byte[]>() != null);

 			SHA256 sha256 = new SHA256Managed();
 			byte[] hash1 = sha256.ComputeHash(data);
 			byte[] hash2 = sha256.ComputeHash(hash1);

diff --git a/Core Modules/WalletConnectSharp.Crypto/Encoder/BaseX.cs b/Core Modules/WalletConnectSharp.Crypto/Encoder/BaseX.cs
                var carry = source[pbegin];
                // Apply "b58 = b58 * 256 + ch".
                var i = 0;
                for (var it1 = size - 1; (carry != 0 || i < length) && (it1 != -1); it1--, i++) {
                    carry += (byte)((uint)(256 * b58[it1]) >> 0);
                    b58[it1] = (byte)((uint)(carry % Base) >> 0);
                    carry = (byte)((uint)(carry / Base) >> 0);
                    return null;
                }
                var i = 0;
                for (var it3 = size - 1; (carry != 0 || i < length) && (it3 != -1); it3--, i++) {
                    carry += (byte)((uint)(Base * b256[it3]) >> 0);
                    b256[it3] = (byte)((uint)(carry % 256) >> 0);
                    carry = (byte)((uint)(carry / 256) >> 0);
diff --git a/Core Modules/WalletConnectSharp.Crypto/Crypto.cs b/Core Modules/WalletConnectSharp.Crypto/Crypto.cs
            {
                seed = await KeyChain.Get(CryptoClientSeed);
            }
            catch (Exception e)
            {
                byte[] seedRaw = new byte[32];
                RandomNumberGenerator.Fill(seedRaw);
	{
	eventHandler -= internalHandler;
	}
	catch (Exception e)
Check warning on line 129 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / build `The variable 'e' is declared but never used` Check warning on line 129 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / build `The variable 'e' is declared but never used` Check warning on line 129 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / build `The variable 'e' is declared but never used` Check warning on line 129 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / build `The variable 'e' is declared but never used` Check warning on line 129 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / test (unit-tests) `The variable 'e' is declared but never used` Check warning on line 129 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / test (unit-tests) `The variable 'e' is declared but never used` Check warning on line 129 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / test (unit-tests) `The variable 'e' is declared but never used` Check warning on line 129 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / test (unit-tests) `The variable 'e' is declared but never used` Check warning on line 129 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / test (integration-tests) `The variable 'e' is declared but never used` Check warning on line 129 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / test (integration-tests) `The variable 'e' is declared but never used` Check warning on line 129 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / test (integration-tests) `The variable 'e' is declared but never used`
	{
	// ignored
	}
	{
	eventHandler -= internalHandler;
	}
	catch (Exception e)
Check warning on line 155 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / build `The variable 'e' is declared but never used` Check warning on line 155 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / build `The variable 'e' is declared but never used` Check warning on line 155 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / build `The variable 'e' is declared but never used` Check warning on line 155 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / build `The variable 'e' is declared but never used` Check warning on line 155 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / test (unit-tests) `The variable 'e' is declared but never used` Check warning on line 155 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / test (unit-tests) `The variable 'e' is declared but never used` Check warning on line 155 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / test (unit-tests) `The variable 'e' is declared but never used` Check warning on line 155 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / test (unit-tests) `The variable 'e' is declared but never used` Check warning on line 155 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / test (integration-tests) `The variable 'e' is declared but never used` Check warning on line 155 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / test (integration-tests) `The variable 'e' is declared but never used` Check warning on line 155 in Core Modules/WalletConnectSharp.Common/Utils/Extensions.cs GitHub Actions / test (integration-tests) `The variable 'e' is declared but never used`
	{
	// ignored
	}
	}
	}

	public async void Dispose()
Check warning on line 302 in Core Modules/WalletConnectSharp.Network.Websocket/WebsocketConnection.cs GitHub Actions / build `This async method lacks 'await' operators and will run synchronously. Consider using the 'await' operator to await non-blocking API calls, or 'await Task.Run(...)' to do CPU-bound work on a background thread.` Check warning on line 302 in Core Modules/WalletConnectSharp.Network.Websocket/WebsocketConnection.cs GitHub Actions / test (unit-tests) `This async method lacks 'await' operators and will run synchronously. Consider using the 'await' operator to await non-blocking API calls, or 'await Task.Run(...)' to do CPU-bound work on a background thread.` Check warning on line 302 in Core Modules/WalletConnectSharp.Network.Websocket/WebsocketConnection.cs GitHub Actions / test (integration-tests) `This async method lacks 'await' operators and will run synchronously. Consider using the 'await' operator to await non-blocking API calls, or 'await Task.Run(...)' to do CPU-bound work on a background thread.`
	{
	Dispose(true);
	GC.SuppressFinalize(this);
	//Contract.Requires<ArgumentNullException>(data != null);
	//Contract.Ensures(//Contract.Result<byte[]>() != null);

	SHA256 sha256 = new SHA256Managed();
Check warning on line 119 in Core Modules/WalletConnectSharp.Crypto/Encoder/Base58Encoding.cs GitHub Actions / build `'SHA256Managed' is obsolete: 'Derived cryptographic types are obsolete. Use the Create method on the base type instead.' (https://aka.ms/dotnet-warnings/SYSLIB0021)`
	byte[] hash1 = sha256.ComputeHash(data);
	byte[] hash2 = sha256.ComputeHash(hash1);
	var carry = source[pbegin];
	// Apply "b58 = b58 * 256 + ch".
	var i = 0;
	for (var it1 = size - 1; (carry != 0 \|\| i < length) && (it1 != -1); it1--, i++) {
Check warning on line 66 in Core Modules/WalletConnectSharp.Crypto/Encoder/BaseX.cs GitHub Actions / test (unit-tests) `Comparison to integral constant is useless; the constant is outside the range of type 'uint'` Check warning on line 66 in Core Modules/WalletConnectSharp.Crypto/Encoder/BaseX.cs GitHub Actions / test (integration-tests) `Comparison to integral constant is useless; the constant is outside the range of type 'uint'`
	carry += (byte)((uint)(256 * b58[it1]) >> 0);
	b58[it1] = (byte)((uint)(carry % Base) >> 0);
	carry = (byte)((uint)(carry / Base) >> 0);
	return null;
	}
	var i = 0;
	for (var it3 = size - 1; (carry != 0 \|\| i < length) && (it3 != -1); it3--, i++) {
Check warning on line 121 in Core Modules/WalletConnectSharp.Crypto/Encoder/BaseX.cs GitHub Actions / test (integration-tests) `Comparison to integral constant is useless; the constant is outside the range of type 'uint'`
	carry += (byte)((uint)(Base * b256[it3]) >> 0);
	b256[it3] = (byte)((uint)(carry % 256) >> 0);
	carry = (byte)((uint)(carry / 256) >> 0);
	{
	seed = await KeyChain.Get(CryptoClientSeed);
	}
	catch (Exception e)
Check warning on line 662 in Core Modules/WalletConnectSharp.Crypto/Crypto.cs GitHub Actions / test (integration-tests) `The variable 'e' is declared but never used`
	{
	byte[] seedRaw = new byte[32];
	RandomNumberGenerator.Fill(seedRaw);