Clean up env vars endpoint (#1513)

### This PR:
* Removes env vars from the `public-env-vars.toml` file, which I forgot
to do when moving things to a genesis file
* Sorts this file alphabetically

### This PR does not:
<!-- Describe what is out of scope for this PR, if applicable. Leave
this section blank if it's not applicable -->
<!-- This section helps avoid the reviewer having to needlessly point
out missing parts -->
<!-- * Implement feature 3 because that feature is blocked by Issue 4
-->
<!-- * Implement xyz because that is tracked in issue #123. -->
<!-- * Address xzy for which I opened issue #456 -->

### Key places to review:
<!-- Describe key places for reviewers to pay close attention to -->
<!-- * file.rs, `add_integers` function -->
<!-- Or directly comment on those files/lines to make it easier for the
reviewers -->

<!-- ### How to test this PR:  -->
<!-- Optional, uncomment the above line if this is relevant to your PR
-->
<!-- If your PR is fully tested through CI there is no need to add this
section -->
<!-- * E.g. `just test` -->

<!-- ### Things tested -->
<!-- Anything that was manually tested (that is not tested in CI). -->
<!-- E.g. building/running of docker containers. Changes to docker demo,
... -->
<!-- Especially mention anything untested, with reasoning and link an
issue to resolve this. -->

<!-- Complete the following items before creating this PR -->
<!-- [ ] Issue linked or PR description mentions why this change is
necessary. -->
<!-- [ ] PR description is clear enough for reviewers. -->
<!-- [ ] Documentation for changes (additions) has been updated (added).
-->
<!-- [ ] If this is a draft it is marked as "draft".  -->

<!-- To make changes to this template edit
https://github.com/EspressoSystems/.github/blob/main/PULL_REQUEST_TEMPLATE.md
-->

process-compose.yaml

@@ -120,7 +120,6 @@ processes:
       - ESPRESSO_SEQUENCER_POSTGRES_DATABASE=sequencer
       - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_0
       - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_0
-      - ESPRESSO_SEQUENCER_STAKE_TABLE_CAPACITY=10
       - ESPRESSO_SEQUENCER_IS_DA=true
     depends_on:
       orchestrator:
@@ -163,7 +162,6 @@ processes:
       - ESPRESSO_SEQUENCER_POSTGRES_DATABASE=sequencer
       - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_1
       - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_1
-      - ESPRESSO_SEQUENCER_STAKE_TABLE_CAPACITY=10
       - ESPRESSO_SEQUENCER_IS_DA=true
     depends_on:
       orchestrator:
@@ -200,7 +198,6 @@ processes:
       - ESPRESSO_SEQUENCER_STORAGE_PATH=$ESPRESSO_BASE_STORAGE_PATH/seq2
       - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_2
       - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_2
-      - ESPRESSO_SEQUENCER_STAKE_TABLE_CAPACITY=10
       - ESPRESSO_SEQUENCER_IS_DA=true
     depends_on:
       orchestrator:
@@ -235,7 +232,6 @@ processes:
       - ESPRESSO_SEQUENCER_STORAGE_PATH=$ESPRESSO_BASE_STORAGE_PATH/seq3
       - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_3
       - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_3
-      - ESPRESSO_SEQUENCER_STAKE_TABLE_CAPACITY=10
     depends_on:
       orchestrator:
         condition: process_healthy
@@ -267,7 +263,6 @@ processes:
       - ESPRESSO_SEQUENCER_STORAGE_PATH=$ESPRESSO_BASE_STORAGE_PATH/seq4
       - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_STAKING_PRIVATE_KEY_4
       - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_4
-      - ESPRESSO_SEQUENCER_STAKE_TABLE_CAPACITY=10
     depends_on:
       orchestrator:
         condition: process_healthy

sequencer/api/public-env-vars.toml

@@ -5,101 +5,92 @@
 
 
 variables = [
-    "ESPRESSO_SEQUENCER_ORCHESTRATOR_URL",
-    "ESPRESSO_SEQUENCER_CDN_ENDPOINT",
-    "ESPRESSO_SEQUENCER_LIBP2P_BIND_ADDRESS",
-    "ESPRESSO_SEQUENCER_LIBP2P_ADVERTISE_ADDRESS",
-    "ESPRESSO_STATE_RELAY_SERVER_URL",
-    "ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS",
-    "ESPRESSO_SEQUENCER_L1_GENESIS",
-    "ESPRESSO_SEQUENCER_L1_EVENTS_MAX_BLOCK_RANGE",
-    "ESPRESSO_SEQUENCER_IS_DA",
-    "ESPRESSO_SEQUENCER_STATE_PEERS",
-    "ESPRESSO_SEQUENCER_STAKE_TABLE_CAPACITY",
-    "ESPRESSO_SEQUENCER_API_PEERS",
-    "ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT",
-    "ESPRESSO_SEQUENCER_POSTGRES_HOST",
-    "ESPRESSO_SEQUENCER_POSTGRES_PORT",
-    "ESPRESSO_SEQUENCER_POSTGRES_DATABASE",
-    "ESPRESSO_SEQUENCER_POSTGRES_USER",
-    "ESPRESSO_SEQUENCER_POSTGRES_USE_TLS",
-    "ESPRESSO_SEQUENCER_POSTGRES_PRUNE",
-    "ESPRESSO_SEQUENCER_PRUNER_PRUNING_THRESHOLD",
-    "ESPRESSO_SEQUENCER_PRUNER_MINIMUM_RETENTION",
-    "ESPRESSO_SEQUENCER_PRUNER_TARGET_RETENTION",
-    "ESPRESSO_SEQUENCER_PRUNER_BATCH_SIZE",
-    "ESPRESSO_SEQUENCER_PRUNER_MAX_USAGE",
-    "ESPRESSO_SEQUENCER_PRUNER_INTERVAL",
-    "ESPRESSO_SEQUENCER_STORE_UNDECIDED_STATE",
-    "ESPRESSO_SEQUENCER_API_PORT",
-    "ESPRESSO_SEQUENCER_STORAGE_PATH",
-    "ESPRESSO_SEQUENCER_CHAIN_ID",
-    "ESPRESSO_SEQUENCER_MAX_BLOCK_SIZE",
-    "ESPRESSO_SEQUENCER_BASE_FEE",
-    "ESPRESSO_SEQUENCER_FEE_CONTRACT_PROXY_ADDRESS",
-    "ESPRESSO_SEQUENCER_FEE_RECIPIENT",
+    "ADDRESS",
+    "AMOUNT",
+    "BLOCK",
+    "CONFIRMATIONS",
+    "CONTRACT_ADDRESS",
+    "ESPRESSO_CDN_BROKER_CA_CERT_PATH",
     "ESPRESSO_CDN_BROKER_DISCOVERY_ENDPOINT",
-    "ESPRESSO_CDN_BROKER_PUBLIC_BIND_ENDPOINT",
-    "ESPRESSO_CDN_BROKER_PUBLIC_ADVERTISE_ENDPOINT",
     "ESPRESSO_CDN_BROKER_METRICS_BIND_ENDPOINT",
-    "ESPRESSO_CDN_BROKER_CA_CERT_PATH",
-    "ESPRESSO_CDN_MARSHAL_DISCOVERY_ENDPOINT",
+    "ESPRESSO_CDN_BROKER_PUBLIC_ADVERTISE_ENDPOINT",
+    "ESPRESSO_CDN_BROKER_PUBLIC_BIND_ENDPOINT",
     "ESPRESSO_CDN_MARSHAL_BIND_PORT",
-    "ESPRESSO_CDN_MARSHAL_METRICS_BIND_ENDPOINT",
     "ESPRESSO_CDN_MARSHAL_CA_CERT_PATH",
+    "ESPRESSO_CDN_MARSHAL_DISCOVERY_ENDPOINT",
+    "ESPRESSO_CDN_MARSHAL_METRICS_BIND_ENDPOINT",
     "ESPRESSO_CDN_WHITELIST_DISCOVERY_ENDPOINT",
-    "ESPRESSO_SEQUENCER_URL",
-    "ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS",
+    "ESPRESSO_COMMITMENT_TASK_DELAY",
     "ESPRESSO_COMMITMENT_TASK_PORT",
     "ESPRESSO_COMMITMENT_TASK_REQUEST_TIMEOUT",
-    "ESPRESSO_COMMITMENT_TASK_DELAY",
     "ESPRESSO_DEPLOYER_OUT_PATH",
-    "ESPRESSO_SEQUENCER_STAKE_TABLE_CAPACITY",
-    "ESPRESS_NASTY_CLIENT_HTTP_TIMEOUT",
-    "ESPRESSO_NASTY_CLIENT_PORT",
-    "ESPRESSO_NASTY_CLIENT_MAX_OPEN_STREAMS",
+    "ESPRESSO_NASTY_CLIENT_HTTP_TIMEOUT",
     "ESPRESSO_NASTY_CLIENT_MAX_BLOCKING_POLLS",
+    "ESPRESSO_NASTY_CLIENT_MAX_OPEN_STREAMS",
     "ESPRESSO_NASTY_CLIENT_MAX_RETRIES",
-    "ESPRESSO_NASTY_CLIENT_RETRY_DELAY",
     "ESPRESSO_NASTY_CLIENT_MIN_RETRIES",
+    "ESPRESSO_NASTY_CLIENT_PORT",
+    "ESPRESSO_NASTY_CLIENT_RETRY_DELAY",
     "ESPRESSO_NASTY_CLIENT_WEB_SOCKET_TIMEOUT",
-    "ESPRESSO_NASTY_CLIENT_WEIGHT_QUERY",
-    "ESPRESSO_NASTY_CLIENT_WEIGHT_OPEN_STREAM",
     "ESPRESSO_NASTY_CLIENT_WEIGHT_CLOSE_STREAM",
+    "ESPRESSO_NASTY_CLIENT_WEIGHT_OPEN_STREAM",
     "ESPRESSO_NASTY_CLIENT_WEIGHT_POLL_STREAM",
-    "ESPRESSO_NASTY_CLIENT_WEIGHT_QUERY_WINDOW",
-    "ESPRESSO_NASTY_CLIENT_WEIGHT_QUERY_NAMESPACE",
+    "ESPRESSO_NASTY_CLIENT_WEIGHT_QUERY",
     "ESPRESSO_NASTY_CLIENT_WEIGHT_QUERY_BLOCK_STATE",
     "ESPRESSO_NASTY_CLIENT_WEIGHT_QUERY_FEE_STATE",
-    "ESPRESSO_ORCHESTRATOR_PORT",
+    "ESPRESSO_NASTY_CLIENT_WEIGHT_QUERY_NAMESPACE",
+    "ESPRESSO_NASTY_CLIENT_WEIGHT_QUERY_WINDOW",
+    "ESPRESSO_ORCHESTRATOR_BUILDER_TIMEOUT",
+    "ESPRESSO_ORCHESTRATOR_BUILDER_URL",
+    "ESPRESSO_ORCHESTRATOR_LIBP2P_MESH_N",
+    "ESPRESSO_ORCHESTRATOR_NEXT_VIEW_TIMEOUT",
     "ESPRESSO_ORCHESTRATOR_NUM_NODES",
+    "ESPRESSO_ORCHESTRATOR_PORT",
+    "ESPRESSO_ORCHESTRATOR_ROUND_START_DELAY",
     "ESPRESSO_ORCHESTRATOR_START_DELAY",
-    "ESPRESSO_ORCHESTRATOR_NEXT_VIEW_TIMEOUT",
-    "ESPRESSO_ORCHESTRATOR_TIMEOUT_RATIO",
     "ESPRESSO_ORCHESTRATOR_START_THRESHOLD",
-    "ESPRESSO_ORCHESTRATOR_ROUND_START_DELAY",
-    "ESPRESSO_ORCHESTRATOR_LIBP2P_MESH_N",
-    "ESPRESSO_ORCHESTRATOR_BUILDER_URL",
-    "ESPRESSO_ORCHESTRATOR_BUILDER_TIMEOUT",
-    "ESPRESSO_SUBMIT_TRANSACTIONS_MIN_SIZE",
+    "ESPRESSO_ORCHESTRATOR_TIMEOUT_RATIO",
+    "ESPRESSO_PROVIDER",
+    "ESPRESSO_SEQUENCER_API_PEERS",
+    "ESPRESSO_SEQUENCER_API_PORT",
+    "ESPRESSO_SEQUENCER_CDN_ENDPOINT",
+    "ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS",
+    "ESPRESSO_SEQUENCER_HOTSHOT_EVENT_STREAMING_API_PORT",
+    "ESPRESSO_SEQUENCER_IS_DA",
+    "ESPRESSO_SEQUENCER_L1_EVENTS_MAX_BLOCK_RANGE",
+    "ESPRESSO_SEQUENCER_LIBP2P_ADVERTISE_ADDRESS",
+    "ESPRESSO_SEQUENCER_LIBP2P_BIND_ADDRESS",
+    "ESPRESSO_SEQUENCER_ORCHESTRATOR_URL",
+    "ESPRESSO_SEQUENCER_POSTGRES_DATABASE",
+    "ESPRESSO_SEQUENCER_POSTGRES_HOST",
+    "ESPRESSO_SEQUENCER_POSTGRES_PORT",
+    "ESPRESSO_SEQUENCER_POSTGRES_PRUNE",
+    "ESPRESSO_SEQUENCER_POSTGRES_USE_TLS",
+    "ESPRESSO_SEQUENCER_POSTGRES_USER",
+    "ESPRESSO_SEQUENCER_PRUNER_BATCH_SIZE",
+    "ESPRESSO_SEQUENCER_PRUNER_INTERVAL",
+    "ESPRESSO_SEQUENCER_PRUNER_MAX_USAGE",
+    "ESPRESSO_SEQUENCER_PRUNER_MINIMUM_RETENTION",
+    "ESPRESSO_SEQUENCER_PRUNER_PRUNING_THRESHOLD",
+    "ESPRESSO_SEQUENCER_PRUNER_TARGET_RETENTION",
+    "ESPRESSO_SEQUENCER_STATE_PEERS",
+    "ESPRESSO_SEQUENCER_STORAGE_PATH",
+    "ESPRESSO_SEQUENCER_STORE_UNDECIDED_STATE",
+    "ESPRESSO_SEQUENCER_URL",
+    "ESPRESSO_STATE_RELAY_SERVER_URL",
+    "ESPRESSO_SUBMIT_TRANSACTIONS_CHANNEL_BOUND",
+    "ESPRESSO_SUBMIT_TRANSACTIONS_DELAY",
+    "ESPRESSO_SUBMIT_TRANSACTIONS_JOBS",
+    "ESPRESSO_SUBMIT_TRANSACTIONS_MAX_BATCH_SIZE",
+    "ESPRESSO_SUBMIT_TRANSACTIONS_MAX_NAMESPACE",
     "ESPRESSO_SUBMIT_TRANSACTIONS_MAX_SIZE",
     "ESPRESSO_SUBMIT_TRANSACTIONS_MIN_BATCH_SIZE",
-    "ESPRESSO_SUBMIT_TRANSACTIONS_MAX_BATCH_SIZE",
     "ESPRESSO_SUBMIT_TRANSACTIONS_MIN_NAMESPACE",
-    "ESPRESSO_SUBMIT_TRANSACTIONS_MAX_NAMESPACE",
-    "ESPRESSO_SUBMIT_TRANSACTIONS_DELAY",
-    "ESPRESSO_SUBMIT_TRANSACTIONS_CHANNEL_BOUND",
-    "ESPRESSO_SUBMIT_TRANSACTIONS_JOBS",
+    "ESPRESSO_SUBMIT_TRANSACTIONS_MIN_SIZE",
     "ESPRESSO_SUBMIT_TRANSACTIONS_PENDING_TRANSACTIONS_WARNING_THRESHOLD",
-    "ESPRESSO_SUBMIT_TRANSACTIONS_SLOW_TRANSACTION_WARNING_THRESHOLD",
     "ESPRESSO_SUBMIT_TRANSACTIONS_PORT",
+    "ESPRESSO_SUBMIT_TRANSACTIONS_SLOW_TRANSACTION_WARNING_THRESHOLD",
     "ESPRESSO_SUBMIT_TRANSACTIONS_SUBMIT_URL",
-    "ESPRESSO_PROVIDER",
-    "CONTRACT_ADDRESS",
-    "AMOUNT",
-    "CONFIRMATIONS",
-    "ADDRESS",
-    "BLOCK",
     "FROM",
     "TO"
-]
+]

sequencer/src/api/endpoints.rs

@@ -2,7 +2,7 @@
 
 use serde::de::Error as _;
 use std::{
-    collections::{HashMap, HashSet},
+    collections::{BTreeSet, HashMap},
     env,
 };
 
@@ -341,7 +341,7 @@ fn get_public_env_vars() -> Result<Vec<String>> {
         .clone()
         .into_iter()
         .map(|v| v.try_into())
-        .collect::<Result<HashSet<String>, toml::de::Error>>()?;
+        .collect::<Result<BTreeSet<String>, toml::de::Error>>()?;
 
     let hashmap: HashMap<String, String> = env::vars().collect();
     let mut public_env_vars: Vec<String> = Vec::new();