Skip to content

Fix commit nil issue #655

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

Merged
Manav-Aggarwal merged 1 commit into from
Dec 12, 2022
Merged

Fix commit nil issue #655

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 24 additions & 10 deletions block/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,22 @@ func (m *Manager) getRemainingSleep(start time.Time) time.Duration {
return sleepDuration
}

func (m *Manager) getCommit(header types.Header) (*types.Commit, error) {
headerBytes, err := header.MarshalBinary()
if err != nil {
return nil, err
}
sign, err := m.proposerKey.Sign(headerBytes)
if err != nil {
return nil, err
}
return &types.Commit{
Height: header.Height,
HeaderHash: header.Hash(),
Signatures: []types.Signature{sign},
}, nil
}

func (m *Manager) publishBlock(ctx context.Context) error {
var lastCommit *types.Commit
var lastHeaderHash [32]byte
Expand Down Expand Up @@ -438,19 +454,10 @@ func (m *Manager) publishBlock(ctx context.Context) error {
block = m.executor.CreateBlock(newHeight, lastCommit, lastHeaderHash, m.lastState)
m.logger.Debug("block info", "num_tx", len(block.Data.Txs))

headerBytes, err := block.Header.MarshalBinary()
commit, err := m.getCommit(block.Header)
if err != nil {
return err
}
sign, err := m.proposerKey.Sign(headerBytes)
if err != nil {
return err
}
commit = &types.Commit{
Height: block.Header.Height,
HeaderHash: block.Header.Hash(),
Signatures: []types.Signature{sign},
}

// SaveBlock commits the DB tx
err = m.store.SaveBlock(block, commit)
Expand All @@ -466,6 +473,13 @@ func (m *Manager) publishBlock(ctx context.Context) error {
return err
}

if commit == nil {
commit, err = m.getCommit(block.Header)
if err != nil {
return err
}
}

// SaveBlock commits the DB tx
err = m.store.SaveBlock(block, commit)
if err != nil {
Expand Down