New nft contract from github source

deniszagumennov · deniszagumennov · commit 8f066f8aa3fb · 2025-03-07T18:39:38.000+04:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -43,8 +43,8 @@ tendermint-proto = { version = "0.34.1", default-features = false }
 cosmwasm-schema = { version = "2.1.0", default-features = false }
 cw-storage-plus = { version = "2.0.0", default-features = false }
 cw2 = { version = "2.0.0", default-features = false }
-cw721 = { version = "0.18.0", default-features = false }
-cw721-base = { version = "0.18.0", features = ["library"] }
+cw721 = { package = "cw721", git = "https://github.com/public-awesome/cw-nfts", branch = "main", default-features = false }
+cw721-base = { package = "cw721-base", git = "https://github.com/public-awesome/cw-nfts", branch = "main", default-features = false }
 cw-multi-test = { version = "2.1.0", default-features = false }
 cw-utils = { version = "2.0.0", default-features = false }
 serde = { version = "1.0.195", default-features = false }
@@ -55,7 +55,6 @@ bech32 = { version = "0.11.0", default-features = false, features = ["alloc"] }
 thiserror = { version = "1.0.56", default-features = false }
 optfield = { version = "0.3.0", default-features = false }
 schemars = { version = "0.8.16", default-features = false }
-astroport = { version = "5.5.0", default-features = false }
 semver = { version = "1.0.22", default-features = false }
 hex = { version = "0.4.3", default-features = false }
 once_cell = { version = "1.20.2" }
diff --git a/Makefile b/Makefile
@@ -33,7 +33,7 @@ compile_arm64:
 
 check_contracts:
 	@cargo install cosmwasm-check --locked
