diff --git a/aztec-up/bin/.aztec-run b/aztec-up/bin/.aztec-run index 34503e27fc8d..d374e63ded73 100755 --- a/aztec-up/bin/.aztec-run +++ b/aztec-up/bin/.aztec-run @@ -110,9 +110,21 @@ for env in ${ENV_VARS_TO_INJECT:-}; do fi done +arg_port_assignment="" + # Dynamic port assignment. if [ -n "${AZTEC_PORT:-}" ]; then - arg_port_assignment="-p $AZTEC_PORT:$AZTEC_PORT" + arg_port_assignment+=" -p $AZTEC_PORT:$AZTEC_PORT " +fi + +if [ -n "${P2P_TCP_LISTEN_ADDR:-}" ]; then + P2P_TCP_PORT=${P2P_TCP_LISTEN_ADDR#*:} + arg_port_assignment+=" -p $P2P_TCP_PORT:$P2P_TCP_PORT " +fi + +if [ -n "${P2P_UDP_LISTEN_ADDR:-}" ]; then + P2P_UDP_PORT=${P2P_UDP_LISTEN_ADDR#*:} + arg_port_assignment+=" -p $P2P_UDP_PORT:$P2P_UDP_PORT/udp " fi # For debugging the aztec-up scripts, can be useful to mount local code into container. diff --git a/yarn-project/aztec/src/cli/chain_l2_config.ts b/yarn-project/aztec/src/cli/chain_l2_config.ts index 61c45ccd65c3..a09594cd80d4 100644 --- a/yarn-project/aztec/src/cli/chain_l2_config.ts +++ b/yarn-project/aztec/src/cli/chain_l2_config.ts @@ -10,6 +10,8 @@ export type L2ChainConfig = { p2pEnabled: boolean; p2pBootstrapNodes: string[]; registryAddress: string; + seqMinTxsPerBlock: number; + seqMaxTxsPerBlock: number; }; export const testnetIgnitionL2ChainConfig: L2ChainConfig = { @@ -22,6 +24,8 @@ export const testnetIgnitionL2ChainConfig: L2ChainConfig = { p2pEnabled: true, p2pBootstrapNodes: [], registryAddress: '0x12b3ebc176a1646b911391eab3760764f2e05fe3', + seqMinTxsPerBlock: 0, + seqMaxTxsPerBlock: 0, }; export async function getBootnodes(networkName: NetworkNames) { @@ -65,4 +69,6 @@ export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames enrichVar('P2P_ENABLED', config.p2pEnabled.toString()); enrichVar('L1_CHAIN_ID', config.l1ChainId.toString()); enrichVar('REGISTRY_CONTRACT_ADDRESS', config.registryAddress); + enrichVar('SEQ_MIN_TX_PER_BLOCK', config.seqMinTxsPerBlock.toString()); + enrichVar('SEQ_MAX_TX_PER_BLOCK', config.seqMaxTxsPerBlock.toString()); }