Merge pull request #224 from EspressoSystems/refactor/faucet

Move faucet to its own repo
EspressoSystems · Sep 18, 2023 · e88b5d7 · e88b5d7
2 parents bc0d1aa + b4063e3
commit e88b5d7
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 1,455 deletions.
diff --git a/.env b/.env
@@ -39,11 +39,11 @@ ESPRESSO_SEQUENCER_L1_PROVIDER=http://zkevm-mock-l1-network:$ESPRESSO_ZKEVM_L1_P
 ESPRESSO_SEQUENCER_QUERY_SERVICE_URL=http://sequencer0:$ESPRESSO_SEQUENCER_API_PORT
 
 # Config shared between both zkevm-nodes
-ESPRESSO_ZKEVM_FAUCET_DISCORD_TOKEN=""
-ESPRESSO_ZKEVM_FAUCET_GRANT_AMOUNT_ETHERS=1000
-ESPRESSO_ZKEVM_FAUCET_MNEMONIC="test test test test test test test test test test test junk"
-ESPRESSO_ZKEVM_FAUCET_NUM_CLIENTS=1
-ESPRESSO_ZKEVM_FAUCET_TRANSACTION_TIMEOUT_SECS=300
+ESPRESSO_DISCORD_FAUCET_DISCORD_TOKEN=""
+ESPRESSO_DISCORD_FAUCET_GRANT_AMOUNT_ETHERS=1000
+ESPRESSO_DISCORD_FAUCET_MNEMONIC="test test test test test test test test test test test junk"
+ESPRESSO_DISCORD_FAUCET_NUM_CLIENTS=1
+ESPRESSO_DISCORD_FAUCET_TRANSACTION_TIMEOUT_SECS=300
 ESPRESSO_ZKEVM_IGNORE_GEN_BLOCK_NUMBER_CHECK=1
 ESPRESSO_ZKEVM_ETH_TX_MANAGER_POLLING_INTERVAL="1s"
 

diff --git a/.github/workflows/build_static.yml b/.github/workflows/build_static.yml
@@ -55,7 +55,6 @@ jobs:
           name: x86_64-unknown-linux-musl-services
           path: |
             target/x86_64-unknown-linux-musl/release/polygon-zkevm-adaptor
-            target/x86_64-unknown-linux-musl/release/faucet
 
   static-dockers:
     runs-on: ubuntu-latest
@@ -96,19 +95,3 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.polygon-zkevm-adaptor.outputs.tags }}
           labels: ${{ steps.polygon-zkevm-adaptor.outputs.labels }}
-
-      - name: Generate faucet docker metadata
-        uses: docker/metadata-action@v4
-        id: faucet
-        with:
-          images: ghcr.io/espressosystems/espresso-polygon-zkevm-demo/faucet
-
-      - name: Build and push faucet docker
-        uses: docker/build-push-action@v4
-        with:
-          context: ./
-          file: ./docker/faucet.Dockerfile
-          platforms: linux/amd64
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.faucet.outputs.tags }}
-          labels: ${{ steps.faucet.outputs.labels }}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,6 @@
 [workspace]
 
 members = [
-  "faucet",
   "gen-bindings",
   "keygen",
   "polygon-zkevm-adaptor",

diff --git a/docker/faucet.Dockerfile b/docker/faucet.Dockerfile