Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/nightly-nextnet-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
needs: get-latest-tag
uses: ./.github/workflows/network-deploy.yml
with:
ref: next
ref: ${{ github.ref }}
cluster: aztec-gke-private
namespace: next-rc-1
values_file: rc-1.yaml
Expand Down
2 changes: 1 addition & 1 deletion spartan/aztec-network/files/config/deploy-l1-contracts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ FLUSH_ENTRY_QUEUE_ARG="--flush-entry-queue"

for attempt in $(seq 1 $MAX_RETRIES); do
# Construct base command
base_cmd="LOG_LEVEL=debug node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js deploy-l1-contracts $TEST_ACCOUNTS_ARG $ACCELERATED_TEST_DEPLOYMENTS_ARG $SPONSORED_FPC_ARG $REAL_VERIFIER_ARG $FLUSH_ENTRY_QUEUE"
base_cmd="LOG_LEVEL=debug node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js deploy-l1-contracts $TEST_ACCOUNTS_ARG $ACCELERATED_TEST_DEPLOYMENTS_ARG $SPONSORED_FPC_ARG $REAL_VERIFIER_ARG $FLUSH_ENTRY_QUEUE_ARG"

# Add account - use private key if set, otherwise use mnemonic
if [ -n "${L1_DEPLOYMENT_PRIVATE_KEY:-}" ]; then
Expand Down
5 changes: 3 additions & 2 deletions spartan/aztec-network/files/config/setup-attester-keystore.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,9 @@ publishers=()
if [ -n "$WEB3_SIGNER_URL" ]; then
remoteSigner=$(jq -n '{remoteSignerUrl: $url}' --arg url "$WEB3_SIGNER_URL")
attesters=(${addresses[*]})
# With web3signer, use addresses for publishers too
publishers=(${publisher_addresses[*]})
# TODO: use addresses here when web3signer supports EIP-4844 txs. See PR https://github.com/Consensys/web3signer/pull/1096
# publishers=(${publisher_addresses[*]})
publishers=(${publisher_private_keys[*]})
else
remoteSigner="null"
attesters=(${private_keys[*]})
Expand Down
9 changes: 0 additions & 9 deletions spartan/aztec-network/resources/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,6 @@ blobSink:
memory: "512Mi"
cpu: "500m"

faucet:
resources:
requests:
memory: "512Mi"
cpu: "200m"
limits:
memory: "512Mi"
cpu: "200m"

ethereum:
execution:
resources:
Expand Down
6 changes: 0 additions & 6 deletions spartan/aztec-network/resources/gcloud.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ proverBroker:
blobSink:
resources:

faucet:
resources:
requests:
memory: "2Gi"
cpu: "200m"

ethereum:
execution:
resources:
Expand Down
6 changes: 0 additions & 6 deletions spartan/aztec-network/resources/mainframe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,6 @@ proverBroker:
blobSink:
resources:

faucet:
resources:
requests:
memory: "2Gi"
cpu: "200m"

ethereum:
execution:
resources:
Expand Down
138 changes: 0 additions & 138 deletions spartan/aztec-network/templates/faucet.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions spartan/aztec-network/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -423,12 +423,3 @@ blobSink:
storageSize: "8Gi"
dataStoreMapSize: "134217728" # 128 GB

faucet:
enabled: true
replicas: 1
service:
nodePort: 8085
apiServerPort: 8086
addressIndex: 0
l1Assets: ""
logLevel: ""
3 changes: 0 additions & 3 deletions spartan/aztec-network/values/archival-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,5 @@ proverBroker:
pxe:
enabled: false

faucet:
enabled: false

bot:
enabled: false
3 changes: 0 additions & 3 deletions spartan/aztec-network/values/ignition-reth.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ bot:
pxe:
enabled: false

faucet:
enabled: false

validator:
replicas: 3
sequencer:
Expand Down
3 changes: 0 additions & 3 deletions spartan/aztec-network/values/ignition-testnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ bot:
pxe:
enabled: false

faucet:
enabled: false

bootNode:
enabled: false
# unused.
Expand Down
2 changes: 0 additions & 2 deletions spartan/aztec-network/values/slim.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,3 @@ bootNode:
bot:
enabled: false

faucet:
enabled: false
5 changes: 2 additions & 3 deletions spartan/terraform/deploy-release/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ resource "helm_release" "aztec-gke-cluster" {

# Setting timeout and wait conditions
timeout = 600
wait = true
wait_for_jobs = true

wait = false
wait_for_jobs = false
}
2 changes: 1 addition & 1 deletion yarn-project/aztec/src/cli/aztec_start_options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
],
'L1 CONTRACTS': [
configToFlag('--registry-address', l1ContractAddressesMapping.registryAddress),
configToFlag('--rollup-version', chainConfigMappings.rollupVersion, 'canonical'),
configToFlag('--rollup-version', chainConfigMappings.rollupVersion),
],
STORAGE: [
configToFlag('--data-directory', dataConfigMappings.dataDirectory),
Expand Down
Loading