Merge pull request #1 from larry0x/larry

Validate channel IDs without using regex

Cargo.toml

@@ -32,29 +32,11 @@ backtraces = ["cosmwasm-std/backtraces"]
 # use library feature to disable all instantiate/execute/query exports
 library = []
 
-[package.metadata.scripts]
-optimize = """docker run --rm -v "$(pwd)":/code \
-  --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
-  --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-  cosmwasm/rust-optimizer:0.12.12
-"""
-
 [dependencies]
 cosmwasm-schema = "1.3.3"
 cosmwasm-std = "1.3.3"
-cosmwasm-storage = "1.3.3"
 cw-storage-plus = "1.1.0"
 cw2 = "1.1.0"
 hex = "0.4.3"
-regex = "1"
-schemars = "0.8.12"
-serde = { version = "1.0.185", default-features = false, features = ["derive"] }
 sha2 = "0.10.7"
-thiserror = "1.0.47" 
-strum = "0.25.0"
-strum_macros = "0.25.2"
-serde-json-wasm = "1.0.0"
-
-[dev-dependencies]
-cw-multi-test = "0.16.2"
-
+thiserror = "1.0.47"

Makefile

@@ -22,19 +22,19 @@ build-debug:
 
 build-optimized:
 	docker run --rm -v "$(CURDIR)":/code \
-		--mount type=volume,source="$(notdir $(CURDIR))_cache",target=/code/target \
+		--mount type=volume,source="$(notdir $(CURDIR))_cache",target=/target \
 		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-		cosmwasm/rust-optimizer:0.12.13
+		cosmwasm/rust-optimizer:0.14.0
 
 validate:
 	cosmwasm-check ./artifacts/ica_oracle.wasm
 
 # Uploads the contract to osmosis
-store-contract: 
+store-contract:
 	@STRIDE_HOME=$(STRIDE_HOME) bash scripts/store_contract.sh
 
 # Instantiates the contract directly with the osmosis dockernet validator as the admin
-instantiate-contract: 
+instantiate-contract:
 	@STRIDE_HOME=$(STRIDE_HOME) bash scripts/instantiate_contract.sh
 
 # Adds a metric directly to the contract from the osmosis dockernet validator