feat: Create ctx module for context types

examples/contracts/custom/src/contract.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use cw_storage_plus::Item;
 use sylvia::contract;
 use sylvia::cw_std::{CosmosMsg, QueryRequest, Response, StdResult};

examples/contracts/custom/src/cw1.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use cw1::{CanExecuteResp, Cw1};
 use sylvia::cw_std::{CosmosMsg, Empty, Response, StdError, StdResult};
 use sylvia::types::{ExecCtx, QueryCtx};

examples/contracts/cw1-subkeys/src/contract.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use cw1_whitelist::contract::Cw1WhitelistContract;
 use cw2::set_contract_version;
 use cw_storage_plus::{Bound, Map};

examples/contracts/cw1-subkeys/src/cw1.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use cw1::{CanExecuteResp, Cw1};
 use sylvia::cw_std::{ensure, Addr, CosmosMsg, Response, StdResult};
 use sylvia::types::{CustomMsg, CustomQuery, ExecCtx, QueryCtx};

examples/contracts/cw1-subkeys/src/whitelist.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use sylvia::cw_std::{Response, StdResult};
 use sylvia::types::{CustomMsg, CustomQuery, ExecCtx, QueryCtx};
 use whitelist::responses::AdminListResponse;

examples/contracts/cw1-whitelist/src/contract.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use crate::error::ContractError;
 use cw2::set_contract_version;
 use cw_storage_plus::{Item, Map};

examples/contracts/cw1-whitelist/src/cw1.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use cw1::{CanExecuteResp, Cw1};
 use sylvia::cw_std::{Addr, CosmosMsg, Response, StdResult};
 use sylvia::types::{CustomMsg, CustomQuery, ExecCtx, QueryCtx};

examples/contracts/cw1-whitelist/src/whitelist.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use sylvia::cw_std::{Empty, Order, Response, StdResult};
 use sylvia::types::{CustomMsg, CustomQuery, ExecCtx, QueryCtx};
 use whitelist::responses::AdminListResponse;

