cw20-hooks and dao-cw20-transfer-rules

DA0-DA0 · Apr 16, 2024 · d943eb4 · d943eb4
1 parent 3ab7017
commit d943eb4
Show file tree

Hide file tree

Showing 58 changed files with 7,411 additions and 136 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -63,6 +63,7 @@ prost-types = { version = "0.12.3", default-features = false }
 quote = "1.0"
 rand = "0.8"
 schemars = "0.8"
+semver = "1.0"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 serde-cw-value = "0.7"
 serde_json = "1.0"
@@ -90,6 +91,7 @@ cw-tokenfactory-issuer = { path = "./contracts/external/cw-tokenfactory-issuer",
 cw-tokenfactory-types = { path = "./packages/cw-tokenfactory-types", version = "2.4.2", default-features = false }
 cw-vesting = { path = "./contracts/external/cw-vesting", version = "2.4.2" }
 cw-wormhole = { path = "./packages/cw-wormhole", version = "2.4.2" }
+cw20-hooks = { path = "./contracts/external/cw20-hooks", version = "2.4.2" }
 cw20-stake = { path = "./contracts/staking/cw20-stake", version = "2.4.2" }
 cw721-controllers = { path = "./packages/cw721-controllers", version = "2.4.2" }
 cw721-roles = { path = "./contracts/external/cw721-roles", version = "2.4.2" }

diff --git a/ci/bootstrap-env/src/main.rs b/ci/bootstrap-env/src/main.rs
@@ -57,7 +57,7 @@ fn main() -> Result<()> {
             code_id: orc.contract_map.code_id("dao_voting_cw20_staked")?,
             msg: to_json_binary(&dao_voting_cw20_staked::msg::InstantiateMsg {
                 token_info: dao_voting_cw20_staked::msg::TokenInfo::New {
-                    code_id: orc.contract_map.code_id("cw20_base")?,
+                    code_id: orc.contract_map.code_id("cw20_hooks")?,
                     label: "DAO DAO Gov token".to_string(),
                     name: "DAO".to_string(),
                     symbol: "DAO".to_string(),
@@ -147,7 +147,7 @@ fn main() -> Result<()> {
 
     println!(
         "NEXT_PUBLIC_CW20_CODE_ID={}",
-        orc.contract_map.code_id("cw20_base")?
+        orc.contract_map.code_id("cw20_hooks")?
     );
     println!(
         "NEXT_PUBLIC_CW4GROUP_CODE_ID={}",

diff --git a/ci/integration-tests/Cargo.toml b/ci/integration-tests/Cargo.toml
@@ -12,7 +12,7 @@ edition = { workspace = true }
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 cosm-orc = { workspace = true }
 cw20 = { workspace = true }
-cw20-base = { workspace = true }
+cw20-hooks = { workspace = true }
 cw721-base = { workspace = true }
 cw721-roles = { workspace = true }
 cw721 = { workspace = true }

diff --git a/ci/integration-tests/src/helpers/helper.rs b/ci/integration-tests/src/helpers/helper.rs
@@ -41,7 +41,7 @@ pub fn create_dao(
             code_id: chain.orc.contract_map.code_id("dao_voting_cw20_staked")?,
             msg: to_json_binary(&dao_voting_cw20_staked::msg::InstantiateMsg {
                 token_info: dao_voting_cw20_staked::msg::TokenInfo::New {
-                    code_id: chain.orc.contract_map.code_id("cw20_base")?,
+                    code_id: chain.orc.contract_map.code_id("cw20_hooks")?,
                     label: "DAO DAO Gov token".to_string(),
                     name: "DAO".to_string(),
                     symbol: "DAO".to_string(),
@@ -106,7 +106,7 @@ pub fn create_dao(
         .orc
         .instantiate("dao_dao_core", op_name, &msg, key, None, vec![])?;
 
-    // add proposal, pre-propose, voting, cw20_stake, and cw20_base
+    // add proposal, pre-propose, voting, cw20_stake, and cw20_hooks
     // contracts to the orc contract map.
 
     let state: DumpStateResponse = chain
@@ -160,7 +160,7 @@ pub fn create_dao(
         .contract_map
         .add_address("cw20_stake", cw20_stake)
         .unwrap();
-    let cw20_base: String = chain
+    let cw20_hooks: String = chain
         .orc
         .query(
             "dao_voting_cw20_staked",
@@ -172,7 +172,7 @@ pub fn create_dao(
     chain
         .orc
         .contract_map
-        .add_address("cw20_base", cw20_base)
+        .add_address("cw20_hooks", cw20_hooks)
         .unwrap();
 
     Ok(DaoState {
@@ -185,7 +185,7 @@ pub fn stake_tokens(chain: &mut Chain, how_many: u128, key: &SigningKey) {
     chain
         .orc
         .execute(
-            "cw20_base",
+            "cw20_hooks",
             "send_and_stake_cw20",
             &cw20::Cw20ExecuteMsg::Send {
                 contract: chain.orc.contract_map.address("cw20_stake").unwrap(),
@@ -221,8 +221,8 @@ pub fn create_proposal(
     chain
         .orc
         .execute(
-            "cw20_base",
-            "cw20_base_increase_allowance",
+            "cw20_hooks",
+            "cw20_hooks_increase_allowance",
             &cw20::Cw20ExecuteMsg::IncreaseAllowance {
                 spender: chain
                     .orc

diff --git a/ci/integration-tests/src/tests/cw20_stake_test.rs b/ci/integration-tests/src/tests/cw20_stake_test.rs
@@ -69,14 +69,14 @@ fn execute_stake_tokens(chain: &mut Chain) {
     chain
         .orc
         .contract_map
-        .add_address("cw20_base", config.token_address.as_str())
+        .add_address("cw20_hooks", config.token_address.as_str())
         .unwrap();
     chain
         .orc
         .execute(
-            "cw20_base",
+            "cw20_hooks",
             "exc_stake_stake_tokens",
-            &cw20_base::msg::ExecuteMsg::Send {
+            &cw20_hooks::msg::ExecuteMsg::Send {
                 contract: staking_addr,
                 amount: Uint128::new(100),
                 msg: to_json_binary(&cw20_stake::msg::ReceiveMsg::Stake {}).unwrap(),

diff --git a/contracts/dao-dao-core/Cargo.toml b/contracts/dao-dao-core/Cargo.toml
@@ -32,7 +32,8 @@ cw-core-v1 = { workspace = true, features = ["library"] }
 
 [dev-dependencies]
 cw-multi-test = { workspace = true, features = ["stargate"] }
-cw20-base = { workspace = true }
+cw20-hooks = { workspace = true }
 cw721-base = { workspace = true }
 dao-proposal-sudo = { workspace = true }
 dao-voting-cw20-balance = { workspace = true }
+dao-testing = { workspace = true }