Merge pull request #136 from lidofinance/develop

Merge develop into main
lidofinance · Sep 6, 2023 · e655568 · e655568
2 parents 4272c17 + 550bc12
commit e655568
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 31 deletions.
diff --git a/.env.sample b/.env.sample
@@ -1,8 +1,6 @@
-# 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=
 
 # etherscan api key
 ETHERSCAN_API_KEY=

diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ Step 1. Copy the contents of `.env.sample` to `.env.local`
 cp .env.sample .env.local
 ```
 
-Step 2. Fill out the `.env.local`. You may need to sign up for [Infura](https://infura.io/) or [Alchemy](https://www.alchemy.com/), if you haven't already, to be able to use Ethereum JSON RPC connection.
+Step 2. Fill out the `.env.local`. You will need to provide RPC provider urls with keys included.
 
 Step 3. Install dependencies
 

diff --git a/examples/sample.env-develop.env b/examples/sample.env-develop.env
@@ -1,17 +1,14 @@
-# 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_5=
 
 # etherscan api key
 ETHERSCAN_API_KEY=
 
 # supported networks for connecting wallet
-SUPPORTED_CHAINS=4,5
+SUPPORTED_CHAINS=5
 
 # this chain uses when a wallet is not connected
-DEFAULT_CHAIN=4
+DEFAULT_CHAIN=5
 
 # comma-separated trusted hosts for Content Security Policy
 CSP_TRUSTED_HOSTS=

diff --git a/examples/sample.env-production.env b/examples/sample.env-production.env
@@ -1,8 +1,5 @@
-# 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=
 
 # etherscan api key
 ETHERSCAN_API_KEY=

diff --git a/examples/sample.env-staging.env b/examples/sample.env-staging.env
@@ -1,8 +1,5 @@
-# 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=
 
 # etherscan api key
 ETHERSCAN_API_KEY=

diff --git a/next.config.mjs b/next.config.mjs
@@ -1,6 +1,19 @@
 const basePath = process.env.BASE_PATH || ''
 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 etherscanApiKey = process.env.ETHERSCAN_API_KEY
 
 const defaultChain = process.env.DEFAULT_CHAIN || '1'
@@ -111,8 +124,8 @@ export default {
   },
   serverRuntimeConfig: {
     basePath,
-    infuraApiKey,
-    alchemyApiKey,
+    rpcUrls_1,
+    rpcUrls_5,
     etherscanApiKey,
     cspTrustedHosts,
     cspReportOnly,

diff --git a/pages/api/rpc.ts b/pages/api/rpc.ts
@@ -1,14 +1,19 @@
 import clone from 'just-clone'
 import getConfig from 'next/config'
-import { getAlchemyRPCUrl, getInfuraRPCUrl } from '@lido-sdk/fetch'
+import { CHAINS } from '@lido-sdk/constants'
 import { parseChainId } from 'modules/blockChain/chains'
 import { fetchWithFallback } from 'modules/network/utils/fetchWithFallback'
 import type { NextApiRequest, NextApiResponse } from 'next'
 
 const { serverRuntimeConfig } = getConfig()
-const { infuraApiKey, alchemyApiKey } = serverRuntimeConfig
+const { rpcUrls_1, rpcUrls_5 } = serverRuntimeConfig
 
 export default async function rpc(req: NextApiRequest, res: NextApiResponse) {
+  const RPC_URLS: Record<number, string[]> = {
+    [CHAINS.Mainnet]: rpcUrls_1,
+    [CHAINS.Goerli]: rpcUrls_5,
+  }
+
   const requestInfo = {
     type: 'API request',
     path: 'rpc',
@@ -22,10 +27,7 @@ export default async function rpc(req: NextApiRequest, res: NextApiResponse) {
 
   try {
     const chainId = parseChainId(String(req.query.chainId))
-    const urls = [
-      alchemyApiKey ? getAlchemyRPCUrl(chainId, alchemyApiKey) : '',
-      infuraApiKey ? getInfuraRPCUrl(chainId, infuraApiKey) : '',
-    ].filter(Boolean)
+    const urls = RPC_URLS[chainId]
 
     const requested = await fetchWithFallback(urls, chainId, {
       method: 'POST',