Remove Execution Client Fallback and Make Providing an Execution Client Required

beacon-chain/blockchain/service_test.go

@@ -106,7 +106,7 @@ func setupBeaconChain(t *testing.T, beaconDB db.Database) *Service {
 	web3Service, err = execution.NewService(
 		ctx,
 		execution.WithDatabase(beaconDB),
-		execution.WithHttpEndpoints([]string{endpoint}),
+		execution.WithHttpEndpoint(endpoint),
 		execution.WithDepositContractAddress(common.Address{}),
 	)
 	require.NoError(t, err, "Unable to set up web3 service")

beacon-chain/execution/BUILD.bazel

@@ -115,7 +115,6 @@ go_test(
         "//crypto/bls:go_default_library",
         "//encoding/bytesutil:go_default_library",
         "//monitoring/clientstats:go_default_library",
-        "//network:go_default_library",
         "//network/authorization:go_default_library",
         "//proto/engine/v1:go_default_library",
         "//proto/prysm/v1alpha1:go_default_library",

beacon-chain/execution/block_reader_test.go

@@ -36,7 +36,7 @@ func TestLatestMainchainInfo_OK(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDepositContractAddress(testAcc.ContractAddr),
 		WithDatabase(beaconDB),
 	)
@@ -79,7 +79,7 @@ func TestBlockHashByHeight_ReturnsHash(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDatabase(beaconDB),
 	)
 	require.NoError(t, err, "unable to setup web3 ETH1.0 chain service")
@@ -111,7 +111,7 @@ func TestBlockHashByHeight_ReturnsError_WhenNoEth1Client(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDatabase(beaconDB),
 	)
 	require.NoError(t, err, "unable to setup web3 ETH1.0 chain service")
@@ -132,7 +132,7 @@ func TestBlockExists_ValidHash(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDatabase(beaconDB),
 	)
 	require.NoError(t, err, "unable to setup web3 ETH1.0 chain service")
@@ -168,7 +168,7 @@ func TestBlockExists_InvalidHash(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDatabase(beaconDB),
 	)
 	require.NoError(t, err, "unable to setup web3 ETH1.0 chain service")
@@ -187,7 +187,7 @@ func TestBlockExists_UsesCachedBlockInfo(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDatabase(beaconDB),
 	)
 	require.NoError(t, err, "unable to setup web3 ETH1.0 chain service")
@@ -217,7 +217,7 @@ func TestService_BlockNumberByTimestamp(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDatabase(beaconDB),
 	)
 	require.NoError(t, err)
@@ -249,7 +249,7 @@ func TestService_BlockNumberByTimestampLessTargetTime(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDatabase(beaconDB),
 	)
 	require.NoError(t, err)
@@ -287,7 +287,7 @@ func TestService_BlockNumberByTimestampMoreTargetTime(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDatabase(beaconDB),
 	)
 	require.NoError(t, err)
@@ -323,7 +323,7 @@ func TestService_BlockTimeByHeight_ReturnsError_WhenNoEth1Client(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDatabase(beaconDB),
 	)
 	require.NoError(t, err, "unable to setup web3 ETH1.0 chain service")

beacon-chain/execution/deposit_test.go

@@ -59,7 +59,7 @@ func TestProcessDeposit_OK(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDatabase(beaconDB),
 	)
 	require.NoError(t, err, "Unable to setup web3 ETH1.0 chain service")
@@ -88,7 +88,7 @@ func TestProcessDeposit_InvalidMerkleBranch(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDatabase(beaconDB),
 	)
 	require.NoError(t, err, "unable to setup web3 ETH1.0 chain service")
@@ -119,7 +119,7 @@ func TestProcessDeposit_InvalidPublicKey(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDatabase(beaconDB),
 	)
 	require.NoError(t, err, "unable to setup web3 ETH1.0 chain service")
@@ -161,7 +161,7 @@ func TestProcessDeposit_InvalidSignature(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDatabase(beaconDB),
 	)
 	require.NoError(t, err, "unable to setup web3 ETH1.0 chain service")
@@ -203,7 +203,7 @@ func TestProcessDeposit_UnableToVerify(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDatabase(beaconDB),
 	)
 	require.NoError(t, err, "unable to setup web3 ETH1.0 chain service")
@@ -241,7 +241,7 @@ func TestProcessDeposit_IncompleteDeposit(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDatabase(beaconDB),
 	)
 	require.NoError(t, err, "unable to setup web3 ETH1.0 chain service")
@@ -310,7 +310,7 @@ func TestProcessDeposit_AllDepositedSuccessfully(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDatabase(beaconDB),
 	)
 	require.NoError(t, err, "unable to setup web3 ETH1.0 chain service")

beacon-chain/execution/log_processing_test.go

@@ -40,7 +40,7 @@ func TestProcessDepositLog_OK(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDepositContractAddress(testAcc.ContractAddr),
 		WithDatabase(beaconDB),
 		WithDepositCache(depositCache),
@@ -109,7 +109,7 @@ func TestProcessDepositLog_InsertsPendingDeposit(t *testing.T) {
 	})
 
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDepositContractAddress(testAcc.ContractAddr),
 		WithDatabase(beaconDB),
 		WithDepositCache(depositCache),
@@ -170,7 +170,7 @@ func TestUnpackDepositLogData_OK(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDepositContractAddress(testAcc.ContractAddr),
 		WithDatabase(beaconDB),
 	)
@@ -225,7 +225,7 @@ func TestProcessETH2GenesisLog_8DuplicatePubkeys(t *testing.T) {
 	})
 
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDepositContractAddress(testAcc.ContractAddr),
 		WithDatabase(beaconDB),
 		WithDepositCache(depositCache),
@@ -300,7 +300,7 @@ func TestProcessETH2GenesisLog(t *testing.T) {
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDepositContractAddress(testAcc.ContractAddr),
 		WithDatabase(beaconDB),
 		WithDepositCache(depositCache),
@@ -392,7 +392,7 @@ func TestProcessETH2GenesisLog_CorrectNumOfDeposits(t *testing.T) {
 	})
 
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDepositContractAddress(testAcc.ContractAddr),
 		WithDatabase(kvStore),
 		WithDepositCache(depositCache),
@@ -490,7 +490,7 @@ func TestProcessETH2GenesisLog_LargePeriodOfNoLogs(t *testing.T) {
 	})
 
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDepositContractAddress(testAcc.ContractAddr),
 		WithDatabase(kvStore),
 		WithDepositCache(depositCache),
