|
|
@ -26,6 +26,9 @@ type BlockExecutor struct { |
|
|
// save state, validators, consensus params, abci responses here
|
|
|
// save state, validators, consensus params, abci responses here
|
|
|
store Store |
|
|
store Store |
|
|
|
|
|
|
|
|
|
|
|
// use blockstore for the pruning functions.
|
|
|
|
|
|
blockStore BlockStore |
|
|
|
|
|
|
|
|
// execute the app against this
|
|
|
// execute the app against this
|
|
|
proxyApp proxy.AppConnConsensus |
|
|
proxyApp proxy.AppConnConsensus |
|
|
|
|
|
|
|
|
@ -60,17 +63,19 @@ func NewBlockExecutor( |
|
|
proxyApp proxy.AppConnConsensus, |
|
|
proxyApp proxy.AppConnConsensus, |
|
|
mempool mempl.Mempool, |
|
|
mempool mempl.Mempool, |
|
|
evpool EvidencePool, |
|
|
evpool EvidencePool, |
|
|
|
|
|
blockStore BlockStore, |
|
|
options ...BlockExecutorOption, |
|
|
options ...BlockExecutorOption, |
|
|
) *BlockExecutor { |
|
|
) *BlockExecutor { |
|
|
res := &BlockExecutor{ |
|
|
res := &BlockExecutor{ |
|
|
store: stateStore, |
|
|
|
|
|
proxyApp: proxyApp, |
|
|
|
|
|
eventBus: types.NopEventBus{}, |
|
|
|
|
|
mempool: mempool, |
|
|
|
|
|
evpool: evpool, |
|
|
|
|
|
logger: logger, |
|
|
|
|
|
metrics: NopMetrics(), |
|
|
|
|
|
cache: make(map[string]struct{}), |
|
|
|
|
|
|
|
|
store: stateStore, |
|
|
|
|
|
proxyApp: proxyApp, |
|
|
|
|
|
eventBus: types.NopEventBus{}, |
|
|
|
|
|
mempool: mempool, |
|
|
|
|
|
evpool: evpool, |
|
|
|
|
|
logger: logger, |
|
|
|
|
|
metrics: NopMetrics(), |
|
|
|
|
|
cache: make(map[string]struct{}), |
|
|
|
|
|
blockStore: blockStore, |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
for _, option := range options { |
|
|
for _, option := range options { |
|
|
@ -139,17 +144,17 @@ func (blockExec *BlockExecutor) ValidateBlock(state State, block *types.Block) e |
|
|
|
|
|
|
|
|
// ApplyBlock validates the block against the state, executes it against the app,
|
|
|
// ApplyBlock validates the block against the state, executes it against the app,
|
|
|
// fires the relevant events, commits the app, and saves the new state and responses.
|
|
|
// fires the relevant events, commits the app, and saves the new state and responses.
|
|
|
// It returns the new state and the block height to retain (pruning older blocks).
|
|
|
|
|
|
|
|
|
// It returns the new state.
|
|
|
// It's the only function that needs to be called
|
|
|
// It's the only function that needs to be called
|
|
|
// from outside this package to process and commit an entire block.
|
|
|
// from outside this package to process and commit an entire block.
|
|
|
// It takes a blockID to avoid recomputing the parts hash.
|
|
|
// It takes a blockID to avoid recomputing the parts hash.
|
|
|
func (blockExec *BlockExecutor) ApplyBlock( |
|
|
func (blockExec *BlockExecutor) ApplyBlock( |
|
|
state State, blockID types.BlockID, block *types.Block, |
|
|
state State, blockID types.BlockID, block *types.Block, |
|
|
) (State, int64, error) { |
|
|
|
|
|
|
|
|
) (State, error) { |
|
|
|
|
|
|
|
|
// validate the block if we haven't already
|
|
|
// validate the block if we haven't already
|
|
|
if err := blockExec.ValidateBlock(state, block); err != nil { |
|
|
if err := blockExec.ValidateBlock(state, block); err != nil { |
|
|
return state, 0, ErrInvalidBlock(err) |
|
|
|
|
|
|
|
|
return state, ErrInvalidBlock(err) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
startTime := time.Now().UnixNano() |
|
|
startTime := time.Now().UnixNano() |
|
|
@ -159,14 +164,14 @@ func (blockExec *BlockExecutor) ApplyBlock( |
|
|
endTime := time.Now().UnixNano() |
|
|
endTime := time.Now().UnixNano() |
|
|
blockExec.metrics.BlockProcessingTime.Observe(float64(endTime-startTime) / 1000000) |
|
|
blockExec.metrics.BlockProcessingTime.Observe(float64(endTime-startTime) / 1000000) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return state, 0, ErrProxyAppConn(err) |
|
|
|
|
|
|
|
|
return state, ErrProxyAppConn(err) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
fail.Fail() // XXX
|
|
|
fail.Fail() // XXX
|
|
|
|
|
|
|
|
|
// Save the results before we commit.
|
|
|
// Save the results before we commit.
|
|
|
if err := blockExec.store.SaveABCIResponses(block.Height, abciResponses); err != nil { |
|
|
if err := blockExec.store.SaveABCIResponses(block.Height, abciResponses); err != nil { |
|
|
return state, 0, err |
|
|
|
|
|
|
|
|
return state, err |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
fail.Fail() // XXX
|
|
|
fail.Fail() // XXX
|
|
|
@ -175,12 +180,12 @@ func (blockExec *BlockExecutor) ApplyBlock( |
|
|
abciValUpdates := abciResponses.EndBlock.ValidatorUpdates |
|
|
abciValUpdates := abciResponses.EndBlock.ValidatorUpdates |
|
|
err = validateValidatorUpdates(abciValUpdates, state.ConsensusParams.Validator) |
|
|
err = validateValidatorUpdates(abciValUpdates, state.ConsensusParams.Validator) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return state, 0, fmt.Errorf("error in validator updates: %v", err) |
|
|
|
|
|
|
|
|
return state, fmt.Errorf("error in validator updates: %v", err) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
validatorUpdates, err := types.PB2TM.ValidatorUpdates(abciValUpdates) |
|
|
validatorUpdates, err := types.PB2TM.ValidatorUpdates(abciValUpdates) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return state, 0, err |
|
|
|
|
|
|
|
|
return state, err |
|
|
} |
|
|
} |
|
|
if len(validatorUpdates) > 0 { |
|
|
if len(validatorUpdates) > 0 { |
|
|
blockExec.logger.Debug("updates to validators", "updates", types.ValidatorListString(validatorUpdates)) |
|
|
blockExec.logger.Debug("updates to validators", "updates", types.ValidatorListString(validatorUpdates)) |
|
|
@ -189,13 +194,13 @@ func (blockExec *BlockExecutor) ApplyBlock( |
|
|
// Update the state with the block and responses.
|
|
|
// Update the state with the block and responses.
|
|
|
state, err = updateState(state, blockID, &block.Header, abciResponses, validatorUpdates) |
|
|
state, err = updateState(state, blockID, &block.Header, abciResponses, validatorUpdates) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return state, 0, fmt.Errorf("commit failed for application: %v", err) |
|
|
|
|
|
|
|
|
return state, fmt.Errorf("commit failed for application: %v", err) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// Lock mempool, commit app state, update mempoool.
|
|
|
// Lock mempool, commit app state, update mempoool.
|
|
|
appHash, retainHeight, err := blockExec.Commit(state, block, abciResponses.DeliverTxs) |
|
|
appHash, retainHeight, err := blockExec.Commit(state, block, abciResponses.DeliverTxs) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return state, 0, fmt.Errorf("commit failed for application: %v", err) |
|
|
|
|
|
|
|
|
return state, fmt.Errorf("commit failed for application: %v", err) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// Update evpool with the latest state.
|
|
|
// Update evpool with the latest state.
|
|
|
@ -206,11 +211,21 @@ func (blockExec *BlockExecutor) ApplyBlock( |
|
|
// Update the app hash and save the state.
|
|
|
// Update the app hash and save the state.
|
|
|
state.AppHash = appHash |
|
|
state.AppHash = appHash |
|
|
if err := blockExec.store.Save(state); err != nil { |
|
|
if err := blockExec.store.Save(state); err != nil { |
|
|
return state, 0, err |
|
|
|
|
|
|
|
|
return state, err |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
fail.Fail() // XXX
|
|
|
fail.Fail() // XXX
|
|
|
|
|
|
|
|
|
|
|
|
// Prune old heights, if requested by ABCI app.
|
|
|
|
|
|
if retainHeight > 0 { |
|
|
|
|
|
pruned, err := blockExec.pruneBlocks(retainHeight) |
|
|
|
|
|
if err != nil { |
|
|
|
|
|
blockExec.logger.Error("failed to prune blocks", "retain_height", retainHeight, "err", err) |
|
|
|
|
|
} else { |
|
|
|
|
|
blockExec.logger.Debug("pruned blocks", "pruned", pruned, "retain_height", retainHeight) |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// reset the verification cache
|
|
|
// reset the verification cache
|
|
|
blockExec.cache = make(map[string]struct{}) |
|
|
blockExec.cache = make(map[string]struct{}) |
|
|
|
|
|
|
|
|
@ -218,7 +233,7 @@ func (blockExec *BlockExecutor) ApplyBlock( |
|
|
// NOTE: if we crash between Commit and Save, events wont be fired during replay
|
|
|
// NOTE: if we crash between Commit and Save, events wont be fired during replay
|
|
|
fireEvents(blockExec.logger, blockExec.eventBus, block, blockID, abciResponses, validatorUpdates) |
|
|
fireEvents(blockExec.logger, blockExec.eventBus, block, blockID, abciResponses, validatorUpdates) |
|
|
|
|
|
|
|
|
return state, retainHeight, nil |
|
|
|
|
|
|
|
|
return state, nil |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// Commit locks the mempool, runs the ABCI Commit message, and updates the
|
|
|
// Commit locks the mempool, runs the ABCI Commit message, and updates the
|
|
|
@ -595,3 +610,20 @@ func ExecCommitBlock( |
|
|
// ResponseCommit has no error or log, just data
|
|
|
// ResponseCommit has no error or log, just data
|
|
|
return res.Data, nil |
|
|
return res.Data, nil |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
func (blockExec *BlockExecutor) pruneBlocks(retainHeight int64) (uint64, error) { |
|
|
|
|
|
base := blockExec.blockStore.Base() |
|
|
|
|
|
if retainHeight <= base { |
|
|
|
|
|
return 0, nil |
|
|
|
|
|
} |
|
|
|
|
|
pruned, err := blockExec.blockStore.PruneBlocks(retainHeight) |
|
|
|
|
|
if err != nil { |
|
|
|
|
|
return 0, fmt.Errorf("failed to prune block store: %w", err) |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
err = blockExec.Store().PruneStates(retainHeight) |
|
|
|
|
|
if err != nil { |
|
|
|
|
|
return 0, fmt.Errorf("failed to prune state store: %w", err) |
|
|
|
|
|
} |
|
|
|
|
|
return pruned, nil |
|
|
|
|
|
} |
JayT106
4 years ago
GitHub