Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ To compile the contracts, use the CosmWasm optimizer:
docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/optimizer:0.16.1
cosmwasm/optimizer:0.17.0
```

## Development
Expand Down
2 changes: 1 addition & 1 deletion contracts/asset/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ thiserror = { workspace = true }
[features]
asset_base = []
crossmint = []
default = []
default = ["asset_base"]
library = []
8 changes: 4 additions & 4 deletions contracts/asset/src/contracts/asset_base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use crate::{
CONTRACT_NAME, CONTRACT_VERSION,
error::ContractResult,
msg::{AssetExtensionExecuteMsg, ExecuteMsg, InstantiateMsg},
traits::{AssetContract, DefaultAssetContract},
traits::DefaultAssetContract,
};
use cosmwasm_std::{Binary, Deps, DepsMut, Env, MessageInfo, Response, StdResult};
use cw721::{
Expand All @@ -31,7 +31,7 @@ pub fn instantiate(
) -> ContractResult<Response> {
use crate::error::ContractError;

let contract: AssetBaseContract<'static> = AssetContract::default();
let contract: AssetBaseContract<'static> = DefaultAssetContract::default();

let response = contract
.instantiate_with_version(deps, &env, &info, msg, CONTRACT_NAME, CONTRACT_VERSION)
Expand All @@ -52,7 +52,7 @@ pub fn execute(
AssetExtensionExecuteMsg,
>,
) -> ContractResult<Response> {
let contract: AssetBaseContract<'static> = AssetContract::default();
let contract: AssetBaseContract<'static> = DefaultAssetContract::default();

contract
.execute_pluggable(deps, &env, &info, msg)
Expand All @@ -74,7 +74,7 @@ pub fn query(

use crate::error::ContractError;

let contract: AssetBaseContract<'static> = AssetContract::default();
let contract: AssetBaseContract<'static> = DefaultAssetContract::default();

contract
.query(deps, &env, msg)
Expand Down
8 changes: 5 additions & 3 deletions contracts/asset/src/default_plugins.rs
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,11 @@ pub fn allowed_currencies_plugin(
if let Some(min_price) = &ctx.data.min_price
&& !allowed_set.contains(min_price.denom.as_str())
{
return Err(cosmwasm_std::StdError::generic_err(
"minimum price currency is not allowed",
));
{
return Err(cosmwasm_std::StdError::generic_err(
"minimum price currency is not allowed",
));
}
}

for coin in &ctx.info.funds {
Expand Down
Loading