feat: split USDC and USDC.e in starterpack token selection (#2470)

## Summary
- Separates USDC into native USDC and bridged USDC.e for starterpack
token selection.
- Both native USDC and USDC.e are priced at 1:1 against USD in Ekubo
quotes and hardcoded to 6 decimals.
- Added native USDC to the Torii indexing config and updated old USDC
comment to USDC.e.

---------

Co-authored-by: broodling-bot <broodling-bot@users.noreply.github.com>

Author: broodling-bot

packages/keychain/src/components/provider/tokens.tsx

@@ -14,7 +14,12 @@ import {
 import { Price } from "@cartridge/ui/utils/api/cartridge";
 import { useQuery } from "react-query";
 import { getChecksumAddress } from "starknet";
-import { fetchSwapQuoteInUsdc, type ExtendedError } from "@/utils/ekubo";
+import {
+  fetchSwapQuoteInUsdc,
+  type ExtendedError,
+  USDC_ADDRESSES,
+  USDCE_ADDRESSES,
+} from "@/utils/ekubo";
 
 export const DEFAULT_TOKENS = [
   {
@@ -242,7 +247,13 @@ export function TokensProvider({
 
               // USDC price is always 1:1
               if (
-                checksumAddress === getChecksumAddress(USDC_CONTRACT_ADDRESS)
+                checksumAddress === getChecksumAddress(USDC_CONTRACT_ADDRESS) ||
+                (USDC_ADDRESSES[chainId] &&
+                  checksumAddress ===
+                    getChecksumAddress(USDC_ADDRESSES[chainId])) ||
+                (USDCE_ADDRESSES[chainId] &&
+                  checksumAddress ===
+                    getChecksumAddress(USDCE_ADDRESSES[chainId]))
               ) {
                 return {
                   base: address,

packages/keychain/src/components/purchasenew/review/token-utils.ts

@@ -1,4 +1,5 @@
 import { USDC_CONTRACT_ADDRESS } from "@cartridge/ui/utils";
+import { USDC_ADDRESSES, USDCE_ADDRESSES } from "@/utils/ekubo";
 
 /**
  * Normalize a token address for comparison
@@ -15,12 +16,26 @@ export function normalizeTokenAddress(address: string): string {
   return lower;
 }
 
+export function isUsdcToken(tokenAddress: string): boolean {
+  const normalized = normalizeTokenAddress(tokenAddress);
+  if (normalized === USDC_CONTRACT_ADDRESS) return true;
+  if (
+    Object.values(USDC_ADDRESSES).some(
+      (addr) => normalizeTokenAddress(addr) === normalized,
+    )
+  )
+    return true;
+  return Object.values(USDCE_ADDRESSES).some(
+    (addr) => normalizeTokenAddress(addr) === normalized,
+  );
+}
+
 /**
  * Get the number of decimals for a token address
  * USDC = 6 decimals, everything else = 18 decimals
  */
 export function getTokenDecimals(tokenAddress: string): number {
-  return normalizeTokenAddress(tokenAddress) === USDC_CONTRACT_ADDRESS ? 6 : 18;
+  return isUsdcToken(tokenAddress) ? 6 : 18;
 }
 
 /**
@@ -48,9 +63,21 @@ export function tokenAmountToUsd(amount: bigint, tokenAddress: string): string {
  * Get a human-readable token symbol from address
  */
 export function getTokenSymbol(tokenAddress: string): string {
-  if (normalizeTokenAddress(tokenAddress) === USDC_CONTRACT_ADDRESS) {
+  const normalized = normalizeTokenAddress(tokenAddress);
+  if (normalized === USDC_CONTRACT_ADDRESS) return "USDC.e";
+  if (
+    Object.values(USDC_ADDRESSES).some(
+      (addr) => normalizeTokenAddress(addr) === normalized,
+    )
+  )
     return "USDC";
-  }
+  if (
+    Object.values(USDCE_ADDRESSES).some(
+      (addr) => normalizeTokenAddress(addr) === normalized,
+    )
+  )
+    return "USDC.e";
+
   // For unknown tokens, show shortened address
   return `${tokenAddress.slice(0, 6)}...${tokenAddress.slice(-4)}`;
 }
@@ -59,7 +86,7 @@ export function getTokenSymbol(tokenAddress: string): string {
  * Get token icon URL
  */
 export function getTokenIcon(tokenAddress: string): string | null {
-  if (normalizeTokenAddress(tokenAddress) === USDC_CONTRACT_ADDRESS) {
+  if (isUsdcToken(tokenAddress)) {
     return "https://static.cartridge.gg/tokens/usdc.svg";
   }
   return null;

packages/keychain/src/hooks/starterpack/token-selection.ts

@@ -1,12 +1,20 @@
 import { useState, useCallback, useEffect, useMemo } from "react";
 import { erc20Metadata, ExternalPlatform } from "@cartridge/controller";
 import { num, getChecksumAddress, constants } from "starknet";
-import { ERC20 as ERC20Contract } from "@cartridge/ui/utils";
+import {
+  ERC20 as ERC20Contract,
+  USDC_CONTRACT_ADDRESS,
+} from "@cartridge/ui/utils";
 import {
   DEFAULT_TOKENS,
   type ERC20Metadata,
 } from "@/components/provider/tokens";
-import { fetchSwapQuote, USDC_ADDRESSES, type SwapQuote } from "@/utils/ekubo";
+import {
+  fetchSwapQuote,
+  USDC_ADDRESSES,
+  USDCE_ADDRESSES,
+  type SwapQuote,
+} from "@/utils/ekubo";
 import {
   fetchTokenMetadata,
   type TokenMetadata as FullTokenMetadata,
@@ -152,11 +160,14 @@ export function useTokenSelection({
   const availableTokens = useMemo(() => {
     if (!controller) return [];
 
-    // Start with default tokens (ETH, STRK, USDC)
+    // Start with default tokens (ETH, STRK, USDC, USDC.e)
     const usdcAddress =
       USDC_ADDRESSES[controller.chainId()] ||
       USDC_ADDRESSES[constants.StarknetChainId.SN_MAIN];
 
+    const usdceAddress =
+      USDCE_ADDRESSES[controller.chainId()] || USDC_CONTRACT_ADDRESS;
+
     const tokens: ERC20Metadata[] = [
       {
         address: usdcAddress,
@@ -165,6 +176,13 @@ export function useTokenSelection({
         decimals: 6,
         icon: "https://static.cartridge.gg/tokens/usdc.svg",
       },
+      {
+        address: usdceAddress,
+        name: "Bridged USDC",
+        symbol: "USDC.e",
+        decimals: 6,
+        icon: "https://static.cartridge.gg/tokens/usdc.svg",
+      },
       ...DEFAULT_TOKENS,
     ];
 

packages/keychain/src/utils/ekubo/index.ts

@@ -35,6 +35,13 @@ export const EKUBO_ROUTER_ADDRESSES: Record<string, string> = {
 export const USDC_ADDRESSES: Record<string, string> = {
   [constants.StarknetChainId.SN_MAIN]:
     "0x033068F6539f8e6e6b131e6B2B814e6c34A5224bC66947c47DaB9dFeE93b35fb",
+  [constants.StarknetChainId.SN_SEPOLIA]:
+    "0x0512feac6339ff7889822cb5aa2a86c848e9d392bb0e3e237c008674feed8343",
+};
+
+export const USDCE_ADDRESSES: Record<string, string> = {
+  [constants.StarknetChainId.SN_MAIN]:
+    "0x053c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8",
   [constants.StarknetChainId.SN_SEPOLIA]:
     "0x053b40a647cedfca6ca84f542a0fe36736031905a9639a7f19a3c1e66bfd5080",
 };

packages/keychain/src/utils/token-metadata.ts

@@ -1,9 +1,10 @@
 import { Call, RpcProvider, shortString, constants } from "starknet";
-import { USDC_ADDRESSES } from "@/utils/ekubo";
+import { USDC_ADDRESSES, USDCE_ADDRESSES } from "@/utils/ekubo";
 import {
   USDT_CONTRACT_ADDRESS,
   STRK_CONTRACT_ADDRESS,
   ETH_CONTRACT_ADDRESS,
+  USDC_CONTRACT_ADDRESS,
 } from "@cartridge/ui/utils";
 
 export interface TokenMetadata {
@@ -33,6 +34,16 @@ const CACHED_TOKEN_METADATA: Record<string, TokenMetadata> = {
     symbol: "USDT",
     decimals: 6,
   },
+  [USDC_CONTRACT_ADDRESS.toLowerCase()]: {
+    name: "Bridged USDC",
+    symbol: "USDC.e",
+    decimals: 6,
+  },
+  [USDCE_ADDRESSES[constants.StarknetChainId.SN_SEPOLIA].toLowerCase()]: {
+    name: "Bridged USDC",
+    symbol: "USDC.e",
+    decimals: 6,
+  },
   [STRK_CONTRACT_ADDRESS.toLowerCase()]: {
     name: "Starknet Token",
     symbol: "STRK",

packages/torii-config/public-tokens/mainnet.toml

@@ -9,8 +9,10 @@ contracts = [
   "erc20:0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
   # STRK
   "erc20:0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d",
-  # USDC
+  # USDC.e
   "erc20:0x053c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8",
+  # USDC
+  "erc20:0x033068f6539f8e6e6b131e6b2b814e6c34a5224bc66947c47dab9dfee93b35fb",
   # USDT
   "erc20:0x068f5c6a61780768455de69077e07e89787839bf8166decfbf92b645209c0fb8",
   # DAI

packages/torii-config/public-tokens/sepolia.toml

@@ -9,4 +9,8 @@ contracts = [
   "erc20:0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
   # STRK
   "erc20:0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d",
+  # USDC.e
+  "erc20:0x053b40a647cedfca6ca84f542a0fe36736031905a9639a7f19a3c1e66bfd5080",
+  # USDC
+  "erc20:0x0512feac6339ff7889822cb5aa2a86c848e9d392bb0e3e237c008674feed8343",
 ]