Skip to content

Commit 7114921

Browse files
ThunkarThunkar
committed
Merge branch 'next' of github.com:AztecProtocol/aztec-packages into gj/wallet_full_batchability
2 parents 46b947a + e4fca7a commit 7114921

File tree

448 files changed

+10194
-5826
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

448 files changed

+10194
-5826
lines changed

‎.test_patterns.yml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,10 @@ tests:
199199
error_regex: "Failed to commit transaction: InitialBlockNumberNotSequentialError: Cannot insert new block"
200200
owners:
201201
- *palla
202+
- regex: "p2p/src/services/discv5/discv5_service.test.ts"
203+
owners:
204+
- *phil
205+
- *palla
202206

203207
# Nightly GKE tests
204208
- regex: "spartan/bootstrap.sh"
@@ -294,9 +298,10 @@ tests:
294298
owners:
295299
- *palla
296300

297-
- regex: "p2p/.*\\.test\\.ts"
301+
- regex: "p2p/src/client/test/.*\\.test\\.ts"
298302
flake_group_id: e2e-p2p-epoch-flakes
299303
owners:
304+
- *palla
300305
- *phil
301306

302307
- regex: "ethereum/src/l1_tx_utils/.*\\.test\\.ts"
@@ -349,3 +354,10 @@ tests:
349354
error_regex: "playground-1\\s+\\|\\s+1 passed \\("
350355
owners:
351356
- *adam
357+
358+
# http://ci.aztec-labs.com/21afdb4a42f3474d
359+
# Test passed but there was an error on stopping
360+
- regex: "yarn-project/end-to-end/scripts/run_test.sh compose"
361+
error_regex: "tried to kill container, but did not receive an exit event"
362+
owners:
363+
- *adam

‎aztec-up/.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
.DS_Store
44
bin/0.0.1/versions
55
verdaccio-storage
6-
aztec-release-test-image
6+
aztec-up-test-base-image
7+
aztec-up-test-image

