address comments

EspressoSystems · Nov 27, 2024 · c308e83 · c308e83
1 parent cc05e5d
commit c308e83
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/src/bridge/EspressoTEEVerifier.sol b/src/bridge/EspressoTEEVerifier.sol
@@ -40,9 +40,6 @@ contract EspressoTEEVerifier is Ownable {
     // This error is thrown when the reportDataHash doesn't match the hash signed by the TEE
     error InvalidReportDataHash();
 
-    /// @dev a TEE attestation quote was verified
-    event TEEAttestationQuoteVerified(bytes32 reportDataHash);
-
     // V3QuoteVerififer contract from automata to verify the quote
     V3QuoteVerifier public quoteVerifier;
     bytes32 public mrEnclave;
@@ -93,8 +90,6 @@ contract EspressoTEEVerifier is Ownable {
         if (reportDataHash != bytes32(localReport.reportData.substring(0, 32))) {
             revert InvalidReportDataHash();
         }
-
-        emit TEEAttestationQuoteVerified(reportDataHash);
     }
 
     /*

diff --git a/src/bridge/ISequencerInbox.sol b/src/bridge/ISequencerInbox.sol
@@ -39,6 +39,9 @@ interface ISequencerInbox is IDelayedMessageProvider {
     /// @dev a keyset was invalidated
     event InvalidateKeyset(bytes32 indexed keysetHash);
 
+    /// @dev a TEE attestation quote was verified
+    event TEEAttestationQuoteVerified(uint256 indexed seqMessageIndex);
+
     function totalDelayedMessagesRead() external view returns (uint256);
 
     function bridge() external view returns (IBridge);

diff --git a/src/bridge/SequencerInbox.sol b/src/bridge/SequencerInbox.sol
@@ -384,8 +384,9 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
                 newMessageCount
             )
         );
-        // Verify the quote for the batch poster running in the TEE
+        // verify the quote for the batch poster running in the TEE
         espressoTEEVerifier.verify(quote, reportDataHash);
+        emit TEEAttestationQuoteVerified(sequenceNumber);
 
         (bytes32 dataHash, IBridge.TimeBounds memory timeBounds) = formCallDataHash(
             data,
@@ -536,7 +537,9 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
                     newMessageCount
                 )
             );
+            // verify the quote for the batch poster running in the TEE
             espressoTEEVerifier.verify(quote, reportDataHash);
+            emit TEEAttestationQuoteVerified(sequenceNumber);
         }
         (bytes32 dataHash, IBridge.TimeBounds memory timeBounds) = formCallDataHash(
             data,

diff --git a/test/foundry/SequencerInbox.t.sol b/test/foundry/SequencerInbox.t.sol
@@ -70,7 +70,6 @@ contract SequencerInboxTest is Test {
     EspressoTEEVerifierMock espressoTEEVerifier;
     V3QuoteVerifier quoteVerifier;
     bytes sampleQuote;
-    bytes invalidQuote;
 
     function setUp() public {
         vm.startPrank(adminTEE);
@@ -80,9 +79,6 @@ contract SequencerInboxTest is Test {
         string memory quotePath = "/test/foundry/configs/attestation.bin";
         string memory inputFile = string.concat(vm.projectRoot(), quotePath);
         sampleQuote = vm.readFileBinary(inputFile);
-        quotePath = "/test/foundry/configs/incorrect_attestation_quote.bin";
-        inputFile = string.concat(vm.projectRoot(), quotePath);
-        invalidQuote = vm.readFileBinary(inputFile);
         vm.stopPrank();
     }
 

diff --git a/test/foundry/SequencerInboxTEE.t.sol b/test/foundry/SequencerInboxTEE.t.sol
@@ -24,7 +24,7 @@ contract RollupMock {
 }
 
 contract SequencerInboxTest is Test {
-    event TEEAttestationQuoteVerified(bytes32 reportDataHash);
+    event TEEAttestationQuoteVerified(uint256 indexed seqMessageIndex);
     error InvalidReportDataHash();
 
     address rollupOwner = address(137);
@@ -82,6 +82,10 @@ contract SequencerInboxTest is Test {
         vm.prank(rollupOwner);
         bridge.setDelayedInbox(dummyInbox, true);
 
+        seqInboxImpl = new SequencerInbox(maxDataSize, IReader4844(reader4844), false);
+        seqInbox = SequencerInbox(
+            address(new TransparentUpgradeableProxy(address(seqInboxImpl), proxyAdmin, ""))
+        );
         seqInbox.initialize(bridge, maxTimeVariation, address(espressoTEEVerifier));
 
         vm.prank(rollupOwner);
@@ -112,7 +116,7 @@ contract SequencerInboxTest is Test {
 
         //  We expect the TEE attestation quote to be validated
         vm.expectEmit();
-        emit TEEAttestationQuoteVerified(reportDataHash);
+        emit TEEAttestationQuoteVerified(sequenceNumber);
         seqInbox.addSequencerL2BatchFromOrigin(
             sequenceNumber,
             l2TEEData,
@@ -165,7 +169,7 @@ contract SequencerInboxTest is Test {
 
         //  We expect the TEE attestation quote to be validated
         vm.expectEmit();
-        emit TEEAttestationQuoteVerified(reportDataHash);
+        emit TEEAttestationQuoteVerified(sequenceNumber);
         seqInbox.addSequencerL2Batch(
             sequenceNumber,
             l2TEEData,