Fix circular dependency

AztecProtocol · Feb 18, 2025 · 5c25f61 · 5c25f61
1 parent 6dbffcd
commit 5c25f61
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 21 deletions.
diff --git a/yarn-project/ethereum/src/contracts/forwarder.test.ts b/yarn-project/ethereum/src/contracts/forwarder.test.ts
@@ -19,9 +19,10 @@ import { type PrivateKeyAccount, privateKeyToAccount } from 'viem/accounts';
 import { foundry } from 'viem/chains';
 
 import { DefaultL1ContractsConfig } from '../config.js';
-import { type L1Clients, createL1Clients, deployL1Contract, deployL1Contracts } from '../deploy_l1_contracts.js';
+import { createL1Clients, deployL1Contract, deployL1Contracts } from '../deploy_l1_contracts.js';
 import { L1TxUtils } from '../l1_tx_utils.js';
 import { startAnvil } from '../test/start_anvil.js';
+import { type L1Clients } from '../types.js';
 import { FormattedViemError } from '../utils.js';
 import { ForwarderContract } from './forwarder.js';
 

diff --git a/yarn-project/ethereum/src/contracts/forwarder.ts b/yarn-project/ethereum/src/contracts/forwarder.ts
@@ -15,8 +15,9 @@ import {
   getContract,
 } from 'viem';
 
-import { type L1Clients, deployL1Contract } from '../deploy_l1_contracts.js';
+import { deployL1Contract } from '../deploy_l1_contracts.js';
 import { type L1BlobInputs, type L1GasConfig, type L1TxRequest, type L1TxUtils } from '../l1_tx_utils.js';
+import { type L1Clients } from '../types.js';
 import { RollupContract } from './rollup.js';
 
 export class ForwarderContract {

diff --git a/yarn-project/ethereum/src/contracts/governance_proposer.ts b/yarn-project/ethereum/src/contracts/governance_proposer.ts
@@ -13,8 +13,8 @@ import {
   getContract,
 } from 'viem';
 
-import type { L1Clients } from '../deploy_l1_contracts.js';
 import type { GasPrice, L1TxRequest, L1TxUtils } from '../l1_tx_utils.js';
+import { type L1Clients } from '../types.js';
 import { type IEmpireBase, encodeVote } from './empire_base.js';
 
 export class GovernanceProposerContract implements IEmpireBase {

diff --git a/yarn-project/ethereum/src/contracts/slashing_proposer.ts b/yarn-project/ethereum/src/contracts/slashing_proposer.ts
@@ -10,8 +10,8 @@ import {
   getContract,
 } from 'viem';
 
-import type { L1Clients } from '../deploy_l1_contracts.js';
 import type { L1TxRequest } from '../l1_tx_utils.js';
+import type { L1Clients } from '../types.js';
 import { type IEmpireBase, encodeVote } from './empire_base.js';
 
 export class SlashingProposerContract implements IEmpireBase {

diff --git a/yarn-project/ethereum/src/deploy_l1_contracts.ts b/yarn-project/ethereum/src/deploy_l1_contracts.ts
@@ -40,15 +40,10 @@ import type { Abi, Narrow } from 'abitype';
 import {
   type Account,
   type Chain,
-  type Client,
   type Hex,
   type HttpTransport,
-  type PublicActions,
   type PublicClient,
-  type PublicRpcSchema,
-  type WalletActions,
   type WalletClient,
-  type WalletRpcSchema,
   concatHex,
   createPublicClient,
   createWalletClient,
@@ -68,6 +63,7 @@ import { isAnvilTestChain } from './chain.js';
 import { type L1ContractsConfig } from './config.js';
 import { type L1ContractAddresses } from './l1_contract_addresses.js';
 import { L1TxUtils, type L1TxUtilsConfig, defaultL1TxUtilsConfig } from './l1_tx_utils.js';
+import type { L1Clients } from './types.js';
 
 export const DEPLOYER_ADDRESS: Hex = '0x4e59b44847b379578588920cA78FbF26c0B4956C';
 
@@ -210,17 +206,6 @@ export interface DeployL1ContractsArgs extends L1ContractsConfig {
   l1TxConfig?: Partial<L1TxUtilsConfig>;
 }
 
-export type L1Clients = {
-  publicClient: PublicClient<HttpTransport, Chain>;
-  walletClient: Client<
-    HttpTransport,
-    Chain,
-    PrivateKeyAccount,
-    [...WalletRpcSchema, ...PublicRpcSchema],
-    PublicActions<HttpTransport, Chain> & WalletActions<Chain, PrivateKeyAccount>
-  >;
-};
-
 /**
  * Creates a wallet and a public viem client for interacting with L1.
  * @param rpcUrl - RPC URL to connect to L1.

diff --git a/yarn-project/ethereum/src/l1_tx_utils.ts b/yarn-project/ethereum/src/l1_tx_utils.ts
@@ -30,7 +30,7 @@ import {
   hexToBytes,
 } from 'viem';
 
-import { type L1Clients } from './deploy_l1_contracts.js';
+import { type L1Clients } from './types.js';
 import { formatViemError } from './utils.js';
 
 // 1_000_000_000 Gwei = 1 ETH

diff --git a/yarn-project/ethereum/src/types.ts b/yarn-project/ethereum/src/types.ts
@@ -24,3 +24,9 @@ export type ViemClient = Client<
 
 /** Type for a viem public client */
 export type ViemPublicClient = PublicClient<HttpTransport, Chain>;
+
+/** Both L1 clients */
+export type L1Clients = {
+  publicClient: ViemPublicClient;
+  walletClient: ViemClient;
+};