@inco/lightning 0.3.2 → 0.5.0

package/src/lightning-parts/EncryptedOperations.sol

@@ -5,10 +5,10 @@ import {euint256, ebool, EOps, SenderNotAllowedForHandle, ETypes, isTypeSupporte
 import {BaseAccessControlList} from "./AccessControl/BaseAccessControlList.sol";
 import {EventCounter} from "./primitives/EventCounter.sol";
 import {HandleGeneration} from "./primitives/HandleGeneration.sol";
-import {IEncryptedOperationsGen} from "./EncryptedOperations.gen.sol";
+import {IEncryptedOperations} from "./interfaces/IEncryptedOperations.sol";
 
 abstract contract EncryptedOperations is
-    IEncryptedOperationsGen,
+    IEncryptedOperations,
     BaseAccessControlList,
     EventCounter,
     HandleGeneration
@@ -248,7 +248,9 @@ abstract contract EncryptedOperations is
                 euint256.unwrap(rhs)
             )
         );
-        emit EAdd(lhs, rhs, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit EAdd(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eSub(
@@ -263,7 +265,9 @@ abstract contract EncryptedOperations is
                 euint256.unwrap(rhs)
             )
         );
-        emit ESub(lhs, rhs, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit ESub(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eMul(
@@ -278,8 +282,10 @@ abstract contract EncryptedOperations is
                 euint256.unwrap(rhs)
             )
         );
-        emit EMul(lhs, rhs, result, getNewEventId());
-    }
+        uint256 id = getNextEventId();
+        emit EMul(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
+     }
 
     function eDiv(
         euint256 lhs,
@@ -293,7 +299,9 @@ abstract contract EncryptedOperations is
                 euint256.unwrap(rhs)
             )
         );
