Skip to content

chore: More config defaults and forward p2p ports #12529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PhilWindle merged 2 commits into from
Mar 6, 2025
Merged

chore: More config defaults and forward p2p ports #12529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f39be02
More config defaults and forward p2p ports
PhilWindle Mar 6, 2025
53ee66f
Add space
PhilWindle Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion aztec-up/bin/.aztec-run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 6 additions & 0 deletions yarn-project/aztec/src/cli/chain_l2_config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ export type L2ChainConfig = {
p2pEnabled: boolean;
p2pBootstrapNodes: string[];
registryAddress: string;
seqMinTxsPerBlock: number;
seqMaxTxsPerBlock: number;
};

export const testnetIgnitionL2ChainConfig: L2ChainConfig = {
Expand All @@ -22,6 +24,8 @@ export const testnetIgnitionL2ChainConfig: L2ChainConfig = {
p2pEnabled: true,
p2pBootstrapNodes: [],
registryAddress: '0x12b3ebc176a1646b911391eab3760764f2e05fe3',
seqMinTxsPerBlock: 0,
seqMaxTxsPerBlock: 0,
};

export async function getBootnodes(networkName: NetworkNames) {
Expand Down Expand Up @@ -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());
}