Add CallV2 builder methods

crates/env/src/call/call_builder.rs

@@ -648,17 +648,15 @@ where
     E: Environment,
 {
     /// todo: [AJ] docs
-    pub fn v2(
-        self,
-    ) -> CallBuilder<E, Set<CallV2<E>>, Args, RetType> {
+    pub fn v2(self) -> CallBuilder<E, Set<CallV2<E>>, Args, RetType> {
         let call_type = self.call_type.value();
         CallBuilder {
             call_type: Set(CallV2 {
                 callee: call_type.callee,
                 ref_time_limit: call_type.gas_limit,
                 proof_time_limit: Default::default(),
                 transferred_value: call_type.transferred_value,
-            } ),
+            }),
             call_flags: self.call_flags,
             exec_input: self.exec_input,
             return_type: self.return_type,
@@ -772,6 +770,23 @@ where
     }
 }
 
+impl<E, Args, RetType>
+    CallBuilder<E, Set<CallV2<E>>, Set<ExecutionInput<Args>>, Set<ReturnType<RetType>>>
+where
+    E: Environment,
+{
+    /// Finalizes the call builder to call a function.
+    pub fn params(self) -> CallParams<E, CallV2<E>, Args, RetType> {
+        CallParams {
+            call_type: self.call_type.value(),
+            call_flags: self.call_flags,
+            _return_type: Default::default(),
+            exec_input: self.exec_input.value(),
+            _phantom: self._phantom,
+        }
+    }
+}
+
 impl<E, Args, RetType>
     CallBuilder<
         E,
@@ -811,6 +826,28 @@ where
     }
 }
 
+impl<E, RetType>
+    CallBuilder<
+        E,
+        Set<CallV2<E>>,
+        Unset<ExecutionInput<EmptyArgumentList>>,
+        Unset<RetType>,
+    >
+where
+    E: Environment,
+{
+    /// Finalizes the call builder to call a function.
+    pub fn params(self) -> CallParams<E, CallV2<E>, EmptyArgumentList, ()> {
+        CallParams {
+            call_type: self.call_type.value(),
+            call_flags: self.call_flags,
+            _return_type: Default::default(),
+            exec_input: Default::default(),
+            _phantom: self._phantom,
+        }
+    }
+}
+
 impl<E, RetType>
     CallBuilder<
         E,
@@ -866,6 +903,39 @@ where
     }
 }
 
+impl<E>
+    CallBuilder<
+        E,
+        Set<CallV2<E>>,
+        Unset<ExecutionInput<EmptyArgumentList>>,
+        Unset<ReturnType<()>>,
+    >
+where
+    E: Environment,
+{
+    /// Invokes the cross-chain function call.
+    ///
+    /// # Panics
+    ///
+    /// This method panics if it encounters an [`ink::env::Error`][`crate::Error`] or an
+    /// [`ink::primitives::LangError`][`ink_primitives::LangError`]. If you want to handle
+    /// those use the [`try_invoke`][`CallBuilder::try_invoke`] method instead.
+    pub fn invoke(self) {
+        self.params().invoke()
+    }
+
+    /// Invokes the cross-chain function call.
+    ///
+    /// # Note
+    ///
+    /// On failure this returns an outer [`ink::env::Error`][`crate::Error`] or inner
+    /// [`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()
+    }
+}
+
 impl<E>
     CallBuilder<
         E,
@@ -928,6 +998,36 @@ where
     }
 }
 
+impl<E, Args, R>
+    CallBuilder<E, Set<CallV2<E>>, Set<ExecutionInput<Args>>, Set<ReturnType<R>>>
+where
+    E: Environment,
+    Args: scale::Encode,
+    R: scale::Decode,
+{
+    /// Invokes the cross-chain function call and returns the result.
+    ///
+    /// # Panics
+    ///
+    /// This method panics if it encounters an [`ink::env::Error`][`crate::Error`] or an
+    /// [`ink::primitives::LangError`][`ink_primitives::LangError`]. If you want to handle
+    /// those use the [`try_invoke`][`CallBuilder::try_invoke`] method instead.
+    pub fn invoke(self) -> R {
+        self.params().invoke()
+    }
+
+    /// Invokes the cross-chain function call and returns the result.
+    ///
+    /// # Note
+    ///
+    /// On failure this returns an outer [`ink::env::Error`][`crate::Error`] or inner
+    /// [`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()
+    }
+}
+
 impl<E, Args, R>
     CallBuilder<E, Set<DelegateCall<E>>, Set<ExecutionInput<Args>>, Set<ReturnType<R>>>
 where

crates/env/src/call/mod.rs

@@ -43,9 +43,9 @@ pub use self::{
     call_builder::{
         build_call,
         Call,
-        CallV2,
         CallBuilder,
         CallParams,
+        CallV2,
         DelegateCall,
     },
     create_builder::{

integration-tests/cross-contract-calls/lib.rs

@@ -5,11 +5,14 @@ mod cross_contract_calls {
     use ink::{
         codegen::ContractCallBuilder,
         env::{
+            call::FromAccountId,
             ContractEnv,
-            call::FromAccountId
         },
     };
-    use other_contract::{OtherContract, OtherContractRef};
+    use other_contract::{
+        OtherContract,
+        OtherContractRef,
+    };
 
     type Env = <CrossContractCalls as ContractEnv>::Env;
     type OtherContractCallBuilder = <OtherContract as ContractCallBuilder>::Type;
@@ -31,11 +34,14 @@ mod cross_contract_calls {
                 .salt_bytes([0xDE, 0xAD, 0xBE, 0xEF])
                 .instantiate();
 
-            let other_contract_call_builder = <OtherContractCallBuilder as FromAccountId<Env>>::from_account_id(
-                *other_contract.as_ref(),
-            );
+            let other_contract_call_builder =
+                <OtherContractCallBuilder as FromAccountId<Env>>::from_account_id(
+                    *other_contract.as_ref(),
+                );
 
-            Self { other_contract_call_builder }
+            Self {
+                other_contract_call_builder,
+            }
         }
 
         /// Using the `ContractRef` we can call all the messages of the `OtherContract` as
@@ -45,14 +51,11 @@ mod cross_contract_calls {
         pub fn flip_and_get(&mut self) -> bool {
             self.other_contract_call_builder
                 .flip()
-                // .v2()
-                // .weight_limit(0, 0)
+                .v2()
+                .weight_limit(0, 0)
                 .invoke();
 
-            self.other_contract_call_builder
-                .get()
-                // .v2()
-                .invoke()
+            self.other_contract_call_builder.get().v2().invoke()
         }
     }
 }

integration-tests/cross-contract-calls/other-contract/lib.rs

@@ -1,6 +1,9 @@
 #![cfg_attr(not(feature = "std"), no_std, no_main)]
 
-pub use self::other_contract::{OtherContract, OtherContractRef};
+pub use self::other_contract::{
+    OtherContract,
+    OtherContractRef,
+};
 
 #[ink::contract]
 mod other_contract {