Rename variables.

Author: philippecamacho

espresso/.env

@@ -34,9 +34,9 @@ OPERATOR_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf
 # cast wallet address --private-key $OPERATOR_PRIVATE_KEY
 OPERATOR_ADDRESS=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
 
-# Deployer address for contract ownership (index 3 from mnemonic)
+# BatchAuthenticator owner address for contract ownership (index 3 from mnemonic)
 # cast wallet address --mnemonic "test test ... junk" --hd-path "m/44'/60'/0'/0/3"
-DEPLOYER_ADDRESS=0x90F79bf6EB2c4f870365E785982E1f101E93b906
+BATCH_AUTHENTICATOR_OWNER_ADDRESS=0x90F79bf6EB2c4f870365E785982E1f101E93b906
 
 # cast wallet address --mnemonic "test test ... junk" --hd-path "m/44'/60'/0'/0/1"
 PROPOSER_ADDRESS=0x70997970C51812dc3A010C7d01b50e0d17dc79C8

espresso/scripts/prepare-allocs.sh

@@ -96,7 +96,7 @@ dasel put -f "${DEPLOYER_DIR}/intent.toml" -s .chains.[0].roles.proposer -v "${P
 # contract addresses are deterministic.
 dasel put -f "${DEPLOYER_DIR}/state.json" -s create2Salt -v "0xaecea4f57fadb2097ccd56594f2f22715ac52f92971c5913b70a7f1134b68feb"
 
-DEPLOYER_ADDRESS="${DEPLOYER_ADDRESS}" op-deployer apply --l1-rpc-url "${ANVIL_URL}" \
+BATCH_AUTHENTICATOR_OWNER_ADDRESS="${BATCH_AUTHENTICATOR_OWNER_ADDRESS}" op-deployer apply --l1-rpc-url "${ANVIL_URL}" \
                   --workdir "${DEPLOYER_DIR}" \
                   --private-key="${OPERATOR_PRIVATE_KEY}"
 

op-deployer/pkg/deployer/pipeline/espresso.go

@@ -37,21 +37,21 @@ func DeployEspresso(env *Env, intent *state.Intent, st *state.State, chainID com
 	}
 
 	var eo opcm.DeployEspressoOutput
-	// Read deployer address from environment variable, fallback to env.Deployer
-	var deployerAddress common.Address
-	if deployerEnv := os.Getenv("DEPLOYER_ADDRESS"); deployerEnv != "" {
-		deployerAddress = common.HexToAddress(deployerEnv)
-		lgr.Info("Using deployer address from DEPLOYER_ADDRESS env var", "address", deployerAddress.Hex())
+	// Read batch authenticator owner address from environment variable, fallback to env.Deployer
+	var batchAuthenticatorOwnwerAddress common.Address
+	if batchAuthenticatorOwnerEnv := os.Getenv("BATCH_AUTHENTICATOR_OWNER_ADDRESS"); batchAuthenticatorOwnerEnv != "" {
+		batchAuthenticatorOwnwerAddress = common.HexToAddress(batchAuthenticatorOwnerEnv)
+		lgr.Info("Using batch authenticator owner address from BATCH_AUTHENTICATOR_OWNER_ADDRESS env var", "address", batchAuthenticatorOwnwerAddress.Hex())
 	} else {
-		deployerAddress = env.Deployer
-		lgr.Info("Using deployer address from env.Deployer", "address", deployerAddress.Hex())
+		batchAuthenticatorOwnwerAddress = env.Deployer
+		lgr.Info("Using deployer address from env.Deployer", "address", batchAuthenticatorOwnwerAddress.Hex())
 	}
 
 	eo, err = opcm.DeployEspresso(env.L1ScriptHost, opcm.DeployEspressoInput{
 		Salt:                  st.Create2Salt,
 		PreApprovedBatcherKey: chainIntent.PreApprovedBatcherKey,
 		NitroTEEVerifier:      nvo.NitroTEEVerifierAddress,
-	}, deployerAddress)
+	}, batchAuthenticatorOwnwerAddress)
 	if err != nil {
 		return fmt.Errorf("failed to deploy espresso contracts: %w", err)
 	}