From 405502085d39197186a6b2d0ff14c842b18c71a4 Mon Sep 17 00:00:00 2001
From: Jerry Liu <jerry.liu@kraken.com>
Date: Mon, 19 Oct 2026 13:34:47 -0700
Subject: [PATCH 1/3] Remove the oidc extension module

Delete magic/ext/oidc and its settings entry. Drop the OpenID login
button, inputs, handler and strings from the example app, along with
the magic-ext-oidc dependency.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 example/build.gradle                          |  2 -
 .../link/magic/demo/login/MALoginActivity.kt  | 27 ------
 .../src/main/res/layout/activity_ma_login.xml | 29 +-----
 example/src/main/res/values/strings.xml       |  3 -
 magic/ext/oidc/.gitignore                     |  1 -
 magic/ext/oidc/build.gradle                   | 45 ---------
 magic/ext/oidc/consumer-rules.pro             |  0
 magic/ext/oidc/deploy.gradle                  | 93 -------------------
 magic/ext/oidc/gradle.properties              |  5 -
 magic/ext/oidc/proguard-rules.pro             | 21 -----
 magic/ext/oidc/src/main/AndroidManifest.xml   |  4 -
 .../magic/android/extension/oidc/Method.kt    | 11 ---
 .../android/extension/oidc/OidcExtension.kt   | 44 ---------
 .../OpenIdConfiguration.kt                    |  6 --
 settings.gradle                               |  1 -
 15 files changed, 1 insertion(+), 291 deletions(-)
 delete mode 100644 magic/ext/oidc/.gitignore
 delete mode 100644 magic/ext/oidc/build.gradle
 delete mode 100644 magic/ext/oidc/consumer-rules.pro
 delete mode 100644 magic/ext/oidc/deploy.gradle
 delete mode 100644 magic/ext/oidc/gradle.properties
 delete mode 100644 magic/ext/oidc/proguard-rules.pro
 delete mode 100644 magic/ext/oidc/src/main/AndroidManifest.xml
 delete mode 100644 magic/ext/oidc/src/main/java/link/magic/android/extension/oidc/Method.kt
 delete mode 100644 magic/ext/oidc/src/main/java/link/magic/android/extension/oidc/OidcExtension.kt
 delete mode 100644 magic/ext/oidc/src/main/java/link/magic/android/extension/oidc/requestConfiguration/OpenIdConfiguration.kt

diff --git a/example/build.gradle b/example/build.gradle
index ed7a6a6..2f2eb22 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -44,10 +44,8 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation project(':magic:core')
 //    implementation project(':magic:ext:oauth')
-//    implementation project(':magic:ext:oidc')
 //    implementation 'link.magic:magic-android:[10.4.0,11.0['
     implementation 'link.magic:magic-ext-oauth:[5.0,6.0['
-    implementation 'link.magic:magic-ext-oidc:[2.0,3.0['
     implementation "org.web3j:core:$web3j_version"
     implementation "org.web3j:geth:$web3j_version"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
diff --git a/example/src/main/java/link/magic/demo/login/MALoginActivity.kt b/example/src/main/java/link/magic/demo/login/MALoginActivity.kt
index 6ba8d81..b76a447 100644
--- a/example/src/main/java/link/magic/demo/login/MALoginActivity.kt
+++ b/example/src/main/java/link/magic/demo/login/MALoginActivity.kt
@@ -13,8 +13,6 @@ import link.magic.android.extension.oauth.oauth
 import link.magic.android.extension.oauth.requestConfiguration.OAuthConfiguration
 import link.magic.android.extension.oauth.requestConfiguration.OAuthProvider
 import link.magic.android.extension.oauth.response.OAuthResponse
-import link.magic.android.extension.oidc.openid
-import link.magic.android.extension.oidc.requestConfiguration.OpenIdConfiguration
 import link.magic.android.modules.auth.requestConfiguration.LoginWithEmailOTPConfiguration
 import link.magic.android.modules.auth.requestConfiguration.LoginWithSMSConfiguration
 import link.magic.android.modules.auth.requestConfiguration.OverridesConfiguration
@@ -55,10 +53,6 @@ class MALoginActivity : UtilActivity(), AdapterView.OnItemSelectedListener, Magi
         socialLoginButton.setOnClickListener {
             loginViaSocialProviders(it)
         }
-        val openIdLoginButton : Button = findViewById<Button>(R.id.openId_login_btn)
-        openIdLoginButton.setOnClickListener {
-            loginWithOpenId(it)
-        }
 
         val mcLoginButton : Button = findViewById<Button>(R.id.mc_login_btn)
         mcLoginButton.setOnClickListener {
@@ -188,27 +182,6 @@ class MALoginActivity : UtilActivity(), AdapterView.OnItemSelectedListener, Magi
         super.onActivityResult(requestCode, resultCode, data)
     }
 
-    /**
-     * oidc Extension
-     */
-    private fun loginWithOpenId(v: View) {
-        val providerId = findViewById<EditText>(R.id.provider_id_text)
-        val jwt = findViewById<EditText>(R.id.jwt_text)
-        val configuration = OpenIdConfiguration(jwt.text.toString(), providerId.text.toString())
-        val did = (magic as Magic).openid.loginWithOIDC(this, configuration)
-        did.whenComplete { response: DIDToken?, error: Throwable? ->
-            if (error != null) {
-                Log.d("error", error.localizedMessage)
-            }
-            if (response != null && !response.hasError()) {
-                response.result?.let { Log.d("login", it) }
-
-            } else {
-                Log.d("login", "OpenID Not Logged in")
-            }
-        }
-    }
-
     /**
      * Recover Account
      */
diff --git a/example/src/main/res/layout/activity_ma_login.xml b/example/src/main/res/layout/activity_ma_login.xml
index 791fd27..0752545 100644
--- a/example/src/main/res/layout/activity_ma_login.xml
+++ b/example/src/main/res/layout/activity_ma_login.xml
@@ -70,38 +70,11 @@
                     android:layout_marginTop="10dp"
                     android:text="@string/social_login" />
 
-                <EditText
-                    android:id="@+id/provider_id_text"
-                    android:layout_width="298dp"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/social_login_btn"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="10dp"
-                    android:hint="@string/provider_id_hint"
-                    android:inputType="text" />
-                <EditText
-                    android:id="@+id/jwt_text"
-                    android:layout_width="298dp"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/provider_id_text"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="10dp"
-                    android:hint="@string/jwt_hint"
-                    android:inputType="text" />
-                <Button
-                    android:id="@+id/openId_login_btn"
-                    android:layout_width="150dp"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/jwt_text"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="10dp"
-                    android:text="@string/openid_login" />
-
                 <EditText
                     android:id="@+id/recovery_email_input"
                     android:layout_width="298dp"
                     android:layout_height="wrap_content"
-                    android:layout_below="@+id/openId_login_btn"
+                    android:layout_below="@+id/social_login_btn"
                     android:layout_centerHorizontal="true"
                     android:layout_marginTop="10dp"
                     android:autofillHints="phone"
diff --git a/example/src/main/res/values/strings.xml b/example/src/main/res/values/strings.xml
index 773435b..72ad9f3 100644
--- a/example/src/main/res/values/strings.xml
+++ b/example/src/main/res/values/strings.xml
@@ -35,10 +35,7 @@
     <string name="sign_typed_data_legacy_json">Sign Typed Data Legacy Json</string>
     <string name="Contract_write">Contract Write</string>
     <string name="social_login">Social Login</string>
-    <string name="openid_login">OpenID Login</string>
     <string name="mc_login">Magic Connect Login</string>
-    <string name="provider_id_hint">Please enter provider Id</string>
-    <string name="jwt_hint">Please enter JWT</string>
     <string name="sms_login">SMS Login</string>
 
     <!-- MC -->