@@ -602,7 +602,7 @@ func newPowchainService(t *testing.T, eth1Backend *mock.TestAccount, beaconDB db
 		server.Stop()
 	})
 	web3Service, err := NewService(context.Background(),
-		WithHttpEndpoints([]string{endpoint}),
+		WithHttpEndpoint(endpoint),
 		WithDepositContractAddress(eth1Backend.ContractAddr),
 		WithDatabase(beaconDB),
 		WithDepositCache(depositCache),

beacon-chain/execution/options.go

@@ -7,55 +7,31 @@ import (
 	"github.com/prysmaticlabs/prysm/v3/beacon-chain/db"
 	"github.com/prysmaticlabs/prysm/v3/beacon-chain/state"
 	"github.com/prysmaticlabs/prysm/v3/beacon-chain/state/stategen"
-	"github.com/prysmaticlabs/prysm/v3/network"
 	"github.com/prysmaticlabs/prysm/v3/network/authorization"
 )
 
 type Option func(s *Service) error
 
-// WithHttpEndpoints deduplicates and parses http endpoints for the execution chain service to use,
-// and sets the "current" endpoint that will be used first.
-func WithHttpEndpoints(endpointStrings []string) Option {
+// WithHttpEndpoint parse http endpoint for the powchain service to use.
+func WithHttpEndpoint(endpointString string) Option {
 	return func(s *Service) error {
-		stringEndpoints := dedupEndpoints(endpointStrings)
-		endpoints := make([]network.Endpoint, len(stringEndpoints))
-		for i, e := range stringEndpoints {
-			endpoints[i] = HttpEndpoint(e)
-		}
-		// Select first http endpoint in the provided list.
-		var currEndpoint network.Endpoint
-		if len(endpointStrings) > 0 {
-			currEndpoint = endpoints[0]
-		}
-		s.cfg.httpEndpoints = endpoints
-		s.cfg.currHttpEndpoint = currEndpoint
+		s.cfg.currHttpEndpoint = HttpEndpoint(endpointString)
 		return nil
 	}
 }
 
-// WithHttpEndpointsAndJWTSecret for authenticating the execution node JSON-RPC endpoint.
-func WithHttpEndpointsAndJWTSecret(endpointStrings []string, secret []byte) Option {
+// WithHttpEndpointAndJWTSecret for authenticating the execution node JSON-RPC endpoint.
+func WithHttpEndpointAndJWTSecret(endpointString string, secret []byte) Option {
 	return func(s *Service) error {
 		if len(secret) == 0 {
 			return nil
 		}
-		stringEndpoints := dedupEndpoints(endpointStrings)
-		endpoints := make([]network.Endpoint, len(stringEndpoints))
-		// Overwrite authorization type for all endpoints to be of a bearer
-		// type.
-		for i, e := range stringEndpoints {
-			hEndpoint := HttpEndpoint(e)
-			hEndpoint.Auth.Method = authorization.Bearer
-			hEndpoint.Auth.Value = string(secret)
-			endpoints[i] = hEndpoint
-		}
-		// Select first http endpoint in the provided list.
-		var currEndpoint network.Endpoint
-		if len(endpointStrings) > 0 {
-			currEndpoint = endpoints[0]
-		}
-		s.cfg.httpEndpoints = endpoints
-		s.cfg.currHttpEndpoint = currEndpoint
+		// Overwrite authorization type for all endpoints to be of a bearer type.
+		hEndpoint := HttpEndpoint(endpointString)
+		hEndpoint.Auth.Method = authorization.Bearer
+		hEndpoint.Auth.Value = string(secret)
+
+		s.cfg.currHttpEndpoint = hEndpoint
 		return nil
 	}
 }

beacon-chain/execution/prometheus.go

@@ -13,11 +13,9 @@ type BeaconNodeStatsUpdater interface {
 }
 
 type PowchainCollector struct {
-	SyncEth1Connected          *prometheus.Desc
-	SyncEth1FallbackConnected  *prometheus.Desc
-	SyncEth1FallbackConfigured *prometheus.Desc // true if flag specified: --fallback-web3provider
-	updateChan                 chan clientstats.BeaconNodeStats
-	latestStats                clientstats.BeaconNodeStats
+	SyncEth1Connected *prometheus.Desc
+	updateChan        chan clientstats.BeaconNodeStats
+	latestStats       clientstats.BeaconNodeStats
 	sync.Mutex
 	ctx        context.Context
 	finishChan chan struct{}
@@ -38,8 +36,6 @@ func (pc *PowchainCollector) Update(update clientstats.BeaconNodeStats) {
 // prometheus.Collector interface.
 func (pc *PowchainCollector) Describe(ch chan<- *prometheus.Desc) {
 	ch <- pc.SyncEth1Connected
-	ch <- pc.SyncEth1FallbackConfigured
-	ch <- pc.SyncEth1FallbackConnected
 }
 
 // Collect is invoked by the prometheus collection loop.
@@ -54,26 +50,6 @@ func (pc *PowchainCollector) Describe(ch chan<- *prometheus.Desc) {
 func (pc *PowchainCollector) Collect(ch chan<- prometheus.Metric) {
 	bs := pc.getLatestStats()
 
-	var syncEth1FallbackConfigured float64 = 0
-	if bs.SyncEth1FallbackConfigured {
-		syncEth1FallbackConfigured = 1
-	}
-	ch <- prometheus.MustNewConstMetric(
-		pc.SyncEth1FallbackConfigured,
-		prometheus.GaugeValue,
-		syncEth1FallbackConfigured,
-	)
-
-	var syncEth1FallbackConnected float64 = 0
-	if bs.SyncEth1FallbackConnected {
-		syncEth1FallbackConnected = 1
-	}
-	ch <- prometheus.MustNewConstMetric(
-		pc.SyncEth1FallbackConnected,
-		prometheus.GaugeValue,
-		syncEth1FallbackConnected,
-	)
-
 	var syncEth1Connected float64 = 0
 	if bs.SyncEth1Connected {
 		syncEth1Connected = 1
@@ -120,18 +96,6 @@ func NewPowchainCollector(ctx context.Context) (*PowchainCollector, error) {
 	namespace := "powchain"
 	updateChan := make(chan clientstats.BeaconNodeStats, 2)
 	c := &PowchainCollector{
-		SyncEth1FallbackConfigured: prometheus.NewDesc(
-			prometheus.BuildFQName(namespace, "", "sync_eth1_fallback_configured"),
-			"Boolean recording whether a fallback eth1 endpoint was configured: 0=false, 1=true.",
-			nil,
-			nil,
-		),
-		SyncEth1FallbackConnected: prometheus.NewDesc(
-			prometheus.BuildFQName(namespace, "", "sync_eth1_fallback_connected"),
-			"Boolean indicating whether a fallback eth1 endpoint is currently connected: 0=false, 1=true.",
-			nil,
-			nil,
-		),
 		SyncEth1Connected: prometheus.NewDesc(
 			prometheus.BuildFQName(namespace, "", "sync_eth1_connected"),
 			"Boolean indicating whether an eth1 endpoint is currently connected: 0=false, 1=true.",