@aztec/accounts 0.0.1-commit.24de95ac → 0.0.1-commit.2ed92850

package/package.json

@@ -2,7 +2,7 @@
   "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.24de95ac",
+  "version": "0.0.1-commit.2ed92850",
   "type": "module",
   "exports": {
     "./defaults": "./dest/defaults/index.js",
@@ -32,11 +32,11 @@
     "tsconfig": "./tsconfig.json"
   },
   "scripts": {
-    "build": "yarn clean && yarn generate && tsc -b",
+    "build": "yarn clean && yarn generate && ../scripts/tsc.sh",
     "generate": "yarn generate:noir-contracts",
     "generate:noir-contracts": "./scripts/copy-contracts.sh",
-    "build:dev": "tsc -b --watch",
-    "build:ts": "tsc -b",
+    "build:dev": "../scripts/tsc.sh --watch",
+    "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,17 +82,18 @@
     ]
   },
   "dependencies": {
-    "@aztec/aztec.js": "0.0.1-commit.24de95ac",
-    "@aztec/entrypoints": "0.0.1-commit.24de95ac",
-    "@aztec/ethereum": "0.0.1-commit.24de95ac",
-    "@aztec/foundation": "0.0.1-commit.24de95ac",
-    "@aztec/stdlib": "0.0.1-commit.24de95ac",
+    "@aztec/aztec.js": "0.0.1-commit.2ed92850",
+    "@aztec/entrypoints": "0.0.1-commit.2ed92850",
+    "@aztec/ethereum": "0.0.1-commit.2ed92850",
+    "@aztec/foundation": "0.0.1-commit.2ed92850",
+    "@aztec/stdlib": "0.0.1-commit.2ed92850",
     "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.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,8 @@
-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 { 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 +22,12 @@ export abstract class DefaultAccountContract implements AccountContract {
 
   constructor() {}
 
-  getInterface(address: CompleteAddress, chainInfo: ChainInfo): AccountInterface {
-    return new DefaultAccountInterface(this.getAuthWitnessProvider(address), address, chainInfo);
+  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/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';
 

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';
 

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';
 

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';
 

package/src/schnorr/index.ts

@@ -6,7 +6,8 @@
  */
 import { getAccountContractAddress } from '@aztec/aztec.js/account';
 import type { AztecAddress } from '@aztec/aztec.js/addresses';
-import { Fr, GrumpkinScalar } from '@aztec/foundation/fields';
+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 { deriveSigningKey } from '@aztec/stdlib/keys';

package/src/schnorr/lazy.ts

@@ -5,7 +5,8 @@
  * @packageDocumentation
  */
 import { getAccountContractAddress } from '@aztec/aztec.js/account';
-import { Fr, GrumpkinScalar } from '@aztec/foundation/fields';
+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';

package/src/single_key/account_contract.ts

@@ -1,6 +1,7 @@
 import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
-import { Schnorr } from '@aztec/foundation/crypto';
-import { type Fr, GrumpkinScalar } from '@aztec/foundation/fields';
+import { Schnorr } from '@aztec/foundation/crypto/schnorr';
+import type { 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';
 

package/src/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/stub/index.ts

@@ -1,11 +1,11 @@
-import { BaseAccount, type ChainInfo } from '@aztec/aztec.js/account';
+import { BaseAccount } from '@aztec/aztec.js/account';
 import type { CompleteAddress } from '@aztec/aztec.js/addresses';
+import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import { loadContractArtifact } from '@aztec/stdlib/abi';
 import type { NoirCompiledContract } from '@aztec/stdlib/noir';
 
 import SimulatedAccountContract from '../../artifacts/SimulatedAccount.json' with { type: 'json' };
-import { DefaultAccountInterface } from '../defaults/account_interface.js';
 import { StubBaseAccountContract } from './account_contract.js';
 
 export const StubAccountContractArtifact = loadContractArtifact(SimulatedAccountContract as NoirCompiledContract);
@@ -27,15 +27,14 @@ export class StubAccountContract extends StubBaseAccountContract {
 /**
  * Creates a stub account that impersonates the one with the provided originalAddress.
  * @param originalAddress - The address of the account to stub
- * @param chainInfo - The chain info that the account is connected to
  * @returns A stub account that can be used for kernelless simulations
  */
-export function createStubAccount(originalAddress: CompleteAddress, chainInfo: ChainInfo) {
+export function createStubAccount(originalAddress: CompleteAddress) {
   const accountContract = new StubAccountContract();
-  const accountInterface = new DefaultAccountInterface(
-    accountContract.getAuthWitnessProvider(originalAddress),
+  const authWitnessProvider = accountContract.getAuthWitnessProvider(originalAddress);
+  return new BaseAccount(
+    new DefaultAccountEntrypoint(originalAddress.address, authWitnessProvider),
+    authWitnessProvider,
     originalAddress,
-    chainInfo,
   );
-  return new BaseAccount(accountInterface);
 }

package/src/stub/lazy.ts

@@ -1,9 +1,9 @@
-import { BaseAccount, type ChainInfo } from '@aztec/aztec.js/account';
+import { BaseAccount } from '@aztec/aztec.js/account';
 import type { CompleteAddress } from '@aztec/aztec.js/addresses';
+import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import { loadContractArtifact } from '@aztec/stdlib/abi';
 
-import { DefaultAccountInterface } from '../defaults/account_interface.js';
 import { StubBaseAccountContract } from './account_contract.js';
 
 /**
@@ -36,14 +36,16 @@ export class StubAccountContract extends StubBaseAccountContract {
 }
 
 /**
- *
+ * Creates a stub account that impersonates the one with the provided originalAddress.
+ * @param originalAddress - The address of the account to stub
+ * @returns A stub account that can be used for kernelless simulations
  */
-export function createStubAccount(originalAddress: CompleteAddress, chainInfo: ChainInfo) {
+export function createStubAccount(originalAddress: CompleteAddress) {
   const accountContract = new StubAccountContract();
-  const accountInterface = new DefaultAccountInterface(
-    accountContract.getAuthWitnessProvider(originalAddress),
+  const authWitnessProvider = accountContract.getAuthWitnessProvider(originalAddress);
+  return new BaseAccount(
+    new DefaultAccountEntrypoint(originalAddress.address, authWitnessProvider),
+    authWitnessProvider,
     originalAddress,
-    chainInfo,
   );
-  return new BaseAccount(accountInterface);
 }

package/src/testing/configuration.ts

@@ -1,4 +1,5 @@
-import { Fr, GrumpkinScalar } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { deriveMasterIncomingViewingSecretKey } from '@aztec/stdlib/keys';
 

package/src/testing/index.ts

@@ -1,5 +1,5 @@
 /**
- * The `@aztec/accounts/testing` export provides utility methods for testing, in particular in a Sandbox environment.
+ * The `@aztec/accounts/testing` export provides utility methods for testing, in particular in a local network environment.
  *
  * @packageDocumentation
  */

package/src/testing/lazy.ts

@@ -1,5 +1,5 @@
 /**
- * The `@aztec/accounts/testing/lazy` export provides utility methods for testing, in particular in a Sandbox environment.
+ * The `@aztec/accounts/testing/lazy` export provides utility methods for testing, in particular in a local network environment.
  *
  * @packageDocumentation
  */

package/dest/defaults/account_interface.d.ts

@@ -1,29 +0,0 @@
-import type { AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account';
-import { type DefaultAccountEntrypointOptions } from '@aztec/entrypoints/account';
-import type { ChainInfo, EntrypointInterface } from '@aztec/entrypoints/interfaces';
-import type { ExecutionPayload } from '@aztec/entrypoints/payload';
-import { Fr } from '@aztec/foundation/fields';
-import type { AuthWitness } from '@aztec/stdlib/auth-witness';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { CompleteAddress } from '@aztec/stdlib/contract';
-import type { GasSettings } from '@aztec/stdlib/gas';
-import type { TxExecutionRequest } from '@aztec/stdlib/tx';
-/**
- * Default implementation for an account interface. Requires that the account uses the default
- * entrypoint signature, which accept an AppPayload and a FeePayload as defined in noir-libs/aztec-noir/src/entrypoint module
- */
-export declare class DefaultAccountInterface implements AccountInterface {
-    private authWitnessProvider;
-    private address;
-    protected entrypoint: EntrypointInterface;
-    private chainId;
-    private version;
-    constructor(authWitnessProvider: AuthWitnessProvider, address: CompleteAddress, chainInfo: ChainInfo);
-    createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings, options: DefaultAccountEntrypointOptions): Promise<TxExecutionRequest>;
-    createAuthWit(messageHash: Fr): Promise<AuthWitness>;
-    getCompleteAddress(): CompleteAddress;
-    getAddress(): AztecAddress;
-    getChainId(): Fr;
-    getVersion(): Fr;
-}
-//# sourceMappingURL=account_interface.d.ts.map

package/dest/defaults/account_interface.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"account_interface.d.ts","sourceRoot":"","sources":["../../src/defaults/account_interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACrF,OAAO,EAA4B,KAAK,+BAA+B,EAAE,MAAM,4BAA4B,CAAC;AAC5G,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D;;;GAGG;AACH,qBAAa,uBAAwB,YAAW,gBAAgB;IAO5D,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,OAAO;IAPjB,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAE1C,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,OAAO,CAAK;gBAGV,mBAAmB,EAAE,mBAAmB,EACxC,OAAO,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS;IAYtB,wBAAwB,CACtB,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,+BAA+B,GACvC,OAAO,CAAC,kBAAkB,CAAC;IAI9B,aAAa,CAAC,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;IAIpD,kBAAkB,IAAI,eAAe;IAIrC,UAAU,IAAI,YAAY;IAI1B,UAAU,IAAI,EAAE;IAIhB,UAAU,IAAI,EAAE;CAGjB"}

package/dest/defaults/account_interface.js

@@ -1,36 +0,0 @@
-import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
-/**
- * Default implementation for an account interface. Requires that the account uses the default
- * entrypoint signature, which accept an AppPayload and a FeePayload as defined in noir-libs/aztec-noir/src/entrypoint module
- */ export class DefaultAccountInterface {
-    authWitnessProvider;
-    address;
-    entrypoint;
-    chainId;
-    version;
-    constructor(authWitnessProvider, address, chainInfo){
-        this.authWitnessProvider = authWitnessProvider;
-        this.address = address;
-        this.entrypoint = new DefaultAccountEntrypoint(address.address, authWitnessProvider, chainInfo.chainId.toNumber(), chainInfo.version.toNumber());
-        this.chainId = chainInfo.chainId;
-        this.version = chainInfo.version;
-    }
-    createTxExecutionRequest(exec, gasSettings, options) {
-        return this.entrypoint.createTxExecutionRequest(exec, gasSettings, options);
-    }
-    createAuthWit(messageHash) {
-        return this.authWitnessProvider.createAuthWit(messageHash);
-    }
-    getCompleteAddress() {
-        return this.address;
-    }
-    getAddress() {
-        return this.address.address;
-    }
-    getChainId() {
-        return this.chainId;
-    }
-    getVersion() {
-        return this.version;
-    }
-}

package/src/defaults/account_interface.ts

@@ -1,64 +0,0 @@
-import type { AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account';
-import { DefaultAccountEntrypoint, type DefaultAccountEntrypointOptions } from '@aztec/entrypoints/account';
-import type { ChainInfo, EntrypointInterface } from '@aztec/entrypoints/interfaces';
-import type { ExecutionPayload } from '@aztec/entrypoints/payload';
-import { Fr } from '@aztec/foundation/fields';
-import type { AuthWitness } from '@aztec/stdlib/auth-witness';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { CompleteAddress } from '@aztec/stdlib/contract';
-import type { GasSettings } from '@aztec/stdlib/gas';
-import type { TxExecutionRequest } from '@aztec/stdlib/tx';
-
-/**
- * Default implementation for an account interface. Requires that the account uses the default
- * entrypoint signature, which accept an AppPayload and a FeePayload as defined in noir-libs/aztec-noir/src/entrypoint module
- */
-export class DefaultAccountInterface implements AccountInterface {
-  protected entrypoint: EntrypointInterface;
-
-  private chainId: Fr;
-  private version: Fr;
-
-  constructor(
-    private authWitnessProvider: AuthWitnessProvider,
-    private address: CompleteAddress,
-    chainInfo: ChainInfo,
-  ) {
-    this.entrypoint = new DefaultAccountEntrypoint(
-      address.address,
-      authWitnessProvider,
-      chainInfo.chainId.toNumber(),
-      chainInfo.version.toNumber(),
-    );
-    this.chainId = chainInfo.chainId;
-    this.version = chainInfo.version;
-  }
-
-  createTxExecutionRequest(
-    exec: ExecutionPayload,
-    gasSettings: GasSettings,
-    options: DefaultAccountEntrypointOptions,
-  ): Promise<TxExecutionRequest> {
-    return this.entrypoint.createTxExecutionRequest(exec, gasSettings, options);
-  }
-
-  createAuthWit(messageHash: Fr): Promise<AuthWitness> {
-    return this.authWitnessProvider.createAuthWit(messageHash);
-  }
-
-  getCompleteAddress(): CompleteAddress {
-    return this.address;
-  }
-
-  getAddress(): AztecAddress {
-    return this.address.address;
-  }
-
-  getChainId(): Fr {
-    return this.chainId;
-  }
-
-  getVersion(): Fr {
-    return this.version;
-  }
-}