MEV support (ssvlabs#918)

* mev support --------- Co-authored-by: nkryuchkov <[email protected]> Co-authored-by: nivBlox <[email protected]> Co-authored-by: aaron <[email protected]> Co-authored-by: moshe-blox <[email protected]> Co-authored-by: y0sher <[email protected]>
fplk0 · May 15, 2023 · 3b42a81 · 3b42a81
1 parent 4079b1e
commit 3b42a81
Show file tree

Hide file tree

Showing 57 changed files with 1,049 additions and 490 deletions.
diff --git a/.k8/yamls-stage-v1/ssv-node-v2-1-deployment.yml b/.k8/yamls-stage-v1/ssv-node-v2-1-deployment.yml
@@ -136,6 +136,8 @@ spec:
           value: "152834"
         - name: CLEAN_REGISTRY_DATA
           value: "false"
+        - name: BUILDER_PROPOSALS
+          value: "true"
         volumeMounts:
         - mountPath: /data
           name: ssv-node-v2-1

diff --git a/.k8/yamls-stage/ssv-node-10-deployment.yml b/.k8/yamls-stage/ssv-node-10-deployment.yml
@@ -132,6 +132,8 @@ spec:
           value: 'false'
         - name: GENESIS_EPOCH
           value: "152834"
+        - name: BUILDER_PROPOSALS
+          value: "true"
         volumeMounts:
         - mountPath: /data
           name: ssv-node-10

diff --git a/.k8/yamls-stage/ssv-node-11-deployment.yml b/.k8/yamls-stage/ssv-node-11-deployment.yml
@@ -132,6 +132,8 @@ spec:
           value: 'false'
         - name: GENESIS_EPOCH
           value: "152834"
+        - name: BUILDER_PROPOSALS
+          value: "true"
         volumeMounts:
         - mountPath: /data
           name: ssv-node-11

diff --git a/.k8/yamls-stage/ssv-node-12-deployment.yml b/.k8/yamls-stage/ssv-node-12-deployment.yml
@@ -132,6 +132,8 @@ spec:
           value: 'false'
         - name: GENESIS_EPOCH
           value: "152834"
+        - name: BUILDER_PROPOSALS
+          value: "true"
         volumeMounts:
         - mountPath: /data
           name: ssv-node-12

diff --git a/.k8/yamls-stage/ssv-node-9-deployment.yml b/.k8/yamls-stage/ssv-node-9-deployment.yml
@@ -132,6 +132,8 @@ spec:
           value: 'false'
         - name: GENESIS_EPOCH
           value: "152834"
+        - name: BUILDER_PROPOSALS
+          value: "true"
         volumeMounts:
         - mountPath: /data
           name: ssv-node-9

diff --git a/.k8/yamls-stage/ssv-node-v2-2-deployment.yml b/.k8/yamls-stage/ssv-node-v2-2-deployment.yml
@@ -138,6 +138,8 @@ spec:
           value: 'false'
         - name: GENESIS_EPOCH
           value: "152834"
+        - name: BUILDER_PROPOSALS
+          value: "true"
         volumeMounts:
         - mountPath: /data
           name: ssv-node-v2-2

diff --git a/.k8/yamls-stage/ssv-node-v2-3-deployment.yml b/.k8/yamls-stage/ssv-node-v2-3-deployment.yml
@@ -140,6 +140,8 @@ spec:
           value: "152834"
         - name: CLEAN_REGISTRY_DATA
           value: "false"
+        - name: BUILDER_PROPOSALS
+          value: "true"
         volumeMounts:
         - mountPath: /data
           name: ssv-node-v2-3

diff --git a/.k8/yamls-stage/ssv-node-v2-4-deployment.yml b/.k8/yamls-stage/ssv-node-v2-4-deployment.yml
@@ -140,6 +140,8 @@ spec:
           value: "152834"
         - name: CLEAN_REGISTRY_DATA
           value: "false"
+        - name: BUILDER_PROPOSALS
+          value: "true"
         volumeMounts:
         - mountPath: /data
           name: ssv-node-v2-4

diff --git a/.k8/yamls-stage/ssv-node-v2-5-deployment.yml b/.k8/yamls-stage/ssv-node-v2-5-deployment.yml
@@ -132,6 +132,8 @@ spec:
           value: "152834"
         - name: CLEAN_REGISTRY_DATA
           value: "false"
+        - name: BUILDER_PROPOSALS
+          value: "true"
         volumeMounts:
         - mountPath: /data
           name: ssv-node-v2-5

diff --git a/.k8/yamls-stage/ssv-node-v2-6-deployment.yml b/.k8/yamls-stage/ssv-node-v2-6-deployment.yml
@@ -134,6 +134,8 @@ spec:
           value: "152834"
         - name: CLEAN_REGISTRY_DATA
           value: "false"
+        - name: BUILDER_PROPOSALS
+          value: "true"
         volumeMounts:
         - mountPath: /data
           name: ssv-node-v2-6

diff --git a/.k8/yamls-stage/ssv-node-v2-7-deployment.yml b/.k8/yamls-stage/ssv-node-v2-7-deployment.yml
@@ -132,6 +132,8 @@ spec:
           value: 'false'
         - name: GENESIS_EPOCH
           value: "152834"
+        - name: BUILDER_PROPOSALS
+          value: "true"
         volumeMounts:
         - mountPath: /data
           name: ssv-node-v2-7

diff --git a/.k8/yamls-stage/ssv-node-v2-8-deployment.yml b/.k8/yamls-stage/ssv-node-v2-8-deployment.yml
@@ -132,6 +132,8 @@ spec:
           value: 'false'
         - name: GENESIS_EPOCH
           value: "152834"
+        - name: BUILDER_PROPOSALS
+          value: "true"
         volumeMounts:
         - mountPath: /data
           name: ssv-node-v2-8

diff --git a/.k8/yamls-v3-stage/ssv-node-v3-1-deployment.yml b/.k8/yamls-v3-stage/ssv-node-v3-1-deployment.yml
@@ -138,6 +138,8 @@ spec:
           value: "16301"
         - name: FULLNODE
           value: "true"
+        - name: BUILDER_PROPOSALS
+          value: "true"
         volumeMounts:
         - mountPath: /data
           name: ssv-node-v3-1

diff --git a/.k8/yamls-v3-stage/ssv-node-v3-2-deployment.yml b/.k8/yamls-v3-stage/ssv-node-v3-2-deployment.yml
@@ -130,6 +130,8 @@ spec:
           value: "true"
         - name: GENESIS_EPOCH
           value: "152834"
+        - name: BUILDER_PROPOSALS
+          value: "true"
         volumeMounts:
         - mountPath: /data
           name: ssv-node-v3-2

diff --git a/.k8/yamls-v3-stage/ssv-node-v3-3-deployment.yml b/.k8/yamls-v3-stage/ssv-node-v3-3-deployment.yml
@@ -138,6 +138,8 @@ spec:
           value: "16303"
         - name: FULLNODE
           value: "true"
+        - name: BUILDER_PROPOSALS
+          value: "true"
         volumeMounts:
         - mountPath: /data
           name: ssv-node-v3-3

diff --git a/.k8/yamls-v3-stage/ssv-node-v3-4-deployment.yml b/.k8/yamls-v3-stage/ssv-node-v3-4-deployment.yml
@@ -130,6 +130,8 @@ spec:
           value: "true"
         - name: GENESIS_EPOCH
           value: "152834"
+        - name: BUILDER_PROPOSALS
+          value: "true"
         volumeMounts:
         - mountPath: /data
           name: ssv-node-v3-4

diff --git a/beacon/goclient/goclient.go b/beacon/goclient/goclient.go
@@ -9,19 +9,21 @@ import (
 	"time"
 
 	eth2client "github.com/attestantio/go-eth2-client"
+	"github.com/attestantio/go-eth2-client/api"
 	"github.com/attestantio/go-eth2-client/http"
 	"github.com/attestantio/go-eth2-client/spec"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	"github.com/bloxapp/eth2-key-manager/core"
 	spectypes "github.com/bloxapp/ssv-spec/types"
-	"github.com/bloxapp/ssv/logging/fields"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/rs/zerolog"
 	"go.uber.org/zap"
 
+	"github.com/bloxapp/ssv/logging/fields"
 	"github.com/bloxapp/ssv/monitoring/metrics"
+	"github.com/bloxapp/ssv/operator/slot_ticker"
 	beaconprotocol "github.com/bloxapp/ssv/protocol/v2/blockchain/beacon"
 )
 
@@ -99,22 +101,30 @@ type Client interface {
 	eth2client.ValidatorsProvider
 	eth2client.ProposalPreparationsSubmitter
 	eth2client.EventsProvider
+	eth2client.BlindedBeaconBlockProposalProvider
+	eth2client.BlindedBeaconBlockSubmitter
+	eth2client.ValidatorRegistrationsSubmitter
 }
 
 // goClient implementing Beacon struct
 type goClient struct {
-	ctx            context.Context
-	network        beaconprotocol.Network
-	client         Client
-	indicesMapLock sync.Mutex
-	graffiti       []byte
+	log                  *zap.Logger
+	ctx                  context.Context
+	network              beaconprotocol.Network
+	client               Client
+	graffiti             []byte
+	gasLimit             uint64
+	operatorID           spectypes.OperatorID
+	registrationMu       sync.Mutex
+	registrationLastSlot phase0.Slot
+	registrationCache    map[phase0.BLSPubKey]*api.VersionedSignedValidatorRegistration
 }
 
 // verifies that the client implements HealthCheckAgent
 var _ metrics.HealthCheckAgent = &goClient{}
 
 // New init new client and go-client instance
-func New(logger *zap.Logger, opt beaconprotocol.Options) (beaconprotocol.Beacon, error) {
+func New(logger *zap.Logger, opt beaconprotocol.Options, operatorID spectypes.OperatorID, slotTicker slot_ticker.Ticker) (beaconprotocol.Beacon, error) {
 	logger.Info("consensus client: connecting", fields.Address(opt.BeaconNodeAddr), fields.Network(opt.Network))
 
 	httpClient, err := http.New(opt.Context,
@@ -131,15 +141,24 @@ func New(logger *zap.Logger, opt beaconprotocol.Options) (beaconprotocol.Beacon,
 	logger.Info("consensus client: connected", fields.Name(httpClient.Name()), fields.Address(httpClient.Address()))
 
 	network := beaconprotocol.NewNetwork(core.NetworkFromString(opt.Network), opt.MinGenesisTime)
-	_client := &goClient{
-		ctx:            opt.Context,
-		network:        network,
-		client:         httpClient.(*http.Service),
-		indicesMapLock: sync.Mutex{},
-		graffiti:       opt.Graffiti,
+
+	tickerChan := make(chan phase0.Slot, 32)
+	slotTicker.Subscribe(tickerChan)
+
+	client := &goClient{
+		log:               logger,
+		ctx:               opt.Context,
+		network:           network,
+		client:            httpClient.(*http.Service),
+		graffiti:          opt.Graffiti,
+		gasLimit:          opt.GasLimit,
+		operatorID:        operatorID,
+		registrationCache: map[phase0.BLSPubKey]*api.VersionedSignedValidatorRegistration{},
 	}
 
-	return _client, nil
+	go client.registrationSubmitter(tickerChan)
+
+	return client, nil
 }
 
 // HealthCheck provides health status of beacon node