@aztec/ethereum 3.0.0-canary.a9708bd → 3.0.0-devnet.2

package/dest/client.d.ts

@@ -2,7 +2,7 @@ import type { Logger } from '@aztec/foundation/log';
 import { type Chain, type HDAccount, type LocalAccount, type PrivateKeyAccount } from 'viem';
 import type { ExtendedViemWalletClient, ViemPublicClient } from './types.js';
 type Config = {
-    /** The RPC Url of the ethereum host. */
+    /** List of URLs of Ethereum RPC nodes that services will connect to (comma separated). */
     l1RpcUrls: string[];
     /** The chain ID of the ethereum host. */
     l1ChainId: number;

package/dest/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EACL,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,iBAAiB,EAMvB,MAAM,MAAM,CAAC;AAKd,OAAO,KAAK,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE7E,KAAK,MAAM,GAAG;IACZ,wCAAwC;IACxC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,yCAAyC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,2CAA2C;IAC3C,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,CAAC;AAEF,YAAY,EAAE,MAAM,IAAI,oBAAoB,EAAE,CAAC;AAI/C,wDAAwD;AACxD,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAOhE;AAED,0FAA0F;AAC1F,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAIpG;AAyBD,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EAAE,EACjB,+BAA+B,EAAE,MAAM,GAAG,SAAS,GAAG,iBAAiB,GAAG,YAAY,EACtF,KAAK,GAAE,KAAe,EACtB,iBAAiB,CAAC,EAAE,MAAM,EAC1B,YAAY,CAAC,EAAE,MAAM,GACpB,wBAAwB,CAgB1B"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EACL,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,iBAAiB,EAMvB,MAAM,MAAM,CAAC;AAKd,OAAO,KAAK,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE7E,KAAK,MAAM,GAAG;IACZ,0FAA0F;IAC1F,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,yCAAyC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,2CAA2C;IAC3C,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,CAAC;AAEF,YAAY,EAAE,MAAM,IAAI,oBAAoB,EAAE,CAAC;AAI/C,wDAAwD;AACxD,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAOhE;AAED,0FAA0F;AAC1F,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAIpG;AAyBD,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EAAE,EACjB,+BAA+B,EAAE,MAAM,GAAG,SAAS,GAAG,iBAAiB,GAAG,YAAY,EACtF,KAAK,GAAE,KAAe,EACtB,iBAAiB,CAAC,EAAE,MAAM,EAC1B,YAAY,CAAC,EAAE,MAAM,GACpB,wBAAwB,CAgB1B"}

package/dest/config.d.ts

@@ -1,6 +1,6 @@
 import { type ConfigMappingsType, type NetworkNames } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { type L1TxUtilsConfig } from './l1_tx_utils.js';
