Fix a bug in TransactionEffects that didn't capture unwrapped objects (…

…MystenLabs#3358)

crates/sui-core/src/authority.rs

@@ -680,7 +680,7 @@ impl AuthorityState {
         indexes.index_tx(
             cert.sender_address(),
             cert.data.input_objects()?.iter().map(|o| o.object_id()),
-            effects.effects.mutated_and_created(),
+            effects.effects.all_mutated(),
             cert.data
                 .move_calls()?
                 .iter()

crates/sui-core/src/gateway_state.rs

@@ -481,13 +481,14 @@ where
 
         debug!(
             digest = ?tx_digest,
+            ?effects.effects,
             "Transaction completed successfully"
         );
 
         // Download the latest content of every mutated object from the authorities.
         let mutated_object_refs: BTreeSet<_> = effects
             .effects
-            .mutated_and_created()
+            .all_mutated()
             .map(|(obj_ref, _)| *obj_ref)
             .collect();
         let mutated_objects = self
@@ -561,7 +562,7 @@ where
                 self.store.insert_object_direct(*obj_ref, object).await?;
             }
         }
-        debug!(?result, "Downloaded object from authorities");
+        debug!("Downloaded object from authorities: {}", result);
 
         Ok(result)
     }
@@ -615,14 +616,14 @@ where
         // latest objects.
         let mutated_objects = self.store.get_objects(
             &effects
-                .mutated_and_created()
+                .all_mutated()
                 .map(|((object_id, _, _), _)| *object_id)
                 .collect::<Vec<_>>(),
         )?;
         let mut updated_gas = None;
         let mut package = None;
         let mut created_objects = vec![];
-        for ((obj_ref, _), object) in effects.mutated_and_created().zip(mutated_objects) {
+        for ((obj_ref, _), object) in effects.all_mutated().zip(mutated_objects) {
             let object = object.ok_or(SuiError::InconsistentGatewayResult {
                 error: format!(
                     "Crated/Updated object doesn't exist in the store: {:?}",

crates/sui-types/src/messages.rs

@@ -1312,11 +1312,15 @@ pub struct TransactionEffects {
 }
 
 impl TransactionEffects {
-    /// Return an iterator that iterates through both mutated and
-    /// created objects.
-    /// It doesn't include deleted objects.
-    pub fn mutated_and_created(&self) -> impl Iterator<Item = &(ObjectRef, Owner)> + Clone {
-        self.mutated.iter().chain(self.created.iter())
+    /// Return an iterator that iterates through all mutated objects, including mutated,
+    /// created and unwrapped objects. In other words, all objects that still exist
+    /// in the object state after this transaction.
+    /// It doesn't include deleted/wrapped objects.
+    pub fn all_mutated(&self) -> impl Iterator<Item = &(ObjectRef, Owner)> + Clone {
+        self.mutated
+            .iter()
+            .chain(self.created.iter())
+            .chain(self.unwrapped.iter())
     }
 
     /// Return an iterator of mutated objects, but excluding the gas object.
@@ -1330,7 +1334,7 @@ impl TransactionEffects {
 
     pub fn is_object_mutated_here(&self, obj_ref: ObjectRef) -> bool {
         // The mutated or created case
-        if self.mutated_and_created().any(|(oref, _)| *oref == obj_ref) {
+        if self.all_mutated().any(|(oref, _)| *oref == obj_ref) {
             return true;
         }