diff --git a/Packages/io.chainsafe.web3-unity.ramp/Editor.meta b/Packages/io.chainsafe.web3-unity.ramp/Editor.meta index 574852f84..332a94809 100644 --- a/Packages/io.chainsafe.web3-unity.ramp/Editor.meta +++ b/Packages/io.chainsafe.web3-unity.ramp/Editor.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<<< HEAD:Packages/io.chainsafe.web3-unity/Runtime/Prefabs/GUI Screens.meta guid: 355bd8a8a4c06bb468511db149a81dc8 -======== -guid: 89f45fbb72665a64eb12ddc6b921c914 ->>>>>>>> dev:Packages/io.chainsafe.web3-unity.ramp/Editor.meta folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/io.chainsafe.web3-unity.ramp/Runtime/Scripts/RampExchangerWebGL.cs b/Packages/io.chainsafe.web3-unity.ramp/Runtime/Scripts/RampExchangerWebGL.cs index 41087ed9b..968ebd48a 100644 --- a/Packages/io.chainsafe.web3-unity.ramp/Runtime/Scripts/RampExchangerWebGL.cs +++ b/Packages/io.chainsafe.web3-unity.ramp/Runtime/Scripts/RampExchangerWebGL.cs @@ -6,6 +6,7 @@ using AOT; using ChainSafe.Gaming.Evm.Signers; using ChainSafe.Gaming.Web3; +#nullable enable namespace ChainSafe.Gaming.Exchangers.Ramp { @@ -27,8 +28,8 @@ private delegate void OffRampSaleCallback(int requestId, string createdAt, strin private static readonly Dictionary> sellTaskMap = new(); private static readonly Dictionary> purchaseOrSellTaskMap = new(); - public event Action OnRampPurchaseCreated; - public event Action OffRampSaleCreated; + public event Action? OnRampPurchaseCreated; + public event Action? OffRampSaleCreated; private readonly IRampExchangerConfig config; private readonly ISigner signer; diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Plugins/Web3AuthSDK/Types/ECPointArithmetic.cs b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Plugins/Web3AuthSDK/Types/ECPointArithmetic.cs index b72764d57..6f50ae3b1 100644 --- a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Plugins/Web3AuthSDK/Types/ECPointArithmetic.cs +++ b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Plugins/Web3AuthSDK/Types/ECPointArithmetic.cs @@ -1,6 +1,7 @@ using Org.BouncyCastle.Math; using Org.BouncyCastle.Math.EC; using Org.BouncyCastle.Math.Field; +#nullable enable public class ECPointArithmetic { @@ -13,7 +14,6 @@ public class ECPointArithmetic private BigInteger? zinv; private BigInteger one = BigInteger.One; private BigInteger zero = BigInteger.Zero; - private bool infinity; public ECPointArithmetic(ECCurve ec, BigInteger x, BigInteger y, BigInteger z) { @@ -33,7 +33,6 @@ public ECPointArithmetic(ECCurve ec, BigInteger x, BigInteger y, BigInteger z) this.z = z; } this.zinv = null; - infinity = false; } public BigInteger getX() @@ -106,7 +105,7 @@ public ECPointArithmetic add(ECPointArithmetic b) { return this; } - ECPointArithmetic R = new ECPointArithmetic(this.ec, zero, zero, null); + ECPointArithmetic R = new ECPointArithmetic(this.ec, zero, zero, null!); // u = Y2 * Z1 - Y1 * Z2 BigInteger u = b.y.Multiply(this.z).Subtract(this.y.Multiply(b.z)).Mod(this.ef.Characteristic); // v = X2 * Z1 - X1 * Z2 @@ -118,8 +117,7 @@ public ECPointArithmetic add(ECPointArithmetic b) { return this.twice(); // this == b, so double } - - infinity = true; // this = -b, so infinity + return R; } @@ -152,10 +150,9 @@ public ECPointArithmetic twice() { return this; } - ECPointArithmetic R = new ECPointArithmetic(this.ec, zero, zero, null); + ECPointArithmetic R = new ECPointArithmetic(this.ec, zero, zero, null!); if (this.y.SignValue == 0) { - infinity = true; return R; } @@ -196,10 +193,9 @@ public ECPointArithmetic multiply(BigInteger k) return this; } - ECPointArithmetic R = new ECPointArithmetic(this.ec, zero, zero, null); + ECPointArithmetic R = new ECPointArithmetic(this.ec, zero, zero, null!); if (k.SignValue == 0) { - infinity = true; return R; } diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Plugins/Web3AuthSDK/Types/MfaSettings.cs b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Plugins/Web3AuthSDK/Types/MfaSettings.cs index 388d36fba..10805ad60 100644 --- a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Plugins/Web3AuthSDK/Types/MfaSettings.cs +++ b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Plugins/Web3AuthSDK/Types/MfaSettings.cs @@ -1,3 +1,5 @@ +#nullable enable + public class MfaSettings { public MfaSetting? deviceShareFactor { get; set; } diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Plugins/Web3AuthSDK/Types/Web3AuthOptions.cs b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Plugins/Web3AuthSDK/Types/Web3AuthOptions.cs index 99a2bc2ed..b7b36ddf9 100644 --- a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Plugins/Web3AuthSDK/Types/Web3AuthOptions.cs +++ b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Plugins/Web3AuthSDK/Types/Web3AuthOptions.cs @@ -4,11 +4,11 @@ public class Web3AuthOptions { - public string clientId { get; set; } + public string? clientId { get; set; } public Web3Auth.Network network { get; set; } public Web3Auth.BuildEnv buildEnv { get; set; } = Web3Auth.BuildEnv.PRODUCTION; - public Uri redirectUrl { get; set; } + public Uri? redirectUrl { get; set; } public string sdkUrl { get diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Plugins/Web3AuthSDK/Web3Auth.cs b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Plugins/Web3AuthSDK/Web3Auth.cs index 4b2f75364..d42eb2ffa 100644 --- a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Plugins/Web3AuthSDK/Web3Auth.cs +++ b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Plugins/Web3AuthSDK/Web3Auth.cs @@ -123,8 +123,7 @@ public void setOptions(Web3AuthOptions web3AuthOptions, bool rememberMe = false) if (this.web3AuthOptions.clientId != null) this.initParams["clientId"] = this.web3AuthOptions.clientId; - if (this.web3AuthOptions.buildEnv != null) - this.initParams["buildEnv"] = this.web3AuthOptions.buildEnv.ToString().ToLower(); + this.initParams["buildEnv"] = this.web3AuthOptions.buildEnv.ToString().ToLower(); this.initParams["network"] = this.web3AuthOptions.network.ToString().ToLower(); diff --git a/Packages/io.chainsafe.web3-unity/Editor/WebGLResourceEmbedding.cs b/Packages/io.chainsafe.web3-unity/Editor/WebGLResourceEmbedding.cs index 667b58955..715b6d8cd 100644 --- a/Packages/io.chainsafe.web3-unity/Editor/WebGLResourceEmbedding.cs +++ b/Packages/io.chainsafe.web3-unity/Editor/WebGLResourceEmbedding.cs @@ -9,7 +9,7 @@ public class WebGLResourceEmbedding : IPreprocessBuildWithReport public int callbackOrder => 1; public void OnPreprocessBuild(BuildReport report) { - PlayerSettings.SetPropertyBool("useEmbeddedResources", true, BuildTargetGroup.WebGL); + PlayerSettings.WebGL.useEmbeddedResources = true; } } #endif \ No newline at end of file diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Plugins/WebSocket/CSWebSocket.cs b/Packages/io.chainsafe.web3-unity/Runtime/Plugins/WebSocket/CSWebSocket.cs index 812e2d308..3e80fc8fe 100644 --- a/Packages/io.chainsafe.web3-unity/Runtime/Plugins/WebSocket/CSWebSocket.cs +++ b/Packages/io.chainsafe.web3-unity/Runtime/Plugins/WebSocket/CSWebSocket.cs @@ -38,7 +38,7 @@ void Awake() } } -public class WaitForUpdate : CustomYieldInstruction +public class WaitForUpdates : CustomYieldInstruction { public override bool keepWaiting { @@ -697,7 +697,7 @@ public async Task Receive() } finally { - await new WaitForUpdate(); + await new WaitForUpdates(); OnClose?.Invoke(closeCode); } } diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Scripts/IPFS/UploadPlatforms.cs b/Packages/io.chainsafe.web3-unity/Runtime/Scripts/IPFS/UploadPlatforms.cs index beb043b75..de5e6daed 100644 --- a/Packages/io.chainsafe.web3-unity/Runtime/Scripts/IPFS/UploadPlatforms.cs +++ b/Packages/io.chainsafe.web3-unity/Runtime/Scripts/IPFS/UploadPlatforms.cs @@ -7,13 +7,15 @@ public class UploadPlatforms { - + #region Fields +#if UNITY_WEBGL && !UNITY_EDITOR public static event EventHandler ImageSelected; +#endif #endregion - + #region Methods /// diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Scripts/Reown/Dialog/LocalWalletButton.cs b/Packages/io.chainsafe.web3-unity/Runtime/Scripts/Reown/Dialog/LocalWalletButton.cs index 0b1fd9b91..c5e9abe4b 100644 --- a/Packages/io.chainsafe.web3-unity/Runtime/Scripts/Reown/Dialog/LocalWalletButton.cs +++ b/Packages/io.chainsafe.web3-unity/Runtime/Scripts/Reown/Dialog/LocalWalletButton.cs @@ -43,7 +43,7 @@ private void Awake() ); } - public async void Set(WalletModel data, string walletIconEndpoint, HttpHeader[] httpHeaders, Action onClick) + public void Set(WalletModel data, string walletIconEndpoint, HttpHeader[] httpHeaders, Action onClick) { walletData = data; this.walletIconEndpoint = walletIconEndpoint; diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Scripts/Reown/WebSocketConnection.cs b/Packages/io.chainsafe.web3-unity/Runtime/Scripts/Reown/WebSocketConnection.cs index f19745ba9..de3b95785 100644 --- a/Packages/io.chainsafe.web3-unity/Runtime/Scripts/Reown/WebSocketConnection.cs +++ b/Packages/io.chainsafe.web3-unity/Runtime/Scripts/Reown/WebSocketConnection.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics.CodeAnalysis; using System.IO; using System.Threading.Tasks; using ChainSafe.Gaming.Evm.Unity; @@ -32,7 +33,10 @@ public class WebSocketConnection : IJsonRpcConnection, IModule public event EventHandler Closed; public event EventHandler ErrorReceived; public event EventHandler Opened; + // Disabled unused event warning, can't remove without altering IJsonRpcConnection. + #pragma warning disable CS0067 public event EventHandler RegisterErrored; + #pragma warning restore CS0067 private WebSocket _socket; private bool _disposed; diff --git a/src/UnitySampleProject/Assets/Samples/web3.unity SDK/3.0.6/Web3.Unity Samples/Scripts/Samples/EvmSample.cs b/src/UnitySampleProject/Assets/Samples/web3.unity SDK/3.0.6/Web3.Unity Samples/Scripts/Samples/EvmSample.cs index 90d4607ad..d1df9051e 100644 --- a/src/UnitySampleProject/Assets/Samples/web3.unity SDK/3.0.6/Web3.Unity Samples/Scripts/Samples/EvmSample.cs +++ b/src/UnitySampleProject/Assets/Samples/web3.unity SDK/3.0.6/Web3.Unity Samples/Scripts/Samples/EvmSample.cs @@ -43,26 +43,10 @@ public class EvmSample : MonoBehaviour, ISample #endregion - #region Get Send Array - - [Header("Array Calls")] - [SerializeField] private string methodArrayGet = "getStore"; - [SerializeField] private string methodArraySend = "setStore"; - [SerializeField] - private string[] stringArraySend = - { - "0xFb3aECf08940785D4fB3Ad87cDC6e1Ceb20e9aac", - "0x92d4040e4f3591e60644aaa483821d1bd87001e3" - }; - - #endregion - #region Sign Verify Sha3 [Header("Sign Verify SHA3 calls")] [SerializeField] private string messageSign = "The right man in the wrong place can make all the difference in the world."; - [SerializeField] private string messageSignVerify = "A man chooses, a slave obeys."; - [SerializeField] private string messageSha = "It’s dangerous to go alone, take this!"; #endregion @@ -74,23 +58,6 @@ public class EvmSample : MonoBehaviour, ISample #endregion - #region Registered Contract - - [Header("Registered Contract Call")] - [SerializeField] private string registeredContractName = "CsTestErc20"; - - #endregion - - #region ECDSA - - [Header("ECDSA Calls")] - [SerializeField] private string ecdsaKey = "0x78dae1a22c7507a4ed30c06172e7614eb168d3546c13856340771e63ad3c0081"; - [SerializeField] private string ecdsaMessage = "This is a test message"; - [SerializeField] private string transactionHash = "0x123456789"; - [SerializeField] private string chainId = "11155111"; - - #endregion - #region Multi Call [Header("MutliCall")]