rollback refactor

block/block.go

@@ -68,7 +68,7 @@ func (m *Manager) applyBlock(block *types.Block, commit *types.Commit, blockMeta
 	// In case the following true, it means we crashed after the app commit but before updating the state
 	// In that case we'll want to align the state with the app commit result, as if the block was applied.
 	if isBlockAlreadyApplied {
-		err := m.UpdateStateFromApp(block.Header.Hash())
+		err := m.UpdateStateFromApp(block)
 		if err != nil {
 			return fmt.Errorf("update state from app: %w", err)
 		}
@@ -125,7 +125,7 @@ func (m *Manager) applyBlock(block *types.Block, commit *types.Commit, blockMeta
 		}
 		// Update the state with the new app hash, and store height from the commit.
 		// Every one of those, if happens before commit, prevents us from re-executing the block in case failed during commit.
-		m.Executor.UpdateStateAfterCommit(m.State, responses, appHash, block.Header.Height, block.Header.Hash())
+		m.Executor.UpdateStateAfterCommit(m.State, responses, appHash, block)
 
 	}
 

block/executor.go

@@ -30,7 +30,7 @@ type ExecutorI interface {
 	ExecuteBlock(block *types.Block) (*tmstate.ABCIResponses, error)
 	UpdateStateAfterInitChain(s *types.State, res *abci.ResponseInitChain)
 	UpdateMempoolAfterInitChain(s *types.State)
-	UpdateStateAfterCommit(s *types.State, resp *tmstate.ABCIResponses, appHash []byte, height uint64, lastHeaderHash [32]byte)
+	UpdateStateAfterCommit(s *types.State, resp *tmstate.ABCIResponses, appHash []byte, block *types.Block)
 	UpdateProposerFromBlock(s *types.State, seqSet *types.SequencerSet, block *types.Block) bool
 
 	/* Consensus Messages */

block/executor_test.go

@@ -340,7 +340,7 @@ func TestApplyBlock(t *testing.T) {
 	require.NotNil(resp)
 	appHash, _, err := executor.Commit(state, block, resp)
 	require.NoError(err)
-	executor.UpdateStateAfterCommit(state, resp, appHash, block.Header.Height, block.Header.Hash())
+	executor.UpdateStateAfterCommit(state, resp, appHash, block)
 	assert.Equal(uint64(1), state.Height())
 	assert.Equal(mockAppHash, state.AppHash)
 
@@ -390,7 +390,7 @@ func TestApplyBlock(t *testing.T) {
 	require.NotNil(resp)
 	_, _, err = executor.Commit(state, block, resp)
 	require.NoError(err)
-	executor.UpdateStateAfterCommit(state, resp, appHash, block.Header.Height, block.Header.Hash())
+	executor.UpdateStateAfterCommit(state, resp, appHash, block)
 	assert.Equal(uint64(2), state.Height())
 
 	// check rollapp params update

block/manager.go

@@ -192,12 +192,6 @@ func NewManager(
 		return nil, err
 	}
 
-	// update dymint state with next revision info
-	err = m.updateStateForNextRevision()
-	if err != nil {
-		return nil, err
-	}
-
 	// validate configuration params and rollapp consensus params are in line
 	err = m.ValidateConfigWithRollappParams()
 	if err != nil {
@@ -222,6 +216,12 @@ func (m *Manager) Start(ctx context.Context) error {
 		}
 	}
 
+	// update dymint state with next revision info
+	err := m.updateStateForNextRevision()
+	if err != nil {
+		return err
+	}
+
 	// Check if a proposer on the rollapp is set. In case no proposer is set on the Rollapp, fallback to the hub proposer (If such exists).
 	// No proposer on the rollapp means that at some point there was no available proposer.
 	// In case there is also no proposer on the hub to our current height, it means that the chain is halted.

block/state.go

@@ -74,7 +74,7 @@ func NewStateFromGenesis(genDoc *tmtypes.GenesisDoc) (*types.State, error) {
 }
 
 // UpdateStateFromApp is responsible for aligning the state of the store from the abci app
-func (m *Manager) UpdateStateFromApp(blockHeaderHash [32]byte) error {
+func (m *Manager) UpdateStateFromApp(block *types.Block) error {
 	proxyAppInfo, err := m.Executor.GetAppInfo()
 	if err != nil {
 		return errorsmod.Wrap(err, "get app info")
@@ -87,7 +87,7 @@ func (m *Manager) UpdateStateFromApp(blockHeaderHash [32]byte) error {
 	}
 
 	// update the state with the app hashes created on the app commit
-	m.Executor.UpdateStateAfterCommit(m.State, resp, proxyAppInfo.LastBlockAppHash, appHeight, blockHeaderHash)
+	m.Executor.UpdateStateAfterCommit(m.State, resp, proxyAppInfo.LastBlockAppHash, block)
 
 	return nil
 }
@@ -116,12 +116,13 @@ func (e *Executor) UpdateMempoolAfterInitChain(s *types.State) {
 }
 
 // UpdateStateAfterCommit updates the state with the app hash and last results hash
-func (e *Executor) UpdateStateAfterCommit(s *types.State, resp *tmstate.ABCIResponses, appHash []byte, height uint64, lastHeaderHash [32]byte) {
+func (e *Executor) UpdateStateAfterCommit(s *types.State, resp *tmstate.ABCIResponses, appHash []byte, block *types.Block) {
 	copy(s.AppHash[:], appHash[:])
 	copy(s.LastResultsHash[:], tmtypes.NewResults(resp.DeliverTxs).Hash())
+	lastHeaderHash := block.Header.Hash()
 	copy(s.LastHeaderHash[:], lastHeaderHash[:])
 
-	s.SetHeight(height)
+	s.SetHeight(block.Header.Height)
 	if resp.EndBlock.ConsensusParamUpdates != nil {
 		s.ConsensusParams.Block.MaxGas = resp.EndBlock.ConsensusParamUpdates.Block.MaxGas
 		s.ConsensusParams.Block.MaxBytes = resp.EndBlock.ConsensusParamUpdates.Block.MaxBytes

store/pruning.go

@@ -17,7 +17,7 @@ func (s *DefaultStore) PruneStore(to uint64, logger types.Logger) (uint64, error
 	} else if err != nil {
 		return pruned, err
 	}
-	pruned, err = s.pruneHeights(from, to, logger)
+	pruned, err = s.PruneHeights(from, to, logger)
 	if err != nil {
 		return pruned, fmt.Errorf("pruning blocks. from: %d to: %d: err:%w", from, to, err)
 	}
@@ -30,7 +30,7 @@ func (s *DefaultStore) PruneStore(to uint64, logger types.Logger) (uint64, error
 }
 
 // pruneHeights prunes all store entries that are stored along blocks (blocks,commit,proposer, etc)
-func (s *DefaultStore) pruneHeights(from, to uint64, logger types.Logger) (uint64, error) {
+func (s *DefaultStore) PruneHeights(from, to uint64, logger types.Logger) (uint64, error) {
 	pruneBlocks := func(batch KVBatch, height uint64) error {
 		hash, err := s.loadHashFromIndex(height)
 		if err != nil {