From b5356375f1185121a4798a0efbf3e91696a9b59f Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Thu, 14 Sep 2023 11:30:11 +0300 Subject: [PATCH 1/9] Revert "automated duplicating imported samples modifications (#595)" This reverts commit a5558941827a91df51e2dd200648dcd13a1231c8. --- .github/workflows/duplicate_sample.yaml | 28 ------------------- duplicate_package_sample.sh | 14 ---------- .../Samples~/Web3.Unity/Prefabs.meta | 8 ------ .../Samples~/Web3.Unity/Scenes.meta | 8 ------ .../Samples~/Web3.Unity/Scripts.meta | 8 ------ .../Samples~/Web3.Unity/Sprites.meta | 8 ------ 6 files changed, 74 deletions(-) delete mode 100644 .github/workflows/duplicate_sample.yaml delete mode 100644 duplicate_package_sample.sh delete mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta delete mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta delete mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta delete mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta diff --git a/.github/workflows/duplicate_sample.yaml b/.github/workflows/duplicate_sample.yaml deleted file mode 100644 index 793149e56..000000000 --- a/.github/workflows/duplicate_sample.yaml +++ /dev/null @@ -1,28 +0,0 @@ -name: Duplicate-Package-Sample - -on: - push: - branches: - - main - -jobs: - duplicate: - name: duplicate package sample - runs-on: ubuntu-latest - - steps: - - name: Checkout Repository - uses: actions/checkout@v2 - - - name: Run duplicate script file - run: bash ${GITHUB_WORKSPACE}/duplicate_package_sample.sh - - - name: Commit and Push - run: | - git config --global user.email $git_email - git config --global user.name "${{ github.actor }}" - git add ./src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/. -f - git diff-index --cached --quiet HEAD || git commit -m "Auto-duplicate Package Samples" - git push - env: - git_email: "${{ github.actor }}@users.noreply.github.com" \ No newline at end of file diff --git a/duplicate_package_sample.sh b/duplicate_package_sample.sh deleted file mode 100644 index f3a677742..000000000 --- a/duplicate_package_sample.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -# Specify the source directory and the destination directory -SOURCE_DIRECTORY="src/UnitySampleProject/Assets/Samples/web3.unity SDK/2.5.0-pre001/Web3.Unity Samples/" -DESTINATION_DIRECTORY="src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/" - -# clear destination directory first -rm -r "$DESTINATION_DIRECTORY" - -# Copy source to the destination -cp -r "$SOURCE_DIRECTORY" "$DESTINATION_DIRECTORY" - -#add all modified files -git add "src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/." -f \ No newline at end of file diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta deleted file mode 100644 index 5b35daff8..000000000 --- a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 45a04d2621549e3458049c6c447c3941 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta deleted file mode 100644 index 5488a62ed..000000000 --- a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f39f8dda9616349489a7803d7e0aff30 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta deleted file mode 100644 index 9a1e8b8d4..000000000 --- a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eaef630f284e6e04a88b5939e0eb1cc5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta deleted file mode 100644 index 7175ee89d..000000000 --- a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0c06517aee7843642a091a67c72b1379 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: From 3576a145cdd35d5563bfecbbd05cf0c990a73efe Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Thu, 14 Sep 2023 12:29:15 +0300 Subject: [PATCH 2/9] reverted main changed for duplicating imported sample changes --- .github/workflows/duplicate_sample.yml | 28 ++++++++++++++++++++++++++ duplicate_package_sample.sh | 14 +++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 .github/workflows/duplicate_sample.yml create mode 100644 duplicate_package_sample.sh diff --git a/.github/workflows/duplicate_sample.yml b/.github/workflows/duplicate_sample.yml new file mode 100644 index 000000000..830ce3ec7 --- /dev/null +++ b/.github/workflows/duplicate_sample.yml @@ -0,0 +1,28 @@ +name: Duplicate Package Sample + +on: + pull_request: + branches: + - main + +jobs: + duplicate: + name: duplicate package sample + runs-on: ubuntu-latest + + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + + - name: Run duplicate script file + run: bash ${GITHUB_WORKSPACE}/duplicate_package_sample.sh + + - name: Commit and Push + run: | + git config --global user.email $git_email + git config --global user.name "${{ github.actor }}" + git add ./src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/. -f + git diff-index --cached --quiet HEAD || git commit -m "Auto-duplicate Package Samples" + git push + env: + git_email: "${{ github.actor }}@users.noreply.github.com" \ No newline at end of file diff --git a/duplicate_package_sample.sh b/duplicate_package_sample.sh new file mode 100644 index 000000000..f3a677742 --- /dev/null +++ b/duplicate_package_sample.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +# Specify the source directory and the destination directory +SOURCE_DIRECTORY="src/UnitySampleProject/Assets/Samples/web3.unity SDK/2.5.0-pre001/Web3.Unity Samples/" +DESTINATION_DIRECTORY="src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/" + +# clear destination directory first +rm -r "$DESTINATION_DIRECTORY" + +# Copy source to the destination +cp -r "$SOURCE_DIRECTORY" "$DESTINATION_DIRECTORY" + +#add all modified files +git add "src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/." -f \ No newline at end of file From a8c6316482b36235eac3af0137dfc81646889a9f Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Thu, 14 Sep 2023 12:34:23 +0300 Subject: [PATCH 3/9] switched checkout to v3 --- .github/workflows/duplicate_sample.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/duplicate_sample.yml b/.github/workflows/duplicate_sample.yml index 830ce3ec7..f1ddcfaff 100644 --- a/.github/workflows/duplicate_sample.yml +++ b/.github/workflows/duplicate_sample.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Run duplicate script file run: bash ${GITHUB_WORKSPACE}/duplicate_package_sample.sh From 61936568862aa130dd4bee076704f34be1c9da4c Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Thu, 14 Sep 2023 12:39:24 +0300 Subject: [PATCH 4/9] added branched checkout --- .github/workflows/duplicate_sample.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/duplicate_sample.yml b/.github/workflows/duplicate_sample.yml index f1ddcfaff..2baafd4b5 100644 --- a/.github/workflows/duplicate_sample.yml +++ b/.github/workflows/duplicate_sample.yml @@ -13,6 +13,8 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v3 + with: + ref: ${{ github.ref_name }} - name: Run duplicate script file run: bash ${GITHUB_WORKSPACE}/duplicate_package_sample.sh From ecac873757fad365ae6f76b821e7f3fb54689468 Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Thu, 14 Sep 2023 12:42:21 +0300 Subject: [PATCH 5/9] branched checkout using checkout v2 --- .github/workflows/duplicate_sample.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/duplicate_sample.yml b/.github/workflows/duplicate_sample.yml index 2baafd4b5..150e52421 100644 --- a/.github/workflows/duplicate_sample.yml +++ b/.github/workflows/duplicate_sample.yml @@ -12,9 +12,9 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v3 + uses: actions/checkout@v2 with: - ref: ${{ github.ref_name }} + ref: ${{ github.event.pull_request.head.ref }} - name: Run duplicate script file run: bash ${GITHUB_WORKSPACE}/duplicate_package_sample.sh @@ -25,6 +25,6 @@ jobs: git config --global user.name "${{ github.actor }}" git add ./src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/. -f git diff-index --cached --quiet HEAD || git commit -m "Auto-duplicate Package Samples" - git push + git push origin HEAD: env: git_email: "${{ github.actor }}@users.noreply.github.com" \ No newline at end of file From 71a18da8f8613a7af4629c817d1e68c3ce307f9b Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Thu, 14 Sep 2023 12:44:26 +0300 Subject: [PATCH 6/9] fixed syntax error --- .github/workflows/duplicate_sample.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/duplicate_sample.yml b/.github/workflows/duplicate_sample.yml index 150e52421..3e299edca 100644 --- a/.github/workflows/duplicate_sample.yml +++ b/.github/workflows/duplicate_sample.yml @@ -25,6 +25,6 @@ jobs: git config --global user.name "${{ github.actor }}" git add ./src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/. -f git diff-index --cached --quiet HEAD || git commit -m "Auto-duplicate Package Samples" - git push origin HEAD: + git push env: git_email: "${{ github.actor }}@users.noreply.github.com" \ No newline at end of file From 17432cc06017d458e21a0bebf53711bd82cfe711 Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Thu, 14 Sep 2023 12:48:19 +0300 Subject: [PATCH 7/9] switched local git credential config and switched out automated author from actor to GH action bot --- .github/workflows/duplicate_sample.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/duplicate_sample.yml b/.github/workflows/duplicate_sample.yml index 3e299edca..38014ae4d 100644 --- a/.github/workflows/duplicate_sample.yml +++ b/.github/workflows/duplicate_sample.yml @@ -21,10 +21,8 @@ jobs: - name: Commit and Push run: | - git config --global user.email $git_email - git config --global user.name "${{ github.actor }}" + git config user.name "Automated" + git config user.email "actions@users.noreply.github.com" git add ./src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/. -f git diff-index --cached --quiet HEAD || git commit -m "Auto-duplicate Package Samples" - git push - env: - git_email: "${{ github.actor }}@users.noreply.github.com" \ No newline at end of file + git push \ No newline at end of file From f43770b0892e347ad221661f092e52f8a3e89fb6 Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Thu, 14 Sep 2023 14:16:14 +0300 Subject: [PATCH 8/9] reverted automated bot author to actor/fix CLA --- .github/workflows/duplicate_sample.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/duplicate_sample.yml b/.github/workflows/duplicate_sample.yml index 38014ae4d..f2ffef5a4 100644 --- a/.github/workflows/duplicate_sample.yml +++ b/.github/workflows/duplicate_sample.yml @@ -21,8 +21,10 @@ jobs: - name: Commit and Push run: | - git config user.name "Automated" - git config user.email "actions@users.noreply.github.com" + git config user.email $git_email + git config user.name "${{ github.actor }}" git add ./src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/. -f git diff-index --cached --quiet HEAD || git commit -m "Auto-duplicate Package Samples" - git push \ No newline at end of file + git push + env: + git_email: "${{ github.actor }}@users.noreply.github.com" \ No newline at end of file From 8bf07897628e0a5cbca59160f03360f18a267a70 Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Thu, 14 Sep 2023 11:16:49 +0000 Subject: [PATCH 9/9] Auto-duplicate Package Samples --- .../Samples~/Web3.Unity/Prefabs.meta | 8 +++ .../Samples~/Web3.Unity/Scenes.meta | 8 +++ .../Web3.Unity/Scenes/SampleMain.unity | 64 ++++++++++++++++++- .../Samples~/Web3.Unity/Scripts.meta | 8 +++ .../Web3.Unity/Scripts/Scenes/Login.cs | 41 ++++++++++-- .../SampleMain/Gelato/GelatoDisableContent.cs | 24 +++++++ .../Gelato/GelatoDisableContent.cs.meta | 11 ++++ .../Samples~/Web3.Unity/Sprites.meta | 8 +++ 8 files changed, 163 insertions(+), 9 deletions(-) create mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta create mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta create mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta create mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/SampleMain/Gelato/GelatoDisableContent.cs create mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/SampleMain/Gelato/GelatoDisableContent.cs.meta create mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta new file mode 100644 index 000000000..5b35daff8 --- /dev/null +++ b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 45a04d2621549e3458049c6c447c3941 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta new file mode 100644 index 000000000..5488a62ed --- /dev/null +++ b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f39f8dda9616349489a7803d7e0aff30 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes/SampleMain.unity b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes/SampleMain.unity index 5c92e33a6..f56d84605 100644 --- a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes/SampleMain.unity +++ b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes/SampleMain.unity @@ -1508,8 +1508,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 37375166} m_HandleRect: {fileID: 37375165} m_Direction: 0 - m_Value: 0 - m_Size: 0.37209302 + m_Value: -0.000000050924633 + m_Size: 0.30317497 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -4020,6 +4020,62 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!114 &1019211779 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 98914093} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f404484bf3c7d4246a08e60ab1cd69b7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1019211780 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 98914093} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1001 &1031869231 PrefabInstance: m_ObjectHideFlags: 0 @@ -7945,6 +8001,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 419827144834286037, guid: dcf96d5d1be365e43a4caa7561dc9ec4, type: 3} + propertyPath: m_text + value: 'Logged in as:' + objectReference: {fileID: 0} - target: {fileID: 419827145282415510, guid: dcf96d5d1be365e43a4caa7561dc9ec4, type: 3} propertyPath: m_Name value: Header diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta new file mode 100644 index 000000000..9a1e8b8d4 --- /dev/null +++ b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eaef630f284e6e04a88b5939e0eb1cc5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/Login.cs b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/Login.cs index 4668caf96..161b5e83f 100644 --- a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/Login.cs +++ b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/Login.cs @@ -62,6 +62,9 @@ private void Awake() // Remember me only works with the WebPageWallet RememberMeToggle.gameObject.SetActive(useWebPageWallet); +#if UNITY_WEBGL + ProcessWeb3Auth(); +#endif TryAutoLogin(); ExistingWalletButton.onClick.AddListener(LoginWithExistingAccount); @@ -84,8 +87,6 @@ private async void TryAutoLogin() if (string.IsNullOrEmpty(savedAccount)) return; - Debug.Log("Saved account detected. Logging in..."); - var web3Builder = new Web3Builder(ProjectConfigUtilities.Load()) .Configure(ConfigureCommonServices) .Configure(services => @@ -137,11 +138,11 @@ private async void LoginWithWeb3Auth(Provider provider) { var web3AuthConfig = new Web3AuthWalletConfig { - ClientId = Web3AuthSettings.ClientId, - RedirectUri = Web3AuthSettings.RedirectUri, - Network = Web3AuthSettings.Network, Web3AuthOptions = new() { + clientId = Web3AuthSettings.ClientId, + redirectUrl = new Uri(Web3AuthSettings.RedirectUri), + network = Web3AuthSettings.Network, whiteLabel = new() { dark = true, @@ -151,13 +152,39 @@ private async void LoginWithWeb3Auth(Provider provider) }, LoginParams = new() { loginProvider = provider } }; - services.UseWeb3AuthWallet(web3AuthConfig); }); + await ProcessLogin(web3Builder); + } + + private async void ProcessWeb3Auth() + { + var web3Builder = new Web3Builder(ProjectConfigUtilities.Load()) + .Configure(ConfigureCommonServices) + .Configure(services => + { + var web3AuthConfig = new Web3AuthWalletConfig + { + Web3AuthOptions = new() + { + whiteLabel = new() + { + dark = true, + defaultLanguage = "en", + name = "ChainSafe Gaming SDK", + }, + clientId = Web3AuthSettings.ClientId, + redirectUrl = new Uri(Web3AuthSettings.RedirectUri), + network = Web3AuthSettings.Network, + }, + }; + services.UseWeb3AuthWallet(web3AuthConfig); + }); await ProcessLogin(web3Builder); } + private async Task ProcessLogin(Web3Builder builder) { Web3 web3; @@ -203,4 +230,4 @@ private void ConfigureCommonServices(IWeb3ServiceCollection services) } } -} +} \ No newline at end of file diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/SampleMain/Gelato/GelatoDisableContent.cs b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/SampleMain/Gelato/GelatoDisableContent.cs new file mode 100644 index 000000000..4009ec614 --- /dev/null +++ b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/SampleMain/Gelato/GelatoDisableContent.cs @@ -0,0 +1,24 @@ +using System.Threading.Tasks; + +namespace Samples.Behaviours.Gelato +{ + public class GelatoDisableContent : SampleBehaviour + { + private GelatoSample logic; + + protected override void Awake() + { + base.Awake(); + logic = new GelatoSample(Web3); + ExecuteSample(); + } + + protected override Task ExecuteSample() + { + if (!logic.GetGelatoDisabled()) return Task.CompletedTask; + print("Gelato functionality disabled as your chain isn't supported"); + gameObject.SetActive(false); + return Task.CompletedTask; + } + } +} \ No newline at end of file diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/SampleMain/Gelato/GelatoDisableContent.cs.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/SampleMain/Gelato/GelatoDisableContent.cs.meta new file mode 100644 index 000000000..6d008e5b8 --- /dev/null +++ b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/SampleMain/Gelato/GelatoDisableContent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f404484bf3c7d4246a08e60ab1cd69b7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta new file mode 100644 index 000000000..7175ee89d --- /dev/null +++ b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0c06517aee7843642a091a67c72b1379 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: