init

Author: kevindeforth

Cargo.lock

@@ -2086,19 +2086,18 @@ impl MpcContract {
         self.metrics.clone()
     }
 
-    /// Returns all allowed code hashes in order from most recent to least recent allowed code hashes. The first element is the most recent allowed code hash.
-    pub fn allowed_docker_image_hashes(&self) -> Vec<NodeImageHash> {
+    /// Returns all allowed code hashes in descending order of their expiry
+    /// date. Note that the expiration depends on the contract configuration
+    /// (c.f. [`Config::tee_upgrade_deadline_duration_seconds`]).
+    pub fn allowed_docker_image_hashes(&self) -> Vec<dtos::AllowedMpcDockerImageHash> {
         let tee_upgrade_deadline_duration =
             Duration::from_secs(self.config.tee_upgrade_deadline_duration_seconds);
 
-        let mut hashes: Vec<NodeImageHash> = self
+        let mut entries = self
             .tee_state
-            .get_allowed_mpc_docker_images(tee_upgrade_deadline_duration)
-            .into_iter()
-            .map(|allowed_image_hash| allowed_image_hash.image_hash)
-            .collect();
-        hashes.reverse();
-        hashes
+            .get_allowed_mpc_docker_images(tee_upgrade_deadline_duration);
+        entries.reverse();
+        entries
     }
 
     pub fn allowed_launcher_compose_hashes(&self) -> Vec<LauncherDockerComposeHash> {
@@ -6516,7 +6515,7 @@ mod tests {
     /// 1. Add M1, add L1 → compose: {L1,M1}
     /// 2. Add M2 → compose: {L1,M1}, {L1,M2}
     /// 3. Advance time past M2's deadline so M1 is fully expired
-    ///    (valid_entries keeps the last expired entry as cutoff, so M1 only
+    ///    (allowed_images keeps the last expired entry as cutoff, so M1 only
     ///    drops when M2's grace period also passes)
     /// 4. Stored compose hashes persist — still {L1,M1}, {L1,M2}
     /// 5. Add L2 → paired only with valid M2, not expired M1

crates/contract/src/lib.rs

@@ -1,5 +1,7 @@
 use std::time::Duration;
 
+use near_sdk::env;
+
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub(crate) struct Timestamp {
     duration_since_unix_epoch: Duration,
@@ -22,6 +24,17 @@ impl Timestamp {
             duration_since_unix_epoch: new_time_stamp,
         })
     }
+
+    pub(crate) fn add_or_panic(self, duration: Duration) -> Self {
+        let Some(res) = self.checked_add(duration) else {
+            env::panic_str("overflowed adding duration to timestamp")
+        };
+        res
+    }
+
+    pub(crate) fn as_secs(self) -> u64 {
+        self.duration_since_unix_epoch.as_secs()
+    }
 }
 
 impl borsh::BorshSerialize for Timestamp {

crates/contract/src/primitives/time.rs

@@ -68,16 +68,6 @@ BorshSchemaContainer {
                 ],
             ),
         },
-        "AllowedDockerImageHashes": Struct {
-            fields: NamedFields(
-                [
-                    (
-                        "allowed_tee_proposals",
-                        "Vec<AllowedMpcDockerImage>",
-                    ),
-                ],
-            ),
-        },
         "AllowedLauncherImage": Struct {
             fields: NamedFields(
                 [
@@ -112,20 +102,6 @@ BorshSchemaContainer {
                 ],
             ),
         },
-        "AllowedMpcDockerImage": Struct {
-            fields: NamedFields(
-                [
-                    (
-                        "image_hash",
-                        "DockerImageHash",
-                    ),
-                    (
-                        "added",
-                        "Timestamp",
-                    ),
-                ],
-            ),
-        },
         "AttemptId": Struct {
             fields: UnnamedFields(
                 [
@@ -1130,6 +1106,16 @@ BorshSchemaContainer {
                 ],
             ),
         },
+        "StoredDockerImageHashes": Struct {
+            fields: NamedFields(
+                [
+                    (
+                        "allowed_tee_proposals",
+                        "Vec<WhitelistedMpcDockerImageHash>",
+                    ),
+                ],
+            ),
+        },
         "String": Sequence {
             length_width: 4,
             length_range: 0..=4294967295,
@@ -1150,7 +1136,7 @@ BorshSchemaContainer {
                 [
                     (
                         "allowed_docker_image_hashes",
-                        "AllowedDockerImageHashes",
+                        "StoredDockerImageHashes",
                     ),
                     (
                         "allowed_launcher_images",
@@ -1244,11 +1230,6 @@ BorshSchemaContainer {
             length_range: 0..=4294967295,
             elements: "AllowedLauncherImage",
         },
-        "Vec<AllowedMpcDockerImage>": Sequence {
-            length_width: 4,
-            length_range: 0..=4294967295,
-            elements: "AllowedMpcDockerImage",
-        },
         "Vec<ContractExpectedMeasurements>": Sequence {
             length_width: 4,
             length_range: 0..=4294967295,
@@ -1269,6 +1250,11 @@ BorshSchemaContainer {
             length_range: 0..=4294967295,
             elements: "LauncherDockerComposeHash",
         },
+        "Vec<WhitelistedMpcDockerImageHash>": Sequence {
+            length_width: 4,
+            length_range: 0..=4294967295,
+            elements: "WhitelistedMpcDockerImageHash",
+        },
         "Vec<u8>": Sequence {
             length_width: 4,
             length_range: 0..=4294967295,
@@ -1302,6 +1288,20 @@ BorshSchemaContainer {
                 ],
             ),
         },
+        "WhitelistedMpcDockerImageHash": Struct {
+            fields: NamedFields(
+                [
+                    (
+                        "image_hash",
+                        "DockerImageHash",
+                    ),
+                    (
+                        "added",
+                        "Timestamp",
+                    ),
+                ],
+            ),
+        },
         "[u8; 32]": Sequence {
             length_width: 0,
             length_range: 32..=32,