@aztec/sequencer-client 0.83.1 → 0.84.0-alpha-testnet.1

package/dest/config.d.ts

@@ -1,6 +1,7 @@
 import { type L1ContractsConfig, type L1ReaderConfig } from '@aztec/ethereum';
 import { type ConfigMappingsType } from '@aztec/foundation/config';
-import { type AllowedElement, type ChainConfig, type SequencerConfig } from '@aztec/stdlib/config';
+import { type P2PConfig } from '@aztec/p2p';
+import { type ChainConfig, type SequencerConfig } from '@aztec/stdlib/config';
 import { type ValidatorClientConfig } from '@aztec/validator-client';
 import { type PublisherConfig, type TxSenderConfig } from './publisher/config.js';
 export * from './publisher/config.js';
@@ -8,23 +9,11 @@ export type { SequencerConfig };
 /**
  * Configuration settings for the SequencerClient.
  */
-export type SequencerClientConfig = PublisherConfig & ValidatorClientConfig & TxSenderConfig & SequencerConfig & L1ReaderConfig & ChainConfig & Pick<L1ContractsConfig, 'ethereumSlotDuration' | 'aztecSlotDuration' | 'aztecEpochDuration'>;
+export type SequencerClientConfig = PublisherConfig & ValidatorClientConfig & TxSenderConfig & SequencerConfig & L1ReaderConfig & ChainConfig & Pick<P2PConfig, 'txPublicSetupAllowList'> & Pick<L1ContractsConfig, 'ethereumSlotDuration' | 'aztecSlotDuration' | 'aztecEpochDuration'>;
 export declare const sequencerConfigMappings: ConfigMappingsType<SequencerConfig>;
 export declare const sequencerClientConfigMappings: ConfigMappingsType<SequencerClientConfig>;
 /**
  * Creates an instance of SequencerClientConfig out of environment variables using sensible defaults for integration testing if not set.
  */
 export declare function getConfigEnvVars(): SequencerClientConfig;
-/**
- * Parses a string to a list of allowed elements.
- * Each encoded is expected to be of one of the following formats
- * `I:${address}`
- * `I:${address}:${selector}`
- * `C:${classId}`
- * `C:${classId}:${selector}`
- *
- * @param value The string to parse
- * @returns A list of allowed elements
- */
-export declare function parseSequencerAllowList(value: string): AllowedElement[];
 //# sourceMappingURL=config.d.ts.map

package/dest/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAGpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAuB,MAAM,sBAAsB,CAAC;AACxH,OAAO,EAAE,KAAK,qBAAqB,EAAiC,MAAM,yBAAyB,CAAC;AAEpG,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAGpB,MAAM,uBAAuB,CAAC;AAE/B,cAAc,uBAAuB,CAAC;AACtC,YAAY,EAAE,eAAe,EAAE,CAAC;AAEhC;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,eAAe,GACjD,qBAAqB,GACrB,cAAc,GACd,eAAe,GACf,cAAc,GACd,WAAW,GACX,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,GAAG,mBAAmB,GAAG,oBAAoB,CAAC,CAAC;AAE/F,eAAO,MAAM,uBAAuB,EAAE,kBAAkB,CAAC,eAAe,CAyEvE,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,CAQnF,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CAExD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,EAAE,CAqCvE"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAGpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,YAAY,CAAC;AAE/D,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAuB,MAAM,sBAAsB,CAAC;AACnG,OAAO,EAAE,KAAK,qBAAqB,EAAiC,MAAM,yBAAyB,CAAC;AAEpG,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAGpB,MAAM,uBAAuB,CAAC;AAE/B,cAAc,uBAAuB,CAAC;AACtC,YAAY,EAAE,eAAe,EAAE,CAAC;AAEhC;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,eAAe,GACjD,qBAAqB,GACrB,cAAc,GACd,eAAe,GACf,cAAc,GACd,WAAW,GACX,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,GACzC,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,GAAG,mBAAmB,GAAG,oBAAoB,CAAC,CAAC;AAE/F,eAAO,MAAM,uBAAuB,EAAE,kBAAkB,CAAC,eAAe,CAmEvE,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,CAQnF,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CAExD"}

package/dest/config.js

@@ -1,8 +1,7 @@
 import { l1ContractsConfigMappings, l1ReaderConfigMappings } from '@aztec/ethereum';
 import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, pickConfigMappings } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
-import { FunctionSelector } from '@aztec/stdlib/abi';
+import { p2pConfigMappings } from '@aztec/p2p';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { chainConfigMappings } from '@aztec/stdlib/config';
 import { validatorClientConfigMappings } from '@aztec/validator-client';
@@ -52,12 +51,6 @@ export const sequencerConfigMappings = {
         env: 'ACVM_BINARY_PATH',
         description: 'The path to the ACVM binary'
     },
