add optional post_init_data to set in result in InstantiateMsg

a hack to workaround scrtlabs/SecretNetwork#1323 Useful when you want to instantiate this contract and return data back to the calling contract that is available in the Reply
eqoty-labs · Oct 26, 2023 · f6938b4 · f6938b4
1 parent 9d131b4
commit f6938b4
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 1 deletion.
diff --git a/src/contract.rs b/src/contract.rs
@@ -122,7 +122,12 @@ pub fn instantiate(
     } else {
         Vec::new()
     };
-    Ok(Response::new().add_messages(messages))
+    let res = Response::new().add_messages(messages);
+    if let Some(some_post_init_data) = msg.post_init_data {
+        Ok(res.set_data(some_post_init_data))
+    } else {
+        Ok(res)
+    }
 }
 
 ///////////////////////////////////// Handle //////////////////////////////////////

diff --git a/src/msg.rs b/src/msg.rs
@@ -31,6 +31,9 @@ pub struct InstantiateMsg {
     /// contract that instantiated it, but it could be used to execute any
     /// contract
     pub post_init_callback: Option<PostInstantiateCallback>,
+    /// optional data to set in result
+    /// a hack to workaround https://github.com/scrtlabs/SecretNetwork/issues/1323
+    pub post_init_data: Option<Binary>,
 }
 
 /// This type represents optional configuration values.

diff --git a/src/unittest_handles.rs b/src/unittest_handles.rs
@@ -47,6 +47,7 @@ mod tests {
             royalty_info: None,
             config: None,
             post_init_callback: None,
+            post_init_data: None,
         };
 
         (instantiate(deps.as_mut(), env, info, init_msg), deps)
@@ -96,6 +97,7 @@ mod tests {
             royalty_info: None,
             config: Some(init_config),
             post_init_callback: None,
+            post_init_data: None,
         };
 
         (instantiate(deps.as_mut(), env, info, init_msg), deps)
@@ -183,6 +185,7 @@ mod tests {
             royalty_info: None,
             config: None,
             post_init_callback,
+            post_init_data: None,
         };
 
         let init_response = instantiate(deps.as_mut(), env, info, init_msg).unwrap();

diff --git a/src/unittest_mint_run.rs b/src/unittest_mint_run.rs
@@ -26,6 +26,7 @@ mod tests {
             royalty_info: None,
             config: None,
             post_init_callback: None,
+            post_init_data: None,
         };
 
         (instantiate(deps.as_mut(), env, info, init_msg), deps)

diff --git a/src/unittest_non_transferable.rs b/src/unittest_non_transferable.rs
@@ -40,6 +40,7 @@ mod tests {
             royalty_info: None,
             config: None,
             post_init_callback: None,
+            post_init_data: None,
         };
 
         (instantiate(deps.as_mut(), env, info, init_msg), deps)
@@ -89,6 +90,7 @@ mod tests {
             royalty_info: None,
             config: Some(init_config),
             post_init_callback: None,
+            post_init_data: None,
         };
 
         (instantiate(deps.as_mut(), env, info, init_msg), deps)
@@ -140,6 +142,7 @@ mod tests {
             royalty_info,
             config: Some(init_config),
             post_init_callback: None,
+            post_init_data: None,
         };
 
         (instantiate(deps.as_mut(), env, info, init_msg), deps)
@@ -220,6 +223,7 @@ mod tests {
             royalty_info: None,
             config: None,
             post_init_callback,
+            post_init_data: None,
         };
 
         let init_response = instantiate(deps.as_mut(), env, info, init_msg).unwrap();

diff --git a/src/unittest_queries.rs b/src/unittest_queries.rs
@@ -34,6 +34,7 @@ mod tests {
             royalty_info: None,
             config: None,
             post_init_callback: None,
+            post_init_data: None,
         };
 
         (instantiate(deps.as_mut(), env, info, init_msg), deps)
@@ -83,6 +84,7 @@ mod tests {
             royalty_info: None,
             config: Some(init_config),
             post_init_callback: None,
+            post_init_data: None,
         };
 
         (instantiate(deps.as_mut(), env, info, init_msg), deps)

diff --git a/src/unittest_royalties.rs b/src/unittest_royalties.rs
@@ -35,6 +35,7 @@ mod tests {
             royalty_info,
             config: None,
             post_init_callback: None,
+            post_init_data: None,
         };
 
         (instantiate(deps.as_mut(), env, info, init_msg), deps)
@@ -86,6 +87,7 @@ mod tests {
             royalty_info,
             config: Some(init_config),
             post_init_callback: None,
+            post_init_data: None,
         };
 
         (instantiate(deps.as_mut(), env, info, init_msg), deps)
@@ -286,6 +288,7 @@ mod tests {
             royalty_info: None,
             config: None,
             post_init_callback,
+            post_init_data: None,
         };
 
         let init_response = instantiate(deps.as_mut(), env, info, init_msg).unwrap();