Skip to content

Support WalletConnect multi-chain sessions #6451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
YeungKC wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Support WalletConnect multi-chain sessions #6451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5765162
Support WalletConnect multi-chain namespaces
YeungKC Jun 11, 2026
296eaa3
Disconnect WalletConnect sessions missing chain addresses
YeungKC Jun 11, 2026
a6d4c76
Merge branch 'master' into feature/walletconnect-multichain
crossle Jun 11, 2026
4328429
Tighten WalletConnect multi-chain request handling
YeungKC Jun 12, 2026
f6338ba
Use standard Solana WalletConnect chain id
YeungKC Jun 12, 2026
42b4dab
Support legacy Solana WalletConnect chain id
YeungKC Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
159 changes: 103 additions & 56 deletions app/src/main/java/one/mixin/android/tip/wc/WalletConnectV2.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,40 @@ import one.mixin.android.tip.wc.internal.Method
import one.mixin.android.tip.wc.internal.WCEthereumSignMessage
import one.mixin.android.tip.wc.internal.WCEthereumTransaction
import one.mixin.android.tip.wc.internal.WalletConnectException
import one.mixin.android.tip.wc.internal.WalletConnectAddresses
import one.mixin.android.tip.wc.internal.WcInstruction
import one.mixin.android.tip.wc.internal.WcInstructionDeserializer
import one.mixin.android.tip.wc.internal.WcBitcoinAccountAddress
import one.mixin.android.tip.wc.internal.WcBitcoinGetAccountAddresses
import one.mixin.android.tip.wc.internal.WcBitcoinSignMessage
import one.mixin.android.tip.wc.internal.WcBitcoinSignature
import one.mixin.android.tip.wc.internal.WcSignature
import one.mixin.android.tip.wc.internal.WcSolanaMessage
import one.mixin.android.tip.wc.internal.WcSolanaTransaction
import one.mixin.android.tip.wc.internal.buildUpdatedNamespaces
import one.mixin.android.tip.wc.internal.ethTransactionSerializer
import one.mixin.android.tip.wc.internal.getSupportedNamespaces
import one.mixin.android.tip.wc.internal.supportChainList
import one.mixin.android.tip.wc.internal.evmChainList
import one.mixin.android.tip.wc.internal.isSupportedMethodForChain
import one.mixin.android.util.decodeBase58
import one.mixin.android.util.encodeToBase58String
import one.mixin.android.extension.toHex
import one.mixin.android.util.reportException
import one.mixin.android.web3.js.Web3Signer
import org.bitcoinj.base.BitcoinNetwork
import org.bitcoinj.base.ScriptType
import org.bitcoinj.crypto.ECKey
import org.sol4k.Keypair
import org.sol4kt.VersionedTransactionCompat
import org.web3j.crypto.Credentials
import org.web3j.crypto.ECKeyPair
import org.web3j.crypto.Keys
import org.web3j.crypto.RawTransaction
import org.web3j.crypto.TransactionEncoder
import org.web3j.utils.Numeric
import timber.log.Timber
import java.math.BigInteger
import java.util.Base64
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit

