@solana-mobile/mobile-wallet-adapter-walletlib 1.0.3 → 1.2.0

package/android/build/outputs/logs/manifest-merger-debug-report.txt

@@ -0,0 +1,16 @@
+-- Merging decision tree log ---
+manifest
+ADDED from /private/var/folders/hc/hvb9tj1s3w10jlcyw0rkqfph0000gn/T/eas-build-local-nodejs/216d8c76-a058-466d-b7a1-3342851e270f/build/examples/mwa-bottom-sheet-wallet/node_modules/@solana-mobile/mobile-wallet-adapter-walletlib/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest11458394771596956116.xml:2:13-83
+INJECTED from /private/var/folders/hc/hvb9tj1s3w10jlcyw0rkqfph0000gn/T/eas-build-local-nodejs/216d8c76-a058-466d-b7a1-3342851e270f/build/examples/mwa-bottom-sheet-wallet/node_modules/@solana-mobile/mobile-wallet-adapter-walletlib/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest11458394771596956116.xml:2:13-83
+	package
+		INJECTED from /private/var/folders/hc/hvb9tj1s3w10jlcyw0rkqfph0000gn/T/eas-build-local-nodejs/216d8c76-a058-466d-b7a1-3342851e270f/build/examples/mwa-bottom-sheet-wallet/node_modules/@solana-mobile/mobile-wallet-adapter-walletlib/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest11458394771596956116.xml
+	xmlns:android
+		ADDED from /private/var/folders/hc/hvb9tj1s3w10jlcyw0rkqfph0000gn/T/eas-build-local-nodejs/216d8c76-a058-466d-b7a1-3342851e270f/build/examples/mwa-bottom-sheet-wallet/node_modules/@solana-mobile/mobile-wallet-adapter-walletlib/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest11458394771596956116.xml:2:23-81
+uses-sdk
+INJECTED from /private/var/folders/hc/hvb9tj1s3w10jlcyw0rkqfph0000gn/T/eas-build-local-nodejs/216d8c76-a058-466d-b7a1-3342851e270f/build/examples/mwa-bottom-sheet-wallet/node_modules/@solana-mobile/mobile-wallet-adapter-walletlib/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest11458394771596956116.xml reason: use-sdk injection requested
+INJECTED from /private/var/folders/hc/hvb9tj1s3w10jlcyw0rkqfph0000gn/T/eas-build-local-nodejs/216d8c76-a058-466d-b7a1-3342851e270f/build/examples/mwa-bottom-sheet-wallet/node_modules/@solana-mobile/mobile-wallet-adapter-walletlib/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest11458394771596956116.xml
+INJECTED from /private/var/folders/hc/hvb9tj1s3w10jlcyw0rkqfph0000gn/T/eas-build-local-nodejs/216d8c76-a058-466d-b7a1-3342851e270f/build/examples/mwa-bottom-sheet-wallet/node_modules/@solana-mobile/mobile-wallet-adapter-walletlib/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest11458394771596956116.xml
+	android:targetSdkVersion
+		INJECTED from /private/var/folders/hc/hvb9tj1s3w10jlcyw0rkqfph0000gn/T/eas-build-local-nodejs/216d8c76-a058-466d-b7a1-3342851e270f/build/examples/mwa-bottom-sheet-wallet/node_modules/@solana-mobile/mobile-wallet-adapter-walletlib/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest11458394771596956116.xml
+	android:minSdkVersion
+		INJECTED from /private/var/folders/hc/hvb9tj1s3w10jlcyw0rkqfph0000gn/T/eas-build-local-nodejs/216d8c76-a058-466d-b7a1-3342851e270f/build/examples/mwa-bottom-sheet-wallet/node_modules/@solana-mobile/mobile-wallet-adapter-walletlib/android/build/intermediates/tmp/ProcessLibraryManifest/debug/tempAndroidManifest11458394771596956116.xml

