diff --git a/app/witnesscalc/depends/json b/app/witnesscalc/depends/json
index 199dea11..b36f4c47 160000
--- a/app/witnesscalc/depends/json
+++ b/app/witnesscalc/depends/json
@@ -1 +1 @@
-Subproject commit 199dea11b17c533721b26249e2dcaee6ca1d51d3
+Subproject commit b36f4c477c40356a0ae1204b567cca3c2a57d201
diff --git a/contracts/.env.example b/contracts/.env.example
index 8254e947..60d5ccd6 100644
--- a/contracts/.env.example
+++ b/contracts/.env.example
@@ -1,2 +1,13 @@
-export PKEY='0x123'
-OPTIMISM_RPC_URL=https://rpc.sepolia.org
\ No newline at end of file
+PKEY='0x123'
+
+MAINNET_RPC_URL=
+SEPOLIA_RPC_URL=https://rpc.sepolia.org
+OPTIMISM_RPC_URL=
+OPTIMISM_SEPOLIA_RPC_URL=
+POLYGON_RPC_URL=
+MUMBAI_RPC_URL=
+WORLD_RPC_URL=
+WORLD_SEPOLIA_RPC_URL=
+
+ETHERSCAN_API_KEY=
+OPTIMISMSCAN_API_KEY=
\ No newline at end of file
diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts
index e53ff23f..2960aa87 100644
--- a/contracts/hardhat.config.ts
+++ b/contracts/hardhat.config.ts
@@ -36,36 +36,38 @@ const config: HardhatUserConfig = {
       url: "http://127.0.0.1:8545",
       accounts: ["0xdf57089febbacf7ba0bc227dafbffa9fc08a93fdc68e1e42411a14efcf23656e"]
     },
-    goerli: {
-      url: "https://eth-goerli.public.blastapi.io",
-      accounts: [process.env.PKEY as string],
-    },
+    // goerli: {
+    //   url: "https://eth-goerli.public.blastapi.io",
+    //   accounts: [process.env.PKEY as string],
+    // },
     polygon: {
-      url: "https://polygon.llamarpc.com",
+      url: process.env.POLYGON_RPC_URL || "https://polygon.llamarpc.com",
       accounts: [process.env.PKEY as string],
     },
     mumbai: {
-      url: "https://polygon-mumbai-bor.publicnode.com",
+      url: process.env.MUMBAI_RPC_URL || "https://polygon-mumbai-bor.publicnode.com",
       accounts: [process.env.PKEY as string],
     },
     sepolia: {
-      url: "https://eth-sepolia.public.blastapi.io",
+      url: process.env.SEPOLIA_RPC_URL || "https://eth-sepolia.public.blastapi.io",
       accounts: [process.env.PKEY as string],
       gasPrice: 6 * 10 ** 9, 
     },
     optimismSepolia: {
-      url: "https://opt-sepolia.g.alchemy.com/v2/t30F1rBnOskwo0M0Q4Re6bXQHQPpW_Sz",
+      url: process.env.OPTIMISM_SEPOLIA_RPC_URL || "https://sepolia.optimism.io",
       accounts: [process.env.PKEY as string],
       gasPrice: 5 * 10 ** 9, // Optimism uses a different gas mechanism, set to 0 for automatic handling
     },
     optimism: {
-      url: "https://opt-mainnet.g.alchemy.com/v2/Mjj_SdklUaCdR6EPfVKXb7m6Pj5TjzWL",
-      accounts: [process.env.PKEY_OP as string],
+      url: process.env.OPTIMISM_RPC_URL || "https://mainnet.optimism.io",
+      accounts: [process.env.PKEY as string],
     }
   },
   etherscan: {
-    //apiKey: "GSZW9CN933WI4N3ZMQF9XCX9R6AC2H9IZF", ethereum
-    apiKey: "86Q5KMJ24TADN1WRUUVSDK31IAR44I1J4K" // optimism
+    apiKey: {
+      ethereum: process.env.ETHERSCAN_API_KEY as string,
+      optimism: process.env.OPTIMISMSCAN_API_KEY as string
+    }
   }
 };