Use workspace for edition, license, repository, and version (#690)

* Use workspace for edition, license, repository, and version * Update schema
DA0-DA0 · Apr 4, 2023 · 9261bb3 · 9261bb3
1 parent b09db5a
commit 9261bb3
Show file tree

Hide file tree

Showing 41 changed files with 125 additions and 111 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,10 @@ members = [
 exclude = ["ci/configs/"]
 
 [workspace.package]
+edition = "2021"
 license = "BSD-3-Clause"
+repository = "https://github.com/DA0-DA0/dao-contracts"
+version = "2.1.0"
 
 [profile.release.package.stake-cw20-external-rewards]
 codegen-units = 1

diff --git a/ci/bootstrap-env/Cargo.toml b/ci/bootstrap-env/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "bootstrap-env"
 version = "0.2.0"
-edition = "2021"
-repository = "https://github.com/DA0-DA0/dao-contracts"
+edition = { workspace = true }
+repository = { workspace = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 cosm-orc = { version = "4.0" }

diff --git a/ci/integration-tests/Cargo.toml b/ci/integration-tests/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "integration-tests"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
 
 # This crate depends on rand. These are not featured in
 # wasm builds of cosmwasm. Despite this crate only being used as a dev

diff --git a/contracts/dao-core/Cargo.toml b/contracts/dao-core/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "dao-core"
-version = "2.1.0"
 authors = ["ekez <ekez@withoutdoing.com>"]
-edition = "2021"
-repository = "https://github.com/DA0-DA0/dao-contracts"
 description = "A DAO DAO core module."
+edition = { workspace = true }
 license = { workspace = true }
+repository = { workspace = true }
+version = { workspace = true }
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/contracts/external/cw-admin-factory/Cargo.toml b/contracts/external/cw-admin-factory/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name ="cw-admin-factory"
-version = "2.1.0"
 authors = ["Jake Hartnell", "blue-note", "ekez <ekez@withoutdoing.com>"]
-edition = "2021"
-repository = "https://github.com/DA0-DA0/dao-contracts"
 description = "A CosmWasm factory contract for instantiating a contract as its own admin."
+edition = { workspace = true }
 license = { workspace = true }
+repository = { workspace = true }
+version = { workspace = true }
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/contracts/external/cw-fund-distributor/Cargo.toml b/contracts/external/cw-fund-distributor/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "cw-fund-distributor"
-version = "0.1.0"
 authors = ["bekauz <bekauz@protonmail.com>"]
-edition = "2021"
-repository = "https://github.com/DA0-DA0/dao-contracts"
 description = "A CosmWasm contract for distributing funds to DAO members based on voting power."
+edition = { workspace = true }
+repository = { workspace = true }
+version = "0.1.0"
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -31,4 +31,4 @@ cw-paginate = { workspace = true }
 [dev-dependencies]
 dao-core = { workspace = true, features = ["library"] }
 cw-multi-test = { workspace = true }
-cw20-base = { workspace = true, features = ["library"] }
+cw20-base = { workspace = true, features = ["library"] }
diff --git a/contracts/external/cw-payroll-factory/Cargo.toml b/contracts/external/cw-payroll-factory/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name ="cw-payroll-factory"
-version = "2.0.0-beta"
 authors = ["Jake Hartnell"]
-edition = "2021"
-repository = "https://github.com/DA0-DA0/dao-contracts"
 description = "A CosmWasm factory contract for instantiating a payroll contract."
+edition = { workspace = true }
+repository = { workspace = true }
+version = { workspace = true }
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/contracts/external/cw-payroll-factory/schema/cw-payroll-factory.json b/contracts/external/cw-payroll-factory/schema/cw-payroll-factory.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "cw-payroll-factory",
-  "contract_version": "2.0.0-beta",
+  "contract_version": "2.1.0",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

diff --git a/contracts/external/cw-token-swap/Cargo.toml b/contracts/external/cw-token-swap/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "cw-token-swap"
-version = "2.1.0"
 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."
+edition = { workspace = true }
 license = { workspace = true }
+repository = { workspace = true }
+version = { workspace = true }
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/contracts/external/cw-vesting/Cargo.toml b/contracts/external/cw-vesting/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "cw-vesting"
-version = "2.1.0"
 authors = ["Jake Hartnell", "ekez <ekez@withoutdoing.com>", "blue-note"]
-edition = "2021"
+edition = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
+version = { workspace = true }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -33,4 +35,4 @@ wynd-utils = { workspace = true }
 anyhow = { workspace = true }
 cw-multi-test = { workspace = true }
 cw20-base = { workspace = true }
-dao-testing = { workspace = true }
+dao-testing = { workspace = true }
diff --git a/contracts/pre-propose/dao-pre-propose-approval-single/Cargo.toml b/contracts/pre-propose/dao-pre-propose-approval-single/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "dao-pre-propose-approval-single"
-version = "2.1.0"
 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."
+edition = { workspace = true }
 license = { workspace = true }
+repository = { workspace = true }
+version = { workspace = true }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -40,4 +40,4 @@ dao-testing = { workspace = true }
 dao-voting = { workspace = true }
 dao-voting-cw4 = { workspace = true }
 dao-voting-cw20-staked = { workspace = true }
-dao-proposal-single = { workspace = true }
+dao-proposal-single = { workspace = true }
diff --git a/contracts/pre-propose/dao-pre-propose-approver/Cargo.toml b/contracts/pre-propose/dao-pre-propose-approver/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "dao-pre-propose-approver"
-version = "2.1.0"
 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."
+edition = { workspace = true }
 license = { workspace = true }
+repository = { workspace = true }
+version = { workspace = true }
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/contracts/pre-propose/dao-pre-propose-multiple/Cargo.toml b/contracts/pre-propose/dao-pre-propose-multiple/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "dao-pre-propose-multiple"
-version = "2.1.0"
 authors = ["ekez <zekemedley@gmail.com>", "Jake Hartnell <meow@no-reply.com>", "blue-note"]
-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."
+edition = { workspace = true }
 license = { workspace = true }
+repository = { workspace = true }
+version = { workspace = true }
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/contracts/pre-propose/dao-pre-propose-single/Cargo.toml b/contracts/pre-propose/dao-pre-propose-single/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "dao-pre-propose-single"
-version = "2.1.0"
 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."
+edition = { workspace = true }
 license = { workspace = true }
+repository = { workspace = true }
+version = { workspace = true }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -38,4 +38,4 @@ dao-interface = { workspace = true }
 dao-testing = { workspace = true }
 dao-proposal-hooks = { workspace = true }
 dao-proposal-single = { workspace = true }
-cw-hooks = { workspace = true }
+cw-hooks = { workspace = true }
diff --git a/contracts/proposal/dao-proposal-condorcet/Cargo.toml b/contracts/proposal/dao-proposal-condorcet/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name ="dao-proposal-condorcet"
-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."
+edition = { workspace = true }
 license = { workspace = true }
+repository = { workspace = true }
+version = "0.1.0"
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -39,4 +39,4 @@ dao-testing = { workspace = true }
 dao-voting-cw4 = { workspace = true }
 cw4-group = { workspace = true }
 cw4 = { workspace = true }
-anyhow = { workspace = true }
+anyhow = { workspace = true }
diff --git a/contracts/proposal/dao-proposal-multiple/Cargo.toml b/contracts/proposal/dao-proposal-multiple/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "dao-proposal-multiple"
-version = "2.1.0"
 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."
+edition = { workspace = true }
 license = { workspace = true }
+repository = { 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.

diff --git a/contracts/proposal/dao-proposal-single/Cargo.toml b/contracts/proposal/dao-proposal-single/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "dao-proposal-single"
-version = "2.1.0"
 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."
+edition = { workspace = true }
 license = { workspace = true }
+repository = { workspace = true }
+version = { workspace = true }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -56,4 +56,4 @@ cw20-base = { workspace = true }
 cw721-base = { workspace = true }
 cw4 = { workspace = true }
 cw4-group = { workspace = true }
-cw-core-v1 = { workspace = true, features = ["library"] }
+cw-core-v1 = { workspace = true, features = ["library"] }
diff --git a/contracts/staking/cw20-stake-external-rewards/Cargo.toml b/contracts/staking/cw20-stake-external-rewards/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
 name = "cw20-stake-external-rewards"
-version = "2.1.0"
 authors = ["Ben2x4 <Ben2x4@tutanota.com>", "ekez <ekez@withoutdoing.com>"]
 edition = "2018"
 license = { workspace = true }
+repository = { workspace = true }
+version = { workspace = true }
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/contracts/staking/cw20-stake-reward-distributor/Cargo.toml b/contracts/staking/cw20-stake-reward-distributor/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
 name = "cw20-stake-reward-distributor"
-version = "2.1.0"
 edition = "2018"
 authors = ["Vernon Johnson <vtj2105@columbia.edu>, ekez <ekez@withoutdoing.com>"]
 license = { workspace = true }
+repository = { workspace = true }
+version = { workspace = true }
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/contracts/staking/cw20-stake/Cargo.toml b/contracts/staking/cw20-stake/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "cw20-stake"
-version = "2.1.0"
+version = { workspace = true }
 authors = ["Ben2x4 <Ben2x4@tutanota.com>"]
-edition = "2018"
-repository = "https://github.com/DA0-DA0/cw-dao/contracts/cw20-stake"
 description = "CW20 token that can be staked and staked balance can be queried at any height"
+edition = "2018"
 license = { workspace = true }
+repository = { workspace = true }
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/contracts/voting/dao-voting-cw20-staked/Cargo.toml b/contracts/voting/dao-voting-cw20-staked/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "dao-voting-cw20-staked"
-version = "2.1.0"
 authors = ["Callum Anderson <callumanderson745@gmail.com>"]
-edition = "2021"
-repository = "https://github.com/DA0-DA0/dao-contracts"
 description = "A DAO DAO voting module based on staked cw20 tokens."
+edition = { workspace = true }
 license = { workspace = true }
+repository = { workspace = true }
+version = { workspace = true }
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/contracts/voting/dao-voting-cw4/Cargo.toml b/contracts/voting/dao-voting-cw4/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "dao-voting-cw4"
-version = "2.1.0"
 authors = ["Callum Anderson <callumanderson745@gmail.com>"]
-edition = "2021"
-repository = "https://github.com/DA0-DA0/dao-contracts"
 description = "A DAO DAO voting module based on cw4 membership."
+edition = { workspace = true }
 license = { workspace = true }
+repository = { workspace = true }
+version = { workspace = true }
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/contracts/voting/dao-voting-cw721-staked/Cargo.toml b/contracts/voting/dao-voting-cw721-staked/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "dao-voting-cw721-staked"
-version = "2.1.0"
 authors = ["CypherApe cypherape@protonmail.com"]
-edition = "2021"
-repository = "https://github.com/DA0-DA0/dao-contracts"
 description = "A DAO DAO voting module based on staked cw721 tokens."
+edition = { workspace = true }
 license = { workspace = true }
+repository = { workspace = true }
+version = { workspace = true }
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/contracts/voting/dao-voting-native-staked/Cargo.toml b/contracts/voting/dao-voting-native-staked/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "dao-voting-native-staked"
-version = "2.1.0"
 authors = ["Callum Anderson <callumanderson745@gmail.com>"]
-edition = "2021"
-repository = "https://github.com/DA0-DA0/dao-contracts"
 description = "A DAO DAO voting module based on staked cw721 tokens."
+edition = { workspace = true }
 license = { workspace = true }
+repository = { workspace = true }
+version = { workspace = true }
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/packages/cw-denom/Cargo.toml b/packages/cw-denom/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "cw-denom"
-version = "2.1.0"
-edition = "2021"
 authors = ["ekez ekez@withoutdoing.com"]
-repository = "https://github.com/DA0-DA0/dao-contracts"
 description = "A package for validation and handling of cw20 and native Cosmos SDK denominations."
+edition = { workspace = true }
 license = { workspace = true }
+repository = { workspace = true }
+version = { workspace = true }
 
 [dependencies]
 cosmwasm-std = { workspace = true }