diff --git a/magic/ext/oidc/.gitignore b/magic/ext/oidc/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/magic/ext/oidc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/magic/ext/oidc/build.gradle b/magic/ext/oidc/build.gradle
deleted file mode 100644
index 7d552b5..0000000
--- a/magic/ext/oidc/build.gradle
+++ /dev/null
@@ -1,45 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'org.jetbrains.kotlin.android'
-}
-
-android {
-    compileSdk 33
-
-    defaultConfig {
-        minSdk 24
-        targetSdk 33
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-}
-
-dependencies {
-
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.6.1'
-//    implementation project(':magic:core')
-    implementation 'link.magic:magic-android:[10.0,11.0['
-    implementation "org.web3j:core:$web3j_version"
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-}
-
-apply from: 'deploy.gradle'
diff --git a/magic/ext/oidc/consumer-rules.pro b/magic/ext/oidc/consumer-rules.pro
deleted file mode 100644
index e69de29..0000000
diff --git a/magic/ext/oidc/deploy.gradle b/magic/ext/oidc/deploy.gradle
deleted file mode 100644
index df082de..0000000
--- a/magic/ext/oidc/deploy.gradle
+++ /dev/null
@@ -1,93 +0,0 @@
-apply plugin: 'maven-publish'
-apply plugin: 'signing'
-
-task androidJavadocs(type: Javadoc) {
-    excludes = ['**/*.kt']
-    source = android.sourceSets.main.java.srcDirs
-    configurations.implementation.setCanBeResolved(true)
-    classpath = configurations.implementation
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-}
-
-task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-    archiveClassifier.set('javadoc')
-    from androidJavadocs.destinationDir
-}
-
-task androidSourcesJar(type: Jar) {
-    archiveClassifier.set('sources')
-    from android.sourceSets.main.java.srcDirs
-}
-
-afterEvaluate {
-    publishing {
-        publications {
-            release(MavenPublication) {
-
-                from components.release
-
-                artifact androidJavadocsJar
-                artifact androidSourcesJar
-
-                // You can then customize attributes of the publication as shown below.
-                groupId = GROUP
-                artifactId = POM_ARTIFACT_ID
-                version = VERSION_NAME
-
-                pom {
-                    name = POM_NAME
-                    packaging = POM_PACKAGING
-                    description = POM_DESCRIPTION
-                    url = POM_URL
-                    licenses {
-                        license {
-                            name = POM_LICENCE_NAME
-                            url = POM_LICENCE_URL
-                        }
-                    }
-                    developers {
-                        developer {
-                            id = POM_DEVELOPER_ID
-                            name = POM_DEVELOPER_NAME
-                            email = POM_DEVELOPER_EMAIL
-                        }
-                    }
-                    scm {
-                        connection = POM_SCM_CONNECTION
-                        developerConnection = POM_SCM_DEV_CONNECTION
-                        url = POM_SCM_URL
-                    }
-                }
-            }
-            // Creates a Maven publication called "debug".
-            debug(MavenPublication) {
-                // Applies the component for the debug build variant.
-                from components.debug
-
-                groupId = GROUP
-                artifactId = POM_ARTIFACT_ID
-                version = VERSION_NAME
-            }
-        }
-        repositories {
-            maven {
-                def releasesRepoUrl = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-                def snapshotsRepoUrl = uri("https://oss.sonatype.org/content/repositories/snapshots/")
-                url = VERSION_NAME.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
-                credentials {
-                    username = NEXUS_USERNAME
-                    password = NEXUS_PASSWORD
-                }
-            }
-        }
-    }
-
-    artifacts {
-        archives androidSourcesJar
-        archives androidJavadocsJar
-    }
-
-    signing {
-        sign publishing.publications.release
-    }
-}
diff --git a/magic/ext/oidc/gradle.properties b/magic/ext/oidc/gradle.properties
deleted file mode 100644
index 46db544..0000000
--- a/magic/ext/oidc/gradle.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-VERSION_NAME=2.0.4
-POM_DESCRIPTION=Magic Android OIDC Extension
-POM_NAME=magic-ext-oidc
-POM_ARTIFACT_ID=magic-ext-oidc
-POM_PACKAGING=aar
diff --git a/magic/ext/oidc/proguard-rules.pro b/magic/ext/oidc/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/magic/ext/oidc/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/magic/ext/oidc/src/main/AndroidManifest.xml b/magic/ext/oidc/src/main/AndroidManifest.xml
deleted file mode 100644
index 5ec358f..0000000
--- a/magic/ext/oidc/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="link.magic.ext.oidc">
-
-</manifest>
diff --git a/magic/ext/oidc/src/main/java/link/magic/android/extension/oidc/Method.kt b/magic/ext/oidc/src/main/java/link/magic/android/extension/oidc/Method.kt
deleted file mode 100644
index 140f1df..0000000
--- a/magic/ext/oidc/src/main/java/link/magic/android/extension/oidc/Method.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package link.magic.android.extension.oidc
-
-import java.util.*
-
-internal enum class Method {
-    MAGIC_AUTH_LOGIN_WITH_OIDC;
-
-    override fun toString(): String {
-        return name.lowercase(Locale.ROOT)
-    }
-}
diff --git a/magic/ext/oidc/src/main/java/link/magic/android/extension/oidc/OidcExtension.kt b/magic/ext/oidc/src/main/java/link/magic/android/extension/oidc/OidcExtension.kt
deleted file mode 100644
index 2da9551..0000000
--- a/magic/ext/oidc/src/main/java/link/magic/android/extension/oidc/OidcExtension.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package link.magic.android.extension.oidc
-
-import android.content.Context
-import android.util.Log
-import link.magic.android.Magic
-import link.magic.android.Magic.Companion.LOG_WARN_MSG
-import link.magic.android.Magic.Companion.TAG
-import link.magic.android.core.provider.RpcProvider
-import link.magic.android.extension.oidc.requestConfiguration.OpenIdConfiguration
-import link.magic.android.modules.BaseModule
-import link.magic.android.modules.auth.response.DIDToken
-import org.web3j.protocol.core.Request
-import java.util.concurrent.CompletableFuture
-
-class OidcExtension(rpcProvider: RpcProvider): BaseModule(rpcProvider) {
-
-    companion object {
-
-        // Singleton
-        private var singleInstance: OidcExtension? = null;
-
-        fun getInstance(rpcProvider: RpcProvider): OidcExtension {
-            if (singleInstance == null)
-                singleInstance = OidcExtension(rpcProvider);
-
-            return singleInstance as OidcExtension;
-        }
-    }
-
-    fun loginWithOIDC(context: Context, configuration: OpenIdConfiguration): CompletableFuture<DIDToken> {
-        provider.context = context
-        val request = Request(Method.MAGIC_AUTH_LOGIN_WITH_OIDC.toString(), listOf(configuration), provider, DIDToken::class.java)
-        return provider.sendAsync(request, DIDToken::class.java)
-    }
-}
-
-/**
- * Extend OAuth
- */
-val Magic.openid: OidcExtension
-    get() {
-        Log.w(TAG, LOG_WARN_MSG)
-        return OidcExtension.getInstance(this.rpcProvider)
-    }
diff --git a/magic/ext/oidc/src/main/java/link/magic/android/extension/oidc/requestConfiguration/OpenIdConfiguration.kt b/magic/ext/oidc/src/main/java/link/magic/android/extension/oidc/requestConfiguration/OpenIdConfiguration.kt
deleted file mode 100644
index ad066d5..0000000
--- a/magic/ext/oidc/src/main/java/link/magic/android/extension/oidc/requestConfiguration/OpenIdConfiguration.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package link.magic.android.extension.oidc.requestConfiguration
-
-import androidx.annotation.Keep
-
-@Keep
-data class OpenIdConfiguration constructor(val jwt: String, val providerId: String)
diff --git a/settings.gradle b/settings.gradle
index f4b7e97..8de81b4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,3 @@
 include ':magic:ext:oauth'
 include ':example'
 include ':magic:core'
-include ':magic:ext:oidc'

From 07b093d4c90aeae55c16e12982a9abcf7bb9fae6 Mon Sep 17 00:00:00 2001
From: Jerry Liu <jerry.liu@kraken.com>
Date: Sun, 18 Oct 2026 11:40:58 -0700
Subject: [PATCH 2/3] Add Solana and Bitcoin extensions

Mirrors @magic-ext/solana and @magic-ext/bitcoin, and the iOS SDK change.
Pass SolanaConfiguration and BitcoinConfiguration to the Magic constructor,
then use magic.solana and magic.bitcoin (null unless configured).

