From 26d8eb2e60c9ea1f5907605dfe9f005e227d5029 Mon Sep 17 00:00:00 2001 From: Shane Vitarana Date: Tue, 25 Oct 2022 11:49:56 -0400 Subject: [PATCH 1/8] Update versions --- Cargo.lock | 462 ++++++++++++++++++-------------- Cargo.toml | 18 +- packages/controllers/Cargo.toml | 2 +- 3 files changed, 276 insertions(+), 206 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f52cacb2c..8153bac46 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,63 +23,63 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base-factory" version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8064923cf6b6675628f83ecf30f32ca22c65654dcbdae7e36e871dca50b1a88" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-multi-test", - "cw-storage-plus", - "cw-utils", - "cw2", + "cw-storage-plus 0.15.1", + "cw-utils 0.15.1", + "cw2 0.15.1", "schemars", "serde", - "sg-multi-test 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg-std 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg1 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg2 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.20.0", + "sg1 0.20.0", + "sg2 0.20.0", "thiserror", ] [[package]] name = "base-factory" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8064923cf6b6675628f83ecf30f32ca22c65654dcbdae7e36e871dca50b1a88" +version = "0.21.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus", - "cw-utils", - "cw2", + "cw-multi-test 0.16.0", + "cw-storage-plus 0.16.0", + "cw-utils 0.16.0", + "cw2 0.16.0", "schemars", "serde", - "sg-std 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg1 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg2 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-multi-test 0.20.0", + "sg-std 0.20.0", + "sg1 0.20.0", + "sg2 0.20.0", "thiserror", ] [[package]] name = "base-minter" -version = "0.20.0" +version = "0.21.0" dependencies = [ - "base-factory 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "base-factory 0.20.0", "cosmwasm-schema", "cosmwasm-std", - "cw-multi-test", - "cw-storage-plus", - "cw-utils", - "cw2", + "cw-multi-test 0.16.0", + "cw-storage-plus 0.16.0", + "cw-utils 0.16.0", + "cw2 0.16.0", "cw721", "cw721-base", "schemars", "serde", - "sg-multi-test 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg-std 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg1 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg2 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg4 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg721 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg721-base 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-multi-test 0.20.0", + "sg-std 0.20.0", + "sg1 0.20.0", + "sg2 0.20.0", + "sg4 0.20.0", + "sg721 0.20.0", + "sg721-base 0.20.0", "sg721-nt", "thiserror", "url", @@ -163,9 +163,9 @@ checksum = "722e23542a15cea1f65d4a1419c4cfd7a26706c70871a13a04238ca3f40f1661" [[package]] name = "cosmwasm-crypto" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce1c26e5595c6a960cd3d6dc1d8629e16a2b0cb22ecd653b28bbf292d7c53a3c" +checksum = "28376836c7677e1ea6d6656a754582e88b91e544ce22fae42956d5fe5549a958" dependencies = [ "digest 0.10.5", "ed25519-zebra", @@ -176,18 +176,18 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a24050753f242554c558dfe7a6b3a456850f2bc6fcf8b518988720e40a5fa21" +checksum = "8eb69f4f7a8a4bce68c8fbd3646238fede1e77056e4ea31c5b6bfc37b709eec3" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce6fe57b9e59a87a406b825cbe647f6456e1a853f8d4c99bffcc20957fd29d6" +checksum = "a227cfeb9a7152b26a354b1c990e930e962f75fd68f57ab5ae2ef888c8524292" dependencies = [ "cosmwasm-schema-derive", "schemars", @@ -198,9 +198,9 @@ dependencies = [ [[package]] name = "cosmwasm-schema-derive" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62e8cfc90b557a8ed272c9daf0ff3634e6b9f4698a19832bba6a4c7baa46da04" +checksum = "3626cb42eef870de67f791e873711255325224d86f281bf628c42abd295f3a14" dependencies = [ "proc-macro2", "quote", @@ -209,9 +209,9 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78e50ba8bfea2e449be2e7fa96fd8b196d09fb5ef34e27a18f28835ed835b199" +checksum = "46bf9157d060abbc55152aeadcace799d03dc630575daa66604079a1206cb060" dependencies = [ "base64", "cosmwasm-crypto", @@ -288,14 +288,14 @@ dependencies = [ [[package]] name = "cw-controllers" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b3ababe9f0a473c2d878b7c973eee08e05e5d768253fbb08d475daeadba503" +checksum = "24bd6738c3fd59c87d2f84911c1cad1e4f2d1c58ecaa6e52549b4f78f4ed6f07" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus", - "cw-utils", + "cw-storage-plus 0.16.0", + "cw-utils 0.16.0", "schemars", "serde", "thiserror", @@ -310,8 +310,26 @@ dependencies = [ "anyhow", "cosmwasm-std", "cosmwasm-storage", - "cw-storage-plus", - "cw-utils", + "cw-storage-plus 0.15.1", + "cw-utils 0.15.1", + "derivative", + "itertools", + "prost", + "schemars", + "serde", + "thiserror", +] + +[[package]] +name = "cw-multi-test" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7192aec80d0c01a0e5941392eea7e2b7e212ee74ca7f430bfdc899420c055ef6" +dependencies = [ + "anyhow", + "cosmwasm-std", + "cw-storage-plus 0.16.0", + "cw-utils 0.16.0", "derivative", "itertools", "prost", @@ -331,6 +349,17 @@ dependencies = [ "serde", ] +[[package]] +name = "cw-storage-plus" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b6f91c0b94481a3e9ef1ceb183c37d00764f8751e39b45fc09f4d9b970d469" +dependencies = [ + "cosmwasm-std", + "schemars", + "serde", +] + [[package]] name = "cw-utils" version = "0.15.1" @@ -339,7 +368,22 @@ checksum = "0ae0b69fa7679de78825b4edeeec045066aa2b2c4b6e063d80042e565bb4da5c" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw2", + "cw2 0.15.1", + "schemars", + "semver", + "serde", + "thiserror", +] + +[[package]] +name = "cw-utils" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6a84c6c1c0acc3616398eba50783934bd6c964bad6974241eaee3460c8f5b26" +dependencies = [ + "cosmwasm-schema", + "cosmwasm-std", + "cw2 0.16.0", "schemars", "semver", "serde", @@ -354,7 +398,20 @@ checksum = "5abb8ecea72e09afff830252963cb60faf945ce6cef2c20a43814516082653da" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus", + "cw-storage-plus 0.15.1", + "schemars", + "serde", +] + +[[package]] +name = "cw2" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91398113b806f4d2a8d5f8d05684704a20ffd5968bf87e3473e1973710b884ad" +dependencies = [ + "cosmwasm-schema", + "cosmwasm-std", + "cw-storage-plus 0.16.0", "schemars", "serde", ] @@ -367,24 +424,37 @@ checksum = "5dfbc9e431223e3fa64ddc98f3e6d20db015a933d4f76da3721ec093d5f113ea" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus", + "cw-storage-plus 0.15.1", + "schemars", + "serde", +] + +[[package]] +name = "cw4" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86a93c2764ddb44038b948d9a9a8aadc9f92f5ef3e61249af2fad16091e43412" +dependencies = [ + "cosmwasm-schema", + "cosmwasm-std", + "cw-storage-plus 0.16.0", "schemars", "serde", ] [[package]] name = "cw4-group" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "811087a9180b248a9f1a8c10a91f128a020e22bdf51603672399a2b956efdde5" +checksum = "dba1d15bff40b97bde05f36a0d44ac3369a085a4bda6c4673e33a9359513fdd2" dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-controllers", - "cw-storage-plus", - "cw-utils", - "cw2", - "cw4", + "cw-storage-plus 0.16.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw4 0.16.0", "schemars", "serde", "thiserror", @@ -398,7 +468,7 @@ checksum = "20dfe04f86e5327956b559ffcc86d9a43167391f37402afd8bf40b0be16bee4d" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-utils", + "cw-utils 0.15.1", "schemars", "serde", ] @@ -411,9 +481,9 @@ checksum = "62c3ee3b669fc2a8094301a73fd7be97a7454d4df2650c33599f737e8f254d24" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus", - "cw-utils", - "cw2", + "cw-storage-plus 0.15.1", + "cw-utils 0.15.1", + "cw2 0.15.1", "cw721", "schemars", "serde", @@ -885,21 +955,23 @@ dependencies = [ [[package]] name = "sg-controllers" -version = "0.20.0" +version = "0.21.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus", - "cw-utils", + "cw-storage-plus 0.16.0", + "cw-utils 0.16.0", "schemars", "serde", - "sg-std 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.20.0", "thiserror", ] [[package]] name = "sg-metadata" version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b3de91d20f0273051fdba51292a2882f4ec92adc0b11fa4653d321130dc316b" dependencies = [ "cosmwasm-schema", "schemars", @@ -908,9 +980,7 @@ dependencies = [ [[package]] name = "sg-metadata" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3de91d20f0273051fdba51292a2882f4ec92adc0b11fa4653d321130dc316b" +version = "0.21.0" dependencies = [ "cosmwasm-schema", "schemars", @@ -920,71 +990,73 @@ dependencies = [ [[package]] name = "sg-multi-test" version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "405639103cd4da88e102ccf6e3491b889faeb913ef81c8d0f569c5e511f2ae18" dependencies = [ "anyhow", "cosmwasm-std", - "cw-multi-test", + "cw-multi-test 0.15.1", "schemars", "serde", - "sg-std 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.20.0", ] [[package]] name = "sg-multi-test" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "405639103cd4da88e102ccf6e3491b889faeb913ef81c8d0f569c5e511f2ae18" +version = "0.21.0" dependencies = [ "anyhow", "cosmwasm-std", - "cw-multi-test", + "cw-multi-test 0.16.0", "schemars", "serde", - "sg-std 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.20.0", ] [[package]] name = "sg-splits" version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5d3803eb3860056f77a651cb94e3439721e240ab5a018728d93ca7e1e16e896" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-multi-test", - "cw-storage-plus", - "cw2", - "cw4", - "cw4-group", + "cw-storage-plus 0.15.1", + "cw2 0.15.1", + "cw4 0.15.1", "schemars", "serde", - "sg-multi-test 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg-std 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.20.0", "thiserror", ] [[package]] name = "sg-splits" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d3803eb3860056f77a651cb94e3439721e240ab5a018728d93ca7e1e16e896" +version = "0.21.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus", - "cw2", - "cw4", + "cw-multi-test 0.16.0", + "cw-storage-plus 0.16.0", + "cw2 0.16.0", + "cw4 0.16.0", + "cw4-group", "schemars", "serde", - "sg-std 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-multi-test 0.20.0", + "sg-std 0.20.0", "thiserror", ] [[package]] name = "sg-std" version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e79e1fd5120014c1967533df1624996ab862887cec7be51437d08641c6198feb" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-utils", + "cw-utils 0.15.1", "cw721", "schemars", "serde", @@ -993,13 +1065,11 @@ dependencies = [ [[package]] name = "sg-std" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79e1fd5120014c1967533df1624996ab862887cec7be51437d08641c6198feb" +version = "0.21.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-utils", + "cw-utils 0.16.0", "cw721", "schemars", "serde", @@ -1008,7 +1078,7 @@ dependencies = [ [[package]] name = "sg-utils" -version = "0.20.0" +version = "0.21.0" dependencies = [ "bech32", "cosmwasm-std", @@ -1017,94 +1087,96 @@ dependencies = [ [[package]] name = "sg-whitelist" version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14a29f194c4df98a7f773fbb6436f06838493766c04ec8637e1c763c0c7d0ee0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus", - "cw-utils", - "cw2", + "cw-storage-plus 0.15.1", + "cw-utils 0.15.1", + "cw2 0.15.1", "rust_decimal", "schemars", "serde", - "sg-std 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg1 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.20.0", + "sg1 0.20.0", "thiserror", ] [[package]] name = "sg-whitelist" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a29f194c4df98a7f773fbb6436f06838493766c04ec8637e1c763c0c7d0ee0" +version = "0.21.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus", - "cw-utils", - "cw2", + "cw-storage-plus 0.16.0", + "cw-utils 0.16.0", + "cw2 0.16.0", "rust_decimal", "schemars", "serde", - "sg-std 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg1 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.20.0", + "sg1 0.20.0", "thiserror", ] [[package]] name = "sg1" version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bbf02f2371fced3176e878469ab952d1aa9dd3c50d0dc63e10b0e9d54dffab9" dependencies = [ "cosmwasm-std", - "cw-utils", + "cw-utils 0.15.1", "serde", - "sg-std 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.20.0", "thiserror", ] [[package]] name = "sg1" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbf02f2371fced3176e878469ab952d1aa9dd3c50d0dc63e10b0e9d54dffab9" +version = "0.21.0" dependencies = [ "cosmwasm-std", - "cw-utils", + "cw-utils 0.16.0", "serde", - "sg-std 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.20.0", "thiserror", ] [[package]] name = "sg2" version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3560bb3ecaeb529ae98101171561c2ed044c82693f25051c1e1a5cbe91fc5aef" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-utils", + "cw-utils 0.15.1", "schemars", "serde", - "sg721 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg721 0.20.0", "thiserror", ] [[package]] name = "sg2" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3560bb3ecaeb529ae98101171561c2ed044c82693f25051c1e1a5cbe91fc5aef" +version = "0.21.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-utils", + "cw-utils 0.16.0", "schemars", "serde", - "sg721 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg721 0.20.0", "thiserror", ] [[package]] name = "sg4" version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67fb1f2505004a4151f0bafed18499797050826b3c1e8592cf0cb0d1bcb1bf09" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1115,9 +1187,7 @@ dependencies = [ [[package]] name = "sg4" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fb1f2505004a4151f0bafed18499797050826b3c1e8592cf0cb0d1bcb1bf09" +version = "0.21.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1129,11 +1199,12 @@ dependencies = [ [[package]] name = "sg721" version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c3f6ca205ca8bd8b2a69008cc027a4acc13eca1ea16b798f80991434735fdc6" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-multi-test", - "cw-utils", + "cw-utils 0.15.1", "cw721-base", "serde", "thiserror", @@ -1141,13 +1212,12 @@ dependencies = [ [[package]] name = "sg721" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3f6ca205ca8bd8b2a69008cc027a4acc13eca1ea16b798f80991434735fdc6" +version = "0.21.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-utils", + "cw-multi-test 0.16.0", + "cw-utils 0.16.0", "cw721-base", "serde", "thiserror", @@ -1156,78 +1226,78 @@ dependencies = [ [[package]] name = "sg721-base" version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abe35a369a36e51f7be30d7104729063006ce0328dc0d9ae4eeaa4fc8a590c27" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-multi-test", - "cw-storage-plus", - "cw-utils", - "cw2", + "cw-storage-plus 0.15.1", + "cw-utils 0.15.1", + "cw2 0.15.1", "cw721", "cw721-base", "serde", - "sg-multi-test 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg-std 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg2 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg721 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.20.0", + "sg721 0.20.0", "thiserror", "url", - "vending-factory 0.20.0", - "vending-minter", ] [[package]] name = "sg721-base" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe35a369a36e51f7be30d7104729063006ce0328dc0d9ae4eeaa4fc8a590c27" +version = "0.21.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus", - "cw-utils", - "cw2", + "cw-multi-test 0.16.0", + "cw-storage-plus 0.16.0", + "cw-utils 0.16.0", + "cw2 0.16.0", "cw721", "cw721-base", "serde", - "sg-std 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg721 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-multi-test 0.20.0", + "sg-std 0.20.0", + "sg2 0.20.0", + "sg721 0.20.0", "thiserror", "url", + "vending-factory 0.21.0", + "vending-minter", ] [[package]] name = "sg721-metadata-onchain" -version = "0.20.0" +version = "0.21.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw2", + "cw2 0.16.0", "cw721", "cw721-base", "schemars", "serde", - "sg-metadata 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg-std 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg721 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg721-base 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-metadata 0.20.0", + "sg-std 0.20.0", + "sg721 0.20.0", + "sg721-base 0.20.0", ] [[package]] name = "sg721-nt" -version = "0.20.0" +version = "0.21.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-utils", - "cw2", + "cw-utils 0.16.0", + "cw2 0.16.0", "cw721", "cw721-base", "schemars", "serde", - "sg-std 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg721 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg721-base 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.20.0", + "sg721 0.20.0", + "sg721-base 0.20.0", ] [[package]] @@ -1394,56 +1464,56 @@ dependencies = [ [[package]] name = "vending-factory" version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d619b5979bbf219a6c549879fe8a3e7742b12e8347eb8b92ad9b64a48b32e97" dependencies = [ - "base-factory 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "base-factory 0.20.0", "cosmwasm-schema", "cosmwasm-std", - "cw-multi-test", - "cw-storage-plus", - "cw-utils", - "cw2", + "cw-storage-plus 0.15.1", + "cw-utils 0.15.1", + "cw2 0.15.1", "schemars", "serde", - "sg-multi-test 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg-std 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg1 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg2 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg721 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.20.0", + "sg1 0.20.0", + "sg2 0.20.0", + "sg721 0.20.0", "thiserror", ] [[package]] name = "vending-factory" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d619b5979bbf219a6c549879fe8a3e7742b12e8347eb8b92ad9b64a48b32e97" +version = "0.21.0" dependencies = [ - "base-factory 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "base-factory 0.20.0", "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus", - "cw-utils", - "cw2", + "cw-multi-test 0.16.0", + "cw-storage-plus 0.16.0", + "cw-utils 0.16.0", + "cw2 0.16.0", "schemars", "serde", - "sg-std 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg1 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg2 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg721 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-multi-test 0.20.0", + "sg-std 0.20.0", + "sg1 0.20.0", + "sg2 0.20.0", + "sg721 0.20.0", "thiserror", ] [[package]] name = "vending-minter" -version = "0.20.0" +version = "0.21.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-multi-test", - "cw-storage-plus", - "cw-utils", - "cw2", - "cw4", + "cw-multi-test 0.16.0", + "cw-storage-plus 0.16.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw4 0.16.0", "cw4-group", "cw721", "cw721-base", @@ -1451,20 +1521,20 @@ dependencies = [ "rand_xoshiro", "schemars", "serde", - "sg-multi-test 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg-splits 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg-std 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg-whitelist 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg1 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg2 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg4 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg721 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg721-base 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-multi-test 0.20.0", + "sg-splits 0.20.0", + "sg-std 0.20.0", + "sg-whitelist 0.20.0", + "sg1 0.20.0", + "sg2 0.20.0", + "sg4 0.20.0", + "sg721 0.20.0", + "sg721-base 0.20.0", "sha2 0.10.6", "shuffle", "thiserror", "url", - "vending-factory 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "vending-factory 0.20.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index b972144e3..c99a52840 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["packages/*", "contracts/*"] resolver = "2" [workspace.package] -version = "0.20.0" +version = "0.21.0" edition = "2021" homepage = "https://stargaze.zone" repository = "https://github.com/public-awesome/launchpad" @@ -11,16 +11,16 @@ license = "Apache-2.0" [workspace.dependencies] base-factory = "0.20.0" -cosmwasm-schema = "1.1.0" -cosmwasm-std = "1.1.0" -cw2 = "0.15.0" -cw4 = "0.15.0" -cw4-group = "0.15.0" +cosmwasm-schema = "1.1.5" +cosmwasm-std = "1.1.5" +cw2 = "0.16.0" +cw4 = "0.16.0" +cw4-group = "0.16.0" cw721 = "0.15.0" cw721-base = "0.15.0" -cw-multi-test = "0.15.0" -cw-storage-plus = "0.15.0" -cw-utils = "0.15.0" +cw-multi-test = "0.16.0" +cw-storage-plus = "0.16.0" +cw-utils = "0.16.0" schemars = "0.8.8" serde = { version = "1.0.133", default-features = false, features = ["derive"] } sg1 = "0.20.0" diff --git a/packages/controllers/Cargo.toml b/packages/controllers/Cargo.toml index 36ec459fa..cb6eb4ae0 100644 --- a/packages/controllers/Cargo.toml +++ b/packages/controllers/Cargo.toml @@ -10,7 +10,7 @@ license = { workspace = true } [dependencies] cosmwasm-schema = { workspace = true } -cosmwasm-std = { version = "1.1.4" } +cosmwasm-std = { workspace = true } cw-storage-plus = { workspace = true } cw-utils = { workspace = true } schemars = { workspace = true } From 85ca26de8614e3cd90fa28a2003b4d919b83415f Mon Sep 17 00:00:00 2001 From: Shane Vitarana Date: Tue, 25 Oct 2022 12:03:37 -0400 Subject: [PATCH 2/8] Add publish script --- Makefile | 11 +++++++---- scripts/publish.sh | 7 +++++++ 2 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 scripts/publish.sh diff --git a/Makefile b/Makefile index 18e8d3f7e..6ac7056e9 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,18 @@ .PHONY: e2etest optimize -optimize: - sh scripts/optimize.sh +ci-sign: + drone sign public-awesome/launchpad --save e2etest: mkdir -p e2e/contracts cp artifacts/*.wasm e2e/contracts cd e2e && go test -v -ci-sign: - drone sign public-awesome/launchpad --save +optimize: + sh scripts/optimize.sh + +publish: + sh scripts/publish.sh schema: cd contracts/base-factory && cargo schema diff --git a/scripts/publish.sh b/scripts/publish.sh new file mode 100644 index 000000000..2384a9417 --- /dev/null +++ b/scripts/publish.sh @@ -0,0 +1,7 @@ +for d in packages/*; do + if [ -d "$d" ]; then + cd $d + cargo publish + cd ../.. + fi +done From 432a34fb21f8a183f759179fc884159b69e1d3b2 Mon Sep 17 00:00:00 2001 From: Shane Vitarana Date: Tue, 25 Oct 2022 12:05:50 -0400 Subject: [PATCH 3/8] Update schema script --- Makefile | 9 +-------- scripts/schema.sh | 9 +++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 scripts/schema.sh diff --git a/Makefile b/Makefile index 6ac7056e9..7483c0859 100644 --- a/Makefile +++ b/Makefile @@ -15,11 +15,4 @@ publish: sh scripts/publish.sh schema: - cd contracts/base-factory && cargo schema - cd contracts/base-minter && cargo schema - cd contracts/sg721-base && cargo schema - cd contracts/sg721-metadata-onchain && cargo schema - cd contracts/sg721-nt && cargo schema - cd contracts/vending-factory && cargo schema - cd contracts/vending-minter && cargo schema - cd ts && yarn codegen + sh scripts/schema.sh \ No newline at end of file diff --git a/scripts/schema.sh b/scripts/schema.sh new file mode 100644 index 000000000..f6c18a23f --- /dev/null +++ b/scripts/schema.sh @@ -0,0 +1,9 @@ +for d in contracts/*; do + if [ -d "$d" ]; then + cd $d + cargo schema + cd ../.. + fi +done + +cd ts && yarn codegen From 776b50f55d2abdb3b1dd9f300c951a268bf5d5c9 Mon Sep 17 00:00:00 2001 From: Shane Vitarana Date: Tue, 25 Oct 2022 12:12:53 -0400 Subject: [PATCH 4/8] Update versions --- Cargo.lock | 295 +++++++++++++++++------------------------------------ Cargo.toml | 24 ++--- 2 files changed, 105 insertions(+), 214 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8153bac46..39fb5aa72 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,41 +20,22 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "base-factory" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8064923cf6b6675628f83ecf30f32ca22c65654dcbdae7e36e871dca50b1a88" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-storage-plus 0.15.1", - "cw-utils 0.15.1", - "cw2 0.15.1", - "schemars", - "serde", - "sg-std 0.20.0", - "sg1 0.20.0", - "sg2 0.20.0", - "thiserror", -] - [[package]] name = "base-factory" version = "0.21.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-multi-test 0.16.0", + "cw-multi-test", "cw-storage-plus 0.16.0", "cw-utils 0.16.0", "cw2 0.16.0", "schemars", "serde", - "sg-multi-test 0.20.0", - "sg-std 0.20.0", - "sg1 0.20.0", - "sg2 0.20.0", + "sg-multi-test 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg1 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg2 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] @@ -62,10 +43,10 @@ dependencies = [ name = "base-minter" version = "0.21.0" dependencies = [ - "base-factory 0.20.0", + "base-factory", "cosmwasm-schema", "cosmwasm-std", - "cw-multi-test 0.16.0", + "cw-multi-test", "cw-storage-plus 0.16.0", "cw-utils 0.16.0", "cw2 0.16.0", @@ -73,13 +54,13 @@ dependencies = [ "cw721-base", "schemars", "serde", - "sg-multi-test 0.20.0", - "sg-std 0.20.0", - "sg1 0.20.0", - "sg2 0.20.0", - "sg4 0.20.0", - "sg721 0.20.0", - "sg721-base 0.20.0", + "sg-multi-test 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg1 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg2 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg4 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg721 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg721-base", "sg721-nt", "thiserror", "url", @@ -226,16 +207,6 @@ dependencies = [ "uint", ] -[[package]] -name = "cosmwasm-storage" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce135cec6c90df7115b0f5b2b40683dd41ac62999dfb002107f6a9f5c345374" -dependencies = [ - "cosmwasm-std", - "serde", -] - [[package]] name = "cpufeatures" version = "0.2.5" @@ -301,25 +272,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "cw-multi-test" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e81b4a7821d5eeba0d23f737c16027b39a600742ca8c32eb980895ffd270f4" -dependencies = [ - "anyhow", - "cosmwasm-std", - "cosmwasm-storage", - "cw-storage-plus 0.15.1", - "cw-utils 0.15.1", - "derivative", - "itertools", - "prost", - "schemars", - "serde", - "thiserror", -] - [[package]] name = "cw-multi-test" version = "0.16.0" @@ -416,19 +368,6 @@ dependencies = [ "serde", ] -[[package]] -name = "cw4" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbc9e431223e3fa64ddc98f3e6d20db015a933d4f76da3721ec093d5f113ea" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-storage-plus 0.15.1", - "schemars", - "serde", -] - [[package]] name = "cw4" version = "0.16.0" @@ -454,7 +393,7 @@ dependencies = [ "cw-storage-plus 0.16.0", "cw-utils 0.16.0", "cw2 0.16.0", - "cw4 0.16.0", + "cw4", "schemars", "serde", "thiserror", @@ -963,15 +902,13 @@ dependencies = [ "cw-utils 0.16.0", "schemars", "serde", - "sg-std 0.20.0", + "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "sg-metadata" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3de91d20f0273051fdba51292a2882f4ec92adc0b11fa4653d321130dc316b" +version = "0.21.0" dependencies = [ "cosmwasm-schema", "schemars", @@ -981,6 +918,8 @@ dependencies = [ [[package]] name = "sg-metadata" version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2c9933e081fd1a7df186d3e7ca1593548fc513e3ae1167f23c61279a03b3767" dependencies = [ "cosmwasm-schema", "schemars", @@ -989,45 +928,28 @@ dependencies = [ [[package]] name = "sg-multi-test" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "405639103cd4da88e102ccf6e3491b889faeb913ef81c8d0f569c5e511f2ae18" +version = "0.21.0" dependencies = [ "anyhow", "cosmwasm-std", - "cw-multi-test 0.15.1", + "cw-multi-test", "schemars", "serde", - "sg-std 0.20.0", + "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "sg-multi-test" version = "0.21.0" -dependencies = [ - "anyhow", - "cosmwasm-std", - "cw-multi-test 0.16.0", - "schemars", - "serde", - "sg-std 0.20.0", -] - -[[package]] -name = "sg-splits" -version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d3803eb3860056f77a651cb94e3439721e240ab5a018728d93ca7e1e16e896" +checksum = "d951cd5a4d1454c174b85232e12b4e3f777484e7c42b4124f33d1da17e594bb3" dependencies = [ - "cosmwasm-schema", + "anyhow", "cosmwasm-std", - "cw-storage-plus 0.15.1", - "cw2 0.15.1", - "cw4 0.15.1", + "cw-multi-test", "schemars", "serde", "sg-std 0.20.0", - "thiserror", ] [[package]] @@ -1036,15 +958,15 @@ version = "0.21.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-multi-test 0.16.0", + "cw-multi-test", "cw-storage-plus 0.16.0", "cw2 0.16.0", - "cw4 0.16.0", + "cw4", "cw4-group", "schemars", "serde", - "sg-multi-test 0.20.0", - "sg-std 0.20.0", + "sg-multi-test 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] @@ -1077,32 +999,28 @@ dependencies = [ ] [[package]] -name = "sg-utils" +name = "sg-std" version = "0.21.0" -dependencies = [ - "bech32", - "cosmwasm-std", -] - -[[package]] -name = "sg-whitelist" -version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a29f194c4df98a7f773fbb6436f06838493766c04ec8637e1c763c0c7d0ee0" +checksum = "1a4ea34ef575b793eedab055e25e42c7eeb84d32814937b72dad7897caaa682c" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 0.15.1", - "cw-utils 0.15.1", - "cw2 0.15.1", - "rust_decimal", + "cw-utils 0.16.0", + "cw721", "schemars", "serde", - "sg-std 0.20.0", - "sg1 0.20.0", "thiserror", ] +[[package]] +name = "sg-utils" +version = "0.21.0" +dependencies = [ + "bech32", + "cosmwasm-std", +] + [[package]] name = "sg-whitelist" version = "0.21.0" @@ -1115,27 +1033,27 @@ dependencies = [ "rust_decimal", "schemars", "serde", - "sg-std 0.20.0", - "sg1 0.20.0", + "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg1 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "sg1" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbf02f2371fced3176e878469ab952d1aa9dd3c50d0dc63e10b0e9d54dffab9" +version = "0.21.0" dependencies = [ "cosmwasm-std", - "cw-utils 0.15.1", + "cw-utils 0.16.0", "serde", - "sg-std 0.20.0", + "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "sg1" version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee7023a866cd15b5ec9828b6bfafdb750c7c16b9607725bcfd76d2be4e2f4873" dependencies = [ "cosmwasm-std", "cw-utils 0.16.0", @@ -1146,22 +1064,22 @@ dependencies = [ [[package]] name = "sg2" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3560bb3ecaeb529ae98101171561c2ed044c82693f25051c1e1a5cbe91fc5aef" +version = "0.21.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-utils 0.15.1", + "cw-utils 0.16.0", "schemars", "serde", - "sg721 0.20.0", + "sg721 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "sg2" version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10c93d85cd31bf2670a8f4e4f47419855382d0cbed89608c0b8f4a315f99e210" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1174,9 +1092,7 @@ dependencies = [ [[package]] name = "sg4" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fb1f2505004a4151f0bafed18499797050826b3c1e8592cf0cb0d1bcb1bf09" +version = "0.21.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1188,6 +1104,8 @@ dependencies = [ [[package]] name = "sg4" version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfed54015df728bb3f4b327a283a6f79df505eec4f9c7e7f400b6a37368850b0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1216,7 +1134,7 @@ version = "0.21.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-multi-test 0.16.0", + "cw-multi-test", "cw-utils 0.16.0", "cw721-base", "serde", @@ -1224,23 +1142,17 @@ dependencies = [ ] [[package]] -name = "sg721-base" -version = "0.20.0" +name = "sg721" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe35a369a36e51f7be30d7104729063006ce0328dc0d9ae4eeaa4fc8a590c27" +checksum = "c39ae5d731b953812333a82e104cb9a3b866787902dd519b3329c4daa4833a39" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 0.15.1", - "cw-utils 0.15.1", - "cw2 0.15.1", - "cw721", + "cw-utils 0.16.0", "cw721-base", "serde", - "sg-std 0.20.0", - "sg721 0.20.0", "thiserror", - "url", ] [[package]] @@ -1249,20 +1161,20 @@ version = "0.21.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-multi-test 0.16.0", + "cw-multi-test", "cw-storage-plus 0.16.0", "cw-utils 0.16.0", "cw2 0.16.0", "cw721", "cw721-base", "serde", - "sg-multi-test 0.20.0", - "sg-std 0.20.0", - "sg2 0.20.0", - "sg721 0.20.0", + "sg-multi-test 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg2 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg721 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", "url", - "vending-factory 0.21.0", + "vending-factory", "vending-minter", ] @@ -1277,10 +1189,10 @@ dependencies = [ "cw721-base", "schemars", "serde", - "sg-metadata 0.20.0", - "sg-std 0.20.0", - "sg721 0.20.0", - "sg721-base 0.20.0", + "sg-metadata 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg721 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg721-base", ] [[package]] @@ -1295,9 +1207,9 @@ dependencies = [ "cw721-base", "schemars", "serde", - "sg-std 0.20.0", - "sg721 0.20.0", - "sg721-base 0.20.0", + "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg721 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg721-base", ] [[package]] @@ -1461,45 +1373,24 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "vending-factory" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d619b5979bbf219a6c549879fe8a3e7742b12e8347eb8b92ad9b64a48b32e97" -dependencies = [ - "base-factory 0.20.0", - "cosmwasm-schema", - "cosmwasm-std", - "cw-storage-plus 0.15.1", - "cw-utils 0.15.1", - "cw2 0.15.1", - "schemars", - "serde", - "sg-std 0.20.0", - "sg1 0.20.0", - "sg2 0.20.0", - "sg721 0.20.0", - "thiserror", -] - [[package]] name = "vending-factory" version = "0.21.0" dependencies = [ - "base-factory 0.20.0", + "base-factory", "cosmwasm-schema", "cosmwasm-std", - "cw-multi-test 0.16.0", + "cw-multi-test", "cw-storage-plus 0.16.0", "cw-utils 0.16.0", "cw2 0.16.0", "schemars", "serde", - "sg-multi-test 0.20.0", - "sg-std 0.20.0", - "sg1 0.20.0", - "sg2 0.20.0", - "sg721 0.20.0", + "sg-multi-test 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg1 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg2 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg721 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] @@ -1509,11 +1400,11 @@ version = "0.21.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-multi-test 0.16.0", + "cw-multi-test", "cw-storage-plus 0.16.0", "cw-utils 0.16.0", "cw2 0.16.0", - "cw4 0.16.0", + "cw4", "cw4-group", "cw721", "cw721-base", @@ -1521,20 +1412,20 @@ dependencies = [ "rand_xoshiro", "schemars", "serde", - "sg-multi-test 0.20.0", - "sg-splits 0.20.0", - "sg-std 0.20.0", - "sg-whitelist 0.20.0", - "sg1 0.20.0", - "sg2 0.20.0", - "sg4 0.20.0", - "sg721 0.20.0", - "sg721-base 0.20.0", + "sg-multi-test 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-splits", + "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-whitelist", + "sg1 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg2 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg4 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg721 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg721-base", "sha2 0.10.6", "shuffle", "thiserror", "url", - "vending-factory 0.20.0", + "vending-factory", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index c99a52840..5b6f9daaf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/public-awesome/launchpad" license = "Apache-2.0" [workspace.dependencies] -base-factory = "0.20.0" +base-factory = { path = "contracts/base-factory" } cosmwasm-schema = "1.1.5" cosmwasm-std = "1.1.5" cw2 = "0.16.0" @@ -23,19 +23,19 @@ cw-storage-plus = "0.16.0" cw-utils = "0.16.0" schemars = "0.8.8" serde = { version = "1.0.133", default-features = false, features = ["derive"] } -sg1 = "0.20.0" -sg2 = "0.20.0" -sg4 = "0.20.0" -sg721 = "0.20.0" -sg721-base = "0.20.0" -sg-metadata = "0.20.0" -sg-multi-test = "0.20.0" -sg-splits = "0.20.0" -sg-std = "0.20.0" -sg-whitelist = "0.20.0" +sg1 = "0.21.0" +sg2 = "0.21.0" +sg4 = "0.21.0" +sg721 = "0.21.0" +sg721-base = { path = "contracts/sg721-base" } +sg-metadata = "0.21.0" +sg-multi-test = "0.21.0" +sg-splits = { path = "contracts/splits" } +sg-std = "0.21.0" +sg-whitelist = { path = "contracts/whitelist" } thiserror = "1.0.31" url = "2.2.2" -vending-factory = "0.20.0" +vending-factory = { path = "contracts/vending-factory" } [profile.release.package.sg721] codegen-units = 1 From ce971f855f6bb1e9ffaa53dd0598de303d655a2d Mon Sep 17 00:00:00 2001 From: Shane Vitarana Date: Tue, 25 Oct 2022 16:15:29 -0400 Subject: [PATCH 5/8] Update manifest --- Cargo.lock | 58 +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 39fb5aa72..0bf388118 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "anyhow" -version = "1.0.65" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" +checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" [[package]] name = "arrayvec" @@ -74,15 +74,15 @@ checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64ct" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2b2456fd614d856680dcd9fcc660a51a820fa09daef2e49772b56a193c8474" +checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" [[package]] name = "bech32" @@ -224,9 +224,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2b443d17d49dad5ef0ede301c3179cc923b8822f3393b4d2c28c269dd4a122" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ "generic-array", "rand_core 0.6.4", @@ -577,9 +577,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "libc", @@ -588,9 +588,9 @@ dependencies = [ [[package]] name = "group" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7391856def869c1c81063a03457c676fbcd419709c3dfb33d8d319de484b154d" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ "ff", "rand_core 0.6.4", @@ -633,9 +633,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" [[package]] name = "k256" @@ -651,9 +651,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.134" +version = "0.2.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb" +checksum = "55edcf6c0bb319052dea84732cf99db461780fd5e8d3eb46ab6ff312ab31f197" [[package]] name = "num-traits" @@ -688,9 +688,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.46" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" dependencies = [ "unicode-ident", ] @@ -757,7 +757,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", ] [[package]] @@ -843,9 +843,9 @@ checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" [[package]] name = "serde" -version = "1.0.145" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" dependencies = [ "serde_derive", ] @@ -861,9 +861,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.145" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" +checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" dependencies = [ "proc-macro2", "quote", @@ -883,9 +883,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.85" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" +checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" dependencies = [ "itoa", "ryu", @@ -1279,9 +1279,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.101" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" +checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" dependencies = [ "proc-macro2", "quote", @@ -1349,9 +1349,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" [[package]] name = "unicode-normalization" From 89bef1b9429f455f4a2709e9a9b22236382d065e Mon Sep 17 00:00:00 2001 From: Shane Vitarana Date: Tue, 25 Oct 2022 20:03:51 -0400 Subject: [PATCH 6/8] Upgraded to latest cw-nfts --- Cargo.lock | 64 ++++++++++++++++++++++++++++---------- Cargo.toml | 4 +-- packages/sg-std/src/msg.rs | 2 -- 3 files changed, 49 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0bf388118..357232c3a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -50,8 +50,8 @@ dependencies = [ "cw-storage-plus 0.16.0", "cw-utils 0.16.0", "cw2 0.16.0", - "cw721", - "cw721-base", + "cw721 0.16.0", + "cw721-base 0.16.0", "schemars", "serde", "sg-multi-test 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -412,6 +412,19 @@ dependencies = [ "serde", ] +[[package]] +name = "cw721" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94a1ea6e6277bdd6dfc043a9b1380697fe29d6e24b072597439523658d21d791" +dependencies = [ + "cosmwasm-schema", + "cosmwasm-std", + "cw-utils 0.16.0", + "schemars", + "serde", +] + [[package]] name = "cw721-base" version = "0.15.0" @@ -423,7 +436,24 @@ dependencies = [ "cw-storage-plus 0.15.1", "cw-utils 0.15.1", "cw2 0.15.1", - "cw721", + "cw721 0.15.0", + "schemars", + "serde", + "thiserror", +] + +[[package]] +name = "cw721-base" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77518e27431d43214cff4cdfbd788a7508f68d9b1f32389e6fce513e7eaccbef" +dependencies = [ + "cosmwasm-schema", + "cosmwasm-std", + "cw-storage-plus 0.16.0", + "cw-utils 0.16.0", + "cw2 0.16.0", + "cw721 0.16.0", "schemars", "serde", "thiserror", @@ -979,7 +1009,7 @@ dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-utils 0.15.1", - "cw721", + "cw721 0.15.0", "schemars", "serde", "thiserror", @@ -992,7 +1022,7 @@ dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-utils 0.16.0", - "cw721", + "cw721 0.16.0", "schemars", "serde", "thiserror", @@ -1007,7 +1037,7 @@ dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-utils 0.16.0", - "cw721", + "cw721 0.15.0", "schemars", "serde", "thiserror", @@ -1123,7 +1153,7 @@ dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-utils 0.15.1", - "cw721-base", + "cw721-base 0.15.0", "serde", "thiserror", ] @@ -1136,7 +1166,7 @@ dependencies = [ "cosmwasm-std", "cw-multi-test", "cw-utils 0.16.0", - "cw721-base", + "cw721-base 0.16.0", "serde", "thiserror", ] @@ -1150,7 +1180,7 @@ dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-utils 0.16.0", - "cw721-base", + "cw721-base 0.15.0", "serde", "thiserror", ] @@ -1165,8 +1195,8 @@ dependencies = [ "cw-storage-plus 0.16.0", "cw-utils 0.16.0", "cw2 0.16.0", - "cw721", - "cw721-base", + "cw721 0.16.0", + "cw721-base 0.16.0", "serde", "sg-multi-test 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1185,8 +1215,8 @@ dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw2 0.16.0", - "cw721", - "cw721-base", + "cw721 0.16.0", + "cw721-base 0.16.0", "schemars", "serde", "sg-metadata 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1203,8 +1233,8 @@ dependencies = [ "cosmwasm-std", "cw-utils 0.16.0", "cw2 0.16.0", - "cw721", - "cw721-base", + "cw721 0.16.0", + "cw721-base 0.16.0", "schemars", "serde", "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1406,8 +1436,8 @@ dependencies = [ "cw2 0.16.0", "cw4", "cw4-group", - "cw721", - "cw721-base", + "cw721 0.16.0", + "cw721-base 0.16.0", "rand_core 0.6.4", "rand_xoshiro", "schemars", diff --git a/Cargo.toml b/Cargo.toml index 5b6f9daaf..018518468 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,8 +16,8 @@ cosmwasm-std = "1.1.5" cw2 = "0.16.0" cw4 = "0.16.0" cw4-group = "0.16.0" -cw721 = "0.15.0" -cw721-base = "0.15.0" +cw721 = "0.16.0" +cw721-base = "0.16.0" cw-multi-test = "0.16.0" cw-storage-plus = "0.16.0" cw-utils = "0.16.0" diff --git a/packages/sg-std/src/msg.rs b/packages/sg-std/src/msg.rs index 4b75f622b..9705e7c02 100644 --- a/packages/sg-std/src/msg.rs +++ b/packages/sg-std/src/msg.rs @@ -1,7 +1,6 @@ use crate::route::StargazeRoute; use cosmwasm_schema::cw_serde; use cosmwasm_std::{Coin, CosmosMsg, CustomMsg}; -use cw721::CustomMsg as Cw721CustomMsg; static MSG_DATA_VERSION: &str = "1.0.0"; /// StargazeMsg is an override of CosmosMsg::Custom to add support for Stargaze's custom message types @@ -19,7 +18,6 @@ impl From for CosmosMsg { } impl CustomMsg for StargazeMsgWrapper {} -impl Cw721CustomMsg for StargazeMsgWrapper {} #[cw_serde] pub enum StargazeMsg { From 2a3a6bb2abdf2abf405e48ec26249bf101f3e2d4 Mon Sep 17 00:00:00 2001 From: Shane Vitarana Date: Tue, 25 Oct 2022 20:05:40 -0400 Subject: [PATCH 7/8] Updated version --- Cargo.lock | 368 ++++++++++++++++++++--------------------------------- Cargo.toml | 16 +-- 2 files changed, 143 insertions(+), 241 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 357232c3a..25ca4150e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -22,44 +22,44 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base-factory" -version = "0.21.0" +version = "0.21.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-multi-test", - "cw-storage-plus 0.16.0", - "cw-utils 0.16.0", - "cw2 0.16.0", + "cw-storage-plus", + "cw-utils", + "cw2", "schemars", "serde", - "sg-multi-test 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg1 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg2 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-multi-test 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg1 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg2 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "base-minter" -version = "0.21.0" +version = "0.21.1" dependencies = [ "base-factory", "cosmwasm-schema", "cosmwasm-std", "cw-multi-test", - "cw-storage-plus 0.16.0", - "cw-utils 0.16.0", - "cw2 0.16.0", - "cw721 0.16.0", - "cw721-base 0.16.0", + "cw-storage-plus", + "cw-utils", + "cw2", + "cw721", + "cw721-base", "schemars", "serde", - "sg-multi-test 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg1 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg2 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg4 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg721 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-multi-test 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg1 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg2 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg4 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg721 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", "sg721-base", "sg721-nt", "thiserror", @@ -265,8 +265,8 @@ checksum = "24bd6738c3fd59c87d2f84911c1cad1e4f2d1c58ecaa6e52549b4f78f4ed6f07" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 0.16.0", - "cw-utils 0.16.0", + "cw-storage-plus", + "cw-utils", "schemars", "serde", "thiserror", @@ -280,8 +280,8 @@ checksum = "7192aec80d0c01a0e5941392eea7e2b7e212ee74ca7f430bfdc899420c055ef6" dependencies = [ "anyhow", "cosmwasm-std", - "cw-storage-plus 0.16.0", - "cw-utils 0.16.0", + "cw-storage-plus", + "cw-utils", "derivative", "itertools", "prost", @@ -290,17 +290,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "cw-storage-plus" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6cf70ef7686e2da9ad7b067c5942cd3e88dd9453f7af42f54557f8af300fb0" -dependencies = [ - "cosmwasm-std", - "schemars", - "serde", -] - [[package]] name = "cw-storage-plus" version = "0.16.0" @@ -312,21 +301,6 @@ dependencies = [ "serde", ] -[[package]] -name = "cw-utils" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae0b69fa7679de78825b4edeeec045066aa2b2c4b6e063d80042e565bb4da5c" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw2 0.15.1", - "schemars", - "semver", - "serde", - "thiserror", -] - [[package]] name = "cw-utils" version = "0.16.0" @@ -335,26 +309,13 @@ checksum = "d6a84c6c1c0acc3616398eba50783934bd6c964bad6974241eaee3460c8f5b26" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw2 0.16.0", + "cw2", "schemars", "semver", "serde", "thiserror", ] -[[package]] -name = "cw2" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5abb8ecea72e09afff830252963cb60faf945ce6cef2c20a43814516082653da" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-storage-plus 0.15.1", - "schemars", - "serde", -] - [[package]] name = "cw2" version = "0.16.0" @@ -363,7 +324,7 @@ checksum = "91398113b806f4d2a8d5f8d05684704a20ffd5968bf87e3473e1973710b884ad" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 0.16.0", + "cw-storage-plus", "schemars", "serde", ] @@ -376,7 +337,7 @@ checksum = "86a93c2764ddb44038b948d9a9a8aadc9f92f5ef3e61249af2fad16091e43412" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 0.16.0", + "cw-storage-plus", "schemars", "serde", ] @@ -390,28 +351,15 @@ dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-controllers", - "cw-storage-plus 0.16.0", - "cw-utils 0.16.0", - "cw2 0.16.0", + "cw-storage-plus", + "cw-utils", + "cw2", "cw4", "schemars", "serde", "thiserror", ] -[[package]] -name = "cw721" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20dfe04f86e5327956b559ffcc86d9a43167391f37402afd8bf40b0be16bee4d" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-utils 0.15.1", - "schemars", - "serde", -] - [[package]] name = "cw721" version = "0.16.0" @@ -420,26 +368,9 @@ checksum = "94a1ea6e6277bdd6dfc043a9b1380697fe29d6e24b072597439523658d21d791" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-utils 0.16.0", - "schemars", - "serde", -] - -[[package]] -name = "cw721-base" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c3ee3b669fc2a8094301a73fd7be97a7454d4df2650c33599f737e8f254d24" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-storage-plus 0.15.1", - "cw-utils 0.15.1", - "cw2 0.15.1", - "cw721 0.15.0", + "cw-utils", "schemars", "serde", - "thiserror", ] [[package]] @@ -450,10 +381,10 @@ checksum = "77518e27431d43214cff4cdfbd788a7508f68d9b1f32389e6fce513e7eaccbef" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 0.16.0", - "cw-utils 0.16.0", - "cw2 0.16.0", - "cw721 0.16.0", + "cw-storage-plus", + "cw-utils", + "cw2", + "cw721", "schemars", "serde", "thiserror", @@ -924,21 +855,21 @@ dependencies = [ [[package]] name = "sg-controllers" -version = "0.21.0" +version = "0.21.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 0.16.0", - "cw-utils 0.16.0", + "cw-storage-plus", + "cw-utils", "schemars", "serde", - "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "sg-metadata" -version = "0.21.0" +version = "0.21.1" dependencies = [ "cosmwasm-schema", "schemars", @@ -947,9 +878,9 @@ dependencies = [ [[package]] name = "sg-metadata" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2c9933e081fd1a7df186d3e7ca1593548fc513e3ae1167f23c61279a03b3767" +checksum = "23086811ef88e807cddb7b3e004da5a34935940f8fe9d1ad2e9dbe3f995e4b94" dependencies = [ "cosmwasm-schema", "schemars", @@ -958,71 +889,56 @@ dependencies = [ [[package]] name = "sg-multi-test" -version = "0.21.0" +version = "0.21.1" dependencies = [ "anyhow", "cosmwasm-std", "cw-multi-test", "schemars", "serde", - "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "sg-multi-test" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d951cd5a4d1454c174b85232e12b4e3f777484e7c42b4124f33d1da17e594bb3" +checksum = "9ff944d1c9a1cb686089567016cf2e00b78d8e29e8649df733a111cf8d785f2d" dependencies = [ "anyhow", "cosmwasm-std", "cw-multi-test", "schemars", "serde", - "sg-std 0.20.0", + "sg-std 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "sg-splits" -version = "0.21.0" +version = "0.21.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-multi-test", - "cw-storage-plus 0.16.0", - "cw2 0.16.0", + "cw-storage-plus", + "cw2", "cw4", "cw4-group", "schemars", "serde", - "sg-multi-test 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror", -] - -[[package]] -name = "sg-std" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79e1fd5120014c1967533df1624996ab862887cec7be51437d08641c6198feb" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-utils 0.15.1", - "cw721 0.15.0", - "schemars", - "serde", + "sg-multi-test 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "sg-std" -version = "0.21.0" +version = "0.21.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-utils 0.16.0", - "cw721 0.16.0", + "cw-utils", + "cw721", "schemars", "serde", "thiserror", @@ -1030,14 +946,14 @@ dependencies = [ [[package]] name = "sg-std" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a4ea34ef575b793eedab055e25e42c7eeb84d32814937b72dad7897caaa682c" +checksum = "a5e45fef93e29e96d1ab8e981a29b17d9cb53862365047413dd8160c6f9750d0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-utils 0.16.0", - "cw721 0.15.0", + "cw-utils", + "cw721", "schemars", "serde", "thiserror", @@ -1045,7 +961,7 @@ dependencies = [ [[package]] name = "sg-utils" -version = "0.21.0" +version = "0.21.1" dependencies = [ "bech32", "cosmwasm-std", @@ -1053,76 +969,76 @@ dependencies = [ [[package]] name = "sg-whitelist" -version = "0.21.0" +version = "0.21.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-storage-plus 0.16.0", - "cw-utils 0.16.0", - "cw2 0.16.0", + "cw-storage-plus", + "cw-utils", + "cw2", "rust_decimal", "schemars", "serde", - "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg1 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg1 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "sg1" -version = "0.21.0" +version = "0.21.1" dependencies = [ "cosmwasm-std", - "cw-utils 0.16.0", + "cw-utils", "serde", - "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "sg1" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee7023a866cd15b5ec9828b6bfafdb750c7c16b9607725bcfd76d2be4e2f4873" +checksum = "088b183e3edfa9ba93edc7d63edcf5fbb7a093222e4a34fbd6af7387facb63cc" dependencies = [ "cosmwasm-std", - "cw-utils 0.16.0", + "cw-utils", "serde", - "sg-std 0.20.0", + "sg-std 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "sg2" -version = "0.21.0" +version = "0.21.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-utils 0.16.0", + "cw-utils", "schemars", "serde", - "sg721 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg721 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "sg2" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10c93d85cd31bf2670a8f4e4f47419855382d0cbed89608c0b8f4a315f99e210" +checksum = "23ce728360d270cd06aefde7d039d5d6aeb464c6afc990f04010281e61cae207" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-utils 0.16.0", + "cw-utils", "schemars", "serde", - "sg721 0.20.0", + "sg721 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "sg4" -version = "0.21.0" +version = "0.21.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1133,9 +1049,9 @@ dependencies = [ [[package]] name = "sg4" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfed54015df728bb3f4b327a283a6f79df505eec4f9c7e7f400b6a37368850b0" +checksum = "4d5e322bf5dd3ab64b3aac640c812bc8b290fdd0f13f7643d8b6b8a667b66b50" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1146,62 +1062,48 @@ dependencies = [ [[package]] name = "sg721" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3f6ca205ca8bd8b2a69008cc027a4acc13eca1ea16b798f80991434735fdc6" -dependencies = [ - "cosmwasm-schema", - "cosmwasm-std", - "cw-utils 0.15.1", - "cw721-base 0.15.0", - "serde", - "thiserror", -] - -[[package]] -name = "sg721" -version = "0.21.0" +version = "0.21.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-multi-test", - "cw-utils 0.16.0", - "cw721-base 0.16.0", + "cw-utils", + "cw721-base", "serde", "thiserror", ] [[package]] name = "sg721" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c39ae5d731b953812333a82e104cb9a3b866787902dd519b3329c4daa4833a39" +checksum = "65ff1510440e61dab222fd473b04af06c97eef82703b6d5e89e8ef70716ff6cf" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-utils 0.16.0", - "cw721-base 0.15.0", + "cw-utils", + "cw721-base", "serde", "thiserror", ] [[package]] name = "sg721-base" -version = "0.21.0" +version = "0.21.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-multi-test", - "cw-storage-plus 0.16.0", - "cw-utils 0.16.0", - "cw2 0.16.0", - "cw721 0.16.0", - "cw721-base 0.16.0", + "cw-storage-plus", + "cw-utils", + "cw2", + "cw721", + "cw721-base", "serde", - "sg-multi-test 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg2 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg721 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-multi-test 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg2 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg721 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", "url", "vending-factory", @@ -1210,35 +1112,35 @@ dependencies = [ [[package]] name = "sg721-metadata-onchain" -version = "0.21.0" +version = "0.21.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw2 0.16.0", - "cw721 0.16.0", - "cw721-base 0.16.0", + "cw2", + "cw721", + "cw721-base", "schemars", "serde", - "sg-metadata 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg721 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-metadata 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg721 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", "sg721-base", ] [[package]] name = "sg721-nt" -version = "0.21.0" +version = "0.21.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", - "cw-utils 0.16.0", - "cw2 0.16.0", - "cw721 0.16.0", - "cw721-base 0.16.0", + "cw-utils", + "cw2", + "cw721", + "cw721-base", "schemars", "serde", - "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg721 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg721 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", "sg721-base", ] @@ -1405,51 +1307,51 @@ dependencies = [ [[package]] name = "vending-factory" -version = "0.21.0" +version = "0.21.1" dependencies = [ "base-factory", "cosmwasm-schema", "cosmwasm-std", "cw-multi-test", - "cw-storage-plus 0.16.0", - "cw-utils 0.16.0", - "cw2 0.16.0", + "cw-storage-plus", + "cw-utils", + "cw2", "schemars", "serde", - "sg-multi-test 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg1 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg2 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg721 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-multi-test 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg1 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg2 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg721 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "vending-minter" -version = "0.21.0" +version = "0.21.1" dependencies = [ "cosmwasm-schema", "cosmwasm-std", "cw-multi-test", - "cw-storage-plus 0.16.0", - "cw-utils 0.16.0", - "cw2 0.16.0", + "cw-storage-plus", + "cw-utils", + "cw2", "cw4", "cw4-group", - "cw721 0.16.0", - "cw721-base 0.16.0", + "cw721", + "cw721-base", "rand_core 0.6.4", "rand_xoshiro", "schemars", "serde", - "sg-multi-test 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-multi-test 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", "sg-splits", - "sg-std 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg-std 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", "sg-whitelist", - "sg1 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg2 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg4 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sg721 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sg1 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg2 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg4 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sg721 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", "sg721-base", "sha2 0.10.6", "shuffle", diff --git a/Cargo.toml b/Cargo.toml index 018518468..12758a25a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["packages/*", "contracts/*"] resolver = "2" [workspace.package] -version = "0.21.0" +version = "0.21.1" edition = "2021" homepage = "https://stargaze.zone" repository = "https://github.com/public-awesome/launchpad" @@ -23,15 +23,15 @@ cw-storage-plus = "0.16.0" cw-utils = "0.16.0" schemars = "0.8.8" serde = { version = "1.0.133", default-features = false, features = ["derive"] } -sg1 = "0.21.0" -sg2 = "0.21.0" -sg4 = "0.21.0" -sg721 = "0.21.0" +sg1 = "0.21.1" +sg2 = "0.21.1" +sg4 = "0.21.1" +sg721 = "0.21.1" sg721-base = { path = "contracts/sg721-base" } -sg-metadata = "0.21.0" -sg-multi-test = "0.21.0" +sg-metadata = "0.21.1" +sg-multi-test = "0.21.1" sg-splits = { path = "contracts/splits" } -sg-std = "0.21.0" +sg-std = "0.21.1" sg-whitelist = { path = "contracts/whitelist" } thiserror = "1.0.31" url = "2.2.2" From 4d95da024d21d01f02508c68b91addb749d2b3da Mon Sep 17 00:00:00 2001 From: Shane Vitarana Date: Tue, 25 Oct 2022 20:18:38 -0400 Subject: [PATCH 8/8] Updated Makefile --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7483c0859..b9b49a55a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: e2etest optimize +.PHONY: ci-sign e2etest lint optimize publish schema ci-sign: drone sign public-awesome/launchpad --save @@ -8,6 +8,9 @@ e2etest: cp artifacts/*.wasm e2e/contracts cd e2e && go test -v +lint: + cargo clippy --all-targets -- -D warnings + optimize: sh scripts/optimize.sh