Skip to content

chore: New rollup values #13083

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 3 commits into from
Mar 27, 2025
Merged

chore: New rollup values #13083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90c3bd2
New rollup values
PhilWindle Mar 27, 2025
ab60e9d
Fixes
PhilWindle Mar 27, 2025
ea95d04
Log line fix
PhilWindle Mar 27, 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
4 changes: 2 additions & 2 deletions spartan/aztec-network/values/alpha-testnet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ aztec:
bootstrapENRs: "enr:-LO4QLbJddVpePYjaiCftOBY-L7O6Mfj_43TAn5Q1Y-5qQ_OWmSFc7bTKWHzw5xmdVIqXUiizum_kIRniXdPnWHHcwEEhWF6dGVjqDAwLTExMTU1MTExLTAwMDAwMDAwLTAtMTgwNmEwMjgtMWE1MzBmM2KCaWSCdjSCaXCEI8nh9YlzZWNwMjU2azGhA-_dX6aFcXP1DLk91negbXL2a0mNYGXH4hrMvb2i92I0g3VkcIKd0A,enr:-LO4QN4WF8kFyV3sQVX0C_y_03Eepxk5Wac70l9QJcIDRYwKS6aRst1YcfbTDdvovXdRfKf-WSXNVWViGLhDA-dUz2MEhWF6dGVjqDAwLTExMTU1MTExLTAwMDAwMDAwLTAtMTgwNmEwMjgtMWE1MzBmM2KCaWSCdjSCaXCEIicTHolzZWNwMjU2azGhAsz7aFFYRnP5xjTux5UW-HyEQcW_EJrZMT1CNm79N4g-g3VkcIKd0A,enr:-LO4QFrGfkRaCk_iFTeUjR5ESwo45Eov9hx_T1-BLdoT-iHzFgCiHMT4V1KBtdFp8D0ajLSe5HcNYrhalmdJXgv6NTUEhWF6dGVjqDAwLTExMTU1MTExLTAwMDAwMDAwLTAtMTgwNmEwMjgtMWE1MzBmM2KCaWSCdjSCaXCEIlICt4lzZWNwMjU2azGhAlC6nKB3iDtRFqWKWqxf_t-P9hc-SZ6VFBJV4y3bTZBQg3VkcIKd0A"
contracts:
registryAddress: "0xad85d55a4bbef35e95396191c22903aa717edf1c"
rollupAddress: "0x8e9152bb1b0577ea82508c001785e92fc96035fd"
slashFactoryAddress: "0xf667f50fd68b30c38b12d29fee537fa5ea158eb8"
rollupAddress: "0xee29e2cfdf6bac577e7a6497a6d61856be22c9f1"
slashFactoryAddress: ""
feeAssetHandlerContractAddress: "0xf0664fec6ac15313e18d5ad8225e46b7c6463338"

network:
Expand Down
4 changes: 3 additions & 1 deletion spartan/scripts/upgrade_rollup_with_lock.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,9 @@ if [ -n "$DEPOSIT_AMOUNT" ]; then
$EXE deposit-governance-tokens -r $REGISTRY --recipient $MY_ADDR -a $DEPOSIT_AMOUNT $MINT
fi

PAYLOAD=$($EXE deploy-new-rollup -r $REGISTRY --salt $SALT --json $TEST_ACCOUNTS $SPONSORED_FPC | jq -r '.payloadAddress')
OUTPUT=$($EXE deploy-new-rollup -r $REGISTRY --salt $SALT --json $TEST_ACCOUNTS $SPONSORED_FPC)

PAYLOAD=$(echo $OUTPUT | jq -r '.payloadAddress')

PROPOSAL_ID=$($EXE propose-with-lock -r $REGISTRY --payload-address $PAYLOAD --json | jq -r '.proposalId')

