@aztec/accounts 0.0.1-commit.d3ec352c → 0.0.1-commit.d58ff9d0

package/dest/utils/key_derivation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"key_derivation.d.ts","sourceRoot":"","sources":["../../src/utils/key_derivation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAIxE;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,EAAE,CAAC,CAErF"}

package/dest/utils/key_derivation.js

@@ -0,0 +1,16 @@
+import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
+import { sha256ToField } from '@aztec/foundation/crypto/sha256';
+const SIGNING_KEY_TO_SECRET_KEY_SEPARATOR = sha256ToField([
+    Buffer.from('@aztec/accounts/signing_key_to_secret_key')
+]);
+/**
+ * Derives the privacy secret key (the seed for the viewing/nullifier keyset that PXE holds) from the account's signing
+ * key. The signing key is the ownership root the user controls; the privacy keyset hangs off it through this one-way
+ * hash, so a value handled by PXE can never be used to recover the signing key.
+ */ export function deriveSecretKeyFromSigningKey(signingKey) {
+    return poseidon2Hash([
+        SIGNING_KEY_TO_SECRET_KEY_SEPARATOR,
+        signingKey.hi,
+        signingKey.lo
+    ]);
+}

package/dest/utils/ssh_agent.d.ts

@@ -30,4 +30,4 @@ export declare function getIdentities(): Promise<StoredKey[]>;
  */
 export declare function signWithAgent(keyType: Buffer, curveName: Buffer, publicKey: Buffer, data: Buffer): Promise<Buffer<ArrayBufferLike>>;
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3NoX2FnZW50LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvc3NoX2FnZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFDaEMsT0FBTyxHQUFHLE1BQU0sS0FBSyxDQUFDO0FBT3RCOztHQUVHO0FBQ0gsd0JBQWdCLGNBQWMsZUFNN0I7QUFFRDs7R0FFRztBQUNILEtBQUssU0FBUyxHQUFHO0lBQ2Y7O09BRUc7SUFDSCxJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2I7O09BRUc7SUFDSCxTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCOztPQUVHO0lBQ0gsT0FBTyxFQUFFLE1BQU0sQ0FBQztDQUNqQixDQUFDO0FBRUY7O0dBRUc7QUFDSCx3QkFBZ0IsYUFBYSxJQUFJLE9BQU8sQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQWtEcEQ7QUFFRDs7R0FFRztBQUNILHdCQUFnQixhQUFhLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLE1BQU0sb0NBd0NoRyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3NoX2FnZW50LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvc3NoX2FnZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFDaEMsT0FBTyxHQUFHLE1BQU0sS0FBSyxDQUFDO0FBT3RCOztHQUVHO0FBQ0gsd0JBQWdCLGNBQWMsZUFNN0I7QUFFRDs7R0FFRztBQUNILEtBQUssU0FBUyxHQUFHO0lBQ2Y7O09BRUc7SUFDSCxJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2I7O09BRUc7SUFDSCxTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCOztPQUVHO0lBQ0gsT0FBTyxFQUFFLE1BQU0sQ0FBQztDQUNqQixDQUFDO0FBRUY7O0dBRUc7QUFDSCx3QkFBZ0IsYUFBYSxJQUFJLE9BQU8sQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQW1EcEQ7QUFFRDs7R0FFRztBQUNILHdCQUFnQixhQUFhLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLE1BQU0sb0NBeUNoRyJ9

