feat: Inherit dependances from workspace

Cargo.toml

@@ -19,3 +19,59 @@ debug-assertions = false
 panic = 'abort'
 incremental = false
 overflow-checks = true
+
+[workspace.package]
+version = "0.0.3"
+authors = ["[email protected]", "@tjtc", "@mikedotexe"]
+edition = "2021"
+description = "Croncat provides a general purpose, fully autonomous network that enables scheduled function calls for blockchain contract execution. It allows any application to schedule logic to get executed in the future, once or many times, triggered by an approved “agent,” in an economically stable format."
+documentation = "https://docs.cron.cat/"
+
+[workspace.dependencies]
+schemars = "0.8"
+serde = { version = "1.0" }
+cosmwasm-std = { version = "1.0.0" }
+serde-cw-value = "0.7.0"
+generic-query = { version = "0.1.1", path = "./packages/generic-query" }
+thiserror = { version = "1.0" }
+cosmwasm-schema = { version = "1.0.0" }
+rusty-hook = "0.11.2"
+#For some reason it tries to deploy cw_core here
+# voting = { version = "0.2.0", default-features = false, git = "https://github.com/DA0-DA0/dao-contracts" }
+smart-query = { version = "0.1.0", path = "./packages/smart-query" }
+cw20 = { version = "0.13.4" }
+cw-multi-test = { version = "0.16.0" }
+cw20-base = { version = "0.13.4", features = ["library"] }
+cw-rules-core = { version = "0.1.2", path = "./packages/cw-rules-core" }
+cw-storage-plus = "0.16.0"
+cron_schedule = "0.2.3"
+cw2 = "0.16.0"
+hex = { version = "0.4", default-features = false }
+sha2 = { version = "0.10.6", default-features = false }
+serde-json-wasm = { version = "0.5.0" }
+cw-utils = "0.13.4"
+cw721 = "0.15.0"
+# DAO contracts
+cwd-voting = { version = "0.2.0", git = "https://github.com/DA0-DA0/dao-contracts.git" }
+cwd-proposal-single = { version = "0.2.0", git = "https://github.com/DA0-DA0/dao-contracts" }
+cwd-proposal-multiple = { version = "0.2.0", git = "https://github.com/DA0-DA0/dao-contracts" }
+cwd-voting-cw20-staked = { version = "0.2.0", git = "https://github.com/DA0-DA0/dao-contracts" }
+cw20-stake = { version = "0.2.6", git = "https://github.com/DA0-DA0/dao-contracts" }
+cwd-core = { version = "0.2.0", git = "https://github.com/DA0-DA0/dao-contracts" }
+cwd-interface = { version = "0.2.0", git = "https://github.com/DA0-DA0/dao-contracts" }
+# Testing generic msg
+cw4 = "0.16.0"
+cw4-group = "0.16.0"
+base64 = "0.13.0"
+serde_json = { version = "1.0" }
+anyhow = "1"
+cw-rules = { version = "*", path = "./contracts/cw-rules" }
+cw-croncat-core = { version = "0.1.5", path = "./packages/cw-croncat-core" }
+cw721-base = "0.15.0"
+
+[workspace.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.5
+"""

checksum

@@ -1,2 +1,2 @@
-2d2b8d5bb188d7a29b24a00c5fcb87c1e2e4f7c53c0f4bf176e2dc2024bd2cc6  cw_croncat.wasm
-307b8919d8fcae59dd7336319c6220fe5c477488b59bf043158fba67a292234d  cw_rules.wasm
+b589630b11c5c0b1734b5c2cd7163efdbf7d4f25e7401d0662bd589c8225b628  cw_croncat.wasm
+ce9221c037fb3c97b88fab2441130533d52df2e1f684663906444b2046bcdfb0  cw_rules.wasm

contracts/cw-croncat/Cargo.toml

@@ -1,17 +1,17 @@
 [package]
 name = "cw-croncat"
-version = "0.0.3"
-authors = ["[email protected]", "@tjtc", "@mikedotexe"]
-edition = "2018"
-
+authors = { workspace = true }
+description = { workspace = true }
+edition = { workspace = true }
+documentation = { workspace = true }
+version = { workspace = true }
 exclude = [
   # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
   "contract.wasm",
   "hash.txt",
 ]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [lib]
 crate-type = ["cdylib", "rlib"]
 
@@ -24,40 +24,36 @@ staking = ["cw-multi-test/staking"]
 stargate = ["cw-multi-test/stargate"]
 
 [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.5
-"""
+optimize = { workspace = true }
 
 [dependencies]
-cw-croncat-core = { version = "0.1.5", path = "../../packages/cw-croncat-core" }
-cw-rules-core = { version = "0.1.2", path = "../../packages/cw-rules-core" }
-cosmwasm-std = { version = "1.0.0", features = ["staking", "stargate"] }
-cw-storage-plus = "0.16.0"
-cw-utils = "0.13"
-cw2 = "0.16.0"
-cw20 = { version = "0.13.4", default-features = false }
-schemars = "0.8"
-serde = { version = "1.0", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0" }
-hex = "0.4"
-sha2 = "0.10.6"
+cw-croncat-core = { workspace = true }
+cw-rules-core = { workspace = true }
+cosmwasm-std = { workspace = true, features = ["staking", "stargate"] }
+cw-storage-plus = { workspace = true }
+cw-utils = { workspace = true }
+cw2 = { workspace = true }
+cw20 = { workspace = true, default-features = false }
+schemars = { workspace = true }
+serde = { workspace = true, default-features = false, features = ["derive"] }
+thiserror = { workspace = true }
+hex = { workspace = true }
+sha2 = { workspace = true }
 
 [dev-dependencies]
-anyhow = "1"
-cosmwasm-schema = { version = "1.0.0" }
-cw-rules = { version = "*", path = "../cw-rules" }
-cw-multi-test = { version = "0.16.0", features = ["staking"] }
-cw20-base = { version = "0.13.4", features = ["library"] }
-cw4 = { version = "0.13.4" }
-cw4-group = { version = "0.13.4", features = ["library"] }
-smart-query = { version = "*", path = "../../packages/smart-query" }
-generic-query = { version = "*", path = "../../packages/generic-query" }
-cwd-voting-cw20-staked = { version = "0.2.0", git = "https://github.com/DA0-DA0/dao-contracts" }
-cw20-stake = { version = "0.2.6", git = "https://github.com/DA0-DA0/dao-contracts" }
-cwd-core = { version = "0.2.0", git = "https://github.com/DA0-DA0/dao-contracts" }
-cwd-interface = { version = "0.2.0", git = "https://github.com/DA0-DA0/dao-contracts" }
-cwd-proposal-single = { version = "0.2.0", git = "https://github.com/DA0-DA0/dao-contracts" }
-cwd-voting = { version = "0.2.0", git = "https://github.com/DA0-DA0/dao-contracts.git" }
-rusty-hook = "0.11.2"
+anyhow = { workspace = true }
+cosmwasm-schema = { workspace = true }
+cw-rules = { workspace = true }
+cw-multi-test = { workspace = true, features = ["staking"] }
+cw20-base = { workspace = true, features = ["library"] }
+cw4 = { workspace = true }
+cw4-group = { workspace = true, features = ["library"] }
+smart-query = { workspace = true }
+generic-query = { workspace = true }
+cwd-voting-cw20-staked = { workspace = true }
+cw20-stake = { workspace = true }
+cwd-core = { workspace = true }
+cwd-interface = { workspace = true }
+cwd-proposal-single = { workspace = true }
+cwd-voting = { workspace = true }
+rusty-hook = { workspace = true }

contracts/cw-rules/Cargo.toml

@@ -1,17 +1,17 @@
 [package]
 name = "cw-rules"
-version = "0.0.2"
-authors = ["[email protected]", "@tjtc", "@mikedotexe"]
-edition = "2018"
-
+authors = { workspace = true }
+version = { workspace = true }
+description = "CronCat rules core logic for tasks that require conditions"
+edition = { workspace = true }
+documentation = { workspace = true }
 exclude = [
   # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
   "contract.wasm",
   "hash.txt",
 ]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [lib]
 crate-type = ["cdylib", "rlib"]
 
@@ -24,48 +24,42 @@ staking = ["cw-multi-test/staking"]
 stargate = ["cw-multi-test/stargate"]
 
 [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.5
-"""
+optimize = { workspace = true }
 
 [dependencies]
-generic-query = { version = "0.1.1", path = "../../packages/generic-query" }
-smart-query = { version = "0.1.0", path = "../../packages/smart-query" }
-cw-rules-core = { version = "0.1.2", path = "../../packages/cw-rules-core" }
-cosmwasm-std = "1.0.0"
-cw-storage-plus = "0.16.0"
-cw-utils = "0.13.4"
-cw2 = "0.16.0"
-cw721 = "0.15.0"
-cw20 = "0.13.4"
-schemars = "0.8.8"
-serde = { version = "1.0.137", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0.31" }
-
+generic-query = { workspace = true }
+smart-query = { workspace = true }
+cw-rules-core = { workspace = true }
+cosmwasm-std = { workspace = true }
+cw-storage-plus = { workspace = true }
+cw-utils = { workspace = true }
+cw2 = { workspace = true }
+cw721 = { workspace = true }
+cw20 = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true, default-features = false, features = ["derive"] }
+thiserror = { workspace = true }
 # This thing saved our lives thanks @hashedone for implementing it
-serde-cw-value = "0.7.0"
-
-serde-json-wasm = { version = "0.5.0" }
+serde-cw-value = { workspace = true }
+serde-json-wasm = { workspace = true }
 
 [dev-dependencies]
-cw721-base = "0.15.0"
-cosmwasm-schema = "1.0.0"
-cw-multi-test = "0.16.0"
-cw-utils = "0.13.4"
-cw20-base = "0.13.4"
+cw721-base = { workspace = true }
+cosmwasm-schema = { workspace = true }
+cw-multi-test = { workspace = true }
+cw-utils = { workspace = true }
+cw20-base = { workspace = true }
 # DAO contracts
-cwd-voting = { version = "0.2.0", git = "https://github.com/DA0-DA0/dao-contracts.git" }
-cwd-proposal-single = { version = "0.2.0", git = "https://github.com/DA0-DA0/dao-contracts" }
-cwd-proposal-multiple = { version = "0.2.0", git = "https://github.com/DA0-DA0/dao-contracts" }
-cwd-voting-cw20-staked = { version = "0.2.0", git = "https://github.com/DA0-DA0/dao-contracts" }
-cw20-stake = { version = "0.2.6", git = "https://github.com/DA0-DA0/dao-contracts" }
-cwd-core = { version = "0.2.0", git = "https://github.com/DA0-DA0/dao-contracts" }
-cwd-interface = { version = "0.2.0", git = "https://github.com/DA0-DA0/dao-contracts" }
+cwd-voting = { workspace = true }
+cwd-proposal-single = { workspace = true }
+cwd-proposal-multiple = { workspace = true }
+cwd-voting-cw20-staked = { workspace = true }
+cw20-stake = { workspace = true }
+cwd-core = { workspace = true }
+cwd-interface = { workspace = true }
 # Testing generic msg
-cw4 = "0.16.0"
-cw4-group = "0.16.0"
-base64 = "0.13.0"
-serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
-rusty-hook = "0.11.2"
+cw4 = { workspace = true }
+cw4-group = { workspace = true }
+base64 = { workspace = true }
+serde_json = { workspace = true }
+rusty-hook = { workspace = true }

justfile

@@ -48,7 +48,7 @@ optimize:
 		--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
 		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
 		--platform linux/amd64 \
-		cosmwasm/workspace-optimizer:0.12.8
+		cosmwasm/workspace-optimizer:0.12.10
 
 optimize-m1:
 	docker run --rm -v "$(pwd)":/code \

packages/cw-croncat-core/Cargo.toml

@@ -13,23 +13,23 @@ optimize = """docker run --rm -v "$(pwd)":/code \
 """
 
 [dependencies]
-cosmwasm-std = { version = "1.0.0", features = ["staking", "stargate"] }
-cw-rules-core = { version = "0.1.2", path = "../cw-rules-core" }
-generic-query = { version = "0.1.1", path = "../generic-query" }
-cw-storage-plus = "0.16.0"
-cron_schedule = "0.2.3"
-cw2 = "0.16.0"
-cw20 = { version = "0.13.4" }
-schemars = "0.8"
-serde = { version = "1.0", default-features = false, features = ["derive"] }
-thiserror = { version = "1.0" }
-hex = { version = "0.4", default-features = false }
-sha2 = { version = "0.10.6", default-features = false }
-serde-cw-value = "0.7.0"
-serde-json-wasm = { version = "0.5.0" }
+cosmwasm-std = { workspace = true, features = ["staking", "stargate"] }
+cw-rules-core = { workspace = true, path = "../cw-rules-core" }
+generic-query = { workspace = true, path = "../generic-query" }
+cw-storage-plus = { workspace = true }
+cron_schedule = { workspace = true }
+cw2 = { workspace = true }
+cw20 = { workspace = true }
+schemars = { workspace = true }
+serde = { workspace = true, default-features = false, features = ["derive"] }
+thiserror = { workspace = true }
+hex = { workspace = true, default-features = false }
+sha2 = { workspace = true, default-features = false }
+serde-cw-value = { workspace = true }
+serde-json-wasm = { workspace = true }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.0.0" }
-cw-multi-test = { version = "0.16.0", features = ["staking"] }
-cw20-base = { version = "0.13.4", features = ["library"] }
-rusty-hook = "0.11.2"
+cosmwasm-schema = { workspace = true }
+cw-multi-test = { workspace = true, features = ["staking"] }
+cw20-base = { workspace = true, features = ["library"] }
+rusty-hook = { workspace = true }