Upgrade MetaMask SDK to 2.0.1 (#185)

Signed-off-by: Eddie Penta <eddie.penta@consensys.net>
Co-authored-by: 0xFirekeeper <0xFirekeeper@gmail.com>

Author: ecp4224

Assets/Thirdweb/Core/Plugins/MetaMask.NEthereum/MetaMaskNEthereumExtensions.cs

@@ -5,7 +5,7 @@ namespace MetaMask.NEthereum
 {
     public static class MetaMaskNEthereumExtensions
     {
-        public static Web3 CreateWeb3(this MetaMaskUnity metaMaskUnity)
+        public static Web3 CreateWeb3(this IMetaMaskSDK metaMaskUnity)
         {
             return metaMaskUnity.Wallet.CreateWeb3();
         }

Assets/Thirdweb/Core/Plugins/MetaMask/Editor/EditorGUI/ContractGeneratorEditor.cs renamed to Assets/Thirdweb/Core/Plugins/MetaMask/Editor/ContractGeneratorEditor.cs

@@ -0,0 +1,23 @@
+using UnityEngine;
+using UnityEditor;
+
+namespace MetaMask.Editor.NaughtyAttributes.Editor
+{
+    [CustomPropertyDrawer(typeof(HorizontalLineAttribute))]
+    public class HorizontalLineDecoratorDrawer : DecoratorDrawer
+    {
+        public override float GetHeight()
+        {
+            HorizontalLineAttribute lineAttr = (HorizontalLineAttribute)attribute;
+            return EditorGUIUtility.singleLineHeight + lineAttr.Height;
+        }
+
+        public override void OnGUI(Rect position)
+        {
+            Rect rect = EditorGUI.IndentedRect(position);
+            rect.y += EditorGUIUtility.singleLineHeight / 3.0f;
+            HorizontalLineAttribute lineAttr = (HorizontalLineAttribute)attribute;
+            NaughtyEditorGUI.HorizontalLine(rect, lineAttr.Height, lineAttr.Color.GetColor());
+        }
+    }
+}

Assets/Thirdweb/Core/Plugins/MetaMask/Editor/EditorGUI/ContractGeneratorEditor.cs.meta renamed to Assets/Thirdweb/Core/Plugins/MetaMask/Editor/ContractGeneratorEditor.cs.meta

@@ -0,0 +1,59 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace MetaMask.Editor.NaughtyAttributes.Editor
+{
+    [CustomPropertyDrawer(typeof(InfoBoxAttribute))]
+    public class InfoBoxDecoratorDrawer : DecoratorDrawer
+    {
+        public override float GetHeight()
+        {
+            return GetHelpBoxHeight();
+        }
+
+        public override void OnGUI(Rect rect)
+        {
+            InfoBoxAttribute infoBoxAttribute = (InfoBoxAttribute)attribute;
+
+            float indentLength = NaughtyEditorGUI.GetIndentLength(rect);
+            Rect infoBoxRect = new Rect(
+                rect.x + indentLength,
+                rect.y,
+                rect.width - indentLength,
+                GetHelpBoxHeight());
+
+            DrawInfoBox(infoBoxRect, infoBoxAttribute.Text, infoBoxAttribute.Type);
+        }
+
+        private float GetHelpBoxHeight()
+        {
+            InfoBoxAttribute infoBoxAttribute = (InfoBoxAttribute)attribute;
+            float minHeight = EditorGUIUtility.singleLineHeight * 2.0f;
+            float desiredHeight = GUI.skin.box.CalcHeight(new GUIContent(infoBoxAttribute.Text), EditorGUIUtility.currentViewWidth);
+            float height = Mathf.Max(minHeight, desiredHeight);
+
+            return height;
+        }
+
+        private void DrawInfoBox(Rect rect, string infoText, EInfoBoxType infoBoxType)
+        {
+            MessageType messageType = MessageType.None;
+            switch (infoBoxType)
+            {
+                case EInfoBoxType.Normal:
+                    messageType = MessageType.Info;
+                    break;
+
+                case EInfoBoxType.Warning:
+                    messageType = MessageType.Warning;
+                    break;
+
+                case EInfoBoxType.Error:
+                    messageType = MessageType.Error;
+                    break;
+            }
+
+            NaughtyEditorGUI.HelpBox(rect, infoText, messageType);
+        }
+    }
+}

Assets/Thirdweb/Core/Plugins/MetaMask/Editor/EditorGUI/MetaMaskWindow.cs

@@ -0,0 +1,183 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using UnityEditor;
+using UnityEngine;
+
+namespace MetaMask.Editor.NaughtyAttributes.Editor
+{
+    [CanEditMultipleObjects]
+    [CustomEditor(typeof(UnityEngine.Object), true)]
+    public class NaughtyInspector : UnityEditor.Editor
+    {
+        private List<SerializedProperty> _serializedProperties = new List<SerializedProperty>();
+        private IEnumerable<FieldInfo> _nonSerializedFields;
+        private IEnumerable<PropertyInfo> _nativeProperties;
+        private IEnumerable<MethodInfo> _methods;
+        private Dictionary<string, SavedBool> _foldouts = new Dictionary<string, SavedBool>();
+
+        private bool isInvalid;
+
+        protected virtual void OnEnable()
+        {
+            _nonSerializedFields = ReflectionUtility.GetAllFields(
+                target, f => f.GetCustomAttributes(typeof(ShowNonSerializedFieldAttribute), true).Length > 0);
+
+            _nativeProperties = ReflectionUtility.GetAllProperties(
+                target, p => p.GetCustomAttributes(typeof(ShowNativePropertyAttribute), true).Length > 0);
+
+            _methods = ReflectionUtility.GetAllMethods(
+                target, m => m.GetCustomAttributes(typeof(ButtonAttribute), true).Length > 0);
+            
+            EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
+        }
+
+        private void OnPlayModeStateChanged(PlayModeStateChange state)
+        {
+            if (state != PlayModeStateChange.ExitingEditMode || !isInvalid) return;
+            
+            EditorApplication.isPlaying = false;
+
+            EditorUtility.DisplayDialog("Error", "You must fix the configuration errors inside MetaMask SDK before entering play mode.", "OK");
+        }
+
+        protected virtual void OnDisable()
+        {
+            ReorderableListPropertyDrawer.Instance.ClearCache();
+
+            EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
+        }
+
+        public override void OnInspectorGUI()
+        {
+            GetSerializedProperties(ref _serializedProperties);
+
+            bool anyNaughtyAttribute = _serializedProperties.Any(p => PropertyUtility.GetAttribute<INaughtyAttribute>(p) != null);
+            if (!anyNaughtyAttribute)
+            {
+                DrawDefaultInspector();
+            }
+            else
+            {
+                DrawSerializedProperties();
+            }
+
+            DrawNonSerializedFields();
+            DrawNativeProperties();
+            DrawButtons();
+        }
+
+        protected void GetSerializedProperties(ref List<SerializedProperty> outSerializedProperties)
+        {
+            outSerializedProperties.Clear();
+            using (var iterator = serializedObject.GetIterator())
+            {
+                if (iterator.NextVisible(true))
+                {
+                    do
+                    {
+                        outSerializedProperties.Add(serializedObject.FindProperty(iterator.name));
+                    }
+                    while (iterator.NextVisible(false));
+                }
+            }
+        }
+
+        protected void DrawSerializedProperties()
+        {
+            serializedObject.Update();
+
+            // Draw non-grouped serialized properties
+            bool allPropertiesValid = true;
+            foreach (var property in GetNonGroupedProperties(_serializedProperties))
+            {
+                if (property.name.Equals("m_Script", System.StringComparison.Ordinal))
+                {
+                    using (new EditorGUI.DisabledScope(disabled: true))
+                    {
+                        EditorGUILayout.PropertyField(property);
+                    }
+                }
+                else
+                {
+                    allPropertiesValid &= NaughtyEditorGUI.PropertyField_Layout(property, includeChildren: true);
+                }
+            }
+
+            isInvalid = !allPropertiesValid;
+            
+            serializedObject.ApplyModifiedProperties();
+        }
+
+        protected void DrawNonSerializedFields(bool drawHeader = false)
+        {
+            if (_nonSerializedFields.Any())
+            {
+                if (drawHeader)
+                {
+                    EditorGUILayout.Space();
+                    EditorGUILayout.LabelField("Non-Serialized Fields", GetHeaderGUIStyle());
+                    NaughtyEditorGUI.HorizontalLine(
+                        EditorGUILayout.GetControlRect(false), HorizontalLineAttribute.DefaultHeight, HorizontalLineAttribute.DefaultColor.GetColor());
+                }
+
+                foreach (var field in _nonSerializedFields)
+                {
+                    NaughtyEditorGUI.NonSerializedField_Layout(serializedObject.targetObject, field);
+                }
+            }
+        }
+
+        protected void DrawNativeProperties(bool drawHeader = false)
+        {
+            if (_nativeProperties.Any())
+            {
+                if (drawHeader)
+                {
+                    EditorGUILayout.Space();
+                    EditorGUILayout.LabelField("Native Properties", GetHeaderGUIStyle());
+                    NaughtyEditorGUI.HorizontalLine(
+                        EditorGUILayout.GetControlRect(false), HorizontalLineAttribute.DefaultHeight, HorizontalLineAttribute.DefaultColor.GetColor());
+                }
+
+                foreach (var property in _nativeProperties)
+                {
+                    NaughtyEditorGUI.NativeProperty_Layout(serializedObject.targetObject, property);
+                }
+            }
+        }
+
+        protected void DrawButtons(bool drawHeader = false)
+        {
+            if (_methods.Any())
+            {
+                if (drawHeader)
+                {
+                    EditorGUILayout.Space();
+                    EditorGUILayout.LabelField("Buttons", GetHeaderGUIStyle());
+                    NaughtyEditorGUI.HorizontalLine(
+                        EditorGUILayout.GetControlRect(false), HorizontalLineAttribute.DefaultHeight, HorizontalLineAttribute.DefaultColor.GetColor());
+                }
+
+                foreach (var method in _methods)
+                {
+                    NaughtyEditorGUI.Button(serializedObject.targetObject, method);
+                }
+            }
+        }
+
+        private static IEnumerable<SerializedProperty> GetNonGroupedProperties(IEnumerable<SerializedProperty> properties)
+        {
+            return properties.Where(p => PropertyUtility.GetAttribute<IGroupAttribute>(p) == null);
+        }
+
+        private static GUIStyle GetHeaderGUIStyle()
+        {
+            GUIStyle style = new GUIStyle(EditorStyles.centeredGreyMiniLabel);
+            style.fontStyle = FontStyle.Bold;
+            style.alignment = TextAnchor.UpperCenter;
+
+            return style;
+        }
+    }
+}