Cleanup env

examples/starknet-react-next/.env.development

@@ -1,3 +1,2 @@
-NEXT_PUBLIC_RPC_MAINNET="http://localhost:8001/x/starknet/mainnet"
-NEXT_PUBLIC_RPC_SEPOLIA="http://localhost:8001/x/starknet/sepolia"
+NEXT_PUBLIC_API_URL="http://localhost:8001"
 XFRAME_URL="http://localhost:3001"

examples/starknet-react-next/.env.production

@@ -1,3 +1,2 @@
-NEXT_PUBLIC_RPC_MAINNET="https://api.cartridge.gg/x/starknet/mainnet"
-NEXT_PUBLIC_RPC_SEPOLIA="https://api.cartridge.gg/x/starknet/sepolia"
+NEXT_PUBLIC_API_URL="https://api.cartridge.gg"
 XFRAME_URL="https://x.cartridge.gg/"

examples/starknet-react-next/src/components/DelegateAccount.tsx

@@ -29,10 +29,10 @@ export const DelegateAccount = () => {
       setDelegateAddress(delegate?.toString() || "");
       setIsDelegateSupported(true);
     } catch (e: any) {
-      console.log(e)
+      console.log(e);
       // controller doesnt support delegateAccount, ignore
     }
-  }, [account, chainId, cartridgeConnector]);
+  }, [account, cartridgeConnector]);
 
   const execute = useCallback(async () => {
     if (!account) {
@@ -76,7 +76,7 @@ export const DelegateAccount = () => {
               type="text"
               min-width="420px"
               value={delegateAddressInput}
-              onChange={(e:any ) => setDelegateAddressInput(e.target.value)}
+              onChange={(e: any) => setDelegateAddressInput(e.target.value)}
             />
             <Button onClick={() => execute()} disabled={submitted}>
               Set Delegate

examples/starknet-react-next/src/components/Menu.tsx

@@ -13,7 +13,7 @@ export function Menu() {
     if (!account) return;
     const isConnected = await cartridgeConnector.openMenu();
     if (!isConnected) {
-      disconnect()
+      disconnect();
     }
   };
 

examples/starknet-react-next/src/components/providers/StarknetProvider.tsx

@@ -35,12 +35,12 @@ function provider(chain: Chain) {
   switch (chain) {
     case mainnet:
       return new RpcProvider({
-        nodeUrl: process.env.NEXT_PUBLIC_RPC_MAINNET,
+        nodeUrl: `${process.env.NEXT_PUBLIC_API_URL}/x/starknet/mainnet`,
       });
     case sepolia:
     default:
       return new RpcProvider({
-        nodeUrl: process.env.NEXT_PUBLIC_RPC_SEPOLIA,
+        nodeUrl: `${process.env.NEXT_PUBLIC_API_URL}/x/starknet/sepolia`,
       });
   }
 }
@@ -78,7 +78,7 @@ const connectors = [
     ],
     {
       url,
-      rpc: process.env.NEXT_PUBLIC_RPC_SEPOLIA,
+      rpc: `${process.env.NEXT_PUBLIC_API_URL}/x/starknet/sepolia`,
       paymaster: {
         caller: shortString.encodeShortString("ANY_CALLER"),
       },

packages/keychain/.env.development

@@ -1,17 +1,7 @@
-# NEXT_PUBLIC_RP_ID="cartridge.gg"
-# NEXT_PUBLIC_RP_ID="localhost"
-# NEXT_PUBLIC_ADMIN_URL="https://cartridge.gg"
-# NEXT_PUBLIC_API_BASE_URL="https://api.cartridge.gg"
-# NEXT_PUBLIC_API_URL="https://api.cartridge.gg/query"
-# NEXT_PUBLIC_RPC_MAINNET="https://api.cartridge.gg/rpc/starknet"
-# NEXT_PUBLIC_RPC_SEPOLIA="https://api.cartridge.gg/rpc/starknet-sepolia"
 NEXT_PUBLIC_ETH_RPC_MAINNET="https://eth-mainnet.g.alchemy.com/v2/OGPRMquXP3K7oTkLrmVZpjCd1DswtYz3"
 NEXT_PUBLIC_ETH_RPC_SEPOLIA="https://eth-sepolia.g.alchemy.com/v2/mURnclB5pn5elDfyzgTN4W2GR-rOYevI"
 
 NEXT_PUBLIC_ORIGIN="http://localhost:3001"
 NEXT_PUBLIC_RP_ID="localhost"
 NEXT_PUBLIC_ADMIN_URL="http://localhost:3002"
-NEXT_PUBLIC_API_BASE_URL="http://localhost:8000"
-NEXT_PUBLIC_API_URL="http://localhost:8000/query"
-NEXT_PUBLIC_RPC_MAINNET="http://localhost:8001/x/starknet/mainnet"
-NEXT_PUBLIC_RPC_SEPOLIA="http://localhost:8001/x/starknet/sepolia"
+NEXT_PUBLIC_API_URL="http://localhost:8000"

packages/keychain/.env.production

@@ -1,9 +1,6 @@
 NEXT_PUBLIC_ORIGIN="https://x.cartridge.gg"
 NEXT_PUBLIC_RP_ID="cartridge.gg"
 NEXT_PUBLIC_ADMIN_URL="https://cartridge.gg"
-NEXT_PUBLIC_API_BASE_URL="https://api.cartridge.gg"
-NEXT_PUBLIC_API_URL="https://api.cartridge.gg/query"
-NEXT_PUBLIC_RPC_MAINNET="https://api.cartridge.gg/x/starknet/mainnet"
-NEXT_PUBLIC_RPC_SEPOLIA="https://api.cartridge.gg/x/starknet/sepolia"
+NEXT_PUBLIC_API_URL="https://api.cartridge.gg"
 NEXT_PUBLIC_ETH_RPC_MAINNET="https://eth-mainnet.g.alchemy.com/v2/OGPRMquXP3K7oTkLrmVZpjCd1DswtYz3"
 NEXT_PUBLIC_ETH_RPC_SEPOLIA="https://eth-sepolia.g.alchemy.com/v2/mURnclB5pn5elDfyzgTN4W2GR-rOYevI"

packages/keychain/codegen.yaml

@@ -1,5 +1,5 @@
 overwrite: true
-schema: ${NEXT_PUBLIC_API_URL:https://api.cartridge.gg/query}
+schema: ${NEXT_PUBLIC_API_URL:https://api.cartridge.gg}/query
 documents: "src/**/*.graphql"
 generates:
   src/generated/graphql.ts:

packages/keychain/src/components/bridge/BridgeEth.tsx

@@ -306,7 +306,7 @@ const ethereumConfig = createConfig({
 });
 
 async function fetchEthPrice() {
-  const res = await fetch(process.env.NEXT_PUBLIC_API_URL, {
+  const res = await fetch(`${process.env.NEXT_PUBLIC_API_URL}/query`, {
     method: "POST",
     headers: {
       "content-type": "application/json",

packages/keychain/src/components/layout/Container/index.tsx

@@ -120,7 +120,7 @@ type LayoutContextValue = {
   };
 };
 
-type LayoutVariant = "default" | "connect" | "menu"| "error";
+type LayoutVariant = "default" | "connect" | "menu" | "error";
 
 export function useLayout() {
   return useContext(LayoutContext);