Use dappMetadata with Metamask

Author: 0xFirekeeper

Assets/Thirdweb/Plugins/MetaMask/Scripts/MetaMaskUnity.cs

@@ -16,14 +16,14 @@
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.Serialization;
+using Thirdweb;
 
 namespace MetaMask.Unity
 {
     [RequireComponent(typeof(MetaMaskUnityEventHandler))]
     [RequireComponent(typeof(MetaMaskHttpService))]
     public class MetaMaskUnity : MonoBehaviour, IMetaMaskEvents
     {
-
         #region Classes
 
         [Serializable]
@@ -42,30 +42,37 @@ public class MetaMaskUnityRpcUrlConfig
         /// <summary>The configuration for the MetaMask client.</summary>
         [SerializeField]
         protected MetaMaskConfig config;
+
         /// <summary>Whether or not to initialize the wallet on awake.</summary>
         /// <remarks>This is useful for testing.</remarks>
-        [FormerlySerializedAs("initializeOnStart")] [SerializeField]
+        [FormerlySerializedAs("initializeOnStart")]
+        [SerializeField]
         protected bool initializeOnAwake = true;
 
         [SerializeField]
         protected MetaMaskUnityScriptableObjectTransport _transport;
 
-
         /// <summary>Initializes the MetaMask Wallet Plugin.</summary>
         protected bool initialized = false;
 
         /// <param name="transport">The transport to use for communication with the MetaMask backend.</param>
         protected IMetaMaskTransport transport;
+
         /// <param name="socket">The socket wrapper to use for communication with the MetaMask backend.</param>
         protected IMetaMaskSocketWrapper socket;
+
         /// <param name="dataManager">The data manager to use for storing data.</param>
         protected MetaMaskDataManager dataManager;
+
         /// <param name="session">The session to use for storing data.</param>
         protected MetaMaskSession session;
+
         /// <param name="sessionData">The session data to use for storing data.</param>
         protected MetaMaskSessionData sessionData;
+
         /// <param name="wallet">The wallet to use for storing data.</param>
         protected MetaMaskWallet wallet;
+
         /// <summary>
         /// The RPC URL to use for web3 query requests when the MetaMask wallet is paused
         /// </summary>
@@ -74,7 +81,7 @@ public class MetaMaskUnityRpcUrlConfig
         internal Thread unityThread;
 
         #endregion
-        
+
         #region Events
 
         [Inject]
@@ -164,7 +171,6 @@ protected void Awake()
             }
         }
 
-
         /// <summary>Saves the current session.</summary>
         protected void OnApplicationQuit()
         {
@@ -220,18 +226,17 @@ public void Initialize(MetaMaskConfig config, IMetaMaskTransport transport, IMet
 
             this.transport = transport;
             this.socket = socket;
-            
+
             // Inject variables
             UnityBinder.Inject(this);
 
             // Validate config
             if (Config.AppName == "example" || Config.AppUrl == "example.com")
             {
                 if (SceneManager.GetActiveScene().name.ToLower() != "metamask main (sample)")
-                    throw new ArgumentException(
-                        "Cannot use example App name or App URL, please update app info in Window > MetaMask > Setup Window under Credentials");
+                    throw new ArgumentException("Cannot use example App name or App URL, please update app info in Window > MetaMask > Setup Window under Credentials");
             }
-            
+
             try
             {
                 // Check if we need to create a WebsocketDispatcher
@@ -241,49 +246,44 @@ public void Initialize(MetaMaskConfig config, IMetaMaskTransport transport, IMet
                     MetaMaskDebug.Log("No WebSocketDispatcher found in scene, creating one on " + gameObject.name);
                     gameObject.AddComponent<WebSocketDispatcher>();
                 }
-                
+
                 this.unityThread = Thread.CurrentThread;
-                
+
                 // Configure persistent data manager
                 this.dataManager = new MetaMaskDataManager(MetaMaskUnityStorage.Instance, this.config.Encrypt, this.config.EncryptionPassword);
-                
+
                 // Grab app name, app url and session id
-                var appName = Config.AppName;
-                var appUrl = Config.AppUrl;
+                var appName = ThirdwebManager.Instance.SDK.session.Options.wallet?.appName;
+                var appUrl = ThirdwebManager.Instance.SDK.session.Options.wallet?.appUrl;
                 var sessionId = this.config.SessionIdentifier;
 
                 // Setup the wallet
-                this.wallet = new MetaMaskWallet(this.dataManager, 
-                    appName, appUrl, sessionId, UnityEciesProvider.Singleton, 
-                    transport, socket, this.config.SocketUrl);
-                
+                this.wallet = new MetaMaskWallet(this.dataManager, appName, appUrl, sessionId, UnityEciesProvider.Singleton, transport, socket, this.config.SocketUrl);
+
                 // Grab session data
                 this.session = this.wallet.Session;
                 this.sessionData = this.wallet.Session.Data;
-                
+
                 this.wallet.AnalyticsPlatform = "unity";
-                
+
                 // Setup the fallback provider, if set
                 if (RpcUrl != null && RpcUrl.Count > 0)
                 {
-                    var rpcUrlMap = RpcUrl.ToDictionary(
-                        c => c.ChainId,
-                        c => c.RpcUrl
-                    );
-                    
+                    var rpcUrlMap = RpcUrl.ToDictionary(c => c.ChainId, c => c.RpcUrl);
+
                     this.wallet.FallbackProvider = new HttpProvider(rpcUrlMap, this.wallet);
                 }
 
                 if (this.MetaMaskUnityBeforeInitialized != null)
                     this.MetaMaskUnityBeforeInitialized(this, EventArgs.Empty);
-                
+
                 _eventHandler.SetupEvents();
-                
+
                 // Initialize the transport
                 transport.Initialize();
 
                 this.initialized = true;
-                
+
                 if (this.MetaMaskUnityInitialized != null)
                     this.MetaMaskUnityInitialized(this, EventArgs.Empty);
             }
@@ -309,11 +309,11 @@ public void Disconnect(bool endSession = false)
         {
             if (this.wallet.IsConnected)
                 this.wallet.Disconnect();
-            
+
             if (endSession)
                 EndSession();
         }
-        
+
         public void EndSession()
         {
             this.wallet.EndSession();
@@ -335,7 +335,7 @@ internal void ForceClearSession()
             {
                 if (this.dataManager == null)
                     this.dataManager = new MetaMaskDataManager(MetaMaskUnityStorage.Instance, this.config.Encrypt, this.config.EncryptionPassword);
-                    
+
                 this.dataManager.Delete(this.config.SessionIdentifier);
             }
         }
@@ -378,6 +378,5 @@ protected void Release()
         }
 
         #endregion
-
     }
-}
+}