chore(contracts): move away from infura key to full rpc url

privacy-scaling-explorations · Apr 30, 2024 · bda20a1 · bda20a1
1 parent eb75e40
commit bda20a1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/contracts/.env.example b/contracts/.env.example
@@ -1,9 +1,17 @@
 MNEMONIC=
+# api key for eth mainnet etherscan
 ETH_ETHERSCAN_API_KEY=
+# api key for optimism mainnet etherscan
 OPTIMISM_ETHERSCAN_API_KEY=
-INFURA_KEY=
-OP_RPC_URL=
-GAS_PRICE=
+# RPC url to talk to optimism mainnet
+SEPOLIA_RPC_URL=
+# RPC url to talk to optimism sepolia
+OP_SEPOLIA_RPC_URL=
+# Forking url for testing
 FORKING_URL=
+# Gas price to use for transactions
+GAS_PRICE=
+# Block number to fork from
 FORKING_BLOCK_NUM=
+# Hardhat logging level (true/false)
 HARDHAT_LOGGING=
diff --git a/contracts/tasks/helpers/constants.ts b/contracts/tasks/helpers/constants.ts
@@ -23,7 +23,7 @@ const GWEI = 1e9;
 export const STATE_TREE_ARITY = 5;
 
 /**
- * Convert gas price from gwei to wei
+ * Convert gas price from gweguari to wei
  *
  * @param value - gas price in gwei
  * @returns gas price in wei
@@ -46,11 +46,12 @@ export const NETWORKS_DEFAULT_GAS: Record<ESupportedChains, number | "auto"> = {
  * @returns {Record<ESupportedChains, string>} rpc urls for supported networks
  */
 export const getNetworkRpcUrls = (): Record<ESupportedChains, string> => {
-  const INFURA_KEY = process.env.INFURA_KEY ?? "";
+  const SEPOLIA_RPC_URL = process.env.SEPOLIA_RPC_URL ?? "";
+  const OP_SEPOLIA_RPC_URL = process.env.OP_SEPOLIA_RPC_URL ?? "";
 
   return {
-    [ESupportedChains.Sepolia]: `https://sepolia.infura.io/v3/${INFURA_KEY}`,
-    [ESupportedChains.OptimismSepolia]: `https://optimism-sepolia.infura.io/v3/${INFURA_KEY}`,
+    [ESupportedChains.Sepolia]: SEPOLIA_RPC_URL,
+    [ESupportedChains.OptimismSepolia]: OP_SEPOLIA_RPC_URL,
     [ESupportedChains.Coverage]: "http://localhost:8555",
     [ESupportedChains.Hardhat]: "http://localhost:8545",
   };

diff --git a/contracts/tests/EASGatekeeper.test.ts b/contracts/tests/EASGatekeeper.test.ts
@@ -38,7 +38,7 @@ describe("EAS Gatekeeper", () => {
         params: [
           {
             forking: {
-              jsonRpcUrl: process.env.OP_RPC_URL || "https://optimism.drpc.org",
+              jsonRpcUrl: process.env.FORKING_URL || "https://optimism.drpc.org",
             },
           },
         ],

diff --git a/contracts/tests/HatsGatekeeper.test.ts b/contracts/tests/HatsGatekeeper.test.ts
@@ -44,7 +44,7 @@ describe("HatsProtocol Gatekeeper", () => {
         params: [
           {
             forking: {
-              jsonRpcUrl: process.env.OP_RPC_URL || "https://optimism.drpc.org",
+              jsonRpcUrl: process.env.FORKING_URL || "https://optimism.drpc.org",
             },
           },
         ],