Skip to content

Commit

Permalink
Merge branch 'main' into puneet/update-protos
Browse files Browse the repository at this point in the history
  • Loading branch information
puneet2019 authored May 29, 2024
2 parents bb1e921 + e4464f1 commit 9add8b5
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v4

- name: golangci-lint
uses: golangci/golangci-lint-action@v5
uses: golangci/golangci-lint-action@v6
with:
version: "v1.55.0"
args: --timeout=5m
2 changes: 1 addition & 1 deletion .github/workflows/proto-registry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: bufbuild/buf-setup-action@v1.31.0
- uses: bufbuild/buf-setup-action@v1.32.2
- uses: bufbuild/buf-push-action@v1
with:
input: "proto"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
timeout-minutes: 5
steps:
- uses: actions/checkout@v4
- uses: bufbuild/buf-setup-action@v1.31.0
- uses: bufbuild/buf-setup-action@v1.32.2
- uses: bufbuild/buf-lint-action@v1
with:
input: "proto"
Expand All @@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: bufbuild/buf-setup-action@v1.31.0
- uses: bufbuild/buf-setup-action@v1.32.2
- uses: bufbuild/buf-breaking-action@v1
with:
input: "proto"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
minimum-coverage: 70

- name: Coveralls
uses: coverallsapp/github-action@v2.2.3
uses: coverallsapp/github-action@v2.3.0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: coverage.lcov
Expand All @@ -90,7 +90,7 @@ jobs:
uses: tj-actions/branch-names@v8

- name: Build Docker image
uses: strangelove-ventures/[email protected].1
uses: strangelove-ventures/[email protected].2
with:
registry: # empty registry, image only shared for e2e testing
tag: local # emulate local environment for consistency in interchaintest cases
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ Ref: https://keepachangelog.com/en/1.0.0/

## Unreleased

## [v2.13.0] - 2024-05-01

### Bug Fixes

- [815](https://github.com/persistenceOne/pstake-native/pull/815) Not escape merkle paths for proof verification.
Expand Down
2 changes: 1 addition & 1 deletion x/liquidstake/keeper/rebalancing.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func (k Keeper) Rebalance(
redelegation.Error = err
failCount++

k.Logger(ctx).Error(
k.Logger(ctx).Info(
"redelegation failed",
types.DelegatorKeyVal, proxyAcc.String(),
types.SrcValidatorKeyVal, maxVal.OperatorAddress,
Expand Down

0 comments on commit 9add8b5

Please sign in to comment.