+import { type L1TxUtilsConfig } from './l1_tx_utils/index.js';
 export type GenesisStateConfig = {
     /** Whether to populate the genesis state with initial fee juice for the test accounts */
     testAccounts: boolean;
@@ -16,12 +16,16 @@ export type L1ContractsConfig = {
     aztecEpochDuration: number;
     /** The target validator committee size. */
     aztecTargetCommitteeSize: number;
+    /** The number of epochs to lag behind the current epoch for validator selection. */
+    lagInEpochs: number;
     /** The number of epochs after an epoch ends that proofs are still accepted. */
     aztecProofSubmissionEpochs: number;
     /** The deposit amount for a validator */
     activationThreshold: bigint;
     /** The minimum stake for a validator. */
     ejectionThreshold: bigint;
+    /** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */
+    localEjectionThreshold: bigint;
     /** The slashing quorum, i.e. how many slots must signal for the same payload in a round for it to be submittable to the Slasher (defaults to slashRoundSize / 2 + 1) */
     slashingQuorum?: number;
     /** The slashing round size, i.e. how many epochs are in a slashing round */
@@ -34,6 +38,8 @@ export type L1ContractsConfig = {
     slashingVetoer: EthAddress;
     /** How many slashing rounds back we slash (ie when slashing in round N, we slash for offenses committed during epochs of round N-offset) */
     slashingOffsetInRounds: number;
+    /** How long slashing can be disabled for in seconds when vetoer disables it */
+    slashingDisableDuration: number;
     /** Type of slasher proposer */
     slasherFlavor: 'empire' | 'tally' | 'none';
     /** Minimum amount that can be slashed in tally slashing */
@@ -58,9 +64,11 @@ export declare const DefaultL1ContractsConfig: {
     aztecSlotDuration: number;
     aztecEpochDuration: number;
     aztecTargetCommitteeSize: number;
+    lagInEpochs: number;
     aztecProofSubmissionEpochs: number;
     activationThreshold: bigint;
     ejectionThreshold: bigint;
+    localEjectionThreshold: bigint;
     slashAmountSmall: bigint;
     slashAmountMedium: bigint;
     slashAmountLarge: bigint;
@@ -74,6 +82,7 @@ export declare const DefaultL1ContractsConfig: {
     exitDelaySeconds: number;
     slasherFlavor: "tally";
     slashingOffsetInRounds: number;
+    slashingDisableDuration: number;
 };
 export declare const getGovernanceConfiguration: (networkName: NetworkNames) => {
     proposeConfig: {
@@ -88,17 +97,13 @@ export declare const getGovernanceConfiguration: (networkName: NetworkNames) =>
     requiredYeaMargin: bigint;
     minimumVotes: bigint;
 };
-export declare const getGSEConfiguration: (networkName: NetworkNames) => {
-    activationThreshold: bigint;
-    ejectionThreshold: bigint;
-};
 export declare const getRewardConfig: (networkName: NetworkNames) => {
     sequencerBps: number;
     rewardDistributor: `0x${string}`;
     booster: `0x${string}`;
     blockReward: bigint;
 };
-export declare const getRewardBoostConfig: (networkName: NetworkNames) => {
+export declare const getRewardBoostConfig: () => {
     increment: number;
     maxScore: number;
     a: number;

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,kBAAkB,EACvB,KAAK,YAAY,EAOlB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,KAAK,eAAe,EAA2B,MAAM,kBAAkB,CAAC;AAEjF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,yCAAyC;IACzC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uFAAuF;IACvF,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wCAAwC;IACxC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2CAA2C;IAC3C,wBAAwB,EAAE,MAAM,CAAC;IACjC,+EAA+E;IAC/E,0BAA0B,EAAE,MAAM,CAAC;IACnC,yCAAyC;IACzC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,yCAAyC;IACzC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wKAAwK;IACxK,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4EAA4E;IAC5E,yBAAyB,EAAE,MAAM,CAAC;IAClC,gGAAgG;IAChG,wBAAwB,EAAE,MAAM,CAAC;IACjC,yGAAyG;IACzG,8BAA8B,EAAE,MAAM,CAAC;IACvC,yEAAyE;IACzE,cAAc,EAAE,UAAU,CAAC;IAC3B,4IAA4I;IAC5I,sBAAsB,EAAE,MAAM,CAAC;IAC/B,+BAA+B;IAC/B,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;IAC3C,2DAA2D;IAC3D,gBAAgB,EAAE,MAAM,CAAC;IACzB,+CAA+C;IAC/C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qEAAqE;IACrE,gBAAgB,EAAE,MAAM,CAAC;IACzB,gEAAgE;IAChE,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,sCAAsC;IACtC,2BAA2B,EAAE,MAAM,CAAC;IACpC,qCAAqC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gDAAgD;IAChD,gBAAgB,EAAE,MAAM,CAAC;CAC1B,GAAG,eAAe,CAAC;AAEpB,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;CAqBR,CAAC;AA8B9B,eAAO,MAAM,0BAA0B,GAAI,aAAa,YAAY;;;;;;;;;;;;CAKnE,CAAC;AAYF,eAAO,MAAM,mBAAmB,GAAI,aAAa,YAAY;;;CAK5D,CAAC;AAmBF,eAAO,MAAM,eAAe,GAAI,aAAa,YAAY;;;;;CAKxD,CAAC;AAkBF,eAAO,MAAM,oBAAoB,GAAI,aAAa,YAAY;;;;;;CAK7D,CAAC;AAmBF,eAAO,MAAM,mBAAmB,GAAI,aAAa,YAAY;;;;;;CAK5D,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CAkH3E,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,kBAAkB,CAW7E,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D;AAED,wBAAgB,4BAA4B,IAAI,kBAAkB,CAEjE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,eAAe,CAAC,GAAG,IAAI,CAmH3F"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,YAAY,EAOlB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,KAAK,eAAe,EAA2B,MAAM,wBAAwB,CAAC;AAEvF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,yCAAyC;IACzC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uFAAuF;IACvF,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wCAAwC;IACxC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2CAA2C;IAC3C,wBAAwB,EAAE,MAAM,CAAC;IACjC,oFAAoF;IACpF,WAAW,EAAE,MAAM,CAAC;IACpB,+EAA+E;IAC/E,0BAA0B,EAAE,MAAM,CAAC;IACnC,yCAAyC;IACzC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,yCAAyC;IACzC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mHAAmH;IACnH,sBAAsB,EAAE,MAAM,CAAC;IAC/B,wKAAwK;IACxK,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4EAA4E;IAC5E,yBAAyB,EAAE,MAAM,CAAC;IAClC,gGAAgG;IAChG,wBAAwB,EAAE,MAAM,CAAC;IACjC,yGAAyG;IACzG,8BAA8B,EAAE,MAAM,CAAC;IACvC,yEAAyE;IACzE,cAAc,EAAE,UAAU,CAAC;IAC3B,4IAA4I;IAC5I,sBAAsB,EAAE,MAAM,CAAC;IAC/B,+EAA+E;IAC/E,uBAAuB,EAAE,MAAM,CAAC;IAChC,+BAA+B;IAC/B,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;IAC3C,2DAA2D;IAC3D,gBAAgB,EAAE,MAAM,CAAC;IACzB,+CAA+C;IAC/C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qEAAqE;IACrE,gBAAgB,EAAE,MAAM,CAAC;IACzB,gEAAgE;IAChE,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,sCAAsC;IACtC,2BAA2B,EAAE,MAAM,CAAC;IACpC,qCAAqC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gDAAgD;IAChD,gBAAgB,EAAE,MAAM,CAAC;CAC1B,GAAG,eAAe,CAAC;AAEpB,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;CAwBR,CAAC;AA4D9B,eAAO,MAAM,0BAA0B,GAAI,aAAa,YAAY;;;;;;;;;;;;CAiBnE,CAAC;AAaF,eAAO,MAAM,eAAe,GAAI,aAAa,YAAY;;;;;CAYxD,CAAC;AAEF,eAAO,MAAM,oBAAoB;;;;;;CAUhC,CAAC;AAmCF,eAAO,MAAM,mBAAmB,GAAI,aAAa,YAAY;;;;;;CAiB5D,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CAkI3E,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,kBAAkB,CAW7E,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D;AAED,wBAAgB,4BAA4B,IAAI,kBAAkB,CAEjE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,eAAe,CAAC,GAAG,IAAI,CAmH3F"}

package/dest/config.js

@@ -1,17 +1,19 @@
 import { bigintConfigHelper, booleanConfigHelper, enumConfigHelper, getConfigFromMappings, numberConfigHelper, optionalNumberConfigHelper } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { l1TxUtilsConfigMappings } from './l1_tx_utils.js';
+import { l1TxUtilsConfigMappings } from './l1_tx_utils/index.js';
 export const DefaultL1ContractsConfig = {
     ethereumSlotDuration: 12,
     aztecSlotDuration: 36,
     aztecEpochDuration: 32,
     aztecTargetCommitteeSize: 48,
+    lagInEpochs: 2,
     aztecProofSubmissionEpochs: 1,
-    activationThreshold: BigInt(100e18),
-    ejectionThreshold: BigInt(50e18),
-    slashAmountSmall: BigInt(10e18),
-    slashAmountMedium: BigInt(20e18),
-    slashAmountLarge: BigInt(50e18),
+    activationThreshold: 100n * 10n ** 18n,
+    ejectionThreshold: 50n * 10n ** 18n,
+    localEjectionThreshold: 98n * 10n ** 18n,
+    slashAmountSmall: 10n * 10n ** 18n,
+    slashAmountMedium: 20n * 10n ** 18n,
+    slashAmountLarge: 50n * 10n ** 18n,
     slashingRoundSizeInEpochs: 4,
     slashingLifetimeInRounds: 5,
     slashingExecutionDelayInRounds: 0,
@@ -21,7 +23,8 @@ export const DefaultL1ContractsConfig = {
     provingCostPerMana: BigInt(100),
     exitDelaySeconds: 2 * 24 * 60 * 60,
     slasherFlavor: 'tally',
-    slashingOffsetInRounds: 2
+    slashingOffsetInRounds: 2,
+    slashingDisableDuration: 5 * 24 * 60 * 60
 };
 const LocalGovernanceConfiguration = {
     proposeConfig: {
@@ -36,79 +39,95 @@ const LocalGovernanceConfiguration = {
     requiredYeaMargin: 4n * 10n ** 16n,
     minimumVotes: 400n * 10n ** 18n
 };
-const TestnetGovernanceConfiguration = {
+const StagingPublicGovernanceConfiguration = {
     proposeConfig: {
-        lockDelay: 60n * 60n * 24n,
+        lockDelay: 60n * 60n * 24n * 30n,
         lockAmount: DefaultL1ContractsConfig.activationThreshold * 100n
     },
     votingDelay: 60n,
     votingDuration: 60n * 60n,
-    executionDelay: 60n * 60n * 24n,
+    executionDelay: 60n,
     gracePeriod: 60n * 60n * 24n * 7n,
     quorum: 3n * 10n ** 17n,
     requiredYeaMargin: 4n * 10n ** 16n,
     minimumVotes: DefaultL1ContractsConfig.ejectionThreshold * 200n
 };
-export const getGovernanceConfiguration = (networkName)=>{
-    if (networkName === 'alpha-testnet' || networkName === 'testnet') {
-        return TestnetGovernanceConfiguration;
-    }
-    return LocalGovernanceConfiguration;
-};
-const TestnetGSEConfiguration = {
-    activationThreshold: BigInt(100e18),
-    ejectionThreshold: BigInt(50e18)
+const TestnetGovernanceConfiguration = {
+    proposeConfig: {
+        lockDelay: 10n * 365n * 24n * 60n * 60n,
+        lockAmount: 1250n * 200_000n * 10n ** 18n
+    },
+    votingDelay: 12n * 60n * 60n,
+    votingDuration: 1n * 24n * 60n * 60n,
+    executionDelay: 12n * 60n * 60n,
+    gracePeriod: 1n * 24n * 60n * 60n,
+    quorum: 2n * 10n ** 17n,
+    requiredYeaMargin: 1n * 10n ** 17n,
+    minimumVotes: 1250n * 200_000n * 10n ** 18n
 };
-const LocalGSEConfiguration = {
-    activationThreshold: BigInt(100e18),
-    ejectionThreshold: BigInt(50e18)
+const StagingIgnitionGovernanceConfiguration = {
+    proposeConfig: {
+        lockDelay: 10n * 365n * 24n * 60n * 60n,
+        lockAmount: 1250n * 200_000n * 10n ** 18n
+    },
+    votingDelay: 7n * 24n * 60n * 60n,
+    votingDuration: 7n * 24n * 60n * 60n,
+    executionDelay: 30n * 24n * 60n * 60n,
+    gracePeriod: 7n * 24n * 60n * 60n,
+    quorum: 2n * 10n ** 17n,
+    requiredYeaMargin: 1n * 10n ** 17n,
+    minimumVotes: 1250n * 200_000n * 10n ** 18n
 };
-export const getGSEConfiguration = (networkName)=>{
-    if (networkName === 'alpha-testnet' || networkName === 'testnet') {
-        return TestnetGSEConfiguration;
+export const getGovernanceConfiguration = (networkName)=>{
+    switch(networkName){
+        case 'local':
+            return LocalGovernanceConfiguration;
+        case 'next-net':
+            return LocalGovernanceConfiguration;
+        case 'devnet':
+            return LocalGovernanceConfiguration;
+        case 'staging-public':
+            return StagingPublicGovernanceConfiguration;
+        case 'testnet':
+            return TestnetGovernanceConfiguration;
+        case 'staging-ignition':
+            return StagingIgnitionGovernanceConfiguration;
+        default:
+            throw new Error(`Unrecognized network name: ${networkName}`);
     }
-    return LocalGSEConfiguration;
 };
 // Making a default config here as we are only using it thought the deployment
 // and do not expect to be using different setups, so having environment variables
 // for it seems overkill
-const LocalRewardConfig = {
-    sequencerBps: 5000,
-    rewardDistributor: EthAddress.ZERO.toString(),
-    booster: EthAddress.ZERO.toString(),
-    blockReward: BigInt(50e18)
-};
-const TestnetRewardConfig = {
-    sequencerBps: 5000,
+const DefaultRewardConfig = {
+    sequencerBps: 8000,
     rewardDistributor: EthAddress.ZERO.toString(),
     booster: EthAddress.ZERO.toString(),
-    blockReward: BigInt(50e18)
+    blockReward: 500n * 10n ** 18n
 };
 export const getRewardConfig = (networkName)=>{
-    if (networkName === 'alpha-testnet' || networkName === 'testnet') {
-        return TestnetRewardConfig;
+    switch(networkName){
+        case 'local':
+        case 'devnet':
+        case 'next-net':
+        case 'staging-public':
+        case 'testnet':
+        case 'staging-ignition':
+            return DefaultRewardConfig;
+        default:
+            throw new Error(`Unrecognized network name: ${networkName}`);
     }
-    return LocalRewardConfig;
-};
-const LocalRewardBoostConfig = {
-    increment: 200000,
-    maxScore: 5000000,
-    a: 5000,
-    k: 1000000,
-    minimum: 100000
 };
-const TestnetRewardBoostConfig = {
-    increment: 125000,
-    maxScore: 15000000,
-    a: 1000,
-    k: 1000000,
-    minimum: 100000
-};
-export const getRewardBoostConfig = (networkName)=>{
-    if (networkName === 'alpha-testnet' || networkName === 'testnet') {
-        return TestnetRewardBoostConfig;
-    }
-    return LocalRewardBoostConfig;
+export const getRewardBoostConfig = ()=>{
+    // The reward configuration is specified with a precision of 1e5, and we use the same across
+    // all networks.
+    return {
+        increment: 125000,
+        maxScore: 15000000,
+        a: 1000,
+        k: 1000000,
+        minimum: 100000
+    };
 };
 // Similar to the above, no need for environment variables for this.
 const LocalEntryQueueConfig = {
@@ -118,18 +137,44 @@ const LocalEntryQueueConfig = {
     normalFlushSizeQuotient: 2n,
     maxQueueFlushSize: 48n
 };
+const StagingPublicEntryQueueConfig = {
+    bootstrapValidatorSetSize: 48n,
+    bootstrapFlushSize: 48n,
+    normalFlushSizeMin: 1n,
+    normalFlushSizeQuotient: 2475n,
+    maxQueueFlushSize: 32n
+};
 const TestnetEntryQueueConfig = {
     bootstrapValidatorSetSize: 750n,
-    bootstrapFlushSize: 75n,
-    normalFlushSizeMin: 1n,
+    bootstrapFlushSize: 32n,
+    normalFlushSizeMin: 32n,
     normalFlushSizeQuotient: 2475n,
     maxQueueFlushSize: 32n
 };
+const StagingIgnitionEntryQueueConfig = {
+    bootstrapValidatorSetSize: 48n,
+    bootstrapFlushSize: 48n,
+    normalFlushSizeMin: 1n,
+    normalFlushSizeQuotient: 2048n,
+    maxQueueFlushSize: 24n
+};
 export const getEntryQueueConfig = (networkName)=>{
-    if (networkName === 'alpha-testnet' || networkName === 'testnet') {
-        return TestnetEntryQueueConfig;
+    switch(networkName){
+        case 'local':
+            return LocalEntryQueueConfig;
+        case 'next-net':
+            return LocalEntryQueueConfig;
+        case 'devnet':
+            return LocalEntryQueueConfig;
+        case 'staging-public':
+            return StagingPublicEntryQueueConfig;
+        case 'testnet':
+            return TestnetEntryQueueConfig;
+        case 'staging-ignition':
+            return StagingIgnitionEntryQueueConfig;
+        default:
+            throw new Error(`Unrecognized network name: ${networkName}`);
     }
-    return LocalEntryQueueConfig;
 };
 export const l1ContractsConfigMappings = {
     ethereumSlotDuration: {
@@ -152,6 +197,11 @@ export const l1ContractsConfigMappings = {
         description: 'The target validator committee size.',
         ...numberConfigHelper(DefaultL1ContractsConfig.aztecTargetCommitteeSize)
     },
+    lagInEpochs: {
+        env: 'AZTEC_LAG_IN_EPOCHS',
+        description: 'The number of epochs to lag behind the current epoch for validator selection.',
+        ...numberConfigHelper(DefaultL1ContractsConfig.lagInEpochs)
+    },
     aztecProofSubmissionEpochs: {
         env: 'AZTEC_PROOF_SUBMISSION_EPOCHS',
         description: 'The number of epochs after an epoch ends that proofs are still accepted.',
@@ -167,6 +217,11 @@ export const l1ContractsConfigMappings = {
         description: 'The minimum stake for a validator.',
         ...bigintConfigHelper(DefaultL1ContractsConfig.ejectionThreshold)
     },
+    localEjectionThreshold: {
+        env: 'AZTEC_LOCAL_EJECTION_THRESHOLD',
+        description: 'The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup',
+        ...bigintConfigHelper(DefaultL1ContractsConfig.localEjectionThreshold)
+    },
     slashingOffsetInRounds: {
         env: 'AZTEC_SLASHING_OFFSET_IN_ROUNDS',
         description: 'How many slashing rounds back we slash (ie when slashing in round N, we slash for offenses committed during epochs of round N-offset)',
@@ -222,6 +277,11 @@ export const l1ContractsConfigMappings = {
         parseEnv: (val)=>EthAddress.fromString(val),
         defaultValue: DefaultL1ContractsConfig.slashingVetoer
     },
+    slashingDisableDuration: {
+        env: 'AZTEC_SLASHING_DISABLE_DURATION',
+        description: 'How long slashing can be disabled for in seconds when vetoer disables it',
+        ...numberConfigHelper(DefaultL1ContractsConfig.slashingDisableDuration)
+    },
     governanceProposerQuorum: {
         env: 'AZTEC_GOVERNANCE_PROPOSER_QUORUM',
         description: 'The governance proposing quorum',
@@ -285,12 +345,12 @@ export function getGenesisStateConfigEnvVars() {
         errors.push(`aztecSlotDuration (${config.aztecSlotDuration}) must be a multiple of ethereumSlotDuration (${config.ethereumSlotDuration})`);
     }
     // EmpireBase constructor validations for governance/slashing proposers
-    // From: require(QUORUM_SIZE > ROUND_SIZE / 2, Errors.GovernanceProposer__InvalidQuorumAndRoundSize(QUORUM_SIZE, ROUND_SIZE));
+    // From: require(QUORUM_SIZE > ROUND_SIZE / 2, Errors.EmpireBase__InvalidQuorumAndRoundSize(QUORUM_SIZE, ROUND_SIZE));
     const { governanceProposerQuorum, governanceProposerRoundSize } = config;
     if (governanceProposerQuorum !== undefined && governanceProposerQuorum <= Math.floor(governanceProposerRoundSize / 2)) {
         errors.push(`governanceProposerQuorum (${governanceProposerQuorum}) must be greater than half of governanceProposerRoundSize (${Math.floor(governanceProposerRoundSize / 2)})`);
     }
-    // From: require(QUORUM_SIZE <= ROUND_SIZE, Errors.GovernanceProposer__QuorumCannotBeLargerThanRoundSize(QUORUM_SIZE, ROUND_SIZE));
+    // From: require(QUORUM_SIZE <= ROUND_SIZE, Errors.EmpireBase__QuorumCannotBeLargerThanRoundSize(QUORUM_SIZE, ROUND_SIZE));
     if (governanceProposerQuorum !== undefined && governanceProposerQuorum > governanceProposerRoundSize) {
         errors.push(`governanceProposerQuorum (${governanceProposerQuorum}) cannot be larger than governanceProposerRoundSize (${governanceProposerRoundSize})`);
     }

package/dest/contracts/empire_base.d.ts

@@ -1,7 +1,7 @@
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { type Hex, type TypedDataDefinition } from 'viem';
-import type { L1TxRequest } from '../l1_tx_utils.js';
+import type { L1TxRequest } from '../l1_tx_utils/index.js';
 export interface IEmpireBase {
     get address(): EthAddress;
     getRoundInfo(rollupAddress: Hex, round: bigint): Promise<{

package/dest/contracts/empire_base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"empire_base.d.ts","sourceRoot":"","sources":["../../src/contracts/empire_base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,mBAAmB,EAAsB,MAAM,MAAM,CAAC;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,MAAM,WAAW,WAAW;IAC1B,IAAI,OAAO,IAAI,UAAU,CAAC;IAC1B,YAAY,CACV,aAAa,EAAE,GAAG,EAClB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,sBAAsB,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IACvF,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5C,mBAAmB,CAAC,OAAO,EAAE,GAAG,GAAG,WAAW,CAAC;IAC/C,gCAAgC,CAC9B,OAAO,EAAE,GAAG,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,GACjD,OAAO,CAAC,WAAW,CAAC,CAAC;CACzB;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,CAM9C;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,iBAM3E;AAED;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,EAClD,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,GAAG,EACb,iBAAiB,EAAE,GAAG,EACtB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,SAAS,CAAC,CA8BpB"}
+{"version":3,"file":"empire_base.d.ts","sourceRoot":"","sources":["../../src/contracts/empire_base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,mBAAmB,EAAsB,MAAM,MAAM,CAAC;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,MAAM,WAAW,WAAW;IAC1B,IAAI,OAAO,IAAI,UAAU,CAAC;IAC1B,YAAY,CACV,aAAa,EAAE,GAAG,EAClB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,sBAAsB,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IACvF,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5C,mBAAmB,CAAC,OAAO,EAAE,GAAG,GAAG,WAAW,CAAC;IAC/C,gCAAgC,CAC9B,OAAO,EAAE,GAAG,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,GACjD,OAAO,CAAC,WAAW,CAAC,CAAC;CACzB;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,CAM9C;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,iBAM3E;AAED;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,EAClD,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,GAAG,EACb,iBAAiB,EAAE,GAAG,EACtB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,SAAS,CAAC,CA8BpB"}

package/dest/contracts/empire_slashing_proposer.d.ts

@@ -1,7 +1,7 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import EventEmitter from 'events';
 import { type Hex, type Log, type TypedDataDefinition } from 'viem';
-import type { L1TxRequest, L1TxUtils } from '../l1_tx_utils.js';
+import type { L1TxRequest, L1TxUtils } from '../l1_tx_utils/index.js';
 import type { ViemClient } from '../types.js';
 import { type IEmpireBase } from './empire_base.js';
 export declare class ProposalAlreadyExecutedError extends Error {
@@ -12,7 +12,7 @@ export declare class EmpireSlashingProposerContract extends EventEmitter impleme
     private readonly logger;
     private readonly proposer;
     readonly type: "empire";
-    constructor(client: ViemClient, address: Hex);
+    constructor(client: ViemClient, address: Hex | EthAddress);
     get address(): EthAddress;
     getQuorumSize(): Promise<bigint>;
     getRoundSize(): Promise<bigint>;

package/dest/contracts/empire_slashing_proposer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"empire_slashing_proposer.d.ts","sourceRoot":"","sources":["../../src/contracts/empire_slashing_proposer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAK3D,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAGL,KAAK,GAAG,EACR,KAAK,GAAG,EACR,KAAK,mBAAmB,EAGzB,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,KAAK,WAAW,EAA8D,MAAM,kBAAkB,CAAC;AAEhH,qBAAa,4BAA6B,SAAQ,KAAK;gBACzC,KAAK,EAAE,MAAM;CAG1B;AAED,qBAAa,8BAA+B,SAAQ,YAAa,YAAW,WAAW;aAOnE,MAAM,EAAE,UAAU;IANpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+D;IACtF,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsE;IAE/F,SAAgB,IAAI,EAAG,QAAQ,CAAU;gBAGvB,MAAM,EAAE,UAAU,EAClC,OAAO,EAAE,GAAG;IAMd,IAAW,OAAO,eAEjB;IAEM,aAAa;IAIb,YAAY;IAIZ,mBAAmB;IAInB,yBAAyB;IAIzB,eAAe;IAIf,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI3C,WAAW;IAIL,YAAY,CACvB,aAAa,EAAE,GAAG,EAClB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,sBAAsB,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC;IAI/E,iBAAiB,CAAC,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAInF,mBAAmB,CAAC,OAAO,EAAE,GAAG,GAAG,WAAW;IAOxC,gCAAgC,CAC3C,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,GACjD,OAAO,CAAC,WAAW,CAAC;IAehB,2BAA2B,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO;IAiBlG,wBAAwB,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,KAAK,MAAM,EAAE,CAAA;KAAE,KAAK,OAAO;IAgB/F,oBAAoB,CACzB,QAAQ,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAA;KAAE,KAAK,OAAO;IAiBjG,6EAA6E;IACtE,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW;IAW3D,qEAAqE;IAC9D,+BAA+B,CAAC,IAAI,EAAE,GAAG,EAAE;;;;;;;IAIlD;;;;;;OAMG;IACI,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,sBAAsB,GAAE,MAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAe3E,YAAY,CACvB,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,MAAM,GAAG,MAAM,GACrB,UAAU,CAAC,OAAO,OAAO,CAAC,yBAAyB,CAAC;CAiDxD"}
+{"version":3,"file":"empire_slashing_proposer.d.ts","sourceRoot":"","sources":["../../src/contracts/empire_slashing_proposer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAK3D,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAGL,KAAK,GAAG,EACR,KAAK,GAAG,EACR,KAAK,mBAAmB,EAGzB,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,KAAK,WAAW,EAA8D,MAAM,kBAAkB,CAAC;AAEhH,qBAAa,4BAA6B,SAAQ,KAAK;gBACzC,KAAK,EAAE,MAAM;CAG1B;AAED,qBAAa,8BAA+B,SAAQ,YAAa,YAAW,WAAW;aAOnE,MAAM,EAAE,UAAU;IANpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+D;IACtF,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsE;IAE/F,SAAgB,IAAI,EAAG,QAAQ,CAAU;gBAGvB,MAAM,EAAE,UAAU,EAClC,OAAO,EAAE,GAAG,GAAG,UAAU;IAU3B,IAAW,OAAO,eAEjB;IAEM,aAAa;IAIb,YAAY;IAIZ,mBAAmB;IAInB,yBAAyB;IAIzB,eAAe;IAIf,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI3C,WAAW;IAIL,YAAY,CACvB,aAAa,EAAE,GAAG,EAClB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,sBAAsB,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC;IAI/E,iBAAiB,CAAC,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAInF,mBAAmB,CAAC,OAAO,EAAE,GAAG,GAAG,WAAW;IAOxC,gCAAgC,CAC3C,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,GACjD,OAAO,CAAC,WAAW,CAAC;IAehB,2BAA2B,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO;IAiBlG,wBAAwB,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,KAAK,MAAM,EAAE,CAAA;KAAE,KAAK,OAAO;IAgB/F,oBAAoB,CACzB,QAAQ,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAA;KAAE,KAAK,OAAO;IAiBjG,6EAA6E;IACtE,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW;IAW3D,qEAAqE;IAC9D,+BAA+B,CAAC,IAAI,EAAE,GAAG,EAAE;;;;;;;IAIlD;;;;;;OAMG;IACI,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,sBAAsB,GAAE,MAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAe3E,YAAY,CACvB,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,MAAM,GAAG,MAAM,GACrB,UAAU,CAAC,OAAO,OAAO,CAAC,yBAAyB,CAAC;CAiDxD"}

package/dest/contracts/empire_slashing_proposer.js

@@ -19,7 +19,7 @@ export class EmpireSlashingProposerContract extends EventEmitter {
     constructor(client, address){
         super(), this.client = client, this.logger = createLogger('ethereum:contracts:empire_slashing_proposer'), this.type = 'empire';
         this.proposer = getContract({
-            address,
+            address: typeof address === 'string' ? address : address.toString(),
             abi: EmpireSlashingProposerAbi,
             client
         });

package/dest/contracts/fee_asset_handler.d.ts

@@ -1,6 +1,6 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { type Hex } from 'viem';
-import type { L1TxUtils } from '../l1_tx_utils.js';
+import type { L1TxUtils } from '../l1_tx_utils/index.js';
 export declare class FeeAssetHandlerContract {
     readonly txUtils: L1TxUtils;
     address: EthAddress;
@@ -9,11 +9,11 @@ export declare class FeeAssetHandlerContract {
     getMintAmount(): Promise<bigint>;
     mint(recipient: Hex | EthAddress): Promise<{
         receipt: import("viem").TransactionReceipt;
-        gasPrice: import("../l1_tx_utils.js").GasPrice;
+        state: import("../l1_tx_utils/types.js").L1TxState;
     }>;
     setMintAmount(amount: bigint): Promise<{
         receipt: import("viem").TransactionReceipt;
-        gasPrice: import("../l1_tx_utils.js").GasPrice;
+        state: import("../l1_tx_utils/types.js").L1TxState;
     }>;
 }
 //# sourceMappingURL=fee_asset_handler.d.ts.map

package/dest/contracts/fee_asset_handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fee_asset_handler.d.ts","sourceRoot":"","sources":["../../src/contracts/fee_asset_handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,KAAK,GAAG,EAAmC,MAAM,MAAM,CAAC;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,uBAAuB;aAKhB,OAAO,EAAE,SAAS;IAJ7B,OAAO,EAAE,UAAU,CAAC;gBAGzB,OAAO,EAAE,GAAG,GAAG,UAAU,EACT,OAAO,EAAE,SAAS;IAQvB,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC;IASrC,aAAa;IASb,IAAI,CAAC,SAAS,EAAE,GAAG,GAAG,UAAU;;;;IAchC,aAAa,CAAC,MAAM,EAAE,MAAM;;;;CAUpC"}
+{"version":3,"file":"fee_asset_handler.d.ts","sourceRoot":"","sources":["../../src/contracts/fee_asset_handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,KAAK,GAAG,EAAmC,MAAM,MAAM,CAAC;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,qBAAa,uBAAuB;aAKhB,OAAO,EAAE,SAAS;IAJ7B,OAAO,EAAE,UAAU,CAAC;gBAGzB,OAAO,EAAE,GAAG,GAAG,UAAU,EACT,OAAO,EAAE,SAAS;IAQvB,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC;IASrC,aAAa;IASb,IAAI,CAAC,SAAS,EAAE,GAAG,GAAG,UAAU;;;;IAchC,aAAa,CAAC,MAAM,EAAE,MAAM;;;;CAUpC"}

package/dest/contracts/governance.js

@@ -2,7 +2,7 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { sleep } from '@aztec/foundation/sleep';
 import { GovernanceAbi } from '@aztec/l1-artifacts/GovernanceAbi';
 import { encodeFunctionData, getContract, parseEventLogs } from 'viem';
-import { createL1TxUtilsFromViemWallet } from '../l1_tx_utils.js';
+import { createL1TxUtilsFromViemWallet } from '../l1_tx_utils/index.js';
 import { isExtendedClient } from '../types.js';
 // NOTE: Must be kept in sync with DataStructures.ProposalState in l1-contracts
 export var ProposalState = /*#__PURE__*/ function(ProposalState) {
@@ -156,7 +156,9 @@ export class GovernanceContract extends ReadOnlyGovernanceContract {
         ]);
     }
     async vote({ proposalId, voteAmount, inFavor, retries = 10, logger }) {
-        const l1TxUtils = createL1TxUtilsFromViemWallet(this.client, logger);
+        const l1TxUtils = createL1TxUtilsFromViemWallet(this.client, {
+            logger
+        });
         const retryDelaySeconds = 12;
         voteAmount = voteAmount ?? await this.getPower();
         let success = false;
@@ -203,7 +205,9 @@ export class GovernanceContract extends ReadOnlyGovernanceContract {
         logger.info(`Proposal [${proposalId}] has summedBallot nay [${proposal.summedBallot.nay}]`);
     }
     async executeProposal({ proposalId, retries = 10, logger }) {
-        const l1TxUtils = createL1TxUtilsFromViemWallet(this.client, logger);
+        const l1TxUtils = createL1TxUtilsFromViemWallet(this.client, {
+            logger
+        });
         const retryDelaySeconds = 12;
         let success = false;
         for(let i = 0; i < retries; i++){

package/dest/contracts/governance_proposer.d.ts

@@ -1,6 +1,6 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { type Hex, type TransactionReceipt, type TypedDataDefinition } from 'viem';
-import type { GasPrice, L1TxRequest, L1TxUtils } from '../l1_tx_utils.js';
+import type { L1TxRequest, L1TxUtils } from '../l1_tx_utils/index.js';
 import type { ViemClient } from '../types.js';
 import { type IEmpireBase } from './empire_base.js';
 export declare class GovernanceProposerContract implements IEmpireBase {
@@ -24,7 +24,6 @@ export declare class GovernanceProposerContract implements IEmpireBase {
     createSignalRequestWithSignature(payload: Hex, slot: bigint, chainId: number, signerAddress: Hex, signer: (msg: TypedDataDefinition) => Promise<Hex>): Promise<L1TxRequest>;
     submitRoundWinner(round: bigint, l1TxUtils: L1TxUtils): Promise<{
         receipt: TransactionReceipt;
-        gasPrice: GasPrice;
         proposalId: bigint;
     }>;
 }

package/dest/contracts/governance_proposer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"governance_proposer.d.ts","sourceRoot":"","sources":["../../src/contracts/governance_proposer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAEL,KAAK,GAAG,EACR,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EAGzB,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,KAAK,WAAW,EAA8D,MAAM,kBAAkB,CAAC;AAGhH,qBAAa,0BAA2B,YAAW,WAAW;aAI1C,MAAM,EAAE,UAAU;IAHpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkE;gBAGzE,MAAM,EAAE,UAAU,EAClC,OAAO,EAAE,GAAG,GAAG,UAAU;IAQ3B,IAAW,OAAO,eAEjB;IAEY,gBAAgB;IAKhB,kBAAkB;IAIxB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAIhC,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/B,WAAW;IAIX,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIrC,YAAY,CACvB,aAAa,EAAE,GAAG,EAClB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,sBAAsB,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC;IAI/E,iBAAiB,CAAC,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAInF,mBAAmB,CAAC,OAAO,EAAE,GAAG,GAAG,WAAW;IAOxC,gCAAgC,CAC3C,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,GACjD,OAAO,CAAC,WAAW,CAAC;IAeV,iBAAiB,CAC5B,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC;QACT,OAAO,EAAE,kBAAkB,CAAC;QAC5B,QAAQ,EAAE,QAAQ,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CAYH"}
+{"version":3,"file":"governance_proposer.d.ts","sourceRoot":"","sources":["../../src/contracts/governance_proposer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAEL,KAAK,GAAG,EACR,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EAGzB,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,KAAK,WAAW,EAA8D,MAAM,kBAAkB,CAAC;AAGhH,qBAAa,0BAA2B,YAAW,WAAW;aAI1C,MAAM,EAAE,UAAU;IAHpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkE;gBAGzE,MAAM,EAAE,UAAU,EAClC,OAAO,EAAE,GAAG,GAAG,UAAU;IAQ3B,IAAW,OAAO,eAEjB;IAEY,gBAAgB;IAKhB,kBAAkB;IAIxB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAIhC,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/B,WAAW;IAIX,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIrC,YAAY,CACvB,aAAa,EAAE,GAAG,EAClB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,sBAAsB,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC;IAI/E,iBAAiB,CAAC,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAInF,mBAAmB,CAAC,OAAO,EAAE,GAAG,GAAG,WAAW;IAOxC,gCAAgC,CAC3C,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,GACjD,OAAO,CAAC,WAAW,CAAC;IAeV,iBAAiB,CAC5B,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC;QACT,OAAO,EAAE,kBAAkB,CAAC;QAC5B,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CAYH"}

package/dest/contracts/governance_proposer.js

@@ -74,7 +74,7 @@ export class GovernanceProposerContract {
         };
     }
     async submitRoundWinner(round, l1TxUtils) {
-        const { receipt, gasPrice } = await l1TxUtils.sendAndMonitorTransaction({
+        const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
             to: this.address.toString(),
             data: encodeFunctionData({
                 abi: this.proposer.abi,
@@ -87,7 +87,6 @@ export class GovernanceProposerContract {
         const proposalId = extractProposalIdFromLogs(receipt.logs);
         return {
             receipt,
-            gasPrice,
             proposalId
         };
     }

package/dest/contracts/multicall.d.ts

@@ -1,20 +1,18 @@
 import type { Logger } from '@aztec/foundation/log';
 import { type Hex } from 'viem';
-import type { L1BlobInputs, L1GasConfig, L1TxRequest, L1TxUtils } from '../l1_tx_utils.js';
+import type { L1BlobInputs, L1TxConfig, L1TxRequest, L1TxUtils } from '../l1_tx_utils/index.js';
 import type { ExtendedViemWalletClient } from '../types.js';
 import { FormattedViemError } from '../utils.js';
 export declare const MULTI_CALL_3_ADDRESS: "0xcA11bde05977b3631167028862bE2a173976CA11";
 export declare class Multicall3 {
-    static forward(requests: L1TxRequest[], l1TxUtils: L1TxUtils, gasConfig: L1GasConfig | undefined, blobConfig: L1BlobInputs | undefined, rollupAddress: Hex, logger: Logger, opts?: {
+    static forward(requests: L1TxRequest[], l1TxUtils: L1TxUtils, gasConfig: L1TxConfig | undefined, blobConfig: L1BlobInputs | undefined, rollupAddress: Hex, logger: Logger, opts?: {
         revertOnFailure?: boolean;
     }): Promise<FormattedViemError | {
         receipt: import("viem").TransactionReceipt;
-        gasPrice: import("../l1_tx_utils.js").GasPrice;
-        stats: import("../l1_tx_utils.js").TransactionStats | undefined;
+        stats: import("../l1_tx_utils/types.js").TransactionStats | undefined;
         errorMsg?: undefined;
     } | {
         receipt: import("viem").TransactionReceipt;
-        gasPrice: import("../l1_tx_utils.js").GasPrice;
         errorMsg: string | undefined;
         stats?: undefined;
     }>;

package/dest/contracts/multicall.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multicall.d.ts","sourceRoot":"","sources":["../../src/contracts/multicall.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAqC,KAAK,GAAG,EAAqC,MAAM,MAAM,CAAC;AAEtG,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC3F,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAmB,MAAM,aAAa,CAAC;AAGlE,eAAO,MAAM,oBAAoB,EAAG,4CAAqD,CAAC;AAE1F,qBAAa,UAAU;WACR,OAAO,CAClB,QAAQ,EAAE,WAAW,EAAE,EACvB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,WAAW,GAAG,SAAS,EAClC,UAAU,EAAE,YAAY,GAAG,SAAS,EACpC,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;QAAE,eAAe,CAAC,EAAE,OAAO,CAAA;KAAO;;;;;;;;;;;CAmG3C;AAED,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,wBAAwB,EAAE,MAAM,EAAE,MAAM,iBA+BxF"}
+{"version":3,"file":"multicall.d.ts","sourceRoot":"","sources":["../../src/contracts/multicall.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAqC,KAAK,GAAG,EAAqC,MAAM,MAAM,CAAC;AAEtG,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAChG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAmB,MAAM,aAAa,CAAC;AAGlE,eAAO,MAAM,oBAAoB,EAAG,4CAAqD,CAAC;AAE1F,qBAAa,UAAU;WACR,OAAO,CAClB,QAAQ,EAAE,WAAW,EAAE,EACvB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,UAAU,GAAG,SAAS,EACjC,UAAU,EAAE,YAAY,GAAG,SAAS,EACpC,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;QAAE,eAAe,CAAC,EAAE,OAAO,CAAA;KAAO;;;;;;;;;CAoG3C;AAED,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,wBAAwB,EAAE,MAAM,EAAE,MAAM,iBA+BxF"}

package/dest/contracts/multicall.js

@@ -1,4 +1,5 @@
 import { toHex as toPaddedHex } from '@aztec/foundation/bigint-buffer';
+import { TimeoutError } from '@aztec/foundation/error';
 import { encodeFunctionData, multicall3Abi } from 'viem';
 import { FormattedViemError, formatViemError } from '../utils.js';
 import { RollupContract } from './rollup.js';
@@ -20,7 +21,7 @@ export class Multicall3 {
         };
         const encodedForwarderData = encodeFunctionData(forwarderFunctionData);
         try {
-            const { receipt, gasPrice } = await l1TxUtils.sendAndMonitorTransaction({
+            const { receipt, state } = await l1TxUtils.sendAndMonitorTransaction({
                 to: MULTI_CALL_3_ADDRESS,
                 data: encodedForwarderData
             }, gasConfig, blobConfig);
@@ -28,7 +29,6 @@ export class Multicall3 {
                 const stats = await l1TxUtils.getTransactionStats(receipt.transactionHash);
                 return {
                     receipt,
-                    gasPrice,
                     stats
                 };
             } else {
@@ -41,7 +41,7 @@ export class Multicall3 {
                 };
                 let errorMsg;
                 if (blobConfig) {
-                    const maxFeePerBlobGas = blobConfig.maxFeePerBlobGas ?? gasPrice.maxFeePerBlobGas;
+                    const maxFeePerBlobGas = blobConfig.maxFeePerBlobGas ?? state.gasPrice.maxFeePerBlobGas;
                     if (maxFeePerBlobGas === undefined) {
                         errorMsg = 'maxFeePerBlobGas is required to get the error message';
                     } else {
@@ -68,11 +68,13 @@ export class Multicall3 {
                 }
                 return {
                     receipt,
-                    gasPrice,
                     errorMsg
                 };
             }
         } catch (err) {
+            if (err instanceof TimeoutError) {
+                throw err;
+            }
             for (const request of requests){
                 logger.debug('Simulating request', {
                     request