diff --git a/yarn-project/accounts/src/defaults/account_contract.ts b/yarn-project/accounts/src/defaults/account_contract.ts index 40cbe35e6c05..76d015df4e76 100644 --- a/yarn-project/accounts/src/defaults/account_contract.ts +++ b/yarn-project/accounts/src/defaults/account_contract.ts @@ -1,6 +1,6 @@ -import { type AccountContract, type AccountInterface, type AuthWitnessProvider } from '@aztec/aztec.js/account'; -import { type ContractArtifact } from '@aztec/stdlib/abi'; -import { type CompleteAddress, type NodeInfo } from '@aztec/stdlib/contract'; +import type { AccountContract, AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account'; +import type { ContractArtifact } from '@aztec/stdlib/abi'; +import type { CompleteAddress, NodeInfo } from '@aztec/stdlib/contract'; import { DefaultAccountInterface } from '../defaults/account_interface.js'; diff --git a/yarn-project/accounts/src/defaults/account_interface.ts b/yarn-project/accounts/src/defaults/account_interface.ts index 8a0c0826868d..c1017d027437 100644 --- a/yarn-project/accounts/src/defaults/account_interface.ts +++ b/yarn-project/accounts/src/defaults/account_interface.ts @@ -1,10 +1,10 @@ import type { AztecAddress, NodeInfo } from '@aztec/aztec.js'; import { type AccountInterface, type AuthWitnessProvider, CompleteAddress } from '@aztec/aztec.js/account'; -import { type EntrypointInterface, type ExecutionRequestInit } from '@aztec/aztec.js/entrypoint'; +import type { EntrypointInterface, ExecutionRequestInit } from '@aztec/aztec.js/entrypoint'; import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account'; import { Fr } from '@aztec/foundation/fields'; -import { type AuthWitness } from '@aztec/stdlib/auth-witness'; -import { type TxExecutionRequest } from '@aztec/stdlib/tx'; +import type { AuthWitness } from '@aztec/stdlib/auth-witness'; +import type { TxExecutionRequest } from '@aztec/stdlib/tx'; /** * Default implementation for an account interface. Requires that the account uses the default diff --git a/yarn-project/accounts/src/ecdsa/ecdsa_k/account_contract.ts b/yarn-project/accounts/src/ecdsa/ecdsa_k/account_contract.ts index 6e30d981377a..5d0091c4ed6d 100644 --- a/yarn-project/accounts/src/ecdsa/ecdsa_k/account_contract.ts +++ b/yarn-project/accounts/src/ecdsa/ecdsa_k/account_contract.ts @@ -1,7 +1,7 @@ -import { type AuthWitnessProvider } from '@aztec/aztec.js/account'; +import type { AuthWitnessProvider } from '@aztec/aztec.js/account'; import { Ecdsa } from '@aztec/foundation/crypto'; -import { type Fr } from '@aztec/foundation/fields'; -import { type ContractArtifact } from '@aztec/stdlib/abi'; +import type { Fr } from '@aztec/foundation/fields'; +import type { ContractArtifact } from '@aztec/stdlib/abi'; import { AuthWitness } from '@aztec/stdlib/auth-witness'; import { CompleteAddress } from '@aztec/stdlib/contract'; diff --git a/yarn-project/accounts/src/ecdsa/ecdsa_k/index.ts b/yarn-project/accounts/src/ecdsa/ecdsa_k/index.ts index feb54d6b8269..fdc43b7513b1 100644 --- a/yarn-project/accounts/src/ecdsa/ecdsa_k/index.ts +++ b/yarn-project/accounts/src/ecdsa/ecdsa_k/index.ts @@ -7,7 +7,7 @@ import type { AztecAddress, Fr } from '@aztec/aztec.js'; import { AccountManager, type Salt } from '@aztec/aztec.js/account'; import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; import { EcdsaKAccountContract } from './account_contract.js'; diff --git a/yarn-project/accounts/src/ecdsa/ssh_ecdsa_r/account_contract.ts b/yarn-project/accounts/src/ecdsa/ssh_ecdsa_r/account_contract.ts index a051a06c979e..fd89b8e95d00 100644 --- a/yarn-project/accounts/src/ecdsa/ssh_ecdsa_r/account_contract.ts +++ b/yarn-project/accounts/src/ecdsa/ssh_ecdsa_r/account_contract.ts @@ -1,7 +1,7 @@ import { type AuthWitnessProvider, CompleteAddress } from '@aztec/aztec.js/account'; import { EcdsaSignature } from '@aztec/foundation/crypto'; -import { type Fr } from '@aztec/foundation/fields'; -import { type ContractArtifact } from '@aztec/stdlib/abi'; +import type { Fr } from '@aztec/foundation/fields'; +import type { ContractArtifact } from '@aztec/stdlib/abi'; import { AuthWitness } from '@aztec/stdlib/auth-witness'; import { DefaultAccountContract } from '../../defaults/account_contract.js'; diff --git a/yarn-project/accounts/src/ecdsa/ssh_ecdsa_r/index.ts b/yarn-project/accounts/src/ecdsa/ssh_ecdsa_r/index.ts index 242cbd5fbfb8..86bd732b9510 100644 --- a/yarn-project/accounts/src/ecdsa/ssh_ecdsa_r/index.ts +++ b/yarn-project/accounts/src/ecdsa/ssh_ecdsa_r/index.ts @@ -7,7 +7,7 @@ import type { AztecAddress, Fr } from '@aztec/aztec.js'; import { AccountManager, type Salt } from '@aztec/aztec.js/account'; import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; import { EcdsaRSSHAccountContract } from './account_contract.js'; diff --git a/yarn-project/accounts/src/schnorr/account_contract.ts b/yarn-project/accounts/src/schnorr/account_contract.ts index c7fea1c5e43c..3fd7c556bc73 100644 --- a/yarn-project/accounts/src/schnorr/account_contract.ts +++ b/yarn-project/accounts/src/schnorr/account_contract.ts @@ -1,8 +1,8 @@ import { CompleteAddress, getAccountContractAddress } from '@aztec/aztec.js'; -import { type AuthWitnessProvider } from '@aztec/aztec.js/account'; +import type { AuthWitnessProvider } from '@aztec/aztec.js/account'; import { Schnorr } from '@aztec/foundation/crypto'; import { type Fr, GrumpkinScalar } from '@aztec/foundation/fields'; -import { type ContractArtifact } from '@aztec/stdlib/abi'; +import type { ContractArtifact } from '@aztec/stdlib/abi'; import { AuthWitness } from '@aztec/stdlib/auth-witness'; import { deriveSigningKey } from '@aztec/stdlib/keys'; diff --git a/yarn-project/accounts/src/schnorr/index.ts b/yarn-project/accounts/src/schnorr/index.ts index f6976c113052..0ce3ff3418c0 100644 --- a/yarn-project/accounts/src/schnorr/index.ts +++ b/yarn-project/accounts/src/schnorr/index.ts @@ -7,7 +7,7 @@ import type { AztecAddress, Fr, GrumpkinScalar } from '@aztec/aztec.js'; import { AccountManager, type Salt } from '@aztec/aztec.js/account'; import { type AccountWallet, type AccountWalletWithSecretKey, getWallet } from '@aztec/aztec.js/wallet'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; import { SchnorrAccountContract } from './account_contract.js'; diff --git a/yarn-project/accounts/src/single_key/account_contract.ts b/yarn-project/accounts/src/single_key/account_contract.ts index b692fbbe9fe9..3b44b4181d8d 100644 --- a/yarn-project/accounts/src/single_key/account_contract.ts +++ b/yarn-project/accounts/src/single_key/account_contract.ts @@ -1,7 +1,7 @@ import { type AuthWitnessProvider, CompleteAddress } from '@aztec/aztec.js/account'; import { Schnorr } from '@aztec/foundation/crypto'; import { type Fr, GrumpkinScalar } from '@aztec/foundation/fields'; -import { type ContractArtifact } from '@aztec/stdlib/abi'; +import type { ContractArtifact } from '@aztec/stdlib/abi'; import { AuthWitness } from '@aztec/stdlib/auth-witness'; import { DefaultAccountContract } from '../defaults/account_contract.js'; diff --git a/yarn-project/accounts/src/single_key/index.ts b/yarn-project/accounts/src/single_key/index.ts index a4084e57bc97..b6484f87390e 100644 --- a/yarn-project/accounts/src/single_key/index.ts +++ b/yarn-project/accounts/src/single_key/index.ts @@ -7,7 +7,7 @@ import type { AztecAddress, Fr, GrumpkinScalar } from '@aztec/aztec.js'; import { AccountManager, type Salt } from '@aztec/aztec.js/account'; import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; import { deriveMasterIncomingViewingSecretKey } from '@aztec/stdlib/keys'; import { SingleKeyAccountContract } from './account_contract.js'; diff --git a/yarn-project/accounts/src/testing/configuration.ts b/yarn-project/accounts/src/testing/configuration.ts index cb67d1fa1028..2688ce5c4956 100644 --- a/yarn-project/accounts/src/testing/configuration.ts +++ b/yarn-project/accounts/src/testing/configuration.ts @@ -1,7 +1,7 @@ -import { type PXE } from '@aztec/aztec.js'; -import { type AccountWalletWithSecretKey } from '@aztec/aztec.js/wallet'; +import type { PXE } from '@aztec/aztec.js'; +import type { AccountWalletWithSecretKey } from '@aztec/aztec.js/wallet'; import { Fr, type GrumpkinScalar } from '@aztec/foundation/fields'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { deriveMasterIncomingViewingSecretKey } from '@aztec/stdlib/keys'; import { diff --git a/yarn-project/accounts/src/testing/create_account.ts b/yarn-project/accounts/src/testing/create_account.ts index d33f4eb85ec2..99324738d196 100644 --- a/yarn-project/accounts/src/testing/create_account.ts +++ b/yarn-project/accounts/src/testing/create_account.ts @@ -4,7 +4,7 @@ import { deriveSigningKey } from '@aztec/stdlib/keys'; import { getSchnorrAccountContractAddress } from '../schnorr/account_contract.js'; import { getSchnorrAccount } from '../schnorr/index.js'; -import { type InitialAccountData } from './configuration.js'; +import type { InitialAccountData } from './configuration.js'; /** * Generate a fixed amount of random schnorr account contract instance. diff --git a/yarn-project/archiver/src/archiver/archiver.test.ts b/yarn-project/archiver/src/archiver/archiver.test.ts index d9a326707b49..80f069ea7ad0 100644 --- a/yarn-project/archiver/src/archiver/archiver.test.ts +++ b/yarn-project/archiver/src/archiver/archiver.test.ts @@ -1,5 +1,5 @@ import { Blob } from '@aztec/blob-lib'; -import { type BlobSinkClientInterface } from '@aztec/blob-sink/client'; +import type { BlobSinkClientInterface } from '@aztec/blob-sink/client'; import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants'; import { DefaultL1ContractsConfig } from '@aztec/ethereum'; import { EthAddress } from '@aztec/foundation/eth-address'; @@ -26,8 +26,8 @@ import { } from 'viem'; import { Archiver } from './archiver.js'; -import { type ArchiverDataStore } from './archiver_store.js'; -import { type ArchiverInstrumentation } from './instrumentation.js'; +import type { ArchiverDataStore } from './archiver_store.js'; +import type { ArchiverInstrumentation } from './instrumentation.js'; import { MemoryArchiverStore } from './memory_archiver_store/memory_archiver_store.js'; interface MockRollupContractRead { diff --git a/yarn-project/archiver/src/archiver/archiver.ts b/yarn-project/archiver/src/archiver/archiver.ts index a0947c7b80be..b4c31a419e0b 100644 --- a/yarn-project/archiver/src/archiver/archiver.ts +++ b/yarn-project/archiver/src/archiver/archiver.ts @@ -1,6 +1,6 @@ -import { type BlobSinkClientInterface } from '@aztec/blob-sink/client'; +import type { BlobSinkClientInterface } from '@aztec/blob-sink/client'; import { createEthereumChain } from '@aztec/ethereum'; -import { type EthAddress } from '@aztec/foundation/eth-address'; +import type { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; import { type Logger, createLogger } from '@aztec/foundation/log'; import { RunningPromise } from '@aztec/foundation/running-promise'; @@ -16,16 +16,9 @@ import { ContractInstanceDeployedEvent, ContractInstanceUpdatedEvent, } from '@aztec/protocol-contracts/instance-deployer'; -import { type FunctionSelector } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { - type InBlock, - type L2Block, - type L2BlockId, - type L2BlockSource, - type L2Tips, - type NullifierWithBlockSource, -} from '@aztec/stdlib/block'; +import type { FunctionSelector } from '@aztec/stdlib/abi'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { InBlock, L2Block, L2BlockId, L2BlockSource, L2Tips, NullifierWithBlockSource } from '@aztec/stdlib/block'; import { type ContractClassPublic, type ContractDataSource, @@ -62,13 +55,13 @@ import { http, } from 'viem'; -import { type ArchiverDataStore, type ArchiverL1SynchPoint } from './archiver_store.js'; -import { type ArchiverConfig } from './config.js'; +import type { ArchiverDataStore, ArchiverL1SynchPoint } from './archiver_store.js'; +import type { ArchiverConfig } from './config.js'; import { retrieveBlocksFromRollup, retrieveL1ToL2Messages } from './data_retrieval.js'; import { NoBlobBodiesFoundError } from './errors.js'; import { ArchiverInstrumentation } from './instrumentation.js'; -import { type DataRetrieval } from './structs/data_retrieval.js'; -import { type L1Published } from './structs/published.js'; +import type { DataRetrieval } from './structs/data_retrieval.js'; +import type { L1Published } from './structs/published.js'; /** * Helper interface to combine all sources this archiver implementation provides. diff --git a/yarn-project/archiver/src/archiver/archiver_store.ts b/yarn-project/archiver/src/archiver/archiver_store.ts index 3d80e9143df5..4d3453905487 100644 --- a/yarn-project/archiver/src/archiver/archiver_store.ts +++ b/yarn-project/archiver/src/archiver/archiver_store.ts @@ -1,21 +1,21 @@ import type { Fr } from '@aztec/foundation/fields'; -import { type FunctionSelector } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { FunctionSelector } from '@aztec/stdlib/abi'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { InBlock, L2Block } from '@aztec/stdlib/block'; -import { - type ContractClassPublic, - type ContractInstanceUpdateWithAddress, - type ContractInstanceWithAddress, - type ExecutablePrivateFunctionWithMembershipProof, - type UnconstrainedFunctionWithMembershipProof, +import type { + ContractClassPublic, + ContractInstanceUpdateWithAddress, + ContractInstanceWithAddress, + ExecutablePrivateFunctionWithMembershipProof, + UnconstrainedFunctionWithMembershipProof, } from '@aztec/stdlib/contract'; import type { GetContractClassLogsResponse, GetPublicLogsResponse } from '@aztec/stdlib/interfaces/client'; import type { LogFilter, PrivateLog, TxScopedL2Log } from '@aztec/stdlib/logs'; import type { InboxLeaf } from '@aztec/stdlib/messaging'; import { BlockHeader, type TxEffect, type TxHash, type TxReceipt } from '@aztec/stdlib/tx'; -import { type DataRetrieval } from './structs/data_retrieval.js'; -import { type L1Published } from './structs/published.js'; +import type { DataRetrieval } from './structs/data_retrieval.js'; +import type { L1Published } from './structs/published.js'; /** * Represents the latest L1 block processed by the archiver for various objects in L2. diff --git a/yarn-project/archiver/src/archiver/archiver_store_test_suite.ts b/yarn-project/archiver/src/archiver/archiver_store_test_suite.ts index a49717ceb39a..1c25edec58a8 100644 --- a/yarn-project/archiver/src/archiver/archiver_store_test_suite.ts +++ b/yarn-project/archiver/src/archiver/archiver_store_test_suite.ts @@ -26,8 +26,8 @@ import { import '@aztec/stdlib/testing/jest'; import { TxEffect, TxHash } from '@aztec/stdlib/tx'; -import { type ArchiverDataStore, type ArchiverL1SynchPoint } from './archiver_store.js'; -import { type L1Published } from './structs/published.js'; +import type { ArchiverDataStore, ArchiverL1SynchPoint } from './archiver_store.js'; +import type { L1Published } from './structs/published.js'; /** * @param testName - The name of the test suite. diff --git a/yarn-project/archiver/src/archiver/data_retrieval.ts b/yarn-project/archiver/src/archiver/data_retrieval.ts index 740c911fe3ed..52c4bb243467 100644 --- a/yarn-project/archiver/src/archiver/data_retrieval.ts +++ b/yarn-project/archiver/src/archiver/data_retrieval.ts @@ -1,8 +1,8 @@ import { Blob, BlobDeserializationError } from '@aztec/blob-lib'; -import { type BlobSinkClientInterface } from '@aztec/blob-sink/client'; +import type { BlobSinkClientInterface } from '@aztec/blob-sink/client'; import { asyncPool } from '@aztec/foundation/async-pool'; -import { type EthAddress } from '@aztec/foundation/eth-address'; -import { type ViemSignature } from '@aztec/foundation/eth-signature'; +import type { EthAddress } from '@aztec/foundation/eth-address'; +import type { ViemSignature } from '@aztec/foundation/eth-signature'; import { Fr } from '@aztec/foundation/fields'; import { type Logger, createLogger } from '@aztec/foundation/log'; import { numToUInt32BE } from '@aztec/foundation/serialize'; @@ -26,8 +26,8 @@ import { } from 'viem'; import { NoBlobBodiesFoundError } from './errors.js'; -import { type DataRetrieval } from './structs/data_retrieval.js'; -import { type L1Published, type L1PublishedData } from './structs/published.js'; +import type { DataRetrieval } from './structs/data_retrieval.js'; +import type { L1Published, L1PublishedData } from './structs/published.js'; /** * Fetches new L2 blocks. diff --git a/yarn-project/archiver/src/archiver/instrumentation.ts b/yarn-project/archiver/src/archiver/instrumentation.ts index e541b1a2b6b5..1257cdf3e4d2 100644 --- a/yarn-project/archiver/src/archiver/instrumentation.ts +++ b/yarn-project/archiver/src/archiver/instrumentation.ts @@ -1,5 +1,5 @@ import { createLogger } from '@aztec/foundation/log'; -import { type L2Block } from '@aztec/stdlib/block'; +import type { L2Block } from '@aztec/stdlib/block'; import { Attributes, type Gauge, diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/block_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/block_store.ts index 9c7bab1f5230..2df10739567e 100644 --- a/yarn-project/archiver/src/archiver/kv_archiver_store/block_store.ts +++ b/yarn-project/archiver/src/archiver/kv_archiver_store/block_store.ts @@ -2,12 +2,12 @@ import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants'; import { toArray } from '@aztec/foundation/iterable'; import { createLogger } from '@aztec/foundation/log'; import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncSingleton, Range } from '@aztec/kv-store'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { Body, type InBlock, L2Block, L2BlockHash } from '@aztec/stdlib/block'; import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees'; import { BlockHeader, TxEffect, TxHash, TxReceipt } from '@aztec/stdlib/tx'; -import { type L1Published, type L1PublishedData } from '../structs/published.js'; +import type { L1Published, L1PublishedData } from '../structs/published.js'; export { type TxEffect, type TxHash, TxReceipt } from '@aztec/stdlib/tx'; diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/contract_class_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/contract_class_store.ts index 3e49bcf0df39..2fb3770e104c 100644 --- a/yarn-project/archiver/src/archiver/kv_archiver_store/contract_class_store.ts +++ b/yarn-project/archiver/src/archiver/kv_archiver_store/contract_class_store.ts @@ -3,11 +3,11 @@ import { toArray } from '@aztec/foundation/iterable'; import { BufferReader, numToUInt8, serializeToBuffer } from '@aztec/foundation/serialize'; import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store'; import { FunctionSelector } from '@aztec/stdlib/abi'; -import { - type ContractClassPublic, - type ContractClassPublicWithBlockNumber, - type ExecutablePrivateFunctionWithMembershipProof, - type UnconstrainedFunctionWithMembershipProof, +import type { + ContractClassPublic, + ContractClassPublicWithBlockNumber, + ExecutablePrivateFunctionWithMembershipProof, + UnconstrainedFunctionWithMembershipProof, } from '@aztec/stdlib/contract'; import { Vector } from '@aztec/stdlib/types'; diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/kv_archiver_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/kv_archiver_store.ts index 2870e15ece0b..444b606835e4 100644 --- a/yarn-project/archiver/src/archiver/kv_archiver_store/kv_archiver_store.ts +++ b/yarn-project/archiver/src/archiver/kv_archiver_store/kv_archiver_store.ts @@ -1,25 +1,25 @@ import type { Fr } from '@aztec/foundation/fields'; import { toArray } from '@aztec/foundation/iterable'; import { createLogger } from '@aztec/foundation/log'; -import { type AztecAsyncKVStore, type StoreSize } from '@aztec/kv-store'; +import type { AztecAsyncKVStore, StoreSize } from '@aztec/kv-store'; import { FunctionSelector } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { InBlock, L2Block } from '@aztec/stdlib/block'; -import { - type ContractClassPublic, - type ContractInstanceUpdateWithAddress, - type ContractInstanceWithAddress, - type ExecutablePrivateFunctionWithMembershipProof, - type UnconstrainedFunctionWithMembershipProof, +import type { + ContractClassPublic, + ContractInstanceUpdateWithAddress, + ContractInstanceWithAddress, + ExecutablePrivateFunctionWithMembershipProof, + UnconstrainedFunctionWithMembershipProof, } from '@aztec/stdlib/contract'; import type { GetContractClassLogsResponse, GetPublicLogsResponse } from '@aztec/stdlib/interfaces/client'; import { type LogFilter, PrivateLog, type TxScopedL2Log } from '@aztec/stdlib/logs'; import type { InboxLeaf } from '@aztec/stdlib/messaging'; import type { BlockHeader, TxHash, TxReceipt } from '@aztec/stdlib/tx'; -import { type ArchiverDataStore, type ArchiverL1SynchPoint } from '../archiver_store.js'; -import { type DataRetrieval } from '../structs/data_retrieval.js'; -import { type L1Published } from '../structs/published.js'; +import type { ArchiverDataStore, ArchiverL1SynchPoint } from '../archiver_store.js'; +import type { DataRetrieval } from '../structs/data_retrieval.js'; +import type { L1Published } from '../structs/published.js'; import { BlockStore } from './block_store.js'; import { ContractClassStore } from './contract_class_store.js'; import { ContractInstanceStore } from './contract_instance_store.js'; diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/log_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/log_store.ts index b43a3880040b..c3cb665c663a 100644 --- a/yarn-project/archiver/src/archiver/kv_archiver_store/log_store.ts +++ b/yarn-project/archiver/src/archiver/kv_archiver_store/log_store.ts @@ -17,7 +17,7 @@ import { UnencryptedL2Log, } from '@aztec/stdlib/logs'; -import { type BlockStore } from './block_store.js'; +import type { BlockStore } from './block_store.js'; /** * A store for logs diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/message_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/message_store.ts index 147e3bdb94b0..01e56a0bbd31 100644 --- a/yarn-project/archiver/src/archiver/kv_archiver_store/message_store.ts +++ b/yarn-project/archiver/src/archiver/kv_archiver_store/message_store.ts @@ -4,7 +4,7 @@ import { createLogger } from '@aztec/foundation/log'; import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncSingleton } from '@aztec/kv-store'; import { InboxLeaf } from '@aztec/stdlib/messaging'; -import { type DataRetrieval } from '../structs/data_retrieval.js'; +import type { DataRetrieval } from '../structs/data_retrieval.js'; /** * LMDB implementation of the ArchiverDataStore interface. diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/nullifier_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/nullifier_store.ts index 4dcf63881225..caac01c7d362 100644 --- a/yarn-project/archiver/src/archiver/kv_archiver_store/nullifier_store.ts +++ b/yarn-project/archiver/src/archiver/kv_archiver_store/nullifier_store.ts @@ -1,8 +1,8 @@ import { MAX_NULLIFIERS_PER_TX } from '@aztec/constants'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store'; -import { type InBlock, type L2Block } from '@aztec/stdlib/block'; +import type { InBlock, L2Block } from '@aztec/stdlib/block'; export class NullifierStore { #nullifiersToBlockNumber: AztecAsyncMap; diff --git a/yarn-project/archiver/src/archiver/memory_archiver_store/l1_to_l2_message_store.ts b/yarn-project/archiver/src/archiver/memory_archiver_store/l1_to_l2_message_store.ts index 8178af0ed95b..f47502d29aef 100644 --- a/yarn-project/archiver/src/archiver/memory_archiver_store/l1_to_l2_message_store.ts +++ b/yarn-project/archiver/src/archiver/memory_archiver_store/l1_to_l2_message_store.ts @@ -1,5 +1,5 @@ import { L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/constants'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { InboxLeaf } from '@aztec/stdlib/messaging'; /** diff --git a/yarn-project/archiver/src/archiver/memory_archiver_store/memory_archiver_store.test.ts b/yarn-project/archiver/src/archiver/memory_archiver_store/memory_archiver_store.test.ts index 747ea62daf70..40d1ec085f79 100644 --- a/yarn-project/archiver/src/archiver/memory_archiver_store/memory_archiver_store.test.ts +++ b/yarn-project/archiver/src/archiver/memory_archiver_store/memory_archiver_store.test.ts @@ -1,7 +1,7 @@ import { timesParallel } from '@aztec/foundation/collection'; import { L2Block } from '@aztec/stdlib/block'; -import { type ArchiverDataStore } from '../archiver_store.js'; +import type { ArchiverDataStore } from '../archiver_store.js'; import { describeArchiverDataStore } from '../archiver_store_test_suite.js'; import { MemoryArchiverStore } from './memory_archiver_store.js'; diff --git a/yarn-project/archiver/src/archiver/memory_archiver_store/memory_archiver_store.ts b/yarn-project/archiver/src/archiver/memory_archiver_store/memory_archiver_store.ts index ec0674c2374b..d588cb4943b3 100644 --- a/yarn-project/archiver/src/archiver/memory_archiver_store/memory_archiver_store.ts +++ b/yarn-project/archiver/src/archiver/memory_archiver_store/memory_archiver_store.ts @@ -7,15 +7,15 @@ import { import { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; import { FunctionSelector } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { type InBlock, type L2Block, L2BlockHash, wrapInBlock } from '@aztec/stdlib/block'; -import { - type ContractClassPublic, - type ContractClassPublicWithBlockNumber, - type ContractInstanceUpdateWithAddress, - type ContractInstanceWithAddress, - type ExecutablePrivateFunctionWithMembershipProof, - type UnconstrainedFunctionWithMembershipProof, +import type { + ContractClassPublic, + ContractClassPublicWithBlockNumber, + ContractInstanceUpdateWithAddress, + ContractInstanceWithAddress, + ExecutablePrivateFunctionWithMembershipProof, + UnconstrainedFunctionWithMembershipProof, } from '@aztec/stdlib/contract'; import type { GetContractClassLogsResponse, GetPublicLogsResponse } from '@aztec/stdlib/interfaces/client'; import { @@ -31,9 +31,9 @@ import { import type { InboxLeaf } from '@aztec/stdlib/messaging'; import { type BlockHeader, TxEffect, TxHash, TxReceipt } from '@aztec/stdlib/tx'; -import { type ArchiverDataStore, type ArchiverL1SynchPoint } from '../archiver_store.js'; -import { type DataRetrieval } from '../structs/data_retrieval.js'; -import { type L1Published } from '../structs/published.js'; +import type { ArchiverDataStore, ArchiverL1SynchPoint } from '../archiver_store.js'; +import type { DataRetrieval } from '../structs/data_retrieval.js'; +import type { L1Published } from '../structs/published.js'; import { L1ToL2MessageStore } from './l1_to_l2_message_store.js'; type StoredContractInstanceUpdate = ContractInstanceUpdateWithAddress & { blockNumber: number; logIndex: number }; diff --git a/yarn-project/archiver/src/factory.ts b/yarn-project/archiver/src/factory.ts index 2383de023979..c790a261be80 100644 --- a/yarn-project/archiver/src/factory.ts +++ b/yarn-project/archiver/src/factory.ts @@ -1,7 +1,7 @@ -import { type BlobSinkClientInterface } from '@aztec/blob-sink/client'; +import type { BlobSinkClientInterface } from '@aztec/blob-sink/client'; import { createLogger } from '@aztec/foundation/log'; -import { type Maybe } from '@aztec/foundation/types'; -import { type DataStoreConfig } from '@aztec/kv-store/config'; +import type { Maybe } from '@aztec/foundation/types'; +import type { DataStoreConfig } from '@aztec/kv-store/config'; import { createStore } from '@aztec/kv-store/lmdb-v2'; import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token'; import { TokenBridgeContractArtifact } from '@aztec/noir-contracts.js/TokenBridge'; @@ -14,12 +14,12 @@ import { computePublicBytecodeCommitment, getContractClassFromArtifact, } from '@aztec/stdlib/contract'; -import { type ArchiverApi, type Service } from '@aztec/stdlib/interfaces/server'; +import type { ArchiverApi, Service } from '@aztec/stdlib/interfaces/server'; import { getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning'; import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client'; import { Archiver } from './archiver/archiver.js'; -import { type ArchiverConfig } from './archiver/config.js'; +import type { ArchiverConfig } from './archiver/config.js'; import { KVArchiverDataStore } from './archiver/index.js'; import { createArchiverClient } from './rpc/index.js'; diff --git a/yarn-project/archiver/src/test/mock_archiver.ts b/yarn-project/archiver/src/test/mock_archiver.ts index d88ca3994365..1103353f0d83 100644 --- a/yarn-project/archiver/src/test/mock_archiver.ts +++ b/yarn-project/archiver/src/test/mock_archiver.ts @@ -1,4 +1,4 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import type { L2Block, L2BlockSource } from '@aztec/stdlib/block'; import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging'; diff --git a/yarn-project/archiver/src/test/mock_l1_to_l2_message_source.ts b/yarn-project/archiver/src/test/mock_l1_to_l2_message_source.ts index 2013041f3ef5..cc2ae66ba811 100644 --- a/yarn-project/archiver/src/test/mock_l1_to_l2_message_source.ts +++ b/yarn-project/archiver/src/test/mock_l1_to_l2_message_source.ts @@ -1,5 +1,5 @@ -import { type Fr } from '@aztec/foundation/fields'; -import { type L1ToL2MessageSource } from '@aztec/stdlib/messaging'; +import type { Fr } from '@aztec/foundation/fields'; +import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging'; /** * A mocked implementation of L1ToL2MessageSource to be used in tests. diff --git a/yarn-project/aztec-faucet/src/faucet.ts b/yarn-project/aztec-faucet/src/faucet.ts index 3697d5786d6c..d762f739ec1b 100644 --- a/yarn-project/aztec-faucet/src/faucet.ts +++ b/yarn-project/aztec-faucet/src/faucet.ts @@ -1,5 +1,5 @@ import { createEthereumChain } from '@aztec/ethereum'; -import { type EthAddress } from '@aztec/foundation/eth-address'; +import type { EthAddress } from '@aztec/foundation/eth-address'; import { createLogger } from '@aztec/foundation/log'; import { TestERC20Abi } from '@aztec/l1-artifacts'; @@ -19,7 +19,7 @@ import { } from 'viem'; import { mnemonicToAccount } from 'viem/accounts'; -import { type FaucetConfig, type L1AssetConfig } from './config.js'; +import type { FaucetConfig, L1AssetConfig } from './config.js'; type L1Asset = { contract: GetContractReturnType>; diff --git a/yarn-project/aztec-node/src/aztec-node/server.test.ts b/yarn-project/aztec-node/src/aztec-node/server.test.ts index 1ba5ed1de4ad..763565ce1ae5 100644 --- a/yarn-project/aztec-node/src/aztec-node/server.test.ts +++ b/yarn-project/aztec-node/src/aztec-node/server.test.ts @@ -1,19 +1,15 @@ import { TestCircuitVerifier } from '@aztec/bb-prover'; import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; -import { type P2P } from '@aztec/p2p'; +import type { P2P } from '@aztec/p2p'; import { computeFeePayerBalanceLeafSlot } from '@aztec/protocol-contracts/fee-juice'; -import { type GlobalVariableBuilder } from '@aztec/sequencer-client'; +import type { GlobalVariableBuilder } from '@aztec/sequencer-client'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type L2BlockSource, type NullifierWithBlockSource } from '@aztec/stdlib/block'; +import type { L2BlockSource, NullifierWithBlockSource } from '@aztec/stdlib/block'; import type { ContractDataSource } from '@aztec/stdlib/contract'; import { GasFees } from '@aztec/stdlib/gas'; -import { type AztecNode } from '@aztec/stdlib/interfaces/client'; -import { - type L2LogsSource, - type MerkleTreeReadOperations, - type WorldStateSynchronizer, -} from '@aztec/stdlib/interfaces/server'; +import type { AztecNode } from '@aztec/stdlib/interfaces/client'; +import type { L2LogsSource, MerkleTreeReadOperations, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server'; import { RollupValidationRequests } from '@aztec/stdlib/kernel'; import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging'; import { mockTx } from '@aztec/stdlib/testing'; diff --git a/yarn-project/aztec-node/src/aztec-node/server.ts b/yarn-project/aztec-node/src/aztec-node/server.ts index e22f384816a1..571b70da45ed 100644 --- a/yarn-project/aztec-node/src/aztec-node/server.ts +++ b/yarn-project/aztec-node/src/aztec-node/server.ts @@ -18,7 +18,7 @@ import { Fr } from '@aztec/foundation/fields'; import { type Logger, createLogger } from '@aztec/foundation/log'; import { DateProvider, Timer } from '@aztec/foundation/timer'; import { SiblingPath } from '@aztec/foundation/trees'; -import { type AztecKVStore } from '@aztec/kv-store'; +import type { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/lmdb'; import { SHA256Trunc, StandardTree, UnbalancedTree } from '@aztec/merkle-tree'; import { type P2P, createP2PClient } from '@aztec/p2p'; @@ -34,20 +34,16 @@ import { import { PublicProcessorFactory } from '@aztec/simulator/server'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { InBlock, L2Block, L2BlockNumber, L2BlockSource, NullifierWithBlockSource } from '@aztec/stdlib/block'; -import { - type ContractClassPublic, - type ContractDataSource, - type ContractInstanceWithAddress, - type NodeInfo, - type ProtocolContractAddresses, +import type { + ContractClassPublic, + ContractDataSource, + ContractInstanceWithAddress, + NodeInfo, + ProtocolContractAddresses, } from '@aztec/stdlib/contract'; import type { GasFees } from '@aztec/stdlib/gas'; import { computePublicDataTreeLeafSlot, siloNullifier } from '@aztec/stdlib/hash'; -import { - type AztecNode, - type GetContractClassLogsResponse, - type GetPublicLogsResponse, -} from '@aztec/stdlib/interfaces/client'; +import type { AztecNode, GetContractClassLogsResponse, GetPublicLogsResponse } from '@aztec/stdlib/interfaces/client'; import { type ClientProtocolCircuitVerifier, type L2LogsSource, @@ -62,11 +58,7 @@ import type { LogFilter, PrivateLog, TxScopedL2Log } from '@aztec/stdlib/logs'; import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging'; import { P2PClientType } from '@aztec/stdlib/p2p'; import { MerkleTreeId, NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees'; -import { - type NullifierLeafPreimage, - type PublicDataTreeLeaf, - type PublicDataTreeLeafPreimage, -} from '@aztec/stdlib/trees'; +import type { NullifierLeafPreimage, PublicDataTreeLeaf, PublicDataTreeLeafPreimage } from '@aztec/stdlib/trees'; import { type BlockHeader, PublicSimulationOutput, diff --git a/yarn-project/aztec.js/src/account/contract.ts b/yarn-project/aztec.js/src/account/contract.ts index 5b64f386d7ad..735e389bce33 100644 --- a/yarn-project/aztec.js/src/account/contract.ts +++ b/yarn-project/aztec.js/src/account/contract.ts @@ -1,10 +1,10 @@ import { Fr } from '@aztec/foundation/fields'; -import { type ContractArtifact } from '@aztec/stdlib/abi'; +import type { ContractArtifact } from '@aztec/stdlib/abi'; import type { CompleteAddress, NodeInfo } from '@aztec/stdlib/contract'; import { getContractInstanceFromDeployParams } from '@aztec/stdlib/contract'; import { deriveKeys } from '@aztec/stdlib/keys'; -import { type AccountInterface, type AuthWitnessProvider } from './interface.js'; +import type { AccountInterface, AuthWitnessProvider } from './interface.js'; // docs:start:account-contract-interface /** diff --git a/yarn-project/aztec.js/src/account/index.ts b/yarn-project/aztec.js/src/account/index.ts index 0847ab8123fa..8be941cdab46 100644 --- a/yarn-project/aztec.js/src/account/index.ts +++ b/yarn-project/aztec.js/src/account/index.ts @@ -6,7 +6,7 @@ * * @packageDocumentation */ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; export { type AccountContract, getAccountContractAddress } from './contract.js'; export { type AccountInterface, type AuthWitnessProvider } from './interface.js'; diff --git a/yarn-project/aztec.js/src/account/interface.ts b/yarn-project/aztec.js/src/account/interface.ts index 9b7a997ce83c..7d203d77ae81 100644 --- a/yarn-project/aztec.js/src/account/interface.ts +++ b/yarn-project/aztec.js/src/account/interface.ts @@ -1,9 +1,9 @@ -import { type Fr } from '@aztec/foundation/fields'; -import { type AuthWitness } from '@aztec/stdlib/auth-witness'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { Fr } from '@aztec/foundation/fields'; +import type { AuthWitness } from '@aztec/stdlib/auth-witness'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { CompleteAddress } from '@aztec/stdlib/contract'; -import { type EntrypointInterface } from '../entrypoint/entrypoint.js'; +import type { EntrypointInterface } from '../entrypoint/entrypoint.js'; // docs:start:account-interface /** Creates authorization witnesses. */ diff --git a/yarn-project/aztec.js/src/account/wallet.ts b/yarn-project/aztec.js/src/account/wallet.ts index ff7f2edd254a..baf7f6231962 100644 --- a/yarn-project/aztec.js/src/account/wallet.ts +++ b/yarn-project/aztec.js/src/account/wallet.ts @@ -1,8 +1,8 @@ -import { type AuthWitness } from '@aztec/stdlib/auth-witness'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; +import type { AuthWitness } from '@aztec/stdlib/auth-witness'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; -import { type IntentAction, type IntentInnerHash } from '../utils/authwit.js'; -import { type AccountInterface } from './interface.js'; +import type { IntentAction, IntentInnerHash } from '../utils/authwit.js'; +import type { AccountInterface } from './interface.js'; /** * The wallet interface. diff --git a/yarn-project/aztec.js/src/account_manager/deploy_account_method.ts b/yarn-project/aztec.js/src/account_manager/deploy_account_method.ts index 674d4dabac90..76fb1701ce31 100644 --- a/yarn-project/aztec.js/src/account_manager/deploy_account_method.ts +++ b/yarn-project/aztec.js/src/account_manager/deploy_account_method.ts @@ -5,11 +5,11 @@ import { encodeArguments, getFunctionArtifactByName, } from '@aztec/stdlib/abi'; -import { type PublicKeys } from '@aztec/stdlib/keys'; +import type { PublicKeys } from '@aztec/stdlib/keys'; -import { type AuthWitnessProvider } from '../account/interface.js'; -import { type Wallet } from '../account/wallet.js'; -import { type ExecutionRequestInit } from '../api/entrypoint.js'; +import type { AuthWitnessProvider } from '../account/interface.js'; +import type { Wallet } from '../account/wallet.js'; +import type { ExecutionRequestInit } from '../api/entrypoint.js'; import { Contract } from '../contract/contract.js'; import { DeployMethod, type DeployOptions } from '../contract/deploy_method.js'; import { EntrypointPayload, computeCombinedPayloadHash } from '../entrypoint/payload.js'; diff --git a/yarn-project/aztec.js/src/account_manager/deploy_account_sent_tx.ts b/yarn-project/aztec.js/src/account_manager/deploy_account_sent_tx.ts index cbcf51022873..57a23ef929bf 100644 --- a/yarn-project/aztec.js/src/account_manager/deploy_account_sent_tx.ts +++ b/yarn-project/aztec.js/src/account_manager/deploy_account_sent_tx.ts @@ -1,8 +1,8 @@ -import { type FieldsOf } from '@aztec/foundation/types'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; -import { type TxHash, type TxReceipt } from '@aztec/stdlib/tx'; +import type { FieldsOf } from '@aztec/foundation/types'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; +import type { TxHash, TxReceipt } from '@aztec/stdlib/tx'; -import { type Wallet } from '../account/index.js'; +import type { Wallet } from '../account/index.js'; import { DefaultWaitOpts, SentTx, type WaitOpts } from '../contract/sent_tx.js'; /** Extends a transaction receipt with a wallet instance for the newly deployed contract. */ diff --git a/yarn-project/aztec.js/src/account_manager/index.ts b/yarn-project/aztec.js/src/account_manager/index.ts index a55188b125e1..59a9e50cdffd 100644 --- a/yarn-project/aztec.js/src/account_manager/index.ts +++ b/yarn-project/aztec.js/src/account_manager/index.ts @@ -1,12 +1,12 @@ import { Fr } from '@aztec/foundation/fields'; import { CompleteAddress, type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; import { getContractInstanceFromDeployParams } from '@aztec/stdlib/contract'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; import { deriveKeys } from '@aztec/stdlib/keys'; -import { type AccountContract } from '../account/contract.js'; -import { type Salt, type Wallet } from '../account/index.js'; -import { type AccountInterface } from '../account/interface.js'; +import type { AccountContract } from '../account/contract.js'; +import type { Salt, Wallet } from '../account/index.js'; +import type { AccountInterface } from '../account/interface.js'; import { DeployMethod, type DeployOptions } from '../contract/deploy_method.js'; import { Contract } from '../contract/index.js'; import { DefaultWaitOpts, type WaitOpts } from '../contract/sent_tx.js'; diff --git a/yarn-project/aztec.js/src/api/cheat_codes.ts b/yarn-project/aztec.js/src/api/cheat_codes.ts index 1126ddbc643e..0354c077032e 100644 --- a/yarn-project/aztec.js/src/api/cheat_codes.ts +++ b/yarn-project/aztec.js/src/api/cheat_codes.ts @@ -1,6 +1,6 @@ import { EthCheatCodes } from '@aztec/ethereum/eth-cheatcodes'; -import { type L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; +import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; import { AztecCheatCodes } from '../utils/aztec_cheatcodes.js'; import { RollupCheatCodes } from './ethereum/cheat_codes.js'; diff --git a/yarn-project/aztec.js/src/api/ethereum/anvil_test_watcher.ts b/yarn-project/aztec.js/src/api/ethereum/anvil_test_watcher.ts index 2f1929eef3d5..76bbf4a3ca98 100644 --- a/yarn-project/aztec.js/src/api/ethereum/anvil_test_watcher.ts +++ b/yarn-project/aztec.js/src/api/ethereum/anvil_test_watcher.ts @@ -1,8 +1,8 @@ -import { type EthCheatCodes } from '@aztec/ethereum/eth-cheatcodes'; -import { type EthAddress } from '@aztec/foundation/eth-address'; +import type { EthCheatCodes } from '@aztec/ethereum/eth-cheatcodes'; +import type { EthAddress } from '@aztec/foundation/eth-address'; import { type Logger, createLogger } from '@aztec/foundation/log'; import { RunningPromise } from '@aztec/foundation/running-promise'; -import { type TestDateProvider } from '@aztec/foundation/timer'; +import type { TestDateProvider } from '@aztec/foundation/timer'; import { RollupAbi } from '@aztec/l1-artifacts'; import { type GetContractReturnType, type HttpTransport, type PublicClient, getAddress, getContract } from 'viem'; diff --git a/yarn-project/aztec.js/src/api/ethereum/chain_monitor.ts b/yarn-project/aztec.js/src/api/ethereum/chain_monitor.ts index b047a9653daa..b06f0c1d2abc 100644 --- a/yarn-project/aztec.js/src/api/ethereum/chain_monitor.ts +++ b/yarn-project/aztec.js/src/api/ethereum/chain_monitor.ts @@ -1,7 +1,7 @@ -import { type RollupContract } from '@aztec/ethereum/contracts'; +import type { RollupContract } from '@aztec/ethereum/contracts'; import { createLogger } from '@aztec/foundation/log'; -import { type PublicClient } from 'viem'; +import type { PublicClient } from 'viem'; /** Utility class that polls the chain on quick intervals and logs new L1 blocks, L2 blocks, and L2 proofs. */ export class ChainMonitor { diff --git a/yarn-project/aztec.js/src/api/ethereum/cheat_codes.ts b/yarn-project/aztec.js/src/api/ethereum/cheat_codes.ts index 48f588eff840..388ab57f0959 100644 --- a/yarn-project/aztec.js/src/api/ethereum/cheat_codes.ts +++ b/yarn-project/aztec.js/src/api/ethereum/cheat_codes.ts @@ -1,5 +1,5 @@ import { EthCheatCodes } from '@aztec/ethereum/eth-cheatcodes'; -import { type L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses'; +import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses'; import { EthAddress } from '@aztec/foundation/eth-address'; import { createLogger } from '@aztec/foundation/log'; import { RollupAbi, RollupStorage } from '@aztec/l1-artifacts'; diff --git a/yarn-project/aztec.js/src/api/ethereum/l1_contracts.ts b/yarn-project/aztec.js/src/api/ethereum/l1_contracts.ts index 38fd8de1bbcb..7796ec1b5652 100644 --- a/yarn-project/aztec.js/src/api/ethereum/l1_contracts.ts +++ b/yarn-project/aztec.js/src/api/ethereum/l1_contracts.ts @@ -1,4 +1,4 @@ -import { type L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses'; +import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses'; import { retryUntil } from '@aztec/foundation/retry'; import { createPXEClient } from '../../rpc_clients/index.js'; diff --git a/yarn-project/aztec.js/src/api/ethereum/portal_manager.ts b/yarn-project/aztec.js/src/api/ethereum/portal_manager.ts index 126bc958ad87..91bef9da8381 100644 --- a/yarn-project/aztec.js/src/api/ethereum/portal_manager.ts +++ b/yarn-project/aztec.js/src/api/ethereum/portal_manager.ts @@ -2,12 +2,12 @@ import { extractEvent } from '@aztec/ethereum/utils'; import { sha256ToField } from '@aztec/foundation/crypto'; import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; -import { type Logger } from '@aztec/foundation/log'; -import { type SiblingPath } from '@aztec/foundation/trees'; +import type { Logger } from '@aztec/foundation/log'; +import type { SiblingPath } from '@aztec/foundation/trees'; import { FeeJuicePortalAbi, OutboxAbi, TestERC20Abi, TokenPortalAbi } from '@aztec/l1-artifacts'; import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { computeSecretHash } from '@aztec/stdlib/hash'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; import { type Account, diff --git a/yarn-project/aztec.js/src/contract/base_contract_interaction.ts b/yarn-project/aztec.js/src/contract/base_contract_interaction.ts index 04938cdcf4f8..1340329666b1 100644 --- a/yarn-project/aztec.js/src/contract/base_contract_interaction.ts +++ b/yarn-project/aztec.js/src/contract/base_contract_interaction.ts @@ -1,11 +1,11 @@ import type { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; import { GasSettings } from '@aztec/stdlib/gas'; -import { type Capsule, type TxExecutionRequest, type TxProvingResult } from '@aztec/stdlib/tx'; +import type { Capsule, TxExecutionRequest, TxProvingResult } from '@aztec/stdlib/tx'; -import { type Wallet } from '../account/wallet.js'; -import { type ExecutionRequestInit } from '../entrypoint/entrypoint.js'; -import { type FeeOptions, type UserFeeOptions } from '../entrypoint/payload.js'; +import type { Wallet } from '../account/wallet.js'; +import type { ExecutionRequestInit } from '../entrypoint/entrypoint.js'; +import type { FeeOptions, UserFeeOptions } from '../entrypoint/payload.js'; import { FeeJuicePaymentMethod } from '../fee/fee_juice_payment_method.js'; import { getGasLimits } from './get_gas_limits.js'; import { ProvenTx } from './proven_tx.js'; diff --git a/yarn-project/aztec.js/src/contract/batch_call.ts b/yarn-project/aztec.js/src/contract/batch_call.ts index 70720bbe6c0f..e432418ab2e9 100644 --- a/yarn-project/aztec.js/src/contract/batch_call.ts +++ b/yarn-project/aztec.js/src/contract/batch_call.ts @@ -1,7 +1,7 @@ import { type FunctionCall, FunctionType, decodeFromAbi } from '@aztec/stdlib/abi'; -import { type TxExecutionRequest } from '@aztec/stdlib/tx'; +import type { TxExecutionRequest } from '@aztec/stdlib/tx'; -import { type Wallet } from '../account/index.js'; +import type { Wallet } from '../account/index.js'; import { BaseContractInteraction, type SendMethodOptions } from './base_contract_interaction.js'; import type { SimulateMethodOptions } from './contract_function_interaction.js'; diff --git a/yarn-project/aztec.js/src/contract/checker.ts b/yarn-project/aztec.js/src/contract/checker.ts index 52ba617bd037..8ee4fee2a0d6 100644 --- a/yarn-project/aztec.js/src/contract/checker.ts +++ b/yarn-project/aztec.js/src/contract/checker.ts @@ -1,4 +1,4 @@ -import { type AbiType, type BasicType, type ContractArtifact, type StructType } from '@aztec/stdlib/abi'; +import type { AbiType, BasicType, ContractArtifact, StructType } from '@aztec/stdlib/abi'; /** * Represents a type derived from input type T with the 'kind' property removed. diff --git a/yarn-project/aztec.js/src/contract/contract.test.ts b/yarn-project/aztec.js/src/contract/contract.test.ts index 66c69d9d697b..55e8b4062feb 100644 --- a/yarn-project/aztec.js/src/contract/contract.test.ts +++ b/yarn-project/aztec.js/src/contract/contract.test.ts @@ -1,4 +1,4 @@ -import { type L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses'; +import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses'; import { EthAddress } from '@aztec/foundation/eth-address'; import { type AbiDecoded, type ContractArtifact, FunctionType } from '@aztec/stdlib/abi'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; @@ -9,18 +9,11 @@ import { getContractClassFromArtifact, } from '@aztec/stdlib/contract'; import { GasFees } from '@aztec/stdlib/gas'; -import { - type Tx, - type TxExecutionRequest, - type TxHash, - type TxProvingResult, - type TxReceipt, - type TxSimulationResult, -} from '@aztec/stdlib/tx'; +import type { Tx, TxExecutionRequest, TxHash, TxProvingResult, TxReceipt, TxSimulationResult } from '@aztec/stdlib/tx'; import { type MockProxy, mock } from 'jest-mock-extended'; -import { type Wallet } from '../account/wallet.js'; +import type { Wallet } from '../account/wallet.js'; import { Contract } from './contract.js'; describe('Contract Class', () => { diff --git a/yarn-project/aztec.js/src/contract/contract.ts b/yarn-project/aztec.js/src/contract/contract.ts index c65d30cb03d5..db1d2175d079 100644 --- a/yarn-project/aztec.js/src/contract/contract.ts +++ b/yarn-project/aztec.js/src/contract/contract.ts @@ -1,9 +1,9 @@ -import { type ContractArtifact } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { ContractArtifact } from '@aztec/stdlib/abi'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { getContractClassFromArtifact } from '@aztec/stdlib/contract'; import { PublicKeys } from '@aztec/stdlib/keys'; -import { type Wallet } from '../account/index.js'; +import type { Wallet } from '../account/index.js'; import { ContractBase } from './contract_base.js'; import { DeployMethod } from './deploy_method.js'; diff --git a/yarn-project/aztec.js/src/contract/contract_base.ts b/yarn-project/aztec.js/src/contract/contract_base.ts index c672e8df10a2..bc28318afba7 100644 --- a/yarn-project/aztec.js/src/contract/contract_base.ts +++ b/yarn-project/aztec.js/src/contract/contract_base.ts @@ -7,7 +7,7 @@ import { } from '@aztec/stdlib/abi'; import { type ContractInstanceWithAddress, computePartialAddress } from '@aztec/stdlib/contract'; -import { type Wallet } from '../account/index.js'; +import type { Wallet } from '../account/index.js'; import { ContractFunctionInteraction } from './contract_function_interaction.js'; /** diff --git a/yarn-project/aztec.js/src/contract/contract_function_interaction.ts b/yarn-project/aztec.js/src/contract/contract_function_interaction.ts index 5ffad3dd4cae..a3404e20f88b 100644 --- a/yarn-project/aztec.js/src/contract/contract_function_interaction.ts +++ b/yarn-project/aztec.js/src/contract/contract_function_interaction.ts @@ -10,7 +10,7 @@ import { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { PrivateKernelProverProfileResult } from '@aztec/stdlib/kernel'; import type { TxExecutionRequest } from '@aztec/stdlib/tx'; -import { type Wallet } from '../account/wallet.js'; +import type { Wallet } from '../account/wallet.js'; import { FeeJuicePaymentMethod } from '../fee/fee_juice_payment_method.js'; import { BaseContractInteraction, type SendMethodOptions } from './base_contract_interaction.js'; diff --git a/yarn-project/aztec.js/src/contract/deploy_method.ts b/yarn-project/aztec.js/src/contract/deploy_method.ts index ef3169d9275d..271dfdec819e 100644 --- a/yarn-project/aztec.js/src/contract/deploy_method.ts +++ b/yarn-project/aztec.js/src/contract/deploy_method.ts @@ -1,4 +1,4 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { type ContractArtifact, type FunctionArtifact, type FunctionCall, getInitializer } from '@aztec/stdlib/abi'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { @@ -8,16 +8,16 @@ import { getContractInstanceFromDeployParams, } from '@aztec/stdlib/contract'; import type { GasSettings } from '@aztec/stdlib/gas'; -import { type PublicKeys } from '@aztec/stdlib/keys'; -import { type Capsule, type TxExecutionRequest } from '@aztec/stdlib/tx'; +import type { PublicKeys } from '@aztec/stdlib/keys'; +import type { Capsule, TxExecutionRequest } from '@aztec/stdlib/tx'; -import { type Wallet } from '../account/index.js'; +import type { Wallet } from '../account/index.js'; import { deployInstance } from '../deployment/deploy_instance.js'; import { registerContractClass } from '../deployment/register_class.js'; -import { type ExecutionRequestInit } from '../entrypoint/entrypoint.js'; +import type { ExecutionRequestInit } from '../entrypoint/entrypoint.js'; import { BaseContractInteraction, type SendMethodOptions } from './base_contract_interaction.js'; -import { type Contract } from './contract.js'; -import { type ContractBase } from './contract_base.js'; +import type { Contract } from './contract.js'; +import type { ContractBase } from './contract_base.js'; import { ContractFunctionInteraction } from './contract_function_interaction.js'; import { DeployProvenTx } from './deploy_proven_tx.js'; import { DeploySentTx } from './deploy_sent_tx.js'; diff --git a/yarn-project/aztec.js/src/contract/deploy_proven_tx.ts b/yarn-project/aztec.js/src/contract/deploy_proven_tx.ts index 884401031db6..13d61a308cfa 100644 --- a/yarn-project/aztec.js/src/contract/deploy_proven_tx.ts +++ b/yarn-project/aztec.js/src/contract/deploy_proven_tx.ts @@ -1,10 +1,10 @@ -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; -import { type Tx } from '@aztec/stdlib/tx'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; +import type { Tx } from '@aztec/stdlib/tx'; -import { type Wallet } from '../account/index.js'; -import { type Contract } from './contract.js'; +import type { Wallet } from '../account/index.js'; +import type { Contract } from './contract.js'; import { DeploySentTx } from './deploy_sent_tx.js'; import { ProvenTx } from './proven_tx.js'; diff --git a/yarn-project/aztec.js/src/contract/deploy_sent_tx.ts b/yarn-project/aztec.js/src/contract/deploy_sent_tx.ts index 41949960d99e..5f9ee97b9d60 100644 --- a/yarn-project/aztec.js/src/contract/deploy_sent_tx.ts +++ b/yarn-project/aztec.js/src/contract/deploy_sent_tx.ts @@ -1,13 +1,13 @@ import { createLogger } from '@aztec/foundation/log'; -import { type FieldsOf } from '@aztec/foundation/types'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; -import { type TxHash, type TxReceipt } from '@aztec/stdlib/tx'; +import type { FieldsOf } from '@aztec/foundation/types'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; +import type { TxHash, TxReceipt } from '@aztec/stdlib/tx'; -import { type Wallet } from '../account/index.js'; -import { type Contract } from './contract.js'; -import { type ContractBase } from './contract_base.js'; +import type { Wallet } from '../account/index.js'; +import type { Contract } from './contract.js'; +import type { ContractBase } from './contract_base.js'; import { SentTx, type WaitOpts } from './sent_tx.js'; /** Options related to waiting for a deployment tx. */ diff --git a/yarn-project/aztec.js/src/contract/get_gas_limits.test.ts b/yarn-project/aztec.js/src/contract/get_gas_limits.test.ts index 3da79b43969e..410bb7d6283f 100644 --- a/yarn-project/aztec.js/src/contract/get_gas_limits.test.ts +++ b/yarn-project/aztec.js/src/contract/get_gas_limits.test.ts @@ -1,6 +1,6 @@ import { Gas } from '@aztec/stdlib/gas'; import { mockSimulatedTx, mockTxForRollup } from '@aztec/stdlib/testing'; -import { type TxSimulationResult } from '@aztec/stdlib/tx'; +import type { TxSimulationResult } from '@aztec/stdlib/tx'; import { getGasLimits } from './get_gas_limits.js'; diff --git a/yarn-project/aztec.js/src/contract/get_gas_limits.ts b/yarn-project/aztec.js/src/contract/get_gas_limits.ts index 47ab3b14f053..25232ce081a5 100644 --- a/yarn-project/aztec.js/src/contract/get_gas_limits.ts +++ b/yarn-project/aztec.js/src/contract/get_gas_limits.ts @@ -1,5 +1,5 @@ -import { type Gas } from '@aztec/stdlib/gas'; -import { type TxSimulationResult } from '@aztec/stdlib/tx'; +import type { Gas } from '@aztec/stdlib/gas'; +import type { TxSimulationResult } from '@aztec/stdlib/tx'; /** * Returns suggested total and teardown gas limits for a simulated tx. diff --git a/yarn-project/aztec.js/src/contract/proven_tx.ts b/yarn-project/aztec.js/src/contract/proven_tx.ts index afb2ea850399..cbe0a4c87a69 100644 --- a/yarn-project/aztec.js/src/contract/proven_tx.ts +++ b/yarn-project/aztec.js/src/contract/proven_tx.ts @@ -1,7 +1,7 @@ -import { type PXE } from '@aztec/stdlib/interfaces/client'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; import { Tx } from '@aztec/stdlib/tx'; -import { type Wallet } from '../account/index.js'; +import type { Wallet } from '../account/index.js'; import { SentTx } from './sent_tx.js'; /** diff --git a/yarn-project/aztec.js/src/contract/sent_tx.test.ts b/yarn-project/aztec.js/src/contract/sent_tx.test.ts index 7ea0249c29ce..8842282af8e8 100644 --- a/yarn-project/aztec.js/src/contract/sent_tx.test.ts +++ b/yarn-project/aztec.js/src/contract/sent_tx.test.ts @@ -1,5 +1,5 @@ import { Fr } from '@aztec/foundation/fields'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; import { TxHash, type TxReceipt, TxStatus } from '@aztec/stdlib/tx'; import { type MockProxy, mock } from 'jest-mock-extended'; diff --git a/yarn-project/aztec.js/src/contract/sent_tx.ts b/yarn-project/aztec.js/src/contract/sent_tx.ts index 9b2de6440fa6..82c9efa8c4f7 100644 --- a/yarn-project/aztec.js/src/contract/sent_tx.ts +++ b/yarn-project/aztec.js/src/contract/sent_tx.ts @@ -1,6 +1,6 @@ import { retryUntil } from '@aztec/foundation/retry'; -import { type FieldsOf } from '@aztec/foundation/types'; -import { type GetPublicLogsResponse, type PXE } from '@aztec/stdlib/interfaces/client'; +import type { FieldsOf } from '@aztec/foundation/types'; +import type { GetPublicLogsResponse, PXE } from '@aztec/stdlib/interfaces/client'; import { type TxHash, type TxReceipt, TxStatus } from '@aztec/stdlib/tx'; /** Options related to waiting for a tx. */ diff --git a/yarn-project/aztec.js/src/contract/unsafe_contract.ts b/yarn-project/aztec.js/src/contract/unsafe_contract.ts index 349175e265b1..f45b7eb9ba30 100644 --- a/yarn-project/aztec.js/src/contract/unsafe_contract.ts +++ b/yarn-project/aztec.js/src/contract/unsafe_contract.ts @@ -1,7 +1,7 @@ -import { type ContractArtifact } from '@aztec/stdlib/abi'; -import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { ContractArtifact } from '@aztec/stdlib/abi'; +import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract'; -import { type Wallet } from '../wallet/index.js'; +import type { Wallet } from '../wallet/index.js'; import { ContractBase } from './contract_base.js'; /** Unsafe constructor for ContractBase that bypasses the check that the instance is registered in the wallet. */ diff --git a/yarn-project/aztec.js/src/deployment/broadcast_function.ts b/yarn-project/aztec.js/src/deployment/broadcast_function.ts index c08ff5eada5c..be59070cef12 100644 --- a/yarn-project/aztec.js/src/deployment/broadcast_function.ts +++ b/yarn-project/aztec.js/src/deployment/broadcast_function.ts @@ -15,8 +15,8 @@ import { } from '@aztec/stdlib/contract'; import { Capsule } from '@aztec/stdlib/tx'; -import { type ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; -import { type Wallet } from '../wallet/index.js'; +import type { ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; +import type { Wallet } from '../wallet/index.js'; import { getRegistererContract } from './protocol_contracts.js'; /** diff --git a/yarn-project/aztec.js/src/deployment/contract_deployer.ts b/yarn-project/aztec.js/src/deployment/contract_deployer.ts index 00ac92ad09b6..10567f04f0fc 100644 --- a/yarn-project/aztec.js/src/deployment/contract_deployer.ts +++ b/yarn-project/aztec.js/src/deployment/contract_deployer.ts @@ -1,8 +1,8 @@ -import { type ContractArtifact } from '@aztec/stdlib/abi'; +import type { ContractArtifact } from '@aztec/stdlib/abi'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { PublicKeys } from '@aztec/stdlib/keys'; -import { type Wallet } from '../account/wallet.js'; +import type { Wallet } from '../account/wallet.js'; import { Contract } from '../contract/contract.js'; import { DeployMethod } from '../contract/deploy_method.js'; diff --git a/yarn-project/aztec.js/src/deployment/deploy_instance.ts b/yarn-project/aztec.js/src/deployment/deploy_instance.ts index b870cfdea861..ac4704d3190c 100644 --- a/yarn-project/aztec.js/src/deployment/deploy_instance.ts +++ b/yarn-project/aztec.js/src/deployment/deploy_instance.ts @@ -1,7 +1,7 @@ -import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract'; -import { type ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; -import { type Wallet } from '../wallet/index.js'; +import type { ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; +import type { Wallet } from '../wallet/index.js'; import { getDeployerContract } from './protocol_contracts.js'; /** diff --git a/yarn-project/aztec.js/src/deployment/protocol_contracts.ts b/yarn-project/aztec.js/src/deployment/protocol_contracts.ts index 5cbf059c1cd4..476168fc5e5f 100644 --- a/yarn-project/aztec.js/src/deployment/protocol_contracts.ts +++ b/yarn-project/aztec.js/src/deployment/protocol_contracts.ts @@ -2,7 +2,7 @@ import { getCanonicalClassRegisterer } from '@aztec/protocol-contracts/class-reg import { getCanonicalInstanceDeployer } from '@aztec/protocol-contracts/instance-deployer'; import { UnsafeContract } from '../contract/unsafe_contract.js'; -import { type Wallet } from '../wallet/index.js'; +import type { Wallet } from '../wallet/index.js'; /** Returns a Contract wrapper for the class registerer. */ export async function getRegistererContract(wallet: Wallet) { diff --git a/yarn-project/aztec.js/src/deployment/register_class.ts b/yarn-project/aztec.js/src/deployment/register_class.ts index ce3711ddeb13..1f0fd87efb32 100644 --- a/yarn-project/aztec.js/src/deployment/register_class.ts +++ b/yarn-project/aztec.js/src/deployment/register_class.ts @@ -5,8 +5,8 @@ import { type ContractArtifact, bufferAsFields } from '@aztec/stdlib/abi'; import { getContractClassFromArtifact } from '@aztec/stdlib/contract'; import { Capsule } from '@aztec/stdlib/tx'; -import { type ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; -import { type Wallet } from '../wallet/index.js'; +import type { ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; +import type { Wallet } from '../wallet/index.js'; import { getRegistererContract } from './protocol_contracts.js'; const defaultEmitPublicBytecode = diff --git a/yarn-project/aztec.js/src/entrypoint/default_entrypoint.ts b/yarn-project/aztec.js/src/entrypoint/default_entrypoint.ts index 71e447c4b99c..8523a385790c 100644 --- a/yarn-project/aztec.js/src/entrypoint/default_entrypoint.ts +++ b/yarn-project/aztec.js/src/entrypoint/default_entrypoint.ts @@ -1,7 +1,7 @@ import { FunctionType } from '@aztec/stdlib/abi'; import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx'; -import { type EntrypointInterface, type ExecutionRequestInit } from './entrypoint.js'; +import type { EntrypointInterface, ExecutionRequestInit } from './entrypoint.js'; /** * Default implementation of the entrypoint interface. It calls a function on a contract directly diff --git a/yarn-project/aztec.js/src/entrypoint/default_multi_call_entrypoint.ts b/yarn-project/aztec.js/src/entrypoint/default_multi_call_entrypoint.ts index 1f7997886b60..27a57eff38f4 100644 --- a/yarn-project/aztec.js/src/entrypoint/default_multi_call_entrypoint.ts +++ b/yarn-project/aztec.js/src/entrypoint/default_multi_call_entrypoint.ts @@ -1,6 +1,6 @@ import { ProtocolContractAddress } from '@aztec/protocol-contracts'; import { type FunctionAbi, FunctionSelector, encodeArguments } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx'; import { type EntrypointInterface, EntrypointPayload, type ExecutionRequestInit } from './entrypoint.js'; diff --git a/yarn-project/aztec.js/src/entrypoint/entrypoint.ts b/yarn-project/aztec.js/src/entrypoint/entrypoint.ts index 2ef1035674f7..a43caf342e0a 100644 --- a/yarn-project/aztec.js/src/entrypoint/entrypoint.ts +++ b/yarn-project/aztec.js/src/entrypoint/entrypoint.ts @@ -1,7 +1,7 @@ -import { type Fr } from '@aztec/foundation/fields'; -import { type FunctionCall } from '@aztec/stdlib/abi'; -import { type AuthWitness } from '@aztec/stdlib/auth-witness'; -import { type Capsule, type HashedValues, type TxExecutionRequest } from '@aztec/stdlib/tx'; +import type { Fr } from '@aztec/foundation/fields'; +import type { FunctionCall } from '@aztec/stdlib/abi'; +import type { AuthWitness } from '@aztec/stdlib/auth-witness'; +import type { Capsule, HashedValues, TxExecutionRequest } from '@aztec/stdlib/tx'; import { EntrypointPayload, type FeeOptions, computeCombinedPayloadHash } from './payload.js'; diff --git a/yarn-project/aztec.js/src/entrypoint/payload.ts b/yarn-project/aztec.js/src/entrypoint/payload.ts index f7a1f883e74b..9a29e3e503cd 100644 --- a/yarn-project/aztec.js/src/entrypoint/payload.ts +++ b/yarn-project/aztec.js/src/entrypoint/payload.ts @@ -2,14 +2,14 @@ import { GeneratorIndex } from '@aztec/constants'; import { padArrayEnd } from '@aztec/foundation/collection'; import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; -import { type Tuple } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { Tuple } from '@aztec/foundation/serialize'; +import type { FieldsOf } from '@aztec/foundation/types'; import { FunctionCall, FunctionType } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type GasSettings } from '@aztec/stdlib/gas'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { GasSettings } from '@aztec/stdlib/gas'; import { HashedValues } from '@aztec/stdlib/tx'; -import { type FeePaymentMethod } from '../fee/fee_payment_method.js'; +import type { FeePaymentMethod } from '../fee/fee_payment_method.js'; /** * Fee payment options for a transaction. diff --git a/yarn-project/aztec.js/src/fee/fee_juice_payment_method.ts b/yarn-project/aztec.js/src/fee/fee_juice_payment_method.ts index 9cbd6eaaf2e8..1697be168115 100644 --- a/yarn-project/aztec.js/src/fee/fee_juice_payment_method.ts +++ b/yarn-project/aztec.js/src/fee/fee_juice_payment_method.ts @@ -1,8 +1,8 @@ import { ProtocolContractAddress } from '@aztec/protocol-contracts'; -import { type FunctionCall } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { FunctionCall } from '@aztec/stdlib/abi'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type FeePaymentMethod } from './fee_payment_method.js'; +import type { FeePaymentMethod } from './fee_payment_method.js'; /** * Pay fee directly in the Fee Juice. diff --git a/yarn-project/aztec.js/src/fee/fee_juice_payment_method_with_claim.ts b/yarn-project/aztec.js/src/fee/fee_juice_payment_method_with_claim.ts index 9ff5afa04338..b702ee70b601 100644 --- a/yarn-project/aztec.js/src/fee/fee_juice_payment_method_with_claim.ts +++ b/yarn-project/aztec.js/src/fee/fee_juice_payment_method_with_claim.ts @@ -1,11 +1,11 @@ import { Fr } from '@aztec/foundation/fields'; import { ProtocolContractAddress } from '@aztec/protocol-contracts'; import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice'; -import { type FunctionCall } from '@aztec/stdlib/abi'; +import type { FunctionCall } from '@aztec/stdlib/abi'; import { FunctionSelector, FunctionType, U128 } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type L2AmountClaim } from '../api/ethereum/portal_manager.js'; +import type { L2AmountClaim } from '../api/ethereum/portal_manager.js'; import { FeeJuicePaymentMethod } from './fee_juice_payment_method.js'; /** diff --git a/yarn-project/aztec.js/src/fee/fee_payment_method.ts b/yarn-project/aztec.js/src/fee/fee_payment_method.ts index 13aa40ae1ec6..a2d89370a51b 100644 --- a/yarn-project/aztec.js/src/fee/fee_payment_method.ts +++ b/yarn-project/aztec.js/src/fee/fee_payment_method.ts @@ -1,6 +1,6 @@ -import { type FunctionCall } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type GasSettings } from '@aztec/stdlib/gas'; +import type { FunctionCall } from '@aztec/stdlib/abi'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { GasSettings } from '@aztec/stdlib/gas'; /** * Holds information about how the fee for a transaction is to be paid. diff --git a/yarn-project/aztec.js/src/fee/private_fee_payment_method.ts b/yarn-project/aztec.js/src/fee/private_fee_payment_method.ts index 24107a2644fa..ac731cf02646 100644 --- a/yarn-project/aztec.js/src/fee/private_fee_payment_method.ts +++ b/yarn-project/aztec.js/src/fee/private_fee_payment_method.ts @@ -1,12 +1,12 @@ import { Fr } from '@aztec/foundation/fields'; import { type FunctionCall, FunctionSelector, FunctionType, U128 } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type GasSettings } from '@aztec/stdlib/gas'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { GasSettings } from '@aztec/stdlib/gas'; -import { type Wallet } from '../account/wallet.js'; +import type { Wallet } from '../account/wallet.js'; import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; import { SignerlessWallet } from '../wallet/signerless_wallet.js'; -import { type FeePaymentMethod } from './fee_payment_method.js'; +import type { FeePaymentMethod } from './fee_payment_method.js'; /** * Holds information about how the fee for a transaction is to be paid. diff --git a/yarn-project/aztec.js/src/fee/public_fee_payment_method.ts b/yarn-project/aztec.js/src/fee/public_fee_payment_method.ts index bdba18aa0a34..7d42ae767266 100644 --- a/yarn-project/aztec.js/src/fee/public_fee_payment_method.ts +++ b/yarn-project/aztec.js/src/fee/public_fee_payment_method.ts @@ -1,13 +1,13 @@ import { Fr } from '@aztec/foundation/fields'; -import { type FunctionCall } from '@aztec/stdlib/abi'; +import type { FunctionCall } from '@aztec/stdlib/abi'; import { FunctionSelector, FunctionType, U128 } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type GasSettings } from '@aztec/stdlib/gas'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { GasSettings } from '@aztec/stdlib/gas'; import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; -import { type AccountWallet } from '../wallet/account_wallet.js'; +import type { AccountWallet } from '../wallet/account_wallet.js'; import { SignerlessWallet } from '../wallet/signerless_wallet.js'; -import { type FeePaymentMethod } from './fee_payment_method.js'; +import type { FeePaymentMethod } from './fee_payment_method.js'; /** * Holds information about how the fee for a transaction is to be paid. diff --git a/yarn-project/aztec.js/src/rpc_clients/node/index.ts b/yarn-project/aztec.js/src/rpc_clients/node/index.ts index 7652b5a8d9a2..f57400ee1691 100644 --- a/yarn-project/aztec.js/src/rpc_clients/node/index.ts +++ b/yarn-project/aztec.js/src/rpc_clients/node/index.ts @@ -1,8 +1,8 @@ import { jsonStringify } from '@aztec/foundation/json-rpc'; import { type Logger, createLogger } from '@aztec/foundation/log'; import { NoRetryError, makeBackoff, retry } from '@aztec/foundation/retry'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; -import { type ComponentsVersions } from '@aztec/stdlib/versioning'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; +import type { ComponentsVersions } from '@aztec/stdlib/versioning'; import { Axios, type AxiosError } from 'axios'; import { inspect } from 'util'; diff --git a/yarn-project/aztec.js/src/utils/abi_types.ts b/yarn-project/aztec.js/src/utils/abi_types.ts index ba7b889a8c4d..195eac7a208e 100644 --- a/yarn-project/aztec.js/src/utils/abi_types.ts +++ b/yarn-project/aztec.js/src/utils/abi_types.ts @@ -1,7 +1,7 @@ -import { type EthAddress } from '@aztec/foundation/eth-address'; -import { type Fr } from '@aztec/foundation/fields'; -import { type EventSelector, type FunctionSelector } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { EthAddress } from '@aztec/foundation/eth-address'; +import type { Fr } from '@aztec/foundation/fields'; +import type { EventSelector, FunctionSelector } from '@aztec/stdlib/abi'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; /** Any type that can be converted into a field for a contract call. */ export type FieldLike = Fr | Buffer | bigint | number | { /** Converts to field */ toField: () => Fr }; diff --git a/yarn-project/aztec.js/src/utils/authwit.ts b/yarn-project/aztec.js/src/utils/authwit.ts index 2b47ac59e727..bc695f642e6a 100644 --- a/yarn-project/aztec.js/src/utils/authwit.ts +++ b/yarn-project/aztec.js/src/utils/authwit.ts @@ -2,7 +2,7 @@ import { GeneratorIndex } from '@aztec/constants'; import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; import type { FunctionCall } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { HashedValues } from '@aztec/stdlib/tx'; import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; diff --git a/yarn-project/aztec.js/src/utils/aztec_cheatcodes.ts b/yarn-project/aztec.js/src/utils/aztec_cheatcodes.ts index bff7652ac79b..4e65c45caefc 100644 --- a/yarn-project/aztec.js/src/utils/aztec_cheatcodes.ts +++ b/yarn-project/aztec.js/src/utils/aztec_cheatcodes.ts @@ -1,9 +1,9 @@ import { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { deriveStorageSlotInMap } from '@aztec/stdlib/hash'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; -import { type Note } from '@aztec/stdlib/note'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; +import type { Note } from '@aztec/stdlib/note'; /** * A class that provides utility functions for interacting with the aztec chain. diff --git a/yarn-project/aztec.js/src/utils/node.ts b/yarn-project/aztec.js/src/utils/node.ts index 5ad84ef29c27..70c2cf0dcca8 100644 --- a/yarn-project/aztec.js/src/utils/node.ts +++ b/yarn-project/aztec.js/src/utils/node.ts @@ -1,6 +1,6 @@ -import { type Logger } from '@aztec/foundation/log'; +import type { Logger } from '@aztec/foundation/log'; import { retryUntil } from '@aztec/foundation/retry'; -import { type AztecNode } from '@aztec/stdlib/interfaces/client'; +import type { AztecNode } from '@aztec/stdlib/interfaces/client'; export const waitForNode = async (node: AztecNode, logger?: Logger) => { await retryUntil(async () => { diff --git a/yarn-project/aztec.js/src/utils/pub_key.ts b/yarn-project/aztec.js/src/utils/pub_key.ts index 94c9017c05a8..6f67a4716a67 100644 --- a/yarn-project/aztec.js/src/utils/pub_key.ts +++ b/yarn-project/aztec.js/src/utils/pub_key.ts @@ -1,6 +1,6 @@ import { Grumpkin } from '@aztec/foundation/crypto'; -import { type GrumpkinScalar } from '@aztec/foundation/fields'; -import { type PublicKey } from '@aztec/stdlib/keys'; +import type { GrumpkinScalar } from '@aztec/foundation/fields'; +import type { PublicKey } from '@aztec/stdlib/keys'; /** * Method for generating a public grumpkin key from a private key. diff --git a/yarn-project/aztec.js/src/utils/pxe.ts b/yarn-project/aztec.js/src/utils/pxe.ts index 39e3723f6ce4..6260894e51a2 100644 --- a/yarn-project/aztec.js/src/utils/pxe.ts +++ b/yarn-project/aztec.js/src/utils/pxe.ts @@ -1,6 +1,6 @@ -import { type Logger } from '@aztec/foundation/log'; +import type { Logger } from '@aztec/foundation/log'; import { retryUntil } from '@aztec/foundation/retry'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; export const waitForPXE = async (pxe: PXE, logger?: Logger) => { await retryUntil(async () => { diff --git a/yarn-project/aztec.js/src/wallet/account_wallet.ts b/yarn-project/aztec.js/src/wallet/account_wallet.ts index 4aa3fa40e76a..55983f9322ea 100644 --- a/yarn-project/aztec.js/src/wallet/account_wallet.ts +++ b/yarn-project/aztec.js/src/wallet/account_wallet.ts @@ -1,14 +1,14 @@ import { Fr } from '@aztec/foundation/fields'; import { ProtocolContractAddress } from '@aztec/protocol-contracts'; import { type ABIParameterVisibility, type FunctionAbi, FunctionType } from '@aztec/stdlib/abi'; -import { type AuthWitness } from '@aztec/stdlib/auth-witness'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; -import { type TxExecutionRequest } from '@aztec/stdlib/tx'; +import type { AuthWitness } from '@aztec/stdlib/auth-witness'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; +import type { TxExecutionRequest } from '@aztec/stdlib/tx'; -import { type AccountInterface } from '../account/interface.js'; +import type { AccountInterface } from '../account/interface.js'; import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; -import { type ExecutionRequestInit } from '../entrypoint/entrypoint.js'; +import type { ExecutionRequestInit } from '../entrypoint/entrypoint.js'; import { type IntentAction, type IntentInnerHash, diff --git a/yarn-project/aztec.js/src/wallet/account_wallet_with_private_key.ts b/yarn-project/aztec.js/src/wallet/account_wallet_with_private_key.ts index 4f457446be72..807091efc855 100644 --- a/yarn-project/aztec.js/src/wallet/account_wallet_with_private_key.ts +++ b/yarn-project/aztec.js/src/wallet/account_wallet_with_private_key.ts @@ -1,9 +1,9 @@ import type { Fr } from '@aztec/foundation/fields'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; import { computeAddressSecret, deriveMasterIncomingViewingSecretKey } from '@aztec/stdlib/keys'; -import { type Salt } from '../account/index.js'; -import { type AccountInterface } from '../account/interface.js'; +import type { Salt } from '../account/index.js'; +import type { AccountInterface } from '../account/interface.js'; import { AccountWallet } from './account_wallet.js'; /** diff --git a/yarn-project/aztec.js/src/wallet/base_wallet.ts b/yarn-project/aztec.js/src/wallet/base_wallet.ts index 6f7469294a45..c6ef5b918609 100644 --- a/yarn-project/aztec.js/src/wallet/base_wallet.ts +++ b/yarn-project/aztec.js/src/wallet/base_wallet.ts @@ -1,20 +1,20 @@ -import { type L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants'; +import type { L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants'; import type { Fr, Point } from '@aztec/foundation/fields'; import type { SiblingPath } from '@aztec/foundation/trees'; import type { AbiDecoded, ContractArtifact } from '@aztec/stdlib/abi'; -import { type AuthWitness } from '@aztec/stdlib/auth-witness'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AuthWitness } from '@aztec/stdlib/auth-witness'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { L2Block } from '@aztec/stdlib/block'; import type { CompleteAddress, ContractInstanceWithAddress, NodeInfo, PartialAddress } from '@aztec/stdlib/contract'; import type { GasFees } from '@aztec/stdlib/gas'; -import { - type ContractClassMetadata, - type ContractMetadata, - type EventMetadataDefinition, - type GetContractClassLogsResponse, - type GetPublicLogsResponse, - type PXE, - type PXEInfo, +import type { + ContractClassMetadata, + ContractMetadata, + EventMetadataDefinition, + GetContractClassLogsResponse, + GetPublicLogsResponse, + PXE, + PXEInfo, } from '@aztec/stdlib/interfaces/client'; import type { LogFilter } from '@aztec/stdlib/logs'; import type { NotesFilter, UniqueNote } from '@aztec/stdlib/note'; @@ -28,9 +28,9 @@ import type { TxSimulationResult, } from '@aztec/stdlib/tx'; -import { type Wallet } from '../account/wallet.js'; -import { type ExecutionRequestInit } from '../entrypoint/entrypoint.js'; -import { type IntentAction, type IntentInnerHash } from '../utils/authwit.js'; +import type { Wallet } from '../account/wallet.js'; +import type { ExecutionRequestInit } from '../entrypoint/entrypoint.js'; +import type { IntentAction, IntentInnerHash } from '../utils/authwit.js'; /** * A base class for Wallet implementations diff --git a/yarn-project/aztec.js/src/wallet/index.ts b/yarn-project/aztec.js/src/wallet/index.ts index fb7deee0648b..367281979af9 100644 --- a/yarn-project/aztec.js/src/wallet/index.ts +++ b/yarn-project/aztec.js/src/wallet/index.ts @@ -1,7 +1,7 @@ -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; -import { type AccountContract } from '../account/contract.js'; +import type { AccountContract } from '../account/contract.js'; import { AccountWallet } from './account_wallet.js'; export * from '../account/wallet.js'; diff --git a/yarn-project/aztec.js/src/wallet/signerless_wallet.ts b/yarn-project/aztec.js/src/wallet/signerless_wallet.ts index 7d34ab724268..022d2052604f 100644 --- a/yarn-project/aztec.js/src/wallet/signerless_wallet.ts +++ b/yarn-project/aztec.js/src/wallet/signerless_wallet.ts @@ -1,12 +1,12 @@ import type { Fr } from '@aztec/foundation/fields'; import { AuthWitness } from '@aztec/stdlib/auth-witness'; -import { type CompleteAddress } from '@aztec/stdlib/contract'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; -import { type TxExecutionRequest } from '@aztec/stdlib/tx'; +import type { CompleteAddress } from '@aztec/stdlib/contract'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; +import type { TxExecutionRequest } from '@aztec/stdlib/tx'; import { DefaultEntrypoint } from '../entrypoint/default_entrypoint.js'; -import { type EntrypointInterface, type ExecutionRequestInit } from '../entrypoint/entrypoint.js'; -import { type IntentAction, type IntentInnerHash } from '../utils/authwit.js'; +import type { EntrypointInterface, ExecutionRequestInit } from '../entrypoint/entrypoint.js'; +import type { IntentAction, IntentInnerHash } from '../utils/authwit.js'; import { BaseWallet } from './base_wallet.js'; /** diff --git a/yarn-project/aztec/src/cli/aztec_start_action.ts b/yarn-project/aztec/src/cli/aztec_start_action.ts index bf538723e17b..a09c70aaab68 100644 --- a/yarn-project/aztec/src/cli/aztec_start_action.ts +++ b/yarn-project/aztec/src/cli/aztec_start_action.ts @@ -3,9 +3,9 @@ import { createNamespacedSafeJsonRpcServer, startHttpRpcServer, } from '@aztec/foundation/json-rpc/server'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; import { fileURLToPath } from '@aztec/foundation/url'; -import { type ChainConfig } from '@aztec/stdlib/config'; +import type { ChainConfig } from '@aztec/stdlib/config'; import { AztecNodeApiSchema, PXESchema } from '@aztec/stdlib/interfaces/client'; import { getVersioningMiddleware } from '@aztec/stdlib/versioning'; import { getOtelJsonRpcPropagationMiddleware } from '@aztec/telemetry-client'; diff --git a/yarn-project/aztec/src/cli/cli.ts b/yarn-project/aztec/src/cli/cli.ts index 90ff22b6336f..cbfdf7c91628 100644 --- a/yarn-project/aztec/src/cli/cli.ts +++ b/yarn-project/aztec/src/cli/cli.ts @@ -1,4 +1,4 @@ -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; import { Command } from 'commander'; diff --git a/yarn-project/aztec/src/cli/cmds/start_archiver.ts b/yarn-project/aztec/src/cli/cmds/start_archiver.ts index 76f9de659000..b0cf79be47ac 100644 --- a/yarn-project/aztec/src/cli/cmds/start_archiver.ts +++ b/yarn-project/aztec/src/cli/cmds/start_archiver.ts @@ -7,7 +7,7 @@ import { } from '@aztec/archiver'; import { createLogger } from '@aztec/aztec.js'; import { createBlobSinkClient } from '@aztec/blob-sink/client'; -import { type NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server'; +import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server'; import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config'; import { createStore } from '@aztec/kv-store/lmdb-v2'; import { ArchiverApiSchema } from '@aztec/stdlib/interfaces/server'; diff --git a/yarn-project/aztec/src/cli/cmds/start_blob_sink.ts b/yarn-project/aztec/src/cli/cmds/start_blob_sink.ts index 9f8f5721507e..b5810f86c1eb 100644 --- a/yarn-project/aztec/src/cli/cmds/start_blob_sink.ts +++ b/yarn-project/aztec/src/cli/cmds/start_blob_sink.ts @@ -4,7 +4,7 @@ import { createBlobSinkServer, getBlobSinkConfigFromEnv, } from '@aztec/blob-sink/server'; -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client'; import { extractRelevantOptions } from '../util.js'; diff --git a/yarn-project/aztec/src/cli/cmds/start_bot.ts b/yarn-project/aztec/src/cli/cmds/start_bot.ts index a4f3bae9e14c..9a3bba19f4db 100644 --- a/yarn-project/aztec/src/cli/cmds/start_bot.ts +++ b/yarn-project/aztec/src/cli/cmds/start_bot.ts @@ -1,8 +1,8 @@ import { type BotConfig, BotRunner, botConfigMappings, getBotRunnerApiHandler } from '@aztec/bot'; -import { type NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server'; -import { type LogFn } from '@aztec/foundation/log'; -import { type AztecNode, type PXE } from '@aztec/stdlib/interfaces/client'; -import { type TelemetryClient } from '@aztec/telemetry-client'; +import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server'; +import type { LogFn } from '@aztec/foundation/log'; +import type { AztecNode, PXE } from '@aztec/stdlib/interfaces/client'; +import type { TelemetryClient } from '@aztec/telemetry-client'; import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client'; import { extractRelevantOptions } from '../util.js'; diff --git a/yarn-project/aztec/src/cli/cmds/start_faucet.ts b/yarn-project/aztec/src/cli/cmds/start_faucet.ts index 3b0ff4c78aad..5745546b31da 100644 --- a/yarn-project/aztec/src/cli/cmds/start_faucet.ts +++ b/yarn-project/aztec/src/cli/cmds/start_faucet.ts @@ -5,8 +5,8 @@ import { faucetConfigMapping, getFaucetConfigFromEnv, } from '@aztec/aztec-faucet'; -import { type NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server'; -import { type LogFn } from '@aztec/foundation/log'; +import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server'; +import type { LogFn } from '@aztec/foundation/log'; import { extractNamespacedOptions, extractRelevantOptions } from '../util.js'; diff --git a/yarn-project/aztec/src/cli/cmds/start_node.ts b/yarn-project/aztec/src/cli/cmds/start_node.ts index c0df7631cdc8..6e399295af6f 100644 --- a/yarn-project/aztec/src/cli/cmds/start_node.ts +++ b/yarn-project/aztec/src/cli/cmds/start_node.ts @@ -5,8 +5,8 @@ import { getConfigEnvVars as getNodeConfigEnvVars, } from '@aztec/aztec-node'; import { NULL_KEY } from '@aztec/ethereum'; -import { type NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server'; -import { type LogFn } from '@aztec/foundation/log'; +import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server'; +import type { LogFn } from '@aztec/foundation/log'; import { AztecNodeApiSchema, type PXE } from '@aztec/stdlib/interfaces/client'; import { P2PApiSchema } from '@aztec/stdlib/interfaces/server'; import { diff --git a/yarn-project/aztec/src/cli/cmds/start_p2p_bootstrap.ts b/yarn-project/aztec/src/cli/cmds/start_p2p_bootstrap.ts index 184ff668799b..7789124d566a 100644 --- a/yarn-project/aztec/src/cli/cmds/start_p2p_bootstrap.ts +++ b/yarn-project/aztec/src/cli/cmds/start_p2p_bootstrap.ts @@ -1,4 +1,4 @@ -import { type NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server'; +import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server'; import { type LogFn, createLogger } from '@aztec/foundation/log'; import { createStore } from '@aztec/kv-store/lmdb-v2'; import { type BootnodeConfig, BootstrapNode, bootnodeConfigMappings } from '@aztec/p2p'; diff --git a/yarn-project/aztec/src/cli/cmds/start_proof_verifier.ts b/yarn-project/aztec/src/cli/cmds/start_proof_verifier.ts index 8ce25e1b2990..819bdc4216b2 100644 --- a/yarn-project/aztec/src/cli/cmds/start_proof_verifier.ts +++ b/yarn-project/aztec/src/cli/cmds/start_proof_verifier.ts @@ -1,4 +1,4 @@ -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; import { ProofVerifier, proofVerifierConfigMappings } from '@aztec/proof-verifier'; import { initTelemetryClient, telemetryClientConfigMappings } from '@aztec/telemetry-client'; diff --git a/yarn-project/aztec/src/cli/cmds/start_prover_agent.ts b/yarn-project/aztec/src/cli/cmds/start_prover_agent.ts index d704ed8584f1..2e51faff3f77 100644 --- a/yarn-project/aztec/src/cli/cmds/start_prover_agent.ts +++ b/yarn-project/aztec/src/cli/cmds/start_prover_agent.ts @@ -1,7 +1,7 @@ import { times } from '@aztec/foundation/collection'; -import { type NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server'; +import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server'; import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici'; -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; import { buildServerCircuitProver } from '@aztec/prover-client'; import { InlineProofStore, diff --git a/yarn-project/aztec/src/cli/cmds/start_prover_broker.ts b/yarn-project/aztec/src/cli/cmds/start_prover_broker.ts index e788768a1613..9c280ecffed7 100644 --- a/yarn-project/aztec/src/cli/cmds/start_prover_broker.ts +++ b/yarn-project/aztec/src/cli/cmds/start_prover_broker.ts @@ -1,5 +1,5 @@ -import { type NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server'; -import { type LogFn } from '@aztec/foundation/log'; +import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server'; +import type { LogFn } from '@aztec/foundation/log'; import { type ProverBrokerConfig, ProvingJobBrokerSchema, @@ -7,7 +7,7 @@ import { proverBrokerConfigMappings, } from '@aztec/prover-client/broker'; import { getProverNodeBrokerConfigFromEnv } from '@aztec/prover-node'; -import { type ProvingJobBroker } from '@aztec/stdlib/interfaces/server'; +import type { ProvingJobBroker } from '@aztec/stdlib/interfaces/server'; import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client'; import { extractRelevantOptions } from '../util.js'; diff --git a/yarn-project/aztec/src/cli/cmds/start_prover_node.ts b/yarn-project/aztec/src/cli/cmds/start_prover_node.ts index a6ee9aaf2d28..f3bc722807a3 100644 --- a/yarn-project/aztec/src/cli/cmds/start_prover_node.ts +++ b/yarn-project/aztec/src/cli/cmds/start_prover_node.ts @@ -1,8 +1,8 @@ import { getInitialTestAccounts } from '@aztec/accounts/testing'; import { NULL_KEY } from '@aztec/ethereum'; -import { type NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server'; +import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server'; import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici'; -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; import { ProvingJobConsumerSchema, createProvingJobBrokerClient } from '@aztec/prover-client/broker'; import { type ProverNodeConfig, diff --git a/yarn-project/aztec/src/cli/cmds/start_pxe.ts b/yarn-project/aztec/src/cli/cmds/start_pxe.ts index 93a4e2917c42..19a778cb63c4 100644 --- a/yarn-project/aztec/src/cli/cmds/start_pxe.ts +++ b/yarn-project/aztec/src/cli/cmds/start_pxe.ts @@ -7,8 +7,8 @@ import { getContractClassFromArtifact, } from '@aztec/aztec.js'; import { getContractArtifact } from '@aztec/cli/cli-utils'; -import { type NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server'; -import { type LogFn } from '@aztec/foundation/log'; +import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server'; +import type { LogFn } from '@aztec/foundation/log'; import { type CliPXEOptions, type PXEService, diff --git a/yarn-project/aztec/src/cli/cmds/start_txe.ts b/yarn-project/aztec/src/cli/cmds/start_txe.ts index bef3cd2fb538..eeed96aeb3d4 100644 --- a/yarn-project/aztec/src/cli/cmds/start_txe.ts +++ b/yarn-project/aztec/src/cli/cmds/start_txe.ts @@ -1,5 +1,5 @@ import { startHttpRpcServer } from '@aztec/foundation/json-rpc/server'; -import { type Logger } from '@aztec/foundation/log'; +import type { Logger } from '@aztec/foundation/log'; import { createTXERpcServer } from '@aztec/txe'; export async function startTXE(options: any, debugLogger: Logger) { diff --git a/yarn-project/aztec/src/cli/util.ts b/yarn-project/aztec/src/cli/util.ts index fe53de8042e4..015a6cc25348 100644 --- a/yarn-project/aztec/src/cli/util.ts +++ b/yarn-project/aztec/src/cli/util.ts @@ -1,10 +1,10 @@ -import { type AccountManager, type Fr } from '@aztec/aztec.js'; -import { type ConfigMappingsType } from '@aztec/foundation/config'; -import { type LogFn } from '@aztec/foundation/log'; -import { type PXEService } from '@aztec/pxe'; +import type { AccountManager, Fr } from '@aztec/aztec.js'; +import type { ConfigMappingsType } from '@aztec/foundation/config'; +import type { LogFn } from '@aztec/foundation/log'; +import type { PXEService } from '@aztec/pxe'; import chalk from 'chalk'; -import { type Command } from 'commander'; +import type { Command } from 'commander'; import { type AztecStartOption, aztecStartOptions } from './aztec_start_options.js'; diff --git a/yarn-project/aztec/src/cli/validation.test.ts b/yarn-project/aztec/src/cli/validation.test.ts index ef230922e13d..fd30a6b90401 100644 --- a/yarn-project/aztec/src/cli/validation.test.ts +++ b/yarn-project/aztec/src/cli/validation.test.ts @@ -4,7 +4,7 @@ import { startAnvil } from '@aztec/ethereum/test'; import { getDefaultConfig } from '@aztec/foundation/config'; import { EthAddress } from '@aztec/foundation/eth-address'; -import { type Anvil } from '@viem/anvil'; +import type { Anvil } from '@viem/anvil'; import { mnemonicToAccount } from 'viem/accounts'; import { DefaultMnemonic } from '../mnemonic.js'; diff --git a/yarn-project/aztec/src/cli/versioning.ts b/yarn-project/aztec/src/cli/versioning.ts index 02979f145644..73699106a95f 100644 --- a/yarn-project/aztec/src/cli/versioning.ts +++ b/yarn-project/aztec/src/cli/versioning.ts @@ -1,6 +1,6 @@ import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks'; import { protocolContractTreeRoot } from '@aztec/protocol-contracts'; -import { type ChainConfig } from '@aztec/stdlib/config'; +import type { ChainConfig } from '@aztec/stdlib/config'; import { type ComponentsVersions, getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning'; export function getVersions(config?: ChainConfig): Partial { diff --git a/yarn-project/aztec/src/examples/util.ts b/yarn-project/aztec/src/examples/util.ts index 2ba7c3e6e930..81da0305a9b4 100644 --- a/yarn-project/aztec/src/examples/util.ts +++ b/yarn-project/aztec/src/examples/util.ts @@ -2,7 +2,7 @@ import { EthAddress } from '@aztec/aztec.js'; import { jsonStringify } from '@aztec/foundation/json-rpc'; import type { Abi, Narrow } from 'abitype'; -import { type Account, type Chain, type Hex, type HttpTransport, type PublicClient, type WalletClient } from 'viem'; +import type { Account, Chain, Hex, HttpTransport, PublicClient, WalletClient } from 'viem'; /** * Helper function to deploy ETH contracts. diff --git a/yarn-project/aztec/src/sandbox.ts b/yarn-project/aztec/src/sandbox.ts index a30c1e6076d9..71291a888f72 100644 --- a/yarn-project/aztec/src/sandbox.ts +++ b/yarn-project/aztec/src/sandbox.ts @@ -22,8 +22,8 @@ import { ProtocolContractAddress, protocolContractTreeRoot } from '@aztec/protoc import { type PXEServiceConfig, createPXEService, getPXEServiceConfig } from '@aztec/pxe'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { type ContractInstanceWithAddress, getContractInstanceFromDeployParams } from '@aztec/stdlib/contract'; -import { type AztecNode, type PXE } from '@aztec/stdlib/interfaces/client'; -import { type PublicDataTreeLeaf } from '@aztec/stdlib/trees'; +import type { AztecNode, PXE } from '@aztec/stdlib/interfaces/client'; +import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees'; import { type TelemetryClient, getConfigEnvVars as getTelemetryClientConfig, diff --git a/yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit1.test.ts b/yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit1.test.ts index 93f192466811..2e9a203845ee 100644 --- a/yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit1.test.ts +++ b/yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit1.test.ts @@ -8,7 +8,7 @@ import { import { Fr } from '@aztec/foundation/fields'; import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract'; import { AvmProvingTester } from './avm_proving_tester.js'; diff --git a/yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit2.test.ts b/yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit2.test.ts index 5e701cee0002..f7691ae1c2ea 100644 --- a/yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit2.test.ts +++ b/yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit2.test.ts @@ -1,7 +1,7 @@ import { Fr } from '@aztec/foundation/fields'; import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract'; import { AvmProvingTester } from './avm_proving_tester.js'; diff --git a/yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit3.test.ts b/yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit3.test.ts index 468a0bd2d4b8..1a55082cd2fb 100644 --- a/yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit3.test.ts +++ b/yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit3.test.ts @@ -1,7 +1,7 @@ import { Fr } from '@aztec/foundation/fields'; import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract'; import { AvmProvingTester } from './avm_proving_tester.js'; diff --git a/yarn-project/bb-prover/src/avm_proving_tests/avm_contract_class_limits.test.ts b/yarn-project/bb-prover/src/avm_proving_tests/avm_contract_class_limits.test.ts index 144598448599..a96adebe7b49 100644 --- a/yarn-project/bb-prover/src/avm_proving_tests/avm_contract_class_limits.test.ts +++ b/yarn-project/bb-prover/src/avm_proving_tests/avm_contract_class_limits.test.ts @@ -1,7 +1,7 @@ import { MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS } from '@aztec/constants'; import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract'; import { makeContractInstanceFromClassId } from '@aztec/stdlib/testing'; import { AvmProvingTester } from './avm_proving_tester.js'; diff --git a/yarn-project/bb-prover/src/avm_proving_tests/avm_contract_updates.test.ts b/yarn-project/bb-prover/src/avm_proving_tests/avm_contract_updates.test.ts index 31adbf9cfec3..6dd11bf2dd68 100644 --- a/yarn-project/bb-prover/src/avm_proving_tests/avm_contract_updates.test.ts +++ b/yarn-project/bb-prover/src/avm_proving_tests/avm_contract_updates.test.ts @@ -3,7 +3,7 @@ import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest'; import { ProtocolContractAddress } from '@aztec/protocol-contracts'; import { DEFAULT_BLOCK_NUMBER } from '@aztec/simulator/public/fixtures'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract'; import { ScheduledDelayChange, ScheduledValueChange, SharedMutableValuesWithHash } from '@aztec/stdlib/shared-mutable'; import { AvmProvingTester } from './avm_proving_tester.js'; diff --git a/yarn-project/bb-prover/src/avm_proving_tests/avm_proven_amm.test.ts b/yarn-project/bb-prover/src/avm_proving_tests/avm_proven_amm.test.ts index c5c75d9f9388..71654d9bf96c 100644 --- a/yarn-project/bb-prover/src/avm_proving_tests/avm_proven_amm.test.ts +++ b/yarn-project/bb-prover/src/avm_proving_tests/avm_proven_amm.test.ts @@ -2,7 +2,7 @@ import { Fr } from '@aztec/foundation/fields'; import { AMMContractArtifact } from '@aztec/noir-contracts.js/AMM'; import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract'; import { jest } from '@jest/globals'; diff --git a/yarn-project/bb-prover/src/avm_proving_tests/avm_proven_token.test.ts b/yarn-project/bb-prover/src/avm_proving_tests/avm_proven_token.test.ts index 0bf91da7729c..a3e06963bd90 100644 --- a/yarn-project/bb-prover/src/avm_proving_tests/avm_proven_token.test.ts +++ b/yarn-project/bb-prover/src/avm_proving_tests/avm_proven_token.test.ts @@ -1,8 +1,8 @@ import { Fr } from '@aztec/foundation/fields'; import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token'; -import { type PublicTxResult } from '@aztec/simulator/server'; +import type { PublicTxResult } from '@aztec/simulator/server'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract'; import { jest } from '@jest/globals'; diff --git a/yarn-project/bb-prover/src/avm_proving_tests/avm_proving_and_verification.test.ts b/yarn-project/bb-prover/src/avm_proving_tests/avm_proving_and_verification.test.ts index f968529cbb67..4d11af860bcd 100644 --- a/yarn-project/bb-prover/src/avm_proving_tests/avm_proving_and_verification.test.ts +++ b/yarn-project/bb-prover/src/avm_proving_tests/avm_proving_and_verification.test.ts @@ -1,7 +1,7 @@ import { Fr } from '@aztec/foundation/fields'; import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract'; import { AvmProvingTester } from './avm_proving_tester.js'; diff --git a/yarn-project/bb-prover/src/avm_proving_tests/avm_proving_tester.ts b/yarn-project/bb-prover/src/avm_proving_tests/avm_proving_tester.ts index d2bae9ce507a..dc53bbb309f7 100644 --- a/yarn-project/bb-prover/src/avm_proving_tests/avm_proving_tester.ts +++ b/yarn-project/bb-prover/src/avm_proving_tests/avm_proving_tester.ts @@ -1,8 +1,8 @@ import { PublicTxSimulationTester, type TestEnqueuedCall } from '@aztec/simulator/public/fixtures'; import { WorldStateDB } from '@aztec/simulator/server'; -import { type AvmCircuitInputs } from '@aztec/stdlib/avm'; +import type { AvmCircuitInputs } from '@aztec/stdlib/avm'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; import { VerificationKeyData } from '@aztec/stdlib/vks'; import { NativeWorldStateService } from '@aztec/world-state'; diff --git a/yarn-project/bb-prover/src/avm_proving_tests/avm_public_fee_payment.test.ts b/yarn-project/bb-prover/src/avm_proving_tests/avm_public_fee_payment.test.ts index 67bec30f77e6..e84415f3be3d 100644 --- a/yarn-project/bb-prover/src/avm_proving_tests/avm_public_fee_payment.test.ts +++ b/yarn-project/bb-prover/src/avm_proving_tests/avm_public_fee_payment.test.ts @@ -1,7 +1,7 @@ import { Fr } from '@aztec/foundation/fields'; import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract'; import { AvmProvingTester } from './avm_proving_tester.js'; diff --git a/yarn-project/bb-prover/src/avm_proving_tests/avm_v2.test.ts b/yarn-project/bb-prover/src/avm_proving_tests/avm_v2.test.ts index 2b5274f6f4cf..dbdca33acd21 100644 --- a/yarn-project/bb-prover/src/avm_proving_tests/avm_v2.test.ts +++ b/yarn-project/bb-prover/src/avm_proving_tests/avm_v2.test.ts @@ -1,7 +1,7 @@ import { Fr } from '@aztec/foundation/fields'; import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract'; import { AvmProvingTesterV2 } from './avm_proving_tester.js'; diff --git a/yarn-project/bb-prover/src/bb/cli.ts b/yarn-project/bb-prover/src/bb/cli.ts index 0f2bd68fa1cb..043986bf3c22 100644 --- a/yarn-project/bb-prover/src/bb/cli.ts +++ b/yarn-project/bb-prover/src/bb/cli.ts @@ -1,8 +1,8 @@ -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; import { ClientCircuitArtifacts } from '@aztec/noir-protocol-circuits-types/client/bundle'; import { ServerCircuitArtifacts } from '@aztec/noir-protocol-circuits-types/server'; -import { type ProtocolArtifact } from '@aztec/noir-protocol-circuits-types/types'; -import { type NoirCompiledCircuit } from '@aztec/stdlib/noir'; +import type { ProtocolArtifact } from '@aztec/noir-protocol-circuits-types/types'; +import type { NoirCompiledCircuit } from '@aztec/stdlib/noir'; import { Command } from 'commander'; diff --git a/yarn-project/bb-prover/src/bb/execute.ts b/yarn-project/bb-prover/src/bb/execute.ts index 10893c79b869..79e5c646eae7 100644 --- a/yarn-project/bb-prover/src/bb/execute.ts +++ b/yarn-project/bb-prover/src/bb/execute.ts @@ -1,5 +1,5 @@ import { sha256 } from '@aztec/foundation/crypto'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; import { Timer } from '@aztec/foundation/timer'; import { type AvmCircuitInputs, serializeWithMessagePack } from '@aztec/stdlib/avm'; @@ -7,7 +7,7 @@ import * as proc from 'child_process'; import { promises as fs } from 'fs'; import { basename, dirname, join } from 'path'; -import { type UltraHonkFlavor } from '../honk.js'; +import type { UltraHonkFlavor } from '../honk.js'; import { CLIENT_IVC_PROOF_FILE_NAME, CLIENT_IVC_VK_FILE_NAME } from '../prover/client_ivc_proof_utils.js'; export const VK_FILENAME = 'vk'; diff --git a/yarn-project/bb-prover/src/honk.ts b/yarn-project/bb-prover/src/honk.ts index 5fa85486fcf9..31909160369e 100644 --- a/yarn-project/bb-prover/src/honk.ts +++ b/yarn-project/bb-prover/src/honk.ts @@ -1,4 +1,4 @@ -import { type ServerProtocolArtifact } from '@aztec/noir-protocol-circuits-types/server'; +import type { ServerProtocolArtifact } from '@aztec/noir-protocol-circuits-types/server'; export type UltraHonkFlavor = 'ultra_honk' | 'ultra_keccak_honk' | 'ultra_rollup_honk'; diff --git a/yarn-project/bb-prover/src/instrumentation.ts b/yarn-project/bb-prover/src/instrumentation.ts index 57e6bc23e4ca..8148d20d7503 100644 --- a/yarn-project/bb-prover/src/instrumentation.ts +++ b/yarn-project/bb-prover/src/instrumentation.ts @@ -1,5 +1,5 @@ -import { type Timer } from '@aztec/foundation/timer'; -import { type CircuitName } from '@aztec/stdlib/stats'; +import type { Timer } from '@aztec/foundation/timer'; +import type { CircuitName } from '@aztec/stdlib/stats'; import { Attributes, type Gauge, diff --git a/yarn-project/bb-prover/src/prover/bb_native_private_kernel_prover.ts b/yarn-project/bb-prover/src/prover/bb_native_private_kernel_prover.ts index a4aa8b87eb58..23b04c89534c 100644 --- a/yarn-project/bb-prover/src/prover/bb_native_private_kernel_prover.ts +++ b/yarn-project/bb-prover/src/prover/bb_native_private_kernel_prover.ts @@ -1,17 +1,17 @@ import { runInDirectory } from '@aztec/foundation/fs'; import { type Logger, createLogger } from '@aztec/foundation/log'; import { BundleArtifactProvider } from '@aztec/noir-protocol-circuits-types/client/bundle'; -import { type SimulationProvider } from '@aztec/simulator/server'; -import { type ClientIvcProof } from '@aztec/stdlib/proofs'; +import type { SimulationProvider } from '@aztec/simulator/server'; +import type { ClientIvcProof } from '@aztec/stdlib/proofs'; import { encode } from '@msgpack/msgpack'; import { serializeWitness } from '@noir-lang/noirc_abi'; -import { type WitnessMap } from '@noir-lang/types'; +import type { WitnessMap } from '@noir-lang/types'; import { promises as fs } from 'fs'; import path from 'path'; import { BB_RESULT, computeGateCountForCircuit, executeBbClientIvcProof } from '../bb/execute.js'; -import { type BBConfig } from '../config.js'; +import type { BBConfig } from '../config.js'; import { BBPrivateKernelProver } from './bb_private_kernel_prover.js'; import { readFromOutputDirectory } from './client_ivc_proof_utils.js'; diff --git a/yarn-project/bb-prover/src/prover/bb_private_kernel_prover.ts b/yarn-project/bb-prover/src/prover/bb_private_kernel_prover.ts index dce37622d904..a8ee1cacb4e2 100644 --- a/yarn-project/bb-prover/src/prover/bb_private_kernel_prover.ts +++ b/yarn-project/bb-prover/src/prover/bb_private_kernel_prover.ts @@ -14,24 +14,24 @@ import { getPrivateKernelResetArtifactName, updateResetCircuitSampleInputs, } from '@aztec/noir-protocol-circuits-types/client'; -import { type ArtifactProvider, type ClientProtocolArtifact } from '@aztec/noir-protocol-circuits-types/types'; +import type { ArtifactProvider, ClientProtocolArtifact } from '@aztec/noir-protocol-circuits-types/types'; import { ClientCircuitVks } from '@aztec/noir-protocol-circuits-types/vks'; -import { type SimulationProvider } from '@aztec/simulator/client'; -import { type PrivateKernelProver } from '@aztec/stdlib/interfaces/client'; -import { - type PrivateKernelCircuitPublicInputs, - type PrivateKernelInitCircuitPrivateInputs, - type PrivateKernelInnerCircuitPrivateInputs, - type PrivateKernelResetCircuitPrivateInputs, - type PrivateKernelSimulateOutput, - type PrivateKernelTailCircuitPrivateInputs, - type PrivateKernelTailCircuitPublicInputs, +import type { SimulationProvider } from '@aztec/simulator/client'; +import type { PrivateKernelProver } from '@aztec/stdlib/interfaces/client'; +import type { + PrivateKernelCircuitPublicInputs, + PrivateKernelInitCircuitPrivateInputs, + PrivateKernelInnerCircuitPrivateInputs, + PrivateKernelResetCircuitPrivateInputs, + PrivateKernelSimulateOutput, + PrivateKernelTailCircuitPrivateInputs, + PrivateKernelTailCircuitPublicInputs, } from '@aztec/stdlib/kernel'; -import { type NoirCompiledCircuit } from '@aztec/stdlib/noir'; -import { type ClientIvcProof } from '@aztec/stdlib/proofs'; -import { type CircuitSimulationStats, type CircuitWitnessGenerationStats } from '@aztec/stdlib/stats'; +import type { NoirCompiledCircuit } from '@aztec/stdlib/noir'; +import type { ClientIvcProof } from '@aztec/stdlib/proofs'; +import type { CircuitSimulationStats, CircuitWitnessGenerationStats } from '@aztec/stdlib/stats'; -import { type Abi, type WitnessMap } from '@noir-lang/types'; +import type { Abi, WitnessMap } from '@noir-lang/types'; import { mapProtocolArtifactNameToCircuitName } from '../stats.js'; diff --git a/yarn-project/bb-prover/src/prover/bb_prover.ts b/yarn-project/bb-prover/src/prover/bb_prover.ts index c626e0b9fdfd..be346ecd48b5 100644 --- a/yarn-project/bb-prover/src/prover/bb_prover.ts +++ b/yarn-project/bb-prover/src/prover/bb_prover.ts @@ -39,7 +39,7 @@ import { } from '@aztec/noir-protocol-circuits-types/server'; import { ServerCircuitVks } from '@aztec/noir-protocol-circuits-types/vks'; import { NativeACVMSimulator } from '@aztec/simulator/server'; -import { type AvmCircuitInputs } from '@aztec/stdlib/avm'; +import type { AvmCircuitInputs } from '@aztec/stdlib/avm'; import { ProvingError } from '@aztec/stdlib/errors'; import { type ProofAndVerificationKey, @@ -48,27 +48,27 @@ import { makeProofAndVerificationKey, makePublicInputsAndRecursiveProof, } from '@aztec/stdlib/interfaces/server'; -import { type BaseParityInputs, type ParityPublicInputs, type RootParityInputs } from '@aztec/stdlib/parity'; +import type { BaseParityInputs, ParityPublicInputs, RootParityInputs } from '@aztec/stdlib/parity'; import { Proof, RecursiveProof, makeRecursiveProofFromBinary } from '@aztec/stdlib/proofs'; -import { - type BaseOrMergeRollupPublicInputs, - type BlockMergeRollupInputs, - type BlockRootOrBlockMergePublicInputs, - type BlockRootRollupInputs, - type EmptyBlockRootRollupInputs, - type MergeRollupInputs, - type PrivateBaseRollupInputs, - type PublicBaseRollupInputs, - type RootRollupInputs, - type RootRollupPublicInputs, - type SingleTxBlockRootRollupInputs, - type TubeInputs, +import type { + BaseOrMergeRollupPublicInputs, + BlockMergeRollupInputs, + BlockRootOrBlockMergePublicInputs, + BlockRootRollupInputs, + EmptyBlockRootRollupInputs, + MergeRollupInputs, + PrivateBaseRollupInputs, + PublicBaseRollupInputs, + RootRollupInputs, + RootRollupPublicInputs, + SingleTxBlockRootRollupInputs, + TubeInputs, } from '@aztec/stdlib/rollup'; -import { type CircuitProvingStats, type CircuitWitnessGenerationStats } from '@aztec/stdlib/stats'; +import type { CircuitProvingStats, CircuitWitnessGenerationStats } from '@aztec/stdlib/stats'; import type { VerificationKeyData } from '@aztec/stdlib/vks'; import { Attributes, type TelemetryClient, getTelemetryClient, trackSpan } from '@aztec/telemetry-client'; -import { type WitnessMap } from '@noir-lang/types'; +import type { WitnessMap } from '@noir-lang/types'; import { assert } from 'console'; import crypto from 'crypto'; import { promises as fs } from 'fs'; diff --git a/yarn-project/bb-prover/src/stats.ts b/yarn-project/bb-prover/src/stats.ts index 9eaf1141e3f9..b0dd0b87978b 100644 --- a/yarn-project/bb-prover/src/stats.ts +++ b/yarn-project/bb-prover/src/stats.ts @@ -1,4 +1,4 @@ -import { type ProtocolArtifact } from '@aztec/noir-protocol-circuits-types/types'; +import type { ProtocolArtifact } from '@aztec/noir-protocol-circuits-types/types'; import type { CircuitName } from '@aztec/stdlib/stats'; export function mapProtocolArtifactNameToCircuitName(artifact: ProtocolArtifact): CircuitName { diff --git a/yarn-project/bb-prover/src/test/test_circuit_prover.ts b/yarn-project/bb-prover/src/test/test_circuit_prover.ts index 16a31223a114..a682fd97734c 100644 --- a/yarn-project/bb-prover/src/test/test_circuit_prover.ts +++ b/yarn-project/bb-prover/src/test/test_circuit_prover.ts @@ -35,7 +35,7 @@ import { } from '@aztec/noir-protocol-circuits-types/server'; import { ProtocolCircuitVks } from '@aztec/noir-protocol-circuits-types/vks'; import { type SimulationProvider, WASMSimulatorWithBlobs, emitCircuitSimulationStats } from '@aztec/simulator/server'; -import { type AvmCircuitInputs } from '@aztec/stdlib/avm'; +import type { AvmCircuitInputs } from '@aztec/stdlib/avm'; import { type ProofAndVerificationKey, type PublicInputsAndRecursiveProof, @@ -45,24 +45,24 @@ import { } from '@aztec/stdlib/interfaces/server'; import type { BaseParityInputs, ParityPublicInputs, RootParityInputs } from '@aztec/stdlib/parity'; import { type Proof, ProvingRequestType, makeEmptyRecursiveProof, makeRecursiveProof } from '@aztec/stdlib/proofs'; -import { - type BaseOrMergeRollupPublicInputs, - type BlockMergeRollupInputs, - type BlockRootOrBlockMergePublicInputs, - type BlockRootRollupInputs, - type EmptyBlockRootRollupInputs, - type MergeRollupInputs, - type PrivateBaseRollupInputs, - type PublicBaseRollupInputs, - type RootRollupInputs, - type RootRollupPublicInputs, - type SingleTxBlockRootRollupInputs, - type TubeInputs, +import type { + BaseOrMergeRollupPublicInputs, + BlockMergeRollupInputs, + BlockRootOrBlockMergePublicInputs, + BlockRootRollupInputs, + EmptyBlockRootRollupInputs, + MergeRollupInputs, + PrivateBaseRollupInputs, + PublicBaseRollupInputs, + RootRollupInputs, + RootRollupPublicInputs, + SingleTxBlockRootRollupInputs, + TubeInputs, } from '@aztec/stdlib/rollup'; import { VerificationKeyData } from '@aztec/stdlib/vks'; import { type TelemetryClient, getTelemetryClient, trackSpan } from '@aztec/telemetry-client'; -import { type WitnessMap } from '@noir-lang/types'; +import type { WitnessMap } from '@noir-lang/types'; import { ProverInstrumentation } from '../instrumentation.js'; import { mapProtocolArtifactNameToCircuitName } from '../stats.js'; diff --git a/yarn-project/bb-prover/src/test/test_verifier.ts b/yarn-project/bb-prover/src/test/test_verifier.ts index f831537abfa3..03d06c435ee4 100644 --- a/yarn-project/bb-prover/src/test/test_verifier.ts +++ b/yarn-project/bb-prover/src/test/test_verifier.ts @@ -1,5 +1,5 @@ -import { type ClientProtocolCircuitVerifier } from '@aztec/stdlib/interfaces/server'; -import { type Tx } from '@aztec/stdlib/tx'; +import type { ClientProtocolCircuitVerifier } from '@aztec/stdlib/interfaces/server'; +import type { Tx } from '@aztec/stdlib/tx'; export class TestCircuitVerifier implements ClientProtocolCircuitVerifier { verifyProof(_tx: Tx): Promise { diff --git a/yarn-project/bb-prover/src/verifier/bb_verifier.ts b/yarn-project/bb-prover/src/verifier/bb_verifier.ts index b80378755658..83bdb8876cfa 100644 --- a/yarn-project/bb-prover/src/verifier/bb_verifier.ts +++ b/yarn-project/bb-prover/src/verifier/bb_verifier.ts @@ -1,18 +1,18 @@ import { runInDirectory } from '@aztec/foundation/fs'; import { type Logger, createLogger } from '@aztec/foundation/log'; -import { type ClientProtocolArtifact, type ServerProtocolArtifact } from '@aztec/noir-protocol-circuits-types/types'; +import type { ClientProtocolArtifact, ServerProtocolArtifact } from '@aztec/noir-protocol-circuits-types/types'; import { ServerCircuitVks } from '@aztec/noir-protocol-circuits-types/vks'; -import { type ClientProtocolCircuitVerifier } from '@aztec/stdlib/interfaces/server'; -import { type Proof } from '@aztec/stdlib/proofs'; -import { type CircuitVerificationStats } from '@aztec/stdlib/stats'; +import type { ClientProtocolCircuitVerifier } from '@aztec/stdlib/interfaces/server'; +import type { Proof } from '@aztec/stdlib/proofs'; +import type { CircuitVerificationStats } from '@aztec/stdlib/stats'; import { Tx } from '@aztec/stdlib/tx'; -import { type VerificationKeyData } from '@aztec/stdlib/vks'; +import type { VerificationKeyData } from '@aztec/stdlib/vks'; import { promises as fs } from 'fs'; import * as path from 'path'; import { BB_RESULT, PROOF_FILENAME, VK_FILENAME, verifyClientIvcProof, verifyProof } from '../bb/execute.js'; -import { type BBConfig } from '../config.js'; +import type { BBConfig } from '../config.js'; import { getUltraHonkFlavorForCircuit } from '../honk.js'; import { writeToOutputDirectory } from '../prover/client_ivc_proof_utils.js'; import { mapProtocolArtifactNameToCircuitName } from '../stats.js'; diff --git a/yarn-project/bb-prover/src/wasm/bb_wasm_private_kernel_prover.ts b/yarn-project/bb-prover/src/wasm/bb_wasm_private_kernel_prover.ts index d36221e5c6ab..8e16ac852a99 100644 --- a/yarn-project/bb-prover/src/wasm/bb_wasm_private_kernel_prover.ts +++ b/yarn-project/bb-prover/src/wasm/bb_wasm_private_kernel_prover.ts @@ -1,12 +1,12 @@ import { AztecClientBackend } from '@aztec/bb.js'; import { createLogger } from '@aztec/foundation/log'; import { Timer } from '@aztec/foundation/timer'; -import { type ArtifactProvider } from '@aztec/noir-protocol-circuits-types/types'; -import { type SimulationProvider } from '@aztec/simulator/client'; +import type { ArtifactProvider } from '@aztec/noir-protocol-circuits-types/types'; +import type { SimulationProvider } from '@aztec/simulator/client'; import { ClientIvcProof } from '@aztec/stdlib/proofs'; import { serializeWitness } from '@noir-lang/noirc_abi'; -import { type WitnessMap } from '@noir-lang/types'; +import type { WitnessMap } from '@noir-lang/types'; import { ungzip } from 'pako'; import { BBPrivateKernelProver } from '../prover/bb_private_kernel_prover.js'; diff --git a/yarn-project/bb-prover/src/wasm/bundle.ts b/yarn-project/bb-prover/src/wasm/bundle.ts index 8bb327b7f453..7111798e5acc 100644 --- a/yarn-project/bb-prover/src/wasm/bundle.ts +++ b/yarn-project/bb-prover/src/wasm/bundle.ts @@ -1,6 +1,6 @@ import { createLogger } from '@aztec/foundation/log'; import { BundleArtifactProvider } from '@aztec/noir-protocol-circuits-types/client/bundle'; -import { type SimulationProvider } from '@aztec/simulator/client'; +import type { SimulationProvider } from '@aztec/simulator/client'; import { BBWASMPrivateKernelProver } from './bb_wasm_private_kernel_prover.js'; diff --git a/yarn-project/bb-prover/src/wasm/lazy.ts b/yarn-project/bb-prover/src/wasm/lazy.ts index 625b90e2ca62..0673619bef98 100644 --- a/yarn-project/bb-prover/src/wasm/lazy.ts +++ b/yarn-project/bb-prover/src/wasm/lazy.ts @@ -1,6 +1,6 @@ import { createLogger } from '@aztec/foundation/log'; import { LazyArtifactProvider } from '@aztec/noir-protocol-circuits-types/client/lazy'; -import { type SimulationProvider } from '@aztec/simulator/client'; +import type { SimulationProvider } from '@aztec/simulator/client'; import { BBWASMPrivateKernelProver } from './bb_wasm_private_kernel_prover.js'; diff --git a/yarn-project/blob-lib/src/blob.ts b/yarn-project/blob-lib/src/blob.ts index 4f0810b26da5..664adb5731ad 100644 --- a/yarn-project/blob-lib/src/blob.ts +++ b/yarn-project/blob-lib/src/blob.ts @@ -8,7 +8,7 @@ import type { Blob as BlobBuffer } from 'c-kzg'; import { deserializeEncodedBlobToFields, extractBlobFieldsFromBuffer } from './encoding.js'; import { BlobDeserializationError } from './errors.js'; -import { type BlobJson } from './interface.js'; +import type { BlobJson } from './interface.js'; /* eslint-disable import/no-named-as-default-member */ const { BYTES_PER_BLOB, FIELD_ELEMENTS_PER_BLOB, blobToKzgCommitment, computeKzgProof, verifyKzgProof } = cKzg; diff --git a/yarn-project/blob-lib/src/blob_public_inputs.ts b/yarn-project/blob-lib/src/blob_public_inputs.ts index 74d9be993f63..c9b90438e595 100644 --- a/yarn-project/blob-lib/src/blob_public_inputs.ts +++ b/yarn-project/blob-lib/src/blob_public_inputs.ts @@ -4,7 +4,7 @@ import { toBigIntBE, toBufferBE, toHex } from '@aztec/foundation/bigint-buffer'; import { sha256, sha256Trunc } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { type Blob, VERSIONED_HASH_VERSION_KZG } from './blob.js'; diff --git a/yarn-project/blob-sink/src/blobstore/blob_store_test_suite.ts b/yarn-project/blob-sink/src/blobstore/blob_store_test_suite.ts index 523128a77714..eca529b8f943 100644 --- a/yarn-project/blob-sink/src/blobstore/blob_store_test_suite.ts +++ b/yarn-project/blob-sink/src/blobstore/blob_store_test_suite.ts @@ -2,7 +2,7 @@ import { Blob } from '@aztec/blob-lib'; import { Fr } from '@aztec/foundation/fields'; import { BlobWithIndex } from '../types/index.js'; -import { type BlobStore } from './interface.js'; +import type { BlobStore } from './interface.js'; export function describeBlobStore(getBlobStore: () => Promise) { let blobStore: BlobStore; diff --git a/yarn-project/blob-sink/src/blobstore/disk_blob_store.ts b/yarn-project/blob-sink/src/blobstore/disk_blob_store.ts index 0da855c197dd..b7dc22fea578 100644 --- a/yarn-project/blob-sink/src/blobstore/disk_blob_store.ts +++ b/yarn-project/blob-sink/src/blobstore/disk_blob_store.ts @@ -1,7 +1,7 @@ import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store'; import { type BlobWithIndex, BlobsWithIndexes } from '../types/index.js'; -import { type BlobStore } from './interface.js'; +import type { BlobStore } from './interface.js'; export class DiskBlobStore implements BlobStore { blobs: AztecAsyncMap; diff --git a/yarn-project/blob-sink/src/blobstore/interface.ts b/yarn-project/blob-sink/src/blobstore/interface.ts index 27d7fac25c29..cfd509bb70a4 100644 --- a/yarn-project/blob-sink/src/blobstore/interface.ts +++ b/yarn-project/blob-sink/src/blobstore/interface.ts @@ -1,4 +1,4 @@ -import { type BlobWithIndex } from '../types/index.js'; +import type { BlobWithIndex } from '../types/index.js'; export interface BlobStore { /** diff --git a/yarn-project/blob-sink/src/blobstore/memory_blob_store.ts b/yarn-project/blob-sink/src/blobstore/memory_blob_store.ts index efe013f9b01b..a15fc34aa1cc 100644 --- a/yarn-project/blob-sink/src/blobstore/memory_blob_store.ts +++ b/yarn-project/blob-sink/src/blobstore/memory_blob_store.ts @@ -1,5 +1,5 @@ import { type BlobWithIndex, BlobsWithIndexes } from '../types/index.js'; -import { type BlobStore } from './interface.js'; +import type { BlobStore } from './interface.js'; export class MemoryBlobStore implements BlobStore { private blobs: Map = new Map(); diff --git a/yarn-project/blob-sink/src/client/blob-sink-client-tests.ts b/yarn-project/blob-sink/src/client/blob-sink-client-tests.ts index 2c3b18696429..3387e6aa6947 100644 --- a/yarn-project/blob-sink/src/client/blob-sink-client-tests.ts +++ b/yarn-project/blob-sink/src/client/blob-sink-client-tests.ts @@ -1,6 +1,6 @@ import { makeEncodedBlob } from '@aztec/blob-lib/testing'; -import { type BlobSinkClientInterface } from './interface.js'; +import type { BlobSinkClientInterface } from './interface.js'; /** * Shared test suite for blob sink clients diff --git a/yarn-project/blob-sink/src/client/factory.ts b/yarn-project/blob-sink/src/client/factory.ts index 16f8eaa3ac45..af64a4e3889a 100644 --- a/yarn-project/blob-sink/src/client/factory.ts +++ b/yarn-project/blob-sink/src/client/factory.ts @@ -1,7 +1,7 @@ import { MemoryBlobStore } from '../blobstore/memory_blob_store.js'; -import { type BlobSinkConfig } from './config.js'; +import type { BlobSinkConfig } from './config.js'; import { HttpBlobSinkClient } from './http.js'; -import { type BlobSinkClientInterface } from './interface.js'; +import type { BlobSinkClientInterface } from './interface.js'; import { LocalBlobSinkClient } from './local.js'; export function createBlobSinkClient(config?: BlobSinkConfig): BlobSinkClientInterface { diff --git a/yarn-project/blob-sink/src/client/http.test.ts b/yarn-project/blob-sink/src/client/http.test.ts index 535135036d3c..554a23d9f8e7 100644 --- a/yarn-project/blob-sink/src/client/http.test.ts +++ b/yarn-project/blob-sink/src/client/http.test.ts @@ -4,7 +4,7 @@ import { Fr } from '@aztec/foundation/fields'; import { jest } from '@jest/globals'; import http from 'http'; -import { type AddressInfo } from 'net'; +import type { AddressInfo } from 'net'; import { BlobSinkServer } from '../server/server.js'; import { runBlobSinkClientTests } from './blob-sink-client-tests.js'; diff --git a/yarn-project/blob-sink/src/client/http.ts b/yarn-project/blob-sink/src/client/http.ts index 34e5138b6f29..9e6bb9459ad6 100644 --- a/yarn-project/blob-sink/src/client/http.ts +++ b/yarn-project/blob-sink/src/client/http.ts @@ -4,7 +4,7 @@ import { makeBackoff, retry } from '@aztec/foundation/retry'; import { outboundTransform } from '../encoding/index.js'; import { type BlobSinkConfig, getBlobSinkConfigFromEnv } from './config.js'; -import { type BlobSinkClientInterface } from './interface.js'; +import type { BlobSinkClientInterface } from './interface.js'; export class HttpBlobSinkClient implements BlobSinkClientInterface { private readonly log: Logger; diff --git a/yarn-project/blob-sink/src/client/interface.ts b/yarn-project/blob-sink/src/client/interface.ts index 4e5b9369c283..e769b94da4fc 100644 --- a/yarn-project/blob-sink/src/client/interface.ts +++ b/yarn-project/blob-sink/src/client/interface.ts @@ -1,4 +1,4 @@ -import { type Blob } from '@aztec/blob-lib'; +import type { Blob } from '@aztec/blob-lib'; export interface BlobSinkClientInterface { sendBlobsToBlobSink(blockId: string, blobs: Blob[]): Promise; diff --git a/yarn-project/blob-sink/src/client/local.ts b/yarn-project/blob-sink/src/client/local.ts index 2b5a3a036872..f8132ceb714b 100644 --- a/yarn-project/blob-sink/src/client/local.ts +++ b/yarn-project/blob-sink/src/client/local.ts @@ -1,8 +1,8 @@ -import { type Blob } from '@aztec/blob-lib'; +import type { Blob } from '@aztec/blob-lib'; -import { type BlobStore } from '../blobstore/index.js'; +import type { BlobStore } from '../blobstore/index.js'; import { BlobWithIndex } from '../types/blob_with_index.js'; -import { type BlobSinkClientInterface } from './interface.js'; +import type { BlobSinkClientInterface } from './interface.js'; export class LocalBlobSinkClient implements BlobSinkClientInterface { private readonly blobStore: BlobStore; diff --git a/yarn-project/blob-sink/src/server/factory.ts b/yarn-project/blob-sink/src/server/factory.ts index 8e33f9335d23..86f3eed54524 100644 --- a/yarn-project/blob-sink/src/server/factory.ts +++ b/yarn-project/blob-sink/src/server/factory.ts @@ -1,8 +1,8 @@ -import { type AztecAsyncKVStore } from '@aztec/kv-store'; +import type { AztecAsyncKVStore } from '@aztec/kv-store'; import { createStore } from '@aztec/kv-store/lmdb-v2'; -import { type TelemetryClient } from '@aztec/telemetry-client'; +import type { TelemetryClient } from '@aztec/telemetry-client'; -import { type BlobSinkConfig } from './config.js'; +import type { BlobSinkConfig } from './config.js'; import { BlobSinkServer } from './server.js'; // If data store settings are provided, the store is created and returned. diff --git a/yarn-project/blob-sink/src/server/metrics.ts b/yarn-project/blob-sink/src/server/metrics.ts index 17410629f905..ea0901035576 100644 --- a/yarn-project/blob-sink/src/server/metrics.ts +++ b/yarn-project/blob-sink/src/server/metrics.ts @@ -1,6 +1,6 @@ import { type Histogram, Metrics, type TelemetryClient, type UpDownCounter } from '@aztec/telemetry-client'; -import { type BlobWithIndex } from '../types/blob_with_index.js'; +import type { BlobWithIndex } from '../types/blob_with_index.js'; export class BlobSinkMetrics { /** The number of blobs in the blob store */ diff --git a/yarn-project/blob-sink/src/server/server.ts b/yarn-project/blob-sink/src/server/server.ts index 592f39858b69..d80a48283e5a 100644 --- a/yarn-project/blob-sink/src/server/server.ts +++ b/yarn-project/blob-sink/src/server/server.ts @@ -1,11 +1,11 @@ import { Blob } from '@aztec/blob-lib'; import { type Logger, createLogger } from '@aztec/foundation/log'; -import { type AztecAsyncKVStore } from '@aztec/kv-store'; +import type { AztecAsyncKVStore } from '@aztec/kv-store'; import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client'; import express, { type Express, type Request, type Response, json } from 'express'; -import { type Server } from 'http'; -import { type AddressInfo } from 'net'; +import type { Server } from 'http'; +import type { AddressInfo } from 'net'; import { z } from 'zod'; import { type BlobStore, DiskBlobStore } from '../blobstore/index.js'; @@ -13,7 +13,7 @@ import { MemoryBlobStore } from '../blobstore/memory_blob_store.js'; import { inboundTransform } from '../encoding/index.js'; import { type PostBlobSidecarRequest, blockIdSchema, indicesSchema } from '../types/api.js'; import { BlobWithIndex } from '../types/index.js'; -import { type BlobSinkConfig } from './config.js'; +import type { BlobSinkConfig } from './config.js'; import { BlobSinkMetrics } from './metrics.js'; /** diff --git a/yarn-project/bot/src/bot.ts b/yarn-project/bot/src/bot.ts index 796522b64936..77857dd4aa7f 100644 --- a/yarn-project/bot/src/bot.ts +++ b/yarn-project/bot/src/bot.ts @@ -7,13 +7,13 @@ import { createLogger, } from '@aztec/aztec.js'; import { timesParallel } from '@aztec/foundation/collection'; -import { type EasyPrivateTokenContract } from '@aztec/noir-contracts.js/EasyPrivateToken'; -import { type TokenContract } from '@aztec/noir-contracts.js/Token'; -import { type FunctionCall } from '@aztec/stdlib/abi'; +import type { EasyPrivateTokenContract } from '@aztec/noir-contracts.js/EasyPrivateToken'; +import type { TokenContract } from '@aztec/noir-contracts.js/Token'; +import type { FunctionCall } from '@aztec/stdlib/abi'; import { Gas } from '@aztec/stdlib/gas'; -import { type AztecNode, type PXE } from '@aztec/stdlib/interfaces/client'; +import type { AztecNode, PXE } from '@aztec/stdlib/interfaces/client'; -import { type BotConfig } from './config.js'; +import type { BotConfig } from './config.js'; import { BotFactory } from './factory.js'; import { getBalances, getPrivateBalance, isStandardTokenContract } from './utils.js'; diff --git a/yarn-project/bot/src/config.ts b/yarn-project/bot/src/config.ts index b6cf0c868305..2cd88730f607 100644 --- a/yarn-project/bot/src/config.ts +++ b/yarn-project/bot/src/config.ts @@ -10,7 +10,7 @@ import { Fr } from '@aztec/foundation/fields'; import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks'; import { protocolContractTreeRoot } from '@aztec/protocol-contracts'; import { type ZodFor, schemas } from '@aztec/stdlib/schemas'; -import { type ComponentsVersions } from '@aztec/stdlib/versioning'; +import type { ComponentsVersions } from '@aztec/stdlib/versioning'; import { z } from 'zod'; diff --git a/yarn-project/bot/src/factory.ts b/yarn-project/bot/src/factory.ts index 234216d26ee0..61c4dc18d48e 100644 --- a/yarn-project/bot/src/factory.ts +++ b/yarn-project/bot/src/factory.ts @@ -18,7 +18,7 @@ import { createEthereumChain, createL1Clients } from '@aztec/ethereum'; import { Fr } from '@aztec/foundation/fields'; import { EasyPrivateTokenContract } from '@aztec/noir-contracts.js/EasyPrivateToken'; import { TokenContract } from '@aztec/noir-contracts.js/Token'; -import { type FunctionCall } from '@aztec/stdlib/abi'; +import type { FunctionCall } from '@aztec/stdlib/abi'; import { deriveSigningKey } from '@aztec/stdlib/keys'; import { makeTracedFetch } from '@aztec/telemetry-client'; diff --git a/yarn-project/bot/src/interface.ts b/yarn-project/bot/src/interface.ts index a11a923a7a5c..664beb134696 100644 --- a/yarn-project/bot/src/interface.ts +++ b/yarn-project/bot/src/interface.ts @@ -1,4 +1,4 @@ -import { type ApiSchemaFor } from '@aztec/stdlib/schemas'; +import type { ApiSchemaFor } from '@aztec/stdlib/schemas'; import { z } from 'zod'; diff --git a/yarn-project/bot/src/rpc.ts b/yarn-project/bot/src/rpc.ts index d565919b2393..d8ed44c8f317 100644 --- a/yarn-project/bot/src/rpc.ts +++ b/yarn-project/bot/src/rpc.ts @@ -1,8 +1,8 @@ -import { type ApiHandler } from '@aztec/foundation/json-rpc/server'; +import type { ApiHandler } from '@aztec/foundation/json-rpc/server'; import { createTracedJsonRpcServer } from '@aztec/telemetry-client'; import { BotRunnerApiSchema } from './interface.js'; -import { type BotRunner } from './runner.js'; +import type { BotRunner } from './runner.js'; /** * Wraps a bot runner with a JSON RPC HTTP server. diff --git a/yarn-project/bot/src/runner.ts b/yarn-project/bot/src/runner.ts index a178d4e23029..de9998e4caec 100644 --- a/yarn-project/bot/src/runner.ts +++ b/yarn-project/bot/src/runner.ts @@ -4,7 +4,7 @@ import { type TelemetryClient, type Traceable, type Tracer, makeTracedFetch, tra import { Bot } from './bot.js'; import { type BotConfig, getVersions } from './config.js'; -import { type BotRunnerApi } from './interface.js'; +import type { BotRunnerApi } from './interface.js'; export class BotRunner implements BotRunnerApi, Traceable { private log = createLogger('bot'); diff --git a/yarn-project/bot/src/utils.ts b/yarn-project/bot/src/utils.ts index 022c18cb8146..e7101863a00a 100644 --- a/yarn-project/bot/src/utils.ts +++ b/yarn-project/bot/src/utils.ts @@ -1,6 +1,6 @@ -import { type EasyPrivateTokenContract } from '@aztec/noir-contracts.js/EasyPrivateToken'; -import { type TokenContract } from '@aztec/noir-contracts.js/Token'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { EasyPrivateTokenContract } from '@aztec/noir-contracts.js/EasyPrivateToken'; +import type { TokenContract } from '@aztec/noir-contracts.js/Token'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; /** * Gets the private and public balance of the given token for the given address. diff --git a/yarn-project/builder/src/index.ts b/yarn-project/builder/src/index.ts index c78b624749d7..676a546771bd 100644 --- a/yarn-project/builder/src/index.ts +++ b/yarn-project/builder/src/index.ts @@ -1,4 +1,4 @@ -import { type Command } from 'commander'; +import type { Command } from 'commander'; import { dirname } from 'path'; export function injectCommands(program: Command) { diff --git a/yarn-project/cli-wallet/src/cmds/add_authwit.ts b/yarn-project/cli-wallet/src/cmds/add_authwit.ts index 1e1cc0a82c79..1adf26a6bc4e 100644 --- a/yarn-project/cli-wallet/src/cmds/add_authwit.ts +++ b/yarn-project/cli-wallet/src/cmds/add_authwit.ts @@ -1,5 +1,5 @@ -import { type AccountWalletWithSecretKey, type AuthWitness, type AztecAddress } from '@aztec/aztec.js'; -import { type LogFn } from '@aztec/foundation/log'; +import type { AccountWalletWithSecretKey, AuthWitness, AztecAddress } from '@aztec/aztec.js'; +import type { LogFn } from '@aztec/foundation/log'; export async function addAuthwit( wallet: AccountWalletWithSecretKey, diff --git a/yarn-project/cli-wallet/src/cmds/authorize_action.ts b/yarn-project/cli-wallet/src/cmds/authorize_action.ts index 06abf2a8d56d..a2a5c9c4f292 100644 --- a/yarn-project/cli-wallet/src/cmds/authorize_action.ts +++ b/yarn-project/cli-wallet/src/cmds/authorize_action.ts @@ -1,6 +1,6 @@ import { type AccountWalletWithSecretKey, type AztecAddress, Contract } from '@aztec/aztec.js'; import { prepTx } from '@aztec/cli/utils'; -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; export async function authorizeAction( wallet: AccountWalletWithSecretKey, diff --git a/yarn-project/cli-wallet/src/cmds/bridge_fee_juice.ts b/yarn-project/cli-wallet/src/cmds/bridge_fee_juice.ts index 8ca2eac850b5..f90cdef8aac3 100644 --- a/yarn-project/cli-wallet/src/cmds/bridge_fee_juice.ts +++ b/yarn-project/cli-wallet/src/cmds/bridge_fee_juice.ts @@ -2,8 +2,8 @@ import { L1FeeJuicePortalManager, type PXE } from '@aztec/aztec.js'; import { prettyPrintJSON } from '@aztec/cli/utils'; import { createEthereumChain, createL1Clients } from '@aztec/ethereum'; import { Fr } from '@aztec/foundation/fields'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { LogFn, Logger } from '@aztec/foundation/log'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; export async function bridgeL1FeeJuice( amount: bigint, diff --git a/yarn-project/cli-wallet/src/cmds/cancel_tx.ts b/yarn-project/cli-wallet/src/cmds/cancel_tx.ts index a0b3b87d6b05..8d8253dd9e69 100644 --- a/yarn-project/cli-wallet/src/cmds/cancel_tx.ts +++ b/yarn-project/cli-wallet/src/cmds/cancel_tx.ts @@ -1,7 +1,7 @@ import { type AccountWalletWithSecretKey, type FeePaymentMethod, SentTx, type TxHash, TxStatus } from '@aztec/aztec.js'; -import { type FeeOptions } from '@aztec/aztec.js/entrypoint'; +import type { FeeOptions } from '@aztec/aztec.js/entrypoint'; import { Fr } from '@aztec/foundation/fields'; -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; import { GasFees, GasSettings } from '@aztec/stdlib/gas'; export async function cancelTx( diff --git a/yarn-project/cli-wallet/src/cmds/check_tx.ts b/yarn-project/cli-wallet/src/cmds/check_tx.ts index b586cd28ae27..27940abf8c7c 100644 --- a/yarn-project/cli-wallet/src/cmds/check_tx.ts +++ b/yarn-project/cli-wallet/src/cmds/check_tx.ts @@ -1,6 +1,6 @@ -import { type PXE, type TxHash } from '@aztec/aztec.js'; +import type { PXE, TxHash } from '@aztec/aztec.js'; import { inspectTx } from '@aztec/cli/inspect'; -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; export async function checkTx(client: PXE, txHash: TxHash, statusOnly: boolean, log: LogFn) { if (statusOnly) { diff --git a/yarn-project/cli-wallet/src/cmds/create_account.ts b/yarn-project/cli-wallet/src/cmds/create_account.ts index 2b6a7fff4e4a..902aafe0546b 100644 --- a/yarn-project/cli-wallet/src/cmds/create_account.ts +++ b/yarn-project/cli-wallet/src/cmds/create_account.ts @@ -1,7 +1,7 @@ -import { type DeployAccountOptions, type PXE } from '@aztec/aztec.js'; +import type { DeployAccountOptions, PXE } from '@aztec/aztec.js'; import { prettyPrintJSON } from '@aztec/cli/cli-utils'; import { Fr } from '@aztec/foundation/fields'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; import { type AccountType, createOrRetrieveAccount } from '../utils/accounts.js'; import { type IFeeOpts, printGasEstimates } from '../utils/options/fees.js'; diff --git a/yarn-project/cli-wallet/src/cmds/create_authwit.ts b/yarn-project/cli-wallet/src/cmds/create_authwit.ts index 42a4026cfab3..50b4b3819738 100644 --- a/yarn-project/cli-wallet/src/cmds/create_authwit.ts +++ b/yarn-project/cli-wallet/src/cmds/create_authwit.ts @@ -1,6 +1,6 @@ import { type AccountWalletWithSecretKey, type AztecAddress, Contract } from '@aztec/aztec.js'; import { prepTx } from '@aztec/cli/utils'; -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; export async function createAuthwit( wallet: AccountWalletWithSecretKey, diff --git a/yarn-project/cli-wallet/src/cmds/deploy.ts b/yarn-project/cli-wallet/src/cmds/deploy.ts index 5e78cb777b9e..85f7837c2086 100644 --- a/yarn-project/cli-wallet/src/cmds/deploy.ts +++ b/yarn-project/cli-wallet/src/cmds/deploy.ts @@ -1,6 +1,6 @@ import { type AccountWalletWithSecretKey, ContractDeployer, type DeployMethod, Fr, type PXE } from '@aztec/aztec.js'; import { GITHUB_TAG_PREFIX, encodeArgs, getContractArtifact } from '@aztec/cli/utils'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; import { getInitializer } from '@aztec/stdlib/abi'; import { PublicKeys } from '@aztec/stdlib/keys'; diff --git a/yarn-project/cli-wallet/src/cmds/deploy_account.ts b/yarn-project/cli-wallet/src/cmds/deploy_account.ts index 47a0b068b25b..910b2b19ca12 100644 --- a/yarn-project/cli-wallet/src/cmds/deploy_account.ts +++ b/yarn-project/cli-wallet/src/cmds/deploy_account.ts @@ -1,6 +1,6 @@ -import { type AccountManager, type DeployAccountOptions } from '@aztec/aztec.js'; +import type { AccountManager, DeployAccountOptions } from '@aztec/aztec.js'; import { prettyPrintJSON } from '@aztec/cli/cli-utils'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; import { type IFeeOpts, printGasEstimates } from '../utils/options/fees.js'; diff --git a/yarn-project/cli-wallet/src/cmds/import_test_accounts.ts b/yarn-project/cli-wallet/src/cmds/import_test_accounts.ts index d1e7b3946be9..320e9a3a9163 100644 --- a/yarn-project/cli-wallet/src/cmds/import_test_accounts.ts +++ b/yarn-project/cli-wallet/src/cmds/import_test_accounts.ts @@ -2,9 +2,9 @@ import { getSchnorrAccount } from '@aztec/accounts/schnorr'; import { getInitialTestAccounts } from '@aztec/accounts/testing'; import { Fr, type PXE } from '@aztec/aztec.js'; import { prettyPrintJSON } from '@aztec/cli/cli-utils'; -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; -import { type WalletDB } from '../storage/wallet_db.js'; +import type { WalletDB } from '../storage/wallet_db.js'; export async function importTestAccounts(client: PXE, db: WalletDB, json: boolean, log: LogFn) { const testAccounts = await getInitialTestAccounts(); diff --git a/yarn-project/cli-wallet/src/cmds/index.ts b/yarn-project/cli-wallet/src/cmds/index.ts index e034aaaf1aae..45fea5c0eb81 100644 --- a/yarn-project/cli-wallet/src/cmds/index.ts +++ b/yarn-project/cli-wallet/src/cmds/index.ts @@ -13,14 +13,14 @@ import { parsePublicKey, pxeOption, } from '@aztec/cli/utils'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; import { GasFees } from '@aztec/stdlib/gas'; import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client'; import { type Command, Option } from 'commander'; import inquirer from 'inquirer'; -import { type WalletDB } from '../storage/wallet_db.js'; +import type { WalletDB } from '../storage/wallet_db.js'; import { type AccountType, addScopeToWallet, createOrRetrieveAccount, getWalletWithScopes } from '../utils/accounts.js'; import { FeeOpts } from '../utils/options/fees.js'; import { @@ -42,7 +42,7 @@ import { parseGasFees, parsePaymentMethod, } from '../utils/options/index.js'; -import { type PXEWrapper } from '../utils/pxe_wrapper.js'; +import type { PXEWrapper } from '../utils/pxe_wrapper.js'; export function injectCommands( program: Command, diff --git a/yarn-project/cli-wallet/src/cmds/register_contract.ts b/yarn-project/cli-wallet/src/cmds/register_contract.ts index dfdb44d2618c..65e830de000d 100644 --- a/yarn-project/cli-wallet/src/cmds/register_contract.ts +++ b/yarn-project/cli-wallet/src/cmds/register_contract.ts @@ -1,6 +1,6 @@ -import { type AccountWalletWithSecretKey, type AztecAddress, type AztecNode } from '@aztec/aztec.js'; +import type { AccountWalletWithSecretKey, AztecAddress, AztecNode } from '@aztec/aztec.js'; import { getContractArtifact } from '@aztec/cli/cli-utils'; -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; export async function registerContract( wallet: AccountWalletWithSecretKey, diff --git a/yarn-project/cli-wallet/src/cmds/register_sender.ts b/yarn-project/cli-wallet/src/cmds/register_sender.ts index 0d84f637c492..1b9221fe35da 100644 --- a/yarn-project/cli-wallet/src/cmds/register_sender.ts +++ b/yarn-project/cli-wallet/src/cmds/register_sender.ts @@ -1,5 +1,5 @@ -import { type AccountWalletWithSecretKey, type AztecAddress } from '@aztec/aztec.js'; -import { type LogFn } from '@aztec/foundation/log'; +import type { AccountWalletWithSecretKey, AztecAddress } from '@aztec/aztec.js'; +import type { LogFn } from '@aztec/foundation/log'; export async function registerSender(wallet: AccountWalletWithSecretKey, address: AztecAddress, log: LogFn) { await wallet.registerSender(address); diff --git a/yarn-project/cli-wallet/src/cmds/send.ts b/yarn-project/cli-wallet/src/cmds/send.ts index b879f549a000..3752b07f9ba6 100644 --- a/yarn-project/cli-wallet/src/cmds/send.ts +++ b/yarn-project/cli-wallet/src/cmds/send.ts @@ -1,6 +1,6 @@ import { type AccountWalletWithSecretKey, type AztecAddress, Contract, Fr } from '@aztec/aztec.js'; import { prepTx } from '@aztec/cli/utils'; -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; import { GasSettings } from '@aztec/stdlib/gas'; import { type IFeeOpts, printGasEstimates } from '../utils/options/fees.js'; diff --git a/yarn-project/cli-wallet/src/cmds/simulate.ts b/yarn-project/cli-wallet/src/cmds/simulate.ts index c466611a5df9..b26ff4b7e825 100644 --- a/yarn-project/cli-wallet/src/cmds/simulate.ts +++ b/yarn-project/cli-wallet/src/cmds/simulate.ts @@ -1,6 +1,6 @@ import { type AccountWalletWithSecretKey, type AztecAddress, Contract, type ProfileResult } from '@aztec/aztec.js'; import { prepTx } from '@aztec/cli/utils'; -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; import { format } from 'util'; diff --git a/yarn-project/cli-wallet/src/storage/wallet_db.ts b/yarn-project/cli-wallet/src/storage/wallet_db.ts index 342e855d3e72..319e8f21797c 100644 --- a/yarn-project/cli-wallet/src/storage/wallet_db.ts +++ b/yarn-project/cli-wallet/src/storage/wallet_db.ts @@ -1,12 +1,12 @@ import { Fr } from '@aztec/foundation/fields'; -import { type LogFn } from '@aztec/foundation/log'; -import { type AztecAsyncKVStore, type AztecAsyncMap } from '@aztec/kv-store'; -import { type AuthWitness } from '@aztec/stdlib/auth-witness'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { LogFn } from '@aztec/foundation/log'; +import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store'; +import type { AuthWitness } from '@aztec/stdlib/auth-witness'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { GasSettings } from '@aztec/stdlib/gas'; -import { type TxHash } from '@aztec/stdlib/tx'; +import type { TxHash } from '@aztec/stdlib/tx'; -import { type AccountType } from '../utils/accounts.js'; +import type { AccountType } from '../utils/accounts.js'; import { extractECDSAPublicKeyFromBase64String } from '../utils/ecdsa.js'; export const Aliases = ['accounts', 'contracts', 'artifacts', 'secrets', 'transactions', 'authwits'] as const; diff --git a/yarn-project/cli-wallet/src/utils/accounts.ts b/yarn-project/cli-wallet/src/utils/accounts.ts index e584485fc684..c97ef033eaca 100644 --- a/yarn-project/cli-wallet/src/utils/accounts.ts +++ b/yarn-project/cli-wallet/src/utils/accounts.ts @@ -1,11 +1,11 @@ import { getIdentities } from '@aztec/accounts/utils'; -import { type AccountManager, type AccountWalletWithSecretKey } from '@aztec/aztec.js'; +import type { AccountManager, AccountWalletWithSecretKey } from '@aztec/aztec.js'; import { Fr } from '@aztec/foundation/fields'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; import { deriveSigningKey } from '@aztec/stdlib/keys'; -import { type WalletDB } from '../storage/wallet_db.js'; +import type { WalletDB } from '../storage/wallet_db.js'; import { extractECDSAPublicKeyFromBase64String } from './ecdsa.js'; export const AccountTypes = ['schnorr', 'ecdsasecp256r1ssh', 'ecdsasecp256k1'] as const; diff --git a/yarn-project/cli-wallet/src/utils/options/fees.ts b/yarn-project/cli-wallet/src/utils/options/fees.ts index eb533e276d70..8bdae01eef23 100644 --- a/yarn-project/cli-wallet/src/utils/options/fees.ts +++ b/yarn-project/cli-wallet/src/utils/options/fees.ts @@ -7,13 +7,13 @@ import { type SendMethodOptions, } from '@aztec/aztec.js'; import { Fr } from '@aztec/foundation/fields'; -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { Gas, GasFees, GasSettings } from '@aztec/stdlib/gas'; import { Option } from 'commander'; -import { type WalletDB } from '../../storage/wallet_db.js'; +import type { WalletDB } from '../../storage/wallet_db.js'; import { createOrRetrieveAccount } from '../accounts.js'; import { aliasedAddressParser } from './options.js'; diff --git a/yarn-project/cli-wallet/src/utils/options/options.ts b/yarn-project/cli-wallet/src/utils/options/options.ts index f117c3b7a548..f9aff03c144d 100644 --- a/yarn-project/cli-wallet/src/utils/options/options.ts +++ b/yarn-project/cli-wallet/src/utils/options/options.ts @@ -1,11 +1,11 @@ import { parseAztecAddress, parseSecretKey, parseTxHash } from '@aztec/cli/utils'; import { AuthWitness } from '@aztec/stdlib/auth-witness'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { Option } from 'commander'; import { readdir, stat } from 'fs/promises'; -import { type AliasType, type WalletDB } from '../../storage/wallet_db.js'; +import type { AliasType, WalletDB } from '../../storage/wallet_db.js'; import { AccountTypes } from '../accounts.js'; const TARGET_DIR = 'target'; diff --git a/yarn-project/cli/src/cmds/contracts/index.ts b/yarn-project/cli/src/cmds/contracts/index.ts index 99bf4788a73a..70bba7c83846 100644 --- a/yarn-project/cli/src/cmds/contracts/index.ts +++ b/yarn-project/cli/src/cmds/contracts/index.ts @@ -1,6 +1,6 @@ -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; -import { type Command } from 'commander'; +import type { Command } from 'commander'; export function injectCommands(program: Command, log: LogFn, debugLogger: Logger) { program diff --git a/yarn-project/cli/src/cmds/contracts/inspect_contract.ts b/yarn-project/cli/src/cmds/contracts/inspect_contract.ts index 4c2c90ba627a..d6fd6bcda3a9 100644 --- a/yarn-project/cli/src/cmds/contracts/inspect_contract.ts +++ b/yarn-project/cli/src/cmds/contracts/inspect_contract.ts @@ -1,5 +1,5 @@ import { sha256 } from '@aztec/foundation/crypto'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; import { type FunctionArtifact, FunctionSelector, diff --git a/yarn-project/cli/src/cmds/contracts/parse_parameter_struct.ts b/yarn-project/cli/src/cmds/contracts/parse_parameter_struct.ts index 6e529128e454..689f58ce37e9 100644 --- a/yarn-project/cli/src/cmds/contracts/parse_parameter_struct.ts +++ b/yarn-project/cli/src/cmds/contracts/parse_parameter_struct.ts @@ -1,6 +1,6 @@ import { jsonStringify } from '@aztec/foundation/json-rpc'; -import { type LogFn } from '@aztec/foundation/log'; -import { type StructType } from '@aztec/stdlib/abi'; +import type { LogFn } from '@aztec/foundation/log'; +import type { StructType } from '@aztec/stdlib/abi'; import { getContractArtifact } from '../../utils/aztec.js'; import { parseStructString } from '../../utils/encoding.js'; diff --git a/yarn-project/cli/src/cmds/devnet/bootstrap_network.ts b/yarn-project/cli/src/cmds/devnet/bootstrap_network.ts index 3a105d63e7bd..a8c2d2f22b52 100644 --- a/yarn-project/cli/src/cmds/devnet/bootstrap_network.ts +++ b/yarn-project/cli/src/cmds/devnet/bootstrap_network.ts @@ -19,7 +19,7 @@ import { createL1Clients, deployL1Contract, } from '@aztec/ethereum'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; import { getContract } from 'viem'; import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts'; diff --git a/yarn-project/cli/src/cmds/devnet/faucet.ts b/yarn-project/cli/src/cmds/devnet/faucet.ts index 98675405040e..0f87089556df 100644 --- a/yarn-project/cli/src/cmds/devnet/faucet.ts +++ b/yarn-project/cli/src/cmds/devnet/faucet.ts @@ -1,5 +1,5 @@ -import { type EthAddress } from '@aztec/foundation/eth-address'; -import { type LogFn } from '@aztec/foundation/log'; +import type { EthAddress } from '@aztec/foundation/eth-address'; +import type { LogFn } from '@aztec/foundation/log'; import { prettyPrintJSON } from '../../utils/commands.js'; diff --git a/yarn-project/cli/src/cmds/devnet/index.ts b/yarn-project/cli/src/cmds/devnet/index.ts index d7026938f665..840d482435fe 100644 --- a/yarn-project/cli/src/cmds/devnet/index.ts +++ b/yarn-project/cli/src/cmds/devnet/index.ts @@ -1,6 +1,6 @@ -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; -import { type Command } from 'commander'; +import type { Command } from 'commander'; import { ETHEREUM_HOST, l1ChainIdOption, parseEthereumAddress, pxeOption } from '../../utils/commands.js'; diff --git a/yarn-project/cli/src/cmds/infrastructure/index.ts b/yarn-project/cli/src/cmds/infrastructure/index.ts index 5563841c821f..0df893606df8 100644 --- a/yarn-project/cli/src/cmds/infrastructure/index.ts +++ b/yarn-project/cli/src/cmds/infrastructure/index.ts @@ -1,6 +1,6 @@ -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; -import { type Command } from 'commander'; +import type { Command } from 'commander'; import { ETHEREUM_HOST, l1ChainIdOption, parseOptionalInteger, pxeOption } from '../../utils/commands.js'; diff --git a/yarn-project/cli/src/cmds/infrastructure/sequencers.ts b/yarn-project/cli/src/cmds/infrastructure/sequencers.ts index c54f8c7588e5..b4c6e3a88f51 100644 --- a/yarn-project/cli/src/cmds/infrastructure/sequencers.ts +++ b/yarn-project/cli/src/cmds/infrastructure/sequencers.ts @@ -1,6 +1,6 @@ import { createCompatibleClient } from '@aztec/aztec.js'; import { createEthereumChain, getL1ContractsConfigEnvVars } from '@aztec/ethereum'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; import { RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts'; import { createPublicClient, createWalletClient, getContract, http } from 'viem'; diff --git a/yarn-project/cli/src/cmds/infrastructure/setup_l2_contract.ts b/yarn-project/cli/src/cmds/infrastructure/setup_l2_contract.ts index e39b0cf8412b..f0a703c48dcf 100644 --- a/yarn-project/cli/src/cmds/infrastructure/setup_l2_contract.ts +++ b/yarn-project/cli/src/cmds/infrastructure/setup_l2_contract.ts @@ -1,7 +1,7 @@ import { type InitialAccountData, deployFundedSchnorrAccounts, getInitialTestAccounts } from '@aztec/accounts/testing'; import { type AztecAddress, SignerlessWallet, type WaitOpts, createPXEClient, makeFetch } from '@aztec/aztec.js'; import { jsonStringify } from '@aztec/foundation/json-rpc'; -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; import { ProtocolContractAddress } from '@aztec/protocol-contracts'; import { setupCanonicalL2FeeJuice } from '../misc/setup_contracts.js'; diff --git a/yarn-project/cli/src/cmds/l1/advance_epoch.ts b/yarn-project/cli/src/cmds/l1/advance_epoch.ts index 2cd4e01dea37..04391995dad3 100644 --- a/yarn-project/cli/src/cmds/l1/advance_epoch.ts +++ b/yarn-project/cli/src/cmds/l1/advance_epoch.ts @@ -1,5 +1,5 @@ import { CheatCodes, createPXEClient, makeFetch } from '@aztec/aztec.js'; -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; export async function advanceEpoch(l1RpcUrl: string, rpcUrl: string, log: LogFn) { const pxe = createPXEClient(rpcUrl, {}, makeFetch([], true)); diff --git a/yarn-project/cli/src/cmds/l1/assume_proven_through.ts b/yarn-project/cli/src/cmds/l1/assume_proven_through.ts index fd174121eb96..4aa3429318a8 100644 --- a/yarn-project/cli/src/cmds/l1/assume_proven_through.ts +++ b/yarn-project/cli/src/cmds/l1/assume_proven_through.ts @@ -1,5 +1,5 @@ import { EthCheatCodes, RollupCheatCodes, createPXEClient, makeFetch } from '@aztec/aztec.js'; -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; export async function assumeProvenThrough( blockNumberOrLatest: number | undefined, diff --git a/yarn-project/cli/src/cmds/l1/bridge_erc20.ts b/yarn-project/cli/src/cmds/l1/bridge_erc20.ts index 0eae5ac5308a..20197757d87d 100644 --- a/yarn-project/cli/src/cmds/l1/bridge_erc20.ts +++ b/yarn-project/cli/src/cmds/l1/bridge_erc20.ts @@ -1,6 +1,6 @@ import { type AztecAddress, type EthAddress, type Fr, L1ToL2TokenPortalManager } from '@aztec/aztec.js'; import { createEthereumChain, createL1Clients } from '@aztec/ethereum'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; import { prettyPrintJSON } from '../../utils/commands.js'; diff --git a/yarn-project/cli/src/cmds/l1/create_l1_account.ts b/yarn-project/cli/src/cmds/l1/create_l1_account.ts index 81764ce5f02e..38e1815ba766 100644 --- a/yarn-project/cli/src/cmds/l1/create_l1_account.ts +++ b/yarn-project/cli/src/cmds/l1/create_l1_account.ts @@ -1,4 +1,4 @@ -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts'; diff --git a/yarn-project/cli/src/cmds/l1/deploy_l1_contracts.ts b/yarn-project/cli/src/cmds/l1/deploy_l1_contracts.ts index 923039c066fa..01fdd04933d9 100644 --- a/yarn-project/cli/src/cmds/l1/deploy_l1_contracts.ts +++ b/yarn-project/cli/src/cmds/l1/deploy_l1_contracts.ts @@ -1,7 +1,7 @@ import { getInitialTestAccounts } from '@aztec/accounts/testing'; import { getL1ContractsConfigEnvVars } from '@aztec/ethereum'; -import { type EthAddress } from '@aztec/foundation/eth-address'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { EthAddress } from '@aztec/foundation/eth-address'; +import type { LogFn, Logger } from '@aztec/foundation/log'; import { getGenesisValues } from '@aztec/world-state/testing'; import { deployAztecContracts } from '../../utils/aztec.js'; diff --git a/yarn-project/cli/src/cmds/l1/deploy_l1_verifier.ts b/yarn-project/cli/src/cmds/l1/deploy_l1_verifier.ts index 9f525db385a2..c0120a1b1d0c 100644 --- a/yarn-project/cli/src/cmds/l1/deploy_l1_verifier.ts +++ b/yarn-project/cli/src/cmds/l1/deploy_l1_verifier.ts @@ -1,6 +1,6 @@ import { createCompatibleClient } from '@aztec/aztec.js'; import { createEthereumChain, createL1Clients, deployL1Contract } from '@aztec/ethereum'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; import { HonkVerifierAbi, HonkVerifierBytecode } from '@aztec/l1-artifacts'; import { InvalidOptionArgumentError } from 'commander'; diff --git a/yarn-project/cli/src/cmds/l1/get_l1_balance.ts b/yarn-project/cli/src/cmds/l1/get_l1_balance.ts index 50db6ea1663c..9572703f42f1 100644 --- a/yarn-project/cli/src/cmds/l1/get_l1_balance.ts +++ b/yarn-project/cli/src/cmds/l1/get_l1_balance.ts @@ -1,6 +1,6 @@ import { createEthereumChain } from '@aztec/ethereum'; -import { type EthAddress } from '@aztec/foundation/eth-address'; -import { type LogFn } from '@aztec/foundation/log'; +import type { EthAddress } from '@aztec/foundation/eth-address'; +import type { LogFn } from '@aztec/foundation/log'; import { TestERC20Abi } from '@aztec/l1-artifacts'; import { createPublicClient, getContract, http } from 'viem'; diff --git a/yarn-project/cli/src/cmds/l1/index.ts b/yarn-project/cli/src/cmds/l1/index.ts index cb6f83523430..72971562697e 100644 --- a/yarn-project/cli/src/cmds/l1/index.ts +++ b/yarn-project/cli/src/cmds/l1/index.ts @@ -1,5 +1,5 @@ import { EthAddress } from '@aztec/foundation/eth-address'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; import { type Command, Option } from 'commander'; diff --git a/yarn-project/cli/src/cmds/l1/update_l1_validators.ts b/yarn-project/cli/src/cmds/l1/update_l1_validators.ts index e2c00534a794..bafb2ef5e0d9 100644 --- a/yarn-project/cli/src/cmds/l1/update_l1_validators.ts +++ b/yarn-project/cli/src/cmds/l1/update_l1_validators.ts @@ -5,8 +5,8 @@ import { getL1ContractsConfigEnvVars, isAnvilTestChain, } from '@aztec/ethereum'; -import { type EthAddress } from '@aztec/foundation/eth-address'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { EthAddress } from '@aztec/foundation/eth-address'; +import type { LogFn, Logger } from '@aztec/foundation/log'; import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts'; import { createPublicClient, createWalletClient, getContract, http } from 'viem'; diff --git a/yarn-project/cli/src/cmds/misc/compute_selector.ts b/yarn-project/cli/src/cmds/misc/compute_selector.ts index a6b1177f54ff..80a16bbf9fb1 100644 --- a/yarn-project/cli/src/cmds/misc/compute_selector.ts +++ b/yarn-project/cli/src/cmds/misc/compute_selector.ts @@ -1,4 +1,4 @@ -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; import { FunctionSelector } from '@aztec/stdlib/abi'; export async function computeSelector(functionSignature: string, log: LogFn) { diff --git a/yarn-project/cli/src/cmds/misc/example_contracts.ts b/yarn-project/cli/src/cmds/misc/example_contracts.ts index 1c012f59f0cb..467784650407 100644 --- a/yarn-project/cli/src/cmds/misc/example_contracts.ts +++ b/yarn-project/cli/src/cmds/misc/example_contracts.ts @@ -1,4 +1,4 @@ -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; import { getExampleContractNames } from '../../utils/aztec.js'; diff --git a/yarn-project/cli/src/cmds/misc/generate_p2p_private_key.ts b/yarn-project/cli/src/cmds/misc/generate_p2p_private_key.ts index f62617ae6ea7..2bd03e8cbf53 100644 --- a/yarn-project/cli/src/cmds/misc/generate_p2p_private_key.ts +++ b/yarn-project/cli/src/cmds/misc/generate_p2p_private_key.ts @@ -1,4 +1,4 @@ -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; import { createSecp256k1PeerId } from '@libp2p/peer-id-factory'; diff --git a/yarn-project/cli/src/cmds/misc/generate_secret_and_hash.ts b/yarn-project/cli/src/cmds/misc/generate_secret_and_hash.ts index fddea589c334..b284f06922b2 100644 --- a/yarn-project/cli/src/cmds/misc/generate_secret_and_hash.ts +++ b/yarn-project/cli/src/cmds/misc/generate_secret_and_hash.ts @@ -1,6 +1,6 @@ import { computeSecretHash } from '@aztec/aztec.js'; import { Fr } from '@aztec/foundation/fields'; -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; export function generateSecretAndHash(log: LogFn) { const secret = Fr.random(); diff --git a/yarn-project/cli/src/cmds/misc/index.ts b/yarn-project/cli/src/cmds/misc/index.ts index fe6caa16212d..bab874b7c55d 100644 --- a/yarn-project/cli/src/cmds/misc/index.ts +++ b/yarn-project/cli/src/cmds/misc/index.ts @@ -1,6 +1,6 @@ -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; -import { type Command } from 'commander'; +import type { Command } from 'commander'; import { prettyPrintJSON } from '../../utils/commands.js'; diff --git a/yarn-project/cli/src/cmds/misc/setup_contracts.ts b/yarn-project/cli/src/cmds/misc/setup_contracts.ts index 8c90a55399a5..6ac81ca540a3 100644 --- a/yarn-project/cli/src/cmds/misc/setup_contracts.ts +++ b/yarn-project/cli/src/cmds/misc/setup_contracts.ts @@ -1,6 +1,6 @@ import { DefaultWaitOpts, type EthAddress, FeeJuicePaymentMethod, type Wallet } from '@aztec/aztec.js'; import { FEE_JUICE_INITIAL_MINT } from '@aztec/constants'; -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; import { ProtocolContractAddress } from '@aztec/protocol-contracts'; import { Gas } from '@aztec/stdlib/gas'; diff --git a/yarn-project/cli/src/cmds/misc/update.ts b/yarn-project/cli/src/cmds/misc/update.ts index 34c3d3eed50a..01307ee30b11 100644 --- a/yarn-project/cli/src/cmds/misc/update.ts +++ b/yarn-project/cli/src/cmds/misc/update.ts @@ -1,10 +1,10 @@ /* eslint-disable jsdoc/require-jsdoc */ -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; import { relative, resolve } from 'path'; import { parse } from 'semver'; -import { type DependencyChanges } from './update/common.js'; +import type { DependencyChanges } from './update/common.js'; import { GITHUB_TAG_PREFIX } from './update/github.js'; import { updateAztecNr } from './update/noir.js'; import { getNewestVersion, updateAztecDeps, updateLockfile } from './update/npm.js'; diff --git a/yarn-project/cli/src/cmds/misc/update/noir.ts b/yarn-project/cli/src/cmds/misc/update/noir.ts index 9b31189085d3..4f5a81201bf7 100644 --- a/yarn-project/cli/src/cmds/misc/update/noir.ts +++ b/yarn-project/cli/src/cmds/misc/update/noir.ts @@ -1,11 +1,11 @@ -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; import { parseNoirPackageConfig } from '@aztec/foundation/noir'; import TOML from '@iarna/toml'; import { readFile } from 'fs/promises'; import { join, relative, resolve } from 'path'; -import { type DependencyChanges } from './common.js'; +import type { DependencyChanges } from './common.js'; import { atomicUpdateFile, prettyPrintNargoToml } from './utils.js'; /** diff --git a/yarn-project/cli/src/cmds/misc/update/npm.ts b/yarn-project/cli/src/cmds/misc/update/npm.ts index 4be6e9eb01b3..fba56d708e61 100644 --- a/yarn-project/cli/src/cmds/misc/update/npm.ts +++ b/yarn-project/cli/src/cmds/misc/update/npm.ts @@ -1,4 +1,4 @@ -import { type LogFn } from '@aztec/foundation/log'; +import type { LogFn } from '@aztec/foundation/log'; import { spawnSync } from 'child_process'; import { existsSync } from 'fs'; @@ -6,7 +6,7 @@ import { readFile } from 'fs/promises'; import { join, relative, resolve } from 'path'; import { type SemVer, parse } from 'semver'; -import { type DependencyChanges } from './common.js'; +import type { DependencyChanges } from './common.js'; import { atomicUpdateFile } from './utils.js'; const deprecatedNpmPackages = new Set(['@aztec/cli', '@aztec/aztec-sandbox']); diff --git a/yarn-project/cli/src/cmds/misc/update/utils.ts b/yarn-project/cli/src/cmds/misc/update/utils.ts index f4bbb302f69d..bdd6d0c268f2 100644 --- a/yarn-project/cli/src/cmds/misc/update/utils.ts +++ b/yarn-project/cli/src/cmds/misc/update/utils.ts @@ -1,4 +1,4 @@ -import { type NoirPackageConfig } from '@aztec/foundation/noir'; +import type { NoirPackageConfig } from '@aztec/foundation/noir'; import TOML from '@iarna/toml'; import { CommanderError } from 'commander'; diff --git a/yarn-project/cli/src/cmds/pxe/add_contract.ts b/yarn-project/cli/src/cmds/pxe/add_contract.ts index 8b50ebc9ad4a..fe47db0fced7 100644 --- a/yarn-project/cli/src/cmds/pxe/add_contract.ts +++ b/yarn-project/cli/src/cmds/pxe/add_contract.ts @@ -1,6 +1,6 @@ import { AztecAddress, type ContractInstanceWithAddress, type Fr, getContractClassFromArtifact } from '@aztec/aztec.js'; import { createCompatibleClient } from '@aztec/aztec.js'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; import { computeContractAddressFromInstance } from '@aztec/stdlib/contract'; import { PublicKeys } from '@aztec/stdlib/keys'; diff --git a/yarn-project/cli/src/cmds/pxe/block_number.ts b/yarn-project/cli/src/cmds/pxe/block_number.ts index 8e34ec157b37..9bae2f8a1be4 100644 --- a/yarn-project/cli/src/cmds/pxe/block_number.ts +++ b/yarn-project/cli/src/cmds/pxe/block_number.ts @@ -1,5 +1,5 @@ import { createCompatibleClient } from '@aztec/aztec.js'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; export async function blockNumber(rpcUrl: string, debugLogger: Logger, log: LogFn) { const client = await createCompatibleClient(rpcUrl, debugLogger); diff --git a/yarn-project/cli/src/cmds/pxe/get_account.ts b/yarn-project/cli/src/cmds/pxe/get_account.ts index 29318485c645..2b65115528fa 100644 --- a/yarn-project/cli/src/cmds/pxe/get_account.ts +++ b/yarn-project/cli/src/cmds/pxe/get_account.ts @@ -1,6 +1,6 @@ -import { type AztecAddress } from '@aztec/aztec.js'; +import type { AztecAddress } from '@aztec/aztec.js'; import { createCompatibleClient } from '@aztec/aztec.js'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; export async function getAccount(aztecAddress: AztecAddress, rpcUrl: string, debugLogger: Logger, log: LogFn) { const client = await createCompatibleClient(rpcUrl, debugLogger); diff --git a/yarn-project/cli/src/cmds/pxe/get_accounts.ts b/yarn-project/cli/src/cmds/pxe/get_accounts.ts index 71d70d0d713c..4210d5c66e70 100644 --- a/yarn-project/cli/src/cmds/pxe/get_accounts.ts +++ b/yarn-project/cli/src/cmds/pxe/get_accounts.ts @@ -1,5 +1,5 @@ import { createCompatibleClient } from '@aztec/aztec.js'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; export async function getAccounts( rpcUrl: string, diff --git a/yarn-project/cli/src/cmds/pxe/get_block.ts b/yarn-project/cli/src/cmds/pxe/get_block.ts index f2951a9c8f6a..a765044af272 100644 --- a/yarn-project/cli/src/cmds/pxe/get_block.ts +++ b/yarn-project/cli/src/cmds/pxe/get_block.ts @@ -1,5 +1,5 @@ import { createCompatibleClient } from '@aztec/aztec.js'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; import { inspectBlock } from '../../utils/inspect.js'; diff --git a/yarn-project/cli/src/cmds/pxe/get_contract_data.ts b/yarn-project/cli/src/cmds/pxe/get_contract_data.ts index aa3348ba3f87..5885dded392a 100644 --- a/yarn-project/cli/src/cmds/pxe/get_contract_data.ts +++ b/yarn-project/cli/src/cmds/pxe/get_contract_data.ts @@ -1,6 +1,6 @@ -import { type AztecAddress } from '@aztec/aztec.js'; +import type { AztecAddress } from '@aztec/aztec.js'; import { createCompatibleClient } from '@aztec/aztec.js'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; export async function getContractData( rpcUrl: string, diff --git a/yarn-project/cli/src/cmds/pxe/get_current_base_fee.ts b/yarn-project/cli/src/cmds/pxe/get_current_base_fee.ts index b77e3c3595ed..39642b8eae76 100644 --- a/yarn-project/cli/src/cmds/pxe/get_current_base_fee.ts +++ b/yarn-project/cli/src/cmds/pxe/get_current_base_fee.ts @@ -1,6 +1,6 @@ import { createCompatibleClient } from '@aztec/aztec.js'; import { jsonStringify } from '@aztec/foundation/json-rpc'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; export async function getCurrentBaseFee(rpcUrl: string, debugLogger: Logger, log: LogFn) { const client = await createCompatibleClient(rpcUrl, debugLogger); diff --git a/yarn-project/cli/src/cmds/pxe/get_l1_to_l2_message_witness.ts b/yarn-project/cli/src/cmds/pxe/get_l1_to_l2_message_witness.ts index c339dc211302..53b32adf4425 100644 --- a/yarn-project/cli/src/cmds/pxe/get_l1_to_l2_message_witness.ts +++ b/yarn-project/cli/src/cmds/pxe/get_l1_to_l2_message_witness.ts @@ -1,5 +1,5 @@ import { type AztecAddress, type Fr, createCompatibleClient } from '@aztec/aztec.js'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; export async function getL1ToL2MessageWitness( rpcUrl: string, diff --git a/yarn-project/cli/src/cmds/pxe/get_logs.ts b/yarn-project/cli/src/cmds/pxe/get_logs.ts index 18b68e4dae99..1db37a5200ee 100644 --- a/yarn-project/cli/src/cmds/pxe/get_logs.ts +++ b/yarn-project/cli/src/cmds/pxe/get_logs.ts @@ -1,6 +1,6 @@ -import { type AztecAddress, type LogFilter, type LogId, type TxHash } from '@aztec/aztec.js'; +import type { AztecAddress, LogFilter, LogId, TxHash } from '@aztec/aztec.js'; import { createCompatibleClient } from '@aztec/aztec.js'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; import { sleep } from '@aztec/foundation/sleep'; export async function getLogs( diff --git a/yarn-project/cli/src/cmds/pxe/get_node_info.ts b/yarn-project/cli/src/cmds/pxe/get_node_info.ts index fdd44f8d1dbe..c2e1bbfd9644 100644 --- a/yarn-project/cli/src/cmds/pxe/get_node_info.ts +++ b/yarn-project/cli/src/cmds/pxe/get_node_info.ts @@ -1,5 +1,5 @@ import { type AztecNode, type PXE, createAztecNodeClient, createCompatibleClient } from '@aztec/aztec.js'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; export async function getNodeInfo( rpcUrl: string, diff --git a/yarn-project/cli/src/cmds/pxe/get_pxe_info.ts b/yarn-project/cli/src/cmds/pxe/get_pxe_info.ts index 57e3511997f0..7764b53d9f1b 100644 --- a/yarn-project/cli/src/cmds/pxe/get_pxe_info.ts +++ b/yarn-project/cli/src/cmds/pxe/get_pxe_info.ts @@ -1,5 +1,5 @@ import { createCompatibleClient } from '@aztec/aztec.js'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; export async function getPXEInfo(rpcUrl: string, debugLogger: Logger, log: LogFn) { const client = await createCompatibleClient(rpcUrl, debugLogger); diff --git a/yarn-project/cli/src/cmds/pxe/index.ts b/yarn-project/cli/src/cmds/pxe/index.ts index 28d1c35a6c84..3a1eb1f2305d 100644 --- a/yarn-project/cli/src/cmds/pxe/index.ts +++ b/yarn-project/cli/src/cmds/pxe/index.ts @@ -1,7 +1,7 @@ import { Fr } from '@aztec/foundation/fields'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; +import type { LogFn, Logger } from '@aztec/foundation/log'; -import { type Command } from 'commander'; +import type { Command } from 'commander'; import { logJson, diff --git a/yarn-project/cli/src/utils/aztec.test.ts b/yarn-project/cli/src/utils/aztec.test.ts index cbd72c440e9f..af211110c9dd 100644 --- a/yarn-project/cli/src/utils/aztec.test.ts +++ b/yarn-project/cli/src/utils/aztec.test.ts @@ -1,5 +1,5 @@ -import { type NodeInfo } from '@aztec/aztec.js'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; +import type { NodeInfo } from '@aztec/aztec.js'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; import { type MockProxy, mock } from 'jest-mock-extended'; diff --git a/yarn-project/cli/src/utils/aztec.ts b/yarn-project/cli/src/utils/aztec.ts index e4410dfc2a1f..144452470712 100644 --- a/yarn-project/cli/src/utils/aztec.ts +++ b/yarn-project/cli/src/utils/aztec.ts @@ -1,12 +1,12 @@ import { type ContractArtifact, type FunctionArtifact, loadContractArtifact } from '@aztec/aztec.js/abi'; -import { type DeployL1Contracts, type L1ContractsConfig } from '@aztec/ethereum'; -import { type EthAddress } from '@aztec/foundation/eth-address'; -import { type Fr } from '@aztec/foundation/fields'; -import { type LogFn, type Logger } from '@aztec/foundation/log'; -import { type NoirPackageConfig } from '@aztec/foundation/noir'; +import type { DeployL1Contracts, L1ContractsConfig } from '@aztec/ethereum'; +import type { EthAddress } from '@aztec/foundation/eth-address'; +import type { Fr } from '@aztec/foundation/fields'; +import type { LogFn, Logger } from '@aztec/foundation/log'; +import type { NoirPackageConfig } from '@aztec/foundation/noir'; import { ProtocolContractAddress, protocolContractTreeRoot } from '@aztec/protocol-contracts'; import { FunctionType } from '@aztec/stdlib/abi'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; import TOML from '@iarna/toml'; import { readFile } from 'fs/promises'; diff --git a/yarn-project/cli/src/utils/commands.ts b/yarn-project/cli/src/utils/commands.ts index cbaf8e66e611..3cac57ef7557 100644 --- a/yarn-project/cli/src/utils/commands.ts +++ b/yarn-project/cli/src/utils/commands.ts @@ -4,8 +4,8 @@ import { EthAddress } from '@aztec/aztec.js/eth_address'; import { Fr } from '@aztec/aztec.js/fields'; import { LogId } from '@aztec/aztec.js/log_id'; import { TxHash } from '@aztec/aztec.js/tx_hash'; -import { type LogFn } from '@aztec/foundation/log'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; +import type { LogFn } from '@aztec/foundation/log'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; import { PublicKeys } from '@aztec/stdlib/keys'; import { type Command, CommanderError, InvalidArgumentError, Option } from 'commander'; diff --git a/yarn-project/cli/src/utils/inspect.ts b/yarn-project/cli/src/utils/inspect.ts index 79673e11fa02..c840bdd65aca 100644 --- a/yarn-project/cli/src/utils/inspect.ts +++ b/yarn-project/cli/src/utils/inspect.ts @@ -1,10 +1,10 @@ -import { type AztecAddress, type ContractArtifact, type Fr } from '@aztec/aztec.js'; -import { type LogFn } from '@aztec/foundation/log'; +import type { AztecAddress, ContractArtifact, Fr } from '@aztec/aztec.js'; +import type { LogFn } from '@aztec/foundation/log'; import { ProtocolContractAddress } from '@aztec/protocol-contracts'; import { siloNullifier } from '@aztec/stdlib/hash'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; import { type ExtendedNote, NoteStatus } from '@aztec/stdlib/note'; -import { type TxHash } from '@aztec/stdlib/tx'; +import type { TxHash } from '@aztec/stdlib/tx'; export async function inspectBlock(pxe: PXE, blockNumber: number, log: LogFn, opts: { showTxs?: boolean } = {}) { const block = await pxe.getBlock(blockNumber); diff --git a/yarn-project/end-to-end/src/bench/bench_build_block.test.ts b/yarn-project/end-to-end/src/bench/bench_build_block.test.ts index c5f8d9464f8c..c5faf7d65b4f 100644 --- a/yarn-project/end-to-end/src/bench/bench_build_block.test.ts +++ b/yarn-project/end-to-end/src/bench/bench_build_block.test.ts @@ -1,8 +1,8 @@ -import { type BenchmarkingContract } from '@aztec/noir-contracts.js/Benchmarking'; -import { type SequencerClient } from '@aztec/sequencer-client'; +import type { BenchmarkingContract } from '@aztec/noir-contracts.js/Benchmarking'; +import type { SequencerClient } from '@aztec/sequencer-client'; import { Metrics } from '@aztec/telemetry-client'; -import { type EndToEndContext } from '../fixtures/utils.js'; +import type { EndToEndContext } from '../fixtures/utils.js'; import { benchmarkSetup, sendTxs, waitTxs } from './utils.js'; describe('benchmarks/build_block', () => { diff --git a/yarn-project/end-to-end/src/bench/utils.ts b/yarn-project/end-to-end/src/bench/utils.ts index 20df48427a3b..c3ae647bd6a1 100644 --- a/yarn-project/end-to-end/src/bench/utils.ts +++ b/yarn-project/end-to-end/src/bench/utils.ts @@ -1,15 +1,11 @@ -import { type AztecNodeService } from '@aztec/aztec-node'; +import type { AztecNodeService } from '@aztec/aztec-node'; import { type AztecNode, BatchCall, INITIAL_L2_BLOCK_NUM, type SentTx, type WaitOpts } from '@aztec/aztec.js'; import { mean, stdDev, timesParallel } from '@aztec/foundation/collection'; import { randomInt } from '@aztec/foundation/crypto'; import { BenchmarkingContract } from '@aztec/noir-contracts.js/Benchmarking'; import { type PXEService, type PXEServiceConfig, createPXEService } from '@aztec/pxe'; -import { type MetricsType } from '@aztec/telemetry-client'; -import { - type BenchmarkDataPoint, - type BenchmarkMetricsType, - type BenchmarkTelemetryClient, -} from '@aztec/telemetry-client/bench'; +import type { MetricsType } from '@aztec/telemetry-client'; +import type { BenchmarkDataPoint, BenchmarkMetricsType, BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench'; import { writeFileSync } from 'fs'; import { mkdirpSync } from 'fs-extra'; diff --git a/yarn-project/end-to-end/src/composed/e2e_persistence.test.ts b/yarn-project/end-to-end/src/composed/e2e_persistence.test.ts index f70f6e639dff..8f9f1b032f80 100644 --- a/yarn-project/end-to-end/src/composed/e2e_persistence.test.ts +++ b/yarn-project/end-to-end/src/composed/e2e_persistence.test.ts @@ -2,12 +2,12 @@ import { getSchnorrAccount, getSchnorrWallet } from '@aztec/accounts/schnorr'; import { type InitialAccountData, deployFundedSchnorrAccount } from '@aztec/accounts/testing'; import { type AccountWallet, type ContractInstanceWithAddress, type TxHash, computeSecretHash } from '@aztec/aztec.js'; import { MAX_NOTE_HASHES_PER_TX } from '@aztec/constants'; -import { type DeployL1Contracts } from '@aztec/ethereum'; +import type { DeployL1Contracts } from '@aztec/ethereum'; import { Fr } from '@aztec/foundation/fields'; // We use TokenBlacklist because we want to test the persistence of manually added notes and standard token no longer // implements TransparentNote shield flow. import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { jest } from '@jest/globals'; import { mkdtemp } from 'fs/promises'; diff --git a/yarn-project/end-to-end/src/composed/integration_l1_publisher.test.ts b/yarn-project/end-to-end/src/composed/integration_l1_publisher.test.ts index 8c2177e5d416..5100d5c3e96f 100644 --- a/yarn-project/end-to-end/src/composed/integration_l1_publisher.test.ts +++ b/yarn-project/end-to-end/src/composed/integration_l1_publisher.test.ts @@ -1,4 +1,4 @@ -import { type ArchiveSource } from '@aztec/archiver'; +import type { ArchiveSource } from '@aztec/archiver'; import { getConfigEnvVars } from '@aztec/aztec-node'; import { AztecAddress, Fr, GlobalVariables, type L2Block, createLogger } from '@aztec/aztec.js'; import { Blob, BlockBlobPublicInputs } from '@aztec/blob-lib'; @@ -29,7 +29,7 @@ import { SequencerPublisher } from '@aztec/sequencer-client'; import type { L2Tips } from '@aztec/stdlib/block'; import { GasFees, GasSettings } from '@aztec/stdlib/gas'; import { fr, makeBloatedProcessedTx } from '@aztec/stdlib/testing'; -import { type BlockHeader, type ProcessedTx } from '@aztec/stdlib/tx'; +import type { BlockHeader, ProcessedTx } from '@aztec/stdlib/tx'; import { type MerkleTreeAdminDatabase, NativeWorldStateService, diff --git a/yarn-project/end-to-end/src/composed/integration_proof_verification.test.ts b/yarn-project/end-to-end/src/composed/integration_proof_verification.test.ts index e669329ad616..e22ae0df2983 100644 --- a/yarn-project/end-to-end/src/composed/integration_proof_verification.test.ts +++ b/yarn-project/end-to-end/src/composed/integration_proof_verification.test.ts @@ -1,12 +1,12 @@ import { deployL1Contract, fileURLToPath } from '@aztec/aztec.js'; import { BBCircuitVerifier } from '@aztec/bb-prover'; import { createL1Clients } from '@aztec/ethereum'; -import { type Logger } from '@aztec/foundation/log'; +import type { Logger } from '@aztec/foundation/log'; import { HonkVerifierAbi, HonkVerifierBytecode, IVerifierAbi } from '@aztec/l1-artifacts'; import { Proof } from '@aztec/stdlib/proofs'; import { RootRollupPublicInputs } from '@aztec/stdlib/rollup'; -import { type Anvil } from '@viem/anvil'; +import type { Anvil } from '@viem/anvil'; import { readFile } from 'fs/promises'; import { join } from 'path'; import { diff --git a/yarn-project/end-to-end/src/devnet/e2e_smoke.test.ts b/yarn-project/end-to-end/src/devnet/e2e_smoke.test.ts index e535e8db2fe5..730c263f6d60 100644 --- a/yarn-project/end-to-end/src/devnet/e2e_smoke.test.ts +++ b/yarn-project/end-to-end/src/devnet/e2e_smoke.test.ts @@ -13,7 +13,7 @@ import { retryUntil, } from '@aztec/aztec.js'; import { createNamespacedSafeJsonRpcServer, startHttpRpcServer } from '@aztec/foundation/json-rpc/server'; -import { type Logger } from '@aztec/foundation/log'; +import type { Logger } from '@aztec/foundation/log'; import { promiseWithResolvers } from '@aztec/foundation/promise'; import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice'; import { TestContract } from '@aztec/noir-contracts.js/Test'; diff --git a/yarn-project/end-to-end/src/e2e_amm.test.ts b/yarn-project/end-to-end/src/e2e_amm.test.ts index 9e87c17cc451..71c4640e91b2 100644 --- a/yarn-project/end-to-end/src/e2e_amm.test.ts +++ b/yarn-project/end-to-end/src/e2e_amm.test.ts @@ -1,6 +1,6 @@ import { type AccountWallet, Fr, type Logger, type Wallet } from '@aztec/aztec.js'; import { AMMContract } from '@aztec/noir-contracts.js/AMM'; -import { type TokenContract } from '@aztec/noir-contracts.js/Token'; +import type { TokenContract } from '@aztec/noir-contracts.js/Token'; import { jest } from '@jest/globals'; 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 f9a006b9b04c..69ecf3950bf5 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 @@ -10,7 +10,7 @@ import { } from '@aztec/aztec.js'; import { MAX_NOTE_HASHES_PER_TX } from '@aztec/constants'; import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample'; -import { type TokenContract } from '@aztec/noir-contracts.js/Token'; +import type { TokenContract } from '@aztec/noir-contracts.js/Token'; import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist'; import { jest } from '@jest/globals'; diff --git a/yarn-project/end-to-end/src/e2e_block_building.test.ts b/yarn-project/end-to-end/src/e2e_block_building.test.ts index c714a7d4ec2e..2746bc74bd7f 100644 --- a/yarn-project/end-to-end/src/e2e_block_building.test.ts +++ b/yarn-project/end-to-end/src/e2e_block_building.test.ts @@ -1,5 +1,5 @@ import { type InitialAccountData, deployFundedSchnorrAccount } from '@aztec/accounts/testing'; -import { type AztecNodeService } from '@aztec/aztec-node'; +import type { AztecNodeService } from '@aztec/aztec-node'; import { type AccountWallet, AccountWalletWithSecretKey, @@ -24,21 +24,21 @@ import { getL1ContractsConfigEnvVars } from '@aztec/ethereum'; import { asyncMap } from '@aztec/foundation/async-map'; import { times, unique } from '@aztec/foundation/collection'; import { poseidon2Hash } from '@aztec/foundation/crypto'; -import { type TestDateProvider } from '@aztec/foundation/timer'; +import type { TestDateProvider } from '@aztec/foundation/timer'; import { StatefulTestContract, StatefulTestContractArtifact } from '@aztec/noir-contracts.js/StatefulTest'; import { TestContract } from '@aztec/noir-contracts.js/Test'; import { TokenContract } from '@aztec/noir-contracts.js/Token'; -import { type SequencerClient } from '@aztec/sequencer-client'; -import { type TestSequencerClient } from '@aztec/sequencer-client/test'; +import type { SequencerClient } from '@aztec/sequencer-client'; +import type { TestSequencerClient } from '@aztec/sequencer-client/test'; import { PublicProcessorFactory, type PublicTxResult, PublicTxSimulator, type WorldStateDB, } from '@aztec/simulator/server'; -import { type MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; -import { type Tx } from '@aztec/stdlib/tx'; -import { type TelemetryClient } from '@aztec/telemetry-client'; +import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; +import type { Tx } from '@aztec/stdlib/tx'; +import type { TelemetryClient } from '@aztec/telemetry-client'; import { jest } from '@jest/globals'; import 'jest-extended'; diff --git a/yarn-project/end-to-end/src/e2e_bot.test.ts b/yarn-project/end-to-end/src/e2e_bot.test.ts index b8f086e63962..4c2805622c7c 100644 --- a/yarn-project/end-to-end/src/e2e_bot.test.ts +++ b/yarn-project/end-to-end/src/e2e_bot.test.ts @@ -1,5 +1,5 @@ import { getInitialTestAccounts } from '@aztec/accounts/testing'; -import { type PXE } from '@aztec/aztec.js'; +import type { PXE } from '@aztec/aztec.js'; import { Bot, type BotConfig, SupportedTokenContracts, getBotDefaultConfig } from '@aztec/bot'; import { setup } from './fixtures/utils.js'; diff --git a/yarn-project/end-to-end/src/e2e_contract_updates.test.ts b/yarn-project/end-to-end/src/e2e_contract_updates.test.ts index 7f436453281a..eb1ee5494f3c 100644 --- a/yarn-project/end-to-end/src/e2e_contract_updates.test.ts +++ b/yarn-project/end-to-end/src/e2e_contract_updates.test.ts @@ -5,7 +5,7 @@ import { MINIMUM_UPDATE_DELAY, UPDATED_CLASS_IDS_SLOT } from '@aztec/constants'; import { UpdatableContract } from '@aztec/noir-contracts.js/Updatable'; import { UpdatedContract, UpdatedContractArtifact } from '@aztec/noir-contracts.js/Updated'; import { ProtocolContractAddress } from '@aztec/protocol-contracts'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { getContractInstanceFromDeployParams } from '@aztec/stdlib/contract'; import { computePublicDataTreeLeafSlot, deriveStorageSlotInMap } from '@aztec/stdlib/hash'; import { deriveSigningKey } from '@aztec/stdlib/keys'; 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 2c4ce2b7af96..42e85927ed1e 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 @@ -1,5 +1,5 @@ import { getSchnorrWallet } from '@aztec/accounts/schnorr'; -import { type AztecNodeConfig } from '@aztec/aztec-node'; +import type { AztecNodeConfig } from '@aztec/aztec-node'; import { type AccountWallet, AztecAddress, diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts b/yarn-project/end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts index 26246f226f61..d70ef9d04604 100644 --- a/yarn-project/end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts +++ b/yarn-project/end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts @@ -1,4 +1,4 @@ -import { type AztecNodeService } from '@aztec/aztec-node'; +import type { AztecNodeService } from '@aztec/aztec-node'; import { AztecAddress, type AztecNode, @@ -26,7 +26,7 @@ import { StatefulTestContract } from '@aztec/noir-contracts.js/StatefulTest'; import { TestContract } from '@aztec/noir-contracts.js/Test'; import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token'; import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi'; -import { type ContractClassIdPreimage } from '@aztec/stdlib/contract'; +import type { ContractClassIdPreimage } from '@aztec/stdlib/contract'; import { PublicKeys } from '@aztec/stdlib/keys'; import { DUPLICATE_NULLIFIER_ERROR } from '../fixtures/fixtures.js'; 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 51b105323f33..8778a492abd5 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 @@ -13,7 +13,7 @@ import { createLogger, getContractInstanceFromDeployParams, } from '@aztec/aztec.js'; -import { type StatefulTestContract } from '@aztec/noir-contracts.js/StatefulTest'; +import type { StatefulTestContract } from '@aztec/noir-contracts.js/StatefulTest'; import { type ISnapshotManager, createSnapshotManager, deployAccounts } from '../fixtures/snapshot_manager.js'; diff --git a/yarn-project/end-to-end/src/e2e_epochs/epochs_empty_blocks.test.ts b/yarn-project/end-to-end/src/e2e_epochs/epochs_empty_blocks.test.ts index db4302fb4e9a..d9ff11859110 100644 --- a/yarn-project/end-to-end/src/e2e_epochs/epochs_empty_blocks.test.ts +++ b/yarn-project/end-to-end/src/e2e_epochs/epochs_empty_blocks.test.ts @@ -5,7 +5,7 @@ import { RollupContract } from '@aztec/ethereum/contracts'; import { jest } from '@jest/globals'; -import { type EndToEndContext } from '../fixtures/utils.js'; +import type { EndToEndContext } from '../fixtures/utils.js'; import { EPOCH_DURATION_IN_L2_SLOTS, EpochsTestContext, diff --git a/yarn-project/end-to-end/src/e2e_epochs/epochs_multi_proof.test.ts b/yarn-project/end-to-end/src/e2e_epochs/epochs_multi_proof.test.ts index da1cea3bbb48..15c58af5267e 100644 --- a/yarn-project/end-to-end/src/e2e_epochs/epochs_multi_proof.test.ts +++ b/yarn-project/end-to-end/src/e2e_epochs/epochs_multi_proof.test.ts @@ -6,7 +6,7 @@ import { type L1RollupConstants, getSlotRangeForEpoch } from '@aztec/stdlib/epoc import { jest } from '@jest/globals'; -import { type EndToEndContext } from '../fixtures/utils.js'; +import type { EndToEndContext } from '../fixtures/utils.js'; import { EPOCH_DURATION_IN_L2_SLOTS, EpochsTestContext, L1_BLOCK_TIME_IN_S } from './epochs_test.js'; jest.setTimeout(1000 * 60 * 10); diff --git a/yarn-project/end-to-end/src/e2e_epochs/epochs_proof_fails.test.ts b/yarn-project/end-to-end/src/e2e_epochs/epochs_proof_fails.test.ts index 349909f21c51..a6ed4aa86543 100644 --- a/yarn-project/end-to-end/src/e2e_epochs/epochs_proof_fails.test.ts +++ b/yarn-project/end-to-end/src/e2e_epochs/epochs_proof_fails.test.ts @@ -3,15 +3,15 @@ import { ChainMonitor } from '@aztec/aztec.js/ethereum'; import { RollupContract } from '@aztec/ethereum/contracts'; import { type Delayer, waitUntilL1Timestamp } from '@aztec/ethereum/test'; import { promiseWithResolvers } from '@aztec/foundation/promise'; -import { type TestProverNode } from '@aztec/prover-node/test'; -import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers'; +import type { TestProverNode } from '@aztec/prover-node/test'; +import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers'; import { Proof } from '@aztec/stdlib/proofs'; import { RootRollupPublicInputs } from '@aztec/stdlib/rollup'; import { jest } from '@jest/globals'; -import { type PublicClient } from 'viem'; +import type { PublicClient } from 'viem'; -import { type EndToEndContext } from '../fixtures/utils.js'; +import type { EndToEndContext } from '../fixtures/utils.js'; import { EPOCH_DURATION_IN_L2_SLOTS, EpochsTestContext, diff --git a/yarn-project/end-to-end/src/e2e_epochs/epochs_sync_after_reorg.test.ts b/yarn-project/end-to-end/src/e2e_epochs/epochs_sync_after_reorg.test.ts index 64865ef14494..0d6e2cca82ce 100644 --- a/yarn-project/end-to-end/src/e2e_epochs/epochs_sync_after_reorg.test.ts +++ b/yarn-project/end-to-end/src/e2e_epochs/epochs_sync_after_reorg.test.ts @@ -1,10 +1,10 @@ import type { AztecNodeService } from '@aztec/aztec-node'; -import { type Logger } from '@aztec/aztec.js'; +import type { Logger } from '@aztec/aztec.js'; import { executeTimeout } from '@aztec/foundation/timer'; import { jest } from '@jest/globals'; -import { type EndToEndContext } from '../fixtures/utils.js'; +import type { EndToEndContext } from '../fixtures/utils.js'; import { EpochsTestContext, L1_BLOCK_TIME_IN_S, L2_SLOT_DURATION_IN_L1_SLOTS } from './epochs_test.js'; jest.setTimeout(1000 * 60 * 10); diff --git a/yarn-project/end-to-end/src/e2e_epochs/epochs_test.ts b/yarn-project/end-to-end/src/e2e_epochs/epochs_test.ts index ce53b1200aa5..8671054fed38 100644 --- a/yarn-project/end-to-end/src/e2e_epochs/epochs_test.ts +++ b/yarn-project/end-to-end/src/e2e_epochs/epochs_test.ts @@ -6,15 +6,15 @@ import { DelayedTxUtils, type Delayer, waitUntilL1Timestamp } from '@aztec/ether import { randomBytes } from '@aztec/foundation/crypto'; import { withLogNameSuffix } from '@aztec/foundation/log'; import { ProverNode, ProverNodePublisher } from '@aztec/prover-node'; -import { type TestProverNode } from '@aztec/prover-node/test'; -import { type SequencerPublisher } from '@aztec/sequencer-client'; -import { type TestSequencerClient } from '@aztec/sequencer-client/test'; +import type { TestProverNode } from '@aztec/prover-node/test'; +import type { SequencerPublisher } from '@aztec/sequencer-client'; +import type { TestSequencerClient } from '@aztec/sequencer-client/test'; import type { L2BlockNumber } from '@aztec/stdlib/block'; -import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers'; +import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers'; import { MerkleTreeId } from '@aztec/stdlib/trees'; import { join } from 'path'; -import { type Hex, type PublicClient } from 'viem'; +import type { Hex, PublicClient } from 'viem'; import { type EndToEndContext, diff --git a/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts b/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts index 18d333776a6f..a923093d3e5a 100644 --- a/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts +++ b/yarn-project/end-to-end/src/e2e_escrow_contract.test.ts @@ -10,7 +10,7 @@ import { import { EscrowContract } from '@aztec/noir-contracts.js/Escrow'; import { TokenContract } from '@aztec/noir-contracts.js/Token'; import { computePartialAddress } from '@aztec/stdlib/contract'; -import { type PublicKeys } from '@aztec/stdlib/keys'; +import type { PublicKeys } from '@aztec/stdlib/keys'; import { expectTokenBalance, mintTokensToPrivate } from './fixtures/token_utils.js'; import { setup } from './fixtures/utils.js'; diff --git a/yarn-project/end-to-end/src/e2e_event_logs.test.ts b/yarn-project/end-to-end/src/e2e_event_logs.test.ts index e16ea7771474..03ab8c625eda 100644 --- a/yarn-project/end-to-end/src/e2e_event_logs.test.ts +++ b/yarn-project/end-to-end/src/e2e_event_logs.test.ts @@ -8,7 +8,7 @@ import { } from '@aztec/aztec.js'; import { makeTuple } from '@aztec/foundation/array'; import { timesParallel } from '@aztec/foundation/collection'; -import { type Tuple } from '@aztec/foundation/serialize'; +import type { Tuple } from '@aztec/foundation/serialize'; import { type ExampleEvent0, type ExampleEvent1, TestLogContract } from '@aztec/noir-contracts.js/TestLog'; import { EventSelector } from '@aztec/stdlib/abi'; diff --git a/yarn-project/end-to-end/src/e2e_fees/account_init.test.ts b/yarn-project/end-to-end/src/e2e_fees/account_init.test.ts index 469ef3287350..067067877be8 100644 --- a/yarn-project/end-to-end/src/e2e_fees/account_init.test.ts +++ b/yarn-project/end-to-end/src/e2e_fees/account_init.test.ts @@ -15,11 +15,11 @@ import { } from '@aztec/aztec.js'; import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants'; import { Fq } from '@aztec/foundation/fields'; -import { type FPCContract } from '@aztec/noir-contracts.js/FPC'; +import type { FPCContract } from '@aztec/noir-contracts.js/FPC'; import { SchnorrAccountContract } from '@aztec/noir-contracts.js/SchnorrAccount'; -import { type TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type CompleteAddress } from '@aztec/stdlib/contract'; +import type { TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { CompleteAddress } from '@aztec/stdlib/contract'; import { jest } from '@jest/globals'; diff --git a/yarn-project/end-to-end/src/e2e_fees/dapp_subscription.test.ts b/yarn-project/end-to-end/src/e2e_fees/dapp_subscription.test.ts index fbc7ac81c1ea..1c9f66111e64 100644 --- a/yarn-project/end-to-end/src/e2e_fees/dapp_subscription.test.ts +++ b/yarn-project/end-to-end/src/e2e_fees/dapp_subscription.test.ts @@ -8,10 +8,10 @@ import { PrivateFeePaymentMethod, PublicFeePaymentMethod, } from '@aztec/aztec.js'; -import { type AppSubscriptionContract } from '@aztec/noir-contracts.js/AppSubscription'; -import { type CounterContract } from '@aztec/noir-contracts.js/Counter'; -import { type FPCContract } from '@aztec/noir-contracts.js/FPC'; -import { type TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token'; +import type { AppSubscriptionContract } from '@aztec/noir-contracts.js/AppSubscription'; +import type { CounterContract } from '@aztec/noir-contracts.js/Counter'; +import type { FPCContract } from '@aztec/noir-contracts.js/FPC'; +import type { TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token'; import { expectMapping, expectMappingDelta } from '../fixtures/utils.js'; import { FeesTest } from './fees_test.js'; diff --git a/yarn-project/end-to-end/src/e2e_fees/failures.test.ts b/yarn-project/end-to-end/src/e2e_fees/failures.test.ts index c82fd755fec1..5cd06d8adbb8 100644 --- a/yarn-project/end-to-end/src/e2e_fees/failures.test.ts +++ b/yarn-project/end-to-end/src/e2e_fees/failures.test.ts @@ -8,8 +8,8 @@ import { PublicFeePaymentMethod, TxStatus, } from '@aztec/aztec.js'; -import { type FPCContract } from '@aztec/noir-contracts.js/FPC'; -import { type TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token'; +import type { FPCContract } from '@aztec/noir-contracts.js/FPC'; +import type { TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token'; import { FunctionType, U128 } from '@aztec/stdlib/abi'; import { Gas, GasSettings } from '@aztec/stdlib/gas'; diff --git a/yarn-project/end-to-end/src/e2e_fees/fee_juice_payments.test.ts b/yarn-project/end-to-end/src/e2e_fees/fee_juice_payments.test.ts index d33b816a2466..d63b193293ab 100644 --- a/yarn-project/end-to-end/src/e2e_fees/fee_juice_payments.test.ts +++ b/yarn-project/end-to-end/src/e2e_fees/fee_juice_payments.test.ts @@ -9,9 +9,9 @@ import { type PXE, } from '@aztec/aztec.js'; import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants'; -import { type FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice'; -import { type TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token'; -import { type GasSettings } from '@aztec/stdlib/gas'; +import type { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice'; +import type { TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token'; +import type { GasSettings } from '@aztec/stdlib/gas'; import { FeesTest } from './fees_test.js'; diff --git a/yarn-project/end-to-end/src/e2e_fees/fee_settings.test.ts b/yarn-project/end-to-end/src/e2e_fees/fee_settings.test.ts index 9d18968026de..c637bab6365a 100644 --- a/yarn-project/end-to-end/src/e2e_fees/fee_settings.test.ts +++ b/yarn-project/end-to-end/src/e2e_fees/fee_settings.test.ts @@ -7,7 +7,7 @@ import { } from '@aztec/aztec.js'; import { Fr } from '@aztec/foundation/fields'; import { TestContract } from '@aztec/noir-contracts.js/Test'; -import { type GasSettings } from '@aztec/stdlib/gas'; +import type { GasSettings } from '@aztec/stdlib/gas'; import { inspect } from 'util'; diff --git a/yarn-project/end-to-end/src/e2e_fees/gas_estimation.test.ts b/yarn-project/end-to-end/src/e2e_fees/gas_estimation.test.ts index cfcc2deee1fa..19f9251fc466 100644 --- a/yarn-project/end-to-end/src/e2e_fees/gas_estimation.test.ts +++ b/yarn-project/end-to-end/src/e2e_fees/gas_estimation.test.ts @@ -1,4 +1,4 @@ -import { type AztecNodeService } from '@aztec/aztec-node'; +import type { AztecNodeService } from '@aztec/aztec-node'; import { type AccountWallet, type AztecAddress, @@ -6,8 +6,8 @@ import { type FeePaymentMethod, PublicFeePaymentMethod, } from '@aztec/aztec.js'; -import { type Logger } from '@aztec/foundation/log'; -import { type FPCContract } from '@aztec/noir-contracts.js/FPC'; +import type { Logger } from '@aztec/foundation/log'; +import type { FPCContract } from '@aztec/noir-contracts.js/FPC'; import { TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token'; import { GasSettings } from '@aztec/stdlib/gas'; diff --git a/yarn-project/end-to-end/src/e2e_fees/private_payments.test.ts b/yarn-project/end-to-end/src/e2e_fees/private_payments.test.ts index 28d9c36531dd..602330ee0dee 100644 --- a/yarn-project/end-to-end/src/e2e_fees/private_payments.test.ts +++ b/yarn-project/end-to-end/src/e2e_fees/private_payments.test.ts @@ -1,6 +1,6 @@ import { type AccountWallet, type AztecAddress, BatchCall, PrivateFeePaymentMethod } from '@aztec/aztec.js'; import { FPCContract } from '@aztec/noir-contracts.js/FPC'; -import { type TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token'; +import type { TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token'; import { GasSettings } from '@aztec/stdlib/gas'; import { expectMapping } from '../fixtures/utils.js'; diff --git a/yarn-project/end-to-end/src/e2e_fees/public_payments.test.ts b/yarn-project/end-to-end/src/e2e_fees/public_payments.test.ts index ee890cb671f2..e4eb53e46d74 100644 --- a/yarn-project/end-to-end/src/e2e_fees/public_payments.test.ts +++ b/yarn-project/end-to-end/src/e2e_fees/public_payments.test.ts @@ -1,6 +1,6 @@ import { type AccountWallet, type AztecAddress, PublicFeePaymentMethod } from '@aztec/aztec.js'; -import { type FPCContract } from '@aztec/noir-contracts.js/FPC'; -import { type TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token'; +import type { FPCContract } from '@aztec/noir-contracts.js/FPC'; +import type { TokenContract as BananaCoin } from '@aztec/noir-contracts.js/Token'; import { GasSettings } from '@aztec/stdlib/gas'; import { expectMapping } from '../fixtures/utils.js'; diff --git a/yarn-project/end-to-end/src/e2e_keys.test.ts b/yarn-project/end-to-end/src/e2e_keys.test.ts index 73512f467b77..264e0f6a7366 100644 --- a/yarn-project/end-to-end/src/e2e_keys.test.ts +++ b/yarn-project/end-to-end/src/e2e_keys.test.ts @@ -1,4 +1,4 @@ -import { type InitialAccountData } from '@aztec/accounts/testing'; +import type { InitialAccountData } from '@aztec/accounts/testing'; import { type AztecAddress, type AztecNode, Fr, type L2Block, type Wallet } from '@aztec/aztec.js'; import { GeneratorIndex, INITIAL_L2_BLOCK_NUM } from '@aztec/constants'; import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto'; diff --git a/yarn-project/end-to-end/src/e2e_l1_with_wall_time.test.ts b/yarn-project/end-to-end/src/e2e_l1_with_wall_time.test.ts index be46303c45fa..d72c9cb9e71e 100644 --- a/yarn-project/end-to-end/src/e2e_l1_with_wall_time.test.ts +++ b/yarn-project/end-to-end/src/e2e_l1_with_wall_time.test.ts @@ -1,7 +1,7 @@ -import { type Logger, type PXE, type Wallet } from '@aztec/aztec.js'; +import type { Logger, PXE, Wallet } from '@aztec/aztec.js'; import { getL1ContractsConfigEnvVars } from '@aztec/ethereum'; import { EthAddress } from '@aztec/foundation/eth-address'; -import { type PXEService } from '@aztec/pxe'; +import type { PXEService } from '@aztec/pxe'; import { jest } from '@jest/globals'; import { privateKeyToAccount } from 'viem/accounts'; diff --git a/yarn-project/end-to-end/src/e2e_lending_contract.test.ts b/yarn-project/end-to-end/src/e2e_lending_contract.test.ts index 586b1751c5b7..017723e17a4a 100644 --- a/yarn-project/end-to-end/src/e2e_lending_contract.test.ts +++ b/yarn-project/end-to-end/src/e2e_lending_contract.test.ts @@ -1,5 +1,5 @@ import { type AccountWallet, type CheatCodes, type DeployL1Contracts, Fr, type Logger } from '@aztec/aztec.js'; -import { type TestDateProvider } from '@aztec/foundation/timer'; +import type { TestDateProvider } from '@aztec/foundation/timer'; import { RollupAbi } from '@aztec/l1-artifacts'; import { LendingContract } from '@aztec/noir-contracts.js/Lending'; import { PriceFeedContract } from '@aztec/noir-contracts.js/PriceFeed'; diff --git a/yarn-project/end-to-end/src/e2e_new_addresses.test.ts b/yarn-project/end-to-end/src/e2e_new_addresses.test.ts index 0cd726e23656..14d13b5078cb 100644 --- a/yarn-project/end-to-end/src/e2e_new_addresses.test.ts +++ b/yarn-project/end-to-end/src/e2e_new_addresses.test.ts @@ -1,4 +1,4 @@ -import { type Logger } from '@aztec/foundation/log'; +import type { Logger } from '@aztec/foundation/log'; import { beforeEach, describe, it } from '@jest/globals'; diff --git a/yarn-project/end-to-end/src/e2e_p2p/gossip_network.test.ts b/yarn-project/end-to-end/src/e2e_p2p/gossip_network.test.ts index 4e0006f418c5..e281c158458b 100644 --- a/yarn-project/end-to-end/src/e2e_p2p/gossip_network.test.ts +++ b/yarn-project/end-to-end/src/e2e_p2p/gossip_network.test.ts @@ -1,4 +1,4 @@ -import { type AztecNodeService } from '@aztec/aztec-node'; +import type { AztecNodeService } from '@aztec/aztec-node'; import { sleep } from '@aztec/aztec.js'; import { jest } from '@jest/globals'; 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 14d3cb8ca01c..ed2c38adb9a2 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 @@ -1,7 +1,7 @@ import { getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr'; -import { type InitialAccountData } from '@aztec/accounts/testing'; -import { type AztecNodeConfig, type AztecNodeService } from '@aztec/aztec-node'; -import { type AccountWalletWithSecretKey } from '@aztec/aztec.js'; +import type { InitialAccountData } from '@aztec/accounts/testing'; +import type { AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node'; +import type { AccountWalletWithSecretKey } from '@aztec/aztec.js'; import { ChainMonitor } from '@aztec/aztec.js/ethereum'; import { RollupContract, getExpectedAddress, getL1ContractsConfigEnvVars } from '@aztec/ethereum'; import { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs'; @@ -11,7 +11,7 @@ import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec import { SpamContract } from '@aztec/noir-contracts.js/Spam'; import type { BootstrapNode } from '@aztec/p2p/bootstrap'; import { createBootstrapNodeFromPrivateKey, getBootstrapNodeEnr } from '@aztec/p2p/test-helpers'; -import { type PublicDataTreeLeaf } from '@aztec/stdlib/trees'; +import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees'; import { getGenesisValues } from '@aztec/world-state/testing'; import getPort from 'get-port'; diff --git a/yarn-project/end-to-end/src/e2e_p2p/rediscovery.test.ts b/yarn-project/end-to-end/src/e2e_p2p/rediscovery.test.ts index c3e261cefc85..cfd6674f1bf3 100644 --- a/yarn-project/end-to-end/src/e2e_p2p/rediscovery.test.ts +++ b/yarn-project/end-to-end/src/e2e_p2p/rediscovery.test.ts @@ -1,4 +1,4 @@ -import { type AztecNodeService } from '@aztec/aztec-node'; +import type { AztecNodeService } from '@aztec/aztec-node'; import { sleep } from '@aztec/aztec.js'; import fs from 'fs'; diff --git a/yarn-project/end-to-end/src/e2e_p2p/reex.test.ts b/yarn-project/end-to-end/src/e2e_p2p/reex.test.ts index 77c2f9d0c15a..7bbcf593fac4 100644 --- a/yarn-project/end-to-end/src/e2e_p2p/reex.test.ts +++ b/yarn-project/end-to-end/src/e2e_p2p/reex.test.ts @@ -1,9 +1,9 @@ -import { type AztecNodeService } from '@aztec/aztec-node'; +import type { AztecNodeService } from '@aztec/aztec-node'; import { type SentTx, Tx, sleep } from '@aztec/aztec.js'; import { times } from '@aztec/foundation/collection'; -import { type PublicProcessorFactory, type PublicTxResult, type PublicTxSimulator } from '@aztec/simulator/server'; +import type { PublicProcessorFactory, PublicTxResult, PublicTxSimulator } from '@aztec/simulator/server'; import { BlockProposal, SignatureDomainSeparator, getHashedSignaturePayload } from '@aztec/stdlib/p2p'; -import { type ValidatorClient } from '@aztec/validator-client'; +import type { ValidatorClient } from '@aztec/validator-client'; import { ReExFailedTxsError, ReExStateMismatchError, ReExTimeoutError } from '@aztec/validator-client/errors'; import { describe, it, jest } from '@jest/globals'; diff --git a/yarn-project/end-to-end/src/e2e_p2p/reqresp.test.ts b/yarn-project/end-to-end/src/e2e_p2p/reqresp.test.ts index 03714d2459ca..c661983224ec 100644 --- a/yarn-project/end-to-end/src/e2e_p2p/reqresp.test.ts +++ b/yarn-project/end-to-end/src/e2e_p2p/reqresp.test.ts @@ -1,4 +1,4 @@ -import { type AztecNodeService } from '@aztec/aztec-node'; +import type { AztecNodeService } from '@aztec/aztec-node'; import { sleep } from '@aztec/aztec.js'; import { RollupAbi } from '@aztec/l1-artifacts'; diff --git a/yarn-project/end-to-end/src/e2e_p2p/shared.ts b/yarn-project/end-to-end/src/e2e_p2p/shared.ts index 0cee77eb2a65..dd9b581f47e0 100644 --- a/yarn-project/end-to-end/src/e2e_p2p/shared.ts +++ b/yarn-project/end-to-end/src/e2e_p2p/shared.ts @@ -1,11 +1,11 @@ import { getSchnorrAccount } from '@aztec/accounts/schnorr'; -import { type InitialAccountData } from '@aztec/accounts/testing'; -import { type AztecNodeService } from '@aztec/aztec-node'; +import type { InitialAccountData } from '@aztec/accounts/testing'; +import type { AztecNodeService } from '@aztec/aztec-node'; import { type Logger, type SentTx, TxStatus } from '@aztec/aztec.js'; -import { type SpamContract } from '@aztec/noir-contracts.js/Spam'; +import type { SpamContract } from '@aztec/noir-contracts.js/Spam'; import { createPXEService, getPXEServiceConfig as getRpcConfig } from '@aztec/pxe'; -import { type NodeContext } from '../fixtures/setup_p2p_test.js'; +import type { NodeContext } from '../fixtures/setup_p2p_test.js'; import { submitTxsTo } from '../shared/submit-transactions.js'; // submits a set of transactions to the provided Private eXecution Environment (PXE) diff --git a/yarn-project/end-to-end/src/e2e_p2p/slashing.test.ts b/yarn-project/end-to-end/src/e2e_p2p/slashing.test.ts index 0a2cb81e8b69..68f347db4ee8 100644 --- a/yarn-project/end-to-end/src/e2e_p2p/slashing.test.ts +++ b/yarn-project/end-to-end/src/e2e_p2p/slashing.test.ts @@ -1,4 +1,4 @@ -import { type AztecNodeService } from '@aztec/aztec-node'; +import type { AztecNodeService } from '@aztec/aztec-node'; import { sleep } from '@aztec/aztec.js'; import { RollupAbi, SlashFactoryAbi, SlasherAbi, SlashingProposerAbi } from '@aztec/l1-artifacts'; diff --git a/yarn-project/end-to-end/src/e2e_p2p/upgrade_governance_proposer.test.ts b/yarn-project/end-to-end/src/e2e_p2p/upgrade_governance_proposer.test.ts index bb1bedf77b56..922c37bb807a 100644 --- a/yarn-project/end-to-end/src/e2e_p2p/upgrade_governance_proposer.test.ts +++ b/yarn-project/end-to-end/src/e2e_p2p/upgrade_governance_proposer.test.ts @@ -1,4 +1,4 @@ -import { type AztecNodeService } from '@aztec/aztec-node'; +import type { AztecNodeService } from '@aztec/aztec-node'; import { deployL1Contract, sleep } from '@aztec/aztec.js'; import { TestERC20Abi as FeeJuiceAbi, 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 65c71df9da42..87995961d4b6 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 @@ -3,7 +3,7 @@ import { getSchnorrAccount, getSchnorrWalletWithSecretKey, } from '@aztec/accounts/schnorr'; -import { type InitialAccountData } from '@aztec/accounts/testing'; +import type { InitialAccountData } from '@aztec/accounts/testing'; import { type Archiver, createArchiver } from '@aztec/archiver'; import { type AccountWalletWithSecretKey, @@ -19,12 +19,12 @@ import { } from '@aztec/aztec.js'; import { BBCircuitVerifier, type ClientProtocolCircuitVerifier, TestCircuitVerifier } from '@aztec/bb-prover'; import { createBlobSinkClient } from '@aztec/blob-sink/client'; -import { type BlobSinkServer } from '@aztec/blob-sink/server'; +import type { BlobSinkServer } from '@aztec/blob-sink/server'; import { Buffer32 } from '@aztec/foundation/buffer'; import { HonkVerifierAbi, HonkVerifierBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts'; import { TokenContract } from '@aztec/noir-contracts.js/Token'; import { type ProverNode, type ProverNodeConfig, createProverNode } from '@aztec/prover-node'; -import { type PXEService } from '@aztec/pxe'; +import type { PXEService } from '@aztec/pxe'; import { getGenesisValues } from '@aztec/world-state/testing'; import { type Hex, getContract } from 'viem'; diff --git a/yarn-project/end-to-end/src/e2e_sequencer/gov_proposal.test.ts b/yarn-project/end-to-end/src/e2e_sequencer/gov_proposal.test.ts index 3dadf2737d7e..7caebd71c21d 100644 --- a/yarn-project/end-to-end/src/e2e_sequencer/gov_proposal.test.ts +++ b/yarn-project/end-to-end/src/e2e_sequencer/gov_proposal.test.ts @@ -1,4 +1,4 @@ -import { type AztecNode, type CheatCodes, type Logger, type PXE, type Wallet } from '@aztec/aztec.js'; +import type { AztecNode, CheatCodes, Logger, PXE, Wallet } from '@aztec/aztec.js'; import { type DeployL1Contracts, GovernanceProposerContract, @@ -9,7 +9,7 @@ import { import { EthAddress } from '@aztec/foundation/eth-address'; import { NewGovernanceProposerPayloadAbi } from '@aztec/l1-artifacts/NewGovernanceProposerPayloadAbi'; import { NewGovernanceProposerPayloadBytecode } from '@aztec/l1-artifacts/NewGovernanceProposerPayloadBytecode'; -import { type PXEService } from '@aztec/pxe'; +import type { PXEService } from '@aztec/pxe'; import { privateKeyToAccount } from 'viem/accounts'; diff --git a/yarn-project/end-to-end/src/e2e_static_calls.test.ts b/yarn-project/end-to-end/src/e2e_static_calls.test.ts index 1934479fac60..cc73f12b0815 100644 --- a/yarn-project/end-to-end/src/e2e_static_calls.test.ts +++ b/yarn-project/end-to-end/src/e2e_static_calls.test.ts @@ -1,4 +1,4 @@ -import { type AztecAddress, type Wallet } from '@aztec/aztec.js'; +import type { AztecAddress, Wallet } from '@aztec/aztec.js'; import { StaticChildContract } from '@aztec/noir-contracts.js/StaticChild'; import { StaticParentContract } from '@aztec/noir-contracts.js/StaticParent'; diff --git a/yarn-project/end-to-end/src/e2e_synching.test.ts b/yarn-project/end-to-end/src/e2e_synching.test.ts index dec8334c8455..b7fe396fac73 100644 --- a/yarn-project/end-to-end/src/e2e_synching.test.ts +++ b/yarn-project/end-to-end/src/e2e_synching.test.ts @@ -61,9 +61,9 @@ import { RollupAbi } from '@aztec/l1-artifacts'; import { SchnorrHardcodedAccountContract } from '@aztec/noir-contracts.js/SchnorrHardcodedAccount'; import { SpamContract } from '@aztec/noir-contracts.js/Spam'; import { TokenContract } from '@aztec/noir-contracts.js/Token'; -import { type PXEService } from '@aztec/pxe'; +import type { PXEService } from '@aztec/pxe'; import { SequencerPublisher } from '@aztec/sequencer-client'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { L2Block } from '@aztec/stdlib/block'; import { tryStop } from '@aztec/stdlib/interfaces/server'; import { createWorldStateSynchronizer } from '@aztec/world-state'; diff --git a/yarn-project/end-to-end/src/fixtures/get_acvm_config.ts b/yarn-project/end-to-end/src/fixtures/get_acvm_config.ts index f20257adeb6c..7ca48274f9a8 100644 --- a/yarn-project/end-to-end/src/fixtures/get_acvm_config.ts +++ b/yarn-project/end-to-end/src/fixtures/get_acvm_config.ts @@ -1,4 +1,4 @@ -import { type Logger } from '@aztec/aztec.js'; +import type { Logger } from '@aztec/aztec.js'; import { parseBooleanEnv } from '@aztec/foundation/config'; import { randomBytes } from '@aztec/foundation/crypto'; diff --git a/yarn-project/end-to-end/src/fixtures/get_bb_config.ts b/yarn-project/end-to-end/src/fixtures/get_bb_config.ts index 80e82a1a35cb..3a21a1fd3ee6 100644 --- a/yarn-project/end-to-end/src/fixtures/get_bb_config.ts +++ b/yarn-project/end-to-end/src/fixtures/get_bb_config.ts @@ -1,5 +1,5 @@ import { type Logger, fileURLToPath } from '@aztec/aztec.js'; -import { type BBConfig } from '@aztec/bb-prover'; +import type { BBConfig } from '@aztec/bb-prover'; import fs from 'node:fs/promises'; import { tmpdir } from 'node:os'; diff --git a/yarn-project/end-to-end/src/fixtures/l1_to_l2_messaging.ts b/yarn-project/end-to-end/src/fixtures/l1_to_l2_messaging.ts index fd2765bf862e..bf8963eaa0f8 100644 --- a/yarn-project/end-to-end/src/fixtures/l1_to_l2_messaging.ts +++ b/yarn-project/end-to-end/src/fixtures/l1_to_l2_messaging.ts @@ -1,7 +1,7 @@ -import { type L1ContractAddresses } from '@aztec/ethereum'; +import type { L1ContractAddresses } from '@aztec/ethereum'; import { Fr } from '@aztec/foundation/fields'; import { InboxAbi } from '@aztec/l1-artifacts'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { expect } from '@jest/globals'; import { diff --git a/yarn-project/end-to-end/src/fixtures/setup_l1_contracts.ts b/yarn-project/end-to-end/src/fixtures/setup_l1_contracts.ts index ef0e2e6d28bb..7874ef13924a 100644 --- a/yarn-project/end-to-end/src/fixtures/setup_l1_contracts.ts +++ b/yarn-project/end-to-end/src/fixtures/setup_l1_contracts.ts @@ -1,9 +1,9 @@ import { type Logger, deployL1Contracts } from '@aztec/aztec.js'; -import { type DeployL1ContractsArgs, type L1ContractsConfig } from '@aztec/ethereum'; +import type { DeployL1ContractsArgs, L1ContractsConfig } from '@aztec/ethereum'; import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks'; import { ProtocolContractAddress, protocolContractTreeRoot } from '@aztec/protocol-contracts'; -import { type HDAccount, type PrivateKeyAccount } from 'viem'; +import type { HDAccount, PrivateKeyAccount } from 'viem'; import { foundry } from 'viem/chains'; export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js'; 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 10b7f683ebbf..a1b4e743c7fc 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 @@ -2,11 +2,11 @@ * Test fixtures and utilities to set up and run a test using multiple validators */ import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node'; -import { type SentTx } from '@aztec/aztec.js'; +import type { SentTx } from '@aztec/aztec.js'; import { addLogNameHandler, removeLogNameHandler } from '@aztec/foundation/log'; -import { type DateProvider } from '@aztec/foundation/timer'; -import { type PXEService } from '@aztec/pxe'; -import { type PublicDataTreeLeaf } from '@aztec/stdlib/trees'; +import type { DateProvider } from '@aztec/foundation/timer'; +import type { PXEService } from '@aztec/pxe'; +import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees'; import getPort from 'get-port'; import { AsyncLocalStorage } from 'node:async_hooks'; 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 15a8463b9523..deed14dda57b 100644 --- a/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts +++ b/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts @@ -25,12 +25,12 @@ import { randomBytes } from '@aztec/foundation/crypto'; import { createLogger } from '@aztec/foundation/log'; import { resolver, reviver } from '@aztec/foundation/serialize'; import { TestDateProvider } from '@aztec/foundation/timer'; -import { type ProverNode } from '@aztec/prover-node'; +import type { ProverNode } from '@aztec/prover-node'; import { type PXEService, createPXEService, getPXEServiceConfig } from '@aztec/pxe'; import { getConfigEnvVars as getTelemetryConfig, initTelemetryClient } from '@aztec/telemetry-client'; import { getGenesisValues } from '@aztec/world-state/testing'; -import { type Anvil } from '@viem/anvil'; +import type { Anvil } from '@viem/anvil'; import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs'; import { copySync, removeSync } from 'fs-extra/esm'; import fs from 'fs/promises'; diff --git a/yarn-project/end-to-end/src/fixtures/token_utils.ts b/yarn-project/end-to-end/src/fixtures/token_utils.ts index 503db51c48b2..ddfca53fbe41 100644 --- a/yarn-project/end-to-end/src/fixtures/token_utils.ts +++ b/yarn-project/end-to-end/src/fixtures/token_utils.ts @@ -1,5 +1,5 @@ // docs:start:token_utils -import { type AztecAddress, type Logger, type Wallet } from '@aztec/aztec.js'; +import type { AztecAddress, Logger, Wallet } from '@aztec/aztec.js'; import { TokenContract } from '@aztec/noir-contracts.js/Token'; export async function deployToken(adminWallet: Wallet, initialAdminBalance: bigint, logger: Logger) { diff --git a/yarn-project/end-to-end/src/fixtures/utils.ts b/yarn-project/end-to-end/src/fixtures/utils.ts index 1bc68998f88a..29b9ce8c8067 100644 --- a/yarn-project/end-to-end/src/fixtures/utils.ts +++ b/yarn-project/end-to-end/src/fixtures/utils.ts @@ -30,7 +30,7 @@ import { waitForPXE, } from '@aztec/aztec.js'; import { deployInstance, registerContractClass } from '@aztec/aztec.js/deployment'; -import { type BBNativePrivateKernelProver } from '@aztec/bb-prover'; +import type { BBNativePrivateKernelProver } from '@aztec/bb-prover'; import { createBlobSinkClient } from '@aztec/blob-sink/client'; import { type BlobSinkServer, createBlobSinkServer } from '@aztec/blob-sink/server'; import { FEE_JUICE_INITIAL_MINT, GENESIS_ARCHIVE_ROOT, GENESIS_BLOCK_HASH } from '@aztec/constants'; @@ -54,11 +54,11 @@ import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks'; import { ProtocolContractAddress, protocolContractTreeRoot } from '@aztec/protocol-contracts'; import { type ProverNode, type ProverNodeConfig, createProverNode } from '@aztec/prover-node'; import { type PXEService, type PXEServiceConfig, createPXEService, getPXEServiceConfig } from '@aztec/pxe'; -import { type SequencerClient } from '@aztec/sequencer-client'; -import { type TestSequencerClient } from '@aztec/sequencer-client/test'; +import type { SequencerClient } from '@aztec/sequencer-client'; +import type { TestSequencerClient } from '@aztec/sequencer-client/test'; import { getContractClassFromArtifact } from '@aztec/stdlib/contract'; import { Gas } from '@aztec/stdlib/gas'; -import { type PublicDataTreeLeaf } from '@aztec/stdlib/trees'; +import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees'; import { type TelemetryClient, type TelemetryClientConfig, @@ -68,7 +68,7 @@ import { import { BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench'; import { getGenesisValues } from '@aztec/world-state/testing'; -import { type Anvil } from '@viem/anvil'; +import type { Anvil } from '@viem/anvil'; import fs from 'fs/promises'; import getPort from 'get-port'; import { tmpdir } from 'os'; diff --git a/yarn-project/end-to-end/src/public-testnet/e2e_public_testnet_transfer.test.ts b/yarn-project/end-to-end/src/public-testnet/e2e_public_testnet_transfer.test.ts index d52f787adf96..44cf0b907731 100644 --- a/yarn-project/end-to-end/src/public-testnet/e2e_public_testnet_transfer.test.ts +++ b/yarn-project/end-to-end/src/public-testnet/e2e_public_testnet_transfer.test.ts @@ -1,5 +1,5 @@ import { type InitialAccountData, deployFundedSchnorrAccounts } from '@aztec/accounts/testing'; -import { type Logger, type PXE } from '@aztec/aztec.js'; +import type { Logger, PXE } from '@aztec/aztec.js'; import { EasyPrivateTokenContract } from '@aztec/noir-contracts.js/EasyPrivateToken'; import { foundry, sepolia } from 'viem/chains'; diff --git a/yarn-project/end-to-end/src/quality_of_service/alert_checker.ts b/yarn-project/end-to-end/src/quality_of_service/alert_checker.ts index 884681414e58..4c9597ddc613 100644 --- a/yarn-project/end-to-end/src/quality_of_service/alert_checker.ts +++ b/yarn-project/end-to-end/src/quality_of_service/alert_checker.ts @@ -1,4 +1,4 @@ -import { type Logger } from '@aztec/aztec.js'; +import type { Logger } from '@aztec/aztec.js'; import * as fs from 'fs'; import * as yaml from 'js-yaml'; diff --git a/yarn-project/end-to-end/src/shared/cross_chain_test_harness.ts b/yarn-project/end-to-end/src/shared/cross_chain_test_harness.ts index b87743ac4183..f5ebbf71cdb1 100644 --- a/yarn-project/end-to-end/src/shared/cross_chain_test_harness.ts +++ b/yarn-project/end-to-end/src/shared/cross_chain_test_harness.ts @@ -18,7 +18,7 @@ import { deployL1Contract, retryUntil, } from '@aztec/aztec.js'; -import { type L1ContractAddresses } from '@aztec/ethereum'; +import type { L1ContractAddresses } from '@aztec/ethereum'; import { TestERC20Abi, TestERC20Bytecode, TokenPortalAbi, TokenPortalBytecode } from '@aztec/l1-artifacts'; import { TokenContract } from '@aztec/noir-contracts.js/Token'; import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge'; diff --git a/yarn-project/end-to-end/src/shared/gas_portal_test_harness.ts b/yarn-project/end-to-end/src/shared/gas_portal_test_harness.ts index c6933fd320f8..25a6f1c86fe3 100644 --- a/yarn-project/end-to-end/src/shared/gas_portal_test_harness.ts +++ b/yarn-project/end-to-end/src/shared/gas_portal_test_harness.ts @@ -13,7 +13,7 @@ import { import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice'; import { ProtocolContractAddress } from '@aztec/protocol-contracts'; -import { type Account, type Chain, type HttpTransport, type PublicClient, type WalletClient } from 'viem'; +import type { Account, Chain, HttpTransport, PublicClient, WalletClient } from 'viem'; export interface IGasBridgingTestHarness { getL1FeeJuiceBalance(address: EthAddress): Promise; diff --git a/yarn-project/end-to-end/src/shared/submit-transactions.ts b/yarn-project/end-to-end/src/shared/submit-transactions.ts index 5615486ac9b5..ed3928d3ddea 100644 --- a/yarn-project/end-to-end/src/shared/submit-transactions.ts +++ b/yarn-project/end-to-end/src/shared/submit-transactions.ts @@ -1,6 +1,6 @@ import { getSchnorrAccount } from '@aztec/accounts/schnorr'; import { Fr, GrumpkinScalar, type Logger, type SentTx, TxStatus, type Wallet } from '@aztec/aztec.js'; -import { type PXEService } from '@aztec/pxe'; +import type { PXEService } from '@aztec/pxe'; // submits a set of transactions to the provided Private eXecution Environment (PXE) export const submitTxsTo = async ( diff --git a/yarn-project/end-to-end/src/simulators/lending_simulator.ts b/yarn-project/end-to-end/src/simulators/lending_simulator.ts index 159ebdc49287..c88f16a64b86 100644 --- a/yarn-project/end-to-end/src/simulators/lending_simulator.ts +++ b/yarn-project/end-to-end/src/simulators/lending_simulator.ts @@ -2,13 +2,13 @@ import { AztecAddress, type CheatCodes, Fr } from '@aztec/aztec.js'; import { pedersenHash } from '@aztec/foundation/crypto'; import type { TestDateProvider } from '@aztec/foundation/timer'; -import { type RollupAbi } from '@aztec/l1-artifacts'; -import { type LendingContract } from '@aztec/noir-contracts.js/Lending'; +import type { RollupAbi } from '@aztec/l1-artifacts'; +import type { LendingContract } from '@aztec/noir-contracts.js/Lending'; -import { type Account, type GetContractReturnType, type HttpTransport, type WalletClient } from 'viem'; +import type { Account, GetContractReturnType, HttpTransport, WalletClient } from 'viem'; import type * as chains from 'viem/chains'; -import { type TokenSimulator } from './token_simulator.js'; +import type { TokenSimulator } from './token_simulator.js'; /** * Contains utilities to compute the "key" for private holdings in the public state. diff --git a/yarn-project/end-to-end/src/simulators/token_simulator.ts b/yarn-project/end-to-end/src/simulators/token_simulator.ts index 34233f682542..f42df78d7118 100644 --- a/yarn-project/end-to-end/src/simulators/token_simulator.ts +++ b/yarn-project/end-to-end/src/simulators/token_simulator.ts @@ -1,6 +1,6 @@ /* eslint-disable jsdoc/require-jsdoc */ import { type AztecAddress, BatchCall, type Logger, type Wallet } from '@aztec/aztec.js'; -import { type TokenContract } from '@aztec/noir-contracts.js/Token'; +import type { TokenContract } from '@aztec/noir-contracts.js/Token'; import chunk from 'lodash.chunk'; diff --git a/yarn-project/end-to-end/src/spartan/gating-passive.test.ts b/yarn-project/end-to-end/src/spartan/gating-passive.test.ts index 70555ac82ea6..bd40c7079717 100644 --- a/yarn-project/end-to-end/src/spartan/gating-passive.test.ts +++ b/yarn-project/end-to-end/src/spartan/gating-passive.test.ts @@ -5,7 +5,7 @@ import { createLogger } from '@aztec/foundation/log'; import { expect, jest } from '@jest/globals'; -import { type AlertConfig } from '../quality_of_service/alert_checker.js'; +import type { AlertConfig } from '../quality_of_service/alert_checker.js'; import { applyBootNodeFailure, applyNetworkShaping, diff --git a/yarn-project/end-to-end/src/spartan/proving.test.ts b/yarn-project/end-to-end/src/spartan/proving.test.ts index fd1ea281dba2..0da8e3eb1133 100644 --- a/yarn-project/end-to-end/src/spartan/proving.test.ts +++ b/yarn-project/end-to-end/src/spartan/proving.test.ts @@ -2,7 +2,7 @@ import { type PXE, createCompatibleClient, sleep } from '@aztec/aztec.js'; import { createLogger } from '@aztec/foundation/log'; import { jest } from '@jest/globals'; -import { type ChildProcess } from 'child_process'; +import type { ChildProcess } from 'child_process'; import { isK8sConfig, setupEnvironment, startPortForward } from './utils.js'; diff --git a/yarn-project/end-to-end/src/spartan/setup_test_wallets.ts b/yarn-project/end-to-end/src/spartan/setup_test_wallets.ts index c89d6b5404f1..65ff2badd030 100644 --- a/yarn-project/end-to-end/src/spartan/setup_test_wallets.ts +++ b/yarn-project/end-to-end/src/spartan/setup_test_wallets.ts @@ -12,7 +12,7 @@ import { retryUntil, } from '@aztec/aztec.js'; import { createEthereumChain, createL1Clients } from '@aztec/ethereum'; -import { type Logger } from '@aztec/foundation/log'; +import type { Logger } from '@aztec/foundation/log'; import { TokenContract } from '@aztec/noir-contracts.js/Token'; export interface TestWallets { diff --git a/yarn-project/end-to-end/src/spartan/utils.ts b/yarn-project/end-to-end/src/spartan/utils.ts index f3159cb4e01b..32258fe9b088 100644 --- a/yarn-project/end-to-end/src/spartan/utils.ts +++ b/yarn-project/end-to-end/src/spartan/utils.ts @@ -1,5 +1,5 @@ import { createAztecNodeClient, createLogger, sleep } from '@aztec/aztec.js'; -import { type RollupCheatCodes } from '@aztec/aztec.js/ethereum'; +import type { RollupCheatCodes } from '@aztec/aztec.js/ethereum'; import type { Logger } from '@aztec/foundation/log'; import type { SequencerConfig } from '@aztec/sequencer-client'; diff --git a/yarn-project/entrypoints/src/account_entrypoint.ts b/yarn-project/entrypoints/src/account_entrypoint.ts index 09086d654061..8759ee73cff4 100644 --- a/yarn-project/entrypoints/src/account_entrypoint.ts +++ b/yarn-project/entrypoints/src/account_entrypoint.ts @@ -1,4 +1,4 @@ -import { type AuthWitnessProvider } from '@aztec/aztec.js/account'; +import type { AuthWitnessProvider } from '@aztec/aztec.js/account'; import { type EntrypointInterface, EntrypointPayload, @@ -6,7 +6,7 @@ import { computeCombinedPayloadHash, } from '@aztec/aztec.js/entrypoint'; import { type FunctionAbi, FunctionSelector, encodeArguments } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx'; import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.js'; diff --git a/yarn-project/entrypoints/src/dapp_entrypoint.ts b/yarn-project/entrypoints/src/dapp_entrypoint.ts index 11212dfe6e8c..4864f50fcc84 100644 --- a/yarn-project/entrypoints/src/dapp_entrypoint.ts +++ b/yarn-project/entrypoints/src/dapp_entrypoint.ts @@ -1,8 +1,8 @@ import { Fr, computeAuthWitMessageHash, computeInnerAuthWitHash } from '@aztec/aztec.js'; -import { type AuthWitnessProvider } from '@aztec/aztec.js/account'; +import type { AuthWitnessProvider } from '@aztec/aztec.js/account'; import { type EntrypointInterface, EntrypointPayload, type ExecutionRequestInit } from '@aztec/aztec.js/entrypoint'; import { type FunctionAbi, FunctionSelector, encodeArguments } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx'; import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.js'; diff --git a/yarn-project/epoch-cache/src/epoch_cache.test.ts b/yarn-project/epoch-cache/src/epoch_cache.test.ts index f9218b3a9ec7..b6afb5108a41 100644 --- a/yarn-project/epoch-cache/src/epoch_cache.test.ts +++ b/yarn-project/epoch-cache/src/epoch_cache.test.ts @@ -1,4 +1,4 @@ -import { type RollupContract } from '@aztec/ethereum'; +import type { RollupContract } from '@aztec/ethereum'; import { EthAddress } from '@aztec/foundation/eth-address'; import { afterEach, beforeEach, describe, expect, it, jest } from '@jest/globals'; diff --git a/yarn-project/ethereum/src/chain.ts b/yarn-project/ethereum/src/chain.ts index 7fc9dd092cf4..72f3a54c8ec3 100644 --- a/yarn-project/ethereum/src/chain.ts +++ b/yarn-project/ethereum/src/chain.ts @@ -1,4 +1,4 @@ -import { type Chain } from 'viem'; +import type { Chain } from 'viem'; import { foundry } from 'viem/chains'; import { AZTEC_TEST_CHAIN_ID } from './constants.js'; diff --git a/yarn-project/ethereum/src/client.ts b/yarn-project/ethereum/src/client.ts index 47565201b07e..62528913b937 100644 --- a/yarn-project/ethereum/src/client.ts +++ b/yarn-project/ethereum/src/client.ts @@ -1,10 +1,10 @@ -import { type Logger } from '@aztec/foundation/log'; +import type { Logger } from '@aztec/foundation/log'; import { retryUntil } from '@aztec/foundation/retry'; import { createPublicClient, http } from 'viem'; import { createEthereumChain } from './chain.js'; -import { type ViemPublicClient } from './types.js'; +import type { ViemPublicClient } from './types.js'; type Config = { /** The RPC Url of the ethereum host. */ diff --git a/yarn-project/ethereum/src/constants.ts b/yarn-project/ethereum/src/constants.ts index c1f4b34d7321..a521ab80bfbe 100644 --- a/yarn-project/ethereum/src/constants.ts +++ b/yarn-project/ethereum/src/constants.ts @@ -1,4 +1,4 @@ -import { type Hex } from 'viem'; +import type { Hex } from 'viem'; export const NULL_KEY: Hex = `0x${'0000000000000000000000000000000000000000000000000000000000000000'}`; export const AZTEC_TEST_CHAIN_ID = 677692; diff --git a/yarn-project/ethereum/src/contracts/empire_base.ts b/yarn-project/ethereum/src/contracts/empire_base.ts index 6fa4bc447c88..180e0923b1a9 100644 --- a/yarn-project/ethereum/src/contracts/empire_base.ts +++ b/yarn-project/ethereum/src/contracts/empire_base.ts @@ -2,7 +2,7 @@ import { EmpireBaseAbi } from '@aztec/l1-artifacts/EmpireBaseAbi'; import { type Hex, encodeFunctionData } from 'viem'; -import { type L1TxRequest } from '../l1_tx_utils.js'; +import type { L1TxRequest } from '../l1_tx_utils.js'; export interface IEmpireBase { getRoundInfo(rollupAddress: Hex, round: bigint): Promise<{ lastVote: bigint; leader: Hex; executed: boolean }>; diff --git a/yarn-project/ethereum/src/contracts/forwarder.test.ts b/yarn-project/ethereum/src/contracts/forwarder.test.ts index ee98c2b9f938..f46557bffc5b 100644 --- a/yarn-project/ethereum/src/contracts/forwarder.test.ts +++ b/yarn-project/ethereum/src/contracts/forwarder.test.ts @@ -5,7 +5,7 @@ import { GovernanceProposerAbi } from '@aztec/l1-artifacts/GovernanceProposerAbi import { TestERC20Abi } from '@aztec/l1-artifacts/TestERC20Abi'; import { TestERC20Bytecode } from '@aztec/l1-artifacts/TestERC20Bytecode'; -import { type Anvil } from '@viem/anvil'; +import type { Anvil } from '@viem/anvil'; import { type Chain, type GetContractReturnType, @@ -21,7 +21,7 @@ import { DefaultL1ContractsConfig } from '../config.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 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 index 4a8b46977c4a..705401f359c7 100644 --- a/yarn-project/ethereum/src/contracts/forwarder.ts +++ b/yarn-project/ethereum/src/contracts/forwarder.ts @@ -1,5 +1,5 @@ import { toHex } from '@aztec/foundation/bigint-buffer'; -import { type Logger } from '@aztec/foundation/log'; +import type { Logger } from '@aztec/foundation/log'; import { ForwarderAbi, ForwarderBytecode } from '@aztec/l1-artifacts'; import { @@ -16,8 +16,8 @@ import { } from 'viem'; 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 type { L1BlobInputs, L1GasConfig, L1TxRequest, 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.ts b/yarn-project/ethereum/src/contracts/governance.ts index 1cbc513b283c..7d97f9bbe3a7 100644 --- a/yarn-project/ethereum/src/contracts/governance.ts +++ b/yarn-project/ethereum/src/contracts/governance.ts @@ -10,7 +10,7 @@ import { getContract, } from 'viem'; -import { type L1ContractAddresses } from '../l1_contract_addresses.js'; +import type { L1ContractAddresses } from '../l1_contract_addresses.js'; import { GovernanceProposerContract } from './governance_proposer.js'; export type L1GovernanceContractAddresses = Pick< diff --git a/yarn-project/ethereum/src/contracts/governance_proposer.ts b/yarn-project/ethereum/src/contracts/governance_proposer.ts index 00572125f775..f3b3704637b8 100644 --- a/yarn-project/ethereum/src/contracts/governance_proposer.ts +++ b/yarn-project/ethereum/src/contracts/governance_proposer.ts @@ -14,7 +14,7 @@ import { } from 'viem'; import type { GasPrice, L1TxRequest, L1TxUtils } from '../l1_tx_utils.js'; -import { type L1Clients } from '../types.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/rollup.ts b/yarn-project/ethereum/src/contracts/rollup.ts index 89153c026600..cb5764811269 100644 --- a/yarn-project/ethereum/src/contracts/rollup.ts +++ b/yarn-project/ethereum/src/contracts/rollup.ts @@ -17,9 +17,9 @@ import { } from 'viem'; import { createEthereumChain } from '../chain.js'; -import { type DeployL1Contracts } from '../deploy_l1_contracts.js'; -import { type L1ContractAddresses } from '../l1_contract_addresses.js'; -import { type L1ReaderConfig } from '../l1_reader.js'; +import type { DeployL1Contracts } from '../deploy_l1_contracts.js'; +import type { L1ContractAddresses } from '../l1_contract_addresses.js'; +import type { L1ReaderConfig } from '../l1_reader.js'; import { formatViemError } from '../utils.js'; import { SlashingProposerContract } from './slashing_proposer.js'; diff --git a/yarn-project/ethereum/src/deploy_l1_contracts.ts b/yarn-project/ethereum/src/deploy_l1_contracts.ts index 1416b5f81cdc..2fb5a9bf5f09 100644 --- a/yarn-project/ethereum/src/deploy_l1_contracts.ts +++ b/yarn-project/ethereum/src/deploy_l1_contracts.ts @@ -1,6 +1,6 @@ import { EthAddress } from '@aztec/foundation/eth-address'; -import { type Fr } from '@aztec/foundation/fields'; -import { type Logger } from '@aztec/foundation/log'; +import type { Fr } from '@aztec/foundation/fields'; +import type { Logger } from '@aztec/foundation/log'; import { CoinIssuerAbi, CoinIssuerBytecode, @@ -59,8 +59,8 @@ import { type HDAccount, type PrivateKeyAccount, mnemonicToAccount, privateKeyTo import { foundry } from 'viem/chains'; import { isAnvilTestChain } from './chain.js'; -import { type L1ContractsConfig } from './config.js'; -import { type L1ContractAddresses } from './l1_contract_addresses.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'; diff --git a/yarn-project/ethereum/src/eth_cheat_codes.ts b/yarn-project/ethereum/src/eth_cheat_codes.ts index 26a3dc0f86df..4999c584df39 100644 --- a/yarn-project/ethereum/src/eth_cheat_codes.ts +++ b/yarn-project/ethereum/src/eth_cheat_codes.ts @@ -1,9 +1,9 @@ import { toBigIntBE, toHex } from '@aztec/foundation/bigint-buffer'; import { keccak256 } from '@aztec/foundation/crypto'; -import { type EthAddress } from '@aztec/foundation/eth-address'; +import type { EthAddress } from '@aztec/foundation/eth-address'; import { createLogger } from '@aztec/foundation/log'; -import { type Hex } from 'viem'; +import type { Hex } from 'viem'; /** * A class that provides utility functions for interacting with ethereum (L1). diff --git a/yarn-project/ethereum/src/l1_contract_addresses.ts b/yarn-project/ethereum/src/l1_contract_addresses.ts index aca32ba2dd21..872052586333 100644 --- a/yarn-project/ethereum/src/l1_contract_addresses.ts +++ b/yarn-project/ethereum/src/l1_contract_addresses.ts @@ -1,4 +1,4 @@ -import { type ConfigMappingsType } from '@aztec/foundation/config'; +import type { ConfigMappingsType } from '@aztec/foundation/config'; import { EthAddress } from '@aztec/foundation/eth-address'; import { type ZodFor, schemas } from '@aztec/foundation/schemas'; diff --git a/yarn-project/ethereum/src/l1_tx_utils.test.ts b/yarn-project/ethereum/src/l1_tx_utils.test.ts index 2bdb0c334899..97c364e21eb0 100644 --- a/yarn-project/ethereum/src/l1_tx_utils.test.ts +++ b/yarn-project/ethereum/src/l1_tx_utils.test.ts @@ -3,7 +3,7 @@ import { EthAddress } from '@aztec/foundation/eth-address'; import { createLogger } from '@aztec/foundation/log'; import { sleep } from '@aztec/foundation/sleep'; -import { type Anvil } from '@viem/anvil'; +import type { Anvil } from '@viem/anvil'; import { type Abi, type Account, diff --git a/yarn-project/ethereum/src/l1_tx_utils.ts b/yarn-project/ethereum/src/l1_tx_utils.ts index eca62b459398..c7b1c075c44f 100644 --- a/yarn-project/ethereum/src/l1_tx_utils.ts +++ b/yarn-project/ethereum/src/l1_tx_utils.ts @@ -5,7 +5,7 @@ import { getDefaultConfig, numberConfigHelper, } from '@aztec/foundation/config'; -import { type Logger } from '@aztec/foundation/log'; +import type { Logger } from '@aztec/foundation/log'; import { makeBackoff, retry } from '@aztec/foundation/retry'; import { sleep } from '@aztec/foundation/sleep'; @@ -30,7 +30,7 @@ import { hexToBytes, } from 'viem'; -import { type L1Clients } from './types.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/queries.ts b/yarn-project/ethereum/src/queries.ts index f65849aff370..36fde9203c8e 100644 --- a/yarn-project/ethereum/src/queries.ts +++ b/yarn-project/ethereum/src/queries.ts @@ -1,11 +1,11 @@ -import { type EthAddress } from '@aztec/foundation/eth-address'; +import type { EthAddress } from '@aztec/foundation/eth-address'; -import { type Chain, type HttpTransport, type PublicClient } from 'viem'; +import type { Chain, HttpTransport, PublicClient } from 'viem'; -import { type L1ContractsConfig } from './config.js'; +import type { L1ContractsConfig } from './config.js'; import { GovernanceContract } from './contracts/governance.js'; import { RollupContract } from './contracts/rollup.js'; -import { type L1ContractAddresses } from './l1_contract_addresses.js'; +import type { L1ContractAddresses } from './l1_contract_addresses.js'; /** Given the Governance contract address, reads the addresses from all other contracts from L1. */ export async function getL1ContractsAddresses( diff --git a/yarn-project/ethereum/src/test/tx_delayer.test.ts b/yarn-project/ethereum/src/test/tx_delayer.test.ts index 119d3736cb9b..39fc43b98f40 100644 --- a/yarn-project/ethereum/src/test/tx_delayer.test.ts +++ b/yarn-project/ethereum/src/test/tx_delayer.test.ts @@ -1,12 +1,12 @@ import { type Logger, createLogger } from '@aztec/foundation/log'; import { TestERC20Abi, TestERC20Bytecode } from '@aztec/l1-artifacts'; -import { type Anvil } from '@viem/anvil'; +import type { Anvil } from '@viem/anvil'; import { type PrivateKeyAccount, createWalletClient, getContract, http, publicActions } from 'viem'; import { privateKeyToAccount } from 'viem/accounts'; import { foundry } from 'viem/chains'; -import { type ViemClient } from '../types.js'; +import type { ViemClient } from '../types.js'; import { startAnvil } from './start_anvil.js'; import { type Delayer, withDelayer } from './tx_delayer.js'; diff --git a/yarn-project/ethereum/src/types.ts b/yarn-project/ethereum/src/types.ts index e957000e138b..3669fb245e32 100644 --- a/yarn-project/ethereum/src/types.ts +++ b/yarn-project/ethereum/src/types.ts @@ -1,13 +1,13 @@ -import { - type Chain, - type Client, - type HttpTransport, - type PrivateKeyAccount, - type PublicActions, - type PublicClient, - type PublicRpcSchema, - type WalletActions, - type WalletRpcSchema, +import type { + Chain, + Client, + HttpTransport, + PrivateKeyAccount, + PublicActions, + PublicClient, + PublicRpcSchema, + WalletActions, + WalletRpcSchema, } from 'viem'; /** diff --git a/yarn-project/ethereum/src/utils.ts b/yarn-project/ethereum/src/utils.ts index 8c408e4a7fbe..5f028d65ce1a 100644 --- a/yarn-project/ethereum/src/utils.ts +++ b/yarn-project/ethereum/src/utils.ts @@ -1,5 +1,5 @@ -import { type Fr } from '@aztec/foundation/fields'; -import { type Logger } from '@aztec/foundation/log'; +import type { Fr } from '@aztec/foundation/fields'; +import type { Logger } from '@aztec/foundation/log'; import { ErrorsAbi } from '@aztec/l1-artifacts'; import { diff --git a/yarn-project/foundation/.eslintrc.cjs b/yarn-project/foundation/.eslintrc.cjs index 4f5cea0e01e8..6ea775e348e1 100644 --- a/yarn-project/foundation/.eslintrc.cjs +++ b/yarn-project/foundation/.eslintrc.cjs @@ -34,6 +34,7 @@ module.exports = { node: true, }, rules: { + '@typescript-eslint/no-import-type-side-effects': 'error', '@typescript-eslint/explicit-module-boundary-types': 'off', '@typescript-eslint/no-non-null-assertion': 'off', '@typescript-eslint/no-explicit-any': 'off', diff --git a/yarn-project/foundation/src/array/array.ts b/yarn-project/foundation/src/array/array.ts index b75e3db42421..a038c3471ed7 100644 --- a/yarn-project/foundation/src/array/array.ts +++ b/yarn-project/foundation/src/array/array.ts @@ -1,4 +1,4 @@ -import { type Tuple } from '../serialize/index.js'; +import type { Tuple } from '../serialize/index.js'; export type { FieldsOf } from '../types/index.js'; diff --git a/yarn-project/foundation/src/buffer/buffer32.ts b/yarn-project/foundation/src/buffer/buffer32.ts index 799df3f27ece..1a312a90264c 100644 --- a/yarn-project/foundation/src/buffer/buffer32.ts +++ b/yarn-project/foundation/src/buffer/buffer32.ts @@ -1,5 +1,5 @@ import { randomBytes } from '@aztec/foundation/crypto'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { BufferReader, deserializeBigInt, serializeBigInt } from '@aztec/foundation/serialize'; import { bufferToHex } from '../string/index.js'; diff --git a/yarn-project/foundation/src/collection/array.ts b/yarn-project/foundation/src/collection/array.ts index c27e3540287c..0e30ee657c02 100644 --- a/yarn-project/foundation/src/collection/array.ts +++ b/yarn-project/foundation/src/collection/array.ts @@ -1,4 +1,4 @@ -import { type Tuple } from '../serialize/types.js'; +import type { Tuple } from '../serialize/types.js'; /** * Pads an array to the target length by appending an element to its end. Throws if target length exceeds the input array length. Does not modify the input array. diff --git a/yarn-project/foundation/src/config/index.ts b/yarn-project/foundation/src/config/index.ts index 5b1d23860ac4..a96112b407f6 100644 --- a/yarn-project/foundation/src/config/index.ts +++ b/yarn-project/foundation/src/config/index.ts @@ -1,4 +1,4 @@ -import { type EnvVar } from './env_var.js'; +import type { EnvVar } from './env_var.js'; export { type EnvVar } from './env_var.js'; diff --git a/yarn-project/foundation/src/crypto/ecdsa/signature.ts b/yarn-project/foundation/src/crypto/ecdsa/signature.ts index d1c857fdd369..473952c09c03 100644 --- a/yarn-project/foundation/src/crypto/ecdsa/signature.ts +++ b/yarn-project/foundation/src/crypto/ecdsa/signature.ts @@ -3,7 +3,7 @@ import { randomBytes } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; import { mapTuple } from '@aztec/foundation/serialize'; -import { type Signature } from '../signature/index.js'; +import type { Signature } from '../signature/index.js'; /** * ECDSA signature used for transactions. diff --git a/yarn-project/foundation/src/crypto/schnorr/signature.ts b/yarn-project/foundation/src/crypto/schnorr/signature.ts index 16b200fcd89a..836cb54ed911 100644 --- a/yarn-project/foundation/src/crypto/schnorr/signature.ts +++ b/yarn-project/foundation/src/crypto/schnorr/signature.ts @@ -2,7 +2,7 @@ import { randomBytes } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, mapTuple } from '@aztec/foundation/serialize'; -import { type Signature } from '../signature/index.js'; +import type { Signature } from '../signature/index.js'; /** * Schnorr signature used for transactions. diff --git a/yarn-project/foundation/src/crypto/secp256k1-signer/secp256k1_signer.ts b/yarn-project/foundation/src/crypto/secp256k1-signer/secp256k1_signer.ts index 135b0cb37346..f86d597c29eb 100644 --- a/yarn-project/foundation/src/crypto/secp256k1-signer/secp256k1_signer.ts +++ b/yarn-project/foundation/src/crypto/secp256k1-signer/secp256k1_signer.ts @@ -1,6 +1,6 @@ import { Buffer32 } from '@aztec/foundation/buffer'; -import { type EthAddress } from '@aztec/foundation/eth-address'; -import { type Signature } from '@aztec/foundation/eth-signature'; +import type { EthAddress } from '@aztec/foundation/eth-address'; +import type { Signature } from '@aztec/foundation/eth-signature'; import { addressFromPrivateKey, makeEthSignDigest, signMessage } from './utils.js'; diff --git a/yarn-project/foundation/src/crypto/signature/index.ts b/yarn-project/foundation/src/crypto/signature/index.ts index d451121d9c0e..c6209d70aac0 100644 --- a/yarn-project/foundation/src/crypto/signature/index.ts +++ b/yarn-project/foundation/src/crypto/signature/index.ts @@ -1,4 +1,4 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; /** * Interface to represent a signature. diff --git a/yarn-project/foundation/src/fields/coordinate.ts b/yarn-project/foundation/src/fields/coordinate.ts index a8fad0b12d6d..e812f1ebae80 100644 --- a/yarn-project/foundation/src/fields/coordinate.ts +++ b/yarn-project/foundation/src/fields/coordinate.ts @@ -1,5 +1,5 @@ import { toBigIntBE } from '../bigint-buffer/index.js'; -import { type Tuple } from '../serialize/types.js'; +import type { Tuple } from '../serialize/types.js'; import { Fr } from './fields.js'; /** diff --git a/yarn-project/foundation/src/json-rpc/client/undici.ts b/yarn-project/foundation/src/json-rpc/client/undici.ts index 14bc5e49f99c..d82e16cc0a0f 100644 --- a/yarn-project/foundation/src/json-rpc/client/undici.ts +++ b/yarn-project/foundation/src/json-rpc/client/undici.ts @@ -3,7 +3,7 @@ import { Agent, type Dispatcher } from 'undici'; import { createLogger } from '../../log/pino-logger.js'; import { NoRetryError } from '../../retry/index.js'; import { jsonStringify } from '../convert.js'; -import { type JsonRpcFetch } from './fetch.js'; +import type { JsonRpcFetch } from './fetch.js'; const log = createLogger('json-rpc:json_rpc_client:undici'); diff --git a/yarn-project/foundation/src/json-rpc/convert.ts b/yarn-project/foundation/src/json-rpc/convert.ts index 563cb8e8a3a6..e322ea64dfa6 100644 --- a/yarn-project/foundation/src/json-rpc/convert.ts +++ b/yarn-project/foundation/src/json-rpc/convert.ts @@ -1,6 +1,6 @@ import { Buffer } from 'buffer'; -import { type ZodFor } from '../schemas/types.js'; +import type { ZodFor } from '../schemas/types.js'; /** * Parses a json string and then feeds it to a zod schema. diff --git a/yarn-project/foundation/src/json-rpc/server/safe_json_rpc_server.ts b/yarn-project/foundation/src/json-rpc/server/safe_json_rpc_server.ts index 603d88b29ec5..3241e72ba5e2 100644 --- a/yarn-project/foundation/src/json-rpc/server/safe_json_rpc_server.ts +++ b/yarn-project/foundation/src/json-rpc/server/safe_json_rpc_server.ts @@ -4,7 +4,7 @@ import { type default as Application, default as Koa } from 'koa'; import bodyParser from 'koa-bodyparser'; import compress from 'koa-compress'; import Router from 'koa-router'; -import { type AddressInfo } from 'net'; +import type { AddressInfo } from 'net'; import { format, inspect } from 'util'; import { ZodError } from 'zod'; diff --git a/yarn-project/foundation/src/json-rpc/test/integration.ts b/yarn-project/foundation/src/json-rpc/test/integration.ts index 10775154afa2..c8208ad8f6d4 100644 --- a/yarn-project/foundation/src/json-rpc/test/integration.ts +++ b/yarn-project/foundation/src/json-rpc/test/integration.ts @@ -1,6 +1,6 @@ import type http from 'http'; -import { type ApiSchemaFor } from '../../schemas/api.js'; +import type { ApiSchemaFor } from '../../schemas/api.js'; import { makeFetch } from '../client/fetch.js'; import { type SafeJsonRpcClientOptions, createSafeJsonRpcClient } from '../client/safe_json_rpc_client.js'; import { diff --git a/yarn-project/foundation/src/log/console.ts b/yarn-project/foundation/src/log/console.ts index dee595f96c75..03ec5513ec34 100644 --- a/yarn-project/foundation/src/log/console.ts +++ b/yarn-project/foundation/src/log/console.ts @@ -1,5 +1,5 @@ /* eslint-disable no-console */ -import { type LogFn } from './log_fn.js'; +import type { LogFn } from './log_fn.js'; /** * ConsoleLogger is a utility class that provides customizable console logging functionality. diff --git a/yarn-project/foundation/src/log/debug.ts b/yarn-project/foundation/src/log/debug.ts index 69d9e66c76d4..d4c3dfad497c 100644 --- a/yarn-project/foundation/src/log/debug.ts +++ b/yarn-project/foundation/src/log/debug.ts @@ -1,6 +1,6 @@ import debug from 'debug'; -import { type LogFn } from './log_fn.js'; +import type { LogFn } from './log_fn.js'; let preLogHook: ((...args: any[]) => void) | undefined; let postLogHook: ((...args: any[]) => void) | undefined; diff --git a/yarn-project/foundation/src/log/gcloud-logger-config.ts b/yarn-project/foundation/src/log/gcloud-logger-config.ts index 65aef7c5b55b..6c1054f0eb1f 100644 --- a/yarn-project/foundation/src/log/gcloud-logger-config.ts +++ b/yarn-project/foundation/src/log/gcloud-logger-config.ts @@ -1,4 +1,4 @@ -import { type pino } from 'pino'; +import type { pino } from 'pino'; /* eslint-disable camelcase */ diff --git a/yarn-project/foundation/src/log/libp2p_logger.ts b/yarn-project/foundation/src/log/libp2p_logger.ts index be58e1a84571..2954b248828d 100644 --- a/yarn-project/foundation/src/log/libp2p_logger.ts +++ b/yarn-project/foundation/src/log/libp2p_logger.ts @@ -1,4 +1,4 @@ -import { type ComponentLogger, type Logger } from '@libp2p/interface'; +import type { ComponentLogger, Logger } from '@libp2p/interface'; import { getLogLevelFromFilters } from './log-filters.js'; import type { LogLevel } from './log-levels.js'; diff --git a/yarn-project/foundation/src/log/pino-logger.ts b/yarn-project/foundation/src/log/pino-logger.ts index 156a0766c85a..36d4ca52b943 100644 --- a/yarn-project/foundation/src/log/pino-logger.ts +++ b/yarn-project/foundation/src/log/pino-logger.ts @@ -1,15 +1,15 @@ import { createColors, isColorSupported } from 'colorette'; import isNode from 'detect-node'; import { pino, symbols } from 'pino'; -import { type Writable } from 'stream'; +import type { Writable } from 'stream'; import { inspect } from 'util'; import { compactArray } from '../collection/array.js'; import { type EnvVar, parseBooleanEnv } from '../config/index.js'; import { GoogleCloudLoggerConfig } from './gcloud-logger-config.js'; import { getLogLevelFromFilters, parseEnv } from './log-filters.js'; -import { type LogLevel } from './log-levels.js'; -import { type LogData, type LogFn } from './log_fn.js'; +import type { LogLevel } from './log-levels.js'; +import type { LogData, LogFn } from './log_fn.js'; export function createLogger(module: string): Logger { module = logNameHandlers.reduce((moduleName, handler) => handler(moduleName), module.replace(/^aztec:/, '')); diff --git a/yarn-project/foundation/src/mutex/index.ts b/yarn-project/foundation/src/mutex/index.ts index 6042ff32b167..5c18e9089d31 100644 --- a/yarn-project/foundation/src/mutex/index.ts +++ b/yarn-project/foundation/src/mutex/index.ts @@ -1,4 +1,4 @@ -import { type MutexDatabase } from './mutex_database.js'; +import type { MutexDatabase } from './mutex_database.js'; export * from './mutex_database.js'; diff --git a/yarn-project/foundation/src/mutex/mutex.test.ts b/yarn-project/foundation/src/mutex/mutex.test.ts index 82de7f286967..0bebc252899d 100644 --- a/yarn-project/foundation/src/mutex/mutex.test.ts +++ b/yarn-project/foundation/src/mutex/mutex.test.ts @@ -1,7 +1,7 @@ import { jest } from '@jest/globals'; import { Mutex } from './index.js'; -import { type MutexDatabase } from './mutex_database.js'; +import type { MutexDatabase } from './mutex_database.js'; /** * Sleep function for introducing a delay in the execution of code. diff --git a/yarn-project/foundation/src/queue/fifo_memory_queue.ts b/yarn-project/foundation/src/queue/fifo_memory_queue.ts index b440270d1a7d..6cd2c182c54b 100644 --- a/yarn-project/foundation/src/queue/fifo_memory_queue.ts +++ b/yarn-project/foundation/src/queue/fifo_memory_queue.ts @@ -1,4 +1,4 @@ -import { type Logger } from '../log/index.js'; +import type { Logger } from '../log/index.js'; import { BaseMemoryQueue } from './base_memory_queue.js'; /** diff --git a/yarn-project/foundation/src/schemas/api.ts b/yarn-project/foundation/src/schemas/api.ts index b57fefb761e9..025487e3953e 100644 --- a/yarn-project/foundation/src/schemas/api.ts +++ b/yarn-project/foundation/src/schemas/api.ts @@ -1,6 +1,6 @@ -import { type z } from 'zod'; +import type { z } from 'zod'; -import { type ZodNullableOptional } from './utils.js'; +import type { ZodNullableOptional } from './utils.js'; // Forces usage of ZodNullableOptional in parameters schemas so we properly accept nulls for optional parameters. type ZodParameterTypeFor = undefined extends T diff --git a/yarn-project/foundation/src/schemas/types.ts b/yarn-project/foundation/src/schemas/types.ts index 36621b6bc1d5..a5503c28fa24 100644 --- a/yarn-project/foundation/src/schemas/types.ts +++ b/yarn-project/foundation/src/schemas/types.ts @@ -1,3 +1,3 @@ -import { type ZodType } from 'zod'; +import type { ZodType } from 'zod'; export type ZodFor = ZodType; diff --git a/yarn-project/foundation/src/schemas/utils.ts b/yarn-project/foundation/src/schemas/utils.ts index b98f3c3f7832..4dd5fa2aa23b 100644 --- a/yarn-project/foundation/src/schemas/utils.ts +++ b/yarn-project/foundation/src/schemas/utils.ts @@ -14,7 +14,7 @@ import { import { pick } from '../collection/object.js'; import { isHex, withoutHexPrefix } from '../string/index.js'; -import { type ZodFor } from './types.js'; +import type { ZodFor } from './types.js'; export const hexSchema = z.string().refine(isHex, 'Not a valid hex string').transform(withoutHexPrefix); diff --git a/yarn-project/foundation/src/serialize/buffer_reader.ts b/yarn-project/foundation/src/serialize/buffer_reader.ts index 84b2ea86277e..ca41fd74f7a7 100644 --- a/yarn-project/foundation/src/serialize/buffer_reader.ts +++ b/yarn-project/foundation/src/serialize/buffer_reader.ts @@ -1,4 +1,4 @@ -import { type Tuple } from './types.js'; +import type { Tuple } from './types.js'; /** * The BufferReader class provides a utility for reading various data types from a buffer. diff --git a/yarn-project/foundation/src/serialize/field_reader.ts b/yarn-project/foundation/src/serialize/field_reader.ts index abaf19d2577d..c12255d2f1a8 100644 --- a/yarn-project/foundation/src/serialize/field_reader.ts +++ b/yarn-project/foundation/src/serialize/field_reader.ts @@ -1,5 +1,5 @@ import { Fq, type Fr } from '../fields/fields.js'; -import { type Tuple } from './types.js'; +import type { Tuple } from './types.js'; /** * The FieldReader class provides a utility for reading various data types from a field array. diff --git a/yarn-project/foundation/src/serialize/free_funcs.ts b/yarn-project/foundation/src/serialize/free_funcs.ts index 35bf70c35b24..6feeb67b587b 100644 --- a/yarn-project/foundation/src/serialize/free_funcs.ts +++ b/yarn-project/foundation/src/serialize/free_funcs.ts @@ -1,5 +1,5 @@ import { Fr } from '../fields/fields.js'; -import { type Tuple } from './types.js'; +import type { Tuple } from './types.js'; /** * Convert a boolean value to its corresponding byte representation in a Buffer of size 1. diff --git a/yarn-project/foundation/src/testing/snapshot_serializer.ts b/yarn-project/foundation/src/testing/snapshot_serializer.ts index 7ccb1aa826b8..793f317918f3 100644 --- a/yarn-project/foundation/src/testing/snapshot_serializer.ts +++ b/yarn-project/foundation/src/testing/snapshot_serializer.ts @@ -1,4 +1,4 @@ -import { type NewPlugin } from 'pretty-format'; +import type { NewPlugin } from 'pretty-format'; import { inspect } from 'util'; function makeSerializerForCustomInspect(prefix: string): NewPlugin { diff --git a/yarn-project/foundation/src/transport/browser/message_port_socket.ts b/yarn-project/foundation/src/transport/browser/message_port_socket.ts index 2f5cde890136..64d46c530ece 100644 --- a/yarn-project/foundation/src/transport/browser/message_port_socket.ts +++ b/yarn-project/foundation/src/transport/browser/message_port_socket.ts @@ -1,4 +1,4 @@ -import { type Socket } from '../interface/socket.js'; +import type { Socket } from '../interface/socket.js'; /** * An implementation of a TransportSocket using MessagePorts. diff --git a/yarn-project/foundation/src/transport/browser/shared_worker_connector.ts b/yarn-project/foundation/src/transport/browser/shared_worker_connector.ts index 94b62175d063..54f2fe089b1c 100644 --- a/yarn-project/foundation/src/transport/browser/shared_worker_connector.ts +++ b/yarn-project/foundation/src/transport/browser/shared_worker_connector.ts @@ -1,4 +1,4 @@ -import { type Connector } from '../interface/connector.js'; +import type { Connector } from '../interface/connector.js'; import { MessagePortSocket } from './message_port_socket.js'; /** diff --git a/yarn-project/foundation/src/transport/browser/shared_worker_listener.ts b/yarn-project/foundation/src/transport/browser/shared_worker_listener.ts index 5db7b9168bbc..d1ec4b89850a 100644 --- a/yarn-project/foundation/src/transport/browser/shared_worker_listener.ts +++ b/yarn-project/foundation/src/transport/browser/shared_worker_listener.ts @@ -1,6 +1,6 @@ import EventEmitter from 'events'; -import { type Listener } from '../interface/listener.js'; +import type { Listener } from '../interface/listener.js'; import { MessagePortSocket } from './message_port_socket.js'; /** diff --git a/yarn-project/foundation/src/transport/browser/worker_connector.ts b/yarn-project/foundation/src/transport/browser/worker_connector.ts index 67a93caf7570..c1908d4af850 100644 --- a/yarn-project/foundation/src/transport/browser/worker_connector.ts +++ b/yarn-project/foundation/src/transport/browser/worker_connector.ts @@ -1,4 +1,4 @@ -import { type Connector } from '../interface/connector.js'; +import type { Connector } from '../interface/connector.js'; import { MessagePortSocket } from './message_port_socket.js'; /** diff --git a/yarn-project/foundation/src/transport/browser/worker_listener.ts b/yarn-project/foundation/src/transport/browser/worker_listener.ts index 13b94efcda3b..6ca2f46498c7 100644 --- a/yarn-project/foundation/src/transport/browser/worker_listener.ts +++ b/yarn-project/foundation/src/transport/browser/worker_listener.ts @@ -1,6 +1,6 @@ import EventEmitter from 'events'; -import { type Listener } from '../interface/listener.js'; +import type { Listener } from '../interface/listener.js'; import { MessagePortSocket } from './message_port_socket.js'; /** diff --git a/yarn-project/foundation/src/transport/dispatch/create_dispatch_proxy.ts b/yarn-project/foundation/src/transport/dispatch/create_dispatch_proxy.ts index dbaeb2950f5e..0638531eb405 100644 --- a/yarn-project/foundation/src/transport/dispatch/create_dispatch_proxy.ts +++ b/yarn-project/foundation/src/transport/dispatch/create_dispatch_proxy.ts @@ -1,8 +1,8 @@ import { EventEmitter } from 'events'; import { type TransferDescriptor, isTransferDescriptor } from '../interface/transferable.js'; -import { type TransportClient } from '../transport_client.js'; -import { type DispatchMsg } from './create_dispatch_fn.js'; +import type { TransportClient } from '../transport_client.js'; +import type { DispatchMsg } from './create_dispatch_fn.js'; /** * FilterOutAttributes type filters out all non-method properties of an object, leaving only the attributes diff --git a/yarn-project/foundation/src/transport/interface/connector.ts b/yarn-project/foundation/src/transport/interface/connector.ts index b42e2ec1fcf4..2668e37602f8 100644 --- a/yarn-project/foundation/src/transport/interface/connector.ts +++ b/yarn-project/foundation/src/transport/interface/connector.ts @@ -1,4 +1,4 @@ -import { type Socket } from './socket.js'; +import type { Socket } from './socket.js'; /** * Opens a socket with corresponding TransportListener. diff --git a/yarn-project/foundation/src/transport/interface/listener.ts b/yarn-project/foundation/src/transport/interface/listener.ts index 1b2da8134ac9..01ae3cfc7e4d 100644 --- a/yarn-project/foundation/src/transport/interface/listener.ts +++ b/yarn-project/foundation/src/transport/interface/listener.ts @@ -1,6 +1,6 @@ import type EventEmitter from 'events'; -import { type Socket } from './socket.js'; +import type { Socket } from './socket.js'; /** * Once opened, an implementation of a TransportListener will emit `new_socket` events as new clients connect. diff --git a/yarn-project/foundation/src/transport/node/node_connector.ts b/yarn-project/foundation/src/transport/node/node_connector.ts index b49f80d5b8bc..4281138b354d 100644 --- a/yarn-project/foundation/src/transport/node/node_connector.ts +++ b/yarn-project/foundation/src/transport/node/node_connector.ts @@ -1,6 +1,6 @@ -import { type Worker } from 'worker_threads'; +import type { Worker } from 'worker_threads'; -import { type Connector } from '../interface/connector.js'; +import type { Connector } from '../interface/connector.js'; import { NodeConnectorSocket } from './node_connector_socket.js'; /** diff --git a/yarn-project/foundation/src/transport/node/node_connector_socket.ts b/yarn-project/foundation/src/transport/node/node_connector_socket.ts index e81394d5c832..348fcc454941 100644 --- a/yarn-project/foundation/src/transport/node/node_connector_socket.ts +++ b/yarn-project/foundation/src/transport/node/node_connector_socket.ts @@ -1,6 +1,6 @@ -import { type TransferListItem, type Worker } from 'worker_threads'; +import type { TransferListItem, Worker } from 'worker_threads'; -import { type Socket } from '../interface/socket.js'; +import type { Socket } from '../interface/socket.js'; /** * NodeConnectorSocket is a wrapper class that implements the Socket interface for messaging between diff --git a/yarn-project/foundation/src/transport/node/node_listener.ts b/yarn-project/foundation/src/transport/node/node_listener.ts index 406b2eea87eb..aa6a777a7f59 100644 --- a/yarn-project/foundation/src/transport/node/node_listener.ts +++ b/yarn-project/foundation/src/transport/node/node_listener.ts @@ -1,7 +1,7 @@ import EventEmitter from 'events'; import { parentPort } from 'worker_threads'; -import { type Listener } from '../interface/listener.js'; +import type { Listener } from '../interface/listener.js'; import { NodeListenerSocket } from './node_listener_socket.js'; /** diff --git a/yarn-project/foundation/src/transport/node/node_listener_socket.ts b/yarn-project/foundation/src/transport/node/node_listener_socket.ts index b96acc726c82..51475f14ac01 100644 --- a/yarn-project/foundation/src/transport/node/node_listener_socket.ts +++ b/yarn-project/foundation/src/transport/node/node_listener_socket.ts @@ -1,6 +1,6 @@ -import { type MessagePort, type TransferListItem } from 'worker_threads'; +import type { MessagePort, TransferListItem } from 'worker_threads'; -import { type Socket } from '../interface/socket.js'; +import type { Socket } from '../interface/socket.js'; /** * An implementation of a TransportSocket using MessagePorts. diff --git a/yarn-project/foundation/src/transport/transport_client.ts b/yarn-project/foundation/src/transport/transport_client.ts index ff29a4574884..f8235e194679 100644 --- a/yarn-project/foundation/src/transport/transport_client.ts +++ b/yarn-project/foundation/src/transport/transport_client.ts @@ -3,8 +3,8 @@ import { format } from 'util'; import { createLogger } from '../log/index.js'; import { type EventMessage, type ResponseMessage, isEventMessage } from './dispatch/messages.js'; -import { type Connector } from './interface/connector.js'; -import { type Socket } from './interface/socket.js'; +import type { Connector } from './interface/connector.js'; +import type { Socket } from './interface/socket.js'; const log = createLogger('foundation:transport_client'); diff --git a/yarn-project/foundation/src/transport/transport_server.ts b/yarn-project/foundation/src/transport/transport_server.ts index 706215779b79..38f17987e37d 100644 --- a/yarn-project/foundation/src/transport/transport_server.ts +++ b/yarn-project/foundation/src/transport/transport_server.ts @@ -1,6 +1,6 @@ -import { type RequestMessage, type ResponseMessage } from './dispatch/messages.js'; -import { type Listener } from './interface/listener.js'; -import { type Socket } from './interface/socket.js'; +import type { RequestMessage, ResponseMessage } from './dispatch/messages.js'; +import type { Listener } from './interface/listener.js'; +import type { Socket } from './interface/socket.js'; import { isTransferDescriptor } from './interface/transferable.js'; /** diff --git a/yarn-project/foundation/src/trees/indexed_merkle_tree.ts b/yarn-project/foundation/src/trees/indexed_merkle_tree.ts index 6e69d33c7f51..72ae3b7fdb1b 100644 --- a/yarn-project/foundation/src/trees/indexed_merkle_tree.ts +++ b/yarn-project/foundation/src/trees/indexed_merkle_tree.ts @@ -1,6 +1,6 @@ import { Fr } from '../fields/index.js'; import { assertLength } from '../serialize/index.js'; -import { type IndexedTreeLeafPreimage } from './indexed_tree_leaf.js'; +import type { IndexedTreeLeafPreimage } from './indexed_tree_leaf.js'; import { MembershipWitness } from './membership_witness.js'; import { MerkleTree } from './merkle_tree.js'; diff --git a/yarn-project/foundation/src/trees/indexed_merkle_tree_calculator.test.ts b/yarn-project/foundation/src/trees/indexed_merkle_tree_calculator.test.ts index 5c3afcd3d1c0..3ab53e286b3f 100644 --- a/yarn-project/foundation/src/trees/indexed_merkle_tree_calculator.test.ts +++ b/yarn-project/foundation/src/trees/indexed_merkle_tree_calculator.test.ts @@ -3,7 +3,7 @@ import { poseidon2Hash } from '../crypto/poseidon/index.js'; import { Fr } from '../fields/fields.js'; import { BufferReader } from '../serialize/buffer_reader.js'; import type { AsyncHasher, IndexedTreeLeaf, IndexedTreeLeafPreimage } from './index.js'; -import { type IndexedMerkleTree } from './indexed_merkle_tree.js'; +import type { IndexedMerkleTree } from './indexed_merkle_tree.js'; import { IndexedMerkleTreeCalculator } from './indexed_merkle_tree_calculator.js'; import type { MembershipWitness } from './membership_witness.js'; diff --git a/yarn-project/foundation/src/trees/indexed_merkle_tree_calculator.ts b/yarn-project/foundation/src/trees/indexed_merkle_tree_calculator.ts index ab282155e088..ed4405c7e5b1 100644 --- a/yarn-project/foundation/src/trees/indexed_merkle_tree_calculator.ts +++ b/yarn-project/foundation/src/trees/indexed_merkle_tree_calculator.ts @@ -1,8 +1,8 @@ import { toBigIntBE } from '@aztec/foundation/bigint-buffer'; import { numToUInt32BE } from '@aztec/foundation/serialize'; -import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import type { IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; -import { type AsyncHasher } from './hasher.js'; +import type { AsyncHasher } from './hasher.js'; import { IndexedMerkleTree } from './indexed_merkle_tree.js'; interface LeafPreimageFactory { diff --git a/yarn-project/foundation/src/worker/browser/start_web_module.ts b/yarn-project/foundation/src/worker/browser/start_web_module.ts index 4297ffb56585..21dcbc9d93d4 100644 --- a/yarn-project/foundation/src/worker/browser/start_web_module.ts +++ b/yarn-project/foundation/src/worker/browser/start_web_module.ts @@ -1,5 +1,5 @@ import { type DispatchMsg, TransportServer, WorkerListener } from '../../transport/index.js'; -import { type WasmModule } from '../../wasm/index.js'; +import type { WasmModule } from '../../wasm/index.js'; /** * Start the transport server corresponding to this module. diff --git a/yarn-project/foundation/src/worker/browser/web_data_store.ts b/yarn-project/foundation/src/worker/browser/web_data_store.ts index f19e2b9bcda9..4ac6fc822c83 100644 --- a/yarn-project/foundation/src/worker/browser/web_data_store.ts +++ b/yarn-project/foundation/src/worker/browser/web_data_store.ts @@ -1,7 +1,7 @@ import levelup, { type LevelUp } from 'levelup'; import memdown from 'memdown'; -import { type DataStore } from '../data_store.js'; +import type { DataStore } from '../data_store.js'; /** * Cache for data used by wasm module. diff --git a/yarn-project/foundation/src/worker/browser/web_worker.ts b/yarn-project/foundation/src/worker/browser/web_worker.ts index 8a6f6f52943e..c166166ca346 100644 --- a/yarn-project/foundation/src/worker/browser/web_worker.ts +++ b/yarn-project/foundation/src/worker/browser/web_worker.ts @@ -1,6 +1,6 @@ import { type DispatchMsg, TransportClient, WorkerConnector, createDispatchProxy } from '../../transport/index.js'; import { WasmModule } from '../../wasm/index.js'; -import { type WasmWorker } from '../wasm_worker.js'; +import type { WasmWorker } from '../wasm_worker.js'; /** * Instantiate a web worker. diff --git a/yarn-project/foundation/src/worker/node/node_data_store.ts b/yarn-project/foundation/src/worker/node/node_data_store.ts index fd0986487c40..8a5137e0693a 100644 --- a/yarn-project/foundation/src/worker/node/node_data_store.ts +++ b/yarn-project/foundation/src/worker/node/node_data_store.ts @@ -2,7 +2,7 @@ import leveldown from 'leveldown'; import levelup, { type LevelUp } from 'levelup'; import memdown from 'memdown'; -import { type DataStore } from '../data_store.js'; +import type { DataStore } from '../data_store.js'; /** * Cache for data used by wasm module. diff --git a/yarn-project/foundation/src/worker/node/node_worker.ts b/yarn-project/foundation/src/worker/node/node_worker.ts index 8bf1516b772c..0e4435714008 100644 --- a/yarn-project/foundation/src/worker/node/node_worker.ts +++ b/yarn-project/foundation/src/worker/node/node_worker.ts @@ -2,7 +2,7 @@ import { Worker } from 'worker_threads'; import { type DispatchMsg, NodeConnector, TransportClient, createDispatchProxy } from '../../transport/index.js'; import { WasmModule } from '../../wasm/wasm_module.js'; -import { type WasmWorker } from '../wasm_worker.js'; +import type { WasmWorker } from '../wasm_worker.js'; /** * Creates a node worker. diff --git a/yarn-project/foundation/src/worker/node/start_node_module.ts b/yarn-project/foundation/src/worker/node/start_node_module.ts index 024868515dda..74fa22e84c23 100644 --- a/yarn-project/foundation/src/worker/node/start_node_module.ts +++ b/yarn-project/foundation/src/worker/node/start_node_module.ts @@ -1,7 +1,7 @@ import { parentPort } from 'worker_threads'; import { type DispatchMsg, NodeListener, TransportServer } from '../../transport/index.js'; -import { type WasmModule } from '../../wasm/wasm_module.js'; +import type { WasmModule } from '../../wasm/wasm_module.js'; if (!parentPort) { throw new Error('InvalidWorker'); diff --git a/yarn-project/foundation/src/worker/wasm_worker.ts b/yarn-project/foundation/src/worker/wasm_worker.ts index e9036023ee35..06202e0d07c6 100644 --- a/yarn-project/foundation/src/worker/wasm_worker.ts +++ b/yarn-project/foundation/src/worker/wasm_worker.ts @@ -1,5 +1,5 @@ -import { type Proxify } from '../transport/index.js'; -import { type WasmModule } from '../wasm/wasm_module.js'; +import type { Proxify } from '../transport/index.js'; +import type { WasmModule } from '../wasm/wasm_module.js'; /** * Represents either a WASM web worker, or node.js worker. diff --git a/yarn-project/foundation/src/worker/worker_pool.ts b/yarn-project/foundation/src/worker/worker_pool.ts index e32e250b19f4..353989c9a4ff 100644 --- a/yarn-project/foundation/src/worker/worker_pool.ts +++ b/yarn-project/foundation/src/worker/worker_pool.ts @@ -1,5 +1,5 @@ import { createLogger } from '../log/index.js'; -import { type WasmWorker } from './wasm_worker.js'; +import type { WasmWorker } from './wasm_worker.js'; const log = createLogger('foundation:worker_pool'); diff --git a/yarn-project/ivc-integration/src/avm_integration.test.ts b/yarn-project/ivc-integration/src/avm_integration.test.ts index d29ee1017f0b..331bf90af9a6 100644 --- a/yarn-project/ivc-integration/src/avm_integration.test.ts +++ b/yarn-project/ivc-integration/src/avm_integration.test.ts @@ -10,11 +10,11 @@ import { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; import { BufferReader } from '@aztec/foundation/serialize'; import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest'; -import { type FixedLengthArray } from '@aztec/noir-protocol-circuits-types/types'; +import type { FixedLengthArray } from '@aztec/noir-protocol-circuits-types/types'; import { PublicTxSimulationTester } from '@aztec/simulator/public/fixtures'; -import { type AvmCircuitInputs } from '@aztec/stdlib/avm'; +import type { AvmCircuitInputs } from '@aztec/stdlib/avm'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract'; import { promises as fs } from 'fs'; import { tmpdir } from 'node:os'; diff --git a/yarn-project/ivc-integration/src/index.ts b/yarn-project/ivc-integration/src/index.ts index 21629bc80c27..732e9722fbf0 100644 --- a/yarn-project/ivc-integration/src/index.ts +++ b/yarn-project/ivc-integration/src/index.ts @@ -1,4 +1,4 @@ -import { type CLIENT_IVC_VERIFICATION_KEY_LENGTH_IN_FIELDS } from '@aztec/constants'; +import type { CLIENT_IVC_VERIFICATION_KEY_LENGTH_IN_FIELDS } from '@aztec/constants'; import { type ForeignCallOutput, Noir } from '@noir-lang/noir_js'; import createDebug from 'debug'; diff --git a/yarn-project/ivc-integration/src/native_client_ivc_integration.test.ts b/yarn-project/ivc-integration/src/native_client_ivc_integration.test.ts index 8424dacc0fa4..18591b80734a 100644 --- a/yarn-project/ivc-integration/src/native_client_ivc_integration.test.ts +++ b/yarn-project/ivc-integration/src/native_client_ivc_integration.test.ts @@ -6,7 +6,7 @@ import { writeToOutputDirectory, } from '@aztec/bb-prover'; import { createLogger } from '@aztec/foundation/log'; -import { type ClientIvcProof } from '@aztec/stdlib/proofs'; +import type { ClientIvcProof } from '@aztec/stdlib/proofs'; import { jest } from '@jest/globals'; import { encode } from '@msgpack/msgpack'; diff --git a/yarn-project/key-store/src/key_store.ts b/yarn-project/key-store/src/key_store.ts index d425fababbf6..085e80740028 100644 --- a/yarn-project/key-store/src/key_store.ts +++ b/yarn-project/key-store/src/key_store.ts @@ -3,7 +3,7 @@ import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto'; import { Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields'; import { toArray } from '@aztec/foundation/iterable'; import { type Bufferable, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type AztecAsyncKVStore, type AztecAsyncMap } from '@aztec/kv-store'; +import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { CompleteAddress, type PartialAddress } from '@aztec/stdlib/contract'; import { KeyValidationRequest } from '@aztec/stdlib/kernel'; diff --git a/yarn-project/kv-store/src/config.ts b/yarn-project/kv-store/src/config.ts index 659f6a183b72..729254522c28 100644 --- a/yarn-project/kv-store/src/config.ts +++ b/yarn-project/kv-store/src/config.ts @@ -1,6 +1,6 @@ import { l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresses'; import { type ConfigMappingsType, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config'; -import { type EthAddress } from '@aztec/foundation/eth-address'; +import type { EthAddress } from '@aztec/foundation/eth-address'; export type DataStoreConfig = { dataDirectory: string | undefined; diff --git a/yarn-project/kv-store/src/indexeddb/array.ts b/yarn-project/kv-store/src/indexeddb/array.ts index f1297143ae22..ac9af264e587 100644 --- a/yarn-project/kv-store/src/indexeddb/array.ts +++ b/yarn-project/kv-store/src/indexeddb/array.ts @@ -1,7 +1,7 @@ -import { type IDBPDatabase, type IDBPObjectStore } from 'idb'; +import type { IDBPDatabase, IDBPObjectStore } from 'idb'; -import { type AztecAsyncArray } from '../interfaces/array.js'; -import { type AztecIDBSchema } from './store.js'; +import type { AztecAsyncArray } from '../interfaces/array.js'; +import type { AztecIDBSchema } from './store.js'; /** * A persistent array backed by IndexedDB. diff --git a/yarn-project/kv-store/src/indexeddb/index.ts b/yarn-project/kv-store/src/indexeddb/index.ts index 3b2075519413..065b1611b514 100644 --- a/yarn-project/kv-store/src/indexeddb/index.ts +++ b/yarn-project/kv-store/src/indexeddb/index.ts @@ -1,6 +1,6 @@ import { type Logger, createLogger } from '@aztec/foundation/log'; -import { type DataStoreConfig } from '../config.js'; +import type { DataStoreConfig } from '../config.js'; import { initStoreForRollup } from '../utils.js'; import { AztecIndexedDBStore } from './store.js'; diff --git a/yarn-project/kv-store/src/indexeddb/map.ts b/yarn-project/kv-store/src/indexeddb/map.ts index 5002877b6c67..0c3a604d1ccc 100644 --- a/yarn-project/kv-store/src/indexeddb/map.ts +++ b/yarn-project/kv-store/src/indexeddb/map.ts @@ -1,8 +1,8 @@ -import { type IDBPDatabase, type IDBPObjectStore } from 'idb'; +import type { IDBPDatabase, IDBPObjectStore } from 'idb'; -import { type Key, type Range } from '../interfaces/common.js'; -import { type AztecAsyncMultiMap } from '../interfaces/map.js'; -import { type AztecIDBSchema } from './store.js'; +import type { Key, Range } from '../interfaces/common.js'; +import type { AztecAsyncMultiMap } from '../interfaces/map.js'; +import type { AztecIDBSchema } from './store.js'; /** * A map backed by IndexedDB. diff --git a/yarn-project/kv-store/src/indexeddb/set.ts b/yarn-project/kv-store/src/indexeddb/set.ts index c4c4db9a306f..f67198e495df 100644 --- a/yarn-project/kv-store/src/indexeddb/set.ts +++ b/yarn-project/kv-store/src/indexeddb/set.ts @@ -1,9 +1,9 @@ -import { type IDBPDatabase, type IDBPObjectStore } from 'idb'; +import type { IDBPDatabase, IDBPObjectStore } from 'idb'; -import { type Key, type Range } from '../interfaces/common.js'; -import { type AztecAsyncSet } from '../interfaces/set.js'; +import type { Key, Range } from '../interfaces/common.js'; +import type { AztecAsyncSet } from '../interfaces/set.js'; import { IndexedDBAztecMap } from './map.js'; -import { type AztecIDBSchema } from './store.js'; +import type { AztecIDBSchema } from './store.js'; /** * A set backed by IndexedDB. diff --git a/yarn-project/kv-store/src/indexeddb/singleton.ts b/yarn-project/kv-store/src/indexeddb/singleton.ts index 19750cfbdb61..b0e3d45aa7b3 100644 --- a/yarn-project/kv-store/src/indexeddb/singleton.ts +++ b/yarn-project/kv-store/src/indexeddb/singleton.ts @@ -1,7 +1,7 @@ -import { type IDBPDatabase, type IDBPObjectStore } from 'idb'; +import type { IDBPDatabase, IDBPObjectStore } from 'idb'; -import { type AztecAsyncSingleton } from '../interfaces/singleton.js'; -import { type AztecIDBSchema } from './store.js'; +import type { AztecAsyncSingleton } from '../interfaces/singleton.js'; +import type { AztecIDBSchema } from './store.js'; /** * Stores a single value in IndexedDB. diff --git a/yarn-project/kv-store/src/indexeddb/store.ts b/yarn-project/kv-store/src/indexeddb/store.ts index 05b0c9e75877..d921a5f0cb97 100644 --- a/yarn-project/kv-store/src/indexeddb/store.ts +++ b/yarn-project/kv-store/src/indexeddb/store.ts @@ -1,14 +1,14 @@ -import { type Logger } from '@aztec/foundation/log'; +import type { Logger } from '@aztec/foundation/log'; import { type DBSchema, type IDBPDatabase, deleteDB, openDB } from 'idb'; -import { type AztecAsyncArray } from '../interfaces/array.js'; -import { type Key, type StoreSize } from '../interfaces/common.js'; -import { type AztecAsyncCounter } from '../interfaces/counter.js'; -import { type AztecAsyncMap, type AztecAsyncMultiMap } from '../interfaces/map.js'; -import { type AztecAsyncSet } from '../interfaces/set.js'; -import { type AztecAsyncSingleton } from '../interfaces/singleton.js'; -import { type AztecAsyncKVStore } from '../interfaces/store.js'; +import type { AztecAsyncArray } from '../interfaces/array.js'; +import type { Key, StoreSize } from '../interfaces/common.js'; +import type { AztecAsyncCounter } from '../interfaces/counter.js'; +import type { AztecAsyncMap, AztecAsyncMultiMap } from '../interfaces/map.js'; +import type { AztecAsyncSet } from '../interfaces/set.js'; +import type { AztecAsyncSingleton } from '../interfaces/singleton.js'; +import type { AztecAsyncKVStore } from '../interfaces/store.js'; import { IndexedDBAztecArray } from './array.js'; import { IndexedDBAztecMap } from './map.js'; import { IndexedDBAztecSet } from './set.js'; diff --git a/yarn-project/kv-store/src/interfaces/array_test_suite.ts b/yarn-project/kv-store/src/interfaces/array_test_suite.ts index 552e7201cf17..4dfe5d2c9bb5 100644 --- a/yarn-project/kv-store/src/interfaces/array_test_suite.ts +++ b/yarn-project/kv-store/src/interfaces/array_test_suite.ts @@ -2,8 +2,8 @@ import { toArray } from '@aztec/foundation/iterable'; import { expect } from 'chai'; -import { type AztecArray, type AztecAsyncArray } from './array.js'; -import { type AztecAsyncKVStore, type AztecKVStore } from './store.js'; +import type { AztecArray, AztecAsyncArray } from './array.js'; +import type { AztecAsyncKVStore, AztecKVStore } from './store.js'; import { isSyncStore } from './utils.js'; export function describeAztecArray( diff --git a/yarn-project/kv-store/src/interfaces/counter.ts b/yarn-project/kv-store/src/interfaces/counter.ts index 2b94a2ff8475..9ffbacd6987c 100644 --- a/yarn-project/kv-store/src/interfaces/counter.ts +++ b/yarn-project/kv-store/src/interfaces/counter.ts @@ -1,4 +1,4 @@ -import { type Key, type Range } from './common.js'; +import type { Key, Range } from './common.js'; /** * A map that counts how many times it sees a key. Once 0 is reached, that key is removed from the map. diff --git a/yarn-project/kv-store/src/interfaces/map.ts b/yarn-project/kv-store/src/interfaces/map.ts index bc594588db54..4a2169656f5a 100644 --- a/yarn-project/kv-store/src/interfaces/map.ts +++ b/yarn-project/kv-store/src/interfaces/map.ts @@ -1,4 +1,4 @@ -import { type Key, type Range } from './common.js'; +import type { Key, Range } from './common.js'; /** * A map backed by a persistent store. diff --git a/yarn-project/kv-store/src/interfaces/map_test_suite.ts b/yarn-project/kv-store/src/interfaces/map_test_suite.ts index 881aff90f9f0..c6419890d3a6 100644 --- a/yarn-project/kv-store/src/interfaces/map_test_suite.ts +++ b/yarn-project/kv-store/src/interfaces/map_test_suite.ts @@ -2,9 +2,9 @@ import { toArray } from '@aztec/foundation/iterable'; import { expect } from 'chai'; -import { type Key, type Range } from './common.js'; -import { type AztecAsyncMap, type AztecAsyncMultiMap, type AztecMap, type AztecMultiMap } from './map.js'; -import { type AztecAsyncKVStore, type AztecKVStore } from './store.js'; +import type { Key, Range } from './common.js'; +import type { AztecAsyncMap, AztecAsyncMultiMap, AztecMap, AztecMultiMap } from './map.js'; +import type { AztecAsyncKVStore, AztecKVStore } from './store.js'; import { isSyncStore } from './utils.js'; export function describeAztecMap( diff --git a/yarn-project/kv-store/src/interfaces/set.ts b/yarn-project/kv-store/src/interfaces/set.ts index a37f0d2ea202..909c9252517e 100644 --- a/yarn-project/kv-store/src/interfaces/set.ts +++ b/yarn-project/kv-store/src/interfaces/set.ts @@ -1,4 +1,4 @@ -import { type Key, type Range } from './common.js'; +import type { Key, Range } from './common.js'; /** * A set backed by a persistent store. diff --git a/yarn-project/kv-store/src/interfaces/set_test_suite.ts b/yarn-project/kv-store/src/interfaces/set_test_suite.ts index ad2de503f313..22f2753e3060 100644 --- a/yarn-project/kv-store/src/interfaces/set_test_suite.ts +++ b/yarn-project/kv-store/src/interfaces/set_test_suite.ts @@ -2,9 +2,9 @@ import { toArray } from '@aztec/foundation/iterable'; import { expect } from 'chai'; -import { type Range } from './common.js'; -import { type AztecAsyncSet, type AztecSet } from './set.js'; -import { type AztecAsyncKVStore, type AztecKVStore } from './store.js'; +import type { Range } from './common.js'; +import type { AztecAsyncSet, AztecSet } from './set.js'; +import type { AztecAsyncKVStore, AztecKVStore } from './store.js'; import { isSyncStore } from './utils.js'; export function describeAztecSet( diff --git a/yarn-project/kv-store/src/interfaces/singleton_test_suite.ts b/yarn-project/kv-store/src/interfaces/singleton_test_suite.ts index 6ecaa24522dd..2bcec48bdaf5 100644 --- a/yarn-project/kv-store/src/interfaces/singleton_test_suite.ts +++ b/yarn-project/kv-store/src/interfaces/singleton_test_suite.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; -import { type AztecAsyncSingleton, type AztecSingleton } from './singleton.js'; -import { type AztecAsyncKVStore, type AztecKVStore } from './store.js'; +import type { AztecAsyncSingleton, AztecSingleton } from './singleton.js'; +import type { AztecAsyncKVStore, AztecKVStore } from './store.js'; import { isSyncStore } from './utils.js'; export function describeAztecSingleton( diff --git a/yarn-project/kv-store/src/interfaces/store.ts b/yarn-project/kv-store/src/interfaces/store.ts index 176628645da6..b45dcec7996f 100644 --- a/yarn-project/kv-store/src/interfaces/store.ts +++ b/yarn-project/kv-store/src/interfaces/store.ts @@ -1,16 +1,16 @@ -import { type AztecArray, type AztecAsyncArray } from './array.js'; -import { type Key, type StoreSize } from './common.js'; -import { type AztecAsyncCounter, type AztecCounter } from './counter.js'; -import { - type AztecAsyncMap, - type AztecAsyncMultiMap, - type AztecMap, - type AztecMapWithSize, - type AztecMultiMap, - type AztecMultiMapWithSize, +import type { AztecArray, AztecAsyncArray } from './array.js'; +import type { Key, StoreSize } from './common.js'; +import type { AztecAsyncCounter, AztecCounter } from './counter.js'; +import type { + AztecAsyncMap, + AztecAsyncMultiMap, + AztecMap, + AztecMapWithSize, + AztecMultiMap, + AztecMultiMapWithSize, } from './map.js'; -import { type AztecAsyncSet, type AztecSet } from './set.js'; -import { type AztecAsyncSingleton, type AztecSingleton } from './singleton.js'; +import type { AztecAsyncSet, AztecSet } from './set.js'; +import type { AztecAsyncSingleton, AztecSingleton } from './singleton.js'; /** A key-value store */ export interface AztecKVStore { diff --git a/yarn-project/kv-store/src/interfaces/store_test_suite.ts b/yarn-project/kv-store/src/interfaces/store_test_suite.ts index 051504889f00..3e92053d507b 100644 --- a/yarn-project/kv-store/src/interfaces/store_test_suite.ts +++ b/yarn-project/kv-store/src/interfaces/store_test_suite.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; -import { type AztecAsyncSingleton, type AztecSingleton } from './singleton.js'; -import { type AztecAsyncKVStore, type AztecKVStore } from './store.js'; +import type { AztecAsyncSingleton, AztecSingleton } from './singleton.js'; +import type { AztecAsyncKVStore, AztecKVStore } from './store.js'; import { isSyncStore } from './utils.js'; export function describeAztecStore( diff --git a/yarn-project/kv-store/src/interfaces/utils.ts b/yarn-project/kv-store/src/interfaces/utils.ts index bf84fb2e8da0..3bf9213dd198 100644 --- a/yarn-project/kv-store/src/interfaces/utils.ts +++ b/yarn-project/kv-store/src/interfaces/utils.ts @@ -1,4 +1,4 @@ -import { type AztecAsyncKVStore, type AztecKVStore } from './store.js'; +import type { AztecAsyncKVStore, AztecKVStore } from './store.js'; /* eslint-disable no-console */ export const mockLogger = { diff --git a/yarn-project/kv-store/src/lmdb-v2/factory.ts b/yarn-project/kv-store/src/lmdb-v2/factory.ts index 291a5c28f476..80d6da7e55c9 100644 --- a/yarn-project/kv-store/src/lmdb-v2/factory.ts +++ b/yarn-project/kv-store/src/lmdb-v2/factory.ts @@ -5,7 +5,7 @@ import { mkdir, mkdtemp, readFile, rm, writeFile } from 'fs/promises'; import { tmpdir } from 'os'; import { join } from 'path'; -import { type DataStoreConfig } from '../config.js'; +import type { DataStoreConfig } from '../config.js'; import { AztecLMDBStoreV2 } from './store.js'; const ROLLUP_ADDRESS_FILE = 'rollup_address'; diff --git a/yarn-project/kv-store/src/lmdb-v2/map.ts b/yarn-project/kv-store/src/lmdb-v2/map.ts index c0b5141b5b87..15a12b982a8f 100644 --- a/yarn-project/kv-store/src/lmdb-v2/map.ts +++ b/yarn-project/kv-store/src/lmdb-v2/map.ts @@ -2,7 +2,7 @@ import { Encoder } from 'msgpackr'; import type { Key, Range } from '../interfaces/common.js'; import type { AztecAsyncMap, AztecAsyncMultiMap } from '../interfaces/map.js'; -import { type ReadTransaction } from './read_transaction.js'; +import type { ReadTransaction } from './read_transaction.js'; import { type AztecLMDBStoreV2, execInReadTx, execInWriteTx } from './store.js'; import { deserializeKey, maxKey, minKey, serializeKey } from './utils.js'; diff --git a/yarn-project/kv-store/src/lmdb-v2/singleton.ts b/yarn-project/kv-store/src/lmdb-v2/singleton.ts index 46ee72285a6a..a6a892543c12 100644 --- a/yarn-project/kv-store/src/lmdb-v2/singleton.ts +++ b/yarn-project/kv-store/src/lmdb-v2/singleton.ts @@ -1,6 +1,6 @@ import { Encoder } from 'msgpackr'; -import { type AztecAsyncSingleton } from '../interfaces/singleton.js'; +import type { AztecAsyncSingleton } from '../interfaces/singleton.js'; import { type AztecLMDBStoreV2, execInReadTx, execInWriteTx } from './store.js'; import { serializeKey } from './utils.js'; diff --git a/yarn-project/kv-store/src/lmdb-v2/store.test.ts b/yarn-project/kv-store/src/lmdb-v2/store.test.ts index 7209611ffb0e..abaca05ca7a4 100644 --- a/yarn-project/kv-store/src/lmdb-v2/store.test.ts +++ b/yarn-project/kv-store/src/lmdb-v2/store.test.ts @@ -5,8 +5,8 @@ import { expect } from 'chai'; import { stub } from 'sinon'; import { openTmpStore } from './factory.js'; -import { type ReadTransaction } from './read_transaction.js'; -import { type AztecLMDBStoreV2 } from './store.js'; +import type { ReadTransaction } from './read_transaction.js'; +import type { AztecLMDBStoreV2 } from './store.js'; const testMaxReaders = 4; diff --git a/yarn-project/kv-store/src/lmdb-v2/utils.ts b/yarn-project/kv-store/src/lmdb-v2/utils.ts index 1cfa00c04156..71c3081a4b92 100644 --- a/yarn-project/kv-store/src/lmdb-v2/utils.ts +++ b/yarn-project/kv-store/src/lmdb-v2/utils.ts @@ -1,6 +1,6 @@ import { MAXIMUM_KEY, fromBufferKey, toBufferKey } from 'ordered-binary'; -import { type Key } from '../interfaces/common.js'; +import type { Key } from '../interfaces/common.js'; type Cmp = (a: T, b: T) => -1 | 0 | 1; diff --git a/yarn-project/kv-store/src/lmdb/array.ts b/yarn-project/kv-store/src/lmdb/array.ts index 08aa0decda53..5734e4d6ecb0 100644 --- a/yarn-project/kv-store/src/lmdb/array.ts +++ b/yarn-project/kv-store/src/lmdb/array.ts @@ -1,6 +1,6 @@ -import { type Database, type Key } from 'lmdb'; +import type { Database, Key } from 'lmdb'; -import { type AztecArray, type AztecAsyncArray } from '../interfaces/array.js'; +import type { AztecArray, AztecAsyncArray } from '../interfaces/array.js'; import { LmdbAztecSingleton } from './singleton.js'; /** The shape of a key that stores a value in an array */ diff --git a/yarn-project/kv-store/src/lmdb/counter.ts b/yarn-project/kv-store/src/lmdb/counter.ts index 10f564abf779..1819efc41c4e 100644 --- a/yarn-project/kv-store/src/lmdb/counter.ts +++ b/yarn-project/kv-store/src/lmdb/counter.ts @@ -1,7 +1,7 @@ -import { type Key as BaseKey, type Database } from 'lmdb'; +import type { Key as BaseKey, Database } from 'lmdb'; -import { type Key, type Range } from '../interfaces/common.js'; -import { type AztecAsyncCounter, type AztecCounter } from '../interfaces/counter.js'; +import type { Key, Range } from '../interfaces/common.js'; +import type { AztecAsyncCounter, AztecCounter } from '../interfaces/counter.js'; import { LmdbAztecMap } from './map.js'; /** diff --git a/yarn-project/kv-store/src/lmdb/index.ts b/yarn-project/kv-store/src/lmdb/index.ts index 880cb83f3b77..52480360b71e 100644 --- a/yarn-project/kv-store/src/lmdb/index.ts +++ b/yarn-project/kv-store/src/lmdb/index.ts @@ -2,7 +2,7 @@ import { type Logger, createLogger } from '@aztec/foundation/log'; import { join } from 'path'; -import { type DataStoreConfig } from '../config.js'; +import type { DataStoreConfig } from '../config.js'; import { initStoreForRollup } from '../utils.js'; import { AztecLmdbStore } from './store.js'; diff --git a/yarn-project/kv-store/src/lmdb/map.test.ts b/yarn-project/kv-store/src/lmdb/map.test.ts index 2f78d4aca632..bcc5fa12febf 100644 --- a/yarn-project/kv-store/src/lmdb/map.test.ts +++ b/yarn-project/kv-store/src/lmdb/map.test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import { type AztecMapWithSize, type AztecMultiMapWithSize } from '../interfaces/map.js'; +import type { AztecMapWithSize, AztecMultiMapWithSize } from '../interfaces/map.js'; import { describeAztecMap } from '../interfaces/map_test_suite.js'; import { openTmpStore } from './index.js'; diff --git a/yarn-project/kv-store/src/lmdb/map.ts b/yarn-project/kv-store/src/lmdb/map.ts index dd0d9aef0648..9b9843e4e405 100644 --- a/yarn-project/kv-store/src/lmdb/map.ts +++ b/yarn-project/kv-store/src/lmdb/map.ts @@ -1,7 +1,7 @@ -import { type Database, type RangeOptions } from 'lmdb'; +import type { Database, RangeOptions } from 'lmdb'; -import { type Key, type Range } from '../interfaces/common.js'; -import { type AztecAsyncMultiMap, type AztecMapWithSize, type AztecMultiMap } from '../interfaces/map.js'; +import type { Key, Range } from '../interfaces/common.js'; +import type { AztecAsyncMultiMap, AztecMapWithSize, AztecMultiMap } from '../interfaces/map.js'; /** The slot where a key-value entry would be stored */ type MapValueSlot = ['map', string, 'slot', K]; diff --git a/yarn-project/kv-store/src/lmdb/set.ts b/yarn-project/kv-store/src/lmdb/set.ts index f92dce32f4a8..700589a1f9b7 100644 --- a/yarn-project/kv-store/src/lmdb/set.ts +++ b/yarn-project/kv-store/src/lmdb/set.ts @@ -1,7 +1,7 @@ -import { type Database } from 'lmdb'; +import type { Database } from 'lmdb'; -import { type Key, type Range } from '../interfaces/common.js'; -import { type AztecAsyncSet, type AztecSet } from '../interfaces/set.js'; +import type { Key, Range } from '../interfaces/common.js'; +import type { AztecAsyncSet, AztecSet } from '../interfaces/set.js'; import { LmdbAztecMap } from './map.js'; /** diff --git a/yarn-project/kv-store/src/lmdb/singleton.ts b/yarn-project/kv-store/src/lmdb/singleton.ts index 8b4e5d28ff39..ebc052929986 100644 --- a/yarn-project/kv-store/src/lmdb/singleton.ts +++ b/yarn-project/kv-store/src/lmdb/singleton.ts @@ -1,6 +1,6 @@ -import { type Database, type Key } from 'lmdb'; +import type { Database, Key } from 'lmdb'; -import { type AztecAsyncSingleton, type AztecSingleton } from '../interfaces/singleton.js'; +import type { AztecAsyncSingleton, AztecSingleton } from '../interfaces/singleton.js'; /** The slot where this singleton will store its value */ type ValueSlot = ['singleton', string, 'value']; diff --git a/yarn-project/kv-store/src/lmdb/store.ts b/yarn-project/kv-store/src/lmdb/store.ts index 0005a15a741e..18e458bb2582 100644 --- a/yarn-project/kv-store/src/lmdb/store.ts +++ b/yarn-project/kv-store/src/lmdb/store.ts @@ -6,20 +6,20 @@ import { type Database, type RootDatabase, open } from 'lmdb'; import { tmpdir } from 'os'; import { join } from 'path'; -import { type AztecArray, type AztecAsyncArray } from '../interfaces/array.js'; -import { type Key, type StoreSize } from '../interfaces/common.js'; -import { type AztecAsyncCounter, type AztecCounter } from '../interfaces/counter.js'; -import { - type AztecAsyncMap, - type AztecAsyncMultiMap, - type AztecMap, - type AztecMapWithSize, - type AztecMultiMap, - type AztecMultiMapWithSize, +import type { AztecArray, AztecAsyncArray } from '../interfaces/array.js'; +import type { Key, StoreSize } from '../interfaces/common.js'; +import type { AztecAsyncCounter, AztecCounter } from '../interfaces/counter.js'; +import type { + AztecAsyncMap, + AztecAsyncMultiMap, + AztecMap, + AztecMapWithSize, + AztecMultiMap, + AztecMultiMapWithSize, } from '../interfaces/map.js'; -import { type AztecAsyncSet, type AztecSet } from '../interfaces/set.js'; -import { type AztecAsyncSingleton, type AztecSingleton } from '../interfaces/singleton.js'; -import { type AztecAsyncKVStore, type AztecKVStore } from '../interfaces/store.js'; +import type { AztecAsyncSet, AztecSet } from '../interfaces/set.js'; +import type { AztecAsyncSingleton, AztecSingleton } from '../interfaces/singleton.js'; +import type { AztecAsyncKVStore, AztecKVStore } from '../interfaces/store.js'; import { LmdbAztecArray } from './array.js'; import { LmdbAztecCounter } from './counter.js'; import { LmdbAztecMap, LmdbAztecMapWithSize } from './map.js'; diff --git a/yarn-project/kv-store/src/stores/l2_tips_store.test.ts b/yarn-project/kv-store/src/stores/l2_tips_store.test.ts index 3b60e84e10ac..8774759ea04b 100644 --- a/yarn-project/kv-store/src/stores/l2_tips_store.test.ts +++ b/yarn-project/kv-store/src/stores/l2_tips_store.test.ts @@ -1,9 +1,9 @@ import { times } from '@aztec/foundation/collection'; import { Fr } from '@aztec/foundation/fields'; -import { type AztecAsyncKVStore } from '@aztec/kv-store'; +import type { AztecAsyncKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/lmdb-v2'; -import { type L2Block } from '@aztec/stdlib/block'; -import { type BlockHeader } from '@aztec/stdlib/tx'; +import type { L2Block } from '@aztec/stdlib/block'; +import type { BlockHeader } from '@aztec/stdlib/tx'; import { expect } from 'chai'; diff --git a/yarn-project/kv-store/src/stores/l2_tips_store.ts b/yarn-project/kv-store/src/stores/l2_tips_store.ts index b58528ef1dfd..61faeb73e998 100644 --- a/yarn-project/kv-store/src/stores/l2_tips_store.ts +++ b/yarn-project/kv-store/src/stores/l2_tips_store.ts @@ -1,14 +1,14 @@ -import { - type L2BlockId, - type L2BlockStreamEvent, - type L2BlockStreamEventHandler, - type L2BlockStreamLocalDataProvider, - type L2BlockTag, - type L2Tips, +import type { + L2BlockId, + L2BlockStreamEvent, + L2BlockStreamEventHandler, + L2BlockStreamLocalDataProvider, + L2BlockTag, + L2Tips, } from '@aztec/stdlib/block'; -import { type AztecAsyncMap } from '../interfaces/map.js'; -import { type AztecAsyncKVStore } from '../interfaces/store.js'; +import type { AztecAsyncMap } from '../interfaces/map.js'; +import type { AztecAsyncKVStore } from '../interfaces/store.js'; /** Stores currently synced L2 tips and unfinalized block hashes. */ export class L2TipsStore implements L2BlockStreamEventHandler, L2BlockStreamLocalDataProvider { diff --git a/yarn-project/kv-store/src/utils.ts b/yarn-project/kv-store/src/utils.ts index 03e0f327f383..2d5d2c0eca81 100644 --- a/yarn-project/kv-store/src/utils.ts +++ b/yarn-project/kv-store/src/utils.ts @@ -1,8 +1,8 @@ -import { type EthAddress } from '@aztec/foundation/eth-address'; -import { type Logger } from '@aztec/foundation/log'; +import type { EthAddress } from '@aztec/foundation/eth-address'; +import type { Logger } from '@aztec/foundation/log'; -import { type AztecAsyncSingleton, type AztecSingleton } from './interfaces/singleton.js'; -import { type AztecAsyncKVStore, type AztecKVStore } from './interfaces/store.js'; +import type { AztecAsyncSingleton, AztecSingleton } from './interfaces/singleton.js'; +import type { AztecAsyncKVStore, AztecKVStore } from './interfaces/store.js'; import { isSyncStore } from './interfaces/utils.js'; /** diff --git a/yarn-project/merkle-tree/src/hasher_with_stats.ts b/yarn-project/merkle-tree/src/hasher_with_stats.ts index 5f08a9c7e9b5..87e8f171aacf 100644 --- a/yarn-project/merkle-tree/src/hasher_with_stats.ts +++ b/yarn-project/merkle-tree/src/hasher_with_stats.ts @@ -1,4 +1,4 @@ -import { type Hasher } from '@aztec/foundation/trees'; +import type { Hasher } from '@aztec/foundation/trees'; import { createHistogram, performance } from 'perf_hooks'; diff --git a/yarn-project/merkle-tree/src/interfaces/append_only_tree.ts b/yarn-project/merkle-tree/src/interfaces/append_only_tree.ts index bb2cd0db0d72..ebd8656075a2 100644 --- a/yarn-project/merkle-tree/src/interfaces/append_only_tree.ts +++ b/yarn-project/merkle-tree/src/interfaces/append_only_tree.ts @@ -1,7 +1,7 @@ -import { type Bufferable } from '@aztec/foundation/serialize'; +import type { Bufferable } from '@aztec/foundation/serialize'; -import { type TreeSnapshot, type TreeSnapshotBuilder } from '../snapshots/snapshot_builder.js'; -import { type MerkleTree } from './merkle_tree.js'; +import type { TreeSnapshot, TreeSnapshotBuilder } from '../snapshots/snapshot_builder.js'; +import type { MerkleTree } from './merkle_tree.js'; /** * A Merkle tree that supports only appending leaves and not updating existing leaves. diff --git a/yarn-project/merkle-tree/src/interfaces/indexed_tree.ts b/yarn-project/merkle-tree/src/interfaces/indexed_tree.ts index a21a31238cbb..c0d11ec16e21 100644 --- a/yarn-project/merkle-tree/src/interfaces/indexed_tree.ts +++ b/yarn-project/merkle-tree/src/interfaces/indexed_tree.ts @@ -1,13 +1,9 @@ -import { type IndexedTreeLeaf, type IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; -import { type BatchInsertionResult } from '@aztec/stdlib/trees'; +import type { IndexedTreeLeaf, IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import type { BatchInsertionResult } from '@aztec/stdlib/trees'; -import { - type IndexedTreeSnapshot, - type TreeSnapshot, - type TreeSnapshotBuilder, -} from '../snapshots/snapshot_builder.js'; -import { type AppendOnlyTree } from './append_only_tree.js'; -import { type MerkleTree } from './merkle_tree.js'; +import type { IndexedTreeSnapshot, TreeSnapshot, TreeSnapshotBuilder } from '../snapshots/snapshot_builder.js'; +import type { AppendOnlyTree } from './append_only_tree.js'; +import type { MerkleTree } from './merkle_tree.js'; /** * Factory for creating leaf preimages. diff --git a/yarn-project/merkle-tree/src/interfaces/merkle_tree.ts b/yarn-project/merkle-tree/src/interfaces/merkle_tree.ts index a979f6f69ad3..ae2ccd11de75 100644 --- a/yarn-project/merkle-tree/src/interfaces/merkle_tree.ts +++ b/yarn-project/merkle-tree/src/interfaces/merkle_tree.ts @@ -1,5 +1,5 @@ -import { type Bufferable } from '@aztec/foundation/serialize'; -import { type SiblingPath } from '@aztec/foundation/trees'; +import type { Bufferable } from '@aztec/foundation/serialize'; +import type { SiblingPath } from '@aztec/foundation/trees'; /** * Defines the interface for a source of sibling paths. diff --git a/yarn-project/merkle-tree/src/interfaces/update_only_tree.ts b/yarn-project/merkle-tree/src/interfaces/update_only_tree.ts index 06c142edbe26..676e449b5aeb 100644 --- a/yarn-project/merkle-tree/src/interfaces/update_only_tree.ts +++ b/yarn-project/merkle-tree/src/interfaces/update_only_tree.ts @@ -1,7 +1,7 @@ -import { type Bufferable } from '@aztec/foundation/serialize'; +import type { Bufferable } from '@aztec/foundation/serialize'; -import { type TreeSnapshot, type TreeSnapshotBuilder } from '../snapshots/snapshot_builder.js'; -import { type MerkleTree } from './merkle_tree.js'; +import type { TreeSnapshot, TreeSnapshotBuilder } from '../snapshots/snapshot_builder.js'; +import type { MerkleTree } from './merkle_tree.js'; /** * A Merkle tree that supports updates at arbitrary indices but not appending. diff --git a/yarn-project/merkle-tree/src/load_tree.ts b/yarn-project/merkle-tree/src/load_tree.ts index fdb9bece0b36..751d0ed96c45 100644 --- a/yarn-project/merkle-tree/src/load_tree.ts +++ b/yarn-project/merkle-tree/src/load_tree.ts @@ -1,6 +1,6 @@ -import { type Bufferable, type FromBuffer } from '@aztec/foundation/serialize'; -import { type Hasher } from '@aztec/foundation/trees'; -import { type AztecKVStore } from '@aztec/kv-store'; +import type { Bufferable, FromBuffer } from '@aztec/foundation/serialize'; +import type { Hasher } from '@aztec/foundation/trees'; +import type { AztecKVStore } from '@aztec/kv-store'; import { type TreeBase, getTreeMeta } from './tree_base.js'; diff --git a/yarn-project/merkle-tree/src/new_tree.ts b/yarn-project/merkle-tree/src/new_tree.ts index 97eb07d8a034..76e376c3c337 100644 --- a/yarn-project/merkle-tree/src/new_tree.ts +++ b/yarn-project/merkle-tree/src/new_tree.ts @@ -1,8 +1,8 @@ -import { type Bufferable, type FromBuffer } from '@aztec/foundation/serialize'; -import { type Hasher } from '@aztec/foundation/trees'; -import { type AztecKVStore } from '@aztec/kv-store'; +import type { Bufferable, FromBuffer } from '@aztec/foundation/serialize'; +import type { Hasher } from '@aztec/foundation/trees'; +import type { AztecKVStore } from '@aztec/kv-store'; -import { type TreeBase } from './tree_base.js'; +import type { TreeBase } from './tree_base.js'; /** * Creates a new tree. diff --git a/yarn-project/merkle-tree/src/pedersen.ts b/yarn-project/merkle-tree/src/pedersen.ts index 536e7167e535..6adc73ccb487 100644 --- a/yarn-project/merkle-tree/src/pedersen.ts +++ b/yarn-project/merkle-tree/src/pedersen.ts @@ -1,6 +1,6 @@ import { pedersenHash } from '@aztec/foundation/crypto/sync'; import { Fr } from '@aztec/foundation/fields'; -import { type Hasher } from '@aztec/foundation/trees'; +import type { Hasher } from '@aztec/foundation/trees'; /** * A helper class encapsulating Pedersen hash functionality. diff --git a/yarn-project/merkle-tree/src/poseidon.ts b/yarn-project/merkle-tree/src/poseidon.ts index c9ea6c729dce..ade22f735e42 100644 --- a/yarn-project/merkle-tree/src/poseidon.ts +++ b/yarn-project/merkle-tree/src/poseidon.ts @@ -1,6 +1,6 @@ import { poseidon2Hash } from '@aztec/foundation/crypto/sync'; import { Fr } from '@aztec/foundation/fields'; -import { type Hasher } from '@aztec/foundation/trees'; +import type { Hasher } from '@aztec/foundation/trees'; /** * A helper class encapsulating poseidon2 hash functionality. diff --git a/yarn-project/merkle-tree/src/sha_256.ts b/yarn-project/merkle-tree/src/sha_256.ts index b53dbdd0e4f5..5d92f297f330 100644 --- a/yarn-project/merkle-tree/src/sha_256.ts +++ b/yarn-project/merkle-tree/src/sha_256.ts @@ -1,6 +1,6 @@ import { sha256 } from '@aztec/foundation/crypto'; import { truncateAndPad } from '@aztec/foundation/serialize'; -import { type Hasher } from '@aztec/foundation/trees'; +import type { Hasher } from '@aztec/foundation/trees'; /** * A helper class encapsulating SHA256 hash functionality. diff --git a/yarn-project/merkle-tree/src/snapshots/append_only_snapshot.test.ts b/yarn-project/merkle-tree/src/snapshots/append_only_snapshot.test.ts index 094953b0661b..27f67d14b824 100644 --- a/yarn-project/merkle-tree/src/snapshots/append_only_snapshot.test.ts +++ b/yarn-project/merkle-tree/src/snapshots/append_only_snapshot.test.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; -import { type FromBuffer } from '@aztec/foundation/serialize'; -import { type AztecKVStore } from '@aztec/kv-store'; +import type { FromBuffer } from '@aztec/foundation/serialize'; +import type { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/lmdb'; import { Pedersen, StandardTree, newTree } from '../index.js'; diff --git a/yarn-project/merkle-tree/src/snapshots/append_only_snapshot.ts b/yarn-project/merkle-tree/src/snapshots/append_only_snapshot.ts index 4c8c4eb99e9a..6e0613052158 100644 --- a/yarn-project/merkle-tree/src/snapshots/append_only_snapshot.ts +++ b/yarn-project/merkle-tree/src/snapshots/append_only_snapshot.ts @@ -1,11 +1,11 @@ import { type Bufferable, type FromBuffer, serializeToBuffer } from '@aztec/foundation/serialize'; import { SiblingPath } from '@aztec/foundation/trees'; -import { type Hasher } from '@aztec/foundation/trees'; -import { type AztecKVStore, type AztecMap } from '@aztec/kv-store'; +import type { Hasher } from '@aztec/foundation/trees'; +import type { AztecKVStore, AztecMap } from '@aztec/kv-store'; -import { type AppendOnlyTree } from '../interfaces/append_only_tree.js'; -import { type TreeBase } from '../tree_base.js'; -import { type TreeSnapshot, type TreeSnapshotBuilder } from './snapshot_builder.js'; +import type { AppendOnlyTree } from '../interfaces/append_only_tree.js'; +import type { TreeBase } from '../tree_base.js'; +import type { TreeSnapshot, TreeSnapshotBuilder } from './snapshot_builder.js'; // stores the last block that modified this node const nodeModifiedAtBlockKey = (level: number, index: bigint) => `node:${level}:${index}:modifiedAtBlock`; diff --git a/yarn-project/merkle-tree/src/snapshots/base_full_snapshot.ts b/yarn-project/merkle-tree/src/snapshots/base_full_snapshot.ts index 41b74252c345..48d0701e7bc8 100644 --- a/yarn-project/merkle-tree/src/snapshots/base_full_snapshot.ts +++ b/yarn-project/merkle-tree/src/snapshots/base_full_snapshot.ts @@ -1,9 +1,9 @@ import { type Bufferable, type FromBuffer, serializeToBuffer } from '@aztec/foundation/serialize'; import { SiblingPath } from '@aztec/foundation/trees'; -import { type AztecKVStore, type AztecMap } from '@aztec/kv-store'; +import type { AztecKVStore, AztecMap } from '@aztec/kv-store'; -import { type TreeBase } from '../tree_base.js'; -import { type TreeSnapshot, type TreeSnapshotBuilder } from './snapshot_builder.js'; +import type { TreeBase } from '../tree_base.js'; +import type { TreeSnapshot, TreeSnapshotBuilder } from './snapshot_builder.js'; /** * Metadata for a snapshot, per block diff --git a/yarn-project/merkle-tree/src/snapshots/full_snapshot.test.ts b/yarn-project/merkle-tree/src/snapshots/full_snapshot.test.ts index 35b0a3a9c4af..6dc800708505 100644 --- a/yarn-project/merkle-tree/src/snapshots/full_snapshot.test.ts +++ b/yarn-project/merkle-tree/src/snapshots/full_snapshot.test.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; -import { type FromBuffer } from '@aztec/foundation/serialize'; -import { type AztecKVStore } from '@aztec/kv-store'; +import type { FromBuffer } from '@aztec/foundation/serialize'; +import type { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/lmdb'; import { Pedersen, StandardTree, newTree } from '../index.js'; diff --git a/yarn-project/merkle-tree/src/snapshots/full_snapshot.ts b/yarn-project/merkle-tree/src/snapshots/full_snapshot.ts index dc519325f267..66ba2728b8c0 100644 --- a/yarn-project/merkle-tree/src/snapshots/full_snapshot.ts +++ b/yarn-project/merkle-tree/src/snapshots/full_snapshot.ts @@ -1,9 +1,9 @@ -import { type Bufferable, type FromBuffer } from '@aztec/foundation/serialize'; -import { type AztecKVStore } from '@aztec/kv-store'; +import type { Bufferable, FromBuffer } from '@aztec/foundation/serialize'; +import type { AztecKVStore } from '@aztec/kv-store'; -import { type TreeBase } from '../tree_base.js'; +import type { TreeBase } from '../tree_base.js'; import { BaseFullTreeSnapshot, BaseFullTreeSnapshotBuilder } from './base_full_snapshot.js'; -import { type TreeSnapshot, type TreeSnapshotBuilder } from './snapshot_builder.js'; +import type { TreeSnapshot, TreeSnapshotBuilder } from './snapshot_builder.js'; /** * Builds a full snapshot of a tree. This implementation works for any Merkle tree and stores diff --git a/yarn-project/merkle-tree/src/snapshots/indexed_tree_snapshot.test.ts b/yarn-project/merkle-tree/src/snapshots/indexed_tree_snapshot.test.ts index 6b623445e01a..c722a8950ee9 100644 --- a/yarn-project/merkle-tree/src/snapshots/indexed_tree_snapshot.test.ts +++ b/yarn-project/merkle-tree/src/snapshots/indexed_tree_snapshot.test.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; -import { type Hasher } from '@aztec/foundation/trees'; -import { type AztecKVStore } from '@aztec/kv-store'; +import type { Hasher } from '@aztec/foundation/trees'; +import type { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/lmdb'; import { NullifierLeaf, NullifierLeafPreimage } from '@aztec/stdlib/trees'; diff --git a/yarn-project/merkle-tree/src/snapshots/indexed_tree_snapshot.ts b/yarn-project/merkle-tree/src/snapshots/indexed_tree_snapshot.ts index 1d70549450da..6eebaf9ce39f 100644 --- a/yarn-project/merkle-tree/src/snapshots/indexed_tree_snapshot.ts +++ b/yarn-project/merkle-tree/src/snapshots/indexed_tree_snapshot.ts @@ -1,10 +1,10 @@ -import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; -import { type AztecKVStore, type AztecMap } from '@aztec/kv-store'; +import type { IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import type { AztecKVStore, AztecMap } from '@aztec/kv-store'; -import { type IndexedTree, type PreimageFactory } from '../interfaces/indexed_tree.js'; -import { type TreeBase } from '../tree_base.js'; +import type { IndexedTree, PreimageFactory } from '../interfaces/indexed_tree.js'; +import type { TreeBase } from '../tree_base.js'; import { BaseFullTreeSnapshot, BaseFullTreeSnapshotBuilder } from './base_full_snapshot.js'; -import { type IndexedTreeSnapshot, type TreeSnapshotBuilder } from './snapshot_builder.js'; +import type { IndexedTreeSnapshot, TreeSnapshotBuilder } from './snapshot_builder.js'; const snapshotLeafValue = (node: Buffer, index: bigint) => 'snapshot:leaf:' + node.toString('hex') + ':' + index; diff --git a/yarn-project/merkle-tree/src/snapshots/snapshot_builder.ts b/yarn-project/merkle-tree/src/snapshots/snapshot_builder.ts index 1b03b9b6396c..0575fb60bb8a 100644 --- a/yarn-project/merkle-tree/src/snapshots/snapshot_builder.ts +++ b/yarn-project/merkle-tree/src/snapshots/snapshot_builder.ts @@ -1,5 +1,5 @@ -import { type Bufferable } from '@aztec/foundation/serialize'; -import { type IndexedTreeLeafPreimage, type SiblingPath } from '@aztec/foundation/trees'; +import type { Bufferable } from '@aztec/foundation/serialize'; +import type { IndexedTreeLeafPreimage, SiblingPath } from '@aztec/foundation/trees'; /** * An interface for a tree that can record snapshots of its contents. diff --git a/yarn-project/merkle-tree/src/snapshots/snapshot_builder_test_suite.ts b/yarn-project/merkle-tree/src/snapshots/snapshot_builder_test_suite.ts index b1bcd9a8fa1c..bfc12df1808a 100644 --- a/yarn-project/merkle-tree/src/snapshots/snapshot_builder_test_suite.ts +++ b/yarn-project/merkle-tree/src/snapshots/snapshot_builder_test_suite.ts @@ -1,10 +1,10 @@ import { randomBigInt } from '@aztec/foundation/crypto'; -import { type Bufferable } from '@aztec/foundation/serialize'; +import type { Bufferable } from '@aztec/foundation/serialize'; import { jest } from '@jest/globals'; -import { type TreeBase } from '../tree_base.js'; -import { type TreeSnapshot, type TreeSnapshotBuilder } from './snapshot_builder.js'; +import type { TreeBase } from '../tree_base.js'; +import type { TreeSnapshot, TreeSnapshotBuilder } from './snapshot_builder.js'; jest.setTimeout(50_000); diff --git a/yarn-project/merkle-tree/src/sparse_tree/sparse_tree.test.ts b/yarn-project/merkle-tree/src/sparse_tree/sparse_tree.test.ts index bc623fff2bfc..a9dd52de1965 100644 --- a/yarn-project/merkle-tree/src/sparse_tree/sparse_tree.test.ts +++ b/yarn-project/merkle-tree/src/sparse_tree/sparse_tree.test.ts @@ -2,12 +2,12 @@ import { randomBigInt } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; import { SiblingPath } from '@aztec/foundation/trees'; -import { type Hasher } from '@aztec/foundation/trees'; -import { type AztecKVStore } from '@aztec/kv-store'; +import type { Hasher } from '@aztec/foundation/trees'; +import type { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/lmdb'; import { INITIAL_LEAF, newTree } from '../index.js'; -import { type UpdateOnlyTree } from '../interfaces/update_only_tree.js'; +import type { UpdateOnlyTree } from '../interfaces/update_only_tree.js'; import { loadTree } from '../load_tree.js'; import { Pedersen } from '../pedersen.js'; import { standardBasedTreeTestSuite } from '../test/standard_based_test_suite.js'; diff --git a/yarn-project/merkle-tree/src/sparse_tree/sparse_tree.ts b/yarn-project/merkle-tree/src/sparse_tree/sparse_tree.ts index 3ea1a8d9eb64..e291ba42c1ef 100644 --- a/yarn-project/merkle-tree/src/sparse_tree/sparse_tree.ts +++ b/yarn-project/merkle-tree/src/sparse_tree/sparse_tree.ts @@ -1,8 +1,8 @@ import { type Bufferable, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type UpdateOnlyTree } from '../interfaces/update_only_tree.js'; +import type { UpdateOnlyTree } from '../interfaces/update_only_tree.js'; import { FullTreeSnapshotBuilder } from '../snapshots/full_snapshot.js'; -import { type TreeSnapshot } from '../snapshots/snapshot_builder.js'; +import type { TreeSnapshot } from '../snapshots/snapshot_builder.js'; import { INITIAL_LEAF, TreeBase } from '../tree_base.js'; /** diff --git a/yarn-project/merkle-tree/src/standard_indexed_tree/standard_indexed_tree.ts b/yarn-project/merkle-tree/src/standard_indexed_tree/standard_indexed_tree.ts index a46283b528e5..648c86fe4ea5 100644 --- a/yarn-project/merkle-tree/src/standard_indexed_tree/standard_indexed_tree.ts +++ b/yarn-project/merkle-tree/src/standard_indexed_tree/standard_indexed_tree.ts @@ -1,15 +1,15 @@ import { toBufferBE } from '@aztec/foundation/bigint-buffer'; -import { type FromBuffer } from '@aztec/foundation/serialize'; +import type { FromBuffer } from '@aztec/foundation/serialize'; import { Timer } from '@aztec/foundation/timer'; import { SiblingPath } from '@aztec/foundation/trees'; -import { type Hasher, type IndexedTreeLeaf, type IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; -import { type AztecKVStore, type AztecMap } from '@aztec/kv-store'; -import { type TreeInsertionStats } from '@aztec/stdlib/stats'; +import type { Hasher, IndexedTreeLeaf, IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import type { AztecKVStore, AztecMap } from '@aztec/kv-store'; +import type { TreeInsertionStats } from '@aztec/stdlib/stats'; import type { BatchInsertionResult, LeafUpdateWitnessData } from '@aztec/stdlib/trees'; -import { type IndexedTree, type PreimageFactory } from '../interfaces/indexed_tree.js'; +import type { IndexedTree, PreimageFactory } from '../interfaces/indexed_tree.js'; import { IndexedTreeSnapshotBuilder } from '../snapshots/indexed_tree_snapshot.js'; -import { type IndexedTreeSnapshot } from '../snapshots/snapshot_builder.js'; +import type { IndexedTreeSnapshot } from '../snapshots/snapshot_builder.js'; import { TreeBase } from '../tree_base.js'; export const buildDbKeyForPreimage = (name: string, index: bigint) => { diff --git a/yarn-project/merkle-tree/src/standard_indexed_tree/test/standard_indexed_tree.test.ts b/yarn-project/merkle-tree/src/standard_indexed_tree/test/standard_indexed_tree.test.ts index ffe401855231..22ddaef16449 100644 --- a/yarn-project/merkle-tree/src/standard_indexed_tree/test/standard_indexed_tree.test.ts +++ b/yarn-project/merkle-tree/src/standard_indexed_tree/test/standard_indexed_tree.test.ts @@ -1,9 +1,9 @@ import { toBufferBE } from '@aztec/foundation/bigint-buffer'; import { Fr } from '@aztec/foundation/fields'; -import { type FromBuffer } from '@aztec/foundation/serialize'; +import type { FromBuffer } from '@aztec/foundation/serialize'; import { SiblingPath } from '@aztec/foundation/trees'; -import { type Hasher } from '@aztec/foundation/trees'; -import { type AztecKVStore } from '@aztec/kv-store'; +import type { Hasher } from '@aztec/foundation/trees'; +import type { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/lmdb'; import { NullifierLeaf, diff --git a/yarn-project/merkle-tree/src/standard_tree/standard_tree.test.ts b/yarn-project/merkle-tree/src/standard_tree/standard_tree.test.ts index 750bdf9314b5..9f4fa81cad51 100644 --- a/yarn-project/merkle-tree/src/standard_tree/standard_tree.test.ts +++ b/yarn-project/merkle-tree/src/standard_tree/standard_tree.test.ts @@ -1,7 +1,7 @@ import { Fr } from '@aztec/foundation/fields'; -import { type FromBuffer } from '@aztec/foundation/serialize'; -import { type Hasher } from '@aztec/foundation/trees'; -import { type AztecKVStore } from '@aztec/kv-store'; +import type { FromBuffer } from '@aztec/foundation/serialize'; +import type { Hasher } from '@aztec/foundation/trees'; +import type { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/lmdb'; import { loadTree } from '../load_tree.js'; diff --git a/yarn-project/merkle-tree/src/standard_tree/standard_tree.ts b/yarn-project/merkle-tree/src/standard_tree/standard_tree.ts index 8140ec253817..954426a4e8ac 100644 --- a/yarn-project/merkle-tree/src/standard_tree/standard_tree.ts +++ b/yarn-project/merkle-tree/src/standard_tree/standard_tree.ts @@ -1,10 +1,10 @@ import { type Bufferable, serializeToBuffer } from '@aztec/foundation/serialize'; import { Timer } from '@aztec/foundation/timer'; -import { type TreeInsertionStats } from '@aztec/stdlib/stats'; +import type { TreeInsertionStats } from '@aztec/stdlib/stats'; -import { type AppendOnlyTree } from '../interfaces/append_only_tree.js'; +import type { AppendOnlyTree } from '../interfaces/append_only_tree.js'; import { AppendOnlySnapshotBuilder } from '../snapshots/append_only_snapshot.js'; -import { type TreeSnapshot } from '../snapshots/snapshot_builder.js'; +import type { TreeSnapshot } from '../snapshots/snapshot_builder.js'; import { TreeBase } from '../tree_base.js'; /** diff --git a/yarn-project/merkle-tree/src/test/standard_based_test_suite.ts b/yarn-project/merkle-tree/src/test/standard_based_test_suite.ts index 44fb4bb97195..eea1dcea4fd7 100644 --- a/yarn-project/merkle-tree/src/test/standard_based_test_suite.ts +++ b/yarn-project/merkle-tree/src/test/standard_based_test_suite.ts @@ -1,12 +1,12 @@ import { Fr } from '@aztec/foundation/fields'; import { SiblingPath } from '@aztec/foundation/trees'; -import { type Hasher } from '@aztec/foundation/trees'; -import { type AztecKVStore } from '@aztec/kv-store'; +import type { Hasher } from '@aztec/foundation/trees'; +import type { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/lmdb'; import { INITIAL_LEAF, Pedersen } from '../index.js'; -import { type AppendOnlyTree } from '../interfaces/append_only_tree.js'; -import { type UpdateOnlyTree } from '../interfaces/update_only_tree.js'; +import type { AppendOnlyTree } from '../interfaces/append_only_tree.js'; +import type { UpdateOnlyTree } from '../interfaces/update_only_tree.js'; import { appendLeaves } from './utils/append_leaves.js'; const TEST_TREE_DEPTH = 2; diff --git a/yarn-project/merkle-tree/src/test/test_suite.ts b/yarn-project/merkle-tree/src/test/test_suite.ts index a14439a61b13..de1e0fe3aea0 100644 --- a/yarn-project/merkle-tree/src/test/test_suite.ts +++ b/yarn-project/merkle-tree/src/test/test_suite.ts @@ -1,11 +1,11 @@ import { SiblingPath } from '@aztec/foundation/trees'; -import { type Hasher } from '@aztec/foundation/trees'; -import { type AztecKVStore } from '@aztec/kv-store'; +import type { Hasher } from '@aztec/foundation/trees'; +import type { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/lmdb'; import { Pedersen } from '../index.js'; -import { type AppendOnlyTree } from '../interfaces/append_only_tree.js'; -import { type UpdateOnlyTree } from '../interfaces/update_only_tree.js'; +import type { AppendOnlyTree } from '../interfaces/append_only_tree.js'; +import type { UpdateOnlyTree } from '../interfaces/update_only_tree.js'; import { appendLeaves } from './utils/append_leaves.js'; const expectSameTrees = async ( diff --git a/yarn-project/merkle-tree/src/test/utils/append_leaves.ts b/yarn-project/merkle-tree/src/test/utils/append_leaves.ts index 81c07c741657..3d9a4eb1e897 100644 --- a/yarn-project/merkle-tree/src/test/utils/append_leaves.ts +++ b/yarn-project/merkle-tree/src/test/utils/append_leaves.ts @@ -1,5 +1,5 @@ -import { type AppendOnlyTree } from '../../interfaces/append_only_tree.js'; -import { type UpdateOnlyTree } from '../../interfaces/update_only_tree.js'; +import type { AppendOnlyTree } from '../../interfaces/append_only_tree.js'; +import type { UpdateOnlyTree } from '../../interfaces/update_only_tree.js'; export const appendLeaves = async (tree: AppendOnlyTree | UpdateOnlyTree, leaves: Buffer[]) => { if ('appendLeaves' in tree) { diff --git a/yarn-project/merkle-tree/src/tree_base.ts b/yarn-project/merkle-tree/src/tree_base.ts index 5a21cc48e045..5502c058a5a9 100644 --- a/yarn-project/merkle-tree/src/tree_base.ts +++ b/yarn-project/merkle-tree/src/tree_base.ts @@ -2,10 +2,10 @@ import { toBigIntLE, toBufferLE } from '@aztec/foundation/bigint-buffer'; import { type Logger, createLogger } from '@aztec/foundation/log'; import { type Bufferable, type FromBuffer, serializeToBuffer } from '@aztec/foundation/serialize'; import { type Hasher, SiblingPath } from '@aztec/foundation/trees'; -import { type AztecKVStore, type AztecMap, type AztecSingleton } from '@aztec/kv-store'; +import type { AztecKVStore, AztecMap, AztecSingleton } from '@aztec/kv-store'; import { HasherWithStats } from './hasher_with_stats.js'; -import { type MerkleTree } from './interfaces/merkle_tree.js'; +import type { MerkleTree } from './interfaces/merkle_tree.js'; const MAX_DEPTH = 254; diff --git a/yarn-project/merkle-tree/src/unbalanced_tree.test.ts b/yarn-project/merkle-tree/src/unbalanced_tree.test.ts index 7afb23dfa6a2..4aa1b02fb83f 100644 --- a/yarn-project/merkle-tree/src/unbalanced_tree.test.ts +++ b/yarn-project/merkle-tree/src/unbalanced_tree.test.ts @@ -1,7 +1,7 @@ import { sha256Trunc } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; -import { type FromBuffer } from '@aztec/foundation/serialize'; -import { type Hasher } from '@aztec/foundation/trees'; +import type { FromBuffer } from '@aztec/foundation/serialize'; +import type { Hasher } from '@aztec/foundation/trees'; import { openTmpStore } from '@aztec/kv-store/lmdb'; import { SHA256Trunc } from './sha_256.js'; diff --git a/yarn-project/merkle-tree/src/unbalanced_tree.ts b/yarn-project/merkle-tree/src/unbalanced_tree.ts index cc7f5a9506b9..2d97bdafd74d 100644 --- a/yarn-project/merkle-tree/src/unbalanced_tree.ts +++ b/yarn-project/merkle-tree/src/unbalanced_tree.ts @@ -1,9 +1,9 @@ import { type Bufferable, type FromBuffer, serializeToBuffer } from '@aztec/foundation/serialize'; import { SiblingPath } from '@aztec/foundation/trees'; -import { type Hasher } from '@aztec/foundation/trees'; +import type { Hasher } from '@aztec/foundation/trees'; import { HasherWithStats } from './hasher_with_stats.js'; -import { type MerkleTree } from './interfaces/merkle_tree.js'; +import type { MerkleTree } from './interfaces/merkle_tree.js'; const indexToKeyHash = (name: string, level: number, index: bigint) => `${name}:${level}:${index}`; diff --git a/yarn-project/native/src/native_module.ts b/yarn-project/native/src/native_module.ts index 9a7a486e348d..8674058371ec 100644 --- a/yarn-project/native/src/native_module.ts +++ b/yarn-project/native/src/native_module.ts @@ -1,6 +1,6 @@ import bindings from 'bindings'; -import { type MessageReceiver } from './msgpack_channel.js'; +import type { MessageReceiver } from './msgpack_channel.js'; interface NativeClassCtor { new (...args: unknown[]): MessageReceiver; diff --git a/yarn-project/noir-protocol-circuits-types/src/artifacts/client/bundle.ts b/yarn-project/noir-protocol-circuits-types/src/artifacts/client/bundle.ts index 92a9b6e1f58e..210980cb25e5 100644 --- a/yarn-project/noir-protocol-circuits-types/src/artifacts/client/bundle.ts +++ b/yarn-project/noir-protocol-circuits-types/src/artifacts/client/bundle.ts @@ -1,4 +1,4 @@ -import { type NoirCompiledCircuit } from '@aztec/stdlib/noir'; +import type { NoirCompiledCircuit } from '@aztec/stdlib/noir'; import PrivateKernelInitJson from '../../../artifacts/private_kernel_init.json' assert { type: 'json' }; import PrivateKernelInitSimulatedJson from '../../../artifacts/private_kernel_init_simulated.json' assert { type: 'json' }; @@ -9,7 +9,7 @@ import PrivateKernelTailSimulatedJson from '../../../artifacts/private_kernel_ta import PrivateKernelTailToPublicJson from '../../../artifacts/private_kernel_tail_to_public.json' assert { type: 'json' }; import PrivateKernelTailToPublicSimulatedJson from '../../../artifacts/private_kernel_tail_to_public_simulated.json' assert { type: 'json' }; import { PrivateKernelResetArtifacts, PrivateKernelResetSimulatedArtifacts } from '../../private_kernel_reset_data.js'; -import { type ArtifactProvider, type ClientProtocolArtifact } from '../types.js'; +import type { ArtifactProvider, ClientProtocolArtifact } from '../types.js'; export const ClientCircuitArtifacts: Record = { PrivateKernelInitArtifact: PrivateKernelInitJson as NoirCompiledCircuit, diff --git a/yarn-project/noir-protocol-circuits-types/src/artifacts/client/lazy.ts b/yarn-project/noir-protocol-circuits-types/src/artifacts/client/lazy.ts index c4006a4ef440..a1a4b4eac303 100644 --- a/yarn-project/noir-protocol-circuits-types/src/artifacts/client/lazy.ts +++ b/yarn-project/noir-protocol-circuits-types/src/artifacts/client/lazy.ts @@ -1,7 +1,7 @@ -import { type NoirCompiledCircuit } from '@aztec/stdlib/noir'; +import type { NoirCompiledCircuit } from '@aztec/stdlib/noir'; import { ClientCircuitArtifactNames, getClientCircuitArtifact } from '../../client_artifacts_helper.js'; -import { type ArtifactProvider, type ClientProtocolArtifact } from '../types.js'; +import type { ArtifactProvider, ClientProtocolArtifact } from '../types.js'; export class LazyArtifactProvider implements ArtifactProvider { getClientCircuitArtifactByName(artifact: ClientProtocolArtifact): Promise { diff --git a/yarn-project/noir-protocol-circuits-types/src/artifacts/server.ts b/yarn-project/noir-protocol-circuits-types/src/artifacts/server.ts index fecb1459e6ca..1f39846c1ca4 100644 --- a/yarn-project/noir-protocol-circuits-types/src/artifacts/server.ts +++ b/yarn-project/noir-protocol-circuits-types/src/artifacts/server.ts @@ -1,4 +1,4 @@ -import { type NoirCompiledCircuit } from '@aztec/stdlib/noir'; +import type { NoirCompiledCircuit } from '@aztec/stdlib/noir'; import BaseParityJson from '../../artifacts/parity_base.json' assert { type: 'json' }; import RootParityJson from '../../artifacts/parity_root.json' assert { type: 'json' }; @@ -14,7 +14,7 @@ import SingleTxBlockRootRollupJson from '../../artifacts/rollup_block_root_singl import SingleTxBlockRootRollupSimulatedJson from '../../artifacts/rollup_block_root_single_tx_simulated.json' assert { type: 'json' }; import MergeRollupJson from '../../artifacts/rollup_merge.json' assert { type: 'json' }; import RootRollupJson from '../../artifacts/rollup_root.json' assert { type: 'json' }; -import { type ServerProtocolArtifact } from './types.js'; +import type { ServerProtocolArtifact } from './types.js'; export const ServerCircuitArtifacts: Record = { BaseParityArtifact: BaseParityJson as NoirCompiledCircuit, diff --git a/yarn-project/noir-protocol-circuits-types/src/artifacts/types.ts b/yarn-project/noir-protocol-circuits-types/src/artifacts/types.ts index d98c335c7d7b..a8127d667e14 100644 --- a/yarn-project/noir-protocol-circuits-types/src/artifacts/types.ts +++ b/yarn-project/noir-protocol-circuits-types/src/artifacts/types.ts @@ -1,6 +1,6 @@ -import { type NoirCompiledCircuit } from '@aztec/stdlib/noir'; +import type { NoirCompiledCircuit } from '@aztec/stdlib/noir'; -import { type PrivateResetArtifact } from '../private_kernel_reset_types.js'; +import type { PrivateResetArtifact } from '../private_kernel_reset_types.js'; export type ClientProtocolArtifact = | 'PrivateKernelInitArtifact' diff --git a/yarn-project/noir-protocol-circuits-types/src/artifacts/vks.ts b/yarn-project/noir-protocol-circuits-types/src/artifacts/vks.ts index 8dd56aa1e0ae..1f8e5a041a44 100644 --- a/yarn-project/noir-protocol-circuits-types/src/artifacts/vks.ts +++ b/yarn-project/noir-protocol-circuits-types/src/artifacts/vks.ts @@ -33,7 +33,7 @@ import RootRollupVkJson from '../../artifacts/keys/rollup_root.vk.data.json' ass import TubeVkJson from '../../artifacts/keys/tube.vk.data.json' assert { type: 'json' }; import { PrivateKernelResetVkIndexes, PrivateKernelResetVks } from '../private_kernel_reset_vks.js'; import { keyJsonToVKData } from '../utils/vk_json.js'; -import { type ClientProtocolArtifact, type ProtocolArtifact, type ServerProtocolArtifact } from './types.js'; +import type { ClientProtocolArtifact, ProtocolArtifact, ServerProtocolArtifact } from './types.js'; // TODO Include this in the normal maps when the tube is implemented in noir export const TubeVk = keyJsonToVKData(TubeVkJson); diff --git a/yarn-project/noir-protocol-circuits-types/src/conversion/client.ts b/yarn-project/noir-protocol-circuits-types/src/conversion/client.ts index baef913dba3f..2110ed0a53c9 100644 --- a/yarn-project/noir-protocol-circuits-types/src/conversion/client.ts +++ b/yarn-project/noir-protocol-circuits-types/src/conversion/client.ts @@ -54,7 +54,7 @@ import { TransientDataIndexHint, } from '@aztec/stdlib/kernel'; import type { PublicKeys } from '@aztec/stdlib/keys'; -import { type NullifierLeafPreimage } from '@aztec/stdlib/trees'; +import type { NullifierLeafPreimage } from '@aztec/stdlib/trees'; import { CallContext, FunctionData, TxConstantData, TxRequest } from '@aztec/stdlib/tx'; import type { diff --git a/yarn-project/noir-protocol-circuits-types/src/execution/client.ts b/yarn-project/noir-protocol-circuits-types/src/execution/client.ts index 0645f9d5706c..9f313a69b4f7 100644 --- a/yarn-project/noir-protocol-circuits-types/src/execution/client.ts +++ b/yarn-project/noir-protocol-circuits-types/src/execution/client.ts @@ -1,16 +1,16 @@ import { pushTestData } from '@aztec/foundation/testing'; -import { - type PrivateKernelCircuitPublicInputs, - type PrivateKernelInitCircuitPrivateInputs, - type PrivateKernelInnerCircuitPrivateInputs, - type PrivateKernelResetCircuitPrivateInputsVariants, - type PrivateKernelTailCircuitPrivateInputs, - type PrivateKernelTailCircuitPublicInputs, +import type { + PrivateKernelCircuitPublicInputs, + PrivateKernelInitCircuitPrivateInputs, + PrivateKernelInnerCircuitPrivateInputs, + PrivateKernelResetCircuitPrivateInputsVariants, + PrivateKernelTailCircuitPrivateInputs, + PrivateKernelTailCircuitPublicInputs, } from '@aztec/stdlib/kernel'; -import { type WitnessMap } from '@noir-lang/acvm_js'; +import type { WitnessMap } from '@noir-lang/acvm_js'; import { abiDecode, abiEncode } from '@noir-lang/noirc_abi'; -import { type Abi, type InputMap } from '@noir-lang/types'; +import type { Abi, InputMap } from '@noir-lang/types'; import { mapPrivateCallDataToNoir, @@ -24,18 +24,18 @@ import { mapTxRequestToNoir, } from '../conversion/client.js'; import { mapFieldToNoir } from '../conversion/common.js'; -import { - type PrivateKernelInitInputType, - type PrivateKernelInitReturnType, - type PrivateKernelInnerInputType, - type PrivateKernelInnerReturnType, - type PrivateKernelResetReturnType, - type PrivateKernelTailInputType, - type PrivateKernelTailReturnType, - type PrivateKernelTailToPublicInputType, - type PrivateKernelTailToPublicReturnType, +import type { + PrivateKernelInitInputType, + PrivateKernelInitReturnType, + PrivateKernelInnerInputType, + PrivateKernelInnerReturnType, + PrivateKernelResetReturnType, + PrivateKernelTailInputType, + PrivateKernelTailReturnType, + PrivateKernelTailToPublicInputType, + PrivateKernelTailToPublicReturnType, } from '../types/index.js'; -import { type DecodedInputs } from '../utils/decoded_inputs.js'; +import type { DecodedInputs } from '../utils/decoded_inputs.js'; /* eslint-disable camelcase */ diff --git a/yarn-project/noir-protocol-circuits-types/src/execution/server.ts b/yarn-project/noir-protocol-circuits-types/src/execution/server.ts index 3a62b3f753d9..6ae81d44279b 100644 --- a/yarn-project/noir-protocol-circuits-types/src/execution/server.ts +++ b/yarn-project/noir-protocol-circuits-types/src/execution/server.ts @@ -1,20 +1,20 @@ import { pushTestData } from '@aztec/foundation/testing'; -import { type BaseParityInputs, type ParityPublicInputs, type RootParityInputs } from '@aztec/stdlib/parity'; -import { - type BaseOrMergeRollupPublicInputs, - type BlockMergeRollupInputs, - type BlockRootOrBlockMergePublicInputs, - type BlockRootRollupInputs, - type EmptyBlockRootRollupInputs, - type MergeRollupInputs, - type PrivateBaseRollupInputs, - type PublicBaseRollupInputs, - type RootRollupInputs, - type RootRollupPublicInputs, - type SingleTxBlockRootRollupInputs, +import type { BaseParityInputs, ParityPublicInputs, RootParityInputs } from '@aztec/stdlib/parity'; +import type { + BaseOrMergeRollupPublicInputs, + BlockMergeRollupInputs, + BlockRootOrBlockMergePublicInputs, + BlockRootRollupInputs, + EmptyBlockRootRollupInputs, + MergeRollupInputs, + PrivateBaseRollupInputs, + PublicBaseRollupInputs, + RootRollupInputs, + RootRollupPublicInputs, + SingleTxBlockRootRollupInputs, } from '@aztec/stdlib/rollup'; -import { type WitnessMap } from '@noir-lang/acvm_js'; +import type { WitnessMap } from '@noir-lang/acvm_js'; import { abiDecode, abiEncode } from '@noir-lang/noirc_abi'; import { ServerCircuitArtifacts, SimulatedServerCircuitArtifacts } from '../artifacts/server.js'; @@ -34,19 +34,19 @@ import { mapRootRollupPublicInputsFromNoir, mapSingleTxBlockRootRollupInputsToNoir, } from '../conversion/server.js'; -import { - type ParityBaseReturnType, - type ParityRootReturnType, - type RollupBasePrivateReturnType, - type RollupBasePublicReturnType, - type RollupBlockMergeReturnType, - type RollupBlockRootEmptyReturnType, - type RollupBlockRootReturnType, - type RollupBlockRootSingleTxReturnType, - type RollupMergeReturnType, - type RollupRootReturnType, +import type { + ParityBaseReturnType, + ParityRootReturnType, + RollupBasePrivateReturnType, + RollupBasePublicReturnType, + RollupBlockMergeReturnType, + RollupBlockRootEmptyReturnType, + RollupBlockRootReturnType, + RollupBlockRootSingleTxReturnType, + RollupMergeReturnType, + RollupRootReturnType, } from '../types/index.js'; -import { type DecodedInputs } from '../utils/decoded_inputs.js'; +import type { DecodedInputs } from '../utils/decoded_inputs.js'; /** * Converts the inputs of the base parity circuit into a witness map. diff --git a/yarn-project/noir-protocol-circuits-types/src/scripts/generate_client_artifacts_helper.ts b/yarn-project/noir-protocol-circuits-types/src/scripts/generate_client_artifacts_helper.ts index 997dc5c2b454..b012b8f22484 100644 --- a/yarn-project/noir-protocol-circuits-types/src/scripts/generate_client_artifacts_helper.ts +++ b/yarn-project/noir-protocol-circuits-types/src/scripts/generate_client_artifacts_helper.ts @@ -19,8 +19,8 @@ const ClientCircuitArtifactNames: Record = { function generateImports() { return ` - import { type NoirCompiledCircuit } from '@aztec/stdlib/noir'; - import { type ClientProtocolArtifact } from './artifacts/types.js'; + import type { NoirCompiledCircuit } from '@aztec/stdlib/noir'; + import type { ClientProtocolArtifact } from './artifacts/types.js'; `; } diff --git a/yarn-project/noir-protocol-circuits-types/src/scripts/generate_private_kernel_reset_data.ts b/yarn-project/noir-protocol-circuits-types/src/scripts/generate_private_kernel_reset_data.ts index ecfbbcf477dd..b95bdd296416 100644 --- a/yarn-project/noir-protocol-circuits-types/src/scripts/generate_private_kernel_reset_data.ts +++ b/yarn-project/noir-protocol-circuits-types/src/scripts/generate_private_kernel_reset_data.ts @@ -40,18 +40,18 @@ function generateTypeFileImports() { function generateVkFileImports() { return ` - import { type VerificationKeyData } from '@aztec/stdlib/vks'; + import type { VerificationKeyData } from '@aztec/stdlib/vks'; import { keyJsonToVKData } from './utils/vk_json.js'; - import { type PrivateResetArtifact } from './private_kernel_reset_types.js'; + import type { PrivateResetArtifact } from './private_kernel_reset_types.js'; `; } function generateDataFileImports() { return ` - import { type NoirCompiledCircuit } from '@aztec/stdlib/noir'; + import type { NoirCompiledCircuit } from '@aztec/stdlib/noir'; - import { type PrivateResetArtifact } from './private_kernel_reset_types.js'; + import type { PrivateResetArtifact } from './private_kernel_reset_types.js'; `; } diff --git a/yarn-project/noir-protocol-circuits-types/src/utils/client/foreign_call_handler.ts b/yarn-project/noir-protocol-circuits-types/src/utils/client/foreign_call_handler.ts index 70871ec14f99..911059f46b64 100644 --- a/yarn-project/noir-protocol-circuits-types/src/utils/client/foreign_call_handler.ts +++ b/yarn-project/noir-protocol-circuits-types/src/utils/client/foreign_call_handler.ts @@ -1,7 +1,7 @@ import { Fr } from '@aztec/foundation/fields'; import { applyStringFormatting, createLogger } from '@aztec/foundation/log'; -import { type ForeignCallInput, type ForeignCallOutput } from '@noir-lang/acvm_js'; +import type { ForeignCallInput, ForeignCallOutput } from '@noir-lang/acvm_js'; import { strict as assert } from 'assert'; function fromACVMField(field: string): Fr { diff --git a/yarn-project/noir-protocol-circuits-types/src/utils/server/foreign_call_handler.ts b/yarn-project/noir-protocol-circuits-types/src/utils/server/foreign_call_handler.ts index 67872683bd17..5c4e26317daf 100644 --- a/yarn-project/noir-protocol-circuits-types/src/utils/server/foreign_call_handler.ts +++ b/yarn-project/noir-protocol-circuits-types/src/utils/server/foreign_call_handler.ts @@ -2,7 +2,7 @@ import { Blob, BlockBlobPublicInputs, SpongeBlob } from '@aztec/blob-lib'; import { Fr } from '@aztec/foundation/fields'; import { applyStringFormatting, createLogger } from '@aztec/foundation/log'; -import { type ForeignCallInput, type ForeignCallOutput } from '@noir-lang/acvm_js'; +import type { ForeignCallInput, ForeignCallOutput } from '@noir-lang/acvm_js'; import { strict as assert } from 'assert'; function fromACVMField(field: string): Fr { diff --git a/yarn-project/p2p/src/bootstrap/bootstrap.ts b/yarn-project/p2p/src/bootstrap/bootstrap.ts index efa90b516608..8cf3c9b25489 100644 --- a/yarn-project/p2p/src/bootstrap/bootstrap.ts +++ b/yarn-project/p2p/src/bootstrap/bootstrap.ts @@ -1,6 +1,6 @@ import { createLogger } from '@aztec/foundation/log'; -import { type AztecAsyncKVStore } from '@aztec/kv-store'; -import { type P2PBootstrapApi } from '@aztec/stdlib/interfaces/server'; +import type { AztecAsyncKVStore } from '@aztec/kv-store'; +import type { P2PBootstrapApi } from '@aztec/stdlib/interfaces/server'; import { OtelMetricsAdapter, type TelemetryClient } from '@aztec/telemetry-client'; import { Discv5, type Discv5EventEmitter } from '@chainsafe/discv5'; diff --git a/yarn-project/p2p/src/client/factory.ts b/yarn-project/p2p/src/client/factory.ts index aaafb0c8b8d2..307e4c68401e 100644 --- a/yarn-project/p2p/src/client/factory.ts +++ b/yarn-project/p2p/src/client/factory.ts @@ -1,18 +1,18 @@ -import { type EpochCacheInterface } from '@aztec/epoch-cache'; +import type { EpochCacheInterface } from '@aztec/epoch-cache'; import { type Logger, createLogger } from '@aztec/foundation/log'; -import { type AztecAsyncKVStore } from '@aztec/kv-store'; -import { type DataStoreConfig } from '@aztec/kv-store/config'; +import type { AztecAsyncKVStore } from '@aztec/kv-store'; +import type { DataStoreConfig } from '@aztec/kv-store/config'; import { createStore } from '@aztec/kv-store/lmdb-v2'; -import { type L2BlockSource } from '@aztec/stdlib/block'; -import { type ClientProtocolCircuitVerifier, type WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server'; +import type { L2BlockSource } from '@aztec/stdlib/block'; +import type { ClientProtocolCircuitVerifier, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server'; import { P2PClientType } from '@aztec/stdlib/p2p'; import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client'; import { P2PClient } from '../client/p2p_client.js'; -import { type P2PConfig } from '../config.js'; -import { type AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js'; +import type { P2PConfig } from '../config.js'; +import type { AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js'; import { InMemoryAttestationPool } from '../mem_pools/attestation_pool/memory_attestation_pool.js'; -import { type MemPools } from '../mem_pools/interface.js'; +import type { MemPools } from '../mem_pools/interface.js'; import { AztecKVTxPool, type TxPool } from '../mem_pools/tx_pool/index.js'; import { DiscV5Service } from '../services/discv5/discV5_service.js'; import { DummyP2PService } from '../services/dummy_service.js'; diff --git a/yarn-project/p2p/src/client/p2p_client.integration.test.ts b/yarn-project/p2p/src/client/p2p_client.integration.test.ts index 11c0ae2ab025..f6f939b82428 100644 --- a/yarn-project/p2p/src/client/p2p_client.integration.test.ts +++ b/yarn-project/p2p/src/client/p2p_client.integration.test.ts @@ -1,19 +1,19 @@ // An integration test for the p2p client to test req resp protocols -import { type EpochCache } from '@aztec/epoch-cache'; +import type { EpochCache } from '@aztec/epoch-cache'; import { sleep } from '@aztec/foundation/sleep'; import { emptyChainConfig } from '@aztec/stdlib/config'; -import { type WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server'; +import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server'; import { PeerErrorSeverity } from '@aztec/stdlib/p2p'; import { mockTx } from '@aztec/stdlib/testing'; -import { type Tx } from '@aztec/stdlib/tx'; +import type { Tx } from '@aztec/stdlib/tx'; import { describe, expect, it, jest } from '@jest/globals'; import { type MockProxy, mock } from 'jest-mock-extended'; -import { type P2PClient } from '../client/p2p_client.js'; +import type { P2PClient } from '../client/p2p_client.js'; import { type P2PConfig, getP2PDefaultConfig } from '../config.js'; -import { type AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js'; -import { type TxPool } from '../mem_pools/tx_pool/index.js'; +import type { AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js'; +import type { TxPool } from '../mem_pools/tx_pool/index.js'; import { makeTestP2PClients } from '../test-helpers/make-test-p2p-clients.js'; const TEST_TIMEOUT = 80000; diff --git a/yarn-project/p2p/src/client/p2p_client.test.ts b/yarn-project/p2p/src/client/p2p_client.test.ts index 71dbefc44be5..186371a12c82 100644 --- a/yarn-project/p2p/src/client/p2p_client.test.ts +++ b/yarn-project/p2p/src/client/p2p_client.test.ts @@ -2,7 +2,7 @@ import { MockL2BlockSource } from '@aztec/archiver/test'; import { Fr } from '@aztec/foundation/fields'; import { retryUntil } from '@aztec/foundation/retry'; import { sleep } from '@aztec/foundation/sleep'; -import { type AztecAsyncKVStore } from '@aztec/kv-store'; +import type { AztecAsyncKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/lmdb-v2'; import { L2Block } from '@aztec/stdlib/block'; import { P2PClientType } from '@aztec/stdlib/p2p'; @@ -11,10 +11,10 @@ import { mockTx } from '@aztec/stdlib/testing'; import { expect } from '@jest/globals'; import { type MockProxy, mock } from 'jest-mock-extended'; -import { type P2PService } from '../index.js'; -import { type AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js'; -import { type MemPools } from '../mem_pools/interface.js'; -import { type TxPool } from '../mem_pools/tx_pool/index.js'; +import type { P2PService } from '../index.js'; +import type { AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js'; +import type { MemPools } from '../mem_pools/interface.js'; +import type { TxPool } from '../mem_pools/tx_pool/index.js'; import { P2PClient } from './p2p_client.js'; describe('In-Memory P2P Client', () => { diff --git a/yarn-project/p2p/src/client/p2p_client.ts b/yarn-project/p2p/src/client/p2p_client.ts index 091c8d2b467e..7ecbb8eae567 100644 --- a/yarn-project/p2p/src/client/p2p_client.ts +++ b/yarn-project/p2p/src/client/p2p_client.ts @@ -1,16 +1,10 @@ import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants'; import { createLogger } from '@aztec/foundation/log'; -import { type AztecAsyncKVStore, type AztecAsyncMap, type AztecAsyncSingleton } from '@aztec/kv-store'; -import { - type L2Block, - type L2BlockId, - type L2BlockSource, - type L2BlockStreamEvent, - type L2Tips, -} from '@aztec/stdlib/block'; -import { type P2PApi, type PeerInfo, type ProverCoordination } from '@aztec/stdlib/interfaces/server'; -import { type BlockAttestation, type BlockProposal, type P2PClientType } from '@aztec/stdlib/p2p'; -import { type Tx, type TxHash } from '@aztec/stdlib/tx'; +import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncSingleton } from '@aztec/kv-store'; +import type { L2Block, L2BlockId, L2BlockSource, L2BlockStreamEvent, L2Tips } from '@aztec/stdlib/block'; +import type { P2PApi, PeerInfo, ProverCoordination } from '@aztec/stdlib/interfaces/server'; +import type { BlockAttestation, BlockProposal, P2PClientType } from '@aztec/stdlib/p2p'; +import type { Tx, TxHash } from '@aztec/stdlib/tx'; import { Attributes, type TelemetryClient, @@ -20,12 +14,12 @@ import { trackSpan, } from '@aztec/telemetry-client'; -import { type ENR } from '@chainsafe/enr'; +import type { ENR } from '@chainsafe/enr'; import { type P2PConfig, getP2PDefaultConfig } from '../config.js'; -import { type AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js'; -import { type MemPools } from '../mem_pools/interface.js'; -import { type TxPool } from '../mem_pools/tx_pool/index.js'; +import type { AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js'; +import type { MemPools } from '../mem_pools/interface.js'; +import type { TxPool } from '../mem_pools/tx_pool/index.js'; import { ReqRespSubProtocol } from '../services/reqresp/interface.js'; import type { P2PService } from '../services/service.js'; diff --git a/yarn-project/p2p/src/mem_pools/attestation_pool/attestation_pool.ts b/yarn-project/p2p/src/mem_pools/attestation_pool/attestation_pool.ts index 2ec0a902b838..f57c9214f0a0 100644 --- a/yarn-project/p2p/src/mem_pools/attestation_pool/attestation_pool.ts +++ b/yarn-project/p2p/src/mem_pools/attestation_pool/attestation_pool.ts @@ -1,4 +1,4 @@ -import { type BlockAttestation } from '@aztec/stdlib/p2p'; +import type { BlockAttestation } from '@aztec/stdlib/p2p'; /** * An Attestation Pool contains attestations collected by a validator diff --git a/yarn-project/p2p/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts b/yarn-project/p2p/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts index 549589bdfda8..953fe0340f97 100644 --- a/yarn-project/p2p/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts +++ b/yarn-project/p2p/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts @@ -1,13 +1,13 @@ import { Secp256k1Signer } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; -import { type BlockAttestation } from '@aztec/stdlib/p2p'; +import type { BlockAttestation } from '@aztec/stdlib/p2p'; import { TxHash } from '@aztec/stdlib/tx'; import { jest } from '@jest/globals'; import { type MockProxy, mock } from 'jest-mock-extended'; -import { type PoolInstrumentation } from '../instrumentation.js'; -import { type AttestationPool } from './attestation_pool.js'; +import type { PoolInstrumentation } from '../instrumentation.js'; +import type { AttestationPool } from './attestation_pool.js'; import { mockAttestation } from './mocks.js'; const NUMBER_OF_SIGNERS_PER_TEST = 4; diff --git a/yarn-project/p2p/src/mem_pools/attestation_pool/kv_attestation_pool.test.ts b/yarn-project/p2p/src/mem_pools/attestation_pool/kv_attestation_pool.test.ts index 94cf14c2cc3c..edfc6bc15153 100644 --- a/yarn-project/p2p/src/mem_pools/attestation_pool/kv_attestation_pool.test.ts +++ b/yarn-project/p2p/src/mem_pools/attestation_pool/kv_attestation_pool.test.ts @@ -1,4 +1,4 @@ -import { type AztecAsyncKVStore } from '@aztec/kv-store'; +import type { AztecAsyncKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/lmdb-v2'; import { describeAttestationPool } from './attestation_pool_test_suite.js'; diff --git a/yarn-project/p2p/src/mem_pools/attestation_pool/kv_attestation_pool.ts b/yarn-project/p2p/src/mem_pools/attestation_pool/kv_attestation_pool.ts index ff5850dd3671..67885edb7d14 100644 --- a/yarn-project/p2p/src/mem_pools/attestation_pool/kv_attestation_pool.ts +++ b/yarn-project/p2p/src/mem_pools/attestation_pool/kv_attestation_pool.ts @@ -1,12 +1,12 @@ import { Fr } from '@aztec/foundation/fields'; import { toArray } from '@aztec/foundation/iterable'; import { createLogger } from '@aztec/foundation/log'; -import { type AztecAsyncKVStore, type AztecAsyncMap, type AztecAsyncMultiMap } from '@aztec/kv-store'; +import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncMultiMap } from '@aztec/kv-store'; import { BlockAttestation } from '@aztec/stdlib/p2p'; import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client'; import { PoolInstrumentation, PoolName } from '../instrumentation.js'; -import { type AttestationPool } from './attestation_pool.js'; +import type { AttestationPool } from './attestation_pool.js'; export class KvAttestationPool implements AttestationPool { private metrics: PoolInstrumentation; diff --git a/yarn-project/p2p/src/mem_pools/attestation_pool/memory_attestation_pool.ts b/yarn-project/p2p/src/mem_pools/attestation_pool/memory_attestation_pool.ts index 7ac23f3f7164..818eab790d48 100644 --- a/yarn-project/p2p/src/mem_pools/attestation_pool/memory_attestation_pool.ts +++ b/yarn-project/p2p/src/mem_pools/attestation_pool/memory_attestation_pool.ts @@ -1,9 +1,9 @@ import { createLogger } from '@aztec/foundation/log'; -import { type BlockAttestation } from '@aztec/stdlib/p2p'; +import type { BlockAttestation } from '@aztec/stdlib/p2p'; import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client'; import { PoolInstrumentation, PoolName } from '../instrumentation.js'; -import { type AttestationPool } from './attestation_pool.js'; +import type { AttestationPool } from './attestation_pool.js'; export class InMemoryAttestationPool implements AttestationPool { private metrics: PoolInstrumentation; diff --git a/yarn-project/p2p/src/mem_pools/attestation_pool/mocks.ts b/yarn-project/p2p/src/mem_pools/attestation_pool/mocks.ts index 4d3d297e3128..37176f8033ed 100644 --- a/yarn-project/p2p/src/mem_pools/attestation_pool/mocks.ts +++ b/yarn-project/p2p/src/mem_pools/attestation_pool/mocks.ts @@ -1,4 +1,4 @@ -import { type Secp256k1Signer } from '@aztec/foundation/crypto'; +import type { Secp256k1Signer } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; import { BlockAttestation, diff --git a/yarn-project/p2p/src/mem_pools/instrumentation.ts b/yarn-project/p2p/src/mem_pools/instrumentation.ts index 8af506cf48ea..8b196c3b9d4b 100644 --- a/yarn-project/p2p/src/mem_pools/instrumentation.ts +++ b/yarn-project/p2p/src/mem_pools/instrumentation.ts @@ -1,4 +1,4 @@ -import { type Gossipable } from '@aztec/stdlib/p2p'; +import type { Gossipable } from '@aztec/stdlib/p2p'; import { Attributes, type Histogram, diff --git a/yarn-project/p2p/src/mem_pools/interface.ts b/yarn-project/p2p/src/mem_pools/interface.ts index 256247836b59..b48c0fc441ed 100644 --- a/yarn-project/p2p/src/mem_pools/interface.ts +++ b/yarn-project/p2p/src/mem_pools/interface.ts @@ -1,7 +1,7 @@ -import { type P2PClientType } from '@aztec/stdlib/p2p'; +import type { P2PClientType } from '@aztec/stdlib/p2p'; -import { type AttestationPool } from './attestation_pool/attestation_pool.js'; -import { type TxPool } from './tx_pool/tx_pool.js'; +import type { AttestationPool } from './attestation_pool/attestation_pool.js'; +import type { TxPool } from './tx_pool/tx_pool.js'; /** * A interface the combines all mempools diff --git a/yarn-project/p2p/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts b/yarn-project/p2p/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts index 2ec931d8253b..4f43a1531b10 100644 --- a/yarn-project/p2p/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts +++ b/yarn-project/p2p/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts @@ -2,13 +2,13 @@ import { toArray } from '@aztec/foundation/iterable'; import { type Logger, createLogger } from '@aztec/foundation/log'; import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncMultiMap } from '@aztec/kv-store'; import { ClientIvcProof } from '@aztec/stdlib/proofs'; -import { type TxAddedToPoolStats } from '@aztec/stdlib/stats'; +import type { TxAddedToPoolStats } from '@aztec/stdlib/stats'; import { Tx, TxHash } from '@aztec/stdlib/tx'; import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client'; import { PoolInstrumentation, PoolName } from '../instrumentation.js'; import { getPendingTxPriority } from './priority.js'; -import { type TxPool } from './tx_pool.js'; +import type { TxPool } from './tx_pool.js'; /** * KV implementation of the Transaction Pool. diff --git a/yarn-project/p2p/src/mem_pools/tx_pool/memory_tx_pool.ts b/yarn-project/p2p/src/mem_pools/tx_pool/memory_tx_pool.ts index 7d46f54bc6d3..d516888d7a4e 100644 --- a/yarn-project/p2p/src/mem_pools/tx_pool/memory_tx_pool.ts +++ b/yarn-project/p2p/src/mem_pools/tx_pool/memory_tx_pool.ts @@ -1,11 +1,11 @@ import { createLogger } from '@aztec/foundation/log'; -import { type TxAddedToPoolStats } from '@aztec/stdlib/stats'; +import type { TxAddedToPoolStats } from '@aztec/stdlib/stats'; import { Tx, TxHash } from '@aztec/stdlib/tx'; import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client'; import { PoolInstrumentation, PoolName } from '../instrumentation.js'; import { getPendingTxPriority } from './priority.js'; -import { type TxPool } from './tx_pool.js'; +import type { TxPool } from './tx_pool.js'; /** * In-memory implementation of the Transaction Pool. diff --git a/yarn-project/p2p/src/mem_pools/tx_pool/priority.ts b/yarn-project/p2p/src/mem_pools/tx_pool/priority.ts index af50e8102e41..f254ac6e57d0 100644 --- a/yarn-project/p2p/src/mem_pools/tx_pool/priority.ts +++ b/yarn-project/p2p/src/mem_pools/tx_pool/priority.ts @@ -1,5 +1,5 @@ import { Buffer32 } from '@aztec/foundation/buffer'; -import { type Tx } from '@aztec/stdlib/tx'; +import type { Tx } from '@aztec/stdlib/tx'; /** * Returns a string representing the priority of a tx. diff --git a/yarn-project/p2p/src/mem_pools/tx_pool/tx_pool.ts b/yarn-project/p2p/src/mem_pools/tx_pool/tx_pool.ts index 558caadd1857..8af093dfabec 100644 --- a/yarn-project/p2p/src/mem_pools/tx_pool/tx_pool.ts +++ b/yarn-project/p2p/src/mem_pools/tx_pool/tx_pool.ts @@ -1,4 +1,4 @@ -import { type Tx, type TxHash } from '@aztec/stdlib/tx'; +import type { Tx, TxHash } from '@aztec/stdlib/tx'; /** * Interface of a transaction pool. The pool includes tx requests and is kept up-to-date by a P2P client. diff --git a/yarn-project/p2p/src/mem_pools/tx_pool/tx_pool_test_suite.ts b/yarn-project/p2p/src/mem_pools/tx_pool/tx_pool_test_suite.ts index 7e0a0b24c0f0..8c5960023ae8 100644 --- a/yarn-project/p2p/src/mem_pools/tx_pool/tx_pool_test_suite.ts +++ b/yarn-project/p2p/src/mem_pools/tx_pool/tx_pool_test_suite.ts @@ -1,9 +1,9 @@ import { unfreeze } from '@aztec/foundation/types'; import { GasFees } from '@aztec/stdlib/gas'; import { mockTx } from '@aztec/stdlib/testing'; -import { type Tx } from '@aztec/stdlib/tx'; +import type { Tx } from '@aztec/stdlib/tx'; -import { type TxPool } from './tx_pool.js'; +import type { TxPool } from './tx_pool.js'; /** * Tests a TxPool implementation. diff --git a/yarn-project/p2p/src/msg_validators/attestation_validator/attestation_validator.test.ts b/yarn-project/p2p/src/msg_validators/attestation_validator/attestation_validator.test.ts index 81c4273acdcc..a890781fec3a 100644 --- a/yarn-project/p2p/src/msg_validators/attestation_validator/attestation_validator.test.ts +++ b/yarn-project/p2p/src/msg_validators/attestation_validator/attestation_validator.test.ts @@ -1,4 +1,4 @@ -import { type EpochCache } from '@aztec/epoch-cache'; +import type { EpochCache } from '@aztec/epoch-cache'; import { PeerErrorSeverity } from '@aztec/stdlib/p2p'; import { makeBlockAttestation, makeHeader } from '@aztec/stdlib/testing'; diff --git a/yarn-project/p2p/src/msg_validators/attestation_validator/attestation_validator.ts b/yarn-project/p2p/src/msg_validators/attestation_validator/attestation_validator.ts index 1962a451de59..3b3c27bcfc51 100644 --- a/yarn-project/p2p/src/msg_validators/attestation_validator/attestation_validator.ts +++ b/yarn-project/p2p/src/msg_validators/attestation_validator/attestation_validator.ts @@ -1,4 +1,4 @@ -import { type EpochCacheInterface } from '@aztec/epoch-cache'; +import type { EpochCacheInterface } from '@aztec/epoch-cache'; import { type BlockAttestation, type P2PValidator, PeerErrorSeverity } from '@aztec/stdlib/p2p'; export class AttestationValidator implements P2PValidator { diff --git a/yarn-project/p2p/src/msg_validators/block_proposal_validator/block_proposal_validator.test.ts b/yarn-project/p2p/src/msg_validators/block_proposal_validator/block_proposal_validator.test.ts index 47e05c8a76bc..e8d46b33dfeb 100644 --- a/yarn-project/p2p/src/msg_validators/block_proposal_validator/block_proposal_validator.test.ts +++ b/yarn-project/p2p/src/msg_validators/block_proposal_validator/block_proposal_validator.test.ts @@ -1,4 +1,4 @@ -import { type EpochCache } from '@aztec/epoch-cache'; +import type { EpochCache } from '@aztec/epoch-cache'; import { Secp256k1Signer } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; import { PeerErrorSeverity } from '@aztec/stdlib/p2p'; diff --git a/yarn-project/p2p/src/msg_validators/block_proposal_validator/block_proposal_validator.ts b/yarn-project/p2p/src/msg_validators/block_proposal_validator/block_proposal_validator.ts index 7a589b56da81..11174dd89a28 100644 --- a/yarn-project/p2p/src/msg_validators/block_proposal_validator/block_proposal_validator.ts +++ b/yarn-project/p2p/src/msg_validators/block_proposal_validator/block_proposal_validator.ts @@ -1,4 +1,4 @@ -import { type EpochCacheInterface } from '@aztec/epoch-cache'; +import type { EpochCacheInterface } from '@aztec/epoch-cache'; import { type BlockProposal, type P2PValidator, PeerErrorSeverity } from '@aztec/stdlib/p2p'; export class BlockProposalValidator implements P2PValidator { diff --git a/yarn-project/p2p/src/msg_validators/tx_validator/aggregate_tx_validator.ts b/yarn-project/p2p/src/msg_validators/tx_validator/aggregate_tx_validator.ts index 5f72b9db3b69..53aa9e9bcb26 100644 --- a/yarn-project/p2p/src/msg_validators/tx_validator/aggregate_tx_validator.ts +++ b/yarn-project/p2p/src/msg_validators/tx_validator/aggregate_tx_validator.ts @@ -1,4 +1,4 @@ -import { type ProcessedTx, type Tx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx'; +import type { ProcessedTx, Tx, TxValidationResult, TxValidator } from '@aztec/stdlib/tx'; export class AggregateTxValidator implements TxValidator { #validators: TxValidator[]; diff --git a/yarn-project/p2p/src/msg_validators/tx_validator/block_header_validator.test.ts b/yarn-project/p2p/src/msg_validators/tx_validator/block_header_validator.test.ts index 2d98a4e7aca9..d884db8b1504 100644 --- a/yarn-project/p2p/src/msg_validators/tx_validator/block_header_validator.test.ts +++ b/yarn-project/p2p/src/msg_validators/tx_validator/block_header_validator.test.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; import { mockTxForRollup } from '@aztec/stdlib/testing'; -import { type AnyTx, type TxValidationResult } from '@aztec/stdlib/tx'; +import type { AnyTx, TxValidationResult } from '@aztec/stdlib/tx'; import { type MockProxy, mock, mockFn } from 'jest-mock-extended'; diff --git a/yarn-project/p2p/src/msg_validators/tx_validator/block_header_validator.ts b/yarn-project/p2p/src/msg_validators/tx_validator/block_header_validator.ts index ddec319c634e..7fc56869ed56 100644 --- a/yarn-project/p2p/src/msg_validators/tx_validator/block_header_validator.ts +++ b/yarn-project/p2p/src/msg_validators/tx_validator/block_header_validator.ts @@ -1,4 +1,4 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; import { type AnyTx, Tx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx'; diff --git a/yarn-project/p2p/src/msg_validators/tx_validator/data_validator.test.ts b/yarn-project/p2p/src/msg_validators/tx_validator/data_validator.test.ts index 870113c96543..d260beaca974 100644 --- a/yarn-project/p2p/src/msg_validators/tx_validator/data_validator.test.ts +++ b/yarn-project/p2p/src/msg_validators/tx_validator/data_validator.test.ts @@ -5,7 +5,7 @@ import { FunctionSelector } from '@aztec/stdlib/abi'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { computeVarArgsHash } from '@aztec/stdlib/hash'; import { mockTx } from '@aztec/stdlib/testing'; -import { type Tx } from '@aztec/stdlib/tx'; +import type { Tx } from '@aztec/stdlib/tx'; import { DataTxValidator } from './data_validator.js'; diff --git a/yarn-project/p2p/src/msg_validators/tx_validator/double_spend_validator.test.ts b/yarn-project/p2p/src/msg_validators/tx_validator/double_spend_validator.test.ts index 994c6a0e7e3d..04febc003c7f 100644 --- a/yarn-project/p2p/src/msg_validators/tx_validator/double_spend_validator.test.ts +++ b/yarn-project/p2p/src/msg_validators/tx_validator/double_spend_validator.test.ts @@ -1,5 +1,5 @@ import { mockTx, mockTxForRollup } from '@aztec/stdlib/testing'; -import { type AnyTx } from '@aztec/stdlib/tx'; +import type { AnyTx } from '@aztec/stdlib/tx'; import { type MockProxy, mock } from 'jest-mock-extended'; diff --git a/yarn-project/p2p/src/msg_validators/tx_validator/metadata_validator.test.ts b/yarn-project/p2p/src/msg_validators/tx_validator/metadata_validator.test.ts index 95710df0b7b5..52081e937753 100644 --- a/yarn-project/p2p/src/msg_validators/tx_validator/metadata_validator.test.ts +++ b/yarn-project/p2p/src/msg_validators/tx_validator/metadata_validator.test.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; import { mockTx, mockTxForRollup } from '@aztec/stdlib/testing'; -import { type AnyTx, type Tx } from '@aztec/stdlib/tx'; +import type { AnyTx, Tx } from '@aztec/stdlib/tx'; import { MaxBlockNumber } from '@aztec/stdlib/tx'; import { MetadataTxValidator } from './metadata_validator.js'; diff --git a/yarn-project/p2p/src/msg_validators/tx_validator/metadata_validator.ts b/yarn-project/p2p/src/msg_validators/tx_validator/metadata_validator.ts index 35ec1da7e8d3..0d55d434e92d 100644 --- a/yarn-project/p2p/src/msg_validators/tx_validator/metadata_validator.ts +++ b/yarn-project/p2p/src/msg_validators/tx_validator/metadata_validator.ts @@ -1,4 +1,4 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; import { type AnyTx, Tx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx'; diff --git a/yarn-project/p2p/src/msg_validators/tx_validator/tx_proof_validator.ts b/yarn-project/p2p/src/msg_validators/tx_validator/tx_proof_validator.ts index 24ba76d48ff9..025e6695fb18 100644 --- a/yarn-project/p2p/src/msg_validators/tx_validator/tx_proof_validator.ts +++ b/yarn-project/p2p/src/msg_validators/tx_validator/tx_proof_validator.ts @@ -1,5 +1,5 @@ import { createLogger } from '@aztec/foundation/log'; -import { type ClientProtocolCircuitVerifier } from '@aztec/stdlib/interfaces/server'; +import type { ClientProtocolCircuitVerifier } from '@aztec/stdlib/interfaces/server'; import { Tx, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx'; export class TxProofValidator implements TxValidator { diff --git a/yarn-project/p2p/src/services/data_store.test.ts b/yarn-project/p2p/src/services/data_store.test.ts index 463be2795d3c..c4b5106d3af7 100644 --- a/yarn-project/p2p/src/services/data_store.test.ts +++ b/yarn-project/p2p/src/services/data_store.test.ts @@ -1,6 +1,6 @@ import { randomBytes } from '@aztec/foundation/crypto'; import { all } from '@aztec/foundation/iterable'; -import { type AztecAsyncKVStore } from '@aztec/kv-store'; +import type { AztecAsyncKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/lmdb-v2'; import { diff --git a/yarn-project/p2p/src/services/discv5/discv5_service.test.ts b/yarn-project/p2p/src/services/discv5/discv5_service.test.ts index be6e403eb675..232a63661aac 100644 --- a/yarn-project/p2p/src/services/discv5/discv5_service.test.ts +++ b/yarn-project/p2p/src/services/discv5/discv5_service.test.ts @@ -1,6 +1,6 @@ import { addLogNameHandler } from '@aztec/foundation/log'; import { sleep } from '@aztec/foundation/sleep'; -import { type AztecAsyncKVStore } from '@aztec/kv-store'; +import type { AztecAsyncKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/lmdb-v2'; import { emptyChainConfig } from '@aztec/stdlib/config'; import { getTelemetryClient } from '@aztec/telemetry-client'; diff --git a/yarn-project/p2p/src/services/dummy_service.ts b/yarn-project/p2p/src/services/dummy_service.ts index 288381ac7e36..5ff72d1c2250 100644 --- a/yarn-project/p2p/src/services/dummy_service.ts +++ b/yarn-project/p2p/src/services/dummy_service.ts @@ -5,7 +5,7 @@ import { TxHash } from '@aztec/stdlib/tx'; import type { PeerId } from '@libp2p/interface'; import EventEmitter from 'events'; -import { type ReqRespSubProtocol, type SubProtocolMap } from './reqresp/interface.js'; +import type { ReqRespSubProtocol, SubProtocolMap } from './reqresp/interface.js'; import { type P2PService, type PeerDiscoveryService, PeerDiscoveryState } from './service.js'; /** diff --git a/yarn-project/p2p/src/services/encoding.ts b/yarn-project/p2p/src/services/encoding.ts index 3d9e41f7db3f..9cd070610e62 100644 --- a/yarn-project/p2p/src/services/encoding.ts +++ b/yarn-project/p2p/src/services/encoding.ts @@ -1,9 +1,9 @@ // Taken from lodestar: https://github.com/ChainSafe/lodestar import { sha256 } from '@aztec/foundation/crypto'; -import { type RPC } from '@chainsafe/libp2p-gossipsub/message'; -import { type DataTransform } from '@chainsafe/libp2p-gossipsub/types'; -import { type Message } from '@libp2p/interface'; +import type { RPC } from '@chainsafe/libp2p-gossipsub/message'; +import type { DataTransform } from '@chainsafe/libp2p-gossipsub/types'; +import type { Message } from '@libp2p/interface'; import { compressSync, uncompressSync } from 'snappy'; import xxhashFactory from 'xxhash-wasm'; diff --git a/yarn-project/p2p/src/services/libp2p/libp2p_service.ts b/yarn-project/p2p/src/services/libp2p/libp2p_service.ts index 7c320920f259..254fbc817191 100644 --- a/yarn-project/p2p/src/services/libp2p/libp2p_service.ts +++ b/yarn-project/p2p/src/services/libp2p/libp2p_service.ts @@ -1,15 +1,11 @@ -import { type EpochCacheInterface } from '@aztec/epoch-cache'; +import type { EpochCacheInterface } from '@aztec/epoch-cache'; import { Fr } from '@aztec/foundation/fields'; import { createLibp2pComponentLogger, createLogger } from '@aztec/foundation/log'; import { SerialQueue } from '@aztec/foundation/queue'; import { RunningPromise } from '@aztec/foundation/running-promise'; import type { AztecAsyncKVStore } from '@aztec/kv-store'; -import { type L2BlockSource } from '@aztec/stdlib/block'; -import { - type ClientProtocolCircuitVerifier, - type PeerInfo, - type WorldStateSynchronizer, -} from '@aztec/stdlib/interfaces/server'; +import type { L2BlockSource } from '@aztec/stdlib/block'; +import type { ClientProtocolCircuitVerifier, PeerInfo, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server'; import { BlockAttestation, BlockProposal, @@ -24,7 +20,7 @@ import { MerkleTreeId } from '@aztec/stdlib/trees'; import { Tx, type TxHash, type TxValidationResult } from '@aztec/stdlib/tx'; import { Attributes, OtelMetricsAdapter, type TelemetryClient, WithTracer, trackSpan } from '@aztec/telemetry-client'; -import { type ENR } from '@chainsafe/enr'; +import type { ENR } from '@chainsafe/enr'; import { type GossipSub, type GossipSubComponents, @@ -38,14 +34,14 @@ import { yamux } from '@chainsafe/libp2p-yamux'; import { bootstrap } from '@libp2p/bootstrap'; import { identify } from '@libp2p/identify'; import { type Message, type PeerId, TopicValidatorResult } from '@libp2p/interface'; -import { type ConnectionManager } from '@libp2p/interface-internal'; +import type { ConnectionManager } from '@libp2p/interface-internal'; import '@libp2p/kad-dht'; import { mplex } from '@libp2p/mplex'; import { tcp } from '@libp2p/tcp'; import { createLibp2p } from 'libp2p'; -import { type P2PConfig } from '../../config.js'; -import { type MemPools } from '../../mem_pools/interface.js'; +import type { P2PConfig } from '../../config.js'; +import type { MemPools } from '../../mem_pools/interface.js'; import { AttestationValidator, BlockProposalValidator } from '../../msg_validators/index.js'; import { DataTxValidator, diff --git a/yarn-project/p2p/src/services/peer-manager/peer_manager.ts b/yarn-project/p2p/src/services/peer-manager/peer_manager.ts index f71016eb2b90..fee8080f6488 100644 --- a/yarn-project/p2p/src/services/peer-manager/peer_manager.ts +++ b/yarn-project/p2p/src/services/peer-manager/peer_manager.ts @@ -1,19 +1,19 @@ import { createLogger } from '@aztec/foundation/log'; -import { type PeerInfo } from '@aztec/stdlib/interfaces/server'; -import { type PeerErrorSeverity } from '@aztec/stdlib/p2p'; +import type { PeerInfo } from '@aztec/stdlib/interfaces/server'; +import type { PeerErrorSeverity } from '@aztec/stdlib/p2p'; import { type TelemetryClient, trackSpan } from '@aztec/telemetry-client'; -import { type ENR } from '@chainsafe/enr'; -import { type Connection, type PeerId } from '@libp2p/interface'; -import { type Multiaddr } from '@multiformats/multiaddr'; +import type { ENR } from '@chainsafe/enr'; +import type { Connection, PeerId } from '@libp2p/interface'; +import type { Multiaddr } from '@multiformats/multiaddr'; import { inspect } from 'util'; -import { type P2PConfig } from '../../config.js'; -import { type PubSubLibp2p } from '../../util.js'; +import type { P2PConfig } from '../../config.js'; +import type { PubSubLibp2p } from '../../util.js'; import { ReqRespSubProtocol } from '../reqresp/interface.js'; import { GoodByeReason, prettyGoodbyeReason } from '../reqresp/protocols/goodbye.js'; -import { type ReqResp } from '../reqresp/reqresp.js'; -import { type PeerDiscoveryService } from '../service.js'; +import type { ReqResp } from '../reqresp/reqresp.js'; +import type { PeerDiscoveryService } from '../service.js'; import { PeerEvent } from '../types.js'; import { PeerManagerMetrics } from './metrics.js'; import { PeerScoreState, type PeerScoring } from './peer_scoring.js'; diff --git a/yarn-project/p2p/src/services/peer-manager/peer_scoring.ts b/yarn-project/p2p/src/services/peer-manager/peer_scoring.ts index 5a620cbd9699..c7a2c47f90b5 100644 --- a/yarn-project/p2p/src/services/peer-manager/peer_scoring.ts +++ b/yarn-project/p2p/src/services/peer-manager/peer_scoring.ts @@ -2,9 +2,9 @@ import { median } from '@aztec/foundation/collection'; import { createLogger } from '@aztec/foundation/log'; import { PeerErrorSeverity } from '@aztec/stdlib/p2p'; -import { type PeerId } from '@libp2p/interface'; +import type { PeerId } from '@libp2p/interface'; -import { type P2PConfig } from '../../config.js'; +import type { P2PConfig } from '../../config.js'; const DefaultPeerPenalties = { [PeerErrorSeverity.LowToleranceError]: 50, diff --git a/yarn-project/p2p/src/services/reqresp/connection-sampler/batch_connection_sampler.test.ts b/yarn-project/p2p/src/services/reqresp/connection-sampler/batch_connection_sampler.test.ts index 4908ed6c97e9..76202e62c251 100644 --- a/yarn-project/p2p/src/services/reqresp/connection-sampler/batch_connection_sampler.test.ts +++ b/yarn-project/p2p/src/services/reqresp/connection-sampler/batch_connection_sampler.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, jest } from '@jest/globals'; import { createSecp256k1PeerId } from '@libp2p/peer-id-factory'; -import { type Libp2p } from 'libp2p'; +import type { Libp2p } from 'libp2p'; import { BatchConnectionSampler } from './batch_connection_sampler.js'; import { ConnectionSampler, type RandomSampler } from './connection_sampler.js'; diff --git a/yarn-project/p2p/src/services/reqresp/connection-sampler/batch_connection_sampler.ts b/yarn-project/p2p/src/services/reqresp/connection-sampler/batch_connection_sampler.ts index 572f75b3c611..52bdcebe66d4 100644 --- a/yarn-project/p2p/src/services/reqresp/connection-sampler/batch_connection_sampler.ts +++ b/yarn-project/p2p/src/services/reqresp/connection-sampler/batch_connection_sampler.ts @@ -1,8 +1,8 @@ import { createLogger } from '@aztec/foundation/log'; -import { type PeerId } from '@libp2p/interface'; +import type { PeerId } from '@libp2p/interface'; -import { type ConnectionSampler } from './connection_sampler.js'; +import type { ConnectionSampler } from './connection_sampler.js'; /** * Manages batches of peers for parallel request processing. diff --git a/yarn-project/p2p/src/services/reqresp/connection-sampler/connection_sampler.test.ts b/yarn-project/p2p/src/services/reqresp/connection-sampler/connection_sampler.test.ts index 8ecb57c6ab2a..ab2a3f02f767 100644 --- a/yarn-project/p2p/src/services/reqresp/connection-sampler/connection_sampler.test.ts +++ b/yarn-project/p2p/src/services/reqresp/connection-sampler/connection_sampler.test.ts @@ -1,7 +1,7 @@ import { sleep } from '@aztec/foundation/sleep'; import { beforeEach, describe, expect, it, jest } from '@jest/globals'; -import { type PeerId, type Stream } from '@libp2p/interface'; +import type { PeerId, Stream } from '@libp2p/interface'; import { createSecp256k1PeerId } from '@libp2p/peer-id-factory'; import { type MockProxy, mock } from 'jest-mock-extended'; diff --git a/yarn-project/p2p/src/services/reqresp/connection-sampler/connection_sampler.ts b/yarn-project/p2p/src/services/reqresp/connection-sampler/connection_sampler.ts index bc91b23d5dd7..bcee4e979d31 100644 --- a/yarn-project/p2p/src/services/reqresp/connection-sampler/connection_sampler.ts +++ b/yarn-project/p2p/src/services/reqresp/connection-sampler/connection_sampler.ts @@ -1,7 +1,7 @@ import { createLogger } from '@aztec/foundation/log'; import { SerialQueue } from '@aztec/foundation/queue'; -import { type Libp2p, type PeerId, type Stream } from '@libp2p/interface'; +import type { Libp2p, PeerId, Stream } from '@libp2p/interface'; const MAX_SAMPLE_ATTEMPTS = 4; diff --git a/yarn-project/p2p/src/services/reqresp/interface.ts b/yarn-project/p2p/src/services/reqresp/interface.ts index a8c867d28c51..24cc8c4c234a 100644 --- a/yarn-project/p2p/src/services/reqresp/interface.ts +++ b/yarn-project/p2p/src/services/reqresp/interface.ts @@ -2,9 +2,9 @@ import { Fr } from '@aztec/foundation/fields'; import { L2Block } from '@aztec/stdlib/block'; import { Tx, TxHash } from '@aztec/stdlib/tx'; -import { type PeerId } from '@libp2p/interface'; +import type { PeerId } from '@libp2p/interface'; -import { type ReqRespStatus } from './status.js'; +import type { ReqRespStatus } from './status.js'; /* * Request Response Sub Protocols diff --git a/yarn-project/p2p/src/services/reqresp/metrics.ts b/yarn-project/p2p/src/services/reqresp/metrics.ts index e32b4cdb4f4b..bd0794497d0e 100644 --- a/yarn-project/p2p/src/services/reqresp/metrics.ts +++ b/yarn-project/p2p/src/services/reqresp/metrics.ts @@ -1,6 +1,6 @@ // Request response metrics import { Attributes, Metrics, ValueType } from '@aztec/telemetry-client'; -import { type TelemetryClient, type Tracer, type UpDownCounter } from '@aztec/telemetry-client'; +import type { TelemetryClient, Tracer, UpDownCounter } from '@aztec/telemetry-client'; export class ReqRespMetrics { public readonly tracer: Tracer; diff --git a/yarn-project/p2p/src/services/reqresp/protocols/block.ts b/yarn-project/p2p/src/services/reqresp/protocols/block.ts index ef3f0e782a22..816faad55acd 100644 --- a/yarn-project/p2p/src/services/reqresp/protocols/block.ts +++ b/yarn-project/p2p/src/services/reqresp/protocols/block.ts @@ -1,9 +1,9 @@ import { Fr } from '@aztec/foundation/fields'; -import { type L2BlockSource } from '@aztec/stdlib/block'; +import type { L2BlockSource } from '@aztec/stdlib/block'; -import { type PeerId } from '@libp2p/interface'; +import type { PeerId } from '@libp2p/interface'; -import { type ReqRespSubProtocolHandler } from '../interface.js'; +import type { ReqRespSubProtocolHandler } from '../interface.js'; export function reqRespBlockHandler(l2BlockSource: L2BlockSource): ReqRespSubProtocolHandler { return async (_peerId: PeerId, msg: Buffer) => { diff --git a/yarn-project/p2p/src/services/reqresp/protocols/goodbye.ts b/yarn-project/p2p/src/services/reqresp/protocols/goodbye.ts index ce91853f988a..3e9019d7ef1c 100644 --- a/yarn-project/p2p/src/services/reqresp/protocols/goodbye.ts +++ b/yarn-project/p2p/src/services/reqresp/protocols/goodbye.ts @@ -1,10 +1,10 @@ import { createLogger } from '@aztec/foundation/log'; -import { type PeerId } from '@libp2p/interface'; +import type { PeerId } from '@libp2p/interface'; -import { type PeerManager } from '../../peer-manager/peer_manager.js'; +import type { PeerManager } from '../../peer-manager/peer_manager.js'; import { ReqRespSubProtocol, type ReqRespSubProtocolHandler } from '../interface.js'; -import { type ReqResp } from '../reqresp.js'; +import type { ReqResp } from '../reqresp.js'; /** * Enum defining the possible reasons for a goodbye message. diff --git a/yarn-project/p2p/src/services/reqresp/protocols/tx.ts b/yarn-project/p2p/src/services/reqresp/protocols/tx.ts index 251712b79e32..bf775ebaa5c5 100644 --- a/yarn-project/p2p/src/services/reqresp/protocols/tx.ts +++ b/yarn-project/p2p/src/services/reqresp/protocols/tx.ts @@ -1,10 +1,10 @@ -import { type P2PClientType } from '@aztec/stdlib/p2p'; +import type { P2PClientType } from '@aztec/stdlib/p2p'; import { TxHash } from '@aztec/stdlib/tx'; -import { type PeerId } from '@libp2p/interface'; +import type { PeerId } from '@libp2p/interface'; -import { type MemPools } from '../../../mem_pools/interface.js'; -import { type ReqRespSubProtocolHandler } from '../interface.js'; +import type { MemPools } from '../../../mem_pools/interface.js'; +import type { ReqRespSubProtocolHandler } from '../interface.js'; /** * We want to keep the logic of the req resp handler in this file, but we do not have a reference to the mempools here diff --git a/yarn-project/p2p/src/services/reqresp/rate-limiter/rate_limiter.test.ts b/yarn-project/p2p/src/services/reqresp/rate-limiter/rate_limiter.test.ts index 14de11128917..80a6a6e423c9 100644 --- a/yarn-project/p2p/src/services/reqresp/rate-limiter/rate_limiter.test.ts +++ b/yarn-project/p2p/src/services/reqresp/rate-limiter/rate_limiter.test.ts @@ -1,10 +1,10 @@ import { PeerErrorSeverity } from '@aztec/stdlib/p2p'; import { jest } from '@jest/globals'; -import { type PeerId } from '@libp2p/interface'; +import type { PeerId } from '@libp2p/interface'; import { type MockProxy, mock } from 'jest-mock-extended'; -import { type PeerScoring } from '../../peer-manager/peer_scoring.js'; +import type { PeerScoring } from '../../peer-manager/peer_scoring.js'; import { ReqRespSubProtocol, type ReqRespSubProtocolRateLimits } from '../interface.js'; import { RateLimitStatus, RequestResponseRateLimiter } from './rate_limiter.js'; diff --git a/yarn-project/p2p/src/services/reqresp/rate-limiter/rate_limiter.ts b/yarn-project/p2p/src/services/reqresp/rate-limiter/rate_limiter.ts index c627e35ecfa8..b956e5d80704 100644 --- a/yarn-project/p2p/src/services/reqresp/rate-limiter/rate_limiter.ts +++ b/yarn-project/p2p/src/services/reqresp/rate-limiter/rate_limiter.ts @@ -5,10 +5,10 @@ */ import { PeerErrorSeverity } from '@aztec/stdlib/p2p'; -import { type PeerId } from '@libp2p/interface'; +import type { PeerId } from '@libp2p/interface'; -import { type PeerScoring } from '../../peer-manager/peer_scoring.js'; -import { type ReqRespSubProtocol, type ReqRespSubProtocolRateLimits } from '../interface.js'; +import type { PeerScoring } from '../../peer-manager/peer_scoring.js'; +import type { ReqRespSubProtocol, ReqRespSubProtocolRateLimits } from '../interface.js'; import { DEFAULT_RATE_LIMITS } from './rate_limits.js'; // Check for disconnected peers every 10 minutes diff --git a/yarn-project/p2p/src/services/reqresp/reqresp.test.ts b/yarn-project/p2p/src/services/reqresp/reqresp.test.ts index 9e543e3d8ac6..1ca75c09173e 100644 --- a/yarn-project/p2p/src/services/reqresp/reqresp.test.ts +++ b/yarn-project/p2p/src/services/reqresp/reqresp.test.ts @@ -7,7 +7,7 @@ import { mockTx } from '@aztec/stdlib/testing'; import { TxHash } from '@aztec/stdlib/tx'; import { describe, expect, it, jest } from '@jest/globals'; -import { type PeerId } from '@libp2p/interface'; +import type { PeerId } from '@libp2p/interface'; import { type MockProxy, mock } from 'jest-mock-extended'; import { CollectiveReqRespTimeoutError, IndividualReqRespTimeoutError } from '../../errors/reqresp.error.js'; @@ -20,8 +20,8 @@ import { startNodes, stopNodes, } from '../../test-helpers/reqresp-nodes.js'; -import { type PeerManager } from '../peer-manager/peer_manager.js'; -import { type PeerScoring } from '../peer-manager/peer_scoring.js'; +import type { PeerManager } from '../peer-manager/peer_manager.js'; +import type { PeerScoring } from '../peer-manager/peer_scoring.js'; import { ReqRespSubProtocol, RequestableBuffer } from './interface.js'; import { reqRespBlockHandler } from './protocols/block.js'; import { GoodByeReason, reqGoodbyeHandler } from './protocols/goodbye.js'; diff --git a/yarn-project/p2p/src/services/reqresp/reqresp.ts b/yarn-project/p2p/src/services/reqresp/reqresp.ts index 99c0f1c2ae0b..1edaf47ef43c 100644 --- a/yarn-project/p2p/src/services/reqresp/reqresp.ts +++ b/yarn-project/p2p/src/services/reqresp/reqresp.ts @@ -4,10 +4,10 @@ import { executeTimeout } from '@aztec/foundation/timer'; import { PeerErrorSeverity } from '@aztec/stdlib/p2p'; import { Attributes, type TelemetryClient, getTelemetryClient, trackSpan } from '@aztec/telemetry-client'; -import { type IncomingStreamData, type PeerId, type Stream } from '@libp2p/interface'; +import type { IncomingStreamData, PeerId, Stream } from '@libp2p/interface'; import { pipe } from 'it-pipe'; -import { type Libp2p } from 'libp2p'; -import { type Uint8ArrayList } from 'uint8arraylist'; +import type { Libp2p } from 'libp2p'; +import type { Uint8ArrayList } from 'uint8arraylist'; import { CollectiveReqRespTimeoutError, @@ -15,8 +15,8 @@ import { InvalidResponseError, } from '../../errors/reqresp.error.js'; import { SnappyTransform } from '../encoding.js'; -import { type PeerScoring } from '../peer-manager/peer_scoring.js'; -import { type P2PReqRespConfig } from './config.js'; +import type { PeerScoring } from '../peer-manager/peer_scoring.js'; +import type { P2PReqRespConfig } from './config.js'; import { BatchConnectionSampler } from './connection-sampler/batch_connection_sampler.js'; import { ConnectionSampler } from './connection-sampler/connection_sampler.js'; import { diff --git a/yarn-project/p2p/src/services/service.ts b/yarn-project/p2p/src/services/service.ts index ba078c32272b..fc917edbf074 100644 --- a/yarn-project/p2p/src/services/service.ts +++ b/yarn-project/p2p/src/services/service.ts @@ -5,7 +5,7 @@ import type { ENR } from '@chainsafe/enr'; import type { PeerId } from '@libp2p/interface'; import type EventEmitter from 'events'; -import { type ReqRespSubProtocol, type SubProtocolMap } from './reqresp/interface.js'; +import type { ReqRespSubProtocol, SubProtocolMap } from './reqresp/interface.js'; export enum PeerDiscoveryState { RUNNING = 'running', diff --git a/yarn-project/p2p/src/test-helpers/make-enrs.ts b/yarn-project/p2p/src/test-helpers/make-enrs.ts index 69b95089f9cc..3871f766a352 100644 --- a/yarn-project/p2p/src/test-helpers/make-enrs.ts +++ b/yarn-project/p2p/src/test-helpers/make-enrs.ts @@ -1,4 +1,4 @@ -import { type ChainConfig } from '@aztec/stdlib/config'; +import type { ChainConfig } from '@aztec/stdlib/config'; import { SignableENR } from '@chainsafe/enr'; import { multiaddr } from '@multiformats/multiaddr'; diff --git a/yarn-project/p2p/src/test-helpers/make-test-p2p-clients.ts b/yarn-project/p2p/src/test-helpers/make-test-p2p-clients.ts index 84867e862956..83367ceee2c2 100644 --- a/yarn-project/p2p/src/test-helpers/make-test-p2p-clients.ts +++ b/yarn-project/p2p/src/test-helpers/make-test-p2p-clients.ts @@ -1,16 +1,16 @@ import { MockL2BlockSource } from '@aztec/archiver/test'; -import { type EpochCache } from '@aztec/epoch-cache'; +import type { EpochCache } from '@aztec/epoch-cache'; import { type Logger, createLogger } from '@aztec/foundation/log'; -import { type DataStoreConfig } from '@aztec/kv-store/config'; +import type { DataStoreConfig } from '@aztec/kv-store/config'; import { openTmpStore } from '@aztec/kv-store/lmdb-v2'; -import { type WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server'; +import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server'; import { P2PClientType } from '@aztec/stdlib/p2p'; import { createP2PClient } from '../client/index.js'; -import { type P2PClient } from '../client/p2p_client.js'; -import { type P2PConfig } from '../config.js'; -import { type AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js'; -import { type TxPool } from '../mem_pools/tx_pool/index.js'; +import type { P2PClient } from '../client/p2p_client.js'; +import type { P2PConfig } from '../config.js'; +import type { AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js'; +import type { TxPool } from '../mem_pools/tx_pool/index.js'; import { generatePeerIdPrivateKeys } from '../test-helpers/generate-peer-id-private-keys.js'; import { getPorts } from './get-ports.js'; import { makeEnrs } from './make-enrs.js'; diff --git a/yarn-project/p2p/src/test-helpers/reqresp-nodes.ts b/yarn-project/p2p/src/test-helpers/reqresp-nodes.ts index 498baf8f6d31..b5991b714abd 100644 --- a/yarn-project/p2p/src/test-helpers/reqresp-nodes.ts +++ b/yarn-project/p2p/src/test-helpers/reqresp-nodes.ts @@ -1,12 +1,12 @@ -import { type EpochCache } from '@aztec/epoch-cache'; +import type { EpochCache } from '@aztec/epoch-cache'; import { timesParallel } from '@aztec/foundation/collection'; -import { type DataStoreConfig } from '@aztec/kv-store/config'; +import type { DataStoreConfig } from '@aztec/kv-store/config'; import { openTmpStore } from '@aztec/kv-store/lmdb-v2'; -import { type L2BlockSource } from '@aztec/stdlib/block'; +import type { L2BlockSource } from '@aztec/stdlib/block'; import { type ChainConfig, emptyChainConfig } from '@aztec/stdlib/config'; -import { type ClientProtocolCircuitVerifier, type WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server'; -import { type P2PClientType } from '@aztec/stdlib/p2p'; -import { type Tx } from '@aztec/stdlib/tx'; +import type { ClientProtocolCircuitVerifier, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server'; +import type { P2PClientType } from '@aztec/stdlib/p2p'; +import type { Tx } from '@aztec/stdlib/tx'; import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client'; import { SignableENR } from '@chainsafe/enr'; @@ -15,7 +15,7 @@ import { noise } from '@chainsafe/libp2p-noise'; import { yamux } from '@chainsafe/libp2p-yamux'; import { bootstrap } from '@libp2p/bootstrap'; import { identify } from '@libp2p/identify'; -import { type PeerId } from '@libp2p/interface'; +import type { PeerId } from '@libp2p/interface'; import { createSecp256k1PeerId } from '@libp2p/peer-id-factory'; import { tcp } from '@libp2p/tcp'; import { multiaddr } from '@multiformats/multiaddr'; @@ -23,12 +23,12 @@ import getPort from 'get-port'; import { type Libp2p, type Libp2pOptions, createLibp2p } from 'libp2p'; import { BootstrapNode } from '../bootstrap/bootstrap.js'; -import { type BootnodeConfig, type P2PConfig } from '../config.js'; -import { type MemPools } from '../mem_pools/interface.js'; +import type { BootnodeConfig, P2PConfig } from '../config.js'; +import type { MemPools } from '../mem_pools/interface.js'; import { DiscV5Service } from '../services/discv5/discV5_service.js'; import { LibP2PService } from '../services/libp2p/libp2p_service.js'; -import { type PeerScoring } from '../services/peer-manager/peer_scoring.js'; -import { type P2PReqRespConfig } from '../services/reqresp/config.js'; +import type { PeerScoring } from '../services/peer-manager/peer_scoring.js'; +import type { P2PReqRespConfig } from '../services/reqresp/config.js'; import { ReqRespSubProtocol, type ReqRespSubProtocolHandlers, diff --git a/yarn-project/p2p/src/testbench/p2p_client_testbench_worker.ts b/yarn-project/p2p/src/testbench/p2p_client_testbench_worker.ts index 55fb75b0efda..123202618061 100644 --- a/yarn-project/p2p/src/testbench/p2p_client_testbench_worker.ts +++ b/yarn-project/p2p/src/testbench/p2p_client_testbench_worker.ts @@ -4,22 +4,22 @@ * Used when running testbench commands */ import { MockL2BlockSource } from '@aztec/archiver/test'; -import { type EpochCacheInterface } from '@aztec/epoch-cache'; +import type { EpochCacheInterface } from '@aztec/epoch-cache'; import { EthAddress } from '@aztec/foundation/eth-address'; import { createLogger } from '@aztec/foundation/log'; import { sleep } from '@aztec/foundation/sleep'; -import { type DataStoreConfig } from '@aztec/kv-store/config'; +import type { DataStoreConfig } from '@aztec/kv-store/config'; import { openTmpStore } from '@aztec/kv-store/lmdb-v2'; -import { type WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server'; +import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server'; import { P2PClientType } from '@aztec/stdlib/p2p'; import { Tx, TxStatus } from '@aztec/stdlib/tx'; import type { Message, PeerId } from '@libp2p/interface'; -import { type P2PConfig } from '../config.js'; +import type { P2PConfig } from '../config.js'; import { createP2PClient } from '../index.js'; -import { type AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js'; -import { type TxPool } from '../mem_pools/tx_pool/index.js'; +import type { AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js'; +import type { TxPool } from '../mem_pools/tx_pool/index.js'; import { AlwaysTrueCircuitVerifier } from '../test-helpers/reqresp-nodes.js'; // Simple mock implementation diff --git a/yarn-project/p2p/src/testbench/testbench.ts b/yarn-project/p2p/src/testbench/testbench.ts index 0a1db2ced4ab..d6b03166f42a 100644 --- a/yarn-project/p2p/src/testbench/testbench.ts +++ b/yarn-project/p2p/src/testbench/testbench.ts @@ -1,7 +1,7 @@ import { EthAddress } from '@aztec/foundation/eth-address'; import { createLogger } from '@aztec/foundation/log'; import { sleep } from '@aztec/foundation/sleep'; -import { type ChainConfig } from '@aztec/stdlib/config'; +import type { ChainConfig } from '@aztec/stdlib/config'; import { ClientIvcProof } from '@aztec/stdlib/proofs'; import { mockTx } from '@aztec/stdlib/testing'; diff --git a/yarn-project/p2p/src/util.ts b/yarn-project/p2p/src/util.ts index b9a3f7e85a84..9f8f21d0140e 100644 --- a/yarn-project/p2p/src/util.ts +++ b/yarn-project/p2p/src/util.ts @@ -1,15 +1,15 @@ -import { type AztecAsyncKVStore } from '@aztec/kv-store'; -import { type DataStoreConfig } from '@aztec/kv-store/config'; +import type { AztecAsyncKVStore } from '@aztec/kv-store'; +import type { DataStoreConfig } from '@aztec/kv-store/config'; import type { GossipSub } from '@chainsafe/libp2p-gossipsub'; import { generateKeyPair, marshalPrivateKey, unmarshalPrivateKey } from '@libp2p/crypto/keys'; -import { type PeerId, type PrivateKey } from '@libp2p/interface'; -import { type ConnectionManager } from '@libp2p/interface-internal'; +import type { PeerId, PrivateKey } from '@libp2p/interface'; +import type { ConnectionManager } from '@libp2p/interface-internal'; import { createFromPrivKey } from '@libp2p/peer-id-factory'; import { resolve } from 'dns/promises'; import type { Libp2p } from 'libp2p'; -import { type P2PConfig } from './config.js'; +import type { P2PConfig } from './config.js'; export interface PubSubLibp2p extends Libp2p { services: { diff --git a/yarn-project/p2p/src/utils.test.ts b/yarn-project/p2p/src/utils.test.ts index 50ecbf73a225..55c174946d3f 100644 --- a/yarn-project/p2p/src/utils.test.ts +++ b/yarn-project/p2p/src/utils.test.ts @@ -1,10 +1,10 @@ -import { type AztecAsyncKVStore } from '@aztec/kv-store'; +import type { AztecAsyncKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/lmdb-v2'; import { generateKeyPair, marshalPrivateKey } from '@libp2p/crypto/keys'; import { createSecp256k1PeerId } from '@libp2p/peer-id-factory'; -import { type P2PConfig } from './config.js'; +import type { P2PConfig } from './config.js'; import { createLibP2PPeerIdFromPrivateKey, getPeerIdPrivateKey } from './util.js'; describe('p2p utils', () => { diff --git a/yarn-project/p2p/src/versioning.test.ts b/yarn-project/p2p/src/versioning.test.ts index f8708714ca9f..781b98842541 100644 --- a/yarn-project/p2p/src/versioning.test.ts +++ b/yarn-project/p2p/src/versioning.test.ts @@ -1,7 +1,7 @@ import { EthAddress } from '@aztec/foundation/eth-address'; -import { type ChainConfig } from '@aztec/stdlib/config'; +import type { ChainConfig } from '@aztec/stdlib/config'; -import { type SignableENR } from '@chainsafe/enr'; +import type { SignableENR } from '@chainsafe/enr'; import { type MockProxy, mock } from 'jest-mock-extended'; import { AZTEC_ENR_KEY } from './services/types.js'; diff --git a/yarn-project/p2p/src/versioning.ts b/yarn-project/p2p/src/versioning.ts index fd6b7d611945..2123098c2250 100644 --- a/yarn-project/p2p/src/versioning.ts +++ b/yarn-project/p2p/src/versioning.ts @@ -1,7 +1,7 @@ import { toBufferBE } from '@aztec/foundation/bigint-buffer'; import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks'; import { protocolContractTreeRoot } from '@aztec/protocol-contracts'; -import { type ChainConfig } from '@aztec/stdlib/config'; +import type { ChainConfig } from '@aztec/stdlib/config'; import { type ComponentsVersions, checkCompressedComponentVersion, @@ -9,7 +9,7 @@ import { getComponentsVersionsFromConfig, } from '@aztec/stdlib/versioning'; -import { type SignableENR } from '@chainsafe/enr'; +import type { SignableENR } from '@chainsafe/enr'; import xxhashFactory from 'xxhash-wasm'; import { AZTEC_ENR_KEY } from './services/types.js'; diff --git a/yarn-project/proof-verifier/src/proof_verifier.ts b/yarn-project/proof-verifier/src/proof_verifier.ts index 049cd38cd929..e64a432401ed 100644 --- a/yarn-project/proof-verifier/src/proof_verifier.ts +++ b/yarn-project/proof-verifier/src/proof_verifier.ts @@ -16,7 +16,7 @@ import { import { type PublicClient, createPublicClient, http } from 'viem'; -import { type ProofVerifierConfig } from './config.js'; +import type { ProofVerifierConfig } from './config.js'; const EXPECTED_PROOF_SIZE = 13988; diff --git a/yarn-project/protocol-contracts/src/auth-registry/index.ts b/yarn-project/protocol-contracts/src/auth-registry/index.ts index aec3edab2a2e..c3b67b8cfcbc 100644 --- a/yarn-project/protocol-contracts/src/auth-registry/index.ts +++ b/yarn-project/protocol-contracts/src/auth-registry/index.ts @@ -1,9 +1,9 @@ import { loadContractArtifact } from '@aztec/stdlib/abi'; -import { type NoirCompiledContract } from '@aztec/stdlib/noir'; +import type { NoirCompiledContract } from '@aztec/stdlib/noir'; import AuthRegistryJson from '../../artifacts/AuthRegistry.json' assert { type: 'json' }; import { makeProtocolContract } from '../make_protocol_contract.js'; -import { type ProtocolContract } from '../protocol_contract.js'; +import type { ProtocolContract } from '../protocol_contract.js'; let protocolContract: ProtocolContract; diff --git a/yarn-project/protocol-contracts/src/build_protocol_contract_tree.ts b/yarn-project/protocol-contracts/src/build_protocol_contract_tree.ts index ab712cecef62..7e5df2ebc93f 100644 --- a/yarn-project/protocol-contracts/src/build_protocol_contract_tree.ts +++ b/yarn-project/protocol-contracts/src/build_protocol_contract_tree.ts @@ -1,8 +1,8 @@ import { MAX_PROTOCOL_CONTRACTS, PROTOCOL_CONTRACT_TREE_HEIGHT } from '@aztec/constants'; import { poseidon2Hash } from '@aztec/foundation/crypto'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { type IndexedMerkleTree, IndexedMerkleTreeCalculator } from '@aztec/foundation/trees'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { ProtocolContractLeafPreimage } from '@aztec/stdlib/trees'; export async function buildProtocolContractTree( diff --git a/yarn-project/protocol-contracts/src/bundle/index.ts b/yarn-project/protocol-contracts/src/bundle/index.ts index 9984c0440cee..a91830414b35 100644 --- a/yarn-project/protocol-contracts/src/bundle/index.ts +++ b/yarn-project/protocol-contracts/src/bundle/index.ts @@ -1,4 +1,4 @@ -import { type ContractArtifact } from '@aztec/stdlib/abi'; +import type { ContractArtifact } from '@aztec/stdlib/abi'; import { getContractClassFromArtifact, getContractInstanceFromDeployParams } from '@aztec/stdlib/contract'; import { AuthRegistryArtifact } from '../auth-registry/index.js'; @@ -6,7 +6,7 @@ import { ContractClassRegistererArtifact } from '../class-registerer/index.js'; import { FeeJuiceArtifact } from '../fee-juice/index.js'; import { ContractInstanceDeployerArtifact } from '../instance-deployer/index.js'; import { MultiCallEntrypointArtifact } from '../multi-call-entrypoint/index.js'; -import { type ProtocolContract } from '../protocol_contract.js'; +import type { ProtocolContract } from '../protocol_contract.js'; import { ProtocolContractAddress, type ProtocolContractName, ProtocolContractSalt } from '../protocol_contract_data.js'; import { RouterArtifact } from '../router/index.js'; diff --git a/yarn-project/protocol-contracts/src/class-registerer/index.ts b/yarn-project/protocol-contracts/src/class-registerer/index.ts index 07d39bba11df..5efc5027254d 100644 --- a/yarn-project/protocol-contracts/src/class-registerer/index.ts +++ b/yarn-project/protocol-contracts/src/class-registerer/index.ts @@ -1,9 +1,9 @@ import { loadContractArtifact } from '@aztec/stdlib/abi'; -import { type NoirCompiledContract } from '@aztec/stdlib/noir'; +import type { NoirCompiledContract } from '@aztec/stdlib/noir'; import ContractClassRegistererJson from '../../artifacts/ContractClassRegisterer.json' assert { type: 'json' }; import { makeProtocolContract } from '../make_protocol_contract.js'; -import { type ProtocolContract } from '../protocol_contract.js'; +import type { ProtocolContract } from '../protocol_contract.js'; export * from './contract_class_registered_event.js'; export * from './private_function_broadcasted_event.js'; diff --git a/yarn-project/protocol-contracts/src/class-registerer/unconstrained_function_broadcasted_event.test.ts b/yarn-project/protocol-contracts/src/class-registerer/unconstrained_function_broadcasted_event.test.ts index 1d02121307bb..a975bdb28932 100644 --- a/yarn-project/protocol-contracts/src/class-registerer/unconstrained_function_broadcasted_event.test.ts +++ b/yarn-project/protocol-contracts/src/class-registerer/unconstrained_function_broadcasted_event.test.ts @@ -1,6 +1,6 @@ import { randomBytes } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; -import { type Tuple } from '@aztec/foundation/serialize'; +import type { Tuple } from '@aztec/foundation/serialize'; import { setupCustomSnapshotSerializers } from '@aztec/foundation/testing'; import { FunctionSelector } from '@aztec/stdlib/abi'; diff --git a/yarn-project/protocol-contracts/src/class-registerer/unconstrained_function_broadcasted_event.ts b/yarn-project/protocol-contracts/src/class-registerer/unconstrained_function_broadcasted_event.ts index 499b7d51a200..51fe3977d404 100644 --- a/yarn-project/protocol-contracts/src/class-registerer/unconstrained_function_broadcasted_event.ts +++ b/yarn-project/protocol-contracts/src/class-registerer/unconstrained_function_broadcasted_event.ts @@ -7,7 +7,7 @@ import { removeArrayPaddingEnd } from '@aztec/foundation/collection'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, type Tuple } from '@aztec/foundation/serialize'; import { FunctionSelector, bufferFromFields } from '@aztec/stdlib/abi'; -import { type UnconstrainedFunction, type UnconstrainedFunctionWithMembershipProof } from '@aztec/stdlib/contract'; +import type { UnconstrainedFunction, UnconstrainedFunctionWithMembershipProof } from '@aztec/stdlib/contract'; import chunk from 'lodash.chunk'; diff --git a/yarn-project/protocol-contracts/src/fee-juice/index.ts b/yarn-project/protocol-contracts/src/fee-juice/index.ts index f25c1968796a..bd1050385be7 100644 --- a/yarn-project/protocol-contracts/src/fee-juice/index.ts +++ b/yarn-project/protocol-contracts/src/fee-juice/index.ts @@ -1,12 +1,12 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { loadContractArtifact } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { computePublicDataTreeLeafSlot, deriveStorageSlotInMap } from '@aztec/stdlib/hash'; -import { type NoirCompiledContract } from '@aztec/stdlib/noir'; +import type { NoirCompiledContract } from '@aztec/stdlib/noir'; import FeeJuiceJson from '../../artifacts/FeeJuice.json' assert { type: 'json' }; import { makeProtocolContract } from '../make_protocol_contract.js'; -import { type ProtocolContract } from '../protocol_contract.js'; +import type { ProtocolContract } from '../protocol_contract.js'; import { ProtocolContractAddress } from '../protocol_contract_data.js'; export const FeeJuiceArtifact = loadContractArtifact(FeeJuiceJson as NoirCompiledContract); diff --git a/yarn-project/protocol-contracts/src/instance-deployer/index.ts b/yarn-project/protocol-contracts/src/instance-deployer/index.ts index de0ec09df7e9..d9753d0b4013 100644 --- a/yarn-project/protocol-contracts/src/instance-deployer/index.ts +++ b/yarn-project/protocol-contracts/src/instance-deployer/index.ts @@ -1,9 +1,9 @@ import { loadContractArtifact } from '@aztec/stdlib/abi'; -import { type NoirCompiledContract } from '@aztec/stdlib/noir'; +import type { NoirCompiledContract } from '@aztec/stdlib/noir'; import ContractInstanceDeployerJson from '../../artifacts/ContractInstanceDeployer.json' assert { type: 'json' }; import { makeProtocolContract } from '../make_protocol_contract.js'; -import { type ProtocolContract } from '../protocol_contract.js'; +import type { ProtocolContract } from '../protocol_contract.js'; export * from './contract_instance_deployed_event.js'; export * from './contract_instance_updated_event.js'; diff --git a/yarn-project/protocol-contracts/src/make_protocol_contract.ts b/yarn-project/protocol-contracts/src/make_protocol_contract.ts index 9fc583a7deae..6d4f76fc9f4b 100644 --- a/yarn-project/protocol-contracts/src/make_protocol_contract.ts +++ b/yarn-project/protocol-contracts/src/make_protocol_contract.ts @@ -1,7 +1,7 @@ -import { type ContractArtifact } from '@aztec/stdlib/abi'; +import type { ContractArtifact } from '@aztec/stdlib/abi'; import { getContractClassFromArtifact, getContractInstanceFromDeployParams } from '@aztec/stdlib/contract'; -import { type ProtocolContract } from './protocol_contract.js'; +import type { ProtocolContract } from './protocol_contract.js'; import { ProtocolContractAddress, type ProtocolContractName, ProtocolContractSalt } from './protocol_contract_data.js'; /** diff --git a/yarn-project/protocol-contracts/src/multi-call-entrypoint/index.ts b/yarn-project/protocol-contracts/src/multi-call-entrypoint/index.ts index c0a159f86742..a1aedc0e0cf6 100644 --- a/yarn-project/protocol-contracts/src/multi-call-entrypoint/index.ts +++ b/yarn-project/protocol-contracts/src/multi-call-entrypoint/index.ts @@ -1,9 +1,9 @@ import { loadContractArtifact } from '@aztec/stdlib/abi'; -import { type NoirCompiledContract } from '@aztec/stdlib/noir'; +import type { NoirCompiledContract } from '@aztec/stdlib/noir'; import MultiCallEntrypointJson from '../../artifacts/MultiCallEntrypoint.json' assert { type: 'json' }; import { makeProtocolContract } from '../make_protocol_contract.js'; -import { type ProtocolContract } from '../protocol_contract.js'; +import type { ProtocolContract } from '../protocol_contract.js'; export const MultiCallEntrypointArtifact = loadContractArtifact(MultiCallEntrypointJson as NoirCompiledContract); diff --git a/yarn-project/protocol-contracts/src/protocol_contract.ts b/yarn-project/protocol-contracts/src/protocol_contract.ts index 34f8964dbd6d..7df0fcccaafb 100644 --- a/yarn-project/protocol-contracts/src/protocol_contract.ts +++ b/yarn-project/protocol-contracts/src/protocol_contract.ts @@ -1,10 +1,6 @@ -import { type ContractArtifact } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { - type ContractClassIdPreimage, - type ContractClassWithId, - type ContractInstanceWithAddress, -} from '@aztec/stdlib/contract'; +import type { ContractArtifact } from '@aztec/stdlib/abi'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { ContractClassIdPreimage, ContractClassWithId, ContractInstanceWithAddress } from '@aztec/stdlib/contract'; import { ProtocolContractAddress } from './protocol_contract_data.js'; diff --git a/yarn-project/protocol-contracts/src/protocol_contract_tree.ts b/yarn-project/protocol-contracts/src/protocol_contract_tree.ts index 70f4a6c556b2..b9715eae6054 100644 --- a/yarn-project/protocol-contracts/src/protocol_contract_tree.ts +++ b/yarn-project/protocol-contracts/src/protocol_contract_tree.ts @@ -1,6 +1,6 @@ -import { type PROTOCOL_CONTRACT_TREE_HEIGHT } from '@aztec/constants'; +import type { PROTOCOL_CONTRACT_TREE_HEIGHT } from '@aztec/constants'; import { poseidon2Hash } from '@aztec/foundation/crypto'; -import { type IndexedMerkleTree } from '@aztec/foundation/trees'; +import type { IndexedMerkleTree } from '@aztec/foundation/trees'; import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { ProtocolContractLeafPreimage } from '@aztec/stdlib/trees'; diff --git a/yarn-project/protocol-contracts/src/router/index.ts b/yarn-project/protocol-contracts/src/router/index.ts index ab639051b38f..0f5eca406557 100644 --- a/yarn-project/protocol-contracts/src/router/index.ts +++ b/yarn-project/protocol-contracts/src/router/index.ts @@ -1,9 +1,9 @@ import { loadContractArtifact } from '@aztec/stdlib/abi'; -import { type NoirCompiledContract } from '@aztec/stdlib/noir'; +import type { NoirCompiledContract } from '@aztec/stdlib/noir'; import RouterJson from '../../artifacts/Router.json' assert { type: 'json' }; import { makeProtocolContract } from '../make_protocol_contract.js'; -import { type ProtocolContract } from '../protocol_contract.js'; +import type { ProtocolContract } from '../protocol_contract.js'; export const RouterArtifact = loadContractArtifact(RouterJson as NoirCompiledContract); diff --git a/yarn-project/protocol-contracts/src/scripts/generate_data.ts b/yarn-project/protocol-contracts/src/scripts/generate_data.ts index bb68612cd1d9..a447c4987872 100644 --- a/yarn-project/protocol-contracts/src/scripts/generate_data.ts +++ b/yarn-project/protocol-contracts/src/scripts/generate_data.ts @@ -81,7 +81,7 @@ async function computeRoot(names: string[], leaves: Fr[]) { async function generateDeclarationFile(destName: string) { const content = ` - import { type NoirCompiledContract } from '@aztec/stdlib/noir'; + import type { NoirCompiledContract } from '@aztec/stdlib/noir'; const circuit: NoirCompiledContract; export = circuit; `; diff --git a/yarn-project/prover-client/src/block_builder/index.ts b/yarn-project/prover-client/src/block_builder/index.ts index e1a706d328cb..1539e00f788a 100644 --- a/yarn-project/prover-client/src/block_builder/index.ts +++ b/yarn-project/prover-client/src/block_builder/index.ts @@ -1,4 +1,4 @@ -import { type BlockBuilder, type MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server'; +import type { BlockBuilder, MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server'; export * from './light.js'; export interface BlockBuilderFactory { diff --git a/yarn-project/prover-client/src/block_builder/light.test.ts b/yarn-project/prover-client/src/block_builder/light.test.ts index e49eabe25d64..455c36ad63dd 100644 --- a/yarn-project/prover-client/src/block_builder/light.test.ts +++ b/yarn-project/prover-client/src/block_builder/light.test.ts @@ -29,7 +29,7 @@ import { protocolContractTreeRoot } from '@aztec/protocol-contracts'; import { computeFeePayerBalanceLeafSlot } from '@aztec/protocol-contracts/fee-juice'; import { PublicDataWrite } from '@aztec/stdlib/avm'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type MerkleTreeWriteOperations, type ServerCircuitProver } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeWriteOperations, ServerCircuitProver } from '@aztec/stdlib/interfaces/server'; import { BaseParityInputs, ParityPublicInputs, RootParityInput, RootParityInputs } from '@aztec/stdlib/parity'; import { type RecursiveProof, makeEmptyRecursiveProof } from '@aztec/stdlib/proofs'; import { diff --git a/yarn-project/prover-client/src/block_builder/light.ts b/yarn-project/prover-client/src/block_builder/light.ts index 694341c84c1a..f39952a2728b 100644 --- a/yarn-project/prover-client/src/block_builder/light.ts +++ b/yarn-project/prover-client/src/block_builder/light.ts @@ -4,7 +4,7 @@ import { padArrayEnd } from '@aztec/foundation/collection'; import { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; import { L2Block } from '@aztec/stdlib/block'; -import { type BlockBuilder, type MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; +import type { BlockBuilder, MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; import { MerkleTreeId } from '@aztec/stdlib/trees'; import { type GlobalVariables, type ProcessedTx, toNumBlobFields } from '@aztec/stdlib/tx'; import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client'; diff --git a/yarn-project/prover-client/src/config.ts b/yarn-project/prover-client/src/config.ts index 2e18e951658a..bcf40ee1b804 100644 --- a/yarn-project/prover-client/src/config.ts +++ b/yarn-project/prover-client/src/config.ts @@ -1,4 +1,4 @@ -import { type ACVMConfig, type BBConfig } from '@aztec/bb-prover'; +import type { ACVMConfig, BBConfig } from '@aztec/bb-prover'; import { type ConfigMappingsType, booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config'; import { type ProverConfig, proverConfigMappings } from '@aztec/stdlib/interfaces/server'; diff --git a/yarn-project/prover-client/src/mocks/fixtures.ts b/yarn-project/prover-client/src/mocks/fixtures.ts index e6368665c8ef..3fe106a73ddc 100644 --- a/yarn-project/prover-client/src/mocks/fixtures.ts +++ b/yarn-project/prover-client/src/mocks/fixtures.ts @@ -3,14 +3,14 @@ import { padArrayEnd } from '@aztec/foundation/collection'; import { randomBytes } from '@aztec/foundation/crypto'; import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; -import { type Logger } from '@aztec/foundation/log'; +import type { Logger } from '@aztec/foundation/log'; import { fileURLToPath } from '@aztec/foundation/url'; import { NativeACVMSimulator, type SimulationProvider, WASMSimulatorWithBlobs } from '@aztec/simulator/server'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { GasFees } from '@aztec/stdlib/gas'; -import { type MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; import { MerkleTreeId } from '@aztec/stdlib/trees'; -import { type ProcessedTx } from '@aztec/stdlib/tx'; +import type { ProcessedTx } from '@aztec/stdlib/tx'; import { GlobalVariables } from '@aztec/stdlib/tx'; import { promises as fs } from 'fs'; diff --git a/yarn-project/prover-client/src/mocks/test_context.ts b/yarn-project/prover-client/src/mocks/test_context.ts index db7a2a14e1ce..72b0b119475f 100644 --- a/yarn-project/prover-client/src/mocks/test_context.ts +++ b/yarn-project/prover-client/src/mocks/test_context.ts @@ -1,7 +1,7 @@ -import { type BBProverConfig } from '@aztec/bb-prover'; +import type { BBProverConfig } from '@aztec/bb-prover'; import { times, timesParallel } from '@aztec/foundation/collection'; import { Fr } from '@aztec/foundation/fields'; -import { type Logger } from '@aztec/foundation/log'; +import type { Logger } from '@aztec/foundation/log'; import { TestDateProvider } from '@aztec/foundation/timer'; import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks'; import { protocolContractTreeRoot } from '@aztec/protocol-contracts'; @@ -16,11 +16,11 @@ import { import { PublicDataWrite } from '@aztec/stdlib/avm'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { L2Block } from '@aztec/stdlib/block'; -import { type ServerCircuitProver } from '@aztec/stdlib/interfaces/server'; +import type { ServerCircuitProver } from '@aztec/stdlib/interfaces/server'; import { makeBloatedProcessedTx } from '@aztec/stdlib/testing'; import { type AppendOnlyTreeSnapshot, PublicDataTreeLeaf } from '@aztec/stdlib/trees'; import { type BlockHeader, type GlobalVariables, type ProcessedTx, TreeSnapshots, type Tx } from '@aztec/stdlib/tx'; -import { type MerkleTreeAdminDatabase } from '@aztec/world-state'; +import type { MerkleTreeAdminDatabase } from '@aztec/world-state'; import { NativeWorldStateService } from '@aztec/world-state/native'; import { promises as fs } from 'fs'; diff --git a/yarn-project/prover-client/src/orchestrator/block-building-helpers.ts b/yarn-project/prover-client/src/orchestrator/block-building-helpers.ts index db5642f5e65c..3e1e30c178f7 100644 --- a/yarn-project/prover-client/src/orchestrator/block-building-helpers.ts +++ b/yarn-project/prover-client/src/orchestrator/block-building-helpers.ts @@ -15,7 +15,7 @@ import { makeTuple } from '@aztec/foundation/array'; import { padArrayEnd } from '@aztec/foundation/collection'; import { sha256Trunc } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; -import { type Logger } from '@aztec/foundation/log'; +import type { Logger } from '@aztec/foundation/log'; import { type Tuple, assertLength, serializeToBuffer, toFriendlyJSON } from '@aztec/foundation/serialize'; import { MembershipWitness, MerkleTreeCalculator, computeUnbalancedMerkleRoot } from '@aztec/foundation/trees'; import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks'; @@ -23,7 +23,7 @@ import { protocolContractTreeRoot } from '@aztec/protocol-contracts'; import { computeFeePayerBalanceLeafSlot } from '@aztec/protocol-contracts/fee-juice'; import { PublicDataHint } from '@aztec/stdlib/avm'; import { Body } from '@aztec/stdlib/block'; -import { type MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; import type { ParityPublicInputs } from '@aztec/stdlib/parity'; import { type BaseOrMergeRollupPublicInputs, @@ -51,7 +51,7 @@ import { TxEffect, } from '@aztec/stdlib/tx'; import { Attributes, type Span, runInSpan } from '@aztec/telemetry-client'; -import { type MerkleTreeReadOperations } from '@aztec/world-state'; +import type { MerkleTreeReadOperations } from '@aztec/world-state'; import { inspect } from 'util'; diff --git a/yarn-project/prover-client/src/orchestrator/block-proving-state.ts b/yarn-project/prover-client/src/orchestrator/block-proving-state.ts index 05e50a3804cb..cdc3fa92c8e5 100644 --- a/yarn-project/prover-client/src/orchestrator/block-proving-state.ts +++ b/yarn-project/prover-client/src/orchestrator/block-proving-state.ts @@ -11,13 +11,13 @@ import { } from '@aztec/constants'; import { padArrayEnd } from '@aztec/foundation/collection'; import { Fr } from '@aztec/foundation/fields'; -import { type Logger } from '@aztec/foundation/log'; -import { type Tuple } from '@aztec/foundation/serialize'; +import type { Logger } from '@aztec/foundation/log'; +import type { Tuple } from '@aztec/foundation/serialize'; import { MembershipWitness, type TreeNodeLocation, UnbalancedTreeStore } from '@aztec/foundation/trees'; import { getVKIndex, getVKSiblingPath, getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks'; import { protocolContractTreeRoot } from '@aztec/protocol-contracts'; -import { type L2Block } from '@aztec/stdlib/block'; -import { type PublicInputsAndRecursiveProof } from '@aztec/stdlib/interfaces/server'; +import type { L2Block } from '@aztec/stdlib/block'; +import type { PublicInputsAndRecursiveProof } from '@aztec/stdlib/interfaces/server'; import { type ParityPublicInputs, RootParityInput, RootParityInputs } from '@aztec/stdlib/parity'; import { type BaseOrMergeRollupPublicInputs, @@ -31,13 +31,13 @@ import { PreviousRollupData, SingleTxBlockRootRollupInputs, } from '@aztec/stdlib/rollup'; -import { type CircuitName } from '@aztec/stdlib/stats'; -import { type AppendOnlyTreeSnapshot, type MerkleTreeId } from '@aztec/stdlib/trees'; +import type { CircuitName } from '@aztec/stdlib/stats'; +import type { AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees'; import { type BlockHeader, type GlobalVariables, StateReference } from '@aztec/stdlib/tx'; import { buildBlobHints, buildHeaderFromCircuitOutputs } from './block-building-helpers.js'; -import { type EpochProvingState } from './epoch-proving-state.js'; -import { type TxProvingState } from './tx-proving-state.js'; +import type { EpochProvingState } from './epoch-proving-state.js'; +import type { TxProvingState } from './tx-proving-state.js'; export type TreeSnapshots = Map; diff --git a/yarn-project/prover-client/src/orchestrator/epoch-proving-state.ts b/yarn-project/prover-client/src/orchestrator/epoch-proving-state.ts index cda027762179..c260e1cd93d9 100644 --- a/yarn-project/prover-client/src/orchestrator/epoch-proving-state.ts +++ b/yarn-project/prover-client/src/orchestrator/epoch-proving-state.ts @@ -6,10 +6,10 @@ import { VK_TREE_HEIGHT, } from '@aztec/constants'; import type { Fr } from '@aztec/foundation/fields'; -import { type Tuple } from '@aztec/foundation/serialize'; +import type { Tuple } from '@aztec/foundation/serialize'; import { MembershipWitness, type TreeNodeLocation, UnbalancedTreeStore } from '@aztec/foundation/trees'; import { getVKIndex, getVKSiblingPath } from '@aztec/noir-protocol-circuits-types/vks'; -import { type ProofAndVerificationKey, type PublicInputsAndRecursiveProof } from '@aztec/stdlib/interfaces/server'; +import type { ProofAndVerificationKey, PublicInputsAndRecursiveProof } from '@aztec/stdlib/interfaces/server'; import type { Proof } from '@aztec/stdlib/proofs'; import { BlockMergeRollupInputs, @@ -18,8 +18,8 @@ import { RootRollupInputs, type RootRollupPublicInputs, } from '@aztec/stdlib/rollup'; -import { type AppendOnlyTreeSnapshot, type MerkleTreeId } from '@aztec/stdlib/trees'; -import { type BlockHeader, type GlobalVariables } from '@aztec/stdlib/tx'; +import type { AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees'; +import type { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx'; import { BlockProvingState } from './block-proving-state.js'; diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator.ts b/yarn-project/prover-client/src/orchestrator/orchestrator.ts index 5a5c27bb3428..9a1317a9b00e 100644 --- a/yarn-project/prover-client/src/orchestrator/orchestrator.ts +++ b/yarn-project/prover-client/src/orchestrator/orchestrator.ts @@ -15,15 +15,15 @@ import { promiseWithResolvers } from '@aztec/foundation/promise'; import { assertLength } from '@aztec/foundation/serialize'; import { pushTestData } from '@aztec/foundation/testing'; import { elapsed } from '@aztec/foundation/timer'; -import { type TreeNodeLocation } from '@aztec/foundation/trees'; +import type { TreeNodeLocation } from '@aztec/foundation/trees'; import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks'; import { L2Block } from '@aztec/stdlib/block'; -import { - type EpochProver, - type ForkMerkleTreeOperations, - type MerkleTreeWriteOperations, - type ProofAndVerificationKey, - type ServerCircuitProver, +import type { + EpochProver, + ForkMerkleTreeOperations, + MerkleTreeWriteOperations, + ProofAndVerificationKey, + ServerCircuitProver, } from '@aztec/stdlib/interfaces/server'; import { BaseParityInputs } from '@aztec/stdlib/parity'; import { makeEmptyRecursiveProof } from '@aztec/stdlib/proofs'; @@ -34,7 +34,7 @@ import { SingleTxBlockRootRollupInputs, TubeInputs, } from '@aztec/stdlib/rollup'; -import { type CircuitName } from '@aztec/stdlib/stats'; +import type { CircuitName } from '@aztec/stdlib/stats'; import { type AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees'; import { type BlockHeader, type GlobalVariables, type ProcessedTx, type Tx, toNumBlobFields } from '@aztec/stdlib/tx'; import { VerificationKeyData } from '@aztec/stdlib/vks'; @@ -58,7 +58,7 @@ import { validatePartialState, validateTx, } from './block-building-helpers.js'; -import { type BlockProvingState } from './block-proving-state.js'; +import type { BlockProvingState } from './block-proving-state.js'; import { EpochProvingState, type ProvingResult, type TreeSnapshots } from './epoch-proving-state.js'; import { ProvingOrchestratorMetrics } from './orchestrator_metrics.js'; import { TxProvingState } from './tx-proving-state.js'; diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator_errors.test.ts b/yarn-project/prover-client/src/orchestrator/orchestrator_errors.test.ts index 620f4159933f..a672aad9be56 100644 --- a/yarn-project/prover-client/src/orchestrator/orchestrator_errors.test.ts +++ b/yarn-project/prover-client/src/orchestrator/orchestrator_errors.test.ts @@ -3,7 +3,7 @@ import { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; import { TestContext } from '../mocks/test_context.js'; -import { type ProvingOrchestrator } from './orchestrator.js'; +import type { ProvingOrchestrator } from './orchestrator.js'; const logger = createLogger('prover-client:test:orchestrator-errors'); diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator_failures.test.ts b/yarn-project/prover-client/src/orchestrator/orchestrator_failures.test.ts index ba9b06a9c2a0..cbeef2b377eb 100644 --- a/yarn-project/prover-client/src/orchestrator/orchestrator_failures.test.ts +++ b/yarn-project/prover-client/src/orchestrator/orchestrator_failures.test.ts @@ -1,11 +1,11 @@ import { timesAsync } from '@aztec/foundation/collection'; import { createLogger } from '@aztec/foundation/log'; -import { type ServerCircuitProver } from '@aztec/stdlib/interfaces/server'; +import type { ServerCircuitProver } from '@aztec/stdlib/interfaces/server'; import { jest } from '@jest/globals'; import { TestContext } from '../mocks/test_context.js'; -import { type ProvingOrchestrator } from './orchestrator.js'; +import type { ProvingOrchestrator } from './orchestrator.js'; const logger = createLogger('prover-client:test:orchestrator-failures'); const LONG_TIMEOUT = 600_000; diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator_lifecycle.test.ts b/yarn-project/prover-client/src/orchestrator/orchestrator_lifecycle.test.ts index 1bdd0fd6f0c5..0db23aa7b59d 100644 --- a/yarn-project/prover-client/src/orchestrator/orchestrator_lifecycle.test.ts +++ b/yarn-project/prover-client/src/orchestrator/orchestrator_lifecycle.test.ts @@ -2,7 +2,7 @@ import { NUM_BASE_PARITY_PER_ROOT_PARITY } from '@aztec/constants'; import { createLogger } from '@aztec/foundation/log'; import { type PromiseWithResolvers, promiseWithResolvers } from '@aztec/foundation/promise'; import { sleep } from '@aztec/foundation/sleep'; -import { type ServerCircuitProver } from '@aztec/stdlib/interfaces/server'; +import type { ServerCircuitProver } from '@aztec/stdlib/interfaces/server'; import { jest } from '@jest/globals'; diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator_multi_public_functions.test.ts b/yarn-project/prover-client/src/orchestrator/orchestrator_multi_public_functions.test.ts index a425df7edb75..de1199da1203 100644 --- a/yarn-project/prover-client/src/orchestrator/orchestrator_multi_public_functions.test.ts +++ b/yarn-project/prover-client/src/orchestrator/orchestrator_multi_public_functions.test.ts @@ -4,9 +4,9 @@ import { createLogger } from '@aztec/foundation/log'; import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token'; import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks'; import { protocolContractTreeRoot } from '@aztec/protocol-contracts'; -import { type TestEnqueuedCall } from '@aztec/simulator/public/fixtures'; +import type { TestEnqueuedCall } from '@aztec/simulator/public/fixtures'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract'; import { siloNullifier } from '@aztec/stdlib/hash'; import { Tx } from '@aztec/stdlib/tx'; diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator_workflow.test.ts b/yarn-project/prover-client/src/orchestrator/orchestrator_workflow.test.ts index 1f3abe99b0c7..f217482dded9 100644 --- a/yarn-project/prover-client/src/orchestrator/orchestrator_workflow.test.ts +++ b/yarn-project/prover-client/src/orchestrator/orchestrator_workflow.test.ts @@ -12,13 +12,13 @@ import { import type { ParityPublicInputs } from '@aztec/stdlib/parity'; import { ClientIvcProof, makeRecursiveProof } from '@aztec/stdlib/proofs'; import { makeParityPublicInputs } from '@aztec/stdlib/testing'; -import { type BlockHeader, type GlobalVariables, type Tx } from '@aztec/stdlib/tx'; +import type { BlockHeader, GlobalVariables, Tx } from '@aztec/stdlib/tx'; import { jest } from '@jest/globals'; import { type MockProxy, mock } from 'jest-mock-extended'; import { TestContext } from '../mocks/test_context.js'; -import { type ProvingOrchestrator } from './orchestrator.js'; +import type { ProvingOrchestrator } from './orchestrator.js'; const logger = createLogger('prover-client:test:orchestrator-workflow'); diff --git a/yarn-project/prover-client/src/orchestrator/tx-proving-state.ts b/yarn-project/prover-client/src/orchestrator/tx-proving-state.ts index 0416cf5b573d..01185ee9f6a8 100644 --- a/yarn-project/prover-client/src/orchestrator/tx-proving-state.ts +++ b/yarn-project/prover-client/src/orchestrator/tx-proving-state.ts @@ -1,7 +1,7 @@ import { type AVM_PROOF_LENGTH_IN_FIELDS, AVM_VK_INDEX, type TUBE_PROOF_LENGTH, TUBE_VK_INDEX } from '@aztec/constants'; import { getVKIndex, getVKSiblingPath } from '@aztec/noir-protocol-circuits-types/vks'; import type { AvmCircuitInputs } from '@aztec/stdlib/avm'; -import { type ProofAndVerificationKey } from '@aztec/stdlib/interfaces/server'; +import type { ProofAndVerificationKey } from '@aztec/stdlib/interfaces/server'; import { AvmProofData, type BaseRollupHints, @@ -13,9 +13,9 @@ import { PublicTubeData, TubeInputs, } from '@aztec/stdlib/rollup'; -import { type CircuitName } from '@aztec/stdlib/stats'; -import { type AppendOnlyTreeSnapshot, type MerkleTreeId } from '@aztec/stdlib/trees'; -import { type ProcessedTx } from '@aztec/stdlib/tx'; +import type { CircuitName } from '@aztec/stdlib/stats'; +import type { AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees'; +import type { ProcessedTx } from '@aztec/stdlib/tx'; import { VkWitnessData } from '@aztec/stdlib/vks'; /** diff --git a/yarn-project/prover-client/src/prover-client/factory.ts b/yarn-project/prover-client/src/prover-client/factory.ts index 3ce4f3b2890b..a28429627846 100644 --- a/yarn-project/prover-client/src/prover-client/factory.ts +++ b/yarn-project/prover-client/src/prover-client/factory.ts @@ -1,7 +1,7 @@ -import { type ForkMerkleTreeOperations, type ProvingJobBroker } from '@aztec/stdlib/interfaces/server'; +import type { ForkMerkleTreeOperations, ProvingJobBroker } from '@aztec/stdlib/interfaces/server'; import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client'; -import { type ProverClientConfig } from '../config.js'; +import type { ProverClientConfig } from '../config.js'; import { ProverClient } from './prover-client.js'; export function createProverClient( diff --git a/yarn-project/prover-client/src/prover-client/prover-client.ts b/yarn-project/prover-client/src/prover-client/prover-client.ts index 0f91da948d3f..1de621f10237 100644 --- a/yarn-project/prover-client/src/prover-client/prover-client.ts +++ b/yarn-project/prover-client/src/prover-client/prover-client.ts @@ -3,19 +3,19 @@ import { times } from '@aztec/foundation/collection'; import { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; import { NativeACVMSimulator } from '@aztec/simulator/server'; -import { - type ActualProverConfig, - type EpochProver, - type EpochProverManager, - type ForkMerkleTreeOperations, - type ProvingJobBroker, - type ProvingJobConsumer, - type ProvingJobProducer, - type ServerCircuitProver, +import type { + ActualProverConfig, + EpochProver, + EpochProverManager, + ForkMerkleTreeOperations, + ProvingJobBroker, + ProvingJobConsumer, + ProvingJobProducer, + ServerCircuitProver, } from '@aztec/stdlib/interfaces/server'; import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client'; -import { type ProverClientConfig } from '../config.js'; +import type { ProverClientConfig } from '../config.js'; import { ProvingOrchestrator } from '../orchestrator/orchestrator.js'; import { BrokerCircuitProverFacade } from '../proving_broker/broker_prover_facade.js'; import { InlineProofStore, type ProofStore, createProofStore } from '../proving_broker/proof_store/index.js'; diff --git a/yarn-project/prover-client/src/prover-client/server-epoch-prover.ts b/yarn-project/prover-client/src/prover-client/server-epoch-prover.ts index 44e5d2b07d66..bc09106237e8 100644 --- a/yarn-project/prover-client/src/prover-client/server-epoch-prover.ts +++ b/yarn-project/prover-client/src/prover-client/server-epoch-prover.ts @@ -1,12 +1,12 @@ import type { Fr } from '@aztec/foundation/fields'; import type { L2Block } from '@aztec/stdlib/block'; -import { type EpochProver } from '@aztec/stdlib/interfaces/server'; +import type { EpochProver } from '@aztec/stdlib/interfaces/server'; import type { Proof } from '@aztec/stdlib/proofs'; -import { type RootRollupPublicInputs } from '@aztec/stdlib/rollup'; -import { type BlockHeader, type GlobalVariables, type ProcessedTx, type Tx } from '@aztec/stdlib/tx'; +import type { RootRollupPublicInputs } from '@aztec/stdlib/rollup'; +import type { BlockHeader, GlobalVariables, ProcessedTx, Tx } from '@aztec/stdlib/tx'; -import { type ProvingOrchestrator } from '../orchestrator/orchestrator.js'; -import { type BrokerCircuitProverFacade } from '../proving_broker/broker_prover_facade.js'; +import type { ProvingOrchestrator } from '../orchestrator/orchestrator.js'; +import type { BrokerCircuitProverFacade } from '../proving_broker/broker_prover_facade.js'; /** Encapsulates the proving orchestrator and the broker facade */ export class ServerEpochProver implements EpochProver { diff --git a/yarn-project/prover-client/src/proving_broker/broker_prover_facade.ts b/yarn-project/prover-client/src/proving_broker/broker_prover_facade.ts index a2d00184e492..427207b3244d 100644 --- a/yarn-project/prover-client/src/proving_broker/broker_prover_facade.ts +++ b/yarn-project/prover-client/src/proving_broker/broker_prover_facade.ts @@ -1,15 +1,15 @@ -import { - type AVM_PROOF_LENGTH_IN_FIELDS, - type NESTED_RECURSIVE_PROOF_LENGTH, - type NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, - type RECURSIVE_PROOF_LENGTH, - type TUBE_PROOF_LENGTH, +import type { + AVM_PROOF_LENGTH_IN_FIELDS, + NESTED_RECURSIVE_PROOF_LENGTH, + NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, + RECURSIVE_PROOF_LENGTH, + TUBE_PROOF_LENGTH, } from '@aztec/constants'; import { sha256 } from '@aztec/foundation/crypto'; import { createLogger } from '@aztec/foundation/log'; import { type PromiseWithResolvers, RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise'; import { truncate } from '@aztec/foundation/string'; -import { type AvmCircuitInputs } from '@aztec/stdlib/avm'; +import type { AvmCircuitInputs } from '@aztec/stdlib/avm'; import { type ProofAndVerificationKey, type ProofUri, @@ -22,21 +22,21 @@ import { type ServerCircuitProver, makeProvingJobId, } from '@aztec/stdlib/interfaces/server'; -import { type BaseParityInputs, type ParityPublicInputs, type RootParityInputs } from '@aztec/stdlib/parity'; +import type { BaseParityInputs, ParityPublicInputs, RootParityInputs } from '@aztec/stdlib/parity'; import { ProvingRequestType } from '@aztec/stdlib/proofs'; -import { - type BaseOrMergeRollupPublicInputs, - type BlockMergeRollupInputs, - type BlockRootOrBlockMergePublicInputs, - type BlockRootRollupInputs, - type EmptyBlockRootRollupInputs, - type MergeRollupInputs, - type PrivateBaseRollupInputs, - type PublicBaseRollupInputs, - type RootRollupInputs, - type RootRollupPublicInputs, - type SingleTxBlockRootRollupInputs, - type TubeInputs, +import type { + BaseOrMergeRollupPublicInputs, + BlockMergeRollupInputs, + BlockRootOrBlockMergePublicInputs, + BlockRootRollupInputs, + EmptyBlockRootRollupInputs, + MergeRollupInputs, + PrivateBaseRollupInputs, + PublicBaseRollupInputs, + RootRollupInputs, + RootRollupPublicInputs, + SingleTxBlockRootRollupInputs, + TubeInputs, } from '@aztec/stdlib/rollup'; import { InlineProofStore, type ProofStore } from './proof_store/index.js'; diff --git a/yarn-project/prover-client/src/proving_broker/factory.ts b/yarn-project/prover-client/src/proving_broker/factory.ts index 4f083a6f1262..367398f86ee9 100644 --- a/yarn-project/prover-client/src/proving_broker/factory.ts +++ b/yarn-project/prover-client/src/proving_broker/factory.ts @@ -1,6 +1,6 @@ -import { type TelemetryClient } from '@aztec/telemetry-client'; +import type { TelemetryClient } from '@aztec/telemetry-client'; -import { type ProverBrokerConfig } from './config.js'; +import type { ProverBrokerConfig } from './config.js'; import { ProvingBroker } from './proving_broker.js'; import { InMemoryBrokerDatabase } from './proving_broker_database/memory.js'; import { KVBrokerDatabase } from './proving_broker_database/persisted.js'; diff --git a/yarn-project/prover-client/src/proving_broker/proof_store/factory.ts b/yarn-project/prover-client/src/proving_broker/proof_store/factory.ts index 84f3b5fa1cc7..5bf970d66fd3 100644 --- a/yarn-project/prover-client/src/proving_broker/proof_store/factory.ts +++ b/yarn-project/prover-client/src/proving_broker/proof_store/factory.ts @@ -2,7 +2,7 @@ import { createLogger } from '@aztec/foundation/log'; import { GoogleCloudStorageProofStore } from './gcs_proof_store.js'; import { InlineProofStore } from './inline_proof_store.js'; -import { type ProofStore } from './proof_store.js'; +import type { ProofStore } from './proof_store.js'; export function createProofStore(config: string | undefined, logger = createLogger('prover-client:proof-store')) { if (config === undefined) { diff --git a/yarn-project/prover-client/src/proving_broker/proof_store/gcs_proof_store.ts b/yarn-project/prover-client/src/proving_broker/proof_store/gcs_proof_store.ts index ca5b95a28c00..c845e97f9d75 100644 --- a/yarn-project/prover-client/src/proving_broker/proof_store/gcs_proof_store.ts +++ b/yarn-project/prover-client/src/proving_broker/proof_store/gcs_proof_store.ts @@ -12,7 +12,7 @@ import { ProvingRequestType } from '@aztec/stdlib/proofs'; import { Storage } from '@google-cloud/storage'; import { join } from 'path'; -import { type ProofStore } from './proof_store.js'; +import type { ProofStore } from './proof_store.js'; const INPUTS_PATH = 'inputs'; diff --git a/yarn-project/prover-client/src/proving_broker/proof_store/inline_proof_store.ts b/yarn-project/prover-client/src/proving_broker/proof_store/inline_proof_store.ts index 96754258cd0f..ef42d97bed6b 100644 --- a/yarn-project/prover-client/src/proving_broker/proof_store/inline_proof_store.ts +++ b/yarn-project/prover-client/src/proving_broker/proof_store/inline_proof_store.ts @@ -8,9 +8,9 @@ import { type ProvingJobResultsMap, } from '@aztec/stdlib/interfaces/server'; import type { ProvingRequestType } from '@aztec/stdlib/proofs'; -import { type ZodFor } from '@aztec/stdlib/schemas'; +import type { ZodFor } from '@aztec/stdlib/schemas'; -import { type ProofStore } from './proof_store.js'; +import type { ProofStore } from './proof_store.js'; // use an ASCII encoded data uri https://datatracker.ietf.org/doc/html/rfc2397#section-2 // we do this to avoid double encoding to base64 (since the inputs already serialize to a base64 string) diff --git a/yarn-project/prover-client/src/proving_broker/proof_store/proof_store.ts b/yarn-project/prover-client/src/proving_broker/proof_store/proof_store.ts index 12e5aae763f9..21f40990586b 100644 --- a/yarn-project/prover-client/src/proving_broker/proof_store/proof_store.ts +++ b/yarn-project/prover-client/src/proving_broker/proof_store/proof_store.ts @@ -1,10 +1,10 @@ -import { - type ProofUri, - type ProvingJobId, - type ProvingJobInputs, - type ProvingJobInputsMap, - type ProvingJobResult, - type ProvingJobResultsMap, +import type { + ProofUri, + ProvingJobId, + ProvingJobInputs, + ProvingJobInputsMap, + ProvingJobResult, + ProvingJobResultsMap, } from '@aztec/stdlib/interfaces/server'; import type { ProvingRequestType } from '@aztec/stdlib/proofs'; diff --git a/yarn-project/prover-client/src/proving_broker/proving_agent.test.ts b/yarn-project/prover-client/src/proving_broker/proving_agent.test.ts index a6f9b0f66205..0ef040705640 100644 --- a/yarn-project/prover-client/src/proving_broker/proving_agent.test.ts +++ b/yarn-project/prover-client/src/proving_broker/proving_agent.test.ts @@ -20,7 +20,7 @@ import { VerificationKeyData } from '@aztec/stdlib/vks'; import { jest } from '@jest/globals'; import { MockProver } from '../test/mock_prover.js'; -import { type ProofStore } from './proof_store/index.js'; +import type { ProofStore } from './proof_store/index.js'; import { ProvingAgent } from './proving_agent.js'; describe('ProvingAgent', () => { diff --git a/yarn-project/prover-client/src/proving_broker/proving_agent.ts b/yarn-project/prover-client/src/proving_broker/proving_agent.ts index 360d85b72aef..61f3892df56f 100644 --- a/yarn-project/prover-client/src/proving_broker/proving_agent.ts +++ b/yarn-project/prover-client/src/proving_broker/proving_agent.ts @@ -3,13 +3,13 @@ import { RunningPromise } from '@aztec/foundation/running-promise'; import { truncate } from '@aztec/foundation/string'; import { Timer } from '@aztec/foundation/timer'; import { ProvingError } from '@aztec/stdlib/errors'; -import { - type ProvingJob, - type ProvingJobConsumer, - type ProvingJobId, - type ProvingJobInputs, - type ProvingJobResultsMap, - type ServerCircuitProver, +import type { + ProvingJob, + ProvingJobConsumer, + ProvingJobId, + ProvingJobInputs, + ProvingJobResultsMap, + ServerCircuitProver, } from '@aztec/stdlib/interfaces/server'; import { ProvingRequestType } from '@aztec/stdlib/proofs'; import { @@ -20,7 +20,7 @@ import { trackSpan, } from '@aztec/telemetry-client'; -import { type ProofStore } from './proof_store/index.js'; +import type { ProofStore } from './proof_store/index.js'; import { ProvingAgentInstrumentation } from './proving_agent_instrumentation.js'; import { ProvingJobController, ProvingJobControllerStatus } from './proving_job_controller.js'; diff --git a/yarn-project/prover-client/src/proving_broker/proving_agent_instrumentation.ts b/yarn-project/prover-client/src/proving_broker/proving_agent_instrumentation.ts index 573b71f2e932..af0e49ef3da7 100644 --- a/yarn-project/prover-client/src/proving_broker/proving_agent_instrumentation.ts +++ b/yarn-project/prover-client/src/proving_broker/proving_agent_instrumentation.ts @@ -1,4 +1,4 @@ -import { type Timer } from '@aztec/foundation/timer'; +import type { Timer } from '@aztec/foundation/timer'; import { type Histogram, Metrics, type TelemetryClient, ValueType } from '@aztec/telemetry-client'; export class ProvingAgentInstrumentation { diff --git a/yarn-project/prover-client/src/proving_broker/proving_broker.test.ts b/yarn-project/prover-client/src/proving_broker/proving_broker.test.ts index ac4089534877..6110e8a1c194 100644 --- a/yarn-project/prover-client/src/proving_broker/proving_broker.test.ts +++ b/yarn-project/prover-client/src/proving_broker/proving_broker.test.ts @@ -1,10 +1,5 @@ import { sleep } from '@aztec/foundation/sleep'; -import { - type ProofUri, - type ProvingJob, - type ProvingJobId, - type ProvingJobStatus, -} from '@aztec/stdlib/interfaces/server'; +import type { ProofUri, ProvingJob, ProvingJobId, ProvingJobStatus } from '@aztec/stdlib/interfaces/server'; import { ProvingRequestType } from '@aztec/stdlib/proofs'; import { jest } from '@jest/globals'; @@ -15,7 +10,7 @@ import { join } from 'path'; import { type ProverBrokerConfig, defaultProverBrokerConfig } from './config.js'; import { makeInputsUri, makeOutputsUri, makeRandomProvingJobId } from './fixtures.js'; import { ProvingBroker } from './proving_broker.js'; -import { type ProvingBrokerDatabase } from './proving_broker_database.js'; +import type { ProvingBrokerDatabase } from './proving_broker_database.js'; import { InMemoryBrokerDatabase } from './proving_broker_database/memory.js'; import { KVBrokerDatabase } from './proving_broker_database/persisted.js'; diff --git a/yarn-project/prover-client/src/proving_broker/proving_broker.ts b/yarn-project/prover-client/src/proving_broker/proving_broker.ts index bef6bdbb6f43..8817839c9918 100644 --- a/yarn-project/prover-client/src/proving_broker/proving_broker.ts +++ b/yarn-project/prover-client/src/proving_broker/proving_broker.ts @@ -2,16 +2,16 @@ import { createLogger } from '@aztec/foundation/log'; import { type PromiseWithResolvers, RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise'; import { PriorityMemoryQueue } from '@aztec/foundation/queue'; import { Timer } from '@aztec/foundation/timer'; -import { - type GetProvingJobResponse, - type ProofUri, - type ProvingJob, - type ProvingJobConsumer, - type ProvingJobFilter, - type ProvingJobId, - type ProvingJobProducer, - type ProvingJobSettledResult, - type ProvingJobStatus, +import type { + GetProvingJobResponse, + ProofUri, + ProvingJob, + ProvingJobConsumer, + ProvingJobFilter, + ProvingJobId, + ProvingJobProducer, + ProvingJobSettledResult, + ProvingJobStatus, } from '@aztec/stdlib/interfaces/server'; import { ProvingRequestType } from '@aztec/stdlib/proofs'; import { @@ -25,7 +25,7 @@ import { import assert from 'assert'; import { type ProverBrokerConfig, defaultProverBrokerConfig } from './config.js'; -import { type ProvingBrokerDatabase } from './proving_broker_database.js'; +import type { ProvingBrokerDatabase } from './proving_broker_database.js'; import { type MonitorCallback, ProvingBrokerInstrumentation } from './proving_broker_instrumentation.js'; type InProgressMetadata = { diff --git a/yarn-project/prover-client/src/proving_broker/proving_broker_database.ts b/yarn-project/prover-client/src/proving_broker/proving_broker_database.ts index 8f715ab06b8c..3bef61979f3f 100644 --- a/yarn-project/prover-client/src/proving_broker/proving_broker_database.ts +++ b/yarn-project/prover-client/src/proving_broker/proving_broker_database.ts @@ -1,9 +1,4 @@ -import { - type ProofUri, - type ProvingJob, - type ProvingJobId, - type ProvingJobSettledResult, -} from '@aztec/stdlib/interfaces/server'; +import type { ProofUri, ProvingJob, ProvingJobId, ProvingJobSettledResult } from '@aztec/stdlib/interfaces/server'; /** * A database for storing proof requests and their results diff --git a/yarn-project/prover-client/src/proving_broker/proving_broker_database/broker_persisted_database.test.ts b/yarn-project/prover-client/src/proving_broker/proving_broker_database/broker_persisted_database.test.ts index 15f57be7c968..92b9f356722d 100644 --- a/yarn-project/prover-client/src/proving_broker/proving_broker_database/broker_persisted_database.test.ts +++ b/yarn-project/prover-client/src/proving_broker/proving_broker_database/broker_persisted_database.test.ts @@ -1,5 +1,5 @@ import { toArray } from '@aztec/foundation/iterable'; -import { type ProofUri, type ProvingJob, type ProvingJobSettledResult } from '@aztec/stdlib/interfaces/server'; +import type { ProofUri, ProvingJob, ProvingJobSettledResult } from '@aztec/stdlib/interfaces/server'; import { ProvingRequestType } from '@aztec/stdlib/proofs'; import { jest } from '@jest/globals'; @@ -8,7 +8,7 @@ import { mkdir, mkdtemp, rm } from 'fs/promises'; import { tmpdir } from 'os'; import { join } from 'path'; -import { type ProverBrokerConfig } from '../config.js'; +import type { ProverBrokerConfig } from '../config.js'; import { makeInputsUri, makeRandomProvingJobId } from '../fixtures.js'; import { KVBrokerDatabase } from './persisted.js'; diff --git a/yarn-project/prover-client/src/proving_broker/proving_broker_database/memory.ts b/yarn-project/prover-client/src/proving_broker/proving_broker_database/memory.ts index 2acbd85c6682..b29bbbac64f9 100644 --- a/yarn-project/prover-client/src/proving_broker/proving_broker_database/memory.ts +++ b/yarn-project/prover-client/src/proving_broker/proving_broker_database/memory.ts @@ -6,7 +6,7 @@ import { getEpochFromProvingJobId, } from '@aztec/stdlib/interfaces/server'; -import { type ProvingBrokerDatabase } from '../proving_broker_database.js'; +import type { ProvingBrokerDatabase } from '../proving_broker_database.js'; export class InMemoryBrokerDatabase implements ProvingBrokerDatabase { private jobs = new Map(); diff --git a/yarn-project/prover-client/src/proving_broker/proving_broker_database/persisted.ts b/yarn-project/prover-client/src/proving_broker/proving_broker_database/persisted.ts index ce2af2358d73..5203bc4e0154 100644 --- a/yarn-project/prover-client/src/proving_broker/proving_broker_database/persisted.ts +++ b/yarn-project/prover-client/src/proving_broker/proving_broker_database/persisted.ts @@ -15,8 +15,8 @@ import { Attributes, LmdbMetrics, type TelemetryClient, getTelemetryClient } fro import { mkdir, readdir } from 'fs/promises'; import { join } from 'path'; -import { type ProverBrokerConfig } from '../config.js'; -import { type ProvingBrokerDatabase } from '../proving_broker_database.js'; +import type { ProverBrokerConfig } from '../config.js'; +import type { ProvingBrokerDatabase } from '../proving_broker_database.js'; class SingleEpochDatabase { private jobs: AztecAsyncMap; diff --git a/yarn-project/prover-client/src/proving_broker/proving_broker_instrumentation.ts b/yarn-project/prover-client/src/proving_broker/proving_broker_instrumentation.ts index c95d1ac11355..63c80dfe0830 100644 --- a/yarn-project/prover-client/src/proving_broker/proving_broker_instrumentation.ts +++ b/yarn-project/prover-client/src/proving_broker/proving_broker_instrumentation.ts @@ -1,4 +1,4 @@ -import { type Timer } from '@aztec/foundation/timer'; +import type { Timer } from '@aztec/foundation/timer'; import { ProvingRequestType } from '@aztec/stdlib/proofs'; import { Attributes, diff --git a/yarn-project/prover-client/src/proving_broker/proving_job_controller.ts b/yarn-project/prover-client/src/proving_broker/proving_job_controller.ts index 955a3e715884..36e430b48d2d 100644 --- a/yarn-project/prover-client/src/proving_broker/proving_job_controller.ts +++ b/yarn-project/prover-client/src/proving_broker/proving_job_controller.ts @@ -1,8 +1,8 @@ -import { - type ProvingJobId, - type ProvingJobInputs, - type ProvingJobResultsMap, - type ServerCircuitProver, +import type { + ProvingJobId, + ProvingJobInputs, + ProvingJobResultsMap, + ServerCircuitProver, } from '@aztec/stdlib/interfaces/server'; import { ProvingRequestType } from '@aztec/stdlib/proofs'; diff --git a/yarn-project/prover-client/src/proving_broker/rpc.ts b/yarn-project/prover-client/src/proving_broker/rpc.ts index 2483171f2d20..35d72a42b7e7 100644 --- a/yarn-project/prover-client/src/proving_broker/rpc.ts +++ b/yarn-project/prover-client/src/proving_broker/rpc.ts @@ -1,5 +1,5 @@ import { createSafeJsonRpcClient } from '@aztec/foundation/json-rpc/client'; -import { type SafeJsonRpcServer } from '@aztec/foundation/json-rpc/server'; +import type { SafeJsonRpcServer } from '@aztec/foundation/json-rpc/server'; import { type GetProvingJobResponse, ProofUri, diff --git a/yarn-project/prover-client/src/test/mock_prover.ts b/yarn-project/prover-client/src/test/mock_prover.ts index 66fcbc573306..df9cc1059e6e 100644 --- a/yarn-project/prover-client/src/test/mock_prover.ts +++ b/yarn-project/prover-client/src/test/mock_prover.ts @@ -7,7 +7,7 @@ import { TUBE_PROOF_LENGTH, } from '@aztec/constants'; import { times } from '@aztec/foundation/collection'; -import { type AvmCircuitInputs } from '@aztec/stdlib/avm'; +import type { AvmCircuitInputs } from '@aztec/stdlib/avm'; import { type ProofAndVerificationKey, type ProvingJob, @@ -19,20 +19,20 @@ import { makeProofAndVerificationKey, makePublicInputsAndRecursiveProof, } from '@aztec/stdlib/interfaces/server'; -import { type BaseParityInputs, type RootParityInputs } from '@aztec/stdlib/parity'; +import type { BaseParityInputs, RootParityInputs } from '@aztec/stdlib/parity'; import { makeEmptyRecursiveProof, makeRecursiveProof } from '@aztec/stdlib/proofs'; -import { - type BaseOrMergeRollupPublicInputs, - type BlockMergeRollupInputs, - type BlockRootOrBlockMergePublicInputs, - type BlockRootRollupInputs, - type EmptyBlockRootRollupInputs, - type MergeRollupInputs, - type PrivateBaseRollupInputs, - type PublicBaseRollupInputs, - type RootRollupInputs, - type RootRollupPublicInputs, - type SingleTxBlockRootRollupInputs, +import type { + BaseOrMergeRollupPublicInputs, + BlockMergeRollupInputs, + BlockRootOrBlockMergePublicInputs, + BlockRootRollupInputs, + EmptyBlockRootRollupInputs, + MergeRollupInputs, + PrivateBaseRollupInputs, + PublicBaseRollupInputs, + RootRollupInputs, + RootRollupPublicInputs, + SingleTxBlockRootRollupInputs, } from '@aztec/stdlib/rollup'; import { makeBaseOrMergeRollupPublicInputs, diff --git a/yarn-project/prover-node/src/config.ts b/yarn-project/prover-node/src/config.ts index df9295654d15..c4680d31748f 100644 --- a/yarn-project/prover-node/src/config.ts +++ b/yarn-project/prover-node/src/config.ts @@ -1,5 +1,5 @@ import { type ArchiverConfig, archiverConfigMappings } from '@aztec/archiver/config'; -import { type ACVMConfig, type BBConfig } from '@aztec/bb-prover/config'; +import type { ACVMConfig, BBConfig } from '@aztec/bb-prover/config'; import { type ConfigMappingsType, booleanConfigHelper, diff --git a/yarn-project/prover-node/src/factory.ts b/yarn-project/prover-node/src/factory.ts index 8c8d85178766..c6052c505ec5 100644 --- a/yarn-project/prover-node/src/factory.ts +++ b/yarn-project/prover-node/src/factory.ts @@ -3,15 +3,15 @@ import { type BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob- import { EpochCache } from '@aztec/epoch-cache'; import { L1TxUtils, RollupContract, createEthereumChain, createL1Clients } from '@aztec/ethereum'; import { type Logger, createLogger } from '@aztec/foundation/log'; -import { type DataStoreConfig } from '@aztec/kv-store/config'; +import type { DataStoreConfig } from '@aztec/kv-store/config'; import { createProverClient } from '@aztec/prover-client'; import { createAndStartProvingBroker } from '@aztec/prover-client/broker'; -import { type ProverCoordination, type ProvingJobBroker } from '@aztec/stdlib/interfaces/server'; -import { type PublicDataTreeLeaf } from '@aztec/stdlib/trees'; +import type { ProverCoordination, ProvingJobBroker } from '@aztec/stdlib/interfaces/server'; +import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees'; import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client'; import { createWorldStateSynchronizer } from '@aztec/world-state'; -import { type ProverNodeConfig } from './config.js'; +import type { ProverNodeConfig } from './config.js'; import { EpochMonitor } from './monitors/epoch-monitor.js'; import { createProverCoordination } from './prover-coordination/factory.js'; import { ProverNodePublisher } from './prover-node-publisher.js'; diff --git a/yarn-project/prover-node/src/http.ts b/yarn-project/prover-node/src/http.ts index 11f7eca595e4..219ef157f835 100644 --- a/yarn-project/prover-node/src/http.ts +++ b/yarn-project/prover-node/src/http.ts @@ -1,7 +1,7 @@ import { ProverNodeApiSchema } from '@aztec/stdlib/interfaces/server'; import { createTracedJsonRpcServer } from '@aztec/telemetry-client'; -import { type ProverNode } from './prover-node.js'; +import type { ProverNode } from './prover-node.js'; /** * Wrap a ProverNode instance with a JSON RPC HTTP server. diff --git a/yarn-project/prover-node/src/job/epoch-proving-job.test.ts b/yarn-project/prover-node/src/job/epoch-proving-job.test.ts index 5ee8c5628010..a5f176f95782 100644 --- a/yarn-project/prover-node/src/job/epoch-proving-job.test.ts +++ b/yarn-project/prover-node/src/job/epoch-proving-job.test.ts @@ -1,24 +1,20 @@ import { times, timesParallel } from '@aztec/foundation/collection'; import { toArray } from '@aztec/foundation/iterable'; import { sleep } from '@aztec/foundation/sleep'; -import { type PublicProcessor, type PublicProcessorFactory } from '@aztec/simulator/server'; +import type { PublicProcessor, PublicProcessorFactory } from '@aztec/simulator/server'; import { L2Block, type L2BlockSource } from '@aztec/stdlib/block'; -import { - type EpochProver, - type MerkleTreeWriteOperations, - type WorldStateSynchronizer, -} from '@aztec/stdlib/interfaces/server'; +import type { EpochProver, MerkleTreeWriteOperations, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server'; import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging'; import { Proof } from '@aztec/stdlib/proofs'; import { RootRollupPublicInputs } from '@aztec/stdlib/rollup'; -import { type ProcessedTx, type Tx } from '@aztec/stdlib/tx'; +import type { ProcessedTx, Tx } from '@aztec/stdlib/tx'; import { BlockHeader } from '@aztec/stdlib/tx'; import { getTelemetryClient } from '@aztec/telemetry-client'; import { type MockProxy, mock } from 'jest-mock-extended'; import { ProverNodeMetrics } from '../metrics.js'; -import { type ProverNodePublisher } from '../prover-node-publisher.js'; +import type { ProverNodePublisher } from '../prover-node-publisher.js'; import { EpochProvingJob } from './epoch-proving-job.js'; describe('epoch-proving-job', () => { diff --git a/yarn-project/prover-node/src/job/epoch-proving-job.ts b/yarn-project/prover-node/src/job/epoch-proving-job.ts index ba1408a1327e..93d3748ad713 100644 --- a/yarn-project/prover-node/src/job/epoch-proving-job.ts +++ b/yarn-project/prover-node/src/job/epoch-proving-job.ts @@ -2,7 +2,7 @@ import { asyncPool } from '@aztec/foundation/async-pool'; import { createLogger } from '@aztec/foundation/log'; import { promiseWithResolvers } from '@aztec/foundation/promise'; import { Timer } from '@aztec/foundation/timer'; -import { type PublicProcessor, type PublicProcessorFactory } from '@aztec/simulator/server'; +import type { PublicProcessor, PublicProcessorFactory } from '@aztec/simulator/server'; import type { L2Block, L2BlockSource } from '@aztec/stdlib/block'; import { type EpochProver, @@ -11,13 +11,13 @@ import { type ForkMerkleTreeOperations, } from '@aztec/stdlib/interfaces/server'; import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging'; -import { type ProcessedTx, type Tx } from '@aztec/stdlib/tx'; +import type { ProcessedTx, Tx } from '@aztec/stdlib/tx'; import { Attributes, type Traceable, type Tracer, trackSpan } from '@aztec/telemetry-client'; import * as crypto from 'node:crypto'; -import { type ProverNodeMetrics } from '../metrics.js'; -import { type ProverNodePublisher } from '../prover-node-publisher.js'; +import type { ProverNodeMetrics } from '../metrics.js'; +import type { ProverNodePublisher } from '../prover-node-publisher.js'; /** * Job that grabs a range of blocks from the unfinalised chain from L1, gets their txs given their hashes, diff --git a/yarn-project/prover-node/src/metrics.ts b/yarn-project/prover-node/src/metrics.ts index c10186fd1120..8281ac941632 100644 --- a/yarn-project/prover-node/src/metrics.ts +++ b/yarn-project/prover-node/src/metrics.ts @@ -1,4 +1,4 @@ -import { type L1PublishProofStats, type L1PublishStats } from '@aztec/stdlib/stats'; +import type { L1PublishProofStats, L1PublishStats } from '@aztec/stdlib/stats'; import { Attributes, type Histogram, diff --git a/yarn-project/prover-node/src/monitors/epoch-monitor.test.ts b/yarn-project/prover-node/src/monitors/epoch-monitor.test.ts index 9219503d7209..071b035f80ab 100644 --- a/yarn-project/prover-node/src/monitors/epoch-monitor.test.ts +++ b/yarn-project/prover-node/src/monitors/epoch-monitor.test.ts @@ -1,5 +1,5 @@ import type { L2BlockSource } from '@aztec/stdlib/block'; -import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers'; +import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers'; import { BlockHeader } from '@aztec/stdlib/tx'; import { type MockProxy, mock } from 'jest-mock-extended'; diff --git a/yarn-project/prover-node/src/prover-coordination/factory.ts b/yarn-project/prover-node/src/prover-coordination/factory.ts index 9e955f6c4187..ae2d793bda4b 100644 --- a/yarn-project/prover-node/src/prover-coordination/factory.ts +++ b/yarn-project/prover-node/src/prover-coordination/factory.ts @@ -1,18 +1,18 @@ -import { type ArchiveSource, type Archiver } from '@aztec/archiver'; +import type { ArchiveSource, Archiver } from '@aztec/archiver'; import { BBCircuitVerifier, TestCircuitVerifier } from '@aztec/bb-prover'; -import { type EpochCache } from '@aztec/epoch-cache'; +import type { EpochCache } from '@aztec/epoch-cache'; import { createLogger } from '@aztec/foundation/log'; -import { type DataStoreConfig } from '@aztec/kv-store/config'; +import type { DataStoreConfig } from '@aztec/kv-store/config'; import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks'; import { createP2PClient } from '@aztec/p2p'; import { protocolContractTreeRoot } from '@aztec/protocol-contracts'; import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client'; -import { type ProverCoordination, type WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server'; +import type { ProverCoordination, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server'; import { P2PClientType } from '@aztec/stdlib/p2p'; import { getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning'; import { type TelemetryClient, makeTracedFetch } from '@aztec/telemetry-client'; -import { type ProverNodeConfig } from '../config.js'; +import type { ProverNodeConfig } from '../config.js'; // We return a reference to the P2P client so that the prover node can stop the service when it shuts down. type ProverCoordinationDeps = { diff --git a/yarn-project/prover-node/src/prover-node-publisher.ts b/yarn-project/prover-node/src/prover-node-publisher.ts index d6880f8f5884..86d3c4765f6d 100644 --- a/yarn-project/prover-node/src/prover-node-publisher.ts +++ b/yarn-project/prover-node/src/prover-node-publisher.ts @@ -1,5 +1,5 @@ import { AGGREGATION_OBJECT_LENGTH, AZTEC_MAX_EPOCH_DURATION } from '@aztec/constants'; -import { type L1TxUtils, type RollupContract } from '@aztec/ethereum'; +import type { L1TxUtils, RollupContract } from '@aztec/ethereum'; import { makeTuple } from '@aztec/foundation/array'; import { areArraysEqual, times } from '@aztec/foundation/collection'; import { EthAddress } from '@aztec/foundation/eth-address'; @@ -9,10 +9,10 @@ import { type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; import { InterruptibleSleep } from '@aztec/foundation/sleep'; import { Timer } from '@aztec/foundation/timer'; import { RollupAbi } from '@aztec/l1-artifacts'; -import { type PublisherConfig, type TxSenderConfig } from '@aztec/sequencer-client'; -import { type Proof } from '@aztec/stdlib/proofs'; -import { type FeeRecipient, type RootRollupPublicInputs } from '@aztec/stdlib/rollup'; -import { type L1PublishProofStats } from '@aztec/stdlib/stats'; +import type { PublisherConfig, TxSenderConfig } from '@aztec/sequencer-client'; +import type { Proof } from '@aztec/stdlib/proofs'; +import type { FeeRecipient, RootRollupPublicInputs } from '@aztec/stdlib/rollup'; +import type { L1PublishProofStats } from '@aztec/stdlib/stats'; import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client'; import { type Hex, type TransactionReceipt, encodeFunctionData } from 'viem'; diff --git a/yarn-project/prover-node/src/prover-node.test.ts b/yarn-project/prover-node/src/prover-node.test.ts index 9aab45e328f0..c91690518a73 100644 --- a/yarn-project/prover-node/src/prover-node.test.ts +++ b/yarn-project/prover-node/src/prover-node.test.ts @@ -1,8 +1,8 @@ import { timesParallel } from '@aztec/foundation/collection'; import { EthAddress } from '@aztec/foundation/eth-address'; -import { type PublicProcessorFactory } from '@aztec/simulator/server'; +import type { PublicProcessorFactory } from '@aztec/simulator/server'; import { L2Block, type L2BlockSource } from '@aztec/stdlib/block'; -import { type ContractDataSource } from '@aztec/stdlib/contract'; +import type { ContractDataSource } from '@aztec/stdlib/contract'; import { EmptyL1RollupConstants } from '@aztec/stdlib/epoch-helpers'; import { type EpochProverManager, @@ -17,9 +17,9 @@ import type { Tx } from '@aztec/stdlib/tx'; import { type MockProxy, mock } from 'jest-mock-extended'; -import { type EpochProvingJob } from './job/epoch-proving-job.js'; +import type { EpochProvingJob } from './job/epoch-proving-job.js'; import { EpochMonitor } from './monitors/epoch-monitor.js'; -import { type ProverNodePublisher } from './prover-node-publisher.js'; +import type { ProverNodePublisher } from './prover-node-publisher.js'; import { ProverNode, type ProverNodeOptions } from './prover-node.js'; describe('prover-node', () => { diff --git a/yarn-project/prover-node/src/prover-node.ts b/yarn-project/prover-node/src/prover-node.ts index 80f14069600b..089d97961bbc 100644 --- a/yarn-project/prover-node/src/prover-node.ts +++ b/yarn-project/prover-node/src/prover-node.ts @@ -3,11 +3,11 @@ import { memoize } from '@aztec/foundation/decorators'; import { createLogger } from '@aztec/foundation/log'; import { RunningPromise } from '@aztec/foundation/running-promise'; import { DateProvider } from '@aztec/foundation/timer'; -import { type Maybe } from '@aztec/foundation/types'; -import { type P2P } from '@aztec/p2p'; +import type { Maybe } from '@aztec/foundation/types'; +import type { P2P } from '@aztec/p2p'; import { PublicProcessorFactory } from '@aztec/simulator/server'; -import { type L2Block, type L2BlockSource } from '@aztec/stdlib/block'; -import { type ContractDataSource } from '@aztec/stdlib/contract'; +import type { L2Block, L2BlockSource } from '@aztec/stdlib/block'; +import type { ContractDataSource } from '@aztec/stdlib/contract'; import { getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers'; import { type EpochProverManager, @@ -32,8 +32,8 @@ import { import { EpochProvingJob, type EpochProvingJobState } from './job/epoch-proving-job.js'; import { ProverNodeMetrics } from './metrics.js'; -import { type EpochMonitor, type EpochMonitorHandler } from './monitors/epoch-monitor.js'; -import { type ProverNodePublisher } from './prover-node-publisher.js'; +import type { EpochMonitor, EpochMonitorHandler } from './monitors/epoch-monitor.js'; +import type { ProverNodePublisher } from './prover-node-publisher.js'; export type ProverNodeOptions = { pollingIntervalMs: number; diff --git a/yarn-project/prover-node/src/test/index.ts b/yarn-project/prover-node/src/test/index.ts index 44a7814ade44..41921ded10b5 100644 --- a/yarn-project/prover-node/src/test/index.ts +++ b/yarn-project/prover-node/src/test/index.ts @@ -1,6 +1,6 @@ -import { type EpochProverManager } from '@aztec/stdlib/interfaces/server'; +import type { EpochProverManager } from '@aztec/stdlib/interfaces/server'; -import { type ProverNodePublisher } from '../prover-node-publisher.js'; +import type { ProverNodePublisher } from '../prover-node-publisher.js'; import { ProverNode } from '../prover-node.js'; class TestProverNode_ extends ProverNode { diff --git a/yarn-project/pxe/src/config/index.ts b/yarn-project/pxe/src/config/index.ts index 06152bc7cb59..62b788c831f9 100644 --- a/yarn-project/pxe/src/config/index.ts +++ b/yarn-project/pxe/src/config/index.ts @@ -8,7 +8,7 @@ import { } from '@aztec/foundation/config'; import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config'; import { type ChainConfig, chainConfigMappings } from '@aztec/stdlib/config'; -import { type Network } from '@aztec/stdlib/network'; +import type { Network } from '@aztec/stdlib/network'; /** * Temporary configuration until WASM can be used instead of native diff --git a/yarn-project/pxe/src/contract_data_oracle/index.ts b/yarn-project/pxe/src/contract_data_oracle/index.ts index d1ddff489a48..6c5166efca4f 100644 --- a/yarn-project/pxe/src/contract_data_oracle/index.ts +++ b/yarn-project/pxe/src/contract_data_oracle/index.ts @@ -1,4 +1,4 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import type { MembershipWitness } from '@aztec/foundation/trees'; import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/simulator/client'; import { @@ -9,10 +9,10 @@ import { getFunctionDebugMetadata, } from '@aztec/stdlib/abi'; import type { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractClass, type ContractInstance } from '@aztec/stdlib/contract'; +import type { ContractClass, ContractInstance } from '@aztec/stdlib/contract'; -import { type ContractArtifactDatabase } from '../database/contracts/contract_artifact_db.js'; -import { type ContractInstanceDatabase } from '../database/contracts/contract_instance_db.js'; +import type { ContractArtifactDatabase } from '../database/contracts/contract_artifact_db.js'; +import type { ContractInstanceDatabase } from '../database/contracts/contract_instance_db.js'; import { PrivateFunctionsTree } from './private_functions_tree.js'; /** diff --git a/yarn-project/pxe/src/database/contracts/contract_artifact_db.ts b/yarn-project/pxe/src/database/contracts/contract_artifact_db.ts index b3237017642b..9cf9c217dec8 100644 --- a/yarn-project/pxe/src/database/contracts/contract_artifact_db.ts +++ b/yarn-project/pxe/src/database/contracts/contract_artifact_db.ts @@ -1,5 +1,5 @@ -import { type Fr } from '@aztec/foundation/fields'; -import { type ContractArtifact } from '@aztec/stdlib/abi'; +import type { Fr } from '@aztec/foundation/fields'; +import type { ContractArtifact } from '@aztec/stdlib/abi'; /** * PXE database for managing contract artifacts. diff --git a/yarn-project/pxe/src/database/contracts/contract_instance_db.ts b/yarn-project/pxe/src/database/contracts/contract_instance_db.ts index bef8e7d2c28f..6bf084a375b0 100644 --- a/yarn-project/pxe/src/database/contracts/contract_instance_db.ts +++ b/yarn-project/pxe/src/database/contracts/contract_instance_db.ts @@ -1,5 +1,5 @@ import type { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract'; /** * PXE database for managing contract instances. diff --git a/yarn-project/pxe/src/database/kv_pxe_database.ts b/yarn-project/pxe/src/database/kv_pxe_database.ts index 9bdb8fcfd66a..7fc685ec207e 100644 --- a/yarn-project/pxe/src/database/kv_pxe_database.ts +++ b/yarn-project/pxe/src/database/kv_pxe_database.ts @@ -2,12 +2,12 @@ import { toBufferBE } from '@aztec/foundation/bigint-buffer'; import { Fr, type Point } from '@aztec/foundation/fields'; import { toArray } from '@aztec/foundation/iterable'; import { type LogFn, createDebugOnlyLogger } from '@aztec/foundation/log'; -import { - type AztecAsyncArray, - type AztecAsyncKVStore, - type AztecAsyncMap, - type AztecAsyncMultiMap, - type AztecAsyncSingleton, +import type { + AztecAsyncArray, + AztecAsyncKVStore, + AztecAsyncMap, + AztecAsyncMultiMap, + AztecAsyncSingleton, } from '@aztec/kv-store'; import { type ContractArtifact, FunctionSelector, FunctionType } from '@aztec/stdlib/abi'; import { contractArtifactFromBuffer, contractArtifactToBuffer } from '@aztec/stdlib/abi'; @@ -25,7 +25,7 @@ import { MerkleTreeId } from '@aztec/stdlib/trees'; import { BlockHeader } from '@aztec/stdlib/tx'; import { NoteDao } from './note_dao.js'; -import { type PxeDatabase } from './pxe_database.js'; +import type { PxeDatabase } from './pxe_database.js'; /** * A PXE database backed by LMDB. diff --git a/yarn-project/pxe/src/database/note_dao.ts b/yarn-project/pxe/src/database/note_dao.ts index d7e53f5bd06d..ceb47271e29c 100644 --- a/yarn-project/pxe/src/database/note_dao.ts +++ b/yarn-project/pxe/src/database/note_dao.ts @@ -1,7 +1,7 @@ import { toBigIntBE } from '@aztec/foundation/bigint-buffer'; import { Fr, Point } from '@aztec/foundation/fields'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type NoteData } from '@aztec/simulator/client'; +import type { NoteData } from '@aztec/simulator/client'; import { NoteSelector } from '@aztec/stdlib/abi'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { PublicKey } from '@aztec/stdlib/keys'; diff --git a/yarn-project/pxe/src/database/pxe_database.ts b/yarn-project/pxe/src/database/pxe_database.ts index 4305491b49ec..e7f035edf0e3 100644 --- a/yarn-project/pxe/src/database/pxe_database.ts +++ b/yarn-project/pxe/src/database/pxe_database.ts @@ -1,16 +1,16 @@ -import { type Fr } from '@aztec/foundation/fields'; -import { type ContractArtifact } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type InBlock } from '@aztec/stdlib/block'; +import type { Fr } from '@aztec/foundation/fields'; +import type { ContractArtifact } from '@aztec/stdlib/abi'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { InBlock } from '@aztec/stdlib/block'; import type { CompleteAddress, ContractInstanceWithAddress } from '@aztec/stdlib/contract'; import type { PublicKey } from '@aztec/stdlib/keys'; import type { IndexedTaggingSecret } from '@aztec/stdlib/logs'; import type { NotesFilter } from '@aztec/stdlib/note'; -import { type BlockHeader } from '@aztec/stdlib/tx'; +import type { BlockHeader } from '@aztec/stdlib/tx'; -import { type ContractArtifactDatabase } from './contracts/contract_artifact_db.js'; -import { type ContractInstanceDatabase } from './contracts/contract_instance_db.js'; -import { type NoteDao } from './note_dao.js'; +import type { ContractArtifactDatabase } from './contracts/contract_artifact_db.js'; +import type { ContractInstanceDatabase } from './contracts/contract_instance_db.js'; +import type { NoteDao } from './note_dao.js'; /** * A database interface that provides methods for retrieving, adding, and removing transactional data related to Aztec diff --git a/yarn-project/pxe/src/database/pxe_database_test_suite.ts b/yarn-project/pxe/src/database/pxe_database_test_suite.ts index 711e5d188a64..1e4653a13dd8 100644 --- a/yarn-project/pxe/src/database/pxe_database_test_suite.ts +++ b/yarn-project/pxe/src/database/pxe_database_test_suite.ts @@ -14,7 +14,7 @@ import { makeHeader, randomTxHash } from '@aztec/stdlib/testing'; import times from 'lodash.times'; import { NoteDao } from './note_dao.js'; -import { type PxeDatabase } from './pxe_database.js'; +import type { PxeDatabase } from './pxe_database.js'; /** * A common test suite for a PXE database. diff --git a/yarn-project/pxe/src/kernel_oracle/index.ts b/yarn-project/pxe/src/kernel_oracle/index.ts index e6950681d247..3d4a105c860f 100644 --- a/yarn-project/pxe/src/kernel_oracle/index.ts +++ b/yarn-project/pxe/src/kernel_oracle/index.ts @@ -1,9 +1,9 @@ import { type NOTE_HASH_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, VK_TREE_HEIGHT } from '@aztec/constants'; import type { Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; -import { type Tuple } from '@aztec/foundation/serialize'; +import type { Tuple } from '@aztec/foundation/serialize'; import { MembershipWitness } from '@aztec/foundation/trees'; -import { type KeyStore } from '@aztec/key-store'; +import type { KeyStore } from '@aztec/key-store'; import { getVKIndex, getVKSiblingPath } from '@aztec/noir-protocol-circuits-types/vks'; import { ProtocolContractAddress } from '@aztec/protocol-contracts'; import type { FunctionSelector } from '@aztec/stdlib/abi'; @@ -11,14 +11,14 @@ import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { L2BlockNumber } from '@aztec/stdlib/block'; import { computeContractClassIdPreimage, computeSaltedInitializationHash } from '@aztec/stdlib/contract'; import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash'; -import { type AztecNode } from '@aztec/stdlib/interfaces/client'; +import type { AztecNode } from '@aztec/stdlib/interfaces/client'; import { UpdatedClassIdHints } from '@aztec/stdlib/kernel'; import { SharedMutableValues, SharedMutableValuesWithHash } from '@aztec/stdlib/shared-mutable'; import type { NullifierMembershipWitness } from '@aztec/stdlib/trees'; import type { VerificationKeyAsFields } from '@aztec/stdlib/vks'; -import { type ContractDataOracle } from '../contract_data_oracle/index.js'; -import { type ProvingDataOracle } from './../kernel_prover/proving_data_oracle.js'; +import type { ContractDataOracle } from '../contract_data_oracle/index.js'; +import type { ProvingDataOracle } from './../kernel_prover/proving_data_oracle.js'; // TODO: Block number should not be "latest". // It should be fixed at the time the proof is being simulated. I.e., it should be the same as the value defined in the constant data. diff --git a/yarn-project/pxe/src/kernel_prover/hints/build_private_kernel_reset_private_inputs.ts b/yarn-project/pxe/src/kernel_prover/hints/build_private_kernel_reset_private_inputs.ts index af615b3dff47..0d44b16408f4 100644 --- a/yarn-project/pxe/src/kernel_prover/hints/build_private_kernel_reset_private_inputs.ts +++ b/yarn-project/pxe/src/kernel_prover/hints/build_private_kernel_reset_private_inputs.ts @@ -42,7 +42,7 @@ import { } from '@aztec/stdlib/kernel'; import { type PrivateCallExecutionResult, collectNested } from '@aztec/stdlib/tx'; -import { type ProvingDataOracle } from '../proving_data_oracle.js'; +import type { ProvingDataOracle } from '../proving_data_oracle.js'; function collectNestedReadRequests( executionStack: PrivateCallExecutionResult[], diff --git a/yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts b/yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts index 8d560ceb1f36..6eae2a21c052 100644 --- a/yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts +++ b/yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts @@ -9,7 +9,7 @@ import { Fr } from '@aztec/foundation/fields'; import { MembershipWitness } from '@aztec/foundation/trees'; import { FunctionSelector, NoteSelector } from '@aztec/stdlib/abi'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type PrivateKernelProver } from '@aztec/stdlib/interfaces/client'; +import type { PrivateKernelProver } from '@aztec/stdlib/interfaces/client'; import { NoteHash, PrivateCircuitPublicInputs, @@ -32,7 +32,7 @@ import { VerificationKey, VerificationKeyAsFields } from '@aztec/stdlib/vks'; import { mock } from 'jest-mock-extended'; import { KernelProver } from './kernel_prover.js'; -import { type ProvingDataOracle } from './proving_data_oracle.js'; +import type { ProvingDataOracle } from './proving_data_oracle.js'; describe('Kernel Prover', () => { let txRequest: TxRequest; diff --git a/yarn-project/pxe/src/kernel_prover/kernel_prover.ts b/yarn-project/pxe/src/kernel_prover/kernel_prover.ts index 62ab65736601..4fb97a61791c 100644 --- a/yarn-project/pxe/src/kernel_prover/kernel_prover.ts +++ b/yarn-project/pxe/src/kernel_prover/kernel_prover.ts @@ -37,11 +37,11 @@ import { } from '@aztec/stdlib/tx'; import { VerificationKeyAsFields } from '@aztec/stdlib/vks'; -import { type WitnessMap } from '@noir-lang/types'; +import type { WitnessMap } from '@noir-lang/types'; import { strict as assert } from 'assert'; import { PrivateKernelResetPrivateInputsBuilder } from './hints/build_private_kernel_reset_private_inputs.js'; -import { type ProvingDataOracle } from './proving_data_oracle.js'; +import type { ProvingDataOracle } from './proving_data_oracle.js'; // TODO(#10592): Temporary workaround to check that the private logs are correctly split into non-revertible set and revertible set. // This should be done in TailToPublicOutputValidator in private kernel tail. diff --git a/yarn-project/pxe/src/kernel_prover/proving_data_oracle.ts b/yarn-project/pxe/src/kernel_prover/proving_data_oracle.ts index 3120d3983f36..bf10b6ad9776 100644 --- a/yarn-project/pxe/src/kernel_prover/proving_data_oracle.ts +++ b/yarn-project/pxe/src/kernel_prover/proving_data_oracle.ts @@ -1,11 +1,11 @@ -import { type FUNCTION_TREE_HEIGHT, type NOTE_HASH_TREE_HEIGHT, type VK_TREE_HEIGHT } from '@aztec/constants'; +import type { FUNCTION_TREE_HEIGHT, NOTE_HASH_TREE_HEIGHT, VK_TREE_HEIGHT } from '@aztec/constants'; import type { Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields'; import type { MembershipWitness } from '@aztec/foundation/trees'; import type { FunctionSelector } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { UpdatedClassIdHints } from '@aztec/stdlib/kernel'; import type { PublicKeys } from '@aztec/stdlib/keys'; -import { type NullifierMembershipWitness } from '@aztec/stdlib/trees'; +import type { NullifierMembershipWitness } from '@aztec/stdlib/trees'; import type { VerificationKeyAsFields } from '@aztec/stdlib/vks'; /** diff --git a/yarn-project/pxe/src/note_decryption_utils/add_public_values_to_payload.ts b/yarn-project/pxe/src/note_decryption_utils/add_public_values_to_payload.ts index 54aa2e4a1da7..6afae34f600d 100644 --- a/yarn-project/pxe/src/note_decryption_utils/add_public_values_to_payload.ts +++ b/yarn-project/pxe/src/note_decryption_utils/add_public_values_to_payload.ts @@ -1,8 +1,8 @@ import { ContractNotFoundError } from '@aztec/simulator/client'; -import { type L1NotePayload } from '@aztec/stdlib/logs'; +import type { L1NotePayload } from '@aztec/stdlib/logs'; import { Note } from '@aztec/stdlib/note'; -import { type PxeDatabase } from '../database/pxe_database.js'; +import type { PxeDatabase } from '../database/pxe_database.js'; /** * Merges privately and publicly delivered note values. diff --git a/yarn-project/pxe/src/pxe_service/error_enriching.ts b/yarn-project/pxe/src/pxe_service/error_enriching.ts index 3ac0b89eeb05..9ea24c9bbe0f 100644 --- a/yarn-project/pxe/src/pxe_service/error_enriching.ts +++ b/yarn-project/pxe/src/pxe_service/error_enriching.ts @@ -1,12 +1,12 @@ import { PUBLIC_DISPATCH_SELECTOR } from '@aztec/constants'; import { Fr } from '@aztec/foundation/fields'; -import { type Logger } from '@aztec/foundation/log'; +import type { Logger } from '@aztec/foundation/log'; import { resolveAssertionMessageFromRevertData, resolveOpcodeLocations } from '@aztec/simulator/client'; import { FunctionSelector } from '@aztec/stdlib/abi'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { type SimulationError, isNoirCallStackUnresolved } from '@aztec/stdlib/errors'; -import { type ContractDataOracle, type PxeDatabase } from '../index.js'; +import type { ContractDataOracle, PxeDatabase } from '../index.js'; /** * Adds contract and function names to a simulation error, if they diff --git a/yarn-project/pxe/src/pxe_service/pxe_service.ts b/yarn-project/pxe/src/pxe_service/pxe_service.ts index a88bb874fc52..ac8949f178b1 100644 --- a/yarn-project/pxe/src/pxe_service/pxe_service.ts +++ b/yarn-project/pxe/src/pxe_service/pxe_service.ts @@ -2,9 +2,9 @@ import { L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants'; import { Fr, type Point } from '@aztec/foundation/fields'; import { type Logger, createLogger } from '@aztec/foundation/log'; import { Timer } from '@aztec/foundation/timer'; -import { type SiblingPath } from '@aztec/foundation/trees'; -import { type KeyStore } from '@aztec/key-store'; -import { type L2TipsStore } from '@aztec/kv-store/stores'; +import type { SiblingPath } from '@aztec/foundation/trees'; +import type { KeyStore } from '@aztec/key-store'; +import type { L2TipsStore } from '@aztec/kv-store/stores'; import { ProtocolContractAddress, protocolContractNames } from '@aztec/protocol-contracts'; import { getCanonicalProtocolContract } from '@aztec/protocol-contracts/bundle'; import { type AcirSimulator, type SimulationProvider, readCurrentClassId } from '@aztec/simulator/client'; @@ -18,8 +18,8 @@ import { decodeFunctionSignature, encodeArguments, } from '@aztec/stdlib/abi'; -import { type AuthWitness } from '@aztec/stdlib/auth-witness'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AuthWitness } from '@aztec/stdlib/auth-witness'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { InBlock, L2Block } from '@aztec/stdlib/block'; import type { CompleteAddress, @@ -33,14 +33,14 @@ import { SimulationError } from '@aztec/stdlib/errors'; import { EventMetadata, L1EventPayload } from '@aztec/stdlib/event'; import type { GasFees } from '@aztec/stdlib/gas'; import { siloNullifier } from '@aztec/stdlib/hash'; -import { - type AztecNode, - type EventMetadataDefinition, - type GetContractClassLogsResponse, - type GetPublicLogsResponse, - type PXE, - type PXEInfo, - type PrivateKernelProver, +import type { + AztecNode, + EventMetadataDefinition, + GetContractClassLogsResponse, + GetPublicLogsResponse, + PXE, + PXEInfo, + PrivateKernelProver, } from '@aztec/stdlib/interfaces/client'; import { type PrivateKernelSimulateOutput, PrivateKernelTailCircuitPublicInputs } from '@aztec/stdlib/kernel'; import { computeAddressSecret } from '@aztec/stdlib/keys'; @@ -62,10 +62,10 @@ import { import { inspect } from 'util'; -import { type PXEServiceConfig } from '../config/index.js'; +import type { PXEServiceConfig } from '../config/index.js'; import { getPackageInfo } from '../config/package_info.js'; import { ContractDataOracle } from '../contract_data_oracle/index.js'; -import { type PxeDatabase } from '../database/index.js'; +import type { PxeDatabase } from '../database/index.js'; import { KernelOracle } from '../kernel_oracle/index.js'; import { KernelProver, type ProvingConfig } from '../kernel_prover/kernel_prover.js'; import { getAcirSimulator } from '../simulator/index.js'; diff --git a/yarn-project/pxe/src/pxe_service/test/pxe_service.test.ts b/yarn-project/pxe/src/pxe_service/test/pxe_service.test.ts index 0809d2d4c706..61439d9ca06f 100644 --- a/yarn-project/pxe/src/pxe_service/test/pxe_service.test.ts +++ b/yarn-project/pxe/src/pxe_service/test/pxe_service.test.ts @@ -1,21 +1,21 @@ import { BBWASMBundlePrivateKernelProver } from '@aztec/bb-prover/wasm/bundle'; import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants'; -import { type L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses'; +import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses'; import { EthAddress } from '@aztec/foundation/eth-address'; import { KeyStore } from '@aztec/key-store'; import { openTmpStore } from '@aztec/kv-store/lmdb-v2'; import { L2TipsStore } from '@aztec/kv-store/stores'; import { type SimulationProvider, WASMSimulator } from '@aztec/simulator/client'; import { randomInBlock } from '@aztec/stdlib/block'; -import { type AztecNode, type PXE, type PrivateKernelProver } from '@aztec/stdlib/interfaces/client'; +import type { AztecNode, PXE, PrivateKernelProver } from '@aztec/stdlib/interfaces/client'; import { mockTx } from '@aztec/stdlib/testing'; import { TxEffect } from '@aztec/stdlib/tx'; import { type MockProxy, mock } from 'jest-mock-extended'; import { KVPxeDatabase } from '../../database/kv_pxe_database.js'; -import { type PxeDatabase } from '../../database/pxe_database.js'; -import { type PXEServiceConfig } from '../../index.js'; +import type { PxeDatabase } from '../../database/pxe_database.js'; +import type { PXEServiceConfig } from '../../index.js'; import { PXEService } from '../pxe_service.js'; import { pxeTestSuite } from './pxe_test_suite.js'; diff --git a/yarn-project/pxe/src/pxe_service/test/pxe_test_suite.ts b/yarn-project/pxe/src/pxe_service/test/pxe_test_suite.ts index 71a01e6e413f..6764b008a2f6 100644 --- a/yarn-project/pxe/src/pxe_service/test/pxe_test_suite.ts +++ b/yarn-project/pxe/src/pxe_service/test/pxe_test_suite.ts @@ -2,7 +2,7 @@ import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants'; import { Fr } from '@aztec/foundation/fields'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { getContractClassFromArtifact } from '@aztec/stdlib/contract'; -import { type PXE } from '@aztec/stdlib/interfaces/client'; +import type { PXE } from '@aztec/stdlib/interfaces/client'; import { randomContractArtifact, randomContractInstanceWithAddress, diff --git a/yarn-project/pxe/src/simulator/index.ts b/yarn-project/pxe/src/simulator/index.ts index f25b1372e84d..2e588225e42e 100644 --- a/yarn-project/pxe/src/simulator/index.ts +++ b/yarn-project/pxe/src/simulator/index.ts @@ -1,9 +1,9 @@ -import { type KeyStore } from '@aztec/key-store'; +import type { KeyStore } from '@aztec/key-store'; import { AcirSimulator, type SimulationProvider } from '@aztec/simulator/client'; -import { type AztecNode } from '@aztec/stdlib/interfaces/client'; +import type { AztecNode } from '@aztec/stdlib/interfaces/client'; import { ContractDataOracle } from '../contract_data_oracle/index.js'; -import { type PxeDatabase } from '../database/pxe_database.js'; +import type { PxeDatabase } from '../database/pxe_database.js'; import { SimulatorOracle } from '../simulator_oracle/index.js'; /** diff --git a/yarn-project/pxe/src/simulator_oracle/index.ts b/yarn-project/pxe/src/simulator_oracle/index.ts index da5e0788111f..14efdf4f7163 100644 --- a/yarn-project/pxe/src/simulator_oracle/index.ts +++ b/yarn-project/pxe/src/simulator_oracle/index.ts @@ -9,7 +9,7 @@ import { poseidon2Hash } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; import { BufferReader } from '@aztec/foundation/serialize'; -import { type KeyStore } from '@aztec/key-store'; +import type { KeyStore } from '@aztec/key-store'; import { type AcirSimulator, type DBOracle, @@ -29,7 +29,7 @@ import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { InBlock, L2Block, L2BlockNumber } from '@aztec/stdlib/block'; import type { CompleteAddress, ContractInstance } from '@aztec/stdlib/contract'; import { computeUniqueNoteHash, siloNoteHash, siloNullifier } from '@aztec/stdlib/hash'; -import { type AztecNode } from '@aztec/stdlib/interfaces/client'; +import type { AztecNode } from '@aztec/stdlib/interfaces/client'; import type { KeyValidationRequest } from '@aztec/stdlib/kernel'; import { computeAddressSecret, computeTaggingSecretPoint } from '@aztec/stdlib/keys'; import { @@ -47,7 +47,7 @@ import type { BlockHeader } from '@aztec/stdlib/tx'; import { TxHash } from '@aztec/stdlib/tx'; import { ContractDataOracle } from '../contract_data_oracle/index.js'; -import { type PxeDatabase } from '../database/index.js'; +import type { PxeDatabase } from '../database/index.js'; import { NoteDao } from '../database/note_dao.js'; import { getOrderedNoteItems } from '../note_decryption_utils/add_public_values_to_payload.js'; import { getAcirSimulator } from '../simulator/index.js'; diff --git a/yarn-project/pxe/src/simulator_oracle/simulator_oracle.test.ts b/yarn-project/pxe/src/simulator_oracle/simulator_oracle.test.ts index 91bffc812775..71984a8b87ae 100644 --- a/yarn-project/pxe/src/simulator_oracle/simulator_oracle.test.ts +++ b/yarn-project/pxe/src/simulator_oracle/simulator_oracle.test.ts @@ -9,7 +9,7 @@ import { type FunctionArtifact, FunctionSelector, FunctionType } from '@aztec/st import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { L2Block, randomInBlock, wrapInBlock } from '@aztec/stdlib/block'; import { CompleteAddress } from '@aztec/stdlib/contract'; -import { type AztecNode } from '@aztec/stdlib/interfaces/client'; +import type { AztecNode } from '@aztec/stdlib/interfaces/client'; import { computeAddress, computeTaggingSecretPoint, deriveKeys } from '@aztec/stdlib/keys'; import { EncryptedLogPayload, IndexedTaggingSecret, L1NotePayload, PublicLog, TxScopedL2Log } from '@aztec/stdlib/logs'; import { Note } from '@aztec/stdlib/note'; @@ -19,7 +19,7 @@ import { TxEffect, TxHash } from '@aztec/stdlib/tx'; import { jest } from '@jest/globals'; import { type MockProxy, mock } from 'jest-mock-extended'; -import { type PxeDatabase } from '../database/index.js'; +import type { PxeDatabase } from '../database/index.js'; import { KVPxeDatabase } from '../database/kv_pxe_database.js'; import { ContractDataOracle } from '../index.js'; import { SimulatorOracle } from './index.js'; diff --git a/yarn-project/pxe/src/synchronizer/synchronizer.test.ts b/yarn-project/pxe/src/synchronizer/synchronizer.test.ts index 4d72290bdb43..cbe65671435e 100644 --- a/yarn-project/pxe/src/synchronizer/synchronizer.test.ts +++ b/yarn-project/pxe/src/synchronizer/synchronizer.test.ts @@ -2,12 +2,12 @@ import { timesParallel } from '@aztec/foundation/collection'; import { openTmpStore } from '@aztec/kv-store/lmdb-v2'; import { L2TipsStore } from '@aztec/kv-store/stores'; import { L2Block, type L2BlockStream } from '@aztec/stdlib/block'; -import { type AztecNode } from '@aztec/stdlib/interfaces/client'; +import type { AztecNode } from '@aztec/stdlib/interfaces/client'; import { jest } from '@jest/globals'; import { type MockProxy, mock } from 'jest-mock-extended'; -import { type PxeDatabase } from '../database/index.js'; +import type { PxeDatabase } from '../database/index.js'; import { KVPxeDatabase } from '../database/kv_pxe_database.js'; import { Synchronizer } from './synchronizer.js'; diff --git a/yarn-project/pxe/src/synchronizer/synchronizer.ts b/yarn-project/pxe/src/synchronizer/synchronizer.ts index 02c884f1bf52..fbf17737dc27 100644 --- a/yarn-project/pxe/src/synchronizer/synchronizer.ts +++ b/yarn-project/pxe/src/synchronizer/synchronizer.ts @@ -1,11 +1,11 @@ import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants'; import { type Logger, createLogger } from '@aztec/foundation/log'; -import { type L2TipsStore } from '@aztec/kv-store/stores'; +import type { L2TipsStore } from '@aztec/kv-store/stores'; import { L2BlockStream, type L2BlockStreamEvent, type L2BlockStreamEventHandler } from '@aztec/stdlib/block'; -import { type AztecNode } from '@aztec/stdlib/interfaces/client'; +import type { AztecNode } from '@aztec/stdlib/interfaces/client'; -import { type PXEConfig } from '../config/index.js'; -import { type PxeDatabase } from '../database/index.js'; +import type { PXEConfig } from '../config/index.js'; +import type { PxeDatabase } from '../database/index.js'; /** * The Synchronizer class manages the synchronization with the aztec node, allowing PXE to retrieve the diff --git a/yarn-project/pxe/src/utils/create_pxe_service.ts b/yarn-project/pxe/src/utils/create_pxe_service.ts index 1255e515c8a9..57ed1f431a4c 100644 --- a/yarn-project/pxe/src/utils/create_pxe_service.ts +++ b/yarn-project/pxe/src/utils/create_pxe_service.ts @@ -6,9 +6,9 @@ import { KeyStore } from '@aztec/key-store'; import { createStore } from '@aztec/kv-store/lmdb-v2'; import { L2TipsStore } from '@aztec/kv-store/stores'; import { type SimulationProvider, WASMSimulator } from '@aztec/simulator/client'; -import { type AztecNode, type PrivateKernelProver } from '@aztec/stdlib/interfaces/client'; +import type { AztecNode, PrivateKernelProver } from '@aztec/stdlib/interfaces/client'; -import { type PXEServiceConfig } from '../config/index.js'; +import type { PXEServiceConfig } from '../config/index.js'; import { KVPxeDatabase } from '../database/kv_pxe_database.js'; import { PXEService } from '../pxe_service/pxe_service.js'; diff --git a/yarn-project/sequencer-client/src/client/sequencer-client.ts b/yarn-project/sequencer-client/src/client/sequencer-client.ts index 3dc25738600c..8538f9784b22 100644 --- a/yarn-project/sequencer-client/src/client/sequencer-client.ts +++ b/yarn-project/sequencer-client/src/client/sequencer-client.ts @@ -1,4 +1,4 @@ -import { type BlobSinkClientInterface } from '@aztec/blob-sink/client'; +import type { BlobSinkClientInterface } from '@aztec/blob-sink/client'; import { EpochCache } from '@aztec/epoch-cache'; import { ForwarderContract, @@ -12,23 +12,23 @@ import { 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'; -import { type P2P } from '@aztec/p2p'; +import type { DateProvider } from '@aztec/foundation/timer'; +import type { P2P } from '@aztec/p2p'; import { LightweightBlockBuilderFactory } from '@aztec/prover-client/block-builder'; import { PublicProcessorFactory } from '@aztec/simulator/server'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type L2BlockSource } from '@aztec/stdlib/block'; -import { type ContractDataSource } from '@aztec/stdlib/contract'; -import { type WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { L2BlockSource } from '@aztec/stdlib/block'; +import type { ContractDataSource } from '@aztec/stdlib/contract'; +import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server'; import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging'; -import { type TelemetryClient } from '@aztec/telemetry-client'; -import { type ValidatorClient } from '@aztec/validator-client'; +import type { TelemetryClient } from '@aztec/telemetry-client'; +import type { ValidatorClient } from '@aztec/validator-client'; -import { type SequencerClientConfig } from '../config.js'; +import type { SequencerClientConfig } from '../config.js'; import { GlobalVariableBuilder } from '../global_variable_builder/index.js'; import { SequencerPublisher } from '../publisher/index.js'; import { Sequencer, type SequencerConfig } from '../sequencer/index.js'; -import { type SlasherClient } from '../slasher/index.js'; +import type { SlasherClient } from '../slasher/index.js'; /** * Encapsulates the full sequencer and publisher. diff --git a/yarn-project/sequencer-client/src/global_variable_builder/global_builder.ts b/yarn-project/sequencer-client/src/global_variable_builder/global_builder.ts index fc619814cf93..66c44a148e3f 100644 --- a/yarn-project/sequencer-client/src/global_variable_builder/global_builder.ts +++ b/yarn-project/sequencer-client/src/global_variable_builder/global_builder.ts @@ -3,9 +3,9 @@ import type { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; import { RollupAbi } from '@aztec/l1-artifacts'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { GasFees } from '@aztec/stdlib/gas'; -import { type GlobalVariableBuilder as GlobalVariableBuilderInterface } from '@aztec/stdlib/tx'; +import type { GlobalVariableBuilder as GlobalVariableBuilderInterface } from '@aztec/stdlib/tx'; import { GlobalVariables } from '@aztec/stdlib/tx'; import { diff --git a/yarn-project/sequencer-client/src/publisher/sequencer-publisher.test.ts b/yarn-project/sequencer-client/src/publisher/sequencer-publisher.test.ts index cd62299339ce..c690500a46df 100644 --- a/yarn-project/sequencer-client/src/publisher/sequencer-publisher.test.ts +++ b/yarn-project/sequencer-client/src/publisher/sequencer-publisher.test.ts @@ -1,7 +1,7 @@ import { Blob } from '@aztec/blob-lib'; import { HttpBlobSinkClient } from '@aztec/blob-sink/client'; import { inboundTransform } from '@aztec/blob-sink/encoding'; -import { type EpochCache } from '@aztec/epoch-cache'; +import type { EpochCache } from '@aztec/epoch-cache'; import { type ForwarderContract, type GasPrice, @@ -13,18 +13,18 @@ import { defaultL1TxUtilsConfig, getL1ContractsConfigEnvVars, } from '@aztec/ethereum'; -import { type L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs'; +import type { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs'; import { EthAddress } from '@aztec/foundation/eth-address'; import { sleep } from '@aztec/foundation/sleep'; import { EmpireBaseAbi, RollupAbi } from '@aztec/l1-artifacts'; import { L2Block } from '@aztec/stdlib/block'; import express, { json } from 'express'; -import { type Server } from 'http'; +import type { Server } from 'http'; import { type MockProxy, mock } from 'jest-mock-extended'; import { type GetTransactionReceiptReturnType, type TransactionReceipt, encodeFunctionData } from 'viem'; -import { type PublisherConfig, type TxSenderConfig } from './config.js'; +import type { PublisherConfig, TxSenderConfig } from './config.js'; import { SequencerPublisher, VoteType } from './sequencer-publisher.js'; const mockRollupAddress = EthAddress.random().toString(); diff --git a/yarn-project/sequencer-client/src/publisher/sequencer-publisher.ts b/yarn-project/sequencer-client/src/publisher/sequencer-publisher.ts index e8a43dfcad74..4f6520c46afb 100644 --- a/yarn-project/sequencer-client/src/publisher/sequencer-publisher.ts +++ b/yarn-project/sequencer-client/src/publisher/sequencer-publisher.ts @@ -1,7 +1,7 @@ import type { L2Block } from '@aztec/aztec.js'; import { Blob } from '@aztec/blob-lib'; import { type BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-sink/client'; -import { type EpochCache } from '@aztec/epoch-cache'; +import type { EpochCache } from '@aztec/epoch-cache'; import { FormattedViemError, type ForwarderContract, @@ -17,10 +17,10 @@ import { type TransactionStats, formatViemError, } from '@aztec/ethereum'; -import { type L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs'; +import type { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs'; import { toHex } from '@aztec/foundation/bigint-buffer'; import { EthAddress } from '@aztec/foundation/eth-address'; -import { type Signature } from '@aztec/foundation/eth-signature'; +import type { Signature } from '@aztec/foundation/eth-signature'; import { createLogger } from '@aztec/foundation/log'; import { Timer } from '@aztec/foundation/timer'; import { ForwarderAbi, RollupAbi } from '@aztec/l1-artifacts'; @@ -32,7 +32,7 @@ import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-clien import pick from 'lodash.pick'; import { type TransactionReceipt, encodeFunctionData } from 'viem'; -import { type PublisherConfig, type TxSenderConfig } from './config.js'; +import type { PublisherConfig, TxSenderConfig } from './config.js'; import { SequencerPublisherMetrics } from './sequencer-publisher-metrics.js'; /** Arguments to the process method of the rollup contract */ diff --git a/yarn-project/sequencer-client/src/sequencer/allowed.ts b/yarn-project/sequencer-client/src/sequencer/allowed.ts index b9dfb7c93256..450c5ae9c838 100644 --- a/yarn-project/sequencer-client/src/sequencer/allowed.ts +++ b/yarn-project/sequencer-client/src/sequencer/allowed.ts @@ -2,7 +2,7 @@ import { FPCContract } from '@aztec/noir-contracts.js/FPC'; import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token'; import { ProtocolContractAddress } from '@aztec/protocol-contracts'; import { getContractClassFromArtifact } from '@aztec/stdlib/contract'; -import { type AllowedElement } from '@aztec/stdlib/interfaces/server'; +import type { AllowedElement } from '@aztec/stdlib/interfaces/server'; let defaultAllowedSetupFunctions: AllowedElement[] | undefined = undefined; diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts index 7ad4660caa47..b44c3c3b7d9d 100644 --- a/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts +++ b/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts @@ -10,8 +10,8 @@ import { toArray } from '@aztec/foundation/iterable'; import { type Logger, createLogger } from '@aztec/foundation/log'; import { TestDateProvider, type Timer } from '@aztec/foundation/timer'; import { type P2P, P2PClientState } from '@aztec/p2p'; -import { type BlockBuilderFactory } from '@aztec/prover-client/block-builder'; -import { type PublicProcessor, type PublicProcessorFactory } from '@aztec/simulator/server'; +import type { BlockBuilderFactory } from '@aztec/prover-client/block-builder'; +import type { PublicProcessor, PublicProcessorFactory } from '@aztec/simulator/server'; import { PublicDataWrite } from '@aztec/stdlib/avm'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { L2BlockSource } from '@aztec/stdlib/block'; @@ -29,17 +29,17 @@ import { import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging'; import { BlockAttestation, BlockProposal, ConsensusPayload } from '@aztec/stdlib/p2p'; import { makeAppendOnlyTreeSnapshot, mockTxForRollup } from '@aztec/stdlib/testing'; -import { type MerkleTreeId } from '@aztec/stdlib/trees'; +import type { MerkleTreeId } from '@aztec/stdlib/trees'; import { type Tx, TxHash, makeProcessedTxFromPrivateOnlyTx } from '@aztec/stdlib/tx'; import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx'; -import { type ValidatorClient } from '@aztec/validator-client'; +import type { ValidatorClient } from '@aztec/validator-client'; import { expect } from '@jest/globals'; import { type MockProxy, mock, mockFn } from 'jest-mock-extended'; -import { type GlobalVariableBuilder } from '../global_variable_builder/global_builder.js'; -import { type SequencerPublisher } from '../publisher/sequencer-publisher.js'; -import { type SlasherClient } from '../slasher/index.js'; +import type { GlobalVariableBuilder } from '../global_variable_builder/global_builder.js'; +import type { SequencerPublisher } from '../publisher/sequencer-publisher.js'; +import type { SlasherClient } from '../slasher/index.js'; import { Sequencer } from './sequencer.js'; import { SequencerState } from './utils.js'; diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.ts index eebd85348790..f4eee659d23b 100644 --- a/yarn-project/sequencer-client/src/sequencer/sequencer.ts +++ b/yarn-project/sequencer-client/src/sequencer/sequencer.ts @@ -7,9 +7,9 @@ import { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; import { RunningPromise } from '@aztec/foundation/running-promise'; import { type DateProvider, Timer, elapsed } from '@aztec/foundation/timer'; -import { type P2P } from '@aztec/p2p'; -import { type BlockBuilderFactory } from '@aztec/prover-client/block-builder'; -import { type PublicProcessorFactory } from '@aztec/simulator/server'; +import type { P2P } from '@aztec/p2p'; +import type { BlockBuilderFactory } from '@aztec/prover-client/block-builder'; +import type { PublicProcessorFactory } from '@aztec/simulator/server'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { L2BlockSource } from '@aztec/stdlib/block'; import type { ContractDataSource } from '@aztec/stdlib/contract'; @@ -23,7 +23,7 @@ import { } from '@aztec/stdlib/interfaces/server'; import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging'; import { pickFromSchema } from '@aztec/stdlib/schemas'; -import { type L2BlockBuiltStats } from '@aztec/stdlib/stats'; +import type { L2BlockBuiltStats } from '@aztec/stdlib/stats'; import { AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees'; import { BlockHeader, @@ -34,14 +34,14 @@ import { type TxHash, } from '@aztec/stdlib/tx'; import { Attributes, type TelemetryClient, type Tracer, getTelemetryClient, trackSpan } from '@aztec/telemetry-client'; -import { type ValidatorClient } from '@aztec/validator-client'; +import type { ValidatorClient } from '@aztec/validator-client'; -import { type GlobalVariableBuilder } from '../global_variable_builder/global_builder.js'; +import type { GlobalVariableBuilder } from '../global_variable_builder/global_builder.js'; import { type SequencerPublisher, VoteType } from '../publisher/sequencer-publisher.js'; -import { type SlasherClient } from '../slasher/slasher_client.js'; +import type { SlasherClient } from '../slasher/slasher_client.js'; import { createValidatorsForBlockBuilding } from '../tx_validator/tx_validator_factory.js'; import { getDefaultAllowedSetupFunctions } from './allowed.js'; -import { type SequencerConfig } from './config.js'; +import type { SequencerConfig } from './config.js'; import { SequencerMetrics } from './metrics.js'; import { SequencerTimetable, SequencerTooSlowError } from './timetable.js'; import { SequencerState, orderAttestations } from './utils.js'; diff --git a/yarn-project/sequencer-client/src/sequencer/timetable.ts b/yarn-project/sequencer-client/src/sequencer/timetable.ts index 5ee463a1a4d1..cc819e409606 100644 --- a/yarn-project/sequencer-client/src/sequencer/timetable.ts +++ b/yarn-project/sequencer-client/src/sequencer/timetable.ts @@ -1,6 +1,6 @@ import { createLogger } from '@aztec/aztec.js'; -import { type SequencerMetrics } from './metrics.js'; +import type { SequencerMetrics } from './metrics.js'; import { SequencerState } from './utils.js'; export class SequencerTimetable { diff --git a/yarn-project/sequencer-client/src/sequencer/utils.ts b/yarn-project/sequencer-client/src/sequencer/utils.ts index 9aeaedb81b0a..f92198803e34 100644 --- a/yarn-project/sequencer-client/src/sequencer/utils.ts +++ b/yarn-project/sequencer-client/src/sequencer/utils.ts @@ -1,4 +1,4 @@ -import { type EthAddress } from '@aztec/foundation/eth-address'; +import type { EthAddress } from '@aztec/foundation/eth-address'; import { Signature } from '@aztec/foundation/eth-signature'; import type { BlockAttestation } from '@aztec/stdlib/p2p'; diff --git a/yarn-project/sequencer-client/src/slasher/factory.ts b/yarn-project/sequencer-client/src/slasher/factory.ts index 337d549f0315..c972e6fdee31 100644 --- a/yarn-project/sequencer-client/src/slasher/factory.ts +++ b/yarn-project/sequencer-client/src/slasher/factory.ts @@ -1,13 +1,13 @@ -import { type L1ContractsConfig, type L1ReaderConfig } from '@aztec/ethereum'; +import type { L1ContractsConfig, L1ReaderConfig } from '@aztec/ethereum'; import { createLogger } from '@aztec/foundation/log'; -import { type AztecAsyncKVStore } from '@aztec/kv-store'; -import { type DataStoreConfig } from '@aztec/kv-store/config'; +import type { AztecAsyncKVStore } from '@aztec/kv-store'; +import type { DataStoreConfig } from '@aztec/kv-store/config'; import { createStore } from '@aztec/kv-store/lmdb-v2'; import type { L2BlockSource } from '@aztec/stdlib/block'; import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client'; import { SlasherClient } from './slasher_client.js'; -import { type SlasherConfig } from './slasher_client.js'; +import type { SlasherConfig } from './slasher_client.js'; export const createSlasherClient = async ( _config: SlasherConfig & DataStoreConfig & L1ContractsConfig & L1ReaderConfig, diff --git a/yarn-project/sequencer-client/src/slasher/slasher_client.test.ts b/yarn-project/sequencer-client/src/slasher/slasher_client.test.ts index e75cf308ce54..da37f4376204 100644 --- a/yarn-project/sequencer-client/src/slasher/slasher_client.test.ts +++ b/yarn-project/sequencer-client/src/slasher/slasher_client.test.ts @@ -8,7 +8,7 @@ import { import { EthAddress } from '@aztec/foundation/eth-address'; import { retryUntil } from '@aztec/foundation/retry'; import { sleep } from '@aztec/foundation/sleep'; -import { type AztecAsyncKVStore } from '@aztec/kv-store'; +import type { AztecAsyncKVStore } from '@aztec/kv-store'; import { openStoreAt, openTmpStore } from '@aztec/kv-store/lmdb-v2'; import { L2Block } from '@aztec/stdlib/block'; diff --git a/yarn-project/sequencer-client/src/test/index.ts b/yarn-project/sequencer-client/src/test/index.ts index f348ba4072ed..9b0501bba54f 100644 --- a/yarn-project/sequencer-client/src/test/index.ts +++ b/yarn-project/sequencer-client/src/test/index.ts @@ -1,9 +1,9 @@ -import { type PublicProcessorFactory } from '@aztec/simulator/server'; +import type { PublicProcessorFactory } from '@aztec/simulator/server'; import { SequencerClient } from '../client/sequencer-client.js'; -import { type SequencerPublisher } from '../publisher/sequencer-publisher.js'; +import type { SequencerPublisher } from '../publisher/sequencer-publisher.js'; import { Sequencer } from '../sequencer/sequencer.js'; -import { type SequencerTimetable } from '../sequencer/timetable.js'; +import type { SequencerTimetable } from '../sequencer/timetable.js'; class TestSequencer_ extends Sequencer { public override publicProcessorFactory!: PublicProcessorFactory; diff --git a/yarn-project/sequencer-client/src/tx_validator/archive_cache.test.ts b/yarn-project/sequencer-client/src/tx_validator/archive_cache.test.ts index d4239f4fa69c..7871e8abc38f 100644 --- a/yarn-project/sequencer-client/src/tx_validator/archive_cache.test.ts +++ b/yarn-project/sequencer-client/src/tx_validator/archive_cache.test.ts @@ -1,5 +1,5 @@ import { Fr } from '@aztec/foundation/fields'; -import { type MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server'; import { MerkleTreeId } from '@aztec/stdlib/trees'; import { type MockProxy, mock } from 'jest-mock-extended'; diff --git a/yarn-project/sequencer-client/src/tx_validator/archive_cache.ts b/yarn-project/sequencer-client/src/tx_validator/archive_cache.ts index b2e8f84dcc37..2755b6a6ad18 100644 --- a/yarn-project/sequencer-client/src/tx_validator/archive_cache.ts +++ b/yarn-project/sequencer-client/src/tx_validator/archive_cache.ts @@ -1,6 +1,6 @@ -import { type Fr } from '@aztec/foundation/fields'; -import { type ArchiveSource } from '@aztec/p2p'; -import { type MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server'; +import type { Fr } from '@aztec/foundation/fields'; +import type { ArchiveSource } from '@aztec/p2p'; +import type { MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server'; import { MerkleTreeId } from '@aztec/stdlib/trees'; /** diff --git a/yarn-project/sequencer-client/src/tx_validator/gas_validator.test.ts b/yarn-project/sequencer-client/src/tx_validator/gas_validator.test.ts index f8907249cce4..3641b65a5828 100644 --- a/yarn-project/sequencer-client/src/tx_validator/gas_validator.test.ts +++ b/yarn-project/sequencer-client/src/tx_validator/gas_validator.test.ts @@ -1,13 +1,13 @@ import { PUBLIC_DISPATCH_SELECTOR } from '@aztec/constants'; import { Fr } from '@aztec/foundation/fields'; -import { type Writeable } from '@aztec/foundation/types'; +import type { Writeable } from '@aztec/foundation/types'; import { ProtocolContractAddress } from '@aztec/protocol-contracts'; import { computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice'; import { FunctionSelector, U128 } from '@aztec/stdlib/abi'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { GasFees, GasSettings } from '@aztec/stdlib/gas'; import { mockTx } from '@aztec/stdlib/testing'; -import { type Tx } from '@aztec/stdlib/tx'; +import type { Tx } from '@aztec/stdlib/tx'; import { type MockProxy, mock, mockFn } from 'jest-mock-extended'; diff --git a/yarn-project/sequencer-client/src/tx_validator/gas_validator.ts b/yarn-project/sequencer-client/src/tx_validator/gas_validator.ts index fae7edd9a46b..626c8ed21bb9 100644 --- a/yarn-project/sequencer-client/src/tx_validator/gas_validator.ts +++ b/yarn-project/sequencer-client/src/tx_validator/gas_validator.ts @@ -3,7 +3,7 @@ import { createLogger } from '@aztec/foundation/log'; import { computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice'; import { getExecutionRequestsByPhase } from '@aztec/simulator/server'; import { FunctionSelector, U128 } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { GasFees } from '@aztec/stdlib/gas'; import { type Tx, TxExecutionPhase, type TxValidationResult, type TxValidator } from '@aztec/stdlib/tx'; diff --git a/yarn-project/sequencer-client/src/tx_validator/nullifier_cache.test.ts b/yarn-project/sequencer-client/src/tx_validator/nullifier_cache.test.ts index 9b198d2463cf..2d0a8b032aff 100644 --- a/yarn-project/sequencer-client/src/tx_validator/nullifier_cache.test.ts +++ b/yarn-project/sequencer-client/src/tx_validator/nullifier_cache.test.ts @@ -1,5 +1,5 @@ import { times } from '@aztec/foundation/collection'; -import { type MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server'; import { MerkleTreeId } from '@aztec/stdlib/trees'; import { type MockProxy, mock } from 'jest-mock-extended'; diff --git a/yarn-project/sequencer-client/src/tx_validator/nullifier_cache.ts b/yarn-project/sequencer-client/src/tx_validator/nullifier_cache.ts index b66633bd2f30..2722c310e3c6 100644 --- a/yarn-project/sequencer-client/src/tx_validator/nullifier_cache.ts +++ b/yarn-project/sequencer-client/src/tx_validator/nullifier_cache.ts @@ -1,5 +1,5 @@ -import { type NullifierSource } from '@aztec/p2p'; -import { type MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server'; +import type { NullifierSource } from '@aztec/p2p'; +import type { MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server'; import { MerkleTreeId } from '@aztec/stdlib/trees'; /** diff --git a/yarn-project/sequencer-client/src/tx_validator/phases_validator.test.ts b/yarn-project/sequencer-client/src/tx_validator/phases_validator.test.ts index 124c32f06ef8..61e083b59a43 100644 --- a/yarn-project/sequencer-client/src/tx_validator/phases_validator.test.ts +++ b/yarn-project/sequencer-client/src/tx_validator/phases_validator.test.ts @@ -1,9 +1,9 @@ import { Fr } from '@aztec/foundation/fields'; import type { FunctionSelector } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractDataSource } from '@aztec/stdlib/contract'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { ContractDataSource } from '@aztec/stdlib/contract'; import { makeAztecAddress, makeSelector, mockTx } from '@aztec/stdlib/testing'; -import { type Tx } from '@aztec/stdlib/tx'; +import type { Tx } from '@aztec/stdlib/tx'; import { type MockProxy, mock, mockFn } from 'jest-mock-extended'; diff --git a/yarn-project/sequencer-client/src/tx_validator/phases_validator.ts b/yarn-project/sequencer-client/src/tx_validator/phases_validator.ts index 1133d6048359..2925104fa0dd 100644 --- a/yarn-project/sequencer-client/src/tx_validator/phases_validator.ts +++ b/yarn-project/sequencer-client/src/tx_validator/phases_validator.ts @@ -1,7 +1,7 @@ import { createLogger } from '@aztec/foundation/log'; import { ContractsDataSourcePublicDB, getExecutionRequestsByPhase } from '@aztec/simulator/server'; -import { type ContractDataSource } from '@aztec/stdlib/contract'; -import { type AllowedElement } from '@aztec/stdlib/interfaces/server'; +import type { ContractDataSource } from '@aztec/stdlib/contract'; +import type { AllowedElement } from '@aztec/stdlib/interfaces/server'; import { type PublicExecutionRequest, Tx, diff --git a/yarn-project/sequencer-client/src/tx_validator/test_utils.ts b/yarn-project/sequencer-client/src/tx_validator/test_utils.ts index eb54f7ee4cdd..02dcff7ada39 100644 --- a/yarn-project/sequencer-client/src/tx_validator/test_utils.ts +++ b/yarn-project/sequencer-client/src/tx_validator/test_utils.ts @@ -2,7 +2,7 @@ import type { Fr } from '@aztec/foundation/fields'; import type { FunctionSelector } from '@aztec/stdlib/abi'; import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { computeVarArgsHash } from '@aztec/stdlib/hash'; -import { type Tx } from '@aztec/stdlib/tx'; +import type { Tx } from '@aztec/stdlib/tx'; export function patchNonRevertibleFn( tx: Tx, diff --git a/yarn-project/sequencer-client/src/tx_validator/tx_validator_factory.ts b/yarn-project/sequencer-client/src/tx_validator/tx_validator_factory.ts index 41988e4b3264..8a635be1cc09 100644 --- a/yarn-project/sequencer-client/src/tx_validator/tx_validator_factory.ts +++ b/yarn-project/sequencer-client/src/tx_validator/tx_validator_factory.ts @@ -9,13 +9,13 @@ import { } from '@aztec/p2p'; import { ProtocolContractAddress } from '@aztec/protocol-contracts'; import { readPublicState } from '@aztec/simulator/server'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractDataSource } from '@aztec/stdlib/contract'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { ContractDataSource } from '@aztec/stdlib/contract'; import type { GasFees } from '@aztec/stdlib/gas'; -import { - type AllowedElement, - type ClientProtocolCircuitVerifier, - type MerkleTreeReadOperations, +import type { + AllowedElement, + ClientProtocolCircuitVerifier, + MerkleTreeReadOperations, } from '@aztec/stdlib/interfaces/server'; import { GlobalVariables, type ProcessedTx, type Tx, type TxValidator } from '@aztec/stdlib/tx'; diff --git a/yarn-project/simulator/src/acvm/acvm.ts b/yarn-project/simulator/src/acvm/acvm.ts index 6e938c71f29a..3c386b69f67f 100644 --- a/yarn-project/simulator/src/acvm/acvm.ts +++ b/yarn-project/simulator/src/acvm/acvm.ts @@ -10,8 +10,8 @@ import { } from '@noir-lang/acvm_js'; import { resolveOpcodeLocations, traverseCauseChain } from '../common/errors.js'; -import { type ACVMWitness } from './acvm_types.js'; -import { type ORACLE_NAMES } from './oracle/index.js'; +import type { ACVMWitness } from './acvm_types.js'; +import type { ORACLE_NAMES } from './oracle/index.js'; /** * The callback interface for the ACIR. diff --git a/yarn-project/simulator/src/acvm/acvm_types.ts b/yarn-project/simulator/src/acvm/acvm_types.ts index 3053d948a0b3..e7431a013036 100644 --- a/yarn-project/simulator/src/acvm/acvm_types.ts +++ b/yarn-project/simulator/src/acvm/acvm_types.ts @@ -1,4 +1,4 @@ -import { type WitnessMap } from '@noir-lang/acvm_js'; +import type { WitnessMap } from '@noir-lang/acvm_js'; /** * ACVMField diff --git a/yarn-project/simulator/src/acvm/deserialize.ts b/yarn-project/simulator/src/acvm/deserialize.ts index af6794196a8a..f788ea12bf7b 100644 --- a/yarn-project/simulator/src/acvm/deserialize.ts +++ b/yarn-project/simulator/src/acvm/deserialize.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; -import { type ACVMField, type ACVMWitness } from './acvm_types.js'; +import type { ACVMField, ACVMWitness } from './acvm_types.js'; /** * Converts an ACVM field to a Fr. diff --git a/yarn-project/simulator/src/acvm/oracle/index.ts b/yarn-project/simulator/src/acvm/oracle/index.ts index d9b084ccb6cb..10a453b8f08c 100644 --- a/yarn-project/simulator/src/acvm/oracle/index.ts +++ b/yarn-project/simulator/src/acvm/oracle/index.ts @@ -1,4 +1,4 @@ -import { type Oracle } from './oracle.js'; +import type { Oracle } from './oracle.js'; export * from './oracle.js'; export * from './typed_oracle.js'; diff --git a/yarn-project/simulator/src/acvm/oracle/oracle.ts b/yarn-project/simulator/src/acvm/oracle/oracle.ts index b4164e40f7a9..e3de074e2c2f 100644 --- a/yarn-project/simulator/src/acvm/oracle/oracle.ts +++ b/yarn-project/simulator/src/acvm/oracle/oracle.ts @@ -4,10 +4,10 @@ import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { LogWithTxData, UnencryptedL2Log } from '@aztec/stdlib/logs'; import { MerkleTreeId } from '@aztec/stdlib/trees'; -import { type ACVMField } from '../acvm_types.js'; +import type { ACVMField } from '../acvm_types.js'; import { frToBoolean, frToNumber, fromACVMField, fromBoundedVec } from '../deserialize.js'; import { toACVMField, toACVMFieldSingleOrArray } from '../serialize.js'; -import { type TypedOracle } from './typed_oracle.js'; +import type { TypedOracle } from './typed_oracle.js'; /** * A data source that has all the apis required by Aztec.nr. diff --git a/yarn-project/simulator/src/acvm/oracle/typed_oracle.ts b/yarn-project/simulator/src/acvm/oracle/typed_oracle.ts index 034d742c6610..0458f61e54b7 100644 --- a/yarn-project/simulator/src/acvm/oracle/typed_oracle.ts +++ b/yarn-project/simulator/src/acvm/oracle/typed_oracle.ts @@ -1,15 +1,15 @@ -import { type L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants'; +import type { L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants'; import { Fr } from '@aztec/foundation/fields'; -import { type FunctionSelector, type NoteSelector } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type CompleteAddress, type ContractInstance } from '@aztec/stdlib/contract'; -import { type KeyValidationRequest } from '@aztec/stdlib/kernel'; +import type { FunctionSelector, NoteSelector } from '@aztec/stdlib/abi'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { CompleteAddress, ContractInstance } from '@aztec/stdlib/contract'; +import type { KeyValidationRequest } from '@aztec/stdlib/kernel'; import { type IndexedTaggingSecret, type LogWithTxData, UnencryptedL2Log } from '@aztec/stdlib/logs'; -import { type Note, type NoteStatus } from '@aztec/stdlib/note'; +import type { Note, NoteStatus } from '@aztec/stdlib/note'; import { type MerkleTreeId, type NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees'; -import { type BlockHeader } from '@aztec/stdlib/tx'; +import type { BlockHeader } from '@aztec/stdlib/tx'; -import { type MessageLoadOracleInputs } from '../../common/message_load_oracle_inputs.js'; +import type { MessageLoadOracleInputs } from '../../common/message_load_oracle_inputs.js'; /** * Information about a note needed during execution. diff --git a/yarn-project/simulator/src/acvm/serialize.ts b/yarn-project/simulator/src/acvm/serialize.ts index 8b429396df80..21552ad04e56 100644 --- a/yarn-project/simulator/src/acvm/serialize.ts +++ b/yarn-project/simulator/src/acvm/serialize.ts @@ -1,8 +1,8 @@ -import { type EthAddress } from '@aztec/foundation/eth-address'; +import type { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ACVMField } from './acvm_types.js'; +import type { ACVMField } from './acvm_types.js'; /** * Adapts the buffer to the field size. diff --git a/yarn-project/simulator/src/avm/avm_context.ts b/yarn-project/simulator/src/avm/avm_context.ts index ca0c17b439c4..9b5ed8a24d05 100644 --- a/yarn-project/simulator/src/avm/avm_context.ts +++ b/yarn-project/simulator/src/avm/avm_context.ts @@ -1,11 +1,11 @@ -import { type Fr } from '@aztec/foundation/fields'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { Fr } from '@aztec/foundation/fields'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type AvmExecutionEnvironment } from './avm_execution_environment.js'; +import type { AvmExecutionEnvironment } from './avm_execution_environment.js'; import { type Gas, gasToGasLeft } from './avm_gas.js'; import { AvmMachineState } from './avm_machine_state.js'; import type { AvmSimulator } from './avm_simulator.js'; -import { type AvmPersistableStateManager } from './journal/journal.js'; +import type { AvmPersistableStateManager } from './journal/journal.js'; /** * An execution context includes the information necessary to initiate AVM diff --git a/yarn-project/simulator/src/avm/avm_contract_call_result.ts b/yarn-project/simulator/src/avm/avm_contract_call_result.ts index bc1047559f09..6bda310721d7 100644 --- a/yarn-project/simulator/src/avm/avm_contract_call_result.ts +++ b/yarn-project/simulator/src/avm/avm_contract_call_result.ts @@ -1,12 +1,12 @@ -import { type Fr } from '@aztec/foundation/fields'; -import { type SimulationError } from '@aztec/stdlib/errors'; +import type { Fr } from '@aztec/foundation/fields'; +import type { SimulationError } from '@aztec/stdlib/errors'; import { Gas } from '@aztec/stdlib/gas'; import { inspect } from 'util'; import { createSimulationError } from '../common/errors.js'; -import { type Gas as AvmGas } from './avm_gas.js'; -import { type AvmRevertReason } from './errors.js'; +import type { Gas as AvmGas } from './avm_gas.js'; +import type { AvmRevertReason } from './errors.js'; /** * Results of an contract call's execution in the AVM. diff --git a/yarn-project/simulator/src/avm/avm_execution_environment.ts b/yarn-project/simulator/src/avm/avm_execution_environment.ts index f808b45512d5..a43d4f9e47e9 100644 --- a/yarn-project/simulator/src/avm/avm_execution_environment.ts +++ b/yarn-project/simulator/src/avm/avm_execution_environment.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type GlobalVariables } from '@aztec/stdlib/tx'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { GlobalVariables } from '@aztec/stdlib/tx'; /** * Contains variables that remain constant during AVM execution diff --git a/yarn-project/simulator/src/avm/avm_machine_state.ts b/yarn-project/simulator/src/avm/avm_machine_state.ts index d25e82ebf990..bf7cad42628a 100644 --- a/yarn-project/simulator/src/avm/avm_machine_state.ts +++ b/yarn-project/simulator/src/avm/avm_machine_state.ts @@ -1,6 +1,6 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; -import { type Gas } from './avm_gas.js'; +import type { Gas } from './avm_gas.js'; import { TaggedMemory } from './avm_memory_types.js'; import { type AvmRevertReason, OutOfGasError } from './errors.js'; diff --git a/yarn-project/simulator/src/avm/avm_memory_types.ts b/yarn-project/simulator/src/avm/avm_memory_types.ts index 138f2828866e..7590b2bdaceb 100644 --- a/yarn-project/simulator/src/avm/avm_memory_types.ts +++ b/yarn-project/simulator/src/avm/avm_memory_types.ts @@ -10,7 +10,7 @@ import { import { toBufferBE } from '@aztec/foundation/bigint-buffer'; import { Fr } from '@aztec/foundation/fields'; import { type Logger, createLogger } from '@aztec/foundation/log'; -import { type FunctionsOf } from '@aztec/foundation/types'; +import type { FunctionsOf } from '@aztec/foundation/types'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { strict as assert } from 'assert'; diff --git a/yarn-project/simulator/src/avm/avm_simulator.test.ts b/yarn-project/simulator/src/avm/avm_simulator.test.ts index 046d011139a0..d6984e5fe50a 100644 --- a/yarn-project/simulator/src/avm/avm_simulator.test.ts +++ b/yarn-project/simulator/src/avm/avm_simulator.test.ts @@ -9,7 +9,7 @@ import { sha256, } from '@aztec/foundation/crypto'; import { Fq, Fr, Point } from '@aztec/foundation/fields'; -import { type Fieldable } from '@aztec/foundation/serialize'; +import type { Fieldable } from '@aztec/foundation/serialize'; import { FunctionSelector } from '@aztec/stdlib/abi'; import { PublicDataWrite } from '@aztec/stdlib/avm'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; @@ -23,7 +23,7 @@ import { siloNoteHash, siloNullifier, } from '@aztec/stdlib/hash'; -import { type MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; import { PublicKeys } from '@aztec/stdlib/keys'; import { makeContractClassPublic, makeContractInstanceFromClassId } from '@aztec/stdlib/testing'; import { MerkleTreeId, NullifierLeafPreimage, PublicDataTreeLeafPreimage } from '@aztec/stdlib/trees'; @@ -34,9 +34,9 @@ import { mock } from 'jest-mock-extended'; import { WorldStateDB } from '../public/public_db_sources.js'; import { SideEffectTrace } from '../public/side_effect_trace.js'; -import { type PublicSideEffectTraceInterface } from '../public/side_effect_trace_interface.js'; -import { type AvmContext } from './avm_context.js'; -import { type AvmExecutionEnvironment } from './avm_execution_environment.js'; +import type { PublicSideEffectTraceInterface } from '../public/side_effect_trace_interface.js'; +import type { AvmContext } from './avm_context.js'; +import type { AvmExecutionEnvironment } from './avm_execution_environment.js'; import { type MemoryValue, TypeTag, type Uint8, type Uint64 } from './avm_memory_types.js'; import { AvmSimulator } from './avm_simulator.js'; import { isAvmBytecode, markBytecodeAsAvm } from './bytecode_utils.js'; @@ -55,7 +55,7 @@ import { resolveAvmTestContractAssertionMessage, } from './fixtures/index.js'; import { SimpleContractDataSource } from './fixtures/simple_contract_data_source.js'; -import { type AvmPersistableStateManager } from './journal/journal.js'; +import type { AvmPersistableStateManager } from './journal/journal.js'; import { Add, CalldataCopy, diff --git a/yarn-project/simulator/src/avm/avm_simulator.ts b/yarn-project/simulator/src/avm/avm_simulator.ts index d8e644ed7396..e99df26015ce 100644 --- a/yarn-project/simulator/src/avm/avm_simulator.ts +++ b/yarn-project/simulator/src/avm/avm_simulator.ts @@ -10,7 +10,7 @@ import { SideEffectLimitReachedError } from '../public/side_effect_errors.js'; import { AvmContext } from './avm_context.js'; import { AvmContractCallResult } from './avm_contract_call_result.js'; import { AvmExecutionEnvironment } from './avm_execution_environment.js'; -import { type Gas } from './avm_gas.js'; +import type { Gas } from './avm_gas.js'; import { AvmMachineState } from './avm_machine_state.js'; import { isAvmBytecode } from './bytecode_utils.js'; import { @@ -20,8 +20,8 @@ import { revertReasonFromExceptionalHalt, revertReasonFromExplicitRevert, } from './errors.js'; -import { type AvmPersistableStateManager } from './journal/journal.js'; -import { type Instruction } from './opcodes/instruction.js'; +import type { AvmPersistableStateManager } from './journal/journal.js'; +import type { Instruction } from './opcodes/instruction.js'; import { INSTRUCTION_SET, type InstructionSet, diff --git a/yarn-project/simulator/src/avm/errors.ts b/yarn-project/simulator/src/avm/errors.ts index 478569af2e88..f7ac336ae424 100644 --- a/yarn-project/simulator/src/avm/errors.ts +++ b/yarn-project/simulator/src/avm/errors.ts @@ -1,9 +1,9 @@ import type { Fr, Point } from '@aztec/foundation/fields'; import type { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type FailingFunction, type NoirCallStack } from '@aztec/stdlib/errors'; +import type { FailingFunction, NoirCallStack } from '@aztec/stdlib/errors'; import { ExecutionError } from '../common/errors.js'; -import { type AvmContext } from './avm_context.js'; +import type { AvmContext } from './avm_context.js'; /** * Avm-specific errors should derive from this diff --git a/yarn-project/simulator/src/avm/fixtures/avm_simulation_tester.ts b/yarn-project/simulator/src/avm/fixtures/avm_simulation_tester.ts index 73272f696dc4..c8d23572a3cf 100644 --- a/yarn-project/simulator/src/avm/fixtures/avm_simulation_tester.ts +++ b/yarn-project/simulator/src/avm/fixtures/avm_simulation_tester.ts @@ -1,12 +1,12 @@ import { Fr } from '@aztec/foundation/fields'; import { encodeArguments } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { GasFees } from '@aztec/stdlib/gas'; -import { type MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; import { GlobalVariables } from '@aztec/stdlib/tx'; import { NativeWorldStateService } from '@aztec/world-state'; -import { type AvmContractCallResult } from '../../avm/avm_contract_call_result.js'; +import type { AvmContractCallResult } from '../../avm/avm_contract_call_result.js'; import { getContractFunctionArtifact, getFunctionSelector, diff --git a/yarn-project/simulator/src/avm/fixtures/base_avm_simulation_tester.ts b/yarn-project/simulator/src/avm/fixtures/base_avm_simulation_tester.ts index bd813d1054fa..544fdd84a3e1 100644 --- a/yarn-project/simulator/src/avm/fixtures/base_avm_simulation_tester.ts +++ b/yarn-project/simulator/src/avm/fixtures/base_avm_simulation_tester.ts @@ -3,15 +3,15 @@ import { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; import { ProtocolContractAddress } from '@aztec/protocol-contracts'; import { computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice'; -import { type ContractArtifact } from '@aztec/stdlib/abi'; +import type { ContractArtifact } from '@aztec/stdlib/abi'; import { PublicDataWrite } from '@aztec/stdlib/avm'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractClassPublic, type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/stdlib/contract'; import { computePublicDataTreeLeafSlot, siloNullifier } from '@aztec/stdlib/hash'; -import { type MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; import { MerkleTreeId } from '@aztec/stdlib/trees'; -import { type SimpleContractDataSource } from './simple_contract_data_source.js'; +import type { SimpleContractDataSource } from './simple_contract_data_source.js'; /** * An abstract test class that enables tests of real apps in the AVM without requiring e2e tests. diff --git a/yarn-project/simulator/src/avm/fixtures/index.ts b/yarn-project/simulator/src/avm/fixtures/index.ts index 38e02f82b63a..9e4b6e3d3bf9 100644 --- a/yarn-project/simulator/src/avm/fixtures/index.ts +++ b/yarn-project/simulator/src/avm/fixtures/index.ts @@ -7,7 +7,7 @@ import { type ContractArtifact, type FunctionArtifact, FunctionSelector } from ' import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { isNoirCallStackUnresolved } from '@aztec/stdlib/errors'; import { GasFees } from '@aztec/stdlib/gas'; -import { type MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; import { GlobalVariables } from '@aztec/stdlib/tx'; import { strict as assert } from 'assert'; @@ -15,13 +15,13 @@ import { mock } from 'jest-mock-extended'; import merge from 'lodash.merge'; import { resolveAssertionMessageFromRevertData, traverseCauseChain } from '../../common.js'; -import { type PublicSideEffectTraceInterface } from '../../public/side_effect_trace_interface.js'; +import type { PublicSideEffectTraceInterface } from '../../public/side_effect_trace_interface.js'; import { AvmSimulator, type WorldStateDB } from '../../server.js'; import { AvmContext } from '../avm_context.js'; import { AvmExecutionEnvironment } from '../avm_execution_environment.js'; import { AvmMachineState } from '../avm_machine_state.js'; import { Field, Uint8, Uint32, Uint64 } from '../avm_memory_types.js'; -import { type AvmRevertReason } from '../errors.js'; +import type { AvmRevertReason } from '../errors.js'; import { AvmPersistableStateManager } from '../journal/journal.js'; import { NullifierManager } from '../journal/nullifiers.js'; import { PublicStorage } from '../journal/public_storage.js'; diff --git a/yarn-project/simulator/src/avm/fixtures/simple_contract_data_source.ts b/yarn-project/simulator/src/avm/fixtures/simple_contract_data_source.ts index 1ed3f6426db0..25595e9bf0df 100644 --- a/yarn-project/simulator/src/avm/fixtures/simple_contract_data_source.ts +++ b/yarn-project/simulator/src/avm/fixtures/simple_contract_data_source.ts @@ -1,9 +1,9 @@ import { PUBLIC_DISPATCH_SELECTOR } from '@aztec/constants'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice'; import { type ContractArtifact, FunctionSelector } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { type ContractClassPublic, type ContractDataSource, diff --git a/yarn-project/simulator/src/avm/journal/journal.test.ts b/yarn-project/simulator/src/avm/journal/journal.test.ts index 4d435194bf29..d7d13a78c022 100644 --- a/yarn-project/simulator/src/avm/journal/journal.test.ts +++ b/yarn-project/simulator/src/avm/journal/journal.test.ts @@ -6,8 +6,8 @@ import { makeContractClassPublic } from '@aztec/stdlib/testing'; import { mock } from 'jest-mock-extended'; -import { type WorldStateDB } from '../../public/public_db_sources.js'; -import { type PublicSideEffectTraceInterface } from '../../public/side_effect_trace_interface.js'; +import type { WorldStateDB } from '../../public/public_db_sources.js'; +import type { PublicSideEffectTraceInterface } from '../../public/side_effect_trace_interface.js'; import { initPersistableStateManager } from '../fixtures/index.js'; import { mockGetBytecode, @@ -19,7 +19,7 @@ import { mockNullifierExists, mockStorageRead, } from '../test_utils.js'; -import { type AvmPersistableStateManager } from './journal.js'; +import type { AvmPersistableStateManager } from './journal.js'; describe('journal', () => { let address: AztecAddress; diff --git a/yarn-project/simulator/src/avm/journal/journal.ts b/yarn-project/simulator/src/avm/journal/journal.ts index 4ba708990bfa..efd4e262055f 100644 --- a/yarn-project/simulator/src/avm/journal/journal.ts +++ b/yarn-project/simulator/src/avm/journal/journal.ts @@ -22,7 +22,7 @@ import { siloNoteHash, siloNullifier, } from '@aztec/stdlib/hash'; -import { type IndexedTreeId, type MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; +import type { IndexedTreeId, MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; import type { PublicCallRequest } from '@aztec/stdlib/kernel'; import { SharedMutableValues, SharedMutableValuesWithHash } from '@aztec/stdlib/shared-mutable'; import { MerkleTreeId, NullifierLeafPreimage, PublicDataTreeLeafPreimage } from '@aztec/stdlib/trees'; @@ -31,9 +31,9 @@ import { strict as assert } from 'assert'; import cloneDeep from 'lodash.clonedeep'; import { getPublicFunctionDebugName } from '../../common/debug_fn_name.js'; -import { type WorldStateDB } from '../../public/public_db_sources.js'; -import { type PublicSideEffectTraceInterface } from '../../public/side_effect_trace_interface.js'; -import { type AvmExecutionEnvironment } from '../avm_execution_environment.js'; +import type { WorldStateDB } from '../../public/public_db_sources.js'; +import type { PublicSideEffectTraceInterface } from '../../public/side_effect_trace_interface.js'; +import type { AvmExecutionEnvironment } from '../avm_execution_environment.js'; import { NullifierCollisionError, NullifierManager } from './nullifiers.js'; import { PublicStorage } from './public_storage.js'; diff --git a/yarn-project/simulator/src/avm/journal/nullifiers.test.ts b/yarn-project/simulator/src/avm/journal/nullifiers.test.ts index 11dba2b9bdac..21861458e0ba 100644 --- a/yarn-project/simulator/src/avm/journal/nullifiers.test.ts +++ b/yarn-project/simulator/src/avm/journal/nullifiers.test.ts @@ -2,7 +2,7 @@ import { Fr } from '@aztec/foundation/fields'; import { type MockProxy, mock } from 'jest-mock-extended'; -import { type WorldStateDB } from '../../server.js'; +import type { WorldStateDB } from '../../server.js'; import { NullifierManager } from './nullifiers.js'; describe('avm nullifier caching', () => { diff --git a/yarn-project/simulator/src/avm/journal/nullifiers.ts b/yarn-project/simulator/src/avm/journal/nullifiers.ts index 999932c1f233..38640644ffb2 100644 --- a/yarn-project/simulator/src/avm/journal/nullifiers.ts +++ b/yarn-project/simulator/src/avm/journal/nullifiers.ts @@ -1,4 +1,4 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import type { WorldStateDB } from '../../server.js'; diff --git a/yarn-project/simulator/src/avm/journal/public_storage.test.ts b/yarn-project/simulator/src/avm/journal/public_storage.test.ts index c3a18b838d05..68759c079c9b 100644 --- a/yarn-project/simulator/src/avm/journal/public_storage.test.ts +++ b/yarn-project/simulator/src/avm/journal/public_storage.test.ts @@ -3,7 +3,7 @@ import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { type MockProxy, mock } from 'jest-mock-extended'; -import { type PublicStateDB } from '../../server.js'; +import type { PublicStateDB } from '../../server.js'; import { PublicStorage } from './public_storage.js'; describe('avm public storage', () => { diff --git a/yarn-project/simulator/src/avm/journal/public_storage.ts b/yarn-project/simulator/src/avm/journal/public_storage.ts index 1c8f174517a0..f6cfe759ddb7 100644 --- a/yarn-project/simulator/src/avm/journal/public_storage.ts +++ b/yarn-project/simulator/src/avm/journal/public_storage.ts @@ -1,7 +1,7 @@ import { Fr } from '@aztec/foundation/fields'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type PublicStateDB } from '../../server.js'; +import type { PublicStateDB } from '../../server.js'; type PublicStorageReadResult = { value: Fr; diff --git a/yarn-project/simulator/src/avm/opcodes/accrued_substate.test.ts b/yarn-project/simulator/src/avm/opcodes/accrued_substate.test.ts index 8831c0a41023..606bf46cb30e 100644 --- a/yarn-project/simulator/src/avm/opcodes/accrued_substate.test.ts +++ b/yarn-project/simulator/src/avm/opcodes/accrued_substate.test.ts @@ -4,13 +4,13 @@ import { computeNoteHashNonce, computeUniqueNoteHash, siloNoteHash, siloNullifie import { mock } from 'jest-mock-extended'; -import { type WorldStateDB } from '../../public/public_db_sources.js'; -import { type PublicSideEffectTraceInterface } from '../../public/side_effect_trace_interface.js'; -import { type AvmContext } from '../avm_context.js'; +import type { WorldStateDB } from '../../public/public_db_sources.js'; +import type { PublicSideEffectTraceInterface } from '../../public/side_effect_trace_interface.js'; +import type { AvmContext } from '../avm_context.js'; import { Field, Uint8, Uint32 } from '../avm_memory_types.js'; import { InstructionExecutionError, StaticCallAlterationError } from '../errors.js'; import { initContext, initExecutionEnvironment, initPersistableStateManager } from '../fixtures/index.js'; -import { type AvmPersistableStateManager } from '../journal/journal.js'; +import type { AvmPersistableStateManager } from '../journal/journal.js'; import { mockL1ToL2MessageExists, mockNoteHashCount, mockNoteHashExists, mockNullifierExists } from '../test_utils.js'; import { EmitNoteHash, diff --git a/yarn-project/simulator/src/avm/opcodes/arithmetic.test.ts b/yarn-project/simulator/src/avm/opcodes/arithmetic.test.ts index 022957eb2d2a..66494b65542e 100644 --- a/yarn-project/simulator/src/avm/opcodes/arithmetic.test.ts +++ b/yarn-project/simulator/src/avm/opcodes/arithmetic.test.ts @@ -1,4 +1,4 @@ -import { type AvmContext } from '../avm_context.js'; +import type { AvmContext } from '../avm_context.js'; import { Field, TypeTag, Uint8, Uint16, Uint32, Uint64, Uint128 } from '../avm_memory_types.js'; import { initContext } from '../fixtures/index.js'; import { Opcode } from '../serialization/instruction_serialization.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/bitwise.test.ts b/yarn-project/simulator/src/avm/opcodes/bitwise.test.ts index e207780ebd55..d590b3c72f40 100644 --- a/yarn-project/simulator/src/avm/opcodes/bitwise.test.ts +++ b/yarn-project/simulator/src/avm/opcodes/bitwise.test.ts @@ -1,4 +1,4 @@ -import { type AvmContext } from '../avm_context.js'; +import type { AvmContext } from '../avm_context.js'; import { Uint8, Uint16, Uint32 } from '../avm_memory_types.js'; import { initContext } from '../fixtures/index.js'; import { Opcode } from '../serialization/instruction_serialization.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/comparators.test.ts b/yarn-project/simulator/src/avm/opcodes/comparators.test.ts index 29b592c7e705..9ad064acc73f 100644 --- a/yarn-project/simulator/src/avm/opcodes/comparators.test.ts +++ b/yarn-project/simulator/src/avm/opcodes/comparators.test.ts @@ -1,4 +1,4 @@ -import { type AvmContext } from '../avm_context.js'; +import type { AvmContext } from '../avm_context.js'; import { Field, Uint8, Uint16, Uint32 } from '../avm_memory_types.js'; import { TagCheckError } from '../errors.js'; import { initContext } from '../fixtures/index.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/contract.test.ts b/yarn-project/simulator/src/avm/opcodes/contract.test.ts index 4642908679da..fb24491c52c6 100644 --- a/yarn-project/simulator/src/avm/opcodes/contract.test.ts +++ b/yarn-project/simulator/src/avm/opcodes/contract.test.ts @@ -4,12 +4,12 @@ import { SerializableContractInstance } from '@aztec/stdlib/contract'; import { mock } from 'jest-mock-extended'; -import { type WorldStateDB } from '../../public/public_db_sources.js'; -import { type PublicSideEffectTraceInterface } from '../../public/side_effect_trace_interface.js'; -import { type AvmContext } from '../avm_context.js'; +import type { WorldStateDB } from '../../public/public_db_sources.js'; +import type { PublicSideEffectTraceInterface } from '../../public/side_effect_trace_interface.js'; +import type { AvmContext } from '../avm_context.js'; import { Field, TypeTag, Uint1 } from '../avm_memory_types.js'; import { initContext, initPersistableStateManager } from '../fixtures/index.js'; -import { type AvmPersistableStateManager } from '../journal/journal.js'; +import type { AvmPersistableStateManager } from '../journal/journal.js'; import { mockGetContractInstance, mockNullifierExists } from '../test_utils.js'; import { ContractInstanceMember, GetContractInstance } from './contract.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/control_flow.test.ts b/yarn-project/simulator/src/avm/opcodes/control_flow.test.ts index 0e7cc0fe3574..d2cee207096d 100644 --- a/yarn-project/simulator/src/avm/opcodes/control_flow.test.ts +++ b/yarn-project/simulator/src/avm/opcodes/control_flow.test.ts @@ -1,4 +1,4 @@ -import { type AvmContext } from '../avm_context.js'; +import type { AvmContext } from '../avm_context.js'; import { Uint16 } from '../avm_memory_types.js'; import { InstructionExecutionError } from '../errors.js'; import { initContext } from '../fixtures/index.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/control_flow.ts b/yarn-project/simulator/src/avm/opcodes/control_flow.ts index f9097b6119bf..04135ff7aa5e 100644 --- a/yarn-project/simulator/src/avm/opcodes/control_flow.ts +++ b/yarn-project/simulator/src/avm/opcodes/control_flow.ts @@ -1,5 +1,5 @@ import type { AvmContext } from '../avm_context.js'; -import { type IntegralValue } from '../avm_memory_types.js'; +import type { IntegralValue } from '../avm_memory_types.js'; import { InstructionExecutionError } from '../errors.js'; import { Opcode, OperandType } from '../serialization/instruction_serialization.js'; import { Addressing } from './addressing_mode.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/conversion.test.ts b/yarn-project/simulator/src/avm/opcodes/conversion.test.ts index a7f1c5658219..48a6f9de2b5f 100644 --- a/yarn-project/simulator/src/avm/opcodes/conversion.test.ts +++ b/yarn-project/simulator/src/avm/opcodes/conversion.test.ts @@ -1,4 +1,4 @@ -import { type AvmContext } from '../avm_context.js'; +import type { AvmContext } from '../avm_context.js'; import { Field, Uint1, type Uint8, Uint32 } from '../avm_memory_types.js'; import { InvalidToRadixInputsError } from '../errors.js'; import { initContext } from '../fixtures/index.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/conversion.ts b/yarn-project/simulator/src/avm/opcodes/conversion.ts index 3d32d643d4dd..b78604889bde 100644 --- a/yarn-project/simulator/src/avm/opcodes/conversion.ts +++ b/yarn-project/simulator/src/avm/opcodes/conversion.ts @@ -1,4 +1,4 @@ -import { type AvmContext } from '../avm_context.js'; +import type { AvmContext } from '../avm_context.js'; import { TypeTag, Uint1, Uint8 } from '../avm_memory_types.js'; import { InvalidToRadixInputsError } from '../errors.js'; import { Opcode, OperandType } from '../serialization/instruction_serialization.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/ec_add.test.ts b/yarn-project/simulator/src/avm/opcodes/ec_add.test.ts index 2ca9c762f215..c9547da04dd9 100644 --- a/yarn-project/simulator/src/avm/opcodes/ec_add.test.ts +++ b/yarn-project/simulator/src/avm/opcodes/ec_add.test.ts @@ -3,7 +3,7 @@ import { Fr, Point } from '@aztec/foundation/fields'; import { beforeEach } from '@jest/globals'; -import { type AvmContext } from '../avm_context.js'; +import type { AvmContext } from '../avm_context.js'; import { Field, Uint1, Uint32 } from '../avm_memory_types.js'; import { initContext } from '../fixtures/index.js'; import { EcAdd } from './ec_add.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/ec_add.ts b/yarn-project/simulator/src/avm/opcodes/ec_add.ts index 3e0232c38308..9e896ba419f0 100644 --- a/yarn-project/simulator/src/avm/opcodes/ec_add.ts +++ b/yarn-project/simulator/src/avm/opcodes/ec_add.ts @@ -1,7 +1,7 @@ import { Grumpkin } from '@aztec/foundation/crypto'; import { Point } from '@aztec/foundation/fields'; -import { type AvmContext } from '../avm_context.js'; +import type { AvmContext } from '../avm_context.js'; import { Field, TypeTag, Uint1 } from '../avm_memory_types.js'; import { Opcode, OperandType } from '../serialization/instruction_serialization.js'; import { Addressing } from './addressing_mode.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/environment_getters.test.ts b/yarn-project/simulator/src/avm/opcodes/environment_getters.test.ts index ccb9fbe6b516..70a15a6be274 100644 --- a/yarn-project/simulator/src/avm/opcodes/environment_getters.test.ts +++ b/yarn-project/simulator/src/avm/opcodes/environment_getters.test.ts @@ -4,7 +4,7 @@ import { GasFees } from '@aztec/stdlib/gas'; import { randomInt } from 'crypto'; -import { type AvmContext } from '../avm_context.js'; +import type { AvmContext } from '../avm_context.js'; import { TypeTag } from '../avm_memory_types.js'; import { initContext, initExecutionEnvironment, initGlobalVariables } from '../fixtures/index.js'; import { Opcode } from '../serialization/instruction_serialization.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/external_calls.test.ts b/yarn-project/simulator/src/avm/opcodes/external_calls.test.ts index 3d5d81f21bb3..34257e340bf1 100644 --- a/yarn-project/simulator/src/avm/opcodes/external_calls.test.ts +++ b/yarn-project/simulator/src/avm/opcodes/external_calls.test.ts @@ -4,13 +4,13 @@ import { makeContractClassPublic, makeContractInstanceFromClassId } from '@aztec import { mock } from 'jest-mock-extended'; -import { type WorldStateDB } from '../../public/public_db_sources.js'; -import { type PublicSideEffectTraceInterface } from '../../public/side_effect_trace_interface.js'; -import { type AvmContext } from '../avm_context.js'; +import type { WorldStateDB } from '../../public/public_db_sources.js'; +import type { PublicSideEffectTraceInterface } from '../../public/side_effect_trace_interface.js'; +import type { AvmContext } from '../avm_context.js'; import { Field, TypeTag, Uint1, Uint32 } from '../avm_memory_types.js'; import { markBytecodeAsAvm } from '../bytecode_utils.js'; import { initContext, initPersistableStateManager } from '../fixtures/index.js'; -import { type AvmPersistableStateManager } from '../journal/journal.js'; +import type { AvmPersistableStateManager } from '../journal/journal.js'; import { encodeToBytecode } from '../serialization/bytecode_serialization.js'; import { Opcode } from '../serialization/instruction_serialization.js'; import { @@ -22,7 +22,7 @@ import { } from '../test_utils.js'; import { EnvironmentVariable, GetEnvVar } from './environment_getters.js'; import { Call, Return, Revert, StaticCall } from './external_calls.js'; -import { type Instruction } from './instruction.js'; +import type { Instruction } from './instruction.js'; import { CalldataCopy, Set } from './memory.js'; import { SStore } from './storage.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/external_calls.ts b/yarn-project/simulator/src/avm/opcodes/external_calls.ts index ae62a98ff5f2..4ceb165f6050 100644 --- a/yarn-project/simulator/src/avm/opcodes/external_calls.ts +++ b/yarn-project/simulator/src/avm/opcodes/external_calls.ts @@ -1,5 +1,5 @@ import type { AvmContext } from '../avm_context.js'; -import { type AvmContractCallResult } from '../avm_contract_call_result.js'; +import type { AvmContractCallResult } from '../avm_contract_call_result.js'; import { type Field, TypeTag, Uint1 } from '../avm_memory_types.js'; import { Opcode, OperandType } from '../serialization/instruction_serialization.js'; import { Addressing } from './addressing_mode.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/hashing.test.ts b/yarn-project/simulator/src/avm/opcodes/hashing.test.ts index a6f04f3ab131..9ef39cc4b23d 100644 --- a/yarn-project/simulator/src/avm/opcodes/hashing.test.ts +++ b/yarn-project/simulator/src/avm/opcodes/hashing.test.ts @@ -1,6 +1,6 @@ import { keccakf1600, sha256Compression } from '@aztec/foundation/crypto'; -import { type AvmContext } from '../avm_context.js'; +import type { AvmContext } from '../avm_context.js'; import { Field, TaggedMemory, Uint32, Uint64 } from '../avm_memory_types.js'; import { MemorySliceOutOfRangeError } from '../errors.js'; import { initContext, randomMemoryUint32s } from '../fixtures/index.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/hashing.ts b/yarn-project/simulator/src/avm/opcodes/hashing.ts index f91876240019..2014aab8c36d 100644 --- a/yarn-project/simulator/src/avm/opcodes/hashing.ts +++ b/yarn-project/simulator/src/avm/opcodes/hashing.ts @@ -1,6 +1,6 @@ import { keccakf1600, poseidon2Permutation, sha256Compression } from '@aztec/foundation/crypto'; -import { type AvmContext } from '../avm_context.js'; +import type { AvmContext } from '../avm_context.js'; import { Field, TypeTag, Uint32, Uint64 } from '../avm_memory_types.js'; import { Opcode, OperandType } from '../serialization/instruction_serialization.js'; import { Addressing } from './addressing_mode.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/instruction.ts b/yarn-project/simulator/src/avm/opcodes/instruction.ts index c7ae85a5d84f..94a421031bdd 100644 --- a/yarn-project/simulator/src/avm/opcodes/instruction.ts +++ b/yarn-project/simulator/src/avm/opcodes/instruction.ts @@ -2,8 +2,8 @@ import { strict as assert } from 'assert'; import type { AvmContext } from '../avm_context.js'; import { type Gas, getBaseGasCost, getDynamicGasCost, mulGas, sumGas } from '../avm_gas.js'; -import { type BufferCursor } from '../serialization/buffer_cursor.js'; -import { type Serializable } from '../serialization/bytecode_serialization.js'; +import type { BufferCursor } from '../serialization/buffer_cursor.js'; +import type { Serializable } from '../serialization/bytecode_serialization.js'; import { Opcode, type OperandType, deserialize, serializeAs } from '../serialization/instruction_serialization.js'; type InstructionConstructor = { diff --git a/yarn-project/simulator/src/avm/opcodes/memory.test.ts b/yarn-project/simulator/src/avm/opcodes/memory.test.ts index 1ba27d2b0d9f..309f14f6b9a4 100644 --- a/yarn-project/simulator/src/avm/opcodes/memory.test.ts +++ b/yarn-project/simulator/src/avm/opcodes/memory.test.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; -import { type AvmContext } from '../avm_context.js'; +import type { AvmContext } from '../avm_context.js'; import { Field, TaggedMemory, TypeTag, Uint8, Uint16, Uint32, Uint64, Uint128 } from '../avm_memory_types.js'; import { MemorySliceOutOfRangeError } from '../errors.js'; import { initContext, initExecutionEnvironment } from '../fixtures/index.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/misc.ts b/yarn-project/simulator/src/avm/opcodes/misc.ts index f1d9f3743643..9abbeb76a6cc 100644 --- a/yarn-project/simulator/src/avm/opcodes/misc.ts +++ b/yarn-project/simulator/src/avm/opcodes/misc.ts @@ -1,6 +1,6 @@ import { applyStringFormatting, createLogger } from '@aztec/foundation/log'; -import { type AvmContext } from '../avm_context.js'; +import type { AvmContext } from '../avm_context.js'; import { TypeTag } from '../avm_memory_types.js'; import { Opcode, OperandType } from '../serialization/instruction_serialization.js'; import { Addressing } from './addressing_mode.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/storage.test.ts b/yarn-project/simulator/src/avm/opcodes/storage.test.ts index 0ccf420b214f..46e5b160ac66 100644 --- a/yarn-project/simulator/src/avm/opcodes/storage.test.ts +++ b/yarn-project/simulator/src/avm/opcodes/storage.test.ts @@ -3,11 +3,11 @@ import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { type MockProxy, mock } from 'jest-mock-extended'; -import { type AvmContext } from '../avm_context.js'; +import type { AvmContext } from '../avm_context.js'; import { Field } from '../avm_memory_types.js'; import { StaticCallAlterationError } from '../errors.js'; import { initContext, initExecutionEnvironment } from '../fixtures/index.js'; -import { type AvmPersistableStateManager } from '../journal/journal.js'; +import type { AvmPersistableStateManager } from '../journal/journal.js'; import { SLoad, SStore } from './storage.js'; describe('Storage Instructions', () => { diff --git a/yarn-project/simulator/src/avm/serialization/bytecode_serialization.test.ts b/yarn-project/simulator/src/avm/serialization/bytecode_serialization.test.ts index ac84cfa19dd6..28cca507169e 100644 --- a/yarn-project/simulator/src/avm/serialization/bytecode_serialization.test.ts +++ b/yarn-project/simulator/src/avm/serialization/bytecode_serialization.test.ts @@ -2,7 +2,7 @@ import { strict as assert } from 'assert'; import { AvmParsingError, InvalidOpcodeError, InvalidTagValueError } from '../errors.js'; import { Add, Call, EnvironmentVariable, GetEnvVar, StaticCall, Sub } from '../opcodes/index.js'; -import { type BufferCursor } from './buffer_cursor.js'; +import type { BufferCursor } from './buffer_cursor.js'; import { type InstructionSet, decodeFromBytecode, encodeToBytecode } from './bytecode_serialization.js'; import { MAX_OPCODE_VALUE, Opcode } from './instruction_serialization.js'; diff --git a/yarn-project/simulator/src/avm/test_utils.ts b/yarn-project/simulator/src/avm/test_utils.ts index 991740927bdc..aa480ec8fae3 100644 --- a/yarn-project/simulator/src/avm/test_utils.ts +++ b/yarn-project/simulator/src/avm/test_utils.ts @@ -5,11 +5,11 @@ import { computePublicBytecodeCommitment, } from '@aztec/stdlib/contract'; -import { type jest } from '@jest/globals'; +import type { jest } from '@jest/globals'; import { mock } from 'jest-mock-extended'; -import { type WorldStateDB } from '../public/public_db_sources.js'; -import { type PublicSideEffectTraceInterface } from '../public/side_effect_trace_interface.js'; +import type { WorldStateDB } from '../public/public_db_sources.js'; +import type { PublicSideEffectTraceInterface } from '../public/side_effect_trace_interface.js'; export async function mockGetBytecode(worldStateDB: WorldStateDB, bytecode: Buffer) { const commitment = await computePublicBytecodeCommitment(bytecode); diff --git a/yarn-project/simulator/src/client/client_execution_context.ts b/yarn-project/simulator/src/client/client_execution_context.ts index be65480c78dd..bed6cd34105b 100644 --- a/yarn-project/simulator/src/client/client_execution_context.ts +++ b/yarn-project/simulator/src/client/client_execution_context.ts @@ -8,10 +8,10 @@ import { type NoteSelector, countArgumentsSize, } from '@aztec/stdlib/abi'; -import { type AuthWitness } from '@aztec/stdlib/auth-witness'; +import type { AuthWitness } from '@aztec/stdlib/auth-witness'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { computeUniqueNoteHash, siloNoteHash } from '@aztec/stdlib/hash'; -import { type AztecNode } from '@aztec/stdlib/interfaces/client'; +import type { AztecNode } from '@aztec/stdlib/interfaces/client'; import { PrivateContextInputs } from '@aztec/stdlib/kernel'; import type { UnencryptedL2Log } from '@aztec/stdlib/logs'; import { Note, type NoteStatus } from '@aztec/stdlib/note'; @@ -28,10 +28,10 @@ import { } from '@aztec/stdlib/tx'; import { type NoteData, toACVMWitness } from '../acvm/index.js'; -import { type HashedValuesCache } from '../common/hashed_values_cache.js'; -import { type SimulationProvider } from '../server.js'; -import { type DBOracle } from './db_oracle.js'; -import { type ExecutionNoteCache } from './execution_note_cache.js'; +import type { HashedValuesCache } from '../common/hashed_values_cache.js'; +import type { SimulationProvider } from '../server.js'; +import type { DBOracle } from './db_oracle.js'; +import type { ExecutionNoteCache } from './execution_note_cache.js'; import { pickNotes } from './pick_notes.js'; import { executePrivateFunction, verifyCurrentClassId } from './private_execution.js'; import { ViewDataOracle } from './view_data_oracle.js'; diff --git a/yarn-project/simulator/src/client/db_oracle.ts b/yarn-project/simulator/src/client/db_oracle.ts index bf960f85fa8f..6e2d933e4b9d 100644 --- a/yarn-project/simulator/src/client/db_oracle.ts +++ b/yarn-project/simulator/src/client/db_oracle.ts @@ -1,16 +1,16 @@ -import { type Fr } from '@aztec/foundation/fields'; -import { type FunctionArtifact, type FunctionSelector } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { Fr } from '@aztec/foundation/fields'; +import type { FunctionArtifact, FunctionSelector } from '@aztec/stdlib/abi'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { L2Block } from '@aztec/stdlib/block'; -import { type CompleteAddress, type ContractInstance } from '@aztec/stdlib/contract'; +import type { CompleteAddress, ContractInstance } from '@aztec/stdlib/contract'; import type { KeyValidationRequest } from '@aztec/stdlib/kernel'; import { IndexedTaggingSecret, LogWithTxData, TxScopedL2Log } from '@aztec/stdlib/logs'; import type { NoteStatus } from '@aztec/stdlib/note'; import { type MerkleTreeId, type NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees'; import type { BlockHeader } from '@aztec/stdlib/tx'; -import { type NoteData } from '../acvm/index.js'; -import { type CommitmentsDB } from '../public/db_interfaces.js'; +import type { NoteData } from '../acvm/index.js'; +import type { CommitmentsDB } from '../public/db_interfaces.js'; /** * Error thrown when a contract is not found in the database. diff --git a/yarn-project/simulator/src/client/execution_note_cache.ts b/yarn-project/simulator/src/client/execution_note_cache.ts index e1378ff84687..ad45e8e54cfb 100644 --- a/yarn-project/simulator/src/client/execution_note_cache.ts +++ b/yarn-project/simulator/src/client/execution_note_cache.ts @@ -1,8 +1,8 @@ import { Fr } from '@aztec/foundation/fields'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { computeNoteHashNonce, computeUniqueNoteHash, siloNoteHash, siloNullifier } from '@aztec/stdlib/hash'; -import { type NoteData } from '../acvm/index.js'; +import type { NoteData } from '../acvm/index.js'; interface PendingNote { note: NoteData; diff --git a/yarn-project/simulator/src/client/private_execution.test.ts b/yarn-project/simulator/src/client/private_execution.test.ts index f0f4a60ffb57..ec40be1fd6e8 100644 --- a/yarn-project/simulator/src/client/private_execution.test.ts +++ b/yarn-project/simulator/src/client/private_execution.test.ts @@ -11,7 +11,7 @@ import { poseidon2Hash, poseidon2HashWithSeparator, randomInt } from '@aztec/fou import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr, GrumpkinScalar } from '@aztec/foundation/fields'; import { type Logger, createLogger } from '@aztec/foundation/log'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { openTmpStore } from '@aztec/kv-store/lmdb'; import { type AppendOnlyTree, Poseidon, StandardTree, newTree } from '@aztec/merkle-tree'; import { ChildContractArtifact } from '@aztec/noir-contracts.js/Child'; @@ -46,7 +46,7 @@ import { deriveStorageSlotInMap, siloNoteHash, } from '@aztec/stdlib/hash'; -import { type AztecNode } from '@aztec/stdlib/interfaces/client'; +import type { AztecNode } from '@aztec/stdlib/interfaces/client'; import { KeyValidationRequest, getNonEmptyItems } from '@aztec/stdlib/kernel'; import { computeAppNullifierSecretKey, deriveKeys } from '@aztec/stdlib/keys'; import { IndexedTaggingSecret, TxScopedL2Log } from '@aztec/stdlib/logs'; @@ -73,7 +73,7 @@ import { toFunctionSelector } from 'viem'; import { MessageLoadOracleInputs } from '../common/message_load_oracle_inputs.js'; import { WASMSimulator } from '../providers/acvm_wasm.js'; import { buildL1ToL2Message } from '../test/utils.js'; -import { type DBOracle } from './db_oracle.js'; +import type { DBOracle } from './db_oracle.js'; import { AcirSimulator } from './simulator.js'; jest.setTimeout(60_000); diff --git a/yarn-project/simulator/src/client/private_execution.ts b/yarn-project/simulator/src/client/private_execution.ts index 84a98d86f765..c1d9d2e05289 100644 --- a/yarn-project/simulator/src/client/private_execution.ts +++ b/yarn-project/simulator/src/client/private_execution.ts @@ -4,19 +4,19 @@ import { createLogger } from '@aztec/foundation/log'; import { Timer } from '@aztec/foundation/timer'; import { ProtocolContractAddress } from '@aztec/protocol-contracts'; import { type FunctionArtifact, type FunctionSelector, countArgumentsSize } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractInstance } from '@aztec/stdlib/contract'; -import { type AztecNode } from '@aztec/stdlib/interfaces/client'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { ContractInstance } from '@aztec/stdlib/contract'; +import type { AztecNode } from '@aztec/stdlib/interfaces/client'; import { PrivateCircuitPublicInputs } from '@aztec/stdlib/kernel'; import { SharedMutableValues, SharedMutableValuesWithHash } from '@aztec/stdlib/shared-mutable'; -import { type CircuitWitnessGenerationStats } from '@aztec/stdlib/stats'; +import type { CircuitWitnessGenerationStats } from '@aztec/stdlib/stats'; import { PrivateCallExecutionResult } from '@aztec/stdlib/tx'; import { fromACVMField, witnessMapToFields } from '../acvm/deserialize.js'; import { type ACVMWitness, Oracle, extractCallStack } from '../acvm/index.js'; import { ExecutionError, resolveAssertionMessageFromError } from '../common/errors.js'; -import { type SimulationProvider } from '../server.js'; -import { type ClientExecutionContext } from './client_execution_context.js'; +import type { SimulationProvider } from '../server.js'; +import type { ClientExecutionContext } from './client_execution_context.js'; /** * Execute a private function and return the execution result. diff --git a/yarn-project/simulator/src/client/simulator.ts b/yarn-project/simulator/src/client/simulator.ts index 9159726c48d1..084148d15808 100644 --- a/yarn-project/simulator/src/client/simulator.ts +++ b/yarn-project/simulator/src/client/simulator.ts @@ -1,16 +1,16 @@ import { Fr } from '@aztec/foundation/fields'; import { type Logger, createLogger } from '@aztec/foundation/log'; -import { type FunctionCall } from '@aztec/stdlib/abi'; +import type { FunctionCall } from '@aztec/stdlib/abi'; import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type AztecNode } from '@aztec/stdlib/interfaces/client'; +import type { AztecNode } from '@aztec/stdlib/interfaces/client'; import { CallContext, PrivateExecutionResult, TxExecutionRequest } from '@aztec/stdlib/tx'; import { createSimulationError } from '../common/errors.js'; import { HashedValuesCache } from '../common/hashed_values_cache.js'; -import { type SimulationProvider } from '../common/simulation_provider.js'; +import type { SimulationProvider } from '../common/simulation_provider.js'; import { ClientExecutionContext } from './client_execution_context.js'; -import { type DBOracle } from './db_oracle.js'; +import type { DBOracle } from './db_oracle.js'; import { ExecutionNoteCache } from './execution_note_cache.js'; import { executePrivateFunction, verifyCurrentClassId } from './private_execution.js'; import { executeUnconstrainedFunction } from './unconstrained_execution.js'; diff --git a/yarn-project/simulator/src/client/unconstrained_execution.test.ts b/yarn-project/simulator/src/client/unconstrained_execution.test.ts index 45f31e0b9ec9..a13b05f46340 100644 --- a/yarn-project/simulator/src/client/unconstrained_execution.test.ts +++ b/yarn-project/simulator/src/client/unconstrained_execution.test.ts @@ -3,7 +3,7 @@ import { StatefulTestContractArtifact } from '@aztec/noir-contracts.js/StatefulT import { FunctionCall, FunctionSelector, FunctionType, encodeArguments } from '@aztec/stdlib/abi'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { CompleteAddress, type ContractInstance } from '@aztec/stdlib/contract'; -import { type AztecNode } from '@aztec/stdlib/interfaces/client'; +import type { AztecNode } from '@aztec/stdlib/interfaces/client'; import type { TxScopedL2Log } from '@aztec/stdlib/logs'; import { Note } from '@aztec/stdlib/note'; import { BlockHeader } from '@aztec/stdlib/tx'; @@ -11,7 +11,7 @@ import { BlockHeader } from '@aztec/stdlib/tx'; import { mock } from 'jest-mock-extended'; import { WASMSimulator } from '../providers/acvm_wasm.js'; -import { type DBOracle } from './db_oracle.js'; +import type { DBOracle } from './db_oracle.js'; import { AcirSimulator } from './simulator.js'; describe('Unconstrained Execution test suite', () => { diff --git a/yarn-project/simulator/src/client/unconstrained_execution.ts b/yarn-project/simulator/src/client/unconstrained_execution.ts index 2129dddda435..a2bf90d5eedd 100644 --- a/yarn-project/simulator/src/client/unconstrained_execution.ts +++ b/yarn-project/simulator/src/client/unconstrained_execution.ts @@ -1,13 +1,13 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; import { type AbiDecoded, type FunctionArtifact, type FunctionSelector, decodeFromAbi } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { witnessMapToFields } from '../acvm/deserialize.js'; import { Oracle, extractCallStack, toACVMWitness } from '../acvm/index.js'; import { ExecutionError, resolveAssertionMessageFromError } from '../common/errors.js'; -import { type SimulationProvider } from '../server.js'; -import { type ViewDataOracle } from './view_data_oracle.js'; +import type { SimulationProvider } from '../server.js'; +import type { ViewDataOracle } from './view_data_oracle.js'; // docs:start:execute_unconstrained_function /** diff --git a/yarn-project/simulator/src/client/view_data_oracle.ts b/yarn-project/simulator/src/client/view_data_oracle.ts index de04dc49dfc2..3e3926ef4a3d 100644 --- a/yarn-project/simulator/src/client/view_data_oracle.ts +++ b/yarn-project/simulator/src/client/view_data_oracle.ts @@ -1,19 +1,19 @@ import { Aes128 } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; import { applyStringFormatting, createLogger } from '@aztec/foundation/log'; -import { type AuthWitness } from '@aztec/stdlib/auth-witness'; +import type { AuthWitness } from '@aztec/stdlib/auth-witness'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { CompleteAddress, ContractInstance } from '@aztec/stdlib/contract'; import { siloNullifier } from '@aztec/stdlib/hash'; -import { type AztecNode } from '@aztec/stdlib/interfaces/client'; +import type { AztecNode } from '@aztec/stdlib/interfaces/client'; import type { KeyValidationRequest } from '@aztec/stdlib/kernel'; import { IndexedTaggingSecret, LogWithTxData } from '@aztec/stdlib/logs'; import type { NoteStatus } from '@aztec/stdlib/note'; import { type MerkleTreeId, type NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees'; -import { type BlockHeader, type Capsule } from '@aztec/stdlib/tx'; +import type { BlockHeader, Capsule } from '@aztec/stdlib/tx'; import { type NoteData, TypedOracle } from '../acvm/index.js'; -import { type DBOracle } from './db_oracle.js'; +import type { DBOracle } from './db_oracle.js'; import { pickNotes } from './pick_notes.js'; /** diff --git a/yarn-project/simulator/src/common/debug_fn_name.ts b/yarn-project/simulator/src/common/debug_fn_name.ts index 18eddfb688e1..bce7ac4e83c7 100644 --- a/yarn-project/simulator/src/common/debug_fn_name.ts +++ b/yarn-project/simulator/src/common/debug_fn_name.ts @@ -2,7 +2,7 @@ import type { Fr } from '@aztec/foundation/fields'; import { FunctionSelector } from '@aztec/stdlib/abi'; import type { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type WorldStateDB } from '../public/public_db_sources.js'; +import type { WorldStateDB } from '../public/public_db_sources.js'; export async function getPublicFunctionDebugName( db: WorldStateDB, diff --git a/yarn-project/simulator/src/common/errors.ts b/yarn-project/simulator/src/common/errors.ts index ca309b28d055..5e8a27a1fa93 100644 --- a/yarn-project/simulator/src/common/errors.ts +++ b/yarn-project/simulator/src/common/errors.ts @@ -1,4 +1,4 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { jsonStringify } from '@aztec/foundation/json-rpc'; import type { BrilligFunctionId, FunctionAbi, FunctionDebugMetadata, OpcodeLocation } from '@aztec/stdlib/abi'; import { @@ -8,7 +8,7 @@ import { type SourceCodeLocation, } from '@aztec/stdlib/errors'; -import { type RawAssertionPayload } from '@noir-lang/acvm_js'; +import type { RawAssertionPayload } from '@noir-lang/acvm_js'; import { abiDecodeError } from '@noir-lang/noirc_abi'; /** diff --git a/yarn-project/simulator/src/common/message_load_oracle_inputs.ts b/yarn-project/simulator/src/common/message_load_oracle_inputs.ts index a5b9bf35fe33..47b29ec4571e 100644 --- a/yarn-project/simulator/src/common/message_load_oracle_inputs.ts +++ b/yarn-project/simulator/src/common/message_load_oracle_inputs.ts @@ -1,5 +1,5 @@ import { Fr } from '@aztec/foundation/fields'; -import { type SiblingPath } from '@aztec/foundation/trees'; +import type { SiblingPath } from '@aztec/foundation/trees'; export class MessageLoadOracleInputs { constructor( diff --git a/yarn-project/simulator/src/common/simulation_provider.ts b/yarn-project/simulator/src/common/simulation_provider.ts index f4fd8b221d1e..0c73f21d3158 100644 --- a/yarn-project/simulator/src/common/simulation_provider.ts +++ b/yarn-project/simulator/src/common/simulation_provider.ts @@ -1,11 +1,11 @@ -import { type NoirCompiledCircuit } from '@aztec/stdlib/noir'; +import type { NoirCompiledCircuit } from '@aztec/stdlib/noir'; -import { type ExecutionError } from '@noir-lang/acvm_js'; +import type { ExecutionError } from '@noir-lang/acvm_js'; import { abiDecodeError } from '@noir-lang/noirc_abi'; -import { type Abi, type WitnessMap } from '@noir-lang/types'; +import type { Abi, WitnessMap } from '@noir-lang/types'; -import { type ACIRCallback, type ACIRExecutionResult } from '../acvm/acvm.js'; -import { type ACVMWitness } from '../acvm/acvm_types.js'; +import type { ACIRCallback, ACIRExecutionResult } from '../acvm/acvm.js'; +import type { ACVMWitness } from '../acvm/acvm_types.js'; /** * Low level simulation interface diff --git a/yarn-project/simulator/src/providers/acvm_native.ts b/yarn-project/simulator/src/providers/acvm_native.ts index 1d6c9c0162af..1a565f26e925 100644 --- a/yarn-project/simulator/src/providers/acvm_native.ts +++ b/yarn-project/simulator/src/providers/acvm_native.ts @@ -1,15 +1,15 @@ import { runInDirectory } from '@aztec/foundation/fs'; import { createLogger } from '@aztec/foundation/log'; import { Timer } from '@aztec/foundation/timer'; -import { type NoirCompiledCircuit } from '@aztec/stdlib/noir'; +import type { NoirCompiledCircuit } from '@aztec/stdlib/noir'; -import { type WitnessMap } from '@noir-lang/types'; +import type { WitnessMap } from '@noir-lang/types'; import * as proc from 'child_process'; import { promises as fs } from 'fs'; -import { type ACIRCallback, type ACIRExecutionResult } from '../acvm/acvm.js'; -import { type ACVMWitness } from '../acvm/acvm_types.js'; -import { type SimulationProvider } from '../common/simulation_provider.js'; +import type { ACIRCallback, ACIRExecutionResult } from '../acvm/acvm.js'; +import type { ACVMWitness } from '../acvm/acvm_types.js'; +import type { SimulationProvider } from '../common/simulation_provider.js'; const logger = createLogger('simulator:acvm-native'); diff --git a/yarn-project/simulator/src/providers/acvm_wasm.ts b/yarn-project/simulator/src/providers/acvm_wasm.ts index 6a3b4649807b..b5dce812dfc3 100644 --- a/yarn-project/simulator/src/providers/acvm_wasm.ts +++ b/yarn-project/simulator/src/providers/acvm_wasm.ts @@ -1,13 +1,13 @@ import { createLogger } from '@aztec/foundation/log'; import { foreignCallHandler } from '@aztec/noir-protocol-circuits-types/client'; -import { type NoirCompiledCircuit } from '@aztec/stdlib/noir'; +import type { NoirCompiledCircuit } from '@aztec/stdlib/noir'; import initACVM, { type ExecutionError, executeCircuit } from '@noir-lang/acvm_js'; import initAbi from '@noir-lang/noirc_abi'; -import { type WitnessMap } from '@noir-lang/types'; +import type { WitnessMap } from '@noir-lang/types'; import { type ACIRCallback, acvm } from '../acvm/acvm.js'; -import { type ACVMWitness } from '../acvm/acvm_types.js'; +import type { ACVMWitness } from '../acvm/acvm_types.js'; import { type SimulationProvider, parseErrorPayload } from '../common/simulation_provider.js'; export class WASMSimulator implements SimulationProvider { diff --git a/yarn-project/simulator/src/providers/acvm_wasm_with_blobs.ts b/yarn-project/simulator/src/providers/acvm_wasm_with_blobs.ts index 276ba7a49486..7618188eee2e 100644 --- a/yarn-project/simulator/src/providers/acvm_wasm_with_blobs.ts +++ b/yarn-project/simulator/src/providers/acvm_wasm_with_blobs.ts @@ -1,11 +1,11 @@ import { foreignCallHandler } from '@aztec/noir-protocol-circuits-types/server'; -import { type NoirCompiledCircuit } from '@aztec/stdlib/noir'; +import type { NoirCompiledCircuit } from '@aztec/stdlib/noir'; import { type ExecutionError, executeCircuit } from '@noir-lang/acvm_js'; -import { type WitnessMap } from '@noir-lang/types'; +import type { WitnessMap } from '@noir-lang/types'; -import { type ACIRCallback, type ACIRExecutionResult } from '../acvm/acvm.js'; -import { type ACVMWitness } from '../acvm/acvm_types.js'; +import type { ACIRCallback, ACIRExecutionResult } from '../acvm/acvm.js'; +import type { ACVMWitness } from '../acvm/acvm_types.js'; import { type SimulationProvider, parseErrorPayload } from '../common/simulation_provider.js'; /** diff --git a/yarn-project/simulator/src/providers/factory.ts b/yarn-project/simulator/src/providers/factory.ts index cf8f919cb00a..048391b10ce8 100644 --- a/yarn-project/simulator/src/providers/factory.ts +++ b/yarn-project/simulator/src/providers/factory.ts @@ -2,7 +2,7 @@ import { type Logger, createLogger } from '@aztec/foundation/log'; import { promises as fs } from 'fs'; -import { type SimulationProvider } from '../common/simulation_provider.js'; +import type { SimulationProvider } from '../common/simulation_provider.js'; import { NativeACVMSimulator } from './acvm_native.js'; import { WASMSimulator } from './acvm_wasm.js'; diff --git a/yarn-project/simulator/src/public/apps_tests/token.test.ts b/yarn-project/simulator/src/public/apps_tests/token.test.ts index 0d1faf5d2000..909da0ec6e09 100644 --- a/yarn-project/simulator/src/public/apps_tests/token.test.ts +++ b/yarn-project/simulator/src/public/apps_tests/token.test.ts @@ -5,7 +5,7 @@ import { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract'; import { PublicTxSimulationTester } from '../fixtures/public_tx_simulation_tester.js'; -import { type PublicTxResult } from '../public_tx_simulator.js'; +import type { PublicTxResult } from '../public_tx_simulator.js'; describe('Public TX simulator apps tests: TokenContract', () => { const logger = createLogger('public-tx-apps-tests-token'); diff --git a/yarn-project/simulator/src/public/db_interfaces.ts b/yarn-project/simulator/src/public/db_interfaces.ts index be94e5f580ec..01a54f58c67d 100644 --- a/yarn-project/simulator/src/public/db_interfaces.ts +++ b/yarn-project/simulator/src/public/db_interfaces.ts @@ -1,11 +1,11 @@ -import { type L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants'; -import { type Fr } from '@aztec/foundation/fields'; +import type { L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants'; +import type { Fr } from '@aztec/foundation/fields'; import type { FunctionSelector } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; -import { type NullifierMembershipWitness } from '@aztec/stdlib/trees'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { NullifierMembershipWitness } from '@aztec/stdlib/trees'; -import { type MessageLoadOracleInputs } from '../common/message_load_oracle_inputs.js'; +import type { MessageLoadOracleInputs } from '../common/message_load_oracle_inputs.js'; /** * Database interface for providing access to public state. diff --git a/yarn-project/simulator/src/public/execution.ts b/yarn-project/simulator/src/public/execution.ts index 4fcc95409f92..f40674a506e4 100644 --- a/yarn-project/simulator/src/public/execution.ts +++ b/yarn-project/simulator/src/public/execution.ts @@ -14,7 +14,7 @@ import { computeVarArgsHash } from '@aztec/stdlib/hash'; import type { NoteHash, Nullifier, ReadRequest, TreeLeafReadRequest } from '@aztec/stdlib/kernel'; import type { PublicLog } from '@aztec/stdlib/logs'; import type { L2ToL1Message, ScopedL2ToL1Message } from '@aztec/stdlib/messaging'; -import { type PublicExecutionRequest } from '@aztec/stdlib/tx'; +import type { PublicExecutionRequest } from '@aztec/stdlib/tx'; export interface PublicSideEffects { /** The contract storage update requests performed. */ diff --git a/yarn-project/simulator/src/public/fixtures/public_tx_simulation_tester.ts b/yarn-project/simulator/src/public/fixtures/public_tx_simulation_tester.ts index 490a9ee0faf9..e9a501f779f9 100644 --- a/yarn-project/simulator/src/public/fixtures/public_tx_simulation_tester.ts +++ b/yarn-project/simulator/src/public/fixtures/public_tx_simulation_tester.ts @@ -2,9 +2,9 @@ import { PUBLIC_DISPATCH_SELECTOR } from '@aztec/constants'; import { Fr } from '@aztec/foundation/fields'; import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest'; import { type ContractArtifact, FunctionSelector, encodeArguments } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { GasFees } from '@aztec/stdlib/gas'; -import { type MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; import { PublicExecutionRequest, type Tx } from '@aztec/stdlib/tx'; import { CallContext, GlobalVariables } from '@aztec/stdlib/tx'; import { NativeWorldStateService } from '@aztec/world-state'; diff --git a/yarn-project/simulator/src/public/public_db_sources.ts b/yarn-project/simulator/src/public/public_db_sources.ts index 69905bcaaabd..7a21e94ae50f 100644 --- a/yarn-project/simulator/src/public/public_db_sources.ts +++ b/yarn-project/simulator/src/public/public_db_sources.ts @@ -13,17 +13,17 @@ import { computePublicBytecodeCommitment, } from '@aztec/stdlib/contract'; import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash'; -import { - type MerkleTreeCheckpointOperations, - type MerkleTreeReadOperations, - type MerkleTreeWriteOperations, +import type { + MerkleTreeCheckpointOperations, + MerkleTreeReadOperations, + MerkleTreeWriteOperations, } from '@aztec/stdlib/interfaces/server'; import { ContractClassTxL2Logs } from '@aztec/stdlib/logs'; -import { type PublicDBAccessStats } from '@aztec/stdlib/stats'; +import type { PublicDBAccessStats } from '@aztec/stdlib/stats'; import { MerkleTreeId, type PublicDataTreeLeafPreimage } from '@aztec/stdlib/trees'; -import { type Tx } from '@aztec/stdlib/tx'; +import type { Tx } from '@aztec/stdlib/tx'; -import { type PublicContractsDB, type PublicStateDB } from './db_interfaces.js'; +import type { PublicContractsDB, PublicStateDB } from './db_interfaces.js'; /** * Implements the PublicContractsDB using a ContractDataSource. diff --git a/yarn-project/simulator/src/public/public_processor.test.ts b/yarn-project/simulator/src/public/public_processor.test.ts index cedb54834bef..d443c533d97f 100644 --- a/yarn-project/simulator/src/public/public_processor.test.ts +++ b/yarn-project/simulator/src/public/public_processor.test.ts @@ -7,7 +7,7 @@ import { AvmCircuitInputs, PublicDataWrite, RevertCode } from '@aztec/stdlib/avm import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { SimulationError } from '@aztec/stdlib/errors'; import { Gas, GasFees } from '@aztec/stdlib/gas'; -import { type MerkleTreeWriteOperations, type TreeInfo } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeWriteOperations, TreeInfo } from '@aztec/stdlib/interfaces/server'; import { ProvingRequestType } from '@aztec/stdlib/proofs'; import { mockTx } from '@aztec/stdlib/testing'; import { GlobalVariables, type ProcessedTx, Tx, type TxValidator } from '@aztec/stdlib/tx'; @@ -15,9 +15,9 @@ import { getTelemetryClient } from '@aztec/telemetry-client'; import { type MockProxy, mock } from 'jest-mock-extended'; -import { type WorldStateDB } from './public_db_sources.js'; +import type { WorldStateDB } from './public_db_sources.js'; import { PublicProcessor } from './public_processor.js'; -import { type PublicTxResult, type PublicTxSimulator } from './public_tx_simulator.js'; +import type { PublicTxResult, PublicTxSimulator } from './public_tx_simulator.js'; describe('public_processor', () => { let db: MockProxy; diff --git a/yarn-project/simulator/src/public/public_processor.ts b/yarn-project/simulator/src/public/public_processor.ts index 6c9a8856460d..af9f291cb7fc 100644 --- a/yarn-project/simulator/src/public/public_processor.ts +++ b/yarn-project/simulator/src/public/public_processor.ts @@ -10,7 +10,7 @@ import { PublicDataWrite } from '@aztec/stdlib/avm'; import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { ContractDataSource } from '@aztec/stdlib/contract'; import { Gas } from '@aztec/stdlib/gas'; -import { type MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; import { MerkleTreeId } from '@aztec/stdlib/trees'; import { type FailedTx, diff --git a/yarn-project/simulator/src/public/public_processor_metrics.ts b/yarn-project/simulator/src/public/public_processor_metrics.ts index 2e6c058eaba4..0b901d0e2ebb 100644 --- a/yarn-project/simulator/src/public/public_processor_metrics.ts +++ b/yarn-project/simulator/src/public/public_processor_metrics.ts @@ -1,6 +1,6 @@ -import { type ContractClassRegisteredEvent } from '@aztec/protocol-contracts/class-registerer'; -import { type Gas } from '@aztec/stdlib/gas'; -import { type TxExecutionPhase } from '@aztec/stdlib/tx'; +import type { ContractClassRegisteredEvent } from '@aztec/protocol-contracts/class-registerer'; +import type { Gas } from '@aztec/stdlib/gas'; +import type { TxExecutionPhase } from '@aztec/stdlib/tx'; import { Attributes, type Gauge, diff --git a/yarn-project/simulator/src/public/public_tx_context.ts b/yarn-project/simulator/src/public/public_tx_context.ts index f5c7f8a06eed..462796f64af7 100644 --- a/yarn-project/simulator/src/public/public_tx_context.ts +++ b/yarn-project/simulator/src/public/public_tx_context.ts @@ -21,7 +21,7 @@ import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { SimulationError } from '@aztec/stdlib/errors'; import { computeTransactionFee } from '@aztec/stdlib/fees'; import { Gas, GasSettings } from '@aztec/stdlib/gas'; -import { type MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server'; import { PrivateToAvmAccumulatedData, PrivateToAvmAccumulatedDataArrayLengths, @@ -46,7 +46,7 @@ import { strict as assert } from 'assert'; import { inspect } from 'util'; import { AvmPersistableStateManager } from '../avm/index.js'; -import { type WorldStateDB } from './public_db_sources.js'; +import type { WorldStateDB } from './public_db_sources.js'; import { SideEffectArrayLengths, SideEffectTrace } from './side_effect_trace.js'; import { getCallRequestsByPhase, getExecutionRequestsByPhase } from './utils.js'; diff --git a/yarn-project/simulator/src/public/public_tx_simulator.test.ts b/yarn-project/simulator/src/public/public_tx_simulator.test.ts index 331723aaf26c..5461dcde0af6 100644 --- a/yarn-project/simulator/src/public/public_tx_simulator.test.ts +++ b/yarn-project/simulator/src/public/public_tx_simulator.test.ts @@ -1,6 +1,6 @@ import { NULLIFIER_SUBTREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, REGISTERER_CONTRACT_ADDRESS } from '@aztec/constants'; import { Fr } from '@aztec/foundation/fields'; -import { type AztecKVStore } from '@aztec/kv-store'; +import type { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/lmdb'; import { type AppendOnlyTree, Poseidon, StandardTree, newTree } from '@aztec/merkle-tree'; import { ProtocolContractAddress, REGISTERER_CONTRACT_CLASS_REGISTERED_TAG } from '@aztec/protocol-contracts'; @@ -12,7 +12,7 @@ import type { ContractDataSource } from '@aztec/stdlib/contract'; import { SimulationError } from '@aztec/stdlib/errors'; import { Gas, GasFees, GasSettings } from '@aztec/stdlib/gas'; import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash'; -import { type MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; import { ScopedLogHash, countAccumulatedItems } from '@aztec/stdlib/kernel'; import { UnencryptedFunctionL2Logs, UnencryptedL2Log } from '@aztec/stdlib/logs'; import { fr, makeContractClassPublic, mockTx } from '@aztec/stdlib/testing'; @@ -31,8 +31,8 @@ import { jest } from '@jest/globals'; import { mock } from 'jest-mock-extended'; import { AvmFinalizedCallResult } from '../avm/avm_contract_call_result.js'; -import { type AvmPersistableStateManager } from '../avm/journal/journal.js'; -import { type InstructionSet } from '../avm/serialization/bytecode_serialization.js'; +import type { AvmPersistableStateManager } from '../avm/journal/journal.js'; +import type { InstructionSet } from '../avm/serialization/bytecode_serialization.js'; import { WorldStateDB } from './public_db_sources.js'; import { type PublicTxResult, PublicTxSimulator } from './public_tx_simulator.js'; diff --git a/yarn-project/simulator/src/public/public_tx_simulator.ts b/yarn-project/simulator/src/public/public_tx_simulator.ts index da969638062e..6eafb6f2e0e9 100644 --- a/yarn-project/simulator/src/public/public_tx_simulator.ts +++ b/yarn-project/simulator/src/public/public_tx_simulator.ts @@ -6,9 +6,9 @@ import { computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee import type { AvmProvingRequest, RevertCode } from '@aztec/stdlib/avm'; import type { SimulationError } from '@aztec/stdlib/errors'; import type { Gas, GasUsed } from '@aztec/stdlib/gas'; -import { type MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server'; import type { PublicCallRequest } from '@aztec/stdlib/kernel'; -import { type AvmSimulationStats } from '@aztec/stdlib/stats'; +import type { AvmSimulationStats } from '@aztec/stdlib/stats'; import { type GlobalVariables, NestedProcessReturnValues, @@ -20,12 +20,12 @@ import { Attributes, type TelemetryClient, type Tracer, getTelemetryClient, trac import { strict as assert } from 'assert'; -import { type AvmFinalizedCallResult } from '../avm/avm_contract_call_result.js'; +import type { AvmFinalizedCallResult } from '../avm/avm_contract_call_result.js'; import { type AvmPersistableStateManager, AvmSimulator } from '../avm/index.js'; import { NullifierCollisionError } from '../avm/journal/nullifiers.js'; import { getPublicFunctionDebugName } from '../common/debug_fn_name.js'; import { ExecutorMetrics } from './executor_metrics.js'; -import { type WorldStateDB } from './public_db_sources.js'; +import type { WorldStateDB } from './public_db_sources.js'; import { PublicTxContext } from './public_tx_context.js'; export type ProcessedPhase = { diff --git a/yarn-project/simulator/src/public/side_effect_trace.ts b/yarn-project/simulator/src/public/side_effect_trace.ts index c98bb2286ac4..b4421caa9623 100644 --- a/yarn-project/simulator/src/public/side_effect_trace.ts +++ b/yarn-project/simulator/src/public/side_effect_trace.ts @@ -53,7 +53,7 @@ import type { GlobalVariables, TreeSnapshots } from '@aztec/stdlib/tx'; import { strict as assert } from 'assert'; import { SideEffectLimitReachedError } from './side_effect_errors.js'; -import { type PublicSideEffectTraceInterface } from './side_effect_trace_interface.js'; +import type { PublicSideEffectTraceInterface } from './side_effect_trace_interface.js'; import { UniqueClassIds } from './unique_class_ids.js'; const emptyPublicDataPath = () => new Array(PUBLIC_DATA_TREE_HEIGHT).fill(Fr.zero()); diff --git a/yarn-project/simulator/src/public/side_effect_trace_interface.ts b/yarn-project/simulator/src/public/side_effect_trace_interface.ts index e6c025b50994..22cde19c4241 100644 --- a/yarn-project/simulator/src/public/side_effect_trace_interface.ts +++ b/yarn-project/simulator/src/public/side_effect_trace_interface.ts @@ -1,10 +1,10 @@ -import { type Fr } from '@aztec/foundation/fields'; -import { type AvmNullifierReadTreeHint, type AvmPublicDataReadTreeHint } from '@aztec/stdlib/avm'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractClassIdPreimage, type SerializableContractInstance } from '@aztec/stdlib/contract'; +import type { Fr } from '@aztec/foundation/fields'; +import type { AvmNullifierReadTreeHint, AvmPublicDataReadTreeHint } from '@aztec/stdlib/avm'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { ContractClassIdPreimage, SerializableContractInstance } from '@aztec/stdlib/contract'; import type { PublicCallRequest } from '@aztec/stdlib/kernel'; import type { PublicLog } from '@aztec/stdlib/logs'; -import { type NullifierLeafPreimage, type PublicDataTreeLeafPreimage } from '@aztec/stdlib/trees'; +import type { NullifierLeafPreimage, PublicDataTreeLeafPreimage } from '@aztec/stdlib/trees'; export interface PublicSideEffectTraceInterface { fork(): PublicSideEffectTraceInterface; diff --git a/yarn-project/simulator/src/public/utils.ts b/yarn-project/simulator/src/public/utils.ts index f9c1e6ab4cae..8d581aec11e3 100644 --- a/yarn-project/simulator/src/public/utils.ts +++ b/yarn-project/simulator/src/public/utils.ts @@ -1,4 +1,4 @@ -import { type PublicCallRequest } from '@aztec/stdlib/kernel'; +import type { PublicCallRequest } from '@aztec/stdlib/kernel'; import { type PublicExecutionRequest, type Tx, TxExecutionPhase } from '@aztec/stdlib/tx'; export function getExecutionRequestsByPhase(tx: Tx, phase: TxExecutionPhase): PublicExecutionRequest[] { diff --git a/yarn-project/simulator/src/stats/stats.ts b/yarn-project/simulator/src/stats/stats.ts index 152583945bb9..2eac8d6f66ab 100644 --- a/yarn-project/simulator/src/stats/stats.ts +++ b/yarn-project/simulator/src/stats/stats.ts @@ -1,5 +1,5 @@ -import { type Logger } from '@aztec/foundation/log'; -import { type CircuitName, type CircuitSimulationStats } from '@aztec/stdlib/stats'; +import type { Logger } from '@aztec/foundation/log'; +import type { CircuitName, CircuitSimulationStats } from '@aztec/stdlib/stats'; export function emitCircuitSimulationStats( circuitName: CircuitName, diff --git a/yarn-project/simulator/src/test/utils.ts b/yarn-project/simulator/src/test/utils.ts index 763ddca48b6b..0b872fb2f531 100644 --- a/yarn-project/simulator/src/test/utils.ts +++ b/yarn-project/simulator/src/test/utils.ts @@ -1,7 +1,7 @@ import { sha256ToField } from '@aztec/foundation/crypto'; import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { computeSecretHash } from '@aztec/stdlib/hash'; import { L1Actor, L1ToL2Message, L2Actor } from '@aztec/stdlib/messaging'; diff --git a/yarn-project/stdlib/src/abi/abi.ts b/yarn-project/stdlib/src/abi/abi.ts index cbf1d9e95910..4e3199f9be03 100644 --- a/yarn-project/stdlib/src/abi/abi.ts +++ b/yarn-project/stdlib/src/abi/abi.ts @@ -1,5 +1,5 @@ /* eslint-disable camelcase */ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; import { type ZodFor, schemas } from '@aztec/foundation/schemas'; diff --git a/yarn-project/stdlib/src/abi/decoder.test.ts b/yarn-project/stdlib/src/abi/decoder.test.ts index 2a59fb890a17..ea19a4276cc1 100644 --- a/yarn-project/stdlib/src/abi/decoder.test.ts +++ b/yarn-project/stdlib/src/abi/decoder.test.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; -import { type ABIParameterVisibility, type FunctionArtifact } from './abi.js'; +import type { ABIParameterVisibility, FunctionArtifact } from './abi.js'; import { decodeFromAbi, decodeFunctionSignature, decodeFunctionSignatureWithParameterNames } from './decoder.js'; describe('abi/decoder', () => { diff --git a/yarn-project/stdlib/src/abi/decoder.ts b/yarn-project/stdlib/src/abi/decoder.ts index 2fd0e4b2245f..f50bcd8afe30 100644 --- a/yarn-project/stdlib/src/abi/decoder.ts +++ b/yarn-project/stdlib/src/abi/decoder.ts @@ -1,7 +1,7 @@ import { Fr } from '@aztec/foundation/fields'; import { AztecAddress } from '../aztec-address/index.js'; -import { type ABIParameter, type ABIVariable, type AbiType } from './abi.js'; +import type { ABIParameter, ABIVariable, AbiType } from './abi.js'; import { U128 } from './u128.js'; import { isAztecAddressStruct, isU128Struct, parseSignedInt } from './utils.js'; diff --git a/yarn-project/stdlib/src/abi/encoder.ts b/yarn-project/stdlib/src/abi/encoder.ts index 831b951df80a..885f0222a53e 100644 --- a/yarn-project/stdlib/src/abi/encoder.ts +++ b/yarn-project/stdlib/src/abi/encoder.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; -import { type AbiType, type FunctionAbi } from './abi.js'; +import type { AbiType, FunctionAbi } from './abi.js'; import { U128 } from './u128.js'; import { isAddressStruct, isFunctionSelectorStruct, isU128Struct, isWrappedFieldStruct } from './utils.js'; diff --git a/yarn-project/stdlib/src/abi/event_selector.ts b/yarn-project/stdlib/src/abi/event_selector.ts index 41239e05f8cf..2a71be0d97dd 100644 --- a/yarn-project/stdlib/src/abi/event_selector.ts +++ b/yarn-project/stdlib/src/abi/event_selector.ts @@ -1,6 +1,6 @@ import { fromHex, toBigIntBE } from '@aztec/foundation/bigint-buffer'; import { poseidon2HashBytes, randomBytes } from '@aztec/foundation/crypto'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { hexSchemaFor } from '@aztec/foundation/schemas'; import { BufferReader } from '@aztec/foundation/serialize'; diff --git a/yarn-project/stdlib/src/abi/function_call.ts b/yarn-project/stdlib/src/abi/function_call.ts index 149035d8968a..1c600403a1fe 100644 --- a/yarn-project/stdlib/src/abi/function_call.ts +++ b/yarn-project/stdlib/src/abi/function_call.ts @@ -1,5 +1,5 @@ import type { Fr } from '@aztec/foundation/fields'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { AztecAddress } from '../aztec-address/index.js'; import { type AbiType, FunctionType } from './abi.js'; diff --git a/yarn-project/stdlib/src/abi/function_selector.ts b/yarn-project/stdlib/src/abi/function_selector.ts index 0a67dcf52abf..bdb6704b3910 100644 --- a/yarn-project/stdlib/src/abi/function_selector.ts +++ b/yarn-project/stdlib/src/abi/function_selector.ts @@ -1,10 +1,10 @@ import { fromHex, toBigIntBE } from '@aztec/foundation/bigint-buffer'; import { poseidon2HashBytes, randomBytes } from '@aztec/foundation/crypto'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { type ZodFor, hexSchemaFor } from '@aztec/foundation/schemas'; import { BufferReader, FieldReader, TypeRegistry } from '@aztec/foundation/serialize'; -import { type ABIParameter } from './abi.js'; +import type { ABIParameter } from './abi.js'; import { decodeFunctionSignature } from './decoder.js'; import { Selector } from './selector.js'; diff --git a/yarn-project/stdlib/src/abi/utils.ts b/yarn-project/stdlib/src/abi/utils.ts index c40eaeee515b..efb8576c9d29 100644 --- a/yarn-project/stdlib/src/abi/utils.ts +++ b/yarn-project/stdlib/src/abi/utils.ts @@ -1,4 +1,4 @@ -import { type AbiType } from './abi.js'; +import type { AbiType } from './abi.js'; /** * Returns whether the ABI type is an Aztec or Ethereum Address defined in Aztec.nr. diff --git a/yarn-project/stdlib/src/avm/avm.ts b/yarn-project/stdlib/src/avm/avm.ts index 730f5f7afdaf..851f41bd5935 100644 --- a/yarn-project/stdlib/src/avm/avm.ts +++ b/yarn-project/stdlib/src/avm/avm.ts @@ -2,13 +2,13 @@ import { Fq, Fr, Point } from '@aztec/foundation/fields'; import { bufferSchemaFor } from '@aztec/foundation/schemas'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { strict as assert } from 'assert'; import { Encoder, addExtension } from 'msgpackr'; import { AztecAddress } from '../aztec-address/index.js'; -import { type ContractClassIdPreimage } from '../contract/contract_class_id.js'; +import type { ContractClassIdPreimage } from '../contract/contract_class_id.js'; import { PublicKeys } from '../keys/public_keys.js'; import { NullifierLeafPreimage } from '../trees/nullifier_leaf.js'; import { PublicDataTreeLeafPreimage } from '../trees/public_data_leaf.js'; diff --git a/yarn-project/stdlib/src/avm/contract_storage_read.ts b/yarn-project/stdlib/src/avm/contract_storage_read.ts index 329c209b0408..9d70e731fb68 100644 --- a/yarn-project/stdlib/src/avm/contract_storage_read.ts +++ b/yarn-project/stdlib/src/avm/contract_storage_read.ts @@ -2,7 +2,7 @@ import { CONTRACT_STORAGE_READ_LENGTH } from '@aztec/constants'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type AztecAddress } from '../aztec-address/index.js'; +import type { AztecAddress } from '../aztec-address/index.js'; /** * Contract storage read operation on a specific contract. diff --git a/yarn-project/stdlib/src/avm/contract_storage_update_request.ts b/yarn-project/stdlib/src/avm/contract_storage_update_request.ts index 8c4b6d1f6f37..4071dd8644df 100644 --- a/yarn-project/stdlib/src/avm/contract_storage_update_request.ts +++ b/yarn-project/stdlib/src/avm/contract_storage_update_request.ts @@ -1,9 +1,9 @@ import { CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH } from '@aztec/constants'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; -import { type AztecAddress } from '../aztec-address/index.js'; +import type { AztecAddress } from '../aztec-address/index.js'; /** * Contract storage update request for a slot on a specific contract. diff --git a/yarn-project/stdlib/src/avm/public_call_stack_item_compressed.ts b/yarn-project/stdlib/src/avm/public_call_stack_item_compressed.ts index a13fb7cbe204..582f5b22ea2a 100644 --- a/yarn-project/stdlib/src/avm/public_call_stack_item_compressed.ts +++ b/yarn-project/stdlib/src/avm/public_call_stack_item_compressed.ts @@ -1,7 +1,7 @@ import { PUBLIC_CALL_STACK_ITEM_COMPRESSED_LENGTH } from '@aztec/constants'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { AztecAddress } from '../aztec-address/index.js'; import { Gas } from '../gas/gas.js'; diff --git a/yarn-project/stdlib/src/avm/public_data_update_request.ts b/yarn-project/stdlib/src/avm/public_data_update_request.ts index 301d6f5e2158..a9bc8b7fa907 100644 --- a/yarn-project/stdlib/src/avm/public_data_update_request.ts +++ b/yarn-project/stdlib/src/avm/public_data_update_request.ts @@ -3,9 +3,9 @@ import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/ import { inspect } from 'util'; -import { type AztecAddress } from '../aztec-address/index.js'; +import type { AztecAddress } from '../aztec-address/index.js'; import { computePublicDataTreeLeafSlot } from '../hash/hash.js'; -import { type ContractStorageUpdateRequest } from './contract_storage_update_request.js'; +import type { ContractStorageUpdateRequest } from './contract_storage_update_request.js'; // TO BE REMOVED. /** diff --git a/yarn-project/stdlib/src/avm/public_data_write.ts b/yarn-project/stdlib/src/avm/public_data_write.ts index e052fd44b06b..3f33702e2d98 100644 --- a/yarn-project/stdlib/src/avm/public_data_write.ts +++ b/yarn-project/stdlib/src/avm/public_data_write.ts @@ -2,7 +2,7 @@ import { Fr } from '@aztec/foundation/fields'; import { schemas } from '@aztec/foundation/schemas'; import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/avm/public_inner_call_request.ts b/yarn-project/stdlib/src/avm/public_inner_call_request.ts index 984b3b47c446..a9ca8873d8f6 100644 --- a/yarn-project/stdlib/src/avm/public_inner_call_request.ts +++ b/yarn-project/stdlib/src/avm/public_inner_call_request.ts @@ -1,6 +1,6 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { inspect } from 'util'; diff --git a/yarn-project/stdlib/src/block/body.ts b/yarn-project/stdlib/src/block/body.ts index aa18460c0295..936012e5f8cb 100644 --- a/yarn-project/stdlib/src/block/body.ts +++ b/yarn-project/stdlib/src/block/body.ts @@ -1,8 +1,8 @@ import { timesParallel } from '@aztec/foundation/collection'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { ContractClass2BlockL2Logs } from '@aztec/stdlib/logs'; -import { type ZodFor } from '@aztec/stdlib/schemas'; +import type { ZodFor } from '@aztec/stdlib/schemas'; import { inspect } from 'util'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/block/in_block.ts b/yarn-project/stdlib/src/block/in_block.ts index 7c571b5e42d1..3ef782a0d8cb 100644 --- a/yarn-project/stdlib/src/block/in_block.ts +++ b/yarn-project/stdlib/src/block/in_block.ts @@ -3,7 +3,7 @@ import { schemas } from '@aztec/stdlib/schemas'; import { type ZodTypeAny, z } from 'zod'; -import { type L2Block } from './l2_block.js'; +import type { L2Block } from './l2_block.js'; export type InBlock = { l2BlockNumber: number; diff --git a/yarn-project/stdlib/src/block/l2_block_downloader/l2_block_downloader.ts b/yarn-project/stdlib/src/block/l2_block_downloader/l2_block_downloader.ts index 89f6cf5b23ad..82cefbecb575 100644 --- a/yarn-project/stdlib/src/block/l2_block_downloader/l2_block_downloader.ts +++ b/yarn-project/stdlib/src/block/l2_block_downloader/l2_block_downloader.ts @@ -3,8 +3,8 @@ import { createLogger } from '@aztec/foundation/log'; import { FifoMemoryQueue, Semaphore, SerialQueue } from '@aztec/foundation/queue'; import { InterruptibleSleep } from '@aztec/foundation/sleep'; -import { type L2Block } from '../l2_block.js'; -import { type L2BlockSource } from '../l2_block_source.js'; +import type { L2Block } from '../l2_block.js'; +import type { L2BlockSource } from '../l2_block_source.js'; const log = createLogger('types:l2_block_downloader'); diff --git a/yarn-project/stdlib/src/block/l2_block_downloader/l2_block_stream.test.ts b/yarn-project/stdlib/src/block/l2_block_downloader/l2_block_stream.test.ts index 3e81de796c5a..c563520b8c27 100644 --- a/yarn-project/stdlib/src/block/l2_block_downloader/l2_block_stream.test.ts +++ b/yarn-project/stdlib/src/block/l2_block_downloader/l2_block_stream.test.ts @@ -5,8 +5,8 @@ import type { BlockHeader } from '@aztec/stdlib/tx'; import { type MockProxy, mock } from 'jest-mock-extended'; import times from 'lodash.times'; -import { type L2Block } from '../l2_block.js'; -import { type L2BlockSource, type L2Tips } from '../l2_block_source.js'; +import type { L2Block } from '../l2_block.js'; +import type { L2BlockSource, L2Tips } from '../l2_block_source.js'; import { L2BlockStream, type L2BlockStreamEvent, diff --git a/yarn-project/stdlib/src/block/l2_block_downloader/l2_block_stream.ts b/yarn-project/stdlib/src/block/l2_block_downloader/l2_block_stream.ts index 2dc9ac7f4ee2..9b3b9c0c2711 100644 --- a/yarn-project/stdlib/src/block/l2_block_downloader/l2_block_stream.ts +++ b/yarn-project/stdlib/src/block/l2_block_downloader/l2_block_stream.ts @@ -2,8 +2,8 @@ import { AbortError } from '@aztec/foundation/error'; import { createLogger } from '@aztec/foundation/log'; import { RunningPromise } from '@aztec/foundation/running-promise'; -import { type L2Block } from '../l2_block.js'; -import { type L2BlockId, type L2BlockSource, type L2Tips } from '../l2_block_source.js'; +import type { L2Block } from '../l2_block.js'; +import type { L2BlockId, L2BlockSource, L2Tips } from '../l2_block_source.js'; /** Creates a stream of events for new blocks, chain tips updates, and reorgs, out of polling an archiver or a node. */ export class L2BlockStream { diff --git a/yarn-project/stdlib/src/block/l2_block_source.ts b/yarn-project/stdlib/src/block/l2_block_source.ts index f711ce313c24..e573c6d3811b 100644 --- a/yarn-project/stdlib/src/block/l2_block_source.ts +++ b/yarn-project/stdlib/src/block/l2_block_source.ts @@ -3,11 +3,11 @@ import type { BlockHeader, TxReceipt } from '@aztec/stdlib/tx'; import { z } from 'zod'; -import { type L1RollupConstants } from '../epoch-helpers/index.js'; -import { type TxEffect } from '../tx/tx_effect.js'; -import { type TxHash } from '../tx/tx_hash.js'; -import { type InBlock } from './in_block.js'; -import { type L2Block } from './l2_block.js'; +import type { L1RollupConstants } from '../epoch-helpers/index.js'; +import type { TxEffect } from '../tx/tx_effect.js'; +import type { TxHash } from '../tx/tx_hash.js'; +import type { InBlock } from './in_block.js'; +import type { L2Block } from './l2_block.js'; /** * Interface of classes allowing for the retrieval of L2 blocks. diff --git a/yarn-project/stdlib/src/block/nullifier_with_block_source.ts b/yarn-project/stdlib/src/block/nullifier_with_block_source.ts index eb528988dcae..d00f13e6c4fa 100644 --- a/yarn-project/stdlib/src/block/nullifier_with_block_source.ts +++ b/yarn-project/stdlib/src/block/nullifier_with_block_source.ts @@ -1,6 +1,6 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; -import { type InBlock } from './in_block.js'; +import type { InBlock } from './in_block.js'; export interface NullifierWithBlockSource { findNullifiersIndexesWithBlock(blockNumber: number, nullifiers: Fr[]): Promise<(InBlock | undefined)[]>; diff --git a/yarn-project/stdlib/src/contract/artifact_hash.test.ts b/yarn-project/stdlib/src/contract/artifact_hash.test.ts index efb98b970b18..d90ed2cc527f 100644 --- a/yarn-project/stdlib/src/contract/artifact_hash.test.ts +++ b/yarn-project/stdlib/src/contract/artifact_hash.test.ts @@ -1,4 +1,4 @@ -import { type ContractArtifact } from '../abi/index.js'; +import type { ContractArtifact } from '../abi/index.js'; import { getTestContractArtifact } from '../tests/fixtures.js'; import { computeArtifactHash } from './artifact_hash.js'; diff --git a/yarn-project/stdlib/src/contract/complete_address.ts b/yarn-project/stdlib/src/contract/complete_address.ts index 2ad78b47b232..5b3f84365a7b 100644 --- a/yarn-project/stdlib/src/contract/complete_address.ts +++ b/yarn-project/stdlib/src/contract/complete_address.ts @@ -7,7 +7,7 @@ import { AztecAddress } from '../aztec-address/index.js'; import { computeAddress, computePreaddress, deriveKeys } from '../keys/index.js'; import { PublicKeys } from '../keys/public_keys.js'; import { computePartialAddress } from './contract_address.js'; -import { type PartialAddress } from './partial_address.js'; +import type { PartialAddress } from './partial_address.js'; /** * A complete address is a combination of an Aztec address, a public key and a partial address. diff --git a/yarn-project/stdlib/src/contract/contract_address.ts b/yarn-project/stdlib/src/contract/contract_address.ts index 75436678fb65..ef3ca9ee22a2 100644 --- a/yarn-project/stdlib/src/contract/contract_address.ts +++ b/yarn-project/stdlib/src/contract/contract_address.ts @@ -3,10 +3,10 @@ import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; import { type FunctionAbi, FunctionSelector, encodeArguments } from '../abi/index.js'; -import { type AztecAddress } from '../aztec-address/index.js'; +import type { AztecAddress } from '../aztec-address/index.js'; import { computeVarArgsHash } from '../hash/hash.js'; import { computeAddress } from '../keys/index.js'; -import { type ContractInstance } from './interfaces/contract_instance.js'; +import type { ContractInstance } from './interfaces/contract_instance.js'; // TODO(@spalladino): Review all generator indices in this file diff --git a/yarn-project/stdlib/src/contract/contract_class.ts b/yarn-project/stdlib/src/contract/contract_class.ts index d593e569644c..6316c6ff8753 100644 --- a/yarn-project/stdlib/src/contract/contract_class.ts +++ b/yarn-project/stdlib/src/contract/contract_class.ts @@ -6,7 +6,7 @@ import { type ContractArtifact, type FunctionArtifact, FunctionSelector, Functio import { hashVK } from '../hash/hash.js'; import { computeArtifactHash } from './artifact_hash.js'; import { type ContractClassIdPreimage, computeContractClassIdWithPreimage } from './contract_class_id.js'; -import { type ContractClass, type ContractClassWithId, type PublicFunction } from './interfaces/index.js'; +import type { ContractClass, ContractClassWithId, PublicFunction } from './interfaces/index.js'; /** Contract artifact including its artifact hash */ type ContractArtifactWithHash = ContractArtifact & { artifactHash: Fr }; diff --git a/yarn-project/stdlib/src/contract/contract_class_id.test.ts b/yarn-project/stdlib/src/contract/contract_class_id.test.ts index 537f96848b04..0ee594456c24 100644 --- a/yarn-project/stdlib/src/contract/contract_class_id.test.ts +++ b/yarn-project/stdlib/src/contract/contract_class_id.test.ts @@ -2,7 +2,7 @@ import { Fr } from '@aztec/foundation/fields'; import { FunctionSelector } from '../abi/function_selector.js'; import { computeContractClassId } from './contract_class_id.js'; -import { type ContractClass } from './interfaces/contract_class.js'; +import type { ContractClass } from './interfaces/contract_class.js'; describe('ContractClass', () => { describe('getContractClassId', () => { diff --git a/yarn-project/stdlib/src/contract/contract_class_id.ts b/yarn-project/stdlib/src/contract/contract_class_id.ts index 825c0d09eaa2..31c54351bd16 100644 --- a/yarn-project/stdlib/src/contract/contract_class_id.ts +++ b/yarn-project/stdlib/src/contract/contract_class_id.ts @@ -5,7 +5,7 @@ import { Fr } from '@aztec/foundation/fields'; import { strict as assert } from 'assert'; import { bufferAsFields } from '../abi/index.js'; -import { type ContractClass } from './interfaces/contract_class.js'; +import type { ContractClass } from './interfaces/contract_class.js'; import { computePrivateFunctionsRoot } from './private_function.js'; /** diff --git a/yarn-project/stdlib/src/contract/contract_function_dao.ts b/yarn-project/stdlib/src/contract/contract_function_dao.ts index c59d9032b562..e430c29aa1fe 100644 --- a/yarn-project/stdlib/src/contract/contract_function_dao.ts +++ b/yarn-project/stdlib/src/contract/contract_function_dao.ts @@ -1,4 +1,4 @@ -import { type FunctionArtifact, type FunctionSelector } from '../abi/index.js'; +import type { FunctionArtifact, FunctionSelector } from '../abi/index.js'; /** * A contract function Data Access Object (DAO). diff --git a/yarn-project/stdlib/src/contract/contract_instance.ts b/yarn-project/stdlib/src/contract/contract_instance.ts index 174d81206cfb..2a53253c9112 100644 --- a/yarn-project/stdlib/src/contract/contract_instance.ts +++ b/yarn-project/stdlib/src/contract/contract_instance.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; import { BufferReader, numToUInt8, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { type ContractArtifact, type FunctionArtifact, FunctionSelector, getDefaultInitializer } from '../abi/index.js'; import { AztecAddress } from '../aztec-address/index.js'; @@ -11,7 +11,7 @@ import { computeInitializationHash, computeInitializationHashFromEncodedArgs, } from './contract_address.js'; -import { type ContractInstance, type ContractInstanceWithAddress } from './interfaces/contract_instance.js'; +import type { ContractInstance, ContractInstanceWithAddress } from './interfaces/contract_instance.js'; const VERSION = 1 as const; diff --git a/yarn-project/stdlib/src/contract/contract_instance_update.ts b/yarn-project/stdlib/src/contract/contract_instance_update.ts index f9f8878653a9..5649be9c882b 100644 --- a/yarn-project/stdlib/src/contract/contract_instance_update.ts +++ b/yarn-project/stdlib/src/contract/contract_instance_update.ts @@ -1,8 +1,8 @@ import { Fr } from '@aztec/foundation/fields'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; -import { type ContractInstanceUpdate } from './interfaces/contract_instance_update.js'; +import type { ContractInstanceUpdate } from './interfaces/contract_instance_update.js'; export class SerializableContractInstanceUpdate { prevContractClassId: Fr; diff --git a/yarn-project/stdlib/src/contract/deployment_info.ts b/yarn-project/stdlib/src/contract/deployment_info.ts index e3da05f2dc4c..4da83be16992 100644 --- a/yarn-project/stdlib/src/contract/deployment_info.ts +++ b/yarn-project/stdlib/src/contract/deployment_info.ts @@ -1,6 +1,6 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; -import { type CompleteAddress } from './complete_address.js'; +import type { CompleteAddress } from './complete_address.js'; /** * Represents the data generated as part of contract deployment. diff --git a/yarn-project/stdlib/src/contract/interfaces/contract_class.ts b/yarn-project/stdlib/src/contract/interfaces/contract_class.ts index 152e780663dd..34fbbd2c3a30 100644 --- a/yarn-project/stdlib/src/contract/interfaces/contract_class.ts +++ b/yarn-project/stdlib/src/contract/interfaces/contract_class.ts @@ -1,4 +1,4 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { type ZodFor, schemas } from '@aztec/foundation/schemas'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/contract/interfaces/contract_data_source.ts b/yarn-project/stdlib/src/contract/interfaces/contract_data_source.ts index 39b997e463b0..ce5a3ff68392 100644 --- a/yarn-project/stdlib/src/contract/interfaces/contract_data_source.ts +++ b/yarn-project/stdlib/src/contract/interfaces/contract_data_source.ts @@ -1,9 +1,9 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { FunctionSelector } from '../../abi/index.js'; -import { type AztecAddress } from '../../aztec-address/index.js'; -import { type ContractClassPublic, type PublicFunction } from './contract_class.js'; -import { type ContractInstanceWithAddress } from './contract_instance.js'; +import type { AztecAddress } from '../../aztec-address/index.js'; +import type { ContractClassPublic, PublicFunction } from './contract_class.js'; +import type { ContractInstanceWithAddress } from './contract_instance.js'; export interface ContractDataSource { /** diff --git a/yarn-project/stdlib/src/contract/interfaces/contract_instance.ts b/yarn-project/stdlib/src/contract/interfaces/contract_instance.ts index 1fb60e8828c7..8ae06fc6cbba 100644 --- a/yarn-project/stdlib/src/contract/interfaces/contract_instance.ts +++ b/yarn-project/stdlib/src/contract/interfaces/contract_instance.ts @@ -1,8 +1,8 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { z } from 'zod'; -import { type AztecAddress } from '../../aztec-address/index.js'; +import type { AztecAddress } from '../../aztec-address/index.js'; import { PublicKeys } from '../../keys/public_keys.js'; import { type ZodFor, schemas } from '../../schemas/index.js'; diff --git a/yarn-project/stdlib/src/contract/interfaces/contract_instance_update.ts b/yarn-project/stdlib/src/contract/interfaces/contract_instance_update.ts index 00b972c10f89..2413f905007b 100644 --- a/yarn-project/stdlib/src/contract/interfaces/contract_instance_update.ts +++ b/yarn-project/stdlib/src/contract/interfaces/contract_instance_update.ts @@ -1,8 +1,8 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { z } from 'zod'; -import { type AztecAddress } from '../../aztec-address/index.js'; +import type { AztecAddress } from '../../aztec-address/index.js'; import { type ZodFor, schemas } from '../../schemas/index.js'; /** diff --git a/yarn-project/stdlib/src/contract/interfaces/node-info.ts b/yarn-project/stdlib/src/contract/interfaces/node-info.ts index 6c53b5df6115..6135e15113e9 100644 --- a/yarn-project/stdlib/src/contract/interfaces/node-info.ts +++ b/yarn-project/stdlib/src/contract/interfaces/node-info.ts @@ -1,5 +1,5 @@ import { type L1ContractAddresses, L1ContractAddressesSchema } from '@aztec/ethereum/l1-contract-addresses'; -import { type ZodFor } from '@aztec/foundation/schemas'; +import type { ZodFor } from '@aztec/foundation/schemas'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/contract/interfaces/protocol_contract_addresses.ts b/yarn-project/stdlib/src/contract/interfaces/protocol_contract_addresses.ts index 4c3037a09c33..d609c2241956 100644 --- a/yarn-project/stdlib/src/contract/interfaces/protocol_contract_addresses.ts +++ b/yarn-project/stdlib/src/contract/interfaces/protocol_contract_addresses.ts @@ -1,6 +1,6 @@ import { z } from 'zod'; -import { type AztecAddress } from '../../aztec-address/index.js'; +import type { AztecAddress } from '../../aztec-address/index.js'; import { schemas } from '../../schemas/index.js'; export const ProtocolContractsNames = [ diff --git a/yarn-project/stdlib/src/contract/partial_address.ts b/yarn-project/stdlib/src/contract/partial_address.ts index 29b2a8793ded..e3756bc0834f 100644 --- a/yarn-project/stdlib/src/contract/partial_address.ts +++ b/yarn-project/stdlib/src/contract/partial_address.ts @@ -1,4 +1,4 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; /** * A type which along with public key forms a preimage of a contract address. See the link below for more details diff --git a/yarn-project/stdlib/src/contract/private_function.test.ts b/yarn-project/stdlib/src/contract/private_function.test.ts index 7eab1eb4d4eb..8618a757d0e7 100644 --- a/yarn-project/stdlib/src/contract/private_function.test.ts +++ b/yarn-project/stdlib/src/contract/private_function.test.ts @@ -2,7 +2,7 @@ import { Fr } from '@aztec/foundation/fields'; import { setupCustomSnapshotSerializers } from '@aztec/foundation/testing'; import { fr, makeSelector } from '../tests/factories.js'; -import { type PrivateFunction } from './interfaces/contract_class.js'; +import type { PrivateFunction } from './interfaces/contract_class.js'; import { computePrivateFunctionsRoot, computePrivateFunctionsTree } from './private_function.js'; describe('PrivateFunction', () => { diff --git a/yarn-project/stdlib/src/contract/private_function.ts b/yarn-project/stdlib/src/contract/private_function.ts index defe15f8ef3e..35a0fba2ebc1 100644 --- a/yarn-project/stdlib/src/contract/private_function.ts +++ b/yarn-project/stdlib/src/contract/private_function.ts @@ -3,7 +3,7 @@ import { pedersenHash, poseidon2Hash, poseidon2HashWithSeparator } from '@aztec/ import { Fr } from '@aztec/foundation/fields'; import { type MerkleTree, MerkleTreeCalculator } from '@aztec/foundation/trees'; -import { type PrivateFunction } from './interfaces/contract_class.js'; +import type { PrivateFunction } from './interfaces/contract_class.js'; // Memoize the merkle tree calculators to avoid re-computing the zero-hash for each level in each call let privateFunctionTreeCalculator: MerkleTreeCalculator | undefined; diff --git a/yarn-project/stdlib/src/contract/private_function_membership_proof.test.ts b/yarn-project/stdlib/src/contract/private_function_membership_proof.test.ts index 478c5097901f..1fe2139f4ecb 100644 --- a/yarn-project/stdlib/src/contract/private_function_membership_proof.test.ts +++ b/yarn-project/stdlib/src/contract/private_function_membership_proof.test.ts @@ -3,8 +3,8 @@ import { Fr } from '@aztec/foundation/fields'; import { type ContractArtifact, type FunctionArtifact, FunctionSelector, FunctionType } from '../abi/index.js'; import { getBenchmarkContractArtifact } from '../tests/fixtures.js'; import { computeVerificationKeyHash, getContractClassFromArtifact } from './contract_class.js'; -import { type ContractClassIdPreimage } from './contract_class_id.js'; -import { type ContractClass } from './interfaces/contract_class.js'; +import type { ContractClassIdPreimage } from './contract_class_id.js'; +import type { ContractClass } from './interfaces/contract_class.js'; import { createPrivateFunctionMembershipProof, isValidPrivateFunctionMembershipProof, diff --git a/yarn-project/stdlib/src/contract/private_function_membership_proof.ts b/yarn-project/stdlib/src/contract/private_function_membership_proof.ts index 6a8f00be7b2d..a90ef4b3a6fb 100644 --- a/yarn-project/stdlib/src/contract/private_function_membership_proof.ts +++ b/yarn-project/stdlib/src/contract/private_function_membership_proof.ts @@ -13,10 +13,10 @@ import { getArtifactMerkleTreeHasher, } from './artifact_hash.js'; import { getContractClassPrivateFunctionFromArtifact } from './contract_class.js'; -import { - type ContractClassPublic, - type ExecutablePrivateFunctionWithMembershipProof, - type PrivateFunctionMembershipProof, +import type { + ContractClassPublic, + ExecutablePrivateFunctionWithMembershipProof, + PrivateFunctionMembershipProof, } from './interfaces/index.js'; import { computePrivateFunctionLeaf, computePrivateFunctionsTree } from './private_function.js'; diff --git a/yarn-project/stdlib/src/contract/unconstrained_function_membership_proof.test.ts b/yarn-project/stdlib/src/contract/unconstrained_function_membership_proof.test.ts index 004704e6f21a..1440dc9c3a1a 100644 --- a/yarn-project/stdlib/src/contract/unconstrained_function_membership_proof.test.ts +++ b/yarn-project/stdlib/src/contract/unconstrained_function_membership_proof.test.ts @@ -3,8 +3,8 @@ import { Fr } from '@aztec/foundation/fields'; import { type ContractArtifact, type FunctionArtifact, FunctionSelector, FunctionType } from '../abi/index.js'; import { getTestContractArtifact } from '../tests/fixtures.js'; import { getContractClassFromArtifact } from './contract_class.js'; -import { type ContractClassIdPreimage } from './contract_class_id.js'; -import { type ContractClass } from './interfaces/contract_class.js'; +import type { ContractClassIdPreimage } from './contract_class_id.js'; +import type { ContractClass } from './interfaces/contract_class.js'; import { createUnconstrainedFunctionMembershipProof, isValidUnconstrainedFunctionMembershipProof, diff --git a/yarn-project/stdlib/src/contract/unconstrained_function_membership_proof.ts b/yarn-project/stdlib/src/contract/unconstrained_function_membership_proof.ts index d96cc20003ff..67cef231d0f7 100644 --- a/yarn-project/stdlib/src/contract/unconstrained_function_membership_proof.ts +++ b/yarn-project/stdlib/src/contract/unconstrained_function_membership_proof.ts @@ -11,10 +11,10 @@ import { computeFunctionMetadataHash, getArtifactMerkleTreeHasher, } from './artifact_hash.js'; -import { - type ContractClassPublic, - type UnconstrainedFunctionMembershipProof, - type UnconstrainedFunctionWithMembershipProof, +import type { + ContractClassPublic, + UnconstrainedFunctionMembershipProof, + UnconstrainedFunctionWithMembershipProof, } from './interfaces/index.js'; /** diff --git a/yarn-project/stdlib/src/fees/transaction_fee.test.ts b/yarn-project/stdlib/src/fees/transaction_fee.test.ts index 47d3a544cda2..ba06bf23e876 100644 --- a/yarn-project/stdlib/src/fees/transaction_fee.test.ts +++ b/yarn-project/stdlib/src/fees/transaction_fee.test.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; import { updateInlineTestData } from '@aztec/foundation/testing/files'; -import { type Writeable } from '@aztec/foundation/types'; +import type { Writeable } from '@aztec/foundation/types'; import { Gas } from '../gas/gas.js'; import { GasFees } from '../gas/gas_fees.js'; diff --git a/yarn-project/stdlib/src/gas/gas.ts b/yarn-project/stdlib/src/gas/gas.ts index 4df9aabb2939..77c14154ca2c 100644 --- a/yarn-project/stdlib/src/gas/gas.ts +++ b/yarn-project/stdlib/src/gas/gas.ts @@ -1,13 +1,13 @@ import { Fr } from '@aztec/foundation/fields'; import { schemas } from '@aztec/foundation/schemas'; import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { inspect } from 'util'; import { z } from 'zod'; -import { type UInt32 } from '../types/shared.js'; -import { type GasFees } from './gas_fees.js'; +import type { UInt32 } from '../types/shared.js'; +import type { GasFees } from './gas_fees.js'; export const GasDimensions = ['da', 'l2'] as const; export type GasDimensions = (typeof GasDimensions)[number]; diff --git a/yarn-project/stdlib/src/gas/gas_fees.ts b/yarn-project/stdlib/src/gas/gas_fees.ts index e8eec800c37d..015d7d127494 100644 --- a/yarn-project/stdlib/src/gas/gas_fees.ts +++ b/yarn-project/stdlib/src/gas/gas_fees.ts @@ -1,12 +1,12 @@ import { Fr } from '@aztec/foundation/fields'; import { schemas } from '@aztec/foundation/schemas'; import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { inspect } from 'util'; import { z } from 'zod'; -import { type GasDimensions } from './gas.js'; +import type { GasDimensions } from './gas.js'; /** Gas prices for each dimension. */ export class GasFees { diff --git a/yarn-project/stdlib/src/gas/gas_settings.ts b/yarn-project/stdlib/src/gas/gas_settings.ts index e27b1b06a1db..e0851c284118 100644 --- a/yarn-project/stdlib/src/gas/gas_settings.ts +++ b/yarn-project/stdlib/src/gas/gas_settings.ts @@ -1,7 +1,7 @@ import { DEFAULT_GAS_LIMIT, DEFAULT_TEARDOWN_GAS_LIMIT, GAS_SETTINGS_LENGTH } from '@aztec/constants'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/gas/gas_used.ts b/yarn-project/stdlib/src/gas/gas_used.ts index c8adf04f7497..2d86d9df3333 100644 --- a/yarn-project/stdlib/src/gas/gas_used.ts +++ b/yarn-project/stdlib/src/gas/gas_used.ts @@ -1,4 +1,4 @@ -import { type Gas } from './gas.js'; +import type { Gas } from './gas.js'; export interface GasUsed { /** diff --git a/yarn-project/stdlib/src/hash/hash.ts b/yarn-project/stdlib/src/hash/hash.ts index dfb7160d2189..1c47f1f78343 100644 --- a/yarn-project/stdlib/src/hash/hash.ts +++ b/yarn-project/stdlib/src/hash/hash.ts @@ -2,8 +2,8 @@ import { GeneratorIndex } from '@aztec/constants'; import { poseidon2Hash, poseidon2HashWithSeparator, sha256Trunc } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; -import { type AztecAddress } from '../aztec-address/index.js'; -import { type ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js'; +import type { AztecAddress } from '../aztec-address/index.js'; +import type { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js'; /** * Computes a hash of a given verification key. diff --git a/yarn-project/stdlib/src/hash/map_slot.ts b/yarn-project/stdlib/src/hash/map_slot.ts index 60a9cacc62da..cc69919cb44d 100644 --- a/yarn-project/stdlib/src/hash/map_slot.ts +++ b/yarn-project/stdlib/src/hash/map_slot.ts @@ -1,5 +1,5 @@ import { poseidon2Hash } from '@aztec/foundation/crypto'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; /** * Computes the resulting storage slot for an entry in a map. diff --git a/yarn-project/stdlib/src/interfaces/archiver.test.ts b/yarn-project/stdlib/src/interfaces/archiver.test.ts index 84d92be480ee..34fb678c5a44 100644 --- a/yarn-project/stdlib/src/interfaces/archiver.test.ts +++ b/yarn-project/stdlib/src/interfaces/archiver.test.ts @@ -9,7 +9,7 @@ import { FunctionSelector } from '../abi/function_selector.js'; import { AztecAddress } from '../aztec-address/index.js'; import { type InBlock, randomInBlock } from '../block/in_block.js'; import { L2Block } from '../block/l2_block.js'; -import { type L2Tips } from '../block/l2_block_source.js'; +import type { L2Tips } from '../block/l2_block_source.js'; import { getContractClassFromArtifact } from '../contract/contract_class.js'; import { type ContractClassPublic, @@ -30,7 +30,7 @@ import { TxEffect } from '../tx/tx_effect.js'; import { TxHash } from '../tx/tx_hash.js'; import { TxReceipt } from '../tx/tx_receipt.js'; import { type ArchiverApi, ArchiverApiSchema } from './archiver.js'; -import { type GetContractClassLogsResponse, type GetPublicLogsResponse } from './get_logs_response.js'; +import type { GetContractClassLogsResponse, GetPublicLogsResponse } from './get_logs_response.js'; describe('ArchiverApiSchema', () => { let handler: MockArchiver; diff --git a/yarn-project/stdlib/src/interfaces/archiver.ts b/yarn-project/stdlib/src/interfaces/archiver.ts index 7ec1905cfadf..bd114df0af92 100644 --- a/yarn-project/stdlib/src/interfaces/archiver.ts +++ b/yarn-project/stdlib/src/interfaces/archiver.ts @@ -5,7 +5,7 @@ import { z } from 'zod'; import { inBlockSchemaFor } from '../block/in_block.js'; import { L2Block } from '../block/l2_block.js'; import { type L2BlockSource, L2TipsSchema } from '../block/l2_block_source.js'; -import { type NullifierWithBlockSource } from '../block/nullifier_with_block_source.js'; +import type { NullifierWithBlockSource } from '../block/nullifier_with_block_source.js'; import { ContractClassPublicSchema, type ContractDataSource, @@ -16,7 +16,7 @@ import { L1RollupConstantsSchema } from '../epoch-helpers/index.js'; import { LogFilterSchema } from '../logs/log_filter.js'; import { PrivateLog } from '../logs/private_log.js'; import { TxScopedL2Log } from '../logs/tx_scoped_l2_log.js'; -import { type L1ToL2MessageSource } from '../messaging/l1_to_l2_message_source.js'; +import type { L1ToL2MessageSource } from '../messaging/l1_to_l2_message_source.js'; import { optional, schemas } from '../schemas/schemas.js'; import { BlockHeader } from '../tx/block_header.js'; import { TxEffect } from '../tx/tx_effect.js'; diff --git a/yarn-project/stdlib/src/interfaces/aztec-node.test.ts b/yarn-project/stdlib/src/interfaces/aztec-node.test.ts index cae3ae4adfab..f9bcbebde802 100644 --- a/yarn-project/stdlib/src/interfaces/aztec-node.test.ts +++ b/yarn-project/stdlib/src/interfaces/aztec-node.test.ts @@ -18,7 +18,7 @@ import type { ContractArtifact } from '../abi/abi.js'; import { AztecAddress } from '../aztec-address/index.js'; import { type InBlock, randomInBlock } from '../block/in_block.js'; import { L2Block } from '../block/l2_block.js'; -import { type L2Tips } from '../block/l2_block_source.js'; +import type { L2Tips } from '../block/l2_block_source.js'; import { type ContractClassPublic, type ContractInstanceWithAddress, @@ -46,9 +46,9 @@ import { TxHash } from '../tx/tx_hash.js'; import { TxReceipt } from '../tx/tx_receipt.js'; import type { TxValidationResult } from '../tx/validator/tx_validator.js'; import { type AztecNode, AztecNodeApiSchema } from './aztec-node.js'; -import { type SequencerConfig } from './configs.js'; -import { type GetContractClassLogsResponse, type GetPublicLogsResponse } from './get_logs_response.js'; -import { type ProverConfig } from './prover-client.js'; +import type { SequencerConfig } from './configs.js'; +import type { GetContractClassLogsResponse, GetPublicLogsResponse } from './get_logs_response.js'; +import type { ProverConfig } from './prover-client.js'; import type { WorldStateSyncStatus } from './world_state.js'; describe('AztecNodeApiSchema', () => { diff --git a/yarn-project/stdlib/src/interfaces/aztec-node.ts b/yarn-project/stdlib/src/interfaces/aztec-node.ts index a7dd5759adbd..a8e8e3806eea 100644 --- a/yarn-project/stdlib/src/interfaces/aztec-node.ts +++ b/yarn-project/stdlib/src/interfaces/aztec-node.ts @@ -54,7 +54,7 @@ import { GetPublicLogsResponseSchema, } from './get_logs_response.js'; import { type ProverConfig, ProverConfigSchema } from './prover-client.js'; -import { type ProverCoordination } from './prover-coordination.js'; +import type { ProverCoordination } from './prover-coordination.js'; import { type WorldStateSyncStatus, WorldStateSyncStatusSchema } from './world_state.js'; /** diff --git a/yarn-project/stdlib/src/interfaces/block-builder.ts b/yarn-project/stdlib/src/interfaces/block-builder.ts index 4a57e23105b7..eef7b4c1fe5a 100644 --- a/yarn-project/stdlib/src/interfaces/block-builder.ts +++ b/yarn-project/stdlib/src/interfaces/block-builder.ts @@ -1,9 +1,9 @@ import type { Fr } from '@aztec/foundation/fields'; import type { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx'; -import { type L2Block } from '../block/l2_block.js'; -import { type ProcessedTx } from '../tx/processed_tx.js'; -import { type ProcessedTxHandler } from './processed-tx-handler.js'; +import type { L2Block } from '../block/l2_block.js'; +import type { ProcessedTx } from '../tx/processed_tx.js'; +import type { ProcessedTxHandler } from './processed-tx-handler.js'; /** The interface to a block builder. Generates an L2 block out of a set of processed txs. */ export interface BlockBuilder extends ProcessedTxHandler { diff --git a/yarn-project/stdlib/src/interfaces/epoch-prover.ts b/yarn-project/stdlib/src/interfaces/epoch-prover.ts index f67a8d9a9b6f..b0334e11e5ec 100644 --- a/yarn-project/stdlib/src/interfaces/epoch-prover.ts +++ b/yarn-project/stdlib/src/interfaces/epoch-prover.ts @@ -1,11 +1,11 @@ import type { Fr } from '@aztec/foundation/fields'; import type { Proof } from '@aztec/stdlib/proofs'; -import { type RootRollupPublicInputs } from '@aztec/stdlib/rollup'; +import type { RootRollupPublicInputs } from '@aztec/stdlib/rollup'; import type { BlockHeader } from '@aztec/stdlib/tx'; -import { type L2Block } from '../block/l2_block.js'; -import { type Tx } from '../tx/tx.js'; -import { type BlockBuilder } from './block-builder.js'; +import type { L2Block } from '../block/l2_block.js'; +import type { Tx } from '../tx/tx.js'; +import type { BlockBuilder } from './block-builder.js'; /** Coordinates the proving of an entire epoch. */ export interface EpochProver extends Omit { diff --git a/yarn-project/stdlib/src/interfaces/get_logs_response.ts b/yarn-project/stdlib/src/interfaces/get_logs_response.ts index 66e59b063c03..49401d1e1826 100644 --- a/yarn-project/stdlib/src/interfaces/get_logs_response.ts +++ b/yarn-project/stdlib/src/interfaces/get_logs_response.ts @@ -1,4 +1,4 @@ -import { type ZodFor } from '@aztec/stdlib/schemas'; +import type { ZodFor } from '@aztec/stdlib/schemas'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/interfaces/p2p-bootstrap.ts b/yarn-project/stdlib/src/interfaces/p2p-bootstrap.ts index 9e253f58e635..0e181509c2a4 100644 --- a/yarn-project/stdlib/src/interfaces/p2p-bootstrap.ts +++ b/yarn-project/stdlib/src/interfaces/p2p-bootstrap.ts @@ -1,4 +1,4 @@ -import { type ApiSchemaFor } from '@aztec/stdlib/schemas'; +import type { ApiSchemaFor } from '@aztec/stdlib/schemas'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/interfaces/p2p.ts b/yarn-project/stdlib/src/interfaces/p2p.ts index 0872845cdf0e..1f8d48f9dd43 100644 --- a/yarn-project/stdlib/src/interfaces/p2p.ts +++ b/yarn-project/stdlib/src/interfaces/p2p.ts @@ -3,7 +3,7 @@ import { type ApiSchemaFor, optional, schemas } from '@aztec/stdlib/schemas'; import { z } from 'zod'; import { BlockAttestation } from '../p2p/block_attestation.js'; -import { type P2PClientType } from '../p2p/client_type.js'; +import type { P2PClientType } from '../p2p/client_type.js'; import { Tx } from '../tx/tx.js'; export type PeerInfo = diff --git a/yarn-project/stdlib/src/interfaces/private_kernel_prover.ts b/yarn-project/stdlib/src/interfaces/private_kernel_prover.ts index f5007b481aab..c68fbd6ee59d 100644 --- a/yarn-project/stdlib/src/interfaces/private_kernel_prover.ts +++ b/yarn-project/stdlib/src/interfaces/private_kernel_prover.ts @@ -1,13 +1,13 @@ import type { WitnessMap } from '@noir-lang/acvm_js'; -import { - type PrivateKernelCircuitPublicInputs, - type PrivateKernelInitCircuitPrivateInputs, - type PrivateKernelInnerCircuitPrivateInputs, - type PrivateKernelResetCircuitPrivateInputs, - type PrivateKernelSimulateOutput, - type PrivateKernelTailCircuitPrivateInputs, - type PrivateKernelTailCircuitPublicInputs, +import type { + PrivateKernelCircuitPublicInputs, + PrivateKernelInitCircuitPrivateInputs, + PrivateKernelInnerCircuitPrivateInputs, + PrivateKernelResetCircuitPrivateInputs, + PrivateKernelSimulateOutput, + PrivateKernelTailCircuitPrivateInputs, + PrivateKernelTailCircuitPublicInputs, } from '../kernel/index.js'; import type { ClientIvcProof } from '../proofs/client_ivc_proof.js'; diff --git a/yarn-project/stdlib/src/interfaces/processed-tx-handler.ts b/yarn-project/stdlib/src/interfaces/processed-tx-handler.ts index 6b215bc294be..cba67422b53d 100644 --- a/yarn-project/stdlib/src/interfaces/processed-tx-handler.ts +++ b/yarn-project/stdlib/src/interfaces/processed-tx-handler.ts @@ -1,4 +1,4 @@ -import { type ProcessedTx } from '../tx/processed_tx.js'; +import type { ProcessedTx } from '../tx/processed_tx.js'; /** Receives processed txs as part of block simulation or proving. */ export interface ProcessedTxHandler { diff --git a/yarn-project/stdlib/src/interfaces/prover-agent.ts b/yarn-project/stdlib/src/interfaces/prover-agent.ts index dcbf050d71e1..373734072d9e 100644 --- a/yarn-project/stdlib/src/interfaces/prover-agent.ts +++ b/yarn-project/stdlib/src/interfaces/prover-agent.ts @@ -1,4 +1,4 @@ -import { type ApiSchemaFor } from '@aztec/stdlib/schemas'; +import type { ApiSchemaFor } from '@aztec/stdlib/schemas'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/interfaces/prover-client.ts b/yarn-project/stdlib/src/interfaces/prover-client.ts index 389ad94589be..8f722b6f1e8e 100644 --- a/yarn-project/stdlib/src/interfaces/prover-client.ts +++ b/yarn-project/stdlib/src/interfaces/prover-client.ts @@ -4,9 +4,9 @@ import { type ZodFor, schemas } from '@aztec/stdlib/schemas'; import { z } from 'zod'; -import { type TxHash } from '../tx/tx_hash.js'; -import { type EpochProver } from './epoch-prover.js'; -import { type ProvingJobConsumer } from './prover-broker.js'; +import type { TxHash } from '../tx/tx_hash.js'; +import type { EpochProver } from './epoch-prover.js'; +import type { ProvingJobConsumer } from './prover-broker.js'; export type ActualProverConfig = { /** Whether to construct real proofs */ diff --git a/yarn-project/stdlib/src/interfaces/prover-coordination.ts b/yarn-project/stdlib/src/interfaces/prover-coordination.ts index dd5e999f27c8..10dfca73084a 100644 --- a/yarn-project/stdlib/src/interfaces/prover-coordination.ts +++ b/yarn-project/stdlib/src/interfaces/prover-coordination.ts @@ -1,4 +1,4 @@ -import { type ApiSchemaFor } from '@aztec/stdlib/schemas'; +import type { ApiSchemaFor } from '@aztec/stdlib/schemas'; import { TxHash } from '@aztec/stdlib/tx'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/interfaces/proving-job-source.ts b/yarn-project/stdlib/src/interfaces/proving-job-source.ts index 6c3b81fe5e35..d45d468e8abd 100644 --- a/yarn-project/stdlib/src/interfaces/proving-job-source.ts +++ b/yarn-project/stdlib/src/interfaces/proving-job-source.ts @@ -1,4 +1,4 @@ -import { type ApiSchemaFor } from '@aztec/stdlib/schemas'; +import type { ApiSchemaFor } from '@aztec/stdlib/schemas'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/interfaces/proving-job.ts b/yarn-project/stdlib/src/interfaces/proving-job.ts index d75a1c08d604..d8264fcd455d 100644 --- a/yarn-project/stdlib/src/interfaces/proving-job.ts +++ b/yarn-project/stdlib/src/interfaces/proving-job.ts @@ -26,7 +26,7 @@ import { PrivateBaseRollupInputs } from '../rollup/private_base_rollup_inputs.js import { PublicBaseRollupInputs } from '../rollup/public_base_rollup_inputs.js'; import { RootRollupInputs, RootRollupPublicInputs } from '../rollup/root_rollup.js'; import { TubeInputs } from '../rollup/tube_inputs.js'; -import { type ServerCircuitName } from '../stats/index.js'; +import type { ServerCircuitName } from '../stats/index.js'; import { VerificationKeyData } from '../vks/verification_key.js'; export type ProofAndVerificationKey = { diff --git a/yarn-project/stdlib/src/interfaces/pxe.test.ts b/yarn-project/stdlib/src/interfaces/pxe.test.ts index 18de8395c535..30822abf2bb2 100644 --- a/yarn-project/stdlib/src/interfaces/pxe.test.ts +++ b/yarn-project/stdlib/src/interfaces/pxe.test.ts @@ -16,7 +16,7 @@ import type { AbiDecoded } from '../abi/decoder.js'; import { EventSelector } from '../abi/event_selector.js'; import { AuthWitness } from '../auth_witness/auth_witness.js'; import { AztecAddress } from '../aztec-address/index.js'; -import { type InBlock } from '../block/in_block.js'; +import type { InBlock } from '../block/in_block.js'; import { L2Block } from '../block/l2_block.js'; import { CompleteAddress, @@ -33,13 +33,13 @@ import { ExtendedPublicLog } from '../logs/extended_public_log.js'; import { ExtendedUnencryptedL2Log } from '../logs/extended_unencrypted_l2_log.js'; import type { LogFilter } from '../logs/log_filter.js'; import { UniqueNote } from '../note/index.js'; -import { type NotesFilter } from '../note/notes_filter.js'; +import type { NotesFilter } from '../note/notes_filter.js'; import { ClientIvcProof } from '../proofs/client_ivc_proof.js'; import { getTokenContractArtifact } from '../tests/fixtures.js'; import { PrivateExecutionResult, Tx, TxHash, TxProvingResult, TxReceipt, TxSimulationResult } from '../tx/index.js'; import { TxEffect } from '../tx/tx_effect.js'; import { TxExecutionRequest } from '../tx/tx_execution_request.js'; -import { type GetContractClassLogsResponse, type GetPublicLogsResponse } from './get_logs_response.js'; +import type { GetContractClassLogsResponse, GetPublicLogsResponse } from './get_logs_response.js'; import { type ContractClassMetadata, type ContractMetadata, diff --git a/yarn-project/stdlib/src/interfaces/server_circuit_prover.ts b/yarn-project/stdlib/src/interfaces/server_circuit_prover.ts index 4ad77bdcf7c1..695121161eb4 100644 --- a/yarn-project/stdlib/src/interfaces/server_circuit_prover.ts +++ b/yarn-project/stdlib/src/interfaces/server_circuit_prover.ts @@ -1,29 +1,29 @@ -import { - type AVM_PROOF_LENGTH_IN_FIELDS, - type NESTED_RECURSIVE_PROOF_LENGTH, - type NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, - type RECURSIVE_PROOF_LENGTH, - type TUBE_PROOF_LENGTH, +import type { + AVM_PROOF_LENGTH_IN_FIELDS, + NESTED_RECURSIVE_PROOF_LENGTH, + NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH, + RECURSIVE_PROOF_LENGTH, + TUBE_PROOF_LENGTH, } from '@aztec/constants'; -import { type AvmCircuitInputs } from '@aztec/stdlib/avm'; -import { type BaseParityInputs, type ParityPublicInputs, type RootParityInputs } from '@aztec/stdlib/parity'; -import { - type BaseOrMergeRollupPublicInputs, - type BlockMergeRollupInputs, - type BlockRootOrBlockMergePublicInputs, - type BlockRootRollupInputs, - type EmptyBlockRootRollupInputs, - type MergeRollupInputs, - type PrivateBaseRollupInputs, - type PublicBaseRollupInputs, - type RootRollupInputs, - type RootRollupPublicInputs, - type SingleTxBlockRootRollupInputs, - type TubeInputs, +import type { AvmCircuitInputs } from '@aztec/stdlib/avm'; +import type { BaseParityInputs, ParityPublicInputs, RootParityInputs } from '@aztec/stdlib/parity'; +import type { + BaseOrMergeRollupPublicInputs, + BlockMergeRollupInputs, + BlockRootOrBlockMergePublicInputs, + BlockRootRollupInputs, + EmptyBlockRootRollupInputs, + MergeRollupInputs, + PrivateBaseRollupInputs, + PublicBaseRollupInputs, + RootRollupInputs, + RootRollupPublicInputs, + SingleTxBlockRootRollupInputs, + TubeInputs, } from '@aztec/stdlib/rollup'; import type { Tx } from '../tx/tx.js'; -import { type ProofAndVerificationKey, type PublicInputsAndRecursiveProof } from './proving-job.js'; +import type { ProofAndVerificationKey, PublicInputsAndRecursiveProof } from './proving-job.js'; /** * Generates proofs for parity and rollup circuits. diff --git a/yarn-project/stdlib/src/interfaces/service.ts b/yarn-project/stdlib/src/interfaces/service.ts index 7b4c458f8418..aba338ef6371 100644 --- a/yarn-project/stdlib/src/interfaces/service.ts +++ b/yarn-project/stdlib/src/interfaces/service.ts @@ -1,5 +1,5 @@ -import { type Logger } from '@aztec/foundation/log'; -import { type Maybe } from '@aztec/foundation/types'; +import type { Logger } from '@aztec/foundation/log'; +import type { Maybe } from '@aztec/foundation/types'; /** Represents a local service that can be started and stopped. */ export interface Service { diff --git a/yarn-project/stdlib/src/kernel/combined_constant_data.ts b/yarn-project/stdlib/src/kernel/combined_constant_data.ts index 26062e404224..aaedf7dd46c8 100644 --- a/yarn-project/stdlib/src/kernel/combined_constant_data.ts +++ b/yarn-project/stdlib/src/kernel/combined_constant_data.ts @@ -1,13 +1,13 @@ import { Fr } from '@aztec/foundation/fields'; import { type ZodFor, hexSchemaFor, schemas } from '@aztec/foundation/schemas'; import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { z } from 'zod'; import { BlockHeader } from '../tx/block_header.js'; import { GlobalVariables } from '../tx/global_variables.js'; -import { type TxConstantData } from '../tx/tx_constant_data.js'; +import type { TxConstantData } from '../tx/tx_constant_data.js'; import { TxContext } from '../tx/tx_context.js'; /** diff --git a/yarn-project/stdlib/src/kernel/hints/build_note_hash_read_request_hints.test.ts b/yarn-project/stdlib/src/kernel/hints/build_note_hash_read_request_hints.test.ts index 2c684cdf4bac..00235177558b 100644 --- a/yarn-project/stdlib/src/kernel/hints/build_note_hash_read_request_hints.test.ts +++ b/yarn-project/stdlib/src/kernel/hints/build_note_hash_read_request_hints.test.ts @@ -1,7 +1,7 @@ import { MAX_NOTE_HASHES_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_TX } from '@aztec/constants'; import { makeTuple } from '@aztec/foundation/array'; import { Fr } from '@aztec/foundation/fields'; -import { type Tuple } from '@aztec/foundation/serialize'; +import type { Tuple } from '@aztec/foundation/serialize'; import { AztecAddress } from '../../aztec-address/index.js'; import { NoteHash, type ScopedNoteHash } from '../note_hash.js'; diff --git a/yarn-project/stdlib/src/kernel/hints/build_note_hash_read_request_hints.ts b/yarn-project/stdlib/src/kernel/hints/build_note_hash_read_request_hints.ts index 74b94b4663f2..8f8c612231bd 100644 --- a/yarn-project/stdlib/src/kernel/hints/build_note_hash_read_request_hints.ts +++ b/yarn-project/stdlib/src/kernel/hints/build_note_hash_read_request_hints.ts @@ -3,7 +3,7 @@ import { MAX_NOTE_HASH_READ_REQUESTS_PER_TX, type NOTE_HASH_TREE_HEIGHT, } from '@aztec/constants'; -import { type Tuple } from '@aztec/foundation/serialize'; +import type { Tuple } from '@aztec/foundation/serialize'; import type { MembershipWitness } from '@aztec/foundation/trees'; import type { ScopedNoteHash } from '../note_hash.js'; diff --git a/yarn-project/stdlib/src/kernel/hints/build_nullifier_read_request_hints.test.ts b/yarn-project/stdlib/src/kernel/hints/build_nullifier_read_request_hints.test.ts index fe7f1f36d4b6..af66f31a7079 100644 --- a/yarn-project/stdlib/src/kernel/hints/build_nullifier_read_request_hints.test.ts +++ b/yarn-project/stdlib/src/kernel/hints/build_nullifier_read_request_hints.test.ts @@ -1,7 +1,7 @@ import { MAX_NULLIFIERS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX } from '@aztec/constants'; import { makeTuple } from '@aztec/foundation/array'; import { Fr } from '@aztec/foundation/fields'; -import { type Tuple } from '@aztec/foundation/serialize'; +import type { Tuple } from '@aztec/foundation/serialize'; import { AztecAddress } from '../../aztec-address/index.js'; import { Nullifier, type ScopedNullifier } from '../nullifier.js'; diff --git a/yarn-project/stdlib/src/kernel/hints/build_nullifier_read_request_hints.ts b/yarn-project/stdlib/src/kernel/hints/build_nullifier_read_request_hints.ts index b11c77d03b80..13780fc5a9a0 100644 --- a/yarn-project/stdlib/src/kernel/hints/build_nullifier_read_request_hints.ts +++ b/yarn-project/stdlib/src/kernel/hints/build_nullifier_read_request_hints.ts @@ -4,8 +4,8 @@ import { type NULLIFIER_TREE_HEIGHT, } from '@aztec/constants'; import { padArrayEnd } from '@aztec/foundation/collection'; -import { type Fr } from '@aztec/foundation/fields'; -import { type Tuple } from '@aztec/foundation/serialize'; +import type { Fr } from '@aztec/foundation/fields'; +import type { Tuple } from '@aztec/foundation/serialize'; import { type IndexedTreeLeafPreimage, MembershipWitness } from '@aztec/foundation/trees'; import { AztecAddress } from '../../aztec-address/index.js'; diff --git a/yarn-project/stdlib/src/kernel/hints/build_transient_data_hints.ts b/yarn-project/stdlib/src/kernel/hints/build_transient_data_hints.ts index 363fd8df106b..294d027e84e3 100644 --- a/yarn-project/stdlib/src/kernel/hints/build_transient_data_hints.ts +++ b/yarn-project/stdlib/src/kernel/hints/build_transient_data_hints.ts @@ -1,5 +1,5 @@ import { padArrayEnd } from '@aztec/foundation/collection'; -import { type Tuple } from '@aztec/foundation/serialize'; +import type { Tuple } from '@aztec/foundation/serialize'; import type { ScopedNoteHash } from '../note_hash.js'; import type { ScopedNullifier } from '../nullifier.js'; diff --git a/yarn-project/stdlib/src/kernel/hints/find_private_kernel_reset_dimensions.test.ts b/yarn-project/stdlib/src/kernel/hints/find_private_kernel_reset_dimensions.test.ts index 7a3031b08de1..8ce141492722 100644 --- a/yarn-project/stdlib/src/kernel/hints/find_private_kernel_reset_dimensions.test.ts +++ b/yarn-project/stdlib/src/kernel/hints/find_private_kernel_reset_dimensions.test.ts @@ -1,4 +1,4 @@ -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { type DimensionName, diff --git a/yarn-project/stdlib/src/kernel/hints/note_hash_read_request_hints.ts b/yarn-project/stdlib/src/kernel/hints/note_hash_read_request_hints.ts index 6c0e00030c8b..f174d01072fd 100644 --- a/yarn-project/stdlib/src/kernel/hints/note_hash_read_request_hints.ts +++ b/yarn-project/stdlib/src/kernel/hints/note_hash_read_request_hints.ts @@ -1,8 +1,8 @@ import { MAX_NOTE_HASH_READ_REQUESTS_PER_TX, NOTE_HASH_TREE_HEIGHT } from '@aztec/constants'; import { makeTuple } from '@aztec/foundation/array'; import { Fr } from '@aztec/foundation/fields'; -import { type BufferReader } from '@aztec/foundation/serialize'; -import { type MembershipWitness } from '@aztec/foundation/trees'; +import type { BufferReader } from '@aztec/foundation/serialize'; +import type { MembershipWitness } from '@aztec/foundation/trees'; import { PendingReadHint, diff --git a/yarn-project/stdlib/src/kernel/hints/nullifier_read_request_hints.ts b/yarn-project/stdlib/src/kernel/hints/nullifier_read_request_hints.ts index 18a3f14bfb5a..86a87229b48e 100644 --- a/yarn-project/stdlib/src/kernel/hints/nullifier_read_request_hints.ts +++ b/yarn-project/stdlib/src/kernel/hints/nullifier_read_request_hints.ts @@ -1,7 +1,7 @@ import { MAX_NULLIFIER_READ_REQUESTS_PER_TX, NULLIFIER_TREE_HEIGHT } from '@aztec/constants'; import { makeTuple } from '@aztec/foundation/array'; -import { type BufferReader } from '@aztec/foundation/serialize'; -import { type MembershipWitness, type TreeLeafPreimage } from '@aztec/foundation/trees'; +import type { BufferReader } from '@aztec/foundation/serialize'; +import type { MembershipWitness, TreeLeafPreimage } from '@aztec/foundation/trees'; import { NullifierLeafPreimage } from '../../trees/index.js'; import { diff --git a/yarn-project/stdlib/src/kernel/hints/rollup_validation_requests.ts b/yarn-project/stdlib/src/kernel/hints/rollup_validation_requests.ts index b9bd88c66e7b..42458c290209 100644 --- a/yarn-project/stdlib/src/kernel/hints/rollup_validation_requests.ts +++ b/yarn-project/stdlib/src/kernel/hints/rollup_validation_requests.ts @@ -1,8 +1,8 @@ import { ROLLUP_VALIDATION_REQUESTS_LENGTH } from '@aztec/constants'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { MaxBlockNumber } from '../../tx/max_block_number.js'; diff --git a/yarn-project/stdlib/src/kernel/hints/scoped_key_validation_request_and_generator.ts b/yarn-project/stdlib/src/kernel/hints/scoped_key_validation_request_and_generator.ts index 73845f2ac452..dd225f422a2a 100644 --- a/yarn-project/stdlib/src/kernel/hints/scoped_key_validation_request_and_generator.ts +++ b/yarn-project/stdlib/src/kernel/hints/scoped_key_validation_request_and_generator.ts @@ -1,5 +1,5 @@ import { SCOPED_KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH } from '@aztec/constants'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { AztecAddress } from '../../aztec-address/index.js'; diff --git a/yarn-project/stdlib/src/kernel/log_hash.ts b/yarn-project/stdlib/src/kernel/log_hash.ts index df369635b822..18541755f2b1 100644 --- a/yarn-project/stdlib/src/kernel/log_hash.ts +++ b/yarn-project/stdlib/src/kernel/log_hash.ts @@ -5,7 +5,7 @@ import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/ import { inspect } from 'util'; import { AztecAddress } from '../aztec-address/index.js'; -import { type Ordered } from './utils/interfaces.js'; +import type { Ordered } from './utils/interfaces.js'; export class LogHash implements Ordered { constructor(public value: Fr, public counter: number, public length: Fr) {} diff --git a/yarn-project/stdlib/src/kernel/note_hash.ts b/yarn-project/stdlib/src/kernel/note_hash.ts index 7efe153bc384..4dd2cc478c4c 100644 --- a/yarn-project/stdlib/src/kernel/note_hash.ts +++ b/yarn-project/stdlib/src/kernel/note_hash.ts @@ -2,7 +2,7 @@ import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { AztecAddress } from '../aztec-address/index.js'; -import { type Ordered } from './utils/interfaces.js'; +import type { Ordered } from './utils/interfaces.js'; export class NoteHash { constructor(public value: Fr, public counter: number) {} diff --git a/yarn-project/stdlib/src/kernel/nullifier.ts b/yarn-project/stdlib/src/kernel/nullifier.ts index 191330b5e6aa..599342bbb6e9 100644 --- a/yarn-project/stdlib/src/kernel/nullifier.ts +++ b/yarn-project/stdlib/src/kernel/nullifier.ts @@ -2,7 +2,7 @@ import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { AztecAddress } from '../aztec-address/index.js'; -import { type Ordered } from './utils/interfaces.js'; +import type { Ordered } from './utils/interfaces.js'; export class Nullifier implements Ordered { constructor(public value: Fr, public counter: number, public noteHash: Fr) {} diff --git a/yarn-project/stdlib/src/kernel/private_call_data.ts b/yarn-project/stdlib/src/kernel/private_call_data.ts index 06441362089d..674832c774f3 100644 --- a/yarn-project/stdlib/src/kernel/private_call_data.ts +++ b/yarn-project/stdlib/src/kernel/private_call_data.ts @@ -7,7 +7,7 @@ import { import { Fr } from '@aztec/foundation/fields'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { MembershipWitness } from '@aztec/foundation/trees'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { PublicKeys } from '../keys/public_keys.js'; import { SharedMutableValues } from '../shared_mutable/shared_mutable_values.js'; diff --git a/yarn-project/stdlib/src/kernel/private_circuit_public_inputs.ts b/yarn-project/stdlib/src/kernel/private_circuit_public_inputs.ts index dbe5930a14f2..18b520fa991d 100644 --- a/yarn-project/stdlib/src/kernel/private_circuit_public_inputs.ts +++ b/yarn-project/stdlib/src/kernel/private_circuit_public_inputs.ts @@ -21,7 +21,7 @@ import { serializeToBuffer, serializeToFields, } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { KeyValidationRequestAndGenerator } from '../kernel/hints/key_validation_request_and_generator.js'; import { LogHash } from '../kernel/log_hash.js'; diff --git a/yarn-project/stdlib/src/kernel/private_kernel_data.ts b/yarn-project/stdlib/src/kernel/private_kernel_data.ts index f5aecaa3b0b3..d8196668e5ad 100644 --- a/yarn-project/stdlib/src/kernel/private_kernel_data.ts +++ b/yarn-project/stdlib/src/kernel/private_kernel_data.ts @@ -3,7 +3,7 @@ import { makeTuple } from '@aztec/foundation/array'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type UInt32 } from '../types/shared.js'; +import type { UInt32 } from '../types/shared.js'; import { VerificationKeyAsFields } from '../vks/verification_key.js'; import { PrivateKernelCircuitPublicInputs } from './private_kernel_circuit_public_inputs.js'; diff --git a/yarn-project/stdlib/src/kernel/private_kernel_reset_circuit_private_inputs.ts b/yarn-project/stdlib/src/kernel/private_kernel_reset_circuit_private_inputs.ts index 6df2f778f027..1fe64907207d 100644 --- a/yarn-project/stdlib/src/kernel/private_kernel_reset_circuit_private_inputs.ts +++ b/yarn-project/stdlib/src/kernel/private_kernel_reset_circuit_private_inputs.ts @@ -1,14 +1,14 @@ -import { - type MAX_KEY_VALIDATION_REQUESTS_PER_TX, - type MAX_NOTE_HASH_READ_REQUESTS_PER_TX, - type MAX_NULLIFIERS_PER_TX, - type MAX_NULLIFIER_READ_REQUESTS_PER_TX, +import type { + MAX_KEY_VALIDATION_REQUESTS_PER_TX, + MAX_NOTE_HASH_READ_REQUESTS_PER_TX, + MAX_NULLIFIERS_PER_TX, + MAX_NULLIFIER_READ_REQUESTS_PER_TX, } from '@aztec/constants'; import { serializeToBuffer } from '@aztec/foundation/serialize'; -import { type PrivateKernelResetHints } from './hints/private_kernel_reset_hints.js'; -import { type PrivateKernelData } from './private_kernel_data.js'; -import { type PrivateKernelResetDimensions } from './private_kernel_reset_dimensions.js'; +import type { PrivateKernelResetHints } from './hints/private_kernel_reset_hints.js'; +import type { PrivateKernelData } from './private_kernel_data.js'; +import type { PrivateKernelResetDimensions } from './private_kernel_reset_dimensions.js'; export class PrivateKernelResetCircuitPrivateInputsVariants< NH_RR_PENDING extends number, diff --git a/yarn-project/stdlib/src/kernel/private_kernel_reset_dimensions.ts b/yarn-project/stdlib/src/kernel/private_kernel_reset_dimensions.ts index 80d670b5218e..12b672cc3999 100644 --- a/yarn-project/stdlib/src/kernel/private_kernel_reset_dimensions.ts +++ b/yarn-project/stdlib/src/kernel/private_kernel_reset_dimensions.ts @@ -1,5 +1,5 @@ import { serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; export class PrivateKernelResetDimensions { constructor( diff --git a/yarn-project/stdlib/src/kernel/private_kernel_simulated_output.ts b/yarn-project/stdlib/src/kernel/private_kernel_simulated_output.ts index 444cb81e684d..d6d14d160e1b 100644 --- a/yarn-project/stdlib/src/kernel/private_kernel_simulated_output.ts +++ b/yarn-project/stdlib/src/kernel/private_kernel_simulated_output.ts @@ -1,4 +1,4 @@ -import { type WitnessMap } from '@noir-lang/acvm_js'; +import type { WitnessMap } from '@noir-lang/acvm_js'; import type { ClientIvcProof } from '../proofs/client_ivc_proof.js'; import type { VerificationKeyAsFields } from '../vks/verification_key.js'; diff --git a/yarn-project/stdlib/src/kernel/private_log_data.ts b/yarn-project/stdlib/src/kernel/private_log_data.ts index 2e0213c06619..c1da236549e4 100644 --- a/yarn-project/stdlib/src/kernel/private_log_data.ts +++ b/yarn-project/stdlib/src/kernel/private_log_data.ts @@ -1,13 +1,13 @@ import { PRIVATE_LOG_DATA_LENGTH } from '@aztec/constants'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { inspect } from 'util'; import { AztecAddress } from '../aztec-address/index.js'; import { PrivateLog } from '../logs/private_log.js'; -import { type UInt32 } from '../types/shared.js'; +import type { UInt32 } from '../types/shared.js'; export class PrivateLogData { constructor(public log: PrivateLog, public noteHashCounter: UInt32, public counter: UInt32) {} diff --git a/yarn-project/stdlib/src/kernel/private_to_avm_accumulated_data.ts b/yarn-project/stdlib/src/kernel/private_to_avm_accumulated_data.ts index 5c8ddaa825fd..77a00effec05 100644 --- a/yarn-project/stdlib/src/kernel/private_to_avm_accumulated_data.ts +++ b/yarn-project/stdlib/src/kernel/private_to_avm_accumulated_data.ts @@ -18,7 +18,7 @@ import { import { inspect } from 'util'; import { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js'; -import { type UInt32 } from '../types/shared.js'; +import type { UInt32 } from '../types/shared.js'; export class PrivateToAvmAccumulatedData { constructor( diff --git a/yarn-project/stdlib/src/kernel/private_to_public_kernel_circuit_public_inputs.ts b/yarn-project/stdlib/src/kernel/private_to_public_kernel_circuit_public_inputs.ts index 16d6a7579f77..1eff9e29b2ae 100644 --- a/yarn-project/stdlib/src/kernel/private_to_public_kernel_circuit_public_inputs.ts +++ b/yarn-project/stdlib/src/kernel/private_to_public_kernel_circuit_public_inputs.ts @@ -1,9 +1,9 @@ import { GeneratorIndex, PRIVATE_TO_PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH } from '@aztec/constants'; import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { BufferReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { AztecAddress } from '../aztec-address/index.js'; import { Gas } from '../gas/gas.js'; diff --git a/yarn-project/stdlib/src/kernel/private_to_rollup_kernel_circuit_public_inputs.ts b/yarn-project/stdlib/src/kernel/private_to_rollup_kernel_circuit_public_inputs.ts index 4d7b1e719dbd..2fc4f00602c7 100644 --- a/yarn-project/stdlib/src/kernel/private_to_rollup_kernel_circuit_public_inputs.ts +++ b/yarn-project/stdlib/src/kernel/private_to_rollup_kernel_circuit_public_inputs.ts @@ -1,10 +1,10 @@ import { GeneratorIndex, PRIVATE_TO_ROLLUP_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH } from '@aztec/constants'; import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { bufferSchemaFor } from '@aztec/foundation/schemas'; import { BufferReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { AztecAddress } from '../aztec-address/index.js'; import { Gas } from '../gas/gas.js'; diff --git a/yarn-project/stdlib/src/kernel/private_validation_requests.ts b/yarn-project/stdlib/src/kernel/private_validation_requests.ts index 09f9cec9081b..42e317c280ea 100644 --- a/yarn-project/stdlib/src/kernel/private_validation_requests.ts +++ b/yarn-project/stdlib/src/kernel/private_validation_requests.ts @@ -5,7 +5,7 @@ import { } from '@aztec/constants'; import { makeTuple } from '@aztec/foundation/array'; import { arraySerializedSizeOfNonEmpty } from '@aztec/foundation/collection'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; diff --git a/yarn-project/stdlib/src/kernel/public_call_request.ts b/yarn-project/stdlib/src/kernel/public_call_request.ts index 829317b7ddda..ed2e0bfb536b 100644 --- a/yarn-project/stdlib/src/kernel/public_call_request.ts +++ b/yarn-project/stdlib/src/kernel/public_call_request.ts @@ -1,13 +1,13 @@ import { COUNTED_PUBLIC_CALL_REQUEST_LENGTH, PUBLIC_CALL_REQUEST_LENGTH } from '@aztec/constants'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { inspect } from 'util'; import { FunctionSelector } from '../abi/index.js'; import { AztecAddress } from '../aztec-address/index.js'; -import { type UInt32 } from '../types/shared.js'; +import type { UInt32 } from '../types/shared.js'; /** * Represents a request to call a public function. diff --git a/yarn-project/stdlib/src/kernel/utils/optional_number.ts b/yarn-project/stdlib/src/kernel/utils/optional_number.ts index 9281a317c270..c2ba71e85ea6 100644 --- a/yarn-project/stdlib/src/kernel/utils/optional_number.ts +++ b/yarn-project/stdlib/src/kernel/utils/optional_number.ts @@ -1,6 +1,6 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; export class OptionalNumber { constructor( diff --git a/yarn-project/stdlib/src/kernel/utils/order_and_comparison.ts b/yarn-project/stdlib/src/kernel/utils/order_and_comparison.ts index 5138b83230a7..7739ac60aae6 100644 --- a/yarn-project/stdlib/src/kernel/utils/order_and_comparison.ts +++ b/yarn-project/stdlib/src/kernel/utils/order_and_comparison.ts @@ -1,4 +1,4 @@ -import { type Tuple } from '@aztec/foundation/serialize'; +import type { Tuple } from '@aztec/foundation/serialize'; import type { IsEmpty, Ordered } from './interfaces.js'; diff --git a/yarn-project/stdlib/src/kernel/utils/utils.test.ts b/yarn-project/stdlib/src/kernel/utils/utils.test.ts index 3d3a3a811ae0..96252d265d8e 100644 --- a/yarn-project/stdlib/src/kernel/utils/utils.test.ts +++ b/yarn-project/stdlib/src/kernel/utils/utils.test.ts @@ -1,9 +1,9 @@ import { MAX_FIELD_VALUE } from '@aztec/constants'; import { makeTuple } from '@aztec/foundation/array'; import { Fr } from '@aztec/foundation/fields'; -import { type Tuple } from '@aztec/foundation/serialize'; +import type { Tuple } from '@aztec/foundation/serialize'; -import { type IsEmpty } from './interfaces.js'; +import type { IsEmpty } from './interfaces.js'; import { countAccumulatedItems, getNonEmptyItems, diff --git a/yarn-project/stdlib/src/keys/derivation.ts b/yarn-project/stdlib/src/keys/derivation.ts index a8846d17cf98..0d481848b71b 100644 --- a/yarn-project/stdlib/src/keys/derivation.ts +++ b/yarn-project/stdlib/src/keys/derivation.ts @@ -4,7 +4,7 @@ import { Fq, Fr, GrumpkinScalar } from '@aztec/foundation/fields'; import { AztecAddress } from '../aztec-address/index.js'; import type { CompleteAddress } from '../contract/complete_address.js'; -import { type KeyPrefix } from './key_types.js'; +import type { KeyPrefix } from './key_types.js'; import { PublicKeys } from './public_keys.js'; import { getKeyGenerator } from './utils.js'; diff --git a/yarn-project/stdlib/src/keys/key_types.ts b/yarn-project/stdlib/src/keys/key_types.ts index a34e8db92f76..a399fbba8ad7 100644 --- a/yarn-project/stdlib/src/keys/key_types.ts +++ b/yarn-project/stdlib/src/keys/key_types.ts @@ -1,4 +1,4 @@ -import { type GeneratorIndex } from '@aztec/constants'; +import type { GeneratorIndex } from '@aztec/constants'; export type KeyGenerator = GeneratorIndex.NSK_M | GeneratorIndex.IVSK_M | GeneratorIndex.OVSK_M | GeneratorIndex.TSK_M; export type KeyPrefix = 'n' | 'iv' | 'ov' | 't'; diff --git a/yarn-project/stdlib/src/keys/public_key.ts b/yarn-project/stdlib/src/keys/public_key.ts index 0109de4c8ea5..07a5f2b59330 100644 --- a/yarn-project/stdlib/src/keys/public_key.ts +++ b/yarn-project/stdlib/src/keys/public_key.ts @@ -1,4 +1,4 @@ -import { type Point } from '@aztec/foundation/fields'; +import type { Point } from '@aztec/foundation/fields'; /** Represents a user public key. */ export type PublicKey = Point; diff --git a/yarn-project/stdlib/src/keys/public_keys.ts b/yarn-project/stdlib/src/keys/public_keys.ts index 704aa2ed1e0c..e5aacb380a70 100644 --- a/yarn-project/stdlib/src/keys/public_keys.ts +++ b/yarn-project/stdlib/src/keys/public_keys.ts @@ -14,11 +14,11 @@ import { Fr, Point } from '@aztec/foundation/fields'; import { schemas } from '@aztec/foundation/schemas'; import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { bufferToHex, withoutHexPrefix } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { z } from 'zod'; -import { type PublicKey } from './public_key.js'; +import type { PublicKey } from './public_key.js'; export class PublicKeys { public constructor( diff --git a/yarn-project/stdlib/src/keys/utils.ts b/yarn-project/stdlib/src/keys/utils.ts index 482737e32269..7bb15c1f1d91 100644 --- a/yarn-project/stdlib/src/keys/utils.ts +++ b/yarn-project/stdlib/src/keys/utils.ts @@ -1,6 +1,6 @@ import { GeneratorIndex } from '@aztec/constants'; -import { type KeyGenerator, type KeyPrefix } from './key_types.js'; +import type { KeyGenerator, KeyPrefix } from './key_types.js'; export function getKeyGenerator(prefix: KeyPrefix): KeyGenerator { // We get enum key by capitalizing key prefix and concatenating it with 'SK_M' diff --git a/yarn-project/stdlib/src/logs/extended_public_log.ts b/yarn-project/stdlib/src/logs/extended_public_log.ts index 033e1954aa7c..adca18ec340a 100644 --- a/yarn-project/stdlib/src/logs/extended_public_log.ts +++ b/yarn-project/stdlib/src/logs/extended_public_log.ts @@ -1,6 +1,6 @@ import { BufferReader } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import isEqual from 'lodash.isequal'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/logs/extended_unencrypted_l2_log.ts b/yarn-project/stdlib/src/logs/extended_unencrypted_l2_log.ts index 820918526714..4181cd720308 100644 --- a/yarn-project/stdlib/src/logs/extended_unencrypted_l2_log.ts +++ b/yarn-project/stdlib/src/logs/extended_unencrypted_l2_log.ts @@ -1,7 +1,7 @@ import type { ZodFor } from '@aztec/foundation/schemas'; import { BufferReader } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import isEqual from 'lodash.isequal'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/logs/indexed_tagging_secret.ts b/yarn-project/stdlib/src/logs/indexed_tagging_secret.ts index 63f8aadd428b..fc0abc2b6351 100644 --- a/yarn-project/stdlib/src/logs/indexed_tagging_secret.ts +++ b/yarn-project/stdlib/src/logs/indexed_tagging_secret.ts @@ -1,7 +1,7 @@ import { poseidon2Hash } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; -import { type AztecAddress } from '../aztec-address/index.js'; +import type { AztecAddress } from '../aztec-address/index.js'; export class IndexedTaggingSecret { constructor(public appTaggingSecret: Fr, public index: number) { diff --git a/yarn-project/stdlib/src/logs/l1_payload/encryption_util.ts b/yarn-project/stdlib/src/logs/l1_payload/encryption_util.ts index ed6639cde92e..f2c134121dc3 100644 --- a/yarn-project/stdlib/src/logs/l1_payload/encryption_util.ts +++ b/yarn-project/stdlib/src/logs/l1_payload/encryption_util.ts @@ -1,6 +1,6 @@ import { GeneratorIndex } from '@aztec/constants'; import { Aes128, sha256 } from '@aztec/foundation/crypto'; -import { type Point } from '@aztec/foundation/fields'; +import type { Point } from '@aztec/foundation/fields'; import { numToUInt8 } from '@aztec/foundation/serialize'; function extractCloseToUniformlyRandom256BitsFromEcdhSharedSecretUsingSha256(sharedSecret: Point): Buffer { diff --git a/yarn-project/stdlib/src/logs/l1_payload/shared_secret_derivation.ts b/yarn-project/stdlib/src/logs/l1_payload/shared_secret_derivation.ts index 53eb4ef13f4b..b9a681766129 100644 --- a/yarn-project/stdlib/src/logs/l1_payload/shared_secret_derivation.ts +++ b/yarn-project/stdlib/src/logs/l1_payload/shared_secret_derivation.ts @@ -1,5 +1,5 @@ import { Grumpkin } from '@aztec/foundation/crypto'; -import { type GrumpkinScalar, type Point } from '@aztec/foundation/fields'; +import type { GrumpkinScalar, Point } from '@aztec/foundation/fields'; import type { AztecAddress } from '../../aztec-address/index.js'; import type { PublicKey } from '../../keys/public_key.js'; diff --git a/yarn-project/stdlib/src/logs/l2_block_l2_logs.ts b/yarn-project/stdlib/src/logs/l2_block_l2_logs.ts index f9f41f325ba4..ab053bde6a8b 100644 --- a/yarn-project/stdlib/src/logs/l2_block_l2_logs.ts +++ b/yarn-project/stdlib/src/logs/l2_block_l2_logs.ts @@ -5,7 +5,7 @@ import isEqual from 'lodash.isequal'; import { z } from 'zod'; import { ContractClassTxL2Logs, type TxL2Logs } from './tx_l2_logs.js'; -import { type UnencryptedL2Log } from './unencrypted_l2_log.js'; +import type { UnencryptedL2Log } from './unencrypted_l2_log.js'; /** * Data container of logs emitted in all txs in a given L2 block. diff --git a/yarn-project/stdlib/src/logs/log_filter.ts b/yarn-project/stdlib/src/logs/log_filter.ts index 23a16e980bac..d2c191a803a9 100644 --- a/yarn-project/stdlib/src/logs/log_filter.ts +++ b/yarn-project/stdlib/src/logs/log_filter.ts @@ -1,6 +1,6 @@ import { z } from 'zod'; -import { type AztecAddress } from '../aztec-address/index.js'; +import type { AztecAddress } from '../aztec-address/index.js'; import { type ZodFor, schemas } from '../schemas/index.js'; import { TxHash } from '../tx/tx_hash.js'; import { LogId } from './log_id.js'; diff --git a/yarn-project/stdlib/src/logs/tx_l2_logs.ts b/yarn-project/stdlib/src/logs/tx_l2_logs.ts index 4f26783f6a90..ca0c9e2d66d6 100644 --- a/yarn-project/stdlib/src/logs/tx_l2_logs.ts +++ b/yarn-project/stdlib/src/logs/tx_l2_logs.ts @@ -8,7 +8,7 @@ import { z } from 'zod'; import type { LogHash, ScopedLogHash } from '../kernel/log_hash.js'; import { UnencryptedFunctionL2Logs } from './function_l2_logs.js'; -import { type UnencryptedL2Log } from './unencrypted_l2_log.js'; +import type { UnencryptedL2Log } from './unencrypted_l2_log.js'; /** * Data container of logs emitted in 1 tx. diff --git a/yarn-project/stdlib/src/messaging/l1_to_l2_message.ts b/yarn-project/stdlib/src/messaging/l1_to_l2_message.ts index 5a2f3693de11..e0c7b1cb8f37 100644 --- a/yarn-project/stdlib/src/messaging/l1_to_l2_message.ts +++ b/yarn-project/stdlib/src/messaging/l1_to_l2_message.ts @@ -1,4 +1,4 @@ -import { type L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants'; +import type { L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants'; import { sha256ToField } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; @@ -7,7 +7,7 @@ import { SiblingPath } from '@aztec/foundation/trees'; import type { AztecAddress } from '../aztec-address/index.js'; import { computeL1ToL2MessageNullifier } from '../hash/hash.js'; -import { type AztecNode } from '../interfaces/aztec-node.js'; +import type { AztecNode } from '../interfaces/aztec-node.js'; import { MerkleTreeId } from '../trees/merkle_tree_id.js'; import { L1Actor } from './l1_actor.js'; import { L2Actor } from './l2_actor.js'; diff --git a/yarn-project/stdlib/src/messaging/l1_to_l2_message_source.ts b/yarn-project/stdlib/src/messaging/l1_to_l2_message_source.ts index d31cb84e258f..27e5af76193f 100644 --- a/yarn-project/stdlib/src/messaging/l1_to_l2_message_source.ts +++ b/yarn-project/stdlib/src/messaging/l1_to_l2_message_source.ts @@ -1,4 +1,4 @@ -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; /** * Interface of classes allowing for the retrieval of L1 to L2 messages. diff --git a/yarn-project/stdlib/src/messaging/l2_to_l1_message.ts b/yarn-project/stdlib/src/messaging/l2_to_l1_message.ts index 46f5f7aa2693..a37679d4c8ee 100644 --- a/yarn-project/stdlib/src/messaging/l2_to_l1_message.ts +++ b/yarn-project/stdlib/src/messaging/l2_to_l1_message.ts @@ -2,7 +2,7 @@ import { L2_TO_L1_MESSAGE_LENGTH, SCOPED_L2_TO_L1_MESSAGE_LENGTH } from '@aztec/ import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { AztecAddress } from '../aztec-address/index.js'; diff --git a/yarn-project/stdlib/src/p2p/block_attestation.ts b/yarn-project/stdlib/src/p2p/block_attestation.ts index 15848bf373f6..ae4832724ac4 100644 --- a/yarn-project/stdlib/src/p2p/block_attestation.ts +++ b/yarn-project/stdlib/src/p2p/block_attestation.ts @@ -1,13 +1,13 @@ import { Buffer32 } from '@aztec/foundation/buffer'; import { keccak256, recoverAddress } from '@aztec/foundation/crypto'; -import { type EthAddress } from '@aztec/foundation/eth-address'; +import type { EthAddress } from '@aztec/foundation/eth-address'; import { Signature } from '@aztec/foundation/eth-signature'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { z } from 'zod'; -import { type ZodFor } from '../schemas/index.js'; +import type { ZodFor } from '../schemas/index.js'; import { ConsensusPayload } from './consensus_payload.js'; import { Gossipable } from './gossipable.js'; import { SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from './signature_utils.js'; diff --git a/yarn-project/stdlib/src/p2p/block_proposal.ts b/yarn-project/stdlib/src/p2p/block_proposal.ts index f6acc39b1706..ca2c0106244d 100644 --- a/yarn-project/stdlib/src/p2p/block_proposal.ts +++ b/yarn-project/stdlib/src/p2p/block_proposal.ts @@ -1,8 +1,8 @@ import { Buffer32 } from '@aztec/foundation/buffer'; import { keccak256, recoverAddress } from '@aztec/foundation/crypto'; -import { type EthAddress } from '@aztec/foundation/eth-address'; +import type { EthAddress } from '@aztec/foundation/eth-address'; import { Signature } from '@aztec/foundation/eth-signature'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { ConsensusPayload } from './consensus_payload.js'; diff --git a/yarn-project/stdlib/src/p2p/consensus_payload.ts b/yarn-project/stdlib/src/p2p/consensus_payload.ts index 2273f7f866e2..3766b07a4f7e 100644 --- a/yarn-project/stdlib/src/p2p/consensus_payload.ts +++ b/yarn-project/stdlib/src/p2p/consensus_payload.ts @@ -1,14 +1,14 @@ import { Fr } from '@aztec/foundation/fields'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { hexToBuffer } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { encodeAbiParameters, parseAbiParameters } from 'viem'; import { z } from 'zod'; import { BlockHeader } from '../tx/block_header.js'; import { TxHash } from '../tx/tx_hash.js'; -import { type Signable, type SignatureDomainSeparator } from './signature_utils.js'; +import type { Signable, SignatureDomainSeparator } from './signature_utils.js'; export class ConsensusPayload implements Signable { private size: number | undefined; diff --git a/yarn-project/stdlib/src/p2p/gossipable.ts b/yarn-project/stdlib/src/p2p/gossipable.ts index a54968f24753..7ab5b82ff05e 100644 --- a/yarn-project/stdlib/src/p2p/gossipable.ts +++ b/yarn-project/stdlib/src/p2p/gossipable.ts @@ -1,4 +1,4 @@ -import { type Buffer32 } from '@aztec/foundation/buffer'; +import type { Buffer32 } from '@aztec/foundation/buffer'; /** * Gossipable diff --git a/yarn-project/stdlib/src/p2p/interface.ts b/yarn-project/stdlib/src/p2p/interface.ts index 7b11d96f2e58..6be3f930af68 100644 --- a/yarn-project/stdlib/src/p2p/interface.ts +++ b/yarn-project/stdlib/src/p2p/interface.ts @@ -1,7 +1,7 @@ import { Tx } from '../tx/tx.js'; import { BlockAttestation } from './block_attestation.js'; import { BlockProposal } from './block_proposal.js'; -import { type Gossipable } from './gossipable.js'; +import type { Gossipable } from './gossipable.js'; import { TopicType } from './topic_type.js'; export interface RawGossipMessage { diff --git a/yarn-project/stdlib/src/p2p/message_validator.ts b/yarn-project/stdlib/src/p2p/message_validator.ts index ae132ad86766..90de82a27e1b 100644 --- a/yarn-project/stdlib/src/p2p/message_validator.ts +++ b/yarn-project/stdlib/src/p2p/message_validator.ts @@ -1,4 +1,4 @@ -import { type PeerErrorSeverity } from './peer_error.js'; +import type { PeerErrorSeverity } from './peer_error.js'; /** * P2PValidator diff --git a/yarn-project/stdlib/src/parity/parity_public_inputs.ts b/yarn-project/stdlib/src/parity/parity_public_inputs.ts index 1f2f3551c02d..8d9ec4b8a298 100644 --- a/yarn-project/stdlib/src/parity/parity_public_inputs.ts +++ b/yarn-project/stdlib/src/parity/parity_public_inputs.ts @@ -2,7 +2,7 @@ import { Fr } from '@aztec/foundation/fields'; import { bufferSchemaFor } from '@aztec/foundation/schemas'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; export class ParityPublicInputs { constructor( diff --git a/yarn-project/stdlib/src/parity/root_parity_input.ts b/yarn-project/stdlib/src/parity/root_parity_input.ts index bb3cea40545c..fb9c2ee8f0fa 100644 --- a/yarn-project/stdlib/src/parity/root_parity_input.ts +++ b/yarn-project/stdlib/src/parity/root_parity_input.ts @@ -3,7 +3,7 @@ import { Fr } from '@aztec/foundation/fields'; import { schemas } from '@aztec/foundation/schemas'; import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { RecursiveProof } from '../proofs/recursive_proof.js'; import { VerificationKeyAsFields } from '../vks/verification_key.js'; diff --git a/yarn-project/stdlib/src/rollup/base_rollup_hints.ts b/yarn-project/stdlib/src/rollup/base_rollup_hints.ts index 5bf44e5421e5..0bb14d0d7e30 100644 --- a/yarn-project/stdlib/src/rollup/base_rollup_hints.ts +++ b/yarn-project/stdlib/src/rollup/base_rollup_hints.ts @@ -3,7 +3,7 @@ import { ARCHIVE_HEIGHT } from '@aztec/constants'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; import { MembershipWitness } from '@aztec/foundation/trees'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { PublicDataHint } from '../avm/public_data_hint.js'; import { PartialStateReference } from '../tx/partial_state_reference.js'; diff --git a/yarn-project/stdlib/src/rollup/block_root_or_block_merge_public_inputs.ts b/yarn-project/stdlib/src/rollup/block_root_or_block_merge_public_inputs.ts index 3177f387d713..f4d96e44febf 100644 --- a/yarn-project/stdlib/src/rollup/block_root_or_block_merge_public_inputs.ts +++ b/yarn-project/stdlib/src/rollup/block_root_or_block_merge_public_inputs.ts @@ -5,7 +5,7 @@ import { Fr } from '@aztec/foundation/fields'; import { bufferSchemaFor } from '@aztec/foundation/schemas'; import { BufferReader, type Tuple, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js'; import { GlobalVariables } from '../tx/global_variables.js'; diff --git a/yarn-project/stdlib/src/rollup/block_root_rollup.ts b/yarn-project/stdlib/src/rollup/block_root_rollup.ts index 02f5346c02de..e8c1c0cc1494 100644 --- a/yarn-project/stdlib/src/rollup/block_root_rollup.ts +++ b/yarn-project/stdlib/src/rollup/block_root_rollup.ts @@ -9,7 +9,7 @@ import { Fr } from '@aztec/foundation/fields'; import { bufferSchemaFor } from '@aztec/foundation/schemas'; import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { RootParityInput } from '../parity/root_parity_input.js'; import { BlockHeader } from '../tx/block_header.js'; diff --git a/yarn-project/stdlib/src/rollup/constant_rollup_data.ts b/yarn-project/stdlib/src/rollup/constant_rollup_data.ts index f2b6ad89e3bb..d71bc11ed634 100644 --- a/yarn-project/stdlib/src/rollup/constant_rollup_data.ts +++ b/yarn-project/stdlib/src/rollup/constant_rollup_data.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js'; import { GlobalVariables } from '../tx/global_variables.js'; diff --git a/yarn-project/stdlib/src/rollup/empty_block_root_rollup_inputs.ts b/yarn-project/stdlib/src/rollup/empty_block_root_rollup_inputs.ts index f36a6091d207..7b25bbf4d94f 100644 --- a/yarn-project/stdlib/src/rollup/empty_block_root_rollup_inputs.ts +++ b/yarn-project/stdlib/src/rollup/empty_block_root_rollup_inputs.ts @@ -1,7 +1,7 @@ import { bufferSchemaFor } from '@aztec/foundation/schemas'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { BlockRootRollupData } from './block_root_rollup.js'; import { ConstantRollupData } from './constant_rollup_data.js'; diff --git a/yarn-project/stdlib/src/rollup/private_base_rollup_inputs.ts b/yarn-project/stdlib/src/rollup/private_base_rollup_inputs.ts index a83a6655e282..6d793e4cdc6d 100644 --- a/yarn-project/stdlib/src/rollup/private_base_rollup_inputs.ts +++ b/yarn-project/stdlib/src/rollup/private_base_rollup_inputs.ts @@ -1,7 +1,7 @@ import { bufferSchemaFor } from '@aztec/foundation/schemas'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { PrivateBaseRollupHints } from './base_rollup_hints.js'; import { PrivateTubeData } from './private_tube_data.js'; diff --git a/yarn-project/stdlib/src/rollup/public_base_rollup_inputs.ts b/yarn-project/stdlib/src/rollup/public_base_rollup_inputs.ts index 2bf644f4b810..93e5a0010399 100644 --- a/yarn-project/stdlib/src/rollup/public_base_rollup_inputs.ts +++ b/yarn-project/stdlib/src/rollup/public_base_rollup_inputs.ts @@ -1,7 +1,7 @@ import { bufferSchemaFor } from '@aztec/foundation/schemas'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { AvmProofData } from './avm_proof_data.js'; import { PublicBaseRollupHints } from './base_rollup_hints.js'; diff --git a/yarn-project/stdlib/src/rollup/root_rollup.ts b/yarn-project/stdlib/src/rollup/root_rollup.ts index 3b554c8eef55..54e27a9c8134 100644 --- a/yarn-project/stdlib/src/rollup/root_rollup.ts +++ b/yarn-project/stdlib/src/rollup/root_rollup.ts @@ -5,7 +5,7 @@ import { Fr } from '@aztec/foundation/fields'; import { bufferSchemaFor } from '@aztec/foundation/schemas'; import { BufferReader, type Tuple, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js'; import { FeeRecipient } from './block_root_or_block_merge_public_inputs.js'; diff --git a/yarn-project/stdlib/src/rollup/state_diff_hints.ts b/yarn-project/stdlib/src/rollup/state_diff_hints.ts index 5e2ee90d8ce6..a5bcf5d260da 100644 --- a/yarn-project/stdlib/src/rollup/state_diff_hints.ts +++ b/yarn-project/stdlib/src/rollup/state_diff_hints.ts @@ -9,7 +9,7 @@ import { makeTuple } from '@aztec/foundation/array'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; import { MembershipWitness } from '@aztec/foundation/trees'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { NullifierLeafPreimage, PublicDataTreeLeafPreimage } from '../trees/index.js'; diff --git a/yarn-project/stdlib/src/rollup/tube_inputs.ts b/yarn-project/stdlib/src/rollup/tube_inputs.ts index cae5298b394f..aed3fe9e1c0b 100644 --- a/yarn-project/stdlib/src/rollup/tube_inputs.ts +++ b/yarn-project/stdlib/src/rollup/tube_inputs.ts @@ -1,7 +1,7 @@ import { bufferSchemaFor } from '@aztec/foundation/schemas'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { ClientIvcProof } from '../proofs/client_ivc_proof.js'; diff --git a/yarn-project/stdlib/src/shared_mutable/scheduled_delay_change.ts b/yarn-project/stdlib/src/shared_mutable/scheduled_delay_change.ts index f945b4f3d163..e621fbbf97d3 100644 --- a/yarn-project/stdlib/src/shared_mutable/scheduled_delay_change.ts +++ b/yarn-project/stdlib/src/shared_mutable/scheduled_delay_change.ts @@ -1,4 +1,4 @@ -import { type UInt32 } from '../types/shared.js'; +import type { UInt32 } from '../types/shared.js'; export class ScheduledDelayChange { constructor(public pre: UInt32 | undefined, public post: UInt32 | undefined, public blockOfChange: UInt32) {} diff --git a/yarn-project/stdlib/src/tests/factories.ts b/yarn-project/stdlib/src/tests/factories.ts index d0fb2f01206e..0282248ed9ed 100644 --- a/yarn-project/stdlib/src/tests/factories.ts +++ b/yarn-project/stdlib/src/tests/factories.ts @@ -46,7 +46,7 @@ import { compact } from '@aztec/foundation/collection'; import { SchnorrSignature, poseidon2HashWithSeparator } from '@aztec/foundation/crypto'; import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields'; -import { type Bufferable } from '@aztec/foundation/serialize'; +import type { Bufferable } from '@aztec/foundation/serialize'; import { MembershipWitness } from '@aztec/foundation/trees'; import { FunctionSelector } from '../abi/function_selector.js'; diff --git a/yarn-project/stdlib/src/tests/fixtures.ts b/yarn-project/stdlib/src/tests/fixtures.ts index 27e933664b69..5c163e1b1a2c 100644 --- a/yarn-project/stdlib/src/tests/fixtures.ts +++ b/yarn-project/stdlib/src/tests/fixtures.ts @@ -3,7 +3,7 @@ import { dirname, resolve } from 'path'; import { fileURLToPath } from 'url'; import { type ContractArtifact, loadContractArtifact } from '../abi/index.js'; -import { type NoirCompiledContract } from '../noir/index.js'; +import type { NoirCompiledContract } from '../noir/index.js'; // Copied from the build output for the contract `Benchmarking` in noir-contracts export function getBenchmarkContractArtifact(): ContractArtifact { diff --git a/yarn-project/stdlib/src/trees/append_only_tree_snapshot.ts b/yarn-project/stdlib/src/trees/append_only_tree_snapshot.ts index ed436f35e810..aae8388fa34a 100644 --- a/yarn-project/stdlib/src/trees/append_only_tree_snapshot.ts +++ b/yarn-project/stdlib/src/trees/append_only_tree_snapshot.ts @@ -6,7 +6,7 @@ import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; import { inspect } from 'util'; import { z } from 'zod'; -import { type UInt32 } from '../types/shared.js'; +import type { UInt32 } from '../types/shared.js'; /** * Snapshot of an append only tree. diff --git a/yarn-project/stdlib/src/trees/nullifier_leaf.ts b/yarn-project/stdlib/src/trees/nullifier_leaf.ts index 52b8be14aecb..5f64514c31c6 100644 --- a/yarn-project/stdlib/src/trees/nullifier_leaf.ts +++ b/yarn-project/stdlib/src/trees/nullifier_leaf.ts @@ -2,7 +2,7 @@ import { toBigIntBE, toBufferBE } from '@aztec/foundation/bigint-buffer'; import { Fr } from '@aztec/foundation/fields'; import { schemas } from '@aztec/foundation/schemas'; import { BufferReader } from '@aztec/foundation/serialize'; -import { type IndexedTreeLeaf, type IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import type { IndexedTreeLeaf, IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/trees/protocol_contract_leaf.ts b/yarn-project/stdlib/src/trees/protocol_contract_leaf.ts index 836054252e1f..46ca0244e500 100644 --- a/yarn-project/stdlib/src/trees/protocol_contract_leaf.ts +++ b/yarn-project/stdlib/src/trees/protocol_contract_leaf.ts @@ -3,7 +3,7 @@ import { toBigIntBE } from '@aztec/foundation/bigint-buffer'; import { Fr } from '@aztec/foundation/fields'; import { schemas } from '@aztec/foundation/schemas'; import { BufferReader } from '@aztec/foundation/serialize'; -import { type IndexedTreeLeaf, type IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import type { IndexedTreeLeaf, IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/trees/public_data_leaf.ts b/yarn-project/stdlib/src/trees/public_data_leaf.ts index b9660f2832fb..548aaf762efb 100644 --- a/yarn-project/stdlib/src/trees/public_data_leaf.ts +++ b/yarn-project/stdlib/src/trees/public_data_leaf.ts @@ -2,7 +2,7 @@ import { toBigIntBE, toBufferBE } from '@aztec/foundation/bigint-buffer'; import { Fr } from '@aztec/foundation/fields'; import { schemas } from '@aztec/foundation/schemas'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type IndexedTreeLeaf, type IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import type { IndexedTreeLeaf, IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/tx/block_header.ts b/yarn-project/stdlib/src/tx/block_header.ts index 4483464848cc..8e78637f1e36 100644 --- a/yarn-project/stdlib/src/tx/block_header.ts +++ b/yarn-project/stdlib/src/tx/block_header.ts @@ -4,7 +4,7 @@ import { Fr } from '@aztec/foundation/fields'; import { type ZodFor, schemas } from '@aztec/foundation/schemas'; import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { inspect } from 'util'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/tx/call_context.ts b/yarn-project/stdlib/src/tx/call_context.ts index 231ef6bdb416..e72c598efdfc 100644 --- a/yarn-project/stdlib/src/tx/call_context.ts +++ b/yarn-project/stdlib/src/tx/call_context.ts @@ -1,7 +1,7 @@ import { CALL_CONTEXT_LENGTH } from '@aztec/constants'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { inspect } from 'util'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/tx/function_data.ts b/yarn-project/stdlib/src/tx/function_data.ts index 055d72fa2d53..33d773b2920a 100644 --- a/yarn-project/stdlib/src/tx/function_data.ts +++ b/yarn-project/stdlib/src/tx/function_data.ts @@ -5,7 +5,7 @@ import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/ import { z } from 'zod'; import { type FunctionAbi, FunctionSelector, FunctionType } from '../abi/index.js'; -import { type ContractFunctionDao } from '../contract/contract_function_dao.js'; +import type { ContractFunctionDao } from '../contract/contract_function_dao.js'; /** Function description for circuit. */ export class FunctionData { diff --git a/yarn-project/stdlib/src/tx/global_variables.ts b/yarn-project/stdlib/src/tx/global_variables.ts index 839aad902814..7969ea3cf358 100644 --- a/yarn-project/stdlib/src/tx/global_variables.ts +++ b/yarn-project/stdlib/src/tx/global_variables.ts @@ -3,7 +3,7 @@ import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; import { jsonStringify } from '@aztec/foundation/json-rpc'; import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { inspect } from 'util'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/tx/max_block_number.ts b/yarn-project/stdlib/src/tx/max_block_number.ts index 95e1b25ac11b..35e711c97b19 100644 --- a/yarn-project/stdlib/src/tx/max_block_number.ts +++ b/yarn-project/stdlib/src/tx/max_block_number.ts @@ -1,7 +1,7 @@ import { MAX_BLOCK_NUMBER_LENGTH } from '@aztec/constants'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; /** * Maximum block number. diff --git a/yarn-project/stdlib/src/tx/partial_state_reference.ts b/yarn-project/stdlib/src/tx/partial_state_reference.ts index c243b4b66641..6fd874824993 100644 --- a/yarn-project/stdlib/src/tx/partial_state_reference.ts +++ b/yarn-project/stdlib/src/tx/partial_state_reference.ts @@ -1,5 +1,5 @@ import { PARTIAL_STATE_REFERENCE_LENGTH } from '@aztec/constants'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/tx/private_execution_result.ts b/yarn-project/stdlib/src/tx/private_execution_result.ts index 19ef51636eba..37a51e6884d7 100644 --- a/yarn-project/stdlib/src/tx/private_execution_result.ts +++ b/yarn-project/stdlib/src/tx/private_execution_result.ts @@ -1,7 +1,7 @@ import { timesParallel } from '@aztec/foundation/collection'; import { randomBytes, randomInt } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/tx/processed_tx.ts b/yarn-project/stdlib/src/tx/processed_tx.ts index a255f029510c..7005ac1361af 100644 --- a/yarn-project/stdlib/src/tx/processed_tx.ts +++ b/yarn-project/stdlib/src/tx/processed_tx.ts @@ -5,13 +5,13 @@ import type { PublicDataWrite } from '../avm/public_data_write.js'; import { RevertCode } from '../avm/revert_code.js'; import type { SimulationError } from '../errors/simulation_error.js'; import { Gas } from '../gas/gas.js'; -import { type GasUsed } from '../gas/gas_used.js'; +import type { GasUsed } from '../gas/gas_used.js'; import { siloL2ToL1Message } from '../hash/hash.js'; import { CombinedConstantData } from '../kernel/combined_constant_data.js'; import type { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js'; import type { ClientIvcProof } from '../proofs/client_ivc_proof.js'; import type { GlobalVariables } from './global_variables.js'; -import { type Tx } from './tx.js'; +import type { Tx } from './tx.js'; import { TxEffect } from './tx_effect.js'; import type { TxHash } from './tx_hash.js'; diff --git a/yarn-project/stdlib/src/tx/public_execution_request.ts b/yarn-project/stdlib/src/tx/public_execution_request.ts index 59e9e9ebd30c..e246886798ef 100644 --- a/yarn-project/stdlib/src/tx/public_execution_request.ts +++ b/yarn-project/stdlib/src/tx/public_execution_request.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { inspect } from 'util'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/tx/public_simulation_output.ts b/yarn-project/stdlib/src/tx/public_simulation_output.ts index b75adb0bf5bd..cebc7e58a61d 100644 --- a/yarn-project/stdlib/src/tx/public_simulation_output.ts +++ b/yarn-project/stdlib/src/tx/public_simulation_output.ts @@ -6,7 +6,7 @@ import { z } from 'zod'; import { SimulationError } from '../errors/simulation_error.js'; import { Gas } from '../gas/gas.js'; -import { type GasUsed } from '../gas/gas_used.js'; +import type { GasUsed } from '../gas/gas_used.js'; import { CombinedConstantData } from '../kernel/combined_constant_data.js'; import { TxEffect } from '../tx/tx_effect.js'; diff --git a/yarn-project/stdlib/src/tx/simulated_tx.ts b/yarn-project/stdlib/src/tx/simulated_tx.ts index 35ca1d7295e1..1caac2081739 100644 --- a/yarn-project/stdlib/src/tx/simulated_tx.ts +++ b/yarn-project/stdlib/src/tx/simulated_tx.ts @@ -1,10 +1,10 @@ import type { ZodFor } from '@aztec/foundation/schemas'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { z } from 'zod'; import { Gas } from '../gas/gas.js'; -import { type GasUsed } from '../gas/gas_used.js'; +import type { GasUsed } from '../gas/gas_used.js'; import { type PrivateKernelProverProfileResult, PrivateKernelProverProfileResultSchema, diff --git a/yarn-project/stdlib/src/tx/state_reference.ts b/yarn-project/stdlib/src/tx/state_reference.ts index 113b72f00db5..9eb4ad951f60 100644 --- a/yarn-project/stdlib/src/tx/state_reference.ts +++ b/yarn-project/stdlib/src/tx/state_reference.ts @@ -1,5 +1,5 @@ import { STATE_REFERENCE_LENGTH } from '@aztec/constants'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { inspect } from 'util'; diff --git a/yarn-project/stdlib/src/tx/tree_snapshots.ts b/yarn-project/stdlib/src/tx/tree_snapshots.ts index dda0e8b4cd30..479ecf31282f 100644 --- a/yarn-project/stdlib/src/tx/tree_snapshots.ts +++ b/yarn-project/stdlib/src/tx/tree_snapshots.ts @@ -1,5 +1,5 @@ import { TREE_SNAPSHOTS_LENGTH } from '@aztec/constants'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { inspect } from 'util'; diff --git a/yarn-project/stdlib/src/tx/tx.ts b/yarn-project/stdlib/src/tx/tx.ts index 8908ac619134..1825b1a8f16f 100644 --- a/yarn-project/stdlib/src/tx/tx.ts +++ b/yarn-project/stdlib/src/tx/tx.ts @@ -3,7 +3,7 @@ import { arraySerializedSizeOfNonEmpty } from '@aztec/foundation/collection'; import { Fr } from '@aztec/foundation/fields'; import type { ZodFor } from '@aztec/foundation/schemas'; import { BufferReader, serializeArrayOfBufferableToVector, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/tx/tx_constant_data.ts b/yarn-project/stdlib/src/tx/tx_constant_data.ts index cfb30156b206..13d6aaf9c8ab 100644 --- a/yarn-project/stdlib/src/tx/tx_constant_data.ts +++ b/yarn-project/stdlib/src/tx/tx_constant_data.ts @@ -1,7 +1,7 @@ import { TX_CONSTANT_DATA_LENGTH } from '@aztec/constants'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { BlockHeader } from './block_header.js'; import { TxContext } from './tx_context.js'; diff --git a/yarn-project/stdlib/src/tx/tx_context.ts b/yarn-project/stdlib/src/tx/tx_context.ts index fa29fcbb31bc..1309db4494bc 100644 --- a/yarn-project/stdlib/src/tx/tx_context.ts +++ b/yarn-project/stdlib/src/tx/tx_context.ts @@ -2,7 +2,7 @@ import { TX_CONTEXT_LENGTH } from '@aztec/constants'; import { Fr } from '@aztec/foundation/fields'; import { schemas } from '@aztec/foundation/schemas'; import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/tx/tx_execution_request.ts b/yarn-project/stdlib/src/tx/tx_execution_request.ts index 9161b8e7b829..bf29e3311797 100644 --- a/yarn-project/stdlib/src/tx/tx_execution_request.ts +++ b/yarn-project/stdlib/src/tx/tx_execution_request.ts @@ -1,7 +1,7 @@ import { Fr } from '@aztec/foundation/fields'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { bufferToHex, hexToBuffer } from '@aztec/foundation/string'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { FunctionSelector } from '@aztec/stdlib/abi'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { type ZodFor, schemas } from '@aztec/stdlib/schemas'; diff --git a/yarn-project/stdlib/src/tx/tx_receipt.ts b/yarn-project/stdlib/src/tx/tx_receipt.ts index 4a494d224e9b..03a20fac3e86 100644 --- a/yarn-project/stdlib/src/tx/tx_receipt.ts +++ b/yarn-project/stdlib/src/tx/tx_receipt.ts @@ -1,5 +1,5 @@ -import { type Fr } from '@aztec/foundation/fields'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { Fr } from '@aztec/foundation/fields'; +import type { FieldsOf } from '@aztec/foundation/types'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/tx/tx_request.ts b/yarn-project/stdlib/src/tx/tx_request.ts index 35aba6097ea6..e51658b0df37 100644 --- a/yarn-project/stdlib/src/tx/tx_request.ts +++ b/yarn-project/stdlib/src/tx/tx_request.ts @@ -2,7 +2,7 @@ import { GeneratorIndex, TX_REQUEST_LENGTH } from '@aztec/constants'; import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import type { FieldsOf } from '@aztec/foundation/types'; import { AztecAddress } from '../aztec-address/index.js'; import { FunctionData } from './function_data.js'; diff --git a/yarn-project/stdlib/src/tx/validator/empty_validator.ts b/yarn-project/stdlib/src/tx/validator/empty_validator.ts index ccb15a050721..3cee0fdbc748 100644 --- a/yarn-project/stdlib/src/tx/validator/empty_validator.ts +++ b/yarn-project/stdlib/src/tx/validator/empty_validator.ts @@ -1,4 +1,4 @@ -import { type AnyTx, type TxValidationResult, type TxValidator } from './tx_validator.js'; +import type { AnyTx, TxValidationResult, TxValidator } from './tx_validator.js'; export class EmptyTxValidator implements TxValidator { public validateTx(_tx: T): Promise { diff --git a/yarn-project/stdlib/src/tx/validator/tx_validator.ts b/yarn-project/stdlib/src/tx/validator/tx_validator.ts index 6ec689da4b54..4d4a2b6cbeca 100644 --- a/yarn-project/stdlib/src/tx/validator/tx_validator.ts +++ b/yarn-project/stdlib/src/tx/validator/tx_validator.ts @@ -1,8 +1,8 @@ import { z } from 'zod'; -import { type ZodFor } from '../../schemas/schemas.js'; -import { type ProcessedTx } from '../processed_tx.js'; -import { type Tx } from '../tx.js'; +import type { ZodFor } from '../../schemas/schemas.js'; +import type { ProcessedTx } from '../processed_tx.js'; +import type { Tx } from '../tx.js'; export type AnyTx = Tx | ProcessedTx; diff --git a/yarn-project/stdlib/src/versioning/versioning.test.ts b/yarn-project/stdlib/src/versioning/versioning.test.ts index 461c72575b16..c3dd5126f79b 100644 --- a/yarn-project/stdlib/src/versioning/versioning.test.ts +++ b/yarn-project/stdlib/src/versioning/versioning.test.ts @@ -2,7 +2,7 @@ import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; import { createSafeJsonRpcClient } from '@aztec/foundation/json-rpc/client'; import { type JsonRpcTestContext, createJsonRpcTestSetup } from '@aztec/foundation/json-rpc/test'; -import { type ApiSchemaFor } from '@aztec/stdlib/schemas'; +import type { ApiSchemaFor } from '@aztec/stdlib/schemas'; import { z } from 'zod'; diff --git a/yarn-project/stdlib/src/versioning/versioning.ts b/yarn-project/stdlib/src/versioning/versioning.ts index d043a9aebffd..aa56fc6ea364 100644 --- a/yarn-project/stdlib/src/versioning/versioning.ts +++ b/yarn-project/stdlib/src/versioning/versioning.ts @@ -1,10 +1,10 @@ -import { type EthAddress } from '@aztec/foundation/eth-address'; -import { type Fr } from '@aztec/foundation/fields'; +import type { EthAddress } from '@aztec/foundation/eth-address'; +import type { Fr } from '@aztec/foundation/fields'; import { jsonStringify } from '@aztec/foundation/json-rpc'; import type Koa from 'koa'; -import { type ChainConfig } from '../config/config.js'; +import type { ChainConfig } from '../config/config.js'; // REFACTOR: This file is not a circuit-type, but at the moment we don't have any other // package common to all components that we can use for this shared code. diff --git a/yarn-project/stdlib/src/vks/vk_witness_data.ts b/yarn-project/stdlib/src/vks/vk_witness_data.ts index 6ef5c53be811..f03806bd4af3 100644 --- a/yarn-project/stdlib/src/vks/vk_witness_data.ts +++ b/yarn-project/stdlib/src/vks/vk_witness_data.ts @@ -4,7 +4,7 @@ import { Fr } from '@aztec/foundation/fields'; import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; import { bufferToHex } from '@aztec/foundation/string'; -import { type UInt32 } from '../types/shared.js'; +import type { UInt32 } from '../types/shared.js'; import { VerificationKeyData } from './verification_key.js'; export class VkWitnessData { diff --git a/yarn-project/telemetry-client/src/bench.ts b/yarn-project/telemetry-client/src/bench.ts index 7e6d53b8446b..370acd7875a8 100644 --- a/yarn-project/telemetry-client/src/bench.ts +++ b/yarn-project/telemetry-client/src/bench.ts @@ -1,23 +1,17 @@ -import { - type BatchObservableCallback, - type Context, - type MetricOptions, - type Observable, - type ValueType, -} from '@opentelemetry/api'; +import type { BatchObservableCallback, Context, MetricOptions, Observable, ValueType } from '@opentelemetry/api'; import { NoopTracer } from './noop.js'; -import { - type AttributesType, - type Gauge, - type Histogram, - type Meter, - type MetricsType, - type ObservableGauge, - type ObservableUpDownCounter, - type TelemetryClient, - type Tracer, - type UpDownCounter, +import type { + AttributesType, + Gauge, + Histogram, + Meter, + MetricsType, + ObservableGauge, + ObservableUpDownCounter, + TelemetryClient, + Tracer, + UpDownCounter, } from './telemetry.js'; export type BenchmarkMetricsType = { diff --git a/yarn-project/telemetry-client/src/noop.ts b/yarn-project/telemetry-client/src/noop.ts index 5dc7f4f4046d..555ea0ea848d 100644 --- a/yarn-project/telemetry-client/src/noop.ts +++ b/yarn-project/telemetry-client/src/noop.ts @@ -1,6 +1,6 @@ import { type Meter, type Span, type SpanContext, type Tracer, createNoopMeter } from '@opentelemetry/api'; -import { type TelemetryClient } from './telemetry.js'; +import type { TelemetryClient } from './telemetry.js'; export class NoopTelemetryClient implements TelemetryClient { getMeter(): Meter { diff --git a/yarn-project/telemetry-client/src/otel.ts b/yarn-project/telemetry-client/src/otel.ts index cea8bc46b4c7..d5585005d385 100644 --- a/yarn-project/telemetry-client/src/otel.ts +++ b/yarn-project/telemetry-client/src/otel.ts @@ -16,8 +16,8 @@ import { import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http'; import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'; import { HostMetrics } from '@opentelemetry/host-metrics'; -import { type IResource } from '@opentelemetry/resources'; -import { type LoggerProvider } from '@opentelemetry/sdk-logs'; +import type { IResource } from '@opentelemetry/resources'; +import type { LoggerProvider } from '@opentelemetry/sdk-logs'; import { ExplicitBucketHistogramAggregation, InstrumentType, @@ -29,12 +29,12 @@ import { import { BatchSpanProcessor, NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from '@opentelemetry/semantic-conventions'; -import { type TelemetryClientConfig } from './config.js'; +import type { TelemetryClientConfig } from './config.js'; import { EventLoopMonitor } from './event_loop_monitor.js'; import { OtelFilterMetricExporter } from './otel_filter_metric_exporter.js'; import { registerOtelLoggerProvider } from './otel_logger_provider.js'; import { getOtelResource } from './otel_resource.js'; -import { type Gauge, type TelemetryClient } from './telemetry.js'; +import type { Gauge, TelemetryClient } from './telemetry.js'; export type OpenTelemetryClientFactory = (resource: IResource, log: Logger) => OpenTelemetryClient; diff --git a/yarn-project/telemetry-client/src/otel_filter_metric_exporter.ts b/yarn-project/telemetry-client/src/otel_filter_metric_exporter.ts index 34fef5fe2890..fd863c208560 100644 --- a/yarn-project/telemetry-client/src/otel_filter_metric_exporter.ts +++ b/yarn-project/telemetry-client/src/otel_filter_metric_exporter.ts @@ -1,5 +1,5 @@ -import { type ExportResult } from '@opentelemetry/core'; -import { type MetricData, type PushMetricExporter, type ResourceMetrics } from '@opentelemetry/sdk-metrics'; +import type { ExportResult } from '@opentelemetry/core'; +import type { MetricData, PushMetricExporter, ResourceMetrics } from '@opentelemetry/sdk-metrics'; export class OtelFilterMetricExporter implements PushMetricExporter { constructor(private readonly exporter: PushMetricExporter, private readonly excludeMetricPrefixes: string[]) { diff --git a/yarn-project/telemetry-client/src/otel_logger_provider.ts b/yarn-project/telemetry-client/src/otel_logger_provider.ts index 6efeaaca3343..d34ef6dc1b13 100644 --- a/yarn-project/telemetry-client/src/otel_logger_provider.ts +++ b/yarn-project/telemetry-client/src/otel_logger_provider.ts @@ -1,7 +1,7 @@ import { logs as otelLogs } from '@opentelemetry/api-logs'; import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http'; import { CompressionAlgorithm } from '@opentelemetry/otlp-exporter-base'; -import { type IResource } from '@opentelemetry/resources'; +import type { IResource } from '@opentelemetry/resources'; import { BatchLogRecordProcessor, LoggerProvider } from '@opentelemetry/sdk-logs'; export function registerOtelLoggerProvider(resource: IResource, otelLogsUrl?: URL) { diff --git a/yarn-project/telemetry-client/src/prom_otel_adapter.test.ts b/yarn-project/telemetry-client/src/prom_otel_adapter.test.ts index 1f3495543f86..126e9c0cf4a1 100644 --- a/yarn-project/telemetry-client/src/prom_otel_adapter.test.ts +++ b/yarn-project/telemetry-client/src/prom_otel_adapter.test.ts @@ -1,9 +1,9 @@ -import { type Logger } from '@aztec/foundation/log'; +import type { Logger } from '@aztec/foundation/log'; import { jest } from '@jest/globals'; import { OtelGauge } from './prom_otel_adapter.js'; -import { type Meter, type ObservableGauge } from './telemetry.js'; +import type { Meter, ObservableGauge } from './telemetry.js'; describe('OtelGauge', () => { let mockLogger: Logger; diff --git a/yarn-project/telemetry-client/src/prom_otel_adapter.ts b/yarn-project/telemetry-client/src/prom_otel_adapter.ts index 08ee65a306ad..1fc040f8b4e9 100644 --- a/yarn-project/telemetry-client/src/prom_otel_adapter.ts +++ b/yarn-project/telemetry-client/src/prom_otel_adapter.ts @@ -2,7 +2,7 @@ import { type Logger, createLogger } from '@aztec/foundation/log'; import { Registry } from 'prom-client'; -import { type Meter, type MetricsType, type ObservableGauge, type TelemetryClient } from './telemetry.js'; +import type { Meter, MetricsType, ObservableGauge, TelemetryClient } from './telemetry.js'; /** * Types matching the gossipsub and libp2p services diff --git a/yarn-project/telemetry-client/src/start.ts b/yarn-project/telemetry-client/src/start.ts index 80d2604508af..5aa8c9c3a261 100644 --- a/yarn-project/telemetry-client/src/start.ts +++ b/yarn-project/telemetry-client/src/start.ts @@ -1,9 +1,9 @@ import { createLogger } from '@aztec/foundation/log'; -import { type TelemetryClientConfig } from './config.js'; +import type { TelemetryClientConfig } from './config.js'; import { NoopTelemetryClient } from './noop.js'; import { OpenTelemetryClient } from './otel.js'; -import { type TelemetryClient } from './telemetry.js'; +import type { TelemetryClient } from './telemetry.js'; export * from './config.js'; diff --git a/yarn-project/telemetry-client/src/with_tracer.ts b/yarn-project/telemetry-client/src/with_tracer.ts index 6033f1686ea1..261b87596506 100644 --- a/yarn-project/telemetry-client/src/with_tracer.ts +++ b/yarn-project/telemetry-client/src/with_tracer.ts @@ -1,4 +1,4 @@ -import { type TelemetryClient, type Tracer } from './telemetry.js'; +import type { TelemetryClient, Tracer } from './telemetry.js'; /** * A minimal class that enables recording metrics with a telemetry client. diff --git a/yarn-project/telemetry-client/src/wrappers/fetch.ts b/yarn-project/telemetry-client/src/wrappers/fetch.ts index 9da03aa1b055..f7186c36b9b1 100644 --- a/yarn-project/telemetry-client/src/wrappers/fetch.ts +++ b/yarn-project/telemetry-client/src/wrappers/fetch.ts @@ -1,5 +1,5 @@ import { defaultFetch } from '@aztec/foundation/json-rpc/client'; -import { type Logger } from '@aztec/foundation/log'; +import type { Logger } from '@aztec/foundation/log'; import { makeBackoff, retry } from '@aztec/foundation/retry'; import { SpanKind, SpanStatusCode, context, propagation } from '@opentelemetry/api'; diff --git a/yarn-project/telemetry-client/src/wrappers/json_rpc_server.ts b/yarn-project/telemetry-client/src/wrappers/json_rpc_server.ts index d13a1cb1332c..4bc5e822fe91 100644 --- a/yarn-project/telemetry-client/src/wrappers/json_rpc_server.ts +++ b/yarn-project/telemetry-client/src/wrappers/json_rpc_server.ts @@ -1,5 +1,5 @@ import { type SafeJsonRpcServerOptions, createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server'; -import { type ApiSchemaFor } from '@aztec/stdlib/schemas'; +import type { ApiSchemaFor } from '@aztec/stdlib/schemas'; import { getOtelJsonRpcPropagationMiddleware } from '../otel_propagation.js'; diff --git a/yarn-project/txe/src/index.ts b/yarn-project/txe/src/index.ts index 5e826053ab20..ca6daa6e4f80 100644 --- a/yarn-project/txe/src/index.ts +++ b/yarn-project/txe/src/index.ts @@ -10,8 +10,8 @@ import { loadContractArtifact, } from '@aztec/aztec.js'; import { createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server'; -import { type Logger } from '@aztec/foundation/log'; -import { type ApiSchemaFor, type ZodFor } from '@aztec/stdlib/schemas'; +import type { Logger } from '@aztec/foundation/log'; +import type { ApiSchemaFor, ZodFor } from '@aztec/stdlib/schemas'; import { readFile, readdir } from 'fs/promises'; import { join } from 'path'; diff --git a/yarn-project/txe/src/node/txe_node.ts b/yarn-project/txe/src/node/txe_node.ts index 0af9d6bc9dc6..9863013b3720 100644 --- a/yarn-project/txe/src/node/txe_node.ts +++ b/yarn-project/txe/src/node/txe_node.ts @@ -6,32 +6,28 @@ import { type PUBLIC_DATA_TREE_HEIGHT, PUBLIC_LOG_DATA_SIZE_IN_FIELDS, } from '@aztec/constants'; -import { type L1ContractAddresses } from '@aztec/ethereum'; +import type { L1ContractAddresses } from '@aztec/ethereum'; import { poseidon2Hash } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; -import { type SiblingPath } from '@aztec/foundation/trees'; +import type { SiblingPath } from '@aztec/foundation/trees'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; import { type InBlock, L2Block, L2BlockHash, type L2BlockNumber, type L2Tips } from '@aztec/stdlib/block'; -import { - type ContractClassPublic, - type ContractInstanceWithAddress, - type NodeInfo, - type ProtocolContractAddresses, +import type { + ContractClassPublic, + ContractInstanceWithAddress, + NodeInfo, + ProtocolContractAddresses, } from '@aztec/stdlib/contract'; import type { GasFees } from '@aztec/stdlib/gas'; import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash'; -import { - type AztecNode, - type GetContractClassLogsResponse, - type GetPublicLogsResponse, -} from '@aztec/stdlib/interfaces/client'; -import { - type MerkleTreeReadOperations, - type MerkleTreeWriteOperations, - type ProverConfig, - type SequencerConfig, - type WorldStateSyncStatus, +import type { AztecNode, GetContractClassLogsResponse, GetPublicLogsResponse } from '@aztec/stdlib/interfaces/client'; +import type { + MerkleTreeReadOperations, + MerkleTreeWriteOperations, + ProverConfig, + SequencerConfig, + WorldStateSyncStatus, } from '@aztec/stdlib/interfaces/server'; import { type LogFilter, type PrivateLog, type PublicLog, TxScopedL2Log } from '@aztec/stdlib/logs'; import { @@ -49,7 +45,7 @@ import { TxReceipt, type TxValidationResult, } from '@aztec/stdlib/tx'; -import { type NativeWorldStateService } from '@aztec/world-state'; +import type { NativeWorldStateService } from '@aztec/world-state'; export class TXENode implements AztecNode { #logsByTags = new Map(); diff --git a/yarn-project/txe/src/oracle/txe_oracle.ts b/yarn-project/txe/src/oracle/txe_oracle.ts index c4dc75cd5e11..43b9c49dd54d 100644 --- a/yarn-project/txe/src/oracle/txe_oracle.ts +++ b/yarn-project/txe/src/oracle/txe_oracle.ts @@ -15,7 +15,7 @@ import { Schnorr, poseidon2Hash } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; import { type LogFn, type Logger, applyStringFormatting, createDebugOnlyLogger } from '@aztec/foundation/log'; import { Timer } from '@aztec/foundation/timer'; -import { type KeyStore } from '@aztec/key-store'; +import type { KeyStore } from '@aztec/key-store'; import { ContractDataOracle, SimulatorOracle, enrichPublicSimulationError } from '@aztec/pxe'; import { ExecutionNoteCache, @@ -50,7 +50,7 @@ import { import { AuthWitness } from '@aztec/stdlib/auth-witness'; import { PublicDataWrite } from '@aztec/stdlib/avm'; import { AztecAddress } from '@aztec/stdlib/aztec-address'; -import { type ContractInstance, type ContractInstanceWithAddress } from '@aztec/stdlib/contract'; +import type { ContractInstance, ContractInstanceWithAddress } from '@aztec/stdlib/contract'; import { SimulationError } from '@aztec/stdlib/errors'; import { Gas, GasFees } from '@aztec/stdlib/gas'; import { @@ -60,13 +60,13 @@ import { siloNoteHash, siloNullifier, } from '@aztec/stdlib/hash'; -import { type MerkleTreeReadOperations, type MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeReadOperations, MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; import { type KeyValidationRequest, PrivateContextInputs } from '@aztec/stdlib/kernel'; import { computeTaggingSecretPoint, deriveKeys } from '@aztec/stdlib/keys'; import { LogWithTxData, UnencryptedL2Log } from '@aztec/stdlib/logs'; import { IndexedTaggingSecret, type PrivateLog, type PublicLog } from '@aztec/stdlib/logs'; import type { NoteStatus } from '@aztec/stdlib/note'; -import { type CircuitWitnessGenerationStats } from '@aztec/stdlib/stats'; +import type { CircuitWitnessGenerationStats } from '@aztec/stdlib/stats'; import { makeAppendOnlyTreeSnapshot, makeContentCommitment, @@ -86,7 +86,7 @@ import { BlockHeader, CallContext, GlobalVariables, PublicExecutionRequest, TxEf import { ForkCheckpoint, type NativeWorldStateService } from '@aztec/world-state/native'; import { TXENode } from '../node/txe_node.js'; -import { type TXEDatabase } from '../util/txe_database.js'; +import type { TXEDatabase } from '../util/txe_database.js'; import { TXEPublicContractDataSource } from '../util/txe_public_contract_data_source.js'; import { TXEWorldStateDB } from '../util/txe_world_state_db.js'; diff --git a/yarn-project/txe/src/txe_service/txe_service.ts b/yarn-project/txe/src/txe_service/txe_service.ts index e8da9e958651..4f96fb899251 100644 --- a/yarn-project/txe/src/txe_service/txe_service.ts +++ b/yarn-project/txe/src/txe_service/txe_service.ts @@ -1,12 +1,12 @@ import { type ContractInstanceWithAddress, Fr } from '@aztec/aztec.js'; import { DEPLOYER_CONTRACT_ADDRESS } from '@aztec/constants'; -import { type Logger } from '@aztec/foundation/log'; +import type { Logger } from '@aztec/foundation/log'; import { KeyStore } from '@aztec/key-store'; import { openTmpStore } from '@aztec/kv-store/lmdb-v2'; import { protocolContractNames } from '@aztec/protocol-contracts'; import { getCanonicalProtocolContract } from '@aztec/protocol-contracts/bundle'; import { enrichPublicSimulationError } from '@aztec/pxe'; -import { type TypedOracle } from '@aztec/simulator/client'; +import type { TypedOracle } from '@aztec/simulator/client'; import { HashedValuesCache } from '@aztec/simulator/server'; import { type ContractArtifact, FunctionSelector, NoteSelector } from '@aztec/stdlib/abi'; import { PublicDataWrite } from '@aztec/stdlib/avm'; diff --git a/yarn-project/txe/src/util/txe_database.ts b/yarn-project/txe/src/util/txe_database.ts index 1202e7433800..b4fcf8eb66bc 100644 --- a/yarn-project/txe/src/util/txe_database.ts +++ b/yarn-project/txe/src/util/txe_database.ts @@ -1,6 +1,6 @@ -import { type AztecAsyncKVStore, type AztecAsyncMap } from '@aztec/kv-store'; +import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store'; import { KVPxeDatabase } from '@aztec/pxe'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { CompleteAddress } from '@aztec/stdlib/contract'; export class TXEDatabase extends KVPxeDatabase { diff --git a/yarn-project/txe/src/util/txe_public_contract_data_source.ts b/yarn-project/txe/src/util/txe_public_contract_data_source.ts index 040405d27104..b98083453fbd 100644 --- a/yarn-project/txe/src/util/txe_public_contract_data_source.ts +++ b/yarn-project/txe/src/util/txe_public_contract_data_source.ts @@ -2,7 +2,7 @@ import { PUBLIC_DISPATCH_SELECTOR } from '@aztec/constants'; import { Fr } from '@aztec/foundation/fields'; import { PrivateFunctionsTree } from '@aztec/pxe'; import { type ContractArtifact, FunctionSelector } from '@aztec/stdlib/abi'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import { type ContractClassPublic, type ContractDataSource, @@ -11,7 +11,7 @@ import { computePublicBytecodeCommitment, } from '@aztec/stdlib/contract'; -import { type TXE } from '../oracle/txe_oracle.js'; +import type { TXE } from '../oracle/txe_oracle.js'; export class TXEPublicContractDataSource implements ContractDataSource { constructor(private txeOracle: TXE) {} diff --git a/yarn-project/txe/src/util/txe_world_state_db.ts b/yarn-project/txe/src/util/txe_world_state_db.ts index 1d0519caa60d..d63859b922f7 100644 --- a/yarn-project/txe/src/util/txe_world_state_db.ts +++ b/yarn-project/txe/src/util/txe_world_state_db.ts @@ -1,13 +1,13 @@ import { Fr } from '@aztec/foundation/fields'; import { WorldStateDB } from '@aztec/simulator/server'; import { PublicDataWrite } from '@aztec/stdlib/avm'; -import { type AztecAddress } from '@aztec/stdlib/aztec-address'; +import type { AztecAddress } from '@aztec/stdlib/aztec-address'; import type { ContractDataSource } from '@aztec/stdlib/contract'; import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash'; -import { type MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; import { MerkleTreeId, type PublicDataTreeLeafPreimage } from '@aztec/stdlib/trees'; -import { type TXE } from '../oracle/txe_oracle.js'; +import type { TXE } from '../oracle/txe_oracle.js'; export class TXEWorldStateDB extends WorldStateDB { constructor(private merkleDb: MerkleTreeWriteOperations, dataSource: ContractDataSource, private txe: TXE) { diff --git a/yarn-project/validator-client/src/duties/validation_service.ts b/yarn-project/validator-client/src/duties/validation_service.ts index c254f3420bad..a60aeafeeebf 100644 --- a/yarn-project/validator-client/src/duties/validation_service.ts +++ b/yarn-project/validator-client/src/duties/validation_service.ts @@ -1,10 +1,10 @@ import { Buffer32 } from '@aztec/foundation/buffer'; import { keccak256 } from '@aztec/foundation/crypto'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { BlockAttestation, BlockProposal, ConsensusPayload, SignatureDomainSeparator } from '@aztec/stdlib/p2p'; -import { type BlockHeader, type TxHash } from '@aztec/stdlib/tx'; +import type { BlockHeader, TxHash } from '@aztec/stdlib/tx'; -import { type ValidatorKeyStore } from '../key_store/interface.js'; +import type { ValidatorKeyStore } from '../key_store/interface.js'; export class ValidationService { constructor(private keyStore: ValidatorKeyStore) {} diff --git a/yarn-project/validator-client/src/errors/validator.error.ts b/yarn-project/validator-client/src/errors/validator.error.ts index 2a99067424d4..36f4eaf93f30 100644 --- a/yarn-project/validator-client/src/errors/validator.error.ts +++ b/yarn-project/validator-client/src/errors/validator.error.ts @@ -1,4 +1,4 @@ -import { type TxHash } from '@aztec/stdlib/tx'; +import type { TxHash } from '@aztec/stdlib/tx'; export class ValidatorError extends Error { constructor(message: string) { diff --git a/yarn-project/validator-client/src/factory.ts b/yarn-project/validator-client/src/factory.ts index bd29a1cf312b..fc084309af03 100644 --- a/yarn-project/validator-client/src/factory.ts +++ b/yarn-project/validator-client/src/factory.ts @@ -1,11 +1,11 @@ -import { type EpochCache } from '@aztec/epoch-cache'; -import { type DateProvider } from '@aztec/foundation/timer'; -import { type P2P } from '@aztec/p2p'; -import { type TelemetryClient } from '@aztec/telemetry-client'; +import type { EpochCache } from '@aztec/epoch-cache'; +import type { DateProvider } from '@aztec/foundation/timer'; +import type { P2P } from '@aztec/p2p'; +import type { TelemetryClient } from '@aztec/telemetry-client'; import { generatePrivateKey } from 'viem/accounts'; -import { type ValidatorClientConfig } from './config.js'; +import type { ValidatorClientConfig } from './config.js'; import { ValidatorClient } from './validator.js'; export function createValidatorClient( diff --git a/yarn-project/validator-client/src/key_store/interface.ts b/yarn-project/validator-client/src/key_store/interface.ts index eddf3aab7edb..07485e8d6e67 100644 --- a/yarn-project/validator-client/src/key_store/interface.ts +++ b/yarn-project/validator-client/src/key_store/interface.ts @@ -1,6 +1,6 @@ -import { type Buffer32 } from '@aztec/foundation/buffer'; -import { type EthAddress } from '@aztec/foundation/eth-address'; -import { type Signature } from '@aztec/foundation/eth-signature'; +import type { Buffer32 } from '@aztec/foundation/buffer'; +import type { EthAddress } from '@aztec/foundation/eth-address'; +import type { Signature } from '@aztec/foundation/eth-signature'; /** Key Store * diff --git a/yarn-project/validator-client/src/key_store/local_key_store.ts b/yarn-project/validator-client/src/key_store/local_key_store.ts index 436bf4b0c338..ed6496c20bc4 100644 --- a/yarn-project/validator-client/src/key_store/local_key_store.ts +++ b/yarn-project/validator-client/src/key_store/local_key_store.ts @@ -1,9 +1,9 @@ -import { type Buffer32 } from '@aztec/foundation/buffer'; +import type { Buffer32 } from '@aztec/foundation/buffer'; import { Secp256k1Signer } from '@aztec/foundation/crypto'; -import { type EthAddress } from '@aztec/foundation/eth-address'; -import { type Signature } from '@aztec/foundation/eth-signature'; +import type { EthAddress } from '@aztec/foundation/eth-address'; +import type { Signature } from '@aztec/foundation/eth-signature'; -import { type ValidatorKeyStore } from './interface.js'; +import type { ValidatorKeyStore } from './interface.js'; /** * Local Key Store diff --git a/yarn-project/validator-client/src/metrics.ts b/yarn-project/validator-client/src/metrics.ts index d95d9f80ca98..481726ef8c64 100644 --- a/yarn-project/validator-client/src/metrics.ts +++ b/yarn-project/validator-client/src/metrics.ts @@ -1,4 +1,4 @@ -import { type BlockProposal } from '@aztec/stdlib/p2p'; +import type { BlockProposal } from '@aztec/stdlib/p2p'; import { Attributes, type Gauge, diff --git a/yarn-project/validator-client/src/validator.test.ts b/yarn-project/validator-client/src/validator.test.ts index dd523ff9c7f9..aef3bea0dcb4 100644 --- a/yarn-project/validator-client/src/validator.test.ts +++ b/yarn-project/validator-client/src/validator.test.ts @@ -1,12 +1,12 @@ /** * Validation logic unit tests */ -import { type EpochCache } from '@aztec/epoch-cache'; +import type { EpochCache } from '@aztec/epoch-cache'; import { Secp256k1Signer } from '@aztec/foundation/crypto'; import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; import { TestDateProvider } from '@aztec/foundation/timer'; -import { type P2P } from '@aztec/p2p'; +import type { P2P } from '@aztec/p2p'; import { makeBlockAttestation, makeBlockProposal, makeHeader, mockTx } from '@aztec/stdlib/testing'; import { TxHash } from '@aztec/stdlib/tx'; @@ -14,7 +14,7 @@ import { describe, expect, it } from '@jest/globals'; import { type MockProxy, mock } from 'jest-mock-extended'; import { type PrivateKeyAccount, generatePrivateKey, privateKeyToAccount } from 'viem/accounts'; -import { type ValidatorClientConfig } from './config.js'; +import type { ValidatorClientConfig } from './config.js'; import { AttestationTimeoutError, BlockBuilderNotProvidedError, diff --git a/yarn-project/validator-client/src/validator.ts b/yarn-project/validator-client/src/validator.ts index 1aa4c9cbe2d8..ee292b4f19c0 100644 --- a/yarn-project/validator-client/src/validator.ts +++ b/yarn-project/validator-client/src/validator.ts @@ -1,18 +1,18 @@ -import { type EpochCache } from '@aztec/epoch-cache'; +import type { EpochCache } from '@aztec/epoch-cache'; import { Buffer32 } from '@aztec/foundation/buffer'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; import { RunningPromise } from '@aztec/foundation/running-promise'; import { sleep } from '@aztec/foundation/sleep'; import { DateProvider, type Timer } from '@aztec/foundation/timer'; -import { type P2P } from '@aztec/p2p'; +import type { P2P } from '@aztec/p2p'; import { BlockProposalValidator } from '@aztec/p2p/msg_validators'; -import { type L2Block } from '@aztec/stdlib/block'; -import { type BlockAttestation, type BlockProposal } from '@aztec/stdlib/p2p'; -import { type BlockHeader, type GlobalVariables, type Tx, type TxHash } from '@aztec/stdlib/tx'; +import type { L2Block } from '@aztec/stdlib/block'; +import type { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p'; +import type { BlockHeader, GlobalVariables, Tx, TxHash } from '@aztec/stdlib/tx'; import { type TelemetryClient, WithTracer, getTelemetryClient } from '@aztec/telemetry-client'; -import { type ValidatorClientConfig } from './config.js'; +import type { ValidatorClientConfig } from './config.js'; import { ValidationService } from './duties/validation_service.js'; import { AttestationTimeoutError, @@ -23,7 +23,7 @@ import { ReExTimeoutError, TransactionsNotAvailableError, } from './errors/validator.error.js'; -import { type ValidatorKeyStore } from './key_store/interface.js'; +import type { ValidatorKeyStore } from './key_store/interface.js'; import { LocalKeyStore } from './key_store/local_key_store.js'; import { ValidatorMetrics } from './metrics.js'; diff --git a/yarn-project/world-state/src/native/fork_checkpoint.ts b/yarn-project/world-state/src/native/fork_checkpoint.ts index d6104158d142..c4172d689fc3 100644 --- a/yarn-project/world-state/src/native/fork_checkpoint.ts +++ b/yarn-project/world-state/src/native/fork_checkpoint.ts @@ -1,4 +1,4 @@ -import { type MerkleTreeCheckpointOperations } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeCheckpointOperations } from '@aztec/stdlib/interfaces/server'; export class ForkCheckpoint { private completed = false; diff --git a/yarn-project/world-state/src/native/merkle_trees_facade.ts b/yarn-project/world-state/src/native/merkle_trees_facade.ts index 4c6fecf79e4d..1fd7db9c7ccd 100644 --- a/yarn-project/world-state/src/native/merkle_trees_facade.ts +++ b/yarn-project/world-state/src/native/merkle_trees_facade.ts @@ -1,14 +1,14 @@ import { Fr } from '@aztec/foundation/fields'; import { serializeToBuffer } from '@aztec/foundation/serialize'; import { type IndexedTreeLeafPreimage, SiblingPath } from '@aztec/foundation/trees'; -import { - type BatchInsertionResult, - type IndexedTreeId, - type MerkleTreeLeafType, - type MerkleTreeReadOperations, - type MerkleTreeWriteOperations, - type SequentialInsertionResult, - type TreeInfo, +import type { + BatchInsertionResult, + IndexedTreeId, + MerkleTreeLeafType, + MerkleTreeReadOperations, + MerkleTreeWriteOperations, + SequentialInsertionResult, + TreeInfo, } from '@aztec/stdlib/interfaces/server'; import { MerkleTreeId, @@ -29,7 +29,7 @@ import { blockStateReference, treeStateReferenceToSnapshot, } from './message.js'; -import { type NativeWorldStateInstance } from './native_world_state_instance.js'; +import type { NativeWorldStateInstance } from './native_world_state_instance.js'; export class MerkleTreesFacade implements MerkleTreeReadOperations { constructor( diff --git a/yarn-project/world-state/src/native/message.ts b/yarn-project/world-state/src/native/message.ts index 3cfd4368e3e5..5638d928b0b5 100644 --- a/yarn-project/world-state/src/native/message.ts +++ b/yarn-project/world-state/src/native/message.ts @@ -1,5 +1,5 @@ import { Fr } from '@aztec/foundation/fields'; -import { type Tuple } from '@aztec/foundation/serialize'; +import type { Tuple } from '@aztec/foundation/serialize'; import { AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees'; import type { StateReference } from '@aztec/stdlib/tx'; import type { UInt32 } from '@aztec/stdlib/types'; diff --git a/yarn-project/world-state/src/native/native_world_state.test.ts b/yarn-project/world-state/src/native/native_world_state.test.ts index 2d8479467eed..eb16169e480c 100644 --- a/yarn-project/world-state/src/native/native_world_state.test.ts +++ b/yarn-project/world-state/src/native/native_world_state.test.ts @@ -11,10 +11,10 @@ import { } from '@aztec/constants'; import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; -import { type SiblingPath } from '@aztec/foundation/trees'; +import type { SiblingPath } from '@aztec/foundation/trees'; import { PublicDataWrite } from '@aztec/stdlib/avm'; -import { type L2Block } from '@aztec/stdlib/block'; -import { type MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; +import type { L2Block } from '@aztec/stdlib/block'; +import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; import { makeContentCommitment, makeGlobalVariables } from '@aztec/stdlib/testing'; import { AppendOnlyTreeSnapshot, MerkleTreeId, PublicDataTreeLeaf } from '@aztec/stdlib/trees'; import { BlockHeader } from '@aztec/stdlib/tx'; @@ -26,7 +26,7 @@ import { join } from 'path'; import { assertSameState, compareChains, mockBlock, mockEmptyBlock } from '../test/utils.js'; import { INITIAL_NULLIFIER_TREE_SIZE, INITIAL_PUBLIC_DATA_TREE_SIZE } from '../world-state-db/merkle_tree_db.js'; -import { type WorldStateStatusSummary } from './message.js'; +import type { WorldStateStatusSummary } from './message.js'; import { NativeWorldStateService, WORLD_STATE_VERSION_FILE } from './native_world_state.js'; import { WorldStateVersion } from './world_state_version.js'; diff --git a/yarn-project/world-state/src/native/native_world_state.ts b/yarn-project/world-state/src/native/native_world_state.ts index 12872ea67ab6..9f4b215c0671 100644 --- a/yarn-project/world-state/src/native/native_world_state.ts +++ b/yarn-project/world-state/src/native/native_world_state.ts @@ -3,11 +3,11 @@ import { padArrayEnd } from '@aztec/foundation/collection'; import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; -import { type L2Block } from '@aztec/stdlib/block'; -import { - type IndexedTreeId, - type MerkleTreeReadOperations, - type MerkleTreeWriteOperations, +import type { L2Block } from '@aztec/stdlib/block'; +import type { + IndexedTreeId, + MerkleTreeReadOperations, + MerkleTreeWriteOperations, } from '@aztec/stdlib/interfaces/server'; import { MerkleTreeId, NullifierLeaf, type NullifierLeafPreimage, PublicDataTreeLeaf } from '@aztec/stdlib/trees'; import { BlockHeader, PartialStateReference, StateReference } from '@aztec/stdlib/tx'; @@ -19,7 +19,7 @@ import { tmpdir } from 'os'; import { join } from 'path'; import { WorldStateInstrumentation } from '../instrumentation/instrumentation.js'; -import { type MerkleTreeAdminDatabase as MerkleTreeDatabase } from '../world-state-db/merkle_tree_db.js'; +import type { MerkleTreeAdminDatabase as MerkleTreeDatabase } from '../world-state-db/merkle_tree_db.js'; import { MerkleTreesFacade, MerkleTreesForkFacade, serializeLeaf } from './merkle_trees_facade.js'; import { WorldStateMessageType, diff --git a/yarn-project/world-state/src/native/native_world_state_instance.ts b/yarn-project/world-state/src/native/native_world_state_instance.ts index 3543f421f8dc..c53eed09fe32 100644 --- a/yarn-project/world-state/src/native/native_world_state_instance.ts +++ b/yarn-project/world-state/src/native/native_world_state_instance.ts @@ -16,7 +16,7 @@ import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees'; import assert from 'assert'; import { cpus } from 'os'; -import { type WorldStateInstrumentation } from '../instrumentation/instrumentation.js'; +import type { WorldStateInstrumentation } from '../instrumentation/instrumentation.js'; import { WorldStateMessageType, type WorldStateRequest, diff --git a/yarn-project/world-state/src/synchronizer/factory.ts b/yarn-project/world-state/src/synchronizer/factory.ts index 52e3a2b74b72..8629a280b967 100644 --- a/yarn-project/world-state/src/synchronizer/factory.ts +++ b/yarn-project/world-state/src/synchronizer/factory.ts @@ -1,12 +1,12 @@ -import { type DataStoreConfig } from '@aztec/kv-store/config'; -import { type L2BlockSource } from '@aztec/stdlib/block'; -import { type L1ToL2MessageSource } from '@aztec/stdlib/messaging'; -import { type PublicDataTreeLeaf } from '@aztec/stdlib/trees'; +import type { DataStoreConfig } from '@aztec/kv-store/config'; +import type { L2BlockSource } from '@aztec/stdlib/block'; +import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging'; +import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees'; import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client'; import { WorldStateInstrumentation } from '../instrumentation/instrumentation.js'; import { NativeWorldStateService } from '../native/native_world_state.js'; -import { type WorldStateConfig } from './config.js'; +import type { WorldStateConfig } from './config.js'; import { ServerWorldStateSynchronizer } from './server_world_state_synchronizer.js'; export async function createWorldStateSynchronizer( diff --git a/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.test.ts b/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.test.ts index 5ca7832c6c2b..2e486990f9d3 100644 --- a/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.test.ts +++ b/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.test.ts @@ -7,13 +7,13 @@ import { MerkleTreeCalculator } from '@aztec/foundation/trees'; import { SHA256Trunc } from '@aztec/merkle-tree'; import { L2Block, type L2BlockSource, type L2BlockStream } from '@aztec/stdlib/block'; import { type MerkleTreeReadOperations, WorldStateRunningState } from '@aztec/stdlib/interfaces/server'; -import { type L1ToL2MessageSource } from '@aztec/stdlib/messaging'; +import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging'; import type { BlockHeader } from '@aztec/stdlib/tx'; import { jest } from '@jest/globals'; import { type MockProxy, mock } from 'jest-mock-extended'; -import { type MerkleTreeAdminDatabase, type WorldStateConfig } from '../index.js'; +import type { MerkleTreeAdminDatabase, WorldStateConfig } from '../index.js'; import { type WorldStateStatusSummary, buildEmptyWorldStateStatusFull } from '../native/message.js'; import { ServerWorldStateSynchronizer } from './server_world_state_synchronizer.js'; diff --git a/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.ts b/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.ts index 9ede2de603db..224076db5517 100644 --- a/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.ts +++ b/yarn-project/world-state/src/synchronizer/server_world_state_synchronizer.ts @@ -1,19 +1,19 @@ import { L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/constants'; -import { type Fr } from '@aztec/foundation/fields'; +import type { Fr } from '@aztec/foundation/fields'; import { createLogger } from '@aztec/foundation/log'; import { promiseWithResolvers } from '@aztec/foundation/promise'; import { elapsed } from '@aztec/foundation/timer'; import { MerkleTreeCalculator } from '@aztec/foundation/trees'; import { SHA256Trunc } from '@aztec/merkle-tree'; -import { - type L2Block, - type L2BlockId, - type L2BlockSource, - type L2BlockStream, - type L2BlockStreamEvent, - type L2BlockStreamEventHandler, - type L2BlockStreamLocalDataProvider, - type L2Tips, +import type { + L2Block, + L2BlockId, + L2BlockSource, + L2BlockStream, + L2BlockStreamEvent, + L2BlockStreamEventHandler, + L2BlockStreamLocalDataProvider, + L2Tips, } from '@aztec/stdlib/block'; import { WorldStateRunningState, @@ -21,15 +21,15 @@ import { type WorldStateSynchronizer, type WorldStateSynchronizerStatus, } from '@aztec/stdlib/interfaces/server'; -import { type L1ToL2MessageSource } from '@aztec/stdlib/messaging'; -import { type L2BlockHandledStats } from '@aztec/stdlib/stats'; +import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging'; +import type { L2BlockHandledStats } from '@aztec/stdlib/stats'; import { MerkleTreeId, type MerkleTreeReadOperations, type MerkleTreeWriteOperations } from '@aztec/stdlib/trees'; import { TraceableL2BlockStream, getTelemetryClient } from '@aztec/telemetry-client'; import { WorldStateInstrumentation } from '../instrumentation/instrumentation.js'; -import { type WorldStateStatusFull } from '../native/message.js'; -import { type MerkleTreeAdminDatabase } from '../world-state-db/merkle_tree_db.js'; -import { type WorldStateConfig } from './config.js'; +import type { WorldStateStatusFull } from '../native/message.js'; +import type { MerkleTreeAdminDatabase } from '../world-state-db/merkle_tree_db.js'; +import type { WorldStateConfig } from './config.js'; /** * Synchronizes the world state with the L2 blocks from a L2BlockSource via a block stream. diff --git a/yarn-project/world-state/src/test/integration.test.ts b/yarn-project/world-state/src/test/integration.test.ts index 1f949a2b3455..afab711a5496 100644 --- a/yarn-project/world-state/src/test/integration.test.ts +++ b/yarn-project/world-state/src/test/integration.test.ts @@ -3,14 +3,14 @@ import { EthAddress } from '@aztec/foundation/eth-address'; import type { Fr } from '@aztec/foundation/fields'; import { type Logger, createLogger } from '@aztec/foundation/log'; import { sleep } from '@aztec/foundation/sleep'; -import { type DataStoreConfig } from '@aztec/kv-store/config'; -import { type L2Block } from '@aztec/stdlib/block'; +import type { DataStoreConfig } from '@aztec/kv-store/config'; +import type { L2Block } from '@aztec/stdlib/block'; import { MerkleTreeId } from '@aztec/stdlib/trees'; import { jest } from '@jest/globals'; import { NativeWorldStateService } from '../native/native_world_state.js'; -import { type WorldStateConfig } from '../synchronizer/config.js'; +import type { WorldStateConfig } from '../synchronizer/config.js'; import { createWorldState } from '../synchronizer/factory.js'; import { ServerWorldStateSynchronizer } from '../synchronizer/server_world_state_synchronizer.js'; import { mockBlocks } from './utils.js'; diff --git a/yarn-project/world-state/src/test/utils.ts b/yarn-project/world-state/src/test/utils.ts index bbe2a0f708d5..9e04fef5b541 100644 --- a/yarn-project/world-state/src/test/utils.ts +++ b/yarn-project/world-state/src/test/utils.ts @@ -7,10 +7,10 @@ import { import { padArrayEnd } from '@aztec/foundation/collection'; import { Fr } from '@aztec/foundation/fields'; import { L2Block } from '@aztec/stdlib/block'; -import { type MerkleTreeReadOperations, type MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeReadOperations, MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server'; import { AppendOnlyTreeSnapshot, MerkleTreeId } from '@aztec/stdlib/trees'; -import { type NativeWorldStateService } from '../native/native_world_state.js'; +import type { NativeWorldStateService } from '../native/native_world_state.js'; export async function mockBlock(blockNum: number, size: number, fork: MerkleTreeWriteOperations) { const l2Block = await L2Block.random(blockNum, size); diff --git a/yarn-project/world-state/src/world-state-db/merkle_tree_db.ts b/yarn-project/world-state/src/world-state-db/merkle_tree_db.ts index fcf2e33974e2..5e5f2592a0fd 100644 --- a/yarn-project/world-state/src/world-state-db/merkle_tree_db.ts +++ b/yarn-project/world-state/src/world-state-db/merkle_tree_db.ts @@ -1,11 +1,11 @@ import { MAX_NULLIFIERS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX } from '@aztec/constants'; -import { type Fr } from '@aztec/foundation/fields'; -import { type IndexedTreeSnapshot, type TreeSnapshot } from '@aztec/merkle-tree'; -import { type L2Block } from '@aztec/stdlib/block'; -import { type ForkMerkleTreeOperations, type MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server'; -import { type MerkleTreeId } from '@aztec/stdlib/trees'; +import type { Fr } from '@aztec/foundation/fields'; +import type { IndexedTreeSnapshot, TreeSnapshot } from '@aztec/merkle-tree'; +import type { L2Block } from '@aztec/stdlib/block'; +import type { ForkMerkleTreeOperations, MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server'; +import type { MerkleTreeId } from '@aztec/stdlib/trees'; -import { type WorldStateStatusFull, type WorldStateStatusSummary } from '../native/message.js'; +import type { WorldStateStatusFull, WorldStateStatusSummary } from '../native/message.js'; /** *