Expand All @@ -52,6 +63,7 @@ object WalletConnectV2 : WalletConnect() {
private const val CHAIN_TYPE_POLYGON: String = "polygon"
private const val CHAIN_TYPE_BSC: String = "bsc"
private const val CHAIN_TYPE_SOLANA: String = "solana"
private const val CHAIN_TYPE_BTC: String = "btc"

private val gson =
GsonBuilder()
Expand Down Expand Up @@ -134,14 +146,18 @@ object WalletConnectV2 : WalletConnect() {
verifyContext: Wallet.Model.VerifyContext,
) {
Timber.d("$TAG onSessionProposal $sessionProposal $verifyContext")
val chains = supportChainList.map { c -> c.chainId }
val supportedWalletChains =
getSupportedNamespaces(currentWalletConnectAddresses())
.values
.flatMap { it.chains ?: emptyList() }
.toSet()
val namespaces =
(sessionProposal.requiredNamespaces.values + sessionProposal.optionalNamespaces.values)
.filter { proposal -> proposal.chains != null }
val hasSupportChain =
namespaces.any { proposal ->
proposal.chains!!.any { chain ->
chains.contains(chain)
supportedWalletChains.contains(chain)
}
}

Expand All @@ -159,12 +175,13 @@ object WalletConnectV2 : WalletConnect() {
return
}
val requireChain =
supportChainList.firstOrNull {
(namespace).chains?.contains(it.chainId) == true
supportChainList.firstOrNull { chain ->
namespace.chains?.any { chainId -> chain.supportsWalletConnectChainId(chainId) } == true
}
val chainType =
when {
requireChain is Chain.Solana -> CHAIN_TYPE_SOLANA
requireChain is Chain.Bitcoin -> CHAIN_TYPE_BTC
requireChain is Chain.BinanceSmartChain -> CHAIN_TYPE_BSC
requireChain is Chain.Polygon -> CHAIN_TYPE_POLYGON
else -> CHAIN_TYPE_ETH
Expand All @@ -176,7 +193,7 @@ object WalletConnectV2 : WalletConnect() {
val notSupportChainIds =
namespaces.flatMap { proposal ->
proposal.chains!!.filter { chain ->
!chains.contains(chain)
!supportedWalletChains.contains(chain)
}
}.toSet().joinToString()
RxBus.publish(
Expand Down Expand Up @@ -229,45 +246,19 @@ object WalletConnectV2 : WalletConnect() {
}
}

private fun <T> flattenCollections(collection: List<List<T>?>): List<T> {
val result = mutableListOf<T>()
for (innerCollection in collection) {
if (innerCollection == null) continue
result.addAll(innerCollection)
}
return result
}

fun approveSession(
priv: ByteArray,
topic: String,
) {
val sessionProposal = getSessionProposal(topic)
if (sessionProposal == null) {
Timber.e("$TAG approveSession sessionProposal is null")
return
}
val namespaces: Collection<String> = flattenCollections((sessionProposal.requiredNamespaces + sessionProposal.optionalNamespaces).values.map { it.chains })
val chain =
if (namespaces.isEmpty()) {
supportChainList.firstOrNull()
} else {
supportChainList.find {
it.chainId in namespaces
}
}
if (chain == null) {
Timber.e("$TAG approveSession sessionProposal chain is null")
val supportedNamespaces = getSupportedNamespaces(currentWalletConnectAddresses())
if (supportedNamespaces.isEmpty()) {
Timber.e("$TAG approveSession wallet has no supported address")
return
}
val address =
if (chain == Chain.Solana) {
Keypair.fromSecretKey(priv).publicKey.toBase58()
} else {
val pub = ECKeyPair.create(priv).publicKey
Keys.toChecksumAddress(Keys.getAddress(pub))
}
val supportedNamespaces = getSupportedNamespaces(chain, address)
Timber.e("$TAG supportedNamespaces $supportedNamespaces")
val sessionNamespaces = WalletKit.generateApprovedNamespaces(sessionProposal, supportedNamespaces)
Timber.d("$TAG approveSession $sessionNamespaces")
Expand Down Expand Up @@ -315,6 +306,10 @@ object WalletConnectV2 : WalletConnect() {
localAddress: String,
request: Wallet.Model.SessionRequest,
): WCSignData.V2SignData<*>? {
if (!isSupportedMethodForChain(request.request.method, request.chainId)) {
Timber.e("$TAG ${request.request.method} parseSessionRequest not supported method ${request.request.method} for chain ${request.chainId}")
return null
}
val signData =
when (request.request.method) {
Method.ETHSign.name -> {
Expand Down Expand Up @@ -380,6 +375,17 @@ object WalletConnectV2 : WalletConnect() {
val message = gson.fromJson<WcSolanaMessage>(request.request.params)
WCSignData.V2SignData(request.request.id, message, request)
}
Method.BtcGetAccountAddresses.name -> {
val message = gson.fromJson<WcBitcoinGetAccountAddresses>(request.request.params)
validateBitcoinAccount(message.account, localAddress)
WCSignData.V2SignData(request.request.id, message, request)
}
Method.BtcSignMessage.name -> {
val message = gson.fromJson<WcBitcoinSignMessage>(request.request.params)
validateBitcoinAccount(message.account, localAddress)
message.address?.let { validateBitcoinAccount(it, localAddress) }
WCSignData.V2SignData(request.request.id, message, request)
}
else -> {
Timber.e("$TAG ${request.request.method} parseSessionRequest not supported method ${request.request.method}")
null
Expand Down Expand Up @@ -432,6 +438,10 @@ object WalletConnectV2 : WalletConnect() {
val wcSig = WcSignature(signMessage.pubkey, sig)
approveRequestInternal(gson.toJson(wcSig), sessionRequest)
return null
} else if (signMessage is WcBitcoinGetAccountAddresses) {
approveBitcoinAddresses(signMessage, sessionRequest)
} else if (signMessage is WcBitcoinSignMessage) {
approveBitcoinMessage(priv, signMessage, sessionRequest)
}
return null
}
Expand Down Expand Up @@ -510,33 +520,18 @@ object WalletConnectV2 : WalletConnect() {
}
}

fun switchAccount(address:String) {
fun switchAccount(addresses: WalletConnectAddresses = currentWalletConnectAddresses()) {
val sessions = getListOfActiveSessions()
if (sessions.isEmpty()) {
Timber.e("$TAG switchAccount session not found for topic")
return
}
sessions.forEach { session ->
val newNamespaces = session.namespaces.mapValues { (_, ns) ->
val chainId = ns.chains?.firstOrNull()
if (chainId == null) {
Timber.w("$TAG switchAccount: namespace has no chains, skipping update for it")
return@mapValues ns
}
val chain = supportChainList.find { it.chainId == chainId }
if (chain == null) {
Timber.w("$TAG switchAccount: unsupported chainId $chainId, skipping update for it")
return@mapValues ns
}

val newAccount = "$chainId:$address"

Wallet.Model.Namespace.Session(
chains = ns.chains,
accounts = listOf(newAccount),
methods = ns.methods,
events = ns.events,
)
val newNamespaces = buildUpdatedNamespaces(session.namespaces, addresses)
if (newNamespaces == null) {
Timber.w("$TAG switchAccount: current wallet does not have every connected chain address, disconnecting ${session.topic}")
disconnect(session.topic)
return@forEach
}

val updateParams = Wallet.Params.SessionUpdate(
Expand Down Expand Up @@ -644,6 +639,46 @@ object WalletConnectV2 : WalletConnect() {
return hexMessage
}

private fun approveBitcoinAddresses(
request: WcBitcoinGetAccountAddresses,
sessionRequest: Wallet.Model.SessionRequest,
) {
val address = request.account
val result =
listOf(
WcBitcoinAccountAddress(
address = address,
intention = request.intentions?.firstOrNull() ?: "payment",
),
)
approveRequestInternal(gson.toJson(result), sessionRequest)
}

private fun approveBitcoinMessage(
priv: ByteArray,
request: WcBitcoinSignMessage,
sessionRequest: Wallet.Model.SessionRequest,
) {
if (request.protocol != null && request.protocol != "ecdsa") {
throw IllegalArgumentException("Unsupported Bitcoin signature protocol ${request.protocol}")
}
val key = ECKey.fromPrivate(priv, true)
val address = key.toAddress(ScriptType.P2WPKH, BitcoinNetwork.MAINNET).toString()
val requestedAddress = request.address ?: request.account
validateBitcoinAccount(requestedAddress, address)
val signature = Base64.getDecoder().decode(key.signMessage(request.message, ScriptType.P2WPKH)).toHex()
approveRequestInternal(gson.toJson(WcBitcoinSignature(address, signature)), sessionRequest)
}

private fun validateBitcoinAccount(
requested: String,
localAddress: String,
) {
if (localAddress.isNotBlank() && requested != localAddress) {
throw IllegalArgumentException("Address unequal")
}
}

fun approveSolanaTransaction(
signature: String,
sessionRequest: Wallet.Model.SessionRequest,
Expand Down Expand Up @@ -707,4 +742,16 @@ object WalletConnectV2 : WalletConnect() {

fun Wallet.Model.SessionProposal.getNamespaceProposal(): Wallet.Model.Namespace.Proposal? =
this.requiredNamespaces["solana"] ?: this.optionalNamespaces["solana"] ?: this.requiredNamespaces.values.firstOrNull() ?: this.optionalNamespaces.values.firstOrNull()

fun Wallet.Model.SessionProposal.getProposalChainIds(): Set<String> =
(this.requiredNamespaces.values + this.optionalNamespaces.values)
.flatMap { it.chains ?: emptyList() }
.toSet()

private fun currentWalletConnectAddresses(): WalletConnectAddresses =
WalletConnectAddresses(
evm = Web3Signer.evmAddress,
solana = Web3Signer.solanaAddress,
bitcoin = Web3Signer.btcAddress,
)
}
Loading