Merge pull request #81 from Supercolony-net/bugfix/delegated-call

Fix the build after updating of the ink with delegated calls
Supercolony-net · Mar 8, 2022 · 69a39a2 · 69a39a2
2 parents 1787567 + b106268
commit 69a39a2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/contracts/governance/timelock_controller/mod.rs b/contracts/governance/timelock_controller/mod.rs
@@ -19,6 +19,7 @@ pub use derive::TimelockControllerStorage;
 use ink_env::{
     call::{
         build_call,
+        Call,
         ExecutionInput,
     },
     hash::Blake2x256,
@@ -408,9 +409,12 @@ impl<T: AccessControlStorage + TimelockControllerStorage + Flush> TimelockContro
         // Because during cross call we cann call this contract(for example for `update_delay` method).
         self.flush();
         let result = build_call::<DefaultEnvironment>()
-            .callee(transaction.callee)
-            .gas_limit(transaction.gas_limit)
-            .transferred_value(transaction.transferred_value)
+            .call_type(
+                Call::new()
+                    .callee(transaction.callee)
+                    .gas_limit(transaction.gas_limit)
+                    .transferred_value(transaction.transferred_value),
+            )
             .exec_input(ExecutionInput::new(transaction.selector.into()).push_arg(CallInput(&transaction.input)))
             .returns::<()>()
             .call_flags(CallFlags::default().set_allow_reentry(true))

diff --git a/utils/brush_lang/proc_macros/lib.rs b/utils/brush_lang/proc_macros/lib.rs
@@ -393,7 +393,7 @@ pub fn modifiers(_attrs: TokenStream, method: TokenStream) -> TokenStream {
 ///
 /// // Example how to get ink! call builder
 /// let to: AccountId = [0; 32].into();
-/// let builder_for_foo: ::ink_env::call::CallBuilder<_, _, _, _, _, _> = Trait1and2Ref::foo_builder(&to);
+/// let builder_for_foo: ::ink_env::call::CallBuilder<_, _, _, _> = Trait1and2Ref::foo_builder(&to);
 /// let ink_result: Result<bool, ink_env::Error> = builder_for_foo.fire();
 /// }
 /// ```

diff --git a/utils/brush_lang/proc_macros/trait_definition.rs b/utils/brush_lang/proc_macros/trait_definition.rs
@@ -221,9 +221,7 @@ fn generate_wrapper(ink_trait: ItemTrait) -> proc_macro2::TokenStream {
                     #( , #input_bindings : #input_types )*
                 ) -> ::ink_env::call::CallBuilder<
                     ::ink_env::DefaultEnvironment,
-                    ::ink_env::call::utils::Set< <::ink_env::DefaultEnvironment as ::ink_env::Environment>::AccountId >,
-                    ::ink_env::call::utils::Unset< ::core::primitive::u64 >,
-                    ::ink_env::call::utils::Unset< <::ink_env::DefaultEnvironment as ::ink_env::Environment>::Balance >,
+                    ::ink_env::call::utils::Set< ::ink_env::call::Call< ::ink_env::DefaultEnvironment > >,
                     ::ink_env::call::utils::Set< ::ink_env::call::ExecutionInput<#arg_list> >,
                     ::ink_env::call::utils::Set<::ink_env::call::utils::ReturnType<#output_ty>>,
                 >;
@@ -246,14 +244,14 @@ fn generate_wrapper(ink_trait: ItemTrait) -> proc_macro2::TokenStream {
                     #( , #input_bindings : #input_types )*
                 ) -> ::ink_env::call::CallBuilder<
                     ::ink_env::DefaultEnvironment,
-                    ::ink_env::call::utils::Set< <::ink_env::DefaultEnvironment as ::ink_env::Environment>::AccountId >,
-                    ::ink_env::call::utils::Unset< ::core::primitive::u64 >,
-                    ::ink_env::call::utils::Unset< <::ink_env::DefaultEnvironment as ::ink_env::Environment>::Balance >,
+                    ::ink_env::call::utils::Set< ::ink_env::call::Call< ::ink_env::DefaultEnvironment > >,
                     ::ink_env::call::utils::Set< ::ink_env::call::ExecutionInput<#arg_list> >,
                     ::ink_env::call::utils::Set<::ink_env::call::utils::ReturnType<#output_ty>>,
                 > {
                     ::ink_env::call::build_call::<::ink_env::DefaultEnvironment>()
-                        .callee(self.clone())
+                        .call_type(
+                            ::ink_env::call::Call::new()
+                                .callee(self.clone()))
                         .exec_input(
                             ::ink_env::call::ExecutionInput::new(
                                 ::ink_env::call::Selector::new([ #( #selector_bytes ),* ])