Bring changes from main to release/v2.x branch (#179)

* Migrate Hydro & Tribute contracts to v2.0.1 (#170) * added migration from v1.1.0 to v2.0.0 for hydro contract * - modifications of hydro migration code - added tribute migration - added unit tests - fixed tribute build issue * - don't check if lock's validator is active when migrating votes - changed version to V2.0.1 * added changelog * fix user votes query (#174) * Do not allow short lockups to vote on proposals for longer liquidity deployment (#175) * Do not allow short lockups to vote on proposals for longer liquidity deployment. * ignore short lockups instead of returning error in vote() * renamed proposal's "bid_duration" to "deployment_duration" (#176) * allow longer locks in pilot rounds (#177) * prepared V2.0.1 changelog (#178)
informalsystems · Nov 25, 2024 · cdbe999 · cdbe999
1 parent a4a6092
commit cdbe999
Show file tree

Hide file tree

Showing 53 changed files with 2,022 additions and 487 deletions.
diff --git a/.changelog/v2.0.1/bug-fixes/174-query-user-votes-fix.md b/.changelog/v2.0.1/bug-fixes/174-query-user-votes-fix.md
@@ -0,0 +1,2 @@
+- Fix user votes query to take into account only active round validators and their power ratios.
+  ([\#174](https://github.com/informalsystems/hydro/pull/174))
diff --git a/.changelog/v2.0.1/features/170-migrate-contracts-to-v2_0_1.md b/.changelog/v2.0.1/features/170-migrate-contracts-to-v2_0_1.md
@@ -0,0 +1,2 @@
+- Migrate Hydro & Tribute contracts to v2.0.1.
+  ([\#170](https://github.com/informalsystems/hydro/pull/170))
diff --git a/.changelog/v2.0.1/features/175-short-locks-cant-vote-for-long-proposals.md b/.changelog/v2.0.1/features/175-short-locks-cant-vote-for-long-proposals.md
@@ -0,0 +1,2 @@
+- Do not allow short lockups to vote on proposals requesting longer liquidity deployment.
+  ([\#175](https://github.com/informalsystems/hydro/pull/175))
diff --git a/.changelog/v2.0.1/features/176-rename-bid-duration-to-deployment-duration.md b/.changelog/v2.0.1/features/176-rename-bid-duration-to-deployment-duration.md
@@ -0,0 +1,2 @@
+- Rename "bid duration" to "deployment duration".
+  ([\#176](https://github.com/informalsystems/hydro/pull/176))
diff --git a/.changelog/v2.0.1/features/177-allow-longer-locks-in-pilot-rounds.md b/.changelog/v2.0.1/features/177-allow-longer-locks-in-pilot-rounds.md
@@ -0,0 +1,2 @@
+- Allow longer locks in pilot rounds.
+  ([\#177](https://github.com/informalsystems/hydro/pull/177))
diff --git a/.changelog/v2.0.1/summary.md b/.changelog/v2.0.1/summary.md
@@ -0,0 +1 @@
+Date: November 25th, 2024
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,25 @@
 # CHANGELOG
 
+## v2.0.1
+
+Date: November 25th, 2024
+
+### BUG FIXES
+
+- Fix user votes query to take into account only active round validators and their power ratios.
+  ([\#174](https://github.com/informalsystems/hydro/pull/174))
+
+### FEATURES
+
+- Migrate Hydro & Tribute contracts to v2.0.1.
+  ([\#170](https://github.com/informalsystems/hydro/pull/170))
+- Do not allow short lockups to vote on proposals requesting longer liquidity deployment.
+  ([\#175](https://github.com/informalsystems/hydro/pull/175))
+- Rename "bid duration" to "deployment duration".
+  ([\#176](https://github.com/informalsystems/hydro/pull/176))
+- Allow longer locks in pilot rounds.
+  ([\#177](https://github.com/informalsystems/hydro/pull/177))
+
 ## v2.0.0
 
 Date: November 18th, 2024

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/artifacts/checksums.txt b/artifacts/checksums.txt
@@ -1,2 +1,2 @@
-52866b130b633cbf90fd58dc1c9a975896a1060a9ed9ea590e9640efe3fee954  hydro.wasm
-15437347bcd5b5b65b541dc0eec9f1658250c25d893610cf720475b20a0feb51  tribute.wasm
+6a493be7e950050faa946c87b0c5928907dd9ed2d5e94b1c2d12c844a97cfc4f  hydro.wasm
+4f9a40da3c48d741112d35f0e4a52111863379d3ac80603c2b361e9b7a927d72  tribute.wasm
diff --git a/artifacts/hydro.wasm b/artifacts/hydro.wasm
diff --git a/artifacts/tribute.wasm b/artifacts/tribute.wasm
diff --git a/contracts/hydro/Cargo.toml b/contracts/hydro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hydro"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Jehan Tremback", "Philip Offtermatt", "Dusan Maksimovic"]
 edition = "2018"
 

diff --git a/contracts/hydro/schema/constants_response.json b/contracts/hydro/schema/constants_response.json
@@ -21,7 +21,7 @@
         "icq_update_period",
         "is_in_pilot_mode",
         "lock_epoch_length",
-        "max_bid_duration",
+        "max_deployment_duration",
         "max_locked_tokens",
         "max_validator_shares_participating",
         "paused",
@@ -50,7 +50,7 @@
           "format": "uint64",
           "minimum": 0.0
         },
-        "max_bid_duration": {
+        "max_deployment_duration": {
           "type": "integer",
           "format": "uint64",
           "minimum": 0.0

diff --git a/contracts/hydro/schema/execute_msg.json b/contracts/hydro/schema/execute_msg.json
@@ -79,14 +79,14 @@
         "create_proposal": {
           "type": "object",
           "required": [
-            "bid_duration",
+            "deployment_duration",
             "description",
             "minimum_atom_liquidity_request",
             "title",
             "tranche_id"
           ],
           "properties": {
-            "bid_duration": {
+            "deployment_duration": {
               "type": "integer",
               "format": "uint64",
               "minimum": 0.0
@@ -192,7 +192,7 @@
         "update_config": {
           "type": "object",
           "properties": {
-            "max_bid_duration": {
+            "max_deployment_duration": {
               "type": [
                 "integer",
                 "null"

diff --git a/contracts/hydro/schema/hydro_full_schema.json b/contracts/hydro/schema/hydro_full_schema.json
@@ -12,7 +12,7 @@
       "initial_whitelist",
       "is_in_pilot_mode",
       "lock_epoch_length",
-      "max_bid_duration",
+      "max_deployment_duration",
       "max_locked_tokens",
       "max_validator_shares_participating",
       "round_length",
@@ -54,7 +54,7 @@
         "format": "uint64",
         "minimum": 0.0
       },
-      "max_bid_duration": {
+      "max_deployment_duration": {
         "type": "integer",
         "format": "uint64",
         "minimum": 0.0
@@ -202,14 +202,14 @@
           "create_proposal": {
             "type": "object",
             "required": [
-              "bid_duration",
+              "deployment_duration",
               "description",
               "minimum_atom_liquidity_request",
               "title",
               "tranche_id"
             ],
             "properties": {
-              "bid_duration": {
+              "deployment_duration": {
                 "type": "integer",
                 "format": "uint64",
                 "minimum": 0.0
@@ -315,7 +315,7 @@
           "update_config": {
             "type": "object",
             "properties": {
-              "max_bid_duration": {
+              "max_deployment_duration": {
                 "type": [
                   "integer",
                   "null"
@@ -1192,7 +1192,7 @@
         "Proposal": {
           "type": "object",
           "required": [
-            "bid_duration",
+            "deployment_duration",
             "description",
             "minimum_atom_liquidity_request",
             "percentage",
@@ -1203,7 +1203,7 @@
             "tranche_id"
           ],
           "properties": {
-            "bid_duration": {
+            "deployment_duration": {
               "type": "integer",
               "format": "uint64",
               "minimum": 0.0
@@ -1480,7 +1480,7 @@
             "icq_update_period",
             "is_in_pilot_mode",
             "lock_epoch_length",
-            "max_bid_duration",
+            "max_deployment_duration",
             "max_locked_tokens",
             "max_validator_shares_participating",
             "paused",
@@ -1509,7 +1509,7 @@
               "format": "uint64",
               "minimum": 0.0
             },
-            "max_bid_duration": {
+            "max_deployment_duration": {
               "type": "integer",
               "format": "uint64",
               "minimum": 0.0
@@ -1585,7 +1585,7 @@
         "Proposal": {
           "type": "object",
           "required": [
-            "bid_duration",
+            "deployment_duration",
             "description",
             "minimum_atom_liquidity_request",
             "percentage",
@@ -1596,7 +1596,7 @@
             "tranche_id"
           ],
           "properties": {
-            "bid_duration": {
+            "deployment_duration": {
               "type": "integer",
               "format": "uint64",
               "minimum": 0.0
@@ -1962,7 +1962,7 @@
         "Proposal": {
           "type": "object",
           "required": [
-            "bid_duration",
+            "deployment_duration",
             "description",
             "minimum_atom_liquidity_request",
             "percentage",
@@ -1973,7 +1973,7 @@
             "tranche_id"
           ],
           "properties": {
-            "bid_duration": {
+            "deployment_duration": {
               "type": "integer",
               "format": "uint64",
               "minimum": 0.0

diff --git a/contracts/hydro/schema/instantiate_msg.json b/contracts/hydro/schema/instantiate_msg.json
@@ -11,7 +11,7 @@
     "initial_whitelist",
     "is_in_pilot_mode",
     "lock_epoch_length",
-    "max_bid_duration",
+    "max_deployment_duration",
     "max_locked_tokens",
     "max_validator_shares_participating",
     "round_length",
@@ -53,7 +53,7 @@
       "format": "uint64",
       "minimum": 0.0
     },
-    "max_bid_duration": {
+    "max_deployment_duration": {
       "type": "integer",
       "format": "uint64",
       "minimum": 0.0

diff --git a/contracts/hydro/schema/proposal_response.json b/contracts/hydro/schema/proposal_response.json
@@ -15,7 +15,7 @@
     "Proposal": {
       "type": "object",
       "required": [
-        "bid_duration",
+        "deployment_duration",
         "description",
         "minimum_atom_liquidity_request",
         "percentage",
@@ -26,7 +26,7 @@
         "tranche_id"
       ],
       "properties": {
-        "bid_duration": {
+        "deployment_duration": {
           "type": "integer",
           "format": "uint64",
           "minimum": 0.0

diff --git a/contracts/hydro/schema/round_proposals_response.json b/contracts/hydro/schema/round_proposals_response.json
@@ -18,7 +18,7 @@
     "Proposal": {
       "type": "object",
       "required": [
-        "bid_duration",
+        "deployment_duration",
         "description",
         "minimum_atom_liquidity_request",
         "percentage",
@@ -29,7 +29,7 @@
         "tranche_id"
       ],
       "properties": {
-        "bid_duration": {
+        "deployment_duration": {
           "type": "integer",
           "format": "uint64",
           "minimum": 0.0

diff --git a/contracts/hydro/schema/top_n_proposals_response.json b/contracts/hydro/schema/top_n_proposals_response.json
@@ -18,7 +18,7 @@
     "Proposal": {
       "type": "object",
       "required": [
-        "bid_duration",
+        "deployment_duration",
         "description",
         "minimum_atom_liquidity_request",
         "percentage",
@@ -29,7 +29,7 @@
         "tranche_id"
       ],
       "properties": {
-        "bid_duration": {
+        "deployment_duration": {
           "type": "integer",
           "format": "uint64",
           "minimum": 0.0