From b7c402b2b52c11c4f312bcfc969e4e0c664b011d Mon Sep 17 00:00:00 2001
From: Gaurav Goel <grvgoel19@gmail.com>
Date: Thu, 10 Apr 2025 14:03:29 +0530
Subject: [PATCH 01/19] feat: auth-service v10 changes

Signed-off-by: Gaurav Goel <gaurav@tor.us>
---
 .../com/web3auth/app/AuthConnectionLogin.kt   |  8 +++
 .../java/com/web3auth/app/LoginVerifier.kt    |  8 ---
 .../java/com/web3auth/app/MainActivity.kt     | 66 +++++++++----------
 app/src/main/res/layout/activity_main.xml     |  4 +-
 .../main/java/com/web3auth/core/Web3Auth.kt   | 30 ++++-----
 ...nConfigItem.kt => AuthConnectionConfig.kt} |  6 +-
 .../com/web3auth/core/types/InitOptions.kt    |  2 +-
 .../com/web3auth/core/types/InitParams.kt     |  2 +-
 .../com/web3auth/core/types/LoginParams.kt    |  2 +-
 .../java/com/web3auth/core/types/Provider.kt  |  4 +-
 .../com/web3auth/core/types/TypeOfLogin.kt    |  2 +-
 .../java/com/web3auth/core/types/UserInfo.kt  |  6 +-
 .../web3auth/core/types/Web3AuthOptions.kt    |  4 +-
 .../web3auth/core/types/Web3AuthResponse.kt   |  1 +
 14 files changed, 72 insertions(+), 73 deletions(-)
 create mode 100644 app/src/main/java/com/web3auth/app/AuthConnectionLogin.kt
 delete mode 100644 app/src/main/java/com/web3auth/app/LoginVerifier.kt
 rename core/src/main/java/com/web3auth/core/types/{LoginConfigItem.kt => AuthConnectionConfig.kt} (81%)

