Skip to content

fix: switch precedence of cartridgeChains and provided chains #1769

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

Merged
edisontim merged 1 commit into from
Jun 18, 2025
Merged

fix: switch precedence of cartridgeChains and provided chains #1769

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: 4 additions & 2 deletions packages/controller/src/controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default class ControllerProvider extends BaseProvider {

// Merge user chains with default chains
// User chains take precedence if they specify the same network
const chains = [...(options.chains || []), ...cartridgeChains];
const chains = [...cartridgeChains, ...(options.chains || [])];
const defaultChainId =
options.defaultChainId || constants.StarknetChainId.SN_MAIN;

Expand Down Expand Up @@ -438,8 +438,10 @@ export default class ControllerProvider extends BaseProvider {
const isMainnet = chainId === constants.StarknetChainId.SN_MAIN;
const isSepolia = chainId === constants.StarknetChainId.SN_SEPOLIA;
const isCartridgeRpc = url.hostname === "api.cartridge.gg";
const isLocalhost =
url.hostname === "localhost" || url.hostname === "127.0.0.1";

if ((isMainnet || isSepolia) && !isCartridgeRpc) {
if ((isMainnet || isSepolia) && !(isCartridgeRpc || isLocalhost)) {
throw new Error(
`Only Cartridge RPC providers are allowed for ${isMainnet ? "mainnet" : "sepolia"}. ` +
`Please use: https://api.cartridge.gg/x/starknet/${isMainnet ? "mainnet" : "sepolia"}`,
Expand Down
Loading