fixup after rebase

crates/sui-bridge/src/sui_client.rs

@@ -58,7 +58,6 @@ use crate::crypto::BridgeAuthorityPublicKey;
 use crate::error::{BridgeError, BridgeResult};
 use crate::events::SuiBridgeEvent;
 use crate::retry_with_max_elapsed_time;
-use crate::sui_transaction_builder::get_bridge_package_id;
 use crate::types::BridgeActionStatus;
 use crate::types::{BridgeAction, BridgeAuthority, BridgeCommittee};
 
@@ -202,8 +201,8 @@ where
         action: &BridgeAction,
     ) -> BridgeActionStatus {
         loop {
-            let Ok(bridge_records_id) =
-                retry_with_max_delay!(self.get_bridge_record_id(), Duration::from_secs(600))
+            let Ok(Ok(bridge_records_id)) =
+                retry_with_max_elapsed_time!(self.get_bridge_record_id(), Duration::from_secs(30))
             else {
                 // TODO: add metrics and fire alert
                 error!("Failed to get bridge records id");

crates/sui-core/src/execution_cache/writeback_cache.rs

@@ -68,6 +68,7 @@ use sui_macros::fail_point_async;
 use sui_protocol_config::ProtocolVersion;
 use sui_types::accumulator::Accumulator;
 use sui_types::base_types::{EpochId, ObjectID, ObjectRef, SequenceNumber, VerifiedExecutionData};
+use sui_types::bridge::Bridge;
 use sui_types::digests::{
     ObjectDigest, TransactionDigest, TransactionEffectsDigest, TransactionEventsDigest,
 };
@@ -1035,6 +1036,10 @@ impl ExecutionCacheRead for WritebackCache {
     fn check_owned_object_locks_exist(&self, _owned_object_refs: &[ObjectRef]) -> SuiResult {
         todo!()
     }
+
+    fn get_bridge_object_unsafe(&self) -> SuiResult<Bridge> {
+        todo!()
+    }
 }
 
 impl ExecutionCacheWrite for WritebackCache {

crates/sui-framework-snapshot/manifest.json

@@ -302,15 +302,5 @@
       "0x0000000000000000000000000000000000000000000000000000000000000003",
       "0x000000000000000000000000000000000000000000000000000000000000dee9"
     ]
-  },
-  "37": {
-    "git_revision": "55cf7b402c",
-    "package_ids": [
-      "0x0000000000000000000000000000000000000000000000000000000000000001",
-      "0x0000000000000000000000000000000000000000000000000000000000000002",
-      "0x0000000000000000000000000000000000000000000000000000000000000003",
-      "0x000000000000000000000000000000000000000000000000000000000000dee9",
-      "0x000000000000000000000000000000000000000000000000000000000000000b"
-    ]
   }
 }

crates/sui-framework/docs/bridge/dependencies/sui-framework/random.md

@@ -277,9 +277,11 @@
         // First <b>update</b> should be for round zero.
         <b>assert</b>!(new_round == 0, <a href="../../dependencies/sui-framework/random.md#0x2_random_EInvalidRandomnessUpdate">EInvalidRandomnessUpdate</a>);
     } <b>else</b> {
-        // Subsequent updates should increment either epoch or randomness_round.
+        // Subsequent updates should either increase epoch or increment randomness_round.
+        // Note that epoch may increase by more than 1 <b>if</b> an epoch is completed without
+        // randomness ever being generated in that epoch.
         <b>assert</b>!(
-            (epoch == inner.epoch + 1 && new_round == 0) ||
+            (epoch &gt; inner.epoch && new_round == 0) ||
                 (new_round == inner.randomness_round + 1),
             <a href="../../dependencies/sui-framework/random.md#0x2_random_EInvalidRandomnessUpdate">EInvalidRandomnessUpdate</a>
         );