-	@cosmwasm-check --available-capabilities iterator,staking,stargate,neutron,cosmwasm_1_1,cosmwasm_1_2 artifacts/*.wasm
+	@cosmwasm-check --available-capabilities iterator,staking,stargate,neutron,cosmwasm_1_1,cosmwasm_1_2,cosmwasm_1_3,cosmwasm_1_4,cosmwasm_2_0 artifacts/*.wasm
 
 build_arm64: schema clippy test fmt doc compile_arm64 check_contracts
 
diff --git a/contracts/withdrawal-manager/src/contract.rs b/contracts/withdrawal-manager/src/contract.rs
@@ -2,7 +2,7 @@ use cosmwasm_std::{
     attr, ensure_eq, from_json, to_json_binary, Attribute, BankMsg, Binary, Coin, CosmosMsg,
     Decimal, Deps, DepsMut, Env, MessageInfo, Response, StdResult, Uint128, WasmMsg,
 };
-use cw721::NftInfoResponse;
+use cw721::msg::NftInfoResponse;
 use cw_ownable::{get_ownership, update_ownership};
 use drop_helpers::{
     answer::response,
diff --git a/contracts/withdrawal-voucher/Cargo.toml b/contracts/withdrawal-voucher/Cargo.toml
@@ -21,8 +21,10 @@ crate-type = ["cdylib", "rlib"]
 library = []
 
 [dependencies]
-cosmwasm-schema = { version = "1.5.4", default-features = false }
-cosmwasm-std = { version = "1.5.4", default-features = false }
-cw2 = { version = "1.1.2", default-features = false }
-cw721-base = { version = "0.18.0", features = ["library"] }
-semver = { version = "1.0.22", default-features = false }
+cosmwasm-schema = { workspace = true }
+cosmwasm-std = { workspace = true }
+cw2 = { workspace = true }
+cw721 = { workspace = true }
+cw721-base = { workspace = true }
+drop-staking-base = { workspace = true }
+semver = { workspace = true }
diff --git a/contracts/withdrawal-voucher/src/bin/drop-withdrawal-voucher-schema.rs b/contracts/withdrawal-voucher/src/bin/drop-withdrawal-voucher-schema.rs
@@ -1,5 +1,7 @@
 use cosmwasm_schema::write_api;
-use drop_withdrawal_voucher::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
+use drop_staking_base::msg::withdrawal_voucher::{
+    ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg,
+};
 
 fn main() {
     write_api! {
diff --git a/contracts/withdrawal-voucher/src/contract.rs b/contracts/withdrawal-voucher/src/contract.rs
@@ -1,17 +1,18 @@
-use crate::msg::{ExecuteMsg, Extension, InstantiateMsg, MigrateMsg, QueryMsg};
-use cosmwasm_std::Empty;
-pub use cw721_base::{ContractError, MinterResponse};
+pub use cw721::msg::MinterResponse;
+pub use cw721::traits::{Cw721Execute, Cw721Query};
+pub use cw721_base::error::ContractError;
+pub use cw721_base::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
 
 const CONTRACT_NAME: &str = concat!("crates.io:drop-staking__", env!("CARGO_PKG_NAME"));
 const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
 
-pub type Cw721VoucherContract<'a> = cw721_base::Cw721Contract<'a, Extension, Empty, Empty, Empty>;
+pub type Cw721VoucherContract<'a> = cw721_base::Cw721BaseContract<'a>;
 
 #[cfg(not(feature = "library"))]
 pub mod entry {
     use super::*;
 
-    use cosmwasm_std::{Binary, Deps, DepsMut, Env, MessageInfo, Response, StdError, StdResult};
+    use cosmwasm_std::{Binary, Deps, DepsMut, Env, MessageInfo, Response, StdError};
 
     // This makes a conscious choice on the various generics used by the contract
     #[cosmwasm_std::entry_point]
@@ -20,9 +21,9 @@ pub mod entry {
         env: Env,
         info: MessageInfo,
         msg: InstantiateMsg,
-    ) -> StdResult<Response> {
+    ) -> Result<Response, ContractError> {
         cw2::set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
-        Cw721VoucherContract::default().instantiate(deps.branch(), env, info, msg)
+        Cw721VoucherContract::default().instantiate(deps.branch(), &env, &info, msg)
     }
 
     #[cosmwasm_std::entry_point]
@@ -32,12 +33,12 @@ pub mod entry {
         info: MessageInfo,
         msg: ExecuteMsg,
     ) -> Result<Response, ContractError> {
-        Cw721VoucherContract::default().execute(deps, env, info, msg)
+        Cw721VoucherContract::default().execute(deps, &env, &info, msg)
     }
 
     #[cosmwasm_std::entry_point]
-    pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult<Binary> {
-        Cw721VoucherContract::default().query(deps, env, msg)
+    pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> Result<Binary, ContractError> {
+        Cw721VoucherContract::default().query(deps, &env, msg)
     }
 
     #[cosmwasm_std::entry_point]
diff --git a/contracts/withdrawal-voucher/src/lib.rs b/contracts/withdrawal-voucher/src/lib.rs
@@ -1,3 +1 @@
 pub mod contract;
-pub mod msg;
-pub mod state;
diff --git a/contracts/withdrawal-voucher/src/msg.rs b/contracts/withdrawal-voucher/src/msg.rs
diff --git a/packages/base/Cargo.toml b/packages/base/Cargo.toml
@@ -35,7 +35,6 @@ cw721 = { workspace = true }
 thiserror = { workspace = true }
 cw-ownable = { workspace = true }
 optfield = { workspace = true }
-astroport = { workspace = true }
 prost = { workspace = true }
 serde = { workspace = true }
 cw-utils = { workspace = true }
diff --git a/packages/base/src/error/astroport_exchange_handler.rs b/packages/base/src/error/astroport_exchange_handler.rs
diff --git a/packages/base/src/error/mod.rs b/packages/base/src/error/mod.rs
@@ -1,4 +1,3 @@
-pub mod astroport_exchange_handler;
 pub mod core;
 pub mod distribution;
 pub mod factory;
diff --git a/packages/base/src/lib.rs b/packages/base/src/lib.rs
@@ -1,5 +1,3 @@
-extern crate core;
-
 pub mod error;
 pub mod msg;
 pub mod state;
diff --git a/packages/base/src/msg/astroport_exchange_handler.rs b/packages/base/src/msg/astroport_exchange_handler.rs
diff --git a/packages/base/src/msg/mod.rs b/packages/base/src/msg/mod.rs
@@ -1,4 +1,3 @@
-pub mod astroport_exchange_handler;
 pub mod bond_provider;
 pub mod core;
 pub mod distribution;
@@ -25,3 +24,4 @@ pub mod val_ref;
 pub mod validatorset;
 pub mod validatorsstats;
 pub mod withdrawal_manager;
+pub mod withdrawal_voucher;
diff --git a/packages/base/src/msg/withdrawal_manager.rs b/packages/base/src/msg/withdrawal_manager.rs
@@ -1,6 +1,6 @@
 use cosmwasm_schema::{cw_serde, QueryResponses};
 use cosmwasm_std::Uint128;
-use cw721::Cw721ReceiveMsg;
+use cw721::receiver::Cw721ReceiveMsg;
 use cw_ownable::{cw_ownable_execute, cw_ownable_query};
 #[allow(unused_imports)]
 use drop_helpers::pause::PauseInfoResponse;
diff --git a/packages/base/src/msg/withdrawal_voucher.rs b/packages/base/src/msg/withdrawal_voucher.rs
@@ -0,0 +1,14 @@
+use cosmwasm_schema::cw_serde;
+pub use cw721::msg::MinterResponse;
+pub use cw721_base::error::ContractError;
+pub use cw721_base::msg::InstantiateMsg as CW721InstantiateMsg;
+
+use crate::state::withdrawal_voucher::Metadata;
+
+pub type Extension = Option<Metadata>;
+pub type InstantiateMsg = CW721InstantiateMsg;
+pub type ExecuteMsg = cw721_base::msg::ExecuteMsg;
+pub type QueryMsg = cw721_base::msg::QueryMsg;
+
+#[cw_serde]
+pub struct MigrateMsg {}
diff --git a/packages/base/src/state/astroport_exchange_handler.rs b/packages/base/src/state/astroport_exchange_handler.rs
diff --git a/packages/base/src/state/mod.rs b/packages/base/src/state/mod.rs
@@ -1,4 +1,3 @@
-pub mod astroport_exchange_handler;
 pub mod bond_providers;
 pub mod core;
 pub mod factory;
@@ -21,3 +20,4 @@ pub mod val_ref;
 pub mod validatorset;
 pub mod validatorsstats;
 pub mod withdrawal_manager;
+pub mod withdrawal_voucher;
diff --git a/packages/base/src/state/withdrawal_manager.rs b/packages/base/src/state/withdrawal_manager.rs
@@ -8,6 +8,6 @@ pub struct Config {
     pub base_denom: String,
 }
 
-pub type Cw721ReceiveMsg = cw721::Cw721ReceiveMsg;
+pub type Cw721ReceiveMsg = cw721::receiver::Cw721ReceiveMsg;
 
 pub const CONFIG: Item<Config> = Item::new("config");
diff --git a/packages/base/src/state/withdrawal_voucher.rs b/packages/base/src/state/withdrawal_voucher.rs

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1 @@`
`1`	`1`	`pub mod contract;`
`2`		`-pub mod msg;`
`3`		`-pub mod state;`