Solana methods send an object for params, which web3j's Request cannot hold,
so RpcProvider gets an internal sendAsync for that. Bytes use the mgbox
typed-array format.

Also stop RpcProvider from deleting every escaped newline from the message.
That changed any multi-line text to sign (for example a Sign-In With Solana
message). The newlines came from the wrapped base64 in the URL params, so
the params are now encoded with NO_WRAP.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 .../src/main/java/link/magic/android/Magic.kt |  36 +++-
 .../core/provider/ObjectParamsRequest.kt      |  26 +++
 .../android/core/provider/RpcProvider.kt      |  26 ++-
 .../core/relayer/urlBuilder/BaseOptions.kt    |   3 +-
 .../core/relayer/urlBuilder/URLBuilder.kt     |  10 +-
 .../network/CustomNodeBaseOptions.kt          |   5 +-
 .../urlBuilder/network/NetworkBaseOptions.kt  |   5 +-
 .../modules/bitcoin/BitcoinConfiguration.kt   |  70 +++++++
 .../modules/bitcoin/BitcoinExtension.kt       |  61 ++++++
 .../magic/android/modules/bitcoin/Method.kt   |   9 +
 .../extension/ExtensionConfiguration.kt       |  29 +++
 .../android/modules/multichain/Method.kt      |  10 +
 .../modules/multichain/MultichainExtension.kt |  53 ++++++
 .../android/modules/multichain/TypedArray.kt  |  74 ++++++++
 .../magic/android/modules/solana/Method.kt    |  15 ++
 .../modules/solana/SolanaConfiguration.kt     |  85 +++++++++
 .../android/modules/solana/SolanaExtension.kt |  91 +++++++++
 .../magic/android/MultichainExtensionTest.kt  | 179 ++++++++++++++++++
 18 files changed, 765 insertions(+), 22 deletions(-)
 create mode 100644 magic/core/src/main/java/link/magic/android/core/provider/ObjectParamsRequest.kt
 create mode 100644 magic/core/src/main/java/link/magic/android/modules/bitcoin/BitcoinConfiguration.kt
 create mode 100644 magic/core/src/main/java/link/magic/android/modules/bitcoin/BitcoinExtension.kt
 create mode 100644 magic/core/src/main/java/link/magic/android/modules/bitcoin/Method.kt
 create mode 100644 magic/core/src/main/java/link/magic/android/modules/extension/ExtensionConfiguration.kt
 create mode 100644 magic/core/src/main/java/link/magic/android/modules/multichain/Method.kt
 create mode 100644 magic/core/src/main/java/link/magic/android/modules/multichain/MultichainExtension.kt
 create mode 100644 magic/core/src/main/java/link/magic/android/modules/multichain/TypedArray.kt
 create mode 100644 magic/core/src/main/java/link/magic/android/modules/solana/Method.kt
 create mode 100644 magic/core/src/main/java/link/magic/android/modules/solana/SolanaConfiguration.kt
 create mode 100644 magic/core/src/main/java/link/magic/android/modules/solana/SolanaExtension.kt
 create mode 100644 magic/core/src/test/java/link/magic/android/MultichainExtensionTest.kt

diff --git a/magic/core/src/main/java/link/magic/android/Magic.kt b/magic/core/src/main/java/link/magic/android/Magic.kt
index fecf185..8727662 100644
--- a/magic/core/src/main/java/link/magic/android/Magic.kt
+++ b/magic/core/src/main/java/link/magic/android/Magic.kt
@@ -5,13 +5,19 @@ import link.magic.android.core.provider.RpcProvider
 import link.magic.android.core.relayer.urlBuilder.URLBuilder
 import link.magic.android.core.relayer.urlBuilder.network.CustomNodeConfiguration
 import link.magic.android.modules.auth.AuthModule
+import link.magic.android.modules.bitcoin.BitcoinConfiguration
+import link.magic.android.modules.bitcoin.BitcoinExtension
 import link.magic.android.modules.events.EventModule
+import link.magic.android.modules.extension.ExtensionConfiguration
+import link.magic.android.modules.extension.ExtensionConfigurations
+import link.magic.android.modules.solana.SolanaConfiguration
+import link.magic.android.modules.solana.SolanaExtension
 import link.magic.android.modules.user.UserModule
 import link.magic.android.modules.wallet.WalletModule
 import link.magic.android.modules.web3j.signTypedData.SignTypedDataExtension
 import java.util.*
 
