Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions yarn-project/aztec/src/cli/util.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
import { ArchiverConfig } from '@aztec/archiver';
import { AztecNodeConfig } from '@aztec/aztec-node';
import { AccountManager } from '@aztec/aztec.js';
import { L1ContractAddresses } from '@aztec/ethereum';
import { L1ContractAddresses, l1ContractsNames } from '@aztec/ethereum';
import { EthAddress } from '@aztec/foundation/eth-address';
import { LogFn, createConsoleLogger } from '@aztec/foundation/log';
import { P2PConfig } from '@aztec/p2p';
import { GrumpkinScalar, PXEService, PXEServiceConfig } from '@aztec/pxe';

const l1ContractsNames = [
'rollupAddress',
'inboxAddress',
'outboxAddress',
'contractDeploymentEmitterAddress',
'availabilityOracleAddress',
];

/**
* Checks if the object has l1Contracts property
* @param obj - The object to check
Expand Down
38 changes: 12 additions & 26 deletions yarn-project/ethereum/src/l1_contract_addresses.ts
Original file line number Diff line number Diff line change
@@ -1,31 +1,17 @@
import { EthAddress } from '@aztec/foundation/eth-address';

export const l1ContractsNames = [
'availabilityOracleAddress',
'rollupAddress',
'registryAddress',
'inboxAddress',
'outboxAddress',
'contractDeploymentEmitterAddress',
];

/**
* Provides the directory of current L1 contract addresses
*/
export interface L1ContractAddresses {
/**
* Availability Oracle Address.
*/
availabilityOracleAddress: EthAddress;
/**
* Rollup Address.
*/
rollupAddress: EthAddress;
/**
* Registry Address.
*/
registryAddress: EthAddress;
/**
* Inbox Address.
*/
inboxAddress: EthAddress;
/**
* Outbox Address.
*/
outboxAddress: EthAddress;
/**
* Data Emitter Address.
*/
contractDeploymentEmitterAddress: EthAddress;
}
export type L1ContractAddresses = {
[K in (typeof l1ContractsNames)[number]]: EthAddress;
};