package/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.4.2'
+    classpath 'com.android.tools.build:gradle:8.2.2'
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
@@ -135,11 +135,11 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"  // From node_modules
-  implementation 'com.solanamobile:digital-asset-links-android:1.0.2'
-  implementation "com.solanamobile:mobile-wallet-adapter-walletlib:1.1.0"
+  implementation 'com.solanamobile:digital-asset-links-android:1.0.3'
+  implementation "com.solanamobile:mobile-wallet-adapter-walletlib:2.0.2"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
-  implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
+  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
+  implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
 }
 
 if (isNewArchitectureEnabled()) {

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -1,5 +1,8 @@
 package com.solanamobile.mobilewalletadapterwalletlib.reactnative
 
+import android.util.Base64
+import com.solana.mobilewalletadapter.common.signin.SignInWithSolana
+import com.solana.mobilewalletadapter.walletlib.scenario.SignInResult
 import com.solanamobile.mobilewalletadapterwalletlib.reactnative.model.AuthorizeDappResponse
 import com.solanamobile.mobilewalletadapterwalletlib.reactnative.model.DeauthorizeDappResponse
 import com.solanamobile.mobilewalletadapterwalletlib.reactnative.model.MobileWalletAdapterFailureResponse
@@ -17,12 +20,17 @@ import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonContentPolymorphicSerializer
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonNull
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonTransformingSerializer
 import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
+import kotlinx.serialization.json.put
+import org.json.JSONObject
 
 internal open class TypeTransformingSerializer<T: Any>(serializer: KSerializer<T>) : JsonTransformingSerializer<T>(serializer) {
     override fun transformSerialize(element: JsonElement): JsonElement =
@@ -76,7 +84,7 @@ internal object FailReasonTransformingSerializer
 internal object MobileWalletAdapterResponseSerializer : JsonContentPolymorphicSerializer<MobileWalletAdapterResponse>(MobileWalletAdapterResponse::class) {
     override fun selectDeserializer(element: JsonElement): DeserializationStrategy<out MobileWalletAdapterResponse> =
         if ((element as? JsonObject)?.containsKey("failReason") == true) FailReasonTransformingSerializer
-        else if ((element as? JsonObject)?.containsKey("publicKey") == true) AuthorizeDappResponse.serializer()
+        else if ((element as? JsonObject)?.containsKey("accounts") == true) AuthorizeDappResponse.serializer()
         else if ((element as? JsonObject)?.containsKey("authorizationScope") == true) ReauthorizeDappResponse.serializer()
         else if ((element as? JsonObject)?.containsKey("signedPayloads") == true) SignedPayloads.serializer()
         else if ((element as? JsonObject)?.containsKey("signedTransactions") == true) SignedAndSentTransactions.serializer() 
@@ -109,4 +117,41 @@ object ByteArrayCollectionAsMapCollectionSerializer : KSerializer<List<ByteArray
 
     override fun serialize(encoder: Encoder, value: List<ByteArray>) =
         encoder.encodeSerializableValue(ListSerializer(ByteArrayAsMapSerializer), value)
+}
+
+object SignInPayloadSerializer : KSerializer<SignInWithSolana.Payload> {
+    override val descriptor: SerialDescriptor = JsonElement.serializer().descriptor
+    
+    val json = Json { ignoreUnknownKeys = true }
+
+    override fun deserialize(decoder: Decoder): SignInWithSolana.Payload =
+        SignInWithSolana.Payload.fromJson(
+            JSONObject(decoder.decodeSerializableValue(JsonElement.serializer()).toString())
+        )
+
+    override fun serialize(encoder: Encoder, value: SignInWithSolana.Payload) =
+        encoder.encodeSerializableValue(JsonElement.serializer(), 
+            json.decodeFromString(JsonElement.serializer(), value.toJson().toString()))
+}
+
+object SignInResultSerializer : KSerializer<SignInResult> {
+    override val descriptor: SerialDescriptor = JsonElement.serializer().descriptor
+
+    override fun deserialize(decoder: Decoder): SignInResult =
+        decoder.decodeSerializableValue(JsonObject.serializer()).let { json ->
+            SignInResult(
+                Base64.decode(json["address"]!!.jsonPrimitive.content, Base64.NO_WRAP),
+                Base64.decode(json["signed_message"]!!.jsonPrimitive.content, Base64.NO_WRAP),
+                Base64.decode(json["signature"]!!.jsonPrimitive.content, Base64.NO_WRAP),
+                json["signature_type"]?.jsonPrimitive?.content
+            )
+        }
+
+    override fun serialize(encoder: Encoder, value: SignInResult) =
+        encoder.encodeSerializableValue(JsonElement.serializer(), buildJsonObject { 
+            put("address", Base64.encodeToString(value.publicKey, Base64.NO_WRAP))
+            put("signed_message", Base64.encodeToString(value.signedMessage, Base64.NO_WRAP))
+            put("signature", Base64.encodeToString(value.signature, Base64.NO_WRAP))
+            put("signature_type", value.signatureType)
+        })
 }

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

@@ -10,6 +10,7 @@ import com.solana.mobilewalletadapter.walletlib.association.LocalAssociationUri
 import com.solana.mobilewalletadapter.walletlib.authorization.AuthIssuerConfig
 import com.solana.mobilewalletadapter.walletlib.protocol.MobileWalletAdapterConfig
 import com.solana.mobilewalletadapter.walletlib.scenario.*
+import com.solana.mobilewalletadapter.walletlib.scenario.AuthorizedAccount
 import com.solana.mobilewalletadapter.common.ProtocolContract
 import com.solanamobile.mobilewalletadapterwalletlib.reactnative.BuildConfig
 import com.solanamobile.mobilewalletadapterwalletlib.reactnative.model.*
@@ -187,10 +188,13 @@ class SolanaMobileWalletAdapterWalletLibModule(val reactContext: ReactApplicatio
                 is AuthorizeDappResponse ->
                     (pendingRequest as? MobileWalletAdapterRemoteRequest.AuthorizeDapp)
                         ?.request?.completeWithAuthorize(
-                            response.publicKey,
-                            response.accountLabel,
-                            null, //Uri.parse(response.walletUriBase),
-                            response.authorizationScope
+                            response.accounts.first().let { account ->
+                                AuthorizedAccount(account.publicKey, account.accountLabel, account.icon?.let{ Uri.parse(it) }, 
+                                    account.chains?.toTypedArray(), account.features?.toTypedArray())
+                            },
+                            response.walletUriBase?.let { Uri.parse(response.walletUriBase) },
+                            response.authorizationScope,
+                            response.signInResult
                         )
                 else -> completeWithInvalidResponse()
             }
@@ -275,31 +279,33 @@ class SolanaMobileWalletAdapterWalletLibModule(val reactContext: ReactApplicatio
     private fun sendWalletServiceRequestToReact(request: MobileWalletAdapterRemoteRequest) {
         val surrogate = when(request) {
             is MobileWalletAdapterRemoteRequest.AuthorizeDapp -> AuthorizeDapp(
-                scenarioId!!, request.request.cluster, request.request.identityName,
-                request.request.identityUri.toString(), request.request.iconRelativeUri.toString()
+                scenarioId!!, request.request.chain, request.request.identityName,
+                request.request.identityUri.toString(), request.request.iconRelativeUri.toString(),
+                request.request.features?.asList(), request.request.addresses?.asList(), 
+                request.request.signInPayload
             )
             is MobileWalletAdapterRemoteRequest.ReauthorizeDapp -> ReauthorizeDapp(
-                scenarioId!!, request.request.cluster, request.request.identityName,
+                scenarioId!!, request.request.chain, request.request.identityName,
                 request.request.identityUri.toString(), request.request.iconRelativeUri.toString(),
                 request.request.authorizationScope
             )
             is MobileWalletAdapterRemoteRequest.DeauthorizeDapp -> DeauthorizeDapp(
-                scenarioId!!, request.request.cluster, request.request.identityName,
+                scenarioId!!, request.request.chain, request.request.identityName,
                 request.request.identityUri.toString(), request.request.iconRelativeUri.toString(),
                 request.request.authorizationScope
             )
             is MobileWalletAdapterRemoteRequest.SignMessages -> SignMessages(
-                scenarioId!!, request.request.cluster, request.request.identityName,
+                scenarioId!!, request.request.chain, request.request.identityName,
                 request.request.identityUri.toString(), request.request.iconRelativeUri.toString(),
                 request.request.authorizationScope, request.request.payloads.toList()
             )
             is MobileWalletAdapterRemoteRequest.SignTransactions -> SignTransactions(
-                scenarioId!!, request.request.cluster, request.request.identityName,
+                scenarioId!!, request.request.chain, request.request.identityName,
                 request.request.identityUri.toString(), request.request.iconRelativeUri.toString(),
                 request.request.authorizationScope, request.request.payloads.toList()
             )
             is MobileWalletAdapterRemoteRequest.SignAndSendTransactions -> SignAndSendTransactions(
-                scenarioId!!, request.request.cluster, request.request.identityName,
+                scenarioId!!, request.request.chain, request.request.identityName,
                 request.request.identityUri.toString(), request.request.iconRelativeUri.toString(),
                 request.request.authorizationScope, request.request.payloads.toList()
             )

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

@@ -16,12 +16,12 @@ import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonPrimitive
 
 @Serializable
-data class MobileWalletAdapterConfigSurrogate(
-    val supportsSignAndSendTransactions: Boolean,
+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) {
@@ -38,22 +38,22 @@ object MobileWalletAdapterConfigSerializer : KSerializer<MobileWalletAdapterConf
     override fun deserialize(decoder: Decoder): MobileWalletAdapterConfig {
         val surrogate = decoder.decodeSerializableValue(delegateSerializer)
         return MobileWalletAdapterConfig(
-            surrogate.supportsSignAndSendTransactions, 
             surrogate.maxTransactionsPerSigningRequest,
             surrogate.maxMessagesPerSigningRequest,
             surrogate.supportedTransactionVersions.toTypedArray(),
-            surrogate.noConnectionWarningTimeoutMs
+            surrogate.noConnectionWarningTimeoutMs,
+            surrogate.optionalFeatures.toTypedArray()
         )
     }
 
     override fun serialize(encoder: Encoder, value: MobileWalletAdapterConfig) {
         encoder.encodeSerializableValue(delegateSerializer, 
             MobileWalletAdapterConfigSurrogate(
-                value.supportsSignAndSendTransactions,
                 value.maxTransactionsPerSigningRequest,
                 value.maxMessagesPerSigningRequest,
                 value.supportedTransactionVersions.toList(),
-                value.noConnectionWarningTimeoutMs
+                value.noConnectionWarningTimeoutMs,
+                value.optionalFeatures.toList()
             )
         )
     }