diff --git a/Assets/BoomDao/Scripts/Candid/CandidApiManager.cs b/Assets/BoomDao/Scripts/Candid/CandidApiManager.cs index ad3dd38..6bf00a5 100644 --- a/Assets/BoomDao/Scripts/Candid/CandidApiManager.cs +++ b/Assets/BoomDao/Scripts/Candid/CandidApiManager.cs @@ -71,18 +71,13 @@ IAgent CreateAgentWithRandomIdentity(bool useLocalHost = false) IAgent randomAgent = null; var httpClient = new UnityHttpClient(); -#if UNITY_WEBGL && !UNITY_EDITOR - var bls = new WebGlBlsCryptography(); -#else - var bls = new WasmBlsCryptography(); -#endif try { if (useLocalHost) - randomAgent = new HttpAgent(Ed25519Identity.Generate(), new Uri("http://localhost:4943"), bls); + randomAgent = new HttpAgent(Ed25519Identity.Generate(), new Uri("http://localhost:4943")); else - randomAgent = new HttpAgent(httpClient, Ed25519Identity.Generate(), bls); + randomAgent = new HttpAgent(httpClient, Ed25519Identity.Generate()); } catch (Exception e) { @@ -178,14 +173,8 @@ public async UniTaskVoid CreateAgentUsingIdentityJson(string json, bool useLocal var identity = Identity.DeserializeJsonToIdentity(json); var httpClient = new UnityHttpClient(); - -#if UNITY_WEBGL && !UNITY_EDITOR - var bls = new WebGlBlsCryptography(); -#else - var bls = new WasmBlsCryptography(); -#endif - if (useLocalHost) await InitializeCandidApis(new HttpAgent(identity, new Uri("http://localhost:4943"), bls)); - else await InitializeCandidApis(new HttpAgent(httpClient, identity, bls)); + if (useLocalHost) await InitializeCandidApis(new HttpAgent(identity, new Uri("http://localhost:4943"))); + else await InitializeCandidApis(new HttpAgent(httpClient, identity)); Debug.Log("You have logged in"); } diff --git a/Assets/BoomDao/Scripts/Core/Utilities/CandidUtil/TokenUtil.cs b/Assets/BoomDao/Scripts/Core/Utilities/CandidUtil/TokenUtil.cs index 5db1b32..d1ba940 100644 --- a/Assets/BoomDao/Scripts/Core/Utilities/CandidUtil/TokenUtil.cs +++ b/Assets/BoomDao/Scripts/Core/Utilities/CandidUtil/TokenUtil.cs @@ -2,7 +2,6 @@ using Boom.Values; using System.Linq; using UnityEngine; -using Wasmtime; using static Env; public static class TokenUtil diff --git a/Assets/BoomDao/Scripts/Core/Utilities/WebSocketManager.cs b/Assets/BoomDao/Scripts/Core/Utilities/WebSocketManager.cs index e22c01e..295b542 100644 --- a/Assets/BoomDao/Scripts/Core/Utilities/WebSocketManager.cs +++ b/Assets/BoomDao/Scripts/Core/Utilities/WebSocketManager.cs @@ -80,7 +80,7 @@ async void OnDestroy() cancellationTokenSource.Cancel(); // Cancel any ongoing operations if (this.agent != null) { - if (this.agent.State == System.Net.WebSockets.WebSocketState.Aborted) return; + if (!this.agent.IsOpen) return; await this.agent.DisposeAsync(); } } diff --git a/Assets/Plugins/ICP.Net/API.xml b/Assets/Plugins/ICP.Net/API.xml index 7ca3078..df206e9 100644 --- a/Assets/Plugins/ICP.Net/API.xml +++ b/Assets/Plugins/ICP.Net/API.xml @@ -4,5 +4,191 @@ EdjCase.ICP.WebSockets + + + Agent for the Internet Computer using websockets + + The type of the message that will be sent back and forth + from client/server + + + + Connects to the server with a websocket connection. Will update `State` property + when connected + + Optional. Cancellation token used to stop the network requests before completion + + + + + Sends a message to the server via websockets + + The message that should be sent to the server + Optional. Cancellation token used to stop the network requests before completion + + + + + Gets the next message from the server and processes it with the defined callbacks + + Optional. Cancellation token used to stop the network requests before completion + + + + Closes the websocket connection. Will change the `State` property + + + + + Will return true if the connection is open and false otherwise + + + + + Waits and receives all messages from the server until the connection is closed or + the cancellation token is canceled + + Optional. Cancellation token used to stop the loop and network requests before completion + + + + + Represents a WebSocket client. + + + + + Gets a value indicating whether the WebSocket connection is open. + + + + + Connects to the specified WebSocket gateway + + The URI of the WebSocket gateway. + To cancel connection in mid operation + + + + Sends a message to the WebSocket server + + The message to send as a byte array. + To cancel sending in mid operation + + + + Receives the next message from the WebSocket server + + To cancel receiving in mid operation + The received bytes and a flag indicating if the message is a close message. + + + + Closes the WebSocket connection + + To cancel closing in mid operation + The optional policy violation message. + + + + Represents a builder class for creating WebSocket agents that communicate with a specified canister using the Internet Computer Protocol (ICP). + + The type of messages exchanged with the WebSocket agent + + + + Initializes a new instance of the WebSocketBuilder class. + + The principal canister id to send messages to + The URI of the websocket gateway + + + + Sets the action to be executed when the WebSocket connection is opened. + + The action to be executed. + The WebSocketBuilder instance. + + + + Sets the callback action to be executed when a message is received. + + The callback action to be executed. + The WebSocketBuilder instance. + + + + Sets the error handler for the WebSocketBuilder. + + The action to be executed when an error occurs. + The WebSocketBuilder instance. + + + + Sets the action to be executed when the WebSocket connection is closed. + + The action to be executed. + The WebSocketBuilder instance. + + + + Sets the network root key for signature verification. Development networks have different + root keys than mainnet. If not specified, the mainnet root key is used. + + The DER-encoded root key. + The WebSocketBuilder instance. + + + + Sets the network root key for signature verification. Development networks have different + root keys than mainnet. If not specified, the mainnet root key is used. + + The key info of the root key. + The WebSocketBuilder instance. + + + + Sets the identity for the WebSocket connection. + + The identity to set. + The WebSocketBuilder instance. + + + + Sets a custom CandidConverter for the `TMessage` candid conversion to override the + default implemenation. + + The custom CandidConverter to use. + The WebSocketBuilder instance. + + + + Sets a custom websocket client implementation to override the default. + + The custom websocket client implementation. + The WebSocketBuilder instance. + + + + Sets a custom BLS cryptography implementation to override the default. + + The custom BLS cryptography implementation. + The WebSocketBuilder instance. + + + + Builds the WebSocket agent from the specified configuration. + Will NOT connect the agent to the WebSocket gateway + + The WebSocket agent. + Thrown if the OnMessage action is not specified. + + + + Builds the WebSocket agent from the specified configuration and then connects the agent to the WebSocket gateway. + + The WebSocket agent. + Thrown if the OnMessage action is not specified. + diff --git a/Assets/Plugins/ICP.Net/Bls.jslib b/Assets/Plugins/ICP.Net/Bls.jslib deleted file mode 100644 index 1dcccfa..0000000 --- a/Assets/Plugins/ICP.Net/Bls.jslib +++ /dev/null @@ -1,6 +0,0 @@ -var BLS = { - VerifySignature: function (publicKeyHex, messageHashHex, signatureHex) { - return nobleCurves.bls12_381.verify(publicKeyHex, messageHashHex, signatureHex); - }, -}; -mergeInto(LibraryManager.library, BLS); diff --git a/Assets/Plugins/ICP.Net/Castle.Core.dll b/Assets/Plugins/ICP.Net/Castle.Core.dll new file mode 100644 index 0000000..023dc29 Binary files /dev/null and b/Assets/Plugins/ICP.Net/Castle.Core.dll differ diff --git a/Assets/Plugins/ICP.Net/Wasmtime.Dotnet.dll.meta b/Assets/Plugins/ICP.Net/Castle.Core.dll.meta similarity index 93% rename from Assets/Plugins/ICP.Net/Wasmtime.Dotnet.dll.meta rename to Assets/Plugins/ICP.Net/Castle.Core.dll.meta index 9ec5029..553c4f8 100644 --- a/Assets/Plugins/ICP.Net/Wasmtime.Dotnet.dll.meta +++ b/Assets/Plugins/ICP.Net/Castle.Core.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 13cc79c3d1c04e84db6800f3aa637adf +guid: 6b3099258e5290f44a8ddeb49e589c07 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Plugins/ICP.Net/EdjCase.ICP.Agent.deps.json b/Assets/Plugins/ICP.Net/EdjCase.ICP.Agent.deps.json deleted file mode 100644 index 90433cc..0000000 --- a/Assets/Plugins/ICP.Net/EdjCase.ICP.Agent.deps.json +++ /dev/null @@ -1,217 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETStandard,Version=v2.1/", - "signature": "" - }, - "compilationOptions": {}, - "targets": { - ".NETStandard,Version=v2.1": {}, - ".NETStandard,Version=v2.1/": { - "EdjCase.ICP.Agent/1.0.0": { - "dependencies": { - "BouncyCastle.Cryptography": "2.1.1", - "EdjCase.ICP.BLS": "1.0.0", - "EdjCase.ICP.Candid": "1.0.0", - "System.Formats.Cbor": "7.0.0", - "Vsxmd": "1.4.4" - }, - "runtime": { - "EdjCase.ICP.Agent.dll": {} - } - }, - "BouncyCastle.Cryptography/2.1.1": { - "runtime": { - "lib/netstandard2.0/BouncyCastle.Cryptography.dll": { - "assemblyVersion": "2.0.0.0", - "fileVersion": "2.1.1.34079" - } - } - }, - "Microsoft.Bcl.HashCode/1.1.1": { - "runtime": { - "lib/netstandard2.1/Microsoft.Bcl.HashCode.dll": { - "assemblyVersion": "1.0.0.0", - "fileVersion": "4.700.20.56604" - } - } - }, - "System.Buffers/4.5.1": { - "runtime": { - "lib/netstandard2.0/System.Buffers.dll": { - "assemblyVersion": "4.0.3.0", - "fileVersion": "4.6.28619.1" - } - } - }, - "System.Formats.Asn1/7.0.0": { - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5" - }, - "runtime": { - "lib/netstandard2.0/System.Formats.Asn1.dll": { - "assemblyVersion": "7.0.0.0", - "fileVersion": "7.0.22.51805" - } - } - }, - "System.Formats.Cbor/7.0.0": { - "dependencies": { - "Microsoft.Bcl.HashCode": "1.1.1", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - }, - "runtime": { - "lib/netstandard2.0/System.Formats.Cbor.dll": { - "assemblyVersion": "7.0.0.0", - "fileVersion": "7.0.22.51805" - } - } - }, - "System.Memory/4.5.5": { - "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - }, - "runtime": { - "lib/netstandard2.0/System.Memory.dll": { - "assemblyVersion": "4.0.1.2", - "fileVersion": "4.6.31308.1" - } - } - }, - "System.Numerics.Vectors/4.4.0": { - "runtime": { - "lib/netstandard2.0/System.Numerics.Vectors.dll": { - "assemblyVersion": "4.1.3.0", - "fileVersion": "4.6.25519.3" - } - } - }, - "System.Runtime.CompilerServices.Unsafe/6.0.0": { - "runtime": { - "lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll": { - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.0.21.52210" - } - } - }, - "Vsxmd/1.4.4": {}, - "Wasmtime/8.0.1": { - "runtime": { - "lib/netstandard2.1/Wasmtime.Dotnet.dll": { - "assemblyVersion": "8.0.1.0", - "fileVersion": "8.0.1.0" - } - } - }, - "EdjCase.ICP.BLS/1.0.0": { - "dependencies": { - "Wasmtime": "8.0.1" - }, - "runtime": { - "EdjCase.ICP.BLS.dll": {} - } - }, - "EdjCase.ICP.Candid/1.0.0": { - "dependencies": { - "Microsoft.Bcl.HashCode": "1.1.1", - "System.Formats.Asn1": "7.0.0", - "System.Memory": "4.5.5" - }, - "runtime": { - "EdjCase.ICP.Candid.dll": {} - } - } - } - }, - "libraries": { - "EdjCase.ICP.Agent/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "BouncyCastle.Cryptography/2.1.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-NNQaa4eyf5YjSdLKUWGPzq5HXZQc3yGybfIOkR6UY1C/rRFWdo0UhSzBqqnxwGnq3ie4vkN0JlzhhANjfTIJIQ==", - "path": "bouncycastle.cryptography/2.1.1", - "hashPath": "bouncycastle.cryptography.2.1.1.nupkg.sha512" - }, - "Microsoft.Bcl.HashCode/1.1.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-MalY0Y/uM/LjXtHfX/26l2VtN4LDNZ2OE3aumNOHDLsT4fNYy2hiHXI4CXCqKpNUNm7iJ2brrc4J89UdaL56FA==", - "path": "microsoft.bcl.hashcode/1.1.1", - "hashPath": "microsoft.bcl.hashcode.1.1.1.nupkg.sha512" - }, - "System.Buffers/4.5.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==", - "path": "system.buffers/4.5.1", - "hashPath": "system.buffers.4.5.1.nupkg.sha512" - }, - "System.Formats.Asn1/7.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-+nfpV0afLmvJW8+pLlHxRjz3oZJw4fkyU9MMEaMhCsHi/SN9bGF9q79ROubDiwTiCHezmK0uCWkPP7tGFP/4yg==", - "path": "system.formats.asn1/7.0.0", - "hashPath": "system.formats.asn1.7.0.0.nupkg.sha512" - }, - "System.Formats.Cbor/7.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-2DvlHGwr0hEXXRv/8j9x4fw9yqJ7638qusWsf3iruVUmRb+mWl5ODSZRtXe5ZH62/0R6qf/QxA8JTrhIRvWlXw==", - "path": "system.formats.cbor/7.0.0", - "hashPath": "system.formats.cbor.7.0.0.nupkg.sha512" - }, - "System.Memory/4.5.5": { - "type": "package", - "serviceable": true, - "sha512": "sha512-XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", - "path": "system.memory/4.5.5", - "hashPath": "system.memory.4.5.5.nupkg.sha512" - }, - "System.Numerics.Vectors/4.4.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==", - "path": "system.numerics.vectors/4.4.0", - "hashPath": "system.numerics.vectors.4.4.0.nupkg.sha512" - }, - "System.Runtime.CompilerServices.Unsafe/6.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==", - "path": "system.runtime.compilerservices.unsafe/6.0.0", - "hashPath": "system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512" - }, - "Vsxmd/1.4.4": { - "type": "package", - "serviceable": true, - "sha512": "sha512-dhE1koy33KVwpKuz803/7GpYm4Q2emwiln2beHpLJb4PHAbJUFFQ+BUGWUe/iEVSeYptODX7x2fvpYlBvSConQ==", - "path": "vsxmd/1.4.4", - "hashPath": "vsxmd.1.4.4.nupkg.sha512" - }, - "Wasmtime/8.0.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-erxCx7kWqnVstw8KBvGnrIEXJSDW4CKKED5mNhJAL9dw3xK8bMbUdamfOchsNEweWwuuyHwjS2KSr1SQ+HNEpg==", - "path": "wasmtime/8.0.1", - "hashPath": "wasmtime.8.0.1.nupkg.sha512" - }, - "EdjCase.ICP.BLS/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "EdjCase.ICP.Candid/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - } - } -} \ No newline at end of file diff --git a/Assets/Plugins/ICP.Net/EdjCase.ICP.Agent.deps.json.meta b/Assets/Plugins/ICP.Net/EdjCase.ICP.Agent.deps.json.meta deleted file mode 100644 index ba43251..0000000 --- a/Assets/Plugins/ICP.Net/EdjCase.ICP.Agent.deps.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d242a95b5f2c3e84bb9f18c6e832907f -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ICP.Net/EdjCase.ICP.Agent.dll b/Assets/Plugins/ICP.Net/EdjCase.ICP.Agent.dll index dc85950..82d26b8 100644 Binary files a/Assets/Plugins/ICP.Net/EdjCase.ICP.Agent.dll and b/Assets/Plugins/ICP.Net/EdjCase.ICP.Agent.dll differ diff --git a/Assets/Plugins/ICP.Net/EdjCase.ICP.BLS.dll b/Assets/Plugins/ICP.Net/EdjCase.ICP.BLS.dll index 0fcd8aa..e5d5810 100644 Binary files a/Assets/Plugins/ICP.Net/EdjCase.ICP.BLS.dll and b/Assets/Plugins/ICP.Net/EdjCase.ICP.BLS.dll differ diff --git a/Assets/Plugins/ICP.Net/EdjCase.ICP.Candid.dll b/Assets/Plugins/ICP.Net/EdjCase.ICP.Candid.dll index d811b51..637208c 100644 Binary files a/Assets/Plugins/ICP.Net/EdjCase.ICP.Candid.dll and b/Assets/Plugins/ICP.Net/EdjCase.ICP.Candid.dll differ diff --git a/Assets/Plugins/ICP.Net/EdjCase.ICP.WebSockets.deps.json b/Assets/Plugins/ICP.Net/EdjCase.ICP.WebSockets.deps.json index 0e60c5a..4467f8b 100644 --- a/Assets/Plugins/ICP.Net/EdjCase.ICP.WebSockets.deps.json +++ b/Assets/Plugins/ICP.Net/EdjCase.ICP.WebSockets.deps.json @@ -9,7 +9,8 @@ ".NETStandard,Version=v2.1/": { "EdjCase.ICP.WebSockets/1.0.0": { "dependencies": { - "EdjCase.ICP.Agent": "1.0.0" + "EdjCase.ICP.Agent": "1.0.0", + "Moq": "4.18.4" }, "runtime": { "EdjCase.ICP.WebSockets.dll": {} @@ -23,6 +24,17 @@ } } }, + "Castle.Core/5.1.1": { + "dependencies": { + "System.Diagnostics.EventLog": "4.7.0" + }, + "runtime": { + "lib/netstandard2.1/Castle.Core.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.1.1.0" + } + } + }, "Microsoft.Bcl.HashCode/1.1.1": { "runtime": { "lib/netstandard2.1/Microsoft.Bcl.HashCode.dll": { @@ -31,6 +43,17 @@ } } }, + "Moq/4.18.4": { + "dependencies": { + "Castle.Core": "5.1.1" + }, + "runtime": { + "lib/netstandard2.1/Moq.dll": { + "assemblyVersion": "4.18.0.0", + "fileVersion": "4.18.4.0" + } + } + }, "System.Buffers/4.5.1": { "runtime": { "lib/netstandard2.0/System.Buffers.dll": { @@ -39,6 +62,17 @@ } } }, + "System.Diagnostics.EventLog/4.7.0": { + "dependencies": { + "System.Security.Principal.Windows": "4.7.0" + }, + "runtime": { + "lib/netstandard2.0/System.Diagnostics.EventLog.dll": { + "assemblyVersion": "4.0.2.0", + "fileVersion": "4.700.19.56404" + } + } + }, "System.Formats.Asn1/7.0.0": { "dependencies": { "System.Buffers": "4.5.1", @@ -94,11 +128,11 @@ } } }, - "Wasmtime/8.0.1": { + "System.Security.Principal.Windows/4.7.0": { "runtime": { - "lib/netstandard2.1/Wasmtime.Dotnet.dll": { - "assemblyVersion": "8.0.1.0", - "fileVersion": "8.0.1.0" + "lib/netstandard2.0/System.Security.Principal.Windows.dll": { + "assemblyVersion": "4.1.3.0", + "fileVersion": "4.700.19.56404" } } }, @@ -114,9 +148,6 @@ } }, "EdjCase.ICP.BLS/1.0.0": { - "dependencies": { - "Wasmtime": "8.0.1" - }, "runtime": { "EdjCase.ICP.BLS.dll": {} } @@ -146,6 +177,13 @@ "path": "bouncycastle.cryptography/2.1.1", "hashPath": "bouncycastle.cryptography.2.1.1.nupkg.sha512" }, + "Castle.Core/5.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==", + "path": "castle.core/5.1.1", + "hashPath": "castle.core.5.1.1.nupkg.sha512" + }, "Microsoft.Bcl.HashCode/1.1.1": { "type": "package", "serviceable": true, @@ -153,6 +191,13 @@ "path": "microsoft.bcl.hashcode/1.1.1", "hashPath": "microsoft.bcl.hashcode.1.1.1.nupkg.sha512" }, + "Moq/4.18.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-IOo+W51+7Afnb0noltJrKxPBSfsgMzTKCw+Re5AMx8l/vBbAbMDOynLik4+lBYIWDJSO0uV7Zdqt7cNb6RZZ+A==", + "path": "moq/4.18.4", + "hashPath": "moq.4.18.4.nupkg.sha512" + }, "System.Buffers/4.5.1": { "type": "package", "serviceable": true, @@ -160,6 +205,13 @@ "path": "system.buffers/4.5.1", "hashPath": "system.buffers.4.5.1.nupkg.sha512" }, + "System.Diagnostics.EventLog/4.7.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-iDoKGQcRwX0qwY+eAEkaJGae0d/lHlxtslO+t8pJWAUxlvY3tqLtVOPnW2UU4cFjP0Y/L1QBqhkZfSyGqVMR2w==", + "path": "system.diagnostics.eventlog/4.7.0", + "hashPath": "system.diagnostics.eventlog.4.7.0.nupkg.sha512" + }, "System.Formats.Asn1/7.0.0": { "type": "package", "serviceable": true, @@ -195,12 +247,12 @@ "path": "system.runtime.compilerservices.unsafe/6.0.0", "hashPath": "system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512" }, - "Wasmtime/8.0.1": { + "System.Security.Principal.Windows/4.7.0": { "type": "package", "serviceable": true, - "sha512": "sha512-erxCx7kWqnVstw8KBvGnrIEXJSDW4CKKED5mNhJAL9dw3xK8bMbUdamfOchsNEweWwuuyHwjS2KSr1SQ+HNEpg==", - "path": "wasmtime/8.0.1", - "hashPath": "wasmtime.8.0.1.nupkg.sha512" + "sha512": "sha512-ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ==", + "path": "system.security.principal.windows/4.7.0", + "hashPath": "system.security.principal.windows.4.7.0.nupkg.sha512" }, "EdjCase.ICP.Agent/1.0.0": { "type": "project", diff --git a/Assets/Plugins/ICP.Net/EdjCase.ICP.WebSockets.dll b/Assets/Plugins/ICP.Net/EdjCase.ICP.WebSockets.dll index 3db1fc2..3057760 100644 Binary files a/Assets/Plugins/ICP.Net/EdjCase.ICP.WebSockets.dll and b/Assets/Plugins/ICP.Net/EdjCase.ICP.WebSockets.dll differ diff --git a/Assets/Plugins/ICP.Net/System.Diagnostics.EventLog.dll b/Assets/Plugins/ICP.Net/System.Diagnostics.EventLog.dll new file mode 100644 index 0000000..cf31454 Binary files /dev/null and b/Assets/Plugins/ICP.Net/System.Diagnostics.EventLog.dll differ diff --git a/Assets/Plugins/ICP.Net/Bls.jslib.meta b/Assets/Plugins/ICP.Net/System.Diagnostics.EventLog.dll.meta similarity index 81% rename from Assets/Plugins/ICP.Net/Bls.jslib.meta rename to Assets/Plugins/ICP.Net/System.Diagnostics.EventLog.dll.meta index 22a0652..de54913 100644 --- a/Assets/Plugins/ICP.Net/Bls.jslib.meta +++ b/Assets/Plugins/ICP.Net/System.Diagnostics.EventLog.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 95e3e08a3a3facc4bae3c486642a03d5 +guid: 6ab3f7ba2c32a2d4bb28bbd533d884fc PluginImporter: externalObjects: {} serializedVersion: 2 @@ -14,7 +14,7 @@ PluginImporter: - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor @@ -23,10 +23,11 @@ PluginImporter: settings: DefaultValueInitialized: true - first: - WebGL: WebGL + Windows Store Apps: WindowsStoreApps second: - enabled: 1 - settings: {} + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/ICP.Net/System.Security.Principal.Windows.dll b/Assets/Plugins/ICP.Net/System.Security.Principal.Windows.dll new file mode 100644 index 0000000..19d0fc0 Binary files /dev/null and b/Assets/Plugins/ICP.Net/System.Security.Principal.Windows.dll differ diff --git a/Assets/Plugins/ICP.Net/System.Security.Principal.Windows.dll.meta b/Assets/Plugins/ICP.Net/System.Security.Principal.Windows.dll.meta new file mode 100644 index 0000000..3ad69ef --- /dev/null +++ b/Assets/Plugins/ICP.Net/System.Security.Principal.Windows.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 09b1d8d08d2452a4da4cb4fee64aa833 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/ICP.Net/Wasmtime.Dotnet.dll b/Assets/Plugins/ICP.Net/Wasmtime.Dotnet.dll deleted file mode 100644 index b8190e2..0000000 Binary files a/Assets/Plugins/ICP.Net/Wasmtime.Dotnet.dll and /dev/null differ diff --git a/Assets/Plugins/ICP.Net/WebGlBlsCryptography.cs b/Assets/Plugins/ICP.Net/WebGlBlsCryptography.cs deleted file mode 100644 index 7303483..0000000 --- a/Assets/Plugins/ICP.Net/WebGlBlsCryptography.cs +++ /dev/null @@ -1,54 +0,0 @@ -using EdjCase.ICP.Agent.Agents.Http; -using EdjCase.ICP.BLS; -using System; -using System.Net; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Threading; -using System.Threading.Tasks; -using UnityEngine; -using UnityEngine.Networking; - -#if UNITY_WEBGL && !UNITY_EDITOR -public class WebGlBlsCryptography : IBlsCryptography -{ - public bool VerifySignature(byte[] publicKey, byte[] messageHash, byte[] signature) - { - string publicKeyHex = ToHexString(publicKey); - string messageHashHex = ToHexString(messageHash); - string signatureHex = ToHexString(signature); - return BrowserBlsLib.VerifySignature(publicKeyHex, messageHashHex, signatureHex); - } - - public static string ToHexString(byte[] bytes) - { - char[] stringValue = new char[bytes.Length * 2]; - int i = 0; - foreach (byte b in bytes) - { - int charIndex = i++ * 2; - int quotient = Math.DivRem(b, 16, out int remainder); - stringValue[charIndex] = GetChar(quotient); - stringValue[charIndex + 1] = GetChar(remainder); - } - - return new string(stringValue); // returns: "48656C6C6F20776F726C64" for "Hello world" - - } - private static char GetChar(int value) - { - if (value < 10) - { - return (char)(value + 48); // 0->9 - } - return (char)(value + 65 - 10); // A->F ASCII - } -} - -internal static class BrowserBlsLib -{ - [DllImport("__Internal")] - public static extern bool VerifySignature(string publicKeyHex, string messageHashHex, string signatureHex); -} -#endif - diff --git a/Assets/Plugins/ICP.Net/WebGlBlsCryptography.cs.meta b/Assets/Plugins/ICP.Net/WebGlBlsCryptography.cs.meta deleted file mode 100644 index e29f047..0000000 --- a/Assets/Plugins/ICP.Net/WebGlBlsCryptography.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e1706f3f6aa00e040969562a6ae2dfa0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ICP.Net/linux-x64.meta b/Assets/Plugins/ICP.Net/linux-x64.meta deleted file mode 100644 index 68b0ccc..0000000 --- a/Assets/Plugins/ICP.Net/linux-x64.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7c5907fecb1f72d49b8e2e3eb78deca1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ICP.Net/linux-x64/libwasmtime.so b/Assets/Plugins/ICP.Net/linux-x64/libwasmtime.so deleted file mode 100644 index fbb6052..0000000 Binary files a/Assets/Plugins/ICP.Net/linux-x64/libwasmtime.so and /dev/null differ diff --git a/Assets/Plugins/ICP.Net/linux-x64/libwasmtime.so.meta b/Assets/Plugins/ICP.Net/linux-x64/libwasmtime.so.meta deleted file mode 100644 index a23fcb1..0000000 --- a/Assets/Plugins/ICP.Net/linux-x64/libwasmtime.so.meta +++ /dev/null @@ -1,69 +0,0 @@ -fileFormatVersion: 2 -guid: ee4f7a77ec4d9144b8503f9ca3f4b980 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Editor: 0 - Exclude Linux64: 0 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 0 - Exclude Win64: 0 - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: x86_64 - DefaultValueInitialized: true - OS: Linux - - first: - Standalone: Linux64 - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Win - second: - enabled: 1 - settings: - CPU: x86 - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: x86_64 - - first: - WebGL: WebGL - second: - enabled: 0 - settings: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ICP.Net/osx-arm64.meta b/Assets/Plugins/ICP.Net/osx-arm64.meta deleted file mode 100644 index ac0d3f8..0000000 --- a/Assets/Plugins/ICP.Net/osx-arm64.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e99672676b8985e4fa39befe366cbe44 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ICP.Net/osx-arm64/libwasmtime.dylib b/Assets/Plugins/ICP.Net/osx-arm64/libwasmtime.dylib deleted file mode 100644 index c762198..0000000 Binary files a/Assets/Plugins/ICP.Net/osx-arm64/libwasmtime.dylib and /dev/null differ diff --git a/Assets/Plugins/ICP.Net/osx-arm64/libwasmtime.dylib.meta b/Assets/Plugins/ICP.Net/osx-arm64/libwasmtime.dylib.meta deleted file mode 100644 index f3caa09..0000000 --- a/Assets/Plugins/ICP.Net/osx-arm64/libwasmtime.dylib.meta +++ /dev/null @@ -1,69 +0,0 @@ -fileFormatVersion: 2 -guid: 15aa73a2ce13cb74a9d921fbf819ca1a -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Editor: 0 - Exclude Linux64: 1 - Exclude OSXUniversal: 0 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: ARM64 - DefaultValueInitialized: true - OS: OSX - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 1 - settings: - CPU: ARM64 - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - WebGL: WebGL - second: - enabled: 0 - settings: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ICP.Net/osx-x64.meta b/Assets/Plugins/ICP.Net/osx-x64.meta deleted file mode 100644 index 6be6ef4..0000000 --- a/Assets/Plugins/ICP.Net/osx-x64.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8fdcf78f75e41ea48a5c34157b33fcdc -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ICP.Net/osx-x64/libwasmtime.dylib b/Assets/Plugins/ICP.Net/osx-x64/libwasmtime.dylib deleted file mode 100644 index 936c236..0000000 Binary files a/Assets/Plugins/ICP.Net/osx-x64/libwasmtime.dylib and /dev/null differ diff --git a/Assets/Plugins/ICP.Net/osx-x64/libwasmtime.dylib.meta b/Assets/Plugins/ICP.Net/osx-x64/libwasmtime.dylib.meta deleted file mode 100644 index db9dec1..0000000 --- a/Assets/Plugins/ICP.Net/osx-x64/libwasmtime.dylib.meta +++ /dev/null @@ -1,69 +0,0 @@ -fileFormatVersion: 2 -guid: 6492df4d23b190848afad05d0b4e6a8f -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Editor: 0 - Exclude Linux64: 1 - Exclude OSXUniversal: 0 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 1 - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: x86_64 - DefaultValueInitialized: true - OS: OSX - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 1 - settings: - CPU: x86_64 - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - WebGL: WebGL - second: - enabled: 0 - settings: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ICP.Net/win-x64.meta b/Assets/Plugins/ICP.Net/win-x64.meta deleted file mode 100644 index d7a01fd..0000000 --- a/Assets/Plugins/ICP.Net/win-x64.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 004742aeaec1c69478f585decf8fa40f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/ICP.Net/win-x64/wasmtime.dll b/Assets/Plugins/ICP.Net/win-x64/wasmtime.dll deleted file mode 100644 index 2df82b3..0000000 Binary files a/Assets/Plugins/ICP.Net/win-x64/wasmtime.dll and /dev/null differ diff --git a/Assets/Plugins/ICP.Net/win-x64/wasmtime.dll.meta b/Assets/Plugins/ICP.Net/win-x64/wasmtime.dll.meta deleted file mode 100644 index b71e2fe..0000000 --- a/Assets/Plugins/ICP.Net/win-x64/wasmtime.dll.meta +++ /dev/null @@ -1,64 +0,0 @@ -fileFormatVersion: 2 -guid: 2ddd9175530799c4e8e8c80edd4d554c -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Editor: 0 - Exclude Linux64: 0 - Exclude OSXUniversal: 0 - Exclude WebGL: 1 - Exclude Win: 1 - Exclude Win64: 0 - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: x86_64 - DefaultValueInitialized: true - OS: Windows - - first: - Standalone: Linux64 - second: - enabled: 1 - settings: - CPU: x86_64 - - first: - Standalone: OSXUniversal - second: - enabled: 1 - settings: - CPU: None - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: x86_64 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index b763e6a..0454b56 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -49,18 +49,18 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.ide.visualstudio": "2.0.17", - "com.unity.ide.rider": "3.0.18", + "com.unity.ide.visualstudio": "2.0.22", + "com.unity.ide.rider": "3.0.27", "com.unity.ide.vscode": "1.2.5", "com.unity.editorcoroutines": "1.0.0", - "com.unity.performance.profile-analyzer": "1.1.1", - "com.unity.test-framework": "1.1.31", - "com.unity.testtools.codecoverage": "1.2.2" + "com.unity.performance.profile-analyzer": "1.2.2", + "com.unity.test-framework": "1.1.33", + "com.unity.testtools.codecoverage": "1.2.5" } }, "com.unity.ide.rider": { - "version": "3.0.24", - "depth": 0, + "version": "3.0.27", + "depth": 1, "source": "registry", "dependencies": { "com.unity.ext.nunit": "1.0.6" @@ -91,21 +91,21 @@ "url": "https://packages.unity.com" }, "com.unity.performance.profile-analyzer": { - "version": "1.1.1", + "version": "1.2.2", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.scriptablebuildpipeline": { - "version": "1.21.5", + "version": "1.21.21", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.settings-manager": { - "version": "1.0.3", + "version": "2.0.1", "depth": 2, "source": "registry", "dependencies": {}, @@ -139,7 +139,7 @@ "url": "https://packages.unity.com" }, "com.unity.testtools.codecoverage": { - "version": "1.2.2", + "version": "1.2.5", "depth": 1, "source": "registry", "dependencies": { @@ -337,17 +337,6 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", diff --git a/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json b/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json index ad11087..3c7b4c1 100644 --- a/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json +++ b/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json @@ -1,6 +1,4 @@ { - "m_Name": "Settings", - "m_Path": "ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json", "m_Dictionary": { "m_DictionaryValues": [] } diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config deleted file mode 100644 index e69de29..0000000