chore: values for sepolia deployment #10362

spypsy · 2024-12-03T09:58:33Z

just-mitch · 2024-12-04T22:00:56Z

spartan/aztec-network/templates/boot-node.yaml

@@ -93,7 +93,7 @@ spec:
              source /shared/p2p/p2p-addresses && \
              source /shared/config/service-addresses && \
              env && \
-              node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js start --node --archiver --sequencer --pxe


why drop the PXE?

wasn't doing anything right? I believe it was only used for the get-node-info call from other services to check boo-node is up but this has now been added to Aztec Node API

Hm yes, but I think this now conflicts with spartan/aztec-network/files/config/config-validator-env.sh, since it is asking for a PXE url.

It is convenient in that case because when "dynamic boot node" is enabled, the validators use each other to bootstrap, so they use the PXE service, which is connected to the boot node if the network is public, and the validator service otherwise.

So I think the answer is to update the wait-for-services init container in the validators to use echo "{{ include "aztec-network.validatorUrl" . }}" > /shared/boot_node/boot_node_url, and then change back the config-validator-env to use the node url.

Could/should just be a separate issue though.

just-mitch · 2024-12-04T22:08:04Z

spartan/aztec-network/values/sepolia-3-validators-with-metrics.yaml

+
+validator:
+  replicas: 3
+  validatorKeys: ${VALIDATOR_KEYS}


How do these get set? I didn't think you could pull from env like this in a values file.

Maddiaa0 · 2024-12-10T04:14:57Z

yarn-project/end-to-end/scripts/native-network/validators.sh

+    "$(git rev-parse --show-toplevel)/scripts/run_interleaved.sh" "${CMD[@]}"
+  else
+    # Use run_interleaved with a wait condition
+    WAIT_CONDITION="curl -s http://127.0.0.1:$FIRST_PORT/status >/dev/null"


was this wait condition added to prevent them being added with the same key? #10327 this pr pre adds the validators at contract deployment time so may invalidate the need for this work around

just-mitch · 2024-12-13T20:59:27Z

.github/workflows/devnet-deploy.yml

-            --l1-chain-id "$L1_CHAIN_ID" \
-            --mnemonic "$MNEMONIC" \
-            --json | tee ./basic_contracts.json
+          if ${{ inputs.sepolia_deployment }}; then


A nit, not for now, but a bunch of the script above here is to set up port forwarding, but we use none of that in this if. Seems we should just have a different step, and condition on inputs.sepolia_deployment, and then a common step beneath for uploading.

just-mitch · 2024-12-16T13:37:57Z

spartan/aztec-network/templates/reth.yaml

@@ -1,3 +1,4 @@
+{{- if not .Values.network.disableEthNode }}


instead of adding a new flag, could this be replaced by checking if .Values.ethereum.externalHost is set? If we wanted a flag, we could create a helper based off checking that value?

just-mitch · 2024-12-16T13:38:35Z

spartan/aztec-network/files/config/setup-service-addresses.sh

@@ -53,8 +53,8 @@ get_service_address() {
 }

 # Configure Ethereum address
-if [ "${ETHEREUM_EXTERNAL_HOST}" != "" ]; then
-    ETHEREUM_ADDR="${ETHEREUM_EXTERNAL_HOST}"
+if [ "${EXTERNAL_ETHEREUM_HOST}" != "" ]; then


Sorry about this one. Hope you didn't lose much time.

just-mitch · 2024-12-16T13:43:09Z

.github/workflows/network-deploy.yml

+              -var="VALIDATOR_KEYS=${{ secrets.VALIDATOR_KEYS }}" \
+              -var="BOOT_NODE_SEQ_PUBLISHER_PRIVATE_KEY=${{ secrets.BOOT_NODE_SEQ_PUBLISHER_PRIVATE_KEY }}" \
+              -var="PROVER_NODE_PROVER_PUBLISHER_PRIVATE_KEY=${{ secrets.PROVER_NODE_PROVER_PUBLISHER_PRIVATE_KEY }}" \
+              -var="ETHEREUM_EXTERNAL_HOST=${{ secrets.SEPOLIA_EXTERNAL_HOST }}" \


Is this a secret because it has the API key in the URL?

just-mitch · 2024-12-16T13:53:56Z

spartan/terraform/deploy-release/main.tf

+  set_list {
+    name  = "validator.validatorKeys"
+    value = var.VALIDATOR_KEYS
+  }


Suggested change

set_list {

name = "validator.validatorKeys"

value = var.VALIDATOR_KEYS

}

dynamic "set_list" {

for_each = length(var.VALIDATOR_KEYS) > 0 ? [1] : []

content {

name = "validator.validatorKeys"

value = var.VALIDATOR_KEYS

}

}

I'm pretty sure the code as written will break deployments with the deploy-network workflow because the new variables don't have a default value, so the terraform command will just hang awaiting input. But also, if we set the default values to be empty, we need a dynamic block like the suggestion so that we only set when the values are not empty so that we actually use the values in the underlying yaml file.

just-mitch · 2024-12-16T13:55:13Z

spartan/terraform/deploy-release/variables.tf