‎aztec-up/Dockerfile‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
########################################################################################################################
22
# A minimal ubuntu setup. Used for testing releases.
3-
FROM ubuntu:noble
4-
RUN apt update && apt install -y \
5-
curl \
6-
git \
7-
build-essential \
8-
python3 \
9-
netcat-openbsd \
10-
&& rm -rf /var/lib/apt/lists/*
3+
FROM aztecprotocol/aztec-up-test-base
114
COPY --chown=1000:1000 verdaccio-storage /home/ubuntu/verdaccio-storage
125
RUN touch /aztec_release_test_container

‎aztec-up/Dockerfile.base‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
########################################################################################################################
2+
# A minimal ubuntu setup. Used for testing releases.
3+
FROM ubuntu:noble
4+
RUN apt update && apt install -y \
5+
curl \
6+
git \
7+
build-essential \
8+
python3 \
9+
netcat-openbsd \
10+
&& rm -rf /var/lib/apt/lists/*

‎aztec-up/bootstrap.sh‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,16 @@ EOF
4040
npm i -g verdaccio
4141
fi
4242

43-
if ! cache_download aztec-release-test-image-$hash.zst; then
43+
local base_hash=$(cache_content_hash ^aztec-up/Dockerfile.base)
44+
if ! cache_download aztec-up-test-base-image-$base_hash.zst; then
45+
docker build -t aztecprotocol/aztec-up-test-base -f Dockerfile.base .
46+
docker save aztecprotocol/aztec-up-test-base:latest > aztec-up-test-base-image
47+
cache_upload aztec-up-test-base-image-$base_hash.zst aztec-up-test-base-image
48+
else
49+
docker load < aztec-up-test-base-image
50+
fi
51+
52+
if ! cache_download aztec-up-test-image-$hash.zst; then
4453
rm -rf verdaccio-storage
4554
verdaccio --config /tmp/verdaccio-config.yaml --listen 4873 &>/dev/null &
4655
verdaccio_pid=$!
@@ -76,12 +85,12 @@ EOF
7685
npm i -g --prefix /tmp/npm-prime @aztec/aztec@$version @aztec/cli-wallet@$version @aztec/bb.js@$version
7786
rm -rf /tmp/npm-prime
7887

79-
docker build -t aztecprotocol/aztec-release-test .
80-
docker save aztecprotocol/aztec-release-test:latest > aztec-release-test-image
88+
docker build -t aztecprotocol/aztec-up-test .
89+
docker save aztecprotocol/aztec-up-test:latest > aztec-up-test-image
8190

82-
cache_upload aztec-release-test-image-$hash.zst aztec-release-test-image
91+
cache_upload aztec-up-test-image-$hash.zst aztec-up-test-image
8392
else
84-
docker load < aztec-release-test-image
93+
docker load < aztec-up-test-image
8594
fi
8695
}
8796

‎aztec-up/scripts/run_test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function run {
2121
-v$HOME/.bb-crs:/home/ubuntu/.bb-crs \
2222
-w/home/ubuntu \
2323
--user ubuntu:ubuntu \
24-
aztecprotocol/aztec-release-test \
24+
aztecprotocol/aztec-up-test \
2525
bash -c "
2626
aztec-packages/aztec-up/scripts/run_isolated_test.sh $name ${fail_shell:-}
2727
"

‎barretenberg/cpp/cmake/threading.cmake‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ if(MULTITHREADING)
55
if(WASM)
66
add_compile_options(--target=wasm32-wasi-threads)
77
add_link_options(--target=wasm32-wasi-threads -Wl,--shared-memory)
8+
# Prevent indirect call type mismatch errors in thread_local destructors
9+
# (without this the benchmark flow fails at destruction point for WASM)
10+
add_compile_options(-fno-c++-static-destructors)
811
endif()
912
#add_compile_options(-fsanitize=thread)
1013
#add_link_options(-fsanitize=thread)

‎barretenberg/cpp/pil/vm2/constants_gen.pil‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace constants;
1919
pol CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS = 3;
2020
pol MULTI_CALL_ENTRYPOINT_ADDRESS = 4;
2121
pol FEE_JUICE_ADDRESS = 5;
22-
pol ROUTER_ADDRESS = 6;
22+
pol PUBLIC_CHECKS_ADDRESS = 6;
2323
pol FEE_JUICE_BALANCES_SLOT = 1;
2424
pol UPDATED_CLASS_IDS_SLOT = 1;
2525
pol FLAT_PUBLIC_LOGS_HEADER_LENGTH = 1;

‎barretenberg/cpp/scripts/audit/audit_scopes/blake2s_blake3_audit_scope.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# BLAKE2s + BLAKE3 Audit Scope
22

33
Repository: https://github.com/AztecProtocol/aztec-packages
4-
Commit hash: 4a956ceb179c2fe855e4f1fd78f2594e7fc3f5ea
4+
Commit hash: 8fb8b041d4c9179f62da56a9c7bbf22c40db46cc
55

66
### Files to audit
77

‎barretenberg/cpp/scripts/audit/audit_scopes/chonk_audit_scope.md‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,41 +21,40 @@ Note: Paths relative to `aztec-packages/barretenberg/cpp/src/barretenberg`
2121
### Multilinear Batching Components
2222
10. `multilinear_batching/multilinear_batching_prover.cpp`
2323
11. `multilinear_batching/multilinear_batching_prover.hpp`
24-
12. `multilinear_batching/multilinear_batching_proving_key.cpp`
25-
13. `multilinear_batching/multilinear_batching_proving_key.hpp`
26-
14. `multilinear_batching/multilinear_batching_claims.hpp`
27-
15. `multilinear_batching/multilinear_batching_verifier.cpp`
28-
16. `multilinear_batching/multilinear_batching_verifier.hpp`
24+
12. `multilinear_batching/multilinear_batching_claims.hpp`
25+
13. `multilinear_batching/multilinear_batching_verifier.cpp`
26+
14. `multilinear_batching/multilinear_batching_verifier.hpp`
2927

3028
### Merge Protocol
31-
17. `goblin/merge_prover.cpp`
32-
18. `goblin/merge_prover.hpp`
33-
19. `goblin/merge_verifier.cpp`
34-
20. `goblin/merge_verifier.hpp`
29+
15. `goblin/merge_prover.cpp`
30+
16. `goblin/merge_prover.hpp`
31+
17. `goblin/merge_verifier.cpp`
32+
18. `goblin/merge_verifier.hpp`
3533

3634
### Chonk Core
37-
21. `chonk/chonk.cpp`
38-
22. `chonk/chonk.hpp`
39-
23. `chonk/private_execution_steps.cpp`
40-
24. `chonk/chonk_proof.cpp`
41-
25. `chonk/chonk_proof.hpp`
35+
19. `chonk/chonk.cpp`
36+
20. `chonk/chonk.hpp`
37+
21. `chonk/private_execution_steps.cpp`
38+
22. `chonk/chonk_proof.cpp`
39+
23. `chonk/chonk_proof.hpp`
4240

4341
### Relations
44-
26. `relations/databus_lookup_relation.hpp`
45-
27. `relations/multilinear_batching/multilinear_batching_relation.hpp`
42+
24. `relations/multilinear_batching/multilinear_batching_relation.hpp`
4643

4744
### Special Public Inputs
48-
28. `special_public_inputs/special_public_inputs.hpp`
49-
29. `stdlib/primitives/public_input_component/public_input_component.hpp`
45+
25. `special_public_inputs/special_public_inputs.hpp`
46+
26. `stdlib/primitives/public_input_component/public_input_component.hpp`
5047

5148
### Flavor
52-
30. `flavor/multilinear_batching_flavor.hpp`
53-
31. `flavor/multilinear_batching_recursive_flavor.hpp`
49+
27. `flavor/multilinear_batching_flavor.hpp`
50+
28. `flavor/multilinear_batching_flavor.cpp`
51+
29. `flavor/multilinear_batching_recursive_flavor.hpp`
5452

5553
### ACIR Integration
56-
32. `dsl/acir_format/hypernova_recursion_constraint.hpp`
57-
33. `dsl/acir_format/hypernova_recursion_constraint.cpp`
58-
54+
30. `dsl/acir_format/hypernova_recursion_constraint.hpp`
55+
31. `dsl/acir_format/hypernova_recursion_constraint.cpp`
56+
32. `dsl/acir_format/recursion_constraint.cpp` (only `process_hn_recursion_constraints()` method)
57+
33. `dsl/acir_format/recursion_constraint.cpp`
5958
---
6059

6160
## Critical Files
@@ -86,7 +85,7 @@ Note: Paths relative to `aztec-packages/barretenberg/cpp/src/barretenberg`
8685
| `hypernova/hypernova_prover.test.cpp` | HyperNova folding prover tests |
8786
| `chonk/chonk_transcript_invariants.test.cpp` | Transcript consistency, tampering detection, M_tail propagation |
8887
| `hypernova/hypernova_verifier.test.cpp` | Folding proof verification, accumulator batching |
89-
| `multilinear_batching/multilinear_batching_verifier.test.cpp` | Polynomial claim batching, eq consistency |
88+
| `multilinear_batching/multilinear_batching_prover.test.cpp` | Polynomial claim batching, eq consistency |
9089
| `goblin/merge.test.cpp` | Merge protocol correctness, degree checks, PREPEND/APPEND modes |
9190
| `relations/databus_lookup_relation_consistency.test.cpp` | Databus lookup relation soundness |
9291

0 commit comments

Comments
 (0)