chore: kill different blob sink urls

AztecProtocol · Jan 18, 2025 · ea372de · ea372de
1 parent 942d2dd
commit ea372de
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/yarn-project/blob-sink/src/client/config.ts b/yarn-project/blob-sink/src/client/config.ts
@@ -22,7 +22,7 @@ export interface BlobSinkConfig {
 
 export const blobSinkConfigMapping: ConfigMappingsType<BlobSinkConfig> = {
   blobSinkUrl: {
-    env: 'SEQ_BLOB_SINK_URL',
+    env: 'BLOB_SINK_URL',
     description: 'The URL of the blob sink',
   },
   l1RpcUrl: {

diff --git a/yarn-project/end-to-end/scripts/native-network/boot-node.sh b/yarn-project/end-to-end/scripts/native-network/boot-node.sh
@@ -20,7 +20,7 @@ export ETHEREUM_HOST=${ETHEREUM_HOST:-"http://127.0.0.1:8545"}
 export L1_CONSENSUS_HOST_URL=${L1_CONSENSUS_HOST_URL:-}
 export P2P_ENABLED="true"
 export VALIDATOR_DISABLED="true"
-export SEQ_BLOB_SINK_URL="http://127.0.0.1:${BLOB_SINK_PORT:-5053}"
+export BLOB_SINK_URL="http://127.0.0.1:${BLOB_SINK_PORT:-5053}"
 export SEQ_MAX_SECONDS_BETWEEN_BLOCKS="0"
 export SEQ_MIN_TX_PER_BLOCK="1"
 export P2P_TCP_ANNOUNCE_ADDR="127.0.0.1:40400"

diff --git a/yarn-project/end-to-end/scripts/native-network/prover-node.sh b/yarn-project/end-to-end/scripts/native-network/prover-node.sh
@@ -44,7 +44,7 @@ export PROVER_AGENT_COUNT="1"
 export PROVER_AGENT_ENABLED="true"
 export PROVER_PUBLISHER_PRIVATE_KEY=${PROVER_PUBLISHER_PRIVATE_KEY:-"0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"}
 export PROVER_COORDINATION_NODE_URL="http://127.0.0.1:8080"
-export PROVER_BLOB_SINK_URL="http://127.0.0.1:${BLOB_SINK_PORT:-5053}"
+export BLOB_SINK_URL="http://127.0.0.1:${BLOB_SINK_PORT:-5053}"
 export AZTEC_NODE_URL="http://127.0.0.1:8080"
 export OTEL_RESOURCE_ATTRIBUTES="service.name=prover-node-${PORT}"
 export OTEL_EXPORTER_OTLP_METRICS_ENDPOINT="${OTEL_EXPORTER_OTLP_METRICS_ENDPOINT:-}"

diff --git a/yarn-project/end-to-end/scripts/native-network/validator.sh b/yarn-project/end-to-end/scripts/native-network/validator.sh
@@ -77,7 +77,7 @@ export P2P_TCP_ANNOUNCE_ADDR="127.0.0.1:$P2P_PORT"
 export P2P_UDP_ANNOUNCE_ADDR="127.0.0.1:$P2P_PORT"
 export P2P_TCP_LISTEN_ADDR="0.0.0.0:$P2P_PORT"
 export P2P_UDP_LISTEN_ADDR="0.0.0.0:$P2P_PORT"
-export SEQ_BLOB_SINK_URL="http://127.0.0.1:${BLOB_SINK_PORT:-5053}"
+export BLOB_SINK_URL="http://127.0.0.1:${BLOB_SINK_PORT:-5053}"
 export L1_CHAIN_ID=${L1_CHAIN_ID:-31337}
 export OTEL_RESOURCE_ATTRIBUTES="service.name=validator-node-${PORT}"
 export OTEL_EXPORTER_OTLP_METRICS_ENDPOINT="${OTEL_EXPORTER_OTLP_METRICS_ENDPOINT:-}"

diff --git a/yarn-project/foundation/src/config/env_var.ts b/yarn-project/foundation/src/config/env_var.ts
@@ -17,6 +17,7 @@ export type EnvVar =
   | 'BB_WORKING_DIRECTORY'
   | 'BOOTSTRAP_NODES'
   | 'BLOB_SINK_PORT'
+  | 'BLOB_SINK_URL'
   | 'BOT_DA_GAS_LIMIT'
   | 'BOT_FEE_PAYMENT_METHOD'
   | 'BOT_FLUSH_SETUP_TRANSACTIONS'
@@ -103,7 +104,6 @@ export type EnvVar =
   | 'P2P_UDP_LISTEN_ADDR'
   | 'P2P_ARCHIVED_TX_LIMIT'
   | 'PEER_ID_PRIVATE_KEY'
-  | 'PROVER_BLOB_SINK_URL'
   | 'PROOF_VERIFIER_L1_START_BLOCK'
   | 'PROOF_VERIFIER_POLL_INTERVAL_MS'
   | 'PROVER_AGENT_ENABLED'
@@ -143,7 +143,6 @@ export type EnvVar =
   | 'REGISTRY_CONTRACT_ADDRESS'
   | 'ROLLUP_CONTRACT_ADDRESS'
   | 'SEQ_ALLOWED_SETUP_FN'
-  | 'SEQ_BLOB_SINK_URL'
   | 'SEQ_MAX_BLOCK_SIZE_IN_BYTES'
   | 'SEQ_MAX_TX_PER_BLOCK'
   | 'SEQ_MIN_TX_PER_BLOCK'

diff --git a/yarn-project/sequencer-client/src/publisher/config.ts b/yarn-project/sequencer-client/src/publisher/config.ts
@@ -78,7 +78,7 @@ export const getPublisherConfigMappings: (
   },
   ...l1TxUtilsConfigMappings,
   blobSinkUrl: {
-    env: `${scope}_BLOB_SINK_URL`,
+    env: 'BLOB_SINK_URL',
     description: 'The URL of the blob sink.',
     parseEnv: (val?: string) => val,
   },