init

Author: sklppy88

l1-contracts/src/core/libraries/ConstantsGen.sol

@@ -146,6 +146,22 @@ library Constants {
   uint256 internal constant MULTI_CALL_ENTRYPOINT_ADDRESS = 4;
   uint256 internal constant FEE_JUICE_ADDRESS = 5;
   uint256 internal constant ROUTER_ADDRESS = 6;
+  uint256 internal constant DEFAULT_NPK_M_X =
+    582240093077765400562621227108555700500271598878376310175765873770292988861;
+  uint256 internal constant DEFAULT_NPK_M_Y =
+    10422444662424639723529825114205836958711284159673861467999592572974769103684;
+  uint256 internal constant DEFAULT_IVPK_M_X =
+    339708709767762472786445938838804872781183545349360029270386718856175781484;
+  uint256 internal constant DEFAULT_IVPK_M_Y =
+    12719619215050539905199178334954929730355853796706924300730604757520758976849;
+  uint256 internal constant DEFAULT_OVPK_M_X =
+    12212787719617305570587928860288475454328008955283046946846066128763901043335;
+  uint256 internal constant DEFAULT_OVPK_M_Y =
+    3646747884782549389807830220601404629716007431341772952958971658285958854707;
+  uint256 internal constant DEFAULT_TPK_M_X =
+    728059161893070741164607238299536939695876538801885465230641192969135857403;
+  uint256 internal constant DEFAULT_TPK_M_Y =
+    14575718736702206050102425029229426215631664471161015518982549597389390371695;
   uint256 internal constant AZTEC_ADDRESS_LENGTH = 1;
   uint256 internal constant GAS_FEES_LENGTH = 2;
   uint256 internal constant GAS_LENGTH = 2;

noir-projects/noir-protocol-circuits/crates/types/src/constants.nr

@@ -238,6 +238,22 @@ global MULTI_CALL_ENTRYPOINT_ADDRESS = AztecAddress::from_field(4);
 global FEE_JUICE_ADDRESS = AztecAddress::from_field(5);
 global ROUTER_ADDRESS = AztecAddress::from_field(6);
 
+// CANONICAL DEFAULT KEYS
+// This below are:
+// "az_null_npk"
+// "az_null_ivpk"
+// "az_null_ovpk"
+// "az_null_tpk"
+// as bytes, hashed to curve using grumpkin::g1::affine_element::hash_to_curve(<X>, 0);
+global DEFAULT_NPK_M_X = 0x01498945581e0eb9f8427ad6021184c700ef091d570892c437d12c7d90364bbd;
+global DEFAULT_NPK_M_Y = 0x170ae506787c5c43d6ca9255d571c10fa9ffa9d141666e290c347c5c9ab7e344;
+global DEFAULT_IVPK_M_X = 0x00c044b05b6ca83b9c2dbae79cc1135155956a64e136819136e9947fe5e5866c;
+global DEFAULT_IVPK_M_Y = 0x1c1f0ca244c7cd46b682552bff8ae77dea40b966a71de076ec3b7678f2bdb151;
+global DEFAULT_OVPK_M_X = 0x1b00316144359e9a3ec8e49c1cdb7eeb0cedd190dfd9dc90eea5115aa779e287;
+global DEFAULT_OVPK_M_Y = 0x080ffc74d7a8b0bccb88ac11f45874172f3847eb8b92654aaa58a3d2b8dc7833;
+global DEFAULT_TPK_M_X = 0x019c111f36ad3fc1d9b7a7a14344314d2864b94f030594cd67f753ef774a1efb;
+global DEFAULT_TPK_M_Y = 0x2039907fe37f08d10739255141bb066c506a12f7d1e8dfec21abc58494705b6f;
+
 // LENGTH OF STRUCTS SERIALIZED TO FIELDS
 global AZTEC_ADDRESS_LENGTH: u32 = 1;
 global GAS_FEES_LENGTH: u32 = 2;

noir-projects/noir-protocol-circuits/crates/types/src/public_keys.nr

@@ -1,10 +1,16 @@
 use crate::{
-    address::public_keys_hash::PublicKeysHash, constants::GENERATOR_INDEX__PUBLIC_KEYS_HASH,
-    hash::poseidon2_hash_with_separator, point::POINT_LENGTH,
-    traits::{Deserialize, Serialize, Empty, is_empty, Hash},
+    address::public_keys_hash::PublicKeysHash,
+    constants::{
+        GENERATOR_INDEX__PUBLIC_KEYS_HASH, DEFAULT_NPK_M_X, DEFAULT_NPK_M_Y, DEFAULT_IVPK_M_X,
+        DEFAULT_IVPK_M_Y, DEFAULT_OVPK_M_X, DEFAULT_OVPK_M_Y, DEFAULT_TPK_M_X, DEFAULT_TPK_M_Y,
+    }, hash::poseidon2_hash_with_separator, point::POINT_LENGTH,
+    traits::{Deserialize, Serialize, Hash},
 };
 
 use dep::std::embedded_curve_ops::EmbeddedCurvePoint as Point;
+use dep::std::embedded_curve_ops::fixed_base_scalar_mul as derive_public_key;
+use std::embedded_curve_ops::EmbeddedCurveScalar;
+use std::default::Default;
 
 pub global PUBLIC_KEYS_LENGTH: u32 = 12;
 
@@ -96,13 +102,21 @@ impl Serialize<POINT_LENGTH> for TpkM {
     }
 }
 
