Skip to content

Commit

Permalink
Merge branch 'master' into sync-noir
Browse files Browse the repository at this point in the history
* master: (62 commits)
  refactor: note hashing gate optimizations (#7130)
  chore: fix migration notes (#7133)
  feat(p2p): more comprehensive peer management, dial retries, persistence fix (#6953)
  feat: devnet deployments (#7024)
  chore(avm): renamings and comments (#7128)
  refactor: `destroy_note(...)` optimization (#7103)
  git subrepo push --branch=master noir-projects/aztec-nr
  git_subrepo.sh: Fix parent in .gitrepo file. [skip ci]
  chore: replace relative paths to noir-protocol-circuits
  git subrepo push --branch=master barretenberg
  chore: Ultra flavor cleanup (#7070)
  feat: Several updates in SMT verification module (#7105)
  fix: Fix bug for a unit test in full proving mode repated to MSM (#7104)
  feat!: make note_getter return BoundedVec instead of an Option array (#7050)
  chore: Remove unneeded public input folding (#7094)
  chore: reads the return data (#6669)
  test: Create workflow for full AVM tests (#7051)
  chore: Fix noir-projects dockerfile for CircleCI (#7093)
  fix: export event selector and replace function selector with event selector where appropriate (#7095)
  chore(avm): remove avm prefix from pil and executor (#7099)
  ...
  • Loading branch information
TomAFrench committed Jun 20, 2024
2 parents 1296375 + 81a2580 commit 3db7ef0
Show file tree
Hide file tree
Showing 493 changed files with 22,962 additions and 16,610 deletions.
52 changes: 43 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ jobs:
command: cond_spot_run_build noir-packages 32
aztec_manifest_key: noir-packages

avm-transpiler:
avm-transpiler-x86_64:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
Expand All @@ -243,7 +243,7 @@ jobs:
command: cond_spot_run_build avm-transpiler 32
aztec_manifest_key: avm-transpiler

aztec-nargo:
avm-transpiler-arm64:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
Expand All @@ -252,7 +252,31 @@ jobs:
- *setup_env
- run:
name: "Build"
command: cond_spot_run_build aztec-nargo 32
command: cond_spot_run_build avm-transpiler 32 arm64
aztec_manifest_key: avm-transpiler

avm-transpiler-ecr-manifest:
machine:
image: default
resource_class: medium
steps:
- *checkout
- *setup_env
- run:
name: "Create ECR manifest"
command: create_ecr_manifest avm-transpiler x86_64,arm64
aztec_manifest_key: avm-transpiler

aztec-nargo:
machine:
image: default
resource_class: small
steps:
- *checkout
- *setup_env
- run:
name: "Build image"
command: build aztec-nargo
aztec_manifest_key: aztec-nargo

l1-contracts:
Expand Down Expand Up @@ -429,8 +453,9 @@ jobs:
- run:
name: "Update aztec-up"
command: |
should_release || exit 0
deploy_terraform "" aztec-up/terraform
if [ -n "$COMMIT_TAG" ]; then
deploy_terraform "" aztec-up/terraform
fi
# Repeatable config for defining the workflow below.
defaults: &defaults
Expand Down Expand Up @@ -510,15 +535,24 @@ workflows:
<<: *defaults

# Transpiler
- avm-transpiler:
- avm-transpiler-x86_64:
requires:
- noir-ecr-manifest
- noir-x86_64
<<: *defaults
- avm-transpiler-arm64:
requires:
- noir-arm64
<<: *defaults
- avm-transpiler-ecr-manifest:
requires:
- avm-transpiler-x86_64
- avm-transpiler-arm64
<<: *defaults

# aztec-nargo (nargo & transpiler)
- aztec-nargo:
requires:
- avm-transpiler
- avm-transpiler-ecr-manifest
<<: *defaults

# Barretenberg
Expand All @@ -536,7 +570,7 @@ workflows:

- noir-projects:
requires:
- avm-transpiler
- avm-transpiler-ecr-manifest
- noir-ecr-manifest
<<: *defaults

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ jobs:
run: earthly-ci --no-output ./noir+packages-test

noir-projects:
needs: [setup, changes]
needs: [setup, changes, build]
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
if: ${{ needs.changes.outputs.barretenberg == 'true' || needs.changes.outputs.noir == 'true' || needs.changes.outputs.noir-projects == 'true' }}
steps:
Expand Down
69 changes: 69 additions & 0 deletions .github/workflows/devnet-deploys.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
name: Deploy to devnet
on:
push:
branches: [devnet]

env:
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
GIT_COMMIT: ${{ github.sha }}
# TF Vars
TF_VAR_DOCKERHUB_ACCOUNT: aztecprotocol
TF_VAR_CHAIN_ID: 31337
TF_VAR_BOOTNODE_1_PRIVATE_KEY: ${{ secrets.BOOTNODE_1_PRIVATE_KEY }}
TF_VAR_BOOTNODE_2_PRIVATE_KEY: ${{ secrets.BOOTNODE_2_PRIVATE_KEY }}
TF_VAR_SEQ_1_PUBLISHER_PRIVATE_KEY: ${{ secrets.SEQ_1_PUBLISHER_PRIVATE_KEY }}
TF_VAR_SEQ_2_PUBLISHER_PRIVATE_KEY: ${{ secrets.SEQ_2_PUBLISHER_PRIVATE_KEY }}
TF_VAR_DEPLOY_TAG: devnet
TF_VAR_API_KEY: ${{ secrets.FORK_API_KEY }}

jobs:
setup:
uses: ./.github/workflows/setup-runner.yml
with:
username: master
runner_type: builder-x86
secrets: inherit

build:
runs-on: ${{ github.actor }}-x86
steps:
- uses: actions/checkout@v4
with: { ref: "${{ env.GIT_COMMIT }}" }
- uses: ./.github/ci-setup-action
with:
dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
concurrency_key: build-release-artifacts-${{ github.actor }}
- name: "Build & Push images"
timeout-minutes: 40
# Run the build steps for each image with version and arch, push to dockerhub
run: |
earthly-ci --no-output --push ./yarn-project+export-aztec-arch --DIST_TAG=devnet
terraform_deploy:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v4
with: { ref: "${{ env.GIT_COMMIT }}" }
- uses: hashicorp/setup-terraform@v3
with:
terraform_version: 1.7.5

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-west-2

- name: Deploy Bootstrap Nodes
working-directory: ./yarn-project/aztec/terraform/node
run: |
terraform init -input=false -backend-config="key=devnet/aztec-node"
terraform apply -input=false -auto-approve
- name: Deploy Aztec Nodes
working-directory: ./yarn-project/aztec/terraform/node
run: |
terraform init -input=false -backend-config="key=devnet/aztec-node"
terraform apply -input=false -auto-approve
6 changes: 6 additions & 0 deletions .github/workflows/mirror-noir-subrepo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@ jobs:
git config --file="$SUBREPO_PATH/.gitrepo" subrepo.commit "$BASE_NOIR_COMMIT"
# make a new commit with our previous message
git commit -am "$COMMIT_MESSAGE"
# There's various changes which we need to make to account for CI differences so we run this script to apply them.
git checkout origin/master -- noir/scripts/sync-out-fixup.sh
noir/scripts/sync-out-fixup.sh
git commit -am "chore: apply sync fixes"
# Now push to it with subrepo with computed commit messages
if ./scripts/git-subrepo/lib/git-subrepo push $SUBREPO_PATH --squash --branch=$STAGING_BRANCH; then
# We don't push a commit to aztec anymore so that we can maintain the 'commit' as our last pull branch
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull-noir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ jobs:
git commit -am "[$LINES changes] $COMMIT_MESSAGE"
# There's various changes which we need to make to account for CI differences so we run this script to apply them.
git checkout origin/master -- noir/scripts/sync-fixup.sh
noir/scripts/sync-fixup.sh
git checkout origin/master -- noir/scripts/sync-in-fixup.sh
noir/scripts/sync-in-fixup.sh
git commit -am "chore: apply sync fixes"
git push origin $STAGING_BRANCH --force
Expand Down
60 changes: 60 additions & 0 deletions .github/workflows/vm_full_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: AVM Full Tests

on:
schedule:
- cron: "15 4 * * 1-5" # Monday to Friday at 4:15 AM UTC
workflow_dispatch:
inputs:
username:
description: "Username (optional)"
required: false
action:
description: "Default to 'start'"
required: false
default: "start"

concurrency:
# force parallelism in master
group: avm-full-tests-${{ github.ref }}
cancel-in-progress: true

env:
DOCKERHUB_PASSWORD: "${{ secrets.DOCKERHUB_PASSWORD }}"
RUN_ID: ${{ github.run_id }}
RUN_ATTEMPT: ${{ github.run_attempt }}
USERNAME: ${{ github.event.pull_request.user.login || github.actor }}
GITHUB_TOKEN: ${{ github.token }}
GH_SELF_HOSTED_RUNNER_TOKEN: ${{ secrets.GH_SELF_HOSTED_RUNNER_TOKEN }}
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 }}
GIT_COMMIT: ${{ github.event.pull_request.head.sha || github.sha }}
# kludge until we move away from runners
WAIT_FOR_RUNNERS: false

jobs:
setup:
uses: ./.github/workflows/setup-runner.yml
with:
username: ${{ github.event.pull_request.user.login || github.actor }}
runner_type: builder-x86
secrets: inherit

# barretenberg (prover) native and AVM (public VM) tests
# only ran on x86 for resource reasons (memory intensive)
avm-full-tests:
needs: [setup]
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
steps:
- uses: actions/checkout@v4
with: { ref: "${{ env.GIT_COMMIT }}" }
# Only allow one memory-hunger prover test to use this runner
- uses: ./.github/ci-setup-action
with:
# must be globally unique for build x runner
concurrency_key: avm-full-tests-x86
- name: "AVM Full Tests"
working-directory: ./barretenberg/cpp/
timeout-minutes: 90
# limit our parallelism to half our cores
run: earthly-ci --no-output +vm-full-test --hardware_concurrency=64
8 changes: 4 additions & 4 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
".": "0.42.0",
".": "0.43.0",
"yarn-project/cli": "0.35.1",
"yarn-project/aztec": "0.42.0",
"barretenberg": "0.42.0",
"barretenberg/ts": "0.42.0"
"yarn-project/aztec": "0.43.0",
"barretenberg": "0.43.0",
"barretenberg/ts": "0.43.0"
}
1 change: 0 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,5 +169,4 @@
"**/noir/noir-repo/docs/versioned_docs/**": true
},
"cmake.sourceDirectory": "${workspaceFolder}/barretenberg/cpp",
"noir.nargoPath": "./noir/noir-repo/target/release/nargo"
}
Loading

0 comments on commit 3db7ef0

Please sign in to comment.