Merge branch 'master' into md/fix-p2p-tests

AztecProtocol · Dec 19, 2024 · b66dcf0 · b66dcf0
2 parents 5809b1f + 852afb2
commit b66dcf0
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 26 deletions.
diff --git a/.github/workflows/vm_full_tests.yml b/.github/workflows/vm_full_tests.yml
@@ -24,6 +24,7 @@ jobs:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       BUILD_INSTANCE_SSH_KEY: ${{ secrets.BUILD_INSTANCE_SSH_KEY }}
+      GITHUB_RUN_URL: "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}"
       GIT_COMMIT: ${{ github.sha }}
     steps:
       - uses: actions/checkout@v4
@@ -34,4 +35,4 @@ jobs:
         with:
           run: |
             sudo shutdown -P 75 # hack until core part of the scripts
-            earthly-ci --no-output ./barretenberg/cpp/+vm-full-test --hardware_concurrency=64  # limit our parallelism to half our cores
+            scripts/earthly-ci --no-output ./barretenberg/cpp/+vm-full-test --hardware_concurrency=64  # limit our parallelism to half our cores
diff --git a/spartan/aztec-network/templates/boot-node.yaml b/spartan/aztec-network/templates/boot-node.yaml
@@ -175,8 +175,6 @@ spec:
               value: "{{ .Values.bootNode.logLevel }}"
             - name: LOG_JSON
               value: "1"
-            - name: DEBUG
-              value: "{{ .Values.bootNode.debug }}"
             - name: P2P_ENABLED
               value: "{{ .Values.bootNode.p2p.enabled }}"
             - name: COINBASE

diff --git a/spartan/aztec-network/templates/prover-node.yaml b/spartan/aztec-network/templates/prover-node.yaml
@@ -125,8 +125,6 @@ spec:
               value: "{{ .Values.proverNode.logLevel }}"
             - name: LOG_JSON
               value: "1"
-            - name: DEBUG
-              value: "{{ .Values.proverNode.debug }}"
             - name: PROVER_REAL_PROOFS
               value: "{{ .Values.aztec.realProofs }}"
             - name: PROVER_AGENT_COUNT

diff --git a/spartan/aztec-network/templates/validator.yaml b/spartan/aztec-network/templates/validator.yaml
@@ -162,8 +162,6 @@ spec:
               value: "{{ .Values.validator.logLevel }}"
             - name: LOG_JSON
               value: "1"
-            - name: DEBUG
-              value: "{{ .Values.validator.debug }}"
             - name: P2P_ENABLED
               value: "{{ .Values.validator.p2p.enabled }}"
             - name: VALIDATOR_DISABLED

diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml
@@ -45,8 +45,7 @@ bootNode:
     p2pTcpPort: 40400
     p2pUdpPort: 40400
     nodePort: 8080
-  logLevel: "debug"
-  debug: ""
+  logLevel: "debug; info: aztec:simulator, json-rpc"
   coinbaseAddress: "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
   sequencer:
     maxSecondsBetweenBlocks: 0
@@ -90,8 +89,7 @@ validator:
     p2pTcpPort: 40400
     p2pUdpPort: 40400
     nodePort: 8080
-  logLevel: "debug"
-  debug: ""
+  logLevel: "debug; info: aztec:simulator, json-rpc"
   sequencer:
     maxSecondsBetweenBlocks: 0
     minTxsPerBlock: 1
@@ -123,8 +121,7 @@ proverNode:
     p2pTcpPort: 40400
     p2pUdpPort: 40400
     nodePort: 8080
-  logLevel: "debug"
-  debug: ""
+  logLevel: "debug; info: aztec:simulator, json-rpc"
   proverAgent:
     count: 0
     pollIntervalMs: 1000
@@ -142,7 +139,7 @@ proverNode:
   storage: "8Gi"
 
 pxe:
-  logLevel: "debug"
+  logLevel: "debug; info: aztec:simulator, json-rpc"
   replicas: 1
   service:
     nodePort: 8081
@@ -160,7 +157,7 @@ pxe:
 bot:
   enabled: true
   nodeUrl: ""
-  logLevel: "debug"
+  logLevel: "debug; info: aztec:simulator, json-rpc"
   replicas: 1
   botPrivateKey: "0xcafe"
   txIntervalSeconds: 24
@@ -221,7 +218,7 @@ proverAgent:
   proofTypes: ["foo", "bar", "baz"]
   gke:
     spotEnabled: false
