Comments fix

consensus/consensus.go

@@ -34,8 +34,8 @@ type Consensus interface {
 	// GetSyncProgression retrieves the current sync progression, if any
 	GetSyncProgression() *progress.Progression
 
-	// GenerateExitProof generates exit proof for given exit event id
-	GenerateExitProof(exitID, epoch, checkpointNumber uint64) ([]types.Hash, error)
+	// GetBridgeProvider returns an instance of BridgeDataProvider
+	GetBridgeProvider() BridgeDataProvider
 
 	// Initialize initializes the consensus (e.g. setup data)
 	Initialize() error
@@ -78,3 +78,9 @@ type Params struct {
 
 // Factory is the factory function to create a discovery consensus
 type Factory func(*Params) (Consensus, error)
+
+// BridgeDataProvider is an interface providing bridge related functions
+type BridgeDataProvider interface {
+	// GenerateExit proof generates proof of exit for given exit event
+	GenerateExitProof(exitID, epoch, checkpointBlock uint64) ([]types.Hash, error)
+}

consensus/dev/dev.go

@@ -243,6 +243,6 @@ func (d *Dev) Close() error {
 	return nil
 }
 
-func (d *Dev) GenerateExitProof(exitID, epoch, checkpointBlock uint64) ([]types.Hash, error) {
-	return nil, nil
+func (d *Dev) GetBridgeProvider() consensus.BridgeDataProvider {
+	return nil
 }

consensus/dummy/dummy.go

@@ -75,8 +75,8 @@ func (d *Dummy) Close() error {
 	return nil
 }
 
-func (d *Dummy) GenerateExitProof(exitID, epoch, checkpointBlock uint64) ([]types.Hash, error) {
-	return nil, nil
+func (d *Dummy) GetBridgeProvider() consensus.BridgeDataProvider {
+	return nil
 }
 
 func (d *Dummy) run() {

consensus/ibft/ibft.go

@@ -532,8 +532,9 @@ func (i *backendIBFT) SetHeaderHash() {
 	}
 }
 
-func (i *backendIBFT) GenerateExitProof(exitID, epoch, checkpointBlock uint64) ([]types.Hash, error) {
-	return nil, nil
+// GetBridgeProvider returns an instance of BridgeDataProvider
+func (i *backendIBFT) GetBridgeProvider() consensus.BridgeDataProvider {
+	return nil
 }
 
 // updateCurrentModules updates Signer, Hooks, and Validators

consensus/polybft/consensus_runtime.go

@@ -785,8 +785,8 @@ func (c *consensusRuntime) getExitEventRootHash(epoch uint64) (types.Hash, error
 	return tree.Hash(), nil
 }
 
-// generateExitProof generates proof of exit
-func (c *consensusRuntime) generateExitProof(exitID, epoch, checkpointBlock uint64) ([]types.Hash, error) {
+// GenerateExitProof generates proof of exit
+func (c *consensusRuntime) GenerateExitProof(exitID, epoch, checkpointBlock uint64) ([]types.Hash, error) {
 	exitEvent, err := c.state.getExitEvent(exitID, epoch, checkpointBlock)
 	if err != nil {
 		return nil, err

consensus/polybft/consensus_runtime_test.go

@@ -1671,7 +1671,7 @@ func TestConsensusRuntime_getExitEventRootHash(t *testing.T) {
 	})
 }
 
-func TestConsensusRuntime_generateExitProof(t *testing.T) {
+func TestConsensusRuntime_GenerateExitProof(t *testing.T) {
 	const (
 		numOfBlocks         = 10
 		numOfEventsPerBlock = 2
@@ -1689,7 +1689,7 @@ func TestConsensusRuntime_generateExitProof(t *testing.T) {
 	tree, err := NewMerkleTree(checkpointEvents)
 	require.NoError(t, err)
 
-	proof, err := runtime.generateExitProof(1, 1, 1)
+	proof, err := runtime.GenerateExitProof(1, 1, 1)
 	require.NoError(t, err)
 	require.NotNil(t, proof)
 
@@ -1707,7 +1707,7 @@ func TestConsensusRuntime_generateExitProof(t *testing.T) {
 	})
 
 	t.Run("Generate exit proof - no event", func(t *testing.T) {
-		_, err := runtime.generateExitProof(21, 1, 1)
+		_, err := runtime.GenerateExitProof(21, 1, 1)
 		require.ErrorContains(t, err, "could not find any exit event that has an id")
 	})
 }

consensus/polybft/polybft.go

@@ -618,9 +618,9 @@ func (p *Polybft) PreCommitState(_ *types.Header, _ *state.Transition) error {
 	return nil
 }
 
-// GenerateExitProof generates proof for given exit event
-func (p *Polybft) GenerateExitProof(exitID, epoch, checkpointBlock uint64) ([]types.Hash, error) {
-	return p.runtime.generateExitProof(exitID, epoch, checkpointBlock)
+// GetBridgeProvider returns an instance of BridgeDataProvider
+func (p *Polybft) GetBridgeProvider() consensus.BridgeDataProvider {
+	return p.runtime
 }
 
 type pbftTransportWrapper struct {

jsonrpc/bridge_endpoint.go

@@ -15,6 +15,6 @@ type Bridge struct {
 }
 
 // GenerateExitProof generates exit proof for given exit event
-func (b *Bridge) GenerateExitProof(exitID, epoch, checkpointBlock BlockNumber) (interface{}, error) {
+func (b *Bridge) GenerateExitProof(exitID, epoch, checkpointBlock argUint64) (interface{}, error) {
 	return b.store.GenerateExitProof(uint64(exitID), uint64(epoch), uint64(checkpointBlock))
 }

server/server.go

@@ -446,6 +446,7 @@ type jsonRPCHub struct {
 	*state.Executor
 	*network.Server
 	consensus.Consensus
+	consensus.BridgeDataProvider
 }
 
 // HELPER + WRAPPER METHODS //
@@ -563,6 +564,7 @@ func (s *Server) setupJSONRPC() error {
 		Executor:           s.executor,
 		Consensus:          s.consensus,
 		Server:             s.network,
+		BridgeDataProvider: s.consensus.GetBridgeProvider(),
 	}
 
 	conf := &jsonrpc.Config{