diff --git a/noir-projects/aztec-nr/aztec/src/generators.nr b/noir-projects/aztec-nr/aztec/src/generators.nr new file mode 100644 index 000000000000..6a4840cff607 --- /dev/null +++ b/noir-projects/aztec-nr/aztec/src/generators.nr @@ -0,0 +1,3 @@ +use dep::protocol_types::point::Point; + +global G1 = Point { x: 1, y: 17631683881184975370165255887551781615748388533673675138860, is_infinite: false }; diff --git a/noir-projects/aztec-nr/aztec/src/lib.nr b/noir-projects/aztec-nr/aztec/src/lib.nr index d4b1abf35e71..af7f03c1f516 100644 --- a/noir-projects/aztec-nr/aztec/src/lib.nr +++ b/noir-projects/aztec-nr/aztec/src/lib.nr @@ -1,5 +1,6 @@ mod context; mod deploy; +mod generators; mod hash; mod history; mod initializer; diff --git a/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr index 195138cfd4d4..8ef2990ae8e7 100644 --- a/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr @@ -32,6 +32,7 @@ contract AvmTest { use dep::aztec::oracle::get_contract_instance::{get_contract_instance_avm, get_contract_instance_internal_avm}; use dep::aztec::protocol_types::abis::function_selector::FunctionSelector; use dep::aztec::context::gas::GasOpts; + use dep::aztec::generators::G1; use dep::compressed_string::CompressedString; #[aztec(storage)] @@ -137,19 +138,16 @@ contract AvmTest { #[aztec(public)] fn elliptic_curve_add_and_double() -> Point { - let g = Point { x: 1, y: 17631683881184975370165255887551781615748388533673675138860, is_infinite: false }; - - let doubled = g + g; - let added = g + doubled; + let doubled = G1 + G1; + let added = G1 + doubled; added } #[aztec(public)] fn variable_base_msm() -> Point { - let g = Point { x: 1, y: 17631683881184975370165255887551781615748388533673675138860, is_infinite: false }; let scalar = Scalar { lo: 3, hi: 0 }; let scalar2 = Scalar { lo: 20, hi: 0 }; - multi_scalar_mul([g, g], [scalar, scalar2]) + multi_scalar_mul([G1, G1], [scalar, scalar2]) } /************************************************************************ diff --git a/noir-projects/noir-contracts/contracts/private_token_contract/src/types/token_note.nr b/noir-projects/noir-contracts/contracts/private_token_contract/src/types/token_note.nr index 30ef7add279a..0ca85a31f6c0 100644 --- a/noir-projects/noir-contracts/contracts/private_token_contract/src/types/token_note.nr +++ b/noir-projects/noir-contracts/contracts/private_token_contract/src/types/token_note.nr @@ -2,7 +2,8 @@ use dep::aztec::{ prelude::{AztecAddress, NoteHeader, NoteInterface, PrivateContext}, protocol_types::{constants::GENERATOR_INDEX__NOTE_NULLIFIER, point::Point, scalar::Scalar, hash::poseidon2_hash}, note::utils::compute_note_hash_for_consumption, oracle::unsafe_rand::unsafe_rand, - keys::getters::get_nsk_app, note::note_getter_options::PropertySelector + keys::getters::get_nsk_app, note::note_getter_options::PropertySelector, + generators::G1, }; use dep::std::field::bn254::decompose; use dep::std::embedded_curve_ops::multi_scalar_mul; @@ -32,8 +33,6 @@ trait PrivatelyRefundable { global TOKEN_NOTE_LEN: Field = 3; // 3 plus a header. global TOKEN_NOTE_BYTES_LEN: Field = 3 * 32 + 64; -// Grumpkin generator point. -global G1 = Point { x: 1, y: 17631683881184975370165255887551781615748388533673675138860, is_infinite: false }; #[aztec(note)] struct TokenNote {