Skip to content

Commit

Permalink
Merge branch 'main' into sai/fix_ibc_transfer_msg_recv_length_check
Browse files Browse the repository at this point in the history
  • Loading branch information
gsk967 committed Jun 17, 2024
2 parents af18eee + 503e148 commit c049942
Show file tree
Hide file tree
Showing 176 changed files with 10,457 additions and 3,405 deletions.
42 changes: 42 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
root = true

[*]
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
# indent_style = space
# indent_size = 4

[*.css]
indent_style = tab

[*.{coffee,js,jsx,ts,tsx}]
indent_style = tab
indent_size = 4
max_line_length = 96

[*.json]
indent_style = tab
indent_size = 4

[*.go]
max_line_length = 96
indent_style = tab

[*.py]
max_line_length = 80
# tabs are allowed, but spaces is a pep8 convention... //indent_style = tab

[*.sol]
indent_style = space
indent_size = 4

[*.sql]
indent_style = tab

[*.{md,rst}]
trim_trailing_whitespace = false

[*.{html,mako,less,org}]
indent_style = tab
2 changes: 1 addition & 1 deletion .github/workflows/debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
cache: true

- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/govulncheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
FILES: |
go.mod
go.sum
- uses: golang/[email protected].2
- uses: golang/[email protected].3
id: govulncheck
if: env.GIT_DIFF
with:
go-version-input: 1.21
go-version-input: 1.22
go-package: ./...
8 changes: 4 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ jobs:
- uses: actions/setup-go@v5
if: env.GIT_DIFF
with:
go-version: "1.21"
go-version: "1.22"
cache: true

- name: golangci-lint main
uses: golangci/golangci-lint-action@v4
uses: golangci/golangci-lint-action@v6
if: env.GIT_DIFF
with:
version: latest
Expand All @@ -40,12 +40,12 @@ jobs:
with:
fetch-depth: 0
# lint only changed files
- uses: tj-actions/changed-files@v43
- uses: tj-actions/changed-files@v44
id: changed-files
with:
files: "**/*.md"
separator: ","
- uses: DavidAnson/markdownlint-cli2-action@v15
- uses: DavidAnson/markdownlint-cli2-action@v16
if: steps.changed-files.outputs.any_changed == 'true'
with:
globs: ${{ steps.changed-files.outputs.all_changed_files }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release-umee.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,28 @@ jobs:
fetch-depth: 0
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
cache: true

- name: Set Env
run: echo "TM_VERSION=$(go list -m github.com/cometbft/cometbft | sed 's:.* ::')" >> $GITHUB_ENV

# useful to test builds. However will require to add "push" rule to the "on" section
- name: generate and update swagger docs
- name: generate and update swagger docs
run: |
make proto-swagger-gen
make proto-update-swagger-docs
- name: goreleaser test-build
uses: goreleaser/goreleaser-action@v5
uses: goreleaser/goreleaser-action@v6
if: github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'Enable:ReleaseBuild')
with:
version: latest
args: build --rm-dist --skip-validate # skip validate skips initial sanity checks in order to be able to fully run
env:
TM_VERSION: ${{ env.TM_VERSION }}
- name: Release
uses: goreleaser/goreleaser-action@v5
uses: goreleaser/goreleaser-action@v6
if: startsWith(github.ref, 'refs/tags/')
with:
version: latest
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/simulations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"

- name: Install runsim
run: export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/[email protected]
Expand All @@ -40,7 +40,7 @@ jobs:
- uses: actions/setup-go@v5
if: env.GIT_DIFF
with:
go-version: "1.21"
go-version: "1.22"
cache: true
- name: Test application non-determinism
if: env.GIT_DIFF
Expand All @@ -65,7 +65,7 @@ jobs:
- uses: actions/setup-go@v5
if: env.GIT_DIFF
with:
go-version: "1.21"
go-version: "1.22"
cache: true
- uses: actions/cache@v4
if: env.GIT_DIFF
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
- uses: actions/setup-go@v5
if: env.GIT_DIFF
with:
go-version: "1.21"
go-version: "1.22"
cache: true
- uses: actions/cache@v4
if: env.GIT_DIFF
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
- uses: actions/setup-go@v5
if: env.GIT_DIFF
with:
go-version: "1.21"
go-version: "1.22"
cache: true
- uses: actions/cache@v4
if: env.GIT_DIFF
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
- uses: actions/cache@v4
id: cache-go-tparse
with:
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
if: steps.cache-binaries.outputs.cache-hit != 'true' && env.GIT_DIFF
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
cache: true
env:
GOOS: ${{ matrix.targetos }}
Expand All @@ -78,13 +78,13 @@ jobs:
- uses: actions/setup-go@v5
if: env.GIT_DIFF
with:
go-version: "1.21"
go-version: "1.22"
cache: true
- name: Test and Create Coverage Report
if: env.GIT_DIFF
run: |
EXPERIMENTAL=true make test-unit-cover
- uses: codecov/codecov-action@v4.1.0
- uses: codecov/codecov-action@v4.5.0
if: env.GIT_DIFF
with:
token: ${{ secrets.CODECOV_TOKEN }}
Expand All @@ -110,7 +110,7 @@ jobs:
- uses: actions/setup-go@v5
if: env.GIT_DIFF
with:
go-version: "1.21"
go-version: "1.22"
cache: true

- name: Test E2E
Expand Down
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,26 @@ Ref: https://keepachangelog.com/en/1.0.0/

## Unreleased

### Features

