Merge pull request #100 from lidofinance/refactor/rpc-url-env

Refactor/rpc url env

.env.sample

@@ -1,20 +1,13 @@
-# https://{NETWORK}.infura.io/v3/{INFURA_API_KEY}
-INFURA_API_KEY=
-
-# https://eth-{NETWORK}.alchemyapi.io/v2/{ALCHEMY_API_KEY}
-ALCHEMY_API_KEY=
-
-# EL_RPC_URLS_{CHAIN_ID} list or URLs delimeted by commas, first entry is primary, else are fallbacks
-EL_RPC_URLS_1=
-EL_RPC_URLS_5=
+# EL_RPC_URLS list or URLs delimeted by commas, first entry is primary, else are fallbacks
+EL_RPC_URLS=
 
 WALLETCONNECT_PROJECT_ID=
 
 # supported networks for connecting wallet
 SUPPORTED_CHAINS=1,5
 
 # this chain uses when a wallet is not connected
-DEFAULT_CHAIN=1
+CHAIN_ID=1
 
 # comma-separated trusted hosts for Content Security Policy
 # e.g. http://localhost:PORT for local development

Dockerfile

@@ -18,12 +18,12 @@ FROM node:16-alpine as base
 
 ARG BASE_PATH=""
 ARG SUPPORTED_CHAINS="1"
-ARG DEFAULT_CHAIN="1"
+ARG CHAIN_ID="1"
 
 ENV NEXT_TELEMETRY_DISABLED=1 \
   BASE_PATH=$BASE_PATH \
   SUPPORTED_CHAINS=$SUPPORTED_CHAINS \
-  DEFAULT_CHAIN=$DEFAULT_CHAIN
+  CHAIN_ID=$CHAIN_ID
 
 WORKDIR /app
 RUN apk add --no-cache curl=~8.5.0-r0

additional.d.ts

@@ -9,6 +9,5 @@ declare module '*.svg' {
 }
 
 type RuntimeConfig = {
-  rpcUrls_1: string[];
-  rpcUrls_5: string[];
+  rpcUrls: string[];
 };

config/rpc.ts

@@ -2,7 +2,7 @@ import { CHAINS } from 'config/chains';
 import getConfig from 'next/config';
 
 const { serverRuntimeConfig } = getConfig();
-const { rpcUrls_1, rpcUrls_5 } = serverRuntimeConfig;
+const { rpcUrls } = serverRuntimeConfig;
 
 export const getBackendRPCPath = (chainId: CHAINS): string => {
   const BASE_URL = typeof window === 'undefined' ? '' : window.location.origin;
@@ -15,6 +15,6 @@ export const backendRPC = {
 };
 
 export const externalRPC: Record<number, [string, ...string[]]> = {
-  [CHAINS.Mainnet]: rpcUrls_1,
-  [CHAINS.Goerli]: rpcUrls_5,
+  [CHAINS.Mainnet]: rpcUrls,
+  [CHAINS.Goerli]: rpcUrls,
 };

env-dynamics.mjs

@@ -1,5 +1,5 @@
 /** @type number */
-export const defaultChain = parseInt(process.env.DEFAULT_CHAIN, 10) || 1;
+export const defaultChain = parseInt(process.env.CHAIN_ID, 10) || 1;
 /** @type number[] */
 export const supportedChains = process.env?.SUPPORTED_CHAINS?.split(',').map(
   (chainId) => parseInt(chainId, 10),

next-logger.config.cjs

@@ -8,9 +8,7 @@ const projectDir = process.cwd()
 loadEnvConfig(projectDir)
 
 const patterns = [
-  ...commonPatterns, 
-  process.env.INFURA_API_KEY, 
-  process.env.ALCHEMY_API_KEY,
+  ...commonPatterns,
 ];
 
 const mask = satanizer(patterns);

next.config.mjs

@@ -3,21 +3,9 @@ import buildDynamics from './scripts/build-dynamics.mjs';
 
 buildDynamics();
 
-const infuraApiKey = process.env.INFURA_API_KEY;
-const alchemyApiKey = process.env.ALCHEMY_API_KEY;
-const rpcUrls_1 =
-  (process.env.EL_RPC_URLS_1 && process.env.EL_RPC_URLS_1.split(',')) ||
-  [
-    alchemyApiKey && `https://eth-mainnet.alchemyapi.io/v2/${alchemyApiKey}`,
-    infuraApiKey && `https://mainnet.infura.io/v3/${infuraApiKey}`,
-  ].filter(Boolean);
-
-const rpcUrls_5 =
-  (process.env.EL_RPC_URLS_5 && process.env.EL_RPC_URLS_5.split(',')) ||
-  [
-    alchemyApiKey && `https://eth-goerli.alchemyapi.io/v2/${alchemyApiKey}`,
-    infuraApiKey && `https://goerli.infura.io/v3/${infuraApiKey}`,
-  ].filter(Boolean);
+const rpcUrls =
+  (process.env.EL_RPC_URLS && process.env.EL_RPC_URLS.split(',')) ||
+  [].filter(Boolean);
 
 const cspTrustedHosts = process.env.CSP_TRUSTED_HOSTS?.split(',') ?? [
   'https://*.lido.fi',
@@ -166,10 +154,7 @@ export default {
     ];
   },
   serverRuntimeConfig: {
-    infuraApiKey,
-    alchemyApiKey,
-    rpcUrls_1,
-    rpcUrls_5,
+    rpcUrls,
     rateLimit,
     rateLimitTimeFrame,
   },