diff --git a/spartan/aztec-network/values/alpha-testnet.yaml b/spartan/aztec-network/values/alpha-testnet.yaml index 90c422ad40bd..dd7f27051c6e 100644 --- a/spartan/aztec-network/values/alpha-testnet.yaml +++ b/spartan/aztec-network/values/alpha-testnet.yaml @@ -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: diff --git a/spartan/scripts/upgrade_rollup_with_lock.sh b/spartan/scripts/upgrade_rollup_with_lock.sh index 4de73750ad33..5e06b03b942b 100755 --- a/spartan/scripts/upgrade_rollup_with_lock.sh +++ b/spartan/scripts/upgrade_rollup_with_lock.sh @@ -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') diff --git a/yarn-project/aztec/src/cli/chain_l2_config.ts b/yarn-project/aztec/src/cli/chain_l2_config.ts index 97718e5b6ffc..f0cf184965f7 100644 --- a/yarn-project/aztec/src/cli/chain_l2_config.ts +++ b/yarn-project/aztec/src/cli/chain_l2_config.ts @@ -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, diff --git a/yarn-project/cli/src/cmds/l1/deploy_l1_contracts.ts b/yarn-project/cli/src/cmds/l1/deploy_l1_contracts.ts index 30d693f23ed0..0080535a82b9 100644 --- a/yarn-project/cli/src/cmds/l1/deploy_l1_contracts.ts +++ b/yarn-project/cli/src/cmds/l1/deploy_l1_contracts.ts @@ -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, @@ -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()}`); } } diff --git a/yarn-project/cli/src/cmds/l1/deploy_new_rollup.ts b/yarn-project/cli/src/cmds/l1/deploy_new_rollup.ts index 08e4b44cfebb..50fa2ca40955 100644 --- a/yarn-project/cli/src/cmds/l1/deploy_new_rollup.ts +++ b/yarn-project/cli/src/cmds/l1/deploy_new_rollup.ts @@ -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, @@ -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, @@ -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()}`); } }