From 4da4b2f8268a87fde7939095bc9967846995cfe2 Mon Sep 17 00:00:00 2001 From: courtneyeh Date: Thu, 10 Mar 2022 15:59:17 +1300 Subject: [PATCH 1/6] Make --Xee-endpoint CLI option visible --- .../executionengine/ExecutionEngineConfiguration.java | 2 +- .../executionengine/ExecutionEngineConfigurationTest.java | 2 +- .../tech/pegasys/teku/cli/options/ExecutionEngineOptions.java | 2 +- .../java/tech/pegasys/teku/cli/BeaconNodeCommandTest.java | 2 +- .../tech/pegasys/teku/cli/options/Eth2NetworkOptionsTest.java | 4 ++-- .../pegasys/teku/cli/options/ExecutionEngineOptionsTest.java | 2 +- teku/src/test/resources/complete_config.yaml | 2 +- teku/src/test/resources/executionEngineOptions_config.yaml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/services/executionengine/src/main/java/tech/pegasys/teku/services/executionengine/ExecutionEngineConfiguration.java b/services/executionengine/src/main/java/tech/pegasys/teku/services/executionengine/ExecutionEngineConfiguration.java index 279d1e1aed3..b051878a28c 100644 --- a/services/executionengine/src/main/java/tech/pegasys/teku/services/executionengine/ExecutionEngineConfiguration.java +++ b/services/executionengine/src/main/java/tech/pegasys/teku/services/executionengine/ExecutionEngineConfiguration.java @@ -59,7 +59,7 @@ public String getEndpoint() { return endpoint.orElseThrow( () -> new InvalidConfigurationException( - "Invalid configuration. --Xee-endpoint parameter is mandatory when Bellatrix milestone is enabled")); + "Invalid configuration. --ee-endpoint parameter is mandatory when Bellatrix milestone is enabled")); } public Optional getJwtSecretFile() { diff --git a/services/executionengine/src/test/java/tech/pegasys/teku/services/executionengine/ExecutionEngineConfigurationTest.java b/services/executionengine/src/test/java/tech/pegasys/teku/services/executionengine/ExecutionEngineConfigurationTest.java index cbca645113d..456c0252b2d 100644 --- a/services/executionengine/src/test/java/tech/pegasys/teku/services/executionengine/ExecutionEngineConfigurationTest.java +++ b/services/executionengine/src/test/java/tech/pegasys/teku/services/executionengine/ExecutionEngineConfigurationTest.java @@ -31,7 +31,7 @@ public void shouldThrowExceptionIfNoEeEndpointSpecified() { Assertions.assertThatExceptionOfType(InvalidConfigurationException.class) .isThrownBy(config::getEndpoint) .withMessageContaining( - "Invalid configuration. --Xee-endpoint parameter is mandatory when Bellatrix milestone is enabled"); + "Invalid configuration. --ee-endpoint parameter is mandatory when Bellatrix milestone is enabled"); } @Test diff --git a/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java b/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java index ab7dd966d9a..dbf80a558ea 100644 --- a/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java +++ b/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java @@ -26,7 +26,7 @@ public class ExecutionEngineOptions { @Option( - names = {"--Xee-endpoint"}, + names = {"--ee-endpoint"}, paramLabel = "", description = "URL for Execution Engine node.", arity = "1", diff --git a/teku/src/test/java/tech/pegasys/teku/cli/BeaconNodeCommandTest.java b/teku/src/test/java/tech/pegasys/teku/cli/BeaconNodeCommandTest.java index 756548ef08a..4d5554fb1fd 100644 --- a/teku/src/test/java/tech/pegasys/teku/cli/BeaconNodeCommandTest.java +++ b/teku/src/test/java/tech/pegasys/teku/cli/BeaconNodeCommandTest.java @@ -342,7 +342,7 @@ private String[] createCliArgs() { "0x77f7bED277449F51505a4C54550B074030d989bC", "--eth1-endpoint", "http://localhost:8545", - "--Xee-endpoint", + "--ee-endpoint", "http://localhost:8550", "--metrics-enabled", "false", diff --git a/teku/src/test/java/tech/pegasys/teku/cli/options/Eth2NetworkOptionsTest.java b/teku/src/test/java/tech/pegasys/teku/cli/options/Eth2NetworkOptionsTest.java index 454ced4276f..83be2a72f00 100644 --- a/teku/src/test/java/tech/pegasys/teku/cli/options/Eth2NetworkOptionsTest.java +++ b/teku/src/test/java/tech/pegasys/teku/cli/options/Eth2NetworkOptionsTest.java @@ -57,7 +57,7 @@ void shouldUseAltairForkEpochIfSpecified() { void shouldUseBellatrixForkEpochIfSpecified() { final TekuConfiguration config = getTekuConfigurationFromArguments( - "--Xnetwork-bellatrix-fork-epoch", "120000", "--Xee-endpoint", "someEndpoint"); + "--Xnetwork-bellatrix-fork-epoch", "120000", "--ee-endpoint", "someEndpoint"); final Spec spec = config.eth2NetworkConfiguration().getSpec(); assertThat(spec.getForkSchedule().getSpecMilestoneAtEpoch(UInt64.valueOf(119999))) .isEqualTo(SpecMilestone.ALTAIR); @@ -78,7 +78,7 @@ void shouldUseCustomSafeSlotsToImportOptimistically() { getTekuConfigurationFromArguments( "--Xnetwork-bellatrix-fork-epoch", "120000", - "--Xee-endpoint", + "--ee-endpoint", "someEndpoint", "--Xnetwork-safe-slots-to-import-optimistically", "256"); diff --git a/teku/src/test/java/tech/pegasys/teku/cli/options/ExecutionEngineOptionsTest.java b/teku/src/test/java/tech/pegasys/teku/cli/options/ExecutionEngineOptionsTest.java index 38235881f56..24d6f3433ba 100644 --- a/teku/src/test/java/tech/pegasys/teku/cli/options/ExecutionEngineOptionsTest.java +++ b/teku/src/test/java/tech/pegasys/teku/cli/options/ExecutionEngineOptionsTest.java @@ -43,7 +43,7 @@ public void shouldReportEEEnabledIfSpecEnablesBellatrix() { "0", "--Xnetwork-bellatrix-fork-epoch", "1", - "--Xee-endpoint", + "--ee-endpoint", "http://example.com:1234/path/" }; final TekuConfiguration config = getTekuConfigurationFromArguments(args); diff --git a/teku/src/test/resources/complete_config.yaml b/teku/src/test/resources/complete_config.yaml index 20def4bb53f..8812d8eac36 100644 --- a/teku/src/test/resources/complete_config.yaml +++ b/teku/src/test/resources/complete_config.yaml @@ -25,7 +25,7 @@ eth1-endpoint: "http://localhost:8545" #Xeth1-deposits-from-storage-enabled: true # execution engine -Xee-endpoint: "http://localhost:8550" +ee-endpoint: "http://localhost:8550" # output #Xtransaction-record-directory: "/tmp/teku" diff --git a/teku/src/test/resources/executionEngineOptions_config.yaml b/teku/src/test/resources/executionEngineOptions_config.yaml index 0b6fa2fdafa..48b9abe6832 100644 --- a/teku/src/test/resources/executionEngineOptions_config.yaml +++ b/teku/src/test/resources/executionEngineOptions_config.yaml @@ -1,2 +1,2 @@ # execution engine -Xee-endpoint: "http://example.com:1234/path/" \ No newline at end of file +ee-endpoint: "http://example.com:1234/path/" \ No newline at end of file From 800dc0010a7a214d401a795fd78a5b8305c1e2a1 Mon Sep 17 00:00:00 2001 From: courtneyeh Date: Thu, 10 Mar 2022 16:05:22 +1300 Subject: [PATCH 2/6] Make --Xee-jwt-secret CLI option visible --- .../tech/pegasys/teku/cli/options/ExecutionEngineOptions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java b/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java index dbf80a558ea..919d581d521 100644 --- a/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java +++ b/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java @@ -53,7 +53,7 @@ public class ExecutionEngineOptions { @Option( hidden = true, - names = {"--Xee-jwt-secret"}, + names = {"--ee-jwt-secret"}, paramLabel = "", description = "Location of the file specifying the hex-encoded 256 bit secret key to be used for verifying/generating jwt tokens", From a70ca63ea1cd5f6c84d81a986ea883e431534134 Mon Sep 17 00:00:00 2001 From: courtneyeh Date: Thu, 10 Mar 2022 16:08:26 +1300 Subject: [PATCH 3/6] Make --Xee-payload-builders CLI option visible --- .../tech/pegasys/teku/cli/options/ExecutionEngineOptions.java | 2 +- .../pegasys/teku/cli/options/ExecutionEngineOptionsTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java b/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java index 919d581d521..cfe15ae2ccf 100644 --- a/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java +++ b/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java @@ -43,7 +43,7 @@ public class ExecutionEngineOptions { private Version executionEngineVersion = Version.DEFAULT_VERSION; @Option( - names = {"--Xee-payload-builders"}, + names = {"--ee-payload-builders"}, paramLabel = "", description = "List of MEV boost api compatible endpoints to get execution payloads", arity = "1..*", diff --git a/teku/src/test/java/tech/pegasys/teku/cli/options/ExecutionEngineOptionsTest.java b/teku/src/test/java/tech/pegasys/teku/cli/options/ExecutionEngineOptionsTest.java index 24d6f3433ba..1e7073757f9 100644 --- a/teku/src/test/java/tech/pegasys/teku/cli/options/ExecutionEngineOptionsTest.java +++ b/teku/src/test/java/tech/pegasys/teku/cli/options/ExecutionEngineOptionsTest.java @@ -77,7 +77,7 @@ void shouldThrowInvalidConfigurationExceptionIfEndpointRequiredButNotSpecified() @Test void shouldAllowMultipleMevBoostUrls() throws MalformedURLException { - final String[] args = {"--Xee-payload-builders", "http://a.com,http://b.com"}; + final String[] args = {"--ee-payload-builders", "http://a.com,http://b.com"}; final TekuConfiguration config = getTekuConfigurationFromArguments(args); assertThat(config.executionEngine().getMevBoostUrls()) .containsOnly(new URL("http://a.com"), new URL("http://b.com")); From 82c89a2f3d0f71a9bfa416f2afb718a860b8ab45 Mon Sep 17 00:00:00 2001 From: courtneyeh Date: Thu, 10 Mar 2022 16:11:56 +1300 Subject: [PATCH 4/6] Make --Xee-version CLI option visible --- .../tech/pegasys/teku/cli/options/ExecutionEngineOptions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java b/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java index cfe15ae2ccf..656558f4b60 100644 --- a/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java +++ b/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java @@ -34,7 +34,7 @@ public class ExecutionEngineOptions { private String executionEngineEndpoint = null; @Option( - names = {"--Xee-version"}, + names = {"--ee-version"}, paramLabel = "", description = "Execution Engine API version. Possible values are: kintsugi (default), kiln or kilnV2", From 815e3419c517f8f0baa701eb9f950d8b99bfad35 Mon Sep 17 00:00:00 2001 From: courtneyeh Date: Thu, 10 Mar 2022 16:28:15 +1300 Subject: [PATCH 5/6] Revert visibility of --Xee-payload-builders and --Xee-version CLI options --- .../tech/pegasys/teku/cli/options/ExecutionEngineOptions.java | 4 ++-- .../pegasys/teku/cli/options/ExecutionEngineOptionsTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java b/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java index 656558f4b60..919d581d521 100644 --- a/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java +++ b/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java @@ -34,7 +34,7 @@ public class ExecutionEngineOptions { private String executionEngineEndpoint = null; @Option( - names = {"--ee-version"}, + names = {"--Xee-version"}, paramLabel = "", description = "Execution Engine API version. Possible values are: kintsugi (default), kiln or kilnV2", @@ -43,7 +43,7 @@ public class ExecutionEngineOptions { private Version executionEngineVersion = Version.DEFAULT_VERSION; @Option( - names = {"--ee-payload-builders"}, + names = {"--Xee-payload-builders"}, paramLabel = "", description = "List of MEV boost api compatible endpoints to get execution payloads", arity = "1..*", diff --git a/teku/src/test/java/tech/pegasys/teku/cli/options/ExecutionEngineOptionsTest.java b/teku/src/test/java/tech/pegasys/teku/cli/options/ExecutionEngineOptionsTest.java index 1e7073757f9..24d6f3433ba 100644 --- a/teku/src/test/java/tech/pegasys/teku/cli/options/ExecutionEngineOptionsTest.java +++ b/teku/src/test/java/tech/pegasys/teku/cli/options/ExecutionEngineOptionsTest.java @@ -77,7 +77,7 @@ void shouldThrowInvalidConfigurationExceptionIfEndpointRequiredButNotSpecified() @Test void shouldAllowMultipleMevBoostUrls() throws MalformedURLException { - final String[] args = {"--ee-payload-builders", "http://a.com,http://b.com"}; + final String[] args = {"--Xee-payload-builders", "http://a.com,http://b.com"}; final TekuConfiguration config = getTekuConfigurationFromArguments(args); assertThat(config.executionEngine().getMevBoostUrls()) .containsOnly(new URL("http://a.com"), new URL("http://b.com")); From 17f7d3484934e36d130de4a156f246d139f61959 Mon Sep 17 00:00:00 2001 From: courtneyeh Date: Thu, 10 Mar 2022 16:29:55 +1300 Subject: [PATCH 6/6] Rename --ee-jwt-secret CLI option for consistency --- .../tech/pegasys/teku/cli/options/ExecutionEngineOptions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java b/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java index 919d581d521..eff689a2e0d 100644 --- a/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java +++ b/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java @@ -53,7 +53,7 @@ public class ExecutionEngineOptions { @Option( hidden = true, - names = {"--ee-jwt-secret"}, + names = {"--ee-jwt-secret-file"}, paramLabel = "", description = "Location of the file specifying the hex-encoded 256 bit secret key to be used for verifying/generating jwt tokens",