ChainSafe · robGG1997 · Jan 29, 2024 · Sep 14, 2023 · Sep 14, 2023 · Sep 14, 2023
diff --git a/...web3-unity.lootboxes/Chainlink/Runtime/Libraries/ChainSafe.Gaming.Lootboxes.Chainlink.dll b/...web3-unity.lootboxes/Chainlink/Runtime/Libraries/ChainSafe.Gaming.Lootboxes.Chainlink.dll
diff --git a/...chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/Chainsafe.Gaming.Chainlink.dll b/...chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/Chainsafe.Gaming.Chainlink.dll
diff --git a/...ty.lootboxes/Samples~/Chainlink Lootbox Samples/Scripts/ChainlinkLootboxSampleLauncher.cs b/...ty.lootboxes/Samples~/Chainlink Lootbox Samples/Scripts/ChainlinkLootboxSampleLauncher.cs
@@ -3,6 +3,7 @@
 using ChainSafe.Gaming.Debugging;
 using ChainSafe.Gaming.Evm.JsonRpc;
 using ChainSafe.Gaming.Lootboxes.Chainlink;
+using ChainSafe.Gaming.UnityPackage;
 using ChainSafe.Gaming.Wallets;
 using ChainSafe.Gaming.Web3;
 using ChainSafe.Gaming.Web3.Build;
@@ -36,8 +37,7 @@ private class Web3Config : ICompleteProjectConfig
 
         private async void Awake()
         {
-            web3 = await new Web3Builder(new Web3Config())
-                .Configure(services =>
+            web3 = Web3Accessor.TryWeb3 ?? await new Web3Builder(new Web3Config()).Configure(services =>
                 {
                     services.UseUnityEnvironment();
                     services.UseRpcProvider();

diff --git a/...b3-unity.lootboxes/Samples~/Chainlink Lootbox Samples/Scripts/LootboxesServicesAdapter.cs b/...b3-unity.lootboxes/Samples~/Chainlink Lootbox Samples/Scripts/LootboxesServicesAdapter.cs
diff --git a/...ty/Scripts/Utilities/SceneIndexer.cs.meta → .../Scripts/LootboxesServicesAdapter.cs.meta b/...ty/Scripts/Utilities/SceneIndexer.cs.meta → .../Scripts/LootboxesServicesAdapter.cs.meta
diff --git a/Packages/io.chainsafe.web3-unity.ramp/Runtime/Scripts/RampServiceAdapter.cs b/Packages/io.chainsafe.web3-unity.ramp/Runtime/Scripts/RampServiceAdapter.cs
@@ -0,0 +1,24 @@
+using System.Collections;
+using System.Collections.Generic;
+using ChainSafe.Gaming.UnityPackage.Common;
+using ChainSafe.Gaming.Web3.Build;
+using UnityEngine;
+
+namespace ChainSafe.Gaming.Exchangers.Ramp
+{
+    /// <summary>
+    /// Add Ramp service when building a Web3 instance.
+    /// </summary>
+    public class RampServiceAdapter : MonoBehaviour, IWeb3BuilderServiceAdapter
+    {
+        [SerializeField] private RampExchangerConfigSO rampConfig;
+
+        public Web3Builder ConfigureServices(Web3Builder web3Builder)
+        {
+            return web3Builder.Configure(services =>
+            {
+                services.UseRampExchanger(rampConfig);
+            });
+        }
+    }
+}
diff --git a/...ts/Utilities/Web3AuthSceneIndexer.cs.meta → ...untime/Scripts/RampServiceAdapter.cs.meta b/...ts/Utilities/Web3AuthSceneIndexer.cs.meta → ...untime/Scripts/RampServiceAdapter.cs.meta
diff --git a/...safe.web3-unity.web3auth/Samples~/Web3.Unity Web3Auth/Scenes/SampleLogin - Web3Auth.unity b/...safe.web3-unity.web3auth/Samples~/Web3.Unity Web3Auth/Scenes/SampleLogin - Web3Auth.unity
@@ -476,7 +476,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 337558421}
+      - m_Target: {fileID: 0}
         m_TargetAssemblyTypeName: Scenes.ErrorPopup, Assembly-CSharp
         m_MethodName: Close
         m_Mode: 1
@@ -574,7 +574,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 337558419}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c001d0d5433b4215b8abba94194881bd, type: 3}
+  m_Script: {fileID: 11500000, guid: 9df78976caa7771429cfe2b9b96e1491, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   MessageLabel: {fileID: 804898217}
@@ -1184,7 +1184,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 337558421}
+      - m_Target: {fileID: 0}
         m_TargetAssemblyTypeName: Scenes.ErrorPopup, Assembly-CSharp
         m_MethodName: Close
         m_Mode: 1
@@ -1362,6 +1362,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1679801099}
   - component: {fileID: 1679801100}
