note type id fix

AztecProtocol · Jan 8, 2025 · 58da308 · 58da308
1 parent 8ce17d0
commit 58da308
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/docs/docs/aztec/smart_contracts/functions/attributes.md b/docs/docs/aztec/smart_contracts/functions/attributes.md
@@ -232,8 +232,8 @@ impl CustomNote {
     }
 
     fn get_note_type_id() -> Field {
-        // Automatically generated unique ID based on Keccak hash of the struct name
-        0xd2de93eaab1d59abddf06134e737665f076f556feb7b6d3d72ca557b430b14d2
+        // Assigned by macros by incrementing a counter
+        2
     }
 
     fn get_header(note: CustomNote) -> aztec::note::note_header::NoteHeader {

diff --git a/noir-projects/aztec-nr/aztec/src/test/mocks/mock_note.nr b/noir-projects/aztec-nr/aztec/src/test/mocks/mock_note.nr
@@ -64,8 +64,8 @@ impl NoteInterface<MOCK_NOTE_LENGTH> for MockNote {
     }
 
     fn get_note_type_id() -> Field {
-        // randomly chose note type id
-        4135
+        // randomly chosen note type id --> has to fit within 7 bits
+        76
     }
 
     fn to_be_bytes(self, storage_slot: Field) -> [u8; MOCK_NOTE_LENGTH * 32 + 64] {

diff --git a/noir-projects/noir-contracts/contracts/ecdsa_public_key_note/src/lib.nr b/noir-projects/noir-contracts/contracts/ecdsa_public_key_note/src/lib.nr
@@ -89,13 +89,8 @@ impl NoteInterface<ECDSA_PUBLIC_KEY_NOTE_LEN> for EcdsaPublicKeyNote {
     }
 
     fn get_note_type_id() -> Field {
-        comptime
-        {
-            let bytes = "EcdsaPublicKeyNote".as_bytes();
-            let hash = aztec::protocol_types::hash::poseidon2_hash_bytes(bytes);
-            let hash_bytes = hash.to_be_bytes::<4>();
-            aztec::protocol_types::utils::field::field_from_bytes(hash_bytes, true)
-        }
+        // randomly chosen note type id --> has to fit within 7 bits
+        76
     }
 
     fn get_header(self) -> NoteHeader {

diff --git a/yarn-project/foundation/src/abi/note_selector.ts b/yarn-project/foundation/src/abi/note_selector.ts
@@ -28,7 +28,7 @@ export class NoteSelector extends Selector {
     const reader = BufferReader.asReader(buffer);
     const value = Number(toBigIntBE(reader.readBytes(Selector.SIZE)));
     if (value >= 1 << 7) {
-      throw new Error('Invalid note selector');
+      throw new Error(`Invalid note selector: ${value}`);
     }
     return new NoteSelector(value);
   }