refactor: integrate new key store

boxes/boxes/react/src/config.ts

@@ -1,22 +1,23 @@
-import { GrumpkinPrivateKey, GrumpkinScalar, createPXEClient } from '@aztec/aztec.js';
+import { Fr, createPXEClient, deriveMasterIncomingViewingSecretKey } from '@aztec/aztec.js';
 import { BoxReactContractArtifact } from '../artifacts/BoxReact';
 import { AccountManager } from '@aztec/aztec.js/account';
 import { SingleKeyAccountContract } from '@aztec/accounts/single_key';
 
-const GRUMPKIN_KEY = GrumpkinScalar.random();
+const SECRET_KEY = Fr.random();
 
 export class PrivateEnv {
   pxe;
   accountContract;
   account: AccountManager;
 
   constructor(
-    private privateKey: GrumpkinPrivateKey,
+    private secretKey: Fr,
     private pxeURL: string,
   ) {
     this.pxe = createPXEClient(this.pxeURL);
-    this.accountContract = new SingleKeyAccountContract(privateKey);
-    this.account = new AccountManager(this.pxe, this.privateKey, this.accountContract);
+    const encryptionPrivateKey = deriveMasterIncomingViewingSecretKey(secretKey);
+    this.accountContract = new SingleKeyAccountContract(encryptionPrivateKey);
+    this.account = new AccountManager(this.pxe, this.secretKey, this.accountContract);
   }
 
   async getWallet() {
@@ -25,7 +26,7 @@ export class PrivateEnv {
   }
 }
 
-export const deployerEnv = new PrivateEnv(GRUMPKIN_KEY, process.env.PXE_URL || 'http://localhost:8080');
+export const deployerEnv = new PrivateEnv(SECRET_KEY, process.env.PXE_URL || 'http://localhost:8080');
 
 const IGNORE_FUNCTIONS = ['constructor', 'compute_note_hash_and_nullifier'];
 export const filteredInterface = BoxReactContractArtifact.functions.filter(f => !IGNORE_FUNCTIONS.includes(f.name));

boxes/boxes/vanilla/src/index.ts

@@ -1,12 +1,13 @@
-import { GrumpkinScalar, createPXEClient, AccountManager, Fr, Wallet } from '@aztec/aztec.js';
+import { createPXEClient, AccountManager, Fr, Wallet, deriveMasterIncomingViewingSecretKey } from '@aztec/aztec.js';
 
 import { SingleKeyAccountContract } from '@aztec/accounts/single_key';
 import { VanillaContract } from '../artifacts/Vanilla';
 
-const privateKey: GrumpkinScalar = GrumpkinScalar.random();
+const secretKey = Fr.random();
 const pxe = createPXEClient(process.env.PXE_URL || 'http://localhost:8080');
 
-const account = new AccountManager(pxe, privateKey, new SingleKeyAccountContract(privateKey));
+const encryptionPrivateKey = deriveMasterIncomingViewingSecretKey(secretKey);
+const account = new AccountManager(pxe, secretKey, new SingleKeyAccountContract(encryptionPrivateKey));
 let contract: any = null;
 let wallet: Wallet | null = null;
 

docs/docs/developers/contracts/compiling_contracts/how_to_compile_contract.md

@@ -32,8 +32,8 @@ Below is typescript code generated from the [Token](https://github.com/AztecProt
 
 ```ts showLineNumbers
 export class TokenContract extends ContractBase {
-  private constructor(completeAddress: CompleteAddress, wallet: Wallet, portalContract = EthAddress.ZERO) {
-    super(completeAddress, TokenContractArtifact, wallet, portalContract);
+  private constructor(instance: ContractInstanceWithAddress, wallet: Wallet) {
+    super(instance, TokenContractArtifact, wallet);
   }
 
   /**
@@ -49,15 +49,57 @@ export class TokenContract extends ContractBase {
   /**
    * Creates a tx to deploy a new instance of this contract.
    */
-  public static deploy(pxe: PXE, admin: AztecAddressLike) {
-    return new DeployMethod<TokenContract>(Point.ZERO, pxe, TokenContractArtifact, Array.from(arguments).slice(1));
+  public static deploy(
+    wallet: Wallet,
+    admin: AztecAddressLike,
+    name: string,
+    symbol: string,
+    decimals: bigint | number,
+  ) {
+    return new DeployMethod<TokenContract>(
+      Fr.ZERO,
+      wallet,
+      TokenContractArtifact,
+      TokenContract.at,
+      Array.from(arguments).slice(1),
+    );
   }
 
   /**
    * Creates a tx to deploy a new instance of this contract using the specified public key to derive the address.
    */
-  public static deployWithPublicKey(pxe: PXE, publicKey: PublicKey, admin: AztecAddressLike) {
-    return new DeployMethod<TokenContract>(publicKey, pxe, TokenContractArtifact, Array.from(arguments).slice(2));
+  public static deployWithPublicKeysHash(
+    publicKeysHash: Fr,
+    wallet: Wallet,
+    admin: AztecAddressLike,
+    name: string,
+    symbol: string,
+    decimals: bigint | number,
+  ) {
+    return new DeployMethod<TokenContract>(
+      publicKeysHash,
+      wallet,
+      TokenContractArtifact,
+      TokenContract.at,
+      Array.from(arguments).slice(2),
+    );
+  }
+
+  /**
+   * Creates a tx to deploy a new instance of this contract using the specified constructor method.
+   */
+  public static deployWithOpts<M extends keyof TokenContract['methods']>(
+    opts: { publicKeysHash?: Fr; method?: M; wallet: Wallet },
+    ...args: Parameters<TokenContract['methods'][M]>
+  ) {
+    return new DeployMethod<TokenContract>(
+      opts.publicKeysHash ?? Fr.ZERO,
+      opts.wallet,
+      TokenContractArtifact,
+      TokenContract.at,
+      Array.from(arguments).slice(1),
+      opts.method ?? 'constructor',
+    );
   }
 
   /**
@@ -67,27 +109,90 @@ export class TokenContract extends ContractBase {
     return TokenContractArtifact;
   }
 
-  /** Type-safe wrappers for the public methods exposed by the contract. */
-  public methods!: {
-
-    /** balance_of_private(owner: struct) */
-    balance_of_private: ((owner: AztecAddressLike) => ContractFunctionInteraction) & Pick<ContractMethod, 'selector'>;
+  public static get storage(): ContractStorageLayout<
+    | 'admin'
+    | 'minters'
+    | 'balances'
+    | 'total_supply'
+    | 'pending_shields'
+    | 'public_balances'
+    | 'symbol'
+    | 'name'
+    | 'decimals'
+  > {
+    return {
+      admin: {
+        slot: new Fr(1n),
+        typ: 'PublicMutable<AztecAddress>',
+      },
+      minters: {
+        slot: new Fr(2n),
+        typ: 'Map<AztecAddress, PublicMutable<bool>>',
+      },
+      balances: {
+        slot: new Fr(3n),
+        typ: 'BalancesMap<TokenNote>',
+      },
+      total_supply: {
+        slot: new Fr(4n),
+        typ: 'PublicMutable<U128>',
+      },
+      pending_shields: {
+        slot: new Fr(5n),
+        typ: 'PrivateSet<TransparentNote>',
+      },
+      public_balances: {
+        slot: new Fr(6n),
+        typ: 'Map<AztecAddress, PublicMutable<U128>>',
+      },
+      symbol: {
+        slot: new Fr(7n),
+        typ: 'SharedImmutable<FieldCompressedString>',
+      },
+      name: {
+        slot: new Fr(8n),
+        typ: 'SharedImmutable<FieldCompressedString>',
+      },
+      decimals: {
+        slot: new Fr(9n),
+        typ: 'SharedImmutable<u8>',
+      },
+    } as ContractStorageLayout<
+      | 'admin'
+      | 'minters'
+      | 'balances'
+      | 'total_supply'
+      | 'pending_shields'
+      | 'public_balances'
+      | 'symbol'
+      | 'name'
+      | 'decimals'
+    >;
+  }
 
-    /** balance_of_public(owner: struct) */
-    balance_of_public: ((owner: AztecAddressLike) => ContractFunctionInteraction) & Pick<ContractMethod, 'selector'>;
+  public static get notes(): ContractNotes<'TransparentNote' | 'TokenNote'> {
+    const notes = this.artifact.outputs.globals.notes ? (this.artifact.outputs.globals.notes as any) : [];
+    return {
+      TransparentNote: {
+        id: new Fr(84114971101151129711410111011678111116101n),
+      },
+      TokenNote: {
+        id: new Fr(8411110710111078111116101n),
+      },
+    } as ContractNotes<'TransparentNote' | 'TokenNote'>;
+  }
 
-    /** shield(from: struct, amount: field, secret_hash: field, nonce: field) */
-    shield: ((
+  /** Type-safe wrappers for the public methods exposed by the contract. */
+  public override methods!: {
+    /** transfer_public(from: struct, to: struct, amount: field, nonce: field) */
+    transfer_public: ((
       from: AztecAddressLike,
+      to: AztecAddressLike,
       amount: FieldLike,
-      secret_hash: FieldLike,
       nonce: FieldLike,
     ) => ContractFunctionInteraction) &
       Pick<ContractMethod, 'selector'>;
 
-    /** total_supply() */
-    total_supply: (() => ContractFunctionInteraction) & Pick<ContractMethod, 'selector'>;
-
     /** transfer(from: struct, to: struct, amount: field, nonce: field) */
     transfer: ((
       from: AztecAddressLike,
@@ -96,17 +201,9 @@ export class TokenContract extends ContractBase {
       nonce: FieldLike,
     ) => ContractFunctionInteraction) &
       Pick<ContractMethod, 'selector'>;
+
+  ...
 
-    /** transfer_public(from: struct, to: struct, amount: field, nonce: field) */
-    transfer_public: ((
-      from: AztecAddressLike,
-      to: AztecAddressLike,
-      amount: FieldLike,
-      nonce: FieldLike,
-    ) => ContractFunctionInteraction) &
-      Pick<ContractMethod, 'selector'>;
-
-    ...
   };
 }
 ```

docs/docs/misc/migration_notes.md

@@ -8,6 +8,20 @@ Aztec is in full-speed development. Literally every version breaks compatibility
 
 ## TBD
 
+### [Aztec.nr] Oracles
+
+Oracle `get_nullifier_secret_key` was renamed to `get_app_nullifier_secret_key` and `request_nullifier_secret_key` function on PrivateContext was renamed as `request_app_nullifier_secret_key`.
+
+```diff
+- let secret = get_nullifier_secret_key(self.owner);
++ let secret = get_app_nullifier_secret_key(self.owner);
+```
+
+```diff
+- let secret = context.request_nullifier_secret_key(self.owner);
++ let secret = context.request_app_nullifier_secret_key(self.owner);
+```
+
 ### [Aztec.nr] Contract interfaces
 
 It is now possible to import contracts on another contracts and use their automatic interfaces to perform calls. The interfaces have the same name as the contract, and are automatically exported. Parameters are automatically serialized (using the `Serialize<N>` trait) and return values are automatically deserialized (using the `Deserialize<N>` trait). Serialize and Deserialize methods have to conform to the standard ACVM serialization schema for the interface to work!

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

@@ -88,7 +88,7 @@ library Constants {
   uint256 internal constant DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE =
     0x85864497636cf755ae7bde03f267ce01a520981c21c3682aaf82a631;
   uint256 internal constant DEPLOYER_CONTRACT_ADDRESS =
-    0x1b5ecf3d26907648cf737f4304759b8c5850478e839e72f8ce1f5791b286e8f2;
+    0x0fb483f1556d72e794a34967b15958e789dd6a4dc30bcae23697a4191bdc8241;
   uint256 internal constant L1_TO_L2_MESSAGE_ORACLE_CALL_LENGTH = 17;
   uint256 internal constant MAX_NOTE_FIELDS_LENGTH = 20;
   uint256 internal constant GET_NOTE_ORACLE_RETURN_LENGTH = 23;
@@ -112,11 +112,11 @@ library Constants {
   uint256 internal constant L1_TO_L2_MESSAGE_LENGTH = 6;
   uint256 internal constant L2_TO_L1_MESSAGE_LENGTH = 2;
   uint256 internal constant MAX_BLOCK_NUMBER_LENGTH = 2;
-  uint256 internal constant NULLIFIER_KEY_VALIDATION_REQUEST_LENGTH = 4;
-  uint256 internal constant NULLIFIER_KEY_VALIDATION_REQUEST_CONTEXT_LENGTH = 5;
+  uint256 internal constant NULLIFIER_KEY_VALIDATION_REQUEST_LENGTH = 3;
+  uint256 internal constant NULLIFIER_KEY_VALIDATION_REQUEST_CONTEXT_LENGTH = 4;
   uint256 internal constant PARTIAL_STATE_REFERENCE_LENGTH = 6;
-  uint256 internal constant PRIVATE_CALL_STACK_ITEM_LENGTH = 238;
-  uint256 internal constant PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 235;
+  uint256 internal constant PRIVATE_CALL_STACK_ITEM_LENGTH = 237;
+  uint256 internal constant PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 234;
   uint256 internal constant PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH = 222;
   uint256 internal constant STATE_REFERENCE_LENGTH = 8;
   uint256 internal constant TX_CONTEXT_DATA_LENGTH = 4;

l1-contracts/test/fixtures/empty_block_0.json

@@ -8,7 +8,7 @@
     "l2ToL1Messages": []
   },
   "block": {
-    "archive": "0x2683d379c0ad62e225372f35b74366d8c3cd145a12dbbb2028456da89f889be1",
+    "archive": "0x188be890697072b6e002cfd2c0fff9b434ab0f8075ba55861be700daa8b5245e",
     "body": "0x00000000",
     "txsEffectsHash": "0x00df6b1c97b9e01113fa0363d9ff71c85addc74e92b22d433b2fb082d2493896",
     "decodedHeader": {
@@ -23,8 +23,8 @@
         "chainId": 31337,
         "timestamp": 0,
         "version": 1,
-        "coinbase": "0xd70b960abd35f82aac6df2d1ca6617b5bcd95ba5",
-        "feeRecipient": "0x0c67b9f94de6beccefc03b63ba448b53464348836ef20b3e6183c5d4f85653ee",
+        "coinbase": "0xa43e0eb6a43e0eb6a43e0eb6a43e0eb6a43e0eb6",
+        "feeRecipient": "0x15a9c4f4c75d79ce22330ca2cdb6c1a6ede1f6d94ba28016eeb25e5578913ccb",
         "gasFees": {
           "feePerDaGas": 0,
           "feePerL1Gas": 0,
@@ -56,8 +56,8 @@
         }
       }
     },
-    "header": "0x05b0b6df52f1d47d0406318558052c89a174fbc9d615def82b3cc9ccc1937db800000001000000000000000000000000000000000000000000000000000000000000000100df6b1c97b9e01113fa0363d9ff71c85addc74e92b22d433b2fb082d249389600089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c0007638bb56b6dda2b64b8f76841114ac3a87a1820030e2e16772c4d294879c31864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000001016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000000800bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000001000572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000000800000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000d70b960abd35f82aac6df2d1ca6617b5bcd95ba50c67b9f94de6beccefc03b63ba448b53464348836ef20b3e6183c5d4f85653ee000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "publicInputsHash": "0x00ee6ce1f8afb6a9d9da7165bbff8d03d3f2e4ae6a65a9265ecbb7c600244a9c",
+    "header": "0x05b0b6df52f1d47d0406318558052c89a174fbc9d615def82b3cc9ccc1937db800000001000000000000000000000000000000000000000000000000000000000000000100df6b1c97b9e01113fa0363d9ff71c85addc74e92b22d433b2fb082d249389600089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c0007638bb56b6dda2b64b8f76841114ac3a87a1820030e2e16772c4d294879c31864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000001016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000000800bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000001000572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000000800000000000000000000000000000000000000000000000000000000000007a69000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000a43e0eb6a43e0eb6a43e0eb6a43e0eb6a43e0eb615a9c4f4c75d79ce22330ca2cdb6c1a6ede1f6d94ba28016eeb25e5578913ccb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+    "publicInputsHash": "0x009a9a967263c733e1ab2c9d67836cd9145e691d0123896749c051deebaf766a",
     "numTxs": 0
   }
 }

l1-contracts/test/fixtures/empty_block_1.json

@@ -8,7 +8,7 @@
     "l2ToL1Messages": []
   },
   "block": {
-    "archive": "0x0be67a10fc9ab9372e7fdfa4fcce95a3ed24d42fb6694ffcd3d418d504d8fef4",
+    "archive": "0x007a9bf70a5ce86a4ba37fe030f20f1b83c5491aa1c954f2220e435ab1ad552f",
     "body": "0x00000000",
     "txsEffectsHash": "0x00df6b1c97b9e01113fa0363d9ff71c85addc74e92b22d433b2fb082d2493896",
     "decodedHeader": {
@@ -21,10 +21,10 @@
       "globalVariables": {
         "blockNumber": 2,
         "chainId": 31337,
-        "timestamp": 1712912168,
+        "timestamp": 1713425554,
         "version": 1,
-        "coinbase": "0xd70b960abd35f82aac6df2d1ca6617b5bcd95ba5",
-        "feeRecipient": "0x0c67b9f94de6beccefc03b63ba448b53464348836ef20b3e6183c5d4f85653ee",
+        "coinbase": "0xa43e0eb6a43e0eb6a43e0eb6a43e0eb6a43e0eb6",
+        "feeRecipient": "0x15a9c4f4c75d79ce22330ca2cdb6c1a6ede1f6d94ba28016eeb25e5578913ccb",
         "gasFees": {
           "feePerDaGas": 0,
           "feePerL1Gas": 0,
@@ -33,7 +33,7 @@
       },
       "lastArchive": {
         "nextAvailableLeafIndex": 2,
-        "root": "0x2683d379c0ad62e225372f35b74366d8c3cd145a12dbbb2028456da89f889be1"
+        "root": "0x188be890697072b6e002cfd2c0fff9b434ab0f8075ba55861be700daa8b5245e"
       },
       "stateReference": {
         "l1ToL2MessageTree": {
@@ -56,8 +56,8 @@
         }
       }
     },
-    "header": "0x2683d379c0ad62e225372f35b74366d8c3cd145a12dbbb2028456da89f889be100000002000000000000000000000000000000000000000000000000000000000000000100df6b1c97b9e01113fa0363d9ff71c85addc74e92b22d433b2fb082d249389600089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c0007638bb56b6dda2b64b8f76841114ac3a87a1820030e2e16772c4d294879c31864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000002016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000001000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000001800572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000000c00000000000000000000000000000000000000000000000000000000000007a6900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000006618f728d70b960abd35f82aac6df2d1ca6617b5bcd95ba50c67b9f94de6beccefc03b63ba448b53464348836ef20b3e6183c5d4f85653ee000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "publicInputsHash": "0x00bb8af4db44612602143f2507b6f07f4dc5fdede045494a1467c4bea354bcae",
+    "header": "0x188be890697072b6e002cfd2c0fff9b434ab0f8075ba55861be700daa8b5245e00000002000000000000000000000000000000000000000000000000000000000000000100df6b1c97b9e01113fa0363d9ff71c85addc74e92b22d433b2fb082d249389600089a9d421a82c4a25f7acbebe69e638d5b064fa8a60e018793dcb0be53752c0007638bb56b6dda2b64b8f76841114ac3a87a1820030e2e16772c4d294879c31864fcdaa80ff2719154fa7c8a9050662972707168d69eac9db6fd3110829f800000002016642d9ccd8346c403aa4c3fa451178b22534a27035cdaa6ec34ae53b29c50cb000001000bcfa3e9f1a8922ee92c6dc964d6595907c1804a86753774322b468f69d4f278000001800572c8db882674dd026b8877fbba1b700a4407da3ae9ce5fa43215a28163362b000000c00000000000000000000000000000000000000000000000000000000000007a6900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000006620cc92a43e0eb6a43e0eb6a43e0eb6a43e0eb6a43e0eb615a9c4f4c75d79ce22330ca2cdb6c1a6ede1f6d94ba28016eeb25e5578913ccb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+    "publicInputsHash": "0x00843aedbd1ad63990d73a016d210970a9bb17ccc9637a1e47a5b2150c425318",
     "numTxs": 0
   }
 }