simplified commit

block/block.go

@@ -1,14 +1,11 @@
 package block
 
 import (
-	"context"
 	"fmt"
 
 	errorsmod "cosmossdk.io/errors"
 
-	"github.com/dymensionxyz/dymint/p2p"
 	"github.com/dymensionxyz/dymint/types"
-	tmtypes "github.com/tendermint/tendermint/types"
 )
 
 // applyBlock applies the block to the store and the abci app.
@@ -18,7 +15,6 @@ import (
 // - block height is the expected block height on the store (height + 1).
 // - block height is the expected block height on the app (last block height + 1).
 func (m *Manager) applyBlock(block *types.Block, commit *types.Commit, blockMetaData blockMetaData) error {
-	// TODO (#330): allow genesis block with height > 0 to be applied.
 	// TODO: add switch case to have defined behavior for each case.
 	// validate block height
 	if block.Header.Height != m.State.NextHeight() {
@@ -58,33 +54,32 @@ func (m *Manager) applyBlock(block *types.Block, commit *types.Commit, blockMeta
 		return fmt.Errorf("update state from responses: %w", err)
 	}
 
-	batch := m.Store.NewBatch()
-
-	batch, err = m.Store.SaveBlockResponses(block.Header.Height, responses, batch)
+	dbBatch := m.Store.NewBatch()
+	dbBatch, err = m.Store.SaveBlockResponses(block.Header.Height, responses, dbBatch)
 	if err != nil {
-		batch.Discard()
+		dbBatch.Discard()
 		return fmt.Errorf("save block responses: %w", err)
 	}
 
 	m.State = newState
-	batch, err = m.Store.UpdateState(m.State, batch)
+	dbBatch, err = m.Store.UpdateState(m.State, dbBatch)
 	if err != nil {
-		batch.Discard()
+		dbBatch.Discard()
 		return fmt.Errorf("update state: %w", err)
 	}
-	batch, err = m.Store.SaveValidators(block.Header.Height, m.State.Validators, batch)
+	dbBatch, err = m.Store.SaveValidators(block.Header.Height, m.State.Validators, dbBatch)
 	if err != nil {
-		batch.Discard()
+		dbBatch.Discard()
 		return fmt.Errorf("save validators: %w", err)
 	}
 
-	err = batch.Commit()
+	err = dbBatch.Commit()
 	if err != nil {
 		return fmt.Errorf("commit batch to disk: %w", err)
 	}
 
 	// Commit block to app
-	retainHeight, err := m.Executor.Commit(&newState, block, responses)
+	appHash, retainHeight, err := m.Executor.Commit(&newState, block, responses)
 	if err != nil {
 		return fmt.Errorf("commit block: %w", err)
 	}
@@ -97,16 +92,12 @@ func (m *Manager) applyBlock(block *types.Block, commit *types.Commit, blockMeta
 		} else {
 			m.logger.Debug("pruned blocks", "pruned", pruned, "retain_height", retainHeight)
 		}
+		newState.BaseHeight = m.State.Base()
 	}
 
 	// Update the state with the new app hash, last validators 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.
-	newState.LastValidators = m.State.Validators.Copy()
-	newState.LastStoreHeight = block.Header.Height
-	newState.BaseHeight = m.State.Base()
-	if ok := m.State.SetHeight(block.Header.Height); !ok {
-		return fmt.Errorf("store set height: %d", block.Header.Height)
-	}
+	newState.SetABCICommitResult(responses, appHash, block.Header.Height)
 	_, err = m.Store.UpdateState(newState, nil)
 	if err != nil {
 		return fmt.Errorf("final update state: %w", err)
@@ -160,36 +151,6 @@ func (m *Manager) isHeightAlreadyApplied(blockHeight uint64) (bool, error) {
 	return isBlockAlreadyApplied, nil
 }
 
-// UpdateStateFromApp is responsible for aligning the state of the store from the abci app
-func (m *Manager) UpdateStateFromApp() error {
-	proxyAppInfo, err := m.Executor.GetAppInfo()
-	if err != nil {
-		return errorsmod.Wrap(err, "get app info")
-	}
-
-	appHeight := uint64(proxyAppInfo.LastBlockHeight)
-
-	// update the state with the hash, last store height and last validators.
-	m.State.AppHash = *(*[32]byte)(proxyAppInfo.LastBlockAppHash)
-	m.State.LastStoreHeight = appHeight
-	m.State.LastValidators = m.State.Validators.Copy()
-
-	resp, err := m.Store.LoadBlockResponses(appHeight)
-	if err != nil {
-		return errorsmod.Wrap(err, "load block responses")
-	}
-	copy(m.State.LastResultsHash[:], tmtypes.NewResults(resp.DeliverTxs).Hash())
-
-	if ok := m.State.SetHeight(appHeight); !ok {
-		return fmt.Errorf("state set height: %d", appHeight)
-	}
-	_, err = m.Store.UpdateState(m.State, nil)
-	if err != nil {
-		return errorsmod.Wrap(err, "update state")
-	}
-	return nil
-}
-
 func (m *Manager) validateBlock(block *types.Block, commit *types.Commit) error {
 	// Currently we're assuming proposer is never nil as it's a pre-condition for
 	// dymint to start

block/executor.go

@@ -13,6 +13,8 @@ import (
 	tmtypes "github.com/tendermint/tendermint/types"
 	"go.uber.org/multierr"
 
+	libp2pcrypto "github.com/libp2p/go-libp2p-core/crypto"
+
 	"github.com/dymensionxyz/dymint/mempool"
 	"github.com/dymensionxyz/dymint/types"
 )
@@ -33,7 +35,12 @@ type Executor struct {
 
 // NewExecutor creates new instance of BlockExecutor.
 // Proposer address and namespace ID will be used in all newly created blocks.
-func NewExecutor(proposerAddress []byte, namespaceID string, chainID string, mempool mempool.Mempool, proxyApp proxy.AppConns, eventBus *tmtypes.EventBus, logger types.Logger) (*Executor, error) {
+func NewExecutor(proposerKey libp2pcrypto.PrivKey, namespaceID string, chainID string, mempool mempool.Mempool, proxyApp proxy.AppConns, eventBus *tmtypes.EventBus, logger types.Logger) (*Executor, error) {
+	proposerAddress, err := getAddress(proposerKey)
+	if err != nil {
+		return nil, err
+	}
+
 	bytes, err := hex.DecodeString(namespaceID)
 	if err != nil {
 		return nil, err
@@ -134,21 +141,18 @@ func (e *Executor) CreateBlock(height uint64, lastCommit *types.Commit, lastHead
 }
 
 // Commit commits the block
-func (e *Executor) Commit(state *types.State, block *types.Block, resp *tmstate.ABCIResponses) (int64, error) {
+func (e *Executor) Commit(state *types.State, block *types.Block, resp *tmstate.ABCIResponses) ([]byte, int64, error) {
 	appHash, retainHeight, err := e.commit(state, block, resp.DeliverTxs)
 	if err != nil {
-		return 0, err
+		return nil, 0, err
 	}
 
-	copy(state.AppHash[:], appHash[:])
-	copy(state.LastResultsHash[:], tmtypes.NewResults(resp.DeliverTxs).Hash())
-
 	err = e.publishEvents(resp, block, *state)
 	if err != nil {
 		e.logger.Error("fire block events", "error", err)
-		return 0, err
+		return nil, 0, err
 	}
-	return retainHeight, nil
+	return appHash, retainHeight, nil
 }
 
 // GetAppInfo returns the latest AppInfo from the proxyApp.

block/manager.go

@@ -29,12 +29,6 @@ import (
 	"github.com/dymensionxyz/dymint/types"
 )
 
-const (
-	// max amount of pending batches to be submitted. block production will be paused if this limit is reached.
-	// TODO: make this configurable
-	maxSupportedBatchSkew = 10
-)
-
 // Manager is responsible for aggregating transactions into blocks.
 type Manager struct {
 	// Configuration
@@ -92,12 +86,7 @@ func NewManager(
 	p2pClient *p2p.Client,
 	logger types.Logger,
 ) (*Manager, error) {
-	proposerAddress, err := getAddress(proposerKey)
-	if err != nil {
-		return nil, err
-	}
-
-	exec, err := NewExecutor(proposerAddress, conf.NamespaceID, genesis.ChainID, mempool, proxyApp, eventBus, logger)
+	exec, err := NewExecutor(proposerKey, conf.NamespaceID, genesis.ChainID, mempool, proxyApp, eventBus, logger)
 	if err != nil {
 		return nil, fmt.Errorf("create block executor: %w", err)
 	}

block/state.go

@@ -1,8 +1,11 @@
 package block
 
 import (
+	"fmt"
 	"time"
 
+	errorsmod "cosmossdk.io/errors"
+
 	"github.com/cometbft/cometbft/crypto/merkle"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmstate "github.com/tendermint/tendermint/proto/tendermint/state"
@@ -13,6 +16,37 @@ import (
 )
 
 // TODO: move all those methods from blockExecutor to manager
+
+// UpdateStateFromApp is responsible for aligning the state of the store from the abci app
+func (m *Manager) UpdateStateFromApp() error {
+	proxyAppInfo, err := m.Executor.GetAppInfo()
+	if err != nil {
+		return errorsmod.Wrap(err, "get app info")
+	}
+
+	appHeight := uint64(proxyAppInfo.LastBlockHeight)
+
+	// update the state with the hash, last store height and last validators.
+	m.State.AppHash = *(*[32]byte)(proxyAppInfo.LastBlockAppHash)
+	m.State.LastStoreHeight = appHeight
+	m.State.LastValidators = m.State.Validators.Copy()
+
+	resp, err := m.Store.LoadBlockResponses(appHeight)
+	if err != nil {
+		return errorsmod.Wrap(err, "load block responses")
+	}
+	copy(m.State.LastResultsHash[:], tmtypes.NewResults(resp.DeliverTxs).Hash())
+
+	if ok := m.State.SetHeight(appHeight); !ok {
+		return fmt.Errorf("state set height: %d", appHeight)
+	}
+	_, err = m.Store.UpdateState(m.State, nil)
+	if err != nil {
+		return errorsmod.Wrap(err, "update state")
+	}
+	return nil
+}
+
 func (e *Executor) updateState(state types.State, block *types.Block, abciResponses *tmstate.ABCIResponses, validatorUpdates []*tmtypes.Validator) (types.State, error) {
 	nValSet := state.NextValidators.Copy()
 	lastHeightValSetChanged := state.LastHeightValidatorsChanged

types/state.go

@@ -5,6 +5,8 @@ import (
 	"sync/atomic"
 	"time"
 
+	tmtypes "github.com/tendermint/tendermint/types"
+
 	// TODO(tzdybal): copy to local project?
 	tmstate "github.com/tendermint/tendermint/proto/tendermint/state"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
@@ -133,3 +135,13 @@ func (s *State) SetBase(height uint64) {
 func (s *State) Base() uint64 {
 	return s.BaseHeight
 }
+
+// SetABCICommitResult
+func (s *State) SetABCICommitResult(resp *tmstate.ABCIResponses, appHash []byte, height uint64) {
+	copy(s.AppHash[:], appHash[:])
+	copy(s.LastResultsHash[:], tmtypes.NewResults(resp.DeliverTxs).Hash())
+
+	s.LastValidators = s.Validators.Copy()
+	s.LastStoreHeight = height
+	s.SetHeight(height)
+}