-class Magic private constructor(applicationContext: Context, urlBuilder: URLBuilder) {
+class Magic private constructor(applicationContext: Context, urlBuilder: URLBuilder, extensions: List<ExtensionConfiguration>) {
 
     companion object {
         var debugEnabled = false
@@ -52,21 +58,33 @@ class Magic private constructor(applicationContext: Context, urlBuilder: URLBuil
      */
     val events = EventModule(rpcProvider)
 
+    /**
+     * Contains Solana methods. `null` unless `Magic` was created with a [SolanaConfiguration].
+     */
+    val solana: SolanaExtension? =
+        if (extensions.any { it is SolanaConfiguration }) SolanaExtension(rpcProvider) else null
+
+    /**
+     * Contains Bitcoin methods. `null` unless `Magic` was created with a [BitcoinConfiguration].
+     */
+    val bitcoin: BitcoinExtension? =
+        if (extensions.any { it is BitcoinConfiguration }) BitcoinExtension(rpcProvider) else null
+
     // Default initializer
-    constructor(ctx:Context, apiKey: String, locale: String = defaultLocale)
-            : this(ctx, URLBuilder(apiKey, EthNetwork.Mainnet, locale, ctx.packageName, emptyMap()))
+    constructor(ctx:Context, apiKey: String, locale: String = defaultLocale, extensions: List<ExtensionConfiguration> = emptyList())
+            : this(ctx, URLBuilder(apiKey, EthNetwork.Mainnet, locale, ctx.packageName, emptyMap(), ExtensionConfigurations.toParams(extensions)), extensions)
 
     // Meta initializer
-    constructor(ctx:Context, apiKey: String, meta: Map<String, Any>, locale: String = defaultLocale)
-            : this(ctx, URLBuilder(apiKey, EthNetwork.Mainnet, locale, ctx.packageName, meta))
+    constructor(ctx:Context, apiKey: String, meta: Map<String, Any>, locale: String = defaultLocale, extensions: List<ExtensionConfiguration> = emptyList())
+            : this(ctx, URLBuilder(apiKey, EthNetwork.Mainnet, locale, ctx.packageName, meta, ExtensionConfigurations.toParams(extensions)), extensions)
 
     // Eth Network initializer
-    constructor(ctx:Context, apiKey: String, ethNetwork: EthNetwork, locale: String = defaultLocale)
-            : this(ctx, URLBuilder(apiKey, ethNetwork, locale, ctx.packageName, emptyMap()))
+    constructor(ctx:Context, apiKey: String, ethNetwork: EthNetwork, locale: String = defaultLocale, extensions: List<ExtensionConfiguration> = emptyList())
+            : this(ctx, URLBuilder(apiKey, ethNetwork, locale, ctx.packageName, emptyMap(), ExtensionConfigurations.toParams(extensions)), extensions)
 
     // Custom Node Initializer
-    constructor(ctx:Context, apiKey: String, customNodeConfiguration: CustomNodeConfiguration, meta: Map<String, Any> = emptyMap(), locale: String = defaultLocale)
-            : this(ctx, URLBuilder(apiKey, customNodeConfiguration, locale, ctx.packageName, meta))
+    constructor(ctx:Context, apiKey: String, customNodeConfiguration: CustomNodeConfiguration, meta: Map<String, Any> = emptyMap(), locale: String = defaultLocale, extensions: List<ExtensionConfiguration> = emptyList())
+            : this(ctx, URLBuilder(apiKey, customNodeConfiguration, locale, ctx.packageName, meta, ExtensionConfigurations.toParams(extensions)), extensions)
 
     // Method to change the activity context when needed
     fun setContext(newContext: Context) {
diff --git a/magic/core/src/main/java/link/magic/android/core/provider/ObjectParamsRequest.kt b/magic/core/src/main/java/link/magic/android/core/provider/ObjectParamsRequest.kt
new file mode 100644
index 0000000..f142f1c
--- /dev/null
+++ b/magic/core/src/main/java/link/magic/android/core/provider/ObjectParamsRequest.kt
@@ -0,0 +1,26 @@
+package link.magic.android.core.provider
+
+import androidx.annotation.Keep
+import link.magic.android.core.relayer.message.DPop
+import link.magic.android.core.relayer.message.OutboundMessageType
+
+/**
+ * A JSON-RPC request whose `params` is a single object, not a list. The Solana
+ * methods are sent this way, as in magic-js. web3j's `Request` only holds a list,
+ * so these requests skip it and have their own types.
+ */
+@Keep
+internal class ObjectParamsRequest(
+    private var method: String,
+    private var params: Any,
+    private var id: Long
+) {
+
+    private val jsonrpc = "2.0"
+}
+
+@Keep
+internal class MagicObjectParamsRequestData(val payload: ObjectParamsRequest, outboundMessageType: OutboundMessageType, encodedParams: String) {
+    val msgType: String = "$outboundMessageType-$encodedParams"
+    val jwt: String = DPop.createJwt()
+}
diff --git a/magic/core/src/main/java/link/magic/android/core/provider/RpcProvider.kt b/magic/core/src/main/java/link/magic/android/core/provider/RpcProvider.kt
index a9dc6a4..7867b24 100644
--- a/magic/core/src/main/java/link/magic/android/core/provider/RpcProvider.kt
+++ b/magic/core/src/main/java/link/magic/android/core/provider/RpcProvider.kt
@@ -98,7 +98,6 @@ class RpcProvider internal constructor(initialContext: Context, val urlBuilder:
         /* Overwrite id with random Long number */
         val newRandomId = Number().generateRandomId()
 
-        val result = CompletableFuture<T>()
         val rpcPayload = RequestForSerialization(requestPayload.method, requestPayload.params, newRandomId)
         val request = MagicRequestData(rpcPayload, OutboundMessageType.MAGIC_HANDLE_REQUEST, urlBuilder.encodedParams);
 
@@ -106,7 +105,28 @@ class RpcProvider internal constructor(initialContext: Context, val urlBuilder:
         val message =  GsonExtension()
             .serialize()
                 .toJson(request)
-                .replace("\\n", "")
+
+        return enqueue(message, newRandomId, responseType)
+    }
+
+    /**
+     * Send a request whose `params` is a single object, not a list, to the webview.
+     */
+    internal fun <T : Response<*>> sendAsync(method: String, params: Any, responseType: Class<T>): CompletableFuture<T> {
+        val newRandomId = Number().generateRandomId()
+
+        val rpcPayload = ObjectParamsRequest(method, params, newRandomId)
+        val request = MagicObjectParamsRequestData(rpcPayload, OutboundMessageType.MAGIC_HANDLE_REQUEST, urlBuilder.encodedParams)
+
+        val message = GsonExtension()
+            .serialize()
+            .toJson(request)
+
+        return enqueue(message, newRandomId, responseType)
+    }
+
+    private fun <T : Response<*>> enqueue(message: String, id: Long, responseType: Class<T>): CompletableFuture<T> {
+        val result = CompletableFuture<T>()
 
         if (Magic.debugEnabled) {
             Log.d("Magic", "Prepare Message: $message")
@@ -114,7 +134,7 @@ class RpcProvider internal constructor(initialContext: Context, val urlBuilder:
 
         /* send the promise to webview queue waiting for dispatch.
         When the payload result comes back the handler will resolve the result asynchronously */
-        overlay.enqueue(message, newRandomId, fun (responseString: String) {
+        overlay.enqueue(message, id, fun (responseString: String) {
                     val data = Gson().fromJson(responseString, responseType)
                     result.complete(data)
                 })
diff --git a/magic/core/src/main/java/link/magic/android/core/relayer/urlBuilder/BaseOptions.kt b/magic/core/src/main/java/link/magic/android/core/relayer/urlBuilder/BaseOptions.kt
index 8cc5170..67c7f56 100644
--- a/magic/core/src/main/java/link/magic/android/core/relayer/urlBuilder/BaseOptions.kt
+++ b/magic/core/src/main/java/link/magic/android/core/relayer/urlBuilder/BaseOptions.kt
@@ -11,7 +11,8 @@ open class BaseOptions(
     val host: String,
     val locale: String,
     val bundleId: String,
-    val meta: Map<String, Any>
+    val meta: Map<String, Any>,
+    val ext: Map<String, Any>? = null
 ): Serializable {
     val sdk = "magic-sdk-android"
 }
diff --git a/magic/core/src/main/java/link/magic/android/core/relayer/urlBuilder/URLBuilder.kt b/magic/core/src/main/java/link/magic/android/core/relayer/urlBuilder/URLBuilder.kt
index f6cace6..9bf3907 100644
--- a/magic/core/src/main/java/link/magic/android/core/relayer/urlBuilder/URLBuilder.kt
+++ b/magic/core/src/main/java/link/magic/android/core/relayer/urlBuilder/URLBuilder.kt
@@ -24,15 +24,15 @@ class URLBuilder private constructor(var options: BaseOptions, val apiKey: Strin
     val encodedParams: String
         get() {
             val paramsInBytes = gson.toJson(options).toByteArray()
-            return Base64.encodeToString(paramsInBytes, Base64.DEFAULT)
+            return Base64.encodeToString(paramsInBytes, Base64.NO_WRAP)
         }
 
     companion object {
         private const val mgboxHost = "https://box.magic.link"
     }
 
-    internal constructor(apiKey: String, customNode: CustomNodeConfiguration, locale: String, bundleId: String, meta: Map<String, Any>)
-            : this(CustomNodeBaseOptions(apiKey, customNode, mgboxHost, locale, bundleId, meta), apiKey)
-    internal constructor(apiKey: String, network: EthNetwork, locale: String, bundleId: String, meta: Map<String, Any>)
-            : this(NetworkBaseOptions(apiKey, network.toString().lowercase(), mgboxHost, locale, bundleId, meta), apiKey)
+    internal constructor(apiKey: String, customNode: CustomNodeConfiguration, locale: String, bundleId: String, meta: Map<String, Any>, ext: Map<String, Any>? = null)
+            : this(CustomNodeBaseOptions(apiKey, customNode, mgboxHost, locale, bundleId, meta, ext), apiKey)
+    internal constructor(apiKey: String, network: EthNetwork, locale: String, bundleId: String, meta: Map<String, Any>, ext: Map<String, Any>? = null)
+            : this(NetworkBaseOptions(apiKey, network.toString().lowercase(), mgboxHost, locale, bundleId, meta, ext), apiKey)
 }
diff --git a/magic/core/src/main/java/link/magic/android/core/relayer/urlBuilder/network/CustomNodeBaseOptions.kt b/magic/core/src/main/java/link/magic/android/core/relayer/urlBuilder/network/CustomNodeBaseOptions.kt
index 99241a1..dcdfbd0 100644
--- a/magic/core/src/main/java/link/magic/android/core/relayer/urlBuilder/network/CustomNodeBaseOptions.kt
+++ b/magic/core/src/main/java/link/magic/android/core/relayer/urlBuilder/network/CustomNodeBaseOptions.kt
@@ -11,5 +11,6 @@ internal class CustomNodeBaseOptions internal constructor(
     mgboxHost: String,
     locale: String,
     bundleId: String,
-    meta: Map<String, Any>
-) : BaseOptions(apiKey, mgboxHost, locale, bundleId, meta)
+    meta: Map<String, Any>,
+    ext: Map<String, Any>? = null
+) : BaseOptions(apiKey, mgboxHost, locale, bundleId, meta, ext)
diff --git a/magic/core/src/main/java/link/magic/android/core/relayer/urlBuilder/network/NetworkBaseOptions.kt b/magic/core/src/main/java/link/magic/android/core/relayer/urlBuilder/network/NetworkBaseOptions.kt
index 28c7cec..26caedd 100644
--- a/magic/core/src/main/java/link/magic/android/core/relayer/urlBuilder/network/NetworkBaseOptions.kt
+++ b/magic/core/src/main/java/link/magic/android/core/relayer/urlBuilder/network/NetworkBaseOptions.kt
@@ -12,5 +12,6 @@ internal class NetworkBaseOptions(
     mgboxHost: String,
     locale: String,
     bundleId: String,
-    meta: Map<String, Any>
-) : BaseOptions(apiKey, mgboxHost, locale, bundleId, meta)
+    meta: Map<String, Any>,
+    ext: Map<String, Any>? = null
+) : BaseOptions(apiKey, mgboxHost, locale, bundleId, meta, ext)
diff --git a/magic/core/src/main/java/link/magic/android/modules/bitcoin/BitcoinConfiguration.kt b/magic/core/src/main/java/link/magic/android/modules/bitcoin/BitcoinConfiguration.kt
new file mode 100644
index 0000000..5965338
--- /dev/null
+++ b/magic/core/src/main/java/link/magic/android/modules/bitcoin/BitcoinConfiguration.kt
@@ -0,0 +1,70 @@
+package link.magic.android.modules.bitcoin
+
+import androidx.annotation.Keep
+import com.google.gson.annotations.SerializedName
+import link.magic.android.modules.extension.ExtensionConfiguration
+import org.web3j.protocol.core.Response
+
+/**
+ * Enables the Bitcoin extension. Mirrors `BitcoinConfig` in `@magic-ext/bitcoin`.
+ *
+ * @param rpcUrl The Bitcoin node or indexer URL.
+ * @param network The network name, e.g. `mainnet` or `testnet`.
+ */
+@Keep
+class BitcoinConfiguration(val rpcUrl: String, network: String) : ExtensionConfiguration {
+    override val name: String
+        get() = "bitcoin"
+
+    val chainType: String = BitcoinExtension.CHAIN_TYPE
+
+    val options = Options(network)
+
+    @Keep
+    class Options(val network: String)
+}
+
+/**
+ * A UTXO to spend. [value] is in BTC (not satoshis), with at most eight decimal
+ * places. The enclave needs this value to compute its segwit (BIP143) sighash.
+ * [txNum] is the output index (vout) of the UTXO within its source transaction.
+ */
+@Keep
+class BitcoinTransactionInput(
+    val txid: String,
+    @SerializedName("tx_num") val txNum: Int,
+    val value: Double,
+    val address: String? = null
+)
+
+/**
+ * A transaction output. [value] is in BTC with at most eight decimal places.
+ */
+@Keep
+class BitcoinTransactionOutput(
+    val address: String,
+    val value: Double
+)
+
+/**
+ * The result of `signTransaction`.
+ */
+@Keep
+class BitcoinSignedTransaction(
+    /** The broadcast-ready, fully-signed transaction as hex. */
+    val signedTransaction: String,
+    /** The transaction hash (txid). */
+    val transactionHash: String
+)
+
+@Keep
+class BitcoinSignTransactionResponse : Response<BitcoinSignedTransaction>()
+
+/**
+ * Params for `btc_signTransaction`.
+ */
+@Keep
+internal class BitcoinTransactionParams(
+    val inputs: List<BitcoinTransactionInput>,
+    val outputs: List<BitcoinTransactionOutput>
+)
diff --git a/magic/core/src/main/java/link/magic/android/modules/bitcoin/BitcoinExtension.kt b/magic/core/src/main/java/link/magic/android/modules/bitcoin/BitcoinExtension.kt
new file mode 100644
index 0000000..2406263
--- /dev/null
+++ b/magic/core/src/main/java/link/magic/android/modules/bitcoin/BitcoinExtension.kt
@@ -0,0 +1,61 @@
+package link.magic.android.modules.bitcoin
+
+import android.content.Context
+import link.magic.android.core.provider.RpcProvider
+import link.magic.android.modules.multichain.MultichainExtension
+import org.web3j.protocol.core.Request
+import java.util.concurrent.CompletableFuture
+
+/**
+ * Bitcoin extension for signing transactions.
+ * Mirrors the `@magic-ext/bitcoin` package in magic-js.
+ *
+ * Available as `magic.bitcoin` when `Magic` was created with a [BitcoinConfiguration].
+ */
+class BitcoinExtension internal constructor(rpcProvider: RpcProvider) : MultichainExtension(rpcProvider, CHAIN_TYPE) {
+
+    companion object {
+        internal const val CHAIN_TYPE = "BITCOIN"
+    }
+
+    /**
+     * Signs a Bitcoin transaction in the TEE. The caller supplies fully-formed
+     * inputs (the UTXOs to spend, each with its value) and outputs. Coin
+     * selection, fee, and change are the caller's job. Resolves with the
+     * broadcast-ready signed transaction.
+     *
+     * Input and output values are non-negative BTC amounts with at most eight
+     * decimal places. Tiny floating-point errors (up to 0.001 sat) are
+     * tolerated. Work out fees and change in integer satoshis, then convert to
+     * BTC for this method. Total outputs must not exceed total inputs. The
+     * difference is the fee. There is no minimum or maximum signing fee, and
+     * no dust threshold is enforced. Check the fee rate (sats/vB) and output
+     * amounts against the broadcasting node's policy. Signing does not
+     * guarantee relay, confirmation, or UTXO availability. Invalid
+     * transaction params fail with an RPC error that describes the problem.
+     *
+     * A value that is NaN, infinite or negative fails the returned future with an
+     * [IllegalArgumentException] before anything is sent.
+     */
+    fun signTransaction(
+        context: Context,
+        inputs: List<BitcoinTransactionInput>,
+        outputs: List<BitcoinTransactionOutput>
+    ): CompletableFuture<BitcoinSignTransactionResponse> {
+        val values = inputs.map { it.value } + outputs.map { it.value }
+        if (values.any { !it.isFinite() || it < 0 }) {
+            val failed = CompletableFuture<BitcoinSignTransactionResponse>()
+            failed.completeExceptionally(IllegalArgumentException("Bitcoin amounts must be finite and not negative"))
+            return failed
+        }
+
+        provider.context = context
+        val request = Request(
+            Method.BTC_SIGN_TRANSACTION.toString(),
+            listOf(BitcoinTransactionParams(inputs, outputs)),
+            provider,
+            BitcoinSignTransactionResponse::class.java
+        )
+        return provider.sendAsync(request, BitcoinSignTransactionResponse::class.java)
+    }
+}
diff --git a/magic/core/src/main/java/link/magic/android/modules/bitcoin/Method.kt b/magic/core/src/main/java/link/magic/android/modules/bitcoin/Method.kt
new file mode 100644
index 0000000..373ac41
--- /dev/null
+++ b/magic/core/src/main/java/link/magic/android/modules/bitcoin/Method.kt
@@ -0,0 +1,9 @@
+package link.magic.android.modules.bitcoin
+
+enum class Method {
+    BTC_SIGN_TRANSACTION;
+
+    override fun toString(): String {
+        return "btc_signTransaction"
+    }
+}
diff --git a/magic/core/src/main/java/link/magic/android/modules/extension/ExtensionConfiguration.kt b/magic/core/src/main/java/link/magic/android/modules/extension/ExtensionConfiguration.kt
new file mode 100644
index 0000000..31f89e7
--- /dev/null
+++ b/magic/core/src/main/java/link/magic/android/modules/extension/ExtensionConfiguration.kt
@@ -0,0 +1,29 @@
+package link.magic.android.modules.extension
+
+/**
+ * Configuration for an official Magic extension, such as Solana or Bitcoin.
+ *
+ * Pass these to the `Magic` constructor. Each one is sent to the relayer under
+ * `ext.<name>` in the URL params, the same as extensions in magic-js.
+ *
+ * Gson writes the fields of the implementing class as the value, so `name` must
+ * not have a backing field.
+ */
+interface ExtensionConfiguration {
+    /** The extension name, e.g. `solana`. Matches the `name` field in magic-js. */
+    val name: String
+}
+
+internal object ExtensionConfigurations {
+    /**
+     * Maps each config to `{ "<name>": <config> }`. A later config with the same
+     * name replaces an earlier one, as in magic-js. `null` when there are none,
+     * so the `ext` param is left out of the URL.
+     */
+    fun toParams(extensions: List<ExtensionConfiguration>): Map<String, Any>? {
+        if (extensions.isEmpty()) return null
+        val params = LinkedHashMap<String, Any>()
+        extensions.forEach { params[it.name] = it }
+        return params
+    }
+}
diff --git a/magic/core/src/main/java/link/magic/android/modules/multichain/Method.kt b/magic/core/src/main/java/link/magic/android/modules/multichain/Method.kt
new file mode 100644
index 0000000..7fe2b71
--- /dev/null
+++ b/magic/core/src/main/java/link/magic/android/modules/multichain/Method.kt
@@ -0,0 +1,10 @@
+package link.magic.android.modules.multichain
+
+enum class Method {
+    MAGIC_GET_MULTICHAIN_PUBLIC_ADDRESS,
+    MAGIC_REVEAL_KEY;
+
+    override fun toString(): String {
+        return name.lowercase()
+    }
+}
diff --git a/magic/core/src/main/java/link/magic/android/modules/multichain/MultichainExtension.kt b/magic/core/src/main/java/link/magic/android/modules/multichain/MultichainExtension.kt
new file mode 100644
index 0000000..ff2a957
--- /dev/null
+++ b/magic/core/src/main/java/link/magic/android/modules/multichain/MultichainExtension.kt
@@ -0,0 +1,53 @@
+package link.magic.android.modules.multichain
+
+import android.content.Context
+import androidx.annotation.Keep
+import link.magic.android.core.provider.RpcProvider
+import link.magic.android.modules.BaseModule
+import link.magic.android.modules.user.response.RevealPrivateKeyResponse
+import org.web3j.protocol.core.Request
+import org.web3j.protocol.core.Response
+import java.util.concurrent.CompletableFuture
+
+@Keep
+class MultichainPublicAddressResponse : Response<String>()
+
+@Keep
+internal class ChainParams(val chain: String)
+
+/**
+ * Base class for non-EVM chain extensions.
+ * Mirrors `MultichainExtension` in `@magic-sdk/provider`.
+ *
+ * @param chain The chain type sent to the relayer, e.g. `SOLANA` or `BITCOIN`.
+ */
+open class MultichainExtension internal constructor(rpcProvider: RpcProvider, val chain: String) : BaseModule(rpcProvider) {
+
+    /**
+     * Gets the user's public address on this chain.
+     */
+    fun getPublicAddress(context: Context): CompletableFuture<MultichainPublicAddressResponse> {
+        provider.context = context
+        val request = Request(
+            Method.MAGIC_GET_MULTICHAIN_PUBLIC_ADDRESS.toString(),
+            listOf(ChainParams(chain)),
+            provider,
+            MultichainPublicAddressResponse::class.java
+        )
+        return provider.sendAsync(request, MultichainPublicAddressResponse::class.java)
+    }
+
+    /**
+     * Shows the Magic UI that reveals the user's private key for this chain.
+     */
+    fun revealPrivateKey(context: Context): CompletableFuture<RevealPrivateKeyResponse> {
+        provider.context = context
+        val request = Request(
+            Method.MAGIC_REVEAL_KEY.toString(),
+            listOf(ChainParams(chain)),
+            provider,
+            RevealPrivateKeyResponse::class.java
+        )
+        return provider.sendAsync(request, RevealPrivateKeyResponse::class.java)
+    }
+}
diff --git a/magic/core/src/main/java/link/magic/android/modules/multichain/TypedArray.kt b/magic/core/src/main/java/link/magic/android/modules/multichain/TypedArray.kt
new file mode 100644
index 0000000..aa54fe0
--- /dev/null
+++ b/magic/core/src/main/java/link/magic/android/modules/multichain/TypedArray.kt
@@ -0,0 +1,74 @@
+package link.magic.android.modules.multichain
+
+import androidx.annotation.Keep
+import com.google.gson.TypeAdapter
+import com.google.gson.annotations.JsonAdapter
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonToken
+import com.google.gson.stream.JsonWriter
+
+/**
+ * Binary data in the typed-array wire format that mgbox uses in both directions.
+ *
+ * JSON has no binary type, so mgbox sends a `Uint8Array` as
+ * `{"constructor":"Uint8Array","data":"99,53,247","flag":"MAGIC_PAYLOAD_FLAG_TYPED_ARRAY"}`.
+ * It turns this back into a real `Uint8Array` before the relayer sees it, and
+ * encodes typed arrays in responses (e.g. Solana signatures) the same way.
+ */
+@Keep
+@JsonAdapter(TypedArrayAdapter::class)
+class TypedArray(val bytes: ByteArray) {
+
+    companion object {
+        internal const val FLAG = "MAGIC_PAYLOAD_FLAG_TYPED_ARRAY"
+    }
+
+    override fun equals(other: Any?): Boolean = other is TypedArray && bytes.contentEquals(other.bytes)
+
+    override fun hashCode(): Int = bytes.contentHashCode()
+}
+
+@Keep
+internal class TypedArrayAdapter : TypeAdapter<TypedArray>() {
+
+    override fun write(out: JsonWriter, value: TypedArray?) {
+        if (value == null) {
+            out.nullValue()
+            return
+        }
+        out.beginObject()
+        out.name("constructor").value("Uint8Array")
+        out.name("data").value(value.bytes.joinToString(",") { (it.toInt() and 0xff).toString() })
+        out.name("flag").value(TypedArray.FLAG)
+        out.endObject()
+    }
+
+    override fun read(reader: JsonReader): TypedArray? {
+        if (reader.peek() == JsonToken.NULL) {
+            reader.nextNull()
+            return null
+        }
+        var data: String? = null
+        var flag: String? = null
+        reader.beginObject()
+        while (reader.hasNext()) {
+            when (reader.nextName()) {
+                "data" -> data = reader.nextString()
+                "flag" -> flag = reader.nextString()
+                else -> reader.skipValue()
+            }
+        }
+        reader.endObject()
+
+        if (flag != TypedArray.FLAG) throw IllegalArgumentException("Not a typed array")
+        // `Buffer` and `Uint8Array` both arrive here. Their bytes are joined the same way.
+        val joined = data ?: throw IllegalArgumentException("Typed array has no data")
+        if (joined.isEmpty()) return TypedArray(ByteArray(0))
+        val bytes = joined.split(",").map { part ->
+            val value = part.toIntOrNull()
+            if (value == null || value !in 0..255) throw IllegalArgumentException("Invalid byte: $part")
+            value.toByte()
+        }
+        return TypedArray(bytes.toByteArray())
+    }
+}
diff --git a/magic/core/src/main/java/link/magic/android/modules/solana/Method.kt b/magic/core/src/main/java/link/magic/android/modules/solana/Method.kt
new file mode 100644
index 0000000..1f0ff6b
--- /dev/null
+++ b/magic/core/src/main/java/link/magic/android/modules/solana/Method.kt
@@ -0,0 +1,15 @@
+package link.magic.android.modules.solana
+
+enum class Method {
+    SOL_SIGN_TRANSACTION,
+    SOL_SIGN_MESSAGE,
+    SOL_PARTIAL_SIGN_TRANSACTION;
+
+    override fun toString(): String {
+        return when (this) {
+            SOL_SIGN_TRANSACTION -> "sol_signTransaction"
+            SOL_SIGN_MESSAGE -> "sol_signMessage"
+            SOL_PARTIAL_SIGN_TRANSACTION -> "sol_partialSignTransaction"
+        }
+    }
+}
diff --git a/magic/core/src/main/java/link/magic/android/modules/solana/SolanaConfiguration.kt b/magic/core/src/main/java/link/magic/android/modules/solana/SolanaConfiguration.kt
new file mode 100644
index 0000000..e36d1f3
--- /dev/null
+++ b/magic/core/src/main/java/link/magic/android/modules/solana/SolanaConfiguration.kt
@@ -0,0 +1,85 @@
+package link.magic.android.modules.solana
+
+import androidx.annotation.Keep
+import com.google.gson.annotations.SerializedName
+import link.magic.android.modules.extension.ExtensionConfiguration
+import link.magic.android.modules.multichain.TypedArray
+import org.web3j.protocol.core.Response
+
+/**
+ * Enables the Solana extension. Mirrors `SolanaConfig` in `@magic-ext/solana`.
+ *
+ * @param rpcUrl The Solana RPC node URL.
+ */
+@Keep
+class SolanaConfiguration(val rpcUrl: String) : ExtensionConfiguration {
+    override val name: String
+        get() = "solana"
+
+    val chainType: String = SolanaExtension.CHAIN_TYPE
+}
+
+/**
+ * The format of a serialized Solana transaction.
+ */
+enum class SolanaTransactionType {
+    /** A legacy `Transaction`. */
+    Legacy,
+
+    /** A version 0 `VersionedTransaction`. */
+    V0
+}
+
+/**
+ * Options for serializing a legacy transaction.
+ * Mirrors `SerializeConfig` in `@solana/web3.js`.
+ */
+@Keep
+class SolanaSerializeConfig(
+    val requireAllSignatures: Boolean? = null,
+    val verifySignatures: Boolean? = null
+)
+
+/**
+ * The signed transaction returned by `signTransaction` and `partialSignTransaction`.
+ */
+@Keep
+class SolanaSignedTransaction(
+    @SerializedName("rawTransaction") private val typedRawTransaction: TypedArray
+) {
+    /** The serialized signed transaction. */
+    val rawTransaction: ByteArray
+        get() = typedRawTransaction.bytes
+}
+
+@Keep
+class SolanaSignTransactionResponse : Response<SolanaSignedTransaction>()
+
+@Keep
+class SolanaSignMessageResponse : Response<TypedArray>() {
+    /** The 64-byte ed25519 signature, or `null` if the request failed. */
+    val signature: ByteArray?
+        get() = result?.bytes
+}
+
+/**
+ * Params for `sol_signTransaction` and `sol_partialSignTransaction`.
+ * magic-js sends `type` as the string `legacy` or the number `0`.
+ */
+@Keep
+internal class SolanaTransactionParams(
+    transactionType: SolanaTransactionType,
+    val serialized: TypedArray,
+    val serializeConfig: SolanaSerializeConfig?
+) {
+    val type: Any = when (transactionType) {
+        SolanaTransactionType.Legacy -> "legacy"
+        SolanaTransactionType.V0 -> 0
+    }
+}
+
+/**
+ * Params for `sol_signMessage`. `message` is a `String` or a [TypedArray].
+ */
+@Keep
+internal class SolanaSignMessageParams(val message: Any)
diff --git a/magic/core/src/main/java/link/magic/android/modules/solana/SolanaExtension.kt b/magic/core/src/main/java/link/magic/android/modules/solana/SolanaExtension.kt
new file mode 100644
index 0000000..c325693
--- /dev/null
+++ b/magic/core/src/main/java/link/magic/android/modules/solana/SolanaExtension.kt
@@ -0,0 +1,91 @@
+package link.magic.android.modules.solana
+
+import android.content.Context
+import link.magic.android.core.provider.RpcProvider
+import link.magic.android.modules.multichain.MultichainExtension
+import link.magic.android.modules.multichain.TypedArray
+import java.util.concurrent.CompletableFuture
+
+/**
+ * Solana extension for signing transactions and messages.
+ * Mirrors the `@magic-ext/solana` package in magic-js.
+ *
+ * magic-js takes `Transaction` and `VersionedTransaction` objects from
+ * `@solana/web3.js`. This SDK has no Solana dependency, so it takes the
+ * serialized transaction bytes and their [SolanaTransactionType] instead.
+ * Serialize a legacy transaction the same way you would pass it to magic-js,
+ * usually with `requireAllSignatures = false`.
+ *
+ * Available as `magic.solana` when `Magic` was created with a [SolanaConfiguration].
+ */
+class SolanaExtension internal constructor(rpcProvider: RpcProvider) : MultichainExtension(rpcProvider, CHAIN_TYPE) {
+
+    companion object {
+        internal const val CHAIN_TYPE = "SOLANA"
+    }
+
+    /**
+     * Signs a Solana transaction.
+     *
+     * @param serialized The serialized transaction.
+     * @param type [SolanaTransactionType.Legacy] for a `Transaction`, [SolanaTransactionType.V0] for a `VersionedTransaction`.
+     * @param serializeConfig The config used to serialize the signed legacy transaction.
+     */
+    fun signTransaction(
+        context: Context,
+        serialized: ByteArray,
+        type: SolanaTransactionType,
+        serializeConfig: SolanaSerializeConfig? = null
+    ): CompletableFuture<SolanaSignTransactionResponse> {
+        provider.context = context
+        return provider.sendAsync(
+            Method.SOL_SIGN_TRANSACTION.toString(),
+            SolanaTransactionParams(type, TypedArray(serialized), serializeConfig),
+            SolanaSignTransactionResponse::class.java
+        )
+    }
+
+    /**
+     * Adds the user's signature to a transaction that other parties also sign.
+     *
+     * @param serialized The serialized transaction.
+     * @param type [SolanaTransactionType.Legacy] for a `Transaction`, [SolanaTransactionType.V0] for a `VersionedTransaction`.
+     * @param serializeConfig The config used to serialize the signed legacy transaction.
+     */
+    fun partialSignTransaction(
+        context: Context,
+        serialized: ByteArray,
+        type: SolanaTransactionType,
+        serializeConfig: SolanaSerializeConfig? = null
+    ): CompletableFuture<SolanaSignTransactionResponse> {
+        provider.context = context
+        return provider.sendAsync(
+            Method.SOL_PARTIAL_SIGN_TRANSACTION.toString(),
+            SolanaTransactionParams(type, TypedArray(serialized), serializeConfig),
+            SolanaSignTransactionResponse::class.java
+        )
+    }
+
+    /**
+     * Signs a UTF-8 message. The response holds the 64-byte ed25519 signature.
+     */
+    fun signMessage(context: Context, message: String): CompletableFuture<SolanaSignMessageResponse> {
+        return signMessage(context, SolanaSignMessageParams(message))
+    }
+
+    /**
+     * Signs raw bytes. The response holds the 64-byte ed25519 signature.
+     */
+    fun signMessage(context: Context, message: ByteArray): CompletableFuture<SolanaSignMessageResponse> {
+        return signMessage(context, SolanaSignMessageParams(TypedArray(message)))
+    }
+
+    private fun signMessage(context: Context, params: SolanaSignMessageParams): CompletableFuture<SolanaSignMessageResponse> {
+        provider.context = context
+        return provider.sendAsync(
+            Method.SOL_SIGN_MESSAGE.toString(),
+            params,
+            SolanaSignMessageResponse::class.java
+        )
+    }
+}
diff --git a/magic/core/src/test/java/link/magic/android/MultichainExtensionTest.kt b/magic/core/src/test/java/link/magic/android/MultichainExtensionTest.kt
new file mode 100644
index 0000000..6ba2750
--- /dev/null
+++ b/magic/core/src/test/java/link/magic/android/MultichainExtensionTest.kt
@@ -0,0 +1,179 @@
+package link.magic.android
+
+import com.google.gson.Gson
+import com.google.gson.JsonParser
+import link.magic.android.modules.bitcoin.BitcoinConfiguration
+import link.magic.android.modules.bitcoin.BitcoinSignTransactionResponse
+import link.magic.android.modules.bitcoin.BitcoinTransactionInput
+import link.magic.android.modules.bitcoin.BitcoinTransactionOutput
+import link.magic.android.modules.bitcoin.BitcoinTransactionParams
+import link.magic.android.modules.extension.ExtensionConfigurations
+import link.magic.android.modules.multichain.TypedArray
+import link.magic.android.modules.solana.SolanaConfiguration
+import link.magic.android.modules.solana.SolanaSerializeConfig
+import link.magic.android.modules.solana.SolanaSignMessageParams
+import link.magic.android.modules.solana.SolanaSignMessageResponse
+import link.magic.android.modules.solana.SolanaSignTransactionResponse
+import link.magic.android.modules.solana.SolanaTransactionParams
+import link.magic.android.modules.solana.SolanaTransactionType
+import org.junit.Assert.assertArrayEquals
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Test
+
+class MultichainExtensionTest {
+
+    private val gson = Gson()
+    private val flag = "MAGIC_PAYLOAD_FLAG_TYPED_ARRAY"
+
+    private fun json(text: String) = JsonParser.parseString(text)
+
+    // Typed arrays
+
+    @Test
+    fun typedArrayEncodesBytesAsUnsignedDecimals() {
+        val bytes = byteArrayOf(1, 2, -1, 0)
+        assertEquals(
+            json("""{"constructor":"Uint8Array","data":"1,2,255,0","flag":"$flag"}"""),
+            gson.toJsonTree(TypedArray(bytes))
+        )
+    }
+
+    @Test
+    fun typedArrayDecodesBytes() {
+        val decoded = gson.fromJson("""{"constructor":"Uint8Array","data":"99,53,247","flag":"$flag"}""", TypedArray::class.java)
+        assertArrayEquals(byteArrayOf(99, 53, -9), decoded.bytes)
+    }
+
+    @Test
+    fun typedArrayDecodesBufferAndEmptyData() {
+        val buffer = gson.fromJson("""{"constructor":"Buffer","data":"7","flag":"$flag"}""", TypedArray::class.java)
+        assertArrayEquals(byteArrayOf(7), buffer.bytes)
+        val empty = gson.fromJson("""{"constructor":"Uint8Array","data":"","flag":"$flag"}""", TypedArray::class.java)
+        assertEquals(0, empty.bytes.size)
+    }
+
+    @Test(expected = Exception::class)
+    fun typedArrayRejectsOutOfRangeBytes() {
+        gson.fromJson("""{"constructor":"Uint8Array","data":"1,256","flag":"$flag"}""", TypedArray::class.java)
+    }
+
+    @Test(expected = Exception::class)
+    fun typedArrayRejectsMissingFlag() {
+        gson.fromJson("""{"constructor":"Uint8Array","data":"1"}""", TypedArray::class.java)
+    }
+
+    // Extension config
+
+    @Test
+    fun solanaConfigurationEncodesRpcUrlAndChainType() {
+        assertEquals(
+            json("""{"rpcUrl":"https://api.devnet.solana.com","chainType":"SOLANA"}"""),
+            gson.toJsonTree(SolanaConfiguration("https://api.devnet.solana.com"))
+        )
+    }
+
+    @Test
+    fun bitcoinConfigurationEncodesNetworkUnderOptions() {
+        assertEquals(
+            json("""{"rpcUrl":"https://blockstream.info/testnet/api","chainType":"BITCOIN","options":{"network":"testnet"}}"""),
+            gson.toJsonTree(BitcoinConfiguration("https://blockstream.info/testnet/api", "testnet"))
+        )
+    }
+
+    @Test
+    fun extensionParamsAreKeyedByNameAndLastOneWins() {
+        val params = ExtensionConfigurations.toParams(
+            listOf(SolanaConfiguration("https://first"), BitcoinConfiguration("https://btc", "testnet"), SolanaConfiguration("https://second"))
+        )
+        assertEquals(
+            json("""{"solana":{"rpcUrl":"https://second","chainType":"SOLANA"},"bitcoin":{"rpcUrl":"https://btc","chainType":"BITCOIN","options":{"network":"testnet"}}}"""),
+            gson.toJsonTree(params)
+        )
+    }
+
+    @Test
+    fun noExtensionsLeavesOutTheParam() {
+        assertNull(ExtensionConfigurations.toParams(emptyList()))
+    }
+
+    // Solana params
+
+    @Test
+    fun legacyTransactionIsSentWithTypeLegacy() {
+        val params = SolanaTransactionParams(SolanaTransactionType.Legacy, TypedArray(byteArrayOf(1, 2)), SolanaSerializeConfig(requireAllSignatures = false, verifySignatures = false))
+        assertEquals(
+            json("""{"type":"legacy","serialized":{"constructor":"Uint8Array","data":"1,2","flag":"$flag"},"serializeConfig":{"requireAllSignatures":false,"verifySignatures":false}}"""),
+            gson.toJsonTree(params)
+        )
+    }
+
+    @Test
+    fun v0TransactionIsSentWithTypeZeroAndNoConfig() {
+        val params = SolanaTransactionParams(SolanaTransactionType.V0, TypedArray(byteArrayOf(3)), null)
+        assertEquals(
+            json("""{"type":0,"serialized":{"constructor":"Uint8Array","data":"3","flag":"$flag"}}"""),
+            gson.toJsonTree(params)
+        )
+    }
+
+    @Test
+    fun signMessageSendsAStringOrTypedArray() {
+        assertEquals(json("""{"message":"hello"}"""), gson.toJsonTree(SolanaSignMessageParams("hello")))
+        assertEquals(
+            json("""{"message":{"constructor":"Uint8Array","data":"104,105","flag":"$flag"}}"""),
+            gson.toJsonTree(SolanaSignMessageParams(TypedArray("hi".toByteArray())))
+        )
+    }
+
+    @Test
+    fun signMessageKeepsPercentSignsAndNewlines() {
+        val message = "uri: https://a.com/?q=a%2Fb\nsecond line 100%"
+        val encoded = gson.toJson(SolanaSignMessageParams(message))
+        assertEquals(message, JsonParser.parseString(encoded).asJsonObject.get("message").asString)
+    }
+
+    // Responses
+
+    @Test
+    fun signedTransactionResponseDecodesRawTransaction() {
+        val response = gson.fromJson(
+            """{"jsonrpc":"2.0","id":1,"result":{"rawTransaction":{"constructor":"Uint8Array","data":"9,8,7","flag":"$flag"}}}""",
+            SolanaSignTransactionResponse::class.java
+        )
+        assertArrayEquals(byteArrayOf(9, 8, 7), response.result.rawTransaction)
+    }
+
+    @Test
+    fun signMessageResponseDecodesSignature() {
+        val response = gson.fromJson(
+            """{"jsonrpc":"2.0","id":1,"result":{"constructor":"Uint8Array","data":"1,2,3","flag":"$flag"}}""",
+            SolanaSignMessageResponse::class.java
+        )
+        assertArrayEquals(byteArrayOf(1, 2, 3), response.signature)
+    }
+
+    // Bitcoin
+
+    @Test
+    fun bitcoinParamsUseTxNumKeyAndOmitMissingAddress() {
+        val params = BitcoinTransactionParams(
+            listOf(BitcoinTransactionInput("ab", 1, 0.001)),
+            listOf(BitcoinTransactionOutput("tb1qexample", 0.0009))
+        )
+        assertEquals(
+            json("""{"inputs":[{"txid":"ab","tx_num":1,"value":0.001}],"outputs":[{"address":"tb1qexample","value":0.0009}]}"""),
+            gson.toJsonTree(params)
+        )
+    }
+
+    @Test
+    fun bitcoinResponseDecodesSignedTransaction() {
+        val response = gson.fromJson(
+            """{"jsonrpc":"2.0","id":2,"result":{"signedTransaction":"0200","transactionHash":"ff"}}""",
+            BitcoinSignTransactionResponse::class.java
+        )
+        assertEquals("0200", response.result.signedTransaction)
+        assertEquals("ff", response.result.transactionHash)
+    }
+}

From 486f64c7584064557e611b01daab05a2a80d1414 Mon Sep 17 00:00:00 2001
From: Jerry Liu <jerry.liu@kraken.com>
Date: Mon, 19 Oct 2026 13:37:08 -0700
Subject: [PATCH 3/3] Bump nimbus-jose-jwt to 10.10

9.31 is affected by CVE-2023-52428 and CVE-2025-53864. Both are fixed
in 10.10.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 magic/core/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/magic/core/build.gradle b/magic/core/build.gradle
index 7bd7f6d..cbc3834 100644
--- a/magic/core/build.gradle
+++ b/magic/core/build.gradle
@@ -39,7 +39,7 @@ dependencies {
     implementation "com.google.code.gson:gson:$gson_version"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
-    implementation 'com.nimbusds:nimbus-jose-jwt:9.31'
+    implementation 'com.nimbusds:nimbus-jose-jwt:10.10'
 }
 
 apply from: 'deploy.gradle'