Merge pull request #20 from chainbound/feat/keystore-secrets-path

feat: keystore secrets path
chainbound · Oct 18, 2024 · 001b26f · 001b26f
2 parents 1f25f1f + 30300ec
commit 001b26f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/src/mev/bolt_sidecar/bolt_sidecar_launcher.star b/src/mev/bolt_sidecar/bolt_sidecar_launcher.star
@@ -27,6 +27,7 @@ def launch_bolt_sidecar(
 
     node_keystore_path = validator_keystore_generator.NODE_KEYSTORES_OUTPUT_DIRPATH_FORMAT_STR.format(sidecar_config["participant_index"])
     full_keystore_path = "{0}{1}/keys".format(BOLT_SIDECAR_KEYS_DIRMOUNT_PATH_ON_SERVICE, node_keystore_path)
+    full_keystore_secrets_path = "{0}{1}/secrets".format(BOLT_SIDECAR_KEYS_DIRMOUNT_PATH_ON_SERVICE, node_keystore_path)
 
     api = plan.add_service(
         name=sidecar_config["service_name"],
@@ -35,38 +36,38 @@ def launch_bolt_sidecar(
             cmd=[
                 "--port",
                 str(BOLT_SIDECAR_COMMITMENTS_API_PORT),
-                # "--private-key",
-                # Random private key for testing, generated with `openssl rand -hex 32`
-                # "18d1c5302e734fd6fbfaa51828d42c4c6d3cbe020c42bab7dd15a2799cf00b82",
-                "--keystore-password",
-                validator_keystore_generator.PRYSM_PASSWORD,
-                "--keystore-path",
-                full_keystore_path,
-                "--constraints-url",
-                sidecar_config["constraints_api_url"],
-                "--constraints-proxy-port",
-                str(input_parser.FLASHBOTS_MEV_BOOST_PORT),
-                "--beacon-api-url",
-                sidecar_config["beacon_api_url"],
                 "--execution-api-url",
                 sidecar_config["execution_api_url"],
+                "--beacon-api-url",
+                sidecar_config["beacon_api_url"],
                 "--engine-api-url",
                 sidecar_config["engine_api_url"],
+                "--constraints-api-url",
+                sidecar_config["constraints_api_url"],
+                "--constraints-proxy-port",
+                str(input_parser.FLASHBOTS_MEV_BOOST_PORT),
+                "--validator-indexes",
+                "0..64",
+                "--engine-jwt-hex",
+                sidecar_config["jwt_hex"],
                 "--fee-recipient",
                 "0x0000000000000000000000000000000000000000",
-                "--jwt-hex",
-                sidecar_config["jwt_hex"],
-                "--builder_private_key",
-                # Random private key for testing
-                "0x240872ca0812e33503482a886e05dfe30ae9cf757bf5c040e70eac685e419c6e"
+                "--builder-private-key", # Random private key for testing
+                "0x20c815cb2d37561479c7b6cae9737356b144760d00f1387bff17df4a3712c262",
+                "--commitment-private-key", # Random private key for testing
+                "0x18d1c5302e734fd6fbfaa51828d42c4c6d3cbe020c42bab7dd15a2799cf00b82",
                 "--commitment-deadline",
                 str(100),
                 "--chain",
-                "kurtosis",
-                "--validator-indexes",
-                "0..64",
+                network_params.network,
                 "--slot-time",
                 str(network_params.seconds_per_slot),
+                # "--keystore-password",
+                # validator_keystore_generator.PRYSM_PASSWORD,
+                "--keystore-secrets-path",
+                full_keystore_secrets_path,
+                "--keystore-path",
+                full_keystore_path,
                 "--metrics-port",
                 str(BOLT_SIDECAR_METRICS_PORT),
             ],

diff --git a/src/prelaunch_data_generator/validator_keystores/validator_keystore_generator.star b/src/prelaunch_data_generator/validator_keystores/validator_keystore_generator.star
@@ -10,8 +10,8 @@ PRYSM_PASSWORD_FILEPATH_ON_GENERATOR = "/tmp/prysm-password.txt"
 
 KEYSTORES_GENERATION_TOOL_NAME = "/app/eth2-val-tools"
 
-# ETH_VAL_TOOLS_IMAGE = "protolambda/eth2-val-tools:latest"
-ETH_VAL_TOOLS_IMAGE = "ghcr.io/chainbound/eth2-val-tools:0.1.0"
+ETH_VAL_TOOLS_IMAGE = "protolambda/eth2-val-tools:latest"
+# ETH_VAL_TOOLS_IMAGE = "ghcr.io/chainbound/eth2-val-tools:0.1.0"
 
 SUCCESSFUL_EXEC_CMD_EXIT_CODE = 0