fix(noir): Add workaround for latest noir in account contracts (#1781)

Workaround for this issue noir-lang/noir#2421
so we can update the aztec tag to master.

# 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.
- [x] 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).

yarn-project/acir-simulator/package.json

@@ -35,7 +35,7 @@
     "@aztec/circuits.js": "workspace:^",
     "@aztec/foundation": "workspace:^",
     "@aztec/types": "workspace:^",
-    "acvm_js": "github:noir-lang/acvm-js-wasm#arv/0.22+init-pedersen",
+    "acvm_js": "github:noir-lang/acvm-js-wasm#arv/0.23.0_prerelease",
     "levelup": "^5.1.1",
     "memdown": "^6.1.1",
     "tslib": "^2.4.0"

yarn-project/end-to-end/src/e2e_account_contracts.test.ts

@@ -61,7 +61,9 @@ function itShouldBehaveLikeAnAccountContract(getAccountContract: (encryptionKey:
         accountAddress,
       ).getWallet();
       const childWithInvalidWallet = await ChildContract.at(child.address, invalidWallet);
-      await expect(childWithInvalidWallet.methods.value(42).simulate()).rejects.toThrowError(/Assertion failed: '.*'/);
+      await expect(childWithInvalidWallet.methods.value(42).simulate()).rejects.toThrowError(
+        /Cannot satisfy constraint.*/,
+      );
     });
   });
 }

yarn-project/noir-contracts/src/contracts/ecdsa_account_contract/src/main.nr

@@ -50,7 +50,12 @@ contract EcdsaAccount {
         // Note that noir expects the hash of the message/challenge as input to the ECDSA verification.
         let payload_fields: [Field; entrypoint::ENTRYPOINT_PAYLOAD_SIZE] = payload.serialize();
         let message_field: Field = std::hash::pedersen_with_separator(payload_fields, GENERATOR_INDEX__SIGNATURE_PAYLOAD)[0];
-        let message_bytes = message_field.to_be_bytes(32);
+        // TODO workaround for https://github.com/noir-lang/noir/issues/2421
+        let message_bytes_slice = message_field.to_be_bytes(32);
+        let mut message_bytes: [u8; 32] = [0; 32];
+        for i in 0..32 {
+          message_bytes[i] = message_bytes_slice[i];
+        }
         let hashed_message: [u8; 32] = std::hash::sha256(message_bytes);
         let verification = std::ecdsa_secp256k1::verify_signature(public_key.x, public_key.y, signature, hashed_message);
         assert(verification == true);

yarn-project/noir-contracts/src/contracts/schnorr_account_contract/src/main.nr

@@ -49,7 +49,12 @@ contract SchnorrAccount {
         // Verify payload signature
         let payload_fields: [Field; entrypoint::ENTRYPOINT_PAYLOAD_SIZE] = payload.serialize();
         let message_field: Field = std::hash::pedersen_with_separator(payload_fields, GENERATOR_INDEX__SIGNATURE_PAYLOAD)[0];
-        let message_bytes = message_field.to_be_bytes(32);
+        // TODO workaround for https://github.com/noir-lang/noir/issues/2421
+        let message_bytes_slice = message_field.to_be_bytes(32);
+        let mut message_bytes: [u8; 32] = [0; 32];
+        for i in 0..32 {
+          message_bytes[i] = message_bytes_slice[i];
+        }
 
         // Verify signature of the payload bytes
         let verification = std::schnorr::verify_signature(public_key.x, public_key.y, signature, message_bytes);

yarn-project/noir-contracts/src/contracts/schnorr_single_key_account_contract/src/main.nr

@@ -35,7 +35,12 @@ contract SchnorrSingleKeyAccount {
         // Verify payload signature
         let payload_fields: [Field; entrypoint::ENTRYPOINT_PAYLOAD_SIZE] = payload.serialize();
         let message_field: Field = std::hash::pedersen_with_separator(payload_fields, GENERATOR_INDEX__SIGNATURE_PAYLOAD)[0];
-        let message_bytes = message_field.to_be_bytes(32);
+        // TODO workaround for https://github.com/noir-lang/noir/issues/2421
+        let message_bytes_slice = message_field.to_be_bytes(32);
+        let mut message_bytes: [u8; 32] = [0; 32];
+        for i in 0..32 {
+          message_bytes[i] = message_bytes_slice[i];
+        }
 
         // Convert owner pubkey into fields
         let mut x: Field = 0;
@@ -50,7 +55,6 @@ contract SchnorrSingleKeyAccount {
         }
 
         // Verify signature of the payload hash
-        // TODO: Find out why this signature verification never fails
         let verification = std::schnorr::verify_signature(x, y, signature, message_bytes);
         assert(verification == true);
 

yarn-project/noir-contracts/src/scripts/copy_output.ts

@@ -34,6 +34,8 @@ function writeToProject(abi: any) {
       const toWrite = {
         ...abi,
         functions: abi.functions.map((f: any) => omit(f, projectContract.exclude)),
+        // If we maintain debug symbols they will get commited to git.
+        debug: undefined,
       };
       const targetFilename = pathJoin(projectContract.target, `${snakeCase(abi.name)}_contract.json`);
       writeFileSync(targetFilename, JSON.stringify(toWrite, null, 2) + '\n');