-impl Empty for PublicKeys {
-    fn empty() -> Self {
+impl Default for PublicKeys {
+    fn default() -> Self {
         PublicKeys {
-            npk_m: NpkM { inner: Point::empty() },
-            ivpk_m: IvpkM { inner: Point::empty() },
-            ovpk_m: OvpkM { inner: Point::empty() },
-            tpk_m: TpkM { inner: Point::empty() },
+            npk_m: NpkM {
+                inner: Point { x: DEFAULT_NPK_M_X, y: DEFAULT_NPK_M_Y, is_infinite: false },
+            },
+            ivpk_m: IvpkM {
+                inner: Point { x: DEFAULT_IVPK_M_X, y: DEFAULT_IVPK_M_Y, is_infinite: false },
+            },
+            ovpk_m: OvpkM {
+                inner: Point { x: DEFAULT_OVPK_M_X, y: DEFAULT_OVPK_M_Y, is_infinite: false },
+            },
+            tpk_m: TpkM {
+                inner: Point { x: DEFAULT_TPK_M_X, y: DEFAULT_TPK_M_Y, is_infinite: false },
+            },
         }
     }
 }
@@ -118,16 +132,10 @@ impl Eq for PublicKeys {
 
 impl PublicKeys {
     pub fn hash(self) -> PublicKeysHash {
-        PublicKeysHash::from_field(
-            if is_empty(self) {
-                0
-            } else {
-                poseidon2_hash_with_separator(
-                    self.serialize(),
-                    GENERATOR_INDEX__PUBLIC_KEYS_HASH as Field,
-                )
-            },
-        )
+        PublicKeysHash::from_field(poseidon2_hash_with_separator(
+            self.serialize(),
+            GENERATOR_INDEX__PUBLIC_KEYS_HASH as Field,
+        ))
     }
 }
 
@@ -202,13 +210,13 @@ unconstrained fn compute_public_keys_hash() {
 }
 
 #[test]
-unconstrained fn compute_empty_hash() {
-    let keys = PublicKeys::empty();
+unconstrained fn compute_default_hash() {
+    let keys = PublicKeys::default();
 
     let actual = keys.hash();
-    let test_data_empty_hash = 0x0000000000000000000000000000000000000000000000000000000000000000;
+    let test_data_default_hash = 0x1d3bf1fb93ae0e9cda83b203dd91c3bfb492a9aecf30ec90e1057eced0f0e62d;
 
-    assert(actual.to_field() == test_data_empty_hash);
+    assert(actual.to_field() == test_data_default_hash);
 }
 
 #[test]

noir-projects/noir-protocol-circuits/crates/types/src/tests/fixture_builder.nr

@@ -1330,7 +1330,7 @@ impl Empty for FixtureBuilder {
             returns_hash: 0,
             function_leaf_membership_witness: MembershipWitness::empty(),
             salted_initialization_hash: SaltedInitializationHash::from_field(0),
-            public_keys: PublicKeys::empty(),
+            public_keys: PublicKeys::default(),
             contract_class_artifact_hash: 0,
             contract_class_public_bytecode_commitment: 0,
             acir_hash: 0,

noir-projects/noir-protocol-circuits/crates/types/src/tests/fixtures/contracts.nr

@@ -32,7 +32,7 @@ global default_contract = ContractData {
     contract_class_id: ContractClassId {
         inner: 0x28e91aaf764bc6083e2796ff884079ad895d4b948d6ce8f37f01b29d0bc95a21,
     },
-    public_keys: PublicKeys::empty(),
+    public_keys: PublicKeys::default(),
     salted_initialization_hash: SaltedInitializationHash {
         inner: 0x13a939daa511233e5446905ed2cadbee14948fa75df183b53b5c14b612bffe88,
     },
@@ -56,7 +56,7 @@ global parent_contract = ContractData {
     contract_class_id: ContractClassId {
         inner: 0x00236b0dc6c537d5106543053c5b85c4cbe95b0474f8238b094bae63f1cbcfee,
     },
-    public_keys: PublicKeys::empty(),
+    public_keys: PublicKeys::default(),
     salted_initialization_hash: SaltedInitializationHash {
         inner: 0x24bd6ac7a182e2cf25e437c72f53544ef81dfd97d9afee23abb07a638e7be749,
     },
@@ -70,7 +70,8 @@ pub fn get_protocol_contract(index: u32) -> ContractData {
     let artifact_hash = 576576 + seed;
     let salted_initialization_hash = SaltedInitializationHash { inner: 281972 + seed };
     let public_bytecode_commitment = 38383 + seed;
-    let public_keys = PublicKeys::empty();
+    // Empty public keys here will throw an error when doing ec ops
+    let public_keys = PublicKeys::default();
 
     let function = get_protocol_contract_function(index);
     let private_functions_root = private_functions_root_from_siblings(

yarn-project/aztec.js/src/contract/contract.ts

@@ -38,7 +38,7 @@ export class Contract extends ContractBase {
    */
   public static deploy(wallet: Wallet, artifact: ContractArtifact, args: any[], constructorName?: string) {
     const postDeployCtor = (address: AztecAddress, wallet: Wallet) => Contract.at(address, artifact, wallet);
-    return new DeployMethod(PublicKeys.empty(), wallet, artifact, postDeployCtor, args, constructorName);
+    return new DeployMethod(PublicKeys.default(), wallet, artifact, postDeployCtor, args, constructorName);
   }
 
   /**

yarn-project/aztec.js/src/deployment/contract_deployer.ts

@@ -29,7 +29,7 @@ export class ContractDeployer {
   public deploy(...args: any[]) {
     const postDeployCtor = (address: AztecAddress, wallet: Wallet) => Contract.at(address, this.artifact, wallet);
     return new DeployMethod(
-      this.publicKeys ?? PublicKeys.empty(),
+      this.publicKeys ?? PublicKeys.default(),
       this.wallet,
       this.artifact,
       postDeployCtor,

yarn-project/aztec/src/cli/cmds/start_pxe.ts

@@ -105,7 +105,7 @@ export async function addPXE(
         address,
         deployer: AztecAddress.ZERO,
         contractClassId: getContractClassFromArtifact(artifact!).id,
-        publicKeys: PublicKeys.empty(),
+        publicKeys: PublicKeys.default(),
       };
       userLog(`Registering ${name} at ${address.toString()}`);
       await pxe.registerContract({ artifact, instance });

yarn-project/builder/src/contract-interface-gen/typescript.ts

@@ -84,7 +84,7 @@ function generateDeploy(input: ContractArtifact) {
    * Creates a tx to deploy a new instance of this contract.
    */
   public static deploy(wallet: Wallet, ${args}) {
-    return new DeployMethod<${contractName}>(PublicKeys.empty(), wallet, ${artifactName}, ${contractName}.at, Array.from(arguments).slice(1));
+    return new DeployMethod<${contractName}>(PublicKeys.default(), wallet, ${artifactName}, ${contractName}.at, Array.from(arguments).slice(1));
   }
 
   /**
@@ -102,7 +102,7 @@ function generateDeploy(input: ContractArtifact) {
     ...args: Parameters<${contractName}['methods'][M]>
   ) {
     return new DeployMethod<${contractName}>(
-      opts.publicKeys ?? PublicKeys.empty(),
+      opts.publicKeys ?? PublicKeys.default(),
       opts.wallet,
       ${artifactName},
       ${contractName}.at,

yarn-project/circuits.js/src/constants.gen.ts

@@ -131,6 +131,14 @@ export const REGISTERER_CONTRACT_ADDRESS = 3;
 export const MULTI_CALL_ENTRYPOINT_ADDRESS = 4;
 export const FEE_JUICE_ADDRESS = 5;
 export const ROUTER_ADDRESS = 6;
+export const DEFAULT_NPK_M_X = 582240093077765400562621227108555700500271598878376310175765873770292988861n;
+export const DEFAULT_NPK_M_Y = 10422444662424639723529825114205836958711284159673861467999592572974769103684n;
+export const DEFAULT_IVPK_M_X = 339708709767762472786445938838804872781183545349360029270386718856175781484n;
+export const DEFAULT_IVPK_M_Y = 12719619215050539905199178334954929730355853796706924300730604757520758976849n;
+export const DEFAULT_OVPK_M_X = 12212787719617305570587928860288475454328008955283046946846066128763901043335n;
+export const DEFAULT_OVPK_M_Y = 3646747884782549389807830220601404629716007431341772952958971658285958854707n;
+export const DEFAULT_TPK_M_X = 728059161893070741164607238299536939695876538801885465230641192969135857403n;
+export const DEFAULT_TPK_M_Y = 14575718736702206050102425029229426215631664471161015518982549597389390371695n;
 export const AZTEC_ADDRESS_LENGTH = 1;
 export const GAS_FEES_LENGTH = 2;
 export const GAS_LENGTH = 2;