Better handling of configuration variables.

Author: philippecamacho

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

@@ -67,8 +67,8 @@ jobs:
       - name: Run Key Rotation test
         run: go test -timeout 30m -p 1 -count 1 -run 'TestKeyRotation' -v  ./espresso/devnet-tests/...
 
-      # - name: Run Change Batch Inbox Owner test
-      #   run: go test -timeout 30m -p 1 -count 1 -run 'TestChangeBatchInboxOwner -v  ./espresso/devnet-tests/...
+      - name: Run Change Batch Inbox Owner test
+        run: go test -timeout 30m -p 1 -count 1 -run 'TestChangeBatchInboxOwner' -v  ./espresso/devnet-tests/...
 
       - name: Save Nix cache
         uses: nix-community/cache-nix-action/save@v6

espresso/.env

@@ -34,6 +34,10 @@ OPERATOR_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf
 # cast wallet address --private-key $OPERATOR_PRIVATE_KEY
 OPERATOR_ADDRESS=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
 
+# Deployer 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
+
 # cast wallet address --mnemonic "test test ... junk" --hd-path "m/44'/60'/0'/0/1"
 PROPOSER_ADDRESS=0x70997970C51812dc3A010C7d01b50e0d17dc79C8
 

espresso/devnet-tests/key_rotation_test.go

@@ -91,12 +91,12 @@ func TestChangeBatchInboxOwner(t *testing.T) {
 	// Verify we're transferring to the right address
 	bobAddress := d.secrets.Addresses().Bob
 	t.Logf("Attempting to transfer ownership from %s to %s", currentOwner.Hex(), bobAddress.Hex())
-	
+
 	// Call TransferOwnership
 	tx, err := batchAuthenticator.TransferOwnership(deployerOpts, bobAddress)
 	require.NoError(t, err)
 	t.Logf("TransferOwnership transaction hash: %s", tx.Hash().Hex())
-	
+
 	// Wait for transaction receipt and check if it succeeded
 	receipt, err := wait.ForReceiptOK(ctx, d.L1, tx.Hash())
 	require.NoError(t, err)

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"
 
-op-deployer apply --l1-rpc-url "${ANVIL_URL}" \
+DEPLOYER_ADDRESS="${DEPLOYER_ADDRESS}" op-deployer apply --l1-rpc-url "${ANVIL_URL}" \
                   --workdir "${DEPLOYER_DIR}" \
                   --private-key="${OPERATOR_PRIVATE_KEY}"
 

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

@@ -27,7 +27,7 @@ type DeployEspressoOutput struct {
 }
 
 type DeployEspressoScript struct {
-	Run func(input, output common.Address) error
+	Run func(input, output, deployerAddress common.Address) error
 }
 
 type DeployAWSNitroVerifierScript struct {
@@ -72,6 +72,7 @@ func DeployAWSNitroVerifier(
 func DeployEspresso(
 	host *script.Host,
 	input DeployEspressoInput,
+	deployerAddress common.Address,
 ) (DeployEspressoOutput, error) {
 	var output DeployEspressoOutput
 	inputAddr := host.NewScriptAddress()
@@ -97,7 +98,7 @@ func DeployEspresso(
 	}
 	defer cleanupDeploy()
 
-	if err := deployScript.Run(inputAddr, outputAddr); err != nil {
+	if err := deployScript.Run(inputAddr, outputAddr, deployerAddress); err != nil {
 		return output, fmt.Errorf("failed to run %s script: %w", implContract, err)
 	}
 

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

@@ -2,6 +2,7 @@ package pipeline
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
@@ -36,11 +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())
+	} else {
+		deployerAddress = env.Deployer
+		lgr.Info("Using deployer address from env.Deployer", "address", deployerAddress.Hex())
+	}
+
 	eo, err = opcm.DeployEspresso(env.L1ScriptHost, opcm.DeployEspressoInput{
 		Salt:                  st.Create2Salt,
 		PreApprovedBatcherKey: chainIntent.PreApprovedBatcherKey,
 		NitroTEEVerifier:      nvo.NitroTEEVerifierAddress,
-	})
+	}, deployerAddress)
 	if err != nil {
 		return fmt.Errorf("failed to deploy espresso contracts: %w", err)
 	}

packages/contracts-bedrock/scripts/deploy/DeployEspresso.s.sol

@@ -73,10 +73,8 @@ contract DeployEspressoOutput is BaseDeployIO {
 }
 
 contract DeployEspresso is Script {
-    function run(DeployEspressoInput input, DeployEspressoOutput output) public {
+    function run(DeployEspressoInput input, DeployEspressoOutput output, address deployerAddress) public {
         IEspressoTEEVerifier teeVerifier = deployTEEVerifier(input);
-        // Use the deployer address (index 3 from mnemonic) instead of msg.sender (index 0)
-        address deployerAddress = 0x90F79bf6EB2c4f870365E785982E1f101E93b906;
         IBatchAuthenticator batchAuthenticator = deployBatchAuthenticator(input, output, teeVerifier, deployerAddress);
         deployBatchInbox(input, output, batchAuthenticator);
         checkOutput(output);