+  - component: {fileID: 1679801101}
   m_Layer: 0
   m_Name: Logic - Login - Web3Auth
   m_TagString: Untagged
@@ -1396,10 +1397,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7b6902e441950fa4bb5cefdd2263164a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  <SceneToLoad>k__BackingField: SampleRampIntegration
   gelatoApiKey: 7MFQqyGS1Iui_e_MgmFW1BfbFeJ06g8nnL2oUTlIJug_
   errorPopup: {fileID: 337558421}
-  rampConfig: {fileID: 11400000, guid: d1f58846e4fc71d4e90f287a86f328f9, type: 2}
   clientId: BCc0wTmuXureEzgawhUSZOWu4bgWo56sZPrxLiHQCpg5OHcNrfa44esdTS8Dm77VtmaIyjhbthdWfbLhSwf7jtU
   redirectUri: torusapp://io.chainsafe.gamingsdk.sdkdemoscene/auth
   network: 1
@@ -1416,6 +1415,19 @@ MonoBehaviour:
     Provider: 3
   - Button: {fileID: 7400892925769233044}
     Provider: 4
+--- !u!114 &1679801101
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1679801098}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3d2237df0314604419146b916b88d158, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  sceneToLoad: SampleMain
 --- !u!1 &1799608969
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/...eb3-unity.web3auth/Samples~/Web3.Unity Web3Auth/Scripts/Utilities/Web3AuthSceneIndexer.cs b/...eb3-unity.web3auth/Samples~/Web3.Unity Web3Auth/Scripts/Utilities/Web3AuthSceneIndexer.cs
diff --git a/...3.Unity Web3Auth/Scripts/Web3AuthLogin.cs → ...Web3Auth/Scripts/Web3AuthLoginProvider.cs b/...3.Unity Web3Auth/Scripts/Web3AuthLogin.cs → ...Web3Auth/Scripts/Web3AuthLoginProvider.cs
@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using ChainSafe.Gaming.Exchangers.Ramp;
 using ChainSafe.Gaming.UnityPackage;
+using ChainSafe.Gaming.UnityPackage.Common;
 using ChainSafe.Gaming.Web3;
 using ChainSafe.Gaming.Web3.Analytics;
 using ChainSafe.Gaming.Web3.Build;
@@ -16,11 +17,11 @@
 /// <summary>
 /// Login using Web3Auth.
 /// </summary>
-public class Web3AuthLogin : Login
+public class Web3AuthLoginProvider : LoginProvider, IWeb3BuilderServiceAdapter
 {
     /// <summary>
     /// Struct used for pairing login buttons to Web3 auth providers.
-    /// Used when adding <see cref="Web3AuthLogin.LoginWithWeb3Auth"/> as listeners to the buttons.
+    /// Used when adding <see cref="Web3AuthLoginProvider.LoginWithWeb3Auth"/> as listeners to the buttons.
     /// </summary>
     [Serializable]
     public struct ProviderAndButtonPair
@@ -35,7 +36,7 @@ public struct ProviderAndButtonPair
     [SerializeField] private Network network;
     [Header("UI")]
     [SerializeField] private List<ProviderAndButtonPair> providerAndButtonPairs;
-    
+
     private bool useProvider;
 
     private Provider selectedProvider;
@@ -47,13 +48,13 @@ public void SetRememberMe(bool rememberMe)
         this.rememberMe = rememberMe;
     }
 
