Skip to content

Commit

Permalink
Merge branch 'master' into sync-noir
Browse files Browse the repository at this point in the history
* master: (245 commits)
  chore: pull signed bitshifts from sync PR (#9939)
  chore: pull frontend changes from sync PR (#9935)
  feat: separate bytecode logs from unencrypted logs (#9891)
  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
  fix: token naming issue (#9950)
  feat: multiplier oracle (#9902)
  refactor: token refunds cleanup (#9943)
  chore: Use stack based recursion instead of function recursion (#9947)
  feat: parallelize DIE pass (#9933)
  feat(avm): Simulator enforces integral tag for DIV and field tag for FDIV (#9944)
  chore(avm): bugfixing witness generation for add, sub, mul for FF (#9938)
  feat: Google Cloud Kubernetes cluster + AWS Firewall Rules (#9915)
  chore: nuking ancient redundant test (#9941)
  fix: include 'master' version for aztec-up scripts (#9940)
  chore: fixing test contract fixture (#9909)
  refactor: token naming cleanup (#9904)
  chore: pull SSA parser from sync PR (#9928)
  ...
  • Loading branch information
TomAFrench committed Nov 14, 2024
2 parents 8e9a3c4 + 188f60a commit 3bbe74d
Show file tree
Hide file tree
Showing 1,754 changed files with 79,354 additions and 28,071 deletions.
8 changes: 3 additions & 5 deletions .devcontainer/scripts/onCreateCommand.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@
TYPE=$1
NAME=$2

curl -s install.aztec.network | NON_INTERACTIVE=1 BIN_PATH=/usr/local/bin bash -s
docker compose -f $HOME/.aztec/docker-compose.yml pull
curl -s install.aztec.network | NON_INTERACTIVE=1 bash -s
docker compose -f $HOME/.aztec/docker-compose.sandbox.yml pull

if ! grep -q "PXE_URL" ~/.bashrc; then
echo "export PXE_URL=https://\$CODESPACE_NAME-8080.preview.\$GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN" >> ~/.bashrc
fi

if ! grep -q "alias sandbox" ~/.bashrc; then
echo "alias sandbox=\"npx aztec-app sandbox\"" >> ~/.bashrc
fi

corepack enable

if [ "$TYPE" != "sandbox_only" ]; then
Expand Down
61 changes: 1 addition & 60 deletions .devcontainer/scripts/postAttachCommand.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,63 +4,4 @@ apt update
apt install gh
gh codespace ports visibility 8080:public -c $CODESPACE_NAME

npx aztec-app sandbox start

r=$(tput sgr0) # Reset color
bold=$(tput bold) # Bold text
g=$(tput setaf 46) # Light Green
b=$(tput setaf 21) # Bright Blue
p=$(tput setaf 13) # Magenta
y=$(tput setaf 226) # Bright Yellow
c=$(tput setaf 51) # Cyan
o=$(tput setaf 208) # Orange

# Function to print colored text
print_colored() {
case $2 in
green)
color=$g
;;
blue)
color=$b
;;
magenta)
color=$p
;;
yellow)
color=$y
;;
cyan)
color=$c
;;
orange)
color=$o
;;
*)
color=$r
;;
esac
echo "${color}$1${r}"
}

echo
echo "${bold}${c} █████╗ ███████╗████████╗███████╗ ██████╗${r}"
echo "${bold}${o}██╔══██╗╚══███╔╝╚══██╔══╝██╔════╝██╔════╝${r}"
echo "${bold}${g}███████║ ███╔╝ ██║ █████╗ ██║${r}"
echo "${bold}${b}██╔══██║ ███╔╝ ██║ ██╔══╝ ██║${r}"
echo "${bold}${p}██║ ██║███████╗ ██║ ███████╗╚██████╗${r}"
echo "${bold}${y}╚═╝ ╚═╝╚══════╝ ╚═╝ ╚══════╝ ╚═════╝${r}"
echo
print_colored "${bold}Your codespace is ready with your chosen box! 🎉" "cyan"
print_colored "You can now yarn dev or any other package.json script." "cyan"
echo
print_colored "Manage the running development network by running:" "magenta"
print_colored "sandbox [start, stop, logs, etc]" "green"
print_colored "example: \"sandbox logs\""
echo
print_colored "You can also connect your local environment to it." "magenta"
print_colored "To do so, prepend your commands with this codespace's sandbox URL:" "magenta"
print_colored "${PXE_URL}" "green"
print_colored "example: PXE_URL=\"${PXE_URL}\" yarn dev"
echo
print_colored "${bold}Enjoy your sandbox! 🏖️" "orange"
aztec start --sandbox
9 changes: 1 addition & 8 deletions .github/ci-setup-action/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,11 @@ runs:
echo HOME=$RUN_HOME >> $GITHUB_ENV
mkdir -p $RUN_HOME
- name: Cache Submodules
id: cache-submodules
uses: actions/cache@v4
with:
path: .git/modules
key: submodules-${{ hashFiles('.gitmodules') }}-spot-ebs

- name: Checkout Submodules
shell: bash
run: |
git config --global --add safe.directory '*'
git submodule sync --recursive && git submodule update --init --recursive
git submodule update --init --recursive
# TODO reconsider how jq gets into image
- name: Setup jq
Expand Down
2 changes: 1 addition & 1 deletion .github/ensure-builder/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ runs:
# 128-core x86 instance types, aws chooses for us based on capacity
echo "instance_type=m6a.32xlarge m6i.32xlarge m6in.32xlarge m7a.32xlarge r6a.32xlarge r6i.32xlarge r6in.32xlarge" >> $GITHUB_OUTPUT
echo "ami_id=ami-04d8422a9ba4de80f" >> $GITHUB_OUTPUT
echo "ebs_cache_size=256" >> $GITHUB_OUTPUT
echo "ebs_cache_size=300" >> $GITHUB_OUTPUT
echo "runner_concurrency=20" >> $GITHUB_OUTPUT
echo "runner_label=$USERNAME-x86" >> $GITHUB_OUTPUT
echo "ttl=40" >> $GITHUB_OUTPUT
Expand Down
8 changes: 6 additions & 2 deletions .github/ensure-tester/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ runs:
elif [[ $TYPE == 128core-* ]]; then
SIZE=32xlarge
fi
echo "instance_type=m6a.$SIZE m6in.$SIZE r6a.$SIZE r6i.$SIZE r6in.$SIZE" >> $GITHUB_OUTPUT
INSTANCE_TYPES="m6a.$SIZE m6in.$SIZE r6a.$SIZE r6i.$SIZE r6in.$SIZE"
if [[ $TYPE == *high-memory* ]]; then
INSTANCE_TYPES="r6a.$SIZE r6i.$SIZE r6in.$SIZE"
fi
echo "instance_type=$INSTANCE_TYPES" >> $GITHUB_OUTPUT
- name: Start Tester
uses: ./.github/spot-runner-action
Expand All @@ -67,7 +71,7 @@ runs:
ec2_subnet_id: subnet-4cfabd25
ec2_security_group_id: sg-0ccd4e5df0dcca0c9
ec2_key_name: "build-instance"
ec2_instance_tags: "[]"
ec2_instance_tags: '[{"Key": "Keep-Alive", "Value": "true"}]'

- name: Print Startup Log
shell: bash
Expand Down
25 changes: 0 additions & 25 deletions .github/workflows/bb-msan.yml

This file was deleted.

98 changes: 98 additions & 0 deletions .github/workflows/bb-sanitizers.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
# Checks bb (barretenberg prover library) prover with sanitizers
# Unlike most jobs uses free 4 core github runners of which we have lots of capacity (of total 1000 concurrency).
name: BB MSAN
on:
push:
branches:
- master
- "*/bb-sanitizers*"
pull_request:
types: [opened, synchronize, reopened, labeled]
paths:
- 'barretenberg/**'
workflow_dispatch:
inputs: {}

concurrency:
# force parallelism in master
group: ci-${{ github.ref_name == 'master' && github.run_id || github.ref_name }}
cancel-in-progress: true
jobs:
# acts as prover performance baseline
bb-baseline:
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'bb-msan-check')
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: earthly/actions-setup@v1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: "Barretenberg Baseline Performance Check"
run: earthly --no-cache ./barretenberg/cpp/+preset-check --preset=clang16

# memory sanitzer for prover
bb-msan-check:
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'bb-msan-check')
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: earthly/actions-setup@v1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: "Barretenberg Prover MSAN Check"

run: earthly --no-cache ./barretenberg/cpp/+preset-msan-check || true

# address sanitzer for prover
bb-asan-check:
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'bb-asan-check')
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: earthly/actions-setup@v1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: "Barretenberg Prover ASAN Check"
timeout-minutes: 720 # 12 hour timeout (proving)
run: earthly --no-cache ./barretenberg/cpp/+preset-check --preset=asan

# address sanitzer for prover
bb-tsan-check:
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'bb-tsan-check')
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: earthly/actions-setup@v1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: "Barretenberg Prover TSAN Check"
timeout-minutes: 720 # 12 hour timeout (proving)
run: earthly --no-cache ./barretenberg/cpp/+preset-check --preset=tsan || true

# undefined behavior sanitzer for prover
bb-ubsan-check:
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'bb-ubsan-check')
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: earthly/actions-setup@v1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: "Barretenberg Prover TSAN Check"
timeout-minutes: 720 # 12 hour timeout (proving)
run: earthly --no-cache ./barretenberg/cpp/+preset-check --preset=ubsan
Loading

0 comments on commit 3bbe74d

Please sign in to comment.