@wonderland/aztec-fee-payment 4.2.0 → 5.0.0-rc.2

package/README.md

@@ -29,7 +29,7 @@ A Fee Payment Contract (FPC) for Aztec that enables private transaction fee spon
 
 ### Prerequisites
 
-- [Aztec CLI](https://docs.aztec.network/getting_started) v4.2.0
+- [Aztec CLI](https://docs.aztec.network/getting_started) v5.0.0-rc.2
 - Node.js 22+
 - Yarn 1.22+
 

package/dist/src/artifacts/Counter.d.ts

@@ -1,7 +1,6 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { type AztecAddressLike, type ContractArtifact, type FieldLike, type OptionLike } from '@aztec/aztec.js/abi';
-import { ContractBase, ContractFunctionInteraction, type ContractMethod, type ContractStorageLayout, DeployMethod } from '@aztec/aztec.js/contracts';
-import { PublicKeys } from '@aztec/aztec.js/keys';
+import { ContractBase, ContractFunctionInteraction, type ContractMethod, type ContractStorageLayout, type DeployInstantiationOptions, DeployMethod } from '@aztec/aztec.js/contracts';
 import type { Wallet } from '@aztec/aztec.js/wallet';
 export declare const CounterContractArtifact: ContractArtifact;
 /**
@@ -18,19 +17,17 @@ export declare class CounterContract extends ContractBase {
     static at(address: AztecAddress, wallet: Wallet): CounterContract;
     /**
      * Creates a tx to deploy a new instance of this contract.
+     * @param instantiation - Optional address-affecting parameters (salt, deployer / universalDeploy, publicKeys).
+     *                       Salt defaults to a random value; the deployer is locked lazily from the first send-time `from`.
      */
-    static deploy(wallet: Wallet): DeployMethod<CounterContract>;
-    /**
-     * Creates a tx to deploy a new instance of this contract using the specified public keys hash to derive the address.
-     */
-    static deployWithPublicKeys(publicKeys: PublicKeys, wallet: Wallet): DeployMethod<CounterContract>;
+    static deploy(wallet: Wallet, instantiation?: DeployInstantiationOptions): DeployMethod<CounterContract>;
     /**
      * Creates a tx to deploy a new instance of this contract using the specified constructor method.
      */
     static deployWithOpts<M extends keyof CounterContract['methods']>(opts: {
-        publicKeys?: PublicKeys;
         method?: M;
         wallet: Wallet;
+        instantiation?: DeployInstantiationOptions;
     }, ...args: Parameters<CounterContract['methods'][M]>): DeployMethod<CounterContract>;
     /**
      * Returns this contract's artifact.

package/dist/src/artifacts/Counter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Counter.d.ts","sourceRoot":"","sources":["../../../src/artifacts/Counter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAmB,MAAM,2BAA2B,CAAC;AAC1E,OAAO,EAAgB,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAqD,KAAK,SAAS,EAA6G,KAAK,UAAU,EAAwC,MAAM,qBAAqB,CAAC;AACtU,OAAO,EAAY,YAAY,EAAE,2BAA2B,EAAE,KAAK,cAAc,EAAE,KAAK,qBAAqB,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAG/J,OAAO,EAAkB,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,eAAO,MAAM,uBAAuB,kBAA4E,CAAC;AAIjH;;GAEG;AACH,qBAAa,eAAgB,SAAQ,YAAY;IAE/C,OAAO;IASP;;;;;OAKG;WACW,EAAE,CACd,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,MAAM,GACb,eAAe;IAKlB;;OAEG;WACW,MAAM,CAAC,MAAM,EAAE,MAAM;IAInC;;OAEG;WACW,oBAAoB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM;IAIzE;;OAEG;WACW,cAAc,CAAC,CAAC,SAAS,MAAM,eAAe,CAAC,SAAS,CAAC,EACrE,IAAI,EAAE;QAAE,UAAU,CAAC,EAAE,UAAU,CAAC;QAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAC7D,GAAG,IAAI,EAAE,UAAU,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAcpD;;OAEG;IACH,WAAkB,QAAQ,IAAI,gBAAgB,CAE7C;IAED;;OAEG;IACH,WAAkB,iBAAiB,IAAI,gBAAgB,CAEtD;IAGD,WAAkB,OAAO,IAAI,qBAAqB,CAAC,SAAS,CAAC,CAM1D;IAGH,yEAAyE;IAC1D,OAAO,EAAE;QAEtB,oBAAoB;QACpB,WAAW,EAAE,CAAC,MAAM,2BAA2B,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAEpF,kBAAkB;QAClB,SAAS,EAAE,CAAC,MAAM,2BAA2B,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAElF,yCAAyC;QACzC,gBAAgB,EAAE,CAAC,CAAC,QAAQ,EAAE;YAAE,UAAU,EAAE,SAAS,EAAE,CAAC;YAAC,SAAS,EAAE,gBAAgB,CAAC;YAAC,OAAO,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;YAAC,sBAAsB,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,CAAA;SAAE,EAAE,KAAK,2BAA2B,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAExO,uCAAuC;QACvC,eAAe,EAAE,CAAC,CAAC,QAAQ,EAAE,SAAS,KAAK,2BAA2B,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAE3G,gCAAgC;QAChC,UAAU,EAAE,CAAC,CAAC,KAAK,EAAE,gBAAgB,KAAK,2BAA2B,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;KAC3G,CAAC;CAGH"}
+{"version":3,"file":"Counter.d.ts","sourceRoot":"","sources":["../../../src/artifacts/Counter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAmB,MAAM,2BAA2B,CAAC;AAC1E,OAAO,EAAgB,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAqD,KAAK,SAAS,EAA6G,KAAK,UAAU,EAAwC,MAAM,qBAAqB,CAAC;AACtU,OAAO,EAAY,YAAY,EAAE,2BAA2B,EAAE,KAAK,cAAc,EAAE,KAAK,qBAAqB,EAAE,KAAK,0BAA0B,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAIhM,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,eAAO,MAAM,uBAAuB,kBAA4E,CAAC;AAIjH;;GAEG;AACH,qBAAa,eAAgB,SAAQ,YAAY;IAE/C,OAAO;IASP;;;;;OAKG;WACW,EAAE,CACd,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,MAAM,GACb,eAAe;IAKlB;;;;OAIG;WACW,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,0BAA0B;IAY/E;;OAEG;WACW,cAAc,CAAC,CAAC,SAAS,MAAM,eAAe,CAAC,SAAS,CAAC,EACrE,IAAI,EAAE;QAAE,MAAM,CAAC,EAAE,CAAC,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,0BAA0B,CAAA;KAAE,EAChF,GAAG,IAAI,EAAE,UAAU,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAgBpD;;OAEG;IACH,WAAkB,QAAQ,IAAI,gBAAgB,CAE7C;IAED;;OAEG;IACH,WAAkB,iBAAiB,IAAI,gBAAgB,CAEtD;IAGD,WAAkB,OAAO,IAAI,qBAAqB,CAAC,SAAS,CAAC,CAM1D;IAGH,yEAAyE;IAC1D,OAAO,EAAE;QAEtB,oBAAoB;QACpB,WAAW,EAAE,CAAC,MAAM,2BAA2B,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAEpF,kBAAkB;QAClB,SAAS,EAAE,CAAC,MAAM,2BAA2B,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAElF,yCAAyC;QACzC,gBAAgB,EAAE,CAAC,CAAC,QAAQ,EAAE;YAAE,UAAU,EAAE,SAAS,EAAE,CAAC;YAAC,SAAS,EAAE,gBAAgB,CAAC;YAAC,OAAO,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;YAAC,sBAAsB,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,CAAA;SAAE,EAAE,KAAK,2BAA2B,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAExO,uCAAuC;QACvC,eAAe,EAAE,CAAC,CAAC,QAAQ,EAAE,SAAS,KAAK,2BAA2B,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAE3G,gCAAgC;QAChC,UAAU,EAAE,CAAC,CAAC,KAAK,EAAE,gBAAgB,KAAK,2BAA2B,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;KAC3G,CAAC;CAGH"}

package/dist/src/artifacts/Counter.js

@@ -2,7 +2,6 @@
 import { loadContractArtifact, loadContractArtifactForPublic } from '@aztec/aztec.js/abi';
 import { Contract, ContractBase, DeployMethod } from '@aztec/aztec.js/contracts';
 import { Fr } from '@aztec/aztec.js/fields';
-import { PublicKeys } from '@aztec/aztec.js/keys';
 import CounterContractArtifactJson from '../../target/counter_contract-Counter.json' with { type: 'json' };
 export const CounterContractArtifact = loadContractArtifact(CounterContractArtifactJson);
 /**
@@ -23,21 +22,26 @@ export class CounterContract extends ContractBase {
     }
     /**
      * Creates a tx to deploy a new instance of this contract.
+     * @param instantiation - Optional address-affecting parameters (salt, deployer / universalDeploy, publicKeys).
+     *                       Salt defaults to a random value; the deployer is locked lazily from the first send-time `from`.
      */
-    static deploy(wallet) {
-        return new DeployMethod(PublicKeys.default(), wallet, CounterContractArtifact, (instance, wallet) => CounterContract.at(instance.address, wallet), Array.from(arguments).slice(1));
-    }
-    /**
-     * Creates a tx to deploy a new instance of this contract using the specified public keys hash to derive the address.
-     */
-    static deployWithPublicKeys(publicKeys, wallet) {
-        return new DeployMethod(publicKeys, wallet, CounterContractArtifact, (instance, wallet) => CounterContract.at(instance.address, wallet), Array.from(arguments).slice(2));
+    static deploy(wallet, instantiation) {
+        return DeployMethod.create(wallet, {
+            artifact: CounterContractArtifact,
+            postDeployCtor: (instance, wallet) => CounterContract.at(instance.address, wallet),
+            args: [],
+        }, instantiation);
     }
     /**
      * Creates a tx to deploy a new instance of this contract using the specified constructor method.
      */
     static deployWithOpts(opts, ...args) {
-        return new DeployMethod(opts.publicKeys ?? PublicKeys.default(), opts.wallet, CounterContractArtifact, (instance, wallet) => CounterContract.at(instance.address, wallet), Array.from(arguments).slice(1), opts.method ?? 'constructor');
+        return DeployMethod.create(opts.wallet, {
+            artifact: CounterContractArtifact,
+            postDeployCtor: (instance, wallet) => CounterContract.at(instance.address, wallet),
+            args,
+            constructorNameOrArtifact: opts.method ?? 'constructor',
+        }, opts.instantiation);
     }
     /**
      * Returns this contract's artifact.
@@ -59,4 +63,4 @@ export class CounterContract extends ContractBase {
         };
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ291bnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcnRpZmFjdHMvQ291bnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxzQ0FBc0M7QUFJdEMsT0FBTyxFQUE0SixvQkFBb0IsRUFBRSw2QkFBNkIsRUFBb0YsTUFBTSxxQkFBcUIsQ0FBQztBQUN0VSxPQUFPLEVBQUUsUUFBUSxFQUFFLFlBQVksRUFBZ0YsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFL0osT0FBTyxFQUFFLEVBQUUsRUFBUyxNQUFNLHdCQUF3QixDQUFDO0FBQ25ELE9BQU8sRUFBa0IsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFbEUsT0FBTywyQkFBMkIsTUFBTSw0Q0FBNEMsQ0FBQyxPQUFPLElBQUksRUFBRSxNQUFNLEVBQUUsQ0FBQztBQUMzRyxNQUFNLENBQUMsTUFBTSx1QkFBdUIsR0FBRyxvQkFBb0IsQ0FBQywyQkFBbUQsQ0FBQyxDQUFDO0FBSWpIOztHQUVHO0FBQ0gsTUFBTSxPQUFPLGVBQWdCLFNBQVEsWUFBWTtJQUUvQyxZQUNFLE9BQXFCLEVBQ3JCLE1BQWM7UUFFZCxLQUFLLENBQUMsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ2xELENBQUM7SUFJRDs7Ozs7T0FLRztJQUNJLE1BQU0sQ0FBQyxFQUFFLENBQ2QsT0FBcUIsRUFDckIsTUFBYztRQUVkLE9BQU8sUUFBUSxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsZUFBZSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQW9CLENBQUM7SUFDbkYsQ0FBQztJQUdEOztPQUVHO0lBQ0ksTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFjO1FBQ2pDLE9BQU8sSUFBSSxZQUFZLENBQWtCLFVBQVUsQ0FBQyxPQUFPLEVBQUUsRUFBRSxNQUFNLEVBQUUsdUJBQXVCLEVBQUUsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEVBQUUsQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLEVBQUUsS0FBSyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN0TSxDQUFDO0lBRUQ7O09BRUc7SUFDSSxNQUFNLENBQUMsb0JBQW9CLENBQUMsVUFBc0IsRUFBRSxNQUFjO1FBQ3ZFLE9BQU8sSUFBSSxZQUFZLENBQWtCLFVBQVUsRUFBRSxNQUFNLEVBQUUsdUJBQXVCLEVBQUUsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEVBQUUsQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLEVBQUUsS0FBSyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUM1TCxDQUFDO0lBRUQ7O09BRUc7SUFDSSxNQUFNLENBQUMsY0FBYyxDQUMxQixJQUE2RCxFQUM3RCxHQUFHLElBQStDO1FBRWxELE9BQU8sSUFBSSxZQUFZLENBQ3JCLElBQUksQ0FBQyxVQUFVLElBQUksVUFBVSxDQUFDLE9BQU8sRUFBRSxFQUN2QyxJQUFJLENBQUMsTUFBTSxFQUNYLHVCQUF1QixFQUN2QixDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsRUFBRSxDQUFDLGVBQWUsQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsRUFDbEUsS0FBSyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQzlCLElBQUksQ0FBQyxNQUFNLElBQUksYUFBYSxDQUM3QixDQUFDO0lBQ0osQ0FBQztJQUlEOztPQUVHO0lBQ0ksTUFBTSxLQUFLLFFBQVE7UUFDeEIsT0FBTyx1QkFBdUIsQ0FBQztJQUNqQyxDQUFDO0lBRUQ7O09BRUc7SUFDSSxNQUFNLEtBQUssaUJBQWlCO1FBQ2pDLE9BQU8sNkJBQTZCLENBQUMsMkJBQW1ELENBQUMsQ0FBQztJQUM1RixDQUFDO0lBR00sTUFBTSxLQUFLLE9BQU87UUFDckIsT0FBTztZQUNMLE9BQU8sRUFBRTtnQkFDWCxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsRUFBRSxDQUFDO2FBQ2pCO1NBQ3NDLENBQUM7SUFDeEMsQ0FBQztDQXVCSiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ291bnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcnRpZmFjdHMvQ291bnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxzQ0FBc0M7QUFJdEMsT0FBTyxFQUE0SixvQkFBb0IsRUFBRSw2QkFBNkIsRUFBb0YsTUFBTSxxQkFBcUIsQ0FBQztBQUN0VSxPQUFPLEVBQUUsUUFBUSxFQUFFLFlBQVksRUFBaUgsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFaE0sT0FBTyxFQUFFLEVBQUUsRUFBUyxNQUFNLHdCQUF3QixDQUFDO0FBR25ELE9BQU8sMkJBQTJCLE1BQU0sNENBQTRDLENBQUMsT0FBTyxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQUM7QUFDM0csTUFBTSxDQUFDLE1BQU0sdUJBQXVCLEdBQUcsb0JBQW9CLENBQUMsMkJBQW1ELENBQUMsQ0FBQztBQUlqSDs7R0FFRztBQUNILE1BQU0sT0FBTyxlQUFnQixTQUFRLFlBQVk7SUFFL0MsWUFDRSxPQUFxQixFQUNyQixNQUFjO1FBRWQsS0FBSyxDQUFDLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNsRCxDQUFDO0lBSUQ7Ozs7O09BS0c7SUFDSSxNQUFNLENBQUMsRUFBRSxDQUNkLE9BQXFCLEVBQ3JCLE1BQWM7UUFFZCxPQUFPLFFBQVEsQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLGVBQWUsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFvQixDQUFDO0lBQ25GLENBQUM7SUFHRDs7OztPQUlHO0lBQ0ksTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFjLEVBQUUsYUFBMEM7UUFDN0UsT0FBTyxZQUFZLENBQUMsTUFBTSxDQUN4QixNQUFNLEVBQ047WUFDRSxRQUFRLEVBQUUsdUJBQXVCO1lBQ2pDLGNBQWMsRUFBRSxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsRUFBRSxDQUFDLGVBQWUsQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUM7WUFDbEYsSUFBSSxFQUFFLEVBQUU7U0FDVCxFQUNELGFBQWEsQ0FDZCxDQUFDO0lBQ0osQ0FBQztJQUVEOztPQUVHO0lBQ0ksTUFBTSxDQUFDLGNBQWMsQ0FDMUIsSUFBZ0YsRUFDaEYsR0FBRyxJQUErQztRQUVsRCxPQUFPLFlBQVksQ0FBQyxNQUFNLENBQ3hCLElBQUksQ0FBQyxNQUFNLEVBQ1g7WUFDRSxRQUFRLEVBQUUsdUJBQXVCO1lBQ2pDLGNBQWMsRUFBRSxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsRUFBRSxDQUFDLGVBQWUsQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUM7WUFDbEYsSUFBSTtZQUNKLHlCQUF5QixFQUFFLElBQUksQ0FBQyxNQUFNLElBQUksYUFBYTtTQUN4RCxFQUNELElBQUksQ0FBQyxhQUFhLENBQ25CLENBQUM7SUFDSixDQUFDO0lBSUQ7O09BRUc7SUFDSSxNQUFNLEtBQUssUUFBUTtRQUN4QixPQUFPLHVCQUF1QixDQUFDO0lBQ2pDLENBQUM7SUFFRDs7T0FFRztJQUNJLE1BQU0sS0FBSyxpQkFBaUI7UUFDakMsT0FBTyw2QkFBNkIsQ0FBQywyQkFBbUQsQ0FBQyxDQUFDO0lBQzVGLENBQUM7SUFHTSxNQUFNLEtBQUssT0FBTztRQUNyQixPQUFPO1lBQ0wsT0FBTyxFQUFFO2dCQUNYLElBQUksRUFBRSxJQUFJLEVBQUUsQ0FBQyxFQUFFLENBQUM7YUFDakI7U0FDc0MsQ0FBQztJQUN4QyxDQUFDO0NBdUJKIn0=

package/dist/src/artifacts/PrivateFPC.d.ts

@@ -1,7 +1,6 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { type AztecAddressLike, type ContractArtifact, type FieldLike, type OptionLike } from '@aztec/aztec.js/abi';
-import { ContractBase, ContractFunctionInteraction, type ContractMethod, type ContractStorageLayout, DeployMethod } from '@aztec/aztec.js/contracts';
-import { PublicKeys } from '@aztec/aztec.js/keys';
+import { ContractBase, ContractFunctionInteraction, type ContractMethod, type ContractStorageLayout, type DeployInstantiationOptions, DeployMethod } from '@aztec/aztec.js/contracts';
 import type { Wallet } from '@aztec/aztec.js/wallet';
 export declare const PrivateFPCContractArtifact: ContractArtifact;
 /**
@@ -18,19 +17,17 @@ export declare class PrivateFPCContract extends ContractBase {
     static at(address: AztecAddress, wallet: Wallet): PrivateFPCContract;
     /**
      * Creates a tx to deploy a new instance of this contract.
+     * @param instantiation - Optional address-affecting parameters (salt, deployer / universalDeploy, publicKeys).
+     *                       Salt defaults to a random value; the deployer is locked lazily from the first send-time `from`.
      */
-    static deploy(wallet: Wallet): DeployMethod<PrivateFPCContract>;
-    /**
-     * Creates a tx to deploy a new instance of this contract using the specified public keys hash to derive the address.
-     */
-    static deployWithPublicKeys(publicKeys: PublicKeys, wallet: Wallet): DeployMethod<PrivateFPCContract>;
+    static deploy(wallet: Wallet, instantiation?: DeployInstantiationOptions): DeployMethod<PrivateFPCContract>;
     /**
      * Creates a tx to deploy a new instance of this contract using the specified constructor method.
      */
     static deployWithOpts<M extends keyof PrivateFPCContract['methods']>(opts: {
-        publicKeys?: PublicKeys;
         method?: M;
         wallet: Wallet;
+        instantiation?: DeployInstantiationOptions;
     }, ...args: Parameters<PrivateFPCContract['methods'][M]>): DeployMethod<PrivateFPCContract>;
     /**
      * Returns this contract's artifact.

package/dist/src/artifacts/PrivateFPC.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PrivateFPC.d.ts","sourceRoot":"","sources":["../../../src/artifacts/PrivateFPC.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PrivateFPC.d.ts","sourceRoot":"","sources":["../../../src/artifacts/PrivateFPC.ts"],"names":[],"mappings":"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"}

package/dist/src/artifacts/PrivateFPC.js

@@ -2,7 +2,6 @@
 import { loadContractArtifact, loadContractArtifactForPublic } from '@aztec/aztec.js/abi';
 import { Contract, ContractBase, DeployMethod } from '@aztec/aztec.js/contracts';
 import { Fr } from '@aztec/aztec.js/fields';
-import { PublicKeys } from '@aztec/aztec.js/keys';
 import PrivateFPCContractArtifactJson from '../../target/private_contract-PrivateFPC.json' with { type: 'json' };
 export const PrivateFPCContractArtifact = loadContractArtifact(PrivateFPCContractArtifactJson);
 /**
@@ -23,21 +22,26 @@ export class PrivateFPCContract extends ContractBase {
     }
     /**
      * Creates a tx to deploy a new instance of this contract.
+     * @param instantiation - Optional address-affecting parameters (salt, deployer / universalDeploy, publicKeys).
+     *                       Salt defaults to a random value; the deployer is locked lazily from the first send-time `from`.
      */
-    static deploy(wallet) {
-        return new DeployMethod(PublicKeys.default(), wallet, PrivateFPCContractArtifact, (instance, wallet) => PrivateFPCContract.at(instance.address, wallet), Array.from(arguments).slice(1));
-    }
-    /**
-     * Creates a tx to deploy a new instance of this contract using the specified public keys hash to derive the address.
-     */
-    static deployWithPublicKeys(publicKeys, wallet) {
-        return new DeployMethod(publicKeys, wallet, PrivateFPCContractArtifact, (instance, wallet) => PrivateFPCContract.at(instance.address, wallet), Array.from(arguments).slice(2));
+    static deploy(wallet, instantiation) {
+        return DeployMethod.create(wallet, {
+            artifact: PrivateFPCContractArtifact,
+            postDeployCtor: (instance, wallet) => PrivateFPCContract.at(instance.address, wallet),
+            args: [],
+        }, instantiation);
     }
     /**
      * Creates a tx to deploy a new instance of this contract using the specified constructor method.
      */
     static deployWithOpts(opts, ...args) {
-        return new DeployMethod(opts.publicKeys ?? PublicKeys.default(), opts.wallet, PrivateFPCContractArtifact, (instance, wallet) => PrivateFPCContract.at(instance.address, wallet), Array.from(arguments).slice(1), opts.method ?? 'constructor');
+        return DeployMethod.create(opts.wallet, {
+            artifact: PrivateFPCContractArtifact,
+            postDeployCtor: (instance, wallet) => PrivateFPCContract.at(instance.address, wallet),
+            args,
+            constructorNameOrArtifact: opts.method ?? 'constructor',
+        }, opts.instantiation);
     }
     /**
      * Returns this contract's artifact.
@@ -59,4 +63,4 @@ export class PrivateFPCContract extends ContractBase {
         };
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJpdmF0ZUZQQy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcnRpZmFjdHMvUHJpdmF0ZUZQQy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxzQ0FBc0M7QUFJdEMsT0FBTyxFQUE0SixvQkFBb0IsRUFBRSw2QkFBNkIsRUFBb0YsTUFBTSxxQkFBcUIsQ0FBQztBQUN0VSxPQUFPLEVBQUUsUUFBUSxFQUFFLFlBQVksRUFBZ0YsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFL0osT0FBTyxFQUFFLEVBQUUsRUFBUyxNQUFNLHdCQUF3QixDQUFDO0FBQ25ELE9BQU8sRUFBa0IsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFbEUsT0FBTyw4QkFBOEIsTUFBTSwrQ0FBK0MsQ0FBQyxPQUFPLElBQUksRUFBRSxNQUFNLEVBQUUsQ0FBQztBQUNqSCxNQUFNLENBQUMsTUFBTSwwQkFBMEIsR0FBRyxvQkFBb0IsQ0FBQyw4QkFBc0QsQ0FBQyxDQUFDO0FBSXZIOztHQUVHO0FBQ0gsTUFBTSxPQUFPLGtCQUFtQixTQUFRLFlBQVk7SUFFbEQsWUFDRSxPQUFxQixFQUNyQixNQUFjO1FBRWQsS0FBSyxDQUFDLE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNyRCxDQUFDO0lBSUQ7Ozs7O09BS0c7SUFDSSxNQUFNLENBQUMsRUFBRSxDQUNkLE9BQXFCLEVBQ3JCLE1BQWM7UUFFZCxPQUFPLFFBQVEsQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLGtCQUFrQixDQUFDLFFBQVEsRUFBRSxNQUFNLENBQXVCLENBQUM7SUFDekYsQ0FBQztJQUdEOztPQUVHO0lBQ0ksTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFjO1FBQ2pDLE9BQU8sSUFBSSxZQUFZLENBQXFCLFVBQVUsQ0FBQyxPQUFPLEVBQUUsRUFBRSxNQUFNLEVBQUUsMEJBQTBCLEVBQUUsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsRUFBRSxLQUFLLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQy9NLENBQUM7SUFFRDs7T0FFRztJQUNJLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxVQUFzQixFQUFFLE1BQWM7UUFDdkUsT0FBTyxJQUFJLFlBQVksQ0FBcUIsVUFBVSxFQUFFLE1BQU0sRUFBRSwwQkFBMEIsRUFBRSxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsRUFBRSxDQUFDLGtCQUFrQixDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQyxFQUFFLEtBQUssQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDck0sQ0FBQztJQUVEOztPQUVHO0lBQ0ksTUFBTSxDQUFDLGNBQWMsQ0FDMUIsSUFBNkQsRUFDN0QsR0FBRyxJQUFrRDtRQUVyRCxPQUFPLElBQUksWUFBWSxDQUNyQixJQUFJLENBQUMsVUFBVSxJQUFJLFVBQVUsQ0FBQyxPQUFPLEVBQUUsRUFDdkMsSUFBSSxDQUFDLE1BQU0sRUFDWCwwQkFBMEIsRUFDMUIsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsRUFDckUsS0FBSyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQzlCLElBQUksQ0FBQyxNQUFNLElBQUksYUFBYSxDQUM3QixDQUFDO0lBQ0osQ0FBQztJQUlEOztPQUVHO0lBQ0ksTUFBTSxLQUFLLFFBQVE7UUFDeEIsT0FBTywwQkFBMEIsQ0FBQztJQUNwQyxDQUFDO0lBRUQ7O09BRUc7SUFDSSxNQUFNLEtBQUssaUJBQWlCO1FBQ2pDLE9BQU8sNkJBQTZCLENBQUMsOEJBQXNELENBQUMsQ0FBQztJQUMvRixDQUFDO0lBR00sTUFBTSxLQUFLLE9BQU87UUFDckIsT0FBTztZQUNMLFFBQVEsRUFBRTtnQkFDWixJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsRUFBRSxDQUFDO2FBQ2pCO1NBQ3VDLENBQUM7SUFDekMsQ0FBQztDQTZCSiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUHJpdmF0ZUZQQy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcnRpZmFjdHMvUHJpdmF0ZUZQQy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxzQ0FBc0M7QUFJdEMsT0FBTyxFQUE0SixvQkFBb0IsRUFBRSw2QkFBNkIsRUFBb0YsTUFBTSxxQkFBcUIsQ0FBQztBQUN0VSxPQUFPLEVBQUUsUUFBUSxFQUFFLFlBQVksRUFBaUgsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFaE0sT0FBTyxFQUFFLEVBQUUsRUFBUyxNQUFNLHdCQUF3QixDQUFDO0FBR25ELE9BQU8sOEJBQThCLE1BQU0sK0NBQStDLENBQUMsT0FBTyxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQUM7QUFDakgsTUFBTSxDQUFDLE1BQU0sMEJBQTBCLEdBQUcsb0JBQW9CLENBQUMsOEJBQXNELENBQUMsQ0FBQztBQUl2SDs7R0FFRztBQUNILE1BQU0sT0FBTyxrQkFBbUIsU0FBUSxZQUFZO0lBRWxELFlBQ0UsT0FBcUIsRUFDckIsTUFBYztRQUVkLEtBQUssQ0FBQyxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDckQsQ0FBQztJQUlEOzs7OztPQUtHO0lBQ0ksTUFBTSxDQUFDLEVBQUUsQ0FDZCxPQUFxQixFQUNyQixNQUFjO1FBRWQsT0FBTyxRQUFRLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxrQkFBa0IsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUF1QixDQUFDO0lBQ3pGLENBQUM7SUFHRDs7OztPQUlHO0lBQ0ksTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFjLEVBQUUsYUFBMEM7UUFDN0UsT0FBTyxZQUFZLENBQUMsTUFBTSxDQUN4QixNQUFNLEVBQ047WUFDRSxRQUFRLEVBQUUsMEJBQTBCO1lBQ3BDLGNBQWMsRUFBRSxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsRUFBRSxDQUFDLGtCQUFrQixDQUFDLEVBQUUsQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQztZQUNyRixJQUFJLEVBQUUsRUFBRTtTQUNULEVBQ0QsYUFBYSxDQUNkLENBQUM7SUFDSixDQUFDO0lBRUQ7O09BRUc7SUFDSSxNQUFNLENBQUMsY0FBYyxDQUMxQixJQUFnRixFQUNoRixHQUFHLElBQWtEO1FBRXJELE9BQU8sWUFBWSxDQUFDLE1BQU0sQ0FDeEIsSUFBSSxDQUFDLE1BQU0sRUFDWDtZQUNFLFFBQVEsRUFBRSwwQkFBMEI7WUFDcEMsY0FBYyxFQUFFLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxFQUFFLENBQUMsa0JBQWtCLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDO1lBQ3JGLElBQUk7WUFDSix5QkFBeUIsRUFBRSxJQUFJLENBQUMsTUFBTSxJQUFJLGFBQWE7U0FDeEQsRUFDRCxJQUFJLENBQUMsYUFBYSxDQUNuQixDQUFDO0lBQ0osQ0FBQztJQUlEOztPQUVHO0lBQ0ksTUFBTSxLQUFLLFFBQVE7UUFDeEIsT0FBTywwQkFBMEIsQ0FBQztJQUNwQyxDQUFDO0lBRUQ7O09BRUc7SUFDSSxNQUFNLEtBQUssaUJBQWlCO1FBQ2pDLE9BQU8sNkJBQTZCLENBQUMsOEJBQXNELENBQUMsQ0FBQztJQUMvRixDQUFDO0lBR00sTUFBTSxLQUFLLE9BQU87UUFDckIsT0FBTztZQUNMLFFBQVEsRUFBRTtnQkFDWixJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsRUFBRSxDQUFDO2FBQ2pCO1NBQ3VDLENBQUM7SUFDekMsQ0FBQztDQTZCSiJ9

package/dist/src/ts/utils/deploy.d.ts

@@ -8,11 +8,11 @@ import { PrivateFPCContract } from "../../artifacts/PrivateFPC.js";
  * The Aztec protocol allows interacting with such contracts immediately once registered —
  * no on-chain deployment transaction is required.
  *
- * The contract address is computed deterministically from its class hash and the provided salt,
- * with `deployer: AztecAddress.ZERO` so the deployer address is NOT mixed in. This means the same
- * salt always produces the same address regardless of who calls this function.
- * (`universalDeploy` is only available on `.send()` options; for `.register()` the equivalent
- * is setting `deployer` to `AztecAddress.ZERO`.)
+ * The contract address is computed deterministically from its class hash and the provided salt.
+ * `universalDeploy: true` zeroes the deployer in the address preimage, so the same salt always
+ * produces the same address regardless of who calls this function. (Aztec 4.3 moved salt /
+ * deployer / universalDeploy from per-call options into the `DeployMethod` instantiation
+ * argument, and the `register()` method no longer accepts options.)
  *
  * @param wallet The wallet used to register the contract with the PXE
  * @param salt   Salt used to derive the contract address

package/dist/src/ts/utils/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../src/ts/utils/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAEnE;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,EAAE,GACP,OAAO,CAAC,kBAAkB,CAAC,CAM7B"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../src/ts/utils/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAEnE;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,EAAE,GACP,OAAO,CAAC,kBAAkB,CAAC,CAK7B"}

package/dist/src/ts/utils/deploy.js

@@ -1,4 +1,3 @@
-import { AztecAddress } from "@aztec/stdlib/aztec-address";
 import { PrivateFPCContract } from "../../artifacts/PrivateFPC.js";
 /**
  * Registers the PrivateFPC contract with the PXE without sending any deployment transaction.
@@ -7,21 +6,20 @@ import { PrivateFPCContract } from "../../artifacts/PrivateFPC.js";
  * The Aztec protocol allows interacting with such contracts immediately once registered —
  * no on-chain deployment transaction is required.
  *
- * The contract address is computed deterministically from its class hash and the provided salt,
- * with `deployer: AztecAddress.ZERO` so the deployer address is NOT mixed in. This means the same
- * salt always produces the same address regardless of who calls this function.
- * (`universalDeploy` is only available on `.send()` options; for `.register()` the equivalent
- * is setting `deployer` to `AztecAddress.ZERO`.)
+ * The contract address is computed deterministically from its class hash and the provided salt.
+ * `universalDeploy: true` zeroes the deployer in the address preimage, so the same salt always
+ * produces the same address regardless of who calls this function. (Aztec 4.3 moved salt /
+ * deployer / universalDeploy from per-call options into the `DeployMethod` instantiation
+ * argument, and the `register()` method no longer accepts options.)
  *
  * @param wallet The wallet used to register the contract with the PXE
  * @param salt   Salt used to derive the contract address
  * @returns The registered PrivateFPC contract instance
  */
 export async function registerPrivateContract(wallet, salt) {
-    return PrivateFPCContract.deploy(wallet).register({
-        contractAddressSalt: salt,
-        skipInitialization: true,
-        deployer: AztecAddress.ZERO,
-    });
+    return PrivateFPCContract.deploy(wallet, {
+        salt,
+        universalDeploy: true,
+    }).register();
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3RzL3V0aWxzL2RlcGxveS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFM0QsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFbkU7Ozs7Ozs7Ozs7Ozs7Ozs7R0FnQkc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLHVCQUF1QixDQUMzQyxNQUFjLEVBQ2QsSUFBUTtJQUVSLE9BQU8sa0JBQWtCLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLFFBQVEsQ0FBQztRQUNoRCxtQkFBbUIsRUFBRSxJQUFJO1FBQ3pCLGtCQUFrQixFQUFFLElBQUk7UUFDeEIsUUFBUSxFQUFFLFlBQVksQ0FBQyxJQUFJO0tBQzVCLENBQUMsQ0FBQztBQUNMLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3RzL3V0aWxzL2RlcGxveS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUVuRTs7Ozs7Ozs7Ozs7Ozs7OztHQWdCRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsdUJBQXVCLENBQzNDLE1BQWMsRUFDZCxJQUFRO0lBRVIsT0FBTyxrQkFBa0IsQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFO1FBQ3ZDLElBQUk7UUFDSixlQUFlLEVBQUUsSUFBSTtLQUN0QixDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7QUFDaEIsQ0FBQyJ9

package/dist/src/ts/utils/gas.d.ts

@@ -1,10 +1,25 @@
 import type { FeePaymentMethod } from "@aztec/aztec.js/fee";
 import { AztecAddress } from "@aztec/stdlib/aztec-address";
 import { Gas, GasFees, GasSettings } from "@aztec/stdlib/gas";
-type BaseFeesProvider = {
+type GasEstimationNode = {
     getCurrentMinFees(): Promise<GasFees>;
+    getNodeInfo(): Promise<{
+        txsLimits: {
+            gas: {
+                daGas: number;
+                l2Gas: number;
+            };
+        };
+    }>;
+};
+/**
+ * Raw gas consumed during simulation, returned by `simulate` when called with
+ * `includeMetadata: true`. Replaces the removed `estimatedGas` result field.
+ */
+type SimulatedGasUsage = {
+    totalGas: Gas;
+    teardownGas: Gas;
 };
-type SimulatedGasEstimate = Pick<GasSettings, "gasLimits" | "teardownGasLimits">;
 type SimulatableInteraction = {
     simulate(options: {
         from: AztecAddress;
@@ -12,7 +27,6 @@ type SimulatableInteraction = {
         includeMetadata?: boolean;
         fee?: {
             paymentMethod?: FeePaymentMethod;
-            estimatedGasPadding?: number;
             gasSettings?: {
                 gasLimits?: Gas;
                 teardownGasLimits?: Gas;
@@ -21,7 +35,7 @@ type SimulatableInteraction = {
             };
         };
     }): Promise<{
-        estimatedGas?: SimulatedGasEstimate;
+        gasUsed?: SimulatedGasUsage;
     }>;
 };
 export type FeeMultiplier = number | {
@@ -72,16 +86,20 @@ export declare function maxGasCostFor(maxFeesPerGas: GasFees, gasLimits: Gas): b
 /**
  * Simulate an interaction to derive tighter gas limits, then combine them with
  * fee caps based on the node's current minimum fees.
+ *
+ * The network advertises the maximum gas a single tx may declare via
+ * `NodeInfo.txsLimits.gas` (the smaller of the per-tx maximum and the per-block
+ * allocation). The simulation runs within that ceiling and the simulated usage
+ * is padded and clamped back to it, so the wallet's gas-limit validation never
+ * rejects the resulting transaction for over-declaring gas.
  */
-export declare function estimateGasSettings(interaction: SimulatableInteraction, { aztecNode, from, paymentMethod, additionalScopes, maxFeeMultiplier, estimatedGasPadding, gasLimits, teardownGasLimits, }: {
-    aztecNode: BaseFeesProvider;
+export declare function estimateGasSettings(interaction: SimulatableInteraction, { aztecNode, from, paymentMethod, additionalScopes, maxFeeMultiplier, estimatedGasPadding, }: {
+    aztecNode: GasEstimationNode;
     from: AztecAddress;
     paymentMethod?: FeePaymentMethod;
     additionalScopes?: AztecAddress[];
     maxFeeMultiplier?: FeeMultiplier;
     estimatedGasPadding?: number;
-    gasLimits?: Gas;
-    teardownGasLimits?: Gas;
 }): Promise<GasSettings>;
 export {};
 //# sourceMappingURL=gas.d.ts.map

package/dist/src/ts/utils/gas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gas.d.ts","sourceRoot":"","sources":["../../../../src/ts/utils/gas.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EACL,GAAG,EACH,OAAO,EACP,WAAW,EAIZ,MAAM,mBAAmB,CAAC;AAG3B,KAAK,gBAAgB,GAAG;IACtB,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CACvC,CAAC;AAEF,KAAK,oBAAoB,GAAG,IAAI,CAC9B,WAAW,EACX,WAAW,GAAG,mBAAmB,CAClC,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,QAAQ,CAAC,OAAO,EAAE;QAChB,IAAI,EAAE,YAAY,CAAC;QACnB,gBAAgB,CAAC,EAAE,YAAY,EAAE,CAAC;QAClC,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,GAAG,CAAC,EAAE;YACJ,aAAa,CAAC,EAAE,gBAAgB,CAAC;YACjC,mBAAmB,CAAC,EAAE,MAAM,CAAC;YAC7B,WAAW,CAAC,EAAE;gBACZ,SAAS,CAAC,EAAE,GAAG,CAAC;gBAChB,iBAAiB,CAAC,EAAE,GAAG,CAAC;gBACxB,aAAa,CAAC,EAAE,OAAO,CAAC;gBACxB,qBAAqB,CAAC,EAAE,OAAO,CAAC;aACjC,CAAC;SACH,CAAC;KACH,GAAG,OAAO,CAAC;QAAE,YAAY,CAAC,EAAE,oBAAoB,CAAA;KAAE,CAAC,CAAC;CACtD,CAAC;AAMF,MAAM,MAAM,aAAa,GACrB,MAAM,GACN;IACE,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAgCN;;;;GAIG;AACH,eAAO,MAAM,sBAAsB;;;CAGzB,CAAC;AAEX;;GAEG;AACH,eAAO,MAAM,4BAA4B,MAAM,CAAC;AAwBhD;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE;IACR,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACtC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;CACvC,EACD,UAAU,GAAE,aAAsC,GACjD,OAAO,CAaT;AAED;;;GAGG;AACH,wBAAgB,gCAAgC,CAC9C,aAAa,EAAE,OAAO,GACrB,OAAO,CAET;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,aAAa,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,GAAG,MAAM,CAK5E;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,sBAAsB,EACnC,EACE,SAAS,EACT,IAAI,EACJ,aAAa,EACb,gBAAgB,EAChB,gBAAyC,EACzC,mBAAkD,EAClD,SAA0B,EAC1B,iBAAgD,GACjD,EAAE;IACD,SAAS,EAAE,gBAAgB,CAAC;IAC5B,IAAI,EAAE,YAAY,CAAC;IACnB,aAAa,CAAC,EAAE,gBAAgB,CAAC;IACjC,gBAAgB,CAAC,EAAE,YAAY,EAAE,CAAC;IAClC,gBAAgB,CAAC,EAAE,aAAa,CAAC;IACjC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,iBAAiB,CAAC,EAAE,GAAG,CAAC;CACzB,GACA,OAAO,CAAC,WAAW,CAAC,CAiCtB"}
+{"version":3,"file":"gas.d.ts","sourceRoot":"","sources":["../../../../src/ts/utils/gas.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE9D,KAAK,iBAAiB,GAAG;IACvB,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IACtC,WAAW,IAAI,OAAO,CAAC;QACrB,SAAS,EAAE;YAAE,GAAG,EAAE;gBAAE,KAAK,EAAE,MAAM,CAAC;gBAAC,KAAK,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,CAAC;KACtD,CAAC,CAAC;CACJ,CAAC;AAEF;;;GAGG;AACH,KAAK,iBAAiB,GAAG;IACvB,QAAQ,EAAE,GAAG,CAAC;IACd,WAAW,EAAE,GAAG,CAAC;CAClB,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,QAAQ,CAAC,OAAO,EAAE;QAChB,IAAI,EAAE,YAAY,CAAC;QACnB,gBAAgB,CAAC,EAAE,YAAY,EAAE,CAAC;QAClC,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,GAAG,CAAC,EAAE;YACJ,aAAa,CAAC,EAAE,gBAAgB,CAAC;YACjC,WAAW,CAAC,EAAE;gBACZ,SAAS,CAAC,EAAE,GAAG,CAAC;gBAChB,iBAAiB,CAAC,EAAE,GAAG,CAAC;gBACxB,aAAa,CAAC,EAAE,OAAO,CAAC;gBACxB,qBAAqB,CAAC,EAAE,OAAO,CAAC;aACjC,CAAC;SACH,CAAC;KACH,GAAG,OAAO,CAAC;QAAE,OAAO,CAAC,EAAE,iBAAiB,CAAA;KAAE,CAAC,CAAC;CAC9C,CAAC;AAMF,MAAM,MAAM,aAAa,GACrB,MAAM,GACN;IACE,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAgCN;;;;GAIG;AACH,eAAO,MAAM,sBAAsB;;;CAGzB,CAAC;AAEX;;GAEG;AACH,eAAO,MAAM,4BAA4B,MAAM,CAAC;AAehD;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE;IACR,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACtC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;CACvC,EACD,UAAU,GAAE,aAAsC,GACjD,OAAO,CAaT;AAED;;;GAGG;AACH,wBAAgB,gCAAgC,CAC9C,aAAa,EAAE,OAAO,GACrB,OAAO,CAET;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,aAAa,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,GAAG,MAAM,CAK5E;AAED;;;;;;;;;GASG;AACH,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,sBAAsB,EACnC,EACE,SAAS,EACT,IAAI,EACJ,aAAa,EACb,gBAAgB,EAChB,gBAAyC,EACzC,mBAAkD,GACnD,EAAE;IACD,SAAS,EAAE,iBAAiB,CAAC;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,aAAa,CAAC,EAAE,gBAAgB,CAAC;IACjC,gBAAgB,CAAC,EAAE,YAAY,EAAE,CAAC;IAClC,gBAAgB,CAAC,EAAE,aAAa,CAAC;IACjC,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,GACA,OAAO,CAAC,WAAW,CAAC,CA8DtB"}

package/dist/src/ts/utils/gas.js

@@ -1,5 +1,4 @@
-import { Gas, GasFees, GasSettings, APPROXIMATE_MAX_DA_GAS_PER_BLOCK, FALLBACK_TEARDOWN_DA_GAS_LIMIT, FALLBACK_TEARDOWN_L2_GAS_LIMIT, } from "@aztec/stdlib/gas";
-import { MAX_PROCESSABLE_L2_GAS } from "@aztec/constants";
+import { Gas, GasFees, GasSettings } from "@aztec/stdlib/gas";
 const FEE_MULTIPLIER_SCALE = 10000n;
 const DEFAULT_FEE_MULTIPLIER_NUMERATOR = 6n;
 const DEFAULT_FEE_MULTIPLIER_DENOMINATOR = 5n;
@@ -35,25 +34,17 @@ export const DEFAULT_FEE_MULTIPLIER = {
  */
 export const DEFAULT_GAS_ESTIMATE_PADDING = 0.1;
 /**
- * Protocol-maximum gas limits, used as the initial ceiling for
- * estimateGasSettings — the simulation replaces them with tighter values.
+ * Pads each gas dimension by `pad` (e.g. 0.1 = +10%) and caps it at the
+ * network's per-tx admission limit, mirroring the framework's getGasLimits.
+ * The cap keeps the declared limits within what inbound validation accepts.
  */
-const MAX_GAS_LIMITS = Gas.from({
-    daGas: APPROXIMATE_MAX_DA_GAS_PER_BLOCK,
-    l2Gas: MAX_PROCESSABLE_L2_GAS,
-});
-/**
- * Protocol-default teardown gas limits. The protocol bills teardown gas at the
- * limit (not actual usage), so these overestimate. estimateGasSettings replaces
- * them with simulation output.
- *
- * Teardown gas is already included in gasLimits by the protocol, so these must
- * NOT be passed to maxGasCostFor (that would double-count teardown cost).
- */
-const FALLBACK_TEARDOWN_GAS_LIMITS = Gas.from({
-    daGas: FALLBACK_TEARDOWN_DA_GAS_LIMIT,
-    l2Gas: FALLBACK_TEARDOWN_L2_GAS_LIMIT,
-});
+function padAndClampGas(gas, pad, max) {
+    const padded = gas.mul(1 + pad);
+    return Gas.from({
+        daGas: Math.min(padded.daGas, max.daGas),
+        l2Gas: Math.min(padded.l2Gas, max.l2Gas),
+    });
+}
 /**
  * Calculate max fees per gas from the node's minimum fees with a multiplier.
  * @param baseFees - The current base fees from the node
@@ -90,28 +81,51 @@ export function maxGasCostFor(maxFeesPerGas, gasLimits) {
 /**
  * Simulate an interaction to derive tighter gas limits, then combine them with
  * fee caps based on the node's current minimum fees.
+ *
+ * The network advertises the maximum gas a single tx may declare via
+ * `NodeInfo.txsLimits.gas` (the smaller of the per-tx maximum and the per-block
+ * allocation). The simulation runs within that ceiling and the simulated usage
+ * is padded and clamped back to it, so the wallet's gas-limit validation never
+ * rejects the resulting transaction for over-declaring gas.
  */
-export async function estimateGasSettings(interaction, { aztecNode, from, paymentMethod, additionalScopes, maxFeeMultiplier = DEFAULT_FEE_MULTIPLIER, estimatedGasPadding = DEFAULT_GAS_ESTIMATE_PADDING, gasLimits = MAX_GAS_LIMITS, teardownGasLimits = FALLBACK_TEARDOWN_GAS_LIMITS, }) {
+export async function estimateGasSettings(interaction, { aztecNode, from, paymentMethod, additionalScopes, maxFeeMultiplier = DEFAULT_FEE_MULTIPLIER, estimatedGasPadding = DEFAULT_GAS_ESTIMATE_PADDING, }) {
+    // Validate the padding knob at the public boundary so we fail fast before the
+    // simulation round-trip, mirroring the maxFeeMultiplier validation in
+    // normalizeMultiplier. Zero is allowed (no margin); negatives would
+    // under-declare gas and NaN/Infinity would yield invalid limits the node rejects.
+    if (!Number.isFinite(estimatedGasPadding) || estimatedGasPadding < 0) {
+        throw new Error(`Gas estimate padding must be a non-negative finite number, got ${estimatedGasPadding}`);
+    }
     const maxFeesPerGas = maxFeesPerGasFromBaseFees(await aztecNode.getCurrentMinFees(), maxFeeMultiplier);
     const maxPriorityFeesPerGas = maxPriorityFeesPerGasFromMaxFees(maxFeesPerGas);
+    const { txsLimits: { gas }, } = await aztecNode.getNodeInfo();
+    const maxGasLimits = Gas.from({ daGas: gas.daGas, l2Gas: gas.l2Gas });
     const simulation = await interaction.simulate({
         from,
         additionalScopes,
         includeMetadata: true,
         fee: {
             paymentMethod,
-            estimatedGasPadding,
             gasSettings: {
-                gasLimits,
-                teardownGasLimits,
+                gasLimits: maxGasLimits,
+                teardownGasLimits: maxGasLimits,
                 maxFeesPerGas,
                 maxPriorityFeesPerGas,
             },
         },
     });
-    if (!simulation.estimatedGas) {
-        throw new Error("Gas estimation metadata was not returned by simulation.");
+    if (!simulation.gasUsed) {
+        throw new Error("Gas usage metadata was not returned by simulation.");
+    }
+    const { totalGas, teardownGas } = simulation.gasUsed;
+    // If simulated usage already exceeds the admission limit the tx can never be
+    // included, so fail fast rather than declaring a limit the node would reject.
+    if (totalGas.daGas > maxGasLimits.daGas ||
+        totalGas.l2Gas > maxGasLimits.l2Gas) {
+        throw new Error(`Transaction consumes more gas (DA ${totalGas.daGas}, L2 ${totalGas.l2Gas}) than the network admits per tx (DA ${maxGasLimits.daGas}, L2 ${maxGasLimits.l2Gas}).`);
     }
-    return new GasSettings(simulation.estimatedGas.gasLimits, simulation.estimatedGas.teardownGasLimits, maxFeesPerGas, maxPriorityFeesPerGas);
+    // gasLimits is the padded total gas (teardown is part of the total); the
+    // teardown sub-limit is padded separately. Mirrors the framework's getGasLimits.
+    return new GasSettings(padAndClampGas(totalGas, estimatedGasPadding, maxGasLimits), padAndClampGas(teardownGas, estimatedGasPadding, maxGasLimits), maxFeesPerGas, maxPriorityFeesPerGas);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2FzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3RzL3V0aWxzL2dhcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQ0wsR0FBRyxFQUNILE9BQU8sRUFDUCxXQUFXLEVBQ1gsZ0NBQWdDLEVBQ2hDLDhCQUE4QixFQUM5Qiw4QkFBOEIsR0FDL0IsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQTZCMUQsTUFBTSxvQkFBb0IsR0FBRyxNQUFPLENBQUM7QUFDckMsTUFBTSxnQ0FBZ0MsR0FBRyxFQUFFLENBQUM7QUFDNUMsTUFBTSxrQ0FBa0MsR0FBRyxFQUFFLENBQUM7QUFTOUMsU0FBUyxPQUFPLENBQUMsU0FBaUIsRUFBRSxXQUFtQjtJQUNyRCxPQUFPLENBQUMsU0FBUyxHQUFHLFdBQVcsR0FBRyxFQUFFLENBQUMsR0FBRyxXQUFXLENBQUM7QUFDdEQsQ0FBQztBQUVELFNBQVMsbUJBQW1CLENBQUMsVUFBeUI7SUFJcEQsSUFBSSxPQUFPLFVBQVUsS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUNuQyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsSUFBSSxVQUFVLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDcEQsTUFBTSxJQUFJLEtBQUssQ0FDYix3REFBd0QsVUFBVSxFQUFFLENBQ3JFLENBQUM7UUFDSixDQUFDO1FBRUQsT0FBTztZQUNMLFNBQVMsRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLEdBQUcsTUFBTSxDQUFDLG9CQUFvQixDQUFDLENBQUMsQ0FBQztZQUN2RSxXQUFXLEVBQUUsb0JBQW9CO1NBQ2xDLENBQUM7SUFDSixDQUFDO0lBRUQsSUFBSSxVQUFVLENBQUMsV0FBVyxJQUFJLEVBQUUsSUFBSSxVQUFVLENBQUMsU0FBUyxJQUFJLEVBQUUsRUFBRSxDQUFDO1FBQy9E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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2FzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3RzL3V0aWxzL2dhcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsR0FBRyxFQUFFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQW1DOUQsTUFBTSxvQkFBb0IsR0FBRyxNQUFPLENBQUM7QUFDckMsTUFBTSxnQ0FBZ0MsR0FBRyxFQUFFLENBQUM7QUFDNUMsTUFBTSxrQ0FBa0MsR0FBRyxFQUFFLENBQUM7QUFTOUMsU0FBUyxPQUFPLENBQUMsU0FBaUIsRUFBRSxXQUFtQjtJQUNyRCxPQUFPLENBQUMsU0FBUyxHQUFHLFdBQVcsR0FBRyxFQUFFLENBQUMsR0FBRyxXQUFXLENBQUM7QUFDdEQsQ0FBQztBQUVELFNBQVMsbUJBQW1CLENBQUMsVUFBeUI7SUFJcEQsSUFBSSxPQUFPLFVBQVUsS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUNuQyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsSUFBSSxVQUFVLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDcEQsTUFBTSxJQUFJLEtBQUssQ0FDYix3REFBd0QsVUFBVSxFQUFFLENBQ3JFLENBQUM7UUFDSixDQUFDO1FBRUQsT0FBTztZQUNMLFNBQVMsRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLEdBQUcsTUFBTSxDQUFDLG9CQUFvQixDQUFDLENBQUMsQ0FBQztZQUN2RSxXQUFXLEVBQUUsb0JBQW9CO1NBQ2xDLENBQUM7SUFDSixDQUFDO0lBRUQsSUFBSSxVQUFVLENBQUMsV0FBVyxJQUFJLEVBQUUsSUFBSSxVQUFVLENBQUMsU0FBUyxJQUFJLEVBQUUsRUFBRSxDQUFDO1FBQy9ELE1BQU0sSUFBSSxLQUFLLENBQ2IsbURBQW1ELFVBQVUsQ0FBQyxTQUFTLElBQUksVUFBVSxDQUFDLFdBQVcsRUFBRSxDQUNwRyxDQUFDO0lBQ0os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