-  logLevel: "debug"
+  logLevel: "debug; info: aztec:simulator, json-rpc"
   bb:
     hardwareConcurrency: ""
   nodeSelector: {}
@@ -236,9 +233,12 @@ proverBroker:
   pollIntervalMs: 1000
   jobMaxRetries: 3
   dataDirectory: ""
-  logLevel: "debug"
+  logLevel: "debug; info: aztec:simulator, json-rpc"
   nodeSelector: {}
-  resources: {}
+  resources:
+    requests:
+      memory: "2Gi"
+      cpu: "200m"
 
 jobs:
   deployL1Verifier:

diff --git a/spartan/aztec-network/values/exp-1.yaml b/spartan/aztec-network/values/exp-1.yaml
@@ -117,7 +117,8 @@ validator:
     - 0x3c3E2E178C69D4baD964568415a0f0c84fd6320A
   resources:
     requests:
-      memory: "512Mi"
+      memory: "8Gi"
+      cpu: "3.5"
   validator:
     disabled: false
   sequencer:
@@ -129,16 +130,38 @@ bootNode:
   storageSize: "100Gi"
   validator:
     disabled: true
+  resources:
+    requests:
+      memory: "8Gi"
+      cpu: "3.5"
 
 proverAgent:
-  replicas: 4
+  replicas: 8
+
+proverBroker:
+  resources:
+    requests:
+      memory: "8Gi"
+      cpu: "3.5"
+
+proverNode:
+  resources:
+    requests:
+      memory: "8Gi"
+      cpu: "3.5"
 
 bot:
-  replicas: 6
+  replicas: 10
   followChain: "NONE"
   enabled: true
   txIntervalSeconds: 1
 
 jobs:
   deployL1Verifier:
     enable: false
+
+ethereum:
+  resources:
+    requests:
+      memory: "8Gi"
+      cpu: "3.5"
diff --git a/yarn-project/circuit-types/src/l2_block_downloader/l2_block_stream.ts b/yarn-project/circuit-types/src/l2_block_downloader/l2_block_stream.ts
@@ -8,6 +8,7 @@ import { type L2BlockId, type L2BlockSource, type L2Tips } from '../l2_block_sou
 /** Creates a stream of events for new blocks, chain tips updates, and reorgs, out of polling an archiver or a node. */
 export class L2BlockStream {
   private readonly runningPromise: RunningPromise;
+  private isSyncing = false;
 
   constructor(
     private l2BlockSource: Pick<L2BlockSource, 'getBlocks' | 'getBlockHeader' | 'getL2Tips'>,
@@ -37,8 +38,10 @@ export class L2BlockStream {
     return this.runningPromise.isRunning();
   }
 
-  public sync() {
-    return this.runningPromise.trigger();
+  public async sync() {
+    this.isSyncing = true;
+    await this.runningPromise.trigger();
+    this.isSyncing = false;
   }
 
   protected async work() {
@@ -132,7 +135,7 @@ export class L2BlockStream {
       `Emitting ${event.type} (${event.type === 'blocks-added' ? event.blocks.length : event.blockNumber})`,
     );
     await this.handler.handleBlockStreamEvent(event);
-    if (!this.isRunning()) {
+    if (!this.isRunning() && !this.isSyncing) {
       throw new AbortError();
     }
   }

diff --git a/yarn-project/cli/src/cmds/devnet/faucet.ts b/yarn-project/cli/src/cmds/devnet/faucet.ts
@@ -10,7 +10,7 @@ export async function dripFaucet(
   json: boolean,
   log: LogFn,
 ): Promise<void> {
-  const url = new URL(`${faucetUrl}/drip/${account.toString()}`);
+  const url = new URL(`/drip/${account.toString()}`, faucetUrl);
   url.searchParams.set('asset', asset);
   const res = await fetch(url);
   if (res.status === 200) {

diff --git a/yarn-project/p2p/src/config.ts b/yarn-project/p2p/src/config.ts
@@ -170,7 +170,7 @@ export const p2pConfigMappings: ConfigMappingsType<P2PConfig> = {
   peerCheckIntervalMS: {
     env: 'P2P_PEER_CHECK_INTERVAL_MS',
     description: 'The frequency in which to check for new peers.',
-    ...numberConfigHelper(30_000),
+    ...numberConfigHelper(1_000),
   },
   l2QueueSize: {
     env: 'P2P_L2_QUEUE_SIZE',