diff --git a/yarn-project/aztec.js/src/utils/anvil_test_watcher.ts b/yarn-project/aztec.js/src/utils/anvil_test_watcher.ts index 062f3883c2d..3b6db925b3a 100644 --- a/yarn-project/aztec.js/src/utils/anvil_test_watcher.ts +++ b/yarn-project/aztec.js/src/utils/anvil_test_watcher.ts @@ -18,7 +18,7 @@ export class AnvilTestWatcher { private filledRunningPromise?: RunningPromise; - private logger: Logger = createLogger(`aztec:utils:watcher`); + private logger: Logger = createLogger(`aztecjs:utils:watcher`); constructor( private cheatcodes: EthCheatCodes, diff --git a/yarn-project/end-to-end/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts b/yarn-project/end-to-end/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts index aa9fe1bf2e2..d7dc45a2ca6 100644 --- a/yarn-project/end-to-end/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts +++ b/yarn-project/end-to-end/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts @@ -70,7 +70,7 @@ export class BlacklistTokenContractTest { blacklisted!: AccountWallet; constructor(testName: string) { - this.logger = createLogger(`aztec:e2e_blacklist_token_contract:${testName}`); + this.logger = createLogger(`e2e:e2e_blacklist_token_contract:${testName}`); this.snapshotManager = createSnapshotManager(`e2e_blacklist_token_contract/${testName}`, dataPath); } diff --git a/yarn-project/end-to-end/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts b/yarn-project/end-to-end/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts index eba699c0d1d..2ee9eee8b68 100644 --- a/yarn-project/end-to-end/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts +++ b/yarn-project/end-to-end/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts @@ -52,7 +52,7 @@ export class CrossChainMessagingTest { outbox!: any; // GetContractReturnType | undefined; constructor(testName: string) { - this.logger = createLogger(`aztec:e2e_cross_chain_messaging:${testName}`); + this.logger = createLogger(`e2e:e2e_cross_chain_messaging:${testName}`); this.snapshotManager = createSnapshotManager(`e2e_cross_chain_messaging/${testName}`, dataPath); } diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract/deploy_test.ts b/yarn-project/end-to-end/src/e2e_deploy_contract/deploy_test.ts index ccf96fa00ab..2632b9e4d6d 100644 --- a/yarn-project/end-to-end/src/e2e_deploy_contract/deploy_test.ts +++ b/yarn-project/end-to-end/src/e2e_deploy_contract/deploy_test.ts @@ -29,7 +29,7 @@ export class DeployTest { public aztecNode!: AztecNode; constructor(testName: string) { - this.logger = createLogger(`aztec:e2e_deploy_contract:${testName}`); + this.logger = createLogger(`e2e:e2e_deploy_contract:${testName}`); this.snapshotManager = createSnapshotManager(`e2e_deploy_contract/${testName}`, dataPath); } diff --git a/yarn-project/end-to-end/src/e2e_fees/fees_test.ts b/yarn-project/end-to-end/src/e2e_fees/fees_test.ts index eec862d4e7a..dcb1faa9d96 100644 --- a/yarn-project/end-to-end/src/e2e_fees/fees_test.ts +++ b/yarn-project/end-to-end/src/e2e_fees/fees_test.ts @@ -83,7 +83,7 @@ export class FeesTest { public readonly APP_SPONSORED_TX_GAS_LIMIT = BigInt(10e9); constructor(testName: string) { - this.logger = createLogger(`aztec:e2e_fees:${testName}`); + this.logger = createLogger(`e2e:e2e_fees:${testName}`); this.snapshotManager = createSnapshotManager(`e2e_fees/${testName}`, dataPath); } diff --git a/yarn-project/end-to-end/src/e2e_nested_contract/nested_contract_test.ts b/yarn-project/end-to-end/src/e2e_nested_contract/nested_contract_test.ts index 058e10abcc9..11db0cb233c 100644 --- a/yarn-project/end-to-end/src/e2e_nested_contract/nested_contract_test.ts +++ b/yarn-project/end-to-end/src/e2e_nested_contract/nested_contract_test.ts @@ -23,7 +23,7 @@ export class NestedContractTest { childContract!: ChildContract; constructor(testName: string) { - this.logger = createLogger(`aztec:e2e_nested_contract:${testName}`); + this.logger = createLogger(`e2e:e2e_nested_contract:${testName}`); this.snapshotManager = createSnapshotManager(`e2e_nested_contract/${testName}`, dataPath); } diff --git a/yarn-project/end-to-end/src/e2e_p2p/p2p_network.ts b/yarn-project/end-to-end/src/e2e_p2p/p2p_network.ts index d0a50be5e03..fbb5ec58dde 100644 --- a/yarn-project/end-to-end/src/e2e_p2p/p2p_network.ts +++ b/yarn-project/end-to-end/src/e2e_p2p/p2p_network.ts @@ -59,7 +59,7 @@ export class P2PNetworkTest { // If set enable metrics collection metricsPort?: number, ) { - this.logger = createLogger(`aztec:e2e_p2p:${testName}`); + this.logger = createLogger(`e2e:e2e_p2p:${testName}`); // Set up the base account and node private keys for the initial network deployment this.baseAccount = privateKeyToAccount(`0x${getPrivateKeyFromIndex(0)!.toString('hex')}`); diff --git a/yarn-project/end-to-end/src/e2e_prover/e2e_prover_test.ts b/yarn-project/end-to-end/src/e2e_prover/e2e_prover_test.ts index e333591fd7d..c6d0bab98a7 100644 --- a/yarn-project/end-to-end/src/e2e_prover/e2e_prover_test.ts +++ b/yarn-project/end-to-end/src/e2e_prover/e2e_prover_test.ts @@ -93,7 +93,7 @@ export class FullProverTest { coinbase: EthAddress, private realProofs = true, ) { - this.logger = createLogger(`aztec:full_prover_test:${testName}`); + this.logger = createLogger(`e2e:full_prover_test:${testName}`); this.snapshotManager = createSnapshotManager( `full_prover_integration/${testName}`, dataPath, diff --git a/yarn-project/end-to-end/src/e2e_token_contract/token_contract_test.ts b/yarn-project/end-to-end/src/e2e_token_contract/token_contract_test.ts index a46e31330f2..9453ef7692f 100644 --- a/yarn-project/end-to-end/src/e2e_token_contract/token_contract_test.ts +++ b/yarn-project/end-to-end/src/e2e_token_contract/token_contract_test.ts @@ -29,7 +29,7 @@ export class TokenContractTest { badAccount!: DocsExampleContract; constructor(testName: string) { - this.logger = createLogger(`aztec:e2e_token_contract:${testName}`); + this.logger = createLogger(`e2e:e2e_token_contract:${testName}`); this.snapshotManager = createSnapshotManager(`e2e_token_contract/${testName}`, dataPath, { metricsPort: metricsPort ? parseInt(metricsPort) : undefined, }); diff --git a/yarn-project/end-to-end/src/fixtures/setup_p2p_test.ts b/yarn-project/end-to-end/src/fixtures/setup_p2p_test.ts index 381ab8abfbc..26b4df79f3f 100644 --- a/yarn-project/end-to-end/src/fixtures/setup_p2p_test.ts +++ b/yarn-project/end-to-end/src/fixtures/setup_p2p_test.ts @@ -72,7 +72,7 @@ export async function createNode( return await AztecNodeService.createAndSync(validatorConfig, { telemetry: telemetryClient, - logger: createLogger(`aztec:node-${tcpPort}`), + logger: createLogger(`node:${tcpPort}`), }); } diff --git a/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts b/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts index ac0852f8d34..71cb8e1a5ef 100644 --- a/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts +++ b/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts @@ -94,7 +94,7 @@ class MockSnapshotManager implements ISnapshotManager { private config: Partial = {}, private deployL1ContractsArgs: Partial = { assumeProvenThrough: Number.MAX_SAFE_INTEGER }, ) { - this.logger = createLogger(`aztec:snapshot_manager:${testName}`); + this.logger = createLogger(`e2e:snapshot_manager:${testName}`); this.logger.warn(`No data path given, will not persist any snapshots.`); } @@ -143,7 +143,7 @@ class SnapshotManager implements ISnapshotManager { private deployL1ContractsArgs: Partial = { assumeProvenThrough: Number.MAX_SAFE_INTEGER }, ) { this.livePath = join(this.dataPath, 'live', testName); - this.logger = createLogger(`aztec:snapshot_manager:${testName}`); + this.logger = createLogger(`e2e:snapshot_manager:${testName}`); } public async snapshot( diff --git a/yarn-project/end-to-end/src/shared/jest_setup.ts b/yarn-project/end-to-end/src/shared/jest_setup.ts index 12f4b37794a..8c1ed4e5559 100644 --- a/yarn-project/end-to-end/src/shared/jest_setup.ts +++ b/yarn-project/end-to-end/src/shared/jest_setup.ts @@ -8,6 +8,6 @@ beforeEach(() => { if (!testPath || !currentTestName) { return; } - const logger = createLogger(`aztec:${basename(testPath).replace('.test.ts', '')}`); + const logger = createLogger(`e2e:${basename(testPath).replace('.test.ts', '')}`); logger.info(`Running test: ${currentTestName}`); }); diff --git a/yarn-project/end-to-end/src/spartan/4epochs.test.ts b/yarn-project/end-to-end/src/spartan/4epochs.test.ts index a006f32fe17..43d2a0da7ba 100644 --- a/yarn-project/end-to-end/src/spartan/4epochs.test.ts +++ b/yarn-project/end-to-end/src/spartan/4epochs.test.ts @@ -14,7 +14,7 @@ const config = setupEnvironment(process.env); describe('token transfer test', () => { jest.setTimeout(10 * 60 * 4000); // 40 minutes - const logger = createLogger(`aztec:spartan:4epochs`); + const logger = createLogger(`e2e:spartan:4epochs`); const l1Config = getL1ContractsConfigEnvVars(); // We want plenty of minted tokens for a lot of slots that fill up multiple epochs diff --git a/yarn-project/end-to-end/src/spartan/transfer.test.ts b/yarn-project/end-to-end/src/spartan/transfer.test.ts index e2e0239231d..4f0d79215f7 100644 --- a/yarn-project/end-to-end/src/spartan/transfer.test.ts +++ b/yarn-project/end-to-end/src/spartan/transfer.test.ts @@ -12,7 +12,7 @@ const config = setupEnvironment(process.env); describe('token transfer test', () => { jest.setTimeout(10 * 60 * 2000); // 20 minutes - const logger = createLogger(`aztec:spartan-test:transfer`); + const logger = createLogger(`e2e:spartan-test:transfer`); const MINT_AMOUNT = 20n; const ROUNDS = 5n; diff --git a/yarn-project/merkle-tree/src/tree_base.ts b/yarn-project/merkle-tree/src/tree_base.ts index 0c614647648..395cb6b3779 100644 --- a/yarn-project/merkle-tree/src/tree_base.ts +++ b/yarn-project/merkle-tree/src/tree_base.ts @@ -84,7 +84,7 @@ export abstract class TreeBase implements MerkleTree { this.root = root ? root : current; this.maxIndex = 2n ** BigInt(depth) - 1n; - this.log = createLogger(`aztec:merkle-tree:${name.toLowerCase()}`); + this.log = createLogger(`merkle-tree:${name.toLowerCase()}`); } /** diff --git a/yarn-project/pxe/src/pxe_service/pxe_service.ts b/yarn-project/pxe/src/pxe_service/pxe_service.ts index da2cf61a6f1..1bc6a9cd047 100644 --- a/yarn-project/pxe/src/pxe_service/pxe_service.ts +++ b/yarn-project/pxe/src/pxe_service/pxe_service.ts @@ -102,7 +102,7 @@ export class PXEService implements PXE { config: PXEServiceConfig, logSuffix?: string, ) { - this.log = createLogger(logSuffix ? `aztec:pxe_service_${logSuffix}` : `aztec:pxe_service`); + this.log = createLogger(logSuffix ? `pxe:service:${logSuffix}` : `pxe:service`); this.synchronizer = new Synchronizer(node, db, tipsStore, config, logSuffix); this.contractDataOracle = new ContractDataOracle(db); this.simulator = getAcirSimulator(db, node, keyStore, this.contractDataOracle); diff --git a/yarn-project/pxe/src/synchronizer/synchronizer.ts b/yarn-project/pxe/src/synchronizer/synchronizer.ts index 73fc6171dc4..e85b3eba8b8 100644 --- a/yarn-project/pxe/src/synchronizer/synchronizer.ts +++ b/yarn-project/pxe/src/synchronizer/synchronizer.ts @@ -31,7 +31,7 @@ export class Synchronizer implements L2BlockStreamEventHandler { config: Partial> = {}, logSuffix?: string, ) { - this.log = createLogger(logSuffix ? `aztec:pxe_synchronizer_${logSuffix}` : 'aztec:pxe_synchronizer'); + this.log = createLogger(logSuffix ? `pxe:synchronizer:${logSuffix}` : 'pxe:synchronizer'); this.blockStream = this.createBlockStream(config); } diff --git a/yarn-project/simulator/src/avm/avm_simulator.ts b/yarn-project/simulator/src/avm/avm_simulator.ts index 24bc19fd5f7..528347f6a9a 100644 --- a/yarn-project/simulator/src/avm/avm_simulator.ts +++ b/yarn-project/simulator/src/avm/avm_simulator.ts @@ -54,7 +54,7 @@ export class AvmSimulator { context.machineState.gasLeft.l2Gas <= MAX_L2_GAS_PER_ENQUEUED_CALL, `Cannot allocate more than ${MAX_L2_GAS_PER_ENQUEUED_CALL} to the AVM for execution of an enqueued call`, ); - this.log = createLogger(`aztec:avm_simulator:core(f:${context.environment.functionSelector.toString()})`); + this.log = createLogger(`simulator:avm:core(f:${context.environment.functionSelector.toString()})`); // TODO(palla/log): Should tallies be printed on debug, or only on trace? if (this.log.isLevelEnabled('debug')) { this.tallyPrintFunction = this.printOpcodeTallies; diff --git a/yarn-project/simulator/src/public/public_tx_context.ts b/yarn-project/simulator/src/public/public_tx_context.ts index e73487126cd..35c8afc4b4a 100644 --- a/yarn-project/simulator/src/public/public_tx_context.ts +++ b/yarn-project/simulator/src/public/public_tx_context.ts @@ -72,7 +72,7 @@ export class PublicTxContext { public readonly revertibleAccumulatedDataFromPrivate: PrivateToPublicAccumulatedData, public trace: PublicEnqueuedCallSideEffectTrace, // FIXME(dbanks12): should be private ) { - this.log = createLogger(`aztec:public_tx_context`); + this.log = createLogger(`simulator:public_tx_context`); this.gasUsed = startGasUsed; } @@ -379,7 +379,7 @@ class PhaseStateManager { private currentlyActiveStateManager: AvmPersistableStateManager | undefined; constructor(private readonly txStateManager: AvmPersistableStateManager) { - this.log = createLogger(`aztec:public_phase_state_manager`); + this.log = createLogger(`simulator:public_phase_state_manager`); } fork() { diff --git a/yarn-project/simulator/src/public/public_tx_simulator.ts b/yarn-project/simulator/src/public/public_tx_simulator.ts index ac19520348e..76d4c34b9e3 100644 --- a/yarn-project/simulator/src/public/public_tx_simulator.ts +++ b/yarn-project/simulator/src/public/public_tx_simulator.ts @@ -63,7 +63,7 @@ export class PublicTxSimulator { private realAvmProvingRequests: boolean = true, private doMerkleOperations: boolean = false, ) { - this.log = createLogger(`aztec:public_tx_simulator`); + this.log = createLogger(`simulator:public_tx_simulator`); this.metrics = new ExecutorMetrics(telemetryClient, 'PublicTxSimulator'); }