Skip to content

Commit

Permalink
update cw-nfts lib
Browse files Browse the repository at this point in the history
  • Loading branch information
@taitruong
taitruong committed Aug 13, 2024
1 parent ef5a3c4 commit 3a6d97f
Show file tree
Hide file tree
Showing 9 changed files with 68 additions and 65 deletions.
20 changes: 10 additions & 10 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ cw-ownable = "^0.5"
cw-paginate-storage = { version = "^2.4", git = "https://github.com/DA0-DA0/dao-contracts.git" }
cw-storage-plus = "1.1"
cw2 = "1.1"
cw721 = { git = "https://github.com/public-awesome/cw-nfts", branch = "migrate_msgs"} # TODO switch to version 0.18.1/0.19.0, once released
cw721 = { git = "https://github.com/public-awesome/cw-nfts", branch = "minor_changes"} # TODO switch to version 0.18.1/0.19.0, once released
cw721-018 = { git = "https://github.com/public-awesome/cw-nfts", branch = "release/v0.18.1", package = "cw721"} # TODO switch to version 0.18.1/0.19.0, once released
cw721-016 = { version = "0.16.0", package = "cw721" }
cw721-metadata-onchain = { git = "https://github.com/public-awesome/cw-nfts", branch = "migrate_msgs", package = "cw721-metadata-onchain"} # TODO switch to version 0.18.1/0.19.0, once released
cw721-base = { git = "https://github.com/public-awesome/cw-nfts", branch = "migrate_msgs"} # TODO switch to version 0.18.1/0.19.0, once released
cw721-metadata-onchain = { git = "https://github.com/public-awesome/cw-nfts", branch = "minor_changes", package = "cw721-metadata-onchain"} # TODO switch to version 0.18.1/0.19.0, once released
cw721-base = { git = "https://github.com/public-awesome/cw-nfts", branch = "minor_changes"} # TODO switch to version 0.18.1/0.19.0, once released
cw721-base-018 = { git = "https://github.com/public-awesome/cw-nfts", branch = "release/v0.18.1", package = "cw721-base"} # TODO switch to version 0.18.1/0.19.0, once released
cw721-base-016 = { version = "0.16.0", package = "cw721-base" }
cw-ics721-incoming-proxy = { git = "https://github.com/arkprotocol/cw-ics721-proxy.git", tag = "v0.1.0" }
Expand Down
4 changes: 2 additions & 2 deletions contracts/cw721-tester/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ use cw721::{
use cw721_metadata_onchain::Cw721MetadataContract;
use cw_storage_plus::Item;

pub type ExecuteMsg = cw721_metadata_onchain::ExecuteMsg;
pub type QueryMsg = cw721_metadata_onchain::QueryMsg;
pub type ExecuteMsg = cw721_metadata_onchain::msg::ExecuteMsg;
pub type QueryMsg = cw721_metadata_onchain::msg::QueryMsg;

#[cw_serde]
pub struct InstantiateMsg {
Expand Down
16 changes: 8 additions & 8 deletions packages/ics721/src/execute.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ where
.querier
.query_wasm_smart(
child_collection.clone(),
&cw721_metadata_onchain::QueryMsg::AllNftInfo {
&cw721_metadata_onchain::msg::QueryMsg::AllNftInfo {
token_id: token_id.clone().into(),
include_expired: None,
},
Expand All @@ -207,7 +207,7 @@ where
// note: this requires approval from recipient, or recipient burns it himself
let burn_msg = WasmMsg::Execute {
contract_addr: child_collection.to_string(),
msg: to_json_binary(&cw721_metadata_onchain::ExecuteMsg::Burn {
msg: to_json_binary(&cw721_metadata_onchain::msg::ExecuteMsg::Burn {
token_id: token_id.clone().into(),
})?,
funds: vec![],
Expand Down Expand Up @@ -269,7 +269,7 @@ where
.querier
.query_wasm_smart(
home_collection.clone(),
&cw721_metadata_onchain::QueryMsg::AllNftInfo {
&cw721_metadata_onchain::msg::QueryMsg::AllNftInfo {
token_id: token_id.clone().into(),
include_expired: None,
},
Expand All @@ -285,7 +285,7 @@ where
// transfer NFT
let transfer_msg = WasmMsg::Execute {
contract_addr: home_collection.to_string(),
msg: to_json_binary(&cw721_metadata_onchain::ExecuteMsg::TransferNft {
msg: to_json_binary(&cw721_metadata_onchain::msg::ExecuteMsg::TransferNft {
recipient: recipient.to_string(),
token_id: token_id.clone().into(),
})?,
Expand Down Expand Up @@ -402,7 +402,7 @@ where
// make sure NFT is escrowed by ics721
let UniversalAllNftInfoResponse { access, info } = deps.querier.query_wasm_smart(
nft_contract,
&cw721_metadata_onchain::QueryMsg::AllNftInfo {
&cw721_metadata_onchain::msg::QueryMsg::AllNftInfo {
token_id: token_id.clone().into(),
include_expired: None,
},
Expand Down Expand Up @@ -620,7 +620,7 @@ where
.or_else(|| admin.clone())
.or_else(|| Some(creator.clone()))
.unwrap();
let mut instantiate_msg = cw721_metadata_onchain::InstantiateMsg {
let mut instantiate_msg = cw721_metadata_onchain::msg::InstantiateMsg {
name: class.id.clone().into(),
symbol: class.id.clone().into(),
collection_info_extension: None, // extension is set below, in case there's collection data
Expand Down Expand Up @@ -685,7 +685,7 @@ where
Ok(WasmMsg::Execute {
contract_addr: nft_contract.to_string(),
msg: to_json_binary(
&cw721_metadata_onchain::ExecuteMsg::TransferNft {
&cw721_metadata_onchain::msg::ExecuteMsg::TransferNft {
recipient: receiver.to_string(),
token_id: token_id.into(),
},
Expand Down Expand Up @@ -717,7 +717,7 @@ where
// Also note that this is set for every token, regardless of if data is None.
TOKEN_METADATA.save(deps.storage, (class_id.clone(), id.clone()), &data)?;

let msg = cw721_metadata_onchain::ExecuteMsg::Mint {
let msg = cw721_metadata_onchain::msg::ExecuteMsg::Mint {
token_id: id.into(),
token_uri: uri,
owner: receiver.to_string(),
Expand Down
4 changes: 2 additions & 2 deletions packages/ics721/src/ibc.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ where

messages.push(WasmMsg::Execute {
contract_addr: nft_contract.to_string(),
msg: to_json_binary(&cw721_metadata_onchain::ExecuteMsg::Burn {
msg: to_json_binary(&cw721_metadata_onchain::msg::ExecuteMsg::Burn {
token_id: token.into(),
})?,
funds: vec![],
Expand Down Expand Up @@ -212,7 +212,7 @@ where
.remove(deps.storage, (message.class_id.clone(), token_id.clone()));
Ok(WasmMsg::Execute {
contract_addr: nft_contract.to_string(),
msg: to_json_binary(&cw721_metadata_onchain::ExecuteMsg::TransferNft {
msg: to_json_binary(&cw721_metadata_onchain::msg::ExecuteMsg::TransferNft {
recipient: sender.to_string(),
token_id: token_id.into(),
})?,
Expand Down
4 changes: 2 additions & 2 deletions packages/ics721/src/query.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ pub fn query_token_metadata(
};
let UniversalAllNftInfoResponse { info, .. } = deps.querier.query_wasm_smart(
nft_contract,
&cw721_metadata_onchain::QueryMsg::AllNftInfo {
&cw721_metadata_onchain::msg::QueryMsg::AllNftInfo {
token_id: token_id.clone().into(),
include_expired: None,
},
Expand All @@ -170,7 +170,7 @@ pub fn query_owner(
let nft_contract = load_nft_contract_for_class_id(deps.storage, class_id)?;
let resp: cw721::msg::OwnerOfResponse = deps.querier.query_wasm_smart(
nft_contract,
&cw721_metadata_onchain::QueryMsg::OwnerOf {
&cw721_metadata_onchain::msg::QueryMsg::OwnerOf {
token_id,
include_expired: None,
},
Expand Down
4 changes: 2 additions & 2 deletions packages/ics721/src/testing/contract.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use cw721::{
CollectionExtension, DefaultOptionalCollectionExtension, DefaultOptionalNftExtension,
NftExtension, RoyaltyInfo,
};
use cw721_metadata_onchain::QueryMsg;
use cw721_metadata_onchain::msg::QueryMsg;
use cw_cii::ContractInstantiateInfo;
use cw_ownable::Ownership;
use cw_storage_plus::Map;
Expand Down Expand Up @@ -91,7 +91,7 @@ fn mock_querier(query: &WasmQuery) -> QuerierResult {
cosmwasm_std::WasmQuery::Smart {
contract_addr: _,
msg,
} => match from_json::<cw721_metadata_onchain::QueryMsg>(&msg).unwrap() {
} => match from_json::<cw721_metadata_onchain::msg::QueryMsg>(&msg).unwrap() {
QueryMsg::GetMinterOwnership {} => QuerierResult::Ok(ContractResult::Ok(
to_json_binary(&Ownership::<Addr> {
owner: Some(Addr::unchecked(OWNER_ADDR)),
Expand Down
Loading

0 comments on commit 3a6d97f

Please sign in to comment.