Skip to content

Commit

Permalink
chore: update acir_tests reference branch (#2993)
Browse files Browse the repository at this point in the history
Please provide a paragraph or two giving a summary of the change,
including relevant motivation and context.

# Checklist:
Remove the checklist to signal you've completed it. Enable auto-merge if
the PR is ready to merge.
- [ ] If the pull request requires a cryptography review (e.g.
cryptographic algorithm implementations) I have added the 'crypto' tag.
- [ ] I have reviewed my diff in github, line by line and removed
unexpected formatting changes, testing logs, or commented-out code.
- [ ] Every change is related to the PR description.
- [ ] I have
[linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
this pull request to relevant issues (if any exist).
  • Loading branch information
kevaundray authored and Maddiaa0 committed Oct 25, 2023
1 parent 724568b commit fca0c99
Show file tree
Hide file tree
Showing 12 changed files with 162 additions and 114 deletions.
4 changes: 2 additions & 2 deletions barretenberg/acir_tests/run_acir_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -eu
BIN=${BIN:-../cpp/build/bin/bb}
FLOW=${FLOW:-prove_and_verify}
CRS_PATH=~/.bb-crs
BRANCH=kw/mv/new-pedersen
BRANCH=kw/switch-backend
VERBOSE=${VERBOSE:-}
NAMED_TEST=${1:-}

Expand Down Expand Up @@ -41,7 +41,7 @@ fi
cd acir_tests

# Convert them to array
SKIP_ARRAY=(diamond_deps_0 workspace workspace_default_member merkle_insert simple_shield pedersen_check schnorr)
SKIP_ARRAY=(diamond_deps_0 workspace workspace_default_member)

function test() {
cd $1
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/acir-simulator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@aztec/circuits.js": "workspace:^",
"@aztec/foundation": "workspace:^",
"@aztec/types": "workspace:^",
"@kevaundray/acvm_js": "0.28.0-kw-branched-off-of-last-aztec-tag-5b563c08c",
"@kevaundray/acvm_js": "0.29.0-kw-switch-backend-e9641725f",
"levelup": "^5.1.1",
"memdown": "^6.1.1",
"tslib": "^2.4.0"
Expand Down
12 changes: 6 additions & 6 deletions yarn-project/aztec.js/src/artifacts/ecdsa_account_contract.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

20 changes: 16 additions & 4 deletions yarn-project/boxes/blank-react/src/artifacts/Blank.json

Large diffs are not rendered by default.

20 changes: 16 additions & 4 deletions yarn-project/boxes/blank/src/artifacts/Blank.json

Large diffs are not rendered by default.

178 changes: 101 additions & 77 deletions yarn-project/boxes/token/src/artifacts/Token.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion yarn-project/noir-compiler/src/compile/nargo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export class NargoContractCompiler {
const version = execSync(`${nargoBin} --version`, { cwd: this.projectPath, stdio: 'pipe' }).toString();
this.checkNargoBinVersion(version.replace('\n', ''));
emptyDirSync(this.getTargetFolder());
execSync(`${nargoBin} compile --output-debug `, { cwd: this.projectPath, stdio });
execSync(`${nargoBin} compile`, { cwd: this.projectPath, stdio });
return Promise.resolve(this.collectArtifacts());
}

Expand Down
4 changes: 2 additions & 2 deletions yarn-project/noir-compiler/src/noir-version.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"tag": "0.16.0-aztec.1",
"commit": "f43083c744ff13aefa4d294a090c9445a9b70aac"
"tag": "0.17.0-aztec.2",
"commit": "81d93935922356f72fce77b1839a85e9304cd9c5"
}
2 changes: 1 addition & 1 deletion yarn-project/noir-contracts/scripts/compile_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ nargo_check
# Runs the compile scripts for all contracts.
echo "Compiling all contracts"

nargo compile --workspace --output-debug
nargo compile --workspace
10 changes: 5 additions & 5 deletions yarn-project/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ __metadata:
"@aztec/noir-contracts": "workspace:^"
"@aztec/types": "workspace:^"
"@jest/globals": ^29.5.0
"@kevaundray/acvm_js": 0.28.0-kw-branched-off-of-last-aztec-tag-5b563c08c
"@kevaundray/acvm_js": 0.29.0-kw-switch-backend-e9641725f
"@rushstack/eslint-patch": ^1.1.4
"@types/jest": ^29.5.0
"@types/levelup": ^5.1.3
Expand Down Expand Up @@ -2708,10 +2708,10 @@ __metadata:
languageName: node
linkType: hard

"@kevaundray/acvm_js@npm:0.28.0-kw-branched-off-of-last-aztec-tag-5b563c08c":
version: 0.28.0-kw-branched-off-of-last-aztec-tag-5b563c08c
resolution: "@kevaundray/acvm_js@npm:0.28.0-kw-branched-off-of-last-aztec-tag-5b563c08c"
checksum: 3c23fa6c7842a5da489fe57cddee89a3f9deac1d981038a695cf660858d784f8a6d9a2d99ec97cdab3b6f9793d8ea240d53332a308a412e1d477eb84dca200b9
"@kevaundray/acvm_js@npm:0.29.0-kw-switch-backend-e9641725f":
version: 0.29.0-kw-switch-backend-e9641725f
resolution: "@kevaundray/acvm_js@npm:0.29.0-kw-switch-backend-e9641725f"
checksum: f292041564d36d6f4cb9919d807de60cef79206ad8797b92e3dfba04e61d59b4e63f46311065171af8432df71f75072a6414cd257fada99d73bff1dca6b3261b
languageName: node
linkType: hard

Expand Down

0 comments on commit fca0c99

Please sign in to comment.