examples/contracts/cw20-base/src/allowances.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use cw20_allowances::responses::{
     AllAccountsResponse, AllAllowancesResponse, AllSpenderAllowancesResponse, AllowanceInfo,
     AllowanceResponse, SpenderAllowanceInfo,

examples/contracts/cw20-base/src/contract.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use crate::error::ContractError;
 use crate::responses::{BalanceResponse, Cw20Coin, Cw20ReceiveMsg, TokenInfoResponse};
 use crate::validation::{validate_accounts, validate_msg, verify_logo};

examples/contracts/cw20-base/src/marketing.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use crate::contract::Cw20Base;
 use crate::error::ContractError;
 use crate::validation::verify_logo;

examples/contracts/cw20-base/src/minting.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use crate::contract::{Cw20Base, MinterData};
 use crate::error::ContractError;
 use cw20_minting::responses::MinterResponse;

examples/contracts/cw20-base/src/multitest/receiver.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use sylvia::cw_std::{Binary, Response, StdError, Uint128};
 use sylvia::interface;
 use sylvia::types::ExecCtx;

examples/contracts/cw20-base/src/multitest/receiver_contract.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use sylvia::contract;
 use sylvia::cw_std::{Response, StdResult};
 use sylvia::types::InstantiateCtx;

examples/contracts/entry-points-overriding/src/contract.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use cw_storage_plus::Item;
 use sylvia::contract;
 use sylvia::cw_std::{Response, StdError, StdResult};

examples/contracts/entry-points-overriding/src/messages.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use sylvia::cw_schema::cw_serde;
 use sylvia::cw_std::{DepsMut, Env, MessageInfo, Response, StdError, StdResult};
 use sylvia::types::ExecCtx;

examples/contracts/generic_contract/src/contract.rs

@@ -1,8 +1,9 @@
+#![allow(deprecated)]
+
 use cw_storage_plus::Item;
 use sylvia::contract;
+use sylvia::ctx::ReplyCtx;
 use sylvia::cw_std::{Binary, Response, StdResult, SubMsgResult};
-#[allow(deprecated)]
-use sylvia::replies::ReplyCtx;
 use sylvia::serde::Deserialize;
 use sylvia::types::{CustomMsg, ExecCtx, InstantiateCtx, MigrateCtx, QueryCtx, SudoCtx};
 

examples/contracts/generic_contract/src/custom_and_generic.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use custom_and_generic::CustomAndGeneric;
 use sylvia::cw_std::{CosmosMsg, Response, StdError, StdResult};
 use sylvia::types::{ExecCtx, QueryCtx, SudoCtx};

examples/contracts/generic_contract/src/cw1.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use crate::contract::GenericContract;
 use cw1::{CanExecuteResp, Cw1};
 use sylvia::cw_std::{CosmosMsg, Empty, Response, StdError, StdResult};

examples/contracts/generic_contract/src/generic.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use generic::Generic;
 use sylvia::cw_std::{CosmosMsg, Response, StdError, StdResult};
 use sylvia::serde::Deserialize;

examples/contracts/generic_iface_on_contract/src/contract.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use sylvia::contract;
 use sylvia::cw_std::{Response, StdResult};
 use sylvia::types::InstantiateCtx;

examples/contracts/generic_iface_on_contract/src/custom_and_generic.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use crate::contract::{SvCustomMsg, SvCustomQuery};
 use custom_and_generic::CustomAndGeneric;
 use sylvia::cw_std::{CosmosMsg, Response, StdError, StdResult};

examples/contracts/generic_iface_on_contract/src/cw1.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use cw1::{CanExecuteResp, Cw1};
 use sylvia::cw_std::{CosmosMsg, Empty, Response, StdError, StdResult};
 use sylvia::types::{ExecCtx, QueryCtx};

examples/contracts/generic_iface_on_contract/src/generic.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use generic::Generic;
 use sylvia::cw_std::{CosmosMsg, Response, StdError, StdResult};
 use sylvia::types::{ExecCtx, QueryCtx, SudoCtx};

examples/contracts/generics_forwarded/src/contract.rs

@@ -1,11 +1,10 @@
-#![allow(clippy::type_complexity)]
+#![allow(clippy::type_complexity, deprecated)]
 
 use crate::error::ContractError;
 use cw_storage_plus::Item;
 use sylvia::contract;
+use sylvia::ctx::ReplyCtx;
 use sylvia::cw_std::{Binary, Response, SubMsgResult};
-#[allow(deprecated)]
-use sylvia::replies::ReplyCtx;
 use sylvia::serde::Deserialize;
 use sylvia::types::{
     CustomMsg, CustomQuery, ExecCtx, InstantiateCtx, MigrateCtx, QueryCtx, SudoCtx,

examples/contracts/generics_forwarded/src/custom_and_generic.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use custom_and_generic::CustomAndGeneric;
 use sylvia::cw_std::{CosmosMsg, Response};
 use sylvia::serde::Deserialize;

examples/contracts/generics_forwarded/src/cw1.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use cw1::{CanExecuteResp, Cw1};
 use sylvia::cw_schema::schemars::JsonSchema;
 use sylvia::cw_std::{CosmosMsg, CustomMsg, Empty, Response, StdResult};

examples/contracts/generics_forwarded/src/generic.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use generic::Generic;
 use sylvia::cw_std::{CosmosMsg, Response};
 use sylvia::serde::Deserialize;

examples/interfaces/custom-and-generic/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use sylvia::cw_std::{CosmosMsg, Response, StdError};
 
 use sylvia::interface;

examples/interfaces/cw1/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use sylvia::cw_std::{CosmosMsg, Response, StdError, StdResult};
 use sylvia::serde::{Deserialize, Serialize};
 use sylvia::types::{CustomMsg, CustomQuery, ExecCtx, QueryCtx};

examples/interfaces/cw20-allowances/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 pub mod responses;
 
 use cw_utils::Expiration;

examples/interfaces/cw20-marketing/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 pub mod responses;
 
 use responses::{DownloadLogoResponse, MarketingInfoResponse};

examples/interfaces/cw20-minting/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 pub mod responses;
 
 use responses::MinterResponse;

examples/interfaces/cw4/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 pub mod responses;
 
 use responses::{

examples/interfaces/generic/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use sylvia::cw_std::{CosmosMsg, Response, StdError};
 
 use sylvia::interface;

examples/interfaces/whitelist/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use responses::AdminListResponse;
 use sylvia::cw_std::{Response, StdError, StdResult};
 use sylvia::interface;

sylvia-derive/src/lib.rs

@@ -264,7 +264,7 @@ fn interface_impl(_attr: TokenStream2, item: TokenStream2) -> TokenStream2 {
 /// ## Example usage
 /// ```rust
 /// # use sylvia::types::{ExecCtx, InstantiateCtx, MigrateCtx, QueryCtx, SudoCtx};
-/// # use sylvia::replies::ReplyCtx;
+/// # use sylvia::ctx::ReplyCtx;
 /// # use sylvia::cw_std::{Binary, Response, StdError, SubMsgResult};
 /// # use cw_storage_plus::Item;
 /// # use thiserror::Error;
@@ -328,7 +328,7 @@ fn interface_impl(_attr: TokenStream2, item: TokenStream2) -> TokenStream2 {
 ///
 /// ```rust
 /// # use sylvia::types::{ExecCtx, InstantiateCtx, MigrateCtx, QueryCtx, SudoCtx};
-/// # use sylvia::replies::ReplyCtx;
+/// # use sylvia::ctx::ReplyCtx;
 /// # use sylvia::cw_std::{Binary, Response, StdError, SubMsgResult};
 /// # use cw_storage_plus::Item;
 /// # use thiserror::Error;
@@ -673,7 +673,7 @@ fn contract_impl(attr: TokenStream2, item: TokenStream2) -> TokenStream2 {
 /// ## Example usage
 /// ```rust
 /// # use sylvia::types::{ExecCtx, InstantiateCtx, MigrateCtx, QueryCtx, SudoCtx};
-/// # use sylvia::replies::ReplyCtx;
+/// # use sylvia::ctx::ReplyCtx;
 /// # use sylvia::cw_std::{Binary, Reply, Response, StdResult, SubMsgResult};
 /// #
 /// pub struct SvContract;

sylvia/examples/basic.rs

@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use anyhow::Error;
 use cosmwasm_std::{Addr, Response};
 use cw_storage_plus::{Item, Map};

sylvia/src/ctx.rs

@@ -0,0 +1,131 @@
+use cosmwasm_std::{Deps, DepsMut, Empty, Env, Event, MessageInfo, MsgResponse};
+
+/// Represantation of `reply` context received in entry point.
+#[non_exhaustive]
+pub struct ReplyCtx<'a, C: cosmwasm_std::CustomQuery = Empty> {
+    pub deps: DepsMut<'a, C>,
+    pub env: Env,
+    pub gas_used: u64,
+    pub events: Vec<Event>,
+    pub msg_responses: Vec<MsgResponse>,
+}
+
+/// Represantation of `migrate` context received in entry point.
+#[non_exhaustive]
+pub struct MigrateCtx<'a, C: cosmwasm_std::CustomQuery = Empty> {
+    pub deps: DepsMut<'a, C>,
+    pub env: Env,
+}
+
+/// Represantation of `execute` context received in entry point.
+#[non_exhaustive]
+pub struct ExecCtx<'a, C: cosmwasm_std::CustomQuery = Empty> {
+    pub deps: DepsMut<'a, C>,
+    pub env: Env,
+    pub info: MessageInfo,
+}
+
+/// Represantation of `instantiate` context received in entry point.
+#[non_exhaustive]
+pub struct InstantiateCtx<'a, C: cosmwasm_std::CustomQuery = Empty> {
+    pub deps: DepsMut<'a, C>,
+    pub env: Env,
+    pub info: MessageInfo,
+}
+
+/// Represantation of `query` context received in entry point.
+#[non_exhaustive]
+pub struct QueryCtx<'a, C: cosmwasm_std::CustomQuery = Empty> {
+    pub deps: Deps<'a, C>,
+    pub env: Env,
+}
+
+/// Represantation of `sudo` context received in entry point.
+#[non_exhaustive]
+pub struct SudoCtx<'a, C: cosmwasm_std::CustomQuery = Empty> {
+    pub deps: DepsMut<'a, C>,
+    pub env: Env,
+}
+
+impl<C: cosmwasm_std::CustomQuery> ExecCtx<'_, C> {
+    pub fn branch(&'_ mut self) -> ExecCtx<'_, C> {
+        ExecCtx {
+            deps: self.deps.branch(),
+            env: self.env.clone(),
+            info: self.info.clone(),
+        }
+    }
+}
+
+impl<C: cosmwasm_std::CustomQuery> InstantiateCtx<'_, C> {
+    pub fn branch(&'_ mut self) -> InstantiateCtx<'_, C> {
+        InstantiateCtx {
+            deps: self.deps.branch(),
+            env: self.env.clone(),
+            info: self.info.clone(),
+        }
+    }
+}
+
+impl<C: cosmwasm_std::CustomQuery> SudoCtx<'_, C> {
+    pub fn branch(&'_ mut self) -> SudoCtx<'_, C> {
+        SudoCtx {
+            deps: self.deps.branch(),
+            env: self.env.clone(),
+        }
+    }
+}
+
+impl<'a, C: cosmwasm_std::CustomQuery> From<(DepsMut<'a, C>, Env)> for MigrateCtx<'a, C> {
+    fn from((deps, env): (DepsMut<'a, C>, Env)) -> Self {
+        Self { deps, env }
+    }
+}
+
+impl<'a, C: cosmwasm_std::CustomQuery>
+    From<(DepsMut<'a, C>, Env, u64, Vec<Event>, Vec<MsgResponse>)> for ReplyCtx<'a, C>
+{
+    fn from(
+        (deps, env, gas_used, events, msg_responses): (
+            DepsMut<'a, C>,
+            Env,
+            u64,
+            Vec<Event>,
+            Vec<MsgResponse>,
+        ),
+    ) -> Self {
+        Self {
+            deps,
+            env,
+            gas_used,
+            events,
+            msg_responses,
+        }
+    }
+}
+
+impl<'a, C: cosmwasm_std::CustomQuery> From<(DepsMut<'a, C>, Env, MessageInfo)> for ExecCtx<'a, C> {
+    fn from((deps, env, info): (DepsMut<'a, C>, Env, MessageInfo)) -> Self {
+        Self { deps, env, info }
+    }
+}
+
+impl<'a, C: cosmwasm_std::CustomQuery> From<(DepsMut<'a, C>, Env, MessageInfo)>
+    for InstantiateCtx<'a, C>
+{
+    fn from((deps, env, info): (DepsMut<'a, C>, Env, MessageInfo)) -> Self {
+        Self { deps, env, info }
+    }
+}
+
+impl<'a, C: cosmwasm_std::CustomQuery> From<(Deps<'a, C>, Env)> for QueryCtx<'a, C> {
+    fn from((deps, env): (Deps<'a, C>, Env)) -> Self {
+        Self { deps, env }
+    }
+}
+
+impl<'a, C: cosmwasm_std::CustomQuery> From<(DepsMut<'a, C>, Env)> for SudoCtx<'a, C> {
+    fn from((deps, env): (DepsMut<'a, C>, Env)) -> Self {
+        Self { deps, env }
+    }
+}