@aztec/aztec.js 0.0.1-commit.96dac018d → 0.0.1-commit.993d52e

package/src/wallet/deploy_account_method.ts

@@ -9,22 +9,15 @@ import type { Account } from '../account/account.js';
 import type { Contract } from '../contract/contract.js';
 import type { ContractBase } from '../contract/contract_base.js';
 import {
-  type DeployInteractionWaitOptions,
   DeployMethod,
-  type DeployOptions,
   type DeployOptionsWithoutWait,
   type RequestDeployOptions,
   type SimulateDeployOptions,
 } from '../contract/deploy_method.js';
-import type {
-  FeePaymentMethodOption,
-  InteractionWaitOptions,
-  ProfileInteractionOptions,
-} from '../contract/interaction_options.js';
-import type { WaitOpts } from '../contract/wait_opts.js';
+import type { FeePaymentMethodOption, InteractionWaitOptions } from '../contract/interaction_options.js';
 import type { FeePaymentMethod } from '../fee/fee_payment_method.js';
 import { AccountEntrypointMetaPaymentMethod } from './account_entrypoint_meta_payment_method.js';
-import type { ProfileOptions, SendOptions, SimulateOptions, Wallet } from './index.js';
+import type { Wallet } from './index.js';
 
 /**
  * Extended fee payment method option for account deployments that includes entrypoint wrapping options
@@ -154,34 +147,4 @@ export class DeployAccountMethod<TContract extends ContractBase = Contract> exte
       deployer: options.from,
     };
   }
-
-  protected override convertDeployOptionsToSendOptions<W extends DeployInteractionWaitOptions>(
-    options: DeployOptions<W>,
-    // eslint-disable-next-line jsdoc/require-jsdoc
-  ): SendOptions<W extends { returnReceipt: true } ? WaitOpts : W> {
-    return super.convertDeployOptionsToSendOptions(this.injectContractAddressIntoScopes(options));
-  }
-
-  protected override convertDeployOptionsToSimulateOptions(options: SimulateDeployOptions): SimulateOptions {
-    return super.convertDeployOptionsToSimulateOptions(this.injectContractAddressIntoScopes(options));
-  }
-
-  protected override convertDeployOptionsToProfileOptions(
-    options: DeployOptionsWithoutWait & ProfileInteractionOptions,
-  ): ProfileOptions {
-    return super.convertDeployOptionsToProfileOptions(this.injectContractAddressIntoScopes(options));
-  }
-
-  /**
-   * Injects the contract's own address into scopes so the constructor can access its own keys.
-   * @param options - The deploy options to augment with the contract address.
-   */
-  // eslint-disable-next-line jsdoc/require-jsdoc
-  private injectContractAddressIntoScopes<T extends { additionalScopes?: AztecAddress[] }>(options: T): T {
-    if (!this.address) {
-      throw new Error('Instance not yet constructed. This is a bug!');
-    }
-    const existing = options.additionalScopes ?? [];
-    return { ...options, additionalScopes: [...existing, this.address] };
-  }
 }

package/src/wallet/wallet.ts

@@ -303,7 +303,6 @@ export const SendOptionsSchema = z.object({
   capsules: optional(z.array(Capsule.schema)),
   fee: optional(GasSettingsOptionSchema),
   wait: optional(z.union([z.literal(NO_WAIT), WaitOptsSchema])),
-  additionalScopes: optional(z.array(schemas.AztecAddress)),
 });
 
 export const SimulateOptionsSchema = z.object({
@@ -314,7 +313,6 @@ export const SimulateOptionsSchema = z.object({
   skipTxValidation: optional(z.boolean()),
   skipFeeEnforcement: optional(z.boolean()),
   includeMetadata: optional(z.boolean()),
-  additionalScopes: optional(z.array(schemas.AztecAddress)),
 });
 
 export const ProfileOptionsSchema = SimulateOptionsSchema.extend({
@@ -381,7 +379,6 @@ export const ContractClassMetadataSchema = z.object({
 export const ContractFunctionPatternSchema = z.object({
   contract: z.union([schemas.AztecAddress, z.literal('*')]),
   function: z.union([z.string(), z.literal('*')]),
-  additionalScopes: optional(z.union([z.array(schemas.AztecAddress), z.literal('*')])),
 });
 
 export const AccountsCapabilitySchema = z.object({