Handle LangError from instantiate

crates/e2e/src/builders.rs

@@ -39,7 +39,7 @@ pub type CreateBuilderPartial<E, Args, R> = CreateBuilder<
     Unset<<E as Environment>::Balance>,
     Set<ExecutionInput<Args>>,
     Unset<ink_env::call::state::Salt>,
-    R,
+    Set<ReturnType<R>>,
 >;
 
 /// Get the encoded constructor arguments from the partially initialized `CreateBuilder`

crates/env/src/api.rs

@@ -311,7 +311,40 @@ where
 /// # Note
 ///
 /// This is a low level way to instantiate another smart contract.
-/// Prefer to use the ink! guided and type safe approach to using this.
+///
+/// Prefer to use methods on a `ContractRef` or the [`CreateBuilder`](`crate::call::CreateBuilder`)
+/// through [`build_create`](`crate::call::build_create`) instead.
+///
+/// # Errors
+///
+/// - If the code hash is invalid.
+/// - If the arguments passed to the instantiation process are invalid.
+/// - If the instantiation process traps.
+/// - If the instantiation process runs out of gas.
+/// - If given insufficient endowment.
+/// - If the returned account ID failed to decode properly.
+pub fn instantiate_contract<E, Args, Salt, R>(
+    params: &CreateParams<E, Args, Salt, R>,
+) -> Result<ink_primitives::ConstructorResult<E::AccountId>>
+where
+    E: Environment,
+    Args: scale::Encode,
+    Salt: AsRef<[u8]>,
+{
+    <EnvInstance as OnInstance>::on_instance(|instance| {
+        TypedEnvBackend::instantiate_contract::<E, Args, Salt, R>(instance, params)
+    })
+}
+
+/// Attempts to instantiate another contract, returning the instantiation result back to the
+/// caller.
+///
+/// # Note
+///
+/// This is a low level way to instantiate another smart contract.
+///
+/// Prefer to use methods on a `ContractRef` or the [`CreateBuilder`](`crate::call::CreateBuilder`)
+/// through [`build_create`](`crate::call::build_create`) instead.
 ///
 /// # Errors
 ///
@@ -321,16 +354,21 @@ where
 /// - If the instantiation process runs out of gas.
 /// - If given insufficient endowment.
 /// - If the returned account ID failed to decode properly.
-pub fn instantiate_contract<E, Args, Salt, C>(
-    params: &CreateParams<E, Args, Salt, C>,
-) -> Result<E::AccountId>
+pub fn instantiate_fallible_contract<E, Args, Salt, R, ContractError>(
+    params: &CreateParams<E, Args, Salt, R>,
+) -> Result<
+    ink_primitives::ConstructorResult<core::result::Result<E::AccountId, ContractError>>,
+>
 where
     E: Environment,
     Args: scale::Encode,
     Salt: AsRef<[u8]>,
+    ContractError: scale::Decode,
 {
     <EnvInstance as OnInstance>::on_instance(|instance| {
-        TypedEnvBackend::instantiate_contract::<E, Args, Salt, C>(instance, params)
+        TypedEnvBackend::instantiate_fallible_contract::<E, Args, Salt, R, ContractError>(
+            instance, params,
+        )
     })
 }
 

crates/env/src/backend.rs

@@ -439,15 +439,35 @@ pub trait TypedEnvBackend: EnvBackend {
     /// # Note
     ///
     /// For more details visit: [`instantiate_contract`][`crate::instantiate_contract`]
-    fn instantiate_contract<E, Args, Salt, C>(
+    fn instantiate_contract<E, Args, Salt, R>(
         &mut self,
-        params: &CreateParams<E, Args, Salt, C>,
-    ) -> Result<E::AccountId>
+        params: &CreateParams<E, Args, Salt, R>,
+    ) -> Result<ink_primitives::ConstructorResult<E::AccountId>>
     where
         E: Environment,
         Args: scale::Encode,
         Salt: AsRef<[u8]>;
 
+    /// Attempts to instantiate another contract, returning the instantiation result back to the
+    /// caller.
+    ///
+    /// # Note
+    ///
+    /// For more details visit: [`instantiate_fallible_contract`][`crate::instantiate_fallible_contract`]
+    fn instantiate_fallible_contract<E, Args, Salt, R, ContractError>(
+        &mut self,
+        params: &CreateParams<E, Args, Salt, R>,
+    ) -> Result<
+        ink_primitives::ConstructorResult<
+            core::result::Result<E::AccountId, ContractError>,
+        >,
+    >
+    where
+        E: Environment,
+        Args: scale::Encode,
+        Salt: AsRef<[u8]>,
+        ContractError: scale::Decode;
+
     /// Terminates a smart contract.
     ///
     /// # Note

crates/env/src/call/call_builder.rs

@@ -132,7 +132,8 @@ where
     /// # Note
     ///
     /// On failure this returns an outer [`ink::env::Error`][`crate::Error`] or inner
-    /// [`ink_primitives::LangError`], both of which can be handled by the caller.
+    /// [`ink::primitives::LangError`][`ink_primitives::LangError`], both of which can be handled
+    /// by the caller.
     pub fn try_invoke(&self) -> Result<ink_primitives::MessageResult<R>, crate::Error> {
         crate::invoke_contract(self)
     }
@@ -150,7 +151,7 @@ where
     ///
     /// # Panics
     ///
-    /// This method panics if it encounters an [`ink::env::Error`][`crate::Error`] If you want to
+    /// This method panics if it encounters an [`ink::env::Error`][`crate::Error`]. If you want to
     /// handle those use the [`try_invoke`][`CallParams::try_invoke`] method instead.
     pub fn invoke(&self) -> R {
         crate::invoke_contract_delegate(self).unwrap_or_else(|env_error| {
@@ -691,7 +692,8 @@ where
     /// # Note
     ///
     /// On failure this returns an outer [`ink::env::Error`][`crate::Error`] or inner
-    /// [`ink_primitives::LangError`], both of which can be handled by the caller.
+    /// [`ink::primitives::LangError`][`ink_primitives::LangError`], both of which can be handled
+    /// by the caller.
     pub fn try_invoke(self) -> Result<ink_primitives::MessageResult<()>, Error> {
         self.params().try_invoke()
     }
@@ -750,7 +752,8 @@ where
     /// # Note
     ///
     /// On failure this returns an outer [`ink::env::Error`][`crate::Error`] or inner
-    /// [`ink_primitives::LangError`], both of which can be handled by the caller.
+    /// [`ink::primitives::LangError`][`ink_primitives::LangError`], both of which can be handled
+    /// by the caller.
     pub fn try_invoke(self) -> Result<ink_primitives::MessageResult<R>, Error> {
         self.params().try_invoke()
     }