init

AztecProtocol · Oct 19, 2024 · 62b4c08 · 62b4c08
1 parent dea191e
commit 62b4c08
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 11 deletions.
diff --git a/yarn-project/aztec.js/src/contract/contract.ts b/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);
   }
 
   /**

diff --git a/yarn-project/aztec.js/src/deployment/contract_deployer.ts b/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,

diff --git a/yarn-project/aztec/src/cli/cmds/start_pxe.ts b/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 });

diff --git a/yarn-project/builder/src/contract-interface-gen/typescript.ts b/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,

diff --git a/yarn-project/circuits.js/src/contract/contract_instance.ts b/yarn-project/circuits.js/src/contract/contract_instance.ts
@@ -87,7 +87,7 @@ export class SerializableContractInstance {
       deployer: AztecAddress.zero(),
       contractClassId: Fr.zero(),
       initializationHash: Fr.zero(),
-      publicKeys: PublicKeys.empty(),
+      publicKeys: PublicKeys.default(),
     });
   }
 }
@@ -122,7 +122,7 @@ export function getContractInstanceFromDeployParams(
           args,
         )
       : computeInitializationHash(constructorArtifact, args);
-  const publicKeys = opts.publicKeys ?? PublicKeys.empty();
+  const publicKeys = opts.publicKeys ?? PublicKeys.default();
 
   const instance: ContractInstance = {
     contractClassId,

diff --git a/yarn-project/circuits.js/src/types/public_keys.ts b/yarn-project/circuits.js/src/types/public_keys.ts
@@ -1,9 +1,10 @@
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
-import { Fr, Point } from '@aztec/foundation/fields';
+import { Fq, Fr, Point } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import { GeneratorIndex } from '../constants.gen.js';
 import { type PublicKey } from './public_key.js';
+import { derivePublicKeyFromSecretKey } from '../keys/derivation.js';
 
 export class PublicKeys {
   public constructor(
@@ -45,6 +46,11 @@ export class PublicKeys {
     return new PublicKeys(Point.ZERO, Point.ZERO, Point.ZERO, Point.ZERO);
   }
 
+  static default(): PublicKeys {
+    // We use this because empty will produce a point not on the curve. We may want to replace this with some sort of hash to curve func.
+    return new PublicKeys(derivePublicKeyFromSecretKey(new Fq(1)), derivePublicKeyFromSecretKey(new Fq(2)), derivePublicKeyFromSecretKey(new Fq(3)), derivePublicKeyFromSecretKey(new Fq(4)));
+  }
+
   static random(): PublicKeys {
     return new PublicKeys(Point.random(), Point.random(), Point.random(), Point.random());
   }

diff --git a/yarn-project/cli-wallet/src/cmds/deploy.ts b/yarn-project/cli-wallet/src/cmds/deploy.ts
@@ -37,7 +37,7 @@ export async function deploy(
     );
   }
 
-  const deployer = new ContractDeployer(contractArtifact, wallet, publicKeys ?? PublicKeys.empty(), initializer);
+  const deployer = new ContractDeployer(contractArtifact, wallet, publicKeys ?? PublicKeys.default(), initializer);
 
   let args = [];
   if (rawArgs.length > 0) {

diff --git a/yarn-project/cli/src/cmds/pxe/add_contract.ts b/yarn-project/cli/src/cmds/pxe/add_contract.ts
@@ -23,7 +23,7 @@ export async function addContract(
     salt,
     initializationHash,
     contractClassId: getContractClassFromArtifact(artifact).id,
-    publicKeys: publicKeys ?? PublicKeys.empty(),
+    publicKeys: publicKeys ?? PublicKeys.default(),
     address,
     deployer: deployer ?? AztecAddress.ZERO,
   };

diff --git a/yarn-project/txe/src/txe_service/txe_service.ts b/yarn-project/txe/src/txe_service/txe_service.ts
@@ -117,7 +117,7 @@ export class TXEService {
       skipArgsDecoding: true,
       salt: Fr.ONE,
       // TODO: Modify this to allow for passing public keys.
-      publicKeys: PublicKeys.empty(),
+      publicKeys: PublicKeys.default(),
       constructorArtifact: initializerStr ? initializerStr : undefined,
       deployer: AztecAddress.ZERO,
     });