@aztec/accounts 0.81.0 → 0.82.0

package/dest/defaults/account_interface.d.ts

@@ -1,5 +1,6 @@
 import type { AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account';
-import type { EntrypointInterface, ExecutionRequestInit } from '@aztec/aztec.js/entrypoint';
+import type { EntrypointInterface, FeeOptions, TxExecutionOptions } 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';
@@ -17,7 +18,7 @@ export declare class DefaultAccountInterface implements AccountInterface {
     private chainId;
     private version;
     constructor(authWitnessProvider: AuthWitnessProvider, address: CompleteAddress, nodeInfo: Pick<NodeInfo, 'l1ChainId' | 'protocolVersion'>);
-    createTxExecutionRequest(execution: ExecutionRequestInit): Promise<TxExecutionRequest>;
+    createTxExecutionRequest(exec: ExecutionPayload, fee: FeeOptions, options: TxExecutionOptions): Promise<TxExecutionRequest>;
     createAuthWit(messageHash: Fr): Promise<AuthWitness>;
     getCompleteAddress(): CompleteAddress;
     getAddress(): AztecAddress;

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

@@ -1 +1 @@
-{"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,KAAK,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAE5F,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,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACvD,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,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,GAAG,iBAAiB,CAAC;IAY3D,wBAAwB,CAAC,SAAS,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAItF,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"}
+{"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;AAErF,OAAO,KAAK,EAAE,mBAAmB,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACzG,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,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACvD,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,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,GAAG,iBAAiB,CAAC;IAY3D,wBAAwB,CACtB,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,kBAAkB,GAC1B,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

@@ -16,8 +16,8 @@ import { Fr } from '@aztec/foundation/fields';
         this.chainId = new Fr(nodeInfo.l1ChainId);
         this.version = new Fr(nodeInfo.protocolVersion);
     }
-    createTxExecutionRequest(execution) {
-        return this.entrypoint.createTxExecutionRequest(execution);
+    createTxExecutionRequest(exec, fee, options) {
+        return this.entrypoint.createTxExecutionRequest(exec, fee, options);
     }
     createAuthWit(messageHash) {
         return this.authWitnessProvider.createAuthWit(messageHash);

package/dest/testing/create_account.d.ts

@@ -1,4 +1,4 @@
-import { type AccountManager, type PXE, type WaitOpts } from '@aztec/aztec.js';
+import { type AccountManager, type PXE, type WaitForProvenOpts, type WaitOpts } from '@aztec/aztec.js';
 import { Fr } from '@aztec/foundation/fields';
 import type { InitialAccountData } from './configuration.js';
 /**
@@ -28,7 +28,7 @@ export declare function deployFundedSchnorrAccount(pxe: PXE, account: DeployAcco
      * Whether or not to skip registering contract class.
      */
     skipClassRegistration?: boolean;
-}): Promise<AccountManager>;
+}, waitForProvenOptions?: WaitForProvenOpts): Promise<AccountManager>;
 /**
  * Deploy schnorr account contracts.
  * They will pay for the fees for the deployment themselves. So they must be funded with the prefilled public data.
@@ -38,6 +38,6 @@ export declare function deployFundedSchnorrAccounts(pxe: PXE, accounts: DeployAc
      * Whether or not to skip registering contract class.
      */
     skipClassRegistration?: boolean;
-}): Promise<AccountManager[]>;
+}, waitForProvenOptions?: WaitForProvenOpts): Promise<AccountManager[]>;
 export {};
 //# sourceMappingURL=create_account.d.ts.map

