Merge branch 'master' into demo-boilerplates

Author: andygruening

Assets/SequenceSDK/Editor/SequencePlatformCompileTest.cs

@@ -140,7 +140,7 @@ private static void LogErrorsToFile(BuildReport report, BuildTarget target)
 
         private static void AndroidBuildTest(string path, string[] scenes)
         {
-            SequenceConfig config = SequenceConfig.GetConfig();
+            SequenceConfig config = SequenceConfig.GetConfig(SequenceService.None);
             bool isSecureStorageEnabled = config.StoreSessionPrivateKeyInSecureStorage;
             BuildTarget target = BuildTarget.Android;
 

Assets/SequenceSDK/WaaS/Tests/HttpClientTests.cs

@@ -12,7 +12,7 @@ public void TestHttpClientIncludesAPIKey()
             var request = client.BuildRequest<object>("", null);
             string header = request.Item1.GetRequestHeader("X-Access-Key");
             Assert.IsTrue(header.Length > 0);
-            Assert.AreEqual(SequenceConfig.GetConfig().BuilderAPIKey, header);
+            Assert.AreEqual(SequenceConfig.GetConfig(SequenceService.WaaS).BuilderAPIKey, header);
             Assert.IsTrue(request.Item2.Contains(header));
         }
     }

Assets/SequenceSDK/WaaS/Tests/IntentSenderTests.cs

@@ -137,7 +137,7 @@ public async Task TestGetTransactionReceipt_noWallet()
         [TestCase(1000)] // intent will have been issued in the future
         public async Task TestTimeMismatchExceptionResultsInRetry(int timeOffset)
         {
-            SequenceConfig config = SequenceConfig.GetConfig();
+            SequenceConfig config = SequenceConfig.GetConfig(SequenceService.WaaS);
             ConfigJwt configJwt = SequenceConfig.GetConfigJwt();
             IntentSender intentSender = new IntentSender(new HttpClient($"{configJwt.rpcServer.AppendTrailingSlashIfNeeded()}rpc/WaasAuthenticator"), new EOAWallet(), "", configJwt.projectId, config.WaaSVersion);
             LogAssert.Expect(LogType.Warning, new Regex("Time mismatch*"));

Assets/SequenceSDK/WaaS/Tests/WaaSToWalletAdapterUnitTests.cs

@@ -10,7 +10,7 @@ namespace Sequence.EmbeddedWallet.Tests
     public class WaaSToWalletAdapterUnitTests
     {
         private IEthClient _client =
-            new SequenceEthClient("https://nodes.sequence.app/polygon/YfeuczOMRyP7fpr1v7h8SvrCAAAAAAAAA");
+            new SequenceEthClient(Chain.Polygon);
         private Address address = new Address("0xc683a014955b75F5ECF991d4502427c8fa1Aa249");
 
         [Test]

Packages/Sequence-Unity/Editor/AndroidCustomGradleCheck.cs

@@ -21,7 +21,7 @@ public void OnPreprocessBuild(BuildReport report)
         {
             if (report.summary.platform == BuildTarget.Android)
             {
-                SequenceConfig config = SequenceConfig.GetConfig();
+                SequenceConfig config = SequenceConfig.GetConfig(SequenceService.None);
                 if (!config.StoreSessionPrivateKeyInSecureStorage)
                 {
                     return;

Packages/Sequence-Unity/Editor/AndroidScriptDefineSetup.cs

@@ -34,7 +34,7 @@ public void OnPreprocessBuild(BuildReport report)
                     defineList = new List<string>(defines.Split(';'));
                 }
 
-                SequenceConfig config = SequenceConfig.GetConfig();
+                SequenceConfig config = SequenceConfig.GetConfig(SequenceService.None);
                 if (config.StoreSessionPrivateKeyInSecureStorage)
                 {
                     if (!defineList.Contains(EnableAndroidSecureStorage))

Packages/Sequence-Unity/Editor/CheckUrlScheme.cs

@@ -20,7 +20,7 @@ public class CheckUrlScheme
         [PostProcessBuild]
         public static void OnPostProcessBuild(BuildTarget target, string pathToBuiltProject)
         {
-            SequenceConfig config = SequenceConfig.GetConfig();
+            SequenceConfig config = SequenceConfig.GetConfig(SequenceService.None);
             _urlScheme = config.UrlScheme;
 
             if (string.IsNullOrWhiteSpace(_urlScheme))

Packages/Sequence-Unity/Sequence/SequenceFrontend/Scripts/UI/FederatedAuthExplanationPage.cs

@@ -39,7 +39,7 @@ public override void Open(params object[] args)
                     $"Invalid use. {GetType().Name} must be opened with a {typeof(List<LoginMethod>)} as an argument");
             }
 
-            _enableMultipleAccountsPerEmail = SequenceConfig.GetConfig().EnableMultipleAccountsPerEmail;
+            _enableMultipleAccountsPerEmail = SequenceConfig.GetConfig(SequenceService.WaaS).EnableMultipleAccountsPerEmail;
 
 
             _overrideAccountButton.SetActive(_enableMultipleAccountsPerEmail);
@@ -84,7 +84,7 @@ public void ReturnToLogin()
 
         public void NewAccount()
         {
-            if (!SequenceConfig.GetConfig().EnableMultipleAccountsPerEmail)
+            if (!SequenceConfig.GetConfig(SequenceService.WaaS).EnableMultipleAccountsPerEmail)
             {
                 throw new SystemException("Creating accounts with the same email is not enabled");
             }

Packages/Sequence-Unity/Sequence/SequenceFrontend/Scripts/UI/LoginPanel.cs

@@ -39,7 +39,7 @@ protected override void Awake()
 
             _demoPage = FindObjectOfType<EmbeddedWalletDemoPage>();
 
-            SequenceConfig config = SequenceConfig.GetConfig();
+            SequenceConfig config = SequenceConfig.GetConfig(SequenceService.WaaS);
 
             SequenceWallet.OnFailedToRecoverSession += OnFailedToRecoverSession;
 

Packages/Sequence-Unity/Sequence/SequenceSDK/Authentication/OpenIdAuthenticator.cs

@@ -44,7 +44,7 @@ public static void InjectRedirectUrl(string redirectUrl)
 
         public OpenIdAuthenticator(string nonce = null)
         {
-            SequenceConfig config = SequenceConfig.GetConfig();
+            SequenceConfig config = SequenceConfig.GetConfig(SequenceService.None);
 
             _urlScheme = config.UrlScheme;
             SetClientIds(config);