- [2472](https://github.com/umee-network/umee/pull/2472) un-wire the `crisis` module from umee app.
- [2500](https://github.com/umee-network/umee/pull/2500) (x/leverage): add Rewards Auction fees and `params.rewards_auction_factor`.
- [2506](https://github.com/umee-network/umee/pull/2506) (ics20): support leverage/MsgRepay in Memo
- [2527](https://github.com/umee-network/umee/pull/2527) (x/leverage):add `accounts_summary` grpc-web api and cli query to leverage module.
- [2532](https://github.com/umee-network/umee/pull/2532) (x/oracle): add slashing event.

### Improvements

- [2474](https://github.com/umee-network/umee/pull/2474) (proto) add `gogo.messagename_all` option to all messages.
- [2494](https://github.com/umee-network/umee/pull/2494) Use go 1.22
- [2495](https://github.com/umee-network/umee/pull/2495) (util) `KeyWithUint64` and `KeyWithUint32` helper functions for db keys.
- [2504](https://github.com/umee-network/umee/pull/2504) bump `wasmd` to v0.45.0.

### Bug Fixes

- [2473](https://github.com/umee-network/umee/pull/2473) Correct x/ugov Amino registration for x/ugov messages (they don't have MessageName option).
- [2547](https://github.com/umee-network/umee/pull/2547) Fix the `MissCounters` grpc-web get api result.

## v6.4.1 - 2024-04-30

### Improvements
Expand Down
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ go-mod-tidy:

clean:
@echo "--> Cleaning..."
@rm -rf $(BUILD_DIR)/** $(DIST_DIR)/**
@rm -rf $(BUILDDIR)/** $(DIST_DIR)/**

.PHONY: build build-linux build-experimental build-no_cgo clean go-mod-tidy

Expand Down Expand Up @@ -237,7 +237,7 @@ test-e2e-clean:
docker rm umee0 umee1 umee2 umee-gaia-relayer gaiaval0 umee-price-feeder || true
docker network prune -f

test-qa:
test-qa:
@go test ./tests/qa/... -timeout 30m -v -tags='test_qa'

$(MOCKS_DIR):
Expand Down Expand Up @@ -297,7 +297,10 @@ test-app-benchmark-invariants
### Linting ###
###############################################################################

golangci_lint_cmd := go run github.com/golangci/golangci-lint/cmd/golangci-lint
# TODO: need to add github.com/golangci/golangci-lint entry to go.mod and tools.go, but it
# conflicts with golang.org/x/exp
# go run github.com/golangci/golangci-lint/cmd/golangci-lint
golangci_lint_cmd := golangci-lint
revive_cmd := go run github.com/mgechev/revive

# note: on new OSX, might require brew install diffutils
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ See [Release procedure](CONTRIBUTING.md#release-procedure) for more information
| v6.2.x || v0.47.6+ | v7.2.x | --- | umee/v2.3.0 | --- | v1.5.0 |
| v6.3.x || v0.47.7+ | v7.3.1 | --- | umee/v2.3.0+ | --- | v1.5.0 |
| v6.4.x | x | v0.47.10+ | v7.3.2 | --- | umee/v2.4.1+ | --- | v1.5.2 |
| v6.5.x | x | v0.47.11+ | v7.5.1 | --- | umee/v2.4.3+ | --- | v1.5.2 |

#### Price Feeder

Expand Down
30 changes: 10 additions & 20 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,29 @@

The Release Procedure is defined in the [CONTRIBUTING](CONTRIBUTING.md#release-procedure) document.

## v6.4.1

This release updates our dependencies and applies latest patches to the v6.4.x line. All validators must update to this patch release.

## v6.4.0
## v6.5.0

Highlights:

- Cosmos SDK v0.47.10 patch update.
- IBC Hooks: we integrated ICS20 Memo handling.
- Integrated Packet Forwarding Middleware.
- Update `uibc/MsgGovUpdateQuota` Msg type to handle the new inflow parameters.
- Update `uibc/QueryAllOutflowsResponse` to include denom symbol (token name) in every outflow.
- Cosmos SDK v0.47.11 update.
- Adding new `auction` module to our app.
- Removing `crisis` module from our app.

[CHANGELOG](CHANGELOG.md)

### IBC Hooks

This release brings the first part of the seamless cross-chain money market transactions. At UX, we want to provide the best User Experience for handling lending and leverage. In this release, we support the following `x/leverage` messages:
### Auction module

- `MsgSupply`
- `MsgSupplyCollateral`
- `MsgLiquidate`
We propose a new Cosmos SDK module, that will provide mechanism for protocol owned auctions.

The operation can only use tokens that are part of the IBC transfer (after any intermediate deductions) and the supplier / liquidator must be the IBC recipient (acting on someone else's behalf is not allowed). Authz is not supported. The remaining tokens will be credited to the recipient.
UX Chain will now auction a portion of collected fees and introduce a token burning mechanism, unlocking a way to a potentially deflationary UX token.

Documentation: [x/uibc/README.md](https://github.com/umee-network/umee/blob/v6.4.0/x/uibc/README.md#ibc-ics20-hooks)
Documentation: [x/auction/README.md](https://github.com/umee-network/umee/blob/v6.5.0/x/auction/README.md)

### Validators

**Upgrade Title** (for Cosmovisor): **v6.4**.
**Upgrade Title** (for Cosmovisor): **v6.5**.

Update Price Feeder to `umee/2.4.1+`.
Update Price Feeder to `umee/2.4.3+`.

NOTE: after the upgrade, you should restart your Price Feeder. We observed that Price Feeder doesn't correctly re-established a connection after the chain upgrade.

Expand Down
Loading

0 comments on commit c049942

Please sign in to comment.