Skip to content

Commit

Permalink
chore: Pull noir (#4546)
Browse files Browse the repository at this point in the history
Co-authored-by: Tom French <tom@tomfren.ch>
  • Loading branch information
sirasistant and TomAFrench authored Feb 12, 2024
1 parent 490ca26 commit acf5cf2
Show file tree
Hide file tree
Showing 429 changed files with 8,581 additions and 5,969 deletions.
27 changes: 27 additions & 0 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 build-system/scripts/request_spot
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ launch_spec=$(cat <<EOF
{
"DeviceName": "/dev/sda1",
"Ebs": {
"VolumeSize": 16
"VolumeSize": 32
}
}
]
Expand Down
63 changes: 42 additions & 21 deletions noir/.github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ body:
attributes:
value: |
# Description
Thanks for taking the time to create the Issue, and welcome to the Noirot family!
Thanks for taking the time to create the Issue and welcome to the Noir community!
- type: textarea
id: aim
attributes:
Expand Down Expand Up @@ -38,45 +38,69 @@ body:
2.
3.
4.
- type: dropdown
id: impact
attributes:
label: Project Impact
description: How does this affect a project you or others are working on?
options:
- "Nice-to-have"
- "Blocker"
- type: textarea
id: impact_context
attributes:
label: Impact Context
description: If a nice-to-have / blocker, supplement how does this Issue affect the project.
- type: dropdown
id: workaround
attributes:
label: Workaround
description: Is there a workaround for this Issue?
options:
- "Yes"
- type: textarea
id: workaround_description
attributes:
label: Workaround Description
description: If yes, supplement how could the Issue be worked around.
- type: textarea
id: additional
attributes:
label: Additional Context
description: Supplement further information if applicable.
- type: markdown
attributes:
value: |
# Environment
Specify your versions of Noir releases used.
Specify your version of Noir tooling used.
- type: markdown
attributes:
value: |
## Using Nargo?
## Nargo (CLI)
- type: dropdown
id: nargo-install
attributes:
label: Installation Method
description: How did you install Nargo?
multiple: false
options:
- Binary
- Binary (`noirup` default)
- Compiled from source
- type: input
id: nargo-version
attributes:
label: Nargo Version
description: What is the output of the `nargo --version` command?
placeholder: "nargo 0.6.0 (git version hash: 0181813203a9e3e46c6d8c3169ad5d25971d4282, is dirty: false)"
description: Output of running `nargo --version`
placeholder: "nargo version = 0.23.0 noirc version = 0.23.0+5be9f9d7e2f39ca228df10e5a530474af0331704 (git version hash: 5be9f9d7e2f39ca228df10e5a530474af0331704, is dirty: false)"
- type: markdown
attributes:
value: |
## Using TypeScript?
Please await for our new set of packages.
You can find our target release timeframe on the [Noir Roadmap](https://github.com/orgs/noir-lang/projects/1/views/16).
- type: markdown
attributes:
value: |
# Misc
- type: textarea
id: additional
## NoirJS (JavaScript)
- type: input
id: noirjs-version
attributes:
label: Additional Context
description: Supplement further information if applicable.
label: NoirJS Version
description: Version number of `noir_js` in `package.json`
placeholder: "0.23.0"
- type: markdown
attributes:
value: |
Expand All @@ -87,11 +111,8 @@ body:
label: Would you like to submit a PR for this Issue?
description: Fellow contributors are happy to provide support where applicable.
options:
- "No"
- "Maybe"
- "Yes"
validations:
required: true
- type: textarea
id: pr_support
attributes:
Expand Down
31 changes: 24 additions & 7 deletions noir/.github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ body:
attributes:
value: |
## Description
Thanks for taking the time to create the Issue, and welcome to the Noirot family!
Thanks for taking the time to create the Issue and welcome to the Noir community!
- type: textarea
id: problem
attributes:
Expand All @@ -21,11 +21,31 @@ body:
description: Describe how you think it should work. Supply pseudocode / step-by-step examples if applicable.
validations:
required: true
- type: dropdown
id: impact
attributes:
label: Project Impact
description: How does this affect a project you or others are working on?
options:
- "Nice-to-have"
- "Blocker"
- type: textarea
id: alternatives
id: impact_context
attributes:
label: Alternatives Considered
description: Describe less-happy cases you have considered, if any.
label: Impact Context
description: If a nice-to-have / blocker, supplement how does this Issue affect the project.
- type: dropdown
id: workaround
attributes:
label: Workaround
description: Is there a workaround for this Issue?
options:
- "Yes"
- type: textarea
id: workaround_description
attributes:
label: Workaround Description
description: If yes, supplement how could the Issue be worked around.
- type: textarea
id: additional
attributes:
Expand All @@ -42,11 +62,8 @@ body:
description: Fellow contributors are happy to provide support where applicable.
multiple: false
options:
- "No"
- "Maybe"
- "Yes"
validations:
required: true
- type: textarea
id: pr-support
attributes:
Expand Down
2 changes: 1 addition & 1 deletion noir/.github/actions/install-playwright/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ runs:
run: echo "PLAYWRIGHT_VERSION=$(yarn workspace @noir-lang/noirc_abi info @web/test-runner-playwright --json | jq .children.Version | tr -d '"')" >> $GITHUB_ENV

- name: Cache playwright binaries
uses: actions/cache@v3
uses: actions/cache@v4
id: playwright-cache
with:
path: |
Expand Down
27 changes: 0 additions & 27 deletions noir/.github/actions/nix/action.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash
set -eu

apt-get install libc++-dev -y
npx playwright install && npx playwright install-deps
yarn workspace integration-tests test
yarn workspace integration-tests test
5 changes: 5 additions & 0 deletions noir/.github/scripts/integration-test-node.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash
set -eu

apt-get install libc++-dev -y
yarn workspace integration-tests test
4 changes: 1 addition & 3 deletions noir/.github/scripts/noir-js-test.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#!/bin/bash
set -eu

./scripts/nargo_compile_noir_js_assert_lt.sh
rm -rf /usr/src/noir/tooling/noir_js/test/noir_compiled_examples/assert_lt/target/debug_assert_lt.json
yarn workspace @noir-lang/noir_js test
yarn workspace @noir-lang/noir_js test
59 changes: 58 additions & 1 deletion noir/.github/workflows/docker-test-flow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,63 @@ jobs:
- name: Test
working-directory: /usr/src/noir
run: |
./.github/scripts/integration-test.sh
./.github/scripts/integration-test-node.sh
test-integration-browser:
name: Integration test browser
runs-on: ubuntu-latest
needs: [
build-base-js,
build-noir-wasm,
build-noirc-abi,
build-acvm_js,
build-noir-js-types,
build-noir_js,
build-barretenberg-backend
]
container:
image: ghcr.io/noir-lang/noir:${{ github.sha }}-js
credentials:
username: ${{ github.actor }}
password: ${{ secrets.github_token }}
steps:
- name: Download noir wasm
uses: actions/download-artifact@v4
with:
name: noir_wasm
path: /usr/src/noir/compiler/wasm
- name: Download noirc abi
uses: actions/download-artifact@v4
with:
name: noirc_abi_wasm
path: /usr/src/noir/tooling/noirc_abi_wasm
- name: Download acvm js
uses: actions/download-artifact@v4
with:
name: acvm_js
path: /usr/src/noir/acvm-repo/acvm_js
- name: Download noir js types
uses: actions/download-artifact@v4
with:
name: noir-js-types
path: |
/usr/src/noir/tooling/noir_js_types/lib
- name: Download noir js
uses: actions/download-artifact@v4
with:
name: noir_js
path:
/usr/src/noir/tooling/noir_js/lib
- name: Download Barretenberg backend
uses: actions/download-artifact@v4
with:
name: barretenberg-backend
path:
/usr/src/noir/tooling/noir_js_backend_barretenberg/lib
- name: Test
working-directory: /usr/src/noir
run: |
./.github/scripts/integration-test-browser.sh
tests-end:
name: End
Expand All @@ -733,6 +789,7 @@ jobs:
- test-noir-wasm
- test-noir-wasm-browser
- test-integration
- test-integration-browser
- test-noir_codegen
- test-acvm_js
- test-acvm_js-browser
Expand Down
Loading

0 comments on commit acf5cf2

Please sign in to comment.