refactor: remove commit type

block/manager.go

@@ -526,7 +526,7 @@ func (m *Manager) trySyncNextBlock(ctx context.Context, daHeight uint64) error {
  // if call to applyBlock fails, we halt the node, see https://github.com/cometbft/cometbft/pull/496
  panic(fmt.Errorf("failed to ApplyBlock: %w", err))
  }
- err = m.store.SaveBlock(ctx, b, &b.SignedHeader.Commit)
+ err = m.store.SaveBlock(ctx, b, &b.SignedHeader.Signature)
  if err != nil {
  return fmt.Errorf("failed to save block: %w", err)
  }
@@ -738,16 +738,15 @@ func getRemainingSleep(start time.Time, interval, defaultSleep time.Duration) ti
 	return sleepDuration
 }
 
-func (m *Manager) getCommit(header types.Header) (*types.Commit, error) {
+func (m *Manager) getSignature(header types.Header) (*types.Signature, error) {
 	// note: for compatibility with tendermint light client
 	consensusVote := header.MakeCometBFTVote()
 	sign, err := m.sign(consensusVote)
 	if err != nil {
  return nil, err
 	}
-	return &types.Commit{
- Signatures: []types.Signature{sign},
-	}, nil
+	signature := types.Signature(sign)
+	return &signature, nil
 }
 
 func (m *Manager) publishBlock(ctx context.Context) error {
@@ -766,17 +765,17 @@ func (m *Manager) publishBlock(ctx context.Context) error {
 	}
 
 	var (
-lastCommit *types.Commit
+lastSignature *types.Signature
  lastHeaderHash types.Hash
  err error
 	)
 	height := m.store.Height()
 	newHeight := height + 1
 	// this is a special case, when first block is produced - there is no previous commit
 	if newHeight == uint64(m.genesis.InitialHeight) {
-lastCommit = &types.Commit{}
+lastSignature = &types.Signature{}
 	} else {
-lastCommit, err = m.store.GetCommit(ctx, height)
+lastSignature, err = m.store.GetSignature(ctx, height)
  if err != nil {
  return fmt.Errorf("error while loading last commit: %w", err)
  }
@@ -788,7 +787,7 @@ func (m *Manager) publishBlock(ctx context.Context) error {
 	}
 
 	var block *types.Block
-	var commit *types.Commit
+	var signature *types.Signature
 
 	// Check if there's an already stored block at a newer height
 	// If there is use that instead of creating a new block
@@ -802,14 +801,14 @@ func (m *Manager) publishBlock(ctx context.Context) error {
  if err != nil {
  return fmt.Errorf("failed to load extended commit for height %d: %w", height, err)
  }
- block, err = m.createBlock(newHeight, lastCommit, lastHeaderHash, extendedCommit)
+ block, err = m.createBlock(newHeight, lastSignature, lastHeaderHash, extendedCommit)
  if err != nil {
  return err
  }
  m.logger.Debug("block info", "num_tx", len(block.Data.Txs))
 
  /*
- here we set the SignedHeader.DataHash, and SignedHeader.Commit as a hack
+ here we set the SignedHeader.DataHash, and SignedHeader.Signature as a hack
  to make the block pass ValidateBasic() when it gets called by applyBlock on line 681
  these values get overridden on lines 687-698 after we obtain the IntermediateStateRoots.
  */
@@ -821,14 +820,14 @@ func (m *Manager) publishBlock(ctx context.Context) error {
  block.SignedHeader.Validators = m.getLastStateValidators()
  block.SignedHeader.ValidatorHash = block.SignedHeader.Validators.Hash()
 
-commit, err = m.getCommit(block.SignedHeader.Header)
+signature, err = m.getSignature(block.SignedHeader.Header)
  if err != nil {
  return err
  }
 
- // set the commit to current block's signed header
- block.SignedHeader.Commit = *commit
- err = m.store.SaveBlock(ctx, block, commit)
+ // set the signature to current block's signed header
+ block.SignedHeader.Signature = *signature
+ err = m.store.SaveBlock(ctx, block, signature)
  if err != nil {
  return err
  }
@@ -848,7 +847,7 @@ func (m *Manager) publishBlock(ctx context.Context) error {
  return err
 	}
 
-commit, err = m.getCommit(block.SignedHeader.Header)
+signature, err = m.getSignature(block.SignedHeader.Header)
 	if err != nil {
  return err
 	}
@@ -857,8 +856,8 @@ func (m *Manager) publishBlock(ctx context.Context) error {
  return err
 	}
 
-	// set the commit to current block's signed header
-	block.SignedHeader.Commit = *commit
+	// set the signature to current block's signed header
+	block.SignedHeader.Signature = *signature
 	// Validate the created block before storing
 	if err := m.executor.Validate(m.lastState, block); err != nil {
  return fmt.Errorf("failed to validate block: %w", err)
@@ -872,7 +871,7 @@ func (m *Manager) publishBlock(ctx context.Context) error {
 	m.blockCache.setSeen(blockHash)
 
 	// SaveBlock commits the DB tx
-	err = m.store.SaveBlock(ctx, block, commit)
+	err = m.store.SaveBlock(ctx, block, signature)
 	if err != nil {
  return err
 	}
@@ -1144,10 +1143,10 @@ func (m *Manager) getLastBlockTime() time.Time {
 	return m.lastState.LastBlockTime
 }
 
-func (m *Manager) createBlock(height uint64, lastCommit *types.Commit, lastHeaderHash types.Hash, extendedCommit abci.ExtendedCommitInfo) (*types.Block, error) {
+func (m *Manager) createBlock(height uint64, lastSignature *types.Signature, lastHeaderHash types.Hash, extendedCommit abci.ExtendedCommitInfo) (*types.Block, error) {
 	m.lastStateMtx.RLock()
 	defer m.lastStateMtx.RUnlock()
-	return m.executor.CreateBlock(height, lastCommit, extendedCommit, lastHeaderHash, m.lastState)
+	return m.executor.CreateBlock(height, lastSignature, extendedCommit, lastHeaderHash, m.lastState)
 }
 
 func (m *Manager) applyBlock(ctx context.Context, block *types.Block) (types.State, *abci.ResponseFinalizeBlock, error) {

block/manager_test.go

@@ -147,9 +147,9 @@ func TestSignVerifySignature(t *testing.T) {
  signingKey, err := types.PrivKeyToSigningKey(c.input)
  require.NoError(err)
  m.proposerKey = signingKey
-sig, err := m.sign(payload)
+signature, err := m.sign(payload)
  require.NoError(err)
- ok := pubKey.VerifySignature(payload, sig)
+ ok := pubKey.VerifySignature(payload, signature)
  require.True(ok)
  })
 	}
@@ -211,7 +211,7 @@ func TestSubmitBlocksToMockDA(t *testing.T) {
  blob, err := block.MarshalBinary()
  require.NoError(t, err)
 
- err = m.store.SaveBlock(ctx, block, &types.Commit{})
+ err = m.store.SaveBlock(ctx, block, &types.Signature{})
  require.NoError(t, err)
  m.store.SetHeight(ctx, 1)
 
@@ -327,7 +327,7 @@ func TestSubmitBlocksToDA(t *testing.T) {
  t.Run(tc.name, func(t *testing.T) {
  // PendingBlocks depend on store, so blocks needs to be saved and height updated
  for _, block := range tc.blocks {
- require.NoError(m.store.SaveBlock(ctx, block, &types.Commit{}))
+ require.NoError(m.store.SaveBlock(ctx, block, &types.Signature{}))
  }
  m.store.SetHeight(ctx, uint64(len(tc.blocks)))
 

block/pending_blocks_test.go

@@ -87,7 +87,7 @@ func newPendingBlocks(t *testing.T) *PendingBlocks {
 
 func fillWithBlocks(ctx context.Context, t *testing.T, pb *PendingBlocks) {
 	for i := uint64(1); i <= numBlocks; i++ {
- require.NoError(t, pb.store.SaveBlock(ctx, types.GetRandomBlock(i, 0), &types.Commit{}))
+ require.NoError(t, pb.store.SaveBlock(ctx, types.GetRandomBlock(i, 0), &types.Signature{}))
  pb.store.SetHeight(ctx, i)
 	}
 }

node/full_client.go

@@ -488,10 +488,6 @@ func (c *FullClient) BlockResults(ctx context.Context, height *int64) (*ctypes.R
 // Commit returns signed header (aka commit) at given height.
 func (c *FullClient) Commit(ctx context.Context, height *int64) (*ctypes.ResultCommit, error) {
 	heightValue := c.normalizeHeight(height)
-	com, err := c.node.Store.GetCommit(ctx, heightValue)
-	if err != nil {
- return nil, err
-	}
 	b, err := c.node.Store.GetBlock(ctx, heightValue)
 	if err != nil {
  return nil, err
@@ -503,7 +499,7 @@ func (c *FullClient) Commit(ctx context.Context, height *int64) (*ctypes.ResultC
 	}
 
 	val := b.SignedHeader.Validators.Validators[0].Address
-	commit := com.ToABCICommit(heightValue, b.Hash(), val, b.SignedHeader.Time())
+	commit := types.GetABCICommit(heightValue, b.Hash(), val, b.SignedHeader.Time(), b.SignedHeader.Signature)
 
 	block, err := abciconv.ToABCIBlock(b)
 	if err != nil {

node/full_client_test.go

@@ -315,7 +315,7 @@ func TestGetBlock(t *testing.T) {
 	startNodeWithCleanup(t, rpc.node)
 	ctx := context.Background()
 	block := types.GetRandomBlock(1, 10)
-	err := rpc.node.Store.SaveBlock(ctx, block, &types.Commit{})
+	err := rpc.node.Store.SaveBlock(ctx, block, &types.Signature{})
 	rpc.node.Store.SetHeight(ctx, block.Height())
 	require.NoError(err)
 
@@ -338,7 +338,7 @@ func TestGetCommit(t *testing.T) {
 	startNodeWithCleanup(t, rpc.node)
 	ctx := context.Background()
 	for _, b := range blocks {
- err := rpc.node.Store.SaveBlock(ctx, b, &types.Commit{})
+ err := rpc.node.Store.SaveBlock(ctx, b, &types.Signature{})
  rpc.node.Store.SetHeight(ctx, b.Height())
  require.NoError(err)
 	}
@@ -383,7 +383,7 @@ func TestCometBFTLightClientCompability(t *testing.T) {
 
 	// save the 3 blocks
 	for _, b := range blocks {
- err := rpc.node.Store.SaveBlock(ctx, b, &b.SignedHeader.Commit) // #nosec G601
+ err := rpc.node.Store.SaveBlock(ctx, b, &b.SignedHeader.Signature) // #nosec G601
  rpc.node.Store.SetHeight(ctx, b.Height())
  require.NoError(err)
 	}
@@ -438,7 +438,7 @@ func TestBlockSearch(t *testing.T) {
 	heights := []int64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
 	for _, h := range heights {
  block := types.GetRandomBlock(uint64(h), 5)
- err := rpc.node.Store.SaveBlock(ctx, block, &types.Commit{})
+ err := rpc.node.Store.SaveBlock(ctx, block, &types.Signature{})
  require.NoError(err)
 	}
 	indexBlocks(t, rpc, heights)
@@ -497,7 +497,7 @@ func TestGetBlockByHash(t *testing.T) {
 	startNodeWithCleanup(t, rpc.node)
 	ctx := context.Background()
 	block := types.GetRandomBlock(1, 10)
-	err := rpc.node.Store.SaveBlock(ctx, block, &types.Commit{})
+	err := rpc.node.Store.SaveBlock(ctx, block, &types.Signature{})
 	require.NoError(err)
 	abciBlock, err := abciconv.ToABCIBlock(block)
 	require.NoError(err)
@@ -695,7 +695,7 @@ func TestBlockchainInfo(t *testing.T) {
 	heights := []int64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
 	for _, h := range heights {
  block := types.GetRandomBlock(uint64(h), 5)
- err := rpc.node.Store.SaveBlock(ctx, block, &types.Commit{})
+ err := rpc.node.Store.SaveBlock(ctx, block, &types.Signature{})
  rpc.node.Store.SetHeight(ctx, block.Height())
  require.NoError(err)
 	}
@@ -917,7 +917,7 @@ func TestStatus(t *testing.T) {
  ProposerAddr: pubKey.Bytes(),
 	}
 	earliestBlock, _ := types.GenerateRandomBlockCustom(&config)
-	err = rpc.node.Store.SaveBlock(ctx, earliestBlock, &types.Commit{})
+	err = rpc.node.Store.SaveBlock(ctx, earliestBlock, &types.Signature{})
 	rpc.node.Store.SetHeight(ctx, earliestBlock.Height())
 	require.NoError(err)
 
@@ -927,7 +927,7 @@ func TestStatus(t *testing.T) {
  ProposerAddr: pubKey.Bytes(),
 	}
 	latestBlock, _ := types.GenerateRandomBlockCustom(&config)
-	err = rpc.node.Store.SaveBlock(ctx, latestBlock, &types.Commit{})
+	err = rpc.node.Store.SaveBlock(ctx, latestBlock, &types.Signature{})
 	rpc.node.Store.SetHeight(ctx, latestBlock.Height())
 	require.NoError(err)
 

node/full_node_test.go

@@ -146,14 +146,14 @@ func TestInvalidBlocksIgnored(t *testing.T) {
 	junkProposerBlock.SignedHeader.ProposerAddress = types.GetRandomBytes(32)
 
 	// Recompute signature over the block with the invalid proposer address
-commit, err := types.GetCommit(junkProposerBlock.SignedHeader.Header, signingKey)
+signature, err := types.GetSignature(junkProposerBlock.SignedHeader.Header, signingKey)
 	require.NoError(t, err)
-	junkProposerBlock.SignedHeader.Commit = *commit
+	junkProposerBlock.SignedHeader.Signature = *signature
 	require.ErrorIs(t, junkProposerBlock.ValidateBasic(), types.ErrProposerAddressMismatch)
 
 	// Create a block with an invalid commit
 	junkCommitBlock := *b1
-	junkCommitBlock.SignedHeader.Commit.Signatures = []types.Signature{types.GetRandomBytes(32)}
+	junkCommitBlock.SignedHeader.Signature = types.GetRandomBytes(32)
 	require.ErrorIs(t, junkCommitBlock.ValidateBasic(), types.ErrSignatureVerificationFailed)
 
 	// Validate b1 to make sure it's still valid

proto/rollkit/rollkit.proto

@@ -58,13 +58,9 @@ message Header {
  string chain_id = 12;
 }
 
-message Commit {
- repeated bytes signatures = 1;
-}
-
 message SignedHeader {
  Header header = 1;
-Commit commit = 2;
+bytes signature = 2;
  tendermint.types.ValidatorSet validators = 3;
 }
 

state/block-executor.md

@@ -22,7 +22,7 @@ The `BlockExecutor` is initialized with a proposer address, `namespace ID`, `cha
  - Initial Validator Set using genesis validators
  - Initial Height
 
-- `CreateBlock`: This method reaps transactions from the mempool and builds a block. It takes the state, the height of the block, last header hash, and the commit as parameters.
+- `CreateBlock`: This method reaps transactions from the mempool and builds a block. It takes the state, the height of the block, last header hash, and the signature as parameters.
 
 - `ApplyBlock`: This method applies the block to the state. Given the current state and block to be applied, it:
  - Validates the block, as described in `Validate`.

state/executor.go

@@ -93,7 +93,7 @@ func (e *BlockExecutor) InitChain(genesis *cmtypes.GenesisDoc) (*abci.ResponseIn
 }
 
 // CreateBlock reaps transactions from mempool and builds a block.
-func (e *BlockExecutor) CreateBlock(height uint64, lastCommit *types.Commit, lastExtendedCommit abci.ExtendedCommitInfo, lastHeaderHash types.Hash, state types.State) (*types.Block, error) {
+func (e *BlockExecutor) CreateBlock(height uint64, lastSignature *types.Signature, lastExtendedCommit abci.ExtendedCommitInfo, lastHeaderHash types.Hash, state types.State) (*types.Block, error) {
 	maxBytes := state.ConsensusParams.Block.MaxBytes
 	emptyMaxBytes := maxBytes == -1
 	if emptyMaxBytes {
@@ -128,7 +128,7 @@ func (e *BlockExecutor) CreateBlock(height uint64, lastCommit *types.Commit, las
  LastResultsHash: state.LastResultsHash,
  ProposerAddress: e.proposerAddress,
  },
-Commit: *lastCommit,
+Signature: *lastSignature,
  },
  Data: types.Data{
  Txs: toRollkitTxs(mempoolTxs),
@@ -169,7 +169,8 @@ func (e *BlockExecutor) CreateBlock(height uint64, lastCommit *types.Commit, las
 	}
 
 	block.Data.Txs = toRollkitTxs(txl)
-	block.SignedHeader.LastCommitHash = lastCommit.GetCommitHash(&block.SignedHeader.Header, e.proposerAddress)
+	// Note: This is hash of an ABCI type commit equivalent of the last signature in the signed header.
+	block.SignedHeader.LastCommitHash = lastSignature.GetCommitHash(&block.SignedHeader.Header, e.proposerAddress)
 	block.SignedHeader.LastHeaderHash = lastHeaderHash
 
 	return block, nil