From bf73e8252847521dbcaea387beb04462cc04638f Mon Sep 17 00:00:00 2001 From: Tasio Victoria Date: Fri, 10 May 2024 11:57:25 -0400 Subject: [PATCH] Adjust royalty registry version --- Cargo.lock | 137 ++++++------------- contracts/stargaze-marketplace-v2/Cargo.toml | 2 +- 2 files changed, 44 insertions(+), 95 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ee76a264..a1f77a0a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -59,7 +59,7 @@ dependencies = [ "cw2 0.16.0", "schemars", "serde", - "sg-std 2.4.0", + "sg-std", "sg1", "sg2", "thiserror", @@ -81,12 +81,12 @@ dependencies = [ "cw721-base 0.16.0", "schemars", "serde", - "sg-std 2.4.0", + "sg-std", "sg1", "sg2", "sg4", - "sg721 2.4.0", - "sg721-base 2.4.0", + "sg721", + "sg721-base", "thiserror", "url", ] @@ -1571,7 +1571,7 @@ dependencies = [ "cw-utils 0.16.0", "schemars", "serde", - "sg-std 2.4.0", + "sg-std", "thiserror", ] @@ -1591,7 +1591,7 @@ dependencies = [ "rust_decimal", "schemars", "serde", - "sg-std 2.4.0", + "sg-std", "sg-whitelist", "sg1", "sha2 0.10.8", @@ -1633,11 +1633,11 @@ dependencies = [ "serde", "sg-controllers", "sg-multi-test", - "sg-std 2.4.0", + "sg-std", "sg1", "sg2", - "sg721 2.4.0", - "sg721-base 2.4.0", + "sg721", + "sg721-base", "test-suite", "thiserror", "vending-factory", @@ -1661,10 +1661,10 @@ dependencies = [ "cw721-base 0.16.0", "schemars", "serde", - "sg-std 2.4.0", + "sg-std", "sg1", - "sg721 2.4.0", - "sg721-base 2.4.0", + "sg721", + "sg721-base", "stargaze-fair-burn", "thiserror", ] @@ -1697,7 +1697,7 @@ dependencies = [ "cw-multi-test 0.16.5", "schemars", "serde", - "sg-std 2.4.0", + "sg-std", ] [[package]] @@ -1716,7 +1716,7 @@ dependencies = [ "schemars", "serde", "sg-controllers", - "sg-std 2.4.0", + "sg-std", "thiserror", ] @@ -1735,21 +1735,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "sg-std" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4db53aebc2b4f981dc20a51213544adde8beaace6880345627f4babe2e1bc3ab" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-utils 1.0.3", - "cw721 0.18.0", - "schemars", - "serde", - "thiserror", -] - [[package]] name = "sg-whitelist" version = "2.4.0" @@ -1764,7 +1749,7 @@ dependencies = [ "rust_decimal", "schemars", "serde", - "sg-std 2.4.0", + "sg-std", "sg1", "thiserror", ] @@ -1778,7 +1763,7 @@ dependencies = [ "cosmwasm-std", "cw-utils 0.16.0", "serde", - "sg-std 2.4.0", + "sg-std", "thiserror", ] @@ -1794,7 +1779,7 @@ dependencies = [ "cw-utils 0.16.0", "schemars", "serde", - "sg721 2.4.0", + "sg721", "thiserror", ] @@ -1825,21 +1810,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "sg721" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df55ff0763ceaf9feeb6e9007873e35d4969f3944070f8f6a4a88ff89796d565" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-ownable", - "cw-utils 1.0.3", - "cw721-base 0.18.0", - "serde", - "thiserror", -] - [[package]] name = "sg721-base" version = "2.4.0" @@ -1854,29 +1824,8 @@ dependencies = [ "cw721 0.16.0", "cw721-base 0.16.0", "serde", - "sg-std 2.4.0", - "sg721 2.4.0", - "thiserror", - "url", -] - -[[package]] -name = "sg721-base" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17a8e1c5d6ce97567118ba4413e5c42e5f6d0624e19fd23480e88171c36a9172" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-ownable", - "cw-storage-plus 1.2.0", - "cw-utils 1.0.3", - "cw2 1.1.2", - "cw721 0.18.0", - "cw721-base 0.18.0", - "serde", - "sg-std 3.2.0", - "sg721 3.12.0", + "sg-std", + "sg721", "thiserror", "url", ] @@ -1895,9 +1844,9 @@ dependencies = [ "cw721-base 0.16.0", "schemars", "serde", - "sg-std 2.4.0", - "sg721 2.4.0", - "sg721-base 2.4.0", + "sg-std", + "sg721", + "sg721-base", ] [[package]] @@ -1916,10 +1865,10 @@ dependencies = [ "schemars", "semver", "serde", - "sg-std 2.4.0", + "sg-std", "sg1", - "sg721 2.4.0", - "sg721-base 2.4.0", + "sg721", + "sg721-base", "thiserror", ] @@ -2027,7 +1976,7 @@ dependencies = [ "cw2 0.16.0", "schemars", "serde", - "sg-std 2.4.0", + "sg-std", "thiserror", ] @@ -2074,11 +2023,11 @@ dependencies = [ "serde", "sg-marketplace-common 1.1.0", "sg-multi-test", - "sg-std 2.4.0", + "sg-std", "sg1", "sg2", - "sg721 2.4.0", - "sg721-base 2.4.0", + "sg721", + "sg721-base", "stargaze-fair-burn", "test-suite", "thiserror", @@ -2099,16 +2048,16 @@ dependencies = [ "schemars", "serde", "sg-index-query", - "sg-std 2.4.0", - "sg721 2.4.0", - "sg721-base 2.4.0", + "sg-std", + "sg721", + "sg721-base", "thiserror", ] [[package]] name = "stargaze-royalty-registry" version = "0.4.0" -source = "git+https://github.com/public-awesome/core.git?rev=d41ce961481322557313635a863991cb4856a261#d41ce961481322557313635a863991cb4856a261" +source = "git+https://github.com/public-awesome/core.git?rev=1b154821c6d3fe33573a673f33129765e55ce281#1b154821c6d3fe33573a673f33129765e55ce281" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -2119,8 +2068,8 @@ dependencies = [ "semver", "serde", "sg-index-query", - "sg721 3.12.0", - "sg721-base 3.12.0", + "sg721", + "sg721-base", "thiserror", ] @@ -2202,11 +2151,11 @@ dependencies = [ "sg-eth-airdrop", "sg-multi-test", "sg-splits", - "sg-std 2.4.0", + "sg-std", "sg-whitelist", "sg2", - "sg721 2.4.0", - "sg721-base 2.4.0", + "sg721", + "sg721-base", "sg721-nt", "sg721-updatable", "vending-factory", @@ -2324,10 +2273,10 @@ dependencies = [ "cw2 0.16.0", "schemars", "serde", - "sg-std 2.4.0", + "sg-std", "sg1", "sg2", - "sg721 2.4.0", + "sg721", "thiserror", ] @@ -2349,12 +2298,12 @@ dependencies = [ "schemars", "semver", "serde", - "sg-std 2.4.0", + "sg-std", "sg-whitelist", "sg1", "sg2", "sg4", - "sg721 2.4.0", + "sg721", "sha2 0.10.8", "shuffle", "thiserror", @@ -2388,7 +2337,7 @@ dependencies = [ "cw2 0.16.0", "schemars", "serde", - "sg-std 2.4.0", + "sg-std", "sg-whitelist", "thiserror", ] diff --git a/contracts/stargaze-marketplace-v2/Cargo.toml b/contracts/stargaze-marketplace-v2/Cargo.toml index 77bd139a..be6f19e6 100644 --- a/contracts/stargaze-marketplace-v2/Cargo.toml +++ b/contracts/stargaze-marketplace-v2/Cargo.toml @@ -47,7 +47,7 @@ sha3 = "0.10" [dev-dependencies] cw-multi-test = "0.20.0" cw721-base = { version = "0.18.0", features = ["library"] } -stargaze-royalty-registry = { git = "https://github.com/public-awesome/core.git", rev = "d41ce961481322557313635a863991cb4856a261", package = "stargaze-royalty-registry", features = [ +stargaze-royalty-registry = { git = "https://github.com/public-awesome/core.git", rev = "1b154821c6d3fe33573a673f33129765e55ce281", package = "stargaze-royalty-registry", features = [ "library", ] } cute = "0.3.0"