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

dashpay · Oct 16, 2023 · b767c5d · b767c5d
2 parents 49eec7d + 194e664
commit b767c5d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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

diff --git a/Makefile b/Makefile
@@ -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

diff --git a/internal/state/execution.go b/internal/state/execution.go
@@ -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)
 

diff --git a/internal/state/validation.go b/internal/state/validation.go
@@ -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",

diff --git a/version/version.go b/version/version.go
@@ -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"