Add an option to pass env file to deploy command (#304)

* Add an option to pass env file to deploy command

* Use env variable mapping in fixturenet-optimism stack

* Use default values from checked in env files

* Use env variable mapping in mobymask-v2 stack

* Update instructions

* Add extra hosts in app compose files and update instructions

* Add CERC prefix to env variables in fixturenet-optimism stack

* Add CERC prefix to env variables in mobymask-v2 stack

app/data/config/fixturenet-optimism/generate-l2-config.sh

@@ -4,6 +4,8 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
 
+CERC_L1_RPC="${CERC_L1_RPC:-${DEFAULT_CERC_L1_RPC}}"
+
 # Check existing config if it exists
 if [ -f /app/jwt.txt ] && [ -f /app/rollup.json ]; then
   echo "Found existing L2 config, cross-checking with L1 deployment config"
@@ -30,6 +32,6 @@ op-node genesis l2 \
   --deployment-dir /contracts-bedrock/deployments/getting-started/ \
   --outfile.l2 /app/genesis.json \
   --outfile.rollup /app/rollup.json \
-  --l1-rpc $L1_RPC
+  --l1-rpc $CERC_L1_RPC
 
 openssl rand -hex 32 > /app/jwt.txt

app/data/config/fixturenet-optimism/l1-params.env

@@ -1,14 +1,14 @@
-# Change if pointing to an external L1 endpoint
+# Defaults
 
 # L1 endpoint
-L1_CHAIN_ID=1212
-L1_RPC="http://fixturenet-eth-geth-1:8545"
-L1_HOST="fixturenet-eth-geth-1"
-L1_PORT=8545
+DEFAULT_CERC_L1_CHAIN_ID=1212
+DEFAULT_CERC_L1_RPC="http://fixturenet-eth-geth-1:8545"
+DEFAULT_CERC_L1_HOST="fixturenet-eth-geth-1"
+DEFAULT_CERC_L1_PORT=8545
 
 # Credentials for accounts on L1 to send balance to Optimism Proxy contract from
 # (enables them to do transactions on L2)
-L1_ADDRESS=
-L1_PRIV_KEY=
-L1_ADDRESS_2=
-L1_PRIV_KEY_2=
+DEFAULT_CERC_L1_ADDRESS=
+DEFAULT_CERC_L1_PRIV_KEY=
+DEFAULT_CERC_L1_ADDRESS_2=
+DEFAULT_CERC_L1_PRIV_KEY_2=

app/data/config/fixturenet-optimism/optimism-contracts/run.sh

@@ -4,7 +4,15 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
 
-echo "Using L1 RPC endpoint ${L1_RPC}"
+CERC_L1_CHAIN_ID="${CERC_L1_CHAIN_ID:-${DEFAULT_CERC_L1_CHAIN_ID}}"
+CERC_L1_RPC="${CERC_L1_RPC:-${DEFAULT_CERC_L1_RPC}}"
+
+CERC_L1_ADDRESS="${CERC_L1_ADDRESS:-${DEFAULT_CERC_L1_ADDRESS}}"
+CERC_L1_PRIV_KEY="${CERC_L1_PRIV_KEY:-${DEFAULT_CERC_L1_PRIV_KEY}}"
+CERC_L1_ADDRESS_2="${CERC_L1_ADDRESS_2:-${DEFAULT_CERC_L1_ADDRESS_2}}"
+CERC_L1_PRIV_KEY_2="${CERC_L1_PRIV_KEY_2:-${DEFAULT_CERC_L1_PRIV_KEY_2}}"
+
+echo "Using L1 RPC endpoint ${CERC_L1_RPC}"
 
 IMPORT_1="import './verify-contract-deployment'"
 IMPORT_2="import './rekey-json'"
@@ -18,7 +26,7 @@ if ! grep -Fxq "$IMPORT_1" tasks/index.ts; then
 fi
 
 # Update the chainId in the hardhat config
-sed -i "/getting-started/ {n; s/.*chainId.*/      chainId: $L1_CHAIN_ID,/}" hardhat.config.ts
+sed -i "/getting-started/ {n; s/.*chainId.*/      chainId: $CERC_L1_CHAIN_ID,/}" hardhat.config.ts
 
 # Exit if a deployment already exists (on restarts)
 # Note: fixturenet-eth-geth currently starts fresh on a restart
@@ -57,16 +65,16 @@ SEQUENCER_ADDRESS=$(echo "$KEYS_JSON" | jq -r '.Sequencer.address')
 # Read the private key of L1 accounts
 if [ -f /geth-accounts/accounts.csv ]; then
   echo "Using L1 account credentials from the mounted volume"
-  L1_ADDRESS=$(head -n 1 /geth-accounts/accounts.csv | cut -d ',' -f 2)
-  L1_PRIV_KEY=$(head -n 1 /geth-accounts/accounts.csv | cut -d ',' -f 3)
-  L1_ADDRESS_2=$(awk -F, 'NR==2{print $(NF-1)}' /geth-accounts/accounts.csv)
-  L1_PRIV_KEY_2=$(awk -F, 'NR==2{print $NF}' /geth-accounts/accounts.csv)
+  CERC_L1_ADDRESS=$(head -n 1 /geth-accounts/accounts.csv | cut -d ',' -f 2)
+  CERC_L1_PRIV_KEY=$(head -n 1 /geth-accounts/accounts.csv | cut -d ',' -f 3)
+  CERC_L1_ADDRESS_2=$(awk -F, 'NR==2{print $(NF-1)}' /geth-accounts/accounts.csv)
+  CERC_L1_PRIV_KEY_2=$(awk -F, 'NR==2{print $NF}' /geth-accounts/accounts.csv)
 else
   echo "Using L1 account credentials from env"
 fi
 
 # Select a finalized L1 block as the starting point for roll ups
-until FINALIZED_BLOCK=$(cast block finalized --rpc-url "$L1_RPC"); do
+until FINALIZED_BLOCK=$(cast block finalized --rpc-url "$CERC_L1_RPC"); do
     echo "Waiting for a finalized L1 block to exist, retrying after 10s"
     sleep 10
 done
@@ -78,22 +86,22 @@ L1_BLOCKTIMESTAMP=$(echo "$FINALIZED_BLOCK" | awk '/timestamp/{print $2}')
 echo "Selected L1 block ${L1_BLOCKNUMBER} as the starting block for roll ups"
 
 # Send balances to the above L2 addresses
-yarn hardhat send-balance --to "${ADMIN_ADDRESS}" --amount 2 --private-key "${L1_PRIV_KEY}" --network getting-started
-yarn hardhat send-balance --to "${PROPOSER_ADDRESS}" --amount 5 --private-key "${L1_PRIV_KEY}" --network getting-started
-yarn hardhat send-balance --to "${BATCHER_ADDRESS}" --amount 1000 --private-key "${L1_PRIV_KEY}" --network getting-started
+yarn hardhat send-balance --to "${ADMIN_ADDRESS}" --amount 2 --private-key "${CERC_L1_PRIV_KEY}" --network getting-started
+yarn hardhat send-balance --to "${PROPOSER_ADDRESS}" --amount 5 --private-key "${CERC_L1_PRIV_KEY}" --network getting-started
+yarn hardhat send-balance --to "${BATCHER_ADDRESS}" --amount 1000 --private-key "${CERC_L1_PRIV_KEY}" --network getting-started
 
 echo "Balances sent to L2 accounts"
 
 # Update the deployment config
 sed -i 's/"l2OutputOracleStartingTimestamp": TIMESTAMP/"l2OutputOracleStartingTimestamp": '"$L1_BLOCKTIMESTAMP"'/g' deploy-config/getting-started.json
-jq --arg chainid "$L1_CHAIN_ID" '.l1ChainID = ($chainid | tonumber)' deploy-config/getting-started.json > tmp.json && mv tmp.json deploy-config/getting-started.json
+jq --arg chainid "$CERC_L1_CHAIN_ID" '.l1ChainID = ($chainid | tonumber)' deploy-config/getting-started.json > tmp.json && mv tmp.json deploy-config/getting-started.json
 
 node update-config.js deploy-config/getting-started.json "$ADMIN_ADDRESS" "$PROPOSER_ADDRESS" "$BATCHER_ADDRESS" "$SEQUENCER_ADDRESS" "$L1_BLOCKHASH"
 
 echo "Updated the deployment config"
 
 # Create a .env file
-echo "L1_RPC=$L1_RPC" > .env
+echo "CERC_L1_RPC=$CERC_L1_RPC" > .env
 echo "PRIVATE_KEY_DEPLOYER=$ADMIN_PRIV_KEY" >> .env
 
 echo "Deploying the L1 smart contracts, this will take a while..."
@@ -109,12 +117,12 @@ PROXY_ADDRESS=$(echo "$PROXY_JSON" | jq -r '.address')
 
 # Send balance to the above Proxy contract in L1 for reflecting balance in L2
 # First account
-yarn hardhat send-balance --to "${PROXY_ADDRESS}" --amount 1 --private-key "${L1_PRIV_KEY}" --network getting-started
+yarn hardhat send-balance --to "${PROXY_ADDRESS}" --amount 1 --private-key "${CERC_L1_PRIV_KEY}" --network getting-started
 # Second account
-yarn hardhat send-balance --to "${PROXY_ADDRESS}" --amount 1 --private-key "${L1_PRIV_KEY_2}" --network getting-started
+yarn hardhat send-balance --to "${PROXY_ADDRESS}" --amount 1 --private-key "${CERC_L1_PRIV_KEY_2}" --network getting-started
 
 echo "Balance sent to Proxy L2 contract"
 echo "Use following accounts for transactions in L2:"
-echo "${L1_ADDRESS}"
-echo "${L1_ADDRESS_2}"
+echo "${CERC_L1_ADDRESS}"
+echo "${CERC_L1_ADDRESS_2}"
 echo "Done"

app/data/config/fixturenet-optimism/run-op-batcher.sh

@@ -4,6 +4,8 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
 
+CERC_L1_RPC="${CERC_L1_RPC:-${DEFAULT_CERC_L1_RPC}}"
+
 # Get BACTHER_KEY from keys.json
 BATCHER_KEY=$(jq -r '.Batcher.privateKey' /l2-accounts/keys.json | tr -d '"')
 
@@ -20,5 +22,5 @@ op-batcher \
   --rpc.enable-admin \
   --max-channel-duration=1 \
   --target-l1-tx-size-bytes=2048 \
-  --l1-eth-rpc=$L1_RPC \
+  --l1-eth-rpc=$CERC_L1_RPC \
   --private-key=$BATCHER_KEY

app/data/config/fixturenet-optimism/run-op-node.sh

@@ -4,6 +4,8 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
 
+CERC_L1_RPC="${CERC_L1_RPC:-${DEFAULT_CERC_L1_RPC}}"
+
 # Get SEQUENCER KEY from keys.json
 SEQUENCER_KEY=$(jq -r '.Sequencer.privateKey' /l2-accounts/keys.json | tr -d '"')
 
@@ -19,5 +21,5 @@ op-node \
   --p2p.disable \
   --rpc.enable-admin \
   --p2p.sequencer.key=$SEQUENCER_KEY \
-  --l1=$L1_RPC \
+  --l1=$CERC_L1_RPC \
   --l1.rpckind=any

app/data/config/watcher-mobymask-v2/deploy-and-generate-invite.sh

@@ -4,30 +4,36 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
 
-echo "Using L2 RPC endpoint ${L2_GETH_RPC}"
+CERC_L2_GETH_RPC="${CERC_L2_GETH_RPC:-${DEFAULT_CERC_L2_GETH_RPC}}"
+CERC_PRIVATE_KEY_DEPLOYER="${CERC_PRIVATE_KEY_DEPLOYER:-${DEFAULT_CERC_PRIVATE_KEY_DEPLOYER}}"
+
+CERC_MOBYMASK_APP_BASE_URI="${CERC_MOBYMASK_APP_BASE_URI:-${DEFAULT_CERC_MOBYMASK_APP_BASE_URI}}"
+CERC_DEPLOYED_CONTRACT="${CERC_DEPLOYED_CONTRACT:-${DEFAULT_CERC_DEPLOYED_CONTRACT}}"
+
+echo "Using L2 RPC endpoint ${CERC_L2_GETH_RPC}"
 
 if [ -f /geth-accounts/accounts.csv ]; then
   echo "Using L1 private key from the mounted volume"
   # Read the private key of L1 account to deploy contract
-  PRIVATE_KEY_DEPLOYER=$(head -n 1 /geth-accounts/accounts.csv | cut -d ',' -f 3)
+  CERC_PRIVATE_KEY_DEPLOYER=$(head -n 1 /geth-accounts/accounts.csv | cut -d ',' -f 3)
 else
-  echo "Using PRIVATE_KEY_DEPLOYER from env"
+  echo "Using CERC_PRIVATE_KEY_DEPLOYER from env"
 fi
 
 # Set the private key
-jq --arg privateKey "$PRIVATE_KEY_DEPLOYER" '.privateKey = $privateKey' secrets-template.json > secrets.json
+jq --arg privateKey "$CERC_PRIVATE_KEY_DEPLOYER" '.privateKey = $privateKey' secrets-template.json > secrets.json
 
 # Set the RPC URL
-jq --arg rpcUrl "$L2_GETH_RPC" '.rpcUrl = $rpcUrl' secrets.json > secrets_updated.json && mv secrets_updated.json secrets.json
+jq --arg rpcUrl "$CERC_L2_GETH_RPC" '.rpcUrl = $rpcUrl' secrets.json > secrets_updated.json && mv secrets_updated.json secrets.json
 
 # Set the MobyMask app base URI
-jq --arg baseURI "$MOBYMASK_APP_BASE_URI" '.baseURI = $baseURI' secrets.json > secrets_updated.json && mv secrets_updated.json secrets.json
+jq --arg baseURI "$CERC_MOBYMASK_APP_BASE_URI" '.baseURI = $baseURI' secrets.json > secrets_updated.json && mv secrets_updated.json secrets.json
 
-export RPC_URL="${L2_GETH_RPC}"
+export RPC_URL="${CERC_L2_GETH_RPC}"
 
-# Check if DEPLOYED_CONTRACT environment variable set to skip contract deployment
-if [[ -n "$DEPLOYED_CONTRACT" ]]; then
-  echo "DEPLOYED_CONTRACT is set to '$DEPLOYED_CONTRACT'"
+# Check if CERC_DEPLOYED_CONTRACT environment variable set to skip contract deployment
+if [ -n "$CERC_DEPLOYED_CONTRACT" ]; then
+  echo "CERC_DEPLOYED_CONTRACT is set to '$CERC_DEPLOYED_CONTRACT'"
   echo "Exiting without deploying contract"
   exit 0
 fi
@@ -53,7 +59,7 @@ fi
 # Wait until balance for deployer account is updated
 cd ../hardhat
 while true; do
-  ACCOUNT_BALANCE=$(yarn balance --network optimism "$PRIVATE_KEY_DEPLOYER" | grep ETH)
+  ACCOUNT_BALANCE=$(yarn balance --network optimism "$CERC_PRIVATE_KEY_DEPLOYER" | grep ETH)
 
   if [ "$ACCOUNT_BALANCE" != "0.0 ETH" ]; then
     echo "Account balance updated: $ACCOUNT_BALANCE"

app/data/config/watcher-mobymask-v2/mobymask-app-start.sh

@@ -4,6 +4,11 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
 
+CERC_CHAIN_ID="${CERC_CHAIN_ID:-${DEFAULT_CERC_CHAIN_ID}}"
+CERC_DEPLOYED_CONTRACT="${CERC_DEPLOYED_CONTRACT:-${DEFAULT_CERC_DEPLOYED_CONTRACT}}"
+CERC_RELAY_NODES="${CERC_RELAY_NODES:-${DEFAULT_CERC_RELAY_NODES}}"
+CERC_APP_WATCHER_URL="${CERC_APP_WATCHER_URL:-${DEFAULT_CERC_APP_WATCHER_URL}}"
+
 # Use config from mounted volume if available (when running web-app along with watcher stack)
 if [ -f /server/config.json ]; then
   echo "Merging config for deployed contract from mounted volume"
@@ -13,13 +18,13 @@ else
   echo "Setting deployed contract details from env"
 
   # Set config values from environment variables
-  jq --arg address "$DEPLOYED_CONTRACT" \
-    --argjson chainId $CHAIN_ID \
-    --argjson relayNodes "$RELAY_NODES" \
+  jq --arg address "$CERC_DEPLOYED_CONTRACT" \
+    --argjson chainId $CERC_CHAIN_ID \
+    --argjson relayNodes "$CERC_RELAY_NODES" \
     '.address = $address | .chainId = $chainId | .relayNodes = $relayNodes' \
     /app/src/mobymask-app-config.json > /app/src/config.json
 fi
 
-REACT_APP_WATCHER_URI="$APP_WATCHER_URL/graphql" npm run build
+REACT_APP_WATCHER_URI="$CERC_APP_WATCHER_URL/graphql" npm run build
 
 serve -s build

app/data/config/watcher-mobymask-v2/mobymask-params.env

@@ -1,20 +1,22 @@
-# Change if pointing web app to external watcher endpoint
-WATCHER_HOST="mobymask-watcher-server"
-WATCHER_PORT=3001
-APP_WATCHER_URL="http://localhost:3001"
+# Defaults
+
+# Watcher endpoint
+DEFAULT_CERC_WATCHER_HOST="mobymask-watcher-server"
+DEFAULT_CERC_WATCHER_PORT=3001
+DEFAULT_CERC_APP_WATCHER_URL="http://localhost:3001"
 
 # Base URI for mobymask-app (used for generating invite)
-MOBYMASK_APP_BASE_URI="http://127.0.0.1:3002/#"
+DEFAULT_CERC_MOBYMASK_APP_BASE_URI="http://127.0.0.1:3002/#"
 
 # Set to false for disabling watcher peer to send txs to L2
-ENABLE_PEER_L2_TXS=true
+DEFAULT_CERC_ENABLE_PEER_L2_TXS=true
 
 # Set deployed MobyMask contract address to avoid deploying contract in stack
 # mobymask-app will use this contract address in config if run separately
-DEPLOYED_CONTRACT=
+DEFAULT_CERC_DEPLOYED_CONTRACT=
 
 # Chain ID is used by mobymask web-app for txs
-CHAIN_ID=42069
+DEFAULT_CERC_CHAIN_ID=42069
 
 # Set relay nodes to be used by web-apps
-RELAY_NODES=["/ip4/127.0.0.1/tcp/9090/ws/p2p/12D3KooWSPCsVkHVyLQoCqhu2YRPvvM7o6r6NRYyLM5zeA6Uig5t"]
+DEFAULT_CERC_RELAY_NODES=["/ip4/127.0.0.1/tcp/9090/ws/p2p/12D3KooWSPCsVkHVyLQoCqhu2YRPvvM7o6r6NRYyLM5zeA6Uig5t"]

app/data/config/watcher-mobymask-v2/optimism-params.env

@@ -1,13 +1,13 @@
-# Change if pointing to an external optimism geth endpoint
+# Defaults
 
 # L2 endpoints
-L2_GETH_RPC="http://op-geth:8545"
-L2_GETH_HOST="op-geth"
-L2_GETH_PORT=8545
+DEFAULT_CERC_L2_GETH_RPC="http://op-geth:8545"
+DEFAULT_CERC_L2_GETH_HOST="op-geth"
+DEFAULT_CERC_L2_GETH_PORT=8545
 
-L2_NODE_HOST="op-node"
-L2_NODE_PORT=8547
+DEFAULT_CERC_L2_NODE_HOST="op-node"
+DEFAULT_CERC_L2_NODE_PORT=8547
 
 # Credentials for accounts to perform txs on L2
-PRIVATE_KEY_DEPLOYER=
-PRIVATE_KEY_PEER=
+DEFAULT_CERC_PRIVATE_KEY_DEPLOYER=
+DEFAULT_CERC_PRIVATE_KEY_PEER=

app/data/config/watcher-mobymask-v2/start-server.sh

@@ -4,11 +4,17 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
 
-echo "Using L2 RPC endpoint ${L2_GETH_RPC}"
+CERC_L2_GETH_RPC="${CERC_L2_GETH_RPC:-${DEFAULT_CERC_L2_GETH_RPC}}"
+CERC_PRIVATE_KEY_PEER="${CERC_PRIVATE_KEY_PEER:-${DEFAULT_CERC_PRIVATE_KEY_PEER}}"
+
+CERC_ENABLE_PEER_L2_TXS="${CERC_ENABLE_PEER_L2_TXS:-${DEFAULT_CERC_ENABLE_PEER_L2_TXS}}"
+CERC_DEPLOYED_CONTRACT="${CERC_DEPLOYED_CONTRACT:-${DEFAULT_CERC_DEPLOYED_CONTRACT}}"
+
+echo "Using L2 RPC endpoint ${CERC_L2_GETH_RPC}"
 
 # Use contract address from environment variable or set from config.json in mounted volume
-if [ -n "$DEPLOYED_CONTRACT" ]; then
-  CONTRACT_ADDRESS="${DEPLOYED_CONTRACT}"
+if [ -n "$CERC_DEPLOYED_CONTRACT" ]; then
+  CONTRACT_ADDRESS="${CERC_DEPLOYED_CONTRACT}"
 else
   # Assign deployed contract address from server config (created by mobymask container after deploying contract)
   CONTRACT_ADDRESS=$(jq -r '.address' /server/config.json | tr -d '"')
@@ -17,19 +23,19 @@ fi
 if [ -f /geth-accounts/accounts.csv ]; then
   echo "Using L1 private key from the mounted volume"
   # Read the private key of L1 account for sending txs from peer
-  PRIVATE_KEY_PEER=$(awk -F, 'NR==2{print $NF}' /geth-accounts/accounts.csv)
+  CERC_PRIVATE_KEY_PEER=$(awk -F, 'NR==2{print $NF}' /geth-accounts/accounts.csv)
 else
-  echo "Using PRIVATE_KEY_PEER from env"
+  echo "Using CERC_PRIVATE_KEY_PEER from env"
 fi
 
 
 # Read in the config template TOML file and modify it
 WATCHER_CONFIG_TEMPLATE=$(cat environments/watcher-config-template.toml)
 WATCHER_CONFIG=$(echo "$WATCHER_CONFIG_TEMPLATE" | \
-  sed -E "s/REPLACE_WITH_ENABLE_PEER_L2_TXS/${ENABLE_PEER_L2_TXS}/g; \
-          s/REPLACE_WITH_PRIVATE_KEY_PEER/${PRIVATE_KEY_PEER}/g; \
+  sed -E "s/REPLACE_WITH_CERC_ENABLE_PEER_L2_TXS/${CERC_ENABLE_PEER_L2_TXS}/g; \
+          s/REPLACE_WITH_CERC_PRIVATE_KEY_PEER/${CERC_PRIVATE_KEY_PEER}/g; \
           s/REPLACE_WITH_CONTRACT_ADDRESS/${CONTRACT_ADDRESS}/g; \
-          s|REPLACE_WITH_L2_GETH_RPC_ENDPOINT|${L2_GETH_RPC}| ")
+          s|REPLACE_WITH_CERC_L2_GETH_RPC_ENDPOINT|${CERC_L2_GETH_RPC}| ")
 
 # Write the modified content to a new file
 echo "$WATCHER_CONFIG" > environments/local.toml

app/data/config/watcher-mobymask-v2/test-app-start.sh

@@ -4,8 +4,10 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
 
-# Set relay nodes in config from RELAY_NODES environment variable
-jq --argjson relayNodes "$RELAY_NODES" \
+CERC_RELAY_NODES="${CERC_RELAY_NODES:-${DEFAULT_CERC_RELAY_NODES}}"
+
+# Set relay nodes in config from CERC_RELAY_NODES environment variable
+jq --argjson relayNodes "$CERC_RELAY_NODES" \
   '.relayNodes = $relayNodes' \
   ./src/test-app-config.json > ./src/config.json
 

app/data/config/watcher-mobymask-v2/watcher-config-template.toml

@@ -35,10 +35,10 @@
       pubSubTopic = 'mobymask'
       peerIdFile = './peer-id.json'
       enableDebugInfo = true
-      enableL2Txs = REPLACE_WITH_ENABLE_PEER_L2_TXS
+      enableL2Txs = REPLACE_WITH_CERC_ENABLE_PEER_L2_TXS
 
       [server.p2p.peer.l2TxsConfig]
-        privateKey = 'REPLACE_WITH_PRIVATE_KEY_PEER'
+        privateKey = 'REPLACE_WITH_CERC_PRIVATE_KEY_PEER'
         contractAddress = 'REPLACE_WITH_CONTRACT_ADDRESS'
 
 [metrics]
@@ -60,7 +60,7 @@
 [upstream]
   [upstream.ethServer]
     gqlApiEndpoint = "http://ipld-eth-server:8083/graphql"
-    rpcProviderEndpoint = "REPLACE_WITH_L2_GETH_RPC_ENDPOINT"
+    rpcProviderEndpoint = "REPLACE_WITH_CERC_L2_GETH_RPC_ENDPOINT"
     blockDelayInMilliSecs = 60000
 
   [upstream.cache]