Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring changes from main to prepare 1.1.0 release #159

Closed
wants to merge 13 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .changelog/epilogue.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# CHANGELOG

# v1.0.0

Date: September 24th, 2023
Expand Down
6 changes: 6 additions & 0 deletions .changelog/v1.0.3/summary.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Date: October 15th, 2024
<!--
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. -->
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Adjust tribute refunding condition.
([\#146](https://github.com/informalsystems/hydro/pull/146))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Allow refreshing multiple locks at once
([\#149](https://github.com/informalsystems/hydro/pull/149))
2 changes: 2 additions & 0 deletions .changelog/v1.1.0/features/156-migrate-start.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Adds a migration to change the start of the first contract on an instantiated contract
([\#156](https://github.com/informalsystems/hydro/pull/156))
1 change: 1 addition & 0 deletions .changelog/v1.1.0/summary.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Date: October 22nd, 2024
25 changes: 25 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
## Description

Closes: *#XXXX*

*Add a description of the changes that this PR introduces and the files that
are the most critical to review.*

---

### Author Checklist

*All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.*

I have...

* [ ] Targeted the correct branch
* [ ] Included the necessary unit tests
* [ ] Added/adjusted the necessary [interchain tests](./test/interchain/)
* [ ] Added a changelog entry in `.changelog`
* [ ] Compiled the contracts by using `make compile` and included content of the *artifacts* directory into the PR
* [ ] Regenerated front-end schema by using `make schema` and included generated files into the PR
* [ ] Updated the relevant documentation or specification
* [ ] Reviewed "Files changed" and left comments if necessary
* [ ] Confirmed all CI checks have passed
14 changes: 14 additions & 0 deletions .github/workflows/nigthly-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Nightly Tests

on:
schedule:
# run at 4am every day
- cron: '0 4 * * *'

jobs:
test-interchain:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Interchain Tests
run: make build-docker-relayer && make test-interchain
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ Cargo.toml.orig

# ignore proptest regressions
*/proptest-regressions/*

# macOS specific
**/.DS_Store
39 changes: 38 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,41 @@
# CHANGELOG

## v1.1.0

Date: October 22nd, 2024

### FEATURES

- Adjust tribute refunding condition.
([\#146](https://github.com/informalsystems/hydro/pull/146))
- Allow refreshing multiple locks at once
([\#149](https://github.com/informalsystems/hydro/pull/149))
- Adds a migration to change the start of the first contract on an instantiated contract
([\#156](https://github.com/informalsystems/hydro/pull/156))

## v1.0.3

Date: October 15th, 2024
<!--
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. -->

### BUG FIXES

- Forbid users to claim tributes that belong to other proposals than the one user voted on.
([\#129](https://github.com/informalsystems/hydro/pull/129))
- fix: do not insert proposal into PROPS_BY_SCORE on proposal creation.
([\#135](https://github.com/informalsystems/hydro/pull/135))

### FEATURES

- Update proposal powers when user that voted locks or relocks tokens.
([\#128](https://github.com/informalsystems/hydro/pull/128))
- Add 'pilot round mode' with a different lock duration.
([\#137](https://github.com/informalsystems/hydro/pull/137))

# v1.0.0

Date: September 24th, 2023
Expand All @@ -12,4 +48,5 @@ It includes:
* Users can vote on proposals
* The _Tribute_ contract, where:
* Projects can add tributes to their proposals
* Users can claim tributes for the proposals that they voted on
* Users can claim tributes for the proposals that they voted on

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.

21 changes: 21 additions & 0 deletions RELEASE_PROCESS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
## Cutting a new release

### Creating the changelog

To create a new release, you will need to have [unclog](https://github.com/informalsystems/unclog) installed.

First, run:
```
unclog release vX.Y.Z --editor nano
```
This will move all the changelog entries from the `unreleased` folder into a new folder named after the release tag. It will also open an editor for you to write the release notes.
For the release notes, include the date (as in `Date: October 15th, 2024`). You can
optionally add a short summary of the release, but do not duplicate the changelog entries.

Then, regenerate the `CHANGELOG` by running
```
unclog build > CHANGELOG
```
Finally, commit and push the changes to the repo.
The up-to-date changelog should be present on the release branch for the release you have just cut,
and also on main.
4 changes: 2 additions & 2 deletions artifacts/checksums.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
b8ad3e6620dffc6b4d0357d983333d6db3f2ec4a485f0b87906bcff6c6e223e1 hydro.wasm
b522862cb198bbfa2cab046110b4d26a590dea315fe838af3cf1455cad41f9b7 tribute.wasm
0eef6df459b3aebf48f0a716bf09cadaa71ff3c8dfa8be783b6408f9451df77b hydro.wasm
7a54621d5c5215757ac8ffdbfa42fa469f4c8d7694cbf8a8b3540bc96393fa05 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 = "1.0.0"
version = "1.1.0"
authors = ["Jehan Tremback", "Philip Offtermatt", "Dusan Maksimovic"]
edition = "2018"

Expand Down
13 changes: 8 additions & 5 deletions contracts/hydro/schema/execute_msg.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,21 @@
"type": "object",
"required": [
"lock_duration",
"lock_id"
"lock_ids"
],
"properties": {
"lock_duration": {
"type": "integer",
"format": "uint64",
"minimum": 0.0
},
"lock_id": {
"type": "integer",
"format": "uint64",
"minimum": 0.0
"lock_ids": {
"type": "array",
"items": {
"type": "integer",
"format": "uint64",
"minimum": 0.0
}
}
},
"additionalProperties": false
Expand Down
13 changes: 8 additions & 5 deletions contracts/hydro/schema/hydro_full_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,18 +152,21 @@
"type": "object",
"required": [
"lock_duration",
"lock_id"
"lock_ids"
],
"properties": {
"lock_duration": {
"type": "integer",
"format": "uint64",
"minimum": 0.0
},
"lock_id": {
"type": "integer",
"format": "uint64",
"minimum": 0.0
"lock_ids": {
"type": "array",
"items": {
"type": "integer",
"format": "uint64",
"minimum": 0.0
}
}
},
"additionalProperties": false
Expand Down
Loading