Merge branch 'next' into merge-train/avm

Author: AztecBot

spartan/environments/five-tps-long-epoch.env

@@ -12,6 +12,8 @@ LABS_INFRA_MNEMONIC="test test test test test test test test test test test junk
 FUNDING_PRIVATE_KEY="0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
 # CREATE_CHAOS_MESH=true
 
+AZTEC_MANA_TARGET=2147483647
+
 CREATE_ROLLUP_CONTRACTS=true
 REDEPLOY_ROLLUP_CONTRACTS=true
 VERIFY_CONTRACTS=false
@@ -25,6 +27,7 @@ VALIDATOR_REPLICAS=12
 VALIDATORS_PER_NODE=4
 PUBLISHERS_PER_VALIDATOR_KEY=2
 VALIDATOR_PUBLISHER_MNEMONIC_START_INDEX=5000
+VALIDATOR_RESOURCE_PROFILE="2-core-dedicated"
 
 REAL_VERIFIER=false
 

spartan/environments/five-tps-short-epoch.env

@@ -12,6 +12,8 @@ LABS_INFRA_MNEMONIC="test test test test test test test test test test test junk
 FUNDING_PRIVATE_KEY="0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
 # CREATE_CHAOS_MESH=true
 
+AZTEC_MANA_TARGET=2147483647
+
 CREATE_ROLLUP_CONTRACTS=true
 REDEPLOY_ROLLUP_CONTRACTS=true
 VERIFY_CONTRACTS=false
@@ -25,6 +27,7 @@ VALIDATOR_REPLICAS=12
 VALIDATORS_PER_NODE=4
 PUBLISHERS_PER_VALIDATOR_KEY=2
 VALIDATOR_PUBLISHER_MNEMONIC_START_INDEX=5000
+VALIDATOR_RESOURCE_PROFILE="2-core-dedicated"
 
 REAL_VERIFIER=false
 

spartan/environments/ten-tps-long-epoch.env

@@ -12,6 +12,8 @@ LABS_INFRA_MNEMONIC="test test test test test test test test test test test junk
 FUNDING_PRIVATE_KEY="0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
 # CREATE_CHAOS_MESH=true
 
+AZTEC_MANA_TARGET=2147483647
+
 CREATE_ROLLUP_CONTRACTS=true
 REDEPLOY_ROLLUP_CONTRACTS=true
 VERIFY_CONTRACTS=false
@@ -25,6 +27,7 @@ VALIDATOR_REPLICAS=12
 VALIDATORS_PER_NODE=4
 PUBLISHERS_PER_VALIDATOR_KEY=2
 VALIDATOR_PUBLISHER_MNEMONIC_START_INDEX=5000
+VALIDATOR_RESOURCE_PROFILE="2-core-dedicated"
 
 REAL_VERIFIER=false
 

spartan/environments/ten-tps-short-epoch.env

@@ -12,6 +12,8 @@ LABS_INFRA_MNEMONIC="test test test test test test test test test test test junk
 FUNDING_PRIVATE_KEY="0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
 # CREATE_CHAOS_MESH=true
 
+AZTEC_MANA_TARGET=2147483647
+
 CREATE_ROLLUP_CONTRACTS=true
 REDEPLOY_ROLLUP_CONTRACTS=true
 VERIFY_CONTRACTS=false
@@ -25,6 +27,7 @@ VALIDATOR_REPLICAS=12
 VALIDATORS_PER_NODE=4
 PUBLISHERS_PER_VALIDATOR_KEY=2
 VALIDATOR_PUBLISHER_MNEMONIC_START_INDEX=5000
+VALIDATOR_RESOURCE_PROFILE="2-core-dedicated"
 
 REAL_VERIFIER=false
 

spartan/environments/tps-scenario.env

@@ -31,10 +31,13 @@ DESTROY_AZTEC_INFRA=true
 
 OTEL_COLLECTOR_ENDPOINT=REPLACE_WITH_GCP_SECRET
 
+AZTEC_MANA_TARGET=2147483647
+
 VALIDATOR_REPLICAS=12
 VALIDATORS_PER_NODE=4
 PUBLISHERS_PER_VALIDATOR_KEY=2
 VALIDATOR_PUBLISHER_MNEMONIC_START_INDEX=5000
+VALIDATOR_RESOURCE_PROFILE="2-core-dedicated"
 
 REAL_VERIFIER=false
 

spartan/terraform/deploy-aztec-infra/values/validator-resources-2-core-dedicated.yaml

@@ -0,0 +1,22 @@
+validator:
+  nodeSelector:
+    local-ssd: "false"
+    node-type: "network"
+    cores: "2"
+  node:
+    resources:
+      requests:
+        cpu: "1.5"
+        memory: "4Gi"
+      limits:
+        cpu: "1.5"
+        memory: "6Gi"
+  statefulSet:
+    volumeClaimTemplates:
+      - metadata:
+          name: data
+        spec:
+          accessModes: [ReadWriteOnce]
+          resources:
+            requests:
+              storage: 16Gi