@solana-mobile/mobile-wallet-adapter-walletlib 1.4.0 → 1.4.2

package/android/src/main/java/com/solanamobile/mobilewalletadapterwalletlib/reactnative/model/MobileWalletAdapterConfig.kt

@@ -1,60 +1,60 @@
-package com.solanamobile.mobilewalletadapterwalletlib.reactnative.model
-
-import com.solana.mobilewalletadapter.walletlib.protocol.MobileWalletAdapterConfig
-import kotlinx.serialization.DeserializationStrategy
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.builtins.ListSerializer
-import kotlinx.serialization.builtins.serializer
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.json.JsonContentPolymorphicSerializer
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.JsonPrimitive
-
-@Serializable
-private data class MobileWalletAdapterConfigSurrogate(
-    val maxTransactionsPerSigningRequest: Int,
-    val maxMessagesPerSigningRequest: Int,
-    val supportedTransactionVersions: List<@Serializable(with = TransactionVersionSerializer::class) Any>,
-    val noConnectionWarningTimeoutMs: Long,
-    val optionalFeatures: List<String>
-)
-
-object TransactionVersionSerializer : JsonContentPolymorphicSerializer<Any>(Any::class) {
-    override fun selectDeserializer(element: JsonElement): DeserializationStrategy<out Any> =
-        if ((element as? JsonPrimitive)?.content?.toIntOrNull() != null) Int.serializer()
-        else if ((element as? JsonPrimitive)?.content == "legacy") String.serializer()
-        else throw IllegalArgumentException("supportedTransactionVersions must be either the string \"legacy\" or a non-negative integer")
-}
-
-object MobileWalletAdapterConfigSerializer : KSerializer<MobileWalletAdapterConfig> {
-    private val delegateSerializer = MobileWalletAdapterConfigSurrogate.serializer()
-    override val descriptor: SerialDescriptor = delegateSerializer.descriptor
-
-    override fun deserialize(decoder: Decoder): MobileWalletAdapterConfig {
-        val surrogate = decoder.decodeSerializableValue(delegateSerializer)
-        return MobileWalletAdapterConfig(
-            surrogate.maxTransactionsPerSigningRequest,
-            surrogate.maxMessagesPerSigningRequest,
-            surrogate.supportedTransactionVersions.toTypedArray(),
-            surrogate.noConnectionWarningTimeoutMs,
-            surrogate.optionalFeatures.toTypedArray()
-        )
-    }
-
-    override fun serialize(encoder: Encoder, value: MobileWalletAdapterConfig) {
-        encoder.encodeSerializableValue(delegateSerializer, 
-            MobileWalletAdapterConfigSurrogate(
-                value.maxTransactionsPerSigningRequest,
-                value.maxMessagesPerSigningRequest,
-                value.supportedTransactionVersions.toList(),
-                value.noConnectionWarningTimeoutMs,
-                value.optionalFeatures.toList()
-            )
-        )
-    }
+package com.solanamobile.mobilewalletadapterwalletlib.reactnative.model
+
+import com.solana.mobilewalletadapter.walletlib.protocol.MobileWalletAdapterConfig
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonContentPolymorphicSerializer
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonPrimitive
+
+@Serializable
+private data class MobileWalletAdapterConfigSurrogate(
+    val maxTransactionsPerSigningRequest: Int,
+    val maxMessagesPerSigningRequest: Int,
+    val supportedTransactionVersions: List<@Serializable(with = TransactionVersionSerializer::class) Any>,
+    val noConnectionWarningTimeoutMs: Long,
+    val optionalFeatures: List<String>
+)
+
+object TransactionVersionSerializer : JsonContentPolymorphicSerializer<Any>(Any::class) {
+    override fun selectDeserializer(element: JsonElement): DeserializationStrategy<out Any> =
+        if ((element as? JsonPrimitive)?.content?.toIntOrNull() != null) Int.serializer()
+        else if ((element as? JsonPrimitive)?.content == "legacy") String.serializer()
+        else throw IllegalArgumentException("supportedTransactionVersions must be either the string \"legacy\" or a non-negative integer")
+}
+
+object MobileWalletAdapterConfigSerializer : KSerializer<MobileWalletAdapterConfig> {
+    private val delegateSerializer = MobileWalletAdapterConfigSurrogate.serializer()
+    override val descriptor: SerialDescriptor = delegateSerializer.descriptor
+
+    override fun deserialize(decoder: Decoder): MobileWalletAdapterConfig {
+        val surrogate = decoder.decodeSerializableValue(delegateSerializer)
+        return MobileWalletAdapterConfig(
+            surrogate.maxTransactionsPerSigningRequest,
+            surrogate.maxMessagesPerSigningRequest,
+            surrogate.supportedTransactionVersions.toTypedArray(),
+            surrogate.noConnectionWarningTimeoutMs,
+            surrogate.optionalFeatures.toTypedArray()
+        )
+    }
+
+    override fun serialize(encoder: Encoder, value: MobileWalletAdapterConfig) {
+        encoder.encodeSerializableValue(delegateSerializer, 
+            MobileWalletAdapterConfigSurrogate(
+                value.maxTransactionsPerSigningRequest,
+                value.maxMessagesPerSigningRequest,
+                value.supportedTransactionVersions.toList(),
+                value.noConnectionWarningTimeoutMs,
+                value.optionalFeatures.toList()
+            )
+        )
+    }
 }

package/android/src/main/java/com/solanamobile/mobilewalletadapterwalletlib/reactnative/model/MobileWalletAdapterRequest.kt

@@ -1,98 +1,98 @@
-package com.solanamobile.mobilewalletadapterwalletlib.reactnative.model
-
-import com.solana.mobilewalletadapter.common.signin.SignInWithSolana
-import com.solanamobile.mobilewalletadapterwalletlib.reactnative.SignInPayloadSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import java.util.*
-
-@Serializable
-sealed class MobileWalletAdapterRequest {
-    open val requestId: String = UUID.randomUUID().toString()
-    abstract val sessionId: String
-    abstract val chain: String
-    abstract val identityName: String?
-    abstract val identityUri: String?
-    abstract val iconRelativeUri: String?
-}
-
-@Serializable
-@SerialName("AUTHORIZE_DAPP")
-data class AuthorizeDapp(
-    override val sessionId: String,
-    override val chain: String,
-    override val identityName: String?,
-    override val identityUri: String?,
-    override val iconRelativeUri: String?,
-    val features: List<String>? = null,
-    val addresses: List<String>? = null,
-    @Serializable(with = SignInPayloadSerializer::class) val signInPayload: SignInWithSolana.Payload? = null
-) : MobileWalletAdapterRequest()
-
-@Serializable
-sealed class VerifiableIdentityRequestSurrogate : MobileWalletAdapterRequest() {
-    abstract val authorizationScope: ByteArray
-}
-
-@Serializable
-@SerialName("REAUTHORIZE_DAPP")
-data class ReauthorizeDapp(
-    override val sessionId: String,
-    override val chain: String,
-    override val identityName: String?,
-    override val identityUri: String?,
-    override val iconRelativeUri: String?,
-    override val authorizationScope: ByteArray
-) : VerifiableIdentityRequestSurrogate()
-
-@Serializable
-@SerialName("DEAUTHORIZE_DAPP")
-data class DeauthorizeDapp(
-    override val sessionId: String,
-    override val chain: String,
-    override val identityName: String?,
-    override val identityUri: String?,
-    override val iconRelativeUri: String?,
-    override val authorizationScope: ByteArray
-) : VerifiableIdentityRequestSurrogate()
-
-@Serializable
-sealed class SignPayloads : VerifiableIdentityRequestSurrogate() {
-    abstract val payloads: List<ByteArray>
-}
-
-@Serializable
-@SerialName("SIGN_MESSAGES")
-data class SignMessages(
-    override val sessionId: String,
-    override val chain: String,
-    override val identityName: String?,
-    override val identityUri: String?,
-    override val iconRelativeUri: String?,
-    override val authorizationScope: ByteArray,
-    override val payloads: List<ByteArray>
-) : SignPayloads()
-
-@Serializable
-@SerialName("SIGN_TRANSACTIONS")
-data class SignTransactions(
-    override val sessionId: String,
-    override val chain: String,
-    override val identityName: String?,
-    override val identityUri: String?,
-    override val iconRelativeUri: String?,
-    override val authorizationScope: ByteArray,
-    override val payloads: List<ByteArray>
-) : SignPayloads()
-
-@Serializable
-@SerialName("SIGN_AND_SEND_TRANSACTIONS")
-data class SignAndSendTransactions(
-    override val sessionId: String,
-    override val chain: String,
-    override val identityName: String?,
-    override val identityUri: String?,
-    override val iconRelativeUri: String?,
-    override val authorizationScope: ByteArray,
-    override val payloads: List<ByteArray>
+package com.solanamobile.mobilewalletadapterwalletlib.reactnative.model
+
+import com.solana.mobilewalletadapter.common.signin.SignInWithSolana
+import com.solanamobile.mobilewalletadapterwalletlib.reactnative.SignInPayloadSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import java.util.*
+
+@Serializable
+sealed class MobileWalletAdapterRequest {
+    open val requestId: String = UUID.randomUUID().toString()
+    abstract val sessionId: String
+    abstract val chain: String
+    abstract val identityName: String?
+    abstract val identityUri: String?
+    abstract val iconRelativeUri: String?
+}
+
+@Serializable
+@SerialName("AUTHORIZE_DAPP")
+data class AuthorizeDapp(
+    override val sessionId: String,
+    override val chain: String,
+    override val identityName: String?,
+    override val identityUri: String?,
+    override val iconRelativeUri: String?,
+    val features: List<String>? = null,
+    val addresses: List<String>? = null,
+    @Serializable(with = SignInPayloadSerializer::class) val signInPayload: SignInWithSolana.Payload? = null
+) : MobileWalletAdapterRequest()
+
+@Serializable
+sealed class VerifiableIdentityRequestSurrogate : MobileWalletAdapterRequest() {
+    abstract val authorizationScope: ByteArray
+}
+
+@Serializable
+@SerialName("REAUTHORIZE_DAPP")
+data class ReauthorizeDapp(
+    override val sessionId: String,
+    override val chain: String,
+    override val identityName: String?,
+    override val identityUri: String?,
+    override val iconRelativeUri: String?,
+    override val authorizationScope: ByteArray
+) : VerifiableIdentityRequestSurrogate()
+
+@Serializable
+@SerialName("DEAUTHORIZE_DAPP")
+data class DeauthorizeDapp(
+    override val sessionId: String,
+    override val chain: String,
+    override val identityName: String?,
+    override val identityUri: String?,
+    override val iconRelativeUri: String?,
+    override val authorizationScope: ByteArray
+) : VerifiableIdentityRequestSurrogate()
+
+@Serializable
+sealed class SignPayloads : VerifiableIdentityRequestSurrogate() {
+    abstract val payloads: List<ByteArray>
+}
+
+@Serializable
+@SerialName("SIGN_MESSAGES")
+data class SignMessages(
+    override val sessionId: String,
+    override val chain: String,
+    override val identityName: String?,
+    override val identityUri: String?,
+    override val iconRelativeUri: String?,
+    override val authorizationScope: ByteArray,
+    override val payloads: List<ByteArray>
+) : SignPayloads()
+
+@Serializable
+@SerialName("SIGN_TRANSACTIONS")
+data class SignTransactions(
+    override val sessionId: String,
+    override val chain: String,
+    override val identityName: String?,
+    override val identityUri: String?,
+    override val iconRelativeUri: String?,
+    override val authorizationScope: ByteArray,
+    override val payloads: List<ByteArray>
+) : SignPayloads()
+
+@Serializable
+@SerialName("SIGN_AND_SEND_TRANSACTIONS")
+data class SignAndSendTransactions(
+    override val sessionId: String,
+    override val chain: String,
+    override val identityName: String?,
+    override val identityUri: String?,
+    override val iconRelativeUri: String?,
+    override val authorizationScope: ByteArray,
+    override val payloads: List<ByteArray>
 ) : SignPayloads()

package/android/src/main/java/com/solanamobile/mobilewalletadapterwalletlib/reactnative/model/MobileWalletAdapterResponse.kt

@@ -1,68 +1,68 @@
-package com.solanamobile.mobilewalletadapterwalletlib.reactnative.model
-
-import com.solana.mobilewalletadapter.walletlib.scenario.SignInResult
-import com.solanamobile.mobilewalletadapterwalletlib.reactnative.ByteArrayAsMapSerializer
-import com.solanamobile.mobilewalletadapterwalletlib.reactnative.ByteArrayCollectionAsMapCollectionSerializer
-import com.solanamobile.mobilewalletadapterwalletlib.reactnative.SignInResultSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-sealed class MobileWalletAdapterResponse
-
-@Serializable
-sealed class MobileWalletAdapterFailureResponse : MobileWalletAdapterResponse()
-
-@Serializable
-@SerialName("USER_DECLINED")
-object UserDeclinedResponse : MobileWalletAdapterFailureResponse()
-
-@Serializable
-@SerialName("TOO_MANY_PAYLOADS")
-object TooManyPayloadsResponse : MobileWalletAdapterFailureResponse()
-
-@Serializable
-@SerialName("AUTHORIZATION_NOT_VALID")
-object AuthorizationNotValidResponse : MobileWalletAdapterFailureResponse()
-
-@Serializable
-@SerialName("INVALID_SIGNATURES")
-data class InvalidSignaturesResponse(val valid: BooleanArray) : MobileWalletAdapterFailureResponse()
-
-@Serializable
-data class AuthorizedAccount(
-    @Serializable(with = ByteArrayAsMapSerializer::class) val publicKey: ByteArray,
-    val accountLabel: String? = String(publicKey),
-    val icon: String? = null,
-    val chains: List<String>? = null,
-    val features: List<String>? = null
-)
-
-@Serializable
-data class AuthorizeDappResponse(
-    val accounts: List<AuthorizedAccount>,
-    val walletUriBase: String? = null,
-    @Serializable(with = ByteArrayAsMapSerializer::class) val authorizationScope: ByteArray,
-    @Serializable(with = SignInResultSerializer::class) val signInResult: SignInResult? = null
-) : MobileWalletAdapterResponse()
-
-@Serializable
-data class ReauthorizeDappResponse(
-    @Serializable(with = ByteArrayAsMapSerializer::class) val publicKey: ByteArray? = null,
-    val accountLabel: String? = publicKey?.let { String(publicKey) },
-    val walletUriBase: String? = null,
-    @Serializable(with = ByteArrayAsMapSerializer::class) val authorizationScope: ByteArray
-) : MobileWalletAdapterResponse()
-
-@Serializable
-object DeauthorizeDappResponse : MobileWalletAdapterResponse()
-
-@Serializable
-data class SignedPayloads(
-    @Serializable(with = ByteArrayCollectionAsMapCollectionSerializer::class) val signedPayloads: List<ByteArray>
-) : MobileWalletAdapterResponse()
-
-@Serializable
-data class SignedAndSentTransactions(
-    @Serializable(with = ByteArrayCollectionAsMapCollectionSerializer::class) val signedTransactions: List<ByteArray>
-) : MobileWalletAdapterResponse()
+package com.solanamobile.mobilewalletadapterwalletlib.reactnative.model
+
+import com.solana.mobilewalletadapter.walletlib.scenario.SignInResult
+import com.solanamobile.mobilewalletadapterwalletlib.reactnative.ByteArrayAsMapSerializer
+import com.solanamobile.mobilewalletadapterwalletlib.reactnative.ByteArrayCollectionAsMapCollectionSerializer
+import com.solanamobile.mobilewalletadapterwalletlib.reactnative.SignInResultSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+sealed class MobileWalletAdapterResponse
+
+@Serializable
+sealed class MobileWalletAdapterFailureResponse : MobileWalletAdapterResponse()
+
+@Serializable
+@SerialName("USER_DECLINED")
+object UserDeclinedResponse : MobileWalletAdapterFailureResponse()
+
+@Serializable
+@SerialName("TOO_MANY_PAYLOADS")
+object TooManyPayloadsResponse : MobileWalletAdapterFailureResponse()
+
+@Serializable
+@SerialName("AUTHORIZATION_NOT_VALID")
+object AuthorizationNotValidResponse : MobileWalletAdapterFailureResponse()
+
+@Serializable
+@SerialName("INVALID_SIGNATURES")
+data class InvalidSignaturesResponse(val valid: BooleanArray) : MobileWalletAdapterFailureResponse()
+
+@Serializable
+data class AuthorizedAccount(
+    @Serializable(with = ByteArrayAsMapSerializer::class) val publicKey: ByteArray,
+    val accountLabel: String? = String(publicKey),
+    val icon: String? = null,
+    val chains: List<String>? = null,
+    val features: List<String>? = null
+)
+
+@Serializable
+data class AuthorizeDappResponse(
+    val accounts: List<AuthorizedAccount>,
+    val walletUriBase: String? = null,
+    @Serializable(with = ByteArrayAsMapSerializer::class) val authorizationScope: ByteArray,
+    @Serializable(with = SignInResultSerializer::class) val signInResult: SignInResult? = null
+) : MobileWalletAdapterResponse()
+
+@Serializable
+data class ReauthorizeDappResponse(
+    @Serializable(with = ByteArrayAsMapSerializer::class) val publicKey: ByteArray? = null,
+    val accountLabel: String? = publicKey?.let { String(publicKey) },
+    val walletUriBase: String? = null,
+    @Serializable(with = ByteArrayAsMapSerializer::class) val authorizationScope: ByteArray
+) : MobileWalletAdapterResponse()
+
+@Serializable
+object DeauthorizeDappResponse : MobileWalletAdapterResponse()
+
+@Serializable
+data class SignedPayloads(
+    @Serializable(with = ByteArrayCollectionAsMapCollectionSerializer::class) val signedPayloads: List<ByteArray>
+) : MobileWalletAdapterResponse()
+
+@Serializable
+data class SignedAndSentTransactions(
+    @Serializable(with = ByteArrayCollectionAsMapCollectionSerializer::class) val signedTransactions: List<ByteArray>
+) : MobileWalletAdapterResponse()