From 33984ac8a0e509d761b6eb3bfc73c9727ba9e912 Mon Sep 17 00:00:00 2001
From: Jorge Hernandez <3452489+jhernandezb@users.noreply.github.com>
Date: Fri, 26 Jan 2024 13:13:50 -0600
Subject: [PATCH] Release 3.5.0 (#642)

---
 Cargo.lock                                    | 56 +++++++++----------
 Cargo.toml                                    | 52 ++++++++---------
 .../base-factory/schema/base-factory.json     |  2 +-
 .../base-minter/schema/base-minter.json       |  2 +-
 .../schema/vending-minter-wl-flex.json        |  2 +-
 .../sg-eth-airdrop/schema/sg-eth-airdrop.json |  2 +-
 contracts/splits/schema/sg-splits.json        |  2 +-
 .../schema/sg-whitelist-flex.json             |  2 +-
 .../schema/whitelist-immutable.json           |  2 +-
 .../schema/whitelist-mtree.json               |  2 +-
 scripts/publish-contracts.sh                  |  6 +-
 scripts/release.sh                            |  7 ++-
 ts/package.json                               |  2 +-
 13 files changed, 73 insertions(+), 66 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 262037ee0..5fb111ff8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -308,7 +308,7 @@ dependencies = [
 
 [[package]]
 name = "base-factory"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -325,7 +325,7 @@ dependencies = [
 
 [[package]]
 name = "base-minter"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "base-factory",
  "cosmwasm-schema",
@@ -1355,7 +1355,7 @@ checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555"
 
 [[package]]
 name = "e2e"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "assert_matches",
  "cosm-orc",
@@ -1605,7 +1605,7 @@ dependencies = [
 
 [[package]]
 name = "ethereum-verify"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -2483,7 +2483,7 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "open-edition-factory"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "base-factory",
  "cosmwasm-schema",
@@ -2501,7 +2501,7 @@ dependencies = [
 
 [[package]]
 name = "open-edition-minter"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -3474,7 +3474,7 @@ dependencies = [
 
 [[package]]
 name = "sg-controllers"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -3488,7 +3488,7 @@ dependencies = [
 
 [[package]]
 name = "sg-eth-airdrop"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "anyhow",
  "async-std",
@@ -3523,7 +3523,7 @@ dependencies = [
 
 [[package]]
 name = "sg-metadata"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "schemars",
@@ -3532,7 +3532,7 @@ dependencies = [
 
 [[package]]
 name = "sg-mint-hooks"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -3571,7 +3571,7 @@ dependencies = [
 
 [[package]]
 name = "sg-splits"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -3604,7 +3604,7 @@ dependencies = [
 
 [[package]]
 name = "sg-whitelist"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -3621,7 +3621,7 @@ dependencies = [
 
 [[package]]
 name = "sg-whitelist-flex"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -3638,7 +3638,7 @@ dependencies = [
 
 [[package]]
 name = "sg1"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-std",
  "cw-utils 1.0.1",
@@ -3649,7 +3649,7 @@ dependencies = [
 
 [[package]]
 name = "sg2"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -3663,7 +3663,7 @@ dependencies = [
 
 [[package]]
 name = "sg4"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -3674,7 +3674,7 @@ dependencies = [
 
 [[package]]
 name = "sg721"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -3688,7 +3688,7 @@ dependencies = [
 
 [[package]]
 name = "sg721-base"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -3707,7 +3707,7 @@ dependencies = [
 
 [[package]]
 name = "sg721-metadata-onchain"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -3725,7 +3725,7 @@ dependencies = [
 
 [[package]]
 name = "sg721-nt"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -3742,7 +3742,7 @@ dependencies = [
 
 [[package]]
 name = "sg721-updatable"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -4115,7 +4115,7 @@ dependencies = [
 
 [[package]]
 name = "test-suite"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "anyhow",
  "async-std",
@@ -4549,7 +4549,7 @@ checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3"
 
 [[package]]
 name = "vending-factory"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "base-factory",
  "cosmwasm-schema",
@@ -4568,7 +4568,7 @@ dependencies = [
 
 [[package]]
 name = "vending-minter"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -4597,7 +4597,7 @@ dependencies = [
 
 [[package]]
 name = "vending-minter-merkle-wl"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -4627,7 +4627,7 @@ dependencies = [
 
 [[package]]
 name = "vending-minter-wl-flex"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -4788,7 +4788,7 @@ dependencies = [
 
 [[package]]
 name = "whitelist-immutable"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -4805,7 +4805,7 @@ dependencies = [
 
 [[package]]
 name = "whitelist-mtree"
-version = "3.4.0"
+version = "3.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
diff --git a/Cargo.toml b/Cargo.toml
index 7468f7f6d..5efc42d45 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,15 +11,15 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version    = "3.4.0"
+version    = "3.5.0"
 edition    = "2021"
 homepage   = "https://stargaze.zone"
 repository = "https://github.com/public-awesome/launchpad"
 license    = "Apache-2.0"
 
 [workspace.dependencies]
-base-factory         = { version = "3.4.0", path = "contracts/factories/base-factory" }
-base-minter          = { version = "3.4.0", path = "contracts/minters/base-minter" }
+base-factory         = { version = "3.5.0", path = "contracts/factories/base-factory" }
+base-minter          = { version = "3.5.0", path = "contracts/minters/base-minter" }
 cosmwasm-schema      = "1.2.1"
 cosmwasm-std         = "1.2.1"
 cw-controllers       = "1.1.0"
@@ -33,35 +33,35 @@ cw-storage-plus      = "1.1.0"
 cw-utils             = "1.0.1"
 schemars             = "0.8.11"
 serde                = { version = "1.0.145", default-features = false, features = ["derive"] }
-sg1                  = { version = "3.4.0", path = "packages/sg1" }
-sg2                  = { version = "3.4.0", path = "packages/sg2" }
-sg4                  = { version = "3.4.0", path = "packages/sg4" }
-sg721                = { version = "3.4.0", path = "packages/sg721" }
-sg721-base           = { version = "3.4.0", path = "contracts/collections/sg721-base" }
-sg721-nt             = { version = "3.4.0", path = "contracts/collections/sg721-nt" }
-sg721-updatable      = { version = "3.4.0", path = "contracts/collections/sg721-updatable" }
-sg-controllers       = { version = "3.4.0", path = "packages/controllers" }
-sg-metadata          = { version = "3.4.0", path = "packages/sg-metadata" }
-sg-mint-hooks        = { version = "3.4.0", path = "packages/mint-hooks" }
+sg1                  = { version = "3.5.0", path = "packages/sg1" }
+sg2                  = { version = "3.5.0", path = "packages/sg2" }
+sg4                  = { version = "3.5.0", path = "packages/sg4" }
+sg721                = { version = "3.5.0", path = "packages/sg721" }
+sg721-base           = { version = "3.5.0", path = "contracts/collections/sg721-base" }
+sg721-nt             = { version = "3.5.0", path = "contracts/collections/sg721-nt" }
+sg721-updatable      = { version = "3.5.0", path = "contracts/collections/sg721-updatable" }
+sg-controllers       = { version = "3.5.0", path = "packages/controllers" }
+sg-metadata          = { version = "3.5.0", path = "packages/sg-metadata" }
+sg-mint-hooks        = { version = "3.5.0", path = "packages/mint-hooks" }
 sg-multi-test        = { version = "3.1.0" }
-sg-splits            = { version = "3.4.0", path = "contracts/splits" }
+sg-splits            = { version = "3.5.0", path = "contracts/splits" }
 sg-std               = { version = "3.2.0" }
-sg-whitelist         = { version = "3.4.0", path = "contracts/whitelists/whitelist" }
+sg-whitelist         = { version = "3.5.0", path = "contracts/whitelists/whitelist" }
 thiserror            = "1.0.31"
 url                  = "2.2.2"
 sha2                 = { version = "0.10.2", default-features = false }
 
-whitelist-mtree             = { version = "3.4.0", path = "contracts/whitelists/whitelist-merkletree" }
-vending-minter-merkle-wl    = { version = "3.4.0", path = "contracts/minters/vending-minter-merkle-wl" }
-vending-factory      = { version = "3.4.0", path = "contracts/factories/vending-factory" }
-vending-minter       = { version = "3.4.0", path = "contracts/minters/vending-minter" }
-open-edition-factory = { version = "3.4.0", path = "contracts/factories/open-edition-factory" }
-open-edition-minter  = { version = "3.4.0", path = "contracts/minters/open-edition-minter" }
-whitelist-immutable  = { version = "3.4.0", path = "contracts/whitelists/whitelist-immutable" }
-sg-whitelist-flex    = { version = "3.4.0", path = "contracts/whitelists/whitelist-flex" }
-ethereum-verify      = { version = "3.4.0", path = "packages/ethereum-verify" }
-sg-eth-airdrop       = { version = "3.4.0", path = "contracts/sg-eth-airdrop" }
-test-suite           = { version = "3.4.0", path = "test-suite" }
+whitelist-mtree             = { version = "3.5.0", path = "contracts/whitelists/whitelist-merkletree" }
+vending-minter-merkle-wl    = { version = "3.5.0", path = "contracts/minters/vending-minter-merkle-wl" }
+vending-factory      = { version = "3.5.0", path = "contracts/factories/vending-factory" }
+vending-minter       = { version = "3.5.0", path = "contracts/minters/vending-minter" }
+open-edition-factory = { version = "3.5.0", path = "contracts/factories/open-edition-factory" }
+open-edition-minter  = { version = "3.5.0", path = "contracts/minters/open-edition-minter" }
+whitelist-immutable  = { version = "3.5.0", path = "contracts/whitelists/whitelist-immutable" }
+sg-whitelist-flex    = { version = "3.5.0", path = "contracts/whitelists/whitelist-flex" }
+ethereum-verify      = { version = "3.5.0", path = "packages/ethereum-verify" }
+sg-eth-airdrop       = { version = "3.5.0", path = "contracts/sg-eth-airdrop" }
+test-suite           = { version = "3.5.0", path = "test-suite" }
 
 semver               = "1"
 cw-ownable           = "0.5.1"
diff --git a/contracts/factories/base-factory/schema/base-factory.json b/contracts/factories/base-factory/schema/base-factory.json
index a3c1d6212..71cbe4fbf 100644
--- a/contracts/factories/base-factory/schema/base-factory.json
+++ b/contracts/factories/base-factory/schema/base-factory.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "base-factory",
-  "contract_version": "3.4.0",
+  "contract_version": "3.5.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/contracts/minters/base-minter/schema/base-minter.json b/contracts/minters/base-minter/schema/base-minter.json
index 2ae29d36a..30a682d53 100644
--- a/contracts/minters/base-minter/schema/base-minter.json
+++ b/contracts/minters/base-minter/schema/base-minter.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "base-minter",
-  "contract_version": "3.4.0",
+  "contract_version": "3.5.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/contracts/minters/vending-minter-wl-flex/schema/vending-minter-wl-flex.json b/contracts/minters/vending-minter-wl-flex/schema/vending-minter-wl-flex.json
index c61374794..8146b76fd 100644
--- a/contracts/minters/vending-minter-wl-flex/schema/vending-minter-wl-flex.json
+++ b/contracts/minters/vending-minter-wl-flex/schema/vending-minter-wl-flex.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "vending-minter-wl-flex",
-  "contract_version": "3.4.0",
+  "contract_version": "3.5.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/contracts/sg-eth-airdrop/schema/sg-eth-airdrop.json b/contracts/sg-eth-airdrop/schema/sg-eth-airdrop.json
index 8fbbf8036..ddee384ab 100644
--- a/contracts/sg-eth-airdrop/schema/sg-eth-airdrop.json
+++ b/contracts/sg-eth-airdrop/schema/sg-eth-airdrop.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "sg-eth-airdrop",
-  "contract_version": "3.4.0",
+  "contract_version": "3.5.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/contracts/splits/schema/sg-splits.json b/contracts/splits/schema/sg-splits.json
index a074104de..1e44d7534 100644
--- a/contracts/splits/schema/sg-splits.json
+++ b/contracts/splits/schema/sg-splits.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "sg-splits",
-  "contract_version": "3.4.0",
+  "contract_version": "3.5.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/contracts/whitelists/whitelist-flex/schema/sg-whitelist-flex.json b/contracts/whitelists/whitelist-flex/schema/sg-whitelist-flex.json
index e83896b92..57aa6d7e2 100644
--- a/contracts/whitelists/whitelist-flex/schema/sg-whitelist-flex.json
+++ b/contracts/whitelists/whitelist-flex/schema/sg-whitelist-flex.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "sg-whitelist-flex",
-  "contract_version": "3.4.0",
+  "contract_version": "3.5.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/contracts/whitelists/whitelist-immutable/schema/whitelist-immutable.json b/contracts/whitelists/whitelist-immutable/schema/whitelist-immutable.json
index acab70a14..6d9ae48ea 100644
--- a/contracts/whitelists/whitelist-immutable/schema/whitelist-immutable.json
+++ b/contracts/whitelists/whitelist-immutable/schema/whitelist-immutable.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "whitelist-immutable",
-  "contract_version": "3.4.0",
+  "contract_version": "3.5.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/contracts/whitelists/whitelist-merkletree/schema/whitelist-mtree.json b/contracts/whitelists/whitelist-merkletree/schema/whitelist-mtree.json
index 2c8866aee..3adc017ce 100644
--- a/contracts/whitelists/whitelist-merkletree/schema/whitelist-mtree.json
+++ b/contracts/whitelists/whitelist-merkletree/schema/whitelist-mtree.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "whitelist-mtree",
-  "contract_version": "3.4.0",
+  "contract_version": "3.5.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/scripts/publish-contracts.sh b/scripts/publish-contracts.sh
index bab991dd7..c6403e37b 100755
--- a/scripts/publish-contracts.sh
+++ b/scripts/publish-contracts.sh
@@ -25,8 +25,12 @@ sleep 10
 cd contracts/whitelists/whitelist-immutable && cargo publish && cd ../../..
 sleep 15
 cd contracts/whitelists/whitelist-flex && cargo publish && cd ../../..
-sleep 10
+sleep 15
+cd contracts/whitelists/whitelist-merkletree && cargo publish && cd ../../..
+sleep 15
 cd contracts/minters/vending-minter-wl-flex && cargo publish && cd ../../..
+sleep 15
+cd contracts/minters/vending-minter-merkle-wl && cargo publish && cd ../../..
 
 cd contracts/sg-eth-airdrop && cargo publish && cd ../..
 sleep 15
diff --git a/scripts/release.sh b/scripts/release.sh
index 440b4c6a1..c99934fbb 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -23,6 +23,11 @@ cd $PROJECT_PATH
 cargo build
 . ./scripts/schema.sh $1
 
+echo "Bump NPM version"
+cd $PROJECT_PATH
+cd ts
+npm version $1
+
 cd $PROJECT_PATH
 git commit -am "Release $1"
 git push origin release-$1
@@ -34,8 +39,6 @@ git push origin v$1
 echo "Publish Typescript types to NPM"
 cd $PROJECT_PATH
 cd ts
-npm version $1
-
 npm publish --access public
 
 cd ..
diff --git a/ts/package.json b/ts/package.json
index ab7d8be1c..aa3ac7707 100644
--- a/ts/package.json
+++ b/ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@stargazezone/launchpad",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "description": "Stargaze Launchpad CosmWasm Typescript Types",
   "main": "index.js",
   "scripts": {