@aztec/accounts 0.0.1-commit.24de95ac → 0.0.1-commit.27d773e65

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/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/artifacts/SchnorrSingleKeyAccount.d.json.ts

@@ -1,3 +0,0 @@
-import { type NoirCompiledContract } from '@aztec/stdlib/noir';
-const circuit: NoirCompiledContract;
-export = circuit;