Merge branch 'main' of https://github.com/thirdweb-dev/unity-sdk

Author: 0xFirekeeper

Assets/Thirdweb/Core/Scripts/Transaction.cs

@@ -10,6 +10,8 @@
 using MinimalForwarder = Thirdweb.Contracts.Forwarder.ContractDefinition;
 using UnityEngine.Networking;
 
+#pragma warning disable CS0618
+
 namespace Thirdweb
 {
     /// <summary>

Assets/Thirdweb/Core/Scripts/TransactionManager.cs

@@ -10,6 +10,8 @@
 using Nethereum.RPC.Eth.Transactions;
 using Nethereum.Web3;
 
+#pragma warning disable CS0618
+
 namespace Thirdweb
 {
     public static class TransactionManager

Assets/Thirdweb/Plugins/AsyncAwaitUtil/Source/Awaiters.cs

@@ -1,6 +1,8 @@
 using System;
 using UnityEngine;
 
+#pragma warning disable CS0436
+
 // TODO: Remove the allocs here, use a static memory pool?
 public static class Awaiters
 {

Assets/Thirdweb/Plugins/AsyncAwaitUtil/Source/IEnumeratorAwaitExtensions.cs

@@ -11,6 +11,8 @@
 using UnityAsyncAwaitUtil;
 using UnityEngine.Networking;
 
+#pragma warning disable CS0436
+
 // We could just add a generic GetAwaiter to YieldInstruction and CustomYieldInstruction
 // but instead we add specific methods to each derived class to allow for return values
 // that make the most sense for the specific instruction type

Assets/Thirdweb/Plugins/MetaMask/Plugins/Libraries/evm.net/Runtime/Generator/CodeGenerator.cs

@@ -25,31 +25,89 @@ public string ToFunctionName(string name)
 
         public bool IsValidIdentifier(string identifier)
         {
-            if (String.IsNullOrEmpty(identifier)) return false;
+            if (String.IsNullOrEmpty(identifier))
+                return false;
 
             // C# keywords: http://msdn.microsoft.com/en-us/library/x53a06bb(v=vs.71).aspx
             var keywords = new[]
             {
-                "abstract", "event", "new", "struct",
-                "as", "explicit", "null", "switch",
-                "base", "extern", "object", "this",
-                "bool", "false", "operator", "throw",
-                "breal", "finally", "out", "true",
-                "byte", "fixed", "override", "try",
-                "case", "float", "params", "typeof",
-                "catch", "for", "private", "uint",
-                "char", "foreach", "protected", "ulong",
-                "checked", "goto", "public", "unchekeced",
-                "class", "if", "readonly", "unsafe",
-                "const", "implicit", "ref", "ushort",
-                "continue", "in", "return", "using",
-                "decimal", "int", "sbyte", "virtual",
-                "default", "interface", "sealed", "volatile",
-                "delegate", "internal", "short", "void",
-                "do", "is", "sizeof", "while",
-                "double", "lock", "stackalloc",
-                "else", "long", "static",
-                "enum", "namespace", "string"
+                "abstract",
+                "event",
+                "new",
+                "struct",
+                "as",
+                "explicit",
+                "null",
+                "switch",
+                "base",
+                "extern",
+                "object",
+                "this",
+                "bool",
+                "false",
+                "operator",
+                "throw",
+                "breal",
+                "finally",
+                "out",
+                "true",
+                "byte",
+                "fixed",
+                "override",
+                "try",
+                "case",
+                "float",
+                "params",
+                "typeof",
+                "catch",
+                "for",
+                "private",
+                "uint",
+                "char",
+                "foreach",
+                "protected",
+                "ulong",
+                "checked",
+                "goto",
+                "public",
+                "unchekeced",
+                "class",
+                "if",
+                "readonly",
+                "unsafe",
+                "const",
+                "implicit",
+                "ref",
+                "ushort",
+                "continue",
+                "in",
+                "return",
+                "using",
+                "decimal",
+                "int",
+                "sbyte",
+                "virtual",
+                "default",
+                "interface",
+                "sealed",
+                "volatile",
+                "delegate",
+                "internal",
+                "short",
+                "void",
+                "do",
+                "is",
+                "sizeof",
+                "while",
+                "double",
+                "lock",
+                "stackalloc",
+                "else",
+                "long",
+                "static",
+                "enum",
+                "namespace",
+                "string"
             };
 
             // definition of a valid C# identifier: http://msdn.microsoft.com/en-us/library/aa664670(v=vs.71).aspx
@@ -58,15 +116,10 @@ public bool IsValidIdentifier(string identifier)
             const string decimalDigitCharacter = @"\p{Nd}";
             const string combiningCharacter = @"\p{Mn}|\p{Mc}";
             const string letterCharacter = @"\p{Lu}|\p{Ll}|\p{Lt}|\p{Lm}|\p{Lo}|\p{Nl}";
-            const string identifierPartCharacter = letterCharacter + "|" +
-                                                   decimalDigitCharacter + "|" +
-                                                   connectingCharacter + "|" +
-                                                   combiningCharacter + "|" +
-                                                   formattingCharacter;
+            const string identifierPartCharacter = letterCharacter + "|" + decimalDigitCharacter + "|" + connectingCharacter + "|" + combiningCharacter + "|" + formattingCharacter;
             const string identifierPartCharacters = "(" + identifierPartCharacter + ")+";
             const string identifierStartCharacter = "(" + letterCharacter + "|_)";
-            const string identifierOrKeyword = identifierStartCharacter + "(" +
-                                               identifierPartCharacters + ")*";
+            const string identifierOrKeyword = identifierStartCharacter + "(" + identifierPartCharacters + ")*";
             var validIdentifierRegex = new Regex("^" + identifierOrKeyword + "$", RegexOptions.Compiled);
             var normalizedIdentifier = identifier.Normalize();
 
@@ -123,14 +176,14 @@ public void CompleteCodeBlocks()
         }
 
         protected abstract void DoWrite();
-        
+
         public abstract string Filename { get; }
 
         public string Write(bool force = false)
         {
             if (!string.IsNullOrWhiteSpace(_cachedString) && !force)
                 return _cachedString;
-            
+
             DoWrite();
 
             _cachedString = builder.ToString();
@@ -142,7 +195,7 @@ public Dictionary<string, string> GenerateAll()
         {
             var dict = new Dictionary<string, string>();
             dict.Add(Filename, ToString());
-            
+
             // Add any additional files
             foreach (var generator in _context.Generators)
             {
@@ -152,9 +205,9 @@ public Dictionary<string, string> GenerateAll()
             return dict;
         }
 
-        public string ToString()
+        public override string ToString()
         {
             return Write();
         }
     }
-}
+}

Assets/Thirdweb/Plugins/MetaMask/Plugins/Libraries/evm.net/Runtime/Models/ABI/ABIDefConverter.cs

@@ -6,11 +6,16 @@ namespace evm.net.Models.ABI
 {
     public class ABIDefConverter : JsonConverter
     {
+#nullable enable
         public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
         {
             serializer.Serialize(writer, value);
         }
 
+#nullable disable
+
+#pragma warning disable CS8632
+
         public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
         {
             if (reader.TokenType == JsonToken.Null)
@@ -19,11 +24,12 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
             }
 
             var obj = JObject.Load(reader);
-            
-            if (obj["type"] == null) return serializer.Deserialize(reader, objectType);
+
+            if (obj["type"] == null)
+                return serializer.Deserialize(reader, objectType);
             var typeName = obj["type"].ToString();
 
-            ABIDefType type = (ABIDefType) Enum.Parse(typeof(ABIDefType), typeName, true);
+            ABIDefType type = (ABIDefType)Enum.Parse(typeof(ABIDefType), typeName, true);
 
             switch (type)
             {
@@ -42,7 +48,7 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
                 default:
                     throw new ArgumentOutOfRangeException();
             }
-            
+
             ABIDef result = (existingValue as ABIDef ?? (ABIDef)serializer.ContractResolver.ResolveContract(objectType).DefaultCreator()); // Reuse existingValue if present
             // the structure of the object matches the first format,
             // so just deserialize it directly using the serializer
@@ -52,9 +58,11 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
             return result;
         }
 
+#pragma warning restore CS8632
+
         public override bool CanConvert(Type objectType)
         {
             return typeof(ABIDef).IsAssignableFrom(objectType);
         }
     }
-}
+}

Assets/Thirdweb/Plugins/MetaMask/Plugins/Libraries/evm.net/Runtime/Models/EvmAddress.cs

@@ -11,7 +11,12 @@ public EvmAddress(string value)
             Value = value;
         }
 
+#nullable enable
+
         public static implicit operator string?(EvmAddress d) => d?.Value;
+
+#nullable disable
+
         public static implicit operator EvmAddress(string b) => new EvmAddress(b);
 
         public override string ToString() => Value.StartsWith("0x") ? Value : $"0x{Value}";
@@ -21,4 +26,4 @@ public object Convert()
             return ToString();
         }
     }
-}
+}

Assets/Thirdweb/Plugins/MetaMask/Plugins/Libraries/evm.net/Runtime/Models/HexString.cs

@@ -16,7 +16,12 @@ public byte[] ToBytes()
             return Value.HexToByteArray();
         }
 
+#nullable enable
+
         public static implicit operator string?(HexString d) => d?.Value;
+
+#nullable disable
+
         public static implicit operator HexString(string b) => new HexString(b);
 
         public override string ToString() => Value.StartsWith("0x") ? Value : $"0x{Value}";
@@ -26,4 +31,4 @@ public object Convert()
             return ToString();
         }
     }
-}
+}