diff --git a/Cargo.lock b/Cargo.lock index 3975258..8d7c34a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1888,7 +1888,6 @@ dependencies = [ "semver", "serde", "sg-index-query 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "sg-std 2.4.0", "sg2", "sg721 3.7.0", "sg721-base 3.7.0", diff --git a/Cargo.toml b/Cargo.toml index 7234fa4..a2654ce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,53 +9,6 @@ homepage = "https://stargaze.zone" repository = "https://github.com/public-awesome/core" license = "Apache-2.0" -[workspace.dependencies] -stargaze-fair-burn = { path = "contracts/fair-burn", features = ["library"] } -stargaze-royalty-registry = { path = "contracts/royalty-registry", features = [ - "library", -] } - -vending-factory = { version = "2.1.0", features = ["library"] } -vending-minter = { version = "2.1.0", features = ["library"] } -base-minter = { version = "2.1.0", features = ["library"] } -base-factory = { version = "2.1.0", features = ["library"] } -sg721-base = { version = "2.1.0", features = ["library"] } -sg721 = { version = "2.1.0", features = ["library"] } - -sg-index-query = { path = "packages/sg-index-query" } -sg-std = "2.1.0" -sg-marketplace-common = { version = "1.1.0" } -sg2 = "2.1.0" - -cosmwasm-schema = "1.3.1" -cosmwasm-std = "1.3.1" -cosmwasm-storage = "1.3.1" -cw-storage-macro = "1.1.0" -cw-storage-plus = "1.1.0" -cw-controllers = "1.1.0" -cw2 = "1.1.0" -cw721 = "0.18.0" -cw721-base = "0.18.0" -cw-utils = "1.0.1" -schemars = "0.8.11" -semver = "1.0.16" -serde = { version = "1.0.145", default-features = false, features = ["derive"] } -thiserror = "1.0.31" -anyhow = "1.0.41" - -# dev-dependencies -cw-multi-test = "0.16.5" -sg-multi-test = "2.1.0" -assert_matches = "1.5" -serde_json = "1.0" -env_logger = "0.9.0" -test-context = "0.1.4" -once_cell = "1.13.0" -rand = "0.8" -itertools = "0.10.5" -mockall = "0.11.4" -test-suite = "2.1.0" - [profile.release] rpath = false lto = true diff --git a/contracts/royalty-registry/Cargo.toml b/contracts/royalty-registry/Cargo.toml index 21c4464..4a65330 100644 --- a/contracts/royalty-registry/Cargo.toml +++ b/contracts/royalty-registry/Cargo.toml @@ -47,7 +47,6 @@ thiserror = "1.0.56" [dev-dependencies] cw-multi-test = "0.20.0" -sg-std = "2.1.0" sg2 = { git = "https://github.com/public-awesome/launchpad.git", rev = "897d3ab057d381c1654c7246f3972ddd9f9238ce", package = "sg2" } test-suite = { git = "https://github.com/public-awesome/launchpad.git", rev = "897d3ab057d381c1654c7246f3972ddd9f9238ce", package = "test-suite" } vending-factory = { git = "https://github.com/public-awesome/launchpad.git", rev = "897d3ab057d381c1654c7246f3972ddd9f9238ce", package = "vending-factory" } diff --git a/contracts/royalty-registry/src/tests/setup/setup_accounts.rs b/contracts/royalty-registry/src/tests/setup/setup_accounts.rs index 69e359d..bbee849 100644 --- a/contracts/royalty-registry/src/tests/setup/setup_accounts.rs +++ b/contracts/royalty-registry/src/tests/setup/setup_accounts.rs @@ -1,9 +1,12 @@ use cosmwasm_std::{coins, Addr, Coin, StdResult}; use cw_multi_test::SudoMsg as CwSudoMsg; use cw_multi_test::{BankSudo, SudoMsg}; -use sg_std::NATIVE_DENOM; use test_suite::common_setup::contract_boxes::App; +pub const NATIVE_DENOM: &str = "ustars"; +// 3/11/2022 16:00:00 ET +pub const GENESIS_MINT_START_TIME: u64 = 1647032400000000000; + // all amounts in ustars pub const INITIAL_BALANCE: u128 = 5_000_000_000; pub const _MINT_PRICE: u128 = 100_000_000; diff --git a/contracts/royalty-registry/src/tests/setup/setup_minter.rs b/contracts/royalty-registry/src/tests/setup/setup_minter.rs index 235bfaa..8d4260c 100644 --- a/contracts/royalty-registry/src/tests/setup/setup_minter.rs +++ b/contracts/royalty-registry/src/tests/setup/setup_minter.rs @@ -1,8 +1,7 @@ -use crate::tests::setup::setup_accounts::setup_accounts; +use crate::tests::setup::setup_accounts::{setup_accounts, GENESIS_MINT_START_TIME}; use cosmwasm_std::{Addr, Timestamp}; use sg2::tests::mock_collection_params_1; -use sg_std::GENESIS_MINT_START_TIME; use test_suite::common_setup::{ contract_boxes::custom_mock_app, msg::{MinterCollectionResponse, MinterTemplateResponse}, diff --git a/contracts/royalty-registry/src/tests/unit_tests/execute_tests.rs b/contracts/royalty-registry/src/tests/unit_tests/execute_tests.rs index 58a185a..d82e094 100644 --- a/contracts/royalty-registry/src/tests/unit_tests/execute_tests.rs +++ b/contracts/royalty-registry/src/tests/unit_tests/execute_tests.rs @@ -1,19 +1,19 @@ use crate::{ msg::{ExecuteMsg, InstantiateMsg, QueryMsg}, - state::Config, - state::{RoyaltyDefault, RoyaltyEntry, RoyaltyProtocol}, - tests::helpers::utils::assert_error, - tests::setup::{ - setup_accounts::setup_accounts, - setup_contracts::{contract_royalty_registry, setup_royalty_registry}, - setup_minter::standard_minter_template, + state::{Config, RoyaltyDefault, RoyaltyEntry, RoyaltyProtocol}, + tests::{ + helpers::utils::assert_error, + setup::{ + setup_accounts::{setup_accounts, GENESIS_MINT_START_TIME}, + setup_contracts::{contract_royalty_registry, setup_royalty_registry}, + setup_minter::standard_minter_template, + }, }, ContractError, }; use cosmwasm_std::{Addr, Decimal}; use cw_multi_test::Executor; -use sg_std::GENESIS_MINT_START_TIME; use test_suite::common_setup::{ contract_boxes::custom_mock_app, setup_accounts_and_block::setup_block_time, }; diff --git a/packages/sg-index-query/Cargo.toml b/packages/sg-index-query/Cargo.toml index 6267c13..40e9e8b 100644 --- a/packages/sg-index-query/Cargo.toml +++ b/packages/sg-index-query/Cargo.toml @@ -26,8 +26,8 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -cosmwasm-schema = { workspace = true } -cosmwasm-std = { workspace = true } -cw-storage-plus = { workspace = true } +cosmwasm-schema = "1.3.1" +cosmwasm-std = "1.3.1" +cw-storage-plus = "1.1.0" [dev-dependencies] diff --git a/packages/sg-multi-test/Cargo.toml b/packages/sg-multi-test/Cargo.toml index ffea91d..cf72a76 100644 --- a/packages/sg-multi-test/Cargo.toml +++ b/packages/sg-multi-test/Cargo.toml @@ -9,9 +9,9 @@ repository = { workspace = true } license = { workspace = true } [dependencies] -anyhow = { workspace = true } -cosmwasm-std = { workspace = true } -cw-multi-test = { workspace = true } -schemars = { workspace = true } -serde = { workspace = true } -sg-std = { workspace = true } +anyhow = "1.0.41" +cosmwasm-std = "1.3.1" +cw-multi-test = "0.16.5" +schemars = "0.8.11" +serde = { version = "1.0.145", default-features = false, features = ["derive"] } +sg-std = "2.1.0" diff --git a/packages/sg-std/Cargo.toml b/packages/sg-std/Cargo.toml index 3102675..bb27849 100644 --- a/packages/sg-std/Cargo.toml +++ b/packages/sg-std/Cargo.toml @@ -17,8 +17,8 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -cosmwasm-schema = { workspace = true } -cosmwasm-std = { workspace = true } -schemars = { workspace = true } -serde = { workspace = true } -thiserror = { workspace = true } +cosmwasm-schema = "1.3.1" +cosmwasm-std = "1.3.1" +schemars = "0.8.11" +serde = { version = "1.0.145", default-features = false, features = ["derive"] } +thiserror = "1.0.31" diff --git a/packages/sg-std/examples/schema.rs b/packages/sg-std/examples/schema.rs index f70a354..c0d40d8 100644 --- a/packages/sg-std/examples/schema.rs +++ b/packages/sg-std/examples/schema.rs @@ -1,9 +1,8 @@ +use cosmwasm_schema::{export_schema, remove_schemas, schema_for}; +use sg_std::{StargazeMsg, StargazeMsgWrapper}; use std::env::current_dir; use std::fs::create_dir_all; -use cosmwasm_schema::{export_schema, remove_schemas, schema_for}; - -use sg_std::{StargazeMsg, StargazeMsgWrapper}; fn main() { let mut out_dir = current_dir().unwrap(); out_dir.push("schema");