include the validator hasher

randygrok · May 19, 2025 · May 20, 2025 · May 21, 2025 · May 21, 2025 · May 21, 2025
commit e0c9d5eaa192aadcc3024eed97771b7d0b08bed1
diff --git a/block/manager.go b/block/manager.go
@@ -99,6 +99,8 @@ type Manager struct {
 	genesis genesis.Genesis
 
 	signer signer.Signer
+	// Injected hasher for ValidatorHash calculation
+	validatorHasher types.ValidatorHasher
 
 	daHeight *atomic.Uint64
 
@@ -258,6 +260,7 @@ func NewManager(
 	seqMetrics *Metrics,
 	gasPrice float64,
 	gasMultiplier float64,
+	validatorHasher types.ValidatorHasher,
 ) (*Manager, error) {
 	s, err := getInitialState(ctx, genesis, signer, store, exec, logger)
 	if err != nil {
@@ -321,29 +324,30 @@ func NewManager(
 		store:     store,
 		daHeight:  &daH,
 		// channels are buffered to avoid blocking on input/output operations, buffer sizes are arbitrary
-		HeaderCh:       make(chan *types.SignedHeader, channelLength),
-		DataCh:         make(chan *types.Data, channelLength),
-		headerInCh:     make(chan NewHeaderEvent, headerInChLength),
-		dataInCh:       make(chan NewDataEvent, headerInChLength),
-		headerStoreCh:  make(chan struct{}, 1),
-		dataStoreCh:    make(chan struct{}, 1),
-		headerStore:    headerStore,
-		dataStore:      dataStore,
-		lastStateMtx:   new(sync.RWMutex),
-		lastBatchData:  lastBatchData,
-		headerCache:    cache.NewCache[types.SignedHeader](),
-		dataCache:      cache.NewCache[types.Data](),
-		retrieveCh:     make(chan struct{}, 1),
-		logger:         logger,
-		txsAvailable:   false,
-		pendingHeaders: pendingHeaders,
-		metrics:        seqMetrics,
-		sequencer:      sequencer,
-		exec:           exec,
-		da:             da,
-		gasPrice:       gasPrice,
-		gasMultiplier:  gasMultiplier,
-		txNotifyCh:     make(chan struct{}, 1), // Non-blocking channel
+		HeaderCh:        make(chan *types.SignedHeader, channelLength),
+		DataCh:          make(chan *types.Data, channelLength),
+		headerInCh:      make(chan NewHeaderEvent, headerInChLength),
+		dataInCh:        make(chan NewDataEvent, headerInChLength),
+		headerStoreCh:   make(chan struct{}, 1),
+		dataStoreCh:     make(chan struct{}, 1),
+		headerStore:     headerStore,
+		dataStore:       dataStore,
+		lastStateMtx:    new(sync.RWMutex),
+		lastBatchData:   lastBatchData,
+		headerCache:     cache.NewCache[types.SignedHeader](),
+		dataCache:       cache.NewCache[types.Data](),
+		retrieveCh:      make(chan struct{}, 1),
+		logger:          logger,
+		txsAvailable:    false,
+		pendingHeaders:  pendingHeaders,
+		metrics:         seqMetrics,
+		sequencer:       sequencer,
+		exec:            exec,
+		da:              da,
+		gasPrice:        gasPrice,
+		gasMultiplier:   gasMultiplier,
+		txNotifyCh:      make(chan struct{}, 1),
+		validatorHasher: validatorHasher,
 	}
 	agg.init(ctx)
 	// Set the default publishBlock implementation
@@ -455,7 +459,7 @@ func (m *Manager) retrieveBatch(ctx context.Context) (*BatchData, error) {
 		if len(res.Batch.Transactions) == 0 {
 			errRetrieveBatch = ErrNoBatch
 		}
-		// Even if there are no transactions, update lastBatchData so we don’t
+		// Even if there are no transactions, update lastBatchData so we don't
 		// repeatedly emit the same empty batch, and persist it to metadata.
 		if err := m.store.SetMetadata(ctx, LastBatchDataKey, convertBatchDataToBytes(res.BatchData)); err != nil {
 			m.logger.Error("error while setting last batch hash", "error", err)
@@ -697,6 +701,19 @@ func (m *Manager) execCreateBlock(ctx context.Context, height uint64, lastSignat
 		return nil, nil, fmt.Errorf("proposer address is not the same as the genesis proposer address %x != %x", address, m.genesis.ProposerAddress)
 	}
 
+	var validatorHash types.Hash
+	if m.validatorHasher != nil {
+		calculatedVHash, err := m.validatorHasher(m.genesis.ProposerAddress, key)
+		if err != nil {
+			m.logger.Info("Failed to calculate ValidatorHash using injected hasher", "error", err)
+		} else {
+			validatorHash = calculatedVHash
+			m.logger.Info("Successfully calculated ValidatorHash using injected hasher", "validatorHash", hex.EncodeToString(validatorHash))
+		}
+	} else {
+		m.logger.Info("ValidatorHasher not provided to Manager, ValidatorHash will be zero.")
+	}
+
-	if m.validatorHasher != nil {
-		calculatedVHash, err := m.validatorHasher(m.genesis.ProposerAddress, key)
-		if err != nil {
-			m.logger.Info("Failed to calculate ValidatorHash using injected hasher", "error", err)
-		} else {
-			validatorHash = calculatedVHash
-			m.logger.Info("Successfully calculated ValidatorHash using injected hasher", "validatorHash", hex.EncodeToString(validatorHash))
-		}
-	} else {
-		m.logger.Info("ValidatorHasher not provided to Manager, ValidatorHash will be zero.")
-	}
+	var validatorHash types.Hash
+	if m.validatorHasher != nil {
+		calculatedVHash, err := m.validatorHasher(m.genesis.ProposerAddress, key)
+		if err != nil {
+			return nil, nil, fmt.Errorf("failed to calculate validator hash: %w", err)
+		} else {
+			validatorHash = calculatedVHash
+			m.logger.Info("Successfully calculated ValidatorHash using injected hasher", "validatorHash", hex.EncodeToString(validatorHash))
+		}
+	} else {
+		return nil, nil, errors.New("validatorHasher is required but not provided")
+	}
-	if m.validatorHasher != nil {
-		calculatedVHash, err := m.validatorHasher(m.genesis.ProposerAddress, key)
-		if err != nil {
-			m.logger.Info("Failed to calculate ValidatorHash using injected hasher", "error", err)
-		} else {
-			validatorHash = calculatedVHash
-			m.logger.Info("Successfully calculated ValidatorHash using injected hasher", "validatorHash", hex.EncodeToString(validatorHash))
-		}
-	} else {
-		m.logger.Info("ValidatorHasher not provided to Manager, ValidatorHash will be zero.")
-	}
+	var validatorHash types.Hash
+	if m.validatorHasher != nil {
+		calculatedVHash, err := m.validatorHasher(m.genesis.ProposerAddress, key)
+		if err != nil {
+			return nil, nil, fmt.Errorf("failed to calculate validator hash: %w", err)
+		} else {
+			validatorHash = calculatedVHash
+			m.logger.Info("Successfully calculated ValidatorHash using injected hasher", "validatorHash", hex.EncodeToString(validatorHash))
+		}
+	} else {
+		return nil, nil, errors.New("validatorHasher is required but not provided")
+	}
 	// Determine if this is an empty block
 	isEmpty := batchData.Batch == nil || len(batchData.Transactions) == 0
 
@@ -711,7 +728,7 @@ func (m *Manager) execCreateBlock(ctx context.Context, height uint64, lastSignat
 	header := &types.SignedHeader{
 		Header: types.Header{
 			Version: types.Version{
-				Block: m.lastState.Version.Block,
+				Block: 11, // hardcoded
 				App:   m.lastState.Version.App,
 			},
 			BaseHeader: types.BaseHeader{
@@ -724,6 +741,7 @@ func (m *Manager) execCreateBlock(ctx context.Context, height uint64, lastSignat
 			ConsensusHash:   make(types.Hash, 32),
 			AppHash:         m.lastState.AppHash,
 			ProposerAddress: m.genesis.ProposerAddress,
+			ValidatorHash:   validatorHash,
 		},
 		Signature: *lastSignature,
 		Signer: types.Signer{

diff --git a/go.mod b/go.mod
@@ -6,6 +6,8 @@ retract v0.12.0 // Published by accident
 
 replace github.com/rollkit/rollkit/core => ./core
 
+replace github.com/rollkit/rollkit/da => ./da
+
 require (
 	connectrpc.com/connect v1.18.1
 	connectrpc.com/grpcreflect v1.3.0

diff --git a/node/full.go b/node/full.go
@@ -29,6 +29,7 @@ import (
 	"github.com/rollkit/rollkit/pkg/signer"
 	"github.com/rollkit/rollkit/pkg/store"
 	"github.com/rollkit/rollkit/pkg/sync"
+	"github.com/rollkit/rollkit/types"
 )
 
 // prefixes used in KV store to separate rollkit data from execution environment data (if the same data base is reused)
@@ -81,6 +82,7 @@ func newFullNode(
 	da coreda.DA,
 	metricsProvider MetricsProvider,
 	logger log.Logger,
+	validatorHasher types.ValidatorHasher,
 ) (fn *FullNode, err error) {
 	seqMetrics, _ := metricsProvider(genesis.ChainID)
 
@@ -112,6 +114,7 @@ func newFullNode(
 		seqMetrics,
 		nodeConfig.DA.GasPrice,
 		nodeConfig.DA.GasMultiplier,
+		validatorHasher,
 	)
 	if err != nil {
 		return nil, err
@@ -198,6 +201,7 @@ func initBlockManager(
 	seqMetrics *block.Metrics,
 	gasPrice float64,
 	gasMultiplier float64,
+	validatorHasher types.ValidatorHasher,
 ) (*block.Manager, error) {
 	logger.Debug("Proposer address", "address", genesis.ProposerAddress)
 
@@ -216,6 +220,7 @@ func initBlockManager(
 		seqMetrics,
 		gasPrice,
 		gasMultiplier,
+		validatorHasher,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("error while initializing BlockManager: %w", err)

diff --git a/node/node.go b/node/node.go
@@ -15,6 +15,7 @@ import (
 	"github.com/rollkit/rollkit/pkg/p2p/key"
 	"github.com/rollkit/rollkit/pkg/service"
 	"github.com/rollkit/rollkit/pkg/signer"
+	"github.com/rollkit/rollkit/types"
 )
 
 // Node is the interface for a rollup node
@@ -40,6 +41,7 @@ func NewNode(
 	database ds.Batching,
 	metricsProvider MetricsProvider,
 	logger log.Logger,
+	validatorHasher types.ValidatorHasher,
 ) (Node, error) {
 	if conf.Node.Light {
 		return newLightNode(conf, genesis, p2pClient, nodeKey, database, logger)
@@ -58,5 +60,6 @@ func NewNode(
 		da,
 		metricsProvider,
 		logger,
+		validatorHasher,
 	)
 }
diff --git a/types/hashing.go b/types/hashing.go
@@ -3,6 +3,8 @@ package types
 import (
 	"crypto/sha256"
 	"hash"
+
+	"github.com/libp2p/go-libp2p/core/crypto"
 )
 
 var (
@@ -33,3 +35,11 @@ func leafHashOpt(s hash.Hash, leaf []byte) []byte {
 	s.Write(leaf)
 	return s.Sum(nil)
 }
+
+// ValidatorHasher defines the function signature for a component that can calculate
+// the ValidatorHash for a block header.
+// It takes the proposer's address and public key (as known by Rollkit's signer)
+// and is expected to return a types.Hash compatible with the target consensus system (e.g., CometBFT).
+// If the hasher is not configured or an error occurs, it should be handled appropriately
+// by the caller (e.g., using a zero hash or returning an error).
+type ValidatorHasher func(proposerAddress []byte, pubKey crypto.PubKey) (Hash, error)
diff --git a/types/state.go b/types/state.go
@@ -12,7 +12,7 @@ import (
 // The Consensus.App version will be set during the Handshake, once
 // we hear from the app what protocol version it is running.
 var InitStateVersion = Version{
-	Block: 1,
+	Block: 11,
 	App:   0,
 }