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.

Sign up for GitHub

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

fix: always propose with current app version #697

Merged
merged 4 commits into from
Oct 16, 2023
Merged

fix: always propose with current app version #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a6f2ca
fix: always propose with current app version
QuantumExplorer Oct 13, 2023
c60fba5
Merge branch 'v0.13-dev' into fix/proposeCurrentAppVersion
QuantumExplorer Oct 13, 2023
7ca6b68
fmt
QuantumExplorer Oct 14, 2023
49d0722
fix: remove check about block proposed app version
QuantumExplorer Oct 15, 2023
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
5 changes: 0 additions & 5 deletions internal/state/execution.go
View file
Open in desktop
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
View file
Open in desktop
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
Loading