Merge branch 'master' into Fix/regexValidateAbi

Author: BellringerQuinn

Assets/PlayFab/PlayFabEditorExtensions/Editor/Resources/MostRecentPackage.unitypackage.meta

@@ -20,7 +20,7 @@ public class ChainIndexerTests
         [TestCaseSource(nameof(chainIdCases))]
         public void TestCreateChainIndexerForChain(Chain chain)
         {
-            if (chain == Chain.None) return;
+            if (ChainIsInactive(chain)) return;
             try
             {
                 ChainIndexer chainIndexer = new ChainIndexer(chain);
@@ -36,7 +36,7 @@ public void TestCreateChainIndexerForChain(Chain chain)
         [TestCaseSource(nameof(chainIdCases))]
         public async Task TestPingChain(Chain chain)
         {
-            if (chain == Chain.None) return;
+            if (ChainIsInactive(chain)) return;
             try
             {
                 IIndexer chainIndexer = new ChainIndexer(chain);
@@ -52,7 +52,7 @@ public async Task TestPingChain(Chain chain)
         [TestCaseSource(nameof(chainIdCases))]
         public async Task TestVersion(Chain chain)
         {
-            if (chain == Chain.None) return;
+            if (ChainIsInactive(chain)) return;
             try
             {
                 IIndexer indexer = new ChainIndexer(chain);
@@ -68,11 +68,16 @@ public async Task TestVersion(Chain chain)
                 Assert.Fail("Encountered exception when none was expected: " + e.Message);
             }
         }
+
+        private bool ChainIsInactive(Chain chain)
+        {
+            return chain == Chain.None || chain == Chain.AstarZKEvm || chain == Chain.TestnetAstarZKyoto;
+        }
 
         [TestCaseSource(nameof(chainIdCases))]
         public async Task TestRuntimeStatus(Chain chain)
         {
-            if (chain == Chain.None) return;
+            if (ChainIsInactive(chain)) return;
             RuntimeStatus result = null;
             try
             {

Assets/SequenceSDK/Ethereum/Tests/TupleEncodingTests.cs

@@ -0,0 +1,56 @@
+using System.Numerics;
+using Newtonsoft.Json;
+using NUnit.Framework;
+using UnityEngine;
+
+namespace Sequence.EmbeddedWallet.Tests
+{
+    public class DelayedEncodeJsonSerializationTest
+    {
+        private class ComplexObjectInNonAlphabeticalOrder
+        {
+            public string LastValue;
+            public string FirstValue;
+            public string HalfwayValue;
+
+            public ComplexObjectInNonAlphabeticalOrder(string lastValue, string firstValue, string halfwayValue)
+            {
+                LastValue = lastValue;
+                FirstValue = firstValue;
+                HalfwayValue = halfwayValue;
+            }
+        }
+
+        private class ExtraComplexObjectWithComplexObjectArray
+        {
+            public string LastValue;
+            public ComplexObjectInNonAlphabeticalOrder[] ComplexObjectArray;
+            public string HalfwayValue;
+            
+            public ExtraComplexObjectWithComplexObjectArray(string lastValue, ComplexObjectInNonAlphabeticalOrder[] complexObjectArray, string halwayValue)
+            {
+                LastValue = lastValue;
+                ComplexObjectArray = complexObjectArray;
+                HalfwayValue = halwayValue;
+            }
+        }
+
+        [Test]
+        public void TestDelayedEncodeDataArgsGetsSerializedAlphabetically()
+        {
+            DelayedEncodeData testData = new DelayedEncodeData("testAbi(string,ComplexObjectInNonAlphabeticalOrder,int)", 
+                new object[] { "some string", new ComplexObjectInNonAlphabeticalOrder("last", "first", "halfway"), 
+                BigInteger.One, 5, new object[] { 1, new ComplexObjectInNonAlphabeticalOrder("last", "first", "halfway"), null, "banana" },
+                new ComplexObjectInNonAlphabeticalOrder[] { new ("last", "first", "halfway"), null },
+                new object[] { 1, new object[] { 2, new ComplexObjectInNonAlphabeticalOrder("last", "first", "halfway"), 3, 
+                    new ExtraComplexObjectWithComplexObjectArray("last", new ComplexObjectInNonAlphabeticalOrder[] { null, 
+                        new ("last", "first", "halfway")}, "halfway")}, "word"}
+                }, "testFunc");
+            
+            string json = JsonConvert.SerializeObject(testData);
+            Debug.Log(json);
+            
+            Assert.AreEqual("{\"abi\":\"testAbi(string,ComplexObjectInNonAlphabeticalOrder,int)\",\"args\":[\"some string\",{\"FirstValue\":\"first\",\"HalfwayValue\":\"halfway\",\"LastValue\":\"last\"},1,5,[1,{\"FirstValue\":\"first\",\"HalfwayValue\":\"halfway\",\"LastValue\":\"last\"},null,\"banana\"],[{\"FirstValue\":\"first\",\"HalfwayValue\":\"halfway\",\"LastValue\":\"last\"},null],[1,[2,{\"FirstValue\":\"first\",\"HalfwayValue\":\"halfway\",\"LastValue\":\"last\"},3,{\"ComplexObjectArray\":[null,{\"FirstValue\":\"first\",\"HalfwayValue\":\"halfway\",\"LastValue\":\"last\"}],\"HalfwayValue\":\"halfway\",\"LastValue\":\"last\"}],\"word\"]],\"func\":\"testFunc\"}", json);
+        }
+    }
+}

Assets/SequenceSDK/Ethereum/Tests/TupleEncodingTests.cs.meta

@@ -18,7 +18,7 @@ public class WaaSFederatedAuthTests
         [Test]
         public async Task TestAccountAssociation()
         {
-            _login = new SequenceLogin();
+            _login = SequenceLogin.GetInstance();
             SequenceWallet.OnAccountFederated += OnAccountFederated;
             _tcs = new TaskCompletionSource<bool>();
             EndToEndTestHarness testHarness = new EndToEndTestHarness(_login);

Assets/SequenceSDK/Indexer/Tests/ChainIndexerTests.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using PlayFab;
@@ -13,17 +14,20 @@ public class WaaSSessionManagementTests
         [Test]
         public async Task SignInAndOutRepeatedly_Guest()
         {
+            List<string> sessionIds = new List<string>();
             try
             {
-                SequenceLogin login = new SequenceLogin();
+                SequenceLogin login = SequenceLogin.GetInstance();
                 await Task.Delay(100);
-                login.OnLoginFailed += (error, method, email, methods) =>
+                ILogin.OnLoginFailedHandler onFailedLogin = (error, method, email, methods) =>
                 {
                     Assert.Fail(error);
                 };
                 int repetitions = 0;
-                SequenceWallet.OnWalletCreated += async wallet =>
+                Action<SequenceWallet> onLogin = async wallet =>
                 {
+                    Assert.IsFalse(sessionIds.Contains(wallet.SessionId));
+                    sessionIds.Add(wallet.SessionId);
                     if (repetitions < 3)
                     {
                         try
@@ -38,12 +42,18 @@ public async Task SignInAndOutRepeatedly_Guest()
                         }
                     }
                 };
+                login.OnLoginFailed += onFailedLogin;
+                SequenceWallet.OnWalletCreated += onLogin;
+                
                 await login.ConnectToWaaSAsGuest();
 
                 while (repetitions < 3)
                 {
                     await Task.Yield();
                 }
+                
+                login.OnLoginFailed -= onFailedLogin;
+                SequenceWallet.OnWalletCreated -= onLogin;
             }
             catch (System.Exception e)
             {
@@ -61,7 +71,7 @@ public async Task SignInAndOutRepeatedly_PlayFabGuest()
                 PlayFabSettings.staticSettings.TitleId = titleId;
             }
 
-            SequenceLogin login = new SequenceLogin();
+            SequenceLogin login = SequenceLogin.GetInstance();
             await Task.Delay(100);
             login.OnLoginFailed += (error, method, email, methods) =>
             {

Assets/SequenceSDK/WaaS/Tests/DelayedEncodeJsonSerializationTest.cs

@@ -0,0 +1 @@
+*       @0xsequence/zemind-unreal @0xsequence/web3-unity-unreal-sdks

Assets/SequenceSDK/WaaS/Tests/DelayedEncodeJsonSerializationTest.cs.meta

@@ -11,8 +11,8 @@ namespace Sequence.Authentication
     public class SignInWithApple : MonoBehaviour
     {
         IAppleAuthManager m_AppleAuthManager;
-        public string Token { get; private set; }
-        public string Error { get; private set; }
+        public string Token;
+        public string Error;
 
         private void Initialize()
         {