fix: forks and testnet with rpc proxy (#2459)

grothem · web-flow · commit c9efb109b8fc · 2025-05-06T15:20:15.000+02:00
diff --git a/.env.example b/.env.example
@@ -17,22 +17,23 @@ NEXT_PUBLIC_MIXPANEL=
 NEXT_PUBLIC_FIAT_ON_RAMP=true
 NEXT_PUBLIC_SUBGRAPH_API_KEY=
 NEXT_PUBLIC_IS_CYPRESS_ENABLED=false
+NEXT_PUBLIC_PRIVATE_RPC_ENABLED=false
 
 # Set to 'true' to allow all domains for CORS (use only in development)
 CORS_DOMAINS_ALLOWED=false
 
-# Private RPC URLs (server-side only)
-PRIVATE_RPC_MAINNET=
-PRIVATE_RPC_POLYGON=
-PRIVATE_RPC_AVALANCHE=
-PRIVATE_RPC_ARBITRUM=
-PRIVATE_RPC_BASE=
-PRIVATE_RPC_OPTIMISM=
-PRIVATE_RPC_METIS=
-PRIVATE_RPC_GNOSIS=
-PRIVATE_RPC_BNB=
-PRIVATE_RPC_SCROLL=
-PRIVATE_RPC_ZKSYNC=
-PRIVATE_RPC_LINEA=
-PRIVATE_RPC_SONIC=
-PRIVATE_RPC_CELO=
+# Private RPC api keys (server-side only)
+MAINNET_RPC_API_KEY=
+POLYGON_RPC_API_KEY=
+AVALANCHE_RPC_API_KEY=
+ARBITRUM_RPC_API_KEY=
+BASE_RPC_API_KEY=
+OPTIMISM_RPC_API_KEY=
+METIS_RPC_API_KEY=
+GNOSIS_RPC_API_KEY=
+BNB_RPC_API_KEY=
+SCROLL_RPC_API_KEY=
+ZKSYNC_RPC_API_KEY=
+LINEA_RPC_API_KEY=
+SONIC_RPC_API_KEY=
+CELO_RPC_API_KEY=
diff --git a/pages/api/rpc-proxy.ts b/pages/api/rpc-proxy.ts
@@ -1,43 +1,54 @@
 import { ChainId } from '@aave/contract-helpers';
 import { NextApiRequest, NextApiResponse } from 'next';
 
-import { networkConfigs } from '../../src/ui-config/networksConfig';
-
 // Documentation: ./server-side-rpc-proxy.md
-const PRIVATE_RPC_URLS: Record<string, string> = {
-  [ChainId.mainnet]:
-    process.env.PRIVATE_RPC_MAINNET || networkConfigs[ChainId.mainnet].privateJsonRPCUrl || '',
-  [ChainId.polygon]:
-    process.env.PRIVATE_RPC_POLYGON || networkConfigs[ChainId.polygon].privateJsonRPCUrl || '',
-  [ChainId.avalanche]:
-    process.env.PRIVATE_RPC_AVALANCHE || networkConfigs[ChainId.avalanche].privateJsonRPCUrl || '',
-  [ChainId.arbitrum_one]:
-    process.env.PRIVATE_RPC_ARBITRUM ||
-    networkConfigs[ChainId.arbitrum_one].privateJsonRPCUrl ||
-    '',
-  [ChainId.base]:
-    process.env.PRIVATE_RPC_BASE || networkConfigs[ChainId.base].privateJsonRPCUrl || '',
-  [ChainId.optimism]:
-    process.env.PRIVATE_RPC_OPTIMISM || networkConfigs[ChainId.optimism].privateJsonRPCUrl || '',
-  [ChainId.metis_andromeda]:
-    process.env.PRIVATE_RPC_METIS ||
-    networkConfigs[ChainId.metis_andromeda].privateJsonRPCUrl ||
-    '',
-  [ChainId.xdai]:
-    process.env.PRIVATE_RPC_GNOSIS || networkConfigs[ChainId.xdai].privateJsonRPCUrl || '',
-  [ChainId.bnb]: process.env.PRIVATE_RPC_BNB || networkConfigs[ChainId.bnb].privateJsonRPCUrl || '',
-  [ChainId.scroll]:
-    process.env.PRIVATE_RPC_SCROLL || networkConfigs[ChainId.scroll].privateJsonRPCUrl || '',
-  [ChainId.zksync]:
-    process.env.PRIVATE_RPC_ZKSYNC || networkConfigs[ChainId.zksync].privateJsonRPCUrl || '',
-  [ChainId.linea]:
-    process.env.PRIVATE_RPC_LINEA || networkConfigs[ChainId.linea].privateJsonRPCUrl || '',
-  [ChainId.sonic]:
-    process.env.PRIVATE_RPC_SONIC || networkConfigs[ChainId.sonic].privateJsonRPCUrl || '',
-  [ChainId.celo]:
-    process.env.PRIVATE_RPC_CELO || networkConfigs[ChainId.celo].privateJsonRPCUrl || '',
+const NETWORK_CONFIG: Record<number, { network: string; apiKey: string }> = {
+  // Mainnets
+  [ChainId.mainnet]: { network: 'eth-mainnet', apiKey: process.env.MAINNET_RPC_API_KEY || '' },
+  [ChainId.polygon]: { network: 'polygon-mainnet', apiKey: process.env.POLYGON_RPC_API_KEY || '' },
+  [ChainId.avalanche]: { network: 'avax-mainnet', apiKey: process.env.AVALANCHE_RPC_API_KEY || '' },
+  [ChainId.arbitrum_one]: {
+    network: 'arb-mainnet',
+    apiKey: process.env.ARBITRUM_RPC_API_KEY || '',
+  },
+  [ChainId.base]: { network: 'base-mainnet', apiKey: process.env.BASE_RPC_API_KEY || '' },
+  [ChainId.optimism]: { network: 'opt-mainnet', apiKey: process.env.OPTIMISM_RPC_API_KEY || '' },
+  [ChainId.metis_andromeda]: {
+    network: 'metis-mainnet',
+    apiKey: process.env.METIS_RPC_API_KEY || '',
+  },
+  [ChainId.xdai]: { network: 'gnosis-mainnet', apiKey: process.env.GNOSIS_RPC_API_KEY || '' },
+  [ChainId.bnb]: { network: 'bnb-mainnet', apiKey: process.env.BNB_RPC_API_KEY || '' },
+  [ChainId.scroll]: { network: 'scroll-mainnet', apiKey: process.env.SCROLL_RPC_API_KEY || '' },
+  [ChainId.zksync]: { network: 'zksync-mainnet', apiKey: process.env.ZKSYNC_RPC_API_KEY || '' },
+  [ChainId.linea]: { network: 'linea-mainnet', apiKey: process.env.LINEA_RPC_API_KEY || '' },
+  [ChainId.sonic]: { network: 'sonic-mainnet', apiKey: process.env.SONIC_RPC_API_KEY || '' },
+  [ChainId.celo]: { network: 'celo-mainnet', apiKey: process.env.CELO_RPC_API_KEY || '' },
+
+  // Testnets
+  [ChainId.sepolia]: { network: 'eth-sepolia', apiKey: process.env.MAINNET_RPC_API_KEY || '' },
+  [ChainId.fuji]: { network: 'avax-fuji', apiKey: process.env.AVALANCHE_RPC_API_KEY || '' },
+  [ChainId.arbitrum_sepolia]: {
+    network: 'arb-sepolia',
+    apiKey: process.env.ARBITRUM_RPC_API_KEY || '',
+  },
+  [ChainId.base_sepolia]: { network: 'base-sepolia', apiKey: process.env.BASE_RPC_API_KEY || '' },
+  [ChainId.optimism_sepolia]: {
+    network: 'opt-sepolia',
+    apiKey: process.env.OPTIMISM_RPC_API_KEY || '',
+  },
+  [ChainId.scroll_sepolia]: {
+    network: 'scroll-sepolia',
+    apiKey: process.env.SCROLL_RPC_API_KEY || '',
+  },
 };
 
+function getRpcUrl(chainId: number): string | null {
+  const config = NETWORK_CONFIG[chainId];
+  if (!config) return null;
+  return `https://${config.network}.g.alchemy.com/v2/${config.apiKey}`;
+}
+
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   const allowedOrigins = ['https://app.aave.com', 'https://aave.com'];
   const origin = req.headers.origin;
@@ -73,7 +84,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
   try {
     const { chainId, method, params } = req.body;
     const chainIdNumber = typeof chainId === 'string' ? parseInt(chainId) : chainId;
-    const rpcUrl = PRIVATE_RPC_URLS[chainIdNumber];
+    const rpcUrl = getRpcUrl(chainIdNumber);
 
     if (!rpcUrl) {
       return res.status(400).json({ error: `Unsupported chain ID: ${chainIdNumber}` });
diff --git a/pages/api/server-side-rpc-proxy.md b/pages/api/server-side-rpc-proxy.md
@@ -18,12 +18,12 @@ The implementation consists of two main parts:
 
 ### Environment Variables
 
-Add your private RPC URLs to your server's environment variables:
+Add your private alchemy RPC URLs to your server's environment variables:
 
 ```env
-PRIVATE_RPC_MAINNET=https://your-private-mainnet-rpc-url
-PRIVATE_RPC_POLYGON=https://your-private-polygon-rpc-url
-PRIVATE_RPC_AVALANCHE=https://your-private-avalanche-rpc-url
+MAINNET_RPC_API_KEY=<your-mainnet-rpc-api-key>
+POLYGON_RPC_API_KEY=<your-polygon-rpc-api-key>
+AVALANCHE_RPC_API_KEY=<your-avalanche-rpc-api-key>
 # Add more as needed
 ```
 
@@ -49,6 +49,6 @@ PRIVATE_RPC_AVALANCHE=https://your-private-avalanche-rpc-url
 
 To add support for more chains:
 
-1. Add the environment variable in your server environment (e.g., `PRIVATE_RPC_FANTOM`).
+1. Add the environment variable in your server environment (e.g., `ZKSYNC_RPC_API_KEY`).
 
-2. Update the `PRIVATE_RPC_URLS` object in `pages/api/rpc-proxy.ts` to include the new chain. 
+2. Update the `NETWORK_CONFIG` object in `pages/api/rpc-proxy.ts` to include the new chain and network name.
diff --git a/src/ui-config/networksConfig.ts b/src/ui-config/networksConfig.ts
@@ -37,14 +37,9 @@ export type ExplorerLinkBuilderConfig = {
 export type NetworkConfig = {
   name: string;
   displayName?: string;
-  privateJsonRPCUrl?: string; // private rpc will be used for rpc queries inside the client. normally has private api key and better rate
-  privateJsonRPCWSUrl?: string;
-  publicJsonRPCUrl: readonly string[]; // public rpc used if not private found, and used to add specific network to wallets if user don't have them. Normally with slow rates
-  publicJsonRPCWSUrl?: string;
+  publicJsonRPCUrl: readonly string[]; // public rpc used if not private found
   // https://github.com/aave/aave-api
   ratesHistoryApiUrl?: string;
-  // cachingServerUrl?: string;
-  // cachingWSServerUrl?: string;
   baseUniswapAdapter?: string;
   /**
    * When this is set withdrawals will automatically be unwrapped
@@ -102,7 +97,6 @@ export const testnetConfig: Record<string, BaseNetworkConfig> = {
       'https://rpc.ankr.com/avalanche_fuji',
       'https://ava-testnet.public.blastapi.io/ext/bc/C/rpc',
     ],
-    publicJsonRPCWSUrl: 'wss://api.avax-test.network/ext/bc/C/rpc',
     baseUniswapAdapter: '0x0',
     baseAssetSymbol: 'AVAX',
     wrappedBaseAssetSymbol: 'WAVAX',
@@ -123,7 +117,6 @@ export const testnetConfig: Record<string, BaseNetworkConfig> = {
       'https://sepolia-rollup.arbitrum.io/rpc',
       'https://public.stackup.sh/api/v1/node/arbitrum-sepolia',
     ],
-    publicJsonRPCWSUrl: 'https://sepolia-rollup.arbitrum.io/rpc',
     baseUniswapAdapter: '0x0',
     baseAssetSymbol: 'ETH',
     wrappedBaseAssetSymbol: 'WETH',
@@ -135,13 +128,11 @@ export const testnetConfig: Record<string, BaseNetworkConfig> = {
   },
   [ChainId.base_sepolia]: {
     name: 'Base Sepolia',
-    privateJsonRPCUrl: 'https://base-sepolia.g.alchemy.com/v2/IIdPEqieQtPDflf-075haltN8Jy4CYLp',
     publicJsonRPCUrl: [
       'https://base-sepolia.blockpi.network/v1/rpc/public',
       'https://sepolia.base.org',
       'https://base-sepolia.gateway.tenderly.co',
     ],
-    publicJsonRPCWSUrl: 'wss://base-sepolia-rpc.publicnode.com',
     baseUniswapAdapter: '0x0',
     baseAssetSymbol: 'ETH',
     wrappedBaseAssetSymbol: 'WETH',
@@ -169,7 +160,6 @@ export const testnetConfig: Record<string, BaseNetworkConfig> = {
       'https://sepolia-rpc.scroll.io',
       'https://scroll-sepolia.blockpi.network/v1/rpc/public',
     ],
-    publicJsonRPCWSUrl: 'wss://sepolia-rpc.scroll.io',
     baseUniswapAdapter: '0x0',
     baseAssetSymbol: 'ETH',
     wrappedBaseAssetSymbol: 'WETH',
@@ -184,15 +174,13 @@ export const testnetConfig: Record<string, BaseNetworkConfig> = {
 export const prodNetworkConfig: Record<string, BaseNetworkConfig> = {
   [ChainId.mainnet]: {
     name: 'Ethereum',
-    privateJsonRPCUrl: 'https://eth-mainnet.g.alchemy.com/v2/ZiMMq2478EVIEJdsxC5dMal_ccQwtb31',
     publicJsonRPCUrl: [
       'https://mainnet.gateway.tenderly.co',
       'https://rpc.flashbots.net',
       'https://eth.llamarpc.com',
       'https://eth-mainnet.public.blastapi.io',
       'https://ethereum-rpc.publicnode.com',
     ],
-    publicJsonRPCWSUrl: 'wss://eth-mainnet.alchemyapi.io/v2/demo',
     baseUniswapAdapter: '0xc3efa200a60883a96ffe3d5b492b121d6e9a1f3f',
     baseAssetSymbol: 'ETH',
     wrappedBaseAssetSymbol: 'WETH',
@@ -205,7 +193,6 @@ export const prodNetworkConfig: Record<string, BaseNetworkConfig> = {
   [ChainId.polygon]: {
     name: 'Polygon POS',
     displayName: 'Polygon',
-    privateJsonRPCUrl: 'https://polygon-mainnet.g.alchemy.com/v2/MbgjyHR1CQiU5Y8CUa2mqfRlYwltE5Zr',
     publicJsonRPCUrl: [
       'https://gateway.tenderly.co/public/polygon',
       'https://polygon-pokt.nodies.app',
@@ -214,7 +201,6 @@ export const prodNetworkConfig: Record<string, BaseNetworkConfig> = {
       'https://polygon-mainnet.public.blastapi.io',
       'https://rpc-mainnet.matic.quiknode.pro',
     ],
-    publicJsonRPCWSUrl: 'wss://polygon-rpc.com',
     baseAssetSymbol: 'POL',
     wrappedBaseAssetSymbol: 'WPOL',
     baseAssetDecimals: 18,
@@ -230,13 +216,11 @@ export const prodNetworkConfig: Record<string, BaseNetworkConfig> = {
   },
   [ChainId.avalanche]: {
     name: 'Avalanche',
-    privateJsonRPCUrl: 'https://avax-mainnet.g.alchemy.com/v2/qBXCF7-6YfiiAdG0dvUyLpQuHt02DbXH', //'https://avax.rpc.grove.city/v1/62b3314e123e6f00397f19ca',
     publicJsonRPCUrl: [
       'https://api.avax.network/ext/bc/C/rpc',
       'https://ava-mainnet.public.blastapi.io/ext/bc/C/rpc',
       'https://rpc.ankr.com/avalanche',
     ],
-    publicJsonRPCWSUrl: 'wss://api.avax.network/ext/bc/C/rpc',
     baseUniswapAdapter: '0x0',
     baseAssetSymbol: 'AVAX',
     wrappedBaseAssetSymbol: 'WAVAX',
@@ -253,13 +237,11 @@ export const prodNetworkConfig: Record<string, BaseNetworkConfig> = {
   },
   [ChainId.arbitrum_one]: {
     name: 'Arbitrum',
-    privateJsonRPCUrl: 'https://arb-mainnet.g.alchemy.com/v2/2oA-8BGeYqHHpd2uCU49IzeZDL9skdSm', //'https://arbitrum-one.rpc.grove.city/v1/62b3314e123e6f00397f19ca',
     publicJsonRPCUrl: [
       'https://arb1.arbitrum.io/rpc',
       'https://rpc.ankr.com/arbitrum',
       'https://1rpc.io/arb',
     ],
-    publicJsonRPCWSUrl: 'wss://arb1.arbitrum.io/rpc',
     baseUniswapAdapter: '0x0',
     baseAssetSymbol: 'ETH',
     wrappedBaseAssetSymbol: 'WETH',
@@ -276,7 +258,6 @@ export const prodNetworkConfig: Record<string, BaseNetworkConfig> = {
   },
   [ChainId.base]: {
     name: 'Base',
-    privateJsonRPCUrl: 'https://base-mainnet.g.alchemy.com/v2/AFu9kulpkXzHO7kQQ9UQDXWRyEhJEXPk', //'https://base.rpc.grove.city/v1/62b3314e123e6f00397f19ca',
     publicJsonRPCUrl: [
       'https://mainnet.base.org',
       'https://1rpc.io/base',
@@ -299,9 +280,7 @@ export const prodNetworkConfig: Record<string, BaseNetworkConfig> = {
   },
   [ChainId.optimism]: {
     name: 'OP',
-    privateJsonRPCUrl: 'https://opt-mainnet.g.alchemy.com/v2/H8ZBGuz1LZbRsYnCBQHY4YMv_AUAVGeM', //'https://optimism.rpc.grove.city/v1/62b3314e123e6f00397f19ca',
     publicJsonRPCUrl: ['https://optimism-mainnet.public.blastapi.io', 'https://1rpc.io/op'],
-    publicJsonRPCWSUrl: 'wss://optimism-mainnet.public.blastapi.io',
     baseUniswapAdapter: '0x0',
     baseAssetSymbol: 'ETH',
     wrappedBaseAssetSymbol: 'WETH',
@@ -318,7 +297,6 @@ export const prodNetworkConfig: Record<string, BaseNetworkConfig> = {
   },
   [ChainId.metis_andromeda]: {
     name: 'Metis Andromeda',
-    privateJsonRPCUrl: 'https://metis-mainnet.g.alchemy.com/v2/jUZTAx8v4k1AnKnB2Xa-CBxvU0GUSlzc', //'https://metis.rpc.grove.city/v1/62b3314e123e6f00397f19ca',
     publicJsonRPCUrl: ['https://andromeda.metis.io/?owner=1088'],
     baseAssetSymbol: '', // N/A
     wrappedBaseAssetSymbol: '', // N/A
@@ -330,9 +308,7 @@ export const prodNetworkConfig: Record<string, BaseNetworkConfig> = {
   },
   [ChainId.xdai]: {
     name: 'Gnosis Chain',
-    privateJsonRPCUrl: 'https://gnosis-mainnet.g.alchemy.com/v2/Mzr_UR3Ixxiybvnie9sw9FUp4mVOoARS', //'https://gnosis.rpc.grove.city/v1/62b3314e123e6f00397f19ca',
     publicJsonRPCUrl: ['https://rpc.ankr.com/gnosis', 'https://rpc.gnosischain.com'],
-    publicJsonRPCWSUrl: 'wss://rpc.gnosischain.com/wss',
     baseUniswapAdapter: '0x0',
     baseAssetSymbol: 'xDAI',
     wrappedBaseAssetSymbol: 'WXDAI',
@@ -350,9 +326,7 @@ export const prodNetworkConfig: Record<string, BaseNetworkConfig> = {
   },
   [ChainId.bnb]: {
     name: 'Binance Smart Chain',
-    privateJsonRPCUrl: 'https://bnb-mainnet.g.alchemy.com/v2/nCU1F9Y1KDQFMs9OBtkGw0GLsIKiYBho', //'https://bsc.rpc.grove.city/v1/62b3314e123e6f00397f19ca',
     publicJsonRPCUrl: ['https://bsc.publicnode.com	', 'wss://bsc.publicnode.com'],
-    publicJsonRPCWSUrl: 'wss://bsc.publicnode.com',
     baseAssetSymbol: 'BNB',
     wrappedBaseAssetSymbol: 'WBNB',
     baseAssetDecimals: 18,
@@ -368,9 +342,7 @@ export const prodNetworkConfig: Record<string, BaseNetworkConfig> = {
   },
   [ChainId.scroll]: {
     name: 'Scroll',
-    privateJsonRPCUrl: 'https://scroll-mainnet.g.alchemy.com/v2/SqyEQeiBCyDsgvE6TYTdbrppjdyBsulM', //'https://scroll.rpc.grove.city/v1/62b3314e123e6f00397f19ca',
     publicJsonRPCUrl: ['https://rpc.scroll.io', 'https://rpc.ankr.com/scroll'],
-    publicJsonRPCWSUrl: 'wss://bsc.publicnode.com',
     baseAssetSymbol: 'ETH',
     wrappedBaseAssetSymbol: 'WETH',
     baseAssetDecimals: 18,
@@ -386,7 +358,6 @@ export const prodNetworkConfig: Record<string, BaseNetworkConfig> = {
   },
   [ChainId.zksync]: {
     name: 'ZKsync',
-    privateJsonRPCUrl: 'https://zksync-mainnet.g.alchemy.com/v2/GyNpZOF5T0issE8wYgXXR_KJjUp-yds0',
     publicJsonRPCUrl: ['https://mainnet.era.zksync.io'],
     baseAssetSymbol: 'ETH',
     wrappedBaseAssetSymbol: 'WETH',
@@ -403,7 +374,6 @@ export const prodNetworkConfig: Record<string, BaseNetworkConfig> = {
   },
   [ChainId.linea]: {
     name: 'Linea',
-    privateJsonRPCUrl: 'https://linea-mainnet.g.alchemy.com/v2/6uk5qBl8QvjpEbgF3TgZBbxWkKlmWZR-',
     publicJsonRPCUrl: [
       'https://1rpc.io/linea',
       'https://linea.drpc.org',
@@ -424,7 +394,6 @@ export const prodNetworkConfig: Record<string, BaseNetworkConfig> = {
   },
   [ChainId.sonic]: {
     name: 'Sonic',
-    privateJsonRPCUrl: 'https://sonic-mainnet.g.alchemy.com/v2/L7wpvN30xWzkijd2cRwD8n0VLFM9UTmv',
     publicJsonRPCUrl: [
       'https://rpc.soniclabs.com',
       'https://sonic.drpc.org',
@@ -445,7 +414,6 @@ export const prodNetworkConfig: Record<string, BaseNetworkConfig> = {
   },
   [ChainId.celo]: {
     name: 'Celo',
-    privateJsonRPCUrl: 'https://celo-mainnet.g.alchemy.com/v2/QSIQ93fznmXwv9qEWBnKIOOsQGldk3wL',
     publicJsonRPCUrl: ['https://rpc.ankr.com/celo', 'https://celo.drpc.org'],
     baseAssetSymbol: '', // N/A
     wrappedBaseAssetSymbol: '', // N/A
diff --git a/src/utils/marketsAndNetworksConfig.ts b/src/utils/marketsAndNetworksConfig.ts
