fix: Explicit l1-tx-utils-with-blobs import (#11962)

A little bit ugly, but we're going in the explicit export direction
anyways and otherwise this'll keep happening

boxes/bootstrap.sh

@@ -35,9 +35,7 @@ function test {
 
 function test_cmds {
   for browser in chromium webkit; do
-    # TODO(#11874): reinstate once fixed, failing since b33f1da9
-    #for box in vanilla react vite; do
-    for box in vanilla react; do
+    for box in vanilla react vite; do
       echo "boxes/scripts/run_test.sh $box $browser"
     done
   done

yarn-project/circuit-types/src/config.ts

@@ -1,5 +1,5 @@
 import { EthAddress } from '@aztec/circuits.js';
-import { l1ContractAddressesMapping } from '@aztec/ethereum';
+import { l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresses';
 import { type ConfigMappingsType, numberConfigHelper } from '@aztec/foundation/config';
 
 export { AllowedElement, SequencerConfig, SequencerConfigSchema } from './interfaces/configs.js';

yarn-project/end-to-end/src/composed/integration_l1_publisher.test.ts

@@ -20,12 +20,12 @@ import { EpochCache } from '@aztec/epoch-cache';
 import {
   GovernanceProposerContract,
   type L1ContractAddresses,
-  L1TxUtilsWithBlobs,
   RollupContract,
   SlashingProposerContract,
   createEthereumChain,
   createL1Clients,
 } from '@aztec/ethereum';
+import { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
 import { EthCheatCodesWithState } from '@aztec/ethereum/test';
 import { range } from '@aztec/foundation/array';
 import { timesParallel } from '@aztec/foundation/collection';

yarn-project/end-to-end/src/e2e_p2p/p2p_network.ts

@@ -2,7 +2,8 @@ import { getSchnorrAccount } from '@aztec/accounts/schnorr';
 import { type AztecNodeConfig, type AztecNodeService } from '@aztec/aztec-node';
 import { type AccountWalletWithSecretKey } from '@aztec/aztec.js';
 import { ChainMonitor } from '@aztec/aztec.js/ethereum';
-import { L1TxUtilsWithBlobs, RollupContract, getExpectedAddress, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import { RollupContract, getExpectedAddress, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
 import { EthCheatCodesWithState } from '@aztec/ethereum/test';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';

yarn-project/end-to-end/src/e2e_synching.test.ts

@@ -52,11 +52,11 @@ import { type AztecAddress, EthAddress } from '@aztec/circuits.js';
 import { EpochCache } from '@aztec/epoch-cache';
 import {
   GovernanceProposerContract,
-  L1TxUtilsWithBlobs,
   RollupContract,
   SlashingProposerContract,
   getL1ContractsConfigEnvVars,
 } from '@aztec/ethereum';
+import { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
 import { TestDateProvider, Timer } from '@aztec/foundation/timer';
 import { RollupAbi } from '@aztec/l1-artifacts';
 import { SchnorrHardcodedAccountContract } from '@aztec/noir-contracts.js/SchnorrHardcodedAccount';

yarn-project/ethereum/package.json

@@ -9,6 +9,7 @@
     "./contracts": "./dest/contracts/index.js",
     "./deploy-l1-contracts": "./dest/deploy_l1_contracts.js",
     "./l1-contract-addresses": "./dest/l1_contract_addresses.js",
+    "./l1-tx-utils-with-blobs": "./dest/l1_tx_utils_with_blobs.js",
     "./utils": "./dest/utils.js"
   },
   "typedocOptions": {

yarn-project/ethereum/src/index.ts

@@ -3,7 +3,6 @@ export * from './deploy_l1_contracts.js';
 export * from './chain.js';
 export * from './eth_cheat_codes.js';
 export * from './l1_tx_utils.js';
-export * from './l1_tx_utils_with_blobs.js';
 export * from './l1_contract_addresses.js';
 export * from './l1_reader.js';
 export * from './utils.js';

yarn-project/sequencer-client/src/client/sequencer-client.ts

@@ -5,13 +5,13 @@ import { EpochCache } from '@aztec/epoch-cache';
 import {
   ForwarderContract,
   GovernanceProposerContract,
-  L1TxUtilsWithBlobs,
   RollupContract,
   SlashingProposerContract,
   createEthereumChain,
   createL1Clients,
   isAnvilTestChain,
 } from '@aztec/ethereum';
+import { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { type DateProvider } from '@aztec/foundation/timer';

yarn-project/sequencer-client/src/publisher/sequencer-publisher.test.ts

@@ -10,12 +10,12 @@ import {
   type GovernanceProposerContract,
   type L1ContractsConfig,
   type L1TxUtilsConfig,
-  type L1TxUtilsWithBlobs,
   type RollupContract,
   type SlashingProposerContract,
   defaultL1TxUtilsConfig,
   getL1ContractsConfigEnvVars,
 } from '@aztec/ethereum';
+import { type L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
 import { sleep } from '@aztec/foundation/sleep';
 import { EmpireBaseAbi, RollupAbi } from '@aztec/l1-artifacts';
 

yarn-project/sequencer-client/src/publisher/sequencer-publisher.ts

@@ -20,12 +20,12 @@ import {
   type L1ContractsConfig,
   type L1GasConfig,
   type L1TxRequest,
-  type L1TxUtilsWithBlobs,
   RollupContract,
   type SlashingProposerContract,
   type TransactionStats,
   formatViemError,
 } from '@aztec/ethereum';
+import { type L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
 import { toHex } from '@aztec/foundation/bigint-buffer';
 import { type Signature } from '@aztec/foundation/eth-signature';
 import { createLogger } from '@aztec/foundation/log';