+
+variable "ETHEREUM_EXTERNAL_HOST" {
+  description = "External host to use for the ethereum node"
+  type        = string


So this should be sensitive? Also, as noted in main.tf, I think all of these need defaults to support the existing flows.

just-mitch · 2024-12-16T13:58:06Z

spartan/aztec-network/values/sepolia-exp-1.yaml

super nit, but can we just rename this to exp-2.yaml?

just-mitch

Nice! Thanks!

* master: (119 commits) chore(master): Release 0.68.0 (#10834) feat: enable profiling with local PXE in cli-wallet (#10736) chore: values for sepolia deployment (#10362) fix: vm_full_tests.yml (#10912) chore: disable bb-sanitizers.yml (#10901) chore: Check yarn version during bootstrap (#10910) fix(p2p): default peer score penalties (#10896) feat: Updated metrics (#10885) feat: Reduce bundle sizes, remove polyfills (#10877) chore: Replace bbup.dev link (#10908) chore(avm): extra column information in lookups (#10905) git subrepo push --branch=master noir-projects/aztec-nr git_subrepo.sh: Fix parent in .gitrepo file. [skip ci] chore: replace relative paths to noir-protocol-circuits git subrepo push --branch=master barretenberg chore: disable flake in e2e_fees/private_payments (#10898) chore(ci): disable e2e_cheat_codes.test.ts (#10897) fix: increase default heartbeat (#10891) fix(p2p): less verbose error (#10886) refactor: `contact` --> `sender` in PXE API (#10861) ...

spypsy marked this pull request as ready for review December 3, 2024 10:43

Base automatically changed from spy/gas-utils to master December 4, 2024 13:05

just-mitch reviewed Dec 4, 2024

View reviewed changes

squash commits

c33c122

spypsy force-pushed the spy/sepolia-spartan-updates branch from 38fbedf to c33c122 Compare December 5, 2024 09:50

spypsy requested review from fcarreiro, dbanks12, jeanmon, IlyasRidhuan, Maddiaa0, TomAFrench, vezenovm, guipublic and charlielye as code owners December 5, 2024 09:50

spypsy added 7 commits December 5, 2024 09:58

resolve conflicts

d9cab7b

some missed changes

d049c0e

update network_test

02fcc11

Merge branch 'master' into spy/sepolia-spartan-updates

6141a50

apparently conflicts

97d1248

undo irrelevant changes

c5e0e7c

undo change

9633ab9

fcarreiro removed request for fcarreiro, IlyasRidhuan, jeanmon, Maddiaa0 and dbanks12 December 5, 2024 16:24

merge conflicts

b9dc642

Maddiaa0 reviewed Dec 10, 2024

View reviewed changes

github actions

9cc7cc9

spypsy and others added 9 commits December 11, 2024 13:48

merge conflicts

cb9f57e

correctly pass list to helm release

37d3d38

Merge branch 'master' into spy/sepolia-spartan-updates

1eca57d

sepolia-exp-1

6e08c18

bootstrap sepolia

afefb5f

quote-wrap mnemonic

3717fb1

safer quote wrapping

dc983f9

use eval

bf04092

Merge branch 'master' into spy/sepolia-spartan-updates

6ab38e3

just-mitch reviewed Dec 13, 2024

View reviewed changes

just-mitch reviewed Dec 16, 2024

View reviewed changes

just check for externalHost

ca4e910

just-mitch reviewed Dec 16, 2024

View reviewed changes

spartan/aztec-network/values/sepolia-exp-1.yaml Outdated

Copy link

Collaborator

just-mitch Dec 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

super nit, but can we just rename this to exp-2.yaml?

spypsy added 6 commits December 16, 2024 14:43

PR Fixes

5debe14

consider more empty sepolia vars

e3b8a7d

restore default prover publisher pk

281ce7e

exp-2.yaml

be47200

guard all pk & mnemonic vars

21bce8c

more tf var defaults

d72d954

just-mitch approved these changes Dec 18, 2024

View reviewed changes

Merge branch 'master' into spy/sepolia-spartan-updates

2be454b

spypsy enabled auto-merge (squash) December 20, 2024 15:39

Merge branch 'master' into spy/sepolia-spartan-updates

49ee379

spypsy merged commit 74cfe0d into master Dec 20, 2024
49 checks passed

spypsy deleted the spy/sepolia-spartan-updates branch December 20, 2024 16:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: values for sepolia deployment #10362

chore: values for sepolia deployment #10362

spypsy commented Dec 3, 2024 •

edited

Loading

just-mitch Dec 4, 2024

spypsy Dec 5, 2024

just-mitch Dec 5, 2024

just-mitch Dec 4, 2024

Maddiaa0 Dec 10, 2024

just-mitch Dec 13, 2024 •

edited

Loading

spypsy Dec 16, 2024

just-mitch Dec 16, 2024

just-mitch Dec 16, 2024

just-mitch Dec 16, 2024

spypsy Dec 16, 2024

just-mitch Dec 16, 2024

just-mitch Dec 16, 2024

just-mitch Dec 16, 2024

just-mitch left a comment

chore: values for sepolia deployment #10362

chore: values for sepolia deployment #10362

Conversation

spypsy commented Dec 3, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

just-mitch Dec 13, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

just-mitch left a comment

Choose a reason for hiding this comment

spypsy commented Dec 3, 2024 •

edited

Loading

just-mitch Dec 13, 2024 •

edited

Loading