From 61c291b1525021ae344be9beb468c0bd3a234dc9 Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Wed, 18 Jan 2023 16:51:03 +0100 Subject: [PATCH 1/7] Set version: 0.17.0 --- Cargo.lock | 32 ++++++++++---------- contracts/tg4-engagement/Cargo.toml | 10 +++--- contracts/tg4-group/Cargo.toml | 4 +-- contracts/tg4-mixer/Cargo.toml | 12 ++++---- contracts/tg4-stake/Cargo.toml | 10 +++--- contracts/tgrade-community-pool/Cargo.toml | 16 +++++----- contracts/tgrade-gov-reflect/Cargo.toml | 4 +-- contracts/tgrade-validator-voting/Cargo.toml | 20 ++++++------ contracts/tgrade-valset/Cargo.toml | 14 ++++----- contracts/tgrade-vesting-account/Cargo.toml | 8 ++--- packages/bindings-test/Cargo.toml | 4 +-- packages/bindings/Cargo.toml | 2 +- packages/test-utils/Cargo.toml | 4 +-- packages/tg3/Cargo.toml | 6 ++-- packages/tg4/Cargo.toml | 4 +-- packages/utils/Cargo.toml | 6 ++-- packages/voting-contract/Cargo.toml | 14 ++++----- 17 files changed, 85 insertions(+), 85 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 81af402..6ee9aaf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1635,7 +1635,7 @@ dependencies = [ [[package]] name = "tg-bindings" -version = "0.16.0" +version = "0.17.0" dependencies = [ "base64", "cosmwasm-schema", @@ -1648,7 +1648,7 @@ dependencies = [ [[package]] name = "tg-bindings-test" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "cosmwasm-std", @@ -1662,7 +1662,7 @@ dependencies = [ [[package]] name = "tg-test-utils" -version = "0.16.0" +version = "0.17.0" dependencies = [ "cosmwasm-std", "tg-voting-contract", @@ -1670,7 +1670,7 @@ dependencies = [ [[package]] name = "tg-utils" -version = "0.16.0" +version = "0.17.0" dependencies = [ "cosmwasm-std", "cw-controllers", @@ -1687,7 +1687,7 @@ dependencies = [ [[package]] name = "tg-voting-contract" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "cosmwasm-schema", @@ -1709,7 +1709,7 @@ dependencies = [ [[package]] name = "tg3" -version = "0.16.0" +version = "0.17.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1721,7 +1721,7 @@ dependencies = [ [[package]] name = "tg4" -version = "0.16.0" +version = "0.17.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1732,7 +1732,7 @@ dependencies = [ [[package]] name = "tg4-engagement" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "cosmwasm-schema", @@ -1754,7 +1754,7 @@ dependencies = [ [[package]] name = "tg4-group" -version = "0.16.0" +version = "0.17.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1771,7 +1771,7 @@ dependencies = [ [[package]] name = "tg4-mixer" -version = "0.16.0" +version = "0.17.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1796,7 +1796,7 @@ dependencies = [ [[package]] name = "tg4-stake" -version = "0.16.0" +version = "0.17.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1816,7 +1816,7 @@ dependencies = [ [[package]] name = "tgrade-community-pool" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "cosmwasm-schema", @@ -1838,7 +1838,7 @@ dependencies = [ [[package]] name = "tgrade-gov-reflect" -version = "0.16.0" +version = "0.17.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1851,7 +1851,7 @@ dependencies = [ [[package]] name = "tgrade-validator-voting" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "cosmwasm-schema", @@ -1874,7 +1874,7 @@ dependencies = [ [[package]] name = "tgrade-valset" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "assert_matches", @@ -1902,7 +1902,7 @@ dependencies = [ [[package]] name = "tgrade-vesting-account" -version = "0.16.0" +version = "0.17.0" dependencies = [ "anyhow", "assert_matches", diff --git a/contracts/tg4-engagement/Cargo.toml b/contracts/tg4-engagement/Cargo.toml index c2d99eb..9d717b3 100644 --- a/contracts/tg4-engagement/Cargo.toml +++ b/contracts/tg4-engagement/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg4-engagement" -version = "0.16.0" +version = "0.17.0" authors = ["Ethan Frey "] edition = "2018" description = "Simple TG4 implementation of group membership controlled by an admin" @@ -25,9 +25,9 @@ cw-controllers = "1.0.0" cw-storage-plus = "1.0.1" cw-utils = "1.0.1" cw2 = "1.0.0" -tg-utils = { version = "0.16.0", path = "../../packages/utils" } -tg-bindings = { version = "0.16.0", path = "../../packages/bindings" } -tg4 = { path = "../../packages/tg4", version = "0.16.0" } +tg-utils = { version = "0.17.0", path = "../../packages/utils" } +tg-bindings = { version = "0.17.0", path = "../../packages/bindings" } +tg4 = { path = "../../packages/tg4", version = "0.17.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.1.9" cw-multi-test = "0.16.2" derivative = "2" -tg-bindings-test = { version = "0.16.0", path = "../../packages/bindings-test" } +tg-bindings-test = { version = "0.17.0", path = "../../packages/bindings-test" } diff --git a/contracts/tg4-group/Cargo.toml b/contracts/tg4-group/Cargo.toml index 083b8c7..cf33ad9 100644 --- a/contracts/tg4-group/Cargo.toml +++ b/contracts/tg4-group/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg4-group" -version = "0.16.0" +version = "0.17.0" authors = ["Mauro Lacy "] edition = "2018" description = "Simple tg4 implementation of group membership controlled by admin" @@ -34,7 +34,7 @@ cw-controllers = "1.0.0" cw-storage-plus = "1.0.1" schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg4 = { version = "0.16.0", path = "../../packages/tg4" } +tg4 = { version = "0.17.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 286add8..6c19560 100644 --- a/contracts/tg4-mixer/Cargo.toml +++ b/contracts/tg4-mixer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg4-mixer" -version = "0.16.0" +version = "0.17.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.16.0" } -tg-utils = { path = "../../packages/utils", version = "0.16.0" } -tg-bindings = { path = "../../packages/bindings", version = "0.16.0" } +tg4 = { path = "../../packages/tg4", version = "0.17.0" } +tg-utils = { path = "../../packages/utils", version = "0.17.0" } +tg-bindings = { path = "../../packages/bindings", version = "0.17.0" } [dev-dependencies] cosmwasm-schema = "1.1.9" # bench dependencies cosmwasm-vm = { version = "1.1.0" } cw-multi-test = "0.16.2" -tg4-engagement = { path = "../tg4-engagement", version = "0.16.0", features = ["library"] } -tg4-stake = { path = "../tg4-stake", version = "0.16.0", features = ["library"] } +tg4-engagement = { path = "../tg4-engagement", version = "0.17.0", features = ["library"] } +tg4-stake = { path = "../tg4-stake", version = "0.17.0", features = ["library"] } [[bench]] name = "main" diff --git a/contracts/tg4-stake/Cargo.toml b/contracts/tg4-stake/Cargo.toml index 2ae9479..7138b5e 100644 --- a/contracts/tg4-stake/Cargo.toml +++ b/contracts/tg4-stake/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg4-stake" -version = "0.16.0" +version = "0.17.0" authors = ["Ethan Frey "] edition = "2018" description = "TG4 implementation of group based on staked tokens" @@ -28,11 +28,11 @@ cw-storage-plus = "1.0.1" itertools = "0.10" schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg4 = { path = "../../packages/tg4", version = "0.16.0" } -tg-utils = { path = "../../packages/utils", version = "0.16.0" } -tg-bindings = { path = "../../packages/bindings", version = "0.16.0" } +tg4 = { path = "../../packages/tg4", version = "0.17.0" } +tg-utils = { path = "../../packages/utils", version = "0.17.0" } +tg-bindings = { path = "../../packages/bindings", version = "0.17.0" } thiserror = "1.0.21" [dev-dependencies] cosmwasm-schema = "1.1.9" -tg-bindings-test = { path = "../../packages/bindings-test", version = "0.16.0" } +tg-bindings-test = { path = "../../packages/bindings-test", version = "0.17.0" } diff --git a/contracts/tgrade-community-pool/Cargo.toml b/contracts/tgrade-community-pool/Cargo.toml index eb58912..0969628 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.16.0" +version = "0.17.0" authors = ["Bartłomiej Kuras "] edition = "2018" description = "Implementing tgrade-community-pool voting contract" @@ -22,16 +22,16 @@ cw-utils = "1.0.1" cw2 = "1.0.0" schemars = "0.8.1" serde = { version = "1", default-features = false, features = ["derive"] } -tg-bindings = { path = "../../packages/bindings", version = "0.16.0" } -tg-utils = { path = "../../packages/utils", version = "0.16.0" } -tg-voting-contract = { version = "0.16.0", path = "../../packages/voting-contract" } -tg3 = { path = "../../packages/tg3", version = "0.16.0" } -tg4-engagement = { path = "../tg4-engagement", version = "0.16.0", features = ["library"] } +tg-bindings = { path = "../../packages/bindings", version = "0.17.0" } +tg-utils = { path = "../../packages/utils", version = "0.17.0" } +tg-voting-contract = { version = "0.17.0", path = "../../packages/voting-contract" } +tg3 = { path = "../../packages/tg3", version = "0.17.0" } +tg4-engagement = { path = "../tg4-engagement", version = "0.17.0", features = ["library"] } thiserror = "1" [dev-dependencies] anyhow = "1" cosmwasm-schema = "1.1.9" cw-multi-test = "0.16.2" -tg-bindings-test = { path = "../../packages/bindings-test", version = "0.16.0" } -tg4 = { path = "../../packages/tg4", version = "0.16.0" } +tg-bindings-test = { path = "../../packages/bindings-test", version = "0.17.0" } +tg4 = { path = "../../packages/tg4", version = "0.17.0" } diff --git a/contracts/tgrade-gov-reflect/Cargo.toml b/contracts/tgrade-gov-reflect/Cargo.toml index da6ce0d..284850e 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.16.0" +version = "0.17.0" authors = ["Ethan Frey "] edition = "2018" description = "Implementing tgrade-gov-reflect voting contract" @@ -28,7 +28,7 @@ cosmwasm-std = "1.1.9" cw-storage-plus = "1.0.1" schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg-bindings = { version = "0.16.0", path = "../../packages/bindings" } +tg-bindings = { version = "0.17.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 0c3b5f7..b96b88e 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.16.0" +version = "0.17.0" authors = ["Ethan Frey "] edition = "2018" description = "Implementing tgrade-validator-voting" @@ -22,10 +22,10 @@ cw-utils = "1.0.1" cw2 = "1.0.0" schemars = "0.8.1" serde = { version = "1", default-features = false, features = ["derive"] } -tg-bindings = { path = "../../packages/bindings", version = "0.16.0" } -tg-utils = { path = "../../packages/utils", version = "0.16.0" } -tg-voting-contract = { version = "0.16.0", path = "../../packages/voting-contract" } -tg3 = { path = "../../packages/tg3", version = "0.16.0" } +tg-bindings = { path = "../../packages/bindings", version = "0.17.0" } +tg-utils = { path = "../../packages/utils", version = "0.17.0" } +tg-voting-contract = { version = "0.17.0", path = "../../packages/voting-contract" } +tg3 = { path = "../../packages/tg3", version = "0.17.0" } thiserror = "1" [dev-dependencies] @@ -33,8 +33,8 @@ anyhow = "1" cosmwasm-schema = "1.1.9" cw-multi-test = "0.16.2" cw-storage-plus = "1.0.1" -tg-bindings-test = { version = "0.16.0", path = "../../packages/bindings-test" } -tg-utils = { version = "0.16.0", path = "../../packages/utils" } -tg-voting-contract = { version = "0.16.0", path = "../../packages/voting-contract" } -tg4 = { path = "../../packages/tg4", version = "0.16.0" } -tg4-engagement = { path = "../tg4-engagement", version = "0.16.0", features = ["library"] } +tg-bindings-test = { version = "0.17.0", path = "../../packages/bindings-test" } +tg-utils = { version = "0.17.0", path = "../../packages/utils" } +tg-voting-contract = { version = "0.17.0", path = "../../packages/voting-contract" } +tg4 = { path = "../../packages/tg4", version = "0.17.0" } +tg4-engagement = { path = "../tg4-engagement", version = "0.17.0", features = ["library"] } diff --git a/contracts/tgrade-valset/Cargo.toml b/contracts/tgrade-valset/Cargo.toml index 39a2a18..a7c23ed 100644 --- a/contracts/tgrade-valset/Cargo.toml +++ b/contracts/tgrade-valset/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tgrade-valset" -version = "0.16.0" +version = "0.17.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.16.0" } -tg-bindings = { version = "0.16.0", path = "../../packages/bindings" } -tg-utils = { version = "0.16.0", path = "../../packages/utils" } +tg4 = { path = "../../packages/tg4", version = "0.17.0" } +tg-bindings = { version = "0.17.0", path = "../../packages/bindings" } +tg-utils = { version = "0.17.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.1.9" cw-multi-test = "0.16.2" derivative = "2" -tg4-engagement = { path = "../tg4-engagement", version = "0.16.0" } -tg4-stake = { path = "../tg4-stake", version = "0.16.0" } +tg4-engagement = { path = "../tg4-engagement", version = "0.17.0" } +tg4-stake = { path = "../tg4-stake", version = "0.17.0" } # we enable multitest feature only for tests -tg-bindings-test = { path = "../../packages/bindings-test", version = "0.16.0" } +tg-bindings-test = { path = "../../packages/bindings-test", version = "0.17.0" } diff --git a/contracts/tgrade-vesting-account/Cargo.toml b/contracts/tgrade-vesting-account/Cargo.toml index 659ae67..11f5118 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.16.0" +version = "0.17.0" authors = ["Jakub Bogucki "] edition = "2018" description = "Vesting Account as a contract" @@ -22,8 +22,8 @@ cw2 = "1.0.0" cw-storage-plus = "1.0.1" schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg-bindings = { version = "0.16.0", path = "../../packages/bindings" } -tg-utils = { version = "0.16.0", path = "../../packages/utils" } +tg-bindings = { version = "0.17.0", path = "../../packages/bindings" } +tg-utils = { version = "0.17.0", path = "../../packages/utils" } thiserror = "1" [dev-dependencies] @@ -32,4 +32,4 @@ assert_matches = "1" derivative = "2" cosmwasm-schema = "1.1.9" cw-multi-test = "0.16.2" -tg-bindings-test = { version = "0.16.0", path = "../../packages/bindings-test" } +tg-bindings-test = { version = "0.17.0", path = "../../packages/bindings-test" } diff --git a/packages/bindings-test/Cargo.toml b/packages/bindings-test/Cargo.toml index de689de..eafd4b0 100644 --- a/packages/bindings-test/Cargo.toml +++ b/packages/bindings-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg-bindings-test" -version = "0.16.0" +version = "0.17.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.16.2" cw-storage-plus = "1.0.1" schemars = "0.8" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg-bindings = { version = "0.16.0", path = "../bindings" } +tg-bindings = { version = "0.17.0", path = "../bindings" } thiserror = "1.0.21" diff --git a/packages/bindings/Cargo.toml b/packages/bindings/Cargo.toml index bd0b74d..41a2b59 100644 --- a/packages/bindings/Cargo.toml +++ b/packages/bindings/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg-bindings" -version = "0.16.0" +version = "0.17.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 da5f577..3921e36 100644 --- a/packages/test-utils/Cargo.toml +++ b/packages/test-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg-test-utils" -version = "0.16.0" +version = "0.17.0" authors = ["Jakub Bogucki "] edition = "2018" description = "Utilities used in contract tests" @@ -10,4 +10,4 @@ license = "Apache-2.0" [dependencies] cosmwasm-std = "1.1.9" -tg-voting-contract = { path = "../voting-contract", version = "0.16.0" } +tg-voting-contract = { path = "../voting-contract", version = "0.17.0" } diff --git a/packages/tg3/Cargo.toml b/packages/tg3/Cargo.toml index 91ec25b..91bb00f 100644 --- a/packages/tg3/Cargo.toml +++ b/packages/tg3/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg3" -version = "0.16.0" +version = "0.17.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.1.9" schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg-bindings = { version = "0.16.0", path = "../../packages/bindings" } -tg-utils = { version = "0.16.0", path = "../../packages/utils" } +tg-bindings = { version = "0.17.0", path = "../../packages/bindings" } +tg-utils = { version = "0.17.0", path = "../../packages/utils" } [dev-dependencies] cosmwasm-schema = "1.1.9" diff --git a/packages/tg4/Cargo.toml b/packages/tg4/Cargo.toml index 4c9357a..5d08e71 100644 --- a/packages/tg4/Cargo.toml +++ b/packages/tg4/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg4" -version = "0.16.0" +version = "0.17.0" authors = ["Ethan Frey "] edition = "2018" description = "Tgrade-4 Interface: Groups Members" @@ -12,7 +12,7 @@ license = "Apache-2.0" cosmwasm-std = "1.1.9" schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg-bindings = { path = "../bindings", version = "0.16.0" } +tg-bindings = { path = "../bindings", version = "0.17.0" } [dev-dependencies] cosmwasm-schema = "1.1.9" diff --git a/packages/utils/Cargo.toml b/packages/utils/Cargo.toml index 5aa3a40..9100515 100644 --- a/packages/utils/Cargo.toml +++ b/packages/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg-utils" -version = "0.16.0" +version = "0.17.0" authors = ["Ethan Frey "] edition = "2018" description = "Tgrade Utils: helpers for various contracts" @@ -19,6 +19,6 @@ cw2 = "1.0.0" schemars = "0.8.1" semver = "1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg4 = { path = "../tg4", version = "0.16.0" } -tg-bindings = { path = "../bindings", version = "0.16.0" } +tg4 = { path = "../tg4", version = "0.17.0" } +tg-bindings = { path = "../bindings", version = "0.17.0" } thiserror = "1.0.21" diff --git a/packages/voting-contract/Cargo.toml b/packages/voting-contract/Cargo.toml index c5083f2..17b641c 100644 --- a/packages/voting-contract/Cargo.toml +++ b/packages/voting-contract/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg-voting-contract" -version = "0.16.0" +version = "0.17.0" authors = ["Bartłomiej Kuras "] edition = "2018" description = "Generic utils for building voting contracts for tgrade" @@ -16,10 +16,10 @@ cw-utils = "1.0.1" cw-storage-plus = "1.0.1" schemars = "0.8.1" serde = { version = "1", default-features = false, features = ["derive"] } -tg3 = { path = "../../packages/tg3", version = "0.16.0" } -tg4 = { path = "../tg4", version = "0.16.0" } -tg-bindings = { path = "../bindings", version = "0.16.0" } -tg-utils = { version = "0.16.0", path = "../utils" } +tg3 = { path = "../../packages/tg3", version = "0.17.0" } +tg4 = { path = "../tg4", version = "0.17.0" } +tg-bindings = { path = "../bindings", version = "0.17.0" } +tg-utils = { version = "0.17.0", path = "../utils" } thiserror = "1" [dev-dependencies] @@ -27,5 +27,5 @@ anyhow = "1" cosmwasm-schema = "1.1.9" cw-multi-test = "0.16.2" derivative = "2" -tg-bindings-test = { path = "../../packages/bindings-test", version = "0.16.0" } -tg4-engagement = { path = "../../contracts/tg4-engagement", version = "0.16.0", features = ["library"] } +tg-bindings-test = { path = "../../packages/bindings-test", version = "0.17.0" } +tg4-engagement = { path = "../../contracts/tg4-engagement", version = "0.17.0", features = ["library"] } From 84ce3f464c84f5b3307b911bf7b04672321f6151 Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Wed, 18 Jan 2023 16:51:48 +0100 Subject: [PATCH 2/7] Update CHANGELOG --- CHANGELOG.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b86d860..63957ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,16 @@ ## [Unreleased](https://github.com/confio/poe-contracts/tree/HEAD) -[Full Changelog](https://github.com/confio/poe-contracts/compare/v0.16.0...HEAD) +[Full Changelog](https://github.com/confio/poe-contracts/compare/v0.17.0...HEAD) + +## [v0.17.0](https://github.com/confio/poe-contracts/tree/v0.17.0) (2023-01-18) + +[Full Changelog](https://github.com/confio/poe-contracts/compare/v0.16.0...v0.17.0) + +**Merged pull requests:** + +- Add undelegations processing to migration handler [\#201](https://github.com/confio/poe-contracts/pull/201) ([maurolacy](https://github.com/maurolacy)) +- Engagement half-life [\#200](https://github.com/confio/poe-contracts/pull/200) ([maurolacy](https://github.com/maurolacy)) ## [v0.16.0](https://github.com/confio/poe-contracts/tree/v0.16.0) (2022-12-16) From 673540933de1727063536885790af30d2b2c9ce1 Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Wed, 18 Jan 2023 17:00:17 +0100 Subject: [PATCH 3/7] Fix clippy warnings --- contracts/tg4-engagement/src/contract.rs | 8 ++++---- contracts/tgrade-valset/src/contract.rs | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contracts/tg4-engagement/src/contract.rs b/contracts/tg4-engagement/src/contract.rs index 3566a40..62627d8 100644 --- a/contracts/tg4-engagement/src/contract.rs +++ b/contracts/tg4-engagement/src/contract.rs @@ -305,7 +305,7 @@ pub fn execute_distribute_rewards( .add_attribute("action", "distribute_rewards") .add_attribute("sender", sender.as_str()) .add_attribute("denom", &distribution.denom) - .add_attribute("amount", &amount.to_string()); + .add_attribute("amount", amount.to_string()); Ok(resp) } @@ -352,7 +352,7 @@ pub fn execute_withdraw_rewards( .add_attribute("owner", owner.as_str()) .add_attribute("receiver", receiver.as_str()) .add_attribute("reward", &reward.denom) - .add_attribute("amount", &reward.amount.to_string()) + .add_attribute("amount", reward.amount.to_string()) .add_submessage(SubMsg::new(BankMsg::Send { to_address: receiver.to_string(), amount: vec![reward], @@ -449,7 +449,7 @@ pub fn execute_slash( "Sender is not on slashers list".to_owned(), )); } - let addr = Addr::unchecked(&addr); + let addr = Addr::unchecked(addr); // check if address belongs to member, otherwise leave early if members().may_load(deps.storage, &addr)?.is_none() { return Ok(Response::new()); @@ -769,7 +769,7 @@ pub fn query_withdrawable_rewards( ) -> StdResult { // 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 owner = Addr::unchecked(owner); let distribution = DISTRIBUTION.load(deps.storage)?; let adjustment = if let Some(adj) = WITHDRAW_ADJUSTMENT.may_load(deps.storage, &owner)? { adj diff --git a/contracts/tgrade-valset/src/contract.rs b/contracts/tgrade-valset/src/contract.rs index 7d19a1b..403a2f7 100644 --- a/contracts/tgrade-valset/src/contract.rs +++ b/contracts/tgrade-valset/src/contract.rs @@ -343,7 +343,7 @@ fn execute_jail( let res = Response::new() .add_attribute("action", "jail") .add_attribute("operator", &operator) - .add_attribute("until", &until_attr); + .add_attribute("until", until_attr); Ok(res) } @@ -355,7 +355,7 @@ fn execute_unjail( operator: Option, ) -> Result { // It is OK to get unchecked address here - invalid address would just not occur in the JAIL - let operator = operator.map(|op| Addr::unchecked(&op)); + let operator = operator.map(Addr::unchecked); let operator = operator.as_ref().unwrap_or(&info.sender); let is_admin = ADMIN.is_admin(deps.as_ref(), &info.sender)?; @@ -900,7 +900,7 @@ fn calculate_validators( }) }) }) - .take(cfg.max_validators as usize - validators.len() as usize) + .take(cfg.max_validators as usize - validators.len()) .collect::>()?; validators.extend_from_slice(&filtered); From aab7e107feaa963fcfce6106953cb2f43c2175b3 Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Wed, 18 Jan 2023 17:09:40 +0100 Subject: [PATCH 4/7] Fix clippy warnings in tests --- contracts/tg4-engagement/src/multitest.rs | 16 ++++++++-------- contracts/tg4-engagement/src/multitest/suite.rs | 2 +- contracts/tgrade-valset/src/multitest/suite.rs | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/contracts/tg4-engagement/src/multitest.rs b/contracts/tg4-engagement/src/multitest.rs index f9e2aef..ff6e481 100644 --- a/contracts/tg4-engagement/src/multitest.rs +++ b/contracts/tg4-engagement/src/multitest.rs @@ -22,7 +22,7 @@ mod funds_distribution { Event::new("wasm") .add_attribute("sender", sender) .add_attribute("denom", denom) - .add_attribute("amount", &amount.to_string()) + .add_attribute("amount", amount.to_string()) } #[test] @@ -456,7 +456,7 @@ mod funds_distribution { let denom = suite.denom.clone(); suite - .distribute_funds(&members[3], None, &coins(100, &denom)) + .distribute_funds(&members[3], None, &coins(100, denom)) .unwrap(); suite @@ -487,7 +487,7 @@ mod funds_distribution { let denom = suite.denom.clone(); suite - .distribute_funds(&members[2], None, &coins(100, &denom)) + .distribute_funds(&members[2], None, &coins(100, denom)) .unwrap(); let err = suite @@ -535,7 +535,7 @@ mod funds_distribution { ); suite - .distribute_funds(&members[2], None, &coins(100, &denom)) + .distribute_funds(&members[2], None, &coins(100, denom)) .unwrap(); suite.delegate_withdrawal(&members[1], &members[0]).unwrap(); @@ -604,7 +604,7 @@ mod slashing { ); suite - .distribute_funds(members[2], None, &coins(600, &denom)) + .distribute_funds(members[2], None, &coins(600, denom)) .unwrap(); suite.withdraw_funds(members[0], None, None).unwrap(); @@ -649,7 +649,7 @@ mod slashing { ); suite - .distribute_funds(members[2], None, &coins(600, &denom)) + .distribute_funds(members[2], None, &coins(600, denom)) .unwrap(); suite.withdraw_funds(members[0], None, None).unwrap(); @@ -693,7 +693,7 @@ mod slashing { ); suite - .distribute_funds(members[2], None, &coins(600, &denom)) + .distribute_funds(members[2], None, &coins(600, denom)) .unwrap(); suite.withdraw_funds(members[0], None, None).unwrap(); @@ -804,7 +804,7 @@ mod slashing { ); suite - .distribute_funds(members[2], None, &coins(600, &denom)) + .distribute_funds(members[2], None, &coins(600, denom)) .unwrap(); suite.withdraw_funds(members[0], None, None).unwrap(); diff --git a/contracts/tg4-engagement/src/multitest/suite.rs b/contracts/tg4-engagement/src/multitest/suite.rs index f11e45f..a0157cf 100644 --- a/contracts/tg4-engagement/src/multitest/suite.rs +++ b/contracts/tg4-engagement/src/multitest/suite.rs @@ -333,7 +333,7 @@ impl Suite { let amount = self .app .wrap() - .query_balance(&Addr::unchecked(owner), &self.denom)? + .query_balance(Addr::unchecked(owner), &self.denom)? .amount; Ok(amount.into()) } diff --git a/contracts/tgrade-valset/src/multitest/suite.rs b/contracts/tgrade-valset/src/multitest/suite.rs index 96197d0..cc48dc3 100644 --- a/contracts/tgrade-valset/src/multitest/suite.rs +++ b/contracts/tgrade-valset/src/multitest/suite.rs @@ -764,7 +764,7 @@ impl Suite { let amount = self .app .wrap() - .query_balance(&Addr::unchecked(owner), &self.denom)? + .query_balance(Addr::unchecked(owner), &self.denom)? .amount; Ok(amount.into()) } From 85373072465c744122a062ae9645f8a11f616376 Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Wed, 18 Jan 2023 17:10:51 +0100 Subject: [PATCH 5/7] Update optimizer version in CI to latest --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 82dea5a..7bfebd7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -588,7 +588,7 @@ jobs: - run: name: Build development contracts command: | - docker run --volumes-from with_code cosmwasm/workspace-optimizer:0.12.10 + docker run --volumes-from with_code cosmwasm/workspace-optimizer:0.12.11 docker cp with_code:/code/artifacts ./artifacts - run: name: Show data From 5e153806e60601f3e8539329ca50fd002e6e54a8 Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Wed, 18 Jan 2023 17:11:46 +0100 Subject: [PATCH 6/7] Update rust version in CI to latest stable --- .circleci/config.yml | 110 +++++++++++++++++++++---------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7bfebd7..29c7231 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -41,7 +41,7 @@ workflows: jobs: contract_tg4_engagement: docker: - - image: rust:1.60.0 + - image: rust:1.66.0 working_directory: ~/project/contracts/tg4-engagement steps: - checkout: @@ -51,7 +51,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-tg4-engagement-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-tg4-engagement-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -64,11 +64,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-tg4-engagement-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-tg4-engagement-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} contract_tg4_group: docker: - - image: rust:1.60.0 + - image: rust:1.66.0 working_directory: ~/project/contracts/tg4-group steps: - checkout: @@ -78,7 +78,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-tg4-group-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-tg4-group-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -91,11 +91,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-tg4-group-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-tg4-group-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} contract_tg4_mixer: docker: - - image: rust:1.60.0 + - image: rust:1.66.0 working_directory: ~/project/contracts/tg4-mixer steps: - checkout: @@ -105,7 +105,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-tg4-mixer-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-tg4-mixer-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -118,11 +118,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-tg4-mixer-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-tg4-mixer-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} contract_tg4_stake: docker: - - image: rust:1.60.0 + - image: rust:1.66.0 working_directory: ~/project/contracts/tg4-stake steps: - checkout: @@ -132,7 +132,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-tg4-stake-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-tg4-stake-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -145,11 +145,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-tg4-stake-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-tg4-stake-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} contract_tgrade_gov_reflect: docker: - - image: rust:1.60.0 + - image: rust:1.66.0 working_directory: ~/project/contracts/tgrade-gov-reflect steps: - checkout: @@ -159,7 +159,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-tgrade-gov-reflect-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-tgrade-gov-reflect-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -172,11 +172,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-tgrade-gov-reflect-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-tgrade-gov-reflect-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} contract_tgrade_valset: docker: - - image: rust:1.60.0 + - image: rust:1.66.0 working_directory: ~/project/contracts/tgrade-valset steps: - checkout: @@ -186,7 +186,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-tgrade-valset-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-tgrade-valset-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -199,11 +199,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-tgrade-valset-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-tgrade-valset-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} contract_tgrade_validator_voting: docker: - - image: rust:1.60.0 + - image: rust:1.66.0 working_directory: ~/project/contracts/tgrade-validator-voting steps: - checkout: @@ -213,7 +213,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-tgrade-validator-voting-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-tgrade-validator-voting-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -226,11 +226,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-tgrade-validator-voting-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-tgrade-validator-voting-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} contract_tgrade_vesting_account: docker: - - image: rust:1.60.0 + - image: rust:1.66.0 working_directory: ~/project/contracts/tgrade-vesting-account steps: - checkout: @@ -240,7 +240,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-tgrade-vesting-account-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-tgrade-vesting-account-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -262,11 +262,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-tgrade-vesting-account-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-tgrade-vesting-account-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} contract_tgrade_community_pool: docker: - - image: rust:1.60.0 + - image: rust:1.66.0 working_directory: ~/project/contracts/tgrade-community-pool steps: - checkout: @@ -276,7 +276,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-tgrade-validator-voting-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-tgrade-validator-voting-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -289,12 +289,12 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-tgrade-validator-voting-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-tgrade-validator-voting-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} package_bindings: docker: - - image: rust:1.60.0 + - image: rust:1.66.0 working_directory: ~/project/packages/bindings steps: - checkout: @@ -304,7 +304,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-bindings:1.60.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-v2-bindings:1.66.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Build library for native target command: cargo build --locked @@ -318,11 +318,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-v2-bindings:1.60.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-v2-bindings:1.66.0-{{ checksum "~/project/Cargo.lock" }} package_bindings_test: docker: - - image: rust:1.60.0 + - image: rust:1.66.0 working_directory: ~/project/packages/bindings-test steps: - checkout: @@ -332,7 +332,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-bindings-test:1.60.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-v2-bindings-test:1.66.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Build library for native target command: cargo build --locked @@ -343,11 +343,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-v2-bindings-test:1.60.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-v2-bindings-test:1.66.0-{{ checksum "~/project/Cargo.lock" }} package_utils: docker: - - image: rust:1.60.0 + - image: rust:1.66.0 working_directory: ~/project/packages/utils steps: - checkout: @@ -357,7 +357,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-utils:1.60.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-v2-utils:1.66.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Build library for native target command: cargo build --locked @@ -368,11 +368,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-v2-utils:1.60.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-v2-utils:1.66.0-{{ checksum "~/project/Cargo.lock" }} package_tg3: docker: - - image: rust:1.60.0 + - image: rust:1.66.0 working_directory: ~/project/packages/tg3 steps: - checkout: @@ -382,7 +382,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-tg3:1.60.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-v2-tg3:1.66.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Build library for native target command: cargo build --locked @@ -396,12 +396,12 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-v2-tg3:1.60.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-v2-tg3:1.66.0-{{ checksum "~/project/Cargo.lock" }} package_tg4: docker: - - image: rust:1.60.0 + - image: rust:1.66.0 working_directory: ~/project/packages/tg4 steps: - checkout: @@ -411,7 +411,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-tg4:1.60.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-v2-tg4:1.66.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Build library for native target command: cargo build --locked @@ -425,11 +425,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-v2-tg4:1.60.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-v2-tg4:1.66.0-{{ checksum "~/project/Cargo.lock" }} package_voting_contract: docker: - - image: rust:1.60.0 + - image: rust:1.66.0 working_directory: ~/project/packages/voting-contract steps: - checkout: @@ -439,7 +439,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-tg4:1.60.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-v2-tg4:1.66.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Build library for native target command: cargo build --locked @@ -453,11 +453,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-v2-tg4:1.60.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-v2-tg4:1.66.0-{{ checksum "~/project/Cargo.lock" }} package_test_utils: docker: - - image: rust:1.60.0 + - image: rust:1.66.0 working_directory: ~/project/packages/test-utils steps: - checkout: @@ -467,7 +467,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-tg4:1.60.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-v2-tg4:1.66.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Build library for native target command: cargo build --locked @@ -478,11 +478,11 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-v2-tg4:1.60.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-v2-tg4:1.66.0-{{ checksum "~/project/Cargo.lock" }} lint: docker: - - image: rust:1.60.0 + - image: rust:1.66.0 steps: - checkout - run: @@ -490,7 +490,7 @@ jobs: command: rustc --version; cargo --version; rustup --version; rustup target list --installed - restore_cache: keys: - - cargocache-v2-lint-rust:1.60.0-{{ checksum "Cargo.lock" }} + - cargocache-v2-lint-rust:1.66.0-{{ checksum "Cargo.lock" }} - run: name: Add rustfmt component command: rustup component add rustfmt @@ -515,7 +515,7 @@ jobs: - target/debug/.fingerprint - target/debug/build - target/debug/deps - key: cargocache-v2-lint-rust:1.60.0-{{ checksum "Cargo.lock" }} + key: cargocache-v2-lint-rust:1.66.0-{{ checksum "Cargo.lock" }} # This runs one time on the top level to ensure all contracts compile properly into wasm. # We don't run the wasm build per contract build, and then reuse a lot of the same dependencies, so this speeds up CI time @@ -523,7 +523,7 @@ jobs: # We also sanity-check the resultant wasm files. wasm-build: docker: - - image: rust:1.60.0 + - image: rust:1.66.0 steps: - checkout: path: ~/project @@ -532,7 +532,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-wasm-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + - cargocache-wasm-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Add wasm32 target command: rustup target add wasm32-unknown-unknown @@ -552,7 +552,7 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-wasm-rust:1.60.0-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-wasm-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Check wasm contracts command: | @@ -610,7 +610,7 @@ jobs: build_and_upload_schemas: docker: - - image: rust:1.60.0 + - image: rust:1.66.0 working_directory: ~/project steps: - checkout: From f785c64d9bc79b61027c7b8c70d18406a6acb158 Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Wed, 18 Jan 2023 17:15:43 +0100 Subject: [PATCH 7/7] Switch to cosmwasm-check in CI --- .circleci/config.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 29c7231..405ba66 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -545,9 +545,9 @@ jobs: (cd $C && cargo build --release --target wasm32-unknown-unknown --locked) done - run: - name: Install check_contract + name: Install cosmwasm-check # Uses --debug for compilation speed. - command: cargo install --debug --features iterator --example check_contract --version 1.0.0 -- cosmwasm-vm + command: cargo install --debug --version 1.1.5 cosmwasm-check - save_cache: paths: - /usr/local/cargo/registry @@ -555,12 +555,7 @@ jobs: key: cargocache-wasm-rust:1.66.0-{{ checksum "~/project/Cargo.lock" }} - run: name: Check wasm contracts - command: | - for W in ./target/wasm32-unknown-unknown/release/*.wasm - do - echo -n "Checking $(basename $W) ... " - check_contract --supported-features iterator,staking,stargate,tgrade $W - done + command: cosmwasm-check --supported-features iterator,staking,stargate,tgrade ./target/wasm32-unknown-unknown/release/*.wasm # This job roughly follows the instructions from https://circleci.com/blog/publishing-to-github-releases-via-circleci/ build_and_upload_contracts: