Test passing

Author: philippecamacho

espresso/devnet-tests/key_rotation_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/ethereum-optimism/optimism/op-batcher/bindings"
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/stretchr/testify/require"
@@ -71,14 +72,43 @@ func TestChangeBatchInboxOwner(t *testing.T) {
 	// Change the BatchAuthenticator's owner
 	batchAuthenticator, err := bindings.NewBatchAuthenticator(config.BatchAuthenticatorAddress, d.L1)
 	require.NoError(t, err)
-	tx, err := batchAuthenticator.TransferOwnership(&bind.TransactOpts{}, d.secrets.Addresses().Bob)
+
+	// Get L1 chain ID for transaction signing
+	l1ChainID, err := d.L1.ChainID(ctx)
 	require.NoError(t, err)
-	_, err = d.SendL1Tx(ctx, tx)
+
+	// Check current owner first
+	currentOwner, err := batchAuthenticator.Owner(&bind.CallOpts{})
+	require.NoError(t, err)
+	t.Logf("Current BatchAuthenticator owner: %s", currentOwner.Hex())
+	t.Logf("Deployer address: %s", d.secrets.Addresses().Deployer.Hex())
+	t.Logf("Bob address: %s", d.secrets.Addresses().Bob.Hex())
+
+	// Use deployer key to sign the transaction
+	deployerOpts, err := bind.NewKeyedTransactorWithChainID(d.secrets.Deployer, l1ChainID)
+	require.NoError(t, err)
+
+	// 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)
+	t.Logf("TransferOwnership transaction receipt status: %d", receipt.Status)
+	t.Logf("TransferOwnership transaction gas used: %d", receipt.GasUsed)
+	t.Logf("TransferOwnership transaction completed successfully")
 
 	// Ensure the owner has been changed
 	newOwner, err := batchAuthenticator.Owner(&bind.CallOpts{})
 	require.NoError(t, err)
+	t.Logf("New owner after transfer: %s", newOwner.Hex())
+	t.Logf("Expected Bob address: %s", d.secrets.Addresses().Bob.Hex())
 	require.Equal(t, newOwner, d.secrets.Addresses().Bob)
 
 	// Check that everything still functions

packages/contracts-bedrock/interfaces/L1/IBatchAuthenticator.sol

@@ -38,6 +38,7 @@ interface IBatchAuthenticator {
 
     function __constructor__(
         address _espressoTEEVerifier,
-        address _preApprovedBatcher
+        address _preApprovedBatcher,
+        address _owner
     ) external;
 }

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

@@ -75,15 +75,18 @@ contract DeployEspressoOutput is BaseDeployIO {
 contract DeployEspresso is Script {
     function run(DeployEspressoInput input, DeployEspressoOutput output) public {
         IEspressoTEEVerifier teeVerifier = deployTEEVerifier(input);
-        IBatchAuthenticator batchAuthenticator = deployBatchAuthenticator(input, output, teeVerifier);
+        // 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);
     }
 
     function deployBatchAuthenticator(
         DeployEspressoInput input,
         DeployEspressoOutput output,
-        IEspressoTEEVerifier teeVerifier
+        IEspressoTEEVerifier teeVerifier,
+        address owner
     )
         public
         returns (IBatchAuthenticator)
@@ -96,11 +99,14 @@ contract DeployEspresso is Script {
                 _name: "BatchAuthenticator",
                 _salt: salt,
                 _args: DeployUtils.encodeConstructor(
-                    abi.encodeCall(IBatchAuthenticator.__constructor__, (address(teeVerifier), preApprovedBatcherKey))
+                    abi.encodeCall(
+                        IBatchAuthenticator.__constructor__, (address(teeVerifier), preApprovedBatcherKey, owner)
+                    )
                 )
             })
         );
         vm.label(address(impl), "BatchAuthenticatorImpl");
+
         output.set(output.batchAuthenticatorAddress.selector, address(impl));
         return impl;
     }

packages/contracts-bedrock/src/L1/BatchAuthenticator.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import { ECDSA } from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
-import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
 import { ISemver } from "interfaces/universal/ISemver.sol";
 import { EspressoTEEVerifier } from "@espresso-tee-contracts/EspressoTEEVerifier.sol";
 import { IEspressoTEEVerifier } from "@espresso-tee-contracts/interface/IEspressoTEEVerifier.sol";
@@ -14,7 +14,7 @@ interface INitroValidator {
         returns (bytes memory attestationTbs, bytes memory signature);
 }
 
-contract BatchAuthenticator is ISemver, OwnableUpgradeable {
+contract BatchAuthenticator is ISemver, Ownable {
     /// @notice Semantic version.
     /// @custom:semver 1.0.0
     string public constant version = "1.0.0";
@@ -27,10 +27,11 @@ contract BatchAuthenticator is ISemver, OwnableUpgradeable {
     EspressoTEEVerifier public immutable espressoTEEVerifier;
     INitroValidator public immutable nitroValidator;
 
-    constructor(EspressoTEEVerifier _espressoTEEVerifier, address _preApprovedBatcher) OwnableUpgradeable() {
+    constructor(EspressoTEEVerifier _espressoTEEVerifier, address _preApprovedBatcher, address _owner) Ownable() {
         espressoTEEVerifier = _espressoTEEVerifier;
         preApprovedBatcher = _preApprovedBatcher;
         nitroValidator = INitroValidator(address(espressoTEEVerifier.espressoNitroTEEVerifier()));
+        _transferOwnership(_owner);
     }
 
     function decodeAttestationTbs(bytes memory attestation) external view returns (bytes memory, bytes memory) {