package/dest/utils/ssh_agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssh_agent.d.ts","sourceRoot":"","sources":["../../src/utils/ssh_agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,GAAG,MAAM,KAAK,CAAC;AAOtB;;GAEG;AACH,wBAAgB,cAAc,eAM7B;AAED;;GAEG;AACH,KAAK,SAAS,GAAG;IACf;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,wBAAgB,aAAa,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,CAkDpD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,oCAwChG"}
+{"version":3,"file":"ssh_agent.d.ts","sourceRoot":"","sources":["../../src/utils/ssh_agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,GAAG,MAAM,KAAK,CAAC;AAOtB;;GAEG;AACH,wBAAgB,cAAc,eAM7B;AAED;;GAEG;AACH,KAAK,SAAS,GAAG;IACf;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;GAEG;AACH,wBAAgB,aAAa,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,CAmDpD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,oCAyChG"}

package/dest/utils/ssh_agent.js

@@ -18,6 +18,7 @@ const SSH_AGENT_SIGN_RESPONSE = 14;
  */ export function getIdentities() {
     return new Promise((resolve, reject)=>{
         const stream = connectToAgent();
+        stream.on('error', reject);
         stream.on('connect', ()=>{
             const request = Buffer.concat([
                 Buffer.from([
@@ -78,6 +79,7 @@ const SSH_AGENT_SIGN_RESPONSE = 14;
  */ export function signWithAgent(keyType, curveName, publicKey, data) {
     return new Promise((resolve, reject)=>{
         const stream = connectToAgent();
+        stream.on('error', reject);
         stream.on('connect', ()=>{
             // Construct the key blob
             const keyBlob = Buffer.concat([

package/package.json

@@ -2,22 +2,20 @@
   "name": "@aztec/accounts",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/accounts",
   "description": "Implementation of sample account contracts for Aztec Network",
-  "version": "0.0.1-commit.d3ec352c",
+  "version": "0.0.1-commit.d58ff9d0",
   "type": "module",
   "exports": {
     "./defaults": "./dest/defaults/index.js",
     "./ecdsa": "./dest/ecdsa/index.js",
     "./ecdsa/lazy": "./dest/ecdsa/lazy.js",
+    "./ecdsa/stub": "./dest/ecdsa/stub/index.js",
+    "./ecdsa/stub/lazy": "./dest/ecdsa/stub/lazy.js",
     "./schnorr": "./dest/schnorr/index.js",
     "./schnorr/lazy": "./dest/schnorr/lazy.js",
-    "./single_key": "./dest/single_key/index.js",
-    "./single_key/lazy": "./dest/single_key/lazy.js",
-    "./stub": "./dest/stub/index.js",
-    "./stub/lazy": "./dest/stub/lazy.js",
+    "./schnorr/stub": "./dest/schnorr/stub/index.js",
+    "./schnorr/stub/lazy": "./dest/schnorr/stub/lazy.js",
     "./testing": "./dest/testing/index.js",
     "./testing/lazy": "./dest/testing/lazy.js",
-    "./copy-cat": "./dest/copy_cat/index.js",
-    "./copy-cat/lazy": "./dest/copy_cat/lazy.js",
     "./utils": "./dest/utils/index.js"
   },
   "typedocOptions": {
@@ -25,7 +23,6 @@
       "./src/defaults/index.ts",
       "./src/ecdsa/index.ts",
       "./src/schnorr/index.ts",
-      "./src/single_key/index.ts",
       "./src/testing/index.ts"
     ],
     "name": "Accounts",
@@ -36,7 +33,7 @@
     "generate": "yarn generate:noir-contracts",
     "generate:noir-contracts": "./scripts/copy-contracts.sh",
     "build:dev": "../scripts/tsc.sh --watch",
-    "build:ts": "tsgo -b",
+    "build:ts": "../scripts/tsc.sh",
     "clean": "rm -rf ./dest .tsbuildinfo ./artifacts",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
@@ -82,18 +79,18 @@
     ]
   },
   "dependencies": {
-    "@aztec/aztec.js": "0.0.1-commit.d3ec352c",
-    "@aztec/entrypoints": "0.0.1-commit.d3ec352c",
-    "@aztec/ethereum": "0.0.1-commit.d3ec352c",
-    "@aztec/foundation": "0.0.1-commit.d3ec352c",
-    "@aztec/stdlib": "0.0.1-commit.d3ec352c",
+    "@aztec/aztec.js": "0.0.1-commit.d58ff9d0",
+    "@aztec/entrypoints": "0.0.1-commit.d58ff9d0",
+    "@aztec/ethereum": "0.0.1-commit.d58ff9d0",
+    "@aztec/foundation": "0.0.1-commit.d58ff9d0",
+    "@aztec/stdlib": "0.0.1-commit.d58ff9d0",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",
-    "@typescript/native-preview": "7.0.0-dev.20251126.1",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
     "jest": "^30.0.0",
     "jest-mock-extended": "^4.0.0",
     "ts-loader": "^9.5.4",

package/src/defaults/account_contract.ts

@@ -1,9 +1,9 @@
-import type { AccountContract, AccountInterface, AuthWitnessProvider, ChainInfo } from '@aztec/aztec.js/account';
+import { type Account, type AccountContract, type AuthWitnessProvider, BaseAccount } from '@aztec/aztec.js/account';
+import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import type { CompleteAddress } from '@aztec/stdlib/contract';
 
-import { DefaultAccountInterface } from '../defaults/account_interface.js';
-
 /**
  * Base class for implementing an account contract. Requires that the account uses the
  * default entrypoint method signature.
@@ -23,7 +23,20 @@ export abstract class DefaultAccountContract implements AccountContract {
 
   constructor() {}
 
-  getInterface(address: CompleteAddress, chainInfo: ChainInfo): AccountInterface {
-    return new DefaultAccountInterface(this.getAuthWitnessProvider(address), address, chainInfo);
+  /**
+   * Accounts without immutables (the default) contribute to their address via an on-chain
+   * initializer instead. Account contracts that commit immutables into their address override this.
+   */
+  getImmutablesHash(): Promise<Fr | undefined> {
+    return Promise.resolve(undefined);
+  }
+
+  getAccount(completeAddress: CompleteAddress): Account {
+    const authWitnessProvider = this.getAuthWitnessProvider(completeAddress);
+    return new BaseAccount(
+      new DefaultAccountEntrypoint(completeAddress.address, authWitnessProvider),
+      authWitnessProvider,
+      completeAddress,
+    );
   }
 }

package/src/defaults/index.ts

@@ -6,5 +6,4 @@
  * @packageDocumentation
  */
 
-export * from './account_interface.js';
 export * from './account_contract.js';

package/src/{stub/account_contract.ts → defaults/stub_account_contract.ts}

@@ -1,5 +1,5 @@
 import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { CompleteAddress } from '@aztec/stdlib/contract';
 

package/src/ecdsa/ecdsa_k/account_contract.ts

@@ -1,6 +1,6 @@
 import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
-import { Ecdsa } from '@aztec/foundation/crypto';
-import type { Fr } from '@aztec/foundation/fields';
+import { Ecdsa } from '@aztec/foundation/crypto/ecdsa';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { CompleteAddress } from '@aztec/stdlib/contract';
 
@@ -21,7 +21,7 @@ export abstract class EcdsaKBaseAccountContract extends DefaultAccountContract {
     const signingPublicKey = await new Ecdsa().computePublicKey(this.signingPrivateKey);
     return {
       constructorName: 'constructor',
-      constructorArgs: [signingPublicKey.subarray(0, 32), signingPublicKey.subarray(32, 64)],
+      constructorArgs: [[...signingPublicKey.subarray(0, 32)], [...signingPublicKey.subarray(32, 64)]],
     };
   }
 

package/src/ecdsa/ecdsa_k/lazy.ts

@@ -16,7 +16,7 @@ import { EcdsaKBaseAccountContract } from './account_contract.js';
 export async function getEcdsaKAccountContractArtifact() {
   // Cannot assert this import as it's incompatible with bundlers like vite
   // https://github.com/vitejs/vite/issues/19095#issuecomment-2566074352
-  // Even if now supported by al major browsers, the MIME type is replaced with
+  // Even if now supported by all major browsers, the MIME type is replaced with
   // "text/javascript"
   // In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
   const { default: ecdsaKAccountContractJson } = await import('../../../artifacts/EcdsaKAccount.json');

package/src/ecdsa/ecdsa_r/account_contract.ts

@@ -1,6 +1,6 @@
 import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
-import { Ecdsa } from '@aztec/foundation/crypto';
-import type { Fr } from '@aztec/foundation/fields';
+import { Ecdsa } from '@aztec/foundation/crypto/ecdsa';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { CompleteAddress } from '@aztec/stdlib/contract';
 
@@ -21,7 +21,7 @@ export abstract class EcdsaRBaseAccountContract extends DefaultAccountContract {
     const signingPublicKey = await new Ecdsa('secp256r1').computePublicKey(this.signingPrivateKey);
     return {
       constructorName: 'constructor',
-      constructorArgs: [signingPublicKey.subarray(0, 32), signingPublicKey.subarray(32, 64)],
+      constructorArgs: [[...signingPublicKey.subarray(0, 32)], [...signingPublicKey.subarray(32, 64)]],
     };
   }
 

package/src/ecdsa/ecdsa_r/lazy.ts

@@ -16,7 +16,7 @@ import { EcdsaRBaseAccountContract } from './account_contract.js';
 export async function getEcdsaRAccountContractArtifact() {
   // Cannot assert this import as it's incompatible with bundlers like vite
   // https://github.com/vitejs/vite/issues/19095#issuecomment-2566074352
-  // Even if now supported by al major browsers, the MIME type is replaced with
+  // Even if now supported by all major browsers, the MIME type is replaced with
   // "text/javascript"
   // In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
   const { default: ecdsaKAccountContractJson } = await import('../../../artifacts/EcdsaRAccount.json');

package/src/ecdsa/ssh_ecdsa_r/account_contract.ts

@@ -1,6 +1,6 @@
 import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
-import { EcdsaSignature } from '@aztec/foundation/crypto';
-import type { Fr } from '@aztec/foundation/fields';
+import { EcdsaSignature } from '@aztec/foundation/crypto/ecdsa';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { CompleteAddress } from '@aztec/stdlib/contract';
 
@@ -25,7 +25,7 @@ export abstract class EcdsaRSSHBaseAccountContract extends DefaultAccountContrac
   getInitializationFunctionAndArgs() {
     return Promise.resolve({
       constructorName: 'constructor',
-      constructorArgs: [this.signingPublicKey.subarray(0, 32), this.signingPublicKey.subarray(32, 64)],
+      constructorArgs: [[...this.signingPublicKey.subarray(0, 32)], [...this.signingPublicKey.subarray(32, 64)]],
     });
   }
 

package/src/ecdsa/stub/index.ts

@@ -0,0 +1,28 @@
+import { BaseAccount } from '@aztec/aztec.js/account';
+import type { CompleteAddress } from '@aztec/aztec.js/addresses';
+import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+import type { NoirCompiledContract } from '@aztec/stdlib/noir';
+
+import SimulatedEcdsaAccountJson from '../../../artifacts/SimulatedEcdsaAccount.json' with { type: 'json' };
+import { StubBaseAccountContract } from '../../defaults/stub_account_contract.js';
+
+export const StubEcdsaAccountContractArtifact = loadContractArtifact(SimulatedEcdsaAccountJson as NoirCompiledContract);
+
+/** Stub account contract for ECDSA accounts (secp256k1 and secp256r1). Eagerly loads the contract artifact. */
+export class StubEcdsaAccountContract extends StubBaseAccountContract {
+  override getContractArtifact() {
+    return Promise.resolve(StubEcdsaAccountContractArtifact);
+  }
+}
+
+/** Creates an ECDSA stub account that impersonates the one with the provided address. */
+export function createStubEcdsaAccount(originalAddress: CompleteAddress) {
+  const accountContract = new StubEcdsaAccountContract();
+  const authWitnessProvider = accountContract.getAuthWitnessProvider(originalAddress);
+  return new BaseAccount(
+    new DefaultAccountEntrypoint(originalAddress.address, authWitnessProvider),
+    authWitnessProvider,
+    originalAddress,
+  );
+}

package/src/ecdsa/stub/lazy.ts

@@ -0,0 +1,34 @@
+import { BaseAccount } from '@aztec/aztec.js/account';
+import type { CompleteAddress } from '@aztec/aztec.js/addresses';
+import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+
+import { StubBaseAccountContract } from '../../defaults/stub_account_contract.js';
+
+/**
+ * Lazily loads the ECDSA stub contract artifact (browser-compatible).
+ */
+export async function getStubEcdsaAccountContractArtifact() {
+  // Cannot assert this import as it's incompatible with bundlers like vite
+  // https://github.com/vitejs/vite/issues/19095#issuecomment-2566074352
+  const { default: json } = await import('../../../artifacts/SimulatedEcdsaAccount.json');
+  return loadContractArtifact(json);
+}
+
+/** Stub account contract for ECDSA accounts (secp256k1 and secp256r1). Lazily loads the contract artifact. */
+export class StubEcdsaAccountContract extends StubBaseAccountContract {
+  override getContractArtifact() {
+    return getStubEcdsaAccountContractArtifact();
+  }
+}
+
+/** Creates an ECDSA stub account that impersonates the one with the provided address. */
+export function createStubEcdsaAccount(originalAddress: CompleteAddress) {
+  const accountContract = new StubEcdsaAccountContract();
+  const authWitnessProvider = accountContract.getAuthWitnessProvider(originalAddress);
+  return new BaseAccount(
+    new DefaultAccountEntrypoint(originalAddress.address, authWitnessProvider),
+    authWitnessProvider,
+    originalAddress,
+  );
+}

package/src/schnorr/account_contract.ts

@@ -1,6 +1,7 @@
 import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
-import { Schnorr } from '@aztec/foundation/crypto';
-import { Fr, GrumpkinScalar } from '@aztec/foundation/fields';
+import { Schnorr } from '@aztec/foundation/crypto/schnorr';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { CompleteAddress } from '@aztec/stdlib/contract';
 
@@ -13,12 +14,25 @@ import { DefaultAccountContract } from '../defaults/account_contract.js';
  * can be implemented with or without lazy loading.
  */
 export abstract class SchnorrBaseAccountContract extends DefaultAccountContract {
-  constructor(private signingPrivateKey: GrumpkinScalar) {
+  constructor(protected signingPrivateKey: GrumpkinScalar) {
     super();
   }
 
-  async getInitializationFunctionAndArgs() {
-    const signingPublicKey = await new Schnorr().computePublicKey(this.signingPrivateKey);
+  /** The Grumpkin public key this account verifies signatures against. */
+  getSigningPublicKey() {
+    return new Schnorr().computePublicKey(this.signingPrivateKey);
+  }
+
+  async getInitializationFunctionAndArgs(): Promise<
+    | {
+        /** The name of the function used to initialize the contract */
+        constructorName: string;
+        /** The args to the function used to initialize the contract */
+        constructorArgs: any[];
+      }
+    | undefined
+  > {
+    const signingPublicKey = await this.getSigningPublicKey();
     return { constructorName: 'constructor', constructorArgs: [signingPublicKey.x, signingPublicKey.y] };
   }
 
@@ -33,7 +47,7 @@ export class SchnorrAuthWitnessProvider implements AuthWitnessProvider {
 
   async createAuthWit(messageHash: Fr): Promise<AuthWitness> {
     const schnorr = new Schnorr();
-    const signature = await schnorr.constructSignature(messageHash.toBuffer(), this.signingPrivateKey);
-    return new AuthWitness(messageHash, [...signature.toBuffer()]);
+    const signature = await schnorr.constructSignature(messageHash, this.signingPrivateKey);
+    return new AuthWitness(messageHash, signature.toLimbFields());
   }
 }

package/src/schnorr/index.ts

@@ -1,49 +1,2 @@
-/**
- * The `@aztec/accounts/schnorr` export provides an account contract implementation that uses Schnorr signatures with a Grumpkin key for authentication, and a separate Grumpkin key for encryption.
- * This is the suggested account contract type for most use cases within Aztec.
- *
- * @packageDocumentation
- */
-import { getAccountContractAddress } from '@aztec/aztec.js/account';
-import type { AztecAddress } from '@aztec/aztec.js/addresses';
-import { Fr, GrumpkinScalar } from '@aztec/foundation/fields';
-import type { ContractArtifact } from '@aztec/stdlib/abi';
-import { loadContractArtifact } from '@aztec/stdlib/abi';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
-import type { NoirCompiledContract } from '@aztec/stdlib/noir';
-
-import SchnorrAccountContractJson from '../../artifacts/SchnorrAccount.json' with { type: 'json' };
-import { SchnorrBaseAccountContract } from './account_contract.js';
-
-export const SchnorrAccountContractArtifact = loadContractArtifact(SchnorrAccountContractJson as NoirCompiledContract);
-
-/**
- * Account contract that authenticates transactions using Schnorr signatures
- * verified against a Grumpkin public key stored in an immutable encrypted note.
- * Eagerly loads the contract artifact
- */
-export class SchnorrAccountContract extends SchnorrBaseAccountContract {
-  constructor(signingPrivateKey: GrumpkinScalar) {
-    super(signingPrivateKey);
-  }
-
-  override getContractArtifact(): Promise<ContractArtifact> {
-    return Promise.resolve(SchnorrAccountContractArtifact);
-  }
-}
-
-/**
- * Compute the address of a schnorr account contract.
- * @param secret - A seed for deriving the signing key and public keys.
- * @param salt - The contract address salt.
- * @param signingPrivateKey - A specific signing private key that's not derived from the secret.
- */
-export async function getSchnorrAccountContractAddress(
-  secret: Fr,
-  salt: Fr,
-  signingPrivateKey?: GrumpkinScalar,
-): Promise<AztecAddress> {
-  const signingKey = signingPrivateKey ?? deriveSigningKey(secret);
-  const accountContract = new SchnorrAccountContract(signingKey);
-  return await getAccountContractAddress(accountContract, secret, salt);
-}
+export * from './private_immutable/index.js';
+export * from './initializerless/index.js';

package/src/schnorr/initializerless/index.ts

@@ -0,0 +1,62 @@
+/**
+ * The `@aztec/accounts/schnorr` export provides an account contract implementation that uses Schnorr signatures with a Grumpkin key for authentication, and a separate Grumpkin key for encryption.
+ * This is the suggested account contract type for most use cases within Aztec.
+ *
+ * @packageDocumentation
+ */
+import { getAccountContractAddress } from '@aztec/aztec.js/account';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+import type { NoirCompiledContract } from '@aztec/stdlib/noir';
+
+import SchnorrInitializerlessAccountContractJson from '../../../artifacts/SchnorrInitializerlessAccount.json' with { type: 'json' };
+import { deriveSecretKeyFromSigningKey } from '../../utils/key_derivation.js';
+import { SchnorrBaseAccountContract } from '../account_contract.js';
+
+export const SchnorrInitializerlessAccountContractArtifact = loadContractArtifact(
+  SchnorrInitializerlessAccountContractJson as NoirCompiledContract,
+);
+
+/**
+ * Account contract that authenticates transactions using Schnorr signatures
+ * verified against a Grumpkin public key stored in an immutable encrypted note.
+ * Eagerly loads the contract artifact
+ */
+export class SchnorrInitializerlessAccountContract extends SchnorrBaseAccountContract {
+  constructor(signingPrivateKey: GrumpkinScalar) {
+    super(signingPrivateKey);
+  }
+
+  override getInitializationFunctionAndArgs() {
+    return Promise.resolve(undefined);
+  }
+
+  override async getImmutablesHash(): Promise<Fr> {
+    const signingPublicKey = await this.getSigningPublicKey();
+    return poseidon2Hash([signingPublicKey.x, signingPublicKey.y]);
+  }
+
+  override getContractArtifact(): Promise<ContractArtifact> {
+    return Promise.resolve(SchnorrInitializerlessAccountContractArtifact);
+  }
+}
+
+/**
+ * Compute the address of a schnorr account contract.
+ * @param signingPrivateKey - The account's signing private key.
+ * @param salt - The contract address salt.
+ * @param secretKey - Seed for the account's privacy keys. Derived from the signing key when omitted.
+ */
+export async function getSchnorrInitializerlessAccountContractAddress(
+  signingPrivateKey: GrumpkinScalar,
+  salt: Fr,
+  secretKey?: Fr,
+): Promise<AztecAddress> {
+  const resolvedSecretKey = secretKey ?? (await deriveSecretKeyFromSigningKey(signingPrivateKey));
+  const accountContract = new SchnorrInitializerlessAccountContract(signingPrivateKey);
+  return await getAccountContractAddress(accountContract, resolvedSecretKey, salt);
+}

package/src/schnorr/initializerless/lazy.ts

@@ -0,0 +1,70 @@
+/**
+ * The `@aztec/accounts/schnorr` export provides an account contract implementation that uses Schnorr signatures with a Grumpkin key for authentication, and a separate Grumpkin key for encryption.
+ * This is the suggested account contract type for most use cases within Aztec.
+ *
+ * @packageDocumentation
+ */
+import { getAccountContractAddress } from '@aztec/aztec.js/account';
+import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+
+import { deriveSecretKeyFromSigningKey } from '../../utils/key_derivation.js';
+import { SchnorrBaseAccountContract } from '../account_contract.js';
+
+/**
+ * Lazily loads the contract artifact
+ * @returns The contract artifact for the schnorr account contract
+ */
+export async function getSchnorrInitializerlessAccountContractArtifact() {
+  // Cannot assert this import as it's incompatible with bundlers like vite
+  // https://github.com/vitejs/vite/issues/19095#issuecomment-2566074352
+  // Even if now supported by all major browsers, the MIME type is replaced with
+  // "text/javascript"
+  // In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
+  const { default: schnorrAccountContractJson } = await import('../../../artifacts/SchnorrInitializerlessAccount.json');
+  return loadContractArtifact(schnorrAccountContractJson);
+}
+
+/**
+ * Account contract that authenticates transactions using Schnorr signatures
+ * verified against a Grumpkin public key stored in an immutable encrypted note.
+ * Lazily loads the contract artifact
+ */
+export class SchnorrInitializerlessAccountContract extends SchnorrBaseAccountContract {
+  constructor(signingPrivateKey: GrumpkinScalar) {
+    super(signingPrivateKey);
+  }
+
+  override getInitializationFunctionAndArgs() {
+    return Promise.resolve(undefined);
+  }
+
+  override async getImmutablesHash(): Promise<Fr> {
+    const signingPublicKey = await this.getSigningPublicKey();
+    return poseidon2Hash([signingPublicKey.x, signingPublicKey.y]);
+  }
+
+  override getContractArtifact(): Promise<ContractArtifact> {
+    return getSchnorrInitializerlessAccountContractArtifact();
+  }
+}
+
+/**
+ * Compute the address of a schnorr account contract.
+ * @param signingPrivateKey - The account's signing private key.
+ * @param salt - The contract address salt.
+ * @param secretKey - Seed for the account's privacy keys. Derived from the signing key when omitted.
+ */
+export async function getSchnorrInitializerlessAccountContractAddress(
+  signingPrivateKey: GrumpkinScalar,
+  salt: Fr,
+  secretKey?: Fr,
+): Promise<AztecAddress> {
+  const resolvedSecretKey = secretKey ?? (await deriveSecretKeyFromSigningKey(signingPrivateKey));
+  const accountContract = new SchnorrInitializerlessAccountContract(signingPrivateKey);
+  return await getAccountContractAddress(accountContract, resolvedSecretKey, salt);
+}

package/src/schnorr/lazy.ts

@@ -1,59 +1,2 @@
-/**
- * The `@aztec/accounts/schnorr` export provides an account contract implementation that uses Schnorr signatures with a Grumpkin key for authentication, and a separate Grumpkin key for encryption.
- * This is the suggested account contract type for most use cases within Aztec.
- *
- * @packageDocumentation
- */
-import { getAccountContractAddress } from '@aztec/aztec.js/account';
-import { Fr, GrumpkinScalar } from '@aztec/foundation/fields';
-import type { ContractArtifact } from '@aztec/stdlib/abi';
-import { loadContractArtifact } from '@aztec/stdlib/abi';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
-
-import { SchnorrBaseAccountContract } from './account_contract.js';
-
-/**
- * Lazily loads the contract artifact
- * @returns The contract artifact for the schnorr account contract
- */
-export async function getSchnorrAccountContractArtifact() {
-  // Cannot assert this import as it's incompatible with bundlers like vite
-  // https://github.com/vitejs/vite/issues/19095#issuecomment-2566074352
-  // Even if now supported by al major browsers, the MIME type is replaced with
-  // "text/javascript"
-  // In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
-  const { default: schnorrAccountContractJson } = await import('../../artifacts/SchnorrAccount.json');
-  return loadContractArtifact(schnorrAccountContractJson);
-}
-
-/**
- * Account contract that authenticates transactions using Schnorr signatures
- * verified against a Grumpkin public key stored in an immutable encrypted note.
- * Lazily loads the contract artifact
- */
-export class SchnorrAccountContract extends SchnorrBaseAccountContract {
-  constructor(signingPrivateKey: GrumpkinScalar) {
-    super(signingPrivateKey);
-  }
-
-  override getContractArtifact(): Promise<ContractArtifact> {
-    return getSchnorrAccountContractArtifact();
-  }
-}
-
-/**
- * Compute the address of a schnorr account contract.
- * @param secret - A seed for deriving the signing key and public keys.
- * @param salt - The contract address salt.
- * @param signingPrivateKey - A specific signing private key that's not derived from the secret.
- */
-export async function getSchnorrAccountContractAddress(
-  secret: Fr,
-  salt: Fr,
-  signingPrivateKey?: GrumpkinScalar,
-): Promise<AztecAddress> {
-  const signingKey = signingPrivateKey ?? deriveSigningKey(secret);
-  const accountContract = new SchnorrAccountContract(signingKey);
-  return await getAccountContractAddress(accountContract, secret, salt);
-}
+export * from './private_immutable/lazy.js';
+export * from './initializerless/lazy.js';