From 62bc108b1b1669d2407e4f5c195168f46a8c77c1 Mon Sep 17 00:00:00 2001 From: Tasio Victoria Date: Sat, 13 Apr 2024 10:05:45 -0400 Subject: [PATCH] Continue implementation --- .gitignore | 3 +- .../stargaze-marketplace-v2/src/execute.rs | 51 +++++++------------ .../src/instantiate.rs | 18 +++---- contracts/stargaze-marketplace-v2/src/msg.rs | 6 +-- .../stargaze-marketplace-v2/src/orders.rs | 28 +++++----- .../src/tests/unit_tests/ask_queries.rs | 4 +- .../src/tests/unit_tests/asks.rs | 24 ++++----- .../unit_tests/collection_offer_queries.rs | 6 +-- .../src/tests/unit_tests/collection_offers.rs | 23 ++++----- .../src/tests/unit_tests/offer_queries.rs | 6 +-- .../src/tests/unit_tests/offers.rs | 20 ++++---- .../src/tests/unit_tests/sales.rs | 32 ++++++------ packages/sg-marketplace-common/src/nft.rs | 2 +- scripts/optimize-arm.sh | 6 +-- 14 files changed, 103 insertions(+), 126 deletions(-) diff --git a/.gitignore b/.gitignore index 883d7738..dc59eb6f 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,5 @@ lib dist tmp node_modules -tsconfig.tsbuildinfo \ No newline at end of file +tsconfig.tsbuildinfo +.turbo \ No newline at end of file diff --git a/contracts/stargaze-marketplace-v2/src/execute.rs b/contracts/stargaze-marketplace-v2/src/execute.rs index ff88a6f0..1ec48970 100644 --- a/contracts/stargaze-marketplace-v2/src/execute.rs +++ b/contracts/stargaze-marketplace-v2/src/execute.rs @@ -54,16 +54,12 @@ pub fn execute( execute_update_ask(deps, env, info, id, details.str_to_addr(api)?) } ExecuteMsg::RemoveAsk { id } => execute_remove_ask(deps, env, info, id), - ExecuteMsg::AcceptAsk { - id, - asset_recipient, - finder, - } => execute_accept_ask( + ExecuteMsg::AcceptAsk { id, actor, finder } => execute_accept_ask( deps, env, info, id, - maybe_addr(api, asset_recipient)?, + maybe_addr(api, actor)?, maybe_addr(api, finder)?, ), ExecuteMsg::SetOffer { @@ -82,16 +78,12 @@ pub fn execute( execute_update_offer(deps, env, info, id, details.str_to_addr(api)?) } ExecuteMsg::RemoveOffer { id } => execute_remove_offer(deps, env, info, id), - ExecuteMsg::AcceptOffer { - id, - asset_recipient, - finder, - } => execute_accept_offer( + ExecuteMsg::AcceptOffer { id, actor, finder } => execute_accept_offer( deps, env, info, id, - maybe_addr(api, asset_recipient)?, + maybe_addr(api, actor)?, maybe_addr(api, finder)?, ), ExecuteMsg::SetCollectionOffer { @@ -113,7 +105,7 @@ pub fn execute( ExecuteMsg::AcceptCollectionOffer { id, token_id, - asset_recipient, + actor, finder, } => execute_accept_collection_offer( deps, @@ -121,7 +113,7 @@ pub fn execute( info, id, token_id, - maybe_addr(api, asset_recipient)?, + maybe_addr(api, actor)?, maybe_addr(api, finder)?, ), } @@ -221,7 +213,7 @@ pub fn execute_set_ask( "collection", "token_id", "price", - "asset_recipient", + "actor", "finder", ], } @@ -283,7 +275,7 @@ pub fn execute_update_ask( AskEvent { ty: "update-ask", ask: &ask, - attr_keys: vec!["id", "price", "asset_recipient", "finder"], + attr_keys: vec!["id", "price", "actor", "finder"], } .into(), ); @@ -331,7 +323,7 @@ pub fn execute_accept_ask( env: Env, info: MessageInfo, id: OrderId, - asset_recipient: Option, + actor: Option, finder: Option, ) -> Result { let mut funds = NativeBalance(info.funds.clone()); @@ -354,7 +346,7 @@ pub fn execute_accept_ask( ask.token_id.clone(), OrderDetails { price: ask.details.price.clone(), - asset_recipient: asset_recipient.clone(), + actor: actor.clone(), finder: finder.clone(), }, env.block.height, @@ -450,7 +442,7 @@ pub fn execute_set_offer( "collection", "token_id", "price", - "asset_recipient", + "actor", "finder", ], } @@ -538,7 +530,7 @@ pub fn execute_update_offer( OfferEvent { ty: "update-offer", offer: &offer, - attr_keys: vec!["id", "price", "asset_recipient", "finder"], + attr_keys: vec!["id", "price", "actor", "finder"], } .into(), ); @@ -588,7 +580,7 @@ pub fn execute_accept_offer( env: Env, info: MessageInfo, id: OrderId, - asset_recipient: Option, + actor: Option, finder: Option, ) -> Result { let offer: Offer = offers() @@ -614,7 +606,7 @@ pub fn execute_accept_offer( offer.token_id.clone(), OrderDetails { price: offer.details.price.clone(), - asset_recipient: asset_recipient.clone(), + actor: actor.clone(), finder: finder.clone(), }, ) @@ -693,14 +685,7 @@ pub fn execute_set_collection_offer( CollectionOfferEvent { ty: "set-collection-offer", collection_offer: &collection_offer, - attr_keys: vec![ - "id", - "creator", - "collection", - "price", - "asset_recipient", - "finder", - ], + attr_keys: vec!["id", "creator", "collection", "price", "actor", "finder"], } .into(), ); @@ -788,7 +773,7 @@ pub fn execute_update_collection_offer( CollectionOfferEvent { ty: "update-collection-offer", collection_offer: &collection_offer, - attr_keys: vec!["id", "price", "asset_recipient", "finder"], + attr_keys: vec!["id", "price", "actor", "finder"], } .into(), ); @@ -840,7 +825,7 @@ pub fn execute_accept_collection_offer( info: MessageInfo, id: OrderId, token_id: TokenId, - asset_recipient: Option, + actor: Option, finder: Option, ) -> Result { let collection_offer = collection_offers() @@ -874,7 +859,7 @@ pub fn execute_accept_collection_offer( token_id.clone(), OrderDetails { price: collection_offer.details.price.clone(), - asset_recipient: asset_recipient.clone(), + actor: actor.clone(), finder: finder.clone(), }, ) diff --git a/contracts/stargaze-marketplace-v2/src/instantiate.rs b/contracts/stargaze-marketplace-v2/src/instantiate.rs index d357f29a..9cd808cd 100644 --- a/contracts/stargaze-marketplace-v2/src/instantiate.rs +++ b/contracts/stargaze-marketplace-v2/src/instantiate.rs @@ -15,7 +15,7 @@ use cosmwasm_std::entry_point; #[cfg_attr(not(feature = "library"), entry_point)] pub fn instantiate( deps: DepsMut, - env: Env, + _env: Env, _info: MessageInfo, msg: InstantiateMsg, ) -> Result { @@ -26,20 +26,14 @@ pub fn instantiate( config.save(deps.storage)?; ALLOW_DENOMS.save(deps.storage, &msg.allow_denoms)?; - NONCE.save(deps.storage, &0)?; - let contract_info_response = deps - .querier - .query_wasm_contract_info(env.contract.address)?; - - let instantiate_event = Event::new("instantiate".to_string()) - .add_attribute("code_id", contract_info_response.code_id.to_string()) - .add_attribute("contract_name", CONTRACT_NAME) - .add_attribute("contract_version", CONTRACT_VERSION); - let response = Response::new() - .add_event(instantiate_event) + .add_event( + Event::new("instantiate".to_string()) + .add_attribute("contract_name", CONTRACT_NAME) + .add_attribute("contract_version", CONTRACT_VERSION), + ) .add_event( ConfigEvent { ty: "set-config", diff --git a/contracts/stargaze-marketplace-v2/src/msg.rs b/contracts/stargaze-marketplace-v2/src/msg.rs index a9d8245f..8af75926 100644 --- a/contracts/stargaze-marketplace-v2/src/msg.rs +++ b/contracts/stargaze-marketplace-v2/src/msg.rs @@ -39,7 +39,7 @@ pub enum ExecuteMsg { }, AcceptAsk { id: OrderId, - asset_recipient: Option, + actor: Option, finder: Option, }, SetOffer { @@ -56,7 +56,7 @@ pub enum ExecuteMsg { }, AcceptOffer { id: OrderId, - asset_recipient: Option, + actor: Option, finder: Option, }, SetCollectionOffer { @@ -73,7 +73,7 @@ pub enum ExecuteMsg { AcceptCollectionOffer { id: OrderId, token_id: TokenId, - asset_recipient: Option, + actor: Option, finder: Option, }, } diff --git a/contracts/stargaze-marketplace-v2/src/orders.rs b/contracts/stargaze-marketplace-v2/src/orders.rs index d77a377e..583dd3ca 100644 --- a/contracts/stargaze-marketplace-v2/src/orders.rs +++ b/contracts/stargaze-marketplace-v2/src/orders.rs @@ -19,7 +19,7 @@ use sg_marketplace_common::address::address_or; #[cw_serde] pub struct OrderDetails { pub price: Coin, - pub asset_recipient: Option, + pub actor: Option, pub finder: Option, } @@ -27,7 +27,7 @@ impl OrderDetails { pub fn str_to_addr(self, api: &dyn Api) -> StdResult> { Ok(OrderDetails { price: self.price, - asset_recipient: maybe_addr(api, self.asset_recipient)?, + actor: maybe_addr(api, self.actor)?, finder: maybe_addr(api, self.finder)?, }) } @@ -64,7 +64,7 @@ impl Ask { } pub fn asset_recipient(&self) -> Addr { - address_or(self.details.asset_recipient.as_ref(), &self.creator) + address_or(self.details.actor.as_ref(), &self.creator) } pub fn save(&self, storage: &mut dyn Storage) -> Result<(), ContractError> { @@ -138,11 +138,11 @@ impl Ask { "collection" => Some(attr("collection", self.collection.to_string())), "token_id" => Some(attr("token_id", self.token_id.to_string())), "price" => Some(attr("price", self.details.price.to_string())), - "asset_recipient" => self + "actor" => self .details - .asset_recipient + .actor .as_ref() - .map(|asset_recipient| attr("asset_recipient", asset_recipient.to_string())), + .map(|actor| attr("actor", actor.to_string())), "finder" => self .details .finder @@ -193,7 +193,7 @@ impl Offer { } pub fn asset_recipient(&self) -> Addr { - address_or(self.details.asset_recipient.as_ref(), &self.creator) + address_or(self.details.actor.as_ref(), &self.creator) } pub fn save(&self, storage: &mut dyn Storage) -> Result<(), ContractError> { @@ -229,11 +229,11 @@ impl Offer { "collection" => Some(attr("collection", self.collection.to_string())), "token_id" => Some(attr("token_id", self.token_id.to_string())), "price" => Some(attr("price", self.details.price.to_string())), - "asset_recipient" => self + "actor" => self .details - .asset_recipient + .actor .as_ref() - .map(|asset_recipient| attr("asset_recipient", asset_recipient.to_string())), + .map(|actor| attr("actor", actor.to_string())), "finder" => self .details .finder @@ -280,7 +280,7 @@ impl CollectionOffer { } pub fn asset_recipient(&self) -> Addr { - address_or(self.details.asset_recipient.as_ref(), &self.creator) + address_or(self.details.actor.as_ref(), &self.creator) } pub fn save(&self, storage: &mut dyn Storage) -> Result<(), ContractError> { @@ -321,11 +321,11 @@ impl CollectionOffer { "creator" => Some(attr("creator", self.creator.to_string())), "collection" => Some(attr("collection", self.collection.to_string())), "price" => Some(attr("price", self.details.price.to_string())), - "asset_recipient" => self + "actor" => self .details - .asset_recipient + .actor .as_ref() - .map(|asset_recipient| attr("asset_recipient", asset_recipient.to_string())), + .map(|actor| attr("actor", actor.to_string())), "finder" => self .details .finder diff --git a/contracts/stargaze-marketplace-v2/src/tests/unit_tests/ask_queries.rs b/contracts/stargaze-marketplace-v2/src/tests/unit_tests/ask_queries.rs index f3456388..c9938dbb 100644 --- a/contracts/stargaze-marketplace-v2/src/tests/unit_tests/ask_queries.rs +++ b/contracts/stargaze-marketplace-v2/src/tests/unit_tests/ask_queries.rs @@ -42,7 +42,7 @@ fn try_query_asks_by_collection() { &[], OrderDetails { price, - asset_recipient: None, + actor: None, finder: None, }, ); @@ -132,7 +132,7 @@ fn try_query_asks_by_creator() { &[], OrderDetails { price, - asset_recipient: None, + actor: None, finder: None, }, ); diff --git a/contracts/stargaze-marketplace-v2/src/tests/unit_tests/asks.rs b/contracts/stargaze-marketplace-v2/src/tests/unit_tests/asks.rs index c3199051..c866a397 100644 --- a/contracts/stargaze-marketplace-v2/src/tests/unit_tests/asks.rs +++ b/contracts/stargaze-marketplace-v2/src/tests/unit_tests/asks.rs @@ -54,7 +54,7 @@ fn try_set_ask() { token_id: token_ids[0].clone(), details: OrderDetails { price: coin(1_000_000, NATIVE_DENOM), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -72,7 +72,7 @@ fn try_set_ask() { token_id: token_ids[0].clone(), details: OrderDetails { price: coin(1_000_000, JUNO_DENOM), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -83,7 +83,7 @@ fn try_set_ask() { ); // Create ask succeeds - let asset_recipient = Addr::unchecked("asset_recipient".to_string()); + let actor = Addr::unchecked("actor".to_string()); let finder = Addr::unchecked("finder".to_string()); let price = coin(1_000_000, NATIVE_DENOM); let set_ask = ExecuteMsg::SetAsk { @@ -91,7 +91,7 @@ fn try_set_ask() { token_id: token_ids[0].clone(), details: OrderDetails { price: price.clone(), - asset_recipient: Some(asset_recipient.to_string()), + actor: Some(actor.to_string()), finder: Some(finder.to_string()), }, }; @@ -107,7 +107,7 @@ fn try_set_ask() { assert_eq!(ask.collection, collection); assert_eq!(ask.token_id, token_ids[0]); assert_eq!(ask.details.price, price); - assert_eq!(ask.details.asset_recipient, Some(asset_recipient)); + assert_eq!(ask.details.actor, Some(actor)); assert_eq!(ask.details.finder, Some(finder)); // Create duplicate ask fails @@ -134,7 +134,7 @@ pub fn try_update_ask() { }, } = test_context(); - let asset_recipient = setup_additional_account(&mut app, "asset_recipient").unwrap(); + let actor = setup_additional_account(&mut app, "actor").unwrap(); let finder = setup_additional_account(&mut app, "finder").unwrap(); let num_nfts: u8 = 4; @@ -151,7 +151,7 @@ pub fn try_update_ask() { &[], OrderDetails { price: coin(1000000 + idx as u128, NATIVE_DENOM), - asset_recipient: Some(asset_recipient.to_string()), + actor: Some(actor.to_string()), finder: Some(finder.to_string()), }, ); @@ -164,7 +164,7 @@ pub fn try_update_ask() { id: ask_id.clone(), details: OrderDetails { price: coin(1000000, NATIVE_DENOM).clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -177,14 +177,14 @@ pub fn try_update_ask() { .to_string(), ); - // Setting asset_recipient and finder to None succeeds + // Setting actor and finder to None succeeds let new_price = coin(1000001u128, NATIVE_DENOM); let ask_id = generate_id(vec![collection.as_bytes(), token_ids[0_usize].as_bytes()]); let update_ask = ExecuteMsg::UpdateAsk { id: ask_id.clone(), details: OrderDetails { price: new_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -197,7 +197,7 @@ pub fn try_update_ask() { .unwrap(); assert_eq!(ask.details.price, new_price); - assert_eq!(ask.details.asset_recipient, None); + assert_eq!(ask.details.actor, None); assert_eq!(ask.details.finder, None); } @@ -234,7 +234,7 @@ pub fn try_remove_ask() { &[], OrderDetails { price: coin(1000000 + idx as u128, NATIVE_DENOM), - asset_recipient: None, + actor: None, finder: None, }, ); diff --git a/contracts/stargaze-marketplace-v2/src/tests/unit_tests/collection_offer_queries.rs b/contracts/stargaze-marketplace-v2/src/tests/unit_tests/collection_offer_queries.rs index ae5a3511..8628c307 100644 --- a/contracts/stargaze-marketplace-v2/src/tests/unit_tests/collection_offer_queries.rs +++ b/contracts/stargaze-marketplace-v2/src/tests/unit_tests/collection_offer_queries.rs @@ -40,7 +40,7 @@ fn try_query_collection_offers_by_collection() { collection: collection.to_string(), details: OrderDetails { price: collection_offer_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -93,7 +93,7 @@ fn try_query_collection_offers_by_token_price() { collection: collection.to_string(), details: OrderDetails { price: collection_offer_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -205,7 +205,7 @@ fn try_query_collection_offers_by_creator() { collection: collection.to_string(), details: OrderDetails { price: collection_offer_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; diff --git a/contracts/stargaze-marketplace-v2/src/tests/unit_tests/collection_offers.rs b/contracts/stargaze-marketplace-v2/src/tests/unit_tests/collection_offers.rs index bd996ce4..e1cb2794 100644 --- a/contracts/stargaze-marketplace-v2/src/tests/unit_tests/collection_offers.rs +++ b/contracts/stargaze-marketplace-v2/src/tests/unit_tests/collection_offers.rs @@ -38,7 +38,7 @@ fn try_set_collection_offer() { collection: collection.to_string(), details: OrderDetails { price: collection_offer_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -59,7 +59,7 @@ fn try_set_collection_offer() { collection: collection.to_string(), details: OrderDetails { price: collection_offer_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -78,14 +78,14 @@ fn try_set_collection_offer() { ); // Create collection_offer succeeds, even when overpaid - let asset_recipient = Addr::unchecked("asset_recipient".to_string()); + let actor = Addr::unchecked("actor".to_string()); let finder = Addr::unchecked("finder".to_string()); let collection_offer_price = coin(1_000_000, NATIVE_DENOM); let set_collection_offer = ExecuteMsg::SetCollectionOffer { collection: collection.to_string(), details: OrderDetails { price: collection_offer_price.clone(), - asset_recipient: Some(asset_recipient.to_string()), + actor: Some(actor.to_string()), finder: Some(finder.to_string()), }, }; @@ -128,10 +128,7 @@ fn try_set_collection_offer() { assert_eq!(collection_offer.creator, bidder); assert_eq!(collection_offer.collection, collection); assert_eq!(collection_offer.details.price, collection_offer_price); - assert_eq!( - collection_offer.details.asset_recipient, - Some(asset_recipient) - ); + assert_eq!(collection_offer.details.actor, Some(actor)); assert_eq!(collection_offer.details.finder, Some(finder)); } @@ -148,7 +145,7 @@ pub fn try_update_collection_offer() { accounts: TestAccounts { owner, bidder, .. }, } = test_context(); - let asset_recipient = setup_additional_account(&mut app, "asset_recipient").unwrap(); + let actor = setup_additional_account(&mut app, "actor").unwrap(); let finder = setup_additional_account(&mut app, "finder").unwrap(); let num_collection_offers: u8 = 4; @@ -159,7 +156,7 @@ pub fn try_update_collection_offer() { collection: collection.to_string(), details: OrderDetails { price: collection_offer_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -182,7 +179,7 @@ pub fn try_update_collection_offer() { id: collection_offer_ids[0].clone(), details: OrderDetails { price: coin(1000000u128, NATIVE_DENOM), - asset_recipient: Some(asset_recipient.to_string()), + actor: Some(actor.to_string()), finder: Some(finder.to_string()), }, }; @@ -206,7 +203,7 @@ pub fn try_update_collection_offer() { id: collection_offer_ids[0].clone(), details: OrderDetails { price: new_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -250,7 +247,7 @@ pub fn try_remove_offer() { collection: collection.to_string(), details: OrderDetails { price: price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }, diff --git a/contracts/stargaze-marketplace-v2/src/tests/unit_tests/offer_queries.rs b/contracts/stargaze-marketplace-v2/src/tests/unit_tests/offer_queries.rs index a805d4df..8ce836f6 100644 --- a/contracts/stargaze-marketplace-v2/src/tests/unit_tests/offer_queries.rs +++ b/contracts/stargaze-marketplace-v2/src/tests/unit_tests/offer_queries.rs @@ -39,7 +39,7 @@ fn try_query_offers() { token_id: token_id.to_string(), details: OrderDetails { price: offer_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -91,7 +91,7 @@ fn try_query_offers_by_token_price() { token_id: token_id.to_string(), details: OrderDetails { price: offer_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -230,7 +230,7 @@ fn try_query_offers_by_creator() { token_id: token_id.to_string(), details: OrderDetails { price: offer_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; diff --git a/contracts/stargaze-marketplace-v2/src/tests/unit_tests/offers.rs b/contracts/stargaze-marketplace-v2/src/tests/unit_tests/offers.rs index 6800f80c..ec442f5f 100644 --- a/contracts/stargaze-marketplace-v2/src/tests/unit_tests/offers.rs +++ b/contracts/stargaze-marketplace-v2/src/tests/unit_tests/offers.rs @@ -41,7 +41,7 @@ fn try_set_offer() { token_id: token_id.to_string(), details: OrderDetails { price: offer_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -60,7 +60,7 @@ fn try_set_offer() { token_id: token_id.to_string(), details: OrderDetails { price: offer_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -76,7 +76,7 @@ fn try_set_offer() { ); // Create offer succeeds, even when overpaid - let asset_recipient = Addr::unchecked("asset_recipient".to_string()); + let actor = Addr::unchecked("actor".to_string()); let finder = Addr::unchecked("finder".to_string()); let offer_price = coin(1_000_000, NATIVE_DENOM); let set_offer = ExecuteMsg::SetOffer { @@ -84,7 +84,7 @@ fn try_set_offer() { token_id: token_id.to_string(), details: OrderDetails { price: offer_price.clone(), - asset_recipient: Some(asset_recipient.to_string()), + actor: Some(actor.to_string()), finder: Some(finder.to_string()), }, }; @@ -122,7 +122,7 @@ fn try_set_offer() { assert_eq!(offer.collection, collection); assert_eq!(offer.token_id, token_id); assert_eq!(offer.details.price, offer_price); - assert_eq!(offer.details.asset_recipient, Some(asset_recipient)); + assert_eq!(offer.details.actor, Some(actor)); assert_eq!(offer.details.finder, Some(finder)); } @@ -139,7 +139,7 @@ pub fn try_update_offer() { accounts: TestAccounts { owner, bidder, .. }, } = test_context(); - let asset_recipient = setup_additional_account(&mut app, "asset_recipient").unwrap(); + let actor = setup_additional_account(&mut app, "actor").unwrap(); let finder = setup_additional_account(&mut app, "finder").unwrap(); let num_offers: u8 = 4; @@ -152,7 +152,7 @@ pub fn try_update_offer() { token_id: token_id.to_string(), details: OrderDetails { price: offer_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -175,7 +175,7 @@ pub fn try_update_offer() { id: offer_ids[0].clone(), details: OrderDetails { price: coin(1000000u128, NATIVE_DENOM), - asset_recipient: Some(asset_recipient.to_string()), + actor: Some(actor.to_string()), finder: Some(finder.to_string()), }, }; @@ -194,7 +194,7 @@ pub fn try_update_offer() { id: offer_ids[0].clone(), details: OrderDetails { price: new_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -242,7 +242,7 @@ pub fn try_remove_offer() { token_id: token_id.to_string(), details: OrderDetails { price: price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }, diff --git a/contracts/stargaze-marketplace-v2/src/tests/unit_tests/sales.rs b/contracts/stargaze-marketplace-v2/src/tests/unit_tests/sales.rs index 43f06afe..195b882b 100644 --- a/contracts/stargaze-marketplace-v2/src/tests/unit_tests/sales.rs +++ b/contracts/stargaze-marketplace-v2/src/tests/unit_tests/sales.rs @@ -62,7 +62,7 @@ fn try_set_ask_sale() { token_id: token_id.to_string(), details: OrderDetails { price: offer_price_1.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -76,7 +76,7 @@ fn try_set_ask_sale() { token_id: token_id.to_string(), details: OrderDetails { price: offer_price_2.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -96,7 +96,7 @@ fn try_set_ask_sale() { token_id: token_id.to_string(), details: OrderDetails { price: coin(5_000_000, NATIVE_DENOM), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -162,7 +162,7 @@ fn try_accept_ask_sale() { token_id: token_id.to_string(), details: OrderDetails { price: ask_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -175,7 +175,7 @@ fn try_accept_ask_sale() { // Accept ask directly let accept_ask = ExecuteMsg::AcceptAsk { id: ask_id, - asset_recipient: None, + actor: None, finder: None, }; let response = app.execute_contract( @@ -245,7 +245,7 @@ fn try_set_offer_sale() { token_id: token_id.to_string(), details: OrderDetails { price: ask_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -259,7 +259,7 @@ fn try_set_offer_sale() { token_id: token_id.to_string(), details: OrderDetails { price: offer_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -328,7 +328,7 @@ fn try_accept_offer_sale() { token_id: token_id.to_string(), details: OrderDetails { price: offer_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -348,7 +348,7 @@ fn try_accept_offer_sale() { let accept_offer = ExecuteMsg::AcceptOffer { id: offer_id, - asset_recipient: None, + actor: None, finder: None, }; let response = app.execute_contract(owner.clone(), marketplace.clone(), &accept_offer, &[]); @@ -413,7 +413,7 @@ fn try_set_collection_offer_sale() { token_id: token_id.to_string(), details: OrderDetails { price: ask_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -426,7 +426,7 @@ fn try_set_collection_offer_sale() { collection: collection.to_string(), details: OrderDetails { price: ask_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -494,7 +494,7 @@ fn try_accept_collection_offer_sale() { collection: collection.to_string(), details: OrderDetails { price: offer_price.clone(), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -518,7 +518,7 @@ fn try_accept_collection_offer_sale() { token_id: token_id.to_string(), details: OrderDetails { price: coin(20_000_000, NATIVE_DENOM), - asset_recipient: None, + actor: None, finder: None, }, }; @@ -528,7 +528,7 @@ fn try_accept_collection_offer_sale() { let accept_collection_offer = ExecuteMsg::AcceptCollectionOffer { id: collection_offer_id, token_id: token_id.to_string(), - asset_recipient: None, + actor: None, finder: None, }; let response = app.execute_contract( @@ -599,7 +599,7 @@ fn try_sale_fee_breakdown() { token_id: token_id.to_string(), details: OrderDetails { price: ask_price.clone(), - asset_recipient: Some(tokens_recipient.to_string()), + actor: Some(tokens_recipient.to_string()), finder: Some(maker.to_string()), }, }; @@ -614,7 +614,7 @@ fn try_sale_fee_breakdown() { let nft_recipient: Addr = Addr::unchecked("nft_recipient".to_string()); let accept_ask = ExecuteMsg::AcceptAsk { id: ask_id, - asset_recipient: Some(nft_recipient.to_string()), + actor: Some(nft_recipient.to_string()), finder: Some(taker.to_string()), }; let response = app.execute_contract( diff --git a/packages/sg-marketplace-common/src/nft.rs b/packages/sg-marketplace-common/src/nft.rs index c0c7f648..9df74180 100644 --- a/packages/sg-marketplace-common/src/nft.rs +++ b/packages/sg-marketplace-common/src/nft.rs @@ -44,7 +44,7 @@ pub fn only_owner( match owner_of_response { Ok(owner_of_response) => { - if owner_of_response.owner != info.sender.to_string() { + if owner_of_response.owner != info.sender { return Err(MarketplaceStdError::Unauthorized( "sender is not owner".to_string(), )); diff --git a/scripts/optimize-arm.sh b/scripts/optimize-arm.sh index 15d9e98f..9aee933a 100755 --- a/scripts/optimize-arm.sh +++ b/scripts/optimize-arm.sh @@ -1,4 +1,4 @@ docker run --rm -v "$(pwd)":/code \ - --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \ - --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \ - cosmwasm/workspace-optimizer-arm64:0.12.13 + --mount type=volume,source="$(basename "$(pwd)")_cache",target=/target \ + --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \ + cosmwasm/workspace-optimizer-arm64:0.14.0 \ No newline at end of file