Expand Down
6 changes: 3 additions & 3 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 @@ -46,12 +46,12 @@ export const alphaTestnetL2ChainConfig: L2ChainConfig = {
aztecSlotDuration: 36,
aztecEpochDuration: 32,
aztecProofSubmissionWindow: 64,
testAccounts: true,
sponsoredFPC: false,
testAccounts: false,
sponsoredFPC: true,
p2pEnabled: true,
p2pBootstrapNodes: [],
registryAddress: '0xad85d55a4bbef35e95396191c22903aa717edf1c',
slashFactoryAddress: '0xf667f50fd68b30c38b12d29fee537fa5ea158eb8',
slashFactoryAddress: '',
feeAssetHandlerAddress: '0xf0664fec6ac15313e18d5ad8225e46b7c6463338',
seqMinTxsPerBlock: 0,
seqMaxTxsPerBlock: 4,
Expand Down
17 changes: 7 additions & 10 deletions yarn-project/cli/src/cmds/l1/deploy_l1_contracts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,10 @@ export async function deployL1Contracts(
) {
const config = getL1ContractsConfigEnvVars();

const initialFundedAccounts = testAccounts ? await getInitialTestAccounts() : [];
const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
const { genesisBlockHash, genesisArchiveRoot } = await getGenesisValues(
initialFundedAccounts.map(a => a.address).concat(sponsoredFPCAddress),
);

log(`Deploying Aztec contracts to chain ${chainId}...`);
log(`Initial funded accounts: ${initialFundedAccounts.map(a => a.address.toString()).join(', ')}`);
log(`Initial validators: ${initialValidators.map(a => a.toString()).join(', ')}`);
log(`Genesis block hash: ${genesisBlockHash.toString()}`);
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddress);
const { genesisBlockHash, genesisArchiveRoot } = await getGenesisValues(initialFundedAccounts);

const { l1ContractAddresses } = await deployAztecContracts(
rpcUrls,
Expand Down Expand Up @@ -73,5 +66,9 @@ export async function deployL1Contracts(
log(`Governance Address: ${l1ContractAddresses.governanceAddress.toString()}`);
log(`SlashFactory Address: ${l1ContractAddresses.slashFactoryAddress?.toString()}`);
log(`FeeAssetHandler Address: ${l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
log(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
log(`Initial validators: ${initialValidators.map(a => a.toString()).join(', ')}`);
log(`Genesis block hash: ${genesisBlockHash.toString()}`);
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
}
}
21 changes: 11 additions & 10 deletions yarn-project/cli/src/cmds/l1/deploy_new_rollup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,10 @@ export async function deployNewRollup(
) {
const config = getL1ContractsConfigEnvVars();

const initialFundedAccounts = testAccounts ? await getInitialTestAccounts() : [];
const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
const { genesisBlockHash, genesisArchiveRoot } = await getGenesisValues(
initialFundedAccounts.map(a => a.address).concat(sponsoredFPCAddress),
);

log(`Deploying new rollup contracts to chain ${chainId}...`);
log(`Initial funded accounts: ${initialFundedAccounts.map(a => a.address.toString()).join(', ')}`);
log(`Initial validators: ${initialValidators.map(a => a.toString()).join(', ')}`);
log(`Genesis block hash: ${genesisBlockHash.toString()}`);
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddress);
const { genesisBlockHash, genesisArchiveRoot } = await getGenesisValues(initialFundedAccounts);

const { payloadAddress, rollup } = await deployNewRollupContracts(
registryAddress,
Expand All @@ -57,6 +50,10 @@ export async function deployNewRollup(
{
payloadAddress: payloadAddress.toString(),
rollupAddress: rollup.address,
initialFundedAccounts: initialFundedAccounts.map(a => a.toString()),
initialValidators: initialValidators.map(a => a.toString()),
genesisBlockHash: genesisBlockHash.toString(),
genesisArchiveRoot: genesisArchiveRoot.toString(),
},
null,
2,
Expand All @@ -65,5 +62,9 @@ export async function deployNewRollup(
} else {
log(`Payload Address: ${payloadAddress.toString()}`);
log(`Rollup Address: ${rollup.address}`);
log(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
log(`Initial validators: ${initialValidators.map(a => a.toString()).join(', ')}`);
log(`Genesis block hash: ${genesisBlockHash.toString()}`);
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
}
}