6a03586074
## Description ### Issue Some values (like chain ID) were being leaked from the previous block/initialization into PrepareProposal and ProcessProposal, these values are only available if: 1. The node has never been stopped since the genesis block (as these values are set on `InitChain`) 2. The node has already commited a block (as the previous header was being used for the new state of prepare and process proposal). So if a node is restarted, during the first prepare and process proposal these values won't be populated, and that will cause issues if they are being used. ### Solution Remove any previous header information from a previous block in the prepare and process proposal contexts, making things consistent at every height. - Added ChainID to baseapp - Use an empty header in Commit() with only the chain id set - Fix context for prepare and process proposal Closes: #15269 --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable)
57 lines
1.9 KiB
Go
57 lines
1.9 KiB
Go
package server
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
cmtcmd "github.com/cometbft/cometbft/cmd/cometbft/commands"
|
|
"github.com/spf13/cobra"
|
|
|
|
"github.com/cosmos/cosmos-sdk/client/flags"
|
|
"github.com/cosmos/cosmos-sdk/server/types"
|
|
)
|
|
|
|
// NewRollbackCmd creates a command to rollback CometBFT and multistore state by one height.
|
|
func NewRollbackCmd(appCreator types.AppCreator, defaultNodeHome string) *cobra.Command {
|
|
var removeBlock bool
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "rollback",
|
|
Short: "rollback Cosmos SDK and CometBFT state by one height",
|
|
Long: `
|
|
A state rollback is performed to recover from an incorrect application state transition,
|
|
when CometBFT has persisted an incorrect app hash and is thus unable to make
|
|
progress. Rollback overwrites a state at height n with the state at height n - 1.
|
|
The application also rolls back to height n - 1. No blocks are removed, so upon
|
|
restarting CometBFT the transactions in block n will be re-executed against the
|
|
application.
|
|
`,
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
ctx := GetServerContextFromCmd(cmd)
|
|
cfg := ctx.Config
|
|
home := cfg.RootDir
|
|
db, err := openDB(home, GetAppDBBackend(ctx.Viper))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
app := appCreator(ctx.Logger, db, nil, ctx.Viper)
|
|
// rollback CometBFT state
|
|
height, hash, err := cmtcmd.RollbackState(ctx.Config, removeBlock)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to rollback CometBFT state: %w", err)
|
|
}
|
|
// rollback the multistore
|
|
|
|
if err := app.CommitMultiStore().RollbackToVersion(height); err != nil {
|
|
return fmt.Errorf("failed to rollback to version: %w", err)
|
|
}
|
|
|
|
fmt.Printf("Rolled back state to height %d and hash %X", height, hash)
|
|
return nil
|
|
},
|
|
}
|
|
|
|
cmd.Flags().String(flags.FlagHome, defaultNodeHome, "The application home directory")
|
|
cmd.Flags().BoolVar(&removeBlock, "hard", false, "remove last block as well as state")
|
|
return cmd
|
|
}
|