feat: Cast deps to empty

examples/contracts/cw1-subkeys/Cargo.toml

@@ -13,7 +13,7 @@ tests = ["library", "cw-multi-test", "anyhow"]
 [dependencies]
 anyhow = { version = "1.0.68", optional = true }
 cosmwasm-schema = "1.2"
-cosmwasm-std = { version = "1.2", features = ["staking"] }
+cosmwasm-std = { version = "1.3", features = ["staking"] }
 cw-multi-test = { version = "0.16.2", optional = true }
 cw-storage-plus = "1.0"
 cw-utils = "1.0"

examples/contracts/cw1-whitelist/Cargo.toml

@@ -17,7 +17,7 @@ tests = ["library", "cw-multi-test", "anyhow"]
 mt = ["sylvia/mt", "library"]
 
 [dependencies]
-cosmwasm-std = { version = "1.2", features = ["staking"] }
+cosmwasm-std = { version = "1.3", features = ["staking"] }
 cosmwasm-schema = "1.2"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 sylvia = { path = "../../../sylvia" }

examples/contracts/cw20-base/Cargo.toml

@@ -18,7 +18,7 @@ tests = ["library", "cw-multi-test", "anyhow"]
 [dependencies]
 anyhow = { version = "1.0", optional = true }
 cosmwasm-schema = "1.2"
-cosmwasm-std = { version = "1.2", features = ["staking"] }
+cosmwasm-std = { version = "1.3", features = ["staking"] }
 cw-multi-test = { version = "0.16", optional = true }
 cw-storage-plus = "1.0"
 cw-utils = "1.0"
@@ -39,7 +39,7 @@ cw-multi-test = "0.16"
 cw-utils = "1.0"
 sylvia = { path = "../../../sylvia", features = ["mt"] }
 cw20-allowances = { path = "../../interfaces/cw20-allowances", features = [
-    "mt",
+  "mt",
 ] }
 cw20-marketing = { path = "../../interfaces/cw20-marketing", features = ["mt"] }
 cw20-minting = { path = "../../interfaces/cw20-minting", features = ["mt"] }

examples/contracts/entry-points-overriding/Cargo.toml

@@ -18,7 +18,7 @@ tests = ["library", "cw-multi-test", "anyhow"]
 [dependencies]
 anyhow = { version = "1.0", optional = true }
 cosmwasm-schema = "1.2"
-cosmwasm-std = { version = "1.2", features = ["staking"] }
+cosmwasm-std = { version = "1.3", features = ["staking"] }
 cw-multi-test = { version = "0.16", optional = true }
 cw-storage-plus = "1.0"
 cw-utils = "1.0"

examples/interfaces/cw1/Cargo.toml

@@ -12,7 +12,7 @@ homepage = "https://cosmwasm.com"
 mt = ["sylvia/mt"]
 
 [dependencies]
-cosmwasm-std = { version = "1.2", features = ["staking"] }
+cosmwasm-std = { version = "1.3", features = ["staking"] }
 cosmwasm-schema = "1.2"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 sylvia = { path = "../../../sylvia" }

examples/interfaces/cw20-allowances/Cargo.toml

@@ -12,7 +12,7 @@ homepage = "https://cosmwasm.com"
 mt = ["sylvia/mt"]
 
 [dependencies]
-cosmwasm-std = { version = "1.2", features = ["staking"] }
+cosmwasm-std = { version = "1.3", features = ["staking"] }
 cosmwasm-schema = "1.2"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 sylvia = { path = "../../../sylvia" }

examples/interfaces/cw20-marketing/Cargo.toml

@@ -12,7 +12,7 @@ homepage = "https://cosmwasm.com"
 mt = ["sylvia/mt"]
 
 [dependencies]
-cosmwasm-std = { version = "1.2", features = ["staking"] }
+cosmwasm-std = { version = "1.3", features = ["staking"] }
 cosmwasm-schema = "1.2"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 sylvia = { path = "../../../sylvia" }

examples/interfaces/cw20-minting/Cargo.toml

@@ -12,7 +12,7 @@ homepage = "https://cosmwasm.com"
 mt = ["sylvia/mt"]
 
 [dependencies]
-cosmwasm-std = { version = "1.2", features = ["staking"] }
+cosmwasm-std = { version = "1.3", features = ["staking"] }
 cosmwasm-schema = "1.2"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 sylvia = { path = "../../../sylvia" }

examples/interfaces/cw4/Cargo.toml

@@ -12,7 +12,7 @@ homepage = "https://cosmwasm.com"
 mt = ["sylvia/mt"]
 
 [dependencies]
-cosmwasm-std = { version = "1.2.1", features = ["staking"] }
+cosmwasm-std = { version = "1.3", features = ["staking"] }
 cosmwasm-schema = "1.2"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 sylvia = { path = "../../../sylvia" }

sylvia-derive/src/message.rs

@@ -901,15 +901,28 @@ impl<'a> GlueMessage<'a> {
             let ContractMessageAttr {
                 variant,
                 has_custom_msg,
+                has_custom_query,
                 ..
             } = interface;
 
-            match *has_custom_msg&& msg_ty == &MsgType::Exec
-            {
-                true => quote! { #contract_name :: #variant(msg) => Ok( #sylvia ::into_response::IntoResponse::into_response(msg.dispatch(contract, Into::into(ctx))?)?) },
-                false => quote! { #contract_name :: #variant(msg) => msg.dispatch(contract, Into::into(ctx)) }
-            }
+            let ctx = match (msg_ty, has_custom_query) {
+                (MsgType::Exec, true )=> quote! {
+                    ( ctx.0.into_empty(), ctx.1, ctx.2)
+                },
+                (MsgType::Query, true )=> quote! {
+                    ( ctx.0.into_empty(), ctx.1)
+                },
+                _=> quote! { ctx },
+            };
 
+            match (msg_ty, has_custom_msg) {
+                (MsgType::Exec, true) => quote! {
+                    #contract_name :: #variant(msg) => #sylvia ::into_response::IntoResponse::into_response(msg.dispatch(contract, Into::into( #ctx ))?)
+                },
+                _ => quote! {
+                    #contract_name :: #variant(msg) => msg.dispatch(contract, Into::into( #ctx ))
+                },
+            }
         });
 
         let dispatch_arm = quote! {#contract_name :: #contract (msg) =>msg.dispatch(contract, ctx)};