Set beacon handler for the default beacon process

common/beacon.go

@@ -6,6 +6,11 @@ import "os"
 // value should not be changed for backward-compatibility reasons
 const DefaultBeaconID = "default"
 
+// DefaultChainHash is the value used when chain hash has an empty value on requests
+// from clients. This value should not be changed for
+// backward-compatibility reasons
+const DefaultChainHash = "default"
+
 // MultiBeaconFolder
 const MultiBeaconFolder = "multibeacon"
 
@@ -14,3 +19,7 @@ const MultiBeaconFolder = "multibeacon"
 func GetBeaconIDFromEnv() string {
 	return os.Getenv("BEACON_ID")
 }
+
+func IsDefaultBeaconID(beaconID string) bool {
+	return beaconID == DefaultBeaconID || beaconID == ""
+}

core/drand_daemon.go

@@ -4,9 +4,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/drand/drand/chain"
 	"sync"
 
+	"github.com/drand/drand/chain"
+
 	"github.com/drand/drand/metrics"
 	"github.com/drand/drand/metrics/pprof"
 	"github.com/drand/drand/protobuf/drand"
@@ -141,7 +142,10 @@ func (dd *DrandDaemon) InstantiateBeaconProcess(beaconID string, store key.Store
 
 	if !bp.isFreshRun() {
 		info := chain.NewChainInfo(bp.group)
-		dd.handler.HandlerDrand.CreateBeaconHandler(&drandProxy{bp}, info.HashString())
+		bh := dd.handler.HandlerDrand.CreateBeaconHandler(&drandProxy{bp}, info.HashString())
+		if common.IsDefaultBeaconID(beaconID) {
+			dd.handler.HandlerDrand.AddDefaultBeaconHandler(bh)
+		}
 	}
 
 	return bp, nil

core/drand_daemon_control.go

@@ -3,7 +3,9 @@ package core
 import (
 	"context"
 	"fmt"
+
 	"github.com/drand/drand/chain"
+	common2 "github.com/drand/drand/common"
 
 	"github.com/drand/drand/key"
 
@@ -39,7 +41,10 @@ func (dd *DrandDaemon) InitDKG(c context.Context, in *drand.InitDKGPacket) (*dra
 		group, err := key.GroupFromProto(chainGroup)
 		if err == nil {
 			info := chain.NewChainInfo(group)
-			dd.handler.HandlerDrand.CreateBeaconHandler(&drandProxy{bp}, info.HashString())
+			bh := dd.handler.HandlerDrand.CreateBeaconHandler(&drandProxy{bp}, info.HashString())
+			if common2.IsDefaultBeaconID(beaconID) {
+				dd.handler.HandlerDrand.AddDefaultBeaconHandler(bh)
+			}
 		}
 	}
 

http/server.go

@@ -110,7 +110,7 @@ func New(ctx context.Context, c client.Client, version string, logger log.Logger
 	return DrandHandler{instrumented, handler}, nil
 }
 
-func (h *handler) CreateBeaconHandler(c client.Client, chainHash string) {
+func (h *handler) CreateBeaconHandler(c client.Client, chainHash string) *beaconHandler {
 	h.state.Lock()
 	defer h.state.Unlock()
 
@@ -126,6 +126,16 @@ func (h *handler) CreateBeaconHandler(c client.Client, chainHash string) {
 
 	h.beacons[chainHash] = bh
 	h.log.Infow("Created BeaconHandler", "chainHash", chainHash)
+
+	return bh
+}
+
+func (h *handler) AddDefaultBeaconHandler(bh *beaconHandler) {
+	h.state.Lock()
+	defer h.state.Unlock()
+
+	h.beacons[common.DefaultChainHash] = bh
+	h.log.Infow("Created Default BeaconHandler")
 }
 
 func withCommonHeaders(version string, h func(http.ResponseWriter, *http.Request)) func(http.ResponseWriter, *http.Request) {
@@ -528,7 +538,7 @@ func readRound(r *http.Request) string {
 func (h *handler) getBeaconHandler(chainHash []byte) (*beaconHandler, error) {
 	chainHashStr := fmt.Sprintf("%x", chainHash)
 	if chainHashStr == "" {
-		chainHashStr = common.DefaultBeaconID
+		chainHashStr = common.DefaultChainHash
 	}
 
 	h.state.Lock()