From fab501aca647226f18b428e3249bfe194c2e83e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro=20Sousa?= <outgoing@zpedro.dev>
Date: Mon, 19 Feb 2024 14:33:51 +0000
Subject: [PATCH] abstracting networks away

---
 .github/workflows/vite_hardhat.yaml         |  8 --------
 .github/workflows/vite_hardhat_nightly.yaml | 12 +-----------
 vite-hardhat/hardhat.config.cts             | 20 ++++++++++++++------
 vite-hardhat/utils/addresses.json           |  2 +-
 4 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/vite_hardhat.yaml b/.github/workflows/vite_hardhat.yaml
index fcfb5b2..72b257d 100644
--- a/.github/workflows/vite_hardhat.yaml
+++ b/.github/workflows/vite_hardhat.yaml
@@ -45,13 +45,5 @@ jobs:
         run: yarn --immutable
         shell: bash
 
-      - name: 'Create env file'
-        run: |
-          touch .env
-          echo SEPOLIA_ALCHEMY_KEY="${{ secrets.SEPOLIA_ALCHEMY_KEY }}" >> .env
-          echo SEPOLIA_DEPLOYER_PRIVATE_KEY="${{ secrets.SEPOLIA_DEPLOYER_PRIVATE_KEY }}" >> .env
-          echo MUMBAI_ALCHEMY_KEY"=${{ secrets.MUMBAI_ALCHEMY_KEY }}" >> .env
-          echo MUMBAI_DEPLOYER_PRIVATE_KEY="${{ secrets.MUMBAI_DEPLOYER_PRIVATE_KEY }}" >> .env
-
       - name: Run test
         run: yarn test
diff --git a/.github/workflows/vite_hardhat_nightly.yaml b/.github/workflows/vite_hardhat_nightly.yaml
index bb876e1..db61c3c 100644
--- a/.github/workflows/vite_hardhat_nightly.yaml
+++ b/.github/workflows/vite_hardhat_nightly.yaml
@@ -83,18 +83,8 @@ jobs:
           @noir-lang/noir_wasm@${{ matrix.version }} \
           @noir-lang/types@${{ matrix.version }}
 
-      - name: 'Create env file'
-        run: |
-          touch .env
-          echo SEPOLIA_ALCHEMY_KEY="${{ secrets.SEPOLIA_ALCHEMY_KEY }}" >> .env
-          echo SEPOLIA_DEPLOYER_PRIVATE_KEY="${{ secrets.SEPOLIA_DEPLOYER_PRIVATE_KEY }}" >> .env
-          echo MUMBAI_ALCHEMY_KEY"=${{ secrets.MUMBAI_ALCHEMY_KEY }}" >> .env
-          echo MUMBAI_DEPLOYER_PRIVATE_KEY="${{ secrets.MUMBAI_DEPLOYER_PRIVATE_KEY }}" >> .env
-
       - name: Generate verifier contract
-        run: |
-          nargo codegen-verifier
-        working-directory: vite-hardhat/circuits
+        run: yarn prep
 
       - name: Run test
         run: yarn test
diff --git a/vite-hardhat/hardhat.config.cts b/vite-hardhat/hardhat.config.cts
index 3920685..6d586cf 100644
--- a/vite-hardhat/hardhat.config.cts
+++ b/vite-hardhat/hardhat.config.cts
@@ -34,16 +34,24 @@ const config: HardhatUserConfig = {
     localhost: {
       url: 'http://127.0.0.1:8545',
     },
-    hardhat: {
-      mining: {
-        auto: true,
-        interval: 1000,
-      },
-    },
   },
   paths: {
     sources: './circuit',
   },
 };
 
+if (process.env.MUMBAI_ALCHEMY_KEY && config.networks) {
+  config.networks.mumbai = {
+    url: `https://polygon-mumbai.g.alchemy.com/v2/${process.env.MUMBAI_ALCHEMY_KEY}`,
+    accounts: [process.env.MUMBAI_DEPLOYER_PRIVATE_KEY as string],
+  };
+}
+
+if (process.env.SEPOLIA_ALCHEMY_KEY && config.networks) {
+  config.networks.sepolia = {
+    url: `https://eth-sepolia.g.alchemy.com/v2/${process.env.SEPOLIA_ALCHEMY_KEY}`,
+    accounts: [process.env.SEPOLIA_DEPLOYER_PRIVATE_KEY as string],
+  };
+}
+
 export default config;
diff --git a/vite-hardhat/utils/addresses.json b/vite-hardhat/utils/addresses.json
index 943f7c9..272226d 100644
--- a/vite-hardhat/utils/addresses.json
+++ b/vite-hardhat/utils/addresses.json
@@ -1 +1 @@
-{"chainId":31337,"verifier":"0x7a2088a1bfc9d81c55368ae168c2c02570cb814f"}
\ No newline at end of file
+{"chainId":31337,"verifier":"0x9fe46736679d2d9a65f0992f2272de9f3c7fa6e0"}
\ No newline at end of file