fix package dependency collision and clean up stuff (#897)

DA0-DA0 · Nov 8, 2024 · a48363e · a48363e
1 parent f816da4
commit a48363e
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 70 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -101,7 +101,6 @@ cw-wormhole = { path = "./packages/cw-wormhole", version = "2.6.0" }
 cw20-stake = { path = "./contracts/staking/cw20-stake", version = "2.6.0" }
 cw20-stake-external-rewards = { path = "./contracts/staking/cw20-stake-external-rewards", version = "2.6.0" }
 cw20-stake-reward-distributor = { path = "./contracts/staking/cw20-stake-reward-distributor", version = "2.6.0" }
-cw721-controllers = { path = "./packages/cw721-controllers", version = "2.6.0" }
 cw721-roles = { path = "./contracts/external/cw721-roles", version = "2.6.0" }
 dao-cw721-extensions = { path = "./packages/dao-cw721-extensions", version = "2.6.0" }
 dao-dao-core = { path = "./contracts/dao-dao-core", version = "2.6.0" }
@@ -131,6 +130,7 @@ dao-voting-cw721-roles = { path = "./contracts/voting/dao-voting-cw721-roles", v
 dao-voting-cw721-staked = { path = "./contracts/voting/dao-voting-cw721-staked", version = "2.6.0" }
 dao-voting-onft-staked = { path = "./contracts/voting/dao-voting-onft-staked", version = "2.6.0" }
 dao-voting-token-staked = { path = "./contracts/voting/dao-voting-token-staked", version = "2.6.0" }
+nft-controllers = { path = "./packages/nft-controllers", version = "2.6.0" }
 
 # v1 dependencies. used for state migrations.
 cw-core-v1 = { package = "cw-core", version = "0.1.0" }

diff --git a/README.md b/README.md
@@ -11,7 +11,6 @@
 
 [![DAO DAO DAO](https://img.shields.io/badge/DAO%20DAO%20DAO-gray?logo=data%3Aimage%2Fpng%3Bbase64%2CiVBORw0KGgoAAAANSUhEUgAAAHAAAABwCAMAAADxPgR5AAAABGdBTUEAALGPC%2FxhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAR1QTFRF%2F%2F%2F%2F7%2FDw0NDRoaOjgoSFY2VmREdIJSgpFhgaBgkLNTc4sbKz0dHRREZINTc54ODgwMHCwMLCJSgpREZIoqOjNTc5VFZXoqOksbKz0dHRwcHCkpOUsbKyoqKjJikqc3V2g4SFoaGiwMDB7%2FDwoaKjFxkb39%2FfkZKTFhgaY2VnZGZnZGVn7u%2FvgoOEdHZ3BwoM%2Fv7%2BwcLCRUhJNjg5NTc4gYOENTg5cnR2c3V3sLGy7%2B%2Fv0NHR0NDRU1ZXoaOkgoSFY2VmREdIz9DQJSgqoaKiFhkaBgkL3%2BDgv8DBNDc5z8%2FQsLKzVVdY7u7uwMHBkpSUFxobZWZodHV3sbGyc3R2Njg6RUdJoKKiv8HBr7GykZOT3t%2Ff%2F%2F%2F%2FcnR1oaOjFOTQHAAAAA90Uk5T%2Fv7%2B%2Fv7%2B%2Fv7%2B%2Fv7%2B%2Fv7%2B6a2FXwAABrRJREFUaN7Vm%2BtjmzYQwNnWx7ZuUwq1jU0Dbp04LM0CTWu3pWnBdXHjuY9kXV8b5P%2F%2FM4aFAElIIAH5sPsWk%2BjnO%2B4hnS5KJCPe6Us%2FWCyX4SqRcLleBP7mVGoFRRGHvYzXK6asg0vQNXDH58ByaHy7O6DnhysBUWPQCXBHWwnLYtMaeKdHrLjsxwN9CDyoOBiNjFhTSTUvWwHv4qv1Yt1jWlyPe8LISiBuTM3wqtYBu9jvmqAR0LOKLz326t0B3CvMEQB54E7%2B59pINMh0rdauPGChnjhuK%2FdzpDWRAQK1EQ4i1co3yQbuoUAPjaiBZO9yXxcF%2Bpl6IGok0wAt4IsBrTbqpXJg84gM4O%2FIz0DUQqbIrIf1QMR74EWt5KjPJpaAiDeOWssfTCIN9Dvj5cTjKiDiGVHUIdHnA%2B92qB90Vrics8cDgrBbXqbjPmADPbVrXkY0J0xgGvD9LnmR%2B4ByHAx4J413r1NgdATN5jwsA9MCEYKoY5nahFELYNBlQJRd9ZgGgnRr0D0vcjXcqDlQbZ%2Bwq416QgJTj9mLrkSgUR2dAKYKXg0PGdXEgamCD68IGN2HKl5iQKjg4qp4SMVHBVC%2FWgUzFR%2FmQI2toLeJ%2B9vDbrhexBuvvYonGTCNQb10siBPhf1NaxUnCGgxXPSuyjhxXjZXUUWlGALVUgwCziH0cePMMIOFMQXuwLXwpQzuEdtummyPkNtsgRbtMn7Vqdpv4zY%2BBM4pi%2FrV53i%2FRX57tAUCyqJ%2BXefAb2HTSQKEae1x8f7qexWN3qM7h%2BktAcLK%2B4TauVWK3cRXXegqTxPgnIj6nlA7pomKz%2BBLTIBwiQmxk6oVvfFL%2FE55TqQZVQzYpHK6yy3we0XHbaSL9rgaVBb3xRb4g%2BLjPvNCuKnW1GuuKQHm6BPhLp49kSfubf%2FwuqJhFipbNByPomgYCLmN5ydrrS%2Br3fSGMseAVsk5ANW3yeUJ91jP7bS92j69qSyxxFYqSvnfApt60mdXPOqsRH6jFGhjYTinVg34Gb0UGK9rky0MxB8V%2BCvoI1oNrGE%2For2GlSqRnHDcdPvsJwJIWxT%2F9apn2WpInP8PEMsnz%2BlnE1ZFT%2BURRZoQQNxpbH6pDbgOjO%2BSyl0L6OKE0%2BBhseQWPlAb%2BUdFWNC2fEOExRJzx3kp8KcuEdRVZZ8f%2BGj1s%2B3Tn9PUpnPsloTin657NmNsAxjdjntJ9dYY%2FfgBBryRJu9LTmrrJn0b2L7tOlGeBhJA8ZKo60R5GmD2eS4DPBEuvKdF4Di3yC2GLQF0TgV7CvtYdk%2B2GBM8jDUZFd%2BKKRic4JsoapvoywAdobd45hjUNtHCvGYkA%2BQWPlzeqcj0qc8cJsABvtW3pYjHIjsnE9%2Fq7yVA4iVaUsD6c80s77LDxOaA%2FLhmNLFpLXFWOPPr%2FLiWekq20dS6JM6KWpWWr6cQOMJtakgCedd2W3%2BxsFo1xY7caVVCX3ViyxJNTgI4U%2FFa9Rr9AIE%2Bnmz8lbSwLmBfaUQxTjeRTxEw9dP3TVUsN428M40qxs9SH2W2voxVEwn7H26fJqXQe7P50A%2Fp3QbV%2BkJu876ho1a93wirvbBFi9qXc1zFUWc8B5Q6tAi4S6hodQUcEwru4S1oE1dxYnZrUFcttaDRyfAg2xTud8E7B3gMIv%2FJrxGgle0p%2Bmm3ixdoEPtHk7q3GJFH93F3L9ANcP8proIswqjRRVveX%2BRV0GHp7in1lNyobYkX%2BR4qJLbj2HVealT1qBPiRbHFIM83VReWxx3w3D5pXwKIwm%2BWfzB2WvpLdogzPc6l8z5FNBrF4%2FkuxTsHvGt1FH4FETTIOdhxLeU5H%2FmDA2OaKG%2FWvz36UDyuGo04LhGBKYPEJ4xYvPLwBwqGmYsZWhhJjODMKIflADNi%2FyiSRYb44fddn8ljDfBcZMd7wp0%2B1SHJSbvswE%2FzmCNKyHPsAxf%2FdHhoOlxoGJPTYQchlVArgblnBlPy86Hx%2BbwMDbUxNYs21VbcsRX2mJmOAl794tKPhrr%2F9nM2stsL4sGwfOkTlhJAHbAIePWrK9loLrakEoN0SV49zky3kELmODwBiAC3oZB38L%2B50jiTN2JYMe4JDnP%2FUL9M65mer65q1ItqBlrxrLZImBVQ74PGzm9SQCrFrONv71wG1dsQA%2BDmx6oVa4eSqaymLuJ%2Fvn79Nx1KfnO6eRn3yZ7numaARGDsWv%2FsNCoWjYHJu7SEkvdSZJJYdHR%2BZH1yKqG9sdisrcQ%2FB4DdwwTKovbigfCkhiIpv9y6dv3X37JcutQCfzCUGgtR%2FgO61zuwRnnviwAAAABJRU5ErkJggg%3D%3D)](https://daodao.zone/dao/juno10h0hc64jv006rr8qy0zhlu4jsxct8qwa0vtaleayh0ujz0zynf2s2r7v8q)
 
-
 This is a collection of smart contracts for building composable, modular, and upgradable DAOs.
 
 For a detailed look at how these contracts work, see [our wiki](https://github.com/DA0-DA0/dao-contracts/wiki/DAO-DAO-Contracts-Design).
@@ -38,42 +37,6 @@ If you believe you have found a problem, please [let us know](SECURITY.md).
 
 DAO DAO has been audited by [Oak Security](https://www.oaksecurity.io/) on multiple occasions. You can find all the audit reports [here](https://github.com/oak-security/audit-reports/tree/master/DAO%20DAO).
 
-`v2.3.0` is the most recent DAO DAO release; only new feautres related to tokenfactory and improved NFT DAOs have been [audited](https://github.com/oak-security/audit-reports/blob/master/DAO%20DAO/2023-10-16%20Audit%20Report%20-%20DAO%20DAO%20Updates%20v1.0.pdf). Our most recently [full audited](https://github.com/oak-security/audit-reports/blob/master/DAO%20DAO/2023-02-06%20Audit%20Report%20-%20DAO%20DAO%202%20v1.0.pdf) release is `v2.0.0`. Vesting and payroll were added and [audited](https://github.com/oak-security/audit-reports/blob/master/DAO%20DAO/2023-03-22%20Audit%20Report%20-%20DAO%20DAO%20Vesting%20and%20Payroll%20Factory%20v1.0.pdf) in `v2.1.0`.
-
-Audited contracts include:
-- [cw-payroll-factory](https://crates.io/crates/cw-payroll-factory)
-- [cw-tokenfactory-issuer](https://crates.io/crates/cw-tokenfactory-issuer)
-- [cw-token-swap](https://crates.io/crates/cw-token-swap)
-- [cw-vesting](https://crates.io/crates/cw-vesting)
-- [dao-dao-core](https://crates.io/crates/dao-dao-core)
-- [dao-pre-propose-approval-single](https://crates.io/crates/dao-pre-propose-approval-single)
-- [dao-pre-propose-approver](https://crates.io/crates/dao-pre-propose-approver)
-- [dao-pre-propose-multiple](https://crates.io/crates/dao-pre-propose-multiple)
-- [dao-pre-propose-single](https://crates.io/crates/dao-pre-propose-single)
-- [dao-proposal-condorcet](https://crates.io/crates/dao-proposal-condorcet)
-- [dao-proposal-multiple](https://crates.io/crates/dao-proposal-multiple)
-- [dao-proposal-single](https://crates.io/crates/dao-proposal-single)
-- [cw20-stake](https://crates.io/crates/cw20-stake)
-- [cw20-stake-external-rewards](https://crates.io/crates/cw20-stake-external-rewards)
-- [cw20-stake-reward-distributor](https://crates.io/crates/cw20-stake-reward-distributor)
-- [dao-voting-cw4](https://crates.io/crates/dao-voting-cw4)
-- [dao-voting-cw20-staked](https://crates.io/crates/dao-voting-cw20-staked)
-- [dao-voting-cw721-staked](https://crates.io/crates/dao-voting-cw721-staked)
-- [dao-voting-token-staked](https://crates.io/crates/dao-voting-token-staked)
-
-Audited packages include:
-- [cw721-controllers](https://crates.io/crates/cw721-controllers)
-- [cw-denom](https://crates.io/crates/cw-denom)
-- [cw-hooks](https://crates.io/crates/cw-hooks)
-- [cw-paginate-storage](https://crates.io/crates/cw-paginate-storage)
-- [cw-stake-tracker](https://crates.io/crates/cw-stake-tracker)
-- [cw-wormhole](https://crates.io/crates/cw-wormhole)
-- [dao-dao-macros](https://crates.io/crates/dao-dao-macros)
-- [dao-hooks](https://crates.io/crates/dao-hooks)
-- [dao-interface](https://crates.io/crates/dao-interface)
-- [dao-pre-propose-based](https://crates.io/crates/dao-pre-propose-based)
-- [dao-voting](https://crates.io/crates/dao-voting)
-
 ## Why?
 
 Our institutions grew rapidly after 1970, but as time passed their priorities shifted from growth, to protectionism. We're fighting this. We believe The Internet is where the organizations of tomorrow will be built.

diff --git a/contracts/voting/dao-voting-cw721-staked/Cargo.toml b/contracts/voting/dao-voting-cw721-staked/Cargo.toml
@@ -30,14 +30,14 @@ cw-controllers = { workspace = true }
 cw-hooks = { workspace = true }
 cw721 = { workspace = true }
 cw721-base = { workspace = true, features = ["library"] }
-cw721-controllers = { workspace = true }
 cw721-controllers-v250 = { workspace = true }
 cw-utils = { workspace = true }
 cw2 = { workspace = true }
 dao-dao-macros = { workspace = true }
 dao-hooks = { workspace = true }
 dao-interface = { workspace = true }
 dao-voting = { workspace = true }
+nft-controllers = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]

diff --git a/contracts/voting/dao-voting-cw721-staked/src/error.rs b/contracts/voting/dao-voting-cw721-staked/src/error.rs
@@ -21,7 +21,7 @@ pub enum ContractError {
     UnstakingDurationError(#[from] dao_voting::duration::UnstakingDurationError),
 
     #[error(transparent)]
-    NftClaimError(#[from] cw721_controllers::NftClaimError),
+    NftClaimError(#[from] nft_controllers::NftClaimError),
 
     #[error("Can not stake that which has already been staked")]
     AlreadyStaked {},

diff --git a/contracts/voting/dao-voting-cw721-staked/src/state.rs b/contracts/voting/dao-voting-cw721-staked/src/state.rs
@@ -1,10 +1,10 @@
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{Addr, Binary, Empty, StdError, StdResult, Storage, Uint128};
-use cw721_controllers::NftClaims;
 use cw_hooks::Hooks;
 use cw_storage_plus::{Item, Map, SnapshotItem, SnapshotMap, Strategy};
 use cw_utils::Duration;
 use dao_voting::threshold::ActiveThreshold;
+use nft_controllers::NftClaims;
 
 use crate::ContractError;
 

diff --git a/contracts/voting/dao-voting-onft-staked/Cargo.toml b/contracts/voting/dao-voting-onft-staked/Cargo.toml
@@ -32,7 +32,6 @@ cosmwasm-schema = { workspace = true }
 cw-storage-plus = { workspace = true }
 cw-controllers = { workspace = true }
 cw-hooks = { workspace = true }
-cw721-controllers = { workspace = true }
 cw721-controllers-v250 = { workspace = true }
 cw-utils = { workspace = true }
 cw2 = { workspace = true }
@@ -41,6 +40,7 @@ dao-hooks = { workspace = true }
 dao-interface = { workspace = true }
 dao-voting = { workspace = true }
 omniflix-std = { workspace = true }
+nft-controllers = { workspace = true }
 serde = { workspace = true }
 thiserror = { workspace = true }
 

diff --git a/contracts/voting/dao-voting-onft-staked/src/error.rs b/contracts/voting/dao-voting-onft-staked/src/error.rs
@@ -17,7 +17,7 @@ pub enum ContractError {
     UnstakingDurationError(#[from] dao_voting::duration::UnstakingDurationError),
 
     #[error(transparent)]
-    NftClaimError(#[from] cw721_controllers::NftClaimError),
+    NftClaimError(#[from] nft_controllers::NftClaimError),
 
     #[error("Nothing to claim")]
     NothingToClaim {},

diff --git a/contracts/voting/dao-voting-onft-staked/src/state.rs b/contracts/voting/dao-voting-onft-staked/src/state.rs
@@ -1,10 +1,10 @@
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{Addr, Empty, StdError, StdResult, Storage, Uint128};
-use cw721_controllers::NftClaims;
 use cw_hooks::Hooks;
 use cw_storage_plus::{Item, Map, SnapshotItem, SnapshotMap, Strategy};
 use cw_utils::Duration;
 use dao_voting::threshold::ActiveThreshold;
+use nft_controllers::NftClaims;
 
 use crate::ContractError;
 

diff --git a/packages/cw721-controllers/README.md b/packages/cw721-controllers/README.md
diff --git a/packages/cw721-controllers/Cargo.toml → packages/nft-controllers/Cargo.toml b/packages/cw721-controllers/Cargo.toml → packages/nft-controllers/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
-name = "cw721-controllers"
-authors = ["CypherApe [email protected]"]
-description = "A package for managing cw721 claims."
+name = "nft-controllers"
+authors = ["CypherApe [email protected]", "Noah <[email protected]>"]
+description = "A package for managing NFT claims."
 edition = { workspace = true }
 license = { workspace = true }
 repository = { workspace = true }

diff --git a/packages/nft-controllers/README.md b/packages/nft-controllers/README.md
@@ -0,0 +1,8 @@
+# NFT Controllers
+
+This is an implementation of cw-plus'
+[cw-controllers](https://github.com/CosmWasm/cw-plus/tree/72afcde846b907fac5c0394ce86ed5a59ce47524/packages/controllers)
+package for NFTs. It manages claims for our NFT staking contracts:
+
+- [dao-voting-cw721-staked](../../contracts/voting/dao-voting-cw721-staked)
+- [dao-voting-onft-staked](../../contracts/voting/dao-voting-onft-staked)
diff --git a/packages/cw721-controllers/src/lib.rs → packages/nft-controllers/src/lib.rs b/packages/cw721-controllers/src/lib.rs → packages/nft-controllers/src/lib.rs
diff --git a/packages/cw721-controllers/src/nft_claim.rs → packages/nft-controllers/src/nft_claim.rs b/packages/cw721-controllers/src/nft_claim.rs → packages/nft-controllers/src/nft_claim.rs
diff --git a/scripts/publish.sh b/scripts/publish.sh
@@ -50,7 +50,7 @@ cd packages/cw-paginate-storage
 cargo publish
 cd "$START_DIR"
 
-cd packages/cw721-controllers
+cd packages/nft-controllers
 cargo publish
 cd "$START_DIR"
 
@@ -93,7 +93,7 @@ cd "$START_DIR"
 sleep 120
 
 cd contracts/test/dao-voting-cw20-balance
-cargo publish
+cargo hack publish --no-dev-deps --allow-dirty
 cd "$START_DIR"
 
 cd contracts/test/dao-proposal-hook-counter