Skip to content

fix(namespaces): use caipNetworkId directly in createNamespaces #5666

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
Khizr97 wants to merge 1 commit into
base: chore/khizr-fixes-2
Choose a base branch
from
Open

fix(namespaces): use caipNetworkId directly in createNamespaces #5666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions .changeset/fix-wcnamespace-caip-network-id.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@reown/appkit-controllers": patch
"@reown/appkit-utils": patch
---

Fix `createNamespaces` using `id` to reconstruct CAIP network ID instead of the existing `caipNetworkId` property. For standard chains these are equivalent, but for custom chains (e.g. Neo3, Stellar) where the chain `id` differs from the CAIP-2 chain reference, the wrong namespace was sent to wallets over WalletConnect. Also fixes `rpcMap` keys to use the full `caipNetworkId`.
6 changes: 2 additions & 4 deletions packages/appkit-utils/src/WCNamespaceUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,13 @@ export function createDefaultNamespace(chainNamespace: string): Namespace {

export function createNamespaces(caipNetworks: CaipNetwork[]): NamespaceConfig {
return caipNetworks.reduce<NamespaceConfig>((acc, chain) => {
const { id, chainNamespace, rpcUrls } = chain
const { caipNetworkId, chainNamespace, rpcUrls } = chain
const rpcUrl = rpcUrls.default.http[0]

if (!acc[chainNamespace]) {
acc[chainNamespace] = createDefaultNamespace(chainNamespace)
}

const caipNetworkId = `${chainNamespace}:${id}`

// eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
const namespace = acc[chainNamespace]

Expand All @@ -91,7 +89,7 @@ export function createNamespaces(caipNetworks: CaipNetwork[]): NamespaceConfig {
}

if (namespace?.rpcMap && rpcUrl) {
namespace.rpcMap[id] = rpcUrl
namespace.rpcMap[caipNetworkId] = rpcUrl
}

return acc
Expand Down
6 changes: 2 additions & 4 deletions packages/controllers/src/utils/WalletConnectUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,15 +203,13 @@ export const WcHelpersUtil = {
configOverride?: OptionsControllerState['universalProviderConfigOverride']
): NamespaceConfig {
const defaultNamespaces = caipNetworks.reduce<NamespaceConfig>((acc, chain) => {
const { id, chainNamespace, rpcUrls } = chain
const { caipNetworkId, chainNamespace, rpcUrls } = chain
const rpcUrl = rpcUrls.default.http[0]

if (!acc[chainNamespace]) {
acc[chainNamespace] = this.createDefaultNamespace(chainNamespace)
}

const caipNetworkId = `${chainNamespace}:${id}`

// eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
const namespace = acc[chainNamespace]

Expand All @@ -229,7 +227,7 @@ export const WcHelpersUtil = {
}

if (namespace?.rpcMap && rpcUrl) {
namespace.rpcMap[id] = rpcUrl
namespace.rpcMap[caipNetworkId] = rpcUrl
}

return acc
Expand Down
27 changes: 23 additions & 4 deletions packages/controllers/tests/utils/WalletConnectUtil.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ describe('WcHelpersUtil', () => {
events: ['accountsChanged', 'chainChanged'],
chains: ['eip155:1', 'eip155:137'],
rpcMap: {
'1': 'https://mainnet.infura.io/v3/YOUR-PROJECT-ID',
'137': 'https://polygon.rpc.com'
'eip155:1': 'https://mainnet.infura.io/v3/YOUR-PROJECT-ID',
'eip155:137': 'https://polygon.rpc.com'
}
},
solana: {
Expand All @@ -179,8 +179,8 @@ describe('WcHelpersUtil', () => {
'solana:8E9rvCKLFQia2Y35HXjjpWzj8weVo44K'
],
rpcMap: {
'5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp': 'https://api.mainnet-beta.solana.com',
EtWTRABZaYq6iMfeYKouRu166VU2xqa1: 'https://api.mainnet-beta.solana.com'
'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp': 'https://api.mainnet-beta.solana.com',
'solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1': 'https://api.mainnet-beta.solana.com'
Comment on lines 181 to +183

@tomiir tomiir May 26, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this correct?

}
}
})
Expand All @@ -190,6 +190,25 @@ describe('WcHelpersUtil', () => {
const namespaces = WcHelpersUtil.createNamespaces([])
expect(namespaces).toEqual({})
})

test('uses caipNetworkId directly when id differs from caip chain reference (custom chains)', () => {
const customNetwork: CaipNetwork = {
id: 1,
chainNamespace: 'neo3',
caipNetworkId: 'neo3:MainNet',
name: 'Neo3 MainNet',
nativeCurrency: { name: 'GAS', symbol: 'GAS', decimals: 8 },
rpcUrls: { default: { http: ['https://mainnet1.neo.coz.io'] } }
} as unknown as CaipNetwork

const namespaces = WcHelpersUtil.createNamespaces([customNetwork])

expect(namespaces['neo3']?.chains).toContain('neo3:MainNet')
expect(namespaces['neo3']?.chains).not.toContain('neo3:1')
expect(namespaces['neo3']?.rpcMap).toEqual({
'neo3:MainNet': 'https://mainnet1.neo.coz.io'
})
})
})

describe('getChainsFromNamespaces', () => {
Expand Down
Loading