Skip to content

Commit

Permalink
Merge pull request #245 from CronCats/inherit-deps-workspace
Browse files Browse the repository at this point in the history
[FEATURE] Inherit dependencies from a workspace
  • Loading branch information
d3v3us authored Jan 9, 2023
2 parents 64af446 + f93efc0 commit c68b02a
Show file tree
Hide file tree
Showing 11 changed files with 177 additions and 162 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.63.0
toolchain: 1.64.0
override: true
components: rustfmt, clippy

Expand Down
41 changes: 6 additions & 35 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 56 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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","@NinoLipartiia","@Buckram123","deveusss"]
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
"""
4 changes: 2 additions & 2 deletions checksum
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
2d2b8d5bb188d7a29b24a00c5fcb87c1e2e4f7c53c0f4bf176e2dc2024bd2cc6 cw_croncat.wasm
307b8919d8fcae59dd7336319c6220fe5c477488b59bf043158fba67a292234d cw_rules.wasm
b589630b11c5c0b1734b5c2cd7163efdbf7d4f25e7401d0662bd589c8225b628 cw_croncat.wasm
ce9221c037fb3c97b88fab2441130533d52df2e1f684663906444b2046bcdfb0 cw_rules.wasm
72 changes: 34 additions & 38 deletions contracts/cw-croncat/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"]

Expand All @@ -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 }
80 changes: 37 additions & 43 deletions contracts/cw-rules/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"]

Expand All @@ -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 }
4 changes: 2 additions & 2 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ 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 \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
--platform linux/arm64 \
cosmwasm/workspace-optimizer:0.12.8
cosmwasm/workspace-optimizer:0.12.10

optimize-rs:
docker run --rm -v "$(pwd)":/code \
Expand Down
Loading

0 comments on commit c68b02a

Please sign in to comment.