Skip to content

Commit e1d65f3

Browse files
committed
chore: kill different blob sink urls
1 parent f695f4a commit e1d65f3

File tree

6 files changed

+6
-7
lines changed

6 files changed

+6
-7
lines changed

yarn-project/blob-sink/src/client/config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export interface BlobSinkConfig {
2222

2323
export const blobSinkConfigMapping: ConfigMappingsType<BlobSinkConfig> = {
2424
blobSinkUrl: {
25-
env: 'SEQ_BLOB_SINK_URL',
25+
env: 'BLOB_SINK_URL',
2626
description: 'The URL of the blob sink',
2727
},
2828
l1RpcUrl: {

yarn-project/end-to-end/scripts/native-network/boot-node.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export ETHEREUM_HOST=${ETHEREUM_HOST:-"http://127.0.0.1:8545"}
2020
export L1_CONSENSUS_HOST_URL=${L1_CONSENSUS_HOST_URL:-}
2121
export P2P_ENABLED="true"
2222
export VALIDATOR_DISABLED="true"
23-
export SEQ_BLOB_SINK_URL="http://127.0.0.1:${BLOB_SINK_PORT:-5053}"
23+
export BLOB_SINK_URL="http://127.0.0.1:${BLOB_SINK_PORT:-5053}"
2424
export SEQ_MAX_SECONDS_BETWEEN_BLOCKS="0"
2525
export SEQ_MIN_TX_PER_BLOCK="1"
2626
export P2P_TCP_ANNOUNCE_ADDR="127.0.0.1:40400"

yarn-project/end-to-end/scripts/native-network/prover-node.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export PROVER_AGENT_COUNT="1"
4444
export PROVER_AGENT_ENABLED="true"
4545
export PROVER_PUBLISHER_PRIVATE_KEY=${PROVER_PUBLISHER_PRIVATE_KEY:-"0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"}
4646
export PROVER_COORDINATION_NODE_URL="http://127.0.0.1:8080"
47-
export PROVER_BLOB_SINK_URL="http://127.0.0.1:${BLOB_SINK_PORT:-5053}"
47+
export BLOB_SINK_URL="http://127.0.0.1:${BLOB_SINK_PORT:-5053}"
4848
export AZTEC_NODE_URL="http://127.0.0.1:8080"
4949
export OTEL_RESOURCE_ATTRIBUTES="service.name=prover-node-${PORT}"
5050
export OTEL_EXPORTER_OTLP_METRICS_ENDPOINT="${OTEL_EXPORTER_OTLP_METRICS_ENDPOINT:-}"

yarn-project/end-to-end/scripts/native-network/validator.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export P2P_TCP_ANNOUNCE_ADDR="127.0.0.1:$P2P_PORT"
7777
export P2P_UDP_ANNOUNCE_ADDR="127.0.0.1:$P2P_PORT"
7878
export P2P_TCP_LISTEN_ADDR="0.0.0.0:$P2P_PORT"
7979
export P2P_UDP_LISTEN_ADDR="0.0.0.0:$P2P_PORT"
80-
export SEQ_BLOB_SINK_URL="http://127.0.0.1:${BLOB_SINK_PORT:-5053}"
80+
export BLOB_SINK_URL="http://127.0.0.1:${BLOB_SINK_PORT:-5053}"
8181
export L1_CHAIN_ID=${L1_CHAIN_ID:-31337}
8282
export OTEL_RESOURCE_ATTRIBUTES="service.name=validator-node-${PORT}"
8383
export OTEL_EXPORTER_OTLP_METRICS_ENDPOINT="${OTEL_EXPORTER_OTLP_METRICS_ENDPOINT:-}"

yarn-project/foundation/src/config/env_var.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export type EnvVar =
1717
| 'BB_WORKING_DIRECTORY'
1818
| 'BOOTSTRAP_NODES'
1919
| 'BLOB_SINK_PORT'
20+
| 'BLOB_SINK_URL'
2021
| 'BOT_DA_GAS_LIMIT'
2122
| 'BOT_FEE_PAYMENT_METHOD'
2223
| 'BOT_FLUSH_SETUP_TRANSACTIONS'
@@ -102,7 +103,6 @@ export type EnvVar =
102103
| 'P2P_UDP_ANNOUNCE_ADDR'
103104
| 'P2P_UDP_LISTEN_ADDR'
104105
| 'PEER_ID_PRIVATE_KEY'
105-
| 'PROVER_BLOB_SINK_URL'
106106
| 'PROOF_VERIFIER_L1_START_BLOCK'
107107
| 'PROOF_VERIFIER_POLL_INTERVAL_MS'
108108
| 'PROVER_AGENT_ENABLED'
@@ -141,7 +141,6 @@ export type EnvVar =
141141
| 'REGISTRY_CONTRACT_ADDRESS'
142142
| 'ROLLUP_CONTRACT_ADDRESS'
143143
| 'SEQ_ALLOWED_SETUP_FN'
144-
| 'SEQ_BLOB_SINK_URL'
145144
| 'SEQ_MAX_BLOCK_SIZE_IN_BYTES'
146145
| 'SEQ_MAX_TX_PER_BLOCK'
147146
| 'SEQ_MIN_TX_PER_BLOCK'

yarn-project/sequencer-client/src/publisher/config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export const getPublisherConfigMappings: (
7878
},
7979
...l1TxUtilsConfigMappings,
8080
blobSinkUrl: {
81-
env: `${scope}_BLOB_SINK_URL`,
81+
env: 'BLOB_SINK_URL',
8282
description: 'The URL of the blob sink.',
8383
parseEnv: (val?: string) => val,
8484
},

0 commit comments

Comments
 (0)