Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Sync from noir #11051

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3dbb607
[1 changes] chore: use logs for benchmarking (https://github.com/noir…
AztecBot Jan 4, 2025
da593f2
chore: apply sync fixes
AztecBot Jan 4, 2025
d0a69e8
[1 changes] fix: Non-determinism from under constrained checks (https…
AztecBot Jan 5, 2025
7fbb5c7
chore: apply sync fixes
AztecBot Jan 5, 2025
e0197fd
fix: Non-determinism from under constrained checks (https://github.co…
AztecBot Jan 5, 2025
7c4a45c
[1 changes] chore: also print test output to stdout in CI (https://gi…
AztecBot Jan 6, 2025
f9ac178
chore: apply sync fixes
AztecBot Jan 6, 2025
5ca1fb5
chore: also print test output to stdout in CI (https://github.com/noi…
AztecBot Jan 6, 2025
cf559ae
Merge branch 'master' into sync-noir
michaeljklein Jan 6, 2025
46c6087
Bump MSRV to 1.75.0
michaeljklein Jan 6, 2025
3e9bb5b
Merge branch 'master' into sync-noir
michaeljklein Jan 6, 2025
9ef95d6
[1 changes] feat: don't report warnings for dependencies (https://git…
AztecBot Jan 7, 2025
65c7e62
chore: apply sync fixes
AztecBot Jan 7, 2025
a8136ba
feat: don't report warnings for dependencies (https://github.com/noir…
AztecBot Jan 7, 2025
965ec15
.
TomAFrench Jan 7, 2025
9fdf690
chore: update path filters
TomAFrench Jan 7, 2025
d97196c
Merge branch 'master' into sync-noir
TomAFrench Jan 7, 2025
1c56ebf
.
TomAFrench Jan 7, 2025
eb9fd34
install aws
charlielye Jan 7, 2025
a23511e
install aws
charlielye Jan 7, 2025
0091c7c
install aws
charlielye Jan 7, 2025
051613b
Merge branch 'master' into sync-noir
TomAFrench Jan 7, 2025
311bc03
[1 changes] feat!: type-check trait default methods (https://github.c…
AztecBot Jan 7, 2025
5badb7a
chore: apply sync fixes
AztecBot Jan 7, 2025
438dcab
feat!: type-check trait default methods (https://github.com/noir-lang…
AztecBot Jan 7, 2025
094807f
.
TomAFrench Jan 7, 2025
52c4f28
Update noir/noir-repo/compiler/noirc_evaluator/src/ssa/ir/instruction…
TomAFrench Jan 8, 2025
a755124
[1 changes] feat!: type-check trait default methods (https://github.c…
AztecBot Jan 8, 2025
bc5f824
chore: apply sync fixes
AztecBot Jan 8, 2025
94152d6
feat!: type-check trait default methods (https://github.com/noir-lang…
AztecBot Jan 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ jobs:
id: filter
with:
filters: |
base-images:
- 'build-images/**'
noir:
- 'noir/noir-repo/**'
bb:
Expand Down Expand Up @@ -127,6 +129,8 @@ jobs:
runner_type: builder-x86
username: ${{ needs.configure.outputs.username }}
run: |
sudo apt install unzip
curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m).zip" -o "awscliv2.zip" && unzip awscliv2.zip && sudo ./aws/install --bin-dir /usr/local/bin --install-dir /usr/local/aws-cli --update && rm -rf aws awscliv2.zip
echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
./build-images/bootstrap.sh ci

Expand Down Expand Up @@ -600,7 +604,7 @@ jobs:

public-functions-size-report:
needs: [ci-rest, configure]
if: github.ref_name == 'master' || needs.configure.outputs.non-docs == 'true'
if: github.ref_name == 'master' || needs.configure.outputs.non-docs == 'true'
runs-on: ubuntu-latest
permissions:
pull-requests: write
Expand Down
2 changes: 1 addition & 1 deletion .noir-sync-commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ebc4d2cf2b91658a10393733407f33d50a0faaf1
8bb3908281d531160db7d7898c67fb2647792e6e
143 changes: 81 additions & 62 deletions avm-transpiler/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion avm-transpiler/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "1.74.1"
channel = "1.75.0"
components = ["rust-src"]
targets = []
profile = "default"
6 changes: 3 additions & 3 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ function check_toolchains {
exit 1
fi
# Check rust version.
if ! rustup show | grep "1.74" > /dev/null; then
if ! rustup show | grep "1.75" > /dev/null; then
encourage_dev_container
echo "Rust version 1.74 not installed."
echo "Rust version 1.75 not installed."
echo "Installation:"
echo " curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.74.1"
echo " curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.75.0"
exit 1
fi
# Check wasi-sdk version.
Expand Down
8 changes: 4 additions & 4 deletions build-images/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ foundry:
LET FOUNDRY_BIN_DIR = "/root/.foundry/bin"

RUN curl -L https://foundry.paradigm.xyz | bash \
&& $FOUNDRY_BIN_DIR/foundryup -v nightly-$FOUNDRY_TAG \
&& $FOUNDRY_BIN_DIR/foundryup -i nightly-$FOUNDRY_TAG \
&& mkdir -p /opt/foundry/bin \
&& for t in forge cast anvil chisel; do \
mv $FOUNDRY_BIN_DIR/$t /opt/foundry/bin/$t; \
Expand Down Expand Up @@ -156,14 +156,14 @@ build:
COPY +foundry/opt/foundry /opt/foundry
ENV PATH="/opt/foundry/bin:$PATH"

# Install rust and cross-compilers. Noir specifically uses 1.74.1.
# Install rust and cross-compilers. Noir specifically uses 1.75.0.
# We remove base-build's rust first.
# We give everyone write ownership so downstream boxes can write.
ENV RUSTUP_HOME=/opt/rust/rustup
ENV CARGO_HOME=/opt/rust/cargo
ENV PATH="/opt/rust/cargo/bin:$PATH"
RUN apt remove -y cargo rustc
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.74.1 && \
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.75.0 && \
rustup target add wasm32-unknown-unknown wasm32-wasi aarch64-apple-darwin && \
chmod -R a+w /opt/rust

Expand Down Expand Up @@ -508,4 +508,4 @@ all-ci:
# TODO(#10677): this needs to be pushed while also updating our CI AMI
# BUILD +ci
BUILD +aztec-base
BUILD +end-to-end-base
BUILD +end-to-end-base
2 changes: 1 addition & 1 deletion noir-projects/aztec-nr/aztec/src/encrypted_logs/header.nr
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ impl EncryptedLogHeader {
}

let input: [u8; 32] = self.address.to_field().to_be_bytes();
aes128_encrypt(input, iv, sym_key).as_array()
aes128_encrypt(input, iv, sym_key)
}
}

Expand Down
2 changes: 1 addition & 1 deletion noir-projects/aztec-nr/aztec/src/encrypted_logs/payload.nr
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ pub fn compute_incoming_body_ciphertext<let P: u32>(
plaintext: [u8; P],
eph_sk: Scalar,
address_point: AddressPoint,
) -> [u8] {
) -> [u8; P + 16 - P % 16] {
let full_key = derive_aes_secret(eph_sk, address_point.to_point());
let mut sym_key = [0; 16];
let mut iv = [0; 16];
Expand Down
Loading
Loading