diff --git a/app/src/main/java/com/web3auth/app/AuthConnectionLogin.kt b/app/src/main/java/com/web3auth/app/AuthConnectionLogin.kt
new file mode 100644
index 00000000..9192f517
--- /dev/null
+++ b/app/src/main/java/com/web3auth/app/AuthConnectionLogin.kt
@@ -0,0 +1,8 @@
+package com.web3auth.app
+
+import com.web3auth.core.types.AUTH_CONNECTION
+
+data class AuthConnectionLogin(
+    val name: String,
+    val authConnection: AUTH_CONNECTION
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/web3auth/app/LoginVerifier.kt b/app/src/main/java/com/web3auth/app/LoginVerifier.kt
deleted file mode 100644
index 983a4911..00000000
--- a/app/src/main/java/com/web3auth/app/LoginVerifier.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.web3auth.app
-
-import com.web3auth.core.types.Provider
-
-data class LoginVerifier(
-    val name: String,
-    val loginProvider: Provider
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/web3auth/app/MainActivity.kt b/app/src/main/java/com/web3auth/app/MainActivity.kt
index 6032b162..2e168ac1 100644
--- a/app/src/main/java/com/web3auth/app/MainActivity.kt
+++ b/app/src/main/java/com/web3auth/app/MainActivity.kt
@@ -21,18 +21,18 @@ import com.google.gson.JsonArray
 import com.web3auth.core.Web3Auth
 import com.web3auth.core.isEmailValid
 import com.web3auth.core.isPhoneNumberValid
+import com.web3auth.core.types.AUTH_CONNECTION
+import com.web3auth.core.types.AuthConnection
+import com.web3auth.core.types.AuthConnectionConfig
 import com.web3auth.core.types.BuildEnv
 import com.web3auth.core.types.ChainConfig
 import com.web3auth.core.types.ChainNamespace
 import com.web3auth.core.types.ExtraLoginOptions
 import com.web3auth.core.types.Language
-import com.web3auth.core.types.LoginConfigItem
 import com.web3auth.core.types.LoginParams
 import com.web3auth.core.types.MFALevel
 import com.web3auth.core.types.Network
-import com.web3auth.core.types.Provider
 import com.web3auth.core.types.ThemeModes
-import com.web3auth.core.types.TypeOfLogin
 import com.web3auth.core.types.UserInfo
 import com.web3auth.core.types.Web3AuthOptions
 import com.web3auth.core.types.Web3AuthResponse
@@ -44,31 +44,31 @@ import java.util.concurrent.CompletableFuture
 class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
     private lateinit var web3Auth: Web3Auth
 
-    private val verifierList: List<LoginVerifier> = listOf(
-        LoginVerifier("Google", Provider.GOOGLE),
-        LoginVerifier("Facebook", Provider.FACEBOOK),
-        LoginVerifier("Twitch", Provider.TWITCH),
-        LoginVerifier("Discord", Provider.DISCORD),
-        LoginVerifier("Reddit", Provider.REDDIT),
-        LoginVerifier("Apple", Provider.APPLE),
-        LoginVerifier("Github", Provider.GITHUB),
-        LoginVerifier("LinkedIn", Provider.LINKEDIN),
-        LoginVerifier("Twitter", Provider.TWITTER),
-        LoginVerifier("Line", Provider.LINE),
-        LoginVerifier("Hosted Email Passwordless", Provider.EMAIL_PASSWORDLESS),
-        LoginVerifier("SMS Passwordless", Provider.SMS_PASSWORDLESS),
-        LoginVerifier("JWT", Provider.JWT),
-        LoginVerifier("Farcaster", Provider.FARCASTER)
+    private val authConnectionList: List<AuthConnectionLogin> = listOf(
+        AuthConnectionLogin("Google", AUTH_CONNECTION.GOOGLE),
+        AuthConnectionLogin("Facebook", AUTH_CONNECTION.FACEBOOK),
+        AuthConnectionLogin("Twitch", AUTH_CONNECTION.TWITCH),
+        AuthConnectionLogin("Discord", AUTH_CONNECTION.DISCORD),
+        AuthConnectionLogin("Reddit", AUTH_CONNECTION.REDDIT),
+        AuthConnectionLogin("Apple", AUTH_CONNECTION.APPLE),
+        AuthConnectionLogin("Github", AUTH_CONNECTION.GITHUB),
+        AuthConnectionLogin("LinkedIn", AUTH_CONNECTION.LINKEDIN),
+        AuthConnectionLogin("Twitter", AUTH_CONNECTION.TWITTER),
+        AuthConnectionLogin("Line", AUTH_CONNECTION.LINE),
+        AuthConnectionLogin("Hosted Email Passwordless", AUTH_CONNECTION.EMAIL_PASSWORDLESS),
+        AuthConnectionLogin("SMS Passwordless", AUTH_CONNECTION.SMS_PASSWORDLESS),
+        AuthConnectionLogin("JWT", AUTH_CONNECTION.JWT),
+        AuthConnectionLogin("Farcaster", AUTH_CONNECTION.FARCASTER)
     )
 
-    private var selectedLoginProvider: Provider = Provider.GOOGLE
+    private var selectedLoginProvider: AUTH_CONNECTION = AUTH_CONNECTION.GOOGLE
 
     private val gson = Gson()
 
     private fun signIn() {
         val hintEmailEditText = findViewById<EditText>(R.id.etEmailHint)
         var extraLoginOptions: ExtraLoginOptions? = null
-        if (selectedLoginProvider == Provider.EMAIL_PASSWORDLESS) {
+        if (selectedLoginProvider == AUTH_CONNECTION.EMAIL_PASSWORDLESS) {
             val hintEmail = hintEmailEditText.text.toString()
             if (hintEmail.isBlank() || !hintEmail.isEmailValid()) {
                 Toast.makeText(this, "Please enter a valid Email.", Toast.LENGTH_LONG).show()
@@ -77,7 +77,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
             extraLoginOptions = ExtraLoginOptions(login_hint = hintEmail)
         }
 
-        if (selectedLoginProvider == Provider.SMS_PASSWORDLESS) {
+        if (selectedLoginProvider == AUTH_CONNECTION.SMS_PASSWORDLESS) {
             val hintPhNo = hintEmailEditText.text.toString()
             if (hintPhNo.isBlank() || !hintPhNo.isPhoneNumberValid()) {
                 Toast.makeText(this, "Please enter a valid Number.", Toast.LENGTH_LONG).show()
@@ -124,7 +124,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
         val signMsgButton = findViewById<Button>(R.id.signMsgButton)
         val btnSetUpMfa = findViewById<Button>(R.id.btnSetUpMfa)
         val btnManageMfa = findViewById<Button>(R.id.btn_manageMfa)
-        val spinner = findViewById<TextInputLayout>(R.id.verifierList)
+        val spinner = findViewById<TextInputLayout>(R.id.authConnectionList)
         val hintEmailEditText = findViewById<EditText>(R.id.etEmailHint)
         var key: String? = null
         var userInfo: UserInfo? = null
@@ -180,14 +180,14 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
                     "onPrimary" to "#0000FF"
                 )
             ),
-            loginConfig = hashMapOf(
-                "loginConfig" to LoginConfigItem(
-                    "web3auth-auth0-email-passwordless-sapphire-devnet",
-                    typeOfLogin = TypeOfLogin.JWT,
-                    clientId = "d84f6xvbdV75VTGmHiMWfZLeSPk8M07C",
+            authConnectionConfig = listOf(
+                AuthConnectionConfig(
+                    authConnectionId = "web3auth-auth0-email-passwordless-sapphire-devnet",
+                    authConnection = AuthConnection.JWT,
+                    clientId = "d84f6xvbdV75VTGmHiMWfZLeSPk8M07C"
                 )
             ),
-            buildEnv = BuildEnv.PRODUCTION,
+            buildEnv = BuildEnv.TESTING,
             sessionTime = 86400,
         )
 
@@ -288,7 +288,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
         }
 
         val spinner = findViewById<AutoCompleteTextView>(R.id.spinnerTextView)
-        val loginVerifierList: List<String> = verifierList.map { item ->
+        val loginVerifierList: List<String> = authConnectionList.map { item ->
             item.name
         }
         val adapter: ArrayAdapter<String> =
@@ -312,17 +312,17 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
     }
 
     override fun onItemClick(p0: AdapterView<*>?, p1: View?, p2: Int, p3: Long) {
-        selectedLoginProvider = verifierList[p2].loginProvider
+        selectedLoginProvider = authConnectionList[p2].authConnection
 
         val hintEmailEditText = findViewById<EditText>(R.id.etEmailHint)
 
-        if (selectedLoginProvider == Provider.EMAIL_PASSWORDLESS) {
+        if (selectedLoginProvider == AUTH_CONNECTION.EMAIL_PASSWORDLESS) {
             hintEmailEditText.hint = "Enter Email"
-        } else if (selectedLoginProvider == Provider.SMS_PASSWORDLESS) {
+        } else if (selectedLoginProvider == AUTH_CONNECTION.SMS_PASSWORDLESS) {
             hintEmailEditText.hint = "Enter Phone Number"
         }
 
-        if (selectedLoginProvider == Provider.EMAIL_PASSWORDLESS || selectedLoginProvider == Provider.SMS_PASSWORDLESS) {
+        if (selectedLoginProvider == AUTH_CONNECTION.EMAIL_PASSWORDLESS || selectedLoginProvider == AUTH_CONNECTION.SMS_PASSWORDLESS) {
             hintEmailEditText.visibility = View.VISIBLE
         } else {
             hintEmailEditText.visibility = View.GONE
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c5f35f6a..dc807012 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
     tools:context="com.web3auth.app.MainActivity">
 
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/verifierList"
+        android:id="@+id/authConnectionList"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -39,7 +39,7 @@
         android:backgroundTint="@color/black"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/verifierList" />
+        app:layout_constraintTop_toBottomOf="@id/authConnectionList" />
 
 
     <TextView
diff --git a/core/src/main/java/com/web3auth/core/Web3Auth.kt b/core/src/main/java/com/web3auth/core/Web3Auth.kt
index 11be40a3..a0463140 100644
--- a/core/src/main/java/com/web3auth/core/Web3Auth.kt
+++ b/core/src/main/java/com/web3auth/core/Web3Auth.kt
@@ -17,7 +17,6 @@ import com.web3auth.core.types.ErrorCode
 import com.web3auth.core.types.ExtraLoginOptions
 import com.web3auth.core.types.InitOptions
 import com.web3auth.core.types.InitParams
-import com.web3auth.core.types.LoginConfigItem
 import com.web3auth.core.types.LoginParams
 import com.web3auth.core.types.MFALevel
 import com.web3auth.core.types.REDIRECT_URL
@@ -73,7 +72,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
             network = web3AuthOption.network.name.lowercase(Locale.ROOT),
             redirectUrl = web3AuthOption.redirectUrl.toString(),
             whiteLabel = web3AuthOption.whiteLabel?.let { gson.toJson(it) },
-            loginConfig = web3AuthOption.loginConfig?.let { gson.toJson(it) },
+            authConnectionConfig = web3AuthOption.authConnectionConfig?.let { gson.toJson(it) },
             buildEnv = web3AuthOption.buildEnv?.name?.lowercase(Locale.ROOT),
             mfaSettings = web3AuthOption.mfaSettings?.let { gson.toJson(it) },
             sessionTime = web3AuthOption.sessionTime,
@@ -90,7 +89,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
      */
     private fun getInitParams(params: LoginParams?): InitParams {
         return InitParams(
-            loginProvider = params?.loginProvider?.name?.lowercase(Locale.ROOT),
+            authConnection = params?.authConnection?.name?.lowercase(Locale.ROOT),
             extraLoginOptions = params?.extraLoginOptions?.let { gson.toJson(it) },
             redirectUrl = params?.redirectUrl?.toString() ?: web3AuthOption.redirectUrl.toString(),
             mfaLevel = params?.mfaLevel?.name?.lowercase(Locale.ROOT),
@@ -145,7 +144,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
                 existingExtraLoginOptions =
                     gson.fromJson(extraOptionsString, ExtraLoginOptions::class.java)
             }
-            existingExtraLoginOptions.login_hint = userInfo?.verifierId
+            existingExtraLoginOptions.login_hint = userInfo?.userId
             initParamsJson.put("extraLoginOptions", gson.toJson(existingExtraLoginOptions))
             initParamsJson.put("mfaLevel", MFALevel.MANDATORY.name.lowercase(Locale.ROOT))
             val loginIdObject = mapOf("loginId" to sessionId, "platform" to "android")
@@ -296,8 +295,8 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
 
                                 if (web3AuthResponse?.userInfo?.dappShare?.isNotEmpty() == true) {
                                     KeyStoreManagerUtils.encryptData(
-                                        web3AuthResponse?.userInfo?.verifier.plus(" | ")
-                                            .plus(web3AuthResponse?.userInfo?.verifierId),
+                                        web3AuthResponse?.userInfo?.authConnectionId.plus(" | ")
+                                            .plus(web3AuthResponse?.userInfo?.userId),
                                         web3AuthResponse?.userInfo?.dappShare!!,
                                     )
                                 }
@@ -326,23 +325,22 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
      * @return A CompletableFuture<Web3AuthResponse> representing the asynchronous operation, containing the Web3AuthResponse upon successful login.
      */
     fun login(loginParams: LoginParams): CompletableFuture<Web3AuthResponse> {
-        //check for share
-        if (web3AuthOption.loginConfig != null) {
-            val loginConfigItem: LoginConfigItem? = web3AuthOption.loginConfig?.values?.first()
-            val share: String? =
-                KeyStoreManagerUtils.decryptData(loginConfigItem?.verifier.toString())
-            if (share?.isNotEmpty() == true) {
-                loginParams.dappShare = share
+        web3AuthOption.authConnectionConfig
+            ?.firstOrNull()
+            ?.let { config ->
+                val decryptedShare = KeyStoreManagerUtils.decryptData(config.authConnectionId)
+                if (!decryptedShare.isNullOrEmpty()) {
+                    loginParams.dappShare = decryptedShare
+                }
             }
-        }
 
-        //login
         processRequest("login", loginParams)
 
-        loginCompletableFuture = CompletableFuture<Web3AuthResponse>()
+        loginCompletableFuture = CompletableFuture()
         return loginCompletableFuture
     }
 
+
     /**
      * Logs out the user asynchronously.
      *
diff --git a/core/src/main/java/com/web3auth/core/types/LoginConfigItem.kt b/core/src/main/java/com/web3auth/core/types/AuthConnectionConfig.kt
similarity index 81%
rename from core/src/main/java/com/web3auth/core/types/LoginConfigItem.kt
rename to core/src/main/java/com/web3auth/core/types/AuthConnectionConfig.kt
index 27384135..030a2e4c 100644
--- a/core/src/main/java/com/web3auth/core/types/LoginConfigItem.kt
+++ b/core/src/main/java/com/web3auth/core/types/AuthConnectionConfig.kt
@@ -3,9 +3,9 @@ package com.web3auth.core.types
 import androidx.annotation.Keep
 
 @Keep
-data class LoginConfigItem(
-    @Keep var verifier: String,
-    @Keep var typeOfLogin: TypeOfLogin,
+data class AuthConnectionConfig(
+    @Keep var authConnectionId: String,
+    @Keep var authConnection: AuthConnection,
     @Keep var name: String? = null,
     @Keep var description: String? = null,
     @Keep var clientId: String,
diff --git a/core/src/main/java/com/web3auth/core/types/InitOptions.kt b/core/src/main/java/com/web3auth/core/types/InitOptions.kt
index 4e514dff..86112228 100644
--- a/core/src/main/java/com/web3auth/core/types/InitOptions.kt
+++ b/core/src/main/java/com/web3auth/core/types/InitOptions.kt
@@ -8,7 +8,7 @@ data class InitOptions(
     @Keep val network: String,
     @Keep var redirectUrl: String? = null,
     @Keep val whiteLabel: String? = null,
-    @Keep val loginConfig: String? = null,
+    @Keep val authConnectionConfig: String? = null,
     @Keep val buildEnv: String? = null,
     @Keep val mfaSettings: String? = null,
     @Keep val sessionTime: Int? = null,
diff --git a/core/src/main/java/com/web3auth/core/types/InitParams.kt b/core/src/main/java/com/web3auth/core/types/InitParams.kt
index c62756bf..c1e08898 100644
--- a/core/src/main/java/com/web3auth/core/types/InitParams.kt
+++ b/core/src/main/java/com/web3auth/core/types/InitParams.kt
@@ -4,7 +4,7 @@ import androidx.annotation.Keep
 
 @Keep
 data class InitParams(
-    @Keep val loginProvider: String? = null,
+    @Keep val authConnection: String? = null,
     @Keep val extraLoginOptions: String? = null,
     @Keep val redirectUrl: String,
     @Keep val mfaLevel: String? = null,
diff --git a/core/src/main/java/com/web3auth/core/types/LoginParams.kt b/core/src/main/java/com/web3auth/core/types/LoginParams.kt
index 95141022..1ce760c3 100644
--- a/core/src/main/java/com/web3auth/core/types/LoginParams.kt
+++ b/core/src/main/java/com/web3auth/core/types/LoginParams.kt
@@ -5,7 +5,7 @@ import androidx.annotation.Keep
 
 @Keep
 data class LoginParams(
-    @Keep val loginProvider: Provider,
+    @Keep val authConnection: AUTH_CONNECTION,
     @Keep var dappShare: String? = null,
     @Keep val extraLoginOptions: ExtraLoginOptions? = null,
     @Keep @Transient var redirectUrl: Uri? = null,
diff --git a/core/src/main/java/com/web3auth/core/types/Provider.kt b/core/src/main/java/com/web3auth/core/types/Provider.kt
index 9e6b3762..c9394981 100644
--- a/core/src/main/java/com/web3auth/core/types/Provider.kt
+++ b/core/src/main/java/com/web3auth/core/types/Provider.kt
@@ -4,7 +4,7 @@ import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName
 
 @Keep
-enum class Provider {
+enum class AUTH_CONNECTION {
     @SerializedName("google")
     GOOGLE,
 
@@ -48,7 +48,7 @@ enum class Provider {
     EMAIL_PASSWORDLESS,
 
     @SerializedName("jwt")
-    JWT,
+    JWT, // needs to check whether removed or not
 
     @SerializedName("sms_passwordless")
     SMS_PASSWORDLESS,
diff --git a/core/src/main/java/com/web3auth/core/types/TypeOfLogin.kt b/core/src/main/java/com/web3auth/core/types/TypeOfLogin.kt
index fa900d4b..14bb8d26 100644
--- a/core/src/main/java/com/web3auth/core/types/TypeOfLogin.kt
+++ b/core/src/main/java/com/web3auth/core/types/TypeOfLogin.kt
@@ -4,7 +4,7 @@ import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName
 
 @Keep
-enum class TypeOfLogin {
+enum class AuthConnection {
     @SerializedName("google")
     GOOGLE,
 
diff --git a/core/src/main/java/com/web3auth/core/types/UserInfo.kt b/core/src/main/java/com/web3auth/core/types/UserInfo.kt
index 503fa51b..42b88a2e 100644
--- a/core/src/main/java/com/web3auth/core/types/UserInfo.kt
+++ b/core/src/main/java/com/web3auth/core/types/UserInfo.kt
@@ -7,9 +7,9 @@ data class UserInfo (
     @Keep var email: String = "",
     @Keep var name: String = "",
     @Keep var profileImage: String = "",
-    @Keep var aggregateVerifier: String = "",
-    @Keep var verifier: String = "",
-    @Keep var verifierId: String = "",
+    @Keep var groupedAuthConnectionId: String = "",
+    @Keep var authConnectionId: String = "",
+    @Keep var userId: String = "",
     @Keep var typeOfLogin: String = "",
     @Keep var dappShare: String = "",
     @Keep var idToken: String = "",
diff --git a/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt b/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt
index a5420421..aab90711 100644
--- a/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt
+++ b/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt
@@ -11,7 +11,7 @@ data class Web3AuthOptions(
     @Transient var redirectUrl: Uri,
     var sdkUrl: String = getSdkUrl(buildEnv),
     var whiteLabel: WhiteLabelData? = null,
-    val loginConfig: HashMap<String, LoginConfigItem>? = null,
+    val authConnectionConfig: List<AuthConnectionConfig>? = null,
     val useCoreKitKey: Boolean? = false,
     val chainNamespace: ChainNamespace? = ChainNamespace.EIP155,
     val mfaSettings: MfaSettings? = null,
@@ -78,7 +78,7 @@ fun getDashboardUrl(buildEnv: BuildEnv?): String {
     return sdkUrl
 }
 
-const val authServiceVersion = "v9"
+const val authServiceVersion = "v10"
 const val walletServicesVersion = "v4"
 const val authDashboardVersion = "v9"
 const val walletAccountConstant = "wallet/account"
diff --git a/core/src/main/java/com/web3auth/core/types/Web3AuthResponse.kt b/core/src/main/java/com/web3auth/core/types/Web3AuthResponse.kt
index b936e613..a03179c0 100644
--- a/core/src/main/java/com/web3auth/core/types/Web3AuthResponse.kt
+++ b/core/src/main/java/com/web3auth/core/types/Web3AuthResponse.kt
@@ -16,6 +16,7 @@ data class Web3AuthResponse(
     val tssShareIndex: Int? = null,
     val tssPubKey: String? = null,
     val tssShare: String? = null,
+    val tssTag: String? = null,
     val tssNonce: Int? = null,
     val nodeIndexes: List<Int>? = null,
     val keyMode: String? = null,

From 83cda5a58806c9f6b46894cba21d745f4263aeaf Mon Sep 17 00:00:00 2001
From: Gaurav Goel <gaurav@tor.us>
Date: Mon, 14 Apr 2025 09:45:18 +0530
Subject: [PATCH 02/19] feat: UserInfo.kt updated

Signed-off-by: Gaurav Goel <gaurav@tor.us>
---
 core/src/main/java/com/web3auth/core/Web3Auth.kt       | 2 +-
 core/src/main/java/com/web3auth/core/types/UserInfo.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/com/web3auth/core/Web3Auth.kt b/core/src/main/java/com/web3auth/core/Web3Auth.kt
index a0463140..202e236e 100644
--- a/core/src/main/java/com/web3auth/core/Web3Auth.kt
+++ b/core/src/main/java/com/web3auth/core/Web3Auth.kt
@@ -136,7 +136,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
 
         if (actionType == "enable_mfa" || actionType == "manage_mfa") {
             val userInfo = web3AuthResponse?.userInfo
-            initParamsJson.put("loginProvider", userInfo?.typeOfLogin)
+            initParamsJson.put("authConnection", userInfo?.authConnection)
             var extraOptionsString = ""
             var existingExtraLoginOptions = ExtraLoginOptions()
             if (initParamsJson.has("extraLoginOptions")) {
diff --git a/core/src/main/java/com/web3auth/core/types/UserInfo.kt b/core/src/main/java/com/web3auth/core/types/UserInfo.kt
index 42b88a2e..8b1babd2 100644
--- a/core/src/main/java/com/web3auth/core/types/UserInfo.kt
+++ b/core/src/main/java/com/web3auth/core/types/UserInfo.kt
@@ -10,7 +10,7 @@ data class UserInfo (
     @Keep var groupedAuthConnectionId: String = "",
     @Keep var authConnectionId: String = "",
     @Keep var userId: String = "",
-    @Keep var typeOfLogin: String = "",
+    @Keep var authConnection: String = "",
     @Keep var dappShare: String = "",
     @Keep var idToken: String = "",
     @Keep var oAuthIdToken: String = "",

From 35ad4c52faaceb152a51e0d5ea866774408dfd05 Mon Sep 17 00:00:00 2001
From: Gaurav Goel <grvgoel19@gmail.com>
Date: Tue, 15 Apr 2025 09:54:50 +0530
Subject: [PATCH 03/19] feat: Update code for wallet-services and request
 function. Example also updated

Signed-off-by: Gaurav Goel <gaurav@tor.us>
---
 .../java/com/web3auth/app/MainActivity.kt     | 24 +++++++++++--------
 .../main/java/com/web3auth/core/Web3Auth.kt   | 14 +++++++----
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/web3auth/app/MainActivity.kt b/app/src/main/java/com/web3auth/app/MainActivity.kt
index 2e168ac1..e26e1e18 100644
--- a/app/src/main/java/com/web3auth/app/MainActivity.kt
+++ b/app/src/main/java/com/web3auth/app/MainActivity.kt
@@ -224,11 +224,13 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
         val launchWalletButton = findViewById<Button>(R.id.launchWalletButton)
         launchWalletButton.setOnClickListener {
             val launchWalletCompletableFuture = web3Auth.launchWalletServices(
-                chainConfig = ChainConfig(
-                    chainId = "0x89",
-                    rpcTarget = "https://1rpc.io/matic",
-                    chainNamespace = ChainNamespace.EIP155
-                )
+                chainConfig = listOf(
+                    ChainConfig(
+                        chainId = "0x89",
+                        rpcTarget = "https://1rpc.io/matic",
+                        chainNamespace = ChainNamespace.EIP155
+                    )
+                ), chainId = "0x89"
             )
             launchWalletCompletableFuture.whenComplete { _, error ->
                 if (error == null) {
@@ -248,11 +250,13 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
                 add("Android")
             }
             val signMsgCompletableFuture = web3Auth.request(
-                chainConfig = ChainConfig(
-                    chainId = "0x89",
-                    rpcTarget = "https://polygon-rpc.com/",
-                    chainNamespace = ChainNamespace.EIP155
-                ), "personal_sign", requestParams = params, appState = "web3Auth"
+                chainConfig = listOf(
+                    ChainConfig(
+                        chainId = "0x89",
+                        rpcTarget = "https://polygon-rpc.com/",
+                        chainNamespace = ChainNamespace.EIP155
+                    )
+                ), chainId = "0x89", "personal_sign", requestParams = params, appState = "web3Auth"
             )
             signMsgCompletableFuture.whenComplete { signResult, error ->
                 if (error == null) {
diff --git a/core/src/main/java/com/web3auth/core/Web3Auth.kt b/core/src/main/java/com/web3auth/core/Web3Auth.kt
index 202e236e..e2912016 100644
--- a/core/src/main/java/com/web3auth/core/Web3Auth.kt
+++ b/core/src/main/java/com/web3auth/core/Web3Auth.kt
@@ -520,8 +520,9 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
      * @return A CompletableFuture<Void> representing the asynchronous operation.
      */
     fun launchWalletServices(
-        chainConfig: ChainConfig,
-        path: String? = "wallet"
+        chainConfig: List<ChainConfig>,
+        chainId: String,
+        path: String? = "wallet",
     ): CompletableFuture<Void> {
         val launchWalletServiceCF: CompletableFuture<Void> = CompletableFuture()
         val savedSessionId = SessionManager.getSessionIdFromStorage()
@@ -530,8 +531,9 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
 
             val initOptions = JSONObject(gson.toJson(getInitOptions()))
             initOptions.put(
-                "chainConfig", gson.toJson(chainConfig)
+                "chains", gson.toJson(chainConfig)
             )
+            initOptions.put("chainId", chainId)
 
             val paramMap = JSONObject()
             paramMap.put(
@@ -581,7 +583,8 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
      * @return A CompletableFuture<Void> representing the asynchronous operation.
      */
     fun request(
-        chainConfig: ChainConfig,
+        chainConfig: List<ChainConfig>,
+        chainId: String,
         method: String,
         requestParams: JsonArray,
         path: String? = "wallet/request",
@@ -595,8 +598,9 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
             val sdkUrl = Uri.parse(web3AuthOption.walletSdkUrl)
             val initOptions = JSONObject(gson.toJson(getInitOptions()))
             initOptions.put(
-                "chainConfig", gson.toJson(chainConfig)
+                "chains", gson.toJson(chainConfig)
             )
+            initOptions.put("chainId", chainId)
             val paramMap = JSONObject()
             paramMap.put(
                 "options", initOptions

From 9037d6070fd55aa3e525519c9553e9730db069f1 Mon Sep 17 00:00:00 2001
From: Gaurav Goel <gaurav@tor.us>
Date: Tue, 15 Apr 2025 15:29:36 +0530
Subject: [PATCH 04/19] feat: Update code for wallet-services and request
 function. Example also updated

Signed-off-by: Gaurav Goel <gaurav@tor.us>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 2fcce83e..7d32ef70 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -18,7 +18,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             consumerProguardFiles 'proguard-rules.pro', 'gson.pro', 'retrofit2.pro'
         }

From eab3294d9f2a36b6f74c41be6a0be0cb70a75fcc Mon Sep 17 00:00:00 2001
From: Gaurav Goel <grvgoel19@gmail.com>
Date: Mon, 21 Apr 2025 15:47:58 +0530
Subject: [PATCH 05/19] feat: Update code for wallet-services and request
 function

Signed-off-by: Gaurav Goel <gaurav@tor.us>
---
 app/src/main/java/com/web3auth/app/MainActivity.kt       | 9 ---------
 .../main/java/com/web3auth/core/types/Web3AuthOptions.kt | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/src/main/java/com/web3auth/app/MainActivity.kt b/app/src/main/java/com/web3auth/app/MainActivity.kt
index e26e1e18..ab4e4792 100644
--- a/app/src/main/java/com/web3auth/app/MainActivity.kt
+++ b/app/src/main/java/com/web3auth/app/MainActivity.kt
@@ -22,8 +22,6 @@ import com.web3auth.core.Web3Auth
 import com.web3auth.core.isEmailValid
 import com.web3auth.core.isPhoneNumberValid
 import com.web3auth.core.types.AUTH_CONNECTION
-import com.web3auth.core.types.AuthConnection
-import com.web3auth.core.types.AuthConnectionConfig
 import com.web3auth.core.types.BuildEnv
 import com.web3auth.core.types.ChainConfig
 import com.web3auth.core.types.ChainNamespace
@@ -180,13 +178,6 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
                     "onPrimary" to "#0000FF"
                 )
             ),
-            authConnectionConfig = listOf(
-                AuthConnectionConfig(
-                    authConnectionId = "web3auth-auth0-email-passwordless-sapphire-devnet",
-                    authConnection = AuthConnection.JWT,
-                    clientId = "d84f6xvbdV75VTGmHiMWfZLeSPk8M07C"
-                )
-            ),
             buildEnv = BuildEnv.TESTING,
             sessionTime = 86400,
         )
diff --git a/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt b/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt
index aab90711..aca068bc 100644
--- a/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt
+++ b/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt
@@ -11,7 +11,7 @@ data class Web3AuthOptions(
     @Transient var redirectUrl: Uri,
     var sdkUrl: String = getSdkUrl(buildEnv),
     var whiteLabel: WhiteLabelData? = null,
-    val authConnectionConfig: List<AuthConnectionConfig>? = null,
+    val authConnectionConfig: List<AuthConnectionConfig>? = emptyList(),
     val useCoreKitKey: Boolean? = false,
     val chainNamespace: ChainNamespace? = ChainNamespace.EIP155,
     val mfaSettings: MfaSettings? = null,

From c8269d45366a21ba8ddbaff1435fe3b64fa87e8c Mon Sep 17 00:00:00 2001
From: Gaurav Goel <grvgoel19@gmail.com>
Date: Tue, 22 Apr 2025 08:41:32 +0530
Subject: [PATCH 06/19] feat: Resolved PR comments.

Signed-off-by: Gaurav Goel <gaurav@tor.us>
---
 app/src/main/java/com/web3auth/app/MainActivity.kt     | 10 ++++++----
 core/src/main/java/com/web3auth/core/Web3Auth.kt       |  8 ++++----
 .../java/com/web3auth/core/types/Web3AuthOptions.kt    | 10 +++++-----
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/web3auth/app/MainActivity.kt b/app/src/main/java/com/web3auth/app/MainActivity.kt
index ab4e4792..abe6a4e6 100644
--- a/app/src/main/java/com/web3auth/app/MainActivity.kt
+++ b/app/src/main/java/com/web3auth/app/MainActivity.kt
@@ -178,7 +178,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
                     "onPrimary" to "#0000FF"
                 )
             ),
-            buildEnv = BuildEnv.TESTING,
+            authBuildEnv = BuildEnv.TESTING,
             sessionTime = 86400,
         )
 
@@ -214,14 +214,15 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
 
         val launchWalletButton = findViewById<Button>(R.id.launchWalletButton)
         launchWalletButton.setOnClickListener {
-            val launchWalletCompletableFuture = web3Auth.launchWalletServices(
+            val launchWalletCompletableFuture = web3Auth.showWalletUI(
+                chainId = "0x89",
                 chainConfig = listOf(
                     ChainConfig(
                         chainId = "0x89",
                         rpcTarget = "https://1rpc.io/matic",
                         chainNamespace = ChainNamespace.EIP155
                     )
-                ), chainId = "0x89"
+                )
             )
             launchWalletCompletableFuture.whenComplete { _, error ->
                 if (error == null) {
@@ -241,13 +242,14 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
                 add("Android")
             }
             val signMsgCompletableFuture = web3Auth.request(
+                chainId = "0x89",
                 chainConfig = listOf(
                     ChainConfig(
                         chainId = "0x89",
                         rpcTarget = "https://polygon-rpc.com/",
                         chainNamespace = ChainNamespace.EIP155
                     )
-                ), chainId = "0x89", "personal_sign", requestParams = params, appState = "web3Auth"
+                ), "personal_sign", requestParams = params, appState = "web3Auth"
             )
             signMsgCompletableFuture.whenComplete { signResult, error ->
                 if (error == null) {
diff --git a/core/src/main/java/com/web3auth/core/Web3Auth.kt b/core/src/main/java/com/web3auth/core/Web3Auth.kt
index e2912016..f8bb3157 100644
--- a/core/src/main/java/com/web3auth/core/Web3Auth.kt
+++ b/core/src/main/java/com/web3auth/core/Web3Auth.kt
@@ -73,7 +73,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
             redirectUrl = web3AuthOption.redirectUrl.toString(),
             whiteLabel = web3AuthOption.whiteLabel?.let { gson.toJson(it) },
             authConnectionConfig = web3AuthOption.authConnectionConfig?.let { gson.toJson(it) },
-            buildEnv = web3AuthOption.buildEnv?.name?.lowercase(Locale.ROOT),
+            buildEnv = web3AuthOption.authBuildEnv?.name?.lowercase(Locale.ROOT),
             mfaSettings = web3AuthOption.mfaSettings?.let { gson.toJson(it) },
             sessionTime = web3AuthOption.sessionTime,
             originData = web3AuthOption.originData?.let { gson.toJson(it) },
@@ -519,9 +519,9 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
      * @param path The path where the wallet services will be launched. Default value is "wallet".
      * @return A CompletableFuture<Void> representing the asynchronous operation.
      */
-    fun launchWalletServices(
-        chainConfig: List<ChainConfig>,
+    fun showWalletUI(
         chainId: String,
+        chainConfig: List<ChainConfig>,
         path: String? = "wallet",
     ): CompletableFuture<Void> {
         val launchWalletServiceCF: CompletableFuture<Void> = CompletableFuture()
@@ -583,8 +583,8 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
      * @return A CompletableFuture<Void> representing the asynchronous operation.
      */
     fun request(
-        chainConfig: List<ChainConfig>,
         chainId: String,
+        chainConfig: List<ChainConfig>,
         method: String,
         requestParams: JsonArray,
         path: String? = "wallet/request",
diff --git a/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt b/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt
index aca068bc..571826f0 100644
--- a/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt
+++ b/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt
@@ -7,22 +7,22 @@ import androidx.annotation.Keep
 data class Web3AuthOptions(
     val clientId: String,
     val network: Network,
-    var buildEnv: BuildEnv? = BuildEnv.PRODUCTION,
+    var authBuildEnv: BuildEnv? = BuildEnv.PRODUCTION,
     @Transient var redirectUrl: Uri,
-    var sdkUrl: String = getSdkUrl(buildEnv),
+    var sdkUrl: String = getSdkUrl(authBuildEnv),
     var whiteLabel: WhiteLabelData? = null,
     val authConnectionConfig: List<AuthConnectionConfig>? = emptyList(),
     val useCoreKitKey: Boolean? = false,
     val chainNamespace: ChainNamespace? = ChainNamespace.EIP155,
     val mfaSettings: MfaSettings? = null,
     val sessionTime: Int? = 30 * 86400,
-    var walletSdkUrl: String? = getWalletSdkUrl(buildEnv),
-    var dashboardUrl: String? = getDashboardUrl(buildEnv),
+    var walletSdkUrl: String? = getWalletSdkUrl(authBuildEnv),
+    var dashboardUrl: String? = getDashboardUrl(authBuildEnv),
     var originData: Map<String, String>? = null
 ) {
     init {
         if (dashboardUrl == null) {
-            dashboardUrl = getDashboardUrl(buildEnv)
+            dashboardUrl = getDashboardUrl(authBuildEnv)
         }
     }
 }

From 1bfa09f5f9dc97a4bfed52da34f99aba1e15266e Mon Sep 17 00:00:00 2001
From: Gaurav Goel <grvgoel19@gmail.com>
Date: Tue, 22 Apr 2025 11:48:53 +0530
Subject: [PATCH 07/19] feat: Resolved PR comments.

Signed-off-by: Gaurav Goel <gaurav@tor.us>
---
 .../main/java/com/web3auth/app/MainActivity.kt    | 15 ++++++++++++---
 core/src/main/java/com/web3auth/core/Web3Auth.kt  |  6 +++---
 .../types/{ChainConfig.kt => ChainsConfig.kt}     |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)
 rename core/src/main/java/com/web3auth/core/types/{ChainConfig.kt => ChainsConfig.kt} (95%)

diff --git a/app/src/main/java/com/web3auth/app/MainActivity.kt b/app/src/main/java/com/web3auth/app/MainActivity.kt
index abe6a4e6..9fcfec2d 100644
--- a/app/src/main/java/com/web3auth/app/MainActivity.kt
+++ b/app/src/main/java/com/web3auth/app/MainActivity.kt
@@ -22,9 +22,11 @@ import com.web3auth.core.Web3Auth
 import com.web3auth.core.isEmailValid
 import com.web3auth.core.isPhoneNumberValid
 import com.web3auth.core.types.AUTH_CONNECTION
+import com.web3auth.core.types.AuthConnection
+import com.web3auth.core.types.AuthConnectionConfig
 import com.web3auth.core.types.BuildEnv
-import com.web3auth.core.types.ChainConfig
 import com.web3auth.core.types.ChainNamespace
+import com.web3auth.core.types.ChainsConfig
 import com.web3auth.core.types.ExtraLoginOptions
 import com.web3auth.core.types.Language
 import com.web3auth.core.types.LoginParams
@@ -178,6 +180,13 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
                     "onPrimary" to "#0000FF"
                 )
             ),
+            authConnectionConfig = listOf(
+                AuthConnectionConfig(
+                    authConnectionId = "web3auth-auth0-email-passwordless-sapphire-devnet",
+                    authConnection = AuthConnection.JWT,
+                    clientId = "d84f6xvbdV75VTGmHiMWfZLeSPk8M07C"
+                )
+            ),
             authBuildEnv = BuildEnv.TESTING,
             sessionTime = 86400,
         )
@@ -217,7 +226,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
             val launchWalletCompletableFuture = web3Auth.showWalletUI(
                 chainId = "0x89",
                 chainConfig = listOf(
-                    ChainConfig(
+                    ChainsConfig(
                         chainId = "0x89",
                         rpcTarget = "https://1rpc.io/matic",
                         chainNamespace = ChainNamespace.EIP155
@@ -244,7 +253,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
             val signMsgCompletableFuture = web3Auth.request(
                 chainId = "0x89",
                 chainConfig = listOf(
-                    ChainConfig(
+                    ChainsConfig(
                         chainId = "0x89",
                         rpcTarget = "https://polygon-rpc.com/",
                         chainNamespace = ChainNamespace.EIP155
diff --git a/core/src/main/java/com/web3auth/core/Web3Auth.kt b/core/src/main/java/com/web3auth/core/Web3Auth.kt
index f8bb3157..70dcb908 100644
--- a/core/src/main/java/com/web3auth/core/Web3Auth.kt
+++ b/core/src/main/java/com/web3auth/core/Web3Auth.kt
@@ -12,7 +12,7 @@ import com.google.gson.JsonObject
 import com.web3auth.core.api.ApiHelper
 import com.web3auth.core.api.ApiService
 import com.web3auth.core.keystore.KeyStoreManagerUtils
-import com.web3auth.core.types.ChainConfig
+import com.web3auth.core.types.ChainsConfig
 import com.web3auth.core.types.ErrorCode
 import com.web3auth.core.types.ExtraLoginOptions
 import com.web3auth.core.types.InitOptions
@@ -521,7 +521,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
      */
     fun showWalletUI(
         chainId: String,
-        chainConfig: List<ChainConfig>,
+        chainConfig: List<ChainsConfig>,
         path: String? = "wallet",
     ): CompletableFuture<Void> {
         val launchWalletServiceCF: CompletableFuture<Void> = CompletableFuture()
@@ -584,7 +584,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
      */
     fun request(
         chainId: String,
-        chainConfig: List<ChainConfig>,
+        chainConfig: List<ChainsConfig>,
         method: String,
         requestParams: JsonArray,
         path: String? = "wallet/request",
diff --git a/core/src/main/java/com/web3auth/core/types/ChainConfig.kt b/core/src/main/java/com/web3auth/core/types/ChainsConfig.kt
similarity index 95%
rename from core/src/main/java/com/web3auth/core/types/ChainConfig.kt
rename to core/src/main/java/com/web3auth/core/types/ChainsConfig.kt
index 9980a9ea..5abb7908 100644
--- a/core/src/main/java/com/web3auth/core/types/ChainConfig.kt
+++ b/core/src/main/java/com/web3auth/core/types/ChainsConfig.kt
@@ -4,7 +4,7 @@ import androidx.annotation.Keep
 import java.io.Serializable
 
 @Keep
-data class ChainConfig(
+data class ChainsConfig(
     @Keep val chainNamespace: ChainNamespace = ChainNamespace.EIP155,
     @Keep val decimals: Int? = 18,
     @Keep val blockExplorerUrl: String? = null,

From 993d363dcc1cf2bbcc26110e5ee5afe0a8f911ff Mon Sep 17 00:00:00 2001
From: Gaurav Goel <grvgoel19@gmail.com>
Date: Tue, 22 Apr 2025 13:21:04 +0530
Subject: [PATCH 08/19] feat: Resolved PR comments.

Signed-off-by: Gaurav Goel <gaurav@tor.us>
---
 app/src/main/java/com/web3auth/app/MainActivity.kt | 11 ++++-------
 core/src/main/java/com/web3auth/core/Web3Auth.kt   |  8 ++++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/web3auth/app/MainActivity.kt b/app/src/main/java/com/web3auth/app/MainActivity.kt
index 9fcfec2d..ad89b299 100644
--- a/app/src/main/java/com/web3auth/app/MainActivity.kt
+++ b/app/src/main/java/com/web3auth/app/MainActivity.kt
@@ -251,13 +251,10 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
                 add("Android")
             }
             val signMsgCompletableFuture = web3Auth.request(
-                chainId = "0x89",
-                chainConfig = listOf(
-                    ChainsConfig(
-                        chainId = "0x89",
-                        rpcTarget = "https://polygon-rpc.com/",
-                        chainNamespace = ChainNamespace.EIP155
-                    )
+                chainConfig = ChainsConfig(
+                    chainId = "0x89",
+                    rpcTarget = "https://polygon-rpc.com/",
+                    chainNamespace = ChainNamespace.EIP155
                 ), "personal_sign", requestParams = params, appState = "web3Auth"
             )
             signMsgCompletableFuture.whenComplete { signResult, error ->
diff --git a/core/src/main/java/com/web3auth/core/Web3Auth.kt b/core/src/main/java/com/web3auth/core/Web3Auth.kt
index 70dcb908..12b347d0 100644
--- a/core/src/main/java/com/web3auth/core/Web3Auth.kt
+++ b/core/src/main/java/com/web3auth/core/Web3Auth.kt
@@ -583,8 +583,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
      * @return A CompletableFuture<Void> representing the asynchronous operation.
      */
     fun request(
-        chainId: String,
-        chainConfig: List<ChainsConfig>,
+        chainConfig: ChainsConfig,
         method: String,
         requestParams: JsonArray,
         path: String? = "wallet/request",
@@ -597,10 +596,11 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
         if (sessionId.isNotBlank()) {
             val sdkUrl = Uri.parse(web3AuthOption.walletSdkUrl)
             val initOptions = JSONObject(gson.toJson(getInitOptions()))
+            val chainConfigList = arrayListOf(chainConfig)
             initOptions.put(
-                "chains", gson.toJson(chainConfig)
+                "chains", gson.toJson(chainConfigList)
             )
-            initOptions.put("chainId", chainId)
+            initOptions.put("chainId", chainConfig.chainId)
             val paramMap = JSONObject()
             paramMap.put(
                 "options", initOptions

From 4776e6bf595daa7b914f9e6dbee2128a24fc6e58 Mon Sep 17 00:00:00 2001
From: Gaurav Goel <grvgoel19@gmail.com>
Date: Wed, 23 Apr 2025 08:40:21 +0530
Subject: [PATCH 09/19] feat: Update AuthConnection nd example

Signed-off-by: Gaurav Goel <gaurav@tor.us>
---
 .../com/web3auth/app/AuthConnectionLogin.kt   |  4 +-
 .../java/com/web3auth/app/MainActivity.kt     | 45 +++++++-------
 .../main/java/com/web3auth/core/Web3Auth.kt   |  2 +-
 .../types/{Provider.kt => AuthConnection.kt}  |  2 +-
 .../com/web3auth/core/types/LoginParams.kt    |  2 +-
 .../com/web3auth/core/types/TypeOfLogin.kt    | 58 -------------------
 6 files changed, 27 insertions(+), 86 deletions(-)
 rename core/src/main/java/com/web3auth/core/types/{Provider.kt => AuthConnection.kt} (97%)
 delete mode 100644 core/src/main/java/com/web3auth/core/types/TypeOfLogin.kt

diff --git a/app/src/main/java/com/web3auth/app/AuthConnectionLogin.kt b/app/src/main/java/com/web3auth/app/AuthConnectionLogin.kt
index 9192f517..2a917d75 100644
--- a/app/src/main/java/com/web3auth/app/AuthConnectionLogin.kt
+++ b/app/src/main/java/com/web3auth/app/AuthConnectionLogin.kt
@@ -1,8 +1,8 @@
 package com.web3auth.app
 
-import com.web3auth.core.types.AUTH_CONNECTION
+import com.web3auth.core.types.AuthConnection
 
 data class AuthConnectionLogin(
     val name: String,
-    val authConnection: AUTH_CONNECTION
+    val authConnection: AuthConnection
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/web3auth/app/MainActivity.kt b/app/src/main/java/com/web3auth/app/MainActivity.kt
index ad89b299..888a685b 100644
--- a/app/src/main/java/com/web3auth/app/MainActivity.kt
+++ b/app/src/main/java/com/web3auth/app/MainActivity.kt
@@ -21,7 +21,6 @@ import com.google.gson.JsonArray
 import com.web3auth.core.Web3Auth
 import com.web3auth.core.isEmailValid
 import com.web3auth.core.isPhoneNumberValid
-import com.web3auth.core.types.AUTH_CONNECTION
 import com.web3auth.core.types.AuthConnection
 import com.web3auth.core.types.AuthConnectionConfig
 import com.web3auth.core.types.BuildEnv
@@ -45,30 +44,30 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
     private lateinit var web3Auth: Web3Auth
 
     private val authConnectionList: List<AuthConnectionLogin> = listOf(
-        AuthConnectionLogin("Google", AUTH_CONNECTION.GOOGLE),
-        AuthConnectionLogin("Facebook", AUTH_CONNECTION.FACEBOOK),
-        AuthConnectionLogin("Twitch", AUTH_CONNECTION.TWITCH),
-        AuthConnectionLogin("Discord", AUTH_CONNECTION.DISCORD),
-        AuthConnectionLogin("Reddit", AUTH_CONNECTION.REDDIT),
-        AuthConnectionLogin("Apple", AUTH_CONNECTION.APPLE),
-        AuthConnectionLogin("Github", AUTH_CONNECTION.GITHUB),
-        AuthConnectionLogin("LinkedIn", AUTH_CONNECTION.LINKEDIN),
-        AuthConnectionLogin("Twitter", AUTH_CONNECTION.TWITTER),
-        AuthConnectionLogin("Line", AUTH_CONNECTION.LINE),
-        AuthConnectionLogin("Hosted Email Passwordless", AUTH_CONNECTION.EMAIL_PASSWORDLESS),
-        AuthConnectionLogin("SMS Passwordless", AUTH_CONNECTION.SMS_PASSWORDLESS),
-        AuthConnectionLogin("JWT", AUTH_CONNECTION.JWT),
-        AuthConnectionLogin("Farcaster", AUTH_CONNECTION.FARCASTER)
+        AuthConnectionLogin("Google", AuthConnection.GOOGLE),
+        AuthConnectionLogin("Facebook", AuthConnection.FACEBOOK),
+        AuthConnectionLogin("Twitch", AuthConnection.TWITCH),
+        AuthConnectionLogin("Discord", AuthConnection.DISCORD),
+        AuthConnectionLogin("Reddit", AuthConnection.REDDIT),
+        AuthConnectionLogin("Apple", AuthConnection.APPLE),
+        AuthConnectionLogin("Github", AuthConnection.GITHUB),
+        AuthConnectionLogin("LinkedIn", AuthConnection.LINKEDIN),
+        AuthConnectionLogin("Twitter", AuthConnection.TWITTER),
+        AuthConnectionLogin("Line", AuthConnection.LINE),
+        AuthConnectionLogin("Hosted Email Passwordless", AuthConnection.EMAIL_PASSWORDLESS),
+        AuthConnectionLogin("SMS Passwordless", AuthConnection.SMS_PASSWORDLESS),
+        AuthConnectionLogin("JWT", AuthConnection.JWT),
+        AuthConnectionLogin("Farcaster", AuthConnection.FARCASTER)
     )
 
-    private var selectedLoginProvider: AUTH_CONNECTION = AUTH_CONNECTION.GOOGLE
+    private var selectedLoginProvider: AuthConnection = AuthConnection.GOOGLE
 
     private val gson = Gson()
 
     private fun signIn() {
         val hintEmailEditText = findViewById<EditText>(R.id.etEmailHint)
         var extraLoginOptions: ExtraLoginOptions? = null
-        if (selectedLoginProvider == AUTH_CONNECTION.EMAIL_PASSWORDLESS) {
+        if (selectedLoginProvider == AuthConnection.EMAIL_PASSWORDLESS) {
             val hintEmail = hintEmailEditText.text.toString()
             if (hintEmail.isBlank() || !hintEmail.isEmailValid()) {
                 Toast.makeText(this, "Please enter a valid Email.", Toast.LENGTH_LONG).show()
@@ -77,7 +76,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
             extraLoginOptions = ExtraLoginOptions(login_hint = hintEmail)
         }
 
-        if (selectedLoginProvider == AUTH_CONNECTION.SMS_PASSWORDLESS) {
+        if (selectedLoginProvider == AuthConnection.SMS_PASSWORDLESS) {
             val hintPhNo = hintEmailEditText.text.toString()
             if (hintPhNo.isBlank() || !hintPhNo.isPhoneNumberValid()) {
                 Toast.makeText(this, "Please enter a valid Number.", Toast.LENGTH_LONG).show()
@@ -224,14 +223,14 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
         val launchWalletButton = findViewById<Button>(R.id.launchWalletButton)
         launchWalletButton.setOnClickListener {
             val launchWalletCompletableFuture = web3Auth.showWalletUI(
-                chainId = "0x89",
                 chainConfig = listOf(
                     ChainsConfig(
                         chainId = "0x89",
                         rpcTarget = "https://1rpc.io/matic",
                         chainNamespace = ChainNamespace.EIP155
                     )
-                )
+                ),
+                chainId = "0x89",
             )
             launchWalletCompletableFuture.whenComplete { _, error ->
                 if (error == null) {
@@ -319,13 +318,13 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
 
         val hintEmailEditText = findViewById<EditText>(R.id.etEmailHint)
 
-        if (selectedLoginProvider == AUTH_CONNECTION.EMAIL_PASSWORDLESS) {
+        if (selectedLoginProvider == AuthConnection.EMAIL_PASSWORDLESS) {
             hintEmailEditText.hint = "Enter Email"
-        } else if (selectedLoginProvider == AUTH_CONNECTION.SMS_PASSWORDLESS) {
+        } else if (selectedLoginProvider == AuthConnection.SMS_PASSWORDLESS) {
             hintEmailEditText.hint = "Enter Phone Number"
         }
 
-        if (selectedLoginProvider == AUTH_CONNECTION.EMAIL_PASSWORDLESS || selectedLoginProvider == AUTH_CONNECTION.SMS_PASSWORDLESS) {
+        if (selectedLoginProvider == AuthConnection.EMAIL_PASSWORDLESS || selectedLoginProvider == AuthConnection.SMS_PASSWORDLESS) {
             hintEmailEditText.visibility = View.VISIBLE
         } else {
             hintEmailEditText.visibility = View.GONE
diff --git a/core/src/main/java/com/web3auth/core/Web3Auth.kt b/core/src/main/java/com/web3auth/core/Web3Auth.kt
index 12b347d0..3947160d 100644
--- a/core/src/main/java/com/web3auth/core/Web3Auth.kt
+++ b/core/src/main/java/com/web3auth/core/Web3Auth.kt
@@ -520,8 +520,8 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
      * @return A CompletableFuture<Void> representing the asynchronous operation.
      */
     fun showWalletUI(
-        chainId: String,
         chainConfig: List<ChainsConfig>,
+        chainId: String,
         path: String? = "wallet",
     ): CompletableFuture<Void> {
         val launchWalletServiceCF: CompletableFuture<Void> = CompletableFuture()
diff --git a/core/src/main/java/com/web3auth/core/types/Provider.kt b/core/src/main/java/com/web3auth/core/types/AuthConnection.kt
similarity index 97%
rename from core/src/main/java/com/web3auth/core/types/Provider.kt
rename to core/src/main/java/com/web3auth/core/types/AuthConnection.kt
index c9394981..fb94234f 100644
--- a/core/src/main/java/com/web3auth/core/types/Provider.kt
+++ b/core/src/main/java/com/web3auth/core/types/AuthConnection.kt
@@ -4,7 +4,7 @@ import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName
 
 @Keep
-enum class AUTH_CONNECTION {
+enum class AuthConnection {
     @SerializedName("google")
     GOOGLE,
 
diff --git a/core/src/main/java/com/web3auth/core/types/LoginParams.kt b/core/src/main/java/com/web3auth/core/types/LoginParams.kt
index 1ce760c3..94831212 100644
--- a/core/src/main/java/com/web3auth/core/types/LoginParams.kt
+++ b/core/src/main/java/com/web3auth/core/types/LoginParams.kt
@@ -5,7 +5,7 @@ import androidx.annotation.Keep
 
 @Keep
 data class LoginParams(
-    @Keep val authConnection: AUTH_CONNECTION,
+    @Keep val authConnection: AuthConnection,
     @Keep var dappShare: String? = null,
     @Keep val extraLoginOptions: ExtraLoginOptions? = null,
     @Keep @Transient var redirectUrl: Uri? = null,
diff --git a/core/src/main/java/com/web3auth/core/types/TypeOfLogin.kt b/core/src/main/java/com/web3auth/core/types/TypeOfLogin.kt
deleted file mode 100644
index 14bb8d26..00000000
--- a/core/src/main/java/com/web3auth/core/types/TypeOfLogin.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.web3auth.core.types
-
-import androidx.annotation.Keep
-import com.google.gson.annotations.SerializedName
-
-@Keep
-enum class AuthConnection {
-    @SerializedName("google")
-    GOOGLE,
-
-    @SerializedName("facebook")
-    FACEBOOK,
-
-    @SerializedName("reddit")
-    REDDIT,
-
-    @SerializedName("discord")
-    DISCORD,
-
-    @SerializedName("twitch")
-    TWITCH,
-
-    @SerializedName("apple")
-    APPLE,
-
-    @SerializedName("line")
-    LINE,
-
-    @SerializedName("github")
-    GITHUB,
-
-    @SerializedName("kakao")
-    KAKAO,
-
-    @SerializedName("linkedin")
-    LINKEDIN,
-
-    @SerializedName("twitter")
-    TWITTER,
-
-    @SerializedName("weibo")
-    WEIBO,
-
-    @SerializedName("wechat")
-    WECHAT,
-
-    @SerializedName("email_passwordless")
-    EMAIL_PASSWORDLESS,
-
-    @SerializedName("jwt")
-    JWT,
-
-    @SerializedName("sms_passwordless")
-    SMS_PASSWORDLESS,
-
-    @SerializedName("farcaster")
-    FARCASTER
-}
\ No newline at end of file

From c69004a8380a424d1f81c004c8a1d7a6e5f4bc7d Mon Sep 17 00:00:00 2001
From: Gaurav Goel <grvgoel19@gmail.com>
Date: Thu, 24 Apr 2025 12:07:44 +0530
Subject: [PATCH 10/19] feat: Update ChainConfig.kt

Signed-off-by: Gaurav Goel <gaurav@tor.us>
---
 app/src/main/java/com/web3auth/app/MainActivity.kt          | 6 +++---
 core/src/main/java/com/web3auth/core/Web3Auth.kt            | 6 +++---
 .../web3auth/core/types/{ChainsConfig.kt => ChainConfig.kt} | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename core/src/main/java/com/web3auth/core/types/{ChainsConfig.kt => ChainConfig.kt} (95%)

diff --git a/app/src/main/java/com/web3auth/app/MainActivity.kt b/app/src/main/java/com/web3auth/app/MainActivity.kt
index 888a685b..3561db15 100644
--- a/app/src/main/java/com/web3auth/app/MainActivity.kt
+++ b/app/src/main/java/com/web3auth/app/MainActivity.kt
@@ -24,8 +24,8 @@ import com.web3auth.core.isPhoneNumberValid
 import com.web3auth.core.types.AuthConnection
 import com.web3auth.core.types.AuthConnectionConfig
 import com.web3auth.core.types.BuildEnv
+import com.web3auth.core.types.ChainConfig
 import com.web3auth.core.types.ChainNamespace
-import com.web3auth.core.types.ChainsConfig
 import com.web3auth.core.types.ExtraLoginOptions
 import com.web3auth.core.types.Language
 import com.web3auth.core.types.LoginParams
@@ -224,7 +224,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
         launchWalletButton.setOnClickListener {
             val launchWalletCompletableFuture = web3Auth.showWalletUI(
                 chainConfig = listOf(
-                    ChainsConfig(
+                    ChainConfig(
                         chainId = "0x89",
                         rpcTarget = "https://1rpc.io/matic",
                         chainNamespace = ChainNamespace.EIP155
@@ -250,7 +250,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
                 add("Android")
             }
             val signMsgCompletableFuture = web3Auth.request(
-                chainConfig = ChainsConfig(
+                chainConfig = ChainConfig(
                     chainId = "0x89",
                     rpcTarget = "https://polygon-rpc.com/",
                     chainNamespace = ChainNamespace.EIP155
diff --git a/core/src/main/java/com/web3auth/core/Web3Auth.kt b/core/src/main/java/com/web3auth/core/Web3Auth.kt
index 3947160d..4cdeded1 100644
--- a/core/src/main/java/com/web3auth/core/Web3Auth.kt
+++ b/core/src/main/java/com/web3auth/core/Web3Auth.kt
@@ -12,7 +12,7 @@ import com.google.gson.JsonObject
 import com.web3auth.core.api.ApiHelper
 import com.web3auth.core.api.ApiService
 import com.web3auth.core.keystore.KeyStoreManagerUtils
-import com.web3auth.core.types.ChainsConfig
+import com.web3auth.core.types.ChainConfig
 import com.web3auth.core.types.ErrorCode
 import com.web3auth.core.types.ExtraLoginOptions
 import com.web3auth.core.types.InitOptions
@@ -520,7 +520,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
      * @return A CompletableFuture<Void> representing the asynchronous operation.
      */
     fun showWalletUI(
-        chainConfig: List<ChainsConfig>,
+        chainConfig: List<ChainConfig>,
         chainId: String,
         path: String? = "wallet",
     ): CompletableFuture<Void> {
@@ -583,7 +583,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
      * @return A CompletableFuture<Void> representing the asynchronous operation.
      */
     fun request(
-        chainConfig: ChainsConfig,
+        chainConfig: ChainConfig,
         method: String,
         requestParams: JsonArray,
         path: String? = "wallet/request",
diff --git a/core/src/main/java/com/web3auth/core/types/ChainsConfig.kt b/core/src/main/java/com/web3auth/core/types/ChainConfig.kt
similarity index 95%
rename from core/src/main/java/com/web3auth/core/types/ChainsConfig.kt
rename to core/src/main/java/com/web3auth/core/types/ChainConfig.kt
index 5abb7908..9980a9ea 100644
--- a/core/src/main/java/com/web3auth/core/types/ChainsConfig.kt
+++ b/core/src/main/java/com/web3auth/core/types/ChainConfig.kt
@@ -4,7 +4,7 @@ import androidx.annotation.Keep
 import java.io.Serializable
 
 @Keep
-data class ChainsConfig(
+data class ChainConfig(
     @Keep val chainNamespace: ChainNamespace = ChainNamespace.EIP155,
     @Keep val decimals: Int? = 18,
     @Keep val blockExplorerUrl: String? = null,

From e25259af746c7f88301c88c5a511f55af5ad85d0 Mon Sep 17 00:00:00 2001
From: Gaurav Goel <grvgoel19@gmail.com>
Date: Thu, 24 Apr 2025 12:22:20 +0530
Subject: [PATCH 11/19] feat: Replace network to Web3AuthNetwork everywhere

Signed-off-by: Gaurav Goel <gaurav@tor.us>
---
 .../main/java/com/web3auth/app/MainActivity.kt |  4 ++--
 .../main/java/com/web3auth/core/Web3Auth.kt    | 11 ++++++-----
 .../java/com/web3auth/core/api/ApiHelper.kt    | 18 +++++++++---------
 .../types/{Network.kt => Web3AuthNetwork.kt}   |  2 +-
 .../com/web3auth/core/types/Web3AuthOptions.kt |  2 +-
 5 files changed, 19 insertions(+), 18 deletions(-)
 rename core/src/main/java/com/web3auth/core/types/{Network.kt => Web3AuthNetwork.kt} (93%)

diff --git a/app/src/main/java/com/web3auth/app/MainActivity.kt b/app/src/main/java/com/web3auth/app/MainActivity.kt
index 3561db15..4d1f2d98 100644
--- a/app/src/main/java/com/web3auth/app/MainActivity.kt
+++ b/app/src/main/java/com/web3auth/app/MainActivity.kt
@@ -30,9 +30,9 @@ import com.web3auth.core.types.ExtraLoginOptions
 import com.web3auth.core.types.Language
 import com.web3auth.core.types.LoginParams
 import com.web3auth.core.types.MFALevel
-import com.web3auth.core.types.Network
 import com.web3auth.core.types.ThemeModes
 import com.web3auth.core.types.UserInfo
+import com.web3auth.core.types.Web3AuthNetwork
 import com.web3auth.core.types.Web3AuthOptions
 import com.web3auth.core.types.Web3AuthResponse
 import com.web3auth.core.types.WhiteLabelData
@@ -167,7 +167,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
 
         val options = Web3AuthOptions(
             clientId = "BFuUqebV5I8Pz5F7a5A2ihW7YVmbv_OHXnHYDv6OltAD5NGr6e-ViNvde3U4BHdn6HvwfkgobhVu4VwC-OSJkik",
-            network = Network.SAPPHIRE_DEVNET,
+            web3AuthNetwork = Web3AuthNetwork.SAPPHIRE_DEVNET,
             redirectUrl = Uri.parse("torusapp://org.torusresearch.web3authexample"),
 //            sdkUrl = "https://auth.mocaverse.xyz",
 //            walletSdkUrl = "https://lrc-mocaverse.web3auth.io",
diff --git a/core/src/main/java/com/web3auth/core/Web3Auth.kt b/core/src/main/java/com/web3auth/core/Web3Auth.kt
index 4cdeded1..81ae819c 100644
--- a/core/src/main/java/com/web3auth/core/Web3Auth.kt
+++ b/core/src/main/java/com/web3auth/core/Web3Auth.kt
@@ -69,7 +69,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
     private fun getInitOptions(): InitOptions {
         return InitOptions(
             clientId = web3AuthOption.clientId,
-            network = web3AuthOption.network.name.lowercase(Locale.ROOT),
+            network = web3AuthOption.web3AuthNetwork.name.lowercase(Locale.ROOT),
             redirectUrl = web3AuthOption.redirectUrl.toString(),
             whiteLabel = web3AuthOption.whiteLabel?.let { gson.toJson(it) },
             authConnectionConfig = web3AuthOption.authConnectionConfig?.let { gson.toJson(it) },
@@ -448,7 +448,8 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
     private fun fetchProjectConfig(): CompletableFuture<Boolean> {
         val projectConfigCompletableFuture: CompletableFuture<Boolean> = CompletableFuture()
         val web3AuthApi =
-            ApiHelper.getInstance(web3AuthOption.network.name).create(ApiService::class.java)
+            ApiHelper.getInstance(web3AuthOption.web3AuthNetwork.name)
+                .create(ApiService::class.java)
         if (!ApiHelper.isNetworkAvailable(baseContext)) {
             throw Exception(
                 Web3AuthError.getError(ErrorCode.RUNTIME_ERROR)
@@ -459,7 +460,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
             try {
                 val result = web3AuthApi.fetchProjectConfig(
                     web3AuthOption.clientId,
-                    web3AuthOption.network.name.lowercase()
+                    web3AuthOption.web3AuthNetwork.name.lowercase()
                 )
                 if (result.isSuccessful && result.body() != null) {
                     val response = result.body()
@@ -515,7 +516,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
     /**
      * Launches the wallet services asynchronously.
      *
-     * @param chainConfig The configuration details of the blockchain network.
+     * @param chainConfig The configuration details of the blockchain web3AuthNetwork.
      * @param path The path where the wallet services will be launched. Default value is "wallet".
      * @return A CompletableFuture<Void> representing the asynchronous operation.
      */
@@ -576,7 +577,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
     /**
      * Signs a message asynchronously.
      *
-     * @param chainConfig The configuration details of the blockchain network.
+     * @param chainConfig The configuration details of the blockchain web3AuthNetwork.
      * @param method The method name of the request.
      * @param requestParams The parameters of the request in JSON array format.
      * @param path The path where the signing service is located. Default value is "wallet/request".
diff --git a/core/src/main/java/com/web3auth/core/api/ApiHelper.kt b/core/src/main/java/com/web3auth/core/api/ApiHelper.kt
index 93b4132a..72b85b51 100644
--- a/core/src/main/java/com/web3auth/core/api/ApiHelper.kt
+++ b/core/src/main/java/com/web3auth/core/api/ApiHelper.kt
@@ -5,7 +5,7 @@ import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
 import android.os.Build
 import com.google.gson.GsonBuilder
-import com.web3auth.core.types.Network
+import com.web3auth.core.types.Web3AuthNetwork
 import com.web3auth.session_manager_android.BuildConfig
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
@@ -15,13 +15,13 @@ import java.util.concurrent.TimeUnit
 
 object ApiHelper {
     // TODO: Abstract this to a single common source, i.e torus-common, then add these to here and fetch-node-details, etc respectively
-    val SIGNER_MAP: Map<Network, String> = mapOf(
-        Network.MAINNET to "https://signer.web3auth.io",
-        Network.TESTNET to "https://signer.web3auth.io",
-        Network.CYAN to "https://signer-polygon.web3auth.io",
-        Network.AQUA to "https://signer-polygon.web3auth.io",
-        Network.SAPPHIRE_MAINNET to "https://signer.web3auth.io",
-        Network.SAPPHIRE_DEVNET to "https://signer.web3auth.io"
+    val SIGNER_MAP: Map<Web3AuthNetwork, String> = mapOf(
+        Web3AuthNetwork.MAINNET to "https://signer.web3auth.io",
+        Web3AuthNetwork.TESTNET to "https://signer.web3auth.io",
+        Web3AuthNetwork.CYAN to "https://signer-polygon.web3auth.io",
+        Web3AuthNetwork.AQUA to "https://signer-polygon.web3auth.io",
+        Web3AuthNetwork.SAPPHIRE_MAINNET to "https://signer.web3auth.io",
+        Web3AuthNetwork.SAPPHIRE_DEVNET to "https://signer.web3auth.io"
     )
 
     private const val sessionBaseUrl = "https://session.web3auth.io"
@@ -39,7 +39,7 @@ object ApiHelper {
     private val builder = GsonBuilder().disableHtmlEscaping().create()
 
     fun getInstance(network: String): Retrofit {
-        return Retrofit.Builder().baseUrl(SIGNER_MAP[Network.valueOf(network)])
+        return Retrofit.Builder().baseUrl(SIGNER_MAP[Web3AuthNetwork.valueOf(network)])
             .addConverterFactory(GsonConverterFactory.create(builder))
             .client(okHttpClient)
             .build()
diff --git a/core/src/main/java/com/web3auth/core/types/Network.kt b/core/src/main/java/com/web3auth/core/types/Web3AuthNetwork.kt
similarity index 93%
rename from core/src/main/java/com/web3auth/core/types/Network.kt
rename to core/src/main/java/com/web3auth/core/types/Web3AuthNetwork.kt
index 852d18f5..66d68d4e 100644
--- a/core/src/main/java/com/web3auth/core/types/Network.kt
+++ b/core/src/main/java/com/web3auth/core/types/Web3AuthNetwork.kt
@@ -4,7 +4,7 @@ import androidx.annotation.Keep
 import com.google.gson.annotations.SerializedName
 
 @Keep
-enum class Network {
+enum class Web3AuthNetwork {
     @SerializedName("mainnet")
     MAINNET,
 
diff --git a/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt b/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt
index 571826f0..0c8a7dc0 100644
--- a/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt
+++ b/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt
@@ -6,7 +6,7 @@ import androidx.annotation.Keep
 @Keep
 data class Web3AuthOptions(
     val clientId: String,
-    val network: Network,
+    val web3AuthNetwork: Web3AuthNetwork,
     var authBuildEnv: BuildEnv? = BuildEnv.PRODUCTION,
     @Transient var redirectUrl: Uri,
     var sdkUrl: String = getSdkUrl(authBuildEnv),

From 4bb0571fa93c595c5ec325cf15e2f3f73b14051c Mon Sep 17 00:00:00 2001
From: Gaurav Goel <grvgoel19@gmail.com>
Date: Fri, 25 Apr 2025 09:32:28 +0530
Subject: [PATCH 12/19] feat: Replace privKey to privateKey in Web3AuthResponse

Signed-off-by: Gaurav Goel <gaurav@tor.us>
---
 core/src/main/java/com/web3auth/core/Web3Auth.kt            | 6 +++---
 .../main/java/com/web3auth/core/types/Web3AuthOptions.kt    | 2 ++
 .../main/java/com/web3auth/core/types/Web3AuthResponse.kt   | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/com/web3auth/core/Web3Auth.kt b/core/src/main/java/com/web3auth/core/Web3Auth.kt
index 81ae819c..adc979b5 100644
--- a/core/src/main/java/com/web3auth/core/Web3Auth.kt
+++ b/core/src/main/java/com/web3auth/core/Web3Auth.kt
@@ -283,7 +283,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
                                 throwLoginError(ErrorCode.SOMETHING_WENT_WRONG)
                                 throwEnableMFAError(ErrorCode.SOMETHING_WENT_WRONG)
                                 throwManageMFAError(ErrorCode.SOMETHING_WENT_WRONG)
-                            } else if (web3AuthResponse?.privKey.isNullOrBlank() && web3AuthResponse?.factorKey.isNullOrBlank()) {
+                            } else if (web3AuthResponse?.privateKey.isNullOrBlank() && web3AuthResponse?.factorKey.isNullOrBlank()) {
                                 throwLoginError(ErrorCode.SOMETHING_WENT_WRONG)
                                 throwEnableMFAError(ErrorCode.SOMETHING_WENT_WRONG)
                                 throwManageMFAError(ErrorCode.SOMETHING_WENT_WRONG)
@@ -431,7 +431,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
                             )
                         )
                     )
-                } else if (web3AuthResponse?.privKey.isNullOrBlank() && web3AuthResponse?.factorKey.isNullOrBlank()) {
+                } else if (web3AuthResponse?.privateKey.isNullOrBlank() && web3AuthResponse?.factorKey.isNullOrBlank()) {
                     sessionCompletableFuture.completeExceptionally(
                         Exception(
                             Web3AuthError.getError(ErrorCode.SOMETHING_WENT_WRONG)
@@ -697,7 +697,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
             if (web3AuthOption.useCoreKitKey == true) {
                 web3AuthResponse?.coreKitKey
             } else {
-                web3AuthResponse?.privKey
+                web3AuthResponse?.privateKey
             }
         }
         return privKey
diff --git a/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt b/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt
index 0c8a7dc0..cb3af55c 100644
--- a/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt
+++ b/core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt
@@ -2,10 +2,12 @@ package com.web3auth.core.types
 
 import android.net.Uri
 import androidx.annotation.Keep
+import com.google.gson.annotations.SerializedName
 
 @Keep
 data class Web3AuthOptions(
     val clientId: String,
+    @SerializedName("network")
     val web3AuthNetwork: Web3AuthNetwork,
     var authBuildEnv: BuildEnv? = BuildEnv.PRODUCTION,
     @Transient var redirectUrl: Uri,
diff --git a/core/src/main/java/com/web3auth/core/types/Web3AuthResponse.kt b/core/src/main/java/com/web3auth/core/types/Web3AuthResponse.kt
index a03179c0..d7c21bcd 100644
--- a/core/src/main/java/com/web3auth/core/types/Web3AuthResponse.kt
+++ b/core/src/main/java/com/web3auth/core/types/Web3AuthResponse.kt
@@ -1,10 +1,12 @@
 package com.web3auth.core.types
 
 import androidx.annotation.Keep
+import com.google.gson.annotations.SerializedName
 
 @Keep
 data class Web3AuthResponse(
-    val privKey: String? = null,
+    @SerializedName("privKey")
+    val privateKey: String? = null,
     val ed25519PrivKey: String? = null,
     val userInfo: UserInfo? = null,
     val error: String? = null,

From cce87713c1ae9e8d9217c393e05214bb2a116bdc Mon Sep 17 00:00:00 2001
From: Gaurav Goel <gaurav@tor.us>
Date: Mon, 28 Apr 2025 11:15:20 +0530
Subject: [PATCH 13/19] feat: documentation added.

Signed-off-by: Gaurav Goel <gaurav@tor.us>
---
 app/src/main/java/com/web3auth/app/MainActivity.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/web3auth/app/MainActivity.kt b/app/src/main/java/com/web3auth/app/MainActivity.kt
index 4d1f2d98..152bef8e 100644
--- a/app/src/main/java/com/web3auth/app/MainActivity.kt
+++ b/app/src/main/java/com/web3auth/app/MainActivity.kt
@@ -169,8 +169,8 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
             clientId = "BFuUqebV5I8Pz5F7a5A2ihW7YVmbv_OHXnHYDv6OltAD5NGr6e-ViNvde3U4BHdn6HvwfkgobhVu4VwC-OSJkik",
             web3AuthNetwork = Web3AuthNetwork.SAPPHIRE_DEVNET,
             redirectUrl = Uri.parse("torusapp://org.torusresearch.web3authexample"),
-//            sdkUrl = "https://auth.mocaverse.xyz",
-//            walletSdkUrl = "https://lrc-mocaverse.web3auth.io",
+            //sdkUrl = "https://auth.mocaverse.xyz",
+            //walletSdkUrl = "https://lrc-mocaverse.web3auth.io",
             whiteLabel = WhiteLabelData(
                 "Web3Auth Sample App", null, null, null,
                 Language.EN, ThemeModes.LIGHT, true,
@@ -197,6 +197,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
             options, this
         )
 
+        //Set intent result url from Web3Auth redirect
         web3Auth.setResultUrl(intent.data)
 
         // for session response

From 8e386172477775a202f31c044431bfbf66c7b8f8 Mon Sep 17 00:00:00 2001
From: Gaurav Goel <gaurav@tor.us>
Date: Tue, 29 Apr 2025 11:34:03 +0530
Subject: [PATCH 14/19] feat: for testing purpose

Signed-off-by: Gaurav Goel <gaurav@tor.us>
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0202283f..f3a952c0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,7 +31,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.debug
         }

From 57871c352d846ca8b58a6193e43ecb1500a5ed84 Mon Sep 17 00:00:00 2001
From: Gaurav Goel <gaurav@tor.us>
Date: Tue, 29 Apr 2025 12:03:13 +0530
Subject: [PATCH 15/19] feat: for testing purpose

Signed-off-by: Gaurav Goel <gaurav@tor.us>
---
 core/build.gradle | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/build.gradle b/core/build.gradle
index 7d32ef70..5289f945 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -17,6 +17,9 @@ android {
     }
 
     buildTypes {
+        debug {
+            minifyEnabled false
+        }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

From bb10e731764c5e304305e1c5489d1fd02d4569dd Mon Sep 17 00:00:00 2001
From: Gaurav Goel <gaurav@tor.us>
Date: Tue, 29 Apr 2025 12:11:00 +0530
Subject: [PATCH 16/19] feat: for testing purpose

Signed-off-by: Gaurav Goel <gaurav@tor.us>
---
 core/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/build.gradle b/core/build.gradle
index 5289f945..12341192 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -19,6 +19,7 @@ android {
     buildTypes {
         debug {
             minifyEnabled false
+            debuggable true
         }
         release {
             minifyEnabled false

From 4f25de203ab563fa52e7ccad8206fc0f7ed07cb6 Mon Sep 17 00:00:00 2001
From: Gaurav Goel <gaurav@tor.us>
Date: Tue, 29 Apr 2025 14:47:45 +0530
Subject: [PATCH 17/19] feat: replace AuthConnection jwt type to custom

Signed-off-by: Gaurav Goel <gaurav@tor.us>
---
 app/src/main/java/com/web3auth/app/MainActivity.kt           | 4 ++--
 core/src/main/java/com/web3auth/core/types/AuthConnection.kt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/web3auth/app/MainActivity.kt b/app/src/main/java/com/web3auth/app/MainActivity.kt
index 152bef8e..36ec27bf 100644
--- a/app/src/main/java/com/web3auth/app/MainActivity.kt
+++ b/app/src/main/java/com/web3auth/app/MainActivity.kt
@@ -56,7 +56,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
         AuthConnectionLogin("Line", AuthConnection.LINE),
         AuthConnectionLogin("Hosted Email Passwordless", AuthConnection.EMAIL_PASSWORDLESS),
         AuthConnectionLogin("SMS Passwordless", AuthConnection.SMS_PASSWORDLESS),
-        AuthConnectionLogin("JWT", AuthConnection.JWT),
+        AuthConnectionLogin("CUSTOM", AuthConnection.CUSTOM),
         AuthConnectionLogin("Farcaster", AuthConnection.FARCASTER)
     )
 
@@ -182,7 +182,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
             authConnectionConfig = listOf(
                 AuthConnectionConfig(
                     authConnectionId = "web3auth-auth0-email-passwordless-sapphire-devnet",
-                    authConnection = AuthConnection.JWT,
+                    authConnection = AuthConnection.CUSTOM,
                     clientId = "d84f6xvbdV75VTGmHiMWfZLeSPk8M07C"
                 )
             ),
diff --git a/core/src/main/java/com/web3auth/core/types/AuthConnection.kt b/core/src/main/java/com/web3auth/core/types/AuthConnection.kt
index fb94234f..06b87b35 100644
--- a/core/src/main/java/com/web3auth/core/types/AuthConnection.kt
+++ b/core/src/main/java/com/web3auth/core/types/AuthConnection.kt
@@ -47,8 +47,8 @@ enum class AuthConnection {
     @SerializedName("email_passwordless")
     EMAIL_PASSWORDLESS,
 
-    @SerializedName("jwt")
-    JWT, // needs to check whether removed or not
+    @SerializedName("custom")
+    CUSTOM,
 
     @SerializedName("sms_passwordless")
     SMS_PASSWORDLESS,

From 29f9151d29336ce65716f4fba23d5aa0953ba901 Mon Sep 17 00:00:00 2001
From: Gaurav Goel <gaurav@tor.us>
Date: Tue, 29 Apr 2025 15:01:22 +0530
Subject: [PATCH 18/19] feat: enabling minifyEnabled true in release mode.

Signed-off-by: Gaurav Goel <gaurav@tor.us>
---
 core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build.gradle b/core/build.gradle
index 12341192..389ae010 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -22,7 +22,7 @@ android {
             debuggable true
         }
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             consumerProguardFiles 'proguard-rules.pro', 'gson.pro', 'retrofit2.pro'
         }

From 904235e4f1a77c64f2665020e88443ff0bcbeaab Mon Sep 17 00:00:00 2001
From: Gaurav Goel <gaurav@tor.us>
Date: Wed, 30 Apr 2025 12:43:33 +0530
Subject: [PATCH 19/19] feat: enabling minifyEnabled true in release mode.

Signed-off-by: Gaurav Goel <gaurav@tor.us>
---
 core/src/main/java/com/web3auth/core/types/AuthConnection.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/com/web3auth/core/types/AuthConnection.kt b/core/src/main/java/com/web3auth/core/types/AuthConnection.kt
index 06b87b35..5b5d2aa4 100644
--- a/core/src/main/java/com/web3auth/core/types/AuthConnection.kt
+++ b/core/src/main/java/com/web3auth/core/types/AuthConnection.kt
@@ -48,7 +48,7 @@ enum class AuthConnection {
     EMAIL_PASSWORDLESS,
 
     @SerializedName("custom")
-    CUSTOM,
+    CUSTOM, //for jwt
 
     @SerializedName("sms_passwordless")
     SMS_PASSWORDLESS,