@inco/lightning 0.8.0-devnet-1 → 0.8.0-devnet-2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inco/lightning",
-  "version": "0.8.0-devnet-1",
+  "version": "0.8.0-devnet-2",
   "repository": "https://github.com/Inco-fhevm/inco-monorepo",
   "files": [
     "src/",

package/src/lightning-parts/TEELifecycle.sol

@@ -70,6 +70,8 @@ abstract contract TEELifecycle is
     // Events
     // @notice A new MR_AGGREGATED has been approved
     event NewTEEVersionApproved(uint256 indexed version, bytes32 indexed mrAggregated);
+    // @notice A previously approved TEE version has been removed
+    event TEEVersionRemoved(bytes32 indexed mrAggregated);
     event NewCovalidatorAdded(address covalidatorAddress, bytes quote);
     event BootstrapStageComplete(address indexed newEoaSigner, BootstrapResult bootstrapResult);
     // @notice Emitted to prove that an EOA has upgraded their TDX to a new
@@ -211,6 +213,28 @@ abstract contract TEELifecycle is
         emit NewTEEVersionApproved($.approvedTeeVersions.length - 1, newMrAggregated);
     }
 
+    /**
+     * @notice Removes a previously approved TEE version from the contract state
+     * @param mrAggregated - The MR_AGGREGATED bytes of the TEE version to remove
+     */
+    function removeApprovedTeeVersion(bytes32 mrAggregated) public onlyOwner {
+        StorageForTeeLifecycle storage $ = getTeeLifecycleStorage();
+        bool found = false;
+        for (uint256 i = 0; i < $.approvedTeeVersions.length; i++) {
+            if ($.approvedTeeVersions[i] == mrAggregated) {
+                // Shift all elements after index i to the left to preserve insertion order
+                for (uint256 j = i; j < $.approvedTeeVersions.length - 1; j++) {
+                    $.approvedTeeVersions[j] = $.approvedTeeVersions[j + 1];
+                }
+                $.approvedTeeVersions.pop();
+                found = true;
+                break;
+            }
+        }
+        require(found, TEEVersionNotFound());
+        emit TEEVersionRemoved(mrAggregated);
+    }
+
     function _isApprovedTeeVersion(bytes32 newMrAggregated) internal view returns (bool) {
         StorageForTeeLifecycle storage $ = getTeeLifecycleStorage();
         for (uint256 i = 0; i < $.approvedTeeVersions.length; i++) {

package/src/test/TEELifecycle/TEELifecycleMockTest.t.sol

@@ -124,6 +124,61 @@ contract TEELifecycleMockTest is MockRemoteAttestation, TEELifecycle {
         vm.stopPrank();
     }
 
+    function testRemoveApprovedTeeVersionPreservesOrder() public {
+        bytes32 mrAggregated1 = hex"1111111111111111111111111111111111111111111111111111111111111111";
+        bytes32 mrAggregated2 = hex"2222222222222222222222222222222222222222222222222222222222222222";
+        bytes32 mrAggregated3 = hex"3333333333333333333333333333333333333333333333333333333333333333";
+
+        vm.startPrank(this.owner());
+
+        // Add three versions
+        this.approveNewTeeVersion(mrAggregated1);
+        this.approveNewTeeVersion(mrAggregated2);
+        this.approveNewTeeVersion(mrAggregated3);
+
+        // Verify all exist in order
+        assertEq(this.approvedTeeVersions(0), mrAggregated1);
+        assertEq(this.approvedTeeVersions(1), mrAggregated2);
+        assertEq(this.approvedTeeVersions(2), mrAggregated3);
+
+        // Remove the middle one (mrAggregated2)
+        this.removeApprovedTeeVersion(mrAggregated2);
+
+        // Verify insertion order is preserved: mrAggregated1 stays at 0, mrAggregated3 shifts to 1
+        assertEq(this.approvedTeeVersions(0), mrAggregated1);
+        assertEq(this.approvedTeeVersions(1), mrAggregated3);
+
+        // Verify index 2 is now out of bounds
+        vm.expectRevert(TEELifecycle.IndexOutOfBounds.selector);
+        this.approvedTeeVersions(2);
+
+        vm.stopPrank();
+    }
+
+    function testRemoveApprovedTeeVersionNotFound() public {
+        bytes32 nonExistentMrAggregated = hex"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+
+        vm.startPrank(this.owner());
+        vm.expectRevert(TEELifecycle.TEEVersionNotFound.selector);
+        this.removeApprovedTeeVersion(nonExistentMrAggregated);
+        vm.stopPrank();
+    }
+
+    function testRemoveApprovedTeeVersionOnlyOwner() public {
+        bytes32 mrAggregated = hex"1111111111111111111111111111111111111111111111111111111111111111";
+
+        vm.startPrank(this.owner());
+        this.approveNewTeeVersion(mrAggregated);
+        vm.stopPrank();
+
+        // Try to remove as non-owner
+        address nonOwner = address(0x1234);
+        vm.startPrank(nonOwner);
+        vm.expectRevert();
+        this.removeApprovedTeeVersion(mrAggregated);
+        vm.stopPrank();
+    }
+
     // Helper function to create a successful bootstrap result
     function successfulBootstrapResult()
         internal