Merge pull request #156 from DA0-DA0/shipping

Remove stake_cw20_gov

Cargo.toml

@@ -13,10 +13,6 @@ incremental = false
 codegen-units = 1
 incremental = false
 
-[profile.release.package.stake-cw20-gov]
-codegen-units = 1
-incremental = false
-
 [profile.release.package.cw-distribution]
 codegen-units = 1
 incremental = false

README.md

@@ -7,7 +7,6 @@
 | [cw3-multisig](contracts/cw3-multisig)       | A multisig contract.                                       |
 | [cw4-registry](contracts/cw4-registry)       | A contract for indexing multisig group members.            |
 | [stake-cw20](contracts/stake-cw20)           | A cw20 staking contract.                                   |
-| [stake-cw20-gov](contracts/stake-cw20-gov)   | A cw20 staking contract, with vote delegation.             |
 
 NOTE: _These contracts have yet to be audited. Please see the [disclaimer](#Disclaimer)._
 

contracts/cw3-dao/Cargo.toml

@@ -21,7 +21,7 @@ cw2 = { version = "0.11" }
 cw3 = { version = "0.11" }
 cw20 = "0.11"
 cw20-base = {  version = "0.11", features = ["library"] }
-stake-cw20-gov = { path = "../stake-cw20-gov" }
+stake-cw20 = { path = "../stake-cw20" }
 cw-storage-plus = {  version = "0.11" }
 cosmwasm-std = { version = "1.0.0-beta" }
 schemars = "0.8.8"

contracts/cw3-dao/src/contract.rs

@@ -139,7 +139,7 @@ pub fn instantiate(
                 funds: vec![],
                 admin: Some(env.contract.address.to_string()),
                 label,
-                msg: to_binary(&stake_cw20_gov::msg::InstantiateMsg {
+                msg: to_binary(&stake_cw20::msg::InstantiateMsg {
                     admin: env.contract.address,
                     unstaking_duration,
                     token_address: cw20_addr.addr(),
@@ -739,7 +739,7 @@ pub fn reply(deps: DepsMut, env: Env, msg: Reply) -> Result<Response, ContractEr
                         funds: vec![],
                         admin: Some(env.contract.address.to_string()),
                         label: env.contract.address.to_string(),
-                        msg: to_binary(&stake_cw20_gov::msg::InstantiateMsg {
+                        msg: to_binary(&stake_cw20::msg::InstantiateMsg {
                             admin: env.contract.address,
                             unstaking_duration,
                             token_address: cw20_addr,

contracts/cw3-dao/src/helpers.rs

@@ -4,9 +4,8 @@ use cosmwasm_std::{
 };
 use cw20::Cw20ExecuteMsg;
 
-use stake_cw20_gov::msg::{
-    QueryMsg as StakingContractQueryMsg, StakedBalanceAtHeightResponse,
-    TotalStakedAtHeightResponse, VotingPowerAtHeightResponse,
+use stake_cw20::msg::{
+    QueryMsg as StakingContractQueryMsg, StakedBalanceAtHeightResponse, TotalStakedAtHeightResponse,
 };
 
 use crate::{
@@ -88,7 +87,7 @@ pub fn get_voting_power_at_height(deps: Deps, address: Addr, height: u64) -> Std
     let staking_contract = STAKING_CONTRACT.load(deps.storage)?;
 
     // Get voting power at height
-    let balance: VotingPowerAtHeightResponse = deps.querier.query_wasm_smart(
+    let balance: StakedBalanceAtHeightResponse = deps.querier.query_wasm_smart(
         staking_contract,
         &StakingContractQueryMsg::StakedBalanceAtHeight {
             address: address.to_string(),

contracts/cw3-dao/src/tests.rs

@@ -21,7 +21,7 @@ use cw20::{
 use cw3::{Status, Vote};
 use cw_multi_test::{next_block, App, BankSudo, Contract, ContractWrapper, Executor, SudoMsg};
 use cw_utils::{Duration, Expiration};
-use stake_cw20_gov::msg::ReceiveMsg;
+use stake_cw20::msg::ReceiveMsg;
 use std::borrow::BorrowMut;
 
 const OWNER: &str = "admin0001";
@@ -55,9 +55,9 @@ pub fn contract_cw20_gov() -> Box<dyn Contract<Empty>> {
 
 pub fn contract_staking() -> Box<dyn Contract<Empty>> {
     let contract = ContractWrapper::new(
-        stake_cw20_gov::contract::execute,
-        stake_cw20_gov::contract::instantiate,
-        stake_cw20_gov::contract::query,
+        stake_cw20::contract::execute,
+        stake_cw20::contract::instantiate,
+        stake_cw20::contract::query,
     );
     Box::new(contract)
 }