Skip to content

Commit

Permalink
Prepare release 3.1.1 (#232)
Browse files Browse the repository at this point in the history
* Allow locks with zero funds deployments to vote again even during deployment duration

* Fix query and refactor methods

* Add changelog entry

* Regenerate contracts and fix clippy

* Fix check for round 0 in loop

* Recompile contracts

* Recompile contracts]

* Recompile again

* Filter out tranche properly by returning None

* Regenerate contract

* Remove unnecessary migration instruction

* Prepare changelog

* Regenerate lock file

* Fix migration

* Fix imports for migration message
  • Loading branch information
p-offtermatt authored Feb 26, 2025
1 parent c0e6de5 commit 6932a06
Show file tree
Hide file tree
Showing 16 changed files with 44 additions and 628 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Allow voting with locks that voted for a proposal which did not receive any funds in its deployment
([\#231](https://github.com/informalsystems/hydro/pull/231))
8 changes: 8 additions & 0 deletions .changelog/v3.1.1/summary.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<!--
Add a summary for the release here.
If you don't change this message, or if this file is empty, the release
will not be created. -->


Date: Feburary 25th, 2025
16 changes: 16 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# CHANGELOG

## v3.1.1

<!--
Add a summary for the release here.

If you don't change this message, or if this file is empty, the release
will not be created. -->


Date: Feburary 25th, 2025

### FEATURE

- Allow voting with locks that voted for a proposal which did not receive any funds in its deployment
([\#231](https://github.com/informalsystems/hydro/pull/231))

## v3.1.0

<!--
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions artifacts/checksums.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
5774e9ab9b8c54b8304d27111209b271a610ef31c50e6f539ad44a5a202ab3b0 dao_voting_adapter.wasm
8249ace08e35c0341257c9e730f63cc475e1f0e9711140f78e2f949edf1c180b hydro.wasm
79d6187269733a5281b25a9ab3e2f25d4484e1c1e6ac3e829ea7035b3ed18fc7 tribute.wasm
5ebf204efcc642658cbd7d1a1d01c6c15c29e6f9b404ed74411563080243b249 hydro.wasm
9f14e2e6dccdbcd42c770958cbce73cf49a8b55f36a6384e8731b0a888a7187d tribute.wasm
Binary file modified artifacts/hydro.wasm
Binary file not shown.
Binary file modified artifacts/tribute.wasm
Binary file not shown.
2 changes: 1 addition & 1 deletion contracts/hydro/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "hydro"
version = "3.1.0"
version = "3.1.1"
authors = ["Jehan Tremback", "Philip Offtermatt", "Dusan Maksimovic"]
edition = "2021"

Expand Down
15 changes: 9 additions & 6 deletions contracts/hydro/src/migration/migrate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ use cosmwasm_std::{entry_point, DepsMut, Env, Response, StdError};
use cw2::{get_contract_version, set_contract_version};
use neutron_sdk::bindings::msg::NeutronMsg;
use neutron_sdk::bindings::query::NeutronQuery;

use super::v3_1_0::{migrate_v3_0_0_to_v3_1_0, MigrateMsgV3_1_0};
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};

pub const CONTRACT_VERSION_V1_1_0: &str = "1.1.0";
pub const CONTRACT_VERSION_V2_0_1: &str = "2.0.1";
Expand All @@ -16,11 +16,14 @@ pub const CONTRACT_VERSION_V2_1_0: &str = "2.1.0";
pub const CONTRACT_VERSION_V3_0_0: &str = "3.0.0";
pub const CONTRACT_VERSION_V3_1_0: &str = "3.1.0";

#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
pub struct MigrateMsgV3_1_1 {}

#[cfg_attr(not(feature = "library"), entry_point)]
pub fn migrate(
mut deps: DepsMut<NeutronQuery>,
env: Env,
_msg: MigrateMsgV3_1_0,
deps: DepsMut<NeutronQuery>,
_env: Env,
_msg: MigrateMsgV3_1_1,
) -> Result<Response<NeutronMsg>, ContractError> {
let contract_version = get_contract_version(deps.storage)?;

Expand All @@ -30,7 +33,7 @@ pub fn migrate(
)));
}

migrate_v3_0_0_to_v3_1_0(&mut deps, env)?;
// no migration necessary

set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;

Expand Down
5 changes: 0 additions & 5 deletions contracts/hydro/src/migration/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
pub mod migrate;
pub mod v3_0_0;
pub mod v3_1_0;

#[cfg(test)]
mod testing_v3_1_0;
Loading

0 comments on commit 6932a06

Please sign in to comment.