@aztec/sequencer-client 0.82.0 → 0.82.1-alpha-testnet.1

package/dest/publisher/sequencer-publisher.d.ts

@@ -36,14 +36,14 @@ export declare class SequencerPublisher {
     private metrics;
     private epochCache;
     private forwarderContract;
-    protected governanceLog: import("@aztec/aztec.js").Logger;
+    protected governanceLog: import("@aztec/foundation/log").Logger;
     protected governanceProposerAddress?: EthAddress;
     private governancePayload;
-    protected slashingLog: import("@aztec/aztec.js").Logger;
+    protected slashingLog: import("@aztec/foundation/log").Logger;
     protected slashingProposerAddress?: EthAddress;
     private getSlashPayload?;
     private myLastVotes;
-    protected log: import("@aztec/aztec.js").Logger;
+    protected log: import("@aztec/foundation/log").Logger;
     protected ethereumSlotDuration: bigint;
     private blobSinkClient;
     static PROPOSE_GAS_GUESS: bigint;

package/dest/publisher/sequencer-publisher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sequencer-publisher.d.ts","sourceRoot":"","sources":["../../src/publisher/sequencer-publisher.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAC7F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,QAAQ,EACb,KAAK,0BAA0B,EAE/B,KAAK,YAAY,EACjB,KAAK,iBAAiB,EACtB,KAAK,WAAW,EAChB,KAAK,WAAW,EAChB,cAAc,EACd,KAAK,wBAAwB,EAC7B,KAAK,gBAAgB,EAEtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAEjF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAMjE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,EAAE,KAAK,kBAAkB,EAAsB,MAAM,MAAM,CAAC;AAEnE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAmBnE,oBAAY,QAAQ;IAClB,UAAU,IAAA;IACV,QAAQ,IAAA;CACT;AAED,KAAK,uBAAuB,GAAG,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;AAEvF,KAAK,MAAM,GAAG,SAAS,GAAG,iBAAiB,GAAG,eAAe,CAAC;AAC9D,UAAU,iBAAiB;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,WAAW,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,UAAU,CAAC,EAAE,YAAY,CAAC;IAC1B,QAAQ,CAAC,EAAE,CACT,OAAO,EAAE,WAAW,EACpB,MAAM,CAAC,EAAE;QAAE,OAAO,EAAE,kBAAkB,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAC;QAAC,KAAK,CAAC,EAAE,gBAAgB,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,KACtG,IAAI,CAAC;CACX;AAED,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,SAAS,CAAC,aAAa,mCAAkD;IACzE,SAAS,CAAC,yBAAyB,CAAC,EAAE,UAAU,CAAC;IACjD,OAAO,CAAC,iBAAiB,CAA+B;IAExD,SAAS,CAAC,WAAW,mCAAgD;IACrE,SAAS,CAAC,uBAAuB,CAAC,EAAE,UAAU,CAAC;IAC/C,OAAO,CAAC,eAAe,CAAC,CAAsC;IAE9D,OAAO,CAAC,WAAW,CAGjB;IAEF,SAAS,CAAC,GAAG,mCAAuC;IACpD,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAC;IAEvC,OAAO,CAAC,cAAc,CAA0B;IAIhD,OAAc,iBAAiB,EAAE,MAAM,CAAe;IAE/C,SAAS,EAAE,kBAAkB,CAAC;IAC9B,cAAc,EAAE,cAAc,CAAC;IAC/B,mBAAmB,EAAE,0BAA0B,CAAC;IAChD,wBAAwB,EAAE,wBAAwB,CAAC;IAE1D,SAAS,CAAC,QAAQ,EAAE,iBAAiB,EAAE,CAAM;gBAG3C,MAAM,EAAE,cAAc,GAAG,eAAe,GAAG,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,EAC1F,IAAI,EAAE;QACJ,SAAS,CAAC,EAAE,eAAe,CAAC;QAC5B,cAAc,CAAC,EAAE,uBAAuB,CAAC;QACzC,iBAAiB,EAAE,iBAAiB,CAAC;QACrC,SAAS,EAAE,kBAAkB,CAAC;QAC9B,cAAc,EAAE,cAAc,CAAC;QAC/B,wBAAwB,EAAE,wBAAwB,CAAC;QACnD,0BAA0B,EAAE,0BAA0B,CAAC;QACvD,UAAU,EAAE,UAAU,CAAC;KACxB;IAkBI,0BAA0B,CAAC,QAAQ,EAAE,uBAAuB;IAI5D,mBAAmB;IAInB,gBAAgB;IAIhB,oBAAoB;IAIpB,oBAAoB,CAAC,OAAO,EAAE,UAAU;IAIxC,UAAU,CAAC,OAAO,EAAE,iBAAiB;IAIrC,gBAAgB,IAAI,MAAM;IAIjC;;;;;;OAMG;IACU,YAAY;;;;;;;;;;;IAmEzB,OAAO,CAAC,2BAA2B;IAYnC;;;;OAIG;IACI,wBAAwB,CAAC,UAAU,EAAE,MAAM;IAclD;;;;;;;;OAQG;IACU,0BAA0B,CACrC,MAAM,EAAE,WAAW,EACnB,eAAe,GAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,SAAS,EAAE,CAAA;KAGzD,GACA,OAAO,CAAC,MAAM,CAAC;IAmBL,wBAAwB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YAKhD,qBAAqB;YA4CrB,aAAa;IAmB3B;;;;;;OAMG;IACU,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IASzG;;;;;OAKG;IACU,qBAAqB,CAChC,KAAK,EAAE,OAAO,EACd,YAAY,CAAC,EAAE,SAAS,EAAE,EAC1B,QAAQ,CAAC,EAAE,MAAM,EAAE,EACnB,IAAI,GAAE;QAAE,WAAW,CAAC,EAAE,IAAI,CAAA;KAAO,GAChC,OAAO,CAAC,OAAO,CAAC;IA8BnB;;;;;OAKG;IACI,SAAS;IAKhB,wDAAwD;IACjD,OAAO;YAKA,gBAAgB;YAiGhB,YAAY;IAsE1B;;;;;;;OAOG;IACH,SAAS,CAAC,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;CAGlF"}
+{"version":3,"file":"sequencer-publisher.d.ts","sourceRoot":"","sources":["../../src/publisher/sequencer-publisher.ts"],"names":[],"mappings":"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"}

package/dest/tx_validator/gas_validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gas_validator.d.ts","sourceRoot":"","sources":["../../src/tx_validator/gas_validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAK9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,EAAoB,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAExG,iDAAiD;AACjD,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC,CAAC;CACvE;AAED,qBAAa,cAAe,YAAW,WAAW,CAAC,EAAE,CAAC;;gBAMxC,gBAAgB,EAAE,iBAAiB,EAAE,eAAe,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO;IAM1F,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;CA0EtD"}
+{"version":3,"file":"gas_validator.d.ts","sourceRoot":"","sources":["../../src/tx_validator/gas_validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAK9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,EAAoB,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAExG,iDAAiD;AACjD,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,CAAC,eAAe,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC,CAAC;CACvE;AAED,qBAAa,cAAe,YAAW,WAAW,CAAC,EAAE,CAAC;;gBAMxC,gBAAgB,EAAE,iBAAiB,EAAE,eAAe,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO;IAM1F,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAyEtD"}

package/dest/tx_validator/gas_validator.js

@@ -1,6 +1,6 @@
 import { createLogger } from '@aztec/foundation/log';
 import { computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice';
-import { getExecutionRequestsByPhase } from '@aztec/simulator/server';
+import { getCallRequestsWithCalldataByPhase } from '@aztec/simulator/server';
 import { FunctionSelector } from '@aztec/stdlib/abi';
 import { TxExecutionPhase } from '@aztec/stdlib/tx';
 export class GasTxValidator {
@@ -49,15 +49,13 @@ export class GasTxValidator {
         // Read current balance of the feePayer
         const initialBalance = await this.#publicDataSource.storageRead(this.#feeJuiceAddress, await computeFeePayerBalanceStorageSlot(feePayer));
         // If there is a claim in this tx that increases the fee payer balance in Fee Juice, add it to balance
-        const setupFns = getExecutionRequestsByPhase(tx, TxExecutionPhase.SETUP);
+        const setupFns = getCallRequestsWithCalldataByPhase(tx, TxExecutionPhase.SETUP);
         const increasePublicBalanceSelector = await FunctionSelector.fromSignature('_increase_public_balance((Field),u128)');
-        const claimFunctionCall = setupFns.find((fn)=>fn.callContext.contractAddress.equals(this.#feeJuiceAddress) && fn.callContext.msgSender.equals(this.#feeJuiceAddress) && fn.args.length > 2 && // Public functions get routed through the dispatch function, whose first argument is the target function selector.
-            fn.args[0].equals(increasePublicBalanceSelector.toField()) && fn.args[1].equals(feePayer.toField()) && !fn.callContext.isStaticCall);
-        // The claim amount is at index 2 in the args array because:
-        // - Index 0: Target function selector (due to dispatch routing)
-        // - Index 1: Amount recipient
-        // - Index 2: Amount being claimed
-        const balance = claimFunctionCall ? initialBalance.add(claimFunctionCall.args[2]) : initialBalance;
+        // Arguments of the claim function call:
+        // - args[0]: Amount recipient.
+        // - args[1]: Amount being claimed.
+        const claimFunctionCall = setupFns.find((fn)=>fn.request.contractAddress.equals(this.#feeJuiceAddress) && fn.request.msgSender.equals(this.#feeJuiceAddress) && fn.calldata.length > 2 && fn.functionSelector.equals(increasePublicBalanceSelector) && fn.args[0].equals(feePayer.toField()) && !fn.request.isStaticCall);
+        const balance = claimFunctionCall ? initialBalance.add(claimFunctionCall.args[1]) : initialBalance;
         if (balance.lt(feeLimit)) {
             this.#log.warn(`Rejecting transaction due to not enough fee payer balance`, {
                 feePayer,

package/dest/tx_validator/phases_validator.d.ts

@@ -1,6 +1,6 @@
 import type { ContractDataSource } from '@aztec/stdlib/contract';
 import type { AllowedElement } from '@aztec/stdlib/interfaces/server';
-import { type PublicExecutionRequest, Tx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
+import { Tx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
 export declare class PhasesTxValidator implements TxValidator<Tx> {
     #private;
     private setupAllowList;
@@ -8,6 +8,6 @@ export declare class PhasesTxValidator implements TxValidator<Tx> {
     private contractsDB;
     constructor(contracts: ContractDataSource, setupAllowList: AllowedElement[], blockNumber: number);
     validateTx(tx: Tx): Promise<TxValidationResult>;
-    isOnAllowList(publicCall: PublicExecutionRequest, allowList: AllowedElement[]): Promise<boolean>;
+    private isOnAllowList;
 }
 //# sourceMappingURL=phases_validator.d.ts.map

package/dest/tx_validator/phases_validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"phases_validator.d.ts","sourceRoot":"","sources":["../../src/tx_validator/phases_validator.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EACL,KAAK,sBAAsB,EAC3B,EAAE,EAEF,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAE1B,qBAAa,iBAAkB,YAAW,WAAW,CAAC,EAAE,CAAC;;IAIZ,OAAO,CAAC,cAAc;IAAoB,OAAO,CAAC,WAAW;IAFxG,OAAO,CAAC,WAAW,CAAoB;gBAE3B,SAAS,EAAE,kBAAkB,EAAU,cAAc,EAAE,cAAc,EAAE,EAAU,WAAW,EAAE,MAAM;IAI1G,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAkC/C,aAAa,CAAC,UAAU,EAAE,sBAAsB,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;CA6CvG"}
+{"version":3,"file":"phases_validator.d.ts","sourceRoot":"","sources":["../../src/tx_validator/phases_validator.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAEL,EAAE,EAEF,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAE1B,qBAAa,iBAAkB,YAAW,WAAW,CAAC,EAAE,CAAC;;IAIZ,OAAO,CAAC,cAAc;IAAoB,OAAO,CAAC,WAAW;IAFxG,OAAO,CAAC,WAAW,CAAoB;gBAE3B,SAAS,EAAE,kBAAkB,EAAU,cAAc,EAAE,cAAc,EAAE,EAAU,WAAW,EAAE,MAAM;IAI1G,UAAU,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;YAkCvC,aAAa;CAiD5B"}

package/dest/tx_validator/phases_validator.js

@@ -1,5 +1,5 @@
 import { createLogger } from '@aztec/foundation/log';
-import { PublicContractsDB, getExecutionRequestsByPhase } from '@aztec/simulator/server';
+import { PublicContractsDB, getCallRequestsWithCalldataByPhase } from '@aztec/simulator/server';
 import { Tx, TxExecutionPhase } from '@aztec/stdlib/tx';
 export class PhasesTxValidator {
     setupAllowList;
@@ -24,10 +24,10 @@ export class PhasesTxValidator {
                     result: 'valid'
                 };
             }
-            const setupFns = getExecutionRequestsByPhase(tx, TxExecutionPhase.SETUP);
+            const setupFns = getCallRequestsWithCalldataByPhase(tx, TxExecutionPhase.SETUP);
             for (const setupFn of setupFns){
                 if (!await this.isOnAllowList(setupFn, this.setupAllowList)) {
-                    this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} because it calls setup function not on allow list: ${setupFn.callContext.contractAddress}:${setupFn.callContext.functionSelector}`, {
+                    this.#log.warn(`Rejecting tx ${await Tx.getHash(tx)} because it calls setup function not on allow list: ${setupFn.request.contractAddress}:${setupFn.functionSelector}`, {
                         allowList: this.setupAllowList
                     });
                     return {
@@ -49,7 +49,8 @@ export class PhasesTxValidator {
         if (publicCall.isEmpty()) {
             return true;
         }
-        const { contractAddress, functionSelector } = publicCall.callContext;
+        const contractAddress = publicCall.request.contractAddress;
+        const functionSelector = publicCall.functionSelector;
         // do these checks first since they don't require the contract class
         for (const entry of allowList){
             if ('address' in entry && !('selector' in entry)) {

package/dest/tx_validator/test_utils.d.ts

@@ -1,23 +1,17 @@
 import type { Fr } from '@aztec/foundation/fields';
 import type { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { Tx } from '@aztec/stdlib/tx';
+import { type Tx } from '@aztec/stdlib/tx';
 export declare function patchNonRevertibleFn(tx: Tx, index: number, overrides: {
     address?: AztecAddress;
     selector: FunctionSelector;
     args?: Fr[];
     msgSender?: AztecAddress;
-}): Promise<{
-    address: AztecAddress;
-    selector: FunctionSelector;
-}>;
+}): Promise<AztecAddress>;
 export declare function patchRevertibleFn(tx: Tx, index: number, overrides: {
     address?: AztecAddress;
     selector: FunctionSelector;
     args?: Fr[];
     msgSender?: AztecAddress;
-}): Promise<{
-    address: AztecAddress;
-    selector: FunctionSelector;
-}>;
+}): Promise<AztecAddress>;
 //# sourceMappingURL=test_utils.d.ts.map

package/dest/tx_validator/test_utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test_utils.d.ts","sourceRoot":"","sources":["../../src/tx_validator/test_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE3C,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,EAAE,EACN,KAAK,EAAE,MAAM,EACb,SAAS,EAAE;IAAE,OAAO,CAAC,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,gBAAgB,CAAC;IAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;IAAC,SAAS,CAAC,EAAE,YAAY,CAAA;CAAE,GACvG,OAAO,CAAC;IAAE,OAAO,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,gBAAgB,CAAA;CAAE,CAAC,CAEhE;AAED,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,EAAE,EACN,KAAK,EAAE,MAAM,EACb,SAAS,EAAE;IAAE,OAAO,CAAC,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,gBAAgB,CAAC;IAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;IAAC,SAAS,CAAC,EAAE,YAAY,CAAA;CAAE,GACvG,OAAO,CAAC;IAAE,OAAO,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,gBAAgB,CAAA;CAAE,CAAC,CAEhE"}
+{"version":3,"file":"test_utils.d.ts","sourceRoot":"","sources":["../../src/tx_validator/test_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAgB,KAAK,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEzD,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,EAAE,EACN,KAAK,EAAE,MAAM,EACb,SAAS,EAAE;IAAE,OAAO,CAAC,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,gBAAgB,CAAC;IAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;IAAC,SAAS,CAAC,EAAE,YAAY,CAAA;CAAE,GACvG,OAAO,CAAC,YAAY,CAAC,CAEvB;AAED,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,EAAE,EACN,KAAK,EAAE,MAAM,EACb,SAAS,EAAE;IAAE,OAAO,CAAC,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,gBAAgB,CAAC;IAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;IAAC,SAAS,CAAC,EAAE,YAAY,CAAA;CAAE,GACvG,OAAO,CAAC,YAAY,CAAC,CAEvB"}

package/dest/tx_validator/test_utils.js

@@ -1,4 +1,4 @@
-import { computeVarArgsHash } from '@aztec/stdlib/hash';
+import { HashedValues } from '@aztec/stdlib/tx';
 export function patchNonRevertibleFn(tx, index, overrides) {
     return patchFn('nonRevertibleAccumulatedData', tx, index, overrides);
 }
@@ -6,21 +6,17 @@ export function patchRevertibleFn(tx, index, overrides) {
     return patchFn('revertibleAccumulatedData', tx, index, overrides);
 }
 async function patchFn(where, tx, index, overrides) {
-    const fn = tx.enqueuedPublicFunctionCalls.at(-1 * index - 1);
-    fn.callContext.contractAddress = overrides.address ?? fn.callContext.contractAddress;
-    fn.callContext.functionSelector = overrides.selector;
-    fn.args = overrides.args ?? fn.args;
-    fn.callContext.msgSender = overrides.msgSender ?? fn.callContext.msgSender;
-    tx.enqueuedPublicFunctionCalls[index] = fn;
+    const calldataIndex = where === 'nonRevertibleAccumulatedData' ? index : index + tx.data.forPublic.nonRevertibleAccumulatedData.publicCallRequests.length;
+    const calldata = [
+        overrides.selector.toField(),
+        ...overrides.args ?? []
+    ];
+    const hashedCalldata = await HashedValues.fromCalldata(calldata);
+    tx.publicFunctionCalldata[calldataIndex] = hashedCalldata;
     const request = tx.data.forPublic[where].publicCallRequests[index];
-    request.contractAddress = fn.callContext.contractAddress;
-    request.msgSender = fn.callContext.msgSender;
-    request.functionSelector = fn.callContext.functionSelector;
-    request.isStaticCall = fn.callContext.isStaticCall;
-    request.argsHash = await computeVarArgsHash(fn.args);
+    request.contractAddress = overrides.address ?? request.contractAddress;
+    request.msgSender = overrides.msgSender ?? request.msgSender;
+    request.calldataHash = hashedCalldata.hash;
     tx.data.forPublic[where].publicCallRequests[index] = request;
-    return {
-        address: fn.callContext.contractAddress,
-        selector: fn.callContext.functionSelector
-    };
+    return request.contractAddress;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/sequencer-client",
-  "version": "0.82.0",
+  "version": "0.82.1-alpha-testnet.1",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -28,36 +28,36 @@
     "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
   },
   "dependencies": {
-    "@aztec/aztec.js": "0.82.0",
-    "@aztec/bb-prover": "0.82.0",
-    "@aztec/blob-lib": "0.82.0",
-    "@aztec/blob-sink": "0.82.0",
-    "@aztec/constants": "0.82.0",
-    "@aztec/epoch-cache": "0.82.0",
-    "@aztec/ethereum": "0.82.0",
-    "@aztec/foundation": "0.82.0",
-    "@aztec/l1-artifacts": "0.82.0",
-    "@aztec/merkle-tree": "0.82.0",
-    "@aztec/noir-acvm_js": "0.82.0",
-    "@aztec/noir-contracts.js": "0.82.0",
-    "@aztec/noir-protocol-circuits-types": "0.82.0",
-    "@aztec/noir-types": "0.82.0",
-    "@aztec/p2p": "0.82.0",
-    "@aztec/protocol-contracts": "0.82.0",
-    "@aztec/prover-client": "0.82.0",
-    "@aztec/simulator": "0.82.0",
-    "@aztec/stdlib": "0.82.0",
-    "@aztec/telemetry-client": "0.82.0",
-    "@aztec/validator-client": "0.82.0",
-    "@aztec/world-state": "0.82.0",
+    "@aztec/aztec.js": "0.82.1-alpha-testnet.1",
+    "@aztec/bb-prover": "0.82.1-alpha-testnet.1",
+    "@aztec/blob-lib": "0.82.1-alpha-testnet.1",
+    "@aztec/blob-sink": "0.82.1-alpha-testnet.1",
+    "@aztec/constants": "0.82.1-alpha-testnet.1",
+    "@aztec/epoch-cache": "0.82.1-alpha-testnet.1",
+    "@aztec/ethereum": "0.82.1-alpha-testnet.1",
+    "@aztec/foundation": "0.82.1-alpha-testnet.1",
+    "@aztec/l1-artifacts": "0.82.1-alpha-testnet.1",
+    "@aztec/merkle-tree": "0.82.1-alpha-testnet.1",
+    "@aztec/noir-acvm_js": "0.82.1-alpha-testnet.1",
+    "@aztec/noir-contracts.js": "0.82.1-alpha-testnet.1",
+    "@aztec/noir-protocol-circuits-types": "0.82.1-alpha-testnet.1",
+    "@aztec/noir-types": "0.82.1-alpha-testnet.1",
+    "@aztec/p2p": "0.82.1-alpha-testnet.1",
+    "@aztec/protocol-contracts": "0.82.1-alpha-testnet.1",
+    "@aztec/prover-client": "0.82.1-alpha-testnet.1",
+    "@aztec/simulator": "0.82.1-alpha-testnet.1",
+    "@aztec/stdlib": "0.82.1-alpha-testnet.1",
+    "@aztec/telemetry-client": "0.82.1-alpha-testnet.1",
+    "@aztec/validator-client": "0.82.1-alpha-testnet.1",
+    "@aztec/world-state": "0.82.1-alpha-testnet.1",
     "lodash.chunk": "^4.2.0",
     "lodash.pick": "^4.4.0",
     "tslib": "^2.4.0",
     "viem": "2.23.7"
   },
   "devDependencies": {
-    "@aztec/archiver": "0.82.0",
-    "@aztec/kv-store": "0.82.0",
+    "@aztec/archiver": "0.82.1-alpha-testnet.1",
+    "@aztec/kv-store": "0.82.1-alpha-testnet.1",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/levelup": "^5.1.2",

package/src/tx_validator/gas_validator.ts

@@ -1,7 +1,7 @@
 import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice';
-import { getExecutionRequestsByPhase } from '@aztec/simulator/server';
+import { getCallRequestsWithCalldataByPhase } from '@aztec/simulator/server';
 import { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { GasFees } from '@aztec/stdlib/gas';
@@ -68,26 +68,25 @@ export class GasTxValidator implements TxValidator<Tx> {
     );
 
     // If there is a claim in this tx that increases the fee payer balance in Fee Juice, add it to balance
-    const setupFns = getExecutionRequestsByPhase(tx, TxExecutionPhase.SETUP);
+    const setupFns = getCallRequestsWithCalldataByPhase(tx, TxExecutionPhase.SETUP);
     const increasePublicBalanceSelector = await FunctionSelector.fromSignature(
       '_increase_public_balance((Field),u128)',
     );
+
+    // Arguments of the claim function call:
+    // - args[0]: Amount recipient.
+    // - args[1]: Amount being claimed.
     const claimFunctionCall = setupFns.find(
       fn =>
-        fn.callContext.contractAddress.equals(this.#feeJuiceAddress) &&
-        fn.callContext.msgSender.equals(this.#feeJuiceAddress) &&
-        fn.args.length > 2 &&
-        // Public functions get routed through the dispatch function, whose first argument is the target function selector.
-        fn.args[0].equals(increasePublicBalanceSelector.toField()) &&
-        fn.args[1].equals(feePayer.toField()) &&
-        !fn.callContext.isStaticCall,
+        fn.request.contractAddress.equals(this.#feeJuiceAddress) &&
+        fn.request.msgSender.equals(this.#feeJuiceAddress) &&
+        fn.calldata.length > 2 &&
+        fn.functionSelector.equals(increasePublicBalanceSelector) &&
+        fn.args[0].equals(feePayer.toField()) &&
+        !fn.request.isStaticCall,
     );
 
-    // The claim amount is at index 2 in the args array because:
-    // - Index 0: Target function selector (due to dispatch routing)
-    // - Index 1: Amount recipient
-    // - Index 2: Amount being claimed
-    const balance = claimFunctionCall ? initialBalance.add(claimFunctionCall.args[2]) : initialBalance;
+    const balance = claimFunctionCall ? initialBalance.add(claimFunctionCall.args[1]) : initialBalance;
     if (balance.lt(feeLimit)) {
       this.#log.warn(`Rejecting transaction due to not enough fee payer balance`, {
         feePayer,

package/src/tx_validator/phases_validator.ts

@@ -1,9 +1,9 @@
 import { createLogger } from '@aztec/foundation/log';
-import { PublicContractsDB, getExecutionRequestsByPhase } from '@aztec/simulator/server';
+import { PublicContractsDB, getCallRequestsWithCalldataByPhase } from '@aztec/simulator/server';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
 import type { AllowedElement } from '@aztec/stdlib/interfaces/server';
 import {
-  type PublicExecutionRequest,
+  PublicCallRequestWithCalldata,
   Tx,
   TxExecutionPhase,
   type TxValidationResult,
@@ -32,13 +32,13 @@ export class PhasesTxValidator implements TxValidator<Tx> {
         return { result: 'valid' };
       }
 
-      const setupFns = getExecutionRequestsByPhase(tx, TxExecutionPhase.SETUP);
+      const setupFns = getCallRequestsWithCalldataByPhase(tx, TxExecutionPhase.SETUP);
       for (const setupFn of setupFns) {
         if (!(await this.isOnAllowList(setupFn, this.setupAllowList))) {
           this.#log.warn(
             `Rejecting tx ${await Tx.getHash(tx)} because it calls setup function not on allow list: ${
-              setupFn.callContext.contractAddress
-            }:${setupFn.callContext.functionSelector}`,
+              setupFn.request.contractAddress
+            }:${setupFn.functionSelector}`,
             { allowList: this.setupAllowList },
           );
 
@@ -52,12 +52,16 @@ export class PhasesTxValidator implements TxValidator<Tx> {
     }
   }
 
-  async isOnAllowList(publicCall: PublicExecutionRequest, allowList: AllowedElement[]): Promise<boolean> {
+  private async isOnAllowList(
+    publicCall: PublicCallRequestWithCalldata,
+    allowList: AllowedElement[],
+  ): Promise<boolean> {
     if (publicCall.isEmpty()) {
       return true;
     }
 
-    const { contractAddress, functionSelector } = publicCall.callContext;
+    const contractAddress = publicCall.request.contractAddress;
+    const functionSelector = publicCall.functionSelector;
 
     // do these checks first since they don't require the contract class
     for (const entry of allowList) {

package/src/tx_validator/test_utils.ts

@@ -1,14 +1,13 @@
 import type { Fr } from '@aztec/foundation/fields';
 import type { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { computeVarArgsHash } from '@aztec/stdlib/hash';
-import type { Tx } from '@aztec/stdlib/tx';
+import { HashedValues, type Tx } from '@aztec/stdlib/tx';
 
 export function patchNonRevertibleFn(
   tx: Tx,
   index: number,
   overrides: { address?: AztecAddress; selector: FunctionSelector; args?: Fr[]; msgSender?: AztecAddress },
-): Promise<{ address: AztecAddress; selector: FunctionSelector }> {
+): Promise<AztecAddress> {
   return patchFn('nonRevertibleAccumulatedData', tx, index, overrides);
 }
 
@@ -16,7 +15,7 @@ export function patchRevertibleFn(
   tx: Tx,
   index: number,
   overrides: { address?: AztecAddress; selector: FunctionSelector; args?: Fr[]; msgSender?: AztecAddress },
-): Promise<{ address: AztecAddress; selector: FunctionSelector }> {
+): Promise<AztecAddress> {
   return patchFn('revertibleAccumulatedData', tx, index, overrides);
 }
 
@@ -25,24 +24,20 @@ async function patchFn(
   tx: Tx,
   index: number,
   overrides: { address?: AztecAddress; selector: FunctionSelector; args?: Fr[]; msgSender?: AztecAddress },
-): Promise<{ address: AztecAddress; selector: FunctionSelector }> {
-  const fn = tx.enqueuedPublicFunctionCalls.at(-1 * index - 1)!;
-  fn.callContext.contractAddress = overrides.address ?? fn.callContext.contractAddress;
-  fn.callContext.functionSelector = overrides.selector;
-  fn.args = overrides.args ?? fn.args;
-  fn.callContext.msgSender = overrides.msgSender ?? fn.callContext.msgSender;
-  tx.enqueuedPublicFunctionCalls[index] = fn;
+): Promise<AztecAddress> {
+  const calldataIndex =
+    where === 'nonRevertibleAccumulatedData'
+      ? index
+      : index + tx.data.forPublic!.nonRevertibleAccumulatedData.publicCallRequests.length;
+  const calldata = [overrides.selector.toField(), ...(overrides.args ?? [])];
+  const hashedCalldata = await HashedValues.fromCalldata(calldata);
+  tx.publicFunctionCalldata[calldataIndex] = hashedCalldata;
 
   const request = tx.data.forPublic![where].publicCallRequests[index];
-  request.contractAddress = fn.callContext.contractAddress;
-  request.msgSender = fn.callContext.msgSender;
-  request.functionSelector = fn.callContext.functionSelector;
-  request.isStaticCall = fn.callContext.isStaticCall;
-  request.argsHash = await computeVarArgsHash(fn.args);
+  request.contractAddress = overrides.address ?? request.contractAddress;
+  request.msgSender = overrides.msgSender ?? request.msgSender;
+  request.calldataHash = hashedCalldata.hash;
   tx.data.forPublic![where].publicCallRequests[index] = request;
 
-  return {
-    address: fn.callContext.contractAddress,
-    selector: fn.callContext.functionSelector,
-  };
+  return request.contractAddress;
 }