package/dest/testing/create_account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create_account.d.ts","sourceRoot":"","sources":["../../src/testing/create_account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAyB,KAAK,GAAG,EAAE,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACtG,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAI9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE7D;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,gBAAgB,EAAE,MAAM;;;;;KAarE;AAED;;GAEG;AACH,KAAK,iBAAiB,GAAG,IAAI,CAAC,kBAAkB,EAAE,QAAQ,GAAG,MAAM,CAAC,GAAG;IACrE;;OAEG;IACH,UAAU,CAAC,EAAE,kBAAkB,CAAC,YAAY,CAAC,CAAC;CAC/C,CAAC;AAEF;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,iBAAiB,EAC1B,IAAI,GAAE,QAAQ,GAAG;IACf;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACiB,GAClD,OAAO,CAAC,cAAc,CAAC,CAiBzB;AAED;;;GAGG;AACH,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,iBAAiB,EAAE,EAC7B,IAAI,GAAE,QAAQ,GAAG;IACf;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACiB,GAClD,OAAO,CAAC,cAAc,EAAE,CAAC,CAY3B"}
+{"version":3,"file":"create_account.d.ts","sourceRoot":"","sources":["../../src/testing/create_account.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,cAAc,EAEnB,KAAK,GAAG,EACR,KAAK,iBAAiB,EACtB,KAAK,QAAQ,EAEd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAI9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE7D;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,gBAAgB,EAAE,MAAM;;;;;KAarE;AAED;;GAEG;AACH,KAAK,iBAAiB,GAAG,IAAI,CAAC,kBAAkB,EAAE,QAAQ,GAAG,MAAM,CAAC,GAAG;IACrE;;OAEG;IACH,UAAU,CAAC,EAAE,kBAAkB,CAAC,YAAY,CAAC,CAAC;CAC/C,CAAC;AAEF;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,iBAAiB,EAC1B,IAAI,GAAE,QAAQ,GAAG;IACf;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACiB,EACnD,oBAAoB,CAAC,EAAE,iBAAiB,GACvC,OAAO,CAAC,cAAc,CAAC,CAqBzB;AAED;;;GAGG;AACH,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,iBAAiB,EAAE,EAC7B,IAAI,GAAE,QAAQ,GAAG;IACf;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACiB,EACnD,oBAAoB,CAAC,EAAE,iBAAiB,GACvC,OAAO,CAAC,cAAc,EAAE,CAAC,CAiB3B"}

package/dest/testing/create_account.js

@@ -1,4 +1,4 @@
-import { FeeJuicePaymentMethod } from '@aztec/aztec.js';
+import { FeeJuicePaymentMethod, waitForProven } from '@aztec/aztec.js';
 import { Fr } from '@aztec/foundation/fields';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
 import { getSchnorrAccount, getSchnorrAccountContractAddress } from '../schnorr/index.js';
@@ -24,19 +24,22 @@ import { getSchnorrAccount, getSchnorrAccountContractAddress } from '../schnorr/
  */ export async function deployFundedSchnorrAccount(pxe, account, opts = {
     interval: 0.1,
     skipClassRegistration: false
-}) {
+}, waitForProvenOptions) {
     const signingKey = account.signingKey ?? deriveSigningKey(account.secret);
     const accountManager = await getSchnorrAccount(pxe, account.secret, signingKey, account.salt);
     // Pay the fee by the account itself.
     // This only works when the world state is prefilled with the balance for the account in test environment.
     const paymentMethod = new FeeJuicePaymentMethod(accountManager.getAddress());
-    await accountManager.deploy({
+    const receipt = await accountManager.deploy({
         skipClassRegistration: opts.skipClassRegistration,
         skipPublicDeployment: true,
         fee: {
             paymentMethod
         }
     }).wait(opts);
+    if (waitForProvenOptions !== undefined) {
+        await waitForProven(pxe, receipt, waitForProvenOptions);
+    }
     return accountManager;
 }
 /**
@@ -45,14 +48,14 @@ import { getSchnorrAccount, getSchnorrAccountContractAddress } from '../schnorr/
  */ export async function deployFundedSchnorrAccounts(pxe, accounts, opts = {
     interval: 0.1,
     skipClassRegistration: false
-}) {
+}, waitForProvenOptions) {
     const accountManagers = [];
     // Serial due to https://github.com/AztecProtocol/aztec-packages/issues/12045
     for(let i = 0; i < accounts.length; i++){
         accountManagers.push(await deployFundedSchnorrAccount(pxe, accounts[i], {
             ...opts,
             skipClassRegistration: i !== 0 || opts.skipClassRegistration
-        }));
+        }, waitForProvenOptions));
     }
     return accountManagers;
 }

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.81.0",
+  "version": "0.82.0",
   "type": "module",
   "exports": {
     "./dapp": "./dest/dapp/index.js",
@@ -77,11 +77,11 @@
     ]
   },
   "dependencies": {
-    "@aztec/aztec.js": "0.81.0",
-    "@aztec/entrypoints": "0.81.0",
-    "@aztec/ethereum": "0.81.0",
-    "@aztec/foundation": "0.81.0",
-    "@aztec/stdlib": "0.81.0",
+    "@aztec/aztec.js": "0.82.0",
+    "@aztec/entrypoints": "0.82.0",
+    "@aztec/ethereum": "0.82.0",
+    "@aztec/foundation": "0.82.0",
+    "@aztec/stdlib": "0.82.0",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

package/src/defaults/account_interface.ts

@@ -1,6 +1,7 @@
 import type { AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account';
-import type { EntrypointInterface, ExecutionRequestInit } from '@aztec/aztec.js/entrypoint';
 import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
+import type { EntrypointInterface, FeeOptions, TxExecutionOptions } 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';
@@ -33,8 +34,12 @@ export class DefaultAccountInterface implements AccountInterface {
     this.version = new Fr(nodeInfo.protocolVersion);
   }
 
-  createTxExecutionRequest(execution: ExecutionRequestInit): Promise<TxExecutionRequest> {
-    return this.entrypoint.createTxExecutionRequest(execution);
+  createTxExecutionRequest(
+    exec: ExecutionPayload,
+    fee: FeeOptions,
+    options: TxExecutionOptions,
+  ): Promise<TxExecutionRequest> {
+    return this.entrypoint.createTxExecutionRequest(exec, fee, options);
   }
 
   createAuthWit(messageHash: Fr): Promise<AuthWitness> {

package/src/testing/create_account.ts

@@ -1,4 +1,11 @@
-import { type AccountManager, FeeJuicePaymentMethod, type PXE, type WaitOpts } from '@aztec/aztec.js';
+import {
+  type AccountManager,
+  FeeJuicePaymentMethod,
+  type PXE,
+  type WaitForProvenOpts,
+  type WaitOpts,
+  waitForProven,
+} from '@aztec/aztec.js';
 import { Fr } from '@aztec/foundation/fields';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
 
@@ -46,6 +53,7 @@ export async function deployFundedSchnorrAccount(
      */
     skipClassRegistration?: boolean;
   } = { interval: 0.1, skipClassRegistration: false },
+  waitForProvenOptions?: WaitForProvenOpts,
 ): Promise<AccountManager> {
   const signingKey = account.signingKey ?? deriveSigningKey(account.secret);
   const accountManager = await getSchnorrAccount(pxe, account.secret, signingKey, account.salt);
@@ -54,7 +62,7 @@ export async function deployFundedSchnorrAccount(
   // This only works when the world state is prefilled with the balance for the account in test environment.
   const paymentMethod = new FeeJuicePaymentMethod(accountManager.getAddress());
 
-  await accountManager
+  const receipt = await accountManager
     .deploy({
       skipClassRegistration: opts.skipClassRegistration,
       skipPublicDeployment: true,
@@ -62,6 +70,10 @@ export async function deployFundedSchnorrAccount(
     })
     .wait(opts);
 
+  if (waitForProvenOptions !== undefined) {
+    await waitForProven(pxe, receipt, waitForProvenOptions);
+  }
+
   return accountManager;
 }
 
@@ -78,15 +90,21 @@ export async function deployFundedSchnorrAccounts(
      */
     skipClassRegistration?: boolean;
   } = { interval: 0.1, skipClassRegistration: false },
+  waitForProvenOptions?: WaitForProvenOpts,
 ): Promise<AccountManager[]> {
   const accountManagers: AccountManager[] = [];
   // Serial due to https://github.com/AztecProtocol/aztec-packages/issues/12045
   for (let i = 0; i < accounts.length; i++) {
     accountManagers.push(
-      await deployFundedSchnorrAccount(pxe, accounts[i], {
-        ...opts,
-        skipClassRegistration: i !== 0 || opts.skipClassRegistration, // Register the contract class at most once.
-      }),
+      await deployFundedSchnorrAccount(
+        pxe,
+        accounts[i],
+        {
+          ...opts,
+          skipClassRegistration: i !== 0 || opts.skipClassRegistration, // Register the contract class at most once.
+        },
+        waitForProvenOptions,
+      ),
     );
   }
   return accountManagers;