Add blockID field to ExecutedBlock type

chain/block.go

@@ -897,22 +897,34 @@ func (b *StatefulBlock) FeeManager() *internalfees.Manager {
 }
 
 type ExecutedBlock struct {
+ BlockID ids.ID `json:"blockID"`
  Block *StatelessBlock `json:"block"`
  Results []*Result `json:"results"`
  UnitPrices fees.Dimensions `json:"unitPrices"`
 }
 
-// NewExecutedBlock returns the execution results of a stateful block.
-// This should only be called on a StatefulBlock that has already been
-// executed.
-func NewExecutedBlock(b *StatefulBlock) *ExecutedBlock {
+func NewExecutedBlockFromStateful(b *StatefulBlock) *ExecutedBlock {
  return &ExecutedBlock{
+ BlockID: b.ID(),
  Block: b.StatelessBlock,
  Results: b.results,
  UnitPrices: b.feeManager.UnitPrices(),
  }
 }
 
+func NewExecutedBlock(statelessBlock *StatelessBlock, results []*Result, unitPrices fees.Dimensions) (*ExecutedBlock, error) {
+ blkID, err := statelessBlock.ID()
+ if err != nil {
+ return nil, err
+ }
+ return &ExecutedBlock{
+ BlockID: blkID,
+ Block: statelessBlock,
+ Results: results,
+ UnitPrices: unitPrices,
+ }, nil
+}
+
 func (b *ExecutedBlock) Marshal() ([]byte, error) {
  blockBytes, err := b.Block.Marshal()
  if err != nil {

extension/externalsubscriber/client.go

@@ -64,12 +64,8 @@ func (e *ExternalSubscriberClient) Accept(blk *chain.ExecutedBlock) error {
  req := &pb.BlockRequest{
  BlockData: blockBytes,
  }
- blkID, err := blk.Block.ID()
- if err != nil {
- return err
- }
  e.log.Debug("sending accepted block to server",
- zap.Stringer("blockID", blkID),
+ zap.Stringer("blockID", blk.BlockID),
  zap.Uint64("blockHeight", blk.Block.Hght),
  )
  _, err = e.client.AcceptBlock(context.TODO(), req)

tests/integration/integration.go

@@ -6,7 +6,6 @@ package integration
 import (
  "context"
  "encoding/json"
- "fmt"
  "net/http"
  "net/http/httptest"
  "os"
@@ -136,11 +135,7 @@ func setInstances() {
  externalSubscriber0 := externalsubscriber.NewExternalSubscriberServer(log, createParserFromBytes, []event.Subscription[*chain.ExecutedBlock]{
  event.SubscriptionFunc[*chain.ExecutedBlock]{
  AcceptF: func(blk *chain.ExecutedBlock) error {
- blockID, err := blk.Block.ID()
- if err != nil {
- return fmt.Errorf("failed to get block ID: %w", err)
- }
- externalSubscriberAcceptedBlocksCh <- blockID
+ externalSubscriberAcceptedBlocksCh <- blk.BlockID
  return nil
  },
  },

vm/resolutions.go

@@ -199,7 +199,7 @@ func (vm *VM) processAcceptedBlock(b *chain.StatefulBlock) {
 
  // Subscriptions must be updated before setting the last processed height
  // key to guarantee at-least-once delivery semantics
- executedBlock := chain.NewExecutedBlock(b)
+ executedBlock := chain.NewExecutedBlockFromStateful(b)
  for _, subscription := range vm.blockSubscriptions {
  if err := subscription.Accept(executedBlock); err != nil {
  vm.Fatal("subscription failed to process block", zap.Error(err))