Skip to content

Commit

Permalink
Tidy up toml files for publishing. (#624)
Browse files Browse the repository at this point in the history
  • Loading branch information
@0xekez
0xekez authored Jan 19, 2023
1 parent 820a186 commit f784e57
Show file tree
Hide file tree
Showing 31 changed files with 102 additions and 72 deletions.
84 changes: 42 additions & 42 deletions Cargo.lock
View file

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

55 changes: 29 additions & 26 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ members = [
]
exclude = ["ci/configs/"]

[workspace.package]
license = "BSD-3"

[profile.release.package.stake-cw20-external-rewards]
codegen-units = 1
incremental = false
Expand Down Expand Up @@ -60,31 +63,31 @@ cw-ownable = { git = "https://github.com/steak-enjoyers/cw-plus-plus", rev = "50

cw-admin-factory = { path = "./contracts/external/cw-admin-factory" }
dao-core = { path = "./contracts/dao-core" }
dao-proposal-single = { path = "./contracts/proposal/dao-proposal-single" }
dao-proposal-multiple = { path = "./contracts/proposal/dao-proposal-multiple" }
dao-proposal-condorcet = { path = "./contracts/proposal/dao-proposal-condorcet" }
dao-pre-propose-single = { path = "./contracts/pre-propose/dao-pre-propose-single" }
dao-pre-propose-multiple = { path = "./contracts/pre-propose/dao-pre-propose-multiple" }
dao-pre-propose-approval-single = { path = "./contracts/pre-propose/dao-pre-propose-approval-single" }
dao-pre-propose-approver = { path = "./contracts/pre-propose/dao-pre-propose-approver" }
cw20-stake = { path = "./contracts/staking/cw20-stake" }
dao-voting-cw4 = { path = "./contracts/voting/dao-voting-cw4" }
dao-voting-cw20-staked = { path = "./contracts/voting/dao-voting-cw20-staked" }
dao-voting-native-staked = { path = "./contracts/voting/dao-voting-native-staked" }
dao-voting-cw721-staked = { path = "./contracts/voting/dao-voting-cw721-staked" }
dao-voting-cw20-balance = { path = "./test-contracts/dao-voting-cw20-balance"}
cw-denom = { path = "./packages/cw-denom" }
cw-hooks = { path = "./packages/cw-hooks" }
cw721-controllers = { path = "./packages/cw721-controllers" }
dao-macros = { path = "./packages/dao-macros" }
dao-pre-propose-base = { path = "./packages/dao-pre-propose-base" }
dao-proposal-hooks = { path = "./packages/dao-proposal-hooks" }
dao-proposal-sudo = { path = "./test-contracts/dao-proposal-sudo" }
dao-testing = { path = "./packages/dao-testing" }
dao-vote-hooks = { path = "./packages/dao-vote-hooks" }
cw-paginate = { path = "./packages/cw-paginate" }
dao-interface = { path = "./packages/dao-interface" }
dao-voting = { path = "./packages/dao-voting" }
dao-proposal-single = { path = "./contracts/proposal/dao-proposal-single", version = "*" }
dao-proposal-multiple = { path = "./contracts/proposal/dao-proposal-multiple", version = "*" }
dao-proposal-condorcet = { path = "./contracts/proposal/dao-proposal-condorcet", version = "*" }
dao-pre-propose-single = { path = "./contracts/pre-propose/dao-pre-propose-single", version = "*" }
dao-pre-propose-multiple = { path = "./contracts/pre-propose/dao-pre-propose-multiple", version = "*" }
dao-pre-propose-approval-single = { path = "./contracts/pre-propose/dao-pre-propose-approval-single", version = "*" }
dao-pre-propose-approver = { path = "./contracts/pre-propose/dao-pre-propose-approver", version = "*" }
cw20-stake = { path = "./contracts/staking/cw20-stake", version = "*" }
dao-voting-cw4 = { path = "./contracts/voting/dao-voting-cw4", version = "*" }
dao-voting-cw20-staked = { path = "./contracts/voting/dao-voting-cw20-staked", version = "*" }
dao-voting-native-staked = { path = "./contracts/voting/dao-voting-native-staked", version = "*" }
dao-voting-cw721-staked = { path = "./contracts/voting/dao-voting-cw721-staked", version = "*" }
dao-voting-cw20-balance = { path = "./test-contracts/dao-voting-cw20-balance", version = "*" }
cw-denom = { path = "./packages/cw-denom", version = "*" }
cw-hooks = { path = "./packages/cw-hooks", version = "*" }
cw721-controllers = { path = "./packages/cw721-controllers", version = "*" }
dao-macros = { path = "./packages/dao-macros", version = "*" }
dao-pre-propose-base = { path = "./packages/dao-pre-propose-base", version = "*" }
dao-proposal-hooks = { path = "./packages/dao-proposal-hooks", version = "*" }
dao-proposal-sudo = { path = "./test-contracts/dao-proposal-sudo", version = "*" }
dao-testing = { path = "./packages/dao-testing", version = "*" }
dao-vote-hooks = { path = "./packages/dao-vote-hooks", version = "*" }
cw-paginate = { path = "./packages/cw-paginate", version = "*" }
dao-interface = { path = "./packages/dao-interface", version = "*" }
dao-voting = { path = "./packages/dao-voting", version = "*" }

# v1 dependencies. used for state migrations.
cw-core-v1 = { package = "cw-core", version = "0.1.0", git = "https://github.com/DA0-DA0/dao-contracts.git", tag = "v1.0.0" }
Expand All @@ -93,4 +96,4 @@ voting-v1 = { package = "voting", version = "0.1.0", git = "https://github.com/D
cw-utils-v1 = {package = "cw-utils", version = "0.13"}
cw20-stake-reward-distributor-v1 = { package = "stake-cw20-reward-distributor", version = "0.1.0", git = "https://github.com/DA0-DA0/dao-contracts.git", tag = "v1.0.0" }
cw20-stake-external-rewards-v1 = { package = "stake-cw20-external-rewards", version = "0.2.6", git = "https://github.com/DA0-DA0/dao-contracts.git", tag = "v1.0.0" }
cw20-stake-v1 = { package = "cw20-stake", version = "0.2.6", git = "https://github.com/DA0-DA0/dao-contracts.git", tag = "v1.0.0" }
cw20-stake-v1 = { package = "cw20-stake", version = "0.2.6", git = "https://github.com/DA0-DA0/dao-contracts.git", tag = "v1.0.0" }
1 change: 1 addition & 0 deletions contracts/dao-core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ authors = ["ekez <ekez@withoutdoing.com>"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO core module."
license = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
1 change: 1 addition & 0 deletions contracts/external/cw-admin-factory/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ authors = ["blue-note"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A CosmWasm factory contract for instantiating a contract as its own admin."
license = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
1 change: 1 addition & 0 deletions contracts/external/cw-token-swap/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ authors = ["ekez <ekez@withoutdoing.com>"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A CosmWasm contract for swapping native and cw20 assets."
license = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
1 change: 1 addition & 0 deletions contracts/pre-propose/dao-pre-propose-approval-single/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ authors = ["ekez <ekez@withoutdoing.com>", "Jake Hartnell <no-reply@no-reply.com
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO pre-propose module handling a proposal approval flow for for dao-proposal-single."
license = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
1 change: 1 addition & 0 deletions contracts/pre-propose/dao-pre-propose-approver/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ authors = ["ekez <ekez@withoutdoing.com>", "Jake Hartnell <no-reply@no-reply.com
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO pre-propose module for automatically making approval proposals for dao-pre-propose-approval-single."
license = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
1 change: 1 addition & 0 deletions contracts/pre-propose/dao-pre-propose-multiple/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ authors = ["ekez <zekemedley@gmail.com>", "Jake Hartnell <meow@no-reply.com>", "
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO pre-propose module for dao-proposal-multiple for native and cw20 deposits."
license = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
1 change: 1 addition & 0 deletions contracts/pre-propose/dao-pre-propose-single/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ authors = ["ekez <zekemedley@gmail.com>"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO pre-propose module for dao-proposal-single for native and cw20 deposits."
license = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
3 changes: 2 additions & 1 deletion contracts/proposal/dao-proposal-condorcet/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[package]
name ="dao-proposal-condorcet"
version = "2.0.0-beta"
version = "0.1.0"
authors = ["ekez <ekez@withoutdoing.com>"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO proposal module with ranked-choice, Condorcet voting."
license = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
2 changes: 1 addition & 1 deletion contracts/proposal/dao-proposal-condorcet/schema/dao-proposal-condorcet.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"contract_name": "dao-proposal-condorcet",
"contract_version": "2.0.0-beta",
"contract_version": "0.1.0",
"idl_version": "1.0.0",
"instantiate": {
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down
2 changes: 2 additions & 0 deletions contracts/proposal/dao-proposal-multiple/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ authors = ["blue-note"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO proposal module for multiple choice (a or b or c or ...) voting."
license = { 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",
Expand Down
1 change: 1 addition & 0 deletions contracts/proposal/dao-proposal-single/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ authors = ["ekez <ekez@withoutdoing.com>"]
edition = "2021"
repository = "https://github.com/DA0-DA0/dao-contracts"
description = "A DAO DAO proposal module for single choice (yes / no) voting."
license = { workspace = true }

[lib]
crate-type = ["cdylib", "rlib"]
Expand Down
Loading

0 comments on commit f784e57

Please sign in to comment.