-        emit EDiv(lhs, rhs, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit EDiv(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eRem(
@@ -308,7 +316,9 @@ abstract contract EncryptedOperations is
                 euint256.unwrap(rhs)
             )
         );
-        emit ERem(lhs, rhs, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit ERem(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eBitAnd(
@@ -321,7 +331,9 @@ abstract contract EncryptedOperations is
         checkInput(rhs, typeToBitMask(rhsType));
         require(lhsType == rhsType, UnexpectedType(lhsType, typeToBitMask(rhsType)));
         result = createResultHandle(EOps.BitAnd, lhsType, lhs, rhs);
-        emit EBitAnd(lhs, rhs, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit EBitAnd(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eBitOr(
@@ -334,7 +346,9 @@ abstract contract EncryptedOperations is
         checkInput(rhs, typeToBitMask(rhsType));
         require(lhsType == rhsType, UnexpectedType(lhsType, typeToBitMask(rhsType)));
         result = createResultHandle(EOps.BitOr, lhsType, lhs, rhs);
-        emit EBitOr(lhs, rhs, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit EBitOr(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eBitXor(
@@ -347,7 +361,9 @@ abstract contract EncryptedOperations is
         checkInput(rhs, typeToBitMask(rhsType));
         require(lhsType == rhsType, UnexpectedType(lhsType, typeToBitMask(rhsType)));
         result = createResultHandle(EOps.BitXor, lhsType, lhs, rhs);
-        emit EBitXor(lhs, rhs, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit EBitXor(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eShl(
@@ -362,7 +378,9 @@ abstract contract EncryptedOperations is
                 euint256.unwrap(rhs)
             )
         );
-        emit EShl(lhs, rhs, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit EShl(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eShr(
@@ -377,7 +395,9 @@ abstract contract EncryptedOperations is
                 euint256.unwrap(rhs)
             )
         );
-        emit EShr(lhs, rhs, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit EShr(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eRotl(
@@ -392,7 +412,9 @@ abstract contract EncryptedOperations is
                 euint256.unwrap(rhs)
             )
         );
-        emit ERotl(lhs, rhs, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit ERotl(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eRotr(
@@ -407,7 +429,9 @@ abstract contract EncryptedOperations is
                 euint256.unwrap(rhs)
             )
         );
-        emit ERotr(lhs, rhs, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit ERotr(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eEq(
@@ -425,7 +449,9 @@ abstract contract EncryptedOperations is
                 rhs
             )
         );
-        emit EEq(lhs, rhs, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit EEq(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eNe(
@@ -443,7 +469,9 @@ abstract contract EncryptedOperations is
                 rhs
             )
         );
-        emit ENe(lhs, rhs, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit ENe(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eGe(
@@ -458,7 +486,9 @@ abstract contract EncryptedOperations is
                 euint256.unwrap(rhs)
             )
         );
-        emit EGe(lhs, rhs, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit EGe(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eGt(
@@ -473,7 +503,9 @@ abstract contract EncryptedOperations is
                 euint256.unwrap(rhs)
             )
         );
-        emit EGt(lhs, rhs, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit EGt(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eLe(
@@ -488,7 +520,9 @@ abstract contract EncryptedOperations is
                 euint256.unwrap(rhs)
             )
         );
-        emit ELe(lhs, rhs, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit ELe(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eLt(
@@ -503,7 +537,9 @@ abstract contract EncryptedOperations is
                 euint256.unwrap(rhs)
             )
         );
-        emit ELt(lhs, rhs, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit ELt(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eMin(
@@ -518,7 +554,9 @@ abstract contract EncryptedOperations is
                 euint256.unwrap(rhs)
             )
         );
-        emit EMin(lhs, rhs, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit EMin(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eMax(
@@ -533,7 +571,9 @@ abstract contract EncryptedOperations is
                 euint256.unwrap(rhs)
             )
         );
-        emit EMax(lhs, rhs, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit EMax(lhs, rhs, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eNot(ebool operand) external returns (ebool result) {
@@ -541,7 +581,9 @@ abstract contract EncryptedOperations is
         result = ebool.wrap(
             createResultHandle(EOps.Not, ETypes.Bool, ebool.unwrap(operand))
         );
-        emit ENot(operand, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit ENot(operand, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eCast(
@@ -551,7 +593,9 @@ abstract contract EncryptedOperations is
         bytes32 baseHandle = keccak256(abi.encodePacked(EOps.Cast, ct, toType));
         result = embedTypeVersion(baseHandle, toType);
         allowTransientInternal(result, msg.sender);
-        emit ECast(ct, uint8(toType), result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit ECast(ct, uint8(toType), result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eRand(
@@ -568,7 +612,9 @@ abstract contract EncryptedOperations is
         //NOTE: We pass the incremented randCounter which is incremented using postfix increment above.
         // Due to postfix returning the value before incrementing, the emitted randCounter will be larger by one than the number used to build the handle.
         // So for security and replayability reasons, we always use the incremented randCounter when seeding on the covalidator side, which is fine for as long as we're consistent.
-        emit ERand(randCounter, randType, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit ERand(randCounter, randType, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function eRandBounded(
@@ -588,7 +634,9 @@ abstract contract EncryptedOperations is
         //NOTE: We pass the incremented randCounter which is incremented using postfix increment above.
         // Due to postfix returning the value before incrementing, the emitted randCounter will be larger by one than the number used to build the handle.
         // So for security and replayability reasons, we always use the incremented randCounter when seeding on the covalidator side, which is fine for as long as we're consistent.
-        emit ERandBounded(randCounter, randType, upperBound, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit ERandBounded(randCounter, randType, upperBound, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     // todo add support in testing framework
@@ -608,7 +656,9 @@ abstract contract EncryptedOperations is
         );
         result = embedTypeVersion(baseHandle, returnType);
         allowTransientInternal(result, msg.sender);
-        emit EIfThenElse(control, ifTrue, ifFalse, result, getNewEventId());
+        uint256 id = getNextEventId();
+        emit EIfThenElse(control, ifTrue, ifFalse, result, id);
+        setDigest(abi.encodePacked(result, id));
     }
 
     function checkEIfThenElseInputs(

package/src/lightning-parts/TEELifecycle.sol

@@ -1,60 +1,82 @@
-/// SPDX-License-Identifier: No License
 pragma solidity ^0.8.19;
 
-import "./TEELifecycle.types.sol";
-
+import {
+    BootstrapResult,
+    TEEVersion,
+    TEEVersionStatus
+} from "./TEELifecycle.types.sol";
 import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
-import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
 import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
-import {IQuoteVerifier} from "automata-dcap-attestation/interfaces/IQuoteVerifier.sol";
-import {BELE} from "automata-dcap-attestation/utils/BELE.sol";
-import {HEADER_LENGTH} from "automata-dcap-attestation/types/Constants.sol";
-import {TD10ReportBody, Header} from "automata-dcap-attestation/types/V4Structs.sol";
+import {IQuoteVerifier} from "../interfaces/automata-interfaces/IQuoteVerifier.sol";
+import {BELE} from "../interfaces/automata-interfaces/BELE.sol";
 import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";
-import {EnclaveIdentityJsonObj, IdentityObj} from "@automata-network/on-chain-pccs/helpers/EnclaveIdentityHelper.sol";
-import {TcbInfoJsonObj} from "@automata-network/on-chain-pccs/helpers/FmspcTcbHelper.sol";
-import {AutomataFmspcTcbDao} from "@automata-network/on-chain-pccs/automata_pccs/AutomataFmspcTcbDao.sol";
-import {AutomataEnclaveIdentityDao} from "@automata-network/on-chain-pccs/automata_pccs/AutomataEnclaveIdentityDao.sol";
-
-// @todo: Make this contract UUPSUpgradeable: https://github.com/Inco-fhevm/inco-monorepo/issues/875
-contract TEELifecycle is OwnableUpgradeable, EIP712Upgradeable {
+import {ITEELifecycle} from "./interfaces/ITEELifecycle.sol";
+import {
+    TcbInfoJsonObj,
+    EnclaveIdentityJsonObj,
+    IdentityObj,
+    TD10ReportBody,
+    Header,
+    HEADER_LENGTH
+} from "../interfaces/automata-interfaces/Types.sol";
+import {IFmspcTcbDao} from "../interfaces/automata-interfaces/IFmspcTcbDao.sol";
+import {IAutomataEnclaveIdentityDao} from "../interfaces/automata-interfaces/IAutomataEnclaveIdentityDao.sol";
+
+// todo #1031 make TEELifecycle storage upgrade compatible
+abstract contract TEELifecycle is
+    ITEELifecycle,
+    OwnableUpgradeable,
+    EIP712Upgradeable
+{
+    error InvalidQuoteVerifierVersion(uint16 actual, uint16 expected);
+    error EmptyTcbInfo();
+    error EmptyIdentity();
+    error BootstrapNotComplete();
+    error BootstrapAlreadyCompleted();
+    /// @notice TEEVersionHistory must have exactly one version, please call approveNewTEEVersion first
+    error TEEVersionHistoryInconsistent();
+    error TEEVersionHistoryStatusIsNotPending();
+    error InvalidReportMRTD();
+    error InvalidBootstrapDataSignature();
+    /// @notice MRTD must be exactly 48 bytes
+    error MrtdInvalidLength();
+    error EOASignerAlreadyInitialized();
+    error InvalidMrtdReport();
+    error InvalidReportDataSigner();
 
     event QuoteVerifierUpdated(uint16 indexed version);
-
+    event TEEVersionUpdated(TEEVersion teeVersion);
+    event NewCovalidatorAdded(address covalidatorAddress, bytes quote);
     event BootstrapStageComplete(
         address indexed newEOASigner,
         BootstrapResult bootstrapResult
     );
 
-    event TEEVersionUpdated(
-        TEEVersion teeVersion
-    );
-
-    event NewCovalidatorAdded(
-        address covalidatorAddress,
-        bytes quote
-    );
-
-    bytes32 public constant BootstrapResultStructHash = 
-        keccak256(bytes(
-            "BootstrapResult(bytes ecies_pubkey)"
-        ));
+    bytes32 public constant BootstrapResultStructHash =
+        keccak256(bytes("BootstrapResult(bytes ecies_pubkey)"));
 
     uint16 public constant QUOTE_VERIFIER_VERSION = 4;
 
-    IQuoteVerifier quoteVerifier;
-
+    IQuoteVerifier public quoteVerifier;
     BootstrapResult public VerifiedBootstrapResult;
+    bool public BootstrapComplete;
 
     TEEVersion[] public TEEVersionHistory;
     bytes public ECIESPubkey;
     mapping(address => bool) public EOASigners;
 
-    function initialize(address owner, string memory eip712Name, string memory eip712Version, address quoteVerifierAddress) public initializer {
-        __Ownable_init(owner);
-        __EIP712_init(eip712Name, eip712Version);
-        quoteVerifier = IQuoteVerifier(quoteVerifierAddress);
-        require(quoteVerifier.quoteVersion() == QUOTE_VERIFIER_VERSION, "Invalid quote verifier version");
+    function __TEELifecycle_init(
+        IQuoteVerifier _quoteVerifier
+    ) internal onlyInitializing {
+        quoteVerifier = _quoteVerifier;
+        uint16 actualQuoteVerifierVersion = quoteVerifier.quoteVersion();
+        require(
+            actualQuoteVerifierVersion == QUOTE_VERIFIER_VERSION,
+            InvalidQuoteVerifierVersion(
+                actualQuoteVerifierVersion,
+                QUOTE_VERIFIER_VERSION
+            )
+        );
     }
 
     /**
@@ -62,15 +84,28 @@ contract TEELifecycle is OwnableUpgradeable, EIP712Upgradeable {
      * @param tcbInfo - The TCB info to upload
      * @param identity - The identity to upload
      */
-    function uploadCollateral(TcbInfoJsonObj memory tcbInfo, EnclaveIdentityJsonObj memory identity) public onlyOwner {
-        require(bytes(tcbInfo.tcbInfoStr).length != 0, "tcbInfo.tcbInfoStr must not be empty");
-        require(bytes(identity.identityStr).length != 0, "identity.identityStr must not be empty");
-
-        AutomataFmspcTcbDao fmspcTcbDao = AutomataFmspcTcbDao(quoteVerifier.pccsRouter().fmspcTcbDaoAddr());
+    function uploadCollateral(
+        TcbInfoJsonObj memory tcbInfo,
+        EnclaveIdentityJsonObj memory identity
+    ) public onlyOwner {
+        require(bytes(tcbInfo.tcbInfoStr).length != 0, EmptyTcbInfo());
+        require(bytes(identity.identityStr).length != 0, EmptyIdentity());
+
+        IFmspcTcbDao fmspcTcbDao = IFmspcTcbDao(
+            quoteVerifier.pccsRouter().fmspcTcbDaoAddr()
+        );
         fmspcTcbDao.upsertFmspcTcb(tcbInfo);
-        AutomataEnclaveIdentityDao enclaveIdDao = AutomataEnclaveIdentityDao(quoteVerifier.pccsRouter().qeIdDaoAddr());
-        (IdentityObj memory identityObj,) = enclaveIdDao.EnclaveIdentityLib().parseIdentityString(identity.identityStr);
-        enclaveIdDao.upsertEnclaveIdentity(uint256(identityObj.id), 4, identity);
+        IAutomataEnclaveIdentityDao enclaveIdDao = IAutomataEnclaveIdentityDao(
+            quoteVerifier.pccsRouter().qeIdDaoAddr()
+        );
+        (IdentityObj memory identityObj, ) = enclaveIdDao
+            .EnclaveIdentityLib()
+            .parseIdentityString(identity.identityStr);
+        enclaveIdDao.upsertEnclaveIdentity(
+            uint256(identityObj.id),
+            4,
+            identity
+        );
     }
 
     /**
@@ -79,12 +114,19 @@ contract TEELifecycle is OwnableUpgradeable, EIP712Upgradeable {
      * @param quote - The quote to verify against
      * @param signature - The signature to verify against
      */
-    function verifyBootstrapResult(BootstrapResult calldata bootstrapResult, bytes calldata quote, bytes calldata signature) public onlyOwner {
+    function verifyBootstrapResult(
+        BootstrapResult calldata bootstrapResult,
+        bytes calldata quote,
+        bytes calldata signature
+    ) public onlyOwner {
         // Make sure the bootstrap is not already complete, and that the contract owner
         // has already submitted the pending TEE MRTD.
-        require(!isBootstrapComplete(), "Bootstrap already completed");
-        require(TEEVersionHistory.length == 1, "TEEVersionHistory must have exactly one version, please call approveNewTEEVersion first");
-        require(TEEVersionHistory[0].status == TEEVersionStatus.PENDING, "TEEVersionHistory must still be pending");
+        require(!isBootstrapComplete(), BootstrapAlreadyCompleted());
+        require(TEEVersionHistory.length == 1, TEEVersionHistoryInconsistent());
+        require(
+            TEEVersionHistory[0].status == TEEVersionStatus.PENDING,
+            TEEVersionHistoryStatusIsNotPending()
+        );
 
         bytes32 _bootstrapResultDigest = bootstrapResultDigest(bootstrapResult);
         (bool success, bytes memory output) = _verifyAndAttestOnChain(quote);
@@ -93,10 +135,21 @@ contract TEELifecycle is OwnableUpgradeable, EIP712Upgradeable {
         bytes memory v0MRTD = TEEVersionHistory[0].mrtd;
 
         TD10ReportBody memory tdReport = parseTD10ReportBody(quote);
-        (address reportDataSigner, bytes memory reportMRTD) = parseReport(tdReport);
-        require(keccak256(reportMRTD) == keccak256(v0MRTD), "Invalid report MRTD");
-        address recoveredAddress = ECDSA.recover(_bootstrapResultDigest, signature);
-        require(recoveredAddress == reportDataSigner, "Invalid signature for bootstrap data");
+        (address reportDataSigner, bytes memory reportMRTD) = parseReport(
+            tdReport
+        );
+        require(
+            keccak256(reportMRTD) == keccak256(v0MRTD),
+            InvalidReportMRTD()
+        );
+        address recoveredAddress = ECDSA.recover(
+            _bootstrapResultDigest,
+            signature
+        );
+        require(
+            recoveredAddress == reportDataSigner,
+            InvalidBootstrapDataSignature()
+        );
 
         VerifiedBootstrapResult = bootstrapResult;
         TEEVersionHistory[0].status = TEEVersionStatus.ACTIVE;
@@ -112,13 +165,12 @@ contract TEELifecycle is OwnableUpgradeable, EIP712Upgradeable {
      * @dev This function increments the version number automatically based on the current history
      */
     function approveNewTEEVersion(bytes calldata newMRTD) public onlyOwner {
-        require(newMRTD.length == 48, "MRTD must be 48 bytes");
-        
-        TEEVersionHistory.push(TEEVersion({
-            mrtd: newMRTD,
-            status: TEEVersionStatus.PENDING
-        }));
-        
+        require(newMRTD.length == 48, MrtdInvalidLength());
+
+        TEEVersionHistory.push(
+            TEEVersion({mrtd: newMRTD, status: TEEVersionStatus.PENDING})
+        );
+
         emit TEEVersionUpdated(TEEVersionHistory[TEEVersionHistory.length - 1]);
     }
 
@@ -127,16 +179,22 @@ contract TEELifecycle is OwnableUpgradeable, EIP712Upgradeable {
      * @param quote - The quote from the new covalidator that contains the current MRTD and the eoa address of the new party in the report data
      */
     function addNewCovalidator(bytes calldata quote) public onlyOwner {
-        require(isBootstrapComplete(), "Bootstrap not complete");
+        require(isBootstrapComplete(), BootstrapNotComplete());
 
         (bool success, bytes memory output) = _verifyAndAttestOnChain(quote);
         require(success, string(output));
         TD10ReportBody memory tdReport = parseTD10ReportBody(quote);
-        (address reportDataSigner, bytes memory reportMRTD) = parseReport(tdReport);
-        require(!EOASigners[reportDataSigner], "EOA signer already initialized");
-        
-        require(keccak256(reportMRTD) == keccak256(TEEVersionHistory[TEEVersionHistory.length - 1].mrtd), "Invalid report MRTD");
-        require(reportDataSigner != address(0), "Invalid report data signer");
+        (address reportDataSigner, bytes memory reportMRTD) = parseReport(
+            tdReport
+        );
+        require(!EOASigners[reportDataSigner], EOASignerAlreadyInitialized());
+
+        require(
+            keccak256(reportMRTD) ==
+                keccak256(TEEVersionHistory[TEEVersionHistory.length - 1].mrtd),
+            InvalidMrtdReport()
+        );
+        require(reportDataSigner != address(0), InvalidReportDataSigner());
         emit NewCovalidatorAdded(reportDataSigner, quote);
         EOASigners[reportDataSigner] = true;
         //TODO: Add the new covalidator signers to the Signers contract state
@@ -147,7 +205,9 @@ contract TEELifecycle is OwnableUpgradeable, EIP712Upgradeable {
      * @return true if the bootstrap is complete, false otherwise
      */
     function isBootstrapComplete() public view returns (bool) {
-        return TEEVersionHistory.length >= 1 && TEEVersionHistory[0].status == TEEVersionStatus.ACTIVE;
+        return
+            TEEVersionHistory.length >= 1 &&
+            TEEVersionHistory[0].status == TEEVersionStatus.ACTIVE;
     }
 
     /**
@@ -159,12 +219,14 @@ contract TEELifecycle is OwnableUpgradeable, EIP712Upgradeable {
      * For verification failures, the output is simply a UTF-8 encoded string, describing the reason for failure.
      * @dev can directly type-cast the failed output as a string
      */
-    function _verifyAndAttestOnChain(bytes calldata rawQuote) internal view returns (bool success, bytes memory output) {
+    function _verifyAndAttestOnChain(
+        bytes calldata rawQuote
+    ) internal view returns (bool success, bytes memory output) {
         // Parse the header
         Header memory header;
         (success, header) = _parseQuoteHeader(rawQuote);
         if (!success) {
-            return (false, bytes("Could not parse quote header"));
+            return (false, bytes("Could not parse quote header")); // todo #949 switch the two returned strings for bytes4 identifiers
         }
 
         if (QUOTE_VERIFIER_VERSION != header.version) {
@@ -180,7 +242,9 @@ contract TEELifecycle is OwnableUpgradeable, EIP712Upgradeable {
      * @notice From https://github.com/automata-network/automata-dcap-attestation/blob/evm-v1.0.0/evm/contracts/AttestationEntrypointBase.sol#L168
      * @notice Parses the header to get basic information about the quote, such as the version, TEE types etc.
      */
-    function _parseQuoteHeader(bytes calldata rawQuote) private pure returns (bool success, Header memory header) {
+    function _parseQuoteHeader(
+        bytes calldata rawQuote
+    ) private pure returns (bool success, Header memory header) {
         success = rawQuote.length >= HEADER_LENGTH;
         if (success) {
             uint16 version = uint16(BELE.leBytesToBeUint(rawQuote[0:2]));
@@ -209,23 +273,49 @@ contract TEELifecycle is OwnableUpgradeable, EIP712Upgradeable {
      * @param rawQuote - The raw quote bytes
      * @return report - The parsed TD10 report body
      */
-    function parseTD10ReportBody(bytes calldata rawQuote) public pure returns (TD10ReportBody memory report) {
+    function parseTD10ReportBody(
+        bytes calldata rawQuote
+    ) public pure returns (TD10ReportBody memory report) {
         report = TD10ReportBody({
-            teeTcbSvn: bytes16(rawQuote[HEADER_LENGTH:HEADER_LENGTH+16]),
-            mrSeam: bytes(rawQuote[HEADER_LENGTH+16:HEADER_LENGTH+64]),
-            mrsignerSeam: bytes(rawQuote[HEADER_LENGTH+64:HEADER_LENGTH+112]),
-            seamAttributes: bytes8(uint64(BELE.leBytesToBeUint(rawQuote[HEADER_LENGTH+112:HEADER_LENGTH+120]))),
-            tdAttributes: bytes8(uint64(BELE.leBytesToBeUint(rawQuote[HEADER_LENGTH+120:HEADER_LENGTH+128]))),
-            xFAM: bytes8(uint64(BELE.leBytesToBeUint(rawQuote[HEADER_LENGTH+128:HEADER_LENGTH+136]))),
-            mrTd: bytes(rawQuote[HEADER_LENGTH+136:HEADER_LENGTH+184]),
-            mrConfigId: bytes(rawQuote[HEADER_LENGTH+184:HEADER_LENGTH+232]),
-            mrOwner: bytes(rawQuote[HEADER_LENGTH+232:HEADER_LENGTH+280]),
-            mrOwnerConfig: bytes(rawQuote[HEADER_LENGTH+280:HEADER_LENGTH+328]),
-            rtMr0: bytes(rawQuote[HEADER_LENGTH+328:HEADER_LENGTH+376]),
-            rtMr1: bytes(rawQuote[HEADER_LENGTH+376:HEADER_LENGTH+424]),
-            rtMr2: bytes(rawQuote[HEADER_LENGTH+424:HEADER_LENGTH+472]),
-            rtMr3: bytes(rawQuote[HEADER_LENGTH+472:HEADER_LENGTH+520]),
-            reportData: bytes(rawQuote[HEADER_LENGTH+520:HEADER_LENGTH+584])
+            teeTcbSvn: bytes16(rawQuote[HEADER_LENGTH:HEADER_LENGTH + 16]),
+            mrSeam: bytes(rawQuote[HEADER_LENGTH + 16:HEADER_LENGTH + 64]),
+            mrsignerSeam: bytes(
+                rawQuote[HEADER_LENGTH + 64:HEADER_LENGTH + 112]
+            ),
+            seamAttributes: bytes8(
+                uint64(
+                    BELE.leBytesToBeUint(
+                        rawQuote[HEADER_LENGTH + 112:HEADER_LENGTH + 120]
+                    )
+                )
+            ),
+            tdAttributes: bytes8(
+                uint64(
+                    BELE.leBytesToBeUint(
+                        rawQuote[HEADER_LENGTH + 120:HEADER_LENGTH + 128]
+                    )
+                )
+            ),
+            xFAM: bytes8(
+                uint64(
+                    BELE.leBytesToBeUint(
+                        rawQuote[HEADER_LENGTH + 128:HEADER_LENGTH + 136]
+                    )
+                )
+            ),
+            mrTd: bytes(rawQuote[HEADER_LENGTH + 136:HEADER_LENGTH + 184]),
+            mrConfigId: bytes(
+                rawQuote[HEADER_LENGTH + 184:HEADER_LENGTH + 232]
+            ),
+            mrOwner: bytes(rawQuote[HEADER_LENGTH + 232:HEADER_LENGTH + 280]),
+            mrOwnerConfig: bytes(
+                rawQuote[HEADER_LENGTH + 280:HEADER_LENGTH + 328]
+            ),
+            rtMr0: bytes(rawQuote[HEADER_LENGTH + 328:HEADER_LENGTH + 376]),
+            rtMr1: bytes(rawQuote[HEADER_LENGTH + 376:HEADER_LENGTH + 424]),
+            rtMr2: bytes(rawQuote[HEADER_LENGTH + 424:HEADER_LENGTH + 472]),
+            rtMr3: bytes(rawQuote[HEADER_LENGTH + 472:HEADER_LENGTH + 520]),
+            reportData: bytes(rawQuote[HEADER_LENGTH + 520:HEADER_LENGTH + 584])
         });
     }
 
@@ -235,14 +325,16 @@ contract TEELifecycle is OwnableUpgradeable, EIP712Upgradeable {
      * @return reportDataSigner - The signing address of the report data signer
      * @return reportMRTD - The MRTD bytes from the report
      */
-    function parseReport(TD10ReportBody memory tdReport) public pure returns (address, bytes memory) {
+    function parseReport(
+        TD10ReportBody memory tdReport
+    ) public pure returns (address, bytes memory) {
         return (address(bytes20(tdReport.reportData)), tdReport.mrTd);
     }
 
     function bootstrapResultDigest(
         BootstrapResult memory bootstrapResult
     ) public view returns (bytes32) {
-        return 
+        return
             _hashTypedDataV4(
                 keccak256(
                     abi.encode(
@@ -252,4 +344,4 @@ contract TEELifecycle is OwnableUpgradeable, EIP712Upgradeable {
                 )
             );
     }
-}
+}