address comments

Author: Sneh1999

.github/workflows/espresso-devnet-tests.yaml

@@ -38,6 +38,18 @@ jobs:
       - name: Compile contracts
         run: just compile-contracts
 
+      - name: Load environment variables
+        run: |
+          while IFS= read -r line; do
+            # Skip comments and empty lines
+            if [[ ! "$line" =~ ^#.* ]] && [[ -n "$line" ]]; then
+              # Remove quotes from values
+              line=$(echo "$line" | sed 's/"\(.*\)"/\1/')
+              echo "$line" >> $GITHUB_ENV
+            fi
+          done < ./espresso/.env
+        shell: bash
+
       - name: Build Devnet without TEE
         run: |
           cd op-deployer

.github/workflows/espresso-integration.yaml

@@ -37,6 +37,18 @@ jobs:
       - name: Compile contracts
         run: just compile-contracts
 
+      - name: Load environment variables
+        run: |
+          while IFS= read -r line; do
+            # Skip comments and empty lines
+            if [[ ! "$line" =~ ^#.* ]] && [[ -n "$line" ]]; then
+              # Remove quotes from values
+              line=$(echo "$line" | sed 's/"\(.*\)"/\1/')
+              echo "$line" >> $GITHUB_ENV
+            fi
+          done < ./espresso/.env
+        shell: bash
+
       - name: Generate test slice
         id: test_split
         uses: hashicorp-forge/go-test-split-action@v1

espresso/.env

@@ -26,6 +26,20 @@ ESPRESSO_SEQUENCER_API_PORT=24000
 ESPRESSO_DEV_NODE_PORT=24002
 ESPRESSO_BUILDER_PORT=31003
 
+
+##### Espresso Attestation Verifier Service ######
+ESPRESSO_ATTESTATION_VERIFIER_PORT=8080
+ESPRESSO_ATTESTATION_VERIFIER_RPC_URL="https://rpc.ankr.com/eth_sepolia/ece75e2d2d01c537031b3b31a619b7830674b9cd1b9fe6bc957a3d393c035dbb"
+ESPRESSO_ATTESTATION_VERIFIER_SP1_PROVER="mock"
+ESPRESSO_ATTESTATION_VERIFIER_NITRO_VERIFIER_ADDRESS="0x2D7fbBAD6792698Ba92e67b7e180f8010B9Ec788"
+ESPRESSO_ATTESTATION_VERIFIER_SKIP_TIME_VALIDITY_CHECK=true
+ESPRESSO_ATTESTATION_VERIFIER_HOST="0.0.0.0"
+ESPRESSO_ATTESTATION_VERIFIER_NETWORK_PRIVATE_KEY="0x71f8e55f7555c946eadd5a2b5897465a9813b3ee493d6ef4ba6f1505a6e97af3"
+ESPRESSO_ATTESTATION_VERIFIER_NETWORK_RPC_URL="https://rpc.mainnet.succinct.xyz"
+ESPRESSO_ATTESTATION_VERIFIER_NETWORK_USE_DOCKER=1
+ESPRESSO_ATTESTATION_VERIFIER_RUST_LOG="info"
+ESPRESSO_ATTESTATION_VERIFIER_DOCKER_IMAGE="ghcr.io/espressosystems/attestation-verifier-zk:sha-0e987c3"
+
 L1_ENGINE_PORT=8551
 L1_HTTP_PORT=8545
 L1_BEACON_PORT=5052

espresso/docker-compose.yml

@@ -376,7 +376,7 @@ services:
       - --espresso.enabled=true
       - --espresso.fetch-api=true
       - --espresso.poll-interval=1s
-      - --espresso.espresso-attestation-service=http://attestation-service-zk:8080
+      - --espresso.espresso-attestation-service=http://attestation-service-zk:${ESPRESSO_ATTESTATION_VERIFIER_PORT}
       - --espresso.light-client-addr=0x703848f4c85f18e3acd8196c8ec91eb0b7bd0797
       - --espresso.testing-batcher-private-key=${OP_TESTING_BATCHER_PRIVATE_KEY:-$OPERATOR_PRIVATE_KEY}
       - --private-key=${OP_BATCHER_PRIVATE_KEY:-$OPERATOR_PRIVATE_KEY}
@@ -449,7 +449,7 @@ services:
         export L2_RPC_URL="http://127.0.0.1:${OP_HTTP_PORT}"
         export ROLLUP_RPC_URL="http://127.0.0.1:${ROLLUP_PORT}"
         export ESPRESSO_URL1="http://127.0.0.1:${ESPRESSO_SEQUENCER_API_PORT}"
-        export ATTESTATION_SERVICE_URL="http://127.0.0.1:8080"
+        export ESPRESSO_ATTESTATION_SERVICE_URL="http://127.0.0.1:${ESPRESSO_ATTESTATION_VERIFIER_PORT}"
         /source/espresso/docker/op-batcher-tee/run-enclave.sh
 
   # Legacy op-proposer (for non-succinct mode)
@@ -637,29 +637,31 @@ services:
     image: ghcr.io/espressosystems/attestation-verifier-zk:sha-0e987c3
     platform: linux/amd64
     ports:
-      - "8080:8080"
+      - "${ESPRESSO_ATTESTATION_VERIFIER_PORT}:${ESPRESSO_ATTESTATION_VERIFIER_PORT}"
     healthcheck:
       test:
         [
           "CMD-SHELL",
-          "timeout 2 bash -c 'cat < /dev/null > /dev/tcp/localhost/8080' || exit 1",
+          "timeout 2 bash -c 'cat < /dev/null > /dev/tcp/localhost/${ESPRESSO_ATTESTATION_VERIFIER_PORT}' || exit 1",
         ]
       interval: 5s
       timeout: 3s
       retries: 30
       start_period: 150s
+    env_file:
+      - ./.env
     environment:
       # This is a demo private key for tests, it doesnt contain any funds
-      NETWORK_PRIVATE_KEY: "0x71f8e55f7555c946eadd5a2b5897465a9813b3ee493d6ef4ba6f1505a6e97af3"
-      NETWORK_RPC_URL: "https://rpc.mainnet.succinct.xyz"
-      SP1_PROVER: "mock"
-      RPC_URL: "https://rpc.ankr.com/eth_sepolia/ece75e2d2d01c537031b3b31a619b7830674b9cd1b9fe6bc957a3d393c035dbb"
-      NITRO_VERIFIER_ADDRESS: "0x2D7fbBAD6792698Ba92e67b7e180f8010B9Ec788"
-      USE_DOCKER: "1"
-      SKIP_TIME_VALIDITY_CHECK: "true"
-      RUST_LOG: "info"
-      HOST: "0.0.0.0"
-      PORT: "8080"
+      NETWORK_PRIVATE_KEY: "${ESPRESSO_ATTESTATION_VERIFIER_NETWORK_PRIVATE_KEY}"
+      NETWORK_RPC_URL: "${ESPRESSO_ATTESTATION_VERIFIER_NETWORK_RPC_URL}"
+      SP1_PROVER: "${ESPRESSO_ATTESTATION_VERIFIER_SP1_PROVER}"
+      RPC_URL: "${ESPRESSO_ATTESTATION_VERIFIER_RPC_URL}"
+      NITRO_VERIFIER_ADDRESS: "${ESPRESSO_ATTESTATION_VERIFIER_NITRO_VERIFIER_ADDRESS}"
+      USE_DOCKER: "${ESPRESSO_ATTESTATION_VERIFIER_NETWORK_USE_DOCKER}"
+      SKIP_TIME_VALIDITY_CHECK: "${ESPRESSO_ATTESTATION_VERIFIER_SKIP_TIME_VALIDITY_CHECK}"
+      RUST_LOG: "${ESPRESSO_ATTESTATION_VERIFIER_RUST_LOG}"
+      HOST: "${ESPRESSO_ATTESTATION_VERIFIER_HOST}"
+      PORT: "${ESPRESSO_ATTESTATION_VERIFIER_PORT}"
 
   espresso-dev-node:
     image: ${ESPRESSO_DEV_NODE_IMAGE}

espresso/docker/op-batcher-tee/run-enclave.sh

@@ -10,7 +10,7 @@ set -e
 : ${ROLLUP_RPC_URL:?Error: ROLLUP_RPC_URL is required}
 : ${ESPRESSO_URL1:?Error: ESPRESSO_URL1 is required}
 : ${OPERATOR_PRIVATE_KEY:?Error: OPERATOR_PRIVATE_KEY is required}
-: ${ATTESTATION_SERVICE_URL:?Error: ATTESTATION_SERVICE_URL is required}
+: ${ESPRESSO_ATTESTATION_SERVICE_URL:?Error: ESPRESSO_ATTESTATION_SERVICE_URL is required}
 
 # Optional configuration with defaults
 TAG="${TAG:-op-batcher-enclavetool}"
@@ -29,7 +29,7 @@ echo "L1 RPC URL: $L1_RPC_URL"
 echo "L2 RPC URL: $L2_RPC_URL"
 echo "Rollup RPC URL: $ROLLUP_RPC_URL"
 echo "Espresso URLs: $ESPRESSO_URL1, $ESPRESSO_URL2"
-echo "Attestation service url: $ATTESTATION_SERVICE_URL"
+echo "Attestation service url: $ESPRESSO_ATTESTATION_SERVICE_URL"
 echo "Debug Mode: $ENCLAVE_DEBUG"
 echo "Monitor Interval: $MONITOR_INTERVAL seconds"
 echo "Memory: ${MEMORY_MB}MB"
@@ -50,7 +50,7 @@ BATCHER_ARGS="$BATCHER_ARGS,--max-channel-duration=1"
 BATCHER_ARGS="$BATCHER_ARGS,--target-num-frames=1"
 BATCHER_ARGS="$BATCHER_ARGS,--espresso.fetch-api=true"
 BATCHER_ARGS="$BATCHER_ARGS,--espresso.light-client-addr=0x703848f4c85f18e3acd8196c8ec91eb0b7bd0797"
-BATCHER_ARGS="$BATCHER_ARGS,--espresso.espresso-attestation-service=$ATTESTATION_SERVICE_URL"
+BATCHER_ARGS="$BATCHER_ARGS,--espresso.espresso-attestation-service=$ESPRESSO_ATTESTATION_SERVICE_URL"
 
 # Add debug arguments if enabled
 if [ "$ENCLAVE_DEBUG" = "true" ]; then

espresso/environment/5_batch_authentication_test.go

@@ -63,6 +63,12 @@ func TestE2eDevnetWithUnattestedBatcherKey(t *testing.T) {
 
 	launcher := new(env.EspressoDevNodeLauncherDocker)
 
+	// This is a random private key belonging to address 0xe16d5c4080C0faD6D2Ef4eb07C657674a217271C that will result in Mock Nitro verifier to return `false`
+	// because the given key is not registered as an attested batcher.
+	// Check the following code in Mock Espresso Nitro verifier:
+	//    if (signer == address(0xe16d5c4080C0faD6D2Ef4eb07C657674a217271C)) {
+	//        return false;
+	//   }
 	privateKey, err := crypto.HexToECDSA("841c29acb9520a7ea8a48e7686cd825b93e8a3ecd966b62cb396ff8a2cd7e80e")
 	if err != nil {
 		t.Fatalf("failed to parse private key: %v", err)