From 302888b2c045ca23729aa92680e5c2d52f5446f7 Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Fri, 3 Jun 2022 18:38:31 +0200 Subject: [PATCH 01/16] Adapt tg4-group tests to tg4 format (`MemberInfo` for raw queries) --- contracts/tg4-group/src/contract.rs | 37 ++++++++++++++++++----------- contracts/tg4-group/src/state.rs | 4 ++-- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/contracts/tg4-group/src/contract.rs b/contracts/tg4-group/src/contract.rs index 54a9c4ae..720452d1 100644 --- a/contracts/tg4-group/src/contract.rs +++ b/contracts/tg4-group/src/contract.rs @@ -9,7 +9,7 @@ use cw_storage_plus::Bound; use cw_utils::maybe_addr; use cw4::{MemberChangedHookMsg, MemberDiff}; -use tg4::{Member, MemberListResponse, MemberResponse, TotalPointsResponse}; +use tg4::{Member, MemberInfo, MemberListResponse, MemberResponse, TotalPointsResponse}; use crate::error::ContractError; use crate::msg::{ExecuteMsg, InstantiateMsg, QueryMsg}; @@ -50,7 +50,12 @@ pub fn create( for member in members.into_iter() { total += member.points; let member_addr = deps.api.addr_validate(&member.addr)?; - MEMBERS.save(deps.storage, &member_addr, &member.points, height)?; + MEMBERS.save( + deps.storage, + &member_addr, + &MemberInfo::new(member.points), + height, + )?; } TOTAL.save(deps.storage, &total)?; @@ -126,10 +131,14 @@ pub fn update_members( for add in to_add.into_iter() { let add_addr = deps.api.addr_validate(&add.addr)?; MEMBERS.update(deps.storage, &add_addr, height, |old| -> StdResult<_> { - total -= old.unwrap_or_default(); + total -= old.clone().unwrap_or_default().points; total += add.points; - diffs.push(MemberDiff::new(add.addr, old, Some(add.points))); - Ok(add.points) + diffs.push(MemberDiff::new( + add.addr, + old.map(|mi| mi.points), + Some(add.points), + )); + Ok(MemberInfo::new(add.points)) })?; } @@ -137,9 +146,9 @@ pub fn update_members( let remove_addr = deps.api.addr_validate(&remove)?; let old = MEMBERS.may_load(deps.storage, &remove_addr)?; // Only process this if they were actually in the list before - if let Some(points) = old { - diffs.push(MemberDiff::new(remove, Some(points), None)); - total -= points; + if let Some(member_info) = old { + diffs.push(MemberDiff::new(remove, Some(member_info.points), None)); + total -= member_info.points; MEMBERS.remove(deps.storage, &remove_addr, height)?; } } @@ -171,12 +180,12 @@ fn query_total_points(deps: Deps) -> StdResult { fn query_member(deps: Deps, addr: String, height: Option) -> StdResult { let addr = deps.api.addr_validate(&addr)?; - let points = match height { + let member_info = match height { Some(h) => MEMBERS.may_load_at_height(deps.storage, &addr, h), None => MEMBERS.may_load(deps.storage, &addr), }?; Ok(MemberResponse { - points, + points: member_info.map(|mi| mi.points), start_height: None, }) } @@ -198,10 +207,10 @@ fn list_members( .range(deps.storage, start, None, Order::Ascending) .take(limit) .map(|item| { - item.map(|(addr, points)| Member { + item.map(|(addr, member_info)| Member { addr: addr.into(), - points, - start_height: None, + points: member_info.points, + start_height: member_info.start_height, }) }) .collect::>()?; @@ -557,7 +566,7 @@ mod tests { // get member votes from raw key let member2_raw = deps.storage.get(&member_key(USER2)).unwrap(); - let member2: u64 = from_slice(&member2_raw).unwrap(); + let member2: u64 = from_slice::(&member2_raw).unwrap().points; assert_eq!(6, member2); // and execute misses diff --git a/contracts/tg4-group/src/state.rs b/contracts/tg4-group/src/state.rs index de41754e..da090766 100644 --- a/contracts/tg4-group/src/state.rs +++ b/contracts/tg4-group/src/state.rs @@ -1,14 +1,14 @@ use cosmwasm_std::Addr; use cw_controllers::{Admin, Hooks}; use cw_storage_plus::{Item, SnapshotMap, Strategy}; -use tg4::TOTAL_KEY; +use tg4::{MemberInfo, TOTAL_KEY}; pub const ADMIN: Admin = Admin::new("admin"); pub const HOOKS: Hooks = Hooks::new("tg4-hooks"); pub const TOTAL: Item = Item::new(TOTAL_KEY); -pub const MEMBERS: SnapshotMap<&Addr, u64> = SnapshotMap::new( +pub const MEMBERS: SnapshotMap<&Addr, MemberInfo> = SnapshotMap::new( tg4::MEMBERS_KEY, tg4::MEMBERS_CHECKPOINTS, tg4::MEMBERS_CHANGELOG, From a6c535b07ec66761a2412b09b6d5678bfafdbdb0 Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Fri, 3 Jun 2022 18:39:16 +0200 Subject: [PATCH 02/16] Update comment --- packages/tg4/src/helpers.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tg4/src/helpers.rs b/packages/tg4/src/helpers.rs index 548ea6fc..3ae7a197 100644 --- a/packages/tg4/src/helpers.rs +++ b/packages/tg4/src/helpers.rs @@ -103,7 +103,7 @@ impl Tg4Contract { let query = self.encode_raw_query::<_, Q>(path); // We have to copy the logic of Querier.query to handle the empty case, and not - // try to decode empty result into a u64. + // try to decode an empty result into a `MemberInfo`. // TODO: add similar API on Querier - this is not the first time I came across it let raw = to_vec(&query)?; match querier.raw_query(&raw) { From c532ec967f2417a9c940cf586ceb64dbcca357d2 Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Fri, 3 Jun 2022 18:39:35 +0200 Subject: [PATCH 03/16] Update test case to tg4 storage / raw keys standard --- contracts/tg4-engagement/src/contract.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/tg4-engagement/src/contract.rs b/contracts/tg4-engagement/src/contract.rs index c86892bf..06864f82 100644 --- a/contracts/tg4-engagement/src/contract.rs +++ b/contracts/tg4-engagement/src/contract.rs @@ -1223,9 +1223,9 @@ mod tests { assert_eq!(members.len(), 2); // we write some garbage non-utf8 key in the same key space as members, with some tricks - const BIN_MEMBERS: Map, u64> = Map::new(tg4::MEMBERS_KEY); + const BIN_MEMBERS: Map, MemberInfo> = Map::new(tg4::MEMBERS_KEY); BIN_MEMBERS - .save(&mut deps.storage, vec![226, 130, 40], &123) + .save(&mut deps.storage, vec![226, 130, 40], &MemberInfo::new(123)) .unwrap(); // this should now error when trying to parse the invalid data (in the same keyspace) From ed17d72f684718605dfb14f240f279c47ac0b829 Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Sat, 4 Jun 2022 07:12:08 +0200 Subject: [PATCH 04/16] Improve tg4 docs --- packages/tg4/README.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/tg4/README.md b/packages/tg4/README.md index 76071ba2..99b62254 100644 --- a/packages/tg4/README.md +++ b/packages/tg4/README.md @@ -1,7 +1,7 @@ # TG4 Spec: Group Members -Based on [cosmwasm-plus](https://github.com/CosmWasm/cosmwasm-plus) -[CW4](https://github.com/CosmWasm/cosmwasm-plus/tree/master/packages/cw4). +Based on [cw-plus](https://github.com/CosmWasm/cw-plus) +[CW4](https://github.com/CosmWasm/cw-plus/tree/master/packages/cw4). TG4 is a spec for storing group membership, which can be combined with [TG3](https://github.com/confio/poe-contracts/tree/main/packages/tg3) multisigs. @@ -40,7 +40,7 @@ There are three messages supported by a group contract: by `AddHook`. Only the `admin` may execute any of these function. Thus, by omitting an -`admin`, we end up with a similar functionality ad `cw3-fixed-multisig`. +`admin`, we end up with a similar functionality than `cw3-fixed-multisig`. If we include one, it may often be desired to be a `tg3` contract that uses this group contract as a group. This leads to a bit of chicken-and-egg problem, but we cover how to instantiate that in @@ -76,10 +76,13 @@ in contract-contract calls. These use keys exported by `tg4` `TOTAL_KEY` - making a raw query with this key (`b"total"`) will return a JSON-encoded `u64` -`members_key()` - takes an `Addr` and returns a key that can be +`member_key()` - takes an `Addr` and returns a key that can be used for raw query (`"\x00\x07members" || addr`). This will return empty bytes if the member is not inside the group, otherwise a - JSON-encoded `u64` + JSON-encoded `MemberInfo` struct, that contains the member points + and optionally their membership start height. Which can be used + for tie breaking between members with the same number of points. + See [query.rs](./src/query.rs) for details. ## Hooks @@ -121,4 +124,4 @@ rare and often point to fragile code. Note that the message sender will be the group contract that was updated. Make sure you check this when handling, so external actors cannot -call this hook, only the trusted group. +call this hook, only the trusted group. \ No newline at end of file From c313dd510d469fa0d9870ae9afc95143ed03b81c Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Sat, 4 Jun 2022 07:13:39 +0200 Subject: [PATCH 05/16] Improve MemberResponse creation --- contracts/tg4-group/src/contract.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/contracts/tg4-group/src/contract.rs b/contracts/tg4-group/src/contract.rs index 720452d1..404d00aa 100644 --- a/contracts/tg4-group/src/contract.rs +++ b/contracts/tg4-group/src/contract.rs @@ -184,10 +184,7 @@ fn query_member(deps: Deps, addr: String, height: Option) -> StdResult MEMBERS.may_load_at_height(deps.storage, &addr, h), None => MEMBERS.may_load(deps.storage, &addr), }?; - Ok(MemberResponse { - points: member_info.map(|mi| mi.points), - start_height: None, - }) + Ok(member_info.into()) } // settings for pagination From 5dacdcba9ef2353d717a383b066facd37e9bca0f Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Sat, 4 Jun 2022 07:14:09 +0200 Subject: [PATCH 06/16] Fix / Improve tg4-group docs --- contracts/tg4-group/README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contracts/tg4-group/README.md b/contracts/tg4-group/README.md index c3f0e219..c2453ae2 100644 --- a/contracts/tg4-group/README.md +++ b/contracts/tg4-group/README.md @@ -2,8 +2,8 @@ This is a basic implementation of the [tg4 spec](../../packages/tg4/README.md). It fulfills all elements of the spec, including the raw query lookups, -and it designed to be used as a backing storage for -[cw3 compliant contracts](../../packages/cw3/README.md). +and it is designed to be used as a backing storage for +[tg3 compliant contracts](../../packages/tg3/README.md). It stores a set of members along with an admin, and allows the admin to update the state. Raw queries (intended for cross-contract queries) @@ -25,11 +25,12 @@ pub struct InitMsg { pub struct Member { pub addr: HumanAddr, pub points: u64, + pub start_height: Option } ``` -Members are defined by an address and a number of points. This is transformed -and stored under their `CanonicalAddr`, in a format defined in +Members are defined by an address, a number of points, and an optional start height. +This is transformed and stored under their `Addr`, in a format defined in [tg4 raw queries](../../packages/tg4/README.md#raw). Note that 0 *is an allowed number of points*. This doesn't give any voting rights, but @@ -47,5 +48,4 @@ Basic update messages, queries, and hooks are defined by the `UpdateMembers{add, remove}` - takes a membership diff and adds/updates the members, as well as removing any provided addresses. If an address is on both lists, it will be removed. If it appears multiple times in `add`, only the -last occurrence will be used. - +last occurrence will be used. \ No newline at end of file From a3c52335487c90cf99d48ecb94b8e4c13024ea59 Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Thu, 2 Jun 2022 12:13:44 +0200 Subject: [PATCH 07/16] Add test to check state export is complete --- .../src/multitest/export_import.rs | 26 ++++++++++++++++++- .../tgrade-valset/src/multitest/suite.rs | 7 +++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/contracts/tgrade-valset/src/multitest/export_import.rs b/contracts/tgrade-valset/src/multitest/export_import.rs index 80c9dfc7..5178cae1 100644 --- a/contracts/tgrade-valset/src/multitest/export_import.rs +++ b/contracts/tgrade-valset/src/multitest/export_import.rs @@ -1,7 +1,7 @@ use crate::contract::{CONTRACT_NAME, CONTRACT_VERSION}; use crate::msg::OperatorResponse; use crate::multitest::helpers::addr_to_pubkey; -use crate::multitest::suite::SuiteBuilder; +use crate::multitest::suite::{Suite, SuiteBuilder}; use crate::state::{ Config, EpochInfo, SlashingResponse, StartHeightResponse, ValidatorInfo, ValidatorSlashing, ValsetState, @@ -11,6 +11,30 @@ use cw2::ContractVersion; use tg4::Tg4Contract; use tg_utils::Duration; +#[test] +fn export_contains_all_state() { + let mut suite: Suite = SuiteBuilder::new() + .with_max_validators(6) + .with_min_points(3) + .with_operators(&["member1"]) + .build(); + + // state snapshot + let orig_state = suite.dump_raw_valset_state(); + + // export and import into new contract + let exp = suite.export().unwrap(); + let mut suite = SuiteBuilder::new().build(); + suite.import(exp).unwrap(); + + // state snapshot + let new_state = suite.dump_raw_valset_state(); + + // compare two snapshots + assert_eq!(orig_state, new_state); + +} + #[test] fn export_works() { let mut suite = SuiteBuilder::new() diff --git a/contracts/tgrade-valset/src/multitest/suite.rs b/contracts/tgrade-valset/src/multitest/suite.rs index e72adc8a..aa8a114b 100644 --- a/contracts/tgrade-valset/src/multitest/suite.rs +++ b/contracts/tgrade-valset/src/multitest/suite.rs @@ -450,6 +450,13 @@ pub struct Suite { } impl Suite { + // TODO + pub fn dump_raw_valset_state(&self) -> Vec<(Vec, Vec)> { +// self.app.dump_wasm_raw(&self.valset) + // TODO + vec![] + } + pub fn admin(&self) -> &str { &self.admin } From a42e013d39e148a0e24f28bbe1287f2bfd95187d Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Thu, 2 Jun 2022 12:20:27 +0200 Subject: [PATCH 08/16] Update packages to cw 1.0.0 cw-+ 0.13.4 --- packages/bindings-test/Cargo.toml | 6 +++--- packages/bindings/Cargo.toml | 4 ++-- packages/test-utils/Cargo.toml | 2 +- packages/tg3/Cargo.toml | 4 ++-- packages/tg4/Cargo.toml | 4 ++-- packages/utils/Cargo.toml | 10 +++++----- packages/voting-contract/Cargo.toml | 10 +++++----- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/bindings-test/Cargo.toml b/packages/bindings-test/Cargo.toml index 3941d1c4..1e3e3e37 100644 --- a/packages/bindings-test/Cargo.toml +++ b/packages/bindings-test/Cargo.toml @@ -10,10 +10,10 @@ license = "Apache-2.0" [dependencies] tg-bindings = { version = "0.9.0", path = "../bindings" } -cosmwasm-std = { version = "1.0.0-beta8" } +cosmwasm-std = { version = "1.0.0" } schemars = "0.8" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -cw-multi-test = { version = "0.13.2" } -cw-storage-plus = { version = "0.13.2" } +cw-multi-test = { version = "0.13.4" } +cw-storage-plus = { version = "0.13.4" } anyhow = { version = "1" } thiserror = { version = "1.0.21" } diff --git a/packages/bindings/Cargo.toml b/packages/bindings/Cargo.toml index 48abd27f..97aac668 100644 --- a/packages/bindings/Cargo.toml +++ b/packages/bindings/Cargo.toml @@ -10,11 +10,11 @@ license = "Apache-2.0" [dependencies] base64 = "0.13" -cosmwasm-std = { version = "1.0.0-beta8" } +cosmwasm-std = { version = "1.0.0" } schemars = "0.8" sha2 = "0.9" serde = { version = "1.0.103", default-features = false, features = ["derive"] } [dev-dependencies] -cosmwasm-schema = { version = "1.0.0-beta8" } +cosmwasm-schema = { version = "1.0.0" } hex-literal = "0.3.1" diff --git a/packages/test-utils/Cargo.toml b/packages/test-utils/Cargo.toml index e2a448eb..6a878626 100644 --- a/packages/test-utils/Cargo.toml +++ b/packages/test-utils/Cargo.toml @@ -9,5 +9,5 @@ homepage = "https://tgrade.finance" license = "Apache-2.0" [dependencies] -cosmwasm-std = "1.0.0-beta8" +cosmwasm-std = "1.0.0" tg-voting-contract = { path = "../voting-contract", version = "0.9.0" } diff --git a/packages/tg3/Cargo.toml b/packages/tg3/Cargo.toml index c84256cc..6a6434ca 100644 --- a/packages/tg3/Cargo.toml +++ b/packages/tg3/Cargo.toml @@ -9,11 +9,11 @@ homepage = "https://tgrade.finance" license = "Apache-2.0" [dependencies] -cosmwasm-std = { version = "1.0.0-beta8" } +cosmwasm-std = { version = "1.0.0" } schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } tg-bindings = { version = "0.9.0", path = "../../packages/bindings" } tg-utils = { version = "0.9.0", path = "../../packages/utils" } [dev-dependencies] -cosmwasm-schema = "1.0.0-beta8" +cosmwasm-schema = "1.0.0" diff --git a/packages/tg4/Cargo.toml b/packages/tg4/Cargo.toml index 9c3ecf66..611523f4 100644 --- a/packages/tg4/Cargo.toml +++ b/packages/tg4/Cargo.toml @@ -9,10 +9,10 @@ homepage = "https://tgrade.finance" license = "Apache-2.0" [dependencies] -cosmwasm-std = { version = "1.0.0-beta8" } +cosmwasm-std = { version = "1.0.0" } schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } tg-bindings = { path = "../bindings", version = "0.9.0" } [dev-dependencies] -cosmwasm-schema = { version = "1.0.0-beta8" } +cosmwasm-schema = { version = "1.0.0" } diff --git a/packages/utils/Cargo.toml b/packages/utils/Cargo.toml index 38a72db2..3ffc60b9 100644 --- a/packages/utils/Cargo.toml +++ b/packages/utils/Cargo.toml @@ -11,11 +11,11 @@ license = "Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -cosmwasm-std = "1.0.0-beta8" -cw-utils = "0.13.2" -cw-controllers = "0.13.2" -cw-storage-plus = "0.13.2" -cw2 = "0.13.2" +cosmwasm-std = "1.0.0" +cw-utils = "0.13.4" +cw-controllers = "0.13.4" +cw-storage-plus = "0.13.4" +cw2 = "0.13.4" schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } tg4 = { path = "../tg4", version = "0.9.0" } diff --git a/packages/voting-contract/Cargo.toml b/packages/voting-contract/Cargo.toml index 49dd59e1..47feca32 100644 --- a/packages/voting-contract/Cargo.toml +++ b/packages/voting-contract/Cargo.toml @@ -11,10 +11,10 @@ license = "Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -cw-utils = "0.13.2" +cw-utils = "0.13.4" tg3 = { path = "../../packages/tg3", version = "0.9.0" } -cw-storage-plus = "0.13.2" -cosmwasm-std = "1.0.0-beta8" +cw-storage-plus = "0.13.4" +cosmwasm-std = "1.0.0" schemars = "0.8.1" serde = { version = "1", default-features = false, features = ["derive"] } tg4 = { path = "../tg4", version = "0.9.0" } @@ -24,8 +24,8 @@ thiserror = { version = "1" } [dev-dependencies] anyhow = "1" -cosmwasm-schema = "1.0.0-beta8" -cw-multi-test = "0.13.2" +cosmwasm-schema = "1.0.0" +cw-multi-test = "0.13.4" derivative = "2" tg-bindings-test = { path = "../../packages/bindings-test", version = "0.9.0" } tg4-engagement = { path = "../../contracts/tg4-engagement", version = "0.9.0", features = ["library"] } From 3932c81f83a500b95e4e5d8beec7bf43e8d81e78 Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Thu, 2 Jun 2022 13:11:23 +0200 Subject: [PATCH 09/16] Update contracts to cw 1.0.0 and cw-+ 0.13.4 --- contracts/tg4-engagement/Cargo.toml | 14 +++++++------- contracts/tg4-group/Cargo.toml | 14 +++++++------- contracts/tg4-mixer/Cargo.toml | 16 ++++++++-------- contracts/tg4-stake/Cargo.toml | 12 ++++++------ contracts/tgrade-community-pool/Cargo.toml | 8 ++++---- contracts/tgrade-gov-reflect/Cargo.toml | 6 +++--- contracts/tgrade-validator-voting/Cargo.toml | 10 +++++----- contracts/tgrade-valset/Cargo.toml | 16 ++++++++-------- contracts/tgrade-vesting-account/Cargo.toml | 12 ++++++------ 9 files changed, 54 insertions(+), 54 deletions(-) diff --git a/contracts/tg4-engagement/Cargo.toml b/contracts/tg4-engagement/Cargo.toml index db7a3460..3e7d35a8 100644 --- a/contracts/tg4-engagement/Cargo.toml +++ b/contracts/tg4-engagement/Cargo.toml @@ -20,21 +20,21 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -cw-utils = "0.13.1" -cw2 = "0.13.1" -cw-controllers = "0.13.1" -cw-storage-plus = "0.13.1" +cw-utils = "0.13.4" +cw2 = "0.13.4" +cw-controllers = "0.13.4" +cw-storage-plus = "0.13.4" tg4 = { path = "../../packages/tg4", version = "0.9.0" } tg-utils = { version = "0.9.0", path = "../../packages/utils" } tg-bindings = { version = "0.9.0", path = "../../packages/bindings" } -cosmwasm-std = { version = "1.0.0-beta8" } +cosmwasm-std = { version = "1.0.0" } 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-beta8" } -cw-multi-test = { version = "0.13.1" } +cosmwasm-schema = { version = "1.0.0" } +cw-multi-test = { version = "0.13.4" } tg-bindings-test = { version = "0.9.0", path = "../../packages/bindings-test" } derivative = "2" anyhow = "1" diff --git a/contracts/tg4-group/Cargo.toml b/contracts/tg4-group/Cargo.toml index ada31071..6e215910 100644 --- a/contracts/tg4-group/Cargo.toml +++ b/contracts/tg4-group/Cargo.toml @@ -26,16 +26,16 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -cw-utils = "0.13.1" -cw2 = "0.13.1" -cw4 = "0.13.1" +cw-utils = "0.13.4" +cw2 = "0.13.4" +cw4 = "0.13.4" tg4 = { version = "0.9.0", path = "../../packages/tg4" } -cw-controllers = "0.13.1" -cw-storage-plus = "0.13.1" -cosmwasm-std = { version = "1.0.0-beta8" } +cw-controllers = "0.13.4" +cw-storage-plus = "0.13.4" +cosmwasm-std = { version = "1.0.0" } schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } thiserror = { version = "1.0.23" } [dev-dependencies] -cosmwasm-schema = { version = "1.0.0-beta8" } +cosmwasm-schema = { version = "1.0.0" } diff --git a/contracts/tg4-mixer/Cargo.toml b/contracts/tg4-mixer/Cargo.toml index 48c4375d..34e1a7db 100644 --- a/contracts/tg4-mixer/Cargo.toml +++ b/contracts/tg4-mixer/Cargo.toml @@ -23,14 +23,14 @@ library = [] benches = [ "cosmwasm-vm" ] [dependencies] -cw-utils = "0.13.1" -cw2 = "0.13.1" -cw20 = "0.13.1" -cw-storage-plus = "0.13.1" +cw-utils = "0.13.4" +cw2 = "0.13.4" +cw20 = "0.13.4" +cw-storage-plus = "0.13.4" tg4 = { path = "../../packages/tg4", version = "0.9.0" } tg-utils = { path = "../../packages/utils", version = "0.9.0" } tg-bindings = { path = "../../packages/bindings", version = "0.9.0" } -cosmwasm-std = "1.0.0-beta8" +cosmwasm-std = "1.0.0" integer-sqrt = "0.1.5" schemars = "0.8" serde = { version = "1.0.103", default-features = false, features = ["derive"] } @@ -39,11 +39,11 @@ rust_decimal = { version = "1.16", default-features = false, features = ["maths" rust_decimal_macros = { version = "1.16", default-features = false } # bench dependencies -cosmwasm-vm = { version = "1.0.0-beta8", optional = true } +cosmwasm-vm = { version = "1.0.0", optional = true } [dev-dependencies] -cosmwasm-schema = { version = "1.0.0-beta8" } -cw-multi-test = { version = "0.13.1" } +cosmwasm-schema = { version = "1.0.0" } +cw-multi-test = { version = "0.13.4" } tg4-engagement = { path = "../tg4-engagement", version = "0.9.0", features = ["library"] } tg4-stake = { path = "../tg4-stake", version = "0.9.0", features = ["library"] } diff --git a/contracts/tg4-stake/Cargo.toml b/contracts/tg4-stake/Cargo.toml index a695cc8a..95ea983b 100644 --- a/contracts/tg4-stake/Cargo.toml +++ b/contracts/tg4-stake/Cargo.toml @@ -20,19 +20,19 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -cw-utils = "0.13.1" -cw2 = "0.13.1" -cw-controllers = "0.13.1" -cw-storage-plus = "0.13.1" +cw-utils = "0.13.4" +cw2 = "0.13.4" +cw-controllers = "0.13.4" +cw-storage-plus = "0.13.4" tg4 = { path = "../../packages/tg4", version = "0.9.0" } tg-utils = { path = "../../packages/utils", version = "0.9.0" } tg-bindings = { path = "../../packages/bindings", version = "0.9.0" } -cosmwasm-std = "1.0.0-beta8" +cosmwasm-std = "1.0.0" schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } thiserror = { version = "1.0.21" } itertools = "0.10" [dev-dependencies] -cosmwasm-schema = { version = "1.0.0-beta8" } +cosmwasm-schema = { version = "1.0.0" } tg-bindings-test = { path = "../../packages/bindings-test", version = "0.9.0" } diff --git a/contracts/tgrade-community-pool/Cargo.toml b/contracts/tgrade-community-pool/Cargo.toml index 61f00cb7..89db6c14 100644 --- a/contracts/tgrade-community-pool/Cargo.toml +++ b/contracts/tgrade-community-pool/Cargo.toml @@ -17,9 +17,9 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -cw2 = "0.13.1" +cw2 = "0.13.4" tg3 = { path = "../../packages/tg3", version = "0.9.0" } -cosmwasm-std = "1.0.0-beta8" +cosmwasm-std = "1.0.0" schemars = "0.8.1" serde = { version = "1", default-features = false, features = ["derive"] } tg-bindings = { path = "../../packages/bindings", version = "0.9.0" } @@ -30,7 +30,7 @@ thiserror = "1" [dev-dependencies] anyhow = "1" -cosmwasm-schema = "1.0.0-beta8" -cw-multi-test = "0.13.1" +cosmwasm-schema = "1.0.0" +cw-multi-test = "0.13.4" tg-bindings-test = { path = "../../packages/bindings-test", version = "0.9.0" } tg4 = { path = "../../packages/tg4", version = "0.9.0" } diff --git a/contracts/tgrade-gov-reflect/Cargo.toml b/contracts/tgrade-gov-reflect/Cargo.toml index f0878d44..f95f1098 100644 --- a/contracts/tgrade-gov-reflect/Cargo.toml +++ b/contracts/tgrade-gov-reflect/Cargo.toml @@ -24,12 +24,12 @@ crate-type = ["cdylib", "rlib"] backtraces = ["cosmwasm-std/backtraces"] [dependencies] -cosmwasm-std = "1.0.0-beta8" -cw-storage-plus = "0.13.1" +cosmwasm-std = "1.0.0" +cw-storage-plus = "0.13.4" tg-bindings = { version = "0.9.0", path = "../../packages/bindings" } schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } thiserror = "1" [dev-dependencies] -cosmwasm-schema = "1.0.0-beta8" +cosmwasm-schema = "1.0.0" diff --git a/contracts/tgrade-validator-voting/Cargo.toml b/contracts/tgrade-validator-voting/Cargo.toml index cb77fea1..83c97723 100644 --- a/contracts/tgrade-validator-voting/Cargo.toml +++ b/contracts/tgrade-validator-voting/Cargo.toml @@ -17,9 +17,9 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -cw2 = "0.13.1" +cw2 = "0.13.4" tg3 = { path = "../../packages/tg3", version = "0.9.0" } -cosmwasm-std = "1.0.0-beta8" +cosmwasm-std = "1.0.0" schemars = "0.8.1" serde = { version = "1", default-features = false, features = ["derive"] } tg-bindings = { path = "../../packages/bindings", version = "0.9.0" } @@ -29,9 +29,9 @@ thiserror = "1" [dev-dependencies] anyhow = "1" -cosmwasm-schema = "1.0.0-beta8" -cw-multi-test = "0.13.1" -cw-storage-plus = "0.13.1" +cosmwasm-schema = "1.0.0" +cw-multi-test = "0.13.4" +cw-storage-plus = "0.13.4" tg-bindings-test = { version = "0.9.0", path = "../../packages/bindings-test" } tg-utils = { version = "0.9.0", path = "../../packages/utils" } tg-voting-contract = { version = "0.9.0", path = "../../packages/voting-contract" } diff --git a/contracts/tgrade-valset/Cargo.toml b/contracts/tgrade-valset/Cargo.toml index 421b1773..94d94a5f 100644 --- a/contracts/tgrade-valset/Cargo.toml +++ b/contracts/tgrade-valset/Cargo.toml @@ -27,11 +27,11 @@ library = [] integration = ["bech32", "cosmwasm-vm"] [dependencies] -cosmwasm-std = { version = "1.0.0-beta8" } -cw2 = { version = "0.13.1" } -cw-utils = { version = "0.13.1" } -cw-controllers = { version = "0.13.1" } -cw-storage-plus = { version = "0.13.1" } +cosmwasm-std = { version = "1.0.0" } +cw2 = { version = "0.13.4" } +cw-utils = { version = "0.13.4" } +cw-controllers = { version = "0.13.4" } +cw-storage-plus = { version = "0.13.4" } schemars = "0.8" semver = "1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } @@ -42,11 +42,11 @@ tg-utils = { version = "0.9.0", path = "../../packages/utils" } # For integration tests ("integration" feature) bech32 = { version = "0.8.1", optional = true } -cosmwasm-vm = { version = "1.0.0-beta8", optional = true, default-features = false, features = ["iterator"] } +cosmwasm-vm = { version = "1.0.0", optional = true, default-features = false, features = ["iterator"] } [dev-dependencies] -cosmwasm-schema = { version = "1.0.0-beta8" } -cw-multi-test = "0.13.1" +cosmwasm-schema = { version = "1.0.0" } +cw-multi-test = "0.13.4" tg4-engagement = { path = "../tg4-engagement", version = "0.9.0" } tg4-stake = { path = "../tg4-stake", version = "0.9.0" } # we enable multitest feature only for tests diff --git a/contracts/tgrade-vesting-account/Cargo.toml b/contracts/tgrade-vesting-account/Cargo.toml index 4a3d21e2..588a9c50 100644 --- a/contracts/tgrade-vesting-account/Cargo.toml +++ b/contracts/tgrade-vesting-account/Cargo.toml @@ -16,10 +16,10 @@ crate-type = ["cdylib", "rlib"] library = [] [dependencies] -cosmwasm-std = "1.0.0-beta8" -cw-utils = "0.13.1" -cw2 = "0.13.1" -cw-storage-plus = "0.13.1" +cosmwasm-std = "1.0.0" +cw-utils = "0.13.4" +cw2 = "0.13.4" +cw-storage-plus = "0.13.4" schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } tg-bindings = { version = "0.9.0", path = "../../packages/bindings" } @@ -30,6 +30,6 @@ thiserror = "1" anyhow = "1" assert_matches = "1" derivative = "2" -cosmwasm-schema = "1.0.0-beta8" -cw-multi-test = "0.13.1" +cosmwasm-schema = "1.0.0" +cw-multi-test = "0.13.4" tg-bindings-test = { version = "0.9.0", path = "../../packages/bindings-test" } From 4b1e39568186f3dd8e55b11cccd8b8fa235c001d Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Thu, 2 Jun 2022 13:27:35 +0200 Subject: [PATCH 10/16] Enable complete state export test --- contracts/tgrade-valset/src/multitest/export_import.rs | 1 - contracts/tgrade-valset/src/multitest/suite.rs | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/contracts/tgrade-valset/src/multitest/export_import.rs b/contracts/tgrade-valset/src/multitest/export_import.rs index 5178cae1..38efe613 100644 --- a/contracts/tgrade-valset/src/multitest/export_import.rs +++ b/contracts/tgrade-valset/src/multitest/export_import.rs @@ -32,7 +32,6 @@ fn export_contains_all_state() { // compare two snapshots assert_eq!(orig_state, new_state); - } #[test] diff --git a/contracts/tgrade-valset/src/multitest/suite.rs b/contracts/tgrade-valset/src/multitest/suite.rs index aa8a114b..70942d98 100644 --- a/contracts/tgrade-valset/src/multitest/suite.rs +++ b/contracts/tgrade-valset/src/multitest/suite.rs @@ -450,11 +450,8 @@ pub struct Suite { } impl Suite { - // TODO pub fn dump_raw_valset_state(&self) -> Vec<(Vec, Vec)> { -// self.app.dump_wasm_raw(&self.valset) - // TODO - vec![] + self.app.dump_wasm_raw(&self.valset) } pub fn admin(&self) -> &str { From 11b46ad5156cf77a3027b7cdf7d8ecc6a6e06711 Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Thu, 2 Jun 2022 17:41:42 +0200 Subject: [PATCH 11/16] Set version: 0.10.0 --- 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 +++++++------- 16 files changed, 69 insertions(+), 69 deletions(-) diff --git a/contracts/tg4-engagement/Cargo.toml b/contracts/tg4-engagement/Cargo.toml index 3e7d35a8..de3f7529 100644 --- a/contracts/tg4-engagement/Cargo.toml +++ b/contracts/tg4-engagement/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg4-engagement" -version = "0.9.0" +version = "0.10.0" authors = ["Ethan Frey "] edition = "2018" description = "Simple TG4 implementation of group membership controlled by an admin" @@ -24,9 +24,9 @@ cw-utils = "0.13.4" cw2 = "0.13.4" cw-controllers = "0.13.4" cw-storage-plus = "0.13.4" -tg4 = { path = "../../packages/tg4", version = "0.9.0" } -tg-utils = { version = "0.9.0", path = "../../packages/utils" } -tg-bindings = { version = "0.9.0", path = "../../packages/bindings" } +tg4 = { path = "../../packages/tg4", version = "0.10.0" } +tg-utils = { version = "0.10.0", path = "../../packages/utils" } +tg-bindings = { version = "0.10.0", path = "../../packages/bindings" } cosmwasm-std = { version = "1.0.0" } schemars = "0.8" serde = { version = "1.0.103", default-features = false, features = ["derive"] } @@ -35,6 +35,6 @@ thiserror = { version = "1.0.21" } [dev-dependencies] cosmwasm-schema = { version = "1.0.0" } cw-multi-test = { version = "0.13.4" } -tg-bindings-test = { version = "0.9.0", path = "../../packages/bindings-test" } +tg-bindings-test = { version = "0.10.0", path = "../../packages/bindings-test" } derivative = "2" anyhow = "1" diff --git a/contracts/tg4-group/Cargo.toml b/contracts/tg4-group/Cargo.toml index 6e215910..b8637f52 100644 --- a/contracts/tg4-group/Cargo.toml +++ b/contracts/tg4-group/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg4-group" -version = "0.9.0" +version = "0.10.0" authors = ["Mauro Lacy "] edition = "2018" description = "Simple tg4 implementation of group membership controlled by admin" @@ -29,7 +29,7 @@ library = [] cw-utils = "0.13.4" cw2 = "0.13.4" cw4 = "0.13.4" -tg4 = { version = "0.9.0", path = "../../packages/tg4" } +tg4 = { version = "0.10.0", path = "../../packages/tg4" } cw-controllers = "0.13.4" cw-storage-plus = "0.13.4" cosmwasm-std = { version = "1.0.0" } diff --git a/contracts/tg4-mixer/Cargo.toml b/contracts/tg4-mixer/Cargo.toml index 34e1a7db..c47cf6d0 100644 --- a/contracts/tg4-mixer/Cargo.toml +++ b/contracts/tg4-mixer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg4-mixer" -version = "0.9.0" +version = "0.10.0" authors = ["Ethan Frey "] edition = "2018" description = "TG4 implementation that combines two different groups with a merge function" @@ -27,9 +27,9 @@ cw-utils = "0.13.4" cw2 = "0.13.4" cw20 = "0.13.4" cw-storage-plus = "0.13.4" -tg4 = { path = "../../packages/tg4", version = "0.9.0" } -tg-utils = { path = "../../packages/utils", version = "0.9.0" } -tg-bindings = { path = "../../packages/bindings", version = "0.9.0" } +tg4 = { path = "../../packages/tg4", version = "0.10.0" } +tg-utils = { path = "../../packages/utils", version = "0.10.0" } +tg-bindings = { path = "../../packages/bindings", version = "0.10.0" } cosmwasm-std = "1.0.0" integer-sqrt = "0.1.5" schemars = "0.8" @@ -44,8 +44,8 @@ cosmwasm-vm = { version = "1.0.0", optional = true } [dev-dependencies] cosmwasm-schema = { version = "1.0.0" } cw-multi-test = { version = "0.13.4" } -tg4-engagement = { path = "../tg4-engagement", version = "0.9.0", features = ["library"] } -tg4-stake = { path = "../tg4-stake", version = "0.9.0", features = ["library"] } +tg4-engagement = { path = "../tg4-engagement", version = "0.10.0", features = ["library"] } +tg4-stake = { path = "../tg4-stake", version = "0.10.0", features = ["library"] } [[bench]] name = "main" diff --git a/contracts/tg4-stake/Cargo.toml b/contracts/tg4-stake/Cargo.toml index 95ea983b..ff118c89 100644 --- a/contracts/tg4-stake/Cargo.toml +++ b/contracts/tg4-stake/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg4-stake" -version = "0.9.0" +version = "0.10.0" authors = ["Ethan Frey "] edition = "2018" description = "TG4 implementation of group based on staked tokens" @@ -24,9 +24,9 @@ cw-utils = "0.13.4" cw2 = "0.13.4" cw-controllers = "0.13.4" cw-storage-plus = "0.13.4" -tg4 = { path = "../../packages/tg4", version = "0.9.0" } -tg-utils = { path = "../../packages/utils", version = "0.9.0" } -tg-bindings = { path = "../../packages/bindings", version = "0.9.0" } +tg4 = { path = "../../packages/tg4", version = "0.10.0" } +tg-utils = { path = "../../packages/utils", version = "0.10.0" } +tg-bindings = { path = "../../packages/bindings", version = "0.10.0" } cosmwasm-std = "1.0.0" schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } @@ -35,4 +35,4 @@ itertools = "0.10" [dev-dependencies] cosmwasm-schema = { version = "1.0.0" } -tg-bindings-test = { path = "../../packages/bindings-test", version = "0.9.0" } +tg-bindings-test = { path = "../../packages/bindings-test", version = "0.10.0" } diff --git a/contracts/tgrade-community-pool/Cargo.toml b/contracts/tgrade-community-pool/Cargo.toml index 89db6c14..0d8ea3b5 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.9.0" +version = "0.10.0" authors = ["Bartłomiej Kuras "] edition = "2018" description = "Implementing tgrade-community-pool voting contract" @@ -18,19 +18,19 @@ library = [] [dependencies] cw2 = "0.13.4" -tg3 = { path = "../../packages/tg3", version = "0.9.0" } +tg3 = { path = "../../packages/tg3", version = "0.10.0" } cosmwasm-std = "1.0.0" schemars = "0.8.1" serde = { version = "1", default-features = false, features = ["derive"] } -tg-bindings = { path = "../../packages/bindings", version = "0.9.0" } -tg-utils = { path = "../../packages/utils", version = "0.9.0" } -tg-voting-contract = { version = "0.9.0", path = "../../packages/voting-contract" } -tg4-engagement = { path = "../tg4-engagement", version = "0.9.0", features = ["library"] } +tg-bindings = { path = "../../packages/bindings", version = "0.10.0" } +tg-utils = { path = "../../packages/utils", version = "0.10.0" } +tg-voting-contract = { version = "0.10.0", path = "../../packages/voting-contract" } +tg4-engagement = { path = "../tg4-engagement", version = "0.10.0", features = ["library"] } thiserror = "1" [dev-dependencies] anyhow = "1" cosmwasm-schema = "1.0.0" cw-multi-test = "0.13.4" -tg-bindings-test = { path = "../../packages/bindings-test", version = "0.9.0" } -tg4 = { path = "../../packages/tg4", version = "0.9.0" } +tg-bindings-test = { path = "../../packages/bindings-test", version = "0.10.0" } +tg4 = { path = "../../packages/tg4", version = "0.10.0" } diff --git a/contracts/tgrade-gov-reflect/Cargo.toml b/contracts/tgrade-gov-reflect/Cargo.toml index f95f1098..d892fbb4 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.9.0" +version = "0.10.0" authors = ["Ethan Frey "] edition = "2018" description = "Implementing tgrade-gov-reflect voting contract" @@ -26,7 +26,7 @@ backtraces = ["cosmwasm-std/backtraces"] [dependencies] cosmwasm-std = "1.0.0" cw-storage-plus = "0.13.4" -tg-bindings = { version = "0.9.0", path = "../../packages/bindings" } +tg-bindings = { version = "0.10.0", path = "../../packages/bindings" } schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } thiserror = "1" diff --git a/contracts/tgrade-validator-voting/Cargo.toml b/contracts/tgrade-validator-voting/Cargo.toml index 83c97723..5c724236 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.9.0" +version = "0.10.0" authors = ["Ethan Frey "] edition = "2018" description = "Implementing tgrade-validator-voting" @@ -18,13 +18,13 @@ library = [] [dependencies] cw2 = "0.13.4" -tg3 = { path = "../../packages/tg3", version = "0.9.0" } +tg3 = { path = "../../packages/tg3", version = "0.10.0" } cosmwasm-std = "1.0.0" schemars = "0.8.1" serde = { version = "1", default-features = false, features = ["derive"] } -tg-bindings = { path = "../../packages/bindings", version = "0.9.0" } -tg-utils = { path = "../../packages/utils", version = "0.9.0" } -tg-voting-contract = { version = "0.9.0", path = "../../packages/voting-contract" } +tg-bindings = { path = "../../packages/bindings", version = "0.10.0" } +tg-utils = { path = "../../packages/utils", version = "0.10.0" } +tg-voting-contract = { version = "0.10.0", path = "../../packages/voting-contract" } thiserror = "1" [dev-dependencies] @@ -32,8 +32,8 @@ anyhow = "1" cosmwasm-schema = "1.0.0" cw-multi-test = "0.13.4" cw-storage-plus = "0.13.4" -tg-bindings-test = { version = "0.9.0", path = "../../packages/bindings-test" } -tg-utils = { version = "0.9.0", path = "../../packages/utils" } -tg-voting-contract = { version = "0.9.0", path = "../../packages/voting-contract" } -tg4 = { path = "../../packages/tg4", version = "0.9.0" } -tg4-engagement = { path = "../tg4-engagement", version = "0.9.0", features = ["library"] } +tg-bindings-test = { version = "0.10.0", path = "../../packages/bindings-test" } +tg-utils = { version = "0.10.0", path = "../../packages/utils" } +tg-voting-contract = { version = "0.10.0", path = "../../packages/voting-contract" } +tg4 = { path = "../../packages/tg4", version = "0.10.0" } +tg4-engagement = { path = "../tg4-engagement", version = "0.10.0", features = ["library"] } diff --git a/contracts/tgrade-valset/Cargo.toml b/contracts/tgrade-valset/Cargo.toml index 94d94a5f..f0ecf6a0 100644 --- a/contracts/tgrade-valset/Cargo.toml +++ b/contracts/tgrade-valset/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tgrade-valset" -version = "0.9.0" +version = "0.10.0" authors = ["Ethan Frey "] edition = "2018" description = "Control the validator set based on membership of trusted tg4 contract" @@ -36,9 +36,9 @@ schemars = "0.8" semver = "1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } thiserror = { version = "1.0.21" } -tg4 = { path = "../../packages/tg4", version = "0.9.0" } -tg-bindings = { version = "0.9.0", path = "../../packages/bindings" } -tg-utils = { version = "0.9.0", path = "../../packages/utils" } +tg4 = { path = "../../packages/tg4", version = "0.10.0" } +tg-bindings = { version = "0.10.0", path = "../../packages/bindings" } +tg-utils = { version = "0.10.0", path = "../../packages/utils" } # For integration tests ("integration" feature) bech32 = { version = "0.8.1", optional = true } @@ -47,10 +47,10 @@ cosmwasm-vm = { version = "1.0.0", optional = true, default-features = false, fe [dev-dependencies] cosmwasm-schema = { version = "1.0.0" } cw-multi-test = "0.13.4" -tg4-engagement = { path = "../tg4-engagement", version = "0.9.0" } -tg4-stake = { path = "../tg4-stake", version = "0.9.0" } +tg4-engagement = { path = "../tg4-engagement", version = "0.10.0" } +tg4-stake = { path = "../tg4-stake", version = "0.10.0" } # we enable multitest feature only for tests -tg-bindings-test = { path = "../../packages/bindings-test", version = "0.9.0" } +tg-bindings-test = { path = "../../packages/bindings-test", version = "0.10.0" } derivative = "2" anyhow = "1" assert_matches = "1.5" diff --git a/contracts/tgrade-vesting-account/Cargo.toml b/contracts/tgrade-vesting-account/Cargo.toml index 588a9c50..2da5dc31 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.9.0" +version = "0.10.0" authors = ["Jakub Bogucki "] edition = "2018" description = "Vesting Account as a contract" @@ -22,8 +22,8 @@ cw2 = "0.13.4" cw-storage-plus = "0.13.4" schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg-bindings = { version = "0.9.0", path = "../../packages/bindings" } -tg-utils = { version = "0.9.0", path = "../../packages/utils" } +tg-bindings = { version = "0.10.0", path = "../../packages/bindings" } +tg-utils = { version = "0.10.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.13.4" -tg-bindings-test = { version = "0.9.0", path = "../../packages/bindings-test" } +tg-bindings-test = { version = "0.10.0", path = "../../packages/bindings-test" } diff --git a/packages/bindings-test/Cargo.toml b/packages/bindings-test/Cargo.toml index 1e3e3e37..0a664da2 100644 --- a/packages/bindings-test/Cargo.toml +++ b/packages/bindings-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg-bindings-test" -version = "0.9.0" +version = "0.10.0" authors = ["Ethan Frey "] edition = "2018" description = "Multitest (and other test helpers) support for Tgrade-specific contracts" @@ -9,7 +9,7 @@ homepage = "https://tgrade.finance" license = "Apache-2.0" [dependencies] -tg-bindings = { version = "0.9.0", path = "../bindings" } +tg-bindings = { version = "0.10.0", path = "../bindings" } cosmwasm-std = { version = "1.0.0" } schemars = "0.8" serde = { version = "1.0.103", default-features = false, features = ["derive"] } diff --git a/packages/bindings/Cargo.toml b/packages/bindings/Cargo.toml index 97aac668..b67c1176 100644 --- a/packages/bindings/Cargo.toml +++ b/packages/bindings/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg-bindings" -version = "0.9.0" +version = "0.10.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 6a878626..39b1f705 100644 --- a/packages/test-utils/Cargo.toml +++ b/packages/test-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg-test-utils" -version = "0.9.0" +version = "0.10.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.9.0" } +tg-voting-contract = { path = "../voting-contract", version = "0.10.0" } diff --git a/packages/tg3/Cargo.toml b/packages/tg3/Cargo.toml index 6a6434ca..f020e428 100644 --- a/packages/tg3/Cargo.toml +++ b/packages/tg3/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg3" -version = "0.9.0" +version = "0.10.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 = { version = "1.0.0" } schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg-bindings = { version = "0.9.0", path = "../../packages/bindings" } -tg-utils = { version = "0.9.0", path = "../../packages/utils" } +tg-bindings = { version = "0.10.0", path = "../../packages/bindings" } +tg-utils = { version = "0.10.0", path = "../../packages/utils" } [dev-dependencies] cosmwasm-schema = "1.0.0" diff --git a/packages/tg4/Cargo.toml b/packages/tg4/Cargo.toml index 611523f4..691b7a94 100644 --- a/packages/tg4/Cargo.toml +++ b/packages/tg4/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg4" -version = "0.9.0" +version = "0.10.0" authors = ["Ethan Frey "] edition = "2018" description = "Tgrade-4 Interface: Groups Members" @@ -12,7 +12,7 @@ license = "Apache-2.0" cosmwasm-std = { version = "1.0.0" } schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg-bindings = { path = "../bindings", version = "0.9.0" } +tg-bindings = { path = "../bindings", version = "0.10.0" } [dev-dependencies] cosmwasm-schema = { version = "1.0.0" } diff --git a/packages/utils/Cargo.toml b/packages/utils/Cargo.toml index 3ffc60b9..24748dd8 100644 --- a/packages/utils/Cargo.toml +++ b/packages/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg-utils" -version = "0.9.0" +version = "0.10.0" authors = ["Ethan Frey "] edition = "2018" description = "Tgrade Utils: helpers for various contracts" @@ -18,7 +18,7 @@ cw-storage-plus = "0.13.4" cw2 = "0.13.4" schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -tg4 = { path = "../tg4", version = "0.9.0" } -tg-bindings = { path = "../bindings", version = "0.9.0" } +tg4 = { path = "../tg4", version = "0.10.0" } +tg-bindings = { path = "../bindings", version = "0.10.0" } thiserror = { version = "1.0.21" } semver = "1" diff --git a/packages/voting-contract/Cargo.toml b/packages/voting-contract/Cargo.toml index 47feca32..b9e6f16a 100644 --- a/packages/voting-contract/Cargo.toml +++ b/packages/voting-contract/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tg-voting-contract" -version = "0.9.0" +version = "0.10.0" authors = ["Bartłomiej Kuras "] edition = "2018" description = "Generic utils for building voting contracts for tgrade" @@ -12,14 +12,14 @@ license = "Apache-2.0" [dependencies] cw-utils = "0.13.4" -tg3 = { path = "../../packages/tg3", version = "0.9.0" } +tg3 = { path = "../../packages/tg3", version = "0.10.0" } cw-storage-plus = "0.13.4" cosmwasm-std = "1.0.0" schemars = "0.8.1" serde = { version = "1", default-features = false, features = ["derive"] } -tg4 = { path = "../tg4", version = "0.9.0" } -tg-bindings = { path = "../bindings", version = "0.9.0" } -tg-utils = { version = "0.9.0", path = "../utils" } +tg4 = { path = "../tg4", version = "0.10.0" } +tg-bindings = { path = "../bindings", version = "0.10.0" } +tg-utils = { version = "0.10.0", path = "../utils" } thiserror = { version = "1" } [dev-dependencies] @@ -27,5 +27,5 @@ anyhow = "1" cosmwasm-schema = "1.0.0" cw-multi-test = "0.13.4" derivative = "2" -tg-bindings-test = { path = "../../packages/bindings-test", version = "0.9.0" } -tg4-engagement = { path = "../../contracts/tg4-engagement", version = "0.9.0", features = ["library"] } +tg-bindings-test = { path = "../../packages/bindings-test", version = "0.10.0" } +tg4-engagement = { path = "../../contracts/tg4-engagement", version = "0.10.0", features = ["library"] } From 68e897ddebe58a58445a966f458c9db1dc001452 Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Thu, 2 Jun 2022 18:06:13 +0200 Subject: [PATCH 12/16] Update CHANGELOG --- CHANGELOG.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9aaea533..64fbfbd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,20 @@ ## [Unreleased](https://github.com/confio/poe-contracts/tree/HEAD) -[Full Changelog](https://github.com/confio/poe-contracts/compare/v0.9.0...HEAD) +[Full Changelog](https://github.com/confio/poe-contracts/compare/v0.10.0...HEAD) + +## [v0.10.0](https://github.com/confio/poe-contracts/tree/v0.10.0) (2022-06-02) + +[Full Changelog](https://github.com/confio/poe-contracts/compare/v0.9.0...v0.10.0) + +**Fixed bugs:** + +- Valset: export/ import `admin` [\#139](https://github.com/confio/poe-contracts/issues/139) + +**Merged pull requests:** + +- Add missing Admin to state export / import [\#141](https://github.com/confio/poe-contracts/pull/141) ([maurolacy](https://github.com/maurolacy)) +- \[tgrade-valset\] Offline validator auto-unjail tests [\#140](https://github.com/confio/poe-contracts/pull/140) ([maurolacy](https://github.com/maurolacy)) ## [v0.9.0](https://github.com/confio/poe-contracts/tree/v0.9.0) (2022-04-20) From cbcdf1ed2ca57c299afb6133f21b803f47d1a4bf Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Thu, 2 Jun 2022 18:06:25 +0200 Subject: [PATCH 13/16] Update lock file --- Cargo.lock | 173 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 107 insertions(+), 66 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 03d9ef2b..5008a5e5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -67,12 +67,24 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + [[package]] name = "base64" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +[[package]] +name = "base64ct" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dea908e7347a8c64e378c17e30ef880ad73e3b4498346b055c2c00ea342f3179" + [[package]] name = "bech32" version = "0.8.1" @@ -153,15 +165,15 @@ checksum = "591ff76ca0691bd91c1b0b5b987e5cf93b21ec810ad96665c5a569c60846dd93" [[package]] name = "const-oid" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6f2aa4d0537bcc1c74df8755072bd31c1ef1a3a1b85a68e8404a8c353b7b8b" +checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" [[package]] name = "cosmwasm-crypto" -version = "1.0.0-beta8" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e70111e9701c3ec43bfbff0e523cd4cb115876b4d3433813436dd0934ee962" +checksum = "5eb0afef2325df81aadbf9be1233f522ed8f6e91df870c764bc44cca2b1415bd" dependencies = [ "digest", "ed25519-zebra", @@ -172,18 +184,18 @@ dependencies = [ [[package]] name = "cosmwasm-derive" -version = "1.0.0-beta8" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc2ad5d86be5f6068833f63e20786768db6890019c095dd7775232184fb7b3" +checksum = "4b36e527620a2a3e00e46b6e731ab6c9b68d11069c986f7d7be8eba79ef081a4" dependencies = [ "syn", ] [[package]] name = "cosmwasm-schema" -version = "1.0.0-beta8" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d75f6a05667d8613b24171ef2c77a8bf6fb9c14f9e3aaa39aa10e0c6416ed67" +checksum = "772e80bbad231a47a2068812b723a1ff81dd4a0d56c9391ac748177bea3a61da" dependencies = [ "schemars", "serde_json", @@ -191,9 +203,9 @@ dependencies = [ [[package]] name = "cosmwasm-std" -version = "1.0.0-beta8" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915ca82bd944f116f3a9717481f3fa657e4a73f28c4887288761ebb24e6fbe10" +checksum = "875994993c2082a6fcd406937bf0fca21c349e4a624f3810253a14fa83a3a195" dependencies = [ "base64", "cosmwasm-crypto", @@ -208,9 +220,9 @@ dependencies = [ [[package]] name = "cosmwasm-storage" -version = "1.0.0-beta8" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4be9fd8c9d3ae7d0c32a925ecbc20707007ce0cba1f7538c0d78b7a2d3729b" +checksum = "d18403b07304d15d304dad11040d45bbcaf78d603b4be3fb5e2685c16f9229b5" dependencies = [ "cosmwasm-std", "serde", @@ -218,9 +230,9 @@ dependencies = [ [[package]] name = "cosmwasm-vm" -version = "1.0.0-beta8" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dee89a70aec106d01da013c1534ca609f9965752f50778794a698d21ad3c8e3" +checksum = "472bd6f037bf4de43a29f65ca5d66b8c06510fdb2cd9c911ed08b5a2cec3606f" dependencies = [ "clru", "cosmwasm-crypto", @@ -368,9 +380,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.2.11" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83bd3bb4314701c568e340cd8cf78c975aa0ca79e03d3f6d1677d5b0c9c0c03" +checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" dependencies = [ "generic-array", "rand_core 0.6.3", @@ -403,9 +415,9 @@ dependencies = [ [[package]] name = "cw-controllers" -version = "0.13.2" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc6d042b14823b0e9f33f5cdd67a1eb9b16a7d79f7547b1a73c8870b518b97b" +checksum = "4f0bc6019b4d3d81e11f5c384bcce7173e2210bd654d75c6c9668e12cca05dfa" dependencies = [ "cosmwasm-std", "cw-storage-plus", @@ -417,9 +429,9 @@ dependencies = [ [[package]] name = "cw-multi-test" -version = "0.13.2" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbea57e5be4a682268a5eca1a57efece57a54ff216bfd87603d5e864aad40e12" +checksum = "a3f9a8ab7c3c29ec93cb7a39ce4b14a05e053153b4a17ef7cf2246af1b7c087e" dependencies = [ "anyhow", "cosmwasm-std", @@ -436,9 +448,9 @@ dependencies = [ [[package]] name = "cw-storage-plus" -version = "0.13.2" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9336ecef1e19d56cf6e3e932475fc6a3dee35eec5a386e07917a1d1ba6bb0e35" +checksum = "648b1507290bbc03a8d88463d7cd9b04b1fa0155e5eef366c4fa052b9caaac7a" dependencies = [ "cosmwasm-std", "schemars", @@ -447,9 +459,9 @@ dependencies = [ [[package]] name = "cw-utils" -version = "0.13.2" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "babd2c090f39d07ce5bf2556962305e795daa048ce20a93709eb591476e4a29e" +checksum = "9dbaecb78c8e8abfd6b4258c7f4fbeb5c49a5e45ee4d910d3240ee8e1d714e1b" dependencies = [ "cosmwasm-std", "schemars", @@ -459,9 +471,9 @@ dependencies = [ [[package]] name = "cw2" -version = "0.13.2" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993df11574f29574dd443eb0c189484bb91bc0638b6de3e32ab7f9319c92122d" +checksum = "04cf4639517490dd36b333bbd6c4fbd92e325fd0acf4683b41753bc5eb63bfc1" dependencies = [ "cosmwasm-std", "cw-storage-plus", @@ -471,9 +483,9 @@ dependencies = [ [[package]] name = "cw20" -version = "0.13.2" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356d364602c5fe763544ea00d485b825d6ef519a2fc6a3145528d7df3a603f40" +checksum = "4cb782b8f110819a4eb5dbbcfed25ffba49ec16bbe32b4ad8da50a5ce68fec05" dependencies = [ "cosmwasm-std", "cw-utils", @@ -483,9 +495,9 @@ dependencies = [ [[package]] name = "cw4" -version = "0.13.2" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4476d6a7c13c46ed9ff260bd0e1cf648dc37b13f483822e1ff2a431f0f6ee52" +checksum = "0acc3549d5ce11c6901b3a676f2e2628684722197054d97cd0101ea174ed5cbd" dependencies = [ "cosmwasm-std", "cw-storage-plus", @@ -529,9 +541,9 @@ dependencies = [ [[package]] name = "der" -version = "0.4.5" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79b71cca7d95d7681a4b3b9cdf63c8dbc3730d0584c2c74e31416d64a90493f4" +checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" dependencies = [ "const-oid", ] @@ -590,13 +602,13 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.12.4" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43ee23aa5b4f68c7a092b5c3beb25f50c406adc75e2363634f242f28ab255372" +checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" dependencies = [ "der", "elliptic-curve", - "hmac", + "rfc6979", "signature", ] @@ -623,16 +635,18 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "elliptic-curve" -version = "0.10.6" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beca177dcb8eb540133e7680baff45e7cc4d93bf22002676cec549f82343721b" +checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" dependencies = [ + "base16ct", "crypto-bigint", + "der", "ff", "generic-array", "group", - "pkcs8", "rand_core 0.6.3", + "sec1", "subtle", "zeroize", ] @@ -695,9 +709,9 @@ dependencies = [ [[package]] name = "ff" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f40b2dcd8bc322217a5f6559ae5f9e9d1de202a2ecee2e9eafcbece7562a4f" +checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924" dependencies = [ "rand_core 0.6.3", "subtle", @@ -766,9 +780,9 @@ checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" [[package]] name = "group" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c363a5301b8f153d80747126a04b3c82073b9fe3130571a9d170cacdeaf7912" +checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" dependencies = [ "ff", "rand_core 0.6.3", @@ -885,13 +899,14 @@ dependencies = [ [[package]] name = "k256" -version = "0.9.6" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "903ae2481bcdfdb7b68e0a9baa4b7c9aff600b9ae2e8e5bb5833b8c91ab851ea" +checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d" dependencies = [ "cfg-if", "ecdsa", "elliptic-curve", + "sec1", "sha2", ] @@ -1058,12 +1073,13 @@ checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" [[package]] name = "pkcs8" -version = "0.7.6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee3ef9b64d26bad0536099c816c6734379e45bbd5f14798def6809e5cc350447" +checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" dependencies = [ "der", "spki", + "zeroize", ] [[package]] @@ -1243,6 +1259,17 @@ dependencies = [ "bytecheck", ] +[[package]] +name = "rfc6979" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525" +dependencies = [ + "crypto-bigint", + "hmac", + "zeroize", +] + [[package]] name = "rkyv" version = "0.7.37" @@ -1349,6 +1376,19 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" +[[package]] +name = "sec1" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" +dependencies = [ + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + [[package]] name = "semver" version = "1.0.7" @@ -1366,9 +1406,9 @@ dependencies = [ [[package]] name = "serde-json-wasm" -version = "0.3.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "042ac496d97e5885149d34139bad1d617192770d7eb8f1866da2317ff4501853" +checksum = "479b4dbc401ca13ee8ce902851b834893251404c4f3c65370a49e047a6be09a5" dependencies = [ "serde", ] @@ -1446,10 +1486,11 @@ checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "spki" -version = "0.4.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c01a0c15da1b0b0e1494112e7af814a678fec9bd157881b49beac661e9b6f32" +checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" dependencies = [ + "base64ct", "der", ] @@ -1504,7 +1545,7 @@ dependencies = [ [[package]] name = "tg-bindings" -version = "0.9.0" +version = "0.10.0" dependencies = [ "base64", "cosmwasm-schema", @@ -1517,7 +1558,7 @@ dependencies = [ [[package]] name = "tg-bindings-test" -version = "0.9.0" +version = "0.10.0" dependencies = [ "anyhow", "cosmwasm-std", @@ -1531,7 +1572,7 @@ dependencies = [ [[package]] name = "tg-test-utils" -version = "0.9.0" +version = "0.10.0" dependencies = [ "cosmwasm-std", "tg-voting-contract", @@ -1539,7 +1580,7 @@ dependencies = [ [[package]] name = "tg-utils" -version = "0.9.0" +version = "0.10.0" dependencies = [ "cosmwasm-std", "cw-controllers", @@ -1556,7 +1597,7 @@ dependencies = [ [[package]] name = "tg-voting-contract" -version = "0.9.0" +version = "0.10.0" dependencies = [ "anyhow", "cosmwasm-schema", @@ -1578,7 +1619,7 @@ dependencies = [ [[package]] name = "tg3" -version = "0.9.0" +version = "0.10.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1590,7 +1631,7 @@ dependencies = [ [[package]] name = "tg4" -version = "0.9.0" +version = "0.10.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1601,7 +1642,7 @@ dependencies = [ [[package]] name = "tg4-engagement" -version = "0.9.0" +version = "0.10.0" dependencies = [ "anyhow", "cosmwasm-schema", @@ -1623,7 +1664,7 @@ dependencies = [ [[package]] name = "tg4-group" -version = "0.9.0" +version = "0.10.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1640,7 +1681,7 @@ dependencies = [ [[package]] name = "tg4-mixer" -version = "0.9.0" +version = "0.10.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1665,7 +1706,7 @@ dependencies = [ [[package]] name = "tg4-stake" -version = "0.9.0" +version = "0.10.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1685,7 +1726,7 @@ dependencies = [ [[package]] name = "tgrade-community-pool" -version = "0.9.0" +version = "0.10.0" dependencies = [ "anyhow", "cosmwasm-schema", @@ -1706,7 +1747,7 @@ dependencies = [ [[package]] name = "tgrade-gov-reflect" -version = "0.9.0" +version = "0.10.0" dependencies = [ "cosmwasm-schema", "cosmwasm-std", @@ -1719,7 +1760,7 @@ dependencies = [ [[package]] name = "tgrade-validator-voting" -version = "0.9.0" +version = "0.10.0" dependencies = [ "anyhow", "cosmwasm-schema", @@ -1741,7 +1782,7 @@ dependencies = [ [[package]] name = "tgrade-valset" -version = "0.9.0" +version = "0.10.0" dependencies = [ "anyhow", "assert_matches", @@ -1769,7 +1810,7 @@ dependencies = [ [[package]] name = "tgrade-vesting-account" -version = "0.9.0" +version = "0.10.0" dependencies = [ "anyhow", "assert_matches", From 270c4833299c7f44c5ca5264bccc40e847b8289a Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Mon, 6 Jun 2022 11:17:27 +0200 Subject: [PATCH 14/16] Simplify packages version settings in Cargo --- packages/bindings-test/Cargo.toml | 12 ++++++------ packages/bindings/Cargo.toml | 4 ++-- packages/tg3/Cargo.toml | 2 +- packages/tg4/Cargo.toml | 4 ++-- packages/utils/Cargo.toml | 4 ++-- packages/voting-contract/Cargo.toml | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/bindings-test/Cargo.toml b/packages/bindings-test/Cargo.toml index 0a664da2..795f114c 100644 --- a/packages/bindings-test/Cargo.toml +++ b/packages/bindings-test/Cargo.toml @@ -9,11 +9,11 @@ homepage = "https://tgrade.finance" license = "Apache-2.0" [dependencies] -tg-bindings = { version = "0.10.0", path = "../bindings" } -cosmwasm-std = { version = "1.0.0" } +anyhow = "1" +cosmwasm-std = "1.0.0" +cw-multi-test = "0.13.4" +cw-storage-plus = "0.13.4" schemars = "0.8" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -cw-multi-test = { version = "0.13.4" } -cw-storage-plus = { version = "0.13.4" } -anyhow = { version = "1" } -thiserror = { version = "1.0.21" } +tg-bindings = { version = "0.10.0", path = "../bindings" } +thiserror = "1.0.21" diff --git a/packages/bindings/Cargo.toml b/packages/bindings/Cargo.toml index b67c1176..2bb3f7ce 100644 --- a/packages/bindings/Cargo.toml +++ b/packages/bindings/Cargo.toml @@ -10,11 +10,11 @@ license = "Apache-2.0" [dependencies] base64 = "0.13" -cosmwasm-std = { version = "1.0.0" } +cosmwasm-std = "1.0.0" schemars = "0.8" sha2 = "0.9" serde = { version = "1.0.103", default-features = false, features = ["derive"] } [dev-dependencies] -cosmwasm-schema = { version = "1.0.0" } +cosmwasm-schema = "1.0.0" hex-literal = "0.3.1" diff --git a/packages/tg3/Cargo.toml b/packages/tg3/Cargo.toml index f020e428..5aaddfd3 100644 --- a/packages/tg3/Cargo.toml +++ b/packages/tg3/Cargo.toml @@ -9,7 +9,7 @@ homepage = "https://tgrade.finance" license = "Apache-2.0" [dependencies] -cosmwasm-std = { version = "1.0.0" } +cosmwasm-std = "1.0.0" schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } tg-bindings = { version = "0.10.0", path = "../../packages/bindings" } diff --git a/packages/tg4/Cargo.toml b/packages/tg4/Cargo.toml index 691b7a94..bf8d6fb9 100644 --- a/packages/tg4/Cargo.toml +++ b/packages/tg4/Cargo.toml @@ -9,10 +9,10 @@ homepage = "https://tgrade.finance" license = "Apache-2.0" [dependencies] -cosmwasm-std = { version = "1.0.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.10.0" } [dev-dependencies] -cosmwasm-schema = { version = "1.0.0" } +cosmwasm-schema = "1.0.0" diff --git a/packages/utils/Cargo.toml b/packages/utils/Cargo.toml index 24748dd8..a5ab5384 100644 --- a/packages/utils/Cargo.toml +++ b/packages/utils/Cargo.toml @@ -17,8 +17,8 @@ cw-controllers = "0.13.4" cw-storage-plus = "0.13.4" cw2 = "0.13.4" schemars = "0.8.1" +semver = "1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } tg4 = { path = "../tg4", version = "0.10.0" } tg-bindings = { path = "../bindings", version = "0.10.0" } -thiserror = { version = "1.0.21" } -semver = "1" +thiserror = "1.0.21" diff --git a/packages/voting-contract/Cargo.toml b/packages/voting-contract/Cargo.toml index b9e6f16a..3b7d4a1d 100644 --- a/packages/voting-contract/Cargo.toml +++ b/packages/voting-contract/Cargo.toml @@ -11,16 +11,16 @@ license = "Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +cosmwasm-std = "1.0.0" cw-utils = "0.13.4" -tg3 = { path = "../../packages/tg3", version = "0.10.0" } cw-storage-plus = "0.13.4" -cosmwasm-std = "1.0.0" schemars = "0.8.1" serde = { version = "1", default-features = false, features = ["derive"] } +tg3 = { path = "../../packages/tg3", version = "0.10.0" } tg4 = { path = "../tg4", version = "0.10.0" } tg-bindings = { path = "../bindings", version = "0.10.0" } tg-utils = { version = "0.10.0", path = "../utils" } -thiserror = { version = "1" } +thiserror = "1" [dev-dependencies] anyhow = "1" From 310529eb463be82664541b484902a1d66a48f3a2 Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Mon, 6 Jun 2022 11:30:17 +0200 Subject: [PATCH 15/16] Simplify contracts version settings in Cargo --- contracts/tg4-engagement/Cargo.toml | 18 ++++++++--------- contracts/tg4-group/Cargo.toml | 6 +++--- contracts/tg4-mixer/Cargo.toml | 18 ++++++++--------- contracts/tg4-stake/Cargo.toml | 12 +++++------ contracts/tgrade-community-pool/Cargo.toml | 4 ++-- contracts/tgrade-gov-reflect/Cargo.toml | 2 +- contracts/tgrade-validator-voting/Cargo.toml | 4 ++-- contracts/tgrade-valset/Cargo.toml | 21 ++++++++++---------- 8 files changed, 42 insertions(+), 43 deletions(-) diff --git a/contracts/tg4-engagement/Cargo.toml b/contracts/tg4-engagement/Cargo.toml index de3f7529..3f9b6adb 100644 --- a/contracts/tg4-engagement/Cargo.toml +++ b/contracts/tg4-engagement/Cargo.toml @@ -20,21 +20,21 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -cw-utils = "0.13.4" -cw2 = "0.13.4" +cosmwasm-std = "1.0.0" cw-controllers = "0.13.4" cw-storage-plus = "0.13.4" -tg4 = { path = "../../packages/tg4", version = "0.10.0" } +cw-utils = "0.13.4" +cw2 = "0.13.4" tg-utils = { version = "0.10.0", path = "../../packages/utils" } tg-bindings = { version = "0.10.0", path = "../../packages/bindings" } -cosmwasm-std = { version = "1.0.0" } +tg4 = { path = "../../packages/tg4", version = "0.10.0" } schemars = "0.8" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -thiserror = { version = "1.0.21" } +thiserror = "1.0.21" [dev-dependencies] -cosmwasm-schema = { version = "1.0.0" } -cw-multi-test = { version = "0.13.4" } -tg-bindings-test = { version = "0.10.0", path = "../../packages/bindings-test" } -derivative = "2" anyhow = "1" +cosmwasm-schema = "1.0.0" +cw-multi-test = "0.13.4" +derivative = "2" +tg-bindings-test = { version = "0.10.0", path = "../../packages/bindings-test" } diff --git a/contracts/tg4-group/Cargo.toml b/contracts/tg4-group/Cargo.toml index b8637f52..99b41a7a 100644 --- a/contracts/tg4-group/Cargo.toml +++ b/contracts/tg4-group/Cargo.toml @@ -26,16 +26,16 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] +cosmwasm-std = "1.0.0" cw-utils = "0.13.4" cw2 = "0.13.4" cw4 = "0.13.4" -tg4 = { version = "0.10.0", path = "../../packages/tg4" } cw-controllers = "0.13.4" cw-storage-plus = "0.13.4" -cosmwasm-std = { version = "1.0.0" } schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } +tg4 = { version = "0.10.0", path = "../../packages/tg4" } thiserror = { version = "1.0.23" } [dev-dependencies] -cosmwasm-schema = { version = "1.0.0" } +cosmwasm-schema = "1.0.0" diff --git a/contracts/tg4-mixer/Cargo.toml b/contracts/tg4-mixer/Cargo.toml index c47cf6d0..a1151a17 100644 --- a/contracts/tg4-mixer/Cargo.toml +++ b/contracts/tg4-mixer/Cargo.toml @@ -23,27 +23,27 @@ library = [] benches = [ "cosmwasm-vm" ] [dependencies] +cosmwasm-std = "1.0.0" cw-utils = "0.13.4" cw2 = "0.13.4" cw20 = "0.13.4" cw-storage-plus = "0.13.4" -tg4 = { path = "../../packages/tg4", version = "0.10.0" } -tg-utils = { path = "../../packages/utils", version = "0.10.0" } -tg-bindings = { path = "../../packages/bindings", version = "0.10.0" } -cosmwasm-std = "1.0.0" integer-sqrt = "0.1.5" -schemars = "0.8" -serde = { version = "1.0.103", default-features = false, features = ["derive"] } -thiserror = { version = "1.0.21" } rust_decimal = { version = "1.16", default-features = false, features = ["maths"] } 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.10.0" } +tg-utils = { path = "../../packages/utils", version = "0.10.0" } +tg-bindings = { path = "../../packages/bindings", version = "0.10.0" } # bench dependencies cosmwasm-vm = { version = "1.0.0", optional = true } [dev-dependencies] -cosmwasm-schema = { version = "1.0.0" } -cw-multi-test = { version = "0.13.4" } +cosmwasm-schema = "1.0.0" +cw-multi-test = "0.13.4" tg4-engagement = { path = "../tg4-engagement", version = "0.10.0", features = ["library"] } tg4-stake = { path = "../tg4-stake", version = "0.10.0", features = ["library"] } diff --git a/contracts/tg4-stake/Cargo.toml b/contracts/tg4-stake/Cargo.toml index ff118c89..666e8d94 100644 --- a/contracts/tg4-stake/Cargo.toml +++ b/contracts/tg4-stake/Cargo.toml @@ -20,19 +20,19 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] +cosmwasm-std = "1.0.0" cw-utils = "0.13.4" cw2 = "0.13.4" cw-controllers = "0.13.4" cw-storage-plus = "0.13.4" +itertools = "0.10" +schemars = "0.8.1" +serde = { version = "1.0.103", default-features = false, features = ["derive"] } tg4 = { path = "../../packages/tg4", version = "0.10.0" } tg-utils = { path = "../../packages/utils", version = "0.10.0" } tg-bindings = { path = "../../packages/bindings", version = "0.10.0" } -cosmwasm-std = "1.0.0" -schemars = "0.8.1" -serde = { version = "1.0.103", default-features = false, features = ["derive"] } -thiserror = { version = "1.0.21" } -itertools = "0.10" +thiserror = "1.0.21" [dev-dependencies] -cosmwasm-schema = { version = "1.0.0" } +cosmwasm-schema = "1.0.0" tg-bindings-test = { path = "../../packages/bindings-test", version = "0.10.0" } diff --git a/contracts/tgrade-community-pool/Cargo.toml b/contracts/tgrade-community-pool/Cargo.toml index 0d8ea3b5..091fc48a 100644 --- a/contracts/tgrade-community-pool/Cargo.toml +++ b/contracts/tgrade-community-pool/Cargo.toml @@ -17,14 +17,14 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -cw2 = "0.13.4" -tg3 = { path = "../../packages/tg3", version = "0.10.0" } cosmwasm-std = "1.0.0" +cw2 = "0.13.4" schemars = "0.8.1" serde = { version = "1", default-features = false, features = ["derive"] } tg-bindings = { path = "../../packages/bindings", version = "0.10.0" } tg-utils = { path = "../../packages/utils", version = "0.10.0" } tg-voting-contract = { version = "0.10.0", path = "../../packages/voting-contract" } +tg3 = { path = "../../packages/tg3", version = "0.10.0" } tg4-engagement = { path = "../tg4-engagement", version = "0.10.0", features = ["library"] } thiserror = "1" diff --git a/contracts/tgrade-gov-reflect/Cargo.toml b/contracts/tgrade-gov-reflect/Cargo.toml index d892fbb4..439c54e5 100644 --- a/contracts/tgrade-gov-reflect/Cargo.toml +++ b/contracts/tgrade-gov-reflect/Cargo.toml @@ -26,9 +26,9 @@ backtraces = ["cosmwasm-std/backtraces"] [dependencies] cosmwasm-std = "1.0.0" cw-storage-plus = "0.13.4" -tg-bindings = { version = "0.10.0", path = "../../packages/bindings" } schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } +tg-bindings = { version = "0.10.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 5c724236..c78513f8 100644 --- a/contracts/tgrade-validator-voting/Cargo.toml +++ b/contracts/tgrade-validator-voting/Cargo.toml @@ -17,14 +17,14 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -cw2 = "0.13.4" -tg3 = { path = "../../packages/tg3", version = "0.10.0" } cosmwasm-std = "1.0.0" +cw2 = "0.13.4" schemars = "0.8.1" serde = { version = "1", default-features = false, features = ["derive"] } tg-bindings = { path = "../../packages/bindings", version = "0.10.0" } tg-utils = { path = "../../packages/utils", version = "0.10.0" } tg-voting-contract = { version = "0.10.0", path = "../../packages/voting-contract" } +tg3 = { path = "../../packages/tg3", version = "0.10.0" } thiserror = "1" [dev-dependencies] diff --git a/contracts/tgrade-valset/Cargo.toml b/contracts/tgrade-valset/Cargo.toml index f0ecf6a0..789dd965 100644 --- a/contracts/tgrade-valset/Cargo.toml +++ b/contracts/tgrade-valset/Cargo.toml @@ -8,7 +8,6 @@ repository = "https://github.com/confio/poe-contracts" homepage = "https://tgrade.finance" license = "Apache-2.0" - exclude = [ # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication. "artifacts/*", @@ -27,15 +26,15 @@ library = [] integration = ["bech32", "cosmwasm-vm"] [dependencies] -cosmwasm-std = { version = "1.0.0" } -cw2 = { version = "0.13.4" } -cw-utils = { version = "0.13.4" } -cw-controllers = { version = "0.13.4" } -cw-storage-plus = { version = "0.13.4" } +cosmwasm-std = "1.0.0" +cw2 = "0.13.4" +cw-utils = "0.13.4" +cw-controllers = "0.13.4" +cw-storage-plus = "0.13.4" schemars = "0.8" semver = "1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -thiserror = { version = "1.0.21" } +thiserror = "1.0.21" tg4 = { path = "../../packages/tg4", version = "0.10.0" } tg-bindings = { version = "0.10.0", path = "../../packages/bindings" } tg-utils = { version = "0.10.0", path = "../../packages/utils" } @@ -45,12 +44,12 @@ bech32 = { version = "0.8.1", optional = true } cosmwasm-vm = { version = "1.0.0", optional = true, default-features = false, features = ["iterator"] } [dev-dependencies] -cosmwasm-schema = { version = "1.0.0" } +anyhow = "1" +assert_matches = "1.5" +cosmwasm-schema = "1.0.0" cw-multi-test = "0.13.4" +derivative = "2" tg4-engagement = { path = "../tg4-engagement", version = "0.10.0" } tg4-stake = { path = "../tg4-stake", version = "0.10.0" } # we enable multitest feature only for tests tg-bindings-test = { path = "../../packages/bindings-test", version = "0.10.0" } -derivative = "2" -anyhow = "1" -assert_matches = "1.5" From 25dc784502da7c8638a245ff248ee2408b81cfeb Mon Sep 17 00:00:00 2001 From: Mauro Lacy Date: Mon, 6 Jun 2022 11:42:03 +0200 Subject: [PATCH 16/16] Improve README syntax Co-authored-by: Jakub Bogucki --- contracts/tg4-group/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/tg4-group/README.md b/contracts/tg4-group/README.md index c2453ae2..887cda99 100644 --- a/contracts/tg4-group/README.md +++ b/contracts/tg4-group/README.md @@ -29,7 +29,7 @@ pub struct Member { } ``` -Members are defined by an address, a number of points, and an optional start height. +Members are defined by an address, a number of points and an optional start height. This is transformed and stored under their `Addr`, in a format defined in [tg4 raw queries](../../packages/tg4/README.md#raw).