addressing feedback

AztecProtocol · Feb 7, 2025 · 89435a0 · 89435a0
1 parent 3045a66
commit 89435a0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 20 deletions.
diff --git a/.github/workflows/devnet-deploy.yml b/.github/workflows/devnet-deploy.yml
@@ -133,6 +133,8 @@ jobs:
 
           rm helm_values.json
 
+          ADDRESS_INDEX=69
+
           kubectl port-forward -n $NAMESPACE svc/$NAMESPACE-aztec-network-pxe $PXE_PORT &>/dev/null &
           port_forward_pids+=($!)
 
@@ -152,6 +154,7 @@ jobs:
             --l1-rpc-url http://127.0.0.1:$ETHEREUM_PORT \
             --l1-chain-id "$L1_CHAIN_ID" \
             --mnemonic "$MNEMONIC" \
+            --address-index "$ADDRESS_INDEX" \
             --json | tee ./basic_contracts.json
 
           aws s3 cp ./basic_contracts.json ${{ env.CONTRACT_S3_BUCKET }}/devnet/basic_contracts.json

diff --git a/spartan/aztec-network/templates/boot-node.yaml b/spartan/aztec-network/templates/boot-node.yaml
@@ -27,20 +27,6 @@ spec:
         {{- include "aztec-network.selectorLabels" . | nindent 8 }}
         app: boot-node
     spec:
-      {{- if and .Values.bootNode.gke.spotEnabled .Values.network.gke }}
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-            - matchExpressions:
-              - key: cloud.google.com/gke-spot
-                operator: Exists
-      tolerations:
-      - key: "cloud.google.com/gke-spot"
-        operator: "Equal"
-        value: "true"
-        effect: "NoSchedule"
-      {{- end }}
       {{- if .Values.network.gke }}
       nodeSelector:
         local-ssd: "{{ .Values.storage.localSsd }}"

diff --git a/spartan/aztec-network/values/release-devnet.yaml b/spartan/aztec-network/values/release-devnet.yaml
@@ -12,12 +12,10 @@ validator:
 bootNode:
   validator:
     disabled: true
-  gke:
-    spotEnabled: true
   resources:
     requests:
-      memory: "16Gi"
-      cpu: "8"
+      memory: "6Gi"
+      cpu: "1.85"
 
 proverAgent:
   replicas: 8
@@ -45,7 +43,7 @@ images:
 
 aztec:
   slotDuration: 36
-  epochDuration: 48
+  epochDuration: 32
   realProofs: true
   extraAccounts: 9
   extraAccountsStartIndex: 69

diff --git a/yarn-project/cli/src/cmds/devnet/bootstrap_network.ts b/yarn-project/cli/src/cmds/devnet/bootstrap_network.ts
@@ -39,6 +39,7 @@ export async function bootstrapNetwork(
   l1ChainId: string,
   l1PrivateKey: `0x${string}` | undefined,
   l1Mnemonic: string,
+  addressIndex: number,
   json: boolean,
   log: LogFn,
   debugLog: Logger,
@@ -55,7 +56,7 @@ export async function bootstrapNetwork(
       ? privateKeyToAccount(l1PrivateKey)
       : // We need to use a different account that the main "deployer" account because the "deployer" account creates transactions that send blobs.
         // Note that this account needs to be funded on L1 !
-        mnemonicToAccount(l1Mnemonic, { addressIndex: 69 }),
+        mnemonicToAccount(l1Mnemonic, { addressIndex }),
     createEthereumChain(l1Url, +l1ChainId).chainInfo,
   );
 

diff --git a/yarn-project/cli/src/cmds/devnet/index.ts b/yarn-project/cli/src/cmds/devnet/index.ts
@@ -21,6 +21,12 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
       'The mnemonic to use in deployment',
       'test test test test test test test test test test test junk',
     )
+    .option(
+      '-ai, --address-index <number>',
+      'The address index to use when calculating an address',
+      arg => BigInt(arg),
+      0n,
+    )
     .option('--json', 'Output the result as JSON')
     .action(async options => {
       const { bootstrapNetwork } = await import('./bootstrap_network.js');
@@ -30,6 +36,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
         options[l1ChainIdOption.attributeName()],
         options.l1PrivateKey,
         options.mnemonic,
+        options.addressIndex,
         options.json,
         log,
         debugLogger,