@aztec/aztec.js 0.0.1-commit.96bb3f7 → 0.0.1-commit.96dac018d

package/dest/wallet/deploy_account_method.d.ts

@@ -3,21 +3,48 @@ import type { ContractArtifact, FunctionArtifact } from '@aztec/stdlib/abi';
 import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import type { PublicKeys } from '@aztec/stdlib/keys';
 import { ExecutionPayload } from '@aztec/stdlib/tx';
+import type { Account } from '../account/account.js';
 import type { Contract } from '../contract/contract.js';
 import type { ContractBase } from '../contract/contract_base.js';
-import { DeployMethod, type DeployOptions, type RequestDeployOptions, type SimulateDeployOptions } from '../contract/deploy_method.js';
-import type { Wallet } from './index.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 { ProfileOptions, SendOptions, SimulateOptions, Wallet } from './index.js';
+/**
+ * Extended fee payment method option for account deployments that includes entrypoint wrapping options
+ */
+export type DeployAccountFeePaymentMethodOption = FeePaymentMethodOption & {
+    /** Optional entrypoint-specific options for wrapping execution payloads */
+    feeEntrypointOptions?: unknown;
+};
 /**
  * The configuration options for the request method. Omits the contractAddressSalt, since
  * for account contracts that is fixed in the constructor
  */
-export type RequestDeployAccountOptions = Omit<RequestDeployOptions, 'contractAddressSalt'>;
+export type RequestDeployAccountOptions = Omit<RequestDeployOptions, 'contractAddressSalt' | 'fee'> & {
+    /** Fee options specific to account deployment */
+    fee?: DeployAccountFeePaymentMethodOption;
+};
+/**
+ * Base configuration options for the send/prove methods without wait parameter. Omits:
+ * - The contractAddressSalt, since for account contracts that is fixed in the constructor.
+ * - UniversalDeployment flag, since account contracts are always deployed with it set to true
+ */
+export type DeployAccountOptionsWithoutWait = Omit<DeployOptionsWithoutWait, 'contractAddressSalt' | 'universalDeploy'>;
 /**
  * The configuration options for the send/prove methods. Omits:
  * - The contractAddressSalt, since for account contracts that is fixed in the constructor.
  * - UniversalDeployment flag, since account contracts are always deployed with it set to true
  */
