chore: Add rust-toolchain file & adapt nix for changes (#2686)

.github/workflows/abi_wasm.yml

@@ -47,8 +47,8 @@ jobs:
       - name: Build noirc_abi_wasm
         run: |
           nix build -L .#noirc_abi_wasm
-          cp -r ./result/nodejs ./tooling/noirc_abi_wasm
-          cp -r ./result/web ./tooling/noirc_abi_wasm
+          cp -r ./result/noirc_abi_wasm/nodejs ./tooling/noirc_abi_wasm
+          cp -r ./result/noirc_abi_wasm/web ./tooling/noirc_abi_wasm
 
       - name: Export cache from nix store
         if: ${{ steps.cache.outputs.cache-hit != 'true' && github.event_name != 'merge_group' }}
@@ -63,7 +63,7 @@ jobs:
           key: ${{ steps.cache.outputs.cache-primary-key }}
 
       - name: Dereference symlink
-        run: echo "UPLOAD_PATH=$(readlink -f result)" >> $GITHUB_ENV
+        run: echo "UPLOAD_PATH=$(readlink -f ./result/noirc_abi_wasm)" >> $GITHUB_ENV
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3
@@ -75,7 +75,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     needs: [build]
-  
+
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
@@ -85,7 +85,7 @@ jobs:
         with:
           name: noirc_abi_wasm
           path: ./tooling/noirc_abi_wasm
-    
+
       - name: Install Yarn dependencies
         uses: ./.github/actions/setup
 
@@ -94,7 +94,7 @@ jobs:
 
       - name: Install Playwright
         uses: ./.github/actions/install-playwright
-          
+
       - name: Run browser tests
         run: yarn workspace @noir-lang/noirc_abi test:browser
 

.github/workflows/publish-abi_wasm.yml

@@ -36,7 +36,7 @@ jobs:
           nix build -L .#noirc_abi_wasm
 
       - name: Discover Build Output Path
-        run: echo "BUILD_OUTPUT_PATH=$(readlink -f ./result)" >> $GITHUB_ENV
+        run: echo "BUILD_OUTPUT_PATH=$(readlink -f ./result/noirc_abi_wasm)" >> $GITHUB_ENV
 
       - name: Copy Build Output to Temporary Directory
         run: |

.github/workflows/test-integration.yml

@@ -54,10 +54,10 @@ jobs:
 
       - name: Build noir_wasm package
         run: |
-          nix build -L .#wasm
-          echo "UPLOAD_PATH=$(readlink -f result)" >> $GITHUB_ENV
-          cp -r ./result/nodejs ./compiler/wasm
-          cp -r ./result/web ./compiler/wasm
+          nix build -L .#noir_wasm
+          echo "UPLOAD_PATH=$(readlink -f ./result/noir_wasm)" >> $GITHUB_ENV
+          cp -r ./result/noir_wasm/nodejs ./compiler/wasm
+          cp -r ./result/noir_wasm/web ./compiler/wasm
 
       - name: Upload `noir_wasm` artifact
         uses: actions/upload-artifact@v3
@@ -69,9 +69,9 @@ jobs:
       - name: Build noirc_abi_wasm package
         run: |
           nix build -L .#noirc_abi_wasm
-          echo "UPLOAD_PATH=$(readlink -f result)" >> $GITHUB_ENV
-          cp -r ./result/nodejs ./tooling/noirc_abi_wasm
-          cp -r ./result/web ./tooling/noirc_abi_wasm
+          echo "UPLOAD_PATH=$(readlink -f ./result/noirc_abi_wasm)" >> $GITHUB_ENV
+          cp -r ./result/noirc_abi_wasm/nodejs ./tooling/noirc_abi_wasm
+          cp -r ./result/noirc_abi_wasm/web ./tooling/noirc_abi_wasm
 
       - name: Upload `noirc_abi_wasm` artifact
         uses: actions/upload-artifact@v3
@@ -90,8 +90,8 @@ jobs:
       - name: Run `integration-tests`
         run: |
           yarn test:integration
-          
-      - name: Alert on nightly test failure  
+
+      - name: Alert on nightly test failure
         uses: JasonEtco/create-an-issue@v2
         if: ${{ failure() && github.event_name == 'schedule' }}
         env:

.github/workflows/wasm.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         target: [x86_64-unknown-linux-gnu]
-        
+
     steps:
       - name: Checkout Noir repo
         uses: actions/checkout@v4
@@ -81,7 +81,7 @@ jobs:
 
       - name: Build wasm package
         run: |
-          nix build -L .#wasm
+          nix build -L .#noir_wasm
 
       - name: Export cache from nix store
         if: ${{ steps.cache.outputs.cache-hit != 'true' && github.event_name != 'merge_group' }}
@@ -96,7 +96,7 @@ jobs:
           key: ${{ steps.cache.outputs.cache-primary-key }}
 
       - name: Dereference symlink
-        run: echo "UPLOAD_PATH=$(readlink -f result)" >> $GITHUB_ENV
+        run: echo "UPLOAD_PATH=$(readlink -f ./result/noir_wasm)" >> $GITHUB_ENV
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3

compiler/wasm/README.md

@@ -9,11 +9,11 @@ The package also handles dependency management like how Nargo (Noir's CLI tool)
 Outside of the [noir repo](https://github.com/noir-lang/noir), this package can be built using the command below:
 
 ```bash
-nix build -L github:noir-lang/noir/master#wasm
+nix build -L github:noir-lang/noir/master#noir_wasm
 ```
 
 If you are within the noir repo and would like to build local changes, you can use:
 
 ```bash
-nix build -L #wasm
+nix build -L #noir_wasm
 ```

compiler/wasm/installPhase.sh

@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
 export self_path=$(dirname "$(readlink -f "$0")")
 
-mkdir -p $out
-cp $self_path/README.md $out/
-cp $self_path/package.json $out/
-cp -r $self_path/nodejs $out/
-cp -r $self_path/web $out/
+export out_path=$out/noir_wasm
+
+mkdir -p $out_path
+cp $self_path/README.md $out_path/
+cp $self_path/package.json $out_path/
+cp -r $self_path/nodejs $out_path/
+cp -r $self_path/web $out_path/