Merge pull request #104 from confio/release-0.6.0

Release 0.6.0

Author: maurolacy

CHANGELOG.md

@@ -2,78 +2,83 @@
 
 ## [Unreleased](https://github.com/confio/poe-contracts/tree/HEAD)
 
-[Full Changelog](https://github.com/confio/poe-contracts/compare/v0.6.0-rc2...HEAD)
+[Full Changelog](https://github.com/confio/poe-contracts/compare/v0.6.0...HEAD)
 
-## [v0.6.0-rc2](https://github.com/confio/poe-contracts/tree/v0.6.0-rc2) (2022-02-03)
+## [v0.6.0](https://github.com/confio/poe-contracts/tree/v0.6.0) (2022-02-15)
+
+[Full Changelog](https://github.com/confio/poe-contracts/compare/v0.6.0-rc2...v0.6.0)
 
 **Breaking changes:**
 
-- Use specilaized tg3 version of voting API for tgrade contracts [\#85](https://github.com/confio/poe-contracts/issues/85)
-- Valset config contract names [\#96](https://github.com/confio/poe-contracts/pull/96) ([maurolacy](https://github.com/maurolacy))
-- tg3: Common voting interfaces for tgrade [\#93](https://github.com/confio/poe-contracts/pull/93) ([hashedone](https://github.com/hashedone))
-- Rename API to points and rewards [\#50](https://github.com/confio/poe-contracts/pull/50) ([ethanfrey](https://github.com/ethanfrey))
+- Rename `Tg4Contract::total_weight` to `Tg4Contract::total_points` in `packages/tg4`.
+
+- Some `Response` `attributes` renaming in `tg4-engagement`:
+  - "distribute_tokens" -> "distribute_rewards"
+  - "withdraw_tokens" -> "withdraw_rewards"
+  - "token" -> "rewards"
+  -  "weight" -> "points"
 
 **Closed issues:**
 
-- Valset: add `ListJailedValidators` query [\#87](https://github.com/confio/poe-contracts/issues/87)
-- Add `list_votes_by_voter` query to `voting_contract` [\#78](https://github.com/confio/poe-contracts/issues/78)
-- Increase max limit [\#76](https://github.com/confio/poe-contracts/issues/76)
-- Missing items found when updating Go code [\#75](https://github.com/confio/poe-contracts/issues/75)
-- Tools to help build API Migration Guide [\#72](https://github.com/confio/poe-contracts/issues/72)
-- \[tgrade-valset\] Metadata issues [\#66](https://github.com/confio/poe-contracts/issues/66)
-- Ensure validator is online before adding to the active set [\#36](https://github.com/confio/poe-contracts/issues/36)
+- Refactor local names to match new naming rules [\#86](https://github.com/confio/poe-contracts/issues/86)
 
 **Merged pull requests:**
 
-- Valset: Implement ListJailedValidators query [\#92](https://github.com/confio/poe-contracts/pull/92) ([ueco-jb](https://github.com/ueco-jb))
-- Valset: metadata validation [\#84](https://github.com/confio/poe-contracts/pull/84) ([ueco-jb](https://github.com/ueco-jb))
-- Increase MAX\_LIMIT constant to 100 and DEFAULT\_LIMIT to 30 [\#80](https://github.com/confio/poe-contracts/pull/80) ([ueco-jb](https://github.com/ueco-jb))
-- Voting Contract: Add list\_votes\_by\_voter query [\#79](https://github.com/confio/poe-contracts/pull/79) ([ueco-jb](https://github.com/ueco-jb))
-- Feature-gated `SimulateValidatorSet` [\#77](https://github.com/confio/poe-contracts/pull/77) ([maurolacy](https://github.com/maurolacy))
-- Add `diff_schema.sh` / `diff_state.sh` tools [\#74](https://github.com/confio/poe-contracts/pull/74) ([maurolacy](https://github.com/maurolacy))
+- Aligning local names to APIs [\#102](https://github.com/confio/poe-contracts/pull/102) ([hashedone](https://github.com/hashedone))
 
-## [v0.6.0-beta1](https://github.com/confio/poe-contracts/tree/v0.6.0-beta1) (2022-02-03)
+## [v0.6.0-rc2](https://github.com/confio/poe-contracts/tree/v0.6.0-rc2) (2022-02-10)
 
-[Full Changelog](https://github.com/confio/poe-contracts/compare/v0.6.0-alpha1...v0.6.0-beta1)
+[Full Changelog](https://github.com/confio/poe-contracts/compare/v0.5.5...v0.6.0-rc2)
 
 **Breaking changes:**
 
+- Use specilaized tg3 version of voting API for tgrade contracts [\#85](https://github.com/confio/poe-contracts/issues/85)
+- Valset config contract names [\#96](https://github.com/confio/poe-contracts/pull/96) ([maurolacy](https://github.com/maurolacy))
+- tg3: Common voting interfaces for tgrade [\#93](https://github.com/confio/poe-contracts/pull/93) ([hashedone](https://github.com/hashedone))
+- Rename API to points and rewards [\#50](https://github.com/confio/poe-contracts/pull/50) ([ethanfrey](https://github.com/ethanfrey))
 - `valset`: Optimize VALIDATORS storage [\#42](https://github.com/confio/poe-contracts/issues/42)
 - Optimize validators storage [\#61](https://github.com/confio/poe-contracts/pull/61) ([maurolacy](https://github.com/maurolacy))
-
-**Closed issues:**
-
-- Voting's helper `update_status()` should save changed status [\#62](https://github.com/confio/poe-contracts/issues/62)
-- \[voting-contract\] More status issues [\#55](https://github.com/confio/poe-contracts/issues/55)
-
-**Merged pull requests:**
-
-- Voting Contract: vote and close uses current status [\#60](https://github.com/confio/poe-contracts/pull/60) ([ueco-jb](https://github.com/ueco-jb))
-
-## [v0.6.0-alpha1](https://github.com/confio/poe-contracts/tree/v0.6.0-alpha1) (2022-01-31)
-
-[Full Changelog](https://github.com/confio/poe-contracts/compare/v0.5.5...v0.6.0-alpha1)
-
-**Breaking changes:**
-
 - \[voting-contract\] Record proposal creator [\#31](https://github.com/confio/poe-contracts/issues/31)
-- Validator set query pagination [\#51](https://github.com/confio/poe-contracts/pull/51) ([maurolacy](https://github.com/maurolacy))
-- valset: Add a feature to update `min_weight` and `max_validators` [\#45](https://github.com/confio/poe-contracts/pull/45) ([uint](https://github.com/uint))
 - Store information about operators' validator status [\#37](https://github.com/confio/poe-contracts/pull/37) ([uint](https://github.com/uint))
 
 **Closed issues:**
 
+- Tag 0.6.0-rc1 [\#88](https://github.com/confio/poe-contracts/issues/88)
+- Valset: add `ListJailedValidators` query [\#87](https://github.com/confio/poe-contracts/issues/87)
+- Add `list_votes_by_voter` query to `voting_contract` [\#78](https://github.com/confio/poe-contracts/issues/78)
+- Increase max limit [\#76](https://github.com/confio/poe-contracts/issues/76)
+- Missing items found when updating Go code [\#75](https://github.com/confio/poe-contracts/issues/75)
+- Tools to help build API Migration Guide [\#72](https://github.com/confio/poe-contracts/issues/72)
+- \[tgrade-valset\] Metadata issues [\#66](https://github.com/confio/poe-contracts/issues/66)
+- Tag v0.6.0-beta1 [\#67](https://github.com/confio/poe-contracts/issues/67)
+- Voting's helper `update_status()` should save changed status [\#62](https://github.com/confio/poe-contracts/issues/62)
+- \[voting-contract\] More status issues [\#55](https://github.com/confio/poe-contracts/issues/55)
 - Validator Voting: check `migrate_msg` content to be \>0 [\#46](https://github.com/confio/poe-contracts/issues/46)
 - Add Open Text Proposals [\#15](https://github.com/confio/poe-contracts/issues/15)
 
 **Merged pull requests:**
 
+- Release 0.6.0-rc2 [\#99](https://github.com/confio/poe-contracts/pull/99) ([ueco-jb](https://github.com/ueco-jb))
+- tg3: align version [\#100](https://github.com/confio/poe-contracts/pull/100) ([uint](https://github.com/uint))
+- Fix typo in publish.sh script [\#98](https://github.com/confio/poe-contracts/pull/98) ([ueco-jb](https://github.com/ueco-jb))
+- Add tg3 package to publishing script [\#97](https://github.com/confio/poe-contracts/pull/97) ([maurolacy](https://github.com/maurolacy))
+- Release 0.6.0-rc1 [\#95](https://github.com/confio/poe-contracts/pull/95) ([ueco-jb](https://github.com/ueco-jb))
+- Valset: Implement ListJailedValidators query [\#92](https://github.com/confio/poe-contracts/pull/92) ([ueco-jb](https://github.com/ueco-jb))
+- Valset: metadata validation [\#84](https://github.com/confio/poe-contracts/pull/84) ([ueco-jb](https://github.com/ueco-jb))
+- Increase MAX\_LIMIT constant to 100 and DEFAULT\_LIMIT to 30 [\#80](https://github.com/confio/poe-contracts/pull/80) ([ueco-jb](https://github.com/ueco-jb))
+- Voting Contract: Add list\_votes\_by\_voter query [\#79](https://github.com/confio/poe-contracts/pull/79) ([ueco-jb](https://github.com/ueco-jb))
+- Feature-gated `SimulateValidatorSet` [\#77](https://github.com/confio/poe-contracts/pull/77) ([maurolacy](https://github.com/maurolacy))
+- Add `diff_schema.sh` / `diff_state.sh` tools [\#74](https://github.com/confio/poe-contracts/pull/74) ([maurolacy](https://github.com/maurolacy))
+- Release v0.6.0-beta1 [\#73](https://github.com/confio/poe-contracts/pull/73) ([maurolacy](https://github.com/maurolacy))
+- Voting Contract: vote and close uses current status [\#60](https://github.com/confio/poe-contracts/pull/60) ([ueco-jb](https://github.com/ueco-jb))
 - Update rust toolchain to v1.58.1 [\#58](https://github.com/confio/poe-contracts/pull/58) ([uint](https://github.com/uint))
 - 0.6.0-alpha1 release [\#56](https://github.com/confio/poe-contracts/pull/56) ([uint](https://github.com/uint))
 - Voting contract: save info about creator of proposal [\#54](https://github.com/confio/poe-contracts/pull/54) ([ueco-jb](https://github.com/ueco-jb))
 - Fix `remove_hook` helper [\#53](https://github.com/confio/poe-contracts/pull/53) ([maurolacy](https://github.com/maurolacy))
+- Validator set query pagination [\#51](https://github.com/confio/poe-contracts/pull/51) ([maurolacy](https://github.com/maurolacy))
 - ValidatorVoting - make sure proposal migrate msg is not empty [\#48](https://github.com/confio/poe-contracts/pull/48) ([ueco-jb](https://github.com/ueco-jb))
 - Fix tg4-engagement docs / comments [\#47](https://github.com/confio/poe-contracts/pull/47) ([maurolacy](https://github.com/maurolacy))
+- valset: Add a feature to update `min_weight` and `max_validators` [\#45](https://github.com/confio/poe-contracts/pull/45) ([uint](https://github.com/uint))
 - Update rust to v1.54.0 in CI [\#43](https://github.com/confio/poe-contracts/pull/43) ([maurolacy](https://github.com/maurolacy))
 - Valset: Fix JailMsg inconsistencies [\#39](https://github.com/confio/poe-contracts/pull/39) ([ueco-jb](https://github.com/ueco-jb))
 - Valset: better unjail error message when jail lock didn't expire [\#38](https://github.com/confio/poe-contracts/pull/38) ([ueco-jb](https://github.com/ueco-jb))

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "tg4-engagement"
-version = "0.6.0-rc2"
+version = "0.6.0"
 authors = ["Ethan Frey <[email protected]>"]
 edition = "2018"
 description = "Simple TG4 implementation of group membership controlled by an admin"
@@ -24,17 +24,17 @@ cw-utils = "0.11.0"
 cw2 = "0.11.0"
 cw-controllers = "0.11.0"
 cw-storage-plus = "0.11.0"
-tg4 = { path = "../../packages/tg4", version = "0.6.0-rc2" }
-tg-utils = { version = "0.6.0-rc2", path = "../../packages/utils" }
-tg-bindings = { version = "0.6.0-rc2", path = "../../packages/bindings" }
-cosmwasm-std = { version = "1.0.0-beta" }
+tg4 = { path = "../../packages/tg4", version = "0.6.0" }
+tg-utils = { version = "0.6.0", path = "../../packages/utils" }
+tg-bindings = { version = "0.6.0", path = "../../packages/bindings" }
+cosmwasm-std = { version = "1.0.0-beta5" }
 schemars = "0.8"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.21" }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "1.0.0-beta" }
+cosmwasm-schema = { version = "1.0.0-beta5" }
 cw-multi-test = { version = "0.11.0" }
-tg-bindings-test = { version = "0.6.0-rc2", path = "../../packages/bindings-test" }
+tg-bindings-test = { version = "0.6.0", path = "../../packages/bindings-test" }
 derivative = "2"
 anyhow = "1"

contracts/tg4-engagement/Cargo.toml

@@ -11,7 +11,7 @@ can check a given member address and the total points. Smart queries (designed
 for client API) can do the same, and also query the admin address as well as
 paginate over all members.
 
-Also this contract provides api for behavior similar to EIP2222 standard, which
+Also, this contract provides api for behavior similar to EIP2222 standard, which
 allows for automatic split rewards sent to this contract proportionally to
 members points.
 
@@ -72,7 +72,7 @@ they are assigned for future withdrawal.
 
 `WithdrawFunds {receiver}` - withdraws funds previously assigned to sender of the
 message while funds distribution. Optional `receiver` field is an address where
-funds should be send, message sender by default.
+funds should be sent, message sender by default.
 
 `DelegateWithdrawal{delegated}` - set `delegated` address to be allowed to
 withdraw funds assigned to `sender`. Only one address can be delegated for any
@@ -86,13 +86,13 @@ to `sender`.
 
 `Preauths {}` - returns the current number of preauths.
 
-`WithdrawableFunds {owner}` - returns how much funds is assigned for withdrawal by
+`WithdrawableRewards {owner}` - returns how many rewards are assigned for withdrawal by
 owner.
 
-`DistributedFunds {}` - returns how much funds were distributed by this contract in
+`DistributedRewards {}` - returns how many rewards were distributed by this contract in
 its lifetime.
 
-`UndistributedFunds {}` - returns how much funds is waiting for distribution on this
+`UndistributedRewards {}` - returns how many rewards are waiting for distribution on this
 contract.
 
 `Delegated {owner}` - returns address allowed to withdraw funds assigned to given

contracts/tg4-engagement/README.md

@@ -747,8 +747,8 @@ fn query_member(deps: Deps, addr: String, height: Option<u64>) -> StdResult<Memb
 }
 
 pub fn query_withdrawable_rewards(deps: Deps, owner: String) -> StdResult<RewardsResponse> {
-    // Not checking address, as if it is ivnalid it is guaranteed not to appear in maps, so
-    // `withdrawable_funds` would return error itself.
+    // Not checking address, as if it is invalid it is guaranteed not to appear in maps, so
+    // `withdrawable_rewards` would return error itself.
     let owner = Addr::unchecked(&owner);
     let distribution = DISTRIBUTION.load(deps.storage)?;
     let adjustment = if let Some(adj) = WITHDRAW_ADJUSTMENT.may_load(deps.storage, &owner)? {