Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v1.3-dev' into fix/lint
Browse files Browse the repository at this point in the history
  • Loading branch information
lklimek committed Nov 2, 2024
2 parents e963de0 + 2913d54 commit 52ca522
Show file tree
Hide file tree
Showing 7 changed files with 74 additions and 48 deletions.
1 change: 1 addition & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,5 @@ jobs:
version: v1.61
args: --timeout 10m
github-token: ${{ secrets.github_token }}
only-new-issues: true
if: env.GIT_DIFF
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
## [1.3.1] - 2024-11-02

### Bug Fixes

- Num of validators that didn't sign is always 0 (#905)
- We should panic if finalize block on apply commit fails (#966)

### Documentation

- Update readme (#934)
- Fix broken links (#940)

### Testing

- Update tests for new proposal selection algo (#925)
- Fix proposer selection test (#926)

### Build

- Bump golangci/golangci-lint-action from 6.0.1 to 6.1.1 (#950)
- Bump docker/setup-buildx-action from 3.3.0 to 3.7.1 (#949)
- Bump golang.org/x/crypto from 0.25.0 to 0.28.0 (#945)
- Bump golang.org/x/term from 0.22.0 to 0.25.0 (#942)
- Bump docker/build-push-action from 6.0.0 to 6.9.0 (#935)
- Go 1.23, mockery 2.46.2, golangci-lint 1.61 (#954)

## [1.3.0] - 2024-09-19

### Bug Fixes
Expand All @@ -17,6 +43,7 @@
- Update changelog and version to 1.1.0-dev.1 (#842)
- Update changelog and version to 1.1.0-dev.2 (#846)
- Update changelog and version to 1.1.0-dev.3 (#848)
- Update changelog and version to 1.3.0

### Build

Expand Down
10 changes: 6 additions & 4 deletions dash/core/mocks/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion internal/consensus/state_apply_commit.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ func (c *ApplyCommitAction) Execute(ctx context.Context, stateEvent StateEvent)
stateCopy, err := c.blockExec.finalize(ctx, stateData, commit)
if err != nil {
c.logger.Error("failed to apply block", "err", err)
return nil
// If something went wrong within ABCI client, it can stop and we can't recover from it.
// So, we panic here to ensure that the node will be restarted.
panic(fmt.Errorf("failed to finalize block %X at height %d: %w", block.Hash(), block.Height, err))
}

lastBlockMeta := c.blockStore.LoadBlockMeta(height - 1)
Expand Down
8 changes: 1 addition & 7 deletions internal/state/execution.go
Original file line number Diff line number Diff line change
Expand Up @@ -763,13 +763,7 @@ func execBlockWithoutState(
commit *types.Commit,
logger log.Logger,
) (*abci.ResponseFinalizeBlock, error) {
respFinalizeBlock, err := execBlock(ctx, appConn, block, commit, logger)
if err != nil {
logger.Error("executing block", "err", err)
return respFinalizeBlock, err
}

return respFinalizeBlock, nil
return execBlock(ctx, appConn, block, commit, logger)
}

func (blockExec *BlockExecutor) pruneBlocks(retainHeight int64) {
Expand Down
70 changes: 35 additions & 35 deletions types/mocks/priv_validator.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var (
const (
// TMVersionDefault is the used as the fallback version for Tenderdash
// when not using git describe. It is formatted with semantic versioning.
TMVersionDefault = "1.3.0"
TMVersionDefault = "1.3.1"
// ABCISemVer is the semantic version of the ABCI library
ABCISemVer = "1.2.0"

Expand Down

0 comments on commit 52ca522

Please sign in to comment.