refactor: nuking GrumpkinScalar (#6240)

All the aztec usecases were already replaced with a GrumpkinPrivateKey which is basically a duplicate of GrumpkinScalar. Fixes noir-lang/noir#4968
AztecProtocol · May 7, 2024 · d2df10d · d2df10d
1 parent c145757
commit d2df10d
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 27 deletions.
diff --git a/noir-projects/aztec-nr/aztec/src/keys/point_to_symmetric_key.nr b/noir-projects/aztec-nr/aztec/src/keys/point_to_symmetric_key.nr
@@ -1,5 +1,5 @@
 use dep::protocol_types::{constants::GENERATOR_INDEX__SYMMETRIC_KEY, grumpkin_private_key::GrumpkinPrivateKey, grumpkin_point::GrumpkinPoint, utils::arr_copy_slice};
-use dep::std::{hash::sha256, grumpkin_scalar::GrumpkinScalar, embedded_curve_ops::multi_scalar_mul};
+use dep::std::{hash::sha256, embedded_curve_ops::multi_scalar_mul};
 
 // TODO(#5726): This function is called deriveAESSecret in TS. I don't like point_to_symmetric_key name much since
 // point is not the only input of the function. Unify naming with TS once we have a better name.

diff --git a/...projects/noir-protocol-circuits/crates/types/src/abis/nullifier_key_validation_request.nr b/...projects/noir-protocol-circuits/crates/types/src/abis/nullifier_key_validation_request.nr
@@ -3,12 +3,11 @@ use crate::{
     address::AztecAddress,
     constants::{NULLIFIER_KEY_VALIDATION_REQUEST_CONTEXT_LENGTH, NULLIFIER_KEY_VALIDATION_REQUEST_LENGTH},
     traits::{Empty, Serialize, Deserialize}, grumpkin_point::GrumpkinPoint,
-    grumpkin_private_key::GrumpkinPrivateKey
 };
 
 struct NullifierKeyValidationRequest {
     master_nullifier_public_key: GrumpkinPoint,
-    app_nullifier_secret_key: Field, // not a GrumpkinScalar because it's output of poseidon2
+    app_nullifier_secret_key: Field, // not a grumpkin scalar because it's output of poseidon2
 }
 
 impl Eq for NullifierKeyValidationRequest {

diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/grumpkin_private_key.nr b/noir-projects/noir-protocol-circuits/crates/types/src/grumpkin_private_key.nr
@@ -1,4 +1,4 @@
-use dep::std::{cmp::Eq, grumpkin_scalar::GrumpkinScalar, embedded_curve_ops::fixed_base_scalar_mul};
+use dep::std::{cmp::Eq, embedded_curve_ops::fixed_base_scalar_mul};
 use crate::{
     grumpkin_point::GrumpkinPoint,
     traits::Empty

diff --git a/noir/noir-repo/noir_stdlib/src/grumpkin_scalar.nr b/noir/noir-repo/noir_stdlib/src/grumpkin_scalar.nr
diff --git a/noir/noir-repo/noir_stdlib/src/lib.nr b/noir/noir-repo/noir_stdlib/src/lib.nr
@@ -6,7 +6,6 @@ mod schnorr;
 mod ecdsa_secp256k1;
 mod ecdsa_secp256r1;
 mod eddsa;
-mod grumpkin_scalar;
 mod embedded_curve_ops;
 mod sha256;
 mod sha512;