Register in Random Beacon's Sortition Pool

cmd/start.go

@@ -22,6 +22,8 @@ import (
 	"github.com/keep-network/keep-core/pkg/net/retransmission"
 	"github.com/keep-network/keep-core/pkg/operator"
 	"github.com/urfave/cli"
+
+	beaconChain "github.com/keep-network/keep-core/pkg/chain/random-beacon"
 )
 
 // StartCommand contains the definition of the start command-line subcommand.
@@ -90,6 +92,11 @@ func Start(c *cli.Context) error {
 		return fmt.Errorf("error connecting to Ethereum node: [%v]", err)
 	}
 
+	beaconChainHandle, err := beaconChain.Connect(chainProvider)
+	if err != nil {
+		return fmt.Errorf("error initializing ethereum chain handle for Beacon: [%w]", err)
+	}
+
 	blockCounter, err := chainProvider.BlockCounter()
 	if err != nil {
 		return err
@@ -99,26 +106,27 @@ func Start(c *cli.Context) error {
 	if err != nil {
 		return fmt.Errorf("error obtaining stake monitor handle [%v]", err)
 	}
-	if c.Int(waitForStakeFlag) != 0 {
-		err = waitForStake(stakeMonitor, ethereumKey.Address.Hex(), c.Int(waitForStakeFlag))
-		if err != nil {
-			return err
-		}
-	}
-	hasMinimumStake, err := stakeMonitor.HasMinimumStake(
-		ethereumKey.Address.Hex(),
-	)
-	if err != nil {
-		return fmt.Errorf("could not check the stake [%v]", err)
-	}
-	if !hasMinimumStake {
-		return fmt.Errorf(
-			"no minimum KEEP stake or operator is not authorized to use it; " +
-				"please make sure the operator address in the configuration " +
-				"is correct and it has KEEP tokens delegated and the operator " +
-				"contract has been authorized to operate on the stake",
-		)
-	}
+	// FIXME: Update for V2
+	// if c.Int(waitForStakeFlag) != 0 {
+	// 	err = waitForStake(stakeMonitor, ethereumKey.Address.Hex(), c.Int(waitForStakeFlag))
+	// 	if err != nil {
+	// 		return err
+	// 	}
+	// }
+	// hasMinimumStake, err := stakeMonitor.HasMinimumStake(
+	// 	ethereumKey.Address.Hex(),
+	// )
+	// if err != nil {
+	// 	return fmt.Errorf("could not check the stake [%v]", err)
+	// }
+	// if !hasMinimumStake {
+	// 	return fmt.Errorf(
+	// 		"no minimum KEEP stake or operator is not authorized to use it; " +
+	// 			"please make sure the operator address in the configuration " +
+	// 			"is correct and it has KEEP tokens delegated and the operator " +
+	// 			"contract has been authorized to operate on the stake",
+	// 	)
+	// }
 
 	networkPrivateKey, _ := key.OperatorKeyToNetworkKey(
 		operator.ChainKeyToOperatorKey(ethereumKey),
@@ -152,6 +160,7 @@ func Start(c *cli.Context) error {
 		chainProvider,
 		netProvider,
 		persistence,
+		beaconChainHandle,
 	)
 	if err != nil {
 		return fmt.Errorf("error initializing beacon: [%v]", err)

pkg/beacon/beacon.go

@@ -16,7 +16,9 @@ import (
 	"github.com/keep-network/keep-core/pkg/beacon/relay/groupselection"
 	"github.com/keep-network/keep-core/pkg/beacon/relay/registry"
 	"github.com/keep-network/keep-core/pkg/chain"
+	beaconChain "github.com/keep-network/keep-core/pkg/chain/random-beacon"
 	"github.com/keep-network/keep-core/pkg/net"
+	"github.com/keep-network/keep-core/pkg/sortition"
 )
 
 var logger = log.Logger("keep-beacon")
@@ -31,6 +33,7 @@ func Initialize(
 	chainHandle chain.Handle,
 	netProvider net.Provider,
 	persistence persistence.Handle,
+	beaconChainHandle beaconChain.Handle,
 ) error {
 	relayChain := chainHandle.ThresholdRelay()
 	chainConfig := relayChain.GetConfig()
@@ -209,6 +212,8 @@ func Initialize(
 		go groupRegistry.UnregisterStaleGroups(registration.GroupPublicKey)
 	})
 
+	go sortition.RegisterAndMonitorStatus(ctx, blockCounter, beaconChainHandle)
+
 	return nil
 }
 

pkg/chain/ethereum/_LEGACY_V1

@@ -1 +1 @@
-This directory contains legacy code from V1. It should be removed.
+This directory contains legacy code from V1. It should be moved to fit the new directories structure.

pkg/chain/ethereum/balance_monitoring.go

@@ -26,21 +26,21 @@ const defaultBalanceMonitoringTick = 10 * time.Minute
 const defaultBalanceMonitoringRetryTimeout = 5 * time.Minute
 
 // initializeBalanceMonitoring sets up the balance monitoring process
-func (ec *ethereumChain) initializeBalanceMonitoring(ctx context.Context) {
-	balanceMonitor, err := ec.balanceMonitor()
+func (c *Chain) initializeBalanceMonitoring(ctx context.Context) {
+	balanceMonitor, err := c.balanceMonitor()
 	if err != nil {
 		logger.Errorf("could not get balance monitor [%v]", err)
 		return
 	}
 
 	alertThreshold := defaultBalanceAlertThreshold
-	if value := ec.config.BalanceAlertThreshold; value != nil {
+	if value := c.config.BalanceAlertThreshold; value != nil {
 		alertThreshold = value
 	}
 
 	balanceMonitor.Observe(
 		ctx,
-		ec.Address(),
+		c.Address(),
 		alertThreshold,
 		defaultBalanceMonitoringTick,
 		defaultBalanceMonitoringRetryTimeout,
@@ -49,13 +49,13 @@ func (ec *ethereumChain) initializeBalanceMonitoring(ctx context.Context) {
 	logger.Infof(
 		"started balance monitoring for address [%v] "+
 			"with the alert threshold set to [%v] wei",
-		ec.Address().Hex(),
+		c.Address().Hex(),
 		alertThreshold,
 	)
 }
 
 // balanceMonitor returns a balance monitor.
-func (ec *ethereumChain) balanceMonitor() (*ethutil.BalanceMonitor, error) {
+func (c *Chain) balanceMonitor() (*ethutil.BalanceMonitor, error) {
 	weiBalanceOf := func(
 		address common.Address,
 	) (*ethereum.Wei, error) {
@@ -65,7 +65,7 @@ func (ec *ethereumChain) balanceMonitor() (*ethutil.BalanceMonitor, error) {
 		)
 		defer cancelCtx()
 
-		balance, err := ec.client.BalanceAt(ctx, address, nil)
+		balance, err := c.client.BalanceAt(ctx, address, nil)
 		if err != nil {
 			return nil, err
 		}