Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add NoteFile object #721

Merged
merged 11 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Enhancements

* Add new `NoteFile` object to represent serialized notes (#721).
* [BREAKING] Create `auth` module for `TransactionAuthenticator` and other related objects (#714).
* Implemented `build_recipient_hash` to build recipient hash for custom notes (#710)
* Replaced `cargo-make` with just `make` for running tasks (#696).
Expand Down
195 changes: 195 additions & 0 deletions objects/src/notes/file.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
use vm_core::utils::{ByteReader, ByteWriter, Deserializable, Serializable};
use vm_processor::DeserializationError;

use super::{Note, NoteDetails, NoteId, NoteInclusionProof};

// NOTE FILE
// ================================================================================================

/// A serialized representation of a note.
pub enum NoteFile {
bobbinth marked this conversation as resolved.
Show resolved Hide resolved
/// The note's details aren't known.
NoteId(NoteId),
/// The note has not yet been recorded on chain.
NoteDetails(NoteDetails),
/// The note has been recorded on chain.
NoteWithProof(Note, NoteInclusionProof),
}

impl From<NoteDetails> for NoteFile {
fn from(details: NoteDetails) -> Self {
NoteFile::NoteDetails(details)
}
}

impl From<NoteId> for NoteFile {
fn from(note_id: NoteId) -> Self {
NoteFile::NoteId(note_id)
}
}

// SERIALIZATION
// ================================================================================================

impl Serializable for NoteFile {
fn write_into<W: ByteWriter>(&self, target: &mut W) {
target.write_bytes("note".as_bytes());
match self {
NoteFile::NoteId(note_id) => {
target.write_u8(0);
note_id.write_into(target);
},
NoteFile::NoteDetails(details) => {
target.write_u8(1);
details.write_into(target);
},
NoteFile::NoteWithProof(note, proof) => {
target.write_u8(2);
note.write_into(target);
proof.write_into(target);
},
}
}
}

impl Deserializable for NoteFile {
fn read_from<R: ByteReader>(source: &mut R) -> Result<Self, DeserializationError> {
let magic_value = source.read_string(4)?;
if magic_value != "note" {
return Err(DeserializationError::InvalidValue(format!(
"Invalid note file marker: {magic_value}"
)));
}
match source.read_u8()? {
0 => Ok(NoteFile::NoteId(NoteId::read_from(source)?)),
1 => Ok(NoteFile::NoteDetails(NoteDetails::read_from(source)?)),
2 => {
let note = Note::read_from(source)?;
let proof = NoteInclusionProof::read_from(source)?;
Ok(NoteFile::NoteWithProof(note, proof))
},
v => {
Err(DeserializationError::InvalidValue(format!("Unknown variant {v} for NoteFile")))
},
}
}
}

// TESTS
// ================================================================================================

#[cfg(test)]
mod tests {
use alloc::vec::Vec;

use assembly::{ast::ProgramAst, Assembler};
use vm_core::{
utils::{Deserializable, Serializable},
Felt,
};

use crate::{
accounts::{
account_id::testing::{
ACCOUNT_ID_FUNGIBLE_FAUCET_ON_CHAIN,
ACCOUNT_ID_REGULAR_ACCOUNT_UPDATABLE_CODE_OFF_CHAIN,
},
AccountId,
},
assets::{Asset, FungibleAsset},
notes::{
Note, NoteAssets, NoteFile, NoteInclusionProof, NoteInputs, NoteMetadata,
NoteRecipient, NoteScript, NoteTag, NoteType,
},
};

fn create_example_note() -> Note {
let faucet = AccountId::new_unchecked(Felt::new(ACCOUNT_ID_FUNGIBLE_FAUCET_ON_CHAIN));
let target = AccountId::new_unchecked(Felt::new(
ACCOUNT_ID_REGULAR_ACCOUNT_UPDATABLE_CODE_OFF_CHAIN,
));

let serial_num = [Felt::new(0), Felt::new(1), Felt::new(2), Felt::new(3)];
let note_program_ast = ProgramAst::parse("begin push.1 drop end").unwrap();
let (script, _) = NoteScript::new(note_program_ast, &Assembler::default()).unwrap();
let note_inputs = NoteInputs::new(vec![target.into()]).unwrap();
let recipient = NoteRecipient::new(serial_num, script, note_inputs);

let asset = Asset::Fungible(FungibleAsset::new(faucet, 100).unwrap());
let metadata =
NoteMetadata::new(faucet, NoteType::Public, NoteTag::from(123), Felt::new(0)).unwrap();

Note::new(NoteAssets::new(vec![asset]).unwrap(), metadata, recipient)
}

#[test]
fn serialized_note_magic() {
let note = create_example_note();
let file = NoteFile::NoteId(note.id());
let mut buffer = Vec::new();
file.write_into(&mut buffer);

let magic_value = &buffer[..4];
assert_eq!(magic_value, b"note");
}

#[test]
fn serialize_id() {
let note = create_example_note();
let file = NoteFile::NoteId(note.id());
let mut buffer = Vec::new();
file.write_into(&mut buffer);

let file_copy = NoteFile::read_from_bytes(&buffer).unwrap();

match file_copy {
NoteFile::NoteId(note_id) => {
assert_eq!(note.id(), note_id);
},
_ => panic!("Invalid note file variant"),
}
}

#[test]
fn serialize_details() {
let note = create_example_note();
let file = NoteFile::NoteDetails(note.details.clone());
let mut buffer = Vec::new();
file.write_into(&mut buffer);

let file_copy = NoteFile::read_from_bytes(&buffer).unwrap();

match file_copy {
NoteFile::NoteDetails(details) => {
assert_eq!(details, note.details);
},
_ => panic!("Invalid note file variant"),
}
}

#[test]
fn serialize_with_proof() {
let note = create_example_note();
let mock_inclusion_proof = NoteInclusionProof::new(
Default::default(),
Default::default(),
Default::default(),
0,
Default::default(),
)
.unwrap();
let file = NoteFile::NoteWithProof(note.clone(), mock_inclusion_proof.clone());
let mut buffer = Vec::new();
file.write_into(&mut buffer);

let file_copy = NoteFile::read_from_bytes(&buffer).unwrap();

match file_copy {
NoteFile::NoteWithProof(note_copy, inclusion_proof_copy) => {
assert_eq!(note, note_copy);
assert_eq!(inclusion_proof_copy, mock_inclusion_proof);
},
_ => panic!("Invalid note file variant"),
}
}
}
3 changes: 3 additions & 0 deletions objects/src/notes/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ pub use recipient::NoteRecipient;
mod script;
pub use script::NoteScript;

mod file;
pub use file::NoteFile;

// CONSTANTS
// ================================================================================================

Expand Down
Loading