-    protected override IEnumerator Initialize()
+    protected override async void Initialize()
     {
+        base.Initialize();
+
         //Always first add listeners.
         providerAndButtonPairs.ForEach(p =>
             p.Button.onClick.AddListener(delegate { LoginWithWeb3Auth(p.Provider); }));
-
-        yield return null;
 
 #if UNITY_WEBGL && !UNITY_EDITOR
         Uri uri = new Uri(Application.absoluteURL);
@@ -63,25 +64,18 @@ protected override IEnumerator Initialize()
         {
             useProvider = false;
 
-            Task loginTask = TryLogin();
-
-            yield return new WaitUntil(() => loginTask.IsCompleted);
+            await TryLogin();
 
         }
 #else
         if (!string.IsNullOrEmpty(KeyStoreManagerUtils.getPreferencesData(KeyStoreManagerUtils.SESSION_ID)))
         {
             useProvider = false;
             rememberMe = true;
-            Task loginTask = TryLogin();
+            await TryLogin();
             Debug.Log("Restoring existing Web3Auth session (Remember Me");
-            yield return new WaitUntil(() => loginTask.IsCompleted);
         }
 #endif
-
-            // add provider buttons listeners
-
-
     }
 
     private async void LoginWithWeb3Auth(Provider provider)
@@ -91,8 +85,7 @@ private async void LoginWithWeb3Auth(Provider provider)
             useProvider = true;
         }
         selectedProvider = provider;
-
-
+
         await TryLogin();
         LogAnalytics(provider);
     }
@@ -111,7 +104,7 @@ private void LogAnalytics(Provider provider)
         });
     }
 
-    protected override Web3Builder ConfigureWeb3Services(Web3Builder web3Builder)
+    public Web3Builder ConfigureServices(Web3Builder web3Builder)
     {
         return web3Builder.Configure(services =>
         {
@@ -140,7 +133,7 @@ protected override Web3Builder ConfigureWeb3Services(Web3Builder web3Builder)
                 };   
             }
 
-            services.UseWeb3AuthWallet(web3AuthConfig);            
+            services.UseWeb3AuthWallet(web3AuthConfig);
         });
     }
 }
diff --git a/...ty Web3Auth/Scripts/Web3AuthLogin.cs.meta → ...uth/Scripts/Web3AuthLoginProvider.cs.meta b/...ty Web3Auth/Scripts/Web3AuthLogin.cs.meta → ...uth/Scripts/Web3AuthLoginProvider.cs.meta
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Common.meta b/Packages/io.chainsafe.web3-unity/Runtime/Common.meta
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Common/Scripts.meta b/Packages/io.chainsafe.web3-unity/Runtime/Common/Scripts.meta
diff --git a/...~/Web3.Unity/Scripts/Scenes/ErrorPopup.cs → ...nity/Runtime/Common/Scripts/ErrorPopup.cs b/...~/Web3.Unity/Scripts/Scenes/ErrorPopup.cs → ...nity/Runtime/Common/Scripts/ErrorPopup.cs
@@ -1,18 +1,25 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace Scenes
+namespace ChainSafe.Gaming.UnityPackage.Common
 {
     public class ErrorPopup : MonoBehaviour
     {
         public Text MessageLabel;
 
+        /// <summary>
+        /// Display error pop up when Login fails.
+        /// </summary>
+        /// <param name="message">Error message to be displayed.</param>
         public void ShowError(string message)
         {
             gameObject.SetActive(true);
             MessageLabel.text = message;
         }
 
+        /// <summary>
+        /// Close error popup.
+        /// </summary>
         public void Close()
         {
             gameObject.SetActive(false);

diff --git a/...3.Unity/Scripts/Scenes/ErrorPopup.cs.meta → ...Runtime/Common/Scripts/ErrorPopup.cs.meta b/...3.Unity/Scripts/Scenes/ErrorPopup.cs.meta → ...Runtime/Common/Scripts/ErrorPopup.cs.meta