diff --git a/LICENCE b/LICENCE
new file mode 100644
index 0000000..7a4a3ea
--- /dev/null
+++ b/LICENCE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..c137de4
--- /dev/null
+++ b/README.md
@@ -0,0 +1,66 @@
+
+
+
+
Aztec.nr
+
+
+ Aztec Smart Contract Development Framework
+
+
+
+
+
+
+
+
+
+
+
+# Aztec.nr
+
+`Aztec-nr` is a [Noir](https://noir-lang.org) framework for contract development on [Aztec](aztec.network).
+
+### Directory Structure
+```
+.
+├── aztec // The core of the aztec framework
+├── easy-private-state // A library for easily creating private state
+├── safe-math // A library for safe arithmetic
+└── value-note // A library for storing arbitrary values
+```
+
+## Installing Aztec-nr libraries
+
+```toml
+[package]
+name = "your_contract"
+authors = ["you! ;) "]
+compiler_version = ""
+type = "contract"
+
+[dependencies]
+# To install the aztec framework (required to create aztec contracts).
+aztec = { git = "https://github.com/AztecProtocol/aztec-nr", tag = "master" , directory = "aztec" }
+
+# Optional libraries
+easy_private_state = { git = "https://github.com/AztecProtocol/aztec-nr", tag = "master" , directory = "easy-private-state" }
+safe_math = { git = "https://github.com/AztecProtocol/aztec-nr", tag = "master" , directory = "safe-math" }
+value_note = { git = "https://github.com/AztecProtocol/aztec-nr", tag = "master" , directory = "value-note" }
+```
+
+
+## Prerequisites
+To use `Aztec.nr` you must have [Noir](https://noir-lang.org/) installed. Noir is a general purpose programming language for creating zero-knowledge-proofs. `Aztec.nr` supercharges the Noir language with Aztec Smart Contract capabilities.
+
+### Quick Installation
+The fastest way to install is with [noirup](https://noir-lang.org/getting_started/nargo_installation#option-1-noirup).
+
+To use `Aztec-nr` the `aztec` version of `Noir` is required (Note; this version is temporarily required if you would like to use `#[aztec()]` macros).
+
+Once noirup is installed, you can run the following:
+```bash
+noirup -v aztec
+```
+
+For more installation options, please view [Noir's getting started.](https://noir-lang.org/getting_started/nargo_installation)
+
diff --git a/assets/Aztec_banner.png b/assets/Aztec_banner.png
new file mode 100644
index 0000000..5032029
Binary files /dev/null and b/assets/Aztec_banner.png differ
diff --git a/aztec/src/messaging.nr b/aztec/src/messaging.nr
index c9ee3be..8f41c29 100644
--- a/aztec/src/messaging.nr
+++ b/aztec/src/messaging.nr
@@ -1,4 +1,3 @@
-mod get_commitment_getter_data;
mod l1_to_l2_message;
mod l1_to_l2_message_getter_data;
diff --git a/aztec/src/messaging/get_commitment_getter_data.nr b/aztec/src/messaging/get_commitment_getter_data.nr
deleted file mode 100644
index 07d826d..0000000
--- a/aztec/src/messaging/get_commitment_getter_data.nr
+++ /dev/null
@@ -1,15 +0,0 @@
-use crate::oracle::get_commitment::COMMITMENT_GETTER_LENGTH;
-
-struct CommitmentGetterData {
- message: Field,
- leaf_index: Field,
- root: Field,
-}
-
-fn make_commitment_getter_data(fields: [Field; COMMITMENT_GETTER_LENGTH], start: Field) -> CommitmentGetterData {
- CommitmentGetterData {
- message: fields[start],
- leaf_index: fields[start + 1],
- root: fields[start + 2],
- }
-}
\ No newline at end of file
diff --git a/aztec/src/note/lifecycle.nr b/aztec/src/note/lifecycle.nr
index b6e530e..43ccdfa 100644
--- a/aztec/src/note/lifecycle.nr
+++ b/aztec/src/note/lifecycle.nr
@@ -50,7 +50,6 @@ fn create_note_hash_from_public(
fn destroy_note(
context: &mut PrivateContext,
- storage_slot: Field,
note: Note,
note_interface: NoteInterface,
) {
@@ -72,7 +71,7 @@ fn destroy_note(
// TODO(1718): Can we reuse the note commitment computed in `compute_nullifier`?
nullified_commitment = compute_inner_note_hash(note_interface, note);
}
- assert(notify_nullified_note(storage_slot, nullifier, nullified_commitment) == 0);
+ assert(notify_nullified_note(nullifier, nullified_commitment) == 0);
context.push_new_nullifier(nullifier, nullified_commitment)
}
\ No newline at end of file
diff --git a/aztec/src/note/note_getter.nr b/aztec/src/note/note_getter.nr
index ee40765..808f938 100644
--- a/aztec/src/note/note_getter.nr
+++ b/aztec/src/note/note_getter.nr
@@ -13,11 +13,9 @@ use crate::note::{
note_header::NoteHeader,
note_viewer_options::NoteViewerOptions,
utils::compute_note_hash_for_read_or_nullify,
- utils::compute_unique_siloed_note_hash,
utils::compute_inner_note_hash,
utils::compute_siloed_note_hash,
};
-use crate::messaging::get_commitment_getter_data::make_commitment_getter_data;
use crate::oracle;
use crate::types::vec::BoundedVec;
@@ -34,69 +32,29 @@ fn check_note_header(
assert(header.storage_slot == storage_slot);
}
-fn ensure_note_exists(
- context: &mut PrivateContext,
- storage_slot: Field,
- note_interface: NoteInterface,
- note: &mut Note,
-) {
- let saved_note = get_note_internal(storage_slot, note_interface);
-
- // Only copy over the header to the original note to make sure the preimage is the same.
- let get_header = note_interface.get_header;
- let set_header = note_interface.set_header;
- let note_header = get_header(saved_note);
- set_header(note, note_header);
-
- check_note_header(*context, storage_slot, note_interface, *note);
-
- let note_hash_for_read_request = compute_note_hash_for_read_or_nullify(note_interface, *note);
- context.push_read_request(note_hash_for_read_request);
-}
-
// Ensure a note's hash exists in the tree without retrieving the entire
// notes via the oracle.
-// Modifies the note by populating it with header info.
fn ensure_note_hash_exists(
context: &mut PrivateContext,
- storage_slot: Field,
note_interface: NoteInterface,
- note: &mut Note,
+ note: Note,
+ from_public: bool,
) {
- // Initialize header of note. Must be done before computing note hashes as it initializes the:
- // - storage slot (used in inner note hash)
- // - the contract address (used in siloed note hash)
- // - and the nonce (used in the unique siloed note hash)
- let set_header = note_interface.set_header;
- let note_header = NoteHeader {
- contract_address: (*context).this_address(),
- // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1386): should be
- // real nonce (once public kernel applies nonces).
- nonce: 0,
- storage_slot
- };
- set_header(note, note_header);
-
- // Get a note from oracle and early out if it doesn't exist.
- let inner_note_hash = compute_inner_note_hash(note_interface, *note);
-
- let raw_oracle_ret = oracle::get_commitment::get_commitment(inner_note_hash);
- let deserialized_oracle_ret = make_commitment_getter_data(raw_oracle_ret, 0);
- // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1386): should be
- // unique_siloed_note_hash once public kernel applies nonces
- let saved_siloed_note_hash = deserialized_oracle_ret.message;
-
- assert(saved_siloed_note_hash != 0); // TODO(dbanks12): necessary?
-
- check_note_header(*context, storage_slot, note_interface, *note);
-
- // Ensure that the note hash retrieved from oracle matches the one computed from note.
- let computed_siloed_note_hash = compute_siloed_note_hash(note_interface, *note);
- // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1386): should be
- // compute_note_hash_for_read_or_nullify once public kernel applies nonces
- assert(computed_siloed_note_hash == saved_siloed_note_hash);
+ let get_header = note_interface.get_header;
+ let header = get_header(note);
- context.push_read_request(computed_siloed_note_hash);
+ // Check the note hash via oracle and early out if it doesn't exist.
+ let inner_note_hash = compute_inner_note_hash(note_interface, note);
+ let exists = oracle::notes::check_note_hash_exists(header.nonce, inner_note_hash);
+ assert(exists, "Note hash does not exist.");
+
+ let mut note_hash_for_read_request = compute_note_hash_for_read_or_nullify(note_interface, note);
+ if from_public {
+ // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1386)
+ // Should remove this once public kernel applies nonces.
+ note_hash_for_read_request = compute_siloed_note_hash(note_interface, note);
+ }
+ context.push_read_request(note_hash_for_read_request);
}
fn get_note(
diff --git a/aztec/src/oracle.nr b/aztec/src/oracle.nr
index 056617e..da760ab 100644
--- a/aztec/src/oracle.nr
+++ b/aztec/src/oracle.nr
@@ -6,7 +6,6 @@ mod arguments;
mod call_private_function;
mod context;
mod debug_log;
-mod get_commitment;
mod get_l1_to_l2_message;
mod get_public_key;
mod get_secret_key;
diff --git a/aztec/src/oracle/get_commitment.nr b/aztec/src/oracle/get_commitment.nr
deleted file mode 100644
index 2793c00..0000000
--- a/aztec/src/oracle/get_commitment.nr
+++ /dev/null
@@ -1,11 +0,0 @@
-// Oracle function to get a commitment, its sibling path and index, without getting its preimage.
-
-// commitment + index + root;
-global COMMITMENT_GETTER_LENGTH = 3;
-
-#[oracle(getCommitment)]
-fn get_commitment_oracle(_commitment: Field) -> [Field; COMMITMENT_GETTER_LENGTH] {}
-
-unconstrained fn get_commitment(commitment: Field) -> [Field; COMMITMENT_GETTER_LENGTH] {
- get_commitment_oracle(commitment)
-}
diff --git a/aztec/src/oracle/notes.nr b/aztec/src/oracle/notes.nr
index 52d4a44..356cf5d 100644
--- a/aztec/src/oracle/notes.nr
+++ b/aztec/src/oracle/notes.nr
@@ -22,17 +22,28 @@ unconstrained fn notify_created_note(
#[oracle(notifyNullifiedNote)]
fn notify_nullified_note_oracle(
- _storage_slot: Field,
_nullifier: Field,
_inner_note_hash: Field,
) -> Field {}
unconstrained fn notify_nullified_note(
- storage_slot: Field,
nullifier: Field,
inner_note_hash: Field,
) -> Field {
- notify_nullified_note_oracle(storage_slot, nullifier, inner_note_hash)
+ notify_nullified_note_oracle(nullifier, inner_note_hash)
+}
+
+#[oracle(checkNoteHashExists)]
+fn check_note_hash_exists_oracle(
+ _nonce: Field,
+ _inner_note_hash: Field,
+) -> Field {}
+
+unconstrained fn check_note_hash_exists(
+ nonce: Field,
+ inner_note_hash: Field,
+) -> bool {
+ check_note_hash_exists_oracle(nonce, inner_note_hash) == 1
}
#[oracle(getNotes)]
diff --git a/aztec/src/state_vars/set.nr b/aztec/src/state_vars/set.nr
index c14eebb..698af2e 100644
--- a/aztec/src/state_vars/set.nr
+++ b/aztec/src/state_vars/set.nr
@@ -4,8 +4,9 @@ use crate::constants_gen::{MAX_NOTES_PER_PAGE, MAX_READ_REQUESTS_PER_CALL};
use crate::context::{PrivateContext, PublicContext, Context};
use crate::note::{
lifecycle::{create_note, create_note_hash_from_public, destroy_note},
- note_getter::{ensure_note_exists, ensure_note_hash_exists, get_notes, view_notes},
+ note_getter::{ensure_note_hash_exists, get_notes, view_notes},
note_getter_options::NoteGetterOptions,
+ note_header::NoteHeader,
note_interface::NoteInterface,
note_viewer_options::NoteViewerOptions,
utils::compute_note_hash_for_read_or_nullify,
@@ -49,64 +50,79 @@ impl Set {
);
}
- fn assert_contains_and_remove(self, note: Note) {
- let mut note_with_header = note;
- // TODO(1386): replace with `ensure_note_hash_exists`
- // once `get_commitment` works for privately created note hashes
- ensure_note_exists(
- self.context.private.unwrap(),
- self.storage_slot,
+ fn assert_contains_and_remove(self, note: &mut Note, nonce: Field) {
+ // Initialize header of note. Must be done before computing note hashes as it initializes the:
+ // - storage slot (used in inner note hash)
+ // - the contract address (used in siloed note hash)
+ // - and the nonce (used in the unique siloed note hash)
+ let context = self.context.private.unwrap();
+ let set_header = self.note_interface.set_header;
+ let note_header = NoteHeader{
+ contract_address: context.this_address(),
+ storage_slot: self.storage_slot,
+ nonce
+ };
+ set_header(note, note_header);
+
+ ensure_note_hash_exists(
+ context,
self.note_interface,
- &mut note_with_header,
+ *note,
+ false,
);
+
destroy_note(
- self.context.private.unwrap(),
- self.storage_slot,
- note_with_header,
+ context,
+ *note,
self.note_interface,
);
}
// NOTE: this function should ONLY be used for PUBLICLY-CREATED note hashes!
- // WARNING: function will be deprecated/removed eventually once `assert_contains_and_remove`
- // works for publicly-created note hashes as well.
- fn assert_contains_and_remove_publicly_created(self, note: Note) {
- let mut note_with_header = note;
- // Modifies note with the header which is necessary for the next step (remove).
+ // WARNING: function will be deprecated/removed eventually once public kernel applies nonces.
+ fn assert_contains_and_remove_publicly_created(self, note: &mut Note) {
+ // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1386)
+ // Should be real nonce (once public kernel applies nonces).
+ let nonce = 0;
+ let context = self.context.private.unwrap();
+ let set_header = self.note_interface.set_header;
+ let mut note_header = NoteHeader{
+ contract_address: context.this_address(),
+ storage_slot: self.storage_slot,
+ nonce
+ };
+ set_header(note, note_header);
+
ensure_note_hash_exists(
- self.context.private.unwrap(),
- self.storage_slot,
+ context,
self.note_interface,
- &mut note_with_header,
+ *note,
+ true,
);
- let get_header = self.note_interface.get_header;
- let set_header = self.note_interface.set_header;
- let mut header = get_header(note);
// Set the nonce to nonzero so that the nullifier is treated as persistable
// (non-transient) and so the private kernel does not attempt to match it to
// a pending noteHash/commitment and squash them.
// TODO(https://github.com/AztecProtocol/aztec-packages/issues/1386): remove
// this hack once public kernel injects nonces.
- header.nonce = 1;
- set_header(&mut note_with_header, header);
+ note_header.nonce = 1;
+ set_header(note, note_header);
+
destroy_note(
- self.context.private.unwrap(),
- self.storage_slot,
- note_with_header,
+ context,
+ *note,
self.note_interface,
);
}
fn remove(self, note: Note) {
+ let context = self.context.private.unwrap();
let note_hash = compute_note_hash_for_read_or_nullify(self.note_interface, note);
- let read_requests = self.context.private.unwrap_unchecked().read_requests;
- let has_been_read = read_requests.any(|r| r == note_hash);
+ let has_been_read = context.read_requests.any(|r| r == note_hash);
assert(has_been_read, "Can only remove a note that has been read from the set.");
destroy_note(
- self.context.private.unwrap(),
- self.storage_slot,
+ context,
note,
self.note_interface,
);
diff --git a/aztec/src/state_vars/singleton.nr b/aztec/src/state_vars/singleton.nr
index e103360..6b7afcb 100644
--- a/aztec/src/state_vars/singleton.nr
+++ b/aztec/src/state_vars/singleton.nr
@@ -56,7 +56,7 @@ impl Singleton {
let prev_note = get_note(context, self.storage_slot, self.note_interface);
// Nullify previous note.
- destroy_note(context, self.storage_slot, prev_note, self.note_interface);
+ destroy_note(context, prev_note, self.note_interface);
// Add replacement note.
create_note(context, self.storage_slot, new_note, self.note_interface);
@@ -67,7 +67,7 @@ impl Singleton {
let mut note = get_note(context, self.storage_slot, self.note_interface);
// Nullify current note to make sure it's reading the latest note.
- destroy_note(context, self.storage_slot, note, self.note_interface);
+ destroy_note(context, note, self.note_interface);
// Add the same note again.
// Because a nonce is added to every note in the kernel, its nullifier will be different.
diff --git a/safe-math/src/safe_u120.nr b/safe-math/src/safe_u120.nr
index ccb6ab9..5feeb3c 100644
--- a/safe-math/src/safe_u120.nr
+++ b/safe-math/src/safe_u120.nr
@@ -259,11 +259,10 @@ fn test_mul_div_up_ghost_overflow() {
// It should not be possible for us to overflow `mul_div_up` through the adder, since that require the divisor to be 1
// since we otherwise would not be at the max value. If divisor is 1, adder is 0.
-
#[test(should_fail)]
fn test_mul_div_up_zero_divisor() {
let a = SafeU120::new(6);
let b = SafeU120::new(3);
let c = SafeU120::new(0);
let _d = SafeU120::mul_div_up(a, b, c);
-}
\ No newline at end of file
+}