diff --git a/CHANGELOG.md b/CHANGELOG.md index 13ffc5cb..300c76e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,33 @@ ## [Unreleased](https://github.com/confio/poe-contracts/tree/HEAD) -[Full Changelog](https://github.com/confio/poe-contracts/compare/v0.13.0...HEAD) +[Full Changelog](https://github.com/confio/poe-contracts/compare/v0.14.0...HEAD) + +## [v0.14.0](https://github.com/confio/poe-contracts/tree/v0.14.0) (2022-09-13) + +[Full Changelog](https://github.com/confio/poe-contracts/compare/v0.13.0...v0.14.0) + +**Fixed bugs:** + +- Zero amount claims during release [\#180](https://github.com/confio/poe-contracts/issues/180) + +**Closed issues:** + +- Backport multisig fixes to voting contracts [\#176](https://github.com/confio/poe-contracts/issues/176) +- Benchmark `Ed25519Pubkey::to_address` [\#172](https://github.com/confio/poe-contracts/issues/172) +- \[tg4-stake\] Contract migration to integrate unbonding of vesting tokens [\#170](https://github.com/confio/poe-contracts/issues/170) +- Deprecate `ensure_from_older_version` [\#165](https://github.com/confio/poe-contracts/issues/165) +- Validator proposal creation should fail when description is empty [\#155](https://github.com/confio/poe-contracts/issues/155) +- valset: do not jail validators on first missed vote with "VerifyValidators" enabled [\#149](https://github.com/confio/poe-contracts/issues/149) + +**Merged pull requests:** + +- Fix zero amounts during unbound and release [\#179](https://github.com/confio/poe-contracts/pull/179) ([maurolacy](https://github.com/maurolacy)) +- Backport multisig fixes to voting contracts [\#178](https://github.com/confio/poe-contracts/pull/178) ([0xFable](https://github.com/0xFable)) +- Deprecate `ensure_from_older_version` [\#177](https://github.com/confio/poe-contracts/pull/177) ([ueco-jb](https://github.com/ueco-jb)) +- Update mixer benchmark gas values [\#175](https://github.com/confio/poe-contracts/pull/175) ([maurolacy](https://github.com/maurolacy)) +- Remove / replace coins\_to\_string helper [\#174](https://github.com/confio/poe-contracts/pull/174) ([maurolacy](https://github.com/maurolacy)) +- Verify validators revisited [\#167](https://github.com/confio/poe-contracts/pull/167) ([maurolacy](https://github.com/maurolacy)) ## [v0.13.0](https://github.com/confio/poe-contracts/tree/v0.13.0) (2022-07-26) diff --git a/Cargo.lock b/Cargo.lock index e9bb82bf..b1ea3ef9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1547,7 +1547,7 @@ dependencies = [ [[package]] name = "tg-bindings" -version = "0.13.0" +version = "0.14.0" dependencies = [ "base64", "cosmwasm-schema", @@ -1560,7 +1560,7 @@ dependencies = [ [[package]] name = "tg-bindings-test" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "cosmwasm-std", @@ -1574,7 +1574,7 @@ dependencies = [ [[package]] name = "tg-test-utils" -version = "0.13.0" +version = "0.14.0" dependencies = [ "cosmwasm-std", "tg-voting-contract", @@ -1582,7 +1582,7 @@ dependencies = [ [[package]] name = "tg-utils" -version = "0.13.0" +version = "0.14.0" dependencies = [ "cosmwasm-std", "cw-controllers", @@ -1599,7 +1599,7 @@ dependencies = [ [[package]] name = "tg-voting-contract" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "cosmwasm-schema", @@ -1621,7 +1621,7 @@ dependencies = [ [[package]] name = "tg3" -version = "0.13.0" +version = "0.14.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1633,7 +1633,7 @@ dependencies = [ [[package]] name = "tg4" -version = "0.13.0" +version = "0.14.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1644,7 +1644,7 @@ dependencies = [ [[package]] name = "tg4-engagement" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "cosmwasm-schema", @@ -1666,7 +1666,7 @@ dependencies = [ [[package]] name = "tg4-group" -version = "0.13.0" +version = "0.14.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1683,7 +1683,7 @@ dependencies = [ [[package]] name = "tg4-mixer" -version = "0.13.0" +version = "0.14.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1708,7 +1708,7 @@ dependencies = [ [[package]] name = "tg4-stake" -version = "0.13.0" +version = "0.14.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1728,7 +1728,7 @@ dependencies = [ [[package]] name = "tgrade-community-pool" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "cosmwasm-schema", @@ -1740,6 +1740,7 @@ dependencies = [ "serde", "tg-bindings", "tg-bindings-test", + "tg-utils", "tg-voting-contract", "tg3", "tg4", @@ -1749,7 +1750,7 @@ dependencies = [ [[package]] name = "tgrade-gov-reflect" -version = "0.13.0" +version = "0.14.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1762,7 +1763,7 @@ dependencies = [ [[package]] name = "tgrade-validator-voting" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "cosmwasm-schema", @@ -1785,7 +1786,7 @@ dependencies = [ [[package]] name = "tgrade-valset" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "assert_matches", @@ -1813,7 +1814,7 @@ dependencies = [ [[package]] name = "tgrade-vesting-account" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "assert_matches", diff --git a/contracts/tg4-engagement/Cargo.toml b/contracts/tg4-engagement/Cargo.toml index 633e3ee5..31828c23 100644 --- a/contracts/tg4-engagement/Cargo.toml +++ b/contracts/tg4-engagement/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg4-engagement" -version = "0.13.0" +version = "0.14.0" authors = ["Ethan Frey "] edition = "2018" description = "Simple TG4 implementation of group membership controlled by an admin" @@ -25,9 +25,9 @@ cw-controllers = "0.14.0" cw-storage-plus = "0.14.0" cw-utils = "0.14.0" cw2 = "0.14.0" -tg-utils = { version = "0.13.0", path = "../../packages/utils" } -tg-bindings = { version = "0.13.0", path = "../../packages/bindings" } -tg4 = { path = "../../packages/tg4", version = "0.13.0" } +tg-utils = { version = "0.14.0", path = "../../packages/utils" } +tg-bindings = { version = "0.14.0", path = "../../packages/bindings" } +tg4 = { path = "../../packages/tg4", version = "0.14.0" } schemars = "0.8" serde = { version = "1.0.103", default-features = false, features = ["derive"] } thiserror = "1.0.21" @@ -37,4 +37,4 @@ anyhow = "1" cosmwasm-schema = "1.0.0" cw-multi-test = "0.14.0" derivative = "2" -tg-bindings-test = { version = "0.13.0", path = "../../packages/bindings-test" } +tg-bindings-test = { version = "0.14.0", path = "../../packages/bindings-test" } diff --git a/contracts/tg4-group/Cargo.toml b/contracts/tg4-group/Cargo.toml index 429540a6..c1a7e842 100644 --- a/contracts/tg4-group/Cargo.toml +++ b/contracts/tg4-group/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg4-group" -version = "0.13.0" +version = "0.14.0" authors = ["Mauro Lacy "] edition = "2018" description = "Simple tg4 implementation of group membership controlled by admin" @@ -34,7 +34,7 @@ cw-controllers = "0.14.0" cw-storage-plus = "0.14.0" schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg4 = { version = "0.13.0", path = "../../packages/tg4" } +tg4 = { version = "0.14.0", path = "../../packages/tg4" } thiserror = { version = "1.0.23" } [dev-dependencies] diff --git a/contracts/tg4-mixer/Cargo.toml b/contracts/tg4-mixer/Cargo.toml index b2cbb4dd..417353a7 100644 --- a/contracts/tg4-mixer/Cargo.toml +++ b/contracts/tg4-mixer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg4-mixer" -version = "0.13.0" +version = "0.14.0" authors = ["Ethan Frey "] edition = "2018" description = "TG4 implementation that combines two different groups with a merge function" @@ -33,17 +33,17 @@ rust_decimal_macros = { version = "1.16", default-features = false } thiserror = "1.0.21" schemars = "0.8" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg4 = { path = "../../packages/tg4", version = "0.13.0" } -tg-utils = { path = "../../packages/utils", version = "0.13.0" } -tg-bindings = { path = "../../packages/bindings", version = "0.13.0" } +tg4 = { path = "../../packages/tg4", version = "0.14.0" } +tg-utils = { path = "../../packages/utils", version = "0.14.0" } +tg-bindings = { path = "../../packages/bindings", version = "0.14.0" } [dev-dependencies] cosmwasm-schema = "1.0.0" # bench dependencies cosmwasm-vm = { version = "1.0.0" } cw-multi-test = "0.14.0" -tg4-engagement = { path = "../tg4-engagement", version = "0.13.0", features = ["library"] } -tg4-stake = { path = "../tg4-stake", version = "0.13.0", features = ["library"] } +tg4-engagement = { path = "../tg4-engagement", version = "0.14.0", features = ["library"] } +tg4-stake = { path = "../tg4-stake", version = "0.14.0", features = ["library"] } [[bench]] name = "main" diff --git a/contracts/tg4-stake/Cargo.toml b/contracts/tg4-stake/Cargo.toml index 050b1c43..1272ca5a 100644 --- a/contracts/tg4-stake/Cargo.toml +++ b/contracts/tg4-stake/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg4-stake" -version = "0.13.0" +version = "0.14.0" authors = ["Ethan Frey "] edition = "2018" description = "TG4 implementation of group based on staked tokens" @@ -28,11 +28,11 @@ cw-storage-plus = "0.14.0" itertools = "0.10" schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg4 = { path = "../../packages/tg4", version = "0.13.0" } -tg-utils = { path = "../../packages/utils", version = "0.13.0" } -tg-bindings = { path = "../../packages/bindings", version = "0.13.0" } +tg4 = { path = "../../packages/tg4", version = "0.14.0" } +tg-utils = { path = "../../packages/utils", version = "0.14.0" } +tg-bindings = { path = "../../packages/bindings", version = "0.14.0" } thiserror = "1.0.21" [dev-dependencies] cosmwasm-schema = "1.0.0" -tg-bindings-test = { path = "../../packages/bindings-test", version = "0.13.0" } +tg-bindings-test = { path = "../../packages/bindings-test", version = "0.14.0" } diff --git a/contracts/tgrade-community-pool/Cargo.toml b/contracts/tgrade-community-pool/Cargo.toml index 6cd1de87..36445843 100644 --- a/contracts/tgrade-community-pool/Cargo.toml +++ b/contracts/tgrade-community-pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tgrade-community-pool" -version = "0.13.0" +version = "0.14.0" authors = ["Bartłomiej Kuras "] edition = "2018" description = "Implementing tgrade-community-pool voting contract" @@ -22,15 +22,16 @@ cw-utils = "0.14.0" cw2 = "0.14.0" schemars = "0.8.1" serde = { version = "1", default-features = false, features = ["derive"] } -tg-bindings = { path = "../../packages/bindings", version = "0.13.0" } -tg-voting-contract = { version = "0.13.0", path = "../../packages/voting-contract" } -tg3 = { path = "../../packages/tg3", version = "0.13.0" } -tg4-engagement = { path = "../tg4-engagement", version = "0.13.0", features = ["library"] } +tg-bindings = { path = "../../packages/bindings", version = "0.14.0" } +tg-utils = { path = "../../packages/utils", version = "0.14.0" } +tg-voting-contract = { version = "0.14.0", path = "../../packages/voting-contract" } +tg3 = { path = "../../packages/tg3", version = "0.14.0" } +tg4-engagement = { path = "../tg4-engagement", version = "0.14.0", features = ["library"] } thiserror = "1" [dev-dependencies] anyhow = "1" cosmwasm-schema = "1.0.0" cw-multi-test = "0.14.0" -tg-bindings-test = { path = "../../packages/bindings-test", version = "0.13.0" } -tg4 = { path = "../../packages/tg4", version = "0.13.0" } +tg-bindings-test = { path = "../../packages/bindings-test", version = "0.14.0" } +tg4 = { path = "../../packages/tg4", version = "0.14.0" } diff --git a/contracts/tgrade-gov-reflect/Cargo.toml b/contracts/tgrade-gov-reflect/Cargo.toml index d0c17ada..7cd01296 100644 --- a/contracts/tgrade-gov-reflect/Cargo.toml +++ b/contracts/tgrade-gov-reflect/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tgrade-gov-reflect" -version = "0.13.0" +version = "0.14.0" authors = ["Ethan Frey "] edition = "2018" description = "Implementing tgrade-gov-reflect voting contract" @@ -28,7 +28,7 @@ cosmwasm-std = "1.0.0" cw-storage-plus = "0.14.0" schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg-bindings = { version = "0.13.0", path = "../../packages/bindings" } +tg-bindings = { version = "0.14.0", path = "../../packages/bindings" } thiserror = "1" [dev-dependencies] diff --git a/contracts/tgrade-validator-voting/Cargo.toml b/contracts/tgrade-validator-voting/Cargo.toml index 154545eb..bb44316e 100644 --- a/contracts/tgrade-validator-voting/Cargo.toml +++ b/contracts/tgrade-validator-voting/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tgrade-validator-voting" -version = "0.13.0" +version = "0.14.0" authors = ["Ethan Frey "] edition = "2018" description = "Implementing tgrade-validator-voting" @@ -22,9 +22,10 @@ cw-utils = "0.14.0" cw2 = "0.14.0" schemars = "0.8.1" serde = { version = "1", default-features = false, features = ["derive"] } -tg-bindings = { path = "../../packages/bindings", version = "0.13.0" } -tg-voting-contract = { version = "0.13.0", path = "../../packages/voting-contract" } -tg3 = { path = "../../packages/tg3", version = "0.13.0" } +tg-bindings = { path = "../../packages/bindings", version = "0.14.0" } +tg-utils = { path = "../../packages/utils", version = "0.14.0" } +tg-voting-contract = { version = "0.14.0", path = "../../packages/voting-contract" } +tg3 = { path = "../../packages/tg3", version = "0.14.0" } thiserror = "1" [dev-dependencies] @@ -32,8 +33,8 @@ anyhow = "1" cosmwasm-schema = "1.0.0" cw-multi-test = "0.14.0" cw-storage-plus = "0.14.0" -tg-bindings-test = { version = "0.13.0", path = "../../packages/bindings-test" } -tg-utils = { version = "0.13.0", path = "../../packages/utils" } -tg-voting-contract = { version = "0.13.0", path = "../../packages/voting-contract" } -tg4 = { path = "../../packages/tg4", version = "0.13.0" } -tg4-engagement = { path = "../tg4-engagement", version = "0.13.0", features = ["library"] } +tg-bindings-test = { version = "0.14.0", path = "../../packages/bindings-test" } +tg-utils = { version = "0.14.0", path = "../../packages/utils" } +tg-voting-contract = { version = "0.14.0", path = "../../packages/voting-contract" } +tg4 = { path = "../../packages/tg4", version = "0.14.0" } +tg4-engagement = { path = "../tg4-engagement", version = "0.14.0", features = ["library"] } diff --git a/contracts/tgrade-valset/Cargo.toml b/contracts/tgrade-valset/Cargo.toml index 13f79590..07a2d794 100644 --- a/contracts/tgrade-valset/Cargo.toml +++ b/contracts/tgrade-valset/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tgrade-valset" -version = "0.13.0" +version = "0.14.0" authors = ["Ethan Frey "] edition = "2018" description = "Control the validator set based on membership of trusted tg4 contract" @@ -35,9 +35,9 @@ schemars = "0.8" semver = "1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } thiserror = "1.0.21" -tg4 = { path = "../../packages/tg4", version = "0.13.0" } -tg-bindings = { version = "0.13.0", path = "../../packages/bindings" } -tg-utils = { version = "0.13.0", path = "../../packages/utils" } +tg4 = { path = "../../packages/tg4", version = "0.14.0" } +tg-bindings = { version = "0.14.0", path = "../../packages/bindings" } +tg-utils = { version = "0.14.0", path = "../../packages/utils" } # For integration tests ("integration" feature) bech32 = { version = "0.8.1", optional = true } @@ -49,7 +49,7 @@ assert_matches = "1.5" cosmwasm-schema = "1.0.0" cw-multi-test = "0.14.0" derivative = "2" -tg4-engagement = { path = "../tg4-engagement", version = "0.13.0" } -tg4-stake = { path = "../tg4-stake", version = "0.13.0" } +tg4-engagement = { path = "../tg4-engagement", version = "0.14.0" } +tg4-stake = { path = "../tg4-stake", version = "0.14.0" } # we enable multitest feature only for tests -tg-bindings-test = { path = "../../packages/bindings-test", version = "0.13.0" } +tg-bindings-test = { path = "../../packages/bindings-test", version = "0.14.0" } diff --git a/contracts/tgrade-valset/src/contract.rs b/contracts/tgrade-valset/src/contract.rs index 257178fe..0dd34400 100644 --- a/contracts/tgrade-valset/src/contract.rs +++ b/contracts/tgrade-valset/src/contract.rs @@ -23,7 +23,7 @@ use tg_bindings::{ use tg_utils::{JailingDuration, SlashMsg, ADMIN}; use crate::error::ContractError; -use crate::migration::migrate_jailing_period; +use crate::migration::{migrate_jailing_period, migrate_verify_validators}; use crate::msg::{ EpochResponse, ExecuteMsg, InstantiateMsg, InstantiateResponse, JailingEnd, JailingPeriod, ListActiveValidatorsResponse, ListValidatorResponse, ListValidatorSlashingResponse, MigrateMsg, @@ -951,6 +951,8 @@ pub fn migrate( migrate_jailing_period(deps.branch(), &original_version)?; + migrate_verify_validators(deps.branch(), &original_version)?; + Ok(Response::new()) } diff --git a/contracts/tgrade-valset/src/migration.rs b/contracts/tgrade-valset/src/migration.rs index faa69414..e78a1cbf 100644 --- a/contracts/tgrade-valset/src/migration.rs +++ b/contracts/tgrade-valset/src/migration.rs @@ -7,7 +7,7 @@ use tg_utils::Expiration; use crate::error::ContractError; use crate::msg::{JailingEnd, JailingPeriod}; -use crate::state::JAIL; +use crate::state::{CONFIG, JAIL}; /// `crate::msg::JailingPeriod` version from v0.6.2 and before #[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)] @@ -50,6 +50,21 @@ pub fn migrate_jailing_period( Ok(()) } +pub fn migrate_verify_validators( + deps: DepsMut, + version: &Version, +) -> Result<(), ContractError> { + let mut config = if *version <= "0.14.0".parse::().unwrap() { + CONFIG.load(deps.storage)? + } else { + return Ok(()); + }; + config.verify_validators = true; + CONFIG.save(deps.storage, &config)?; + + Ok(()) +} + #[cfg(test)] mod tests { //! These are very rudimentary tests that only -mock- old state and perform migrations on it. diff --git a/contracts/tgrade-vesting-account/Cargo.toml b/contracts/tgrade-vesting-account/Cargo.toml index bfe96849..6200af5a 100644 --- a/contracts/tgrade-vesting-account/Cargo.toml +++ b/contracts/tgrade-vesting-account/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tgrade-vesting-account" -version = "0.13.0" +version = "0.14.0" authors = ["Jakub Bogucki "] edition = "2018" description = "Vesting Account as a contract" @@ -22,8 +22,8 @@ cw2 = "0.14.0" cw-storage-plus = "0.14.0" schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg-bindings = { version = "0.13.0", path = "../../packages/bindings" } -tg-utils = { version = "0.13.0", path = "../../packages/utils" } +tg-bindings = { version = "0.14.0", path = "../../packages/bindings" } +tg-utils = { version = "0.14.0", path = "../../packages/utils" } thiserror = "1" [dev-dependencies] @@ -32,4 +32,4 @@ assert_matches = "1" derivative = "2" cosmwasm-schema = "1.0.0" cw-multi-test = "0.14.0" -tg-bindings-test = { version = "0.13.0", path = "../../packages/bindings-test" } +tg-bindings-test = { version = "0.14.0", path = "../../packages/bindings-test" } diff --git a/packages/bindings-test/Cargo.toml b/packages/bindings-test/Cargo.toml index 7f3a435a..96e87a5f 100644 --- a/packages/bindings-test/Cargo.toml +++ b/packages/bindings-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg-bindings-test" -version = "0.13.0" +version = "0.14.0" authors = ["Ethan Frey "] edition = "2018" description = "Multitest (and other test helpers) support for Tgrade-specific contracts" @@ -15,5 +15,5 @@ cw-multi-test = "0.14.0" cw-storage-plus = "0.14.0" schemars = "0.8" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg-bindings = { version = "0.13.0", path = "../bindings" } +tg-bindings = { version = "0.14.0", path = "../bindings" } thiserror = "1.0.21" diff --git a/packages/bindings/Cargo.toml b/packages/bindings/Cargo.toml index 1d7b1790..8c7abf98 100644 --- a/packages/bindings/Cargo.toml +++ b/packages/bindings/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg-bindings" -version = "0.13.0" +version = "0.14.0" authors = ["Ethan Frey "] edition = "2018" description = "Bindings for CustomMsg and CustomQuery for the Tgrade blockchain" diff --git a/packages/test-utils/Cargo.toml b/packages/test-utils/Cargo.toml index 2dacbc8b..b4185436 100644 --- a/packages/test-utils/Cargo.toml +++ b/packages/test-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg-test-utils" -version = "0.13.0" +version = "0.14.0" authors = ["Jakub Bogucki "] edition = "2018" description = "Utilities used in contract tests" @@ -10,4 +10,4 @@ license = "Apache-2.0" [dependencies] cosmwasm-std = "1.0.0" -tg-voting-contract = { path = "../voting-contract", version = "0.13.0" } +tg-voting-contract = { path = "../voting-contract", version = "0.14.0" } diff --git a/packages/tg3/Cargo.toml b/packages/tg3/Cargo.toml index 9e8763bf..68232167 100644 --- a/packages/tg3/Cargo.toml +++ b/packages/tg3/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg3" -version = "0.13.0" +version = "0.14.0" authors = ["Bartłomiej Kuras "] edition = "2018" description = "Tgrade-3 Interface: On-Chain MultiSig/Voting contracts" @@ -12,8 +12,8 @@ license = "Apache-2.0" cosmwasm-std = "1.0.0" schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg-bindings = { version = "0.13.0", path = "../../packages/bindings" } -tg-utils = { version = "0.13.0", path = "../../packages/utils" } +tg-bindings = { version = "0.14.0", path = "../../packages/bindings" } +tg-utils = { version = "0.14.0", path = "../../packages/utils" } [dev-dependencies] cosmwasm-schema = "1.0.0" diff --git a/packages/tg4/Cargo.toml b/packages/tg4/Cargo.toml index 948ea706..69010f69 100644 --- a/packages/tg4/Cargo.toml +++ b/packages/tg4/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg4" -version = "0.13.0" +version = "0.14.0" authors = ["Ethan Frey "] edition = "2018" description = "Tgrade-4 Interface: Groups Members" @@ -12,7 +12,7 @@ license = "Apache-2.0" cosmwasm-std = "1.0.0" schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg-bindings = { path = "../bindings", version = "0.13.0" } +tg-bindings = { path = "../bindings", version = "0.14.0" } [dev-dependencies] cosmwasm-schema = "1.0.0" diff --git a/packages/utils/Cargo.toml b/packages/utils/Cargo.toml index a8e6f11e..282ca4b0 100644 --- a/packages/utils/Cargo.toml +++ b/packages/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg-utils" -version = "0.13.0" +version = "0.14.0" authors = ["Ethan Frey "] edition = "2018" description = "Tgrade Utils: helpers for various contracts" @@ -19,6 +19,6 @@ cw2 = "0.14.0" schemars = "0.8.1" semver = "1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg4 = { path = "../tg4", version = "0.13.0" } -tg-bindings = { path = "../bindings", version = "0.13.0" } +tg4 = { path = "../tg4", version = "0.14.0" } +tg-bindings = { path = "../bindings", version = "0.14.0" } thiserror = "1.0.21" diff --git a/packages/voting-contract/Cargo.toml b/packages/voting-contract/Cargo.toml index a26f0d1b..e3ceff95 100644 --- a/packages/voting-contract/Cargo.toml +++ b/packages/voting-contract/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg-voting-contract" -version = "0.13.0" +version = "0.14.0" authors = ["Bartłomiej Kuras "] edition = "2018" description = "Generic utils for building voting contracts for tgrade" @@ -16,10 +16,10 @@ cw-utils = "0.14.0" cw-storage-plus = "0.14.0" schemars = "0.8.1" serde = { version = "1", default-features = false, features = ["derive"] } -tg3 = { path = "../../packages/tg3", version = "0.13.0" } -tg4 = { path = "../tg4", version = "0.13.0" } -tg-bindings = { path = "../bindings", version = "0.13.0" } -tg-utils = { version = "0.13.0", path = "../utils" } +tg3 = { path = "../../packages/tg3", version = "0.14.0" } +tg4 = { path = "../tg4", version = "0.14.0" } +tg-bindings = { path = "../bindings", version = "0.14.0" } +tg-utils = { version = "0.14.0", path = "../utils" } thiserror = "1" [dev-dependencies] @@ -27,5 +27,5 @@ anyhow = "1" cosmwasm-schema = "1.0.0" cw-multi-test = "0.14.0" derivative = "2" -tg-bindings-test = { path = "../../packages/bindings-test", version = "0.13.0" } -tg4-engagement = { path = "../../contracts/tg4-engagement", version = "0.13.0", features = ["library"] } +tg-bindings-test = { path = "../../packages/bindings-test", version = "0.14.0" } +tg4-engagement = { path = "../../contracts/tg4-engagement", version = "0.14.0", features = ["library"] } diff --git a/scripts/optimizer.sh b/scripts/optimizer.sh new file mode 100755 index 00000000..310020d4 --- /dev/null +++ b/scripts/optimizer.sh @@ -0,0 +1,14 @@ +: + +U="cosmwasm" +V="0.12.7" + +M=$(uname -m) +A="linux/${M/x86_64/amd64}" +S=${M#x86_64} +S=${S:+-$S} + +docker run --platform $A --rm -v "$(pwd)":/code \ + --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \ + --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \ + $U/workspace-optimizer$S:$V diff --git a/scripts/publish.sh b/scripts/publish.sh index 4012492d..ead6bc55 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -7,7 +7,7 @@ function print_usage() { echo "Publishes crates to crates.io." } -if [ $# = 1 ] && ( [ "$1" = "-h" ] || [ "$1" = "--help" ] ) +if [ $# = 1 ] && { [ "$1" = "-h" ] || [ "$1" = "--help" ] ; } then print_usage exit 1