feat: optimize wasm binary size (#330)

* remove dynamic Host from logging

* remove dynamic Host from #[storage] macro

* remove dynamic Host from sol_interface and calls

* add Host associated type to HostAccess

* refactor VM

* remove cfg_if from host access impl

* use `impl Host` in tests and apis

* use `impl Host` for unsafe deploy

* add "unsized" constraint for host parameter,
fix ./ci/clippy.sh --contract-client-gen pipeline

* use `impl Host` in tests and contract client generation

Author: usqjwsyi1259anthonyshaffer

stylus-core/src/host.rs

@@ -37,9 +37,12 @@ dyn_clone::clone_trait_object!(Host);
 
 /// Defines a trait that allows a Stylus contract to access its host safely.
 pub trait HostAccess {
+    /// Host type returned by [`Self::vm()`].
+    type Host: Host;
+
     /// Provides access to the parametrized host of a contract, giving access
     /// to all the desired hostios from the user.
-    fn vm(&self) -> &dyn Host;
+    fn vm(&self) -> &Self::Host;
 }
 
 /// Defines a trait that can deny access to a contract router method if a message value is

stylus-proc/src/lib.rs

@@ -165,7 +165,7 @@ pub fn sol_storage(input: TokenStream) -> TokenStream {
 /// # }
 /// # mod evm { pub fn gas_left() -> u64 { 100 } }
 /// # mod msg { pub fn value() -> alloy_primitives::U256 { 100.try_into().unwrap() } }
-/// pub fn do_call(host: &dyn Host, account: IService, user: Address) -> Result<String, Error> {
+/// pub fn do_call(host: &impl Host, account: IService, user: Address) -> Result<String, Error> {
 ///     let config = Call::new()
 ///         .gas(host.evm_gas_left() / 2)       // limit to half the gas left
 ///         .value(host.msg_value());           // set the callvalue
@@ -236,7 +236,7 @@ pub fn sol_storage(input: TokenStream) -> TokenStream {
 /// # mod evm { pub fn gas_left() -> u64 { 100 } }
 /// # mod msg { pub fn value() -> alloy_primitives::U256 { 100.try_into().unwrap() } }
 /// pub fn do_call(
-///     host: &dyn Host,
+///     host: &impl Host,
 ///     account: IService,                   // serializes as an Address
 ///     user: Address,
 /// ) -> Result<String, Error> {

stylus-proc/src/macros/entrypoint.rs

@@ -176,7 +176,7 @@ fn user_entrypoint_fn(user_fn: Ident) -> Option<syn::ItemFn> {
                 #[no_mangle]
                 #[cfg(not(feature = "contract-client-gen"))]
                 pub extern "C" fn user_entrypoint(len: usize) -> usize {
-                    let host = stylus_sdk::host::VM(stylus_sdk::host::WasmVM{});
+                    let host = stylus_sdk::host::VM { host: stylus_sdk::host::WasmVM{}};
                     #deny_reentrant
 
                     // The following call is a noop to ensure that pay_for_memory_grow is

stylus-proc/src/macros/public/types.rs

@@ -114,7 +114,7 @@ fn get_client_funcs<E: InterfaceExtension>(
             let signature = quote! {
                 #funcs_visibility fn #func_name(
                     &self,
-                    host: &dyn stylus_sdk::stylus_core::host::Host,
+                    host: &impl stylus_sdk::stylus_core::host::Host,
                     context: impl #context,
                     #(#inputs,)*
                 ) -> #output_type

stylus-proc/src/macros/sol_interface.rs

@@ -125,8 +125,11 @@ impl Interface {
 
         self.item_impl.items.push(parse_quote! {
             #(#attrs)*
-            pub fn #rust_name(&self, host: &dyn stylus_sdk::stylus_core::host::Host, context: impl #context #(, #rust_args)*) ->
-                Result<<#return_type as #SolType>::RustType, stylus_sdk::stylus_core::calls::errors::Error>
+            pub fn #rust_name(
+                &self,
+                host: &impl stylus_sdk::stylus_core::host::Host,
+                context: impl #context #(, #rust_args)*
+            ) -> Result<<#return_type as #SolType>::RustType, stylus_sdk::stylus_core::calls::errors::Error>
             {
                 let args = <(#(#sol_args,)*) as #SolType>::abi_encode_params(&(#(#rust_arg_names,)*));
                 let mut calldata = vec![#selector0, #selector1, #selector2, #selector3];
@@ -335,7 +338,7 @@ mod tests {
                     #[function_attr]
                     pub fn make_payment(
                         &self,
-                        host: &dyn stylus_sdk::stylus_core::host::Host,
+                        host: &impl stylus_sdk::stylus_core::host::Host,
                         context: impl stylus_sdk::stylus_core::calls::MutatingCallContext,
                         user: <stylus_sdk::alloy_sol_types::sol_data::Address as stylus_sdk::alloy_sol_types::SolType>::RustType,
                     ) ->
@@ -354,7 +357,7 @@ mod tests {
 
                     pub fn get_constant(
                         &self,
-                        host: &dyn stylus_sdk::stylus_core::host::Host,
+                        host: &impl stylus_sdk::stylus_core::host::Host,
                         context: impl stylus_sdk::stylus_core::calls::StaticCallContext,
                     ) ->
                         Result<<stylus_sdk::alloy_sol_types::sol_data::FixedBytes<32> as stylus_sdk::alloy_sol_types::SolType>::RustType, stylus_sdk::stylus_core::calls::errors::Error>
@@ -368,7 +371,7 @@ mod tests {
 
                     pub fn get_foo(
                         &self,
-                        host: &dyn stylus_sdk::stylus_core::host::Host,
+                        host: &impl stylus_sdk::stylus_core::host::Host,
                         context: impl stylus_sdk::stylus_core::calls::StaticCallContext,
                     ) ->
                         Result<<inner::Foo as stylus_sdk::alloy_sol_types::SolType>::RustType, stylus_sdk::stylus_core::calls::errors::Error>

stylus-proc/src/macros/storage.rs

@@ -143,28 +143,19 @@ impl Storage {
     fn impl_host_access(&self) -> syn::ItemImpl {
         let name = &self.name;
         let (impl_generics, ty_generics, where_clause) = self.generics.split_for_impl();
-        cfg_if::cfg_if! {
-            if #[cfg(feature = "stylus-test")] {
-                parse_quote! {
-                    #[cfg(not(feature = "contract-client-gen"))]
-                    impl #impl_generics stylus_sdk::stylus_core::HostAccess for #name #ty_generics #where_clause {
-                        fn vm(&self) -> &dyn stylus_sdk::stylus_core::Host {
-                            self.__stylus_host.host.as_ref()
-                        }
-                    }
-                }
-            } else {
-                parse_quote! {
-                    #[cfg(not(feature = "contract-client-gen"))]
-                    impl #impl_generics stylus_sdk::stylus_core::HostAccess for #name #ty_generics #where_clause {
-                        fn vm(&self) -> &dyn stylus_sdk::stylus_core::Host {
-                            &self.__stylus_host
-                        }
-                    }
+
+        parse_quote! {
+            #[cfg(not(feature = "contract-client-gen"))]
+            impl #impl_generics stylus_sdk::stylus_core::HostAccess for #name #ty_generics #where_clause {
+                type Host = stylus_sdk::host::VM;
+
+                fn vm(&self) -> &Self::Host {
+                    &self.__stylus_host
                 }
             }
         }
     }
+
     fn impl_value_denier(&self) -> syn::ItemImpl {
         let name = &self.name;
         let (impl_generics, ty_generics, where_clause) = self.generics.split_for_impl();
@@ -181,6 +172,7 @@ impl Storage {
             }
         }
     }
+
     fn impl_constructor_guard(&self) -> syn::ItemImpl {
         let name = &self.name;
         let (impl_generics, ty_generics, where_clause) = self.generics.split_for_impl();
@@ -205,6 +197,7 @@ impl Storage {
             }
         }
     }
+
     fn impl_from_vm(&self) -> Option<syn::ItemImpl> {
         cfg_if::cfg_if! {
             if #[cfg(feature = "stylus-test")] {
@@ -236,6 +229,7 @@ impl Storage {
             }
         }
     }
+
     fn impl_vm_access(&self) -> syn::ItemImpl {
         let name = &self.name;
         let (impl_generics, ty_generics, where_clause) = self.generics.split_for_impl();

stylus-sdk/src/call/mod.rs

@@ -27,8 +27,8 @@ mod raw;
 pub mod transfer;
 
 /// Static calls the contract at the given address.
-pub fn static_call(
-    host: &dyn Host,
+pub fn static_call<H: Host + ?Sized>(
+    host: &H,
     context: impl StaticCallContext,
     to: Address,
     data: &[u8],
@@ -49,8 +49,8 @@ pub fn static_call(
 /// A delegate call must trust the other contract to uphold safety requirements.
 /// Though this function clears any cached values, the other contract may arbitrarily change storage,
 /// spend ether, and do other things one should never blindly allow other contracts to do.
-pub unsafe fn delegate_call(
-    host: &dyn Host,
+pub unsafe fn delegate_call<H: Host + ?Sized>(
+    host: &H,
     context: impl MutatingCallContext,
     to: Address,
     data: &[u8],
@@ -64,8 +64,8 @@ pub unsafe fn delegate_call(
 }
 
 /// Calls the contract at the given address.
-pub fn call(
-    host: &dyn Host,
+pub fn call<H: Host + ?Sized>(
+    host: &H,
     context: impl MutatingCallContext,
     to: Address,
     data: &[u8],

stylus-sdk/src/call/raw.rs

@@ -10,15 +10,15 @@ use stylus_core::Host;
 /// For safe calls, see [`Call`](super::Call).
 #[derive(Clone)]
 #[must_use]
-pub struct RawCall<'a> {
+pub struct RawCall<'a, H: Host + ?Sized> {
     kind: CallKind,
     callvalue: U256,
     gas: Option<u64>,
     offset: usize,
     size: Option<usize>,
     #[allow(unused)]
     cache_policy: CachePolicy,
-    host: &'a dyn Host,
+    host: &'a H,
 }
 
 /// What kind of call to perform.
@@ -40,7 +40,7 @@ pub(crate) enum CachePolicy {
     Clear,
 }
 
-impl<'a> RawCall<'a> {
+impl<'a, H: Host + ?Sized> RawCall<'a, H> {
     /// Begin configuring the raw call, similar to how [`std::fs::OpenOptions`][OpenOptions] works.
     ///
     /// ```no_run
@@ -49,7 +49,7 @@ impl<'a> RawCall<'a> {
     /// use stylus_sdk::{alloy_primitives::address, hex};
     /// use stylus_sdk::host::WasmVM;
     ///
-    /// fn do_call(host: &dyn Host) -> Result<(), ()> {
+    /// fn do_call(host: &impl Host) -> Result<(), ()> {
     ///     let contract = address!("361594F5429D23ECE0A88E4fBE529E1c49D524d8");
     ///     let calldata = &hex::decode("eddecf107b5740cef7f5a01e3ea7e287665c4e75").unwrap();
     ///
@@ -65,7 +65,7 @@ impl<'a> RawCall<'a> {
     /// ```
     ///
     /// [OpenOptions]: https://doc.rust-lang.org/stable/std/fs/struct.OpenOptions.html
-    pub fn new(host: &'a dyn Host) -> Self {
+    pub fn new(host: &'a H) -> Self {
         Self {
             host,
             cache_policy: CachePolicy::default(),
@@ -78,7 +78,7 @@ impl<'a> RawCall<'a> {
     }
 
     /// Configures a call that supplies callvalue, denominated in wei.
-    pub fn new_with_value(host: &'a dyn Host, callvalue: U256) -> Self {
+    pub fn new_with_value(host: &'a H, callvalue: U256) -> Self {
         Self {
             host,
             callvalue,
@@ -93,7 +93,7 @@ impl<'a> RawCall<'a> {
     /// Begin configuring a [`delegate call`].
     ///
     /// [`DELEGATE_CALL`]: https://www.evm.codes/#F4
-    pub fn new_delegate(host: &'a dyn Host) -> Self {
+    pub fn new_delegate(host: &'a H) -> Self {
         Self {
             host,
             cache_policy: CachePolicy::default(),
@@ -108,7 +108,7 @@ impl<'a> RawCall<'a> {
     /// Begin configuring a [`static call`].
     ///
     /// [`STATIC_CALL`]: https://www.evm.codes/#FA
-    pub fn new_static(host: &'a dyn Host) -> Self {
+    pub fn new_static(host: &'a H) -> Self {
         Self {
             host,
             cache_policy: CachePolicy::default(),

stylus-sdk/src/call/transfer.rs

@@ -17,15 +17,15 @@ use super::RawCall;
 /// # use stylus_sdk::prelude::*;
 /// # use stylus_sdk::stylus_core::host::Host;
 /// # use stylus_sdk::call::transfer::transfer_eth;
-/// # fn wrap(host: &dyn Host) -> Result<(), Vec<u8>> {
+/// # fn wrap(host: &impl Host) -> Result<(), Vec<u8>> {
 /// #   let value = alloy_primitives::U256::ZERO;
 /// #   let recipient = alloy_primitives::Address::ZERO;
 /// transfer_eth(host, recipient, value)?;                 // these two are equivalent
 /// call(host, Call::new().value(value), recipient, &[])?; // these two are equivalent
 /// #     Ok(())
 /// # }
 /// ```
-pub fn transfer_eth(host: &dyn Host, to: Address, amount: U256) -> Result<(), Vec<u8>> {
+pub fn transfer_eth(host: &impl Host, to: Address, amount: U256) -> Result<(), Vec<u8>> {
     host.flush_cache(true); // clear the storage to persist changes, invalidating the cache
     unsafe {
         RawCall::new_with_value(host, amount)

stylus-sdk/src/deploy/raw.rs

@@ -69,7 +69,7 @@ impl RawDeploy {
     /// For extra flexibility, this method does not clear the global storage cache.
     pub unsafe fn deploy(
         self,
-        host: &dyn Host,
+        host: &impl Host,
         code: &[u8],
         endowment: U256,
     ) -> Result<Address, Vec<u8>> {