-    allowedInSetup: {
-        env: 'SEQ_ALLOWED_SETUP_FN',
-        parseEnv: (val)=>parseSequencerAllowList(val),
-        description: 'The list of functions calls allowed to run in setup',
-        printDefault: ()=>'AuthRegistry, FeeJuice.increase_public_balance, Token.increase_public_balance, FPC.prepare_fee'
-    },
     maxBlockSizeInBytes: {
         env: 'SEQ_MAX_BLOCK_SIZE_IN_BYTES',
         description: 'Max block size',
@@ -79,7 +72,10 @@ export const sequencerConfigMappings = {
         env: 'SEQ_MAX_L1_TX_INCLUSION_TIME_INTO_SLOT',
         description: 'How many seconds into an L1 slot we can still send a tx and get it mined.',
         parseEnv: (val)=>val ? parseInt(val, 10) : undefined
-    }
+    },
+    ...pickConfigMappings(p2pConfigMappings, [
+        'txPublicSetupAllowList'
+    ])
 };
 export const sequencerClientConfigMappings = {
     ...validatorClientConfigMappings,
@@ -99,47 +95,3 @@ export const sequencerClientConfigMappings = {
  */ export function getConfigEnvVars() {
     return getConfigFromMappings(sequencerClientConfigMappings);
 }
-/**
- * Parses a string to a list of allowed elements.
- * Each encoded is expected to be of one of the following formats
- * `I:${address}`
- * `I:${address}:${selector}`
- * `C:${classId}`
- * `C:${classId}:${selector}`
- *
- * @param value The string to parse
- * @returns A list of allowed elements
- */ export function parseSequencerAllowList(value) {
-    const entries = [];
-    if (!value) {
-        return entries;
-    }
-    for (const val of value.split(',')){
-        const [typeString, identifierString, selectorString] = val.split(':');
-        const selector = selectorString !== undefined ? FunctionSelector.fromString(selectorString) : undefined;
-        if (typeString === 'I') {
-            if (selector) {
-                entries.push({
-                    address: AztecAddress.fromString(identifierString),
-                    selector
-                });
-            } else {
-                entries.push({
-                    address: AztecAddress.fromString(identifierString)
-                });
-            }
-        } else if (typeString === 'C') {
-            if (selector) {
-                entries.push({
-                    classId: Fr.fromHexString(identifierString),
-                    selector
-                });
-            } else {
-                entries.push({
-                    classId: Fr.fromHexString(identifierString)
-                });
-            }
-        }
-    }
-    return entries;
-}

package/dest/index.d.ts

@@ -3,6 +3,6 @@ export * from './config.js';
 export * from './publisher/index.js';
 export * from './tx_validator/tx_validator_factory.js';
 export * from './slasher/index.js';
-export { Sequencer, SequencerState, getDefaultAllowedSetupFunctions } from './sequencer/index.js';
+export { Sequencer, SequencerState } from './sequencer/index.js';
 export * from './global_variable_builder/index.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,wCAAwC,CAAC;AACvD,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,+BAA+B,EAAE,MAAM,sBAAsB,CAAC;AAIlG,cAAc,oCAAoC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,wCAAwC,CAAC;AACvD,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAIjE,cAAc,oCAAoC,CAAC"}

package/dest/index.js

@@ -3,7 +3,7 @@ export * from './config.js';
 export * from './publisher/index.js';
 export * from './tx_validator/tx_validator_factory.js';
 export * from './slasher/index.js';
-export { Sequencer, SequencerState, getDefaultAllowedSetupFunctions } from './sequencer/index.js';
+export { Sequencer, SequencerState } from './sequencer/index.js';
 // Used by the node to simulate public parts of transactions. Should these be moved to a shared library?
 // ISSUE(#9832)
 export * from './global_variable_builder/index.js';

package/dest/sequencer/index.d.ts

@@ -1,4 +1,3 @@
 export * from './config.js';
 export * from './sequencer.js';
-export * from './allowed.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sequencer/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sequencer/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC"}

package/dest/sequencer/index.js

@@ -1,3 +1,2 @@
 export * from './config.js';
 export * from './sequencer.js';
-export * from './allowed.js';

package/dest/sequencer/sequencer.d.ts

@@ -59,7 +59,7 @@ export declare class Sequencer {
     private _coinbase;
     private _feeRecipient;
     private state;
-    private allowedInSetup;
+    private txPublicSetupAllowList;
     private maxBlockSizeInBytes;
     private maxBlockGas;
     private metrics;

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

@@ -1 +1 @@
-{"version":3,"file":"sequencer.d.ts","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sequencer.d.ts","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAG/C,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,EAAW,MAAM,yBAAyB,CAAC;AAC5E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAGL,KAAK,sBAAsB,EAE5B,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAInE,OAAO,EAGL,KAAK,eAAe,EAEpB,EAAE,EACF,KAAK,MAAM,EACZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAGL,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AAC1F,OAAO,EAAE,KAAK,kBAAkB,EAAY,MAAM,qCAAqC,CAAC;AACxF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,EAAE,kBAAkB,EAAyB,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAqB,MAAM,YAAY,CAAC;AAE/D,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B,KAAK,wBAAwB,GAAG,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,GAAG,eAAe,GAAG,cAAc,CAAC,CAAC;AAEnH;;;;;;;;GAQG;AACH,qBAAa,SAAS;IAuBlB,SAAS,CAAC,SAAS,EAAE,kBAAkB;IACvC,SAAS,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS;IACtD,SAAS,CAAC,cAAc,EAAE,qBAAqB;IAC/C,SAAS,CAAC,SAAS,EAAE,GAAG;IACxB,SAAS,CAAC,UAAU,EAAE,sBAAsB;IAC5C,SAAS,CAAC,aAAa,EAAE,aAAa;IACtC,SAAS,CAAC,mBAAmB,EAAE,mBAAmB;IAClD,SAAS,CAAC,aAAa,EAAE,aAAa;IACtC,SAAS,CAAC,mBAAmB,EAAE,mBAAmB;IAClD,SAAS,CAAC,sBAAsB,EAAE,sBAAsB;IACxD,SAAS,CAAC,kBAAkB,EAAE,kBAAkB;IAChD,SAAS,CAAC,WAAW,EAAE,wBAAwB;IAC/C,SAAS,CAAC,YAAY,EAAE,YAAY;IACpC,SAAS,CAAC,MAAM,EAAE,eAAe;IAEjC,SAAS,CAAC,GAAG;IArCf,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,iBAAiB,CAAgB;IACzC,OAAO,CAAC,cAAc,CAAM;IAC5B,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,4BAA4B,CAAK;IAEzC,OAAO,CAAC,SAAS,CAAmB;IACpC,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,KAAK,CAA0B;IACvC,OAAO,CAAC,sBAAsB,CAAwB;IACtD,OAAO,CAAC,mBAAmB,CAAuB;IAClD,OAAO,CAAC,WAAW,CAA8B;IACjD,OAAO,CAAC,OAAO,CAAmB;IAClC,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,UAAU,CAAkB;IAEpC,+GAA+G;IAC/G,SAAS,CAAC,SAAS,EAAG,kBAAkB,CAAC;IAEzC,SAAS,CAAC,gBAAgB,EAAE,OAAO,CAAS;gBAGhC,SAAS,EAAE,kBAAkB,EAC7B,eAAe,EAAE,eAAe,GAAG,SAAS,EAAE,wDAAwD;IACtG,cAAc,EAAE,qBAAqB,EACrC,SAAS,EAAE,GAAG,EACd,UAAU,EAAE,sBAAsB,EAClC,aAAa,EAAE,aAAa,EAC5B,mBAAmB,EAAE,mBAAmB,EACxC,aAAa,EAAE,aAAa,EAC5B,mBAAmB,EAAE,mBAAmB,EACxC,sBAAsB,EAAE,sBAAsB,EAC9C,kBAAkB,EAAE,kBAAkB,EACtC,WAAW,EAAE,wBAAwB,EACrC,YAAY,EAAE,YAAY,EAC1B,MAAM,GAAE,eAAoB,EACtC,SAAS,GAAE,eAAsC,EACvC,GAAG,mCAA4B;IAc3C,IAAI,MAAM,IAAI,MAAM,CAEnB;IAEM,mBAAmB;IAI1B;;;OAGG;IACU,YAAY,CAAC,MAAM,EAAE,eAAe;IAmDjD,OAAO,CAAC,YAAY;IAYpB;;OAEG;IACU,KAAK;IASlB;;OAEG;IACU,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAWlC;;OAEG;IACI,OAAO;IAOd;;;OAGG;IACI,MAAM;;;IAIb,uGAAuG;IAChG,KAAK;IAIZ;;;;;;;OAOG;cACa,UAAU;cA6FV,IAAI;IAeb,mBAAmB;IAI1B;;;;;OAKG;IACG,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAiBnG;;;;;;;;OAQG;IACH,QAAQ,CAAC,aAAa,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,EAAE,KAAK,GAAE,OAAe;IAWzF;;;;;;;;;OASG;cACa,UAAU,CACxB,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,EAAE,CAAC,EAC5C,kBAAkB,EAAE,eAAe,EACnC,IAAI,GAAE;QAAE,YAAY,CAAC,EAAE,OAAO,CAAA;KAAO;;;;;;;;;IAgIvC;;;;;;;;OAQG;YAIW,2BAA2B;cAkEzB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC;IA6CzG;;;OAGG;cAIa,qBAAqB,CACnC,KAAK,EAAE,OAAO,EACd,YAAY,CAAC,EAAE,SAAS,EAAE,EAC1B,QAAQ,CAAC,EAAE,MAAM,EAAE,GAClB,OAAO,CAAC,IAAI,CAAC;IAiBhB;;;;OAIG;cACa,WAAW,IAAI,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,EAAE,CAAA;KAAE,GAAG,SAAS,CAAC;IAsDxF,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,kBAAkB;IAK1B,IAAI,iBAAiB,WAEpB;IAED,IAAI,QAAQ,IAAI,UAAU,CAEzB;IAED,IAAI,YAAY,IAAI,YAAY,CAE/B;IAED,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAEtC;CACF"}

package/dest/sequencer/sequencer.js

@@ -11,6 +11,7 @@ import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { Timer, elapsed } from '@aztec/foundation/timer';
+import { getDefaultAllowedSetupFunctions } from '@aztec/p2p/msg_validators';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { Gas } from '@aztec/stdlib/gas';
 import { SequencerConfigSchema } from '@aztec/stdlib/interfaces/server';
@@ -20,7 +21,6 @@ import { BlockHeader, ContentCommitment, StateReference, Tx } from '@aztec/stdli
 import { Attributes, L1Metrics, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { VoteType } from '../publisher/sequencer-publisher.js';
 import { createValidatorForBlockBuilding } from '../tx_validator/tx_validator_factory.js';
-import { getDefaultAllowedSetupFunctions } from './allowed.js';
 import { SequencerMetrics } from './metrics.js';
 import { SequencerTimetable, SequencerTooSlowError } from './timetable.js';
 import { SequencerState, orderAttestations } from './utils.js';
@@ -58,7 +58,7 @@ export { SequencerState };
     _coinbase;
     _feeRecipient;
     state;
-    allowedInSetup;
+    txPublicSetupAllowList;
     maxBlockSizeInBytes;
     maxBlockGas;
     metrics;
@@ -89,7 +89,7 @@ export { SequencerState };
         this._coinbase = EthAddress.ZERO;
         this._feeRecipient = AztecAddress.ZERO;
         this.state = SequencerState.STOPPED;
-        this.allowedInSetup = [];
+        this.txPublicSetupAllowList = [];
         this.maxBlockSizeInBytes = 1024 * 1024;
         this.maxBlockGas = new Gas(100e9, 100e9);
         this.isFlushing = false;
@@ -113,7 +113,7 @@ export { SequencerState };
    * Updates sequencer config.
    * @param config - New parameters.
    */ async updateConfig(config) {
-        this.log.info(`Sequencer config set`, omit(pickFromSchema(config, SequencerConfigSchema), 'allowedInSetup'));
+        this.log.info(`Sequencer config set`, omit(pickFromSchema(config, SequencerConfigSchema), 'txPublicSetupAllowList'));
         if (config.transactionPollingIntervalMS !== undefined) {
             this.pollingIntervalMs = config.transactionPollingIntervalMS;
         }
@@ -135,10 +135,10 @@ export { SequencerState };
         if (config.feeRecipient) {
             this._feeRecipient = config.feeRecipient;
         }
-        if (config.allowedInSetup) {
-            this.allowedInSetup = config.allowedInSetup;
+        if (config.txPublicSetupAllowList) {
+            this.txPublicSetupAllowList = config.txPublicSetupAllowList;
         } else {
-            this.allowedInSetup = await getDefaultAllowedSetupFunctions();
+            this.txPublicSetupAllowList = await getDefaultAllowedSetupFunctions();
         }
         if (config.maxBlockSizeInBytes !== undefined) {
             this.maxBlockSizeInBytes = config.maxBlockSizeInBytes;
@@ -370,7 +370,7 @@ export { SequencerState };
                 now: new Date(this.dateProvider.now()),
                 deadline
             });
-            const validator = createValidatorForBlockBuilding(publicProcessorDBFork, this.contractDataSource, newGlobalVariables, this.allowedInSetup);
+            const validator = createValidatorForBlockBuilding(publicProcessorDBFork, this.contractDataSource, newGlobalVariables, this.txPublicSetupAllowList);
             // TODO(#11000): Public processor should just handle processing, one tx at a time. It should be responsibility
             // of the sequencer to update world state and iterate over txs. We should refactor this along with unifying the
             // publicProcessorFork and orchestratorFork, to avoid doing tree insertions twice when building the block.

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

@@ -1 +1 @@
-{"version":3,"file":"tx_validator_factory.d.ts","sourceRoot":"","sources":["../../src/tx_validator/tx_validator_factory.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAC7B,wBAAwB,EACzB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI9E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,wBAAgB,8BAA8B,CAC5C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,QAAQ,EAAE,6BAA6B,GAAG,SAAS,EACnD,EACE,WAAW,EACX,SAAS,EACT,aAAa,EACb,cAAc,EACd,OAAO,EACP,kBAAkB,GACnB,EAAE;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,cAAc,EAAE,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,GACA,WAAW,CAAC,EAAE,CAAC,CAkBjB;AAED,wBAAgB,+BAA+B,CAC7C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,cAAc,EAAE,GAC/B;IACD,mBAAmB,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;IACrC,cAAc,EAAE,cAAc,CAAC;CAChC,CAgBA"}
+{"version":3,"file":"tx_validator_factory.d.ts","sourceRoot":"","sources":["../../src/tx_validator/tx_validator_factory.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAC7B,wBAAwB,EACzB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG9E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,wBAAgB,8BAA8B,CAC5C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,QAAQ,EAAE,6BAA6B,GAAG,SAAS,EACnD,EACE,WAAW,EACX,SAAS,EACT,aAAa,EACb,cAAc,EACd,OAAO,EACP,kBAAkB,GACnB,EAAE;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,cAAc,EAAE,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,GACA,WAAW,CAAC,EAAE,CAAC,CAkBjB;AAED,wBAAgB,+BAA+B,CAC7C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,cAAc,EAAE,GAC/B;IACD,mBAAmB,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;IACrC,cAAc,EAAE,cAAc,CAAC;CAChC,CAgBA"}

package/dest/tx_validator/tx_validator_factory.js

@@ -1,12 +1,9 @@
-import { MerkleTreeId } from '@aztec/aztec.js';
 import { Fr } from '@aztec/foundation/fields';
-import { AggregateTxValidator, BlockHeaderTxValidator, DataTxValidator, DoubleSpendTxValidator, MetadataTxValidator, TxProofValidator } from '@aztec/p2p';
+import { AggregateTxValidator, BlockHeaderTxValidator, DataTxValidator, DoubleSpendTxValidator, GasTxValidator, MetadataTxValidator, PhasesTxValidator, TxProofValidator } from '@aztec/p2p';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
+import { DatabasePublicStateSource } from '@aztec/stdlib/trees';
 import { ArchiveCache } from './archive_cache.js';
-import { GasTxValidator } from './gas_validator.js';
 import { NullifierCache } from './nullifier_cache.js';
-import { PhasesTxValidator } from './phases_validator.js';
 export function createValidatorForAcceptingTxs(db, contractDataSource, verifier, { blockNumber, l1ChainId, rollupVersion, setupAllowList, gasFees, skipFeeEnforcement }) {
     const validators = [
         new DataTxValidator(),
@@ -32,21 +29,6 @@ export function createValidatorForBlockBuilding(db, contractDataSource, globalVa
         nullifierCache
     };
 }
-class DatabasePublicStateSource {
-    db;
-    constructor(db){
-        this.db = db;
-    }
-    async storageRead(contractAddress, slot) {
-        const leafSlot = (await computePublicDataTreeLeafSlot(contractAddress, slot)).toBigInt();
-        const lowLeafResult = await this.db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
-        if (!lowLeafResult || !lowLeafResult.alreadyPresent) {
-            return Fr.ZERO;
-        }
-        const preimage = await this.db.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
-        return preimage.leaf.value;
-    }
-}
 function preprocessValidator(nullifierCache, archiveCache, publicStateSource, contractDataSource, globalVariables, setupAllowList) {
     // We don't include the TxProofValidator nor the DataTxValidator here because they are already checked by the time we get to block building.
     return new AggregateTxValidator(new MetadataTxValidator(globalVariables.chainId, globalVariables.version, globalVariables.blockNumber), new DoubleSpendTxValidator(nullifierCache), new PhasesTxValidator(contractDataSource, setupAllowList, globalVariables.blockNumber.toNumber()), new GasTxValidator(publicStateSource, ProtocolContractAddress.FeeJuice, globalVariables.gasFees), new BlockHeaderTxValidator(archiveCache));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/sequencer-client",
-  "version": "0.83.1",
+  "version": "0.84.0-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.83.1",
-    "@aztec/bb-prover": "0.83.1",
-    "@aztec/blob-lib": "0.83.1",
-    "@aztec/blob-sink": "0.83.1",
-    "@aztec/constants": "0.83.1",
-    "@aztec/epoch-cache": "0.83.1",
-    "@aztec/ethereum": "0.83.1",
-    "@aztec/foundation": "0.83.1",
-    "@aztec/l1-artifacts": "0.83.1",
-    "@aztec/merkle-tree": "0.83.1",
-    "@aztec/noir-acvm_js": "0.83.1",
-    "@aztec/noir-contracts.js": "0.83.1",
-    "@aztec/noir-protocol-circuits-types": "0.83.1",
-    "@aztec/noir-types": "0.83.1",
-    "@aztec/p2p": "0.83.1",
-    "@aztec/protocol-contracts": "0.83.1",
-    "@aztec/prover-client": "0.83.1",
-    "@aztec/simulator": "0.83.1",
-    "@aztec/stdlib": "0.83.1",
-    "@aztec/telemetry-client": "0.83.1",
-    "@aztec/validator-client": "0.83.1",
-    "@aztec/world-state": "0.83.1",
+    "@aztec/aztec.js": "0.84.0-alpha-testnet.1",
+    "@aztec/bb-prover": "0.84.0-alpha-testnet.1",
+    "@aztec/blob-lib": "0.84.0-alpha-testnet.1",
+    "@aztec/blob-sink": "0.84.0-alpha-testnet.1",
+    "@aztec/constants": "0.84.0-alpha-testnet.1",
+    "@aztec/epoch-cache": "0.84.0-alpha-testnet.1",
+    "@aztec/ethereum": "0.84.0-alpha-testnet.1",
+    "@aztec/foundation": "0.84.0-alpha-testnet.1",
+    "@aztec/l1-artifacts": "0.84.0-alpha-testnet.1",
+    "@aztec/merkle-tree": "0.84.0-alpha-testnet.1",
+    "@aztec/noir-acvm_js": "0.84.0-alpha-testnet.1",
+    "@aztec/noir-contracts.js": "0.84.0-alpha-testnet.1",
+    "@aztec/noir-protocol-circuits-types": "0.84.0-alpha-testnet.1",
+    "@aztec/noir-types": "0.84.0-alpha-testnet.1",
+    "@aztec/p2p": "0.84.0-alpha-testnet.1",
+    "@aztec/protocol-contracts": "0.84.0-alpha-testnet.1",
+    "@aztec/prover-client": "0.84.0-alpha-testnet.1",
+    "@aztec/simulator": "0.84.0-alpha-testnet.1",
+    "@aztec/stdlib": "0.84.0-alpha-testnet.1",
+    "@aztec/telemetry-client": "0.84.0-alpha-testnet.1",
+    "@aztec/validator-client": "0.84.0-alpha-testnet.1",
+    "@aztec/world-state": "0.84.0-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.83.1",
-    "@aztec/kv-store": "0.83.1",
+    "@aztec/archiver": "0.84.0-alpha-testnet.1",
+    "@aztec/kv-store": "0.84.0-alpha-testnet.1",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/levelup": "^5.1.2",

package/src/config.ts

@@ -12,10 +12,9 @@ import {
   pickConfigMappings,
 } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
-import { FunctionSelector } from '@aztec/stdlib/abi';
+import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { type AllowedElement, type ChainConfig, type SequencerConfig, chainConfigMappings } from '@aztec/stdlib/config';
+import { type ChainConfig, type SequencerConfig, chainConfigMappings } from '@aztec/stdlib/config';
 import { type ValidatorClientConfig, validatorClientConfigMappings } from '@aztec/validator-client';
 
 import {
@@ -37,6 +36,7 @@ export type SequencerClientConfig = PublisherConfig &
   SequencerConfig &
   L1ReaderConfig &
   ChainConfig &
+  Pick<P2PConfig, 'txPublicSetupAllowList'> &
   Pick<L1ContractsConfig, 'ethereumSlotDuration' | 'aztecSlotDuration' | 'aztecEpochDuration'>;
 
 export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
@@ -83,13 +83,6 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
     env: 'ACVM_BINARY_PATH',
     description: 'The path to the ACVM binary',
   },
-  allowedInSetup: {
-    env: 'SEQ_ALLOWED_SETUP_FN',
-    parseEnv: (val: string) => parseSequencerAllowList(val),
-    description: 'The list of functions calls allowed to run in setup',
-    printDefault: () =>
-      'AuthRegistry, FeeJuice.increase_public_balance, Token.increase_public_balance, FPC.prepare_fee',
-  },
   maxBlockSizeInBytes: {
     env: 'SEQ_MAX_BLOCK_SIZE_IN_BYTES',
     description: 'Max block size',
@@ -112,6 +105,7 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
     description: 'How many seconds into an L1 slot we can still send a tx and get it mined.',
     parseEnv: (val: string) => (val ? parseInt(val, 10) : undefined),
   },
+  ...pickConfigMappings(p2pConfigMappings, ['txPublicSetupAllowList']),
 };
 
 export const sequencerClientConfigMappings: ConfigMappingsType<SequencerClientConfig> = {
@@ -130,53 +124,3 @@ export const sequencerClientConfigMappings: ConfigMappingsType<SequencerClientCo
 export function getConfigEnvVars(): SequencerClientConfig {
   return getConfigFromMappings<SequencerClientConfig>(sequencerClientConfigMappings);
 }
-
-/**
- * Parses a string to a list of allowed elements.
- * Each encoded is expected to be of one of the following formats
- * `I:${address}`
- * `I:${address}:${selector}`
- * `C:${classId}`
- * `C:${classId}:${selector}`
- *
- * @param value The string to parse
- * @returns A list of allowed elements
- */
-export function parseSequencerAllowList(value: string): AllowedElement[] {
-  const entries: AllowedElement[] = [];
-
-  if (!value) {
-    return entries;
-  }
-
-  for (const val of value.split(',')) {
-    const [typeString, identifierString, selectorString] = val.split(':');
-    const selector = selectorString !== undefined ? FunctionSelector.fromString(selectorString) : undefined;
-
-    if (typeString === 'I') {
-      if (selector) {
-        entries.push({
-          address: AztecAddress.fromString(identifierString),
-          selector,
-        });
-      } else {
-        entries.push({
-          address: AztecAddress.fromString(identifierString),
-        });
-      }
-    } else if (typeString === 'C') {
-      if (selector) {
-        entries.push({
-          classId: Fr.fromHexString(identifierString),
-          selector,
-        });
-      } else {
-        entries.push({
-          classId: Fr.fromHexString(identifierString),
-        });
-      }
-    }
-  }
-
-  return entries;
-}

package/src/index.ts

@@ -3,7 +3,7 @@ export * from './config.js';
 export * from './publisher/index.js';
 export * from './tx_validator/tx_validator_factory.js';
 export * from './slasher/index.js';
-export { Sequencer, SequencerState, getDefaultAllowedSetupFunctions } from './sequencer/index.js';
+export { Sequencer, SequencerState } from './sequencer/index.js';
 
 // Used by the node to simulate public parts of transactions. Should these be moved to a shared library?
 // ISSUE(#9832)

package/src/sequencer/index.ts

@@ -1,3 +1,2 @@
 export * from './config.js';
 export * from './sequencer.js';
-export * from './allowed.js';

package/src/sequencer/sequencer.ts

@@ -8,6 +8,7 @@ import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { type DateProvider, Timer, elapsed } from '@aztec/foundation/timer';
 import type { P2P } from '@aztec/p2p';
+import { getDefaultAllowedSetupFunctions } from '@aztec/p2p/msg_validators';
 import type { BlockBuilderFactory } from '@aztec/prover-client/block-builder';
 import type { PublicProcessorFactory } from '@aztec/simulator/server';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -47,7 +48,6 @@ import type { GlobalVariableBuilder } from '../global_variable_builder/global_bu
 import { type SequencerPublisher, VoteType } from '../publisher/sequencer-publisher.js';
 import type { SlasherClient } from '../slasher/slasher_client.js';
 import { createValidatorForBlockBuilding } from '../tx_validator/tx_validator_factory.js';
-import { getDefaultAllowedSetupFunctions } from './allowed.js';
 import type { SequencerConfig } from './config.js';
 import { SequencerMetrics } from './metrics.js';
 import { SequencerTimetable, SequencerTooSlowError } from './timetable.js';
@@ -76,7 +76,7 @@ export class Sequencer {
   private _coinbase = EthAddress.ZERO;
   private _feeRecipient = AztecAddress.ZERO;
   private state = SequencerState.STOPPED;
-  private allowedInSetup: AllowedElement[] = [];
+  private txPublicSetupAllowList: AllowedElement[] = [];
   private maxBlockSizeInBytes: number = 1024 * 1024;
   private maxBlockGas: Gas = new Gas(100e9, 100e9);
   private metrics: SequencerMetrics;
@@ -131,7 +131,10 @@ export class Sequencer {
    * @param config - New parameters.
    */
   public async updateConfig(config: SequencerConfig) {
-    this.log.info(`Sequencer config set`, omit(pickFromSchema(config, SequencerConfigSchema), 'allowedInSetup'));
+    this.log.info(
+      `Sequencer config set`,
+      omit(pickFromSchema(config, SequencerConfigSchema), 'txPublicSetupAllowList'),
+    );
 
     if (config.transactionPollingIntervalMS !== undefined) {
       this.pollingIntervalMs = config.transactionPollingIntervalMS;
@@ -154,10 +157,10 @@ export class Sequencer {
     if (config.feeRecipient) {
       this._feeRecipient = config.feeRecipient;
     }
-    if (config.allowedInSetup) {
-      this.allowedInSetup = config.allowedInSetup;
+    if (config.txPublicSetupAllowList) {
+      this.txPublicSetupAllowList = config.txPublicSetupAllowList;
     } else {
-      this.allowedInSetup = await getDefaultAllowedSetupFunctions();
+      this.txPublicSetupAllowList = await getDefaultAllowedSetupFunctions();
     }
     if (config.maxBlockSizeInBytes !== undefined) {
       this.maxBlockSizeInBytes = config.maxBlockSizeInBytes;
@@ -469,7 +472,7 @@ export class Sequencer {
         publicProcessorDBFork,
         this.contractDataSource,
         newGlobalVariables,
-        this.allowedInSetup,
+        this.txPublicSetupAllowList,
       );
 
       // TODO(#11000): Public processor should just handle processing, one tx at a time. It should be responsibility

package/src/tx_validator/tx_validator_factory.ts

@@ -1,30 +1,27 @@
-import { MerkleTreeId } from '@aztec/aztec.js';
 import { Fr } from '@aztec/foundation/fields';
 import {
   AggregateTxValidator,
   BlockHeaderTxValidator,
   DataTxValidator,
   DoubleSpendTxValidator,
+  GasTxValidator,
   MetadataTxValidator,
+  PhasesTxValidator,
   TxProofValidator,
 } from '@aztec/p2p';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
 import type { GasFees } from '@aztec/stdlib/gas';
-import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
 import type {
   AllowedElement,
   ClientProtocolCircuitVerifier,
   MerkleTreeReadOperations,
 } from '@aztec/stdlib/interfaces/server';
-import type { PublicDataTreeLeafPreimage } from '@aztec/stdlib/trees';
+import { DatabasePublicStateSource, type PublicStateSource } from '@aztec/stdlib/trees';
 import { GlobalVariables, type Tx, type TxValidator } from '@aztec/stdlib/tx';
 
 import { ArchiveCache } from './archive_cache.js';
-import { GasTxValidator, type PublicStateSource } from './gas_validator.js';
 import { NullifierCache } from './nullifier_cache.js';
-import { PhasesTxValidator } from './phases_validator.js';
 
 export function createValidatorForAcceptingTxs(
   db: MerkleTreeReadOperations,
@@ -91,26 +88,6 @@ export function createValidatorForBlockBuilding(
   };
 }
 
-class DatabasePublicStateSource implements PublicStateSource {
-  constructor(private db: MerkleTreeReadOperations) {}
-
-  async storageRead(contractAddress: AztecAddress, slot: Fr): Promise<Fr> {
-    const leafSlot = (await computePublicDataTreeLeafSlot(contractAddress, slot)).toBigInt();
-
-    const lowLeafResult = await this.db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
-    if (!lowLeafResult || !lowLeafResult.alreadyPresent) {
-      return Fr.ZERO;
-    }
-
-    const preimage = (await this.db.getLeafPreimage(
-      MerkleTreeId.PUBLIC_DATA_TREE,
-      lowLeafResult.index,
-    )) as PublicDataTreeLeafPreimage;
-
-    return preimage.leaf.value;
-  }
-}
-
 function preprocessValidator(
   nullifierCache: NullifierCache,
   archiveCache: ArchiveCache,

package/dest/sequencer/allowed.d.ts

@@ -1,3 +0,0 @@
-import type { AllowedElement } from '@aztec/stdlib/interfaces/server';
-export declare function getDefaultAllowedSetupFunctions(): Promise<AllowedElement[]>;
-//# sourceMappingURL=allowed.d.ts.map

package/dest/sequencer/allowed.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"allowed.d.ts","sourceRoot":"","sources":["../../src/sequencer/allowed.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAItE,wBAAsB,+BAA+B,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,CA2BjF"}

package/dest/sequencer/allowed.js

@@ -1,27 +0,0 @@
-import { FPCContract } from '@aztec/noir-contracts.js/FPC';
-import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
-import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
-let defaultAllowedSetupFunctions = undefined;
-export async function getDefaultAllowedSetupFunctions() {
-    if (defaultAllowedSetupFunctions === undefined) {
-        defaultAllowedSetupFunctions = [
-            // needed for authwit support
-            {
-                address: ProtocolContractAddress.AuthRegistry
-            },
-            // needed for claiming on the same tx as a spend
-            {
-                address: ProtocolContractAddress.FeeJuice
-            },
-            // needed for private transfers via FPC
-            {
-                classId: (await getContractClassFromArtifact(TokenContractArtifact)).id
-            },
-            {
-                classId: (await getContractClassFromArtifact(FPCContract.artifact)).id
-            }
-        ];
-    }
-    return defaultAllowedSetupFunctions;
-}

package/dest/tx_validator/gas_validator.d.ts

@@ -1,14 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { GasFees } from '@aztec/stdlib/gas';
-import { type Tx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
-/** Provides a view into public contract state */
-export interface PublicStateSource {
-    storageRead: (contractAddress: AztecAddress, slot: Fr) => Promise<Fr>;
-}
-export declare class GasTxValidator implements TxValidator<Tx> {
-    #private;
-    constructor(publicDataSource: PublicStateSource, feeJuiceAddress: AztecAddress, gasFees: GasFees);
-    validateTx(tx: Tx): Promise<TxValidationResult>;
-}
-//# sourceMappingURL=gas_validator.d.ts.map

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

@@ -1 +0,0 @@
-{"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,76 +0,0 @@
-import { createLogger } from '@aztec/foundation/log';
-import { computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice';
-import { getCallRequestsWithCalldataByPhase } from '@aztec/simulator/server';
-import { FunctionSelector } from '@aztec/stdlib/abi';
-import { TxExecutionPhase } from '@aztec/stdlib/tx';
-export class GasTxValidator {
-    #log = createLogger('sequencer:tx_validator:tx_gas');
-    #publicDataSource;
-    #feeJuiceAddress;
-    #gasFees;
-    constructor(publicDataSource, feeJuiceAddress, gasFees){
-        this.#publicDataSource = publicDataSource;
-        this.#feeJuiceAddress = feeJuiceAddress;
-        this.#gasFees = gasFees;
-    }
-    async validateTx(tx) {
-        if (await this.#shouldSkip(tx)) {
-            return Promise.resolve({
-                result: 'skipped',
-                reason: [
-                    'Insufficient fee per gas'
-                ]
-            });
-        }
-        return this.#validateTxFee(tx);
-    }
-    /**
-   * Check whether the tx's max fees are valid for the current block, and skip if not.
-   * We skip instead of invalidating since the tx may become eligible later.
-   * Note that circuits check max fees even if fee payer is unset, so we
-   * keep this validation even if the tx does not pay fees.
-   */ async #shouldSkip(tx) {
-        const gasSettings = tx.data.constants.txContext.gasSettings;
-        // Skip the tx if its max fees are not enough for the current block's gas fees.
-        const maxFeesPerGas = gasSettings.maxFeesPerGas;
-        const notEnoughMaxFees = maxFeesPerGas.feePerDaGas.lt(this.#gasFees.feePerDaGas) || maxFeesPerGas.feePerL2Gas.lt(this.#gasFees.feePerL2Gas);
-        if (notEnoughMaxFees) {
-            this.#log.warn(`Skipping transaction ${await tx.getTxHash()} due to insufficient fee per gas`, {
-                txMaxFeesPerGas: maxFeesPerGas.toInspect(),
-                currentGasFees: this.#gasFees.toInspect()
-            });
-        }
-        return notEnoughMaxFees;
-    }
-    async #validateTxFee(tx) {
-        const feePayer = tx.data.feePayer;
-        // Compute the maximum fee that this tx may pay, based on its gasLimits and maxFeePerGas
-        const feeLimit = tx.data.constants.txContext.gasSettings.getFeeLimit();
-        // 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 = 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.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,
-                balance: balance.toBigInt(),
-                feeLimit: feeLimit.toBigInt()
-            });
-            return {
-                result: 'invalid',
-                reason: [
-                    'Insufficient fee payer balance'
-                ]
-            };
-        }
-        return {
-            result: 'valid'
-        };
-    }
-}

package/dest/tx_validator/phases_validator.d.ts

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

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

@@ -1 +0,0 @@
-{"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,83 +0,0 @@
-import { createLogger } from '@aztec/foundation/log';
-import { PublicContractsDB, getCallRequestsWithCalldataByPhase } from '@aztec/simulator/server';
-import { Tx, TxExecutionPhase } from '@aztec/stdlib/tx';
-export class PhasesTxValidator {
-    setupAllowList;
-    blockNumber;
-    #log;
-    contractsDB;
-    constructor(contracts, setupAllowList, blockNumber){
-        this.setupAllowList = setupAllowList;
-        this.blockNumber = blockNumber;
-        this.#log = createLogger('sequencer:tx_validator:tx_phases');
-        this.contractsDB = new PublicContractsDB(contracts);
-    }
-    async validateTx(tx) {
-        try {
-            // TODO(@spalladino): We add this just to handle public authwit-check calls during setup
-            // which are needed for public FPC flows, but fail if the account contract hasnt been deployed yet,
-            // which is what we're trying to do as part of the current txs.
-            await this.contractsDB.addNewContracts(tx);
-            if (!tx.data.forPublic) {
-                this.#log.debug(`Tx ${await Tx.getHash(tx)} does not contain enqueued public functions. Skipping phases validation.`);
-                return {
-                    result: 'valid'
-                };
-            }
-            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.request.contractAddress}:${setupFn.functionSelector}`, {
-                        allowList: this.setupAllowList
-                    });
-                    return {
-                        result: 'invalid',
-                        reason: [
-                            'Setup function not on allow list'
-                        ]
-                    };
-                }
-            }
-            return {
-                result: 'valid'
-            };
-        } finally{
-            this.contractsDB.clearContractsForTx();
-        }
-    }
-    async isOnAllowList(publicCall, allowList) {
-        if (publicCall.isEmpty()) {
-            return true;
-        }
-        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)) {
-                if (contractAddress.equals(entry.address)) {
-                    return true;
-                }
-            }
-            if ('address' in entry && 'selector' in entry) {
-                if (contractAddress.equals(entry.address) && entry.selector.equals(functionSelector)) {
-                    return true;
-                }
-            }
-            const contractClass = await this.contractsDB.getContractInstance(contractAddress, this.blockNumber);
-            if (!contractClass) {
-                throw new Error(`Contract not found: ${contractAddress}`);
-            }
-            if ('classId' in entry && !('selector' in entry)) {
-                if (contractClass.currentContractClassId.equals(entry.classId)) {
-                    return true;
-                }
-            }
-            if ('classId' in entry && 'selector' in entry) {
-                if (contractClass.currentContractClassId.equals(entry.classId) && (entry.selector === undefined || entry.selector.equals(functionSelector))) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-}

package/dest/tx_validator/test_utils.d.ts

@@ -1,17 +0,0 @@
-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';
-export declare function patchNonRevertibleFn(tx: Tx, index: number, overrides: {
-    address?: AztecAddress;
-    selector: FunctionSelector;
-    args?: Fr[];
-    msgSender?: AztecAddress;
-}): Promise<AztecAddress>;
-export declare function patchRevertibleFn(tx: Tx, index: number, overrides: {
-    address?: AztecAddress;
-    selector: FunctionSelector;
-    args?: Fr[];
-    msgSender?: AztecAddress;
-}): Promise<AztecAddress>;
-//# sourceMappingURL=test_utils.d.ts.map

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

@@ -1 +0,0 @@
-{"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,22 +0,0 @@
-import { HashedValues } from '@aztec/stdlib/tx';
-export function patchNonRevertibleFn(tx, index, overrides) {
-    return patchFn('nonRevertibleAccumulatedData', tx, index, overrides);
-}
-export function patchRevertibleFn(tx, index, overrides) {
-    return patchFn('revertibleAccumulatedData', tx, index, overrides);
-}
-async function patchFn(where, tx, index, overrides) {
-    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 = overrides.address ?? request.contractAddress;
-    request.msgSender = overrides.msgSender ?? request.msgSender;
-    request.calldataHash = hashedCalldata.hash;
-    tx.data.forPublic[where].publicCallRequests[index] = request;
-    return request.contractAddress;
-}

package/src/sequencer/allowed.ts

@@ -1,36 +0,0 @@
-import { FPCContract } from '@aztec/noir-contracts.js/FPC';
-import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
-import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
-import type { AllowedElement } from '@aztec/stdlib/interfaces/server';
-
-let defaultAllowedSetupFunctions: AllowedElement[] | undefined = undefined;
-
-export async function getDefaultAllowedSetupFunctions(): Promise<AllowedElement[]> {
-  if (defaultAllowedSetupFunctions === undefined) {
-    defaultAllowedSetupFunctions = [
-      // needed for authwit support
-      {
-        address: ProtocolContractAddress.AuthRegistry,
-      },
-      // needed for claiming on the same tx as a spend
-      {
-        address: ProtocolContractAddress.FeeJuice,
-        // We can't restrict the selector because public functions get routed via dispatch.
-        // selector: FunctionSelector.fromSignature('_increase_public_balance((Field),u128)'),
-      },
-      // needed for private transfers via FPC
-      {
-        classId: (await getContractClassFromArtifact(TokenContractArtifact)).id,
-        // We can't restrict the selector because public functions get routed via dispatch.
-        // selector: FunctionSelector.fromSignature('_increase_public_balance((Field),u128)'),
-      },
-      {
-        classId: (await getContractClassFromArtifact(FPCContract.artifact)).id,
-        // We can't restrict the selector because public functions get routed via dispatch.
-        // selector: FunctionSelector.fromSignature('prepare_fee((Field),Field,(Field),Field)'),
-      },
-    ];
-  }
-  return defaultAllowedSetupFunctions;
-}

package/src/tx_validator/gas_validator.ts

@@ -1,100 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { createLogger } from '@aztec/foundation/log';
-import { computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice';
-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';
-import { type Tx, TxExecutionPhase, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx';
-
-/** Provides a view into public contract state */
-export interface PublicStateSource {
-  storageRead: (contractAddress: AztecAddress, slot: Fr) => Promise<Fr>;
-}
-
-export class GasTxValidator implements TxValidator<Tx> {
-  #log = createLogger('sequencer:tx_validator:tx_gas');
-  #publicDataSource: PublicStateSource;
-  #feeJuiceAddress: AztecAddress;
-  #gasFees: GasFees;
-
-  constructor(publicDataSource: PublicStateSource, feeJuiceAddress: AztecAddress, gasFees: GasFees) {
-    this.#publicDataSource = publicDataSource;
-    this.#feeJuiceAddress = feeJuiceAddress;
-    this.#gasFees = gasFees;
-  }
-
-  async validateTx(tx: Tx): Promise<TxValidationResult> {
-    if (await this.#shouldSkip(tx)) {
-      return Promise.resolve({ result: 'skipped', reason: ['Insufficient fee per gas'] });
-    }
-    return this.#validateTxFee(tx);
-  }
-
-  /**
-   * Check whether the tx's max fees are valid for the current block, and skip if not.
-   * We skip instead of invalidating since the tx may become eligible later.
-   * Note that circuits check max fees even if fee payer is unset, so we
-   * keep this validation even if the tx does not pay fees.
-   */
-  async #shouldSkip(tx: Tx): Promise<boolean> {
-    const gasSettings = tx.data.constants.txContext.gasSettings;
-
-    // Skip the tx if its max fees are not enough for the current block's gas fees.
-    const maxFeesPerGas = gasSettings.maxFeesPerGas;
-    const notEnoughMaxFees =
-      maxFeesPerGas.feePerDaGas.lt(this.#gasFees.feePerDaGas) ||
-      maxFeesPerGas.feePerL2Gas.lt(this.#gasFees.feePerL2Gas);
-
-    if (notEnoughMaxFees) {
-      this.#log.warn(`Skipping transaction ${await tx.getTxHash()} due to insufficient fee per gas`, {
-        txMaxFeesPerGas: maxFeesPerGas.toInspect(),
-        currentGasFees: this.#gasFees.toInspect(),
-      });
-    }
-    return notEnoughMaxFees;
-  }
-
-  async #validateTxFee(tx: Tx): Promise<TxValidationResult> {
-    const feePayer = tx.data.feePayer;
-
-    // Compute the maximum fee that this tx may pay, based on its gasLimits and maxFeePerGas
-    const feeLimit = tx.data.constants.txContext.gasSettings.getFeeLimit();
-
-    // 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 = 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.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,
-        balance: balance.toBigInt(),
-        feeLimit: feeLimit.toBigInt(),
-      });
-      return { result: 'invalid', reason: ['Insufficient fee payer balance'] };
-    }
-    return { result: 'valid' };
-  }
-}

package/src/tx_validator/phases_validator.ts

@@ -1,104 +0,0 @@
-import { createLogger } from '@aztec/foundation/log';
-import { PublicContractsDB, getCallRequestsWithCalldataByPhase } from '@aztec/simulator/server';
-import type { ContractDataSource } from '@aztec/stdlib/contract';
-import type { AllowedElement } from '@aztec/stdlib/interfaces/server';
-import {
-  PublicCallRequestWithCalldata,
-  Tx,
-  TxExecutionPhase,
-  type TxValidationResult,
-  type TxValidator,
-} from '@aztec/stdlib/tx';
-
-export class PhasesTxValidator implements TxValidator<Tx> {
-  #log = createLogger('sequencer:tx_validator:tx_phases');
-  private contractsDB: PublicContractsDB;
-
-  constructor(contracts: ContractDataSource, private setupAllowList: AllowedElement[], private blockNumber: number) {
-    this.contractsDB = new PublicContractsDB(contracts);
-  }
-
-  async validateTx(tx: Tx): Promise<TxValidationResult> {
-    try {
-      // TODO(@spalladino): We add this just to handle public authwit-check calls during setup
-      // which are needed for public FPC flows, but fail if the account contract hasnt been deployed yet,
-      // which is what we're trying to do as part of the current txs.
-      await this.contractsDB.addNewContracts(tx);
-
-      if (!tx.data.forPublic) {
-        this.#log.debug(
-          `Tx ${await Tx.getHash(tx)} does not contain enqueued public functions. Skipping phases validation.`,
-        );
-        return { result: 'valid' };
-      }
-
-      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.request.contractAddress
-            }:${setupFn.functionSelector}`,
-            { allowList: this.setupAllowList },
-          );
-
-          return { result: 'invalid', reason: ['Setup function not on allow list'] };
-        }
-      }
-
-      return { result: 'valid' };
-    } finally {
-      this.contractsDB.clearContractsForTx();
-    }
-  }
-
-  private async isOnAllowList(
-    publicCall: PublicCallRequestWithCalldata,
-    allowList: AllowedElement[],
-  ): Promise<boolean> {
-    if (publicCall.isEmpty()) {
-      return true;
-    }
-
-    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)) {
-        if (contractAddress.equals(entry.address)) {
-          return true;
-        }
-      }
-
-      if ('address' in entry && 'selector' in entry) {
-        if (contractAddress.equals(entry.address) && entry.selector.equals(functionSelector)) {
-          return true;
-        }
-      }
-
-      const contractClass = await this.contractsDB.getContractInstance(contractAddress, this.blockNumber);
-
-      if (!contractClass) {
-        throw new Error(`Contract not found: ${contractAddress}`);
-      }
-
-      if ('classId' in entry && !('selector' in entry)) {
-        if (contractClass.currentContractClassId.equals(entry.classId)) {
-          return true;
-        }
-      }
-
-      if ('classId' in entry && 'selector' in entry) {
-        if (
-          contractClass.currentContractClassId.equals(entry.classId) &&
-          (entry.selector === undefined || entry.selector.equals(functionSelector))
-        ) {
-          return true;
-        }
-      }
-    }
-
-    return false;
-  }
-}

package/src/tx_validator/test_utils.ts

@@ -1,43 +0,0 @@
-import type { Fr } from '@aztec/foundation/fields';
-import type { FunctionSelector } from '@aztec/stdlib/abi';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-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<AztecAddress> {
-  return patchFn('nonRevertibleAccumulatedData', tx, index, overrides);
-}
-
-export function patchRevertibleFn(
-  tx: Tx,
-  index: number,
-  overrides: { address?: AztecAddress; selector: FunctionSelector; args?: Fr[]; msgSender?: AztecAddress },
-): Promise<AztecAddress> {
-  return patchFn('revertibleAccumulatedData', tx, index, overrides);
-}
-
-async function patchFn(
-  where: 'revertibleAccumulatedData' | 'nonRevertibleAccumulatedData',
-  tx: Tx,
-  index: number,
-  overrides: { address?: AztecAddress; selector: FunctionSelector; args?: Fr[]; msgSender?: AztecAddress },
-): 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 = overrides.address ?? request.contractAddress;
-  request.msgSender = overrides.msgSender ?? request.msgSender;
-  request.calldataHash = hashedCalldata.hash;
-  tx.data.forPublic![where].publicCallRequests[index] = request;
-
-  return request.contractAddress;
-}