@aztec/accounts 0.0.1-commit.f295ac2 → 0.0.1-commit.f504929

package/dest/defaults/account_contract.d.ts

@@ -1,4 +1,4 @@
-import type { AccountContract, AccountInterface, AuthWitnessProvider, ChainInfo } from '@aztec/aztec.js/account';
+import { type Account, type AccountContract, type AuthWitnessProvider } from '@aztec/aztec.js/account';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import type { CompleteAddress } from '@aztec/stdlib/contract';
 /**
@@ -15,6 +15,6 @@ export declare abstract class DefaultAccountContract implements AccountContract
     } | undefined>;
     abstract getContractArtifact(): Promise<ContractArtifact>;
     constructor();
-    getInterface(address: CompleteAddress, chainInfo: ChainInfo): AccountInterface;
+    getAccount(completeAddress: CompleteAddress): Account;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9jb250cmFjdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2RlZmF1bHRzL2FjY291bnRfY29udHJhY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLGdCQUFnQixFQUFFLG1CQUFtQixFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ2pILE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDMUQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFJOUQ7OztHQUdHO0FBQ0gsOEJBQXNCLHNCQUF1QixZQUFXLGVBQWU7SUFDckUsUUFBUSxDQUFDLHNCQUFzQixDQUFDLE9BQU8sRUFBRSxlQUFlLEdBQUcsbUJBQW1CLENBQUM7SUFDL0UsUUFBUSxDQUFDLGdDQUFnQyxJQUFJLE9BQU8sQ0FDaEQ7UUFDRSwrREFBK0Q7UUFDL0QsZUFBZSxFQUFFLE1BQU0sQ0FBQztRQUN4QiwrREFBK0Q7UUFDL0QsZUFBZSxFQUFFLEdBQUcsRUFBRSxDQUFDO0tBQ3hCLEdBQ0QsU0FBUyxDQUNaLENBQUM7SUFDRixRQUFRLENBQUMsbUJBQW1CLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBQUM7SUFFMUQsY0FBZ0I7SUFFaEIsWUFBWSxDQUFDLE9BQU8sRUFBRSxlQUFlLEVBQUUsU0FBUyxFQUFFLFNBQVMsR0FBRyxnQkFBZ0IsQ0FFN0U7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9jb250cmFjdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2RlZmF1bHRzL2FjY291bnRfY29udHJhY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFFLEtBQUssbUJBQW1CLEVBQWUsTUFBTSx5QkFBeUIsQ0FBQztBQUVwSCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzFELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlEOzs7R0FHRztBQUNILDhCQUFzQixzQkFBdUIsWUFBVyxlQUFlO0lBQ3JFLFFBQVEsQ0FBQyxzQkFBc0IsQ0FBQyxPQUFPLEVBQUUsZUFBZSxHQUFHLG1CQUFtQixDQUFDO0lBQy9FLFFBQVEsQ0FBQyxnQ0FBZ0MsSUFBSSxPQUFPLENBQ2hEO1FBQ0UsK0RBQStEO1FBQy9ELGVBQWUsRUFBRSxNQUFNLENBQUM7UUFDeEIsK0RBQStEO1FBQy9ELGVBQWUsRUFBRSxHQUFHLEVBQUUsQ0FBQztLQUN4QixHQUNELFNBQVMsQ0FDWixDQUFDO0lBQ0YsUUFBUSxDQUFDLG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBRTFELGNBQWdCO0lBRWhCLFVBQVUsQ0FBQyxlQUFlLEVBQUUsZUFBZSxHQUFHLE9BQU8sQ0FPcEQ7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"account_contract.d.ts","sourceRoot":"","sources":["../../src/defaults/account_contract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACjH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D;;;GAGG;AACH,8BAAsB,sBAAuB,YAAW,eAAe;IACrE,QAAQ,CAAC,sBAAsB,CAAC,OAAO,EAAE,eAAe,GAAG,mBAAmB,CAAC;IAC/E,QAAQ,CAAC,gCAAgC,IAAI,OAAO,CAChD;QACE,+DAA+D;QAC/D,eAAe,EAAE,MAAM,CAAC;QACxB,+DAA+D;QAC/D,eAAe,EAAE,GAAG,EAAE,CAAC;KACxB,GACD,SAAS,CACZ,CAAC;IACF,QAAQ,CAAC,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAE1D,cAAgB;IAEhB,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,GAAG,gBAAgB,CAE7E;CACF"}
+{"version":3,"file":"account_contract.d.ts","sourceRoot":"","sources":["../../src/defaults/account_contract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,mBAAmB,EAAe,MAAM,yBAAyB,CAAC;AAEpH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D;;;GAGG;AACH,8BAAsB,sBAAuB,YAAW,eAAe;IACrE,QAAQ,CAAC,sBAAsB,CAAC,OAAO,EAAE,eAAe,GAAG,mBAAmB,CAAC;IAC/E,QAAQ,CAAC,gCAAgC,IAAI,OAAO,CAChD;QACE,+DAA+D;QAC/D,eAAe,EAAE,MAAM,CAAC;QACxB,+DAA+D;QAC/D,eAAe,EAAE,GAAG,EAAE,CAAC;KACxB,GACD,SAAS,CACZ,CAAC;IACF,QAAQ,CAAC,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAE1D,cAAgB;IAEhB,UAAU,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO,CAOpD;CACF"}

package/dest/defaults/account_contract.js

@@ -1,10 +1,12 @@
-import { DefaultAccountInterface } from '../defaults/account_interface.js';
+import { BaseAccount } from '@aztec/aztec.js/account';
+import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
 /**
  * Base class for implementing an account contract. Requires that the account uses the
  * default entrypoint method signature.
  */ export class DefaultAccountContract {
     constructor(){}
-    getInterface(address, chainInfo) {
-        return new DefaultAccountInterface(this.getAuthWitnessProvider(address), address, chainInfo);
+    getAccount(completeAddress) {
+        const authWitnessProvider = this.getAuthWitnessProvider(completeAddress);
+        return new BaseAccount(new DefaultAccountEntrypoint(completeAddress.address, authWitnessProvider), authWitnessProvider, completeAddress);
     }
 }

package/dest/defaults/index.d.ts

@@ -5,6 +5,5 @@
  *
  * @packageDocumentation
  */
-export * from './account_interface.js';
 export * from './account_contract.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kZWZhdWx0cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSCxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsdUJBQXVCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kZWZhdWx0cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSCxjQUFjLHVCQUF1QixDQUFDIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/defaults/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/defaults/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,uBAAuB,CAAC"}

package/dest/defaults/index.js

@@ -4,5 +4,4 @@
  * Read more in {@link https://docs.aztec.network/developers/tutorials/contract_tutorials/counter_contract | Writing an account contract}.
  *
  * @packageDocumentation
- */ export * from './account_interface.js';
-export * from './account_contract.js';
+ */ export * from './account_contract.js';

package/dest/stub/index.d.ts

@@ -1,4 +1,4 @@
-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 type { ContractArtifact } from '@aztec/stdlib/abi';
 import { StubBaseAccountContract } from './account_contract.js';
@@ -14,8 +14,7 @@ export declare 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 declare function createStubAccount(originalAddress: CompleteAddress, chainInfo: ChainInfo): BaseAccount;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdHViL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsS0FBSyxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN0RSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBTTFELE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRWhFLGVBQU8sTUFBTSwyQkFBMkIsa0JBQXlFLENBQUM7QUFFbEg7OztHQUdHO0FBQ0gscUJBQWEsbUJBQW9CLFNBQVEsdUJBQXVCO0lBQzlELGNBRUM7SUFFUSxtQkFBbUIsSUFBSSxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FFeEQ7Q0FDRjtBQUVEOzs7OztHQUtHO0FBQ0gsd0JBQWdCLGlCQUFpQixDQUFDLGVBQWUsRUFBRSxlQUFlLEVBQUUsU0FBUyxFQUFFLFNBQVMsZUFRdkYifQ==
+export declare function createStubAccount(originalAddress: CompleteAddress): BaseAccount;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdHViL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN0RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUVqRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBSzFELE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRWhFLGVBQU8sTUFBTSwyQkFBMkIsa0JBQXlFLENBQUM7QUFFbEg7OztHQUdHO0FBQ0gscUJBQWEsbUJBQW9CLFNBQVEsdUJBQXVCO0lBQzlELGNBRUM7SUFFUSxtQkFBbUIsSUFBSSxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FFeEQ7Q0FDRjtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBZ0IsaUJBQWlCLENBQUMsZUFBZSxFQUFFLGVBQWUsZUFRakUifQ==

package/dest/stub/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/stub/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,KAAK,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,eAAO,MAAM,2BAA2B,kBAAyE,CAAC;AAElH;;;GAGG;AACH,qBAAa,mBAAoB,SAAQ,uBAAuB;IAC9D,cAEC;IAEQ,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAExD;CACF;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,eAAe,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,eAQvF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/stub/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAK1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,eAAO,MAAM,2BAA2B,kBAAyE,CAAC;AAElH;;;GAGG;AACH,qBAAa,mBAAoB,SAAQ,uBAAuB;IAC9D,cAEC;IAEQ,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAExD;CACF;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,eAAe,EAAE,eAAe,eAQjE"}

package/dest/stub/index.js

@@ -1,9 +1,9 @@
 import { BaseAccount } from '@aztec/aztec.js/account';
+import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
 import { loadContractArtifact } from '@aztec/stdlib/abi';
 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);
 /**
@@ -20,10 +20,9 @@ export const StubAccountContractArtifact = loadContractArtifact(SimulatedAccount
 /**
  * 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, chainInfo) {
+ */ export function createStubAccount(originalAddress) {
     const accountContract = new StubAccountContract();
-    const accountInterface = new DefaultAccountInterface(accountContract.getAuthWitnessProvider(originalAddress), originalAddress, chainInfo);
-    return new BaseAccount(accountInterface);
+    const authWitnessProvider = accountContract.getAuthWitnessProvider(originalAddress);
+    return new BaseAccount(new DefaultAccountEntrypoint(originalAddress.address, authWitnessProvider), authWitnessProvider, originalAddress);
 }

package/dest/stub/lazy.d.ts

@@ -1,4 +1,4 @@
-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 type { ContractArtifact } from '@aztec/stdlib/abi';
 import { StubBaseAccountContract } from './account_contract.js';
@@ -17,7 +17,9 @@ export declare class StubAccountContract extends StubBaseAccountContract {
     getContractArtifact(): Promise<ContractArtifact>;
 }
 /**
- *
+ * 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 declare function createStubAccount(originalAddress: CompleteAddress, chainInfo: ChainInfo): BaseAccount;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF6eS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N0dWIvbGF6eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLEtBQUssU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDdEUsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUkxRCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVoRTs7O0dBR0c7QUFDSCx3QkFBc0IsOEJBQThCLDhCQVFuRDtBQUVEOzs7O0dBSUc7QUFDSCxxQkFBYSxtQkFBb0IsU0FBUSx1QkFBdUI7SUFDOUQsY0FFQztJQUVRLG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUV4RDtDQUNGO0FBRUQ7O0dBRUc7QUFDSCx3QkFBZ0IsaUJBQWlCLENBQUMsZUFBZSxFQUFFLGVBQWUsRUFBRSxTQUFTLEVBQUUsU0FBUyxlQVF2RiJ9
+export declare function createStubAccount(originalAddress: CompleteAddress): BaseAccount;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF6eS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N0dWIvbGF6eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDdEQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFakUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUcxRCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVoRTs7O0dBR0c7QUFDSCx3QkFBc0IsOEJBQThCLDhCQVFuRDtBQUVEOzs7O0dBSUc7QUFDSCxxQkFBYSxtQkFBb0IsU0FBUSx1QkFBdUI7SUFDOUQsY0FFQztJQUVRLG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUV4RDtDQUNGO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFnQixpQkFBaUIsQ0FBQyxlQUFlLEVBQUUsZUFBZSxlQVFqRSJ9

package/dest/stub/lazy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../src/stub/lazy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,KAAK,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAI1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE;;;GAGG;AACH,wBAAsB,8BAA8B,8BAQnD;AAED;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,uBAAuB;IAC9D,cAEC;IAEQ,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAExD;CACF;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,eAAe,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,eAQvF"}
+{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../src/stub/lazy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE;;;GAGG;AACH,wBAAsB,8BAA8B,8BAQnD;AAED;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,uBAAuB;IAC9D,cAEC;IAEQ,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAExD;CACF;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,eAAe,EAAE,eAAe,eAQjE"}

package/dest/stub/lazy.js

@@ -1,6 +1,6 @@
 import { BaseAccount } from '@aztec/aztec.js/account';
+import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
 import { loadContractArtifact } from '@aztec/stdlib/abi';
-import { DefaultAccountInterface } from '../defaults/account_interface.js';
 import { StubBaseAccountContract } from './account_contract.js';
 /**
  * Lazily loads the contract artifact
@@ -27,9 +27,11 @@ import { StubBaseAccountContract } from './account_contract.js';
     }
 }
 /**
- *
- */ export function createStubAccount(originalAddress, chainInfo) {
+ * 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) {
     const accountContract = new StubAccountContract();
-    const accountInterface = new DefaultAccountInterface(accountContract.getAuthWitnessProvider(originalAddress), originalAddress, chainInfo);
-    return new BaseAccount(accountInterface);
+    const authWitnessProvider = accountContract.getAuthWitnessProvider(originalAddress);
+    return new BaseAccount(new DefaultAccountEntrypoint(originalAddress.address, authWitnessProvider), authWitnessProvider, originalAddress);
 }

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.f295ac2",
+  "version": "0.0.1-commit.f504929",
   "type": "module",
   "exports": {
     "./defaults": "./dest/defaults/index.js",
@@ -10,8 +10,6 @@
     "./ecdsa/lazy": "./dest/ecdsa/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",
     "./testing": "./dest/testing/index.js",
@@ -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",
@@ -82,11 +79,11 @@
     ]
   },
   "dependencies": {
-    "@aztec/aztec.js": "0.0.1-commit.f295ac2",
-    "@aztec/entrypoints": "0.0.1-commit.f295ac2",
-    "@aztec/ethereum": "0.0.1-commit.f295ac2",
-    "@aztec/foundation": "0.0.1-commit.f295ac2",
-    "@aztec/stdlib": "0.0.1-commit.f295ac2",
+    "@aztec/aztec.js": "0.0.1-commit.f504929",
+    "@aztec/entrypoints": "0.0.1-commit.f504929",
+    "@aztec/ethereum": "0.0.1-commit.f504929",
+    "@aztec/foundation": "0.0.1-commit.f504929",
+    "@aztec/stdlib": "0.0.1-commit.f504929",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

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

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