-export type DeployAccountOptions = Omit<DeployOptions, 'contractAddressSalt' | 'universalDeploy'>;
+export type DeployAccountOptions<W extends InteractionWaitOptions = undefined> = DeployAccountOptionsWithoutWait & {
+    /**
+     * Whether to wait for the transaction to be mined.
+     * - undefined (default): wait with default options and return TxReceipt
+     * - WaitOpts object: wait with custom options and return TxReceipt
+     * - false: return txHash immediately without waiting
+     */
+    wait?: W;
+};
 /**
  * The configuration options for the simulate method. Omits the contractAddressSalt, since
  * for account contracts that is fixed in the constructor
@@ -29,7 +56,8 @@ export type SimulateDeployAccountOptions = Omit<SimulateDeployOptions, 'contract
  */
 export declare class DeployAccountMethod<TContract extends ContractBase = Contract> extends DeployMethod<TContract> {
     private salt;
-    constructor(publicKeys: PublicKeys, wallet: Wallet, artifact: ContractArtifact, postDeployCtor: (instance: ContractInstanceWithAddress, wallet: Wallet) => TContract, salt: Fr, args?: any[], constructorNameOrArtifact?: string | FunctionArtifact);
+    private account;
+    constructor(publicKeys: PublicKeys, wallet: Wallet, artifact: ContractArtifact, postDeployCtor: (instance: ContractInstanceWithAddress, wallet: Wallet) => TContract, salt: Fr, account: Account, args?: any[], constructorNameOrArtifact?: string | FunctionArtifact);
     /**
      * Returns a FeePaymentMethod that routes the original one provided as an argument
      * through the account's entrypoint. This allows an account contract to pay
@@ -38,6 +66,7 @@ export declare class DeployAccountMethod<TContract extends ContractBase = Contra
      * For more details on how the fee payment routing works see documentation of AccountEntrypointMetaPaymentMethod class.
      *
      * @param originalPaymentMethod - originalPaymentMethod The original payment method to be wrapped.
+     * @param feeEntrypointOptions - Optional entrypoint-specific options for wrapping. If not provided, will be auto-computed based on the payment method.
      * @returns A FeePaymentMethod that routes the original one through the account's entrypoint (AccountEntrypointMetaPaymentMethod)
      */
     private getSelfFeePaymentMethod;
@@ -47,6 +76,16 @@ export declare class DeployAccountMethod<TContract extends ContractBase = Contra
      * @returns The execution payload for this operation
      */
     request(opts?: RequestDeployAccountOptions): Promise<ExecutionPayload>;
-    convertDeployOptionsToRequestOptions(options: DeployOptions): RequestDeployOptions;
+    convertDeployOptionsToRequestOptions(options: DeployAccountOptionsWithoutWait): RequestDeployOptions;
+    protected convertDeployOptionsToSendOptions<W extends DeployInteractionWaitOptions>(options: DeployOptions<W>): SendOptions<W extends {
+        returnReceipt: true;
+    } ? WaitOpts : W>;
+    protected convertDeployOptionsToSimulateOptions(options: SimulateDeployOptions): SimulateOptions;
+    protected convertDeployOptionsToProfileOptions(options: DeployOptionsWithoutWait & ProfileInteractionOptions): ProfileOptions;
+    /**
+     * 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.
+     */
+    private injectContractAddressIntoScopes;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X2FjY291bnRfbWV0aG9kLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FsbGV0L2RlcGxveV9hY2NvdW50X21ldGhvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUU1RSxPQUFPLEtBQUssRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzFFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3JELE9BQU8sRUFBRSxnQkFBZ0IsRUFBMEIsTUFBTSxrQkFBa0IsQ0FBQztBQUU1RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN4RCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUNqRSxPQUFPLEVBQ0wsWUFBWSxFQUNaLEtBQUssYUFBYSxFQUNsQixLQUFLLG9CQUFvQixFQUN6QixLQUFLLHFCQUFxQixFQUMzQixNQUFNLDhCQUE4QixDQUFDO0FBR3RDLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLFlBQVksQ0FBQztBQUV6Qzs7O0dBR0c7QUFDSCxNQUFNLE1BQU0sMkJBQTJCLEdBQUcsSUFBSSxDQUFDLG9CQUFvQixFQUFFLHFCQUFxQixDQUFDLENBQUM7QUFFNUY7Ozs7R0FJRztBQUNILE1BQU0sTUFBTSxvQkFBb0IsR0FBRyxJQUFJLENBQUMsYUFBYSxFQUFFLHFCQUFxQixHQUFHLGlCQUFpQixDQUFDLENBQUM7QUFFbEc7OztHQUdHO0FBQ0gsTUFBTSxNQUFNLDRCQUE0QixHQUFHLElBQUksQ0FBQyxxQkFBcUIsRUFBRSxxQkFBcUIsQ0FBQyxDQUFDO0FBRTlGOzs7R0FHRztBQUNILHFCQUFhLG1CQUFtQixDQUFDLFNBQVMsU0FBUyxZQUFZLEdBQUcsUUFBUSxDQUFFLFNBQVEsWUFBWSxDQUFDLFNBQVMsQ0FBQztJQU12RyxPQUFPLENBQUMsSUFBSTtJQUxkLFlBQ0UsVUFBVSxFQUFFLFVBQVUsRUFDdEIsTUFBTSxFQUFFLE1BQU0sRUFDZCxRQUFRLEVBQUUsZ0JBQWdCLEVBQzFCLGNBQWMsRUFBRSxDQUFDLFFBQVEsRUFBRSwyQkFBMkIsRUFBRSxNQUFNLEVBQUUsTUFBTSxLQUFLLFNBQVMsRUFDNUUsSUFBSSxFQUFFLEVBQUUsRUFDaEIsSUFBSSxHQUFFLEdBQUcsRUFBTyxFQUNoQix5QkFBeUIsQ0FBQyxFQUFFLE1BQU0sR0FBRyxnQkFBZ0IsRUFHdEQ7SUFFRDs7Ozs7Ozs7O09BU0c7SUFDSCxPQUFPLENBQUMsdUJBQXVCO0lBYS9COzs7O09BSUc7SUFDbUIsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLDJCQUEyQixHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQThCM0Y7SUFFUSxvQ0FBb0MsQ0FBQyxPQUFPLEVBQUUsYUFBYSxHQUFHLG9CQUFvQixDQVMxRjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X2FjY291bnRfbWV0aG9kLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd2FsbGV0L2RlcGxveV9hY2NvdW50X21ldGhvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUU1RSxPQUFPLEtBQUssRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzFFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3JELE9BQU8sRUFBRSxnQkFBZ0IsRUFBMEIsTUFBTSxrQkFBa0IsQ0FBQztBQUU1RSxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN4RCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUNqRSxPQUFPLEVBQ0wsS0FBSyw0QkFBNEIsRUFDakMsWUFBWSxFQUNaLEtBQUssYUFBYSxFQUNsQixLQUFLLHdCQUF3QixFQUM3QixLQUFLLG9CQUFvQixFQUN6QixLQUFLLHFCQUFxQixFQUMzQixNQUFNLDhCQUE4QixDQUFDO0FBQ3RDLE9BQU8sS0FBSyxFQUNWLHNCQUFzQixFQUN0QixzQkFBc0IsRUFDdEIseUJBQXlCLEVBQzFCLE1BQU0sb0NBQW9DLENBQUM7QUFDNUMsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFHekQsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLFdBQVcsRUFBRSxlQUFlLEVBQUUsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRXZGOztHQUVHO0FBQ0gsTUFBTSxNQUFNLG1DQUFtQyxHQUFHLHNCQUFzQixHQUFHO0lBQ3pFLDJFQUEyRTtJQUMzRSxvQkFBb0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztDQUNoQyxDQUFDO0FBRUY7OztHQUdHO0FBQ0gsTUFBTSxNQUFNLDJCQUEyQixHQUFHLElBQUksQ0FBQyxvQkFBb0IsRUFBRSxxQkFBcUIsR0FBRyxLQUFLLENBQUMsR0FBRztJQUNwRyxpREFBaUQ7SUFDakQsR0FBRyxDQUFDLEVBQUUsbUNBQW1DLENBQUM7Q0FDM0MsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCxNQUFNLE1BQU0sK0JBQStCLEdBQUcsSUFBSSxDQUFDLHdCQUF3QixFQUFFLHFCQUFxQixHQUFHLGlCQUFpQixDQUFDLENBQUM7QUFFeEg7Ozs7R0FJRztBQUNILE1BQU0sTUFBTSxvQkFBb0IsQ0FBQyxDQUFDLFNBQVMsc0JBQXNCLEdBQUcsU0FBUyxJQUFJLCtCQUErQixHQUFHO0lBQ2pIOzs7OztPQUtHO0lBQ0gsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0NBQ1YsQ0FBQztBQUVGOzs7R0FHRztBQUNILE1BQU0sTUFBTSw0QkFBNEIsR0FBRyxJQUFJLENBQUMscUJBQXFCLEVBQUUscUJBQXFCLENBQUMsQ0FBQztBQUU5Rjs7O0dBR0c7QUFDSCxxQkFBYSxtQkFBbUIsQ0FBQyxTQUFTLFNBQVMsWUFBWSxHQUFHLFFBQVEsQ0FBRSxTQUFRLFlBQVksQ0FBQyxTQUFTLENBQUM7SUFNdkcsT0FBTyxDQUFDLElBQUk7SUFDWixPQUFPLENBQUMsT0FBTztJQU5qQixZQUNFLFVBQVUsRUFBRSxVQUFVLEVBQ3RCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsUUFBUSxFQUFFLGdCQUFnQixFQUMxQixjQUFjLEVBQUUsQ0FBQyxRQUFRLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxFQUFFLE1BQU0sS0FBSyxTQUFTLEVBQzVFLElBQUksRUFBRSxFQUFFLEVBQ1IsT0FBTyxFQUFFLE9BQU8sRUFDeEIsSUFBSSxHQUFFLEdBQUcsRUFBTyxFQUNoQix5QkFBeUIsQ0FBQyxFQUFFLE1BQU0sR0FBRyxnQkFBZ0IsRUFHdEQ7SUFFRDs7Ozs7Ozs7OztPQVVHO0lBQ0gsT0FBTyxDQUFDLHVCQUF1QjtJQU8vQjs7OztPQUlHO0lBQ21CLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSwyQkFBMkIsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0E4QjNGO0lBRVEsb0NBQW9DLENBQUMsT0FBTyxFQUFFLCtCQUErQixHQUFHLG9CQUFvQixDQVM1RztJQUVELFVBQW1CLGlDQUFpQyxDQUFDLENBQUMsU0FBUyw0QkFBNEIsRUFDekYsT0FBTyxFQUFFLGFBQWEsQ0FBQyxDQUFDLENBQUMsR0FFeEIsV0FBVyxDQUFDLENBQUMsU0FBUztRQUFFLGFBQWEsRUFBRSxJQUFJLENBQUE7S0FBRSxHQUFHLFFBQVEsR0FBRyxDQUFDLENBQUMsQ0FFL0Q7SUFFRCxVQUFtQixxQ0FBcUMsQ0FBQyxPQUFPLEVBQUUscUJBQXFCLEdBQUcsZUFBZSxDQUV4RztJQUVELFVBQW1CLG9DQUFvQyxDQUNyRCxPQUFPLEVBQUUsd0JBQXdCLEdBQUcseUJBQXlCLEdBQzVELGNBQWMsQ0FFaEI7SUFFRDs7O09BR0c7SUFFSCxPQUFPLENBQUMsK0JBQStCO0NBT3hDIn0=

package/dest/wallet/deploy_account_method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy_account_method.d.ts","sourceRoot":"","sources":["../../src/wallet/deploy_account_method.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE5E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAA0B,MAAM,kBAAkB,CAAC;AAE5E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EACL,YAAY,EACZ,KAAK,aAAa,EAClB,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC3B,MAAM,8BAA8B,CAAC;AAGtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC;;;GAGG;AACH,MAAM,MAAM,2BAA2B,GAAG,IAAI,CAAC,oBAAoB,EAAE,qBAAqB,CAAC,CAAC;AAE5F;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,aAAa,EAAE,qBAAqB,GAAG,iBAAiB,CAAC,CAAC;AAElG;;;GAGG;AACH,MAAM,MAAM,4BAA4B,GAAG,IAAI,CAAC,qBAAqB,EAAE,qBAAqB,CAAC,CAAC;AAE9F;;;GAGG;AACH,qBAAa,mBAAmB,CAAC,SAAS,SAAS,YAAY,GAAG,QAAQ,CAAE,SAAQ,YAAY,CAAC,SAAS,CAAC;IAMvG,OAAO,CAAC,IAAI;IALd,YACE,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,cAAc,EAAE,CAAC,QAAQ,EAAE,2BAA2B,EAAE,MAAM,EAAE,MAAM,KAAK,SAAS,EAC5E,IAAI,EAAE,EAAE,EAChB,IAAI,GAAE,GAAG,EAAO,EAChB,yBAAyB,CAAC,EAAE,MAAM,GAAG,gBAAgB,EAGtD;IAED;;;;;;;;;OASG;IACH,OAAO,CAAC,uBAAuB;IAa/B;;;;OAIG;IACmB,OAAO,CAAC,IAAI,CAAC,EAAE,2BAA2B,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA8B3F;IAEQ,oCAAoC,CAAC,OAAO,EAAE,aAAa,GAAG,oBAAoB,CAS1F;CACF"}
+{"version":3,"file":"deploy_account_method.d.ts","sourceRoot":"","sources":["../../src/wallet/deploy_account_method.ts"],"names":[],"mappings":"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"}

package/dest/wallet/deploy_account_method.js

@@ -8,8 +8,9 @@ import { AccountEntrypointMetaPaymentMethod } from './account_entrypoint_meta_pa
  * contracts that can pay for their own fee, plus some preconfigured options to avoid errors.
  */ export class DeployAccountMethod extends DeployMethod {
     salt;
-    constructor(publicKeys, wallet, artifact, postDeployCtor, salt, args = [], constructorNameOrArtifact){
-        super(publicKeys, wallet, artifact, postDeployCtor, args, constructorNameOrArtifact), this.salt = salt;
+    account;
+    constructor(publicKeys, wallet, artifact, postDeployCtor, salt, account, args = [], constructorNameOrArtifact){
+        super(publicKeys, wallet, artifact, postDeployCtor, args, constructorNameOrArtifact), this.salt = salt, this.account = account;
     }
     /**
    * Returns a FeePaymentMethod that routes the original one provided as an argument
@@ -19,12 +20,13 @@ import { AccountEntrypointMetaPaymentMethod } from './account_entrypoint_meta_pa
    * For more details on how the fee payment routing works see documentation of AccountEntrypointMetaPaymentMethod class.
    *
    * @param originalPaymentMethod - originalPaymentMethod The original payment method to be wrapped.
+   * @param feeEntrypointOptions - Optional entrypoint-specific options for wrapping. If not provided, will be auto-computed based on the payment method.
    * @returns A FeePaymentMethod that routes the original one through the account's entrypoint (AccountEntrypointMetaPaymentMethod)
-   */ getSelfFeePaymentMethod(originalPaymentMethod) {
+   */ getSelfFeePaymentMethod(originalPaymentMethod, feeEntrypointOptions) {
         if (!this.address) {
             throw new Error('Instance is not yet constructed. This is a bug!');
         }
-        return new AccountEntrypointMetaPaymentMethod(this.wallet, this.artifact, 'entrypoint', this.address, originalPaymentMethod);
+        return new AccountEntrypointMetaPaymentMethod(this.account, originalPaymentMethod, feeEntrypointOptions);
     }
     /**
    * Returns the execution payload that allows this operation to happen on chain.
@@ -51,7 +53,7 @@ import { AccountEntrypointMetaPaymentMethod } from './account_entrypoint_meta_pa
         ];
         // If this is a self-deployment, manage the fee accordingly
         if (opts?.deployer?.equals(AztecAddress.ZERO)) {
-            const feePaymentMethod = this.getSelfFeePaymentMethod(opts?.fee?.paymentMethod);
+            const feePaymentMethod = this.getSelfFeePaymentMethod(opts?.fee?.paymentMethod, opts?.fee?.feeEntrypointOptions);
             const feeExecutionPayload = await feePaymentMethod.getExecutionPayload();
             // Notice they are reversed (fee payment usually goes first):
             // this is because we need to construct the contract BEFORE it can pay for its own fee
@@ -74,4 +76,30 @@ import { AccountEntrypointMetaPaymentMethod } from './account_entrypoint_meta_pa
             deployer: options.from
         };
     }
+    convertDeployOptionsToSendOptions(options) {
+        return super.convertDeployOptionsToSendOptions(this.injectContractAddressIntoScopes(options));
+    }
+    convertDeployOptionsToSimulateOptions(options) {
+        return super.convertDeployOptionsToSimulateOptions(this.injectContractAddressIntoScopes(options));
+    }
+    convertDeployOptionsToProfileOptions(options) {
+        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
+    injectContractAddressIntoScopes(options) {
+        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/dest/wallet/index.d.ts

@@ -1,3 +1,4 @@
 export * from './wallet.js';
 export * from './account_manager.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy93YWxsZXQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxzQkFBc0IsQ0FBQyJ9
+export * from './capabilities.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy93YWxsZXQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLG1CQUFtQixDQUFDIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/wallet/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/wallet/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC"}

package/dest/wallet/index.js

@@ -1,2 +1,3 @@
 export * from './wallet.js';
 export * from './account_manager.js';
+export * from './capabilities.js';