Merge pull request #323 from informalsystems/main

Merge main into release/v3.x-new to prepare for v3.6.2 release

Author: stana-miric

.changelog/v3.6.2/bug-fixes/319-vortex-resolve-auction-overflow-bug-fix.md

@@ -0,0 +1,2 @@
+- Use integer arithmetic with `checked_multiply_ratio` to prevent overflows in Vortex resolve auction method.
+  ([\#319](https://github.com/informalsystems/hydro/pull/319))

.changelog/v3.6.2/features/307-inflow-withdrawals.md

@@ -0,0 +1,2 @@
+- Allow users to withdraw tokens they previously deposited into Inflow, plus any yield that was made by deploying their tokens.
+  ([\#307](https://github.com/informalsystems/hydro/pull/307))

.changelog/v3.6.2/features/316-add-parent-lock-ids-query.md

@@ -0,0 +1,2 @@
+-Added parent lock ids query which returns the list of parent lock ids for a given child lock id.
+([\#316](https://github.com/informalsystems/hydro/pull/316))

.changelog/v3.6.2/summary.md

@@ -0,0 +1,6 @@
+<!--
+    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: October 6th, 2025

.github/workflows/populate-staging-contracts.yml

@@ -40,6 +40,10 @@ jobs:
           echo "HYDRO_OSMO_CONTRACT_ADDRESS=neutron1xkvzdzfzacuzlwlxf5hhlrqgv9sz4rgd2gkhvgm8lmudn8lmw0fq2296nu" >> $GITHUB_ENV
           echo "TRIBUTE_OSMO_CONTRACT_ADDRESS=neutron1l6sq43kzhw77t7f5n9e6vxente0agcj3wyedkxtc08pm7c9uu2jsssq9wj" >> $GITHUB_ENV
           echo "HYDRO_OSMO_TRANCHES_NUM=1" >> $GITHUB_ENV
+
+          echo "HYDRO_NTRN_CONTRACT_ADDRESS=neutron1kwdzg8rhamvy55rz6xnchdy9hfysgp84uz6uxqud6az56nn4t7gsc4zzm0" >> $GITHUB_ENV
+          echo "TRIBUTE_NTRN_CONTRACT_ADDRESS=neutron1s40ldcahqrjqylzw5vcnsd0ca7eym9dzhfxw5k00exvlng4c76hq0p4ftp" >> $GITHUB_ENV
+          echo "HYDRO_NTRN_TRANCHES_NUM=1" >> $GITHUB_ENV
       
       # Enter liquidity deployments info for all proposals from the previous round.
       # If the proposal power was > 0, liquidity deployment info will be entered with deployed_funds > 0.
@@ -53,6 +57,8 @@ jobs:
           source ./tools/deployment/enter_staging_liquidity_deployments.sh $CONFIG_FILE $HYDRO_ATOM_CONTRACT_ADDRESS $HYDRO_ATOM_TRANCHES_NUM
 
           source ./tools/deployment/enter_staging_liquidity_deployments.sh $CONFIG_FILE $HYDRO_OSMO_CONTRACT_ADDRESS $HYDRO_OSMO_TRANCHES_NUM
+
+          source ./tools/deployment/enter_staging_liquidity_deployments.sh $CONFIG_FILE $HYDRO_NTRN_CONTRACT_ADDRESS $HYDRO_NTRN_TRANCHES_NUM
       
       # Run the script to create proposals with tributes in current round
       - name: Populate round with proposals and tributes
@@ -63,6 +69,8 @@ jobs:
           source ./tools/deployment/populate_contracts.sh $CONFIG_FILE $HYDRO_ATOM_CONTRACT_ADDRESS $TRIBUTE_ATOM_CONTRACT_ADDRESS $HYDRO_ATOM_TRANCHES_NUM
 
           source ./tools/deployment/populate_contracts.sh $CONFIG_FILE $HYDRO_OSMO_CONTRACT_ADDRESS $TRIBUTE_OSMO_CONTRACT_ADDRESS $HYDRO_OSMO_TRANCHES_NUM
+
+          source ./tools/deployment/populate_contracts.sh $CONFIG_FILE $HYDRO_NTRN_CONTRACT_ADDRESS $TRIBUTE_NTRN_CONTRACT_ADDRESS $HYDRO_NTRN_TRANCHES_NUM
       
       # Refresh some expired lockup or create a new one, and then vote with it in all tranches of the current round
       - name: Lock tokens and vote
@@ -76,3 +84,6 @@ jobs:
 
           TOKEN_TO_LOCK="ibc/75249A18DEFBEFE55F83B1C70CAD234DF164F174C6BC51682EE92C2C81C18C93"
           source ./tools/deployment/lock_and_vote.sh $CONFIG_FILE $HYDRO_OSMO_CONTRACT_ADDRESS $HYDRO_OSMO_TRANCHES_NUM $TOKEN_TO_LOCK
+
+          TOKEN_TO_LOCK="factory/neutron1frc0p5czd9uaaymdkug2njz7dc7j65jxukp9apmt9260a8egujkspms2t2/udntrn"
+          source ./tools/deployment/lock_and_vote.sh $CONFIG_FILE $HYDRO_NTRN_CONTRACT_ADDRESS $HYDRO_NTRN_TRANCHES_NUM $TOKEN_TO_LOCK

CHANGELOG

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## v3.6.2
+
+Date: October 6th, 2025
+
+### BUG FIXES
+
+- Use integer arithmetic with `checked_multiply_ratio` to prevent overflows in Vortex resolve auction method.
+  ([\#319](https://github.com/informalsystems/hydro/pull/319))
+
+### FEATURES
+
+- Allow users to withdraw tokens they previously deposited into Inflow, plus any yield that was made by deploying their tokens.
+  ([\#307](https://github.com/informalsystems/hydro/pull/307))
+-Added parent lock ids query which returns the list of parent lock ids for a given child lock id.
+([\#316](https://github.com/informalsystems/hydro/pull/316))
+
 ## v3.6.1
 
 Date: September 9th, 2025
@@ -172,10 +188,10 @@ Date: February 11th, 2025
 
 - Allow users / aggregators to unvote without having to switch votes.
   ([\#218](https://github.com/informalsystems/hydro/pull/218))
-- Introduced the compounder cap- a reserved portion of the maximum token lock limit that is allocated exclusively for known users from the previous round.
-  ([\#220](https://github.com/informalsystems/hydro/pull/220))
 - Introduced SnapshotMaps for tracking the historical voting power for each user as well as the round total voting power.
   ([\#220](https://github.com/informalsystems/hydro/pull/220))
+- Introduced the compounder cap- a reserved portion of the maximum token lock limit that is allocated exclusively for known users from the previous round.
+  ([\#220](https://github.com/informalsystems/hydro/pull/220))
 - Added support for integrating Hydro as a voting module in DAO DAO governance smart contracts.
   ([\#226](https://github.com/informalsystems/hydro/pull/226))
 
@@ -272,10 +288,10 @@ Date: November 18th, 2024
 
 ### FEATURES
 
-- Add a minimum liquidity request value to proposals.
-  ([\#164](https://github.com/informalsystems/hydro/pull/164))
 - Adjusts tributes to only be claimable if their proposal received a non-zero fund deployment.
   ([\#164](https://github.com/informalsystems/hydro/pull/164))
+- Add a minimum liquidity request value to proposals.
+  ([\#164](https://github.com/informalsystems/hydro/pull/164))
 - Allow whitelist admins to register performed liquidity deployments in the Hydro contract.
   ([\#164](https://github.com/informalsystems/hydro/pull/164))
 - Allow bids to set a custom duration they would like to receive liquidity for.

Cargo.lock

@@ -16,7 +16,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "3.6.1"
+version = "3.6.2"
 edition = "2021"
 
 [profile.release]

Cargo.toml

@@ -1,9 +1,9 @@
-a6f0afa6224b19d3e52a68ee71248a8d498debcd0ea0a2ea9474805bcbb81ca4  d_token_info_provider.wasm
-54fe4910e900dc66b017b10cc251e3fc98e6e8cf73af46fca2ebe206762e57c9  dao_voting_adapter.wasm
-4d0740b603d8cce240c26a697f2048f807995bd7e84e0f96f2d3719a714dcd66  gatekeeper.wasm
-45a9e43372c404fe16362bce77b3ca7e54eefe09de38e455800793bc98f53cd4  hydro.wasm
-c5e7d8ab97885ab89591dc92ecff1bfe8b8ca465ad0ddd56ac6740f0a3da6bc3  inflow.wasm
-0c204b72ebd3c3daca25521301e5dab7b127aea638981791ce6caaae67049e8d  liquid_collateral.wasm
-8dd203c030a2aa002beb1d1d917cf033a815f2fda270a8e7eea3fc77885c00b2  marketplace.wasm
-abaa897f5122c9786c95e15d7b6f0d64166c024fc8906b84280d3e084efb6651  st_token_info_provider.wasm
-4dbb8b38359618a8ced07e9fcc1a398c58af7a3c4206e59b702f14e882f23f7c  tribute.wasm
+6e75739372bf9e3f188fbb707ce93a38619021f1e9dc7532f00def53b35fac20  d_token_info_provider.wasm
+90c08f794faf3f5a71b94c5c25050c1bbf91d3a82fdcc604847a1b09acb52042  dao_voting_adapter.wasm
+b0feadfd0db42e6536f71c17ad2ca76177b38f49f40f490a91d58c8d3a426f7c  gatekeeper.wasm
+b01b986eefc8e55950700283fd472b3e4102dacf64f0efb58dd32cb550795bc3  hydro.wasm
+c343d3ffffced73851a17d0cc1de8e40bb282f369e21f34124466dc536598cf4  inflow.wasm
+98c6cd3ba16e17fcb6f8c872446e2dc9f5c9bd5b9084aa1d3a34a4583eb2a8d9  liquid_collateral.wasm
+96012e757b8965bb265e35c6e46ca14b6cb5bcb87d41fb23eb19c9a5eed67cd2  marketplace.wasm
+314de5209fa206082e37abcee59c06ec6136142b9a3b3871e0040dfafa57a06d  st_token_info_provider.wasm
+f12229a1a10a023b3f6047f2a4fe4ed0255be0d5acedfbe477973b86ece33e46  tribute.wasm