chore: Cleanup and re-specify sequencer config in RC1

docs/docs/developers/reference/environment_reference/sandbox-reference.md

@@ -67,8 +67,6 @@ ROLLUP_CONTRACT_ADDRESS=0x01234567890abcde01234567890abcde
 SEQ_PUBLISHER_PRIVATE_KEY=0x01234567890abcde01234567890abcde # Private key of an ethereum account that will be used by the sequencer to publish blocks.
 SEQ_MAX_TX_PER_BLOCK=32 # Maximum txs to go on a block. (default: 32)
 SEQ_MIN_TX_PER_BLOCK=1 # Minimum txs to go on a block. (default: 1)
-SEQ_MAX_SECONDS_BETWEEN_BLOCKS=0 # Sequencer will produce a block with less than the min number of txs once this threshold is reached. (default: 0, means disabled)
-SEQ_MIN_SECONDS_BETWEEN_BLOCKS=0 # Minimum seconds to wait between consecutive blocks. (default: 0)
 
 ## Validator variables ##
 VALIDATOR_PRIVATE_KEY=0x01234567890abcde01234567890abcde  # Private key of the ethereum account that will be used to perform validator duties

docs/docs/run_node/guides/run_nodes/how_to_run_sequencer_draft.md

@@ -95,8 +95,6 @@ The Sequencer Client is a criticial component that coordinates tx validation, L2
 | SEQ_ENFORCE_TIME_TABLE                     | Whether to enforce strict timeliness requirement when building blocks. Refer [here](#sequencer-timeliness-requirements) for more on the timetable                   |
 | SEQ_MAX_TX_PER_BLOCK                       | Increase this to make larger blocks                                                                                                                                 |
 | SEQ_MIN_TX_PER_BLOCK                       | Increase this to require making larger blocks                                                                                                                       |
-| SEQ_MIN_SECONDS_BETWEEN_BLOCKS             | If greater than zero, the sequencer will not propose a block until this much time has passed since the last L2 block was published to L1                            |
-| SEQ_MAX_SECONDS_BETWEEN_BLOCKS             | Sequencer will ignore the minTxPerBlock if this many seconds have passed since the last L2 block.                                                                   |
 | COINBASE                                   | This is the Ethereum address that will receive the validator's share of block rewards. It defaults to your validator address.                                       |
 | FEE_RECIPIENT                              | This is the Aztec address that will receive the validator's share of transaction fees. Also defaults to your validator's address (but on Aztec L2).                 |
 

spartan/aztec-network/templates/validator.yaml

@@ -141,8 +141,6 @@ spec:
               value: "{{ .Values.validator.validator.disabled }}"
             - name: VALIDATOR_REEXECUTE
               value: "{{ .Values.validator.validator.reexecute }}"
-            - name: SEQ_MAX_SECONDS_BETWEEN_BLOCKS
-              value: "{{ .Values.validator.sequencer.maxSecondsBetweenBlocks }}"
             - name: SEQ_MIN_TX_PER_BLOCK
               value: "{{ .Values.validator.sequencer.minTxsPerBlock }}"
             - name: SEQ_MAX_TX_PER_BLOCK

spartan/aztec-network/values.yaml

@@ -149,7 +149,6 @@ validator:
     nodePort: 8080
   logLevel: "debug; info: aztec:simulator, json-rpc"
   sequencer:
-    maxSecondsBetweenBlocks: 0
     minTxsPerBlock: 0
     maxTxsPerBlock: 4
     enforceTimeTable: true

spartan/aztec-network/values/rc-1.yaml

@@ -19,6 +19,10 @@ validator:
   replicas: 48
   validator:
     disabled: false
+  sequencer:
+    minTxsPerBlock: 0
+    maxTxsPerBlock: 4
+    enforceTimeTable: true
 
 bootNode:
   peerIdPrivateKey: 080212200ba8451c6d62b03c4441f0a466c0bce7a3a595f2cf50a055ded3305c77aa3af0

spartan/releases/README.md

@@ -84,8 +84,6 @@ The Sequencer Client is a criticial component that coordinates tx validation, L2
 | SEQ_ENFORCE_TIME_TABLE                     | Whether to enforce strict timeliness requirement when building blocks. Refer [here](#sequencer-timeliness-requirements) for more on the timetable                   |
 | SEQ_MAX_TX_PER_BLOCK                       | Increase this to make larger blocks                                                                                                                                 |
 | SEQ_MIN_TX_PER_BLOCK                       | Increase this to require making larger blocks                                                                                                                       |
-| SEQ_MIN_SECONDS_BETWEEN_BLOCKS             | If greater than zero, the sequencer will not propose a block until this much time has passed since the last L2 block was published to L1                            |
-| SEQ_MAX_SECONDS_BETWEEN_BLOCKS             | Sequencer will ignore the minTxPerBlock if this many seconds have passed since the last L2 block.                                                                   |
 | COINBASE                                   | This is the Ethereum address that will receive the validator's share of block rewards. It defaults to your validator address.                                       |
 | FEE_RECIPIENT                              | This is the Aztec address that will receive the validator's share of transaction fees. Also defaults to your validator's address (but on Aztec L2).                 |
 

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

@@ -20,7 +20,6 @@ export L1_CONSENSUS_HOST_URL=${L1_CONSENSUS_HOST_URL:-}
 export P2P_ENABLED="true"
 export VALIDATOR_DISABLED="true"
 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_IP="127.0.0.1"
 export P2P_PORT="40400"

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

@@ -62,7 +62,6 @@ export LOG_LEVEL=${LOG_LEVEL:-"verbose"}
 export L1_CONSENSUS_HOST_URL=${L1_CONSENSUS_HOST_URL:-}
 export P2P_ENABLED="true"
 export VALIDATOR_DISABLED="false"
-export SEQ_MAX_SECONDS_BETWEEN_BLOCKS="0"
 export SEQ_MIN_TX_PER_BLOCK="1"
 export P2P_IP="127.0.0.1"
 export P2P_PORT="$P2P_PORT"

yarn-project/end-to-end/scripts/start_p2p_e2e.sh

@@ -8,8 +8,6 @@ export WS_CHECK_INTERVAL=50
 export SEQ_TX_POLLING_INTERVAL=50
 export SEQ_MAX_TX_PER_BLOCK=32
 export SEQ_MIN_TX_PER_BLOCK=32
-export SEQ_MAX_SECONDS_BETWEEN_BLOCKS=0
-export SEQ_MIN_SECONDS_BETWEEN_BLOCKS=0
 export BOOTSTRAP_NODES='/ip4/127.0.0.1/tcp/40400/p2p/12D3KooWGBpbC6qQFkaCYphjNeY6sV99o4SnEWyTeBigoVriDn4D'
 export P2P_PORT='40400'
 export P2P_NAT_ENABLED='false'