From 5e9e1fa9af0bba0f3ad701c3743fb95f4282b9c1 Mon Sep 17 00:00:00 2001
From: jolestar <jolestar@gmail.com>
Date: Wed, 11 Oct 2023 13:40:39 +0800
Subject: [PATCH] [MoveosStd] unpack the object when context::remove_object

---
 moveos/moveos-stdlib/moveos-stdlib/doc/context.md       | 9 +++++----
 moveos/moveos-stdlib/moveos-stdlib/sources/context.move | 7 ++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/moveos/moveos-stdlib/moveos-stdlib/doc/context.md b/moveos/moveos-stdlib/moveos-stdlib/doc/context.md
index cd87f6f9c2..e68c5c58ed 100644
--- a/moveos/moveos-stdlib/moveos-stdlib/doc/context.md
+++ b/moveos/moveos-stdlib/moveos-stdlib/doc/context.md
@@ -432,10 +432,10 @@ Borrow mut Object from object store with object_id
 
 ## Function `remove_object`
 
-Remove object from object store
+Remove object from object store, and unpack the Object
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="context.md#0x2_context_remove_object">remove_object</a>&lt;T: key&gt;(self: &<b>mut</b> <a href="context.md#0x2_context_Context">context::Context</a>, <a href="object_id.md#0x2_object_id">object_id</a>: <a href="object_id.md#0x2_object_id_ObjectID">object_id::ObjectID</a>): <a href="object.md#0x2_object_Object">object::Object</a>&lt;T&gt;
+<pre><code><b>public</b> <b>fun</b> <a href="context.md#0x2_context_remove_object">remove_object</a>&lt;T: key&gt;(self: &<b>mut</b> <a href="context.md#0x2_context_Context">context::Context</a>, <a href="object_id.md#0x2_object_id">object_id</a>: <a href="object_id.md#0x2_object_id_ObjectID">object_id::ObjectID</a>): (<a href="object_id.md#0x2_object_id_ObjectID">object_id::ObjectID</a>, <b>address</b>, T)
 </code></pre>
 
 
@@ -444,8 +444,9 @@ Remove object from object store
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b> <b>fun</b> <a href="context.md#0x2_context_remove_object">remove_object</a>&lt;T: key&gt;(self: &<b>mut</b> <a href="context.md#0x2_context_Context">Context</a>, <a href="object_id.md#0x2_object_id">object_id</a>: ObjectID): Object&lt;T&gt; {
-    <a href="storage_context.md#0x2_storage_context_remove">storage_context::remove</a>&lt;T&gt;(&<b>mut</b> self.<a href="storage_context.md#0x2_storage_context">storage_context</a>, <a href="object_id.md#0x2_object_id">object_id</a>)
+<pre><code><b>public</b> <b>fun</b> <a href="context.md#0x2_context_remove_object">remove_object</a>&lt;T: key&gt;(self: &<b>mut</b> <a href="context.md#0x2_context_Context">Context</a>, <a href="object_id.md#0x2_object_id">object_id</a>: ObjectID): (ObjectID, <b>address</b>, T) {
+    <b>let</b> obj = <a href="storage_context.md#0x2_storage_context_remove">storage_context::remove</a>&lt;T&gt;(&<b>mut</b> self.<a href="storage_context.md#0x2_storage_context">storage_context</a>, <a href="object_id.md#0x2_object_id">object_id</a>);
+    <a href="object.md#0x2_object_unpack_internal">object::unpack_internal</a>(obj)
 }
 </code></pre>
 
diff --git a/moveos/moveos-stdlib/moveos-stdlib/sources/context.move b/moveos/moveos-stdlib/moveos-stdlib/sources/context.move
index cb4f03d36a..9bd3f4a641 100644
--- a/moveos/moveos-stdlib/moveos-stdlib/sources/context.move
+++ b/moveos/moveos-stdlib/moveos-stdlib/sources/context.move
@@ -107,9 +107,10 @@ module moveos_std::context {
     }
 
     #[private_generics(T)]
-    /// Remove object from object store
-    public fun remove_object<T: key>(self: &mut Context, object_id: ObjectID): Object<T> {
-        storage_context::remove<T>(&mut self.storage_context, object_id)
+    /// Remove object from object store, and unpack the Object
+    public fun remove_object<T: key>(self: &mut Context, object_id: ObjectID): (ObjectID, address, T) {
+        let obj = storage_context::remove<T>(&mut self.storage_context, object_id);
+        object::unpack_internal(obj)
     }
 
     public fun contains_object(self: &Context, object_id: ObjectID): bool {