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

chore(release): update changelog and bump version to 0.13.3 #699

Merged
merged 4 commits into from
Oct 16, 2023
Merged
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
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
## [0.13.3] - 2023-10-16

### Bug Fixes

- Issue with GMP not properly being linked on mac (#698)
- Always propose with current app version (#697)

## [0.13.2] - 2023-10-09

### Bug Fixes

- Log-file-path setting does not work (#691)

### Miscellaneous Tasks

- Update changelog and version to 0.13.2

## [0.13.1] - 2023-09-14

### Bug Fixes
Expand Down
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ CGO_CXXFLAGS ?= -I$(BLS_DIR)/build/depends/relic/include \
-I$(BLS_DIR)/src/depends/relic/include \
-I$(BLS_DIR)/src/include

OS := $(shell uname)

ifeq ($(OS),Darwin) # macOS
GMP_PREFIX := $(shell brew --prefix gmp 2>/dev/null)
CGO_LDFLAGS += -L$(GMP_PREFIX)/lib
CGO_CXXFLAGS += -I$(GMP_PREFIX)/include
endif

GO := CGO_ENABLED=$(CGO_ENABLED) CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" go

# handle ARM builds
Expand Down
5 changes: 0 additions & 5 deletions internal/state/execution.go
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,6 @@ func (blockExec *BlockExecutor) CreateProposalBlock(
return nil, CurrentRoundState{}, fmt.Errorf("create proposal block: %w", err)
}

// Pass proposed app version only if it's higher than current network app version
if proposedAppVersion <= state.Version.Consensus.App {
proposedAppVersion = 0
}

txs := blockExec.mempool.ReapMaxBytesMaxGas(maxDataBytes, maxGas)
block := state.MakeBlock(height, txs, commit, evidence, proposerProTxHash, proposedAppVersion)

Expand Down
8 changes: 0 additions & 8 deletions internal/state/validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,6 @@ func validateBlock(state State, block *types.Block) error {
)
}

// Validate proposed app version
if block.Header.ProposedAppVersion > 0 && block.Header.ProposedAppVersion <= state.Version.Consensus.App {
return fmt.Errorf("wrong block.Header.ProposedAppVersion must be higher than %v, is %d",
state.Version.Consensus.App,
block.Header.ProposedAppVersion,
)
}

// Validate prev block info.
if !block.LastBlockID.Equals(state.LastBlockID) {
return fmt.Errorf("wrong Block.Header.LastBlockID. Expected %v, got %v",
Expand Down
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 = "0.13.2"
TMVersionDefault = "0.13.3"
// ABCISemVer is the semantic version of the ABCI library
ABCISemVer = "0.23.0"

Expand Down
Loading