Merge branch 'master' into jf/fix-1110

* master:
  chore: update flake version to match current release (#1204)
  feat!: Switch to aztec_backend that uses upstream BB & UltraPlonk (#1114)
  chore(ssa refactor): Add Context structs and start ssa gen pass (#1196)
  chore(ssa): Replace JmpIf with BrIf (#1193)
  chore(noir): Release 0.4.1 (#1164)
  chore(ssa refactor): Add DenseMap and SparseMap types (#1184)
  feat: bump noir-source-resolver version (#1182)
  chore(deps): bump h2 from 0.3.16 to 0.3.18 (#1186)
  fix(nargo): restore `nargo codegen-verifier` functionality (#1185)
  chore: simplify setup code in `noir_integration` test (#1180)
  feat: Add Poseidon-BN254 hash functions (#1176)

Author: TomAFrench

.envrc

@@ -1 +1,20 @@
-use nix
+# Based on https://github.com/direnv/direnv-vscode/blob/158e8302c2594cc0eaa5f8b4f0cafedd4e1c0315/.envrc
+
+# You can define your system-specific logic (like Git settings or GH tokens) in .envrc.local
+# If that logic is usable by other people and might improve development environment, consider
+# contributing it to this file!
+
+source_env_if_exists .envrc.local
+
+if [[ -z "${SKIP_NIX:-}" ]] && has nix; then
+
+	if nix flake metadata &>/dev/null && has use_flake; then
+		# use flakes if possible
+		use flake
+
+	else
+		# Otherwise fall back to pure nix
+		use nix
+	fi
+
+fi

.github/workflows/release.yml

@@ -26,6 +26,7 @@ jobs:
           pull-request-title-pattern: "chore(noir): Release ${version}"
           extra-files: |
             Cargo.toml
+            flake.nix
 
   update-lockfile:
     name: Update lockfile

.github/workflows/rust.yml

@@ -0,0 +1,35 @@
+name: Test
+
+on: [push, pull_request]
+
+# This will cancel previous runs when a branch or PR is updated
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    name: Test on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            target: x86_64-linux
+          - os: macos-latest
+            target: x86_64-darwin
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - uses: cachix/install-nix-action@v20
+        with:
+          nix_path: nixpkgs=channel:nixos-22.11
+          github_access_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run `nix flake check`
+        run: |
+          nix flake check

.github/workflows/test.yml

@@ -2,15 +2,19 @@
 .DS_Store
 examples/**/target/
 examples/9
-.vscode
 node_modules
 pkg/
 
+# Nix stuff
+result
+.envrc.local
+.direnv/
+
 # Nargo output
 *.proof
 *.acir
 *.acir.sha256
 *.tr
 *.pk
 *.vk
-**/Verifier.toml
+**/Verifier.toml

.gitignore

@@ -0,0 +1,13 @@
+{
+	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
+	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
+	// List of extensions which should be recommended for users of this workspace.
+	"recommendations": [
+		"mkhl.direnv",
+		"jnoortheen.nix-ide",
+		"rust-lang.rust-analyzer",
+		"redhat.vscode-yaml"
+	],
+	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
+	"unwantedRecommendations": []
+}

.vscode/extensions.json

@@ -0,0 +1,16 @@
+{
+    "direnv.restart.automatic": true,
+    "redhat.telemetry.enabled": false,
+    "yaml.recommendations.show": false,
+    "nix.serverPath": "nil",
+    "nix.enableLanguageServer": true,
+    "nix.serverSettings": {
+        "nil": {
+            "formatting": {
+                "command": [
+                    "nixpkgs-fmt"
+                ]
+            }
+        }
+    },
+}

.vscode/settings.json

@@ -1,5 +1,22 @@
 # Changelog
 
+## [0.4.1](https://github.com/noir-lang/noir/compare/v0.4.0...v0.4.1) (2023-04-20)
+
+
+### Features
+
+* Add Poseidon-BN254 hash functions ([#1176](https://github.com/noir-lang/noir/issues/1176)) ([33feb2b](https://github.com/noir-lang/noir/commit/33feb2bcd71b1040d70d1f51a7377594db557c19))
+* bump noir-source-resolver version ([#1182](https://github.com/noir-lang/noir/issues/1182)) ([750ed77](https://github.com/noir-lang/noir/commit/750ed7793f5a07bc361b56c66f041cb4097219e3))
+
+
+### Bug Fixes
+
+* Add checks for nop ([#1160](https://github.com/noir-lang/noir/issues/1160)) ([809b85f](https://github.com/noir-lang/noir/commit/809b85f751bd0e27ce8c4b38354bc051471d8522))
+* allow comptime or non comptime fields in unconstrained for loops ([#1172](https://github.com/noir-lang/noir/issues/1172)) ([73df465](https://github.com/noir-lang/noir/commit/73df4653556a7d1c74d184e27ec5a8ca3be47af9))
+* maintain ordering of return value witnesses when constructing ABI ([#1177](https://github.com/noir-lang/noir/issues/1177)) ([b799c8a](https://github.com/noir-lang/noir/commit/b799c8aa4491f4f17e248a50a154386803b6d712))
+* **nargo:** restore `nargo codegen-verifier` functionality ([#1185](https://github.com/noir-lang/noir/issues/1185)) ([528a2a4](https://github.com/noir-lang/noir/commit/528a2a441cfe094885cc8f26ffba865f3a0b5c0c))
+* **ssa:** set correct predecessors of IF join ([#1171](https://github.com/noir-lang/noir/issues/1171)) ([7628ed6](https://github.com/noir-lang/noir/commit/7628ed6aa0e430881bd5628c84342058fa0e2f78))
+
 ## [0.4.0](https://github.com/noir-lang/noir/compare/v0.3.2...v0.4.0) (2023-04-17)