Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mev container display on holesky, even if not supported #322

Merged
merged 2 commits into from
Oct 18, 2023
Merged

Mev container display on holesky, even if not supported #322

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbfbe5c
fix: mev container display on holesky, even if not supported
stdevMac Oct 16, 2023
68a93fe
chore: add tests for SupportMevBoost
stdevMac Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions internal/pkg/generate/generate_scripts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ func ComposeFile(gd *GenData, at io.Writer) error {
}

cls := mapClients(gd)

networkConfig := configs.NetworksConfigs()[gd.Network]
for tmpKind, client := range cls {
var name string
if client == nil {
Expand All @@ -166,7 +166,7 @@ func ComposeFile(gd *GenData, at io.Writer) error {
}
tmp, err := templates.Services.ReadFile(strings.Join([]string{
"services",
configs.NetworksConfigs()[gd.Network].NetworkService,
networkConfig.NetworkService,
tmpKind,
name + ".tmpl",
}, "/"))
Expand Down Expand Up @@ -247,7 +247,7 @@ func ComposeFile(gd *GenData, at io.Writer) error {
Services: gd.Services,
Network: gd.Network,
XeeVersion: xeeVersion,
Mev: gd.MevBoostService || (mevSupported && gd.Mev),
Mev: networkConfig.SupportsMEVBoost && (gd.MevBoostService || (mevSupported && gd.Mev)),
MevBoostOnValidator: gd.MevBoostService || (mevSupported && gd.Mev) || gd.MevBoostOnValidator,
MevPort: gd.Ports["MevPort"],
MevBoostEndpoint: gd.MevBoostEndpoint,
Expand Down Expand Up @@ -311,13 +311,13 @@ func EnvFile(gd *GenData, at io.Writer) error {
}

cls := mapClients(gd)

networkConfig := configs.NetworksConfigs()[gd.Network]
for tmpKind, client := range cls {
var tmp []byte
if client == nil {
tmp, err = templates.Services.ReadFile(strings.Join([]string{
"services",
configs.NetworksConfigs()[gd.Network].NetworkService,
networkConfig.NetworkService,
tmpKind,
"empty.tmpl",
}, "/"))
Expand Down Expand Up @@ -400,7 +400,7 @@ func EnvFile(gd *GenData, at io.Writer) error {

data := EnvData{
Services: gd.Services,
Mev: gd.MevBoostService || (mevSupported && gd.Mev) || gd.MevBoostOnValidator,
Mev: networkConfig.SupportsMEVBoost && (gd.MevBoostService || (mevSupported && gd.Mev) || gd.MevBoostOnValidator),
ElImage: imageOrEmpty(cls[execution], gd.LatestVersion),
ElDataDir: "./" + configs.ExecutionDir,
CcImage: imageOrEmpty(cls[consensus], gd.LatestVersion),
Expand Down
1 change: 0 additions & 1 deletion templates/envs/holesky/env_base.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
{{ define "env" }}
# --- Global configuration ---
NETWORK=holesky
# --- {{if .WithMevBoostClient}}RELAY_URLS={{.RelayURLs}}{{end}} ---
{{if .FeeRecipient}}
FEE_RECIPIENT={{.FeeRecipient}}{{end}}
{{template "execution" .}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/holesky/validator/lighthouse.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ VL_INSTANCE_NAME=LighthouseValidator
VL_IMAGE_VERSION={{.VlImage}}
KEYSTORE_DIR={{.KeystoreDir}}
VL_DATA_DIR={{.VlDataDir}}
# --- MEV=true, not sure if MEV is enabled on holesky ---
{{ end }}
1 change: 0 additions & 1 deletion templates/envs/holesky/validator/lodestar.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ VL_INSTANCE_NAME=LodestarValidator
VL_IMAGE_VERSION={{.VlImage}}
KEYSTORE_DIR={{.KeystoreDir}}
VL_DATA_DIR={{.VlDataDir}}
# --- MEV=true, not sure if MEV is enabled on holesky ---
VL_LODESTAR_PRESET=mainnet
{{ end }}
1 change: 0 additions & 1 deletion templates/envs/holesky/validator/teku.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ VL_INSTANCE_NAME=TekuValidator
VL_IMAGE_VERSION={{.VlImage}}
KEYSTORE_DIR={{.KeystoreDir}}
VL_DATA_DIR={{.VlDataDir}}
# --- MEV=true, not sure if MEV is enabled on holesky ---
{{ end }}