diff --git a/Earthfile b/Earthfile index b52fe92c619b..299c6e4de4d2 100644 --- a/Earthfile +++ b/Earthfile @@ -26,9 +26,5 @@ build: test-end-to-end: BUILD ./yarn-project/end-to-end/+test-all -echo-github-ref: - ARG EARTHLY_GIT_HASH - RUN echo $EARTHLY_GIT_HASH - bench: RUN echo hi diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile index 0b5c5f220d05..2e110b4a2093 100644 --- a/yarn-project/Earthfile +++ b/yarn-project/Earthfile @@ -3,14 +3,14 @@ FROM node:18.19.0 RUN apt update && apt install -y jq curl perl && rm -rf /var/lib/apt/lists/* && apt-get clean # copy bb-js and noir-packages -COPY ../barretenberg/ts/+build/build /usr/src/barretenberg/ts -COPY ../noir/+packages/packages /usr/src/noir/packages +COPY ../barretenberg/ts/+build/build /build/barretenberg/ts +COPY ../noir/+packages/packages /build/noir/packages # install acvm binary COPY ../noir/+nargo/acvm /usr/bin/acvm -COPY --dir ../noir-projects/+build/. /usr/src/noir-projects -COPY ../l1-contracts/+build/out /usr/src/l1-contracts/out +COPY --dir ../noir-projects/+build/. /build/noir-projects +COPY ../l1-contracts/+build/out /build/l1-contracts/out -WORKDIR /usr/src/yarn-project +WORKDIR /build/yarn-project # copy source COPY --dir * *.json .yarn .yarnrc.yml . @@ -20,16 +20,24 @@ COPY --dir * *.json .yarn .yarnrc.yml . # This does kind of work, but jest doesn't honor it correctly, so this seems like a neat workaround. # Also, --preserve-symlinks causes duplication of portalled instances such as bb.js, and breaks the singleton logic # by initialising the module more than once. So at present I don't see a viable alternative. -RUN ln -s /usr/src/yarn-project/node_modules /usr/src/node_modules +RUN ln -s /build/yarn-project/node_modules /build/node_modules # Target for main build process build: FROM +source ARG EARTHLY_CI # TODO: Replace puppeteer with puppeteer-core to avoid this. + # TODO encapsulate in bash script for cleanliness ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true - RUN ./bootstrap.sh && yarn workspaces focus @aztec/cli @aztec/aztec --production - SAVE ARTIFACT /usr/src + ENV YARN_CACHE_FOLDER /build/yarn-cache + # Use a mount for incremental builds locally. + RUN --mount type=cache,target=/build/node_modules_cache --mount type=cache,target=/build/yarn-cache \ + mkdir -p node_modules_cache && \ + mv node_modules_cache node_modules && \ + ./bootstrap.sh && \ + yarn workspaces focus @aztec/cli @aztec/aztec --production && \ + cp -r node_modules node_modules_cache + SAVE ARTIFACT /build # TODO versioning flow at end before publish? # ENV COMMIT_TAG=$EARTHLY_BUILD_SHA @@ -39,15 +47,15 @@ build: # FROM node:18.19.1-slim # ARG COMMIT_TAG="" # ENV COMMIT_TAG=$COMMIT_TAG -# COPY --from=builder /usr/src /usr/src -# WORKDIR /usr/src/yarn-project +# COPY --from=builder /build /build +# WORKDIR /build/yarn-project # ENTRYPOINT ["yarn"] aztec: FROM +build # ENV vars for using native ACVM simulation ENV ACVM_BINARY_PATH="/usr/bin/acvm" ACVM_WORKING_DIRECTORY="/tmp/acvm" - ENTRYPOINT ["node", "--no-warnings", "/usr/src/yarn-project/aztec/dest/bin/index.js"] + ENTRYPOINT ["node", "--no-warnings", "/build/yarn-project/aztec/dest/bin/index.js"] EXPOSE 8080 # TODO(AD) the following are the biggest node modules bundled, should they be deleted as they are build tools? # 25840 @jest @@ -55,7 +63,7 @@ aztec: # 62368 @types source: - # for debugging rebuild + # for debugging rebuilds RUN echo CONTENT HASH $(find . -type f -exec sha256sum {} ';' | sort | sha256sum | awk '{print $1}') | tee .content-hash end-to-end: @@ -69,7 +77,7 @@ end-to-end: # Build web bundle for browser tests RUN yarn workspace @aztec/end-to-end run build:web RUN yarn workspaces focus @aztec/end-to-end --production && yarn cache clean - SAVE ARTIFACT /usr/src/* + SAVE ARTIFACT /build end-to-end-minimal: # end to end test runner @@ -77,8 +85,8 @@ end-to-end-minimal: FROM node:18.19.1-slim RUN apt-get update && apt-get install jq chromium -y ENV CHROME_BIN="/usr/bin/chromium" - COPY +end-to-end/. /usr/src - WORKDIR /usr/src/yarn-project/end-to-end + COPY +end-to-end/build /build + WORKDIR /build/yarn-project/end-to-end ENTRYPOINT ["yarn", "test"] build-end-to-end: diff --git a/yarn-project/accounts/src/defaults/account_contract.ts b/yarn-project/accounts/src/defaults/account_contract.ts index f2842c9ac0f6..fe270c5acf79 100644 --- a/yarn-project/accounts/src/defaults/account_contract.ts +++ b/yarn-project/accounts/src/defaults/account_contract.ts @@ -1,7 +1,7 @@ -import { type AccountContract, type AccountInterface, type AuthWitnessProvider } from '@aztec/aztec.js/account'; -import { type CompleteAddress } from '@aztec/circuit-types'; -import { type ContractArtifact } from '@aztec/foundation/abi'; -import { type NodeInfo } from '@aztec/types/interfaces'; +import { AccountContract, AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account'; +import { CompleteAddress } from '@aztec/circuit-types'; +import { ContractArtifact } from '@aztec/foundation/abi'; +import { NodeInfo } from '@aztec/types/interfaces'; 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 44e68db64e22..e4bcf6abc5f1 100644 --- a/yarn-project/accounts/src/defaults/account_interface.ts +++ b/yarn-project/accounts/src/defaults/account_interface.ts @@ -1,9 +1,9 @@ -import { type AccountInterface, type AuthWitnessProvider } from '@aztec/aztec.js/account'; -import { type EntrypointInterface, type FeeOptions } from '@aztec/aztec.js/entrypoint'; -import { type AuthWitness, type FunctionCall, type TxExecutionRequest } from '@aztec/circuit-types'; -import { type AztecAddress, type CompleteAddress, Fr } from '@aztec/circuits.js'; +import { AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account'; +import { EntrypointInterface, FeeOptions } from '@aztec/aztec.js/entrypoint'; +import { AuthWitness, FunctionCall, TxExecutionRequest } from '@aztec/circuit-types'; +import { AztecAddress, CompleteAddress, Fr } from '@aztec/circuits.js'; import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account'; -import { type NodeInfo } from '@aztec/types/interfaces'; +import { NodeInfo } from '@aztec/types/interfaces'; /** * Default implementation for an account interface. Requires that the account uses the default diff --git a/yarn-project/accounts/src/ecdsa/account_contract.ts b/yarn-project/accounts/src/ecdsa/account_contract.ts index 5c641f2acf4f..7919ecf62a3d 100644 --- a/yarn-project/accounts/src/ecdsa/account_contract.ts +++ b/yarn-project/accounts/src/ecdsa/account_contract.ts @@ -1,8 +1,8 @@ -import { type AuthWitnessProvider } from '@aztec/aztec.js/account'; -import { AuthWitness, type CompleteAddress } from '@aztec/circuit-types'; +import { AuthWitnessProvider } from '@aztec/aztec.js/account'; +import { AuthWitness, CompleteAddress } from '@aztec/circuit-types'; import { Ecdsa } from '@aztec/circuits.js/barretenberg'; -import { type ContractArtifact } from '@aztec/foundation/abi'; -import { type Fr } from '@aztec/foundation/fields'; +import { ContractArtifact } from '@aztec/foundation/abi'; +import { Fr } from '@aztec/foundation/fields'; import { DefaultAccountContract } from '../defaults/account_contract.js'; import { EcdsaAccountContractArtifact } from './artifact.js'; diff --git a/yarn-project/accounts/src/ecdsa/artifact.ts b/yarn-project/accounts/src/ecdsa/artifact.ts index 54ec3212dd0e..4dd2fd60dd63 100644 --- a/yarn-project/accounts/src/ecdsa/artifact.ts +++ b/yarn-project/accounts/src/ecdsa/artifact.ts @@ -1,4 +1,4 @@ -import { type NoirCompiledContract, loadContractArtifact } from '@aztec/aztec.js'; +import { NoirCompiledContract, loadContractArtifact } from '@aztec/aztec.js'; import EcdsaAccountContractJson from '../artifacts/EcdsaAccount.json' assert { type: 'json' }; diff --git a/yarn-project/accounts/src/ecdsa/index.ts b/yarn-project/accounts/src/ecdsa/index.ts index 4efcf941dcc8..3bd3c5d215d2 100644 --- a/yarn-project/accounts/src/ecdsa/index.ts +++ b/yarn-project/accounts/src/ecdsa/index.ts @@ -4,10 +4,10 @@ * * @packageDocumentation */ -import { AccountManager, type Salt } from '@aztec/aztec.js/account'; -import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet'; -import { type GrumpkinPrivateKey, type PXE } from '@aztec/circuit-types'; -import { type AztecAddress } from '@aztec/circuits.js'; +import { AccountManager, Salt } from '@aztec/aztec.js/account'; +import { AccountWallet, getWallet } from '@aztec/aztec.js/wallet'; +import { GrumpkinPrivateKey, PXE } from '@aztec/circuit-types'; +import { AztecAddress } from '@aztec/circuits.js'; import { EcdsaAccountContract } 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 cac79664b28d..aa651a073f1b 100644 --- a/yarn-project/accounts/src/schnorr/account_contract.ts +++ b/yarn-project/accounts/src/schnorr/account_contract.ts @@ -1,8 +1,8 @@ -import { type AuthWitnessProvider } from '@aztec/aztec.js/account'; -import { AuthWitness, type CompleteAddress, type GrumpkinPrivateKey } from '@aztec/circuit-types'; +import { AuthWitnessProvider } from '@aztec/aztec.js/account'; +import { AuthWitness, CompleteAddress, GrumpkinPrivateKey } from '@aztec/circuit-types'; import { Schnorr } from '@aztec/circuits.js/barretenberg'; -import { type ContractArtifact } from '@aztec/foundation/abi'; -import { type Fr } from '@aztec/foundation/fields'; +import { ContractArtifact } from '@aztec/foundation/abi'; +import { Fr } from '@aztec/foundation/fields'; import { DefaultAccountContract } from '../defaults/account_contract.js'; import { SchnorrAccountContractArtifact } from './artifact.js'; diff --git a/yarn-project/accounts/src/schnorr/artifact.ts b/yarn-project/accounts/src/schnorr/artifact.ts index f7cac3337f74..1d9088bf3ca4 100644 --- a/yarn-project/accounts/src/schnorr/artifact.ts +++ b/yarn-project/accounts/src/schnorr/artifact.ts @@ -1,4 +1,4 @@ -import { type NoirCompiledContract, loadContractArtifact } from '@aztec/aztec.js'; +import { NoirCompiledContract, loadContractArtifact } from '@aztec/aztec.js'; import SchnorrAccountContractJson from '../artifacts/SchnorrAccount.json' assert { type: 'json' }; diff --git a/yarn-project/accounts/src/schnorr/index.ts b/yarn-project/accounts/src/schnorr/index.ts index 7e752fce6ac9..ce44cdb3eab8 100644 --- a/yarn-project/accounts/src/schnorr/index.ts +++ b/yarn-project/accounts/src/schnorr/index.ts @@ -4,10 +4,10 @@ * * @packageDocumentation */ -import { AccountManager, type Salt } from '@aztec/aztec.js/account'; -import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet'; -import { type GrumpkinPrivateKey, type PXE } from '@aztec/circuit-types'; -import { type AztecAddress } from '@aztec/circuits.js'; +import { AccountManager, Salt } from '@aztec/aztec.js/account'; +import { AccountWallet, getWallet } from '@aztec/aztec.js/wallet'; +import { GrumpkinPrivateKey, PXE } from '@aztec/circuit-types'; +import { AztecAddress } from '@aztec/circuits.js'; 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 393bbab82d81..1334c6791dc7 100644 --- a/yarn-project/accounts/src/single_key/account_contract.ts +++ b/yarn-project/accounts/src/single_key/account_contract.ts @@ -1,10 +1,10 @@ import { generatePublicKey } from '@aztec/aztec.js'; -import { type AuthWitnessProvider } from '@aztec/aztec.js/account'; -import { AuthWitness, type CompleteAddress, type GrumpkinPrivateKey } from '@aztec/circuit-types'; -import { type PartialAddress } from '@aztec/circuits.js'; +import { AuthWitnessProvider } from '@aztec/aztec.js/account'; +import { AuthWitness, CompleteAddress, GrumpkinPrivateKey } from '@aztec/circuit-types'; +import { PartialAddress } from '@aztec/circuits.js'; import { Schnorr } from '@aztec/circuits.js/barretenberg'; -import { type ContractArtifact } from '@aztec/foundation/abi'; -import { type Fr } from '@aztec/foundation/fields'; +import { ContractArtifact } from '@aztec/foundation/abi'; +import { Fr } from '@aztec/foundation/fields'; import { DefaultAccountContract } from '../defaults/account_contract.js'; import { SchnorrSingleKeyAccountContractArtifact } from './artifact.js'; diff --git a/yarn-project/accounts/src/single_key/artifact.ts b/yarn-project/accounts/src/single_key/artifact.ts index 55a819dc5704..954c5f199e76 100644 --- a/yarn-project/accounts/src/single_key/artifact.ts +++ b/yarn-project/accounts/src/single_key/artifact.ts @@ -1,4 +1,4 @@ -import { type NoirCompiledContract, loadContractArtifact } from '@aztec/aztec.js'; +import { NoirCompiledContract, loadContractArtifact } from '@aztec/aztec.js'; import SchnorrSingleKeyAccountContractJson from '../artifacts/SchnorrSingleKeyAccount.json' assert { type: 'json' }; diff --git a/yarn-project/accounts/src/single_key/index.ts b/yarn-project/accounts/src/single_key/index.ts index 1293f97fd6d8..bf20f5da07cf 100644 --- a/yarn-project/accounts/src/single_key/index.ts +++ b/yarn-project/accounts/src/single_key/index.ts @@ -4,10 +4,10 @@ * * @packageDocumentation */ -import { AccountManager, type Salt } from '@aztec/aztec.js/account'; -import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet'; -import { type GrumpkinPrivateKey, type PXE } from '@aztec/circuit-types'; -import { type AztecAddress } from '@aztec/circuits.js'; +import { AccountManager, Salt } from '@aztec/aztec.js/account'; +import { AccountWallet, getWallet } from '@aztec/aztec.js/wallet'; +import { GrumpkinPrivateKey, PXE } from '@aztec/circuit-types'; +import { AztecAddress } from '@aztec/circuits.js'; 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 f19e9383a6c5..a6a4b7bfe5c8 100644 --- a/yarn-project/accounts/src/testing/configuration.ts +++ b/yarn-project/accounts/src/testing/configuration.ts @@ -1,6 +1,6 @@ import { generatePublicKey } from '@aztec/aztec.js'; -import { type AccountWalletWithPrivateKey } from '@aztec/aztec.js/wallet'; -import { type PXE } from '@aztec/circuit-types'; +import { AccountWalletWithPrivateKey } from '@aztec/aztec.js/wallet'; +import { PXE } from '@aztec/circuit-types'; import { Fr, GrumpkinScalar } from '@aztec/foundation/fields'; import { getSchnorrAccount } from '../schnorr/index.js'; diff --git a/yarn-project/accounts/src/testing/create_account.ts b/yarn-project/accounts/src/testing/create_account.ts index 17c6f8dc6bd8..8f5a80401906 100644 --- a/yarn-project/accounts/src/testing/create_account.ts +++ b/yarn-project/accounts/src/testing/create_account.ts @@ -1,5 +1,5 @@ -import { type AccountWalletWithPrivateKey } from '@aztec/aztec.js/wallet'; -import { type PXE } from '@aztec/circuit-types'; +import { AccountWalletWithPrivateKey } from '@aztec/aztec.js/wallet'; +import { PXE } from '@aztec/circuit-types'; import { GrumpkinScalar } from '@aztec/circuits.js'; import { getSchnorrAccount } from '../schnorr/index.js'; diff --git a/yarn-project/archiver/src/archiver/archiver.test.ts b/yarn-project/archiver/src/archiver/archiver.test.ts index 6657106ef643..3a4e4428a4c1 100644 --- a/yarn-project/archiver/src/archiver/archiver.test.ts +++ b/yarn-project/archiver/src/archiver/archiver.test.ts @@ -1,22 +1,14 @@ -import { type Body, EncryptedL2BlockL2Logs, L2Block, LogType, UnencryptedL2BlockL2Logs } from '@aztec/circuit-types'; +import { Body, EncryptedL2BlockL2Logs, L2Block, LogType, UnencryptedL2BlockL2Logs } from '@aztec/circuit-types'; import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; import { sleep } from '@aztec/foundation/sleep'; -import { AvailabilityOracleAbi, type InboxAbi, RollupAbi } from '@aztec/l1-artifacts'; - -import { type MockProxy, mock } from 'jest-mock-extended'; -import { - type Chain, - type HttpTransport, - type Log, - type PublicClient, - type Transaction, - encodeFunctionData, - toHex, -} from 'viem'; +import { AvailabilityOracleAbi, InboxAbi, RollupAbi } from '@aztec/l1-artifacts'; + +import { MockProxy, mock } from 'jest-mock-extended'; +import { Chain, HttpTransport, Log, PublicClient, Transaction, encodeFunctionData, toHex } from 'viem'; import { Archiver } from './archiver.js'; -import { type ArchiverDataStore } from './archiver_store.js'; +import { ArchiverDataStore } from './archiver_store.js'; import { MemoryArchiverStore } from './memory_archiver_store/memory_archiver_store.js'; describe('Archiver', () => { diff --git a/yarn-project/archiver/src/archiver/archiver.ts b/yarn-project/archiver/src/archiver/archiver.ts index 989a765d9120..b0c994cb2d0d 100644 --- a/yarn-project/archiver/src/archiver/archiver.ts +++ b/yarn-project/archiver/src/archiver/archiver.ts @@ -1,19 +1,19 @@ import { - type FromLogType, - type GetUnencryptedLogsResponse, - type L1ToL2MessageSource, + FromLogType, + GetUnencryptedLogsResponse, + L1ToL2MessageSource, L2Block, - type L2BlockL2Logs, - type L2BlockSource, - type L2LogsSource, - type LogFilter, - type LogType, - type TxEffect, - type TxHash, - type TxReceipt, - type UnencryptedL2Log, + L2BlockL2Logs, + L2BlockSource, + L2LogsSource, + LogFilter, + LogType, + TxEffect, + TxHash, + TxReceipt, + UnencryptedL2Log, } from '@aztec/circuit-types'; -import { ContractClassRegisteredEvent, type FunctionSelector } from '@aztec/circuits.js'; +import { ContractClassRegisteredEvent, FunctionSelector } from '@aztec/circuits.js'; import { ContractInstanceDeployedEvent, PrivateFunctionBroadcastedEvent, @@ -22,28 +22,28 @@ import { isValidUnconstrainedFunctionMembershipProof, } from '@aztec/circuits.js/contract'; import { createEthereumChain } from '@aztec/ethereum'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; -import { type EthAddress } from '@aztec/foundation/eth-address'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; +import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; -import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log'; +import { DebugLogger, createDebugLogger } from '@aztec/foundation/log'; import { RunningPromise } from '@aztec/foundation/running-promise'; import { getCanonicalClassRegistererAddress } from '@aztec/protocol-contracts/class-registerer'; import { - type ContractClassPublic, - type ContractDataSource, - type ContractInstanceWithAddress, - type ExecutablePrivateFunctionWithMembershipProof, - type PublicFunction, - type UnconstrainedFunctionWithMembershipProof, + ContractClassPublic, + ContractDataSource, + ContractInstanceWithAddress, + ExecutablePrivateFunctionWithMembershipProof, + PublicFunction, + UnconstrainedFunctionWithMembershipProof, } from '@aztec/types/contracts'; import groupBy from 'lodash.groupby'; -import { type Chain, type HttpTransport, type PublicClient, createPublicClient, http } from 'viem'; +import { Chain, HttpTransport, PublicClient, createPublicClient, http } from 'viem'; -import { type ArchiverDataStore } from './archiver_store.js'; -import { type ArchiverConfig } from './config.js'; +import { ArchiverDataStore } from './archiver_store.js'; +import { ArchiverConfig } from './config.js'; import { - type DataRetrieval, + DataRetrieval, retrieveBlockBodiesFromAvailabilityOracle, retrieveBlockMetadataFromRollup, retrieveL1ToL2Messages, diff --git a/yarn-project/archiver/src/archiver/archiver_store.ts b/yarn-project/archiver/src/archiver/archiver_store.ts index 0188575228ff..ad6a792c75f5 100644 --- a/yarn-project/archiver/src/archiver/archiver_store.ts +++ b/yarn-project/archiver/src/archiver/archiver_store.ts @@ -1,28 +1,28 @@ import { - type Body, - type EncryptedL2BlockL2Logs, - type FromLogType, - type GetUnencryptedLogsResponse, - type InboxLeaf, - type L2Block, - type L2BlockL2Logs, - type LogFilter, - type LogType, - type TxEffect, - type TxHash, - type TxReceipt, - type UnencryptedL2BlockL2Logs, + Body, + EncryptedL2BlockL2Logs, + FromLogType, + GetUnencryptedLogsResponse, + InboxLeaf, + L2Block, + L2BlockL2Logs, + LogFilter, + LogType, + TxEffect, + TxHash, + TxReceipt, + UnencryptedL2BlockL2Logs, } from '@aztec/circuit-types'; -import { type Fr } from '@aztec/circuits.js'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; +import { Fr } from '@aztec/circuits.js'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; import { - type ContractClassPublic, - type ContractInstanceWithAddress, - type ExecutablePrivateFunctionWithMembershipProof, - type UnconstrainedFunctionWithMembershipProof, + ContractClassPublic, + ContractInstanceWithAddress, + ExecutablePrivateFunctionWithMembershipProof, + UnconstrainedFunctionWithMembershipProof, } from '@aztec/types/contracts'; -import { type DataRetrieval } from './data_retrieval.js'; +import { DataRetrieval } from './data_retrieval.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 9b19267294af..1117ee277b54 100644 --- a/yarn-project/archiver/src/archiver/archiver_store_test_suite.ts +++ b/yarn-project/archiver/src/archiver/archiver_store_test_suite.ts @@ -8,14 +8,10 @@ import { } from '@aztec/circuits.js/testing'; import { times } from '@aztec/foundation/collection'; import { randomBytes, randomInt } from '@aztec/foundation/crypto'; -import { - type ContractClassPublic, - type ContractInstanceWithAddress, - SerializableContractInstance, -} from '@aztec/types/contracts'; +import { ContractClassPublic, ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/types/contracts'; -import { type ArchiverDataStore } from './archiver_store.js'; -import { type DataRetrieval } from './data_retrieval.js'; +import { ArchiverDataStore } from './archiver_store.js'; +import { DataRetrieval } from './data_retrieval.js'; /** * @param testName - The name of the test suite. diff --git a/yarn-project/archiver/src/archiver/config.ts b/yarn-project/archiver/src/archiver/config.ts index fe1fb79e8487..8a741ff31acd 100644 --- a/yarn-project/archiver/src/archiver/config.ts +++ b/yarn-project/archiver/src/archiver/config.ts @@ -1,4 +1,4 @@ -import { type L1ContractAddresses } from '@aztec/ethereum'; +import { L1ContractAddresses } from '@aztec/ethereum'; import { EthAddress } from '@aztec/foundation/eth-address'; /** diff --git a/yarn-project/archiver/src/archiver/data_retrieval.ts b/yarn-project/archiver/src/archiver/data_retrieval.ts index 46dd01160f2f..86f1fc6e8bf9 100644 --- a/yarn-project/archiver/src/archiver/data_retrieval.ts +++ b/yarn-project/archiver/src/archiver/data_retrieval.ts @@ -1,8 +1,8 @@ -import { type Body, type InboxLeaf } from '@aztec/circuit-types'; -import { type AppendOnlyTreeSnapshot, type Header } from '@aztec/circuits.js'; -import { type EthAddress } from '@aztec/foundation/eth-address'; +import { Body, InboxLeaf } from '@aztec/circuit-types'; +import { AppendOnlyTreeSnapshot, Header } from '@aztec/circuits.js'; +import { EthAddress } from '@aztec/foundation/eth-address'; -import { type PublicClient } from 'viem'; +import { PublicClient } from 'viem'; import { getL2BlockProcessedLogs, diff --git a/yarn-project/archiver/src/archiver/eth_log_handlers.ts b/yarn-project/archiver/src/archiver/eth_log_handlers.ts index 88c91b7dcf09..4c04f3f44109 100644 --- a/yarn-project/archiver/src/archiver/eth_log_handlers.ts +++ b/yarn-project/archiver/src/archiver/eth_log_handlers.ts @@ -1,11 +1,11 @@ import { Body, InboxLeaf } from '@aztec/circuit-types'; import { AppendOnlyTreeSnapshot, Header } from '@aztec/circuits.js'; -import { type EthAddress } from '@aztec/foundation/eth-address'; +import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; import { numToUInt32BE } from '@aztec/foundation/serialize'; import { AvailabilityOracleAbi, InboxAbi, RollupAbi } from '@aztec/l1-artifacts'; -import { type Hex, type Log, type PublicClient, decodeFunctionData, getAbiItem, getAddress, hexToBytes } from 'viem'; +import { Hex, Log, PublicClient, decodeFunctionData, getAbiItem, getAddress, hexToBytes } from 'viem'; /** * Processes newly received MessageSent (L1 to L2) logs. diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/block_body_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/block_body_store.ts index 4dce18fca50d..11518efb1138 100644 --- a/yarn-project/archiver/src/archiver/kv_archiver_store/block_body_store.ts +++ b/yarn-project/archiver/src/archiver/kv_archiver_store/block_body_store.ts @@ -1,5 +1,5 @@ import { Body } from '@aztec/circuit-types'; -import { type AztecKVStore, type AztecMap } from '@aztec/kv-store'; +import { AztecKVStore, AztecMap } from '@aztec/kv-store'; export class BlockBodyStore { /** Map block body hash to block body */ 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 ef8e91839a9f..233089080d63 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 @@ -1,10 +1,10 @@ -import { L2Block, type TxEffect, type TxHash, TxReceipt, TxStatus } from '@aztec/circuit-types'; -import { AppendOnlyTreeSnapshot, type AztecAddress, Header, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js'; +import { L2Block, TxEffect, TxHash, TxReceipt, TxStatus } from '@aztec/circuit-types'; +import { AppendOnlyTreeSnapshot, AztecAddress, Header, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js'; import { createDebugLogger } from '@aztec/foundation/log'; -import { type AztecKVStore, type AztecMap, type AztecSingleton, type Range } from '@aztec/kv-store'; +import { AztecKVStore, AztecMap, AztecSingleton, Range } from '@aztec/kv-store'; -import { type DataRetrieval } from '../data_retrieval.js'; -import { type BlockBodyStore } from './block_body_store.js'; +import { DataRetrieval } from '../data_retrieval.js'; +import { BlockBodyStore } from './block_body_store.js'; type BlockIndexValue = [blockNumber: number, index: number]; 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 8a4525a1228d..0d17369dcd62 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 @@ -1,10 +1,10 @@ import { Fr, FunctionSelector, Vector } from '@aztec/circuits.js'; import { BufferReader, numToUInt8, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type AztecKVStore, type AztecMap } from '@aztec/kv-store'; +import { AztecKVStore, AztecMap } from '@aztec/kv-store'; import { - type ContractClassPublic, - type ExecutablePrivateFunctionWithMembershipProof, - type UnconstrainedFunctionWithMembershipProof, + ContractClassPublic, + ExecutablePrivateFunctionWithMembershipProof, + UnconstrainedFunctionWithMembershipProof, } from '@aztec/types/contracts'; /** diff --git a/yarn-project/archiver/src/archiver/kv_archiver_store/contract_instance_store.ts b/yarn-project/archiver/src/archiver/kv_archiver_store/contract_instance_store.ts index 915363d0ae12..fb020eb3c353 100644 --- a/yarn-project/archiver/src/archiver/kv_archiver_store/contract_instance_store.ts +++ b/yarn-project/archiver/src/archiver/kv_archiver_store/contract_instance_store.ts @@ -1,6 +1,6 @@ -import { type AztecAddress } from '@aztec/circuits.js'; -import { type AztecKVStore, type AztecMap } from '@aztec/kv-store'; -import { type ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/types/contracts'; +import { AztecAddress } from '@aztec/circuits.js'; +import { AztecKVStore, AztecMap } from '@aztec/kv-store'; +import { ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/types/contracts'; /** * LMDB implementation of the ArchiverDataStore interface. 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 c01b8d2202be..ab8c12d795d7 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,31 +1,31 @@ import { - type Body, - type EncryptedL2BlockL2Logs, - type FromLogType, - type GetUnencryptedLogsResponse, - type InboxLeaf, - type L2Block, - type L2BlockL2Logs, - type LogFilter, - type LogType, - type TxEffect, - type TxHash, - type TxReceipt, - type UnencryptedL2BlockL2Logs, + Body, + EncryptedL2BlockL2Logs, + FromLogType, + GetUnencryptedLogsResponse, + InboxLeaf, + L2Block, + L2BlockL2Logs, + LogFilter, + LogType, + TxEffect, + TxHash, + TxReceipt, + UnencryptedL2BlockL2Logs, } from '@aztec/circuit-types'; -import { type Fr } from '@aztec/circuits.js'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; +import { Fr } from '@aztec/circuits.js'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; import { createDebugLogger } from '@aztec/foundation/log'; -import { type AztecKVStore } from '@aztec/kv-store'; +import { AztecKVStore } from '@aztec/kv-store'; import { - type ContractClassPublic, - type ContractInstanceWithAddress, - type ExecutablePrivateFunctionWithMembershipProof, - type UnconstrainedFunctionWithMembershipProof, + ContractClassPublic, + ContractInstanceWithAddress, + ExecutablePrivateFunctionWithMembershipProof, + UnconstrainedFunctionWithMembershipProof, } from '@aztec/types/contracts'; -import { type ArchiverDataStore, type ArchiverL1SynchPoint } from '../archiver_store.js'; -import { type DataRetrieval } from '../data_retrieval.js'; +import { ArchiverDataStore, ArchiverL1SynchPoint } from '../archiver_store.js'; +import { DataRetrieval } from '../data_retrieval.js'; import { BlockBodyStore } from './block_body_store.js'; import { BlockStore } from './block_store.js'; import { ContractClassStore } from './contract_class_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 26590fb626c7..cada02c9979a 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 @@ -1,20 +1,20 @@ import { EncryptedL2BlockL2Logs, ExtendedUnencryptedL2Log, - type FromLogType, - type GetUnencryptedLogsResponse, - type L2BlockL2Logs, - type LogFilter, + FromLogType, + GetUnencryptedLogsResponse, + L2BlockL2Logs, + LogFilter, LogId, LogType, UnencryptedL2BlockL2Logs, - type UnencryptedL2Log, + UnencryptedL2Log, } from '@aztec/circuit-types'; import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants'; import { createDebugLogger } from '@aztec/foundation/log'; -import { type AztecKVStore, type AztecMap } from '@aztec/kv-store'; +import { AztecKVStore, AztecMap } from '@aztec/kv-store'; -import { type BlockStore } from './block_store.js'; +import { 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 8b6023ad65c3..e85a36e2df65 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 @@ -1,4 +1,4 @@ -import { type InboxLeaf } from '@aztec/circuit-types'; +import { InboxLeaf } from '@aztec/circuit-types'; import { Fr, INITIAL_L2_BLOCK_NUM, @@ -6,9 +6,9 @@ import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, } from '@aztec/circuits.js'; import { createDebugLogger } from '@aztec/foundation/log'; -import { type AztecKVStore, type AztecMap, type AztecSingleton } from '@aztec/kv-store'; +import { AztecKVStore, AztecMap, AztecSingleton } from '@aztec/kv-store'; -import { type DataRetrieval } from '../data_retrieval.js'; +import { DataRetrieval } from '../data_retrieval.js'; /** * LMDB implementation of the ArchiverDataStore interface. 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 a922e62067e2..e311e1b8ed39 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,10 +1,10 @@ -import { type InboxLeaf } from '@aztec/circuit-types'; +import { InboxLeaf } from '@aztec/circuit-types'; import { INITIAL_L2_BLOCK_NUM, L1_TO_L2_MSG_SUBTREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, } from '@aztec/circuits.js/constants'; -import { type Fr } from '@aztec/foundation/fields'; +import { Fr } from '@aztec/foundation/fields'; /** * A simple in-memory implementation of an L1 to L2 message store. 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 7c90a611c2f1..38707f67190a 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,6 +1,6 @@ import { L2Block } from '@aztec/circuit-types'; -import { type ArchiverDataStore } from '../archiver_store.js'; +import { 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 90ffda20554d..43d197cc576c 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 @@ -1,33 +1,33 @@ import { - type Body, - type EncryptedL2BlockL2Logs, + Body, + EncryptedL2BlockL2Logs, ExtendedUnencryptedL2Log, - type FromLogType, - type GetUnencryptedLogsResponse, - type InboxLeaf, - type L2Block, + FromLogType, + GetUnencryptedLogsResponse, + InboxLeaf, + L2Block, L2BlockContext, - type L2BlockL2Logs, - type LogFilter, + L2BlockL2Logs, + LogFilter, LogId, LogType, - type TxEffect, - type TxHash, + TxEffect, + TxHash, TxReceipt, TxStatus, - type UnencryptedL2BlockL2Logs, + UnencryptedL2BlockL2Logs, } from '@aztec/circuit-types'; import { Fr, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; import { - type ContractClassPublic, - type ContractInstanceWithAddress, - type ExecutablePrivateFunctionWithMembershipProof, - type UnconstrainedFunctionWithMembershipProof, + ContractClassPublic, + ContractInstanceWithAddress, + ExecutablePrivateFunctionWithMembershipProof, + UnconstrainedFunctionWithMembershipProof, } from '@aztec/types/contracts'; -import { type ArchiverDataStore, type ArchiverL1SynchPoint } from '../archiver_store.js'; -import { type DataRetrieval } from '../data_retrieval.js'; +import { ArchiverDataStore, ArchiverL1SynchPoint } from '../archiver_store.js'; +import { DataRetrieval } from '../data_retrieval.js'; import { L1ToL2MessageStore } from './l1_to_l2_message_store.js'; /** diff --git a/yarn-project/archiver/src/rpc/archiver_client.ts b/yarn-project/archiver/src/rpc/archiver_client.ts index 53fb5775103a..2e456cc6218b 100644 --- a/yarn-project/archiver/src/rpc/archiver_client.ts +++ b/yarn-project/archiver/src/rpc/archiver_client.ts @@ -9,7 +9,7 @@ import { import { EthAddress, Fr } from '@aztec/circuits.js'; import { createJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client'; -import { type ArchiveSource } from '../archiver/archiver.js'; +import { ArchiveSource } from '../archiver/archiver.js'; export const createArchiverClient = (url: string, fetch = makeFetch([1, 2, 3], true)): ArchiveSource => createJsonRpcClient( diff --git a/yarn-project/archiver/src/rpc/archiver_server.ts b/yarn-project/archiver/src/rpc/archiver_server.ts index 02a5472e46c9..8e96db9bcbb6 100644 --- a/yarn-project/archiver/src/rpc/archiver_server.ts +++ b/yarn-project/archiver/src/rpc/archiver_server.ts @@ -10,7 +10,7 @@ import { import { EthAddress, Fr } from '@aztec/circuits.js'; import { JsonRpcServer } from '@aztec/foundation/json-rpc/server'; -import { type Archiver } from '../archiver/archiver.js'; +import { Archiver } from '../archiver/archiver.js'; /** * Wrap an Archiver instance with a JSON RPC HTTP server. diff --git a/yarn-project/aztec-faucet/src/bin/index.ts b/yarn-project/aztec-faucet/src/bin/index.ts index ad96b2839b6d..dd93e9655f1a 100644 --- a/yarn-project/aztec-faucet/src/bin/index.ts +++ b/yarn-project/aztec-faucet/src/bin/index.ts @@ -7,7 +7,7 @@ import http from 'http'; import Koa from 'koa'; import cors from 'koa-cors'; import Router from 'koa-router'; -import { type Hex, http as ViemHttp, createPublicClient, createWalletClient, parseEther } from 'viem'; +import { Hex, http as ViemHttp, createPublicClient, createWalletClient, parseEther } from 'viem'; import { privateKeyToAccount } from 'viem/accounts'; const { diff --git a/yarn-project/aztec-node/src/aztec-node/config.ts b/yarn-project/aztec-node/src/aztec-node/config.ts index 125ec88b2878..07f79f823834 100644 --- a/yarn-project/aztec-node/src/aztec-node/config.ts +++ b/yarn-project/aztec-node/src/aztec-node/config.ts @@ -1,6 +1,6 @@ -import { type ArchiverConfig, getConfigEnvVars as getArchiverVars } from '@aztec/archiver'; -import { type P2PConfig, getP2PConfigEnvVars } from '@aztec/p2p'; -import { type SequencerClientConfig, getConfigEnvVars as getSequencerVars } from '@aztec/sequencer-client'; +import { ArchiverConfig, getConfigEnvVars as getArchiverVars } from '@aztec/archiver'; +import { P2PConfig, getP2PConfigEnvVars } from '@aztec/p2p'; +import { SequencerClientConfig, getConfigEnvVars as getSequencerVars } from '@aztec/sequencer-client'; import { getConfigEnvVars as getWorldStateVars } from '@aztec/world-state'; /** diff --git a/yarn-project/aztec-node/src/aztec-node/http_rpc_server.ts b/yarn-project/aztec-node/src/aztec-node/http_rpc_server.ts index dd2836448269..7158662dfc5d 100644 --- a/yarn-project/aztec-node/src/aztec-node/http_rpc_server.ts +++ b/yarn-project/aztec-node/src/aztec-node/http_rpc_server.ts @@ -1,5 +1,5 @@ import { - type AztecNode, + AztecNode, EncryptedL2BlockL2Logs, ExtendedUnencryptedL2Log, L2Block, 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 309a9ef3bccc..a972190d03b5 100644 --- a/yarn-project/aztec-node/src/aztec-node/server.test.ts +++ b/yarn-project/aztec-node/src/aztec-node/server.test.ts @@ -1,6 +1,6 @@ import { createEthereumChain } from '@aztec/ethereum'; -import { type AztecNodeConfig, AztecNodeService } from '../index.js'; +import { AztecNodeConfig, AztecNodeService } from '../index.js'; describe('aztec node service', () => { it('fails to create Aztec Node if given incorrect chain id', async () => { diff --git a/yarn-project/aztec-node/src/aztec-node/server.ts b/yarn-project/aztec-node/src/aztec-node/server.ts index e14012e3b29a..f905fbe31869 100644 --- a/yarn-project/aztec-node/src/aztec-node/server.ts +++ b/yarn-project/aztec-node/src/aztec-node/server.ts @@ -1,75 +1,71 @@ -import { type ArchiveSource, Archiver, KVArchiverDataStore, createArchiverClient } from '@aztec/archiver'; +import { ArchiveSource, Archiver, KVArchiverDataStore, createArchiverClient } from '@aztec/archiver'; import { - type AztecNode, - type FromLogType, - type GetUnencryptedLogsResponse, - type L1ToL2MessageSource, - type L2Block, - type L2BlockL2Logs, - type L2BlockNumber, - type L2BlockSource, - type L2LogsSource, - type LogFilter, + AztecNode, + FromLogType, + GetUnencryptedLogsResponse, + L1ToL2MessageSource, + L2Block, + L2BlockL2Logs, + L2BlockNumber, + L2BlockSource, + L2LogsSource, + LogFilter, LogType, MerkleTreeId, NullifierMembershipWitness, - type ProverClient, + ProverClient, PublicDataWitness, - type SequencerConfig, - type SiblingPath, - type Tx, - type TxEffect, - type TxHash, + SequencerConfig, + SiblingPath, + Tx, + TxEffect, + TxHash, TxReceipt, TxStatus, partitionReverts, } from '@aztec/circuit-types'; import { - type ARCHIVE_HEIGHT, + ARCHIVE_HEIGHT, EthAddress, Fr, - type Header, + Header, INITIAL_L2_BLOCK_NUM, - type L1_TO_L2_MSG_TREE_HEIGHT, + L1_TO_L2_MSG_TREE_HEIGHT, L2_TO_L1_MESSAGE_LENGTH, - type NOTE_HASH_TREE_HEIGHT, - type NULLIFIER_TREE_HEIGHT, + NOTE_HASH_TREE_HEIGHT, + NULLIFIER_TREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, - type NullifierLeafPreimage, - type PUBLIC_DATA_TREE_HEIGHT, - type PublicDataTreeLeafPreimage, + NullifierLeafPreimage, + PUBLIC_DATA_TREE_HEIGHT, + PublicDataTreeLeafPreimage, } from '@aztec/circuits.js'; import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash'; -import { type L1ContractAddresses, createEthereumChain } from '@aztec/ethereum'; +import { L1ContractAddresses, createEthereumChain } from '@aztec/ethereum'; import { AztecAddress } from '@aztec/foundation/aztec-address'; import { createDebugLogger } from '@aztec/foundation/log'; -import { type AztecKVStore } from '@aztec/kv-store'; +import { AztecKVStore } from '@aztec/kv-store'; import { AztecLmdbStore } from '@aztec/kv-store/lmdb'; import { initStoreForRollup, openTmpStore } from '@aztec/kv-store/utils'; import { SHA256Trunc, StandardTree } from '@aztec/merkle-tree'; -import { AztecKVTxPool, type P2P, createP2PClient } from '@aztec/p2p'; +import { AztecKVTxPool, P2P, createP2PClient } from '@aztec/p2p'; import { DummyProver, TxProver } from '@aztec/prover-client'; import { - type GlobalVariableBuilder, + GlobalVariableBuilder, PublicProcessorFactory, SequencerClient, getGlobalVariableBuilder, } from '@aztec/sequencer-client'; import { WASMSimulator } from '@aztec/simulator'; -import { - type ContractClassPublic, - type ContractDataSource, - type ContractInstanceWithAddress, -} from '@aztec/types/contracts'; +import { ContractClassPublic, ContractDataSource, ContractInstanceWithAddress } from '@aztec/types/contracts'; import { MerkleTrees, ServerWorldStateSynchronizer, - type WorldStateConfig, - type WorldStateSynchronizer, + WorldStateConfig, + WorldStateSynchronizer, getConfigEnvVars as getWorldStateConfig, } from '@aztec/world-state'; -import { type AztecNodeConfig } from './config.js'; +import { AztecNodeConfig } from './config.js'; import { getSimulationProvider } from './simulator-factory.js'; /** diff --git a/yarn-project/aztec-node/src/aztec-node/simulator-factory.ts b/yarn-project/aztec-node/src/aztec-node/simulator-factory.ts index 0ccaf6be6e6c..8cf8de0b01f7 100644 --- a/yarn-project/aztec-node/src/aztec-node/simulator-factory.ts +++ b/yarn-project/aztec-node/src/aztec-node/simulator-factory.ts @@ -1,9 +1,9 @@ -import { type DebugLogger } from '@aztec/foundation/log'; -import { NativeACVMSimulator, type SimulationProvider, WASMSimulator } from '@aztec/simulator'; +import { DebugLogger } from '@aztec/foundation/log'; +import { NativeACVMSimulator, SimulationProvider, WASMSimulator } from '@aztec/simulator'; import * as fs from 'fs/promises'; -import { type AztecNodeConfig } from './config.js'; +import { AztecNodeConfig } from './config.js'; export async function getSimulationProvider( config: AztecNodeConfig, diff --git a/yarn-project/aztec-node/src/bin/index.ts b/yarn-project/aztec-node/src/bin/index.ts index e1688b791985..7d265c0f2f64 100644 --- a/yarn-project/aztec-node/src/bin/index.ts +++ b/yarn-project/aztec-node/src/bin/index.ts @@ -3,7 +3,7 @@ import { createDebugLogger } from '@aztec/foundation/log'; import http from 'http'; -import { type AztecNodeConfig, AztecNodeService, createAztecNodeRpcServer, getConfigEnvVars } from '../index.js'; +import { AztecNodeConfig, AztecNodeService, createAztecNodeRpcServer, getConfigEnvVars } from '../index.js'; const { AZTEC_NODE_PORT = 8081, API_PREFIX = '' } = process.env; diff --git a/yarn-project/aztec.js/src/account/contract.ts b/yarn-project/aztec.js/src/account/contract.ts index 0711292bbace..f85afacf4b7a 100644 --- a/yarn-project/aztec.js/src/account/contract.ts +++ b/yarn-project/aztec.js/src/account/contract.ts @@ -1,8 +1,8 @@ -import { type CompleteAddress } from '@aztec/circuit-types'; -import { type ContractArtifact } from '@aztec/foundation/abi'; -import { type NodeInfo } from '@aztec/types/interfaces'; +import { CompleteAddress } from '@aztec/circuit-types'; +import { ContractArtifact } from '@aztec/foundation/abi'; +import { NodeInfo } from '@aztec/types/interfaces'; -import { type AccountInterface } from './interface.js'; +import { AccountInterface } 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 1e17feb770a4..19f673839eec 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/circuits.js'; +import { Fr } from '@aztec/circuits.js'; export { AccountContract } from './contract.js'; export { AccountInterface, 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 5a5ab2cf28ea..4a3b90e2444f 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 AuthWitness, type CompleteAddress, type FunctionCall } from '@aztec/circuit-types'; -import { type AztecAddress } from '@aztec/circuits.js'; -import { type Fr } from '@aztec/foundation/fields'; +import { AuthWitness, CompleteAddress, FunctionCall } from '@aztec/circuit-types'; +import { AztecAddress } from '@aztec/circuits.js'; +import { Fr } from '@aztec/foundation/fields'; -import { type ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; -import { type EntrypointInterface } from '../entrypoint/entrypoint.js'; +import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; +import { 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 b618abf94c88..a5b7bf963cb2 100644 --- a/yarn-project/aztec.js/src/account/wallet.ts +++ b/yarn-project/aztec.js/src/account/wallet.ts @@ -1,6 +1,6 @@ -import { type PXE } from '@aztec/circuit-types'; +import { PXE } from '@aztec/circuit-types'; -import { type AccountInterface } from './interface.js'; +import { AccountInterface } from './interface.js'; /** * The wallet interface. 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 cfaa577ea8e5..5fd45b835a8b 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 TxHash, type TxReceipt } from '@aztec/circuit-types'; -import { type FieldsOf } from '@aztec/foundation/types'; +import { TxHash, TxReceipt } from '@aztec/circuit-types'; +import { FieldsOf } from '@aztec/foundation/types'; -import { type Wallet } from '../account/index.js'; -import { DefaultWaitOpts, SentTx, type WaitOpts } from '../contract/index.js'; +import { Wallet } from '../account/index.js'; +import { DefaultWaitOpts, SentTx, WaitOpts } from '../contract/index.js'; import { waitForAccountSynch } from '../utils/account.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 d18bc8b38d24..7814dafa78fa 100644 --- a/yarn-project/aztec.js/src/account_manager/index.ts +++ b/yarn-project/aztec.js/src/account_manager/index.ts @@ -1,13 +1,13 @@ -import { CompleteAddress, type GrumpkinPrivateKey, type PXE } from '@aztec/circuit-types'; -import { type PublicKey, getContractInstanceFromDeployParams } from '@aztec/circuits.js'; +import { CompleteAddress, GrumpkinPrivateKey, PXE } from '@aztec/circuit-types'; +import { PublicKey, getContractInstanceFromDeployParams } from '@aztec/circuits.js'; import { Fr } from '@aztec/foundation/fields'; -import { type ContractInstanceWithAddress } from '@aztec/types/contracts'; +import { ContractInstanceWithAddress } from '@aztec/types/contracts'; -import { type AccountContract } from '../account/contract.js'; -import { type Salt } from '../account/index.js'; -import { type AccountInterface } from '../account/interface.js'; -import { type DeployMethod } from '../contract/deploy_method.js'; -import { DefaultWaitOpts, type WaitOpts } from '../contract/sent_tx.js'; +import { AccountContract } from '../account/contract.js'; +import { Salt } from '../account/index.js'; +import { AccountInterface } from '../account/interface.js'; +import { DeployMethod } from '../contract/deploy_method.js'; +import { DefaultWaitOpts, WaitOpts } from '../contract/sent_tx.js'; import { ContractDeployer } from '../deployment/contract_deployer.js'; import { waitForAccountSynch } from '../utils/account.js'; import { generatePublicKey } from '../utils/index.js'; 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 1cc594b055a4..f2949e50f71e 100644 --- a/yarn-project/aztec.js/src/contract/base_contract_interaction.ts +++ b/yarn-project/aztec.js/src/contract/base_contract_interaction.ts @@ -1,6 +1,6 @@ -import { type PXE, type Tx, type TxExecutionRequest } from '@aztec/circuit-types'; +import { PXE, Tx, TxExecutionRequest } from '@aztec/circuit-types'; -import { type FeeOptions } from '../entrypoint/entrypoint.js'; +import { FeeOptions } from '../entrypoint/entrypoint.js'; import { SentTx } from './sent_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 b6a9c29f5c55..4bfd21879527 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, type TxExecutionRequest } from '@aztec/circuit-types'; +import { FunctionCall, TxExecutionRequest } from '@aztec/circuit-types'; -import { type Wallet } from '../account/index.js'; -import { BaseContractInteraction, type SendMethodOptions } from './base_contract_interaction.js'; +import { Wallet } from '../account/index.js'; +import { BaseContractInteraction, SendMethodOptions } from './base_contract_interaction.js'; /** A batch of function calls to be sent as a single transaction through a wallet. */ export class BatchCall extends BaseContractInteraction { diff --git a/yarn-project/aztec.js/src/contract/checker.ts b/yarn-project/aztec.js/src/contract/checker.ts index 438bef2048c3..758cf9188e2b 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/foundation/abi'; +import { ABIType, BasicType, ContractArtifact, StructType } from '@aztec/foundation/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 449d76b99a03..7b2c692385da 100644 --- a/yarn-project/aztec.js/src/contract/contract.test.ts +++ b/yarn-project/aztec.js/src/contract/contract.test.ts @@ -1,13 +1,13 @@ -import { type Tx, type TxExecutionRequest, type TxHash, type TxReceipt } from '@aztec/circuit-types'; +import { Tx, TxExecutionRequest, TxHash, TxReceipt } from '@aztec/circuit-types'; import { AztecAddress, CompleteAddress, EthAddress } from '@aztec/circuits.js'; -import { type L1ContractAddresses } from '@aztec/ethereum'; -import { ABIParameterVisibility, type ContractArtifact, FunctionType } from '@aztec/foundation/abi'; -import { type NodeInfo } from '@aztec/types/interfaces'; +import { L1ContractAddresses } from '@aztec/ethereum'; +import { ABIParameterVisibility, ContractArtifact, FunctionType } from '@aztec/foundation/abi'; +import { NodeInfo } from '@aztec/types/interfaces'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; -import { type ContractInstanceWithAddress } from '../index.js'; -import { type Wallet } from '../wallet/index.js'; +import { ContractInstanceWithAddress } from '../index.js'; +import { Wallet } from '../wallet/index.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 36b4c831a4bd..67501983cb01 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 PublicKey } from '@aztec/circuit-types'; -import { type ContractArtifact } from '@aztec/foundation/abi'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; +import { PublicKey } from '@aztec/circuit-types'; +import { ContractArtifact } from '@aztec/foundation/abi'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; import { Point } from '@aztec/foundation/fields'; -import { type Wallet } from '../account/index.js'; +import { 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 a49a7205c13e..2767a42e0d1e 100644 --- a/yarn-project/aztec.js/src/contract/contract_base.ts +++ b/yarn-project/aztec.js/src/contract/contract_base.ts @@ -1,8 +1,8 @@ import { computePartialAddress } from '@aztec/circuits.js'; -import { type ContractArtifact, type FunctionArtifact, FunctionSelector } from '@aztec/foundation/abi'; -import { type ContractInstanceWithAddress } from '@aztec/types/contracts'; +import { ContractArtifact, FunctionArtifact, FunctionSelector } from '@aztec/foundation/abi'; +import { ContractInstanceWithAddress } from '@aztec/types/contracts'; -import { type Wallet } from '../account/index.js'; +import { 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 2fb1f6ba3a53..f03b33407632 100644 --- a/yarn-project/aztec.js/src/contract/contract_function_interaction.ts +++ b/yarn-project/aztec.js/src/contract/contract_function_interaction.ts @@ -1,8 +1,8 @@ -import { type FunctionCall, type TxExecutionRequest } from '@aztec/circuit-types'; -import { type AztecAddress, FunctionData } from '@aztec/circuits.js'; -import { type FunctionAbi, FunctionType, encodeArguments } from '@aztec/foundation/abi'; +import { FunctionCall, TxExecutionRequest } from '@aztec/circuit-types'; +import { AztecAddress, FunctionData } from '@aztec/circuits.js'; +import { FunctionAbi, FunctionType, encodeArguments } from '@aztec/foundation/abi'; -import { type Wallet } from '../account/wallet.js'; +import { Wallet } from '../account/wallet.js'; import { BaseContractInteraction, SendMethodOptions } from './base_contract_interaction.js'; export { SendMethodOptions }; diff --git a/yarn-project/aztec.js/src/contract/deploy_method.ts b/yarn-project/aztec.js/src/contract/deploy_method.ts index 44ac1f203b79..0cf02ecab9ca 100644 --- a/yarn-project/aztec.js/src/contract/deploy_method.ts +++ b/yarn-project/aztec.js/src/contract/deploy_method.ts @@ -1,22 +1,22 @@ -import { type FunctionCall, type PublicKey, type Tx, type TxExecutionRequest } from '@aztec/circuit-types'; +import { FunctionCall, PublicKey, Tx, TxExecutionRequest } from '@aztec/circuit-types'; import { AztecAddress, computePartialAddress, getContractClassFromArtifact, getContractInstanceFromDeployParams, } from '@aztec/circuits.js'; -import { type ContractArtifact, type FunctionArtifact, getInitializer } from '@aztec/foundation/abi'; -import { type EthAddress } from '@aztec/foundation/eth-address'; -import { type Fr } from '@aztec/foundation/fields'; +import { ContractArtifact, FunctionArtifact, getInitializer } from '@aztec/foundation/abi'; +import { EthAddress } from '@aztec/foundation/eth-address'; +import { Fr } from '@aztec/foundation/fields'; import { createDebugLogger } from '@aztec/foundation/log'; -import { type ContractInstanceWithAddress } from '@aztec/types/contracts'; +import { ContractInstanceWithAddress } from '@aztec/types/contracts'; -import { type Wallet } from '../account/index.js'; +import { Wallet } from '../account/index.js'; import { deployInstance } from '../deployment/deploy_instance.js'; import { registerContractClass } from '../deployment/register_class.js'; -import { BaseContractInteraction, type SendMethodOptions } from './base_contract_interaction.js'; +import { BaseContractInteraction, SendMethodOptions } from './base_contract_interaction.js'; import { type Contract } from './contract.js'; -import { type ContractBase } from './contract_base.js'; +import { ContractBase } from './contract_base.js'; import { ContractFunctionInteraction } from './contract_function_interaction.js'; import { DeploySentTx } from './deploy_sent_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 224a2adff5e9..a9898e712678 100644 --- a/yarn-project/aztec.js/src/contract/deploy_sent_tx.ts +++ b/yarn-project/aztec.js/src/contract/deploy_sent_tx.ts @@ -1,12 +1,12 @@ -import { type PXE, type TxHash, type TxReceipt } from '@aztec/circuit-types'; -import { type AztecAddress } from '@aztec/circuits.js'; -import { type FieldsOf } from '@aztec/foundation/types'; -import { type ContractInstanceWithAddress } from '@aztec/types/contracts'; +import { PXE, TxHash, TxReceipt } from '@aztec/circuit-types'; +import { AztecAddress } from '@aztec/circuits.js'; +import { FieldsOf } from '@aztec/foundation/types'; +import { ContractInstanceWithAddress } from '@aztec/types/contracts'; -import { type Wallet } from '../account/index.js'; +import { 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'; +import { ContractBase } from './contract_base.js'; +import { SentTx, WaitOpts } from './sent_tx.js'; /** Options related to waiting for a deployment tx. */ export type DeployedWaitOpts = WaitOpts & { 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 649cd6f9e8d7..b9f2b78bea1f 100644 --- a/yarn-project/aztec.js/src/contract/sent_tx.test.ts +++ b/yarn-project/aztec.js/src/contract/sent_tx.test.ts @@ -1,6 +1,6 @@ -import { type PXE, TxHash, type TxReceipt, TxStatus } from '@aztec/circuit-types'; +import { PXE, TxHash, TxReceipt, TxStatus } from '@aztec/circuit-types'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; import { SentTx } from './sent_tx.js'; diff --git a/yarn-project/aztec.js/src/contract/sent_tx.ts b/yarn-project/aztec.js/src/contract/sent_tx.ts index 78178febf9d9..03e9da395ded 100644 --- a/yarn-project/aztec.js/src/contract/sent_tx.ts +++ b/yarn-project/aztec.js/src/contract/sent_tx.ts @@ -1,13 +1,6 @@ -import { - type ExtendedNote, - type GetUnencryptedLogsResponse, - type PXE, - type TxHash, - type TxReceipt, - TxStatus, -} from '@aztec/circuit-types'; +import { ExtendedNote, GetUnencryptedLogsResponse, PXE, TxHash, TxReceipt, TxStatus } from '@aztec/circuit-types'; import { retryUntil } from '@aztec/foundation/retry'; -import { type FieldsOf } from '@aztec/foundation/types'; +import { FieldsOf } from '@aztec/foundation/types'; /** Options related to waiting for a tx. */ export type WaitOpts = { diff --git a/yarn-project/aztec.js/src/contract/unsafe_contract.ts b/yarn-project/aztec.js/src/contract/unsafe_contract.ts index e47fb3b3266a..d010d7121c7c 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/foundation/abi'; -import { type ContractInstanceWithAddress } from '@aztec/types/contracts'; +import { ContractArtifact } from '@aztec/foundation/abi'; +import { ContractInstanceWithAddress } from '@aztec/types/contracts'; -import { type Wallet } from '../wallet/index.js'; +import { 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 6bb647af033d..e748629b5ad8 100644 --- a/yarn-project/aztec.js/src/deployment/broadcast_function.ts +++ b/yarn-project/aztec.js/src/deployment/broadcast_function.ts @@ -6,12 +6,12 @@ import { createUnconstrainedFunctionMembershipProof, getContractClassFromArtifact, } from '@aztec/circuits.js'; -import { type ContractArtifact, type FunctionSelector, FunctionType, bufferAsFields } from '@aztec/foundation/abi'; +import { ContractArtifact, FunctionSelector, FunctionType, bufferAsFields } from '@aztec/foundation/abi'; import { padArrayEnd } from '@aztec/foundation/collection'; import { Fr } from '@aztec/foundation/fields'; -import { type ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; -import { type Wallet } from '../wallet/index.js'; +import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; +import { 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 bd0f04ea74f7..09420c60401b 100644 --- a/yarn-project/aztec.js/src/deployment/contract_deployer.ts +++ b/yarn-project/aztec.js/src/deployment/contract_deployer.ts @@ -1,9 +1,9 @@ -import { type PublicKey } from '@aztec/circuit-types'; -import { type AztecAddress } from '@aztec/circuits.js'; -import { type ContractArtifact } from '@aztec/foundation/abi'; +import { PublicKey } from '@aztec/circuit-types'; +import { AztecAddress } from '@aztec/circuits.js'; +import { ContractArtifact } from '@aztec/foundation/abi'; import { Point } from '@aztec/foundation/fields'; -import { type Wallet } from '../account/wallet.js'; +import { Wallet } from '../account/wallet.js'; import { DeployMethod } from '../contract/deploy_method.js'; import { Contract } from '../contract/index.js'; diff --git a/yarn-project/aztec.js/src/deployment/deploy_instance.ts b/yarn-project/aztec.js/src/deployment/deploy_instance.ts index c6ff64a99920..aac32143c170 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/types/contracts'; +import { ContractInstanceWithAddress } from '@aztec/types/contracts'; -import { type ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; -import { type Wallet } from '../wallet/index.js'; +import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; +import { 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 9fc681f8a556..c7d59c59d634 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 { Wallet } from '../wallet/index.js'; /** Returns a Contract wrapper for the class registerer. */ export 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 8ba9c99f55a2..8d5efd0107ff 100644 --- a/yarn-project/aztec.js/src/deployment/register_class.ts +++ b/yarn-project/aztec.js/src/deployment/register_class.ts @@ -1,8 +1,8 @@ import { MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS, getContractClassFromArtifact } from '@aztec/circuits.js'; -import { type ContractArtifact, bufferAsFields } from '@aztec/foundation/abi'; +import { ContractArtifact, bufferAsFields } from '@aztec/foundation/abi'; -import { type ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; -import { type Wallet } from '../wallet/index.js'; +import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; +import { Wallet } from '../wallet/index.js'; import { getRegistererContract } from './protocol_contracts.js'; /** Sets up a call to register a contract class given its artifact. */ diff --git a/yarn-project/aztec.js/src/entrypoint/default_entrypoint.ts b/yarn-project/aztec.js/src/entrypoint/default_entrypoint.ts index a88cfef9e7a5..7315d4f6aa02 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 { type FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types'; +import { FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types'; import { TxContext } from '@aztec/circuits.js'; -import { type EntrypointInterface } from './entrypoint.js'; +import { EntrypointInterface } 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/entrypoint.ts b/yarn-project/aztec.js/src/entrypoint/entrypoint.ts index ece23e67924f..d32e9b768af9 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 FunctionCall, type TxExecutionRequest } from '@aztec/circuit-types'; -import { type Fr } from '@aztec/foundation/fields'; +import { FunctionCall, TxExecutionRequest } from '@aztec/circuit-types'; +import { Fr } from '@aztec/foundation/fields'; -import { type FeePaymentMethod } from '../fee/fee_payment_method.js'; +import { FeePaymentMethod } from '../fee/fee_payment_method.js'; /** * Fee payment options for a transaction. 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 cc67345b2c07..034ce3ad3126 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/circuit-types'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; -import { type Fr } from '@aztec/foundation/fields'; +import { FunctionCall } from '@aztec/circuit-types'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; +import { Fr } from '@aztec/foundation/fields'; /** * Holds information about how the fee for a transaction is to be paid. diff --git a/yarn-project/aztec.js/src/fee/native_fee_payment_method.ts b/yarn-project/aztec.js/src/fee/native_fee_payment_method.ts index f1b77c2037c8..21aba74b2583 100644 --- a/yarn-project/aztec.js/src/fee/native_fee_payment_method.ts +++ b/yarn-project/aztec.js/src/fee/native_fee_payment_method.ts @@ -1,11 +1,11 @@ -import { type FunctionCall } from '@aztec/circuit-types'; -import { type AztecAddress, FunctionData } from '@aztec/circuits.js'; +import { FunctionCall } from '@aztec/circuit-types'; +import { AztecAddress, FunctionData } from '@aztec/circuits.js'; import { FunctionSelector } from '@aztec/foundation/abi'; -import { type Fr } from '@aztec/foundation/fields'; +import { Fr } from '@aztec/foundation/fields'; import { getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token'; -import { type Wallet } from '../account/wallet.js'; -import { type FeePaymentMethod } from './fee_payment_method.js'; +import { Wallet } from '../account/wallet.js'; +import { FeePaymentMethod } from './fee_payment_method.js'; /** * Pay fee directly in the native gas token. 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 ce4e3ae12424..bc4c998ce7db 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,13 +1,13 @@ -import { type FunctionCall } from '@aztec/circuit-types'; +import { FunctionCall } from '@aztec/circuit-types'; import { FunctionData } from '@aztec/circuits.js'; import { computeMessageSecretHash } from '@aztec/circuits.js/hash'; import { FunctionSelector } from '@aztec/foundation/abi'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; import { Fr } from '@aztec/foundation/fields'; -import { type Wallet } from '../account/wallet.js'; +import { Wallet } from '../account/wallet.js'; import { computeAuthWitMessageHash } from '../utils/authwit.js'; -import { type FeePaymentMethod } from './fee_payment_method.js'; +import { 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 9dbd4b416d6f..ed44beb91eb9 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,12 +1,12 @@ -import { type FunctionCall } from '@aztec/circuit-types'; +import { FunctionCall } from '@aztec/circuit-types'; import { FunctionData } from '@aztec/circuits.js'; import { FunctionSelector } from '@aztec/foundation/abi'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; import { Fr } from '@aztec/foundation/fields'; import { computeAuthWitMessageHash } from '../utils/authwit.js'; -import { type AccountWallet } from '../wallet/account_wallet.js'; -import { type FeePaymentMethod } from './fee_payment_method.js'; +import { AccountWallet } from '../wallet/account_wallet.js'; +import { 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/pxe_client.ts b/yarn-project/aztec.js/src/rpc_clients/pxe_client.ts index 1aacaf16691c..59ced8b1cc44 100644 --- a/yarn-project/aztec.js/src/rpc_clients/pxe_client.ts +++ b/yarn-project/aztec.js/src/rpc_clients/pxe_client.ts @@ -7,7 +7,7 @@ import { LogId, Note, NullifierMembershipWitness, - type PXE, + PXE, Tx, TxEffect, TxExecutionRequest, diff --git a/yarn-project/aztec.js/src/utils/abi_types.ts b/yarn-project/aztec.js/src/utils/abi_types.ts index 71b88b898482..7be0b3896bae 100644 --- a/yarn-project/aztec.js/src/utils/abi_types.ts +++ b/yarn-project/aztec.js/src/utils/abi_types.ts @@ -1,4 +1,4 @@ -import { type AztecAddress, type EthAddress, type Fr, type FunctionSelector } from '@aztec/circuits.js'; +import { AztecAddress, EthAddress, Fr, FunctionSelector } from '@aztec/circuits.js'; /** 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/account.ts b/yarn-project/aztec.js/src/utils/account.ts index c128d8e227e1..35c437cc5ace 100644 --- a/yarn-project/aztec.js/src/utils/account.ts +++ b/yarn-project/aztec.js/src/utils/account.ts @@ -1,7 +1,7 @@ -import { type CompleteAddress, type PXE } from '@aztec/circuit-types'; +import { CompleteAddress, PXE } from '@aztec/circuit-types'; import { retryUntil } from '@aztec/foundation/retry'; -import { DefaultWaitOpts, type WaitOpts } from '../contract/index.js'; +import { DefaultWaitOpts, WaitOpts } from '../contract/index.js'; /** * Waits for the account to finish synchronizing with the PXE Service. diff --git a/yarn-project/aztec.js/src/utils/authwit.ts b/yarn-project/aztec.js/src/utils/authwit.ts index 562c73ca5935..0979524b9dd6 100644 --- a/yarn-project/aztec.js/src/utils/authwit.ts +++ b/yarn-project/aztec.js/src/utils/authwit.ts @@ -1,5 +1,5 @@ -import { type FunctionCall, PackedArguments } from '@aztec/circuit-types'; -import { type AztecAddress, type Fr, GeneratorIndex } from '@aztec/circuits.js'; +import { FunctionCall, PackedArguments } from '@aztec/circuit-types'; +import { AztecAddress, Fr, GeneratorIndex } from '@aztec/circuits.js'; import { pedersenHash } from '@aztec/foundation/crypto'; // docs:start:authwit_computeAuthWitMessageHash diff --git a/yarn-project/aztec.js/src/utils/cheat_codes.ts b/yarn-project/aztec.js/src/utils/cheat_codes.ts index b3a64e92ec8d..49f91a3247a1 100644 --- a/yarn-project/aztec.js/src/utils/cheat_codes.ts +++ b/yarn-project/aztec.js/src/utils/cheat_codes.ts @@ -1,5 +1,5 @@ -import { type Note, type PXE } from '@aztec/circuit-types'; -import { type AztecAddress, type EthAddress, Fr } from '@aztec/circuits.js'; +import { Note, PXE } from '@aztec/circuit-types'; +import { AztecAddress, EthAddress, Fr } from '@aztec/circuits.js'; import { toBigIntBE, toHex } from '@aztec/foundation/bigint-buffer'; import { keccak, pedersenHash } from '@aztec/foundation/crypto'; import { createDebugLogger } from '@aztec/foundation/log'; diff --git a/yarn-project/aztec.js/src/utils/l1_contracts.ts b/yarn-project/aztec.js/src/utils/l1_contracts.ts index 88b9a875234b..d0230c8f3297 100644 --- a/yarn-project/aztec.js/src/utils/l1_contracts.ts +++ b/yarn-project/aztec.js/src/utils/l1_contracts.ts @@ -1,4 +1,4 @@ -import { type L1ContractAddresses } from '@aztec/ethereum'; +import { L1ContractAddresses } from '@aztec/ethereum'; import { retryUntil } from '@aztec/foundation/retry'; import { createPXEClient } from '../rpc_clients/index.js'; diff --git a/yarn-project/aztec.js/src/utils/pub_key.ts b/yarn-project/aztec.js/src/utils/pub_key.ts index 85009e302d3a..5e04f00a1e2f 100644 --- a/yarn-project/aztec.js/src/utils/pub_key.ts +++ b/yarn-project/aztec.js/src/utils/pub_key.ts @@ -1,4 +1,4 @@ -import { type GrumpkinPrivateKey, type PublicKey } from '@aztec/circuits.js'; +import { GrumpkinPrivateKey, PublicKey } from '@aztec/circuits.js'; import { Grumpkin } from '@aztec/circuits.js/barretenberg'; /** diff --git a/yarn-project/aztec.js/src/utils/pxe.ts b/yarn-project/aztec.js/src/utils/pxe.ts index 9b1a9222409c..cd2b257d1a47 100644 --- a/yarn-project/aztec.js/src/utils/pxe.ts +++ b/yarn-project/aztec.js/src/utils/pxe.ts @@ -1,5 +1,5 @@ -import { type PXE } from '@aztec/circuit-types'; -import { type DebugLogger } from '@aztec/foundation/log'; +import { PXE } from '@aztec/circuit-types'; +import { DebugLogger } from '@aztec/foundation/log'; import { retryUntil } from '@aztec/foundation/retry'; export const waitForPXE = async (pxe: PXE, logger?: DebugLogger) => { diff --git a/yarn-project/aztec.js/src/wallet/account_wallet.ts b/yarn-project/aztec.js/src/wallet/account_wallet.ts index 9d216d3ba270..d2d1be43d4fd 100644 --- a/yarn-project/aztec.js/src/wallet/account_wallet.ts +++ b/yarn-project/aztec.js/src/wallet/account_wallet.ts @@ -1,10 +1,10 @@ -import { type AuthWitness, type FunctionCall, type PXE, type TxExecutionRequest } from '@aztec/circuit-types'; -import { type AztecAddress, Fr } from '@aztec/circuits.js'; -import { type ABIParameterVisibility, type FunctionAbi, FunctionType } from '@aztec/foundation/abi'; +import { AuthWitness, FunctionCall, PXE, TxExecutionRequest } from '@aztec/circuit-types'; +import { AztecAddress, Fr } from '@aztec/circuits.js'; +import { ABIParameterVisibility, FunctionAbi, FunctionType } from '@aztec/foundation/abi'; -import { type AccountInterface } from '../account/interface.js'; +import { AccountInterface } from '../account/interface.js'; import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; -import { type FeeOptions } from '../entrypoint/entrypoint.js'; +import { FeeOptions } from '../entrypoint/entrypoint.js'; import { computeAuthWitMessageHash } from '../utils/authwit.js'; import { BaseWallet } from './base_wallet.js'; 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 d21bddf3e850..645db1cf5db3 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,8 +1,8 @@ -import { type PXE } from '@aztec/circuit-types'; -import { type GrumpkinPrivateKey } from '@aztec/circuits.js'; +import { PXE } from '@aztec/circuit-types'; +import { GrumpkinPrivateKey } from '@aztec/circuits.js'; -import { type Salt } from '../account/index.js'; -import { type AccountInterface } from '../account/interface.js'; +import { Salt } from '../account/index.js'; +import { 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 76f9987c3a46..3402041b15a1 100644 --- a/yarn-project/aztec.js/src/wallet/base_wallet.ts +++ b/yarn-project/aztec.js/src/wallet/base_wallet.ts @@ -1,33 +1,27 @@ import { - type AuthWitness, - type ExtendedNote, - type FunctionCall, - type GetUnencryptedLogsResponse, - type L2Block, - type LogFilter, - type NoteFilter, - type PXE, - type SyncStatus, - type Tx, - type TxEffect, - type TxExecutionRequest, - type TxHash, - type TxReceipt, + AuthWitness, + ExtendedNote, + FunctionCall, + GetUnencryptedLogsResponse, + L2Block, + LogFilter, + NoteFilter, + PXE, + SyncStatus, + Tx, + TxEffect, + TxExecutionRequest, + TxHash, + TxReceipt, } from '@aztec/circuit-types'; -import { - type AztecAddress, - type CompleteAddress, - type Fr, - type GrumpkinPrivateKey, - type PartialAddress, -} from '@aztec/circuits.js'; -import { type ContractArtifact } from '@aztec/foundation/abi'; -import { type ContractClassWithId, type ContractInstanceWithAddress } from '@aztec/types/contracts'; -import { type NodeInfo } from '@aztec/types/interfaces'; +import { AztecAddress, CompleteAddress, Fr, GrumpkinPrivateKey, PartialAddress } from '@aztec/circuits.js'; +import { ContractArtifact } from '@aztec/foundation/abi'; +import { ContractClassWithId, ContractInstanceWithAddress } from '@aztec/types/contracts'; +import { NodeInfo } from '@aztec/types/interfaces'; -import { type Wallet } from '../account/wallet.js'; -import { type ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; -import { type FeeOptions } from '../entrypoint/entrypoint.js'; +import { Wallet } from '../account/wallet.js'; +import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js'; +import { FeeOptions } from '../entrypoint/entrypoint.js'; /** * A base class for Wallet implementations diff --git a/yarn-project/aztec.js/src/wallet/create_recipient.ts b/yarn-project/aztec.js/src/wallet/create_recipient.ts index 765f0fcc74ef..94e7917aecea 100644 --- a/yarn-project/aztec.js/src/wallet/create_recipient.ts +++ b/yarn-project/aztec.js/src/wallet/create_recipient.ts @@ -1,4 +1,4 @@ -import { type PXE } from '@aztec/circuit-types'; +import { PXE } from '@aztec/circuit-types'; import { CompleteAddress } from '@aztec/circuits.js'; /** diff --git a/yarn-project/aztec.js/src/wallet/index.ts b/yarn-project/aztec.js/src/wallet/index.ts index 08e8cb27c416..18fcfe3514cd 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 PXE } from '@aztec/circuit-types'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; +import { PXE } from '@aztec/circuit-types'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; -import { type AccountContract } from '../account/contract.js'; +import { 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 63ef84ae1280..816b5a9e5ba7 100644 --- a/yarn-project/aztec.js/src/wallet/signerless_wallet.ts +++ b/yarn-project/aztec.js/src/wallet/signerless_wallet.ts @@ -1,8 +1,8 @@ -import { type AuthWitness, type FunctionCall, type PXE, type TxExecutionRequest } from '@aztec/circuit-types'; -import { type CompleteAddress, type Fr } from '@aztec/circuits.js'; +import { AuthWitness, FunctionCall, PXE, TxExecutionRequest } from '@aztec/circuit-types'; +import { CompleteAddress, Fr } from '@aztec/circuits.js'; import { DefaultEntrypoint } from '../entrypoint/default_entrypoint.js'; -import { type EntrypointInterface } from '../entrypoint/entrypoint.js'; +import { EntrypointInterface } from '../entrypoint/entrypoint.js'; import { BaseWallet } from './base_wallet.js'; /** diff --git a/yarn-project/aztec/CHANGELOG.md b/yarn-project/aztec/CHANGELOG.md index ac44c3520bb6..3ac10e606cf4 100644 --- a/yarn-project/aztec/CHANGELOG.md +++ b/yarn-project/aztec/CHANGELOG.md @@ -1,12 +1,5 @@ # Changelog -## [0.32.1](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.32.0...aztec-package-v0.32.1) (2024-04-02) - - -### Miscellaneous - -* Explicit type imports ([#5519](https://github.com/AztecProtocol/aztec-packages/issues/5519)) ([2a217de](https://github.com/AztecProtocol/aztec-packages/commit/2a217de4da2031a9f3913a657a4b39201f4483bf)) - ## [0.32.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-package-v0.31.0...aztec-package-v0.32.0) (2024-03-27) diff --git a/yarn-project/aztec/package.json b/yarn-project/aztec/package.json index e693c48b7f65..2ea20e7b6f7b 100644 --- a/yarn-project/aztec/package.json +++ b/yarn-project/aztec/package.json @@ -1,6 +1,6 @@ { "name": "@aztec/aztec", - "version": "0.32.1", + "version": "0.32.0", "type": "module", "exports": { ".": "./dest/index.js" diff --git a/yarn-project/aztec/src/cli/cli.ts b/yarn-project/aztec/src/cli/cli.ts index 09ba1a37fb22..a373f6e97baa 100644 --- a/yarn-project/aztec/src/cli/cli.ts +++ b/yarn-project/aztec/src/cli/cli.ts @@ -1,6 +1,6 @@ import { fileURLToPath } from '@aztec/aztec.js'; -import { type ServerList, createNamespacedJsonRpcServer, createStatusRouter } from '@aztec/foundation/json-rpc/server'; -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { ServerList, createNamespacedJsonRpcServer, createStatusRouter } from '@aztec/foundation/json-rpc/server'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { Command } from 'commander'; import { readFileSync } from 'fs'; diff --git a/yarn-project/aztec/src/cli/cmds/start_archiver.ts b/yarn-project/aztec/src/cli/cmds/start_archiver.ts index 567f2b160b04..96cee4c34eec 100644 --- a/yarn-project/aztec/src/cli/cmds/start_archiver.ts +++ b/yarn-project/aztec/src/cli/cmds/start_archiver.ts @@ -1,12 +1,12 @@ import { Archiver, - type ArchiverConfig, + ArchiverConfig, KVArchiverDataStore, createArchiverRpcServer, getConfigEnvVars as getArchiverConfigEnvVars, } from '@aztec/archiver'; import { createDebugLogger } from '@aztec/aztec.js'; -import { type ServerList } from '@aztec/foundation/json-rpc/server'; +import { ServerList } from '@aztec/foundation/json-rpc/server'; import { AztecLmdbStore } from '@aztec/kv-store/lmdb'; import { initStoreForRollup } from '@aztec/kv-store/utils'; diff --git a/yarn-project/aztec/src/cli/cmds/start_node.ts b/yarn-project/aztec/src/cli/cmds/start_node.ts index d9a28ced7a29..f498b42fdef5 100644 --- a/yarn-project/aztec/src/cli/cmds/start_node.ts +++ b/yarn-project/aztec/src/cli/cmds/start_node.ts @@ -1,12 +1,8 @@ -import { - type AztecNodeConfig, - createAztecNodeRpcServer, - getConfigEnvVars as getNodeConfigEnvVars, -} from '@aztec/aztec-node'; +import { AztecNodeConfig, createAztecNodeRpcServer, getConfigEnvVars as getNodeConfigEnvVars } from '@aztec/aztec-node'; import { NULL_KEY } from '@aztec/ethereum'; -import { type ServerList } from '@aztec/foundation/json-rpc/server'; -import { type LogFn } from '@aztec/foundation/log'; -import { type PXEServiceConfig, createPXERpcServer, getPXEServiceConfig } from '@aztec/pxe'; +import { ServerList } from '@aztec/foundation/json-rpc/server'; +import { LogFn } from '@aztec/foundation/log'; +import { PXEServiceConfig, createPXERpcServer, getPXEServiceConfig } from '@aztec/pxe'; import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts'; 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 e3f70aacebbe..2fedcfd56456 100644 --- a/yarn-project/aztec/src/cli/cmds/start_p2p_bootstrap.ts +++ b/yarn-project/aztec/src/cli/cmds/start_p2p_bootstrap.ts @@ -1,6 +1,6 @@ -import { type DebugLogger } from '@aztec/aztec.js'; -import { type LogFn } from '@aztec/foundation/log'; -import { BootstrapNode, type P2PConfig, getP2PConfigEnvVars } from '@aztec/p2p'; +import { DebugLogger } from '@aztec/aztec.js'; +import { LogFn } from '@aztec/foundation/log'; +import { BootstrapNode, P2PConfig, getP2PConfigEnvVars } from '@aztec/p2p'; import { mergeEnvVarsAndCliOptions, parseModuleOptions } from '../util.js'; diff --git a/yarn-project/aztec/src/cli/cmds/start_pxe.ts b/yarn-project/aztec/src/cli/cmds/start_pxe.ts index 95f4027097b7..b97cc431cc8a 100644 --- a/yarn-project/aztec/src/cli/cmds/start_pxe.ts +++ b/yarn-project/aztec/src/cli/cmds/start_pxe.ts @@ -1,7 +1,7 @@ import { createAztecNodeClient } from '@aztec/circuit-types'; -import { type ServerList } from '@aztec/foundation/json-rpc/server'; -import { type LogFn } from '@aztec/foundation/log'; -import { type PXEServiceConfig, createPXERpcServer, createPXEService, getPXEServiceConfig } from '@aztec/pxe'; +import { ServerList } from '@aztec/foundation/json-rpc/server'; +import { LogFn } from '@aztec/foundation/log'; +import { PXEServiceConfig, createPXERpcServer, createPXEService, getPXEServiceConfig } from '@aztec/pxe'; import { mergeEnvVarsAndCliOptions, parseModuleOptions } from '../util.js'; diff --git a/yarn-project/aztec/src/cli/util.ts b/yarn-project/aztec/src/cli/util.ts index 21e79359da2f..3a7a3f499cd3 100644 --- a/yarn-project/aztec/src/cli/util.ts +++ b/yarn-project/aztec/src/cli/util.ts @@ -1,11 +1,11 @@ -import { type ArchiverConfig } from '@aztec/archiver'; -import { type AztecNodeConfig } from '@aztec/aztec-node'; -import { type AccountManager } from '@aztec/aztec.js'; -import { type L1ContractAddresses, l1ContractsNames } from '@aztec/ethereum'; +import { ArchiverConfig } from '@aztec/archiver'; +import { AztecNodeConfig } from '@aztec/aztec-node'; +import { AccountManager } from '@aztec/aztec.js'; +import { L1ContractAddresses, l1ContractsNames } from '@aztec/ethereum'; import { EthAddress } from '@aztec/foundation/eth-address'; -import { type LogFn, createConsoleLogger } from '@aztec/foundation/log'; -import { type P2PConfig } from '@aztec/p2p'; -import { type GrumpkinScalar, type PXEService, type PXEServiceConfig } from '@aztec/pxe'; +import { LogFn, createConsoleLogger } from '@aztec/foundation/log'; +import { P2PConfig } from '@aztec/p2p'; +import { GrumpkinScalar, PXEService, PXEServiceConfig } from '@aztec/pxe'; /** * Checks if the object has l1Contracts property diff --git a/yarn-project/aztec/src/examples/token.ts b/yarn-project/aztec/src/examples/token.ts index 975692b412d9..582b4616c55e 100644 --- a/yarn-project/aztec/src/examples/token.ts +++ b/yarn-project/aztec/src/examples/token.ts @@ -1,12 +1,5 @@ import { getSingleKeyAccount } from '@aztec/accounts/single_key'; -import { - type AccountWallet, - Fr, - GrumpkinScalar, - Note, - computeMessageSecretHash, - createPXEClient, -} from '@aztec/aztec.js'; +import { AccountWallet, Fr, GrumpkinScalar, Note, computeMessageSecretHash, createPXEClient } from '@aztec/aztec.js'; import { ExtendedNote } from '@aztec/circuit-types'; import { createDebugLogger } from '@aztec/foundation/log'; import { TokenContract } from '@aztec/noir-contracts.js/Token'; diff --git a/yarn-project/aztec/src/examples/util.ts b/yarn-project/aztec/src/examples/util.ts index 0d38e5beeefa..a008e15dbd0b 100644 --- a/yarn-project/aztec/src/examples/util.ts +++ b/yarn-project/aztec/src/examples/util.ts @@ -1,7 +1,7 @@ import { EthAddress } from '@aztec/aztec.js'; import type { Abi, Narrow } from 'abitype'; -import { type Account, type Chain, type Hex, type HttpTransport, type PublicClient, type WalletClient } from 'viem'; +import { 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 54952cd331a2..b5ae376daa4b 100644 --- a/yarn-project/aztec/src/sandbox.ts +++ b/yarn-project/aztec/src/sandbox.ts @@ -1,13 +1,13 @@ #!/usr/bin/env -S node --no-warnings -import { type AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node'; -import { type AztecAddress, BatchCall, SignerlessWallet, type Wallet } from '@aztec/aztec.js'; +import { AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node'; +import { AztecAddress, BatchCall, SignerlessWallet, Wallet } from '@aztec/aztec.js'; import { deployInstance, registerContractClass } from '@aztec/aztec.js/deployment'; -import { type AztecNode } from '@aztec/circuit-types'; +import { AztecNode } from '@aztec/circuit-types'; import { DefaultMultiCallEntrypoint } from '@aztec/entrypoints/multi-call'; import { - type DeployL1Contracts, - type L1ContractAddresses, - type L1ContractArtifactsForDeployment, + DeployL1Contracts, + L1ContractAddresses, + L1ContractArtifactsForDeployment, NULL_KEY, createEthereumChain, deployL1Contracts, @@ -31,15 +31,9 @@ import { RollupBytecode, } from '@aztec/l1-artifacts'; import { getCanonicalGasToken } from '@aztec/protocol-contracts/gas-token'; -import { type PXEServiceConfig, createPXEService, getPXEServiceConfig } from '@aztec/pxe'; +import { PXEServiceConfig, createPXEService, getPXEServiceConfig } from '@aztec/pxe'; -import { - type HDAccount, - type PrivateKeyAccount, - createPublicClient, - getContract, - http as httpViemTransport, -} from 'viem'; +import { HDAccount, PrivateKeyAccount, createPublicClient, getContract, http as httpViemTransport } from 'viem'; import { mnemonicToAccount } from 'viem/accounts'; import { foundry } from 'viem/chains'; diff --git a/yarn-project/circuit-types/src/aztec_node/rpc/aztec_node_client.ts b/yarn-project/circuit-types/src/aztec_node/rpc/aztec_node_client.ts index 79f9795f9f4b..2e093883d1e8 100644 --- a/yarn-project/circuit-types/src/aztec_node/rpc/aztec_node_client.ts +++ b/yarn-project/circuit-types/src/aztec_node/rpc/aztec_node_client.ts @@ -5,7 +5,7 @@ import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; import { createJsonRpcClient, defaultFetch } from '@aztec/foundation/json-rpc/client'; -import { type AztecNode } from '../../interfaces/aztec-node.js'; +import { AztecNode } from '../../interfaces/aztec-node.js'; import { NullifierMembershipWitness } from '../../interfaces/nullifier_tree.js'; import { L2Block } from '../../l2_block.js'; import { EncryptedL2BlockL2Logs, ExtendedUnencryptedL2Log, LogId, UnencryptedL2BlockL2Logs } from '../../logs/index.js'; diff --git a/yarn-project/circuit-types/src/function_call.ts b/yarn-project/circuit-types/src/function_call.ts index 3f3c45ad2681..c3d8e831ad4c 100644 --- a/yarn-project/circuit-types/src/function_call.ts +++ b/yarn-project/circuit-types/src/function_call.ts @@ -1,4 +1,4 @@ -import { AztecAddress, type Fr, FunctionData } from '@aztec/circuits.js'; +import { AztecAddress, Fr, FunctionData } from '@aztec/circuits.js'; /** A request to call a function on a contract from a given address. */ export type FunctionCall = { diff --git a/yarn-project/circuit-types/src/interfaces/aztec-node.ts b/yarn-project/circuit-types/src/interfaces/aztec-node.ts index d19c1e599588..5c03eddccbc6 100644 --- a/yarn-project/circuit-types/src/interfaces/aztec-node.ts +++ b/yarn-project/circuit-types/src/interfaces/aztec-node.ts @@ -1,32 +1,26 @@ import { - type ARCHIVE_HEIGHT, - type Header, - type L1_TO_L2_MSG_TREE_HEIGHT, - type NOTE_HASH_TREE_HEIGHT, - type NULLIFIER_TREE_HEIGHT, - type PUBLIC_DATA_TREE_HEIGHT, + ARCHIVE_HEIGHT, + Header, + L1_TO_L2_MSG_TREE_HEIGHT, + NOTE_HASH_TREE_HEIGHT, + NULLIFIER_TREE_HEIGHT, + PUBLIC_DATA_TREE_HEIGHT, } from '@aztec/circuits.js'; -import { type L1ContractAddresses } from '@aztec/ethereum'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; -import { type Fr } from '@aztec/foundation/fields'; -import { type ContractClassPublic, type ContractInstanceWithAddress } from '@aztec/types/contracts'; +import { L1ContractAddresses } from '@aztec/ethereum'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; +import { Fr } from '@aztec/foundation/fields'; +import { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/types/contracts'; -import { type L2Block } from '../l2_block.js'; -import { - type FromLogType, - type GetUnencryptedLogsResponse, - type L2BlockL2Logs, - type LogFilter, - type LogType, -} from '../logs/index.js'; -import { type MerkleTreeId } from '../merkle_tree_id.js'; -import { type SiblingPath } from '../sibling_path/index.js'; -import { type Tx, type TxHash, type TxReceipt } from '../tx/index.js'; -import { type TxEffect } from '../tx_effect.js'; -import { type SequencerConfig } from './configs.js'; -import { type L2BlockNumber } from './l2_block_number.js'; -import { type NullifierMembershipWitness } from './nullifier_tree.js'; -import { type PublicDataWitness } from './public_data_tree.js'; +import { L2Block } from '../l2_block.js'; +import { FromLogType, GetUnencryptedLogsResponse, L2BlockL2Logs, LogFilter, LogType } from '../logs/index.js'; +import { MerkleTreeId } from '../merkle_tree_id.js'; +import { SiblingPath } from '../sibling_path/index.js'; +import { Tx, TxHash, TxReceipt } from '../tx/index.js'; +import { TxEffect } from '../tx_effect.js'; +import { SequencerConfig } from './configs.js'; +import { L2BlockNumber } from './l2_block_number.js'; +import { NullifierMembershipWitness } from './nullifier_tree.js'; +import { PublicDataWitness } from './public_data_tree.js'; /** * The aztec node. diff --git a/yarn-project/circuit-types/src/interfaces/block-prover.ts b/yarn-project/circuit-types/src/interfaces/block-prover.ts index 31560b36a5b3..9e02a117b22b 100644 --- a/yarn-project/circuit-types/src/interfaces/block-prover.ts +++ b/yarn-project/circuit-types/src/interfaces/block-prover.ts @@ -1,7 +1,7 @@ -import { type Fr, type GlobalVariables, type Proof } from '@aztec/circuits.js'; +import { Fr, GlobalVariables, Proof } from '@aztec/circuits.js'; -import { type L2Block } from '../l2_block.js'; -import { type ProcessedTx } from '../tx/processed_tx.js'; +import { L2Block } from '../l2_block.js'; +import { ProcessedTx } from '../tx/processed_tx.js'; export enum PROVING_STATUS { SUCCESS, diff --git a/yarn-project/circuit-types/src/interfaces/configs.ts b/yarn-project/circuit-types/src/interfaces/configs.ts index ee90be579d2b..80198bfca29c 100644 --- a/yarn-project/circuit-types/src/interfaces/configs.ts +++ b/yarn-project/circuit-types/src/interfaces/configs.ts @@ -1,4 +1,4 @@ -import { type AztecAddress, type EthAddress, type Fr } from '@aztec/circuits.js'; +import { AztecAddress, EthAddress, Fr } from '@aztec/circuits.js'; /** * The sequencer configuration. diff --git a/yarn-project/circuit-types/src/interfaces/nullifier_tree.ts b/yarn-project/circuit-types/src/interfaces/nullifier_tree.ts index 5e1dfe80a83b..a3a1bd1a8d19 100644 --- a/yarn-project/circuit-types/src/interfaces/nullifier_tree.ts +++ b/yarn-project/circuit-types/src/interfaces/nullifier_tree.ts @@ -1,4 +1,4 @@ -import { Fr, type NULLIFIER_TREE_HEIGHT, NullifierLeafPreimage } from '@aztec/circuits.js'; +import { Fr, NULLIFIER_TREE_HEIGHT, NullifierLeafPreimage } from '@aztec/circuits.js'; import { SiblingPath } from '../sibling_path/index.js'; diff --git a/yarn-project/circuit-types/src/interfaces/prover-client.ts b/yarn-project/circuit-types/src/interfaces/prover-client.ts index 5c2ef55b8d57..ac803d0e94bd 100644 --- a/yarn-project/circuit-types/src/interfaces/prover-client.ts +++ b/yarn-project/circuit-types/src/interfaces/prover-client.ts @@ -1,4 +1,4 @@ -import { type BlockProver } from './block-prover.js'; +import { BlockProver } from './block-prover.js'; /** * The interface to the prover client. diff --git a/yarn-project/circuit-types/src/interfaces/public_data_tree.ts b/yarn-project/circuit-types/src/interfaces/public_data_tree.ts index 1ae620154ee2..26f65bfba555 100644 --- a/yarn-project/circuit-types/src/interfaces/public_data_tree.ts +++ b/yarn-project/circuit-types/src/interfaces/public_data_tree.ts @@ -1,6 +1,6 @@ -import { Fr, type PUBLIC_DATA_TREE_HEIGHT, type PublicDataTreeLeafPreimage } from '@aztec/circuits.js'; +import { Fr, PUBLIC_DATA_TREE_HEIGHT, PublicDataTreeLeafPreimage } from '@aztec/circuits.js'; -import { type SiblingPath } from '../sibling_path/index.js'; +import { SiblingPath } from '../sibling_path/index.js'; /** * Public data witness. diff --git a/yarn-project/circuit-types/src/interfaces/pxe.ts b/yarn-project/circuit-types/src/interfaces/pxe.ts index 7c993677ba86..384ccdb14378 100644 --- a/yarn-project/circuit-types/src/interfaces/pxe.ts +++ b/yarn-project/circuit-types/src/interfaces/pxe.ts @@ -1,23 +1,17 @@ -import { - type AztecAddress, - type CompleteAddress, - type Fr, - type GrumpkinPrivateKey, - type PartialAddress, -} from '@aztec/circuits.js'; -import { type ContractArtifact } from '@aztec/foundation/abi'; -import { type ContractClassWithId, type ContractInstanceWithAddress } from '@aztec/types/contracts'; -import { type NodeInfo } from '@aztec/types/interfaces'; - -import { type AuthWitness } from '../auth_witness.js'; -import { type L2Block } from '../l2_block.js'; -import { type GetUnencryptedLogsResponse, type LogFilter } from '../logs/index.js'; -import { type ExtendedNote } from '../notes/index.js'; -import { type NoteFilter } from '../notes/note_filter.js'; -import { type Tx, type TxHash, type TxReceipt } from '../tx/index.js'; -import { type TxEffect } from '../tx_effect.js'; -import { type TxExecutionRequest } from '../tx_execution_request.js'; -import { type SyncStatus } from './sync-status.js'; +import { AztecAddress, CompleteAddress, Fr, GrumpkinPrivateKey, PartialAddress } from '@aztec/circuits.js'; +import { ContractArtifact } from '@aztec/foundation/abi'; +import { ContractClassWithId, ContractInstanceWithAddress } from '@aztec/types/contracts'; +import { NodeInfo } from '@aztec/types/interfaces'; + +import { AuthWitness } from '../auth_witness.js'; +import { L2Block } from '../l2_block.js'; +import { GetUnencryptedLogsResponse, LogFilter } from '../logs/index.js'; +import { ExtendedNote } from '../notes/index.js'; +import { NoteFilter } from '../notes/note_filter.js'; +import { Tx, TxHash, TxReceipt } from '../tx/index.js'; +import { TxEffect } from '../tx_effect.js'; +import { TxExecutionRequest } from '../tx_execution_request.js'; +import { SyncStatus } from './sync-status.js'; // docs:start:pxe-interface /** diff --git a/yarn-project/circuit-types/src/keys/key_pair.ts b/yarn-project/circuit-types/src/keys/key_pair.ts index 2f4c0c1e3d31..43809c2ad7a1 100644 --- a/yarn-project/circuit-types/src/keys/key_pair.ts +++ b/yarn-project/circuit-types/src/keys/key_pair.ts @@ -1,4 +1,4 @@ -import { type GrumpkinPrivateKey, type PublicKey } from '@aztec/circuits.js'; +import { GrumpkinPrivateKey, PublicKey } from '@aztec/circuits.js'; /** * Represents a cryptographic public-private key pair. diff --git a/yarn-project/circuit-types/src/keys/key_store.ts b/yarn-project/circuit-types/src/keys/key_store.ts index 4869503def49..f70648a0c4ce 100644 --- a/yarn-project/circuit-types/src/keys/key_store.ts +++ b/yarn-project/circuit-types/src/keys/key_store.ts @@ -1,4 +1,4 @@ -import { type AztecAddress, type GrumpkinPrivateKey, type PublicKey } from '@aztec/circuits.js'; +import { AztecAddress, GrumpkinPrivateKey, PublicKey } from '@aztec/circuits.js'; /** * Represents a secure storage for managing keys. diff --git a/yarn-project/circuit-types/src/l2_block.ts b/yarn-project/circuit-types/src/l2_block.ts index dd1a5bda4e85..c62b4e8c9db9 100644 --- a/yarn-project/circuit-types/src/l2_block.ts +++ b/yarn-project/circuit-types/src/l2_block.ts @@ -1,4 +1,4 @@ -import { Body, type TxEffect, TxHash } from '@aztec/circuit-types'; +import { Body, TxEffect, TxHash } from '@aztec/circuit-types'; import { AppendOnlyTreeSnapshot, Header, STRING_ENCODING } from '@aztec/circuits.js'; import { sha256, sha256ToField } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; diff --git a/yarn-project/circuit-types/src/l2_block_context.ts b/yarn-project/circuit-types/src/l2_block_context.ts index 54374e787444..a8a7b77915fa 100644 --- a/yarn-project/circuit-types/src/l2_block_context.ts +++ b/yarn-project/circuit-types/src/l2_block_context.ts @@ -1,5 +1,5 @@ -import { type L2Block } from './l2_block.js'; -import { type TxHash } from './tx/tx_hash.js'; +import { L2Block } from './l2_block.js'; +import { TxHash } from './tx/tx_hash.js'; /** * A wrapper around L2 block used to cache results of expensive operations. diff --git a/yarn-project/circuit-types/src/l2_block_downloader/l2_block_downloader.ts b/yarn-project/circuit-types/src/l2_block_downloader/l2_block_downloader.ts index 081d65633c8e..fb322129b5e5 100644 --- a/yarn-project/circuit-types/src/l2_block_downloader/l2_block_downloader.ts +++ b/yarn-project/circuit-types/src/l2_block_downloader/l2_block_downloader.ts @@ -3,8 +3,8 @@ import { MemoryFifo, Semaphore, SerialQueue } from '@aztec/foundation/fifo'; import { createDebugLogger } from '@aztec/foundation/log'; import { InterruptibleSleep } from '@aztec/foundation/sleep'; -import { type L2Block } from '../l2_block.js'; -import { type L2BlockSource } from '../l2_block_source.js'; +import { L2Block } from '../l2_block.js'; +import { L2BlockSource } from '../l2_block_source.js'; const log = createDebugLogger('aztec:l2_block_downloader'); diff --git a/yarn-project/circuit-types/src/l2_block_source.ts b/yarn-project/circuit-types/src/l2_block_source.ts index 78b6078f0faa..f60e545d3e46 100644 --- a/yarn-project/circuit-types/src/l2_block_source.ts +++ b/yarn-project/circuit-types/src/l2_block_source.ts @@ -1,9 +1,9 @@ -import { type EthAddress } from '@aztec/circuits.js'; +import { EthAddress } from '@aztec/circuits.js'; -import { type L2Block } from './l2_block.js'; -import { type TxHash } from './tx/tx_hash.js'; -import { type TxReceipt } from './tx/tx_receipt.js'; -import { type TxEffect } from './tx_effect.js'; +import { L2Block } from './l2_block.js'; +import { TxHash } from './tx/tx_hash.js'; +import { TxReceipt } from './tx/tx_receipt.js'; +import { TxEffect } from './tx_effect.js'; /** * Interface of classes allowing for the retrieval of L2 blocks. diff --git a/yarn-project/circuit-types/src/logs/get_unencrypted_logs_response.ts b/yarn-project/circuit-types/src/logs/get_unencrypted_logs_response.ts index b8c18fa278d8..d50c7280a9b8 100644 --- a/yarn-project/circuit-types/src/logs/get_unencrypted_logs_response.ts +++ b/yarn-project/circuit-types/src/logs/get_unencrypted_logs_response.ts @@ -1,4 +1,4 @@ -import { type ExtendedUnencryptedL2Log } from './extended_unencrypted_l2_log.js'; +import { ExtendedUnencryptedL2Log } from './extended_unencrypted_l2_log.js'; /** * It provides documentation for the GetUnencryptedLogsResponse type. diff --git a/yarn-project/circuit-types/src/logs/l1_note_payload/browserify-cipher.d.ts b/yarn-project/circuit-types/src/logs/l1_note_payload/browserify-cipher.d.ts index 5d393110202e..40a65868749e 100644 --- a/yarn-project/circuit-types/src/logs/l1_note_payload/browserify-cipher.d.ts +++ b/yarn-project/circuit-types/src/logs/l1_note_payload/browserify-cipher.d.ts @@ -1,5 +1,5 @@ declare module 'browserify-cipher' { - import { type Cipher } from 'crypto'; + import { Cipher } from 'crypto'; /** * Type representing supported cipher algorithms for encryption and decryption. diff --git a/yarn-project/circuit-types/src/logs/l1_note_payload/encrypt_buffer.ts b/yarn-project/circuit-types/src/logs/l1_note_payload/encrypt_buffer.ts index 314ef0d6c28f..8883ff8941e1 100644 --- a/yarn-project/circuit-types/src/logs/l1_note_payload/encrypt_buffer.ts +++ b/yarn-project/circuit-types/src/logs/l1_note_payload/encrypt_buffer.ts @@ -1,5 +1,5 @@ -import { type GrumpkinPrivateKey, type PublicKey } from '@aztec/circuits.js'; -import { type Grumpkin } from '@aztec/circuits.js/barretenberg'; +import { GrumpkinPrivateKey, PublicKey } from '@aztec/circuits.js'; +import { Grumpkin } from '@aztec/circuits.js/barretenberg'; import { sha256 } from '@aztec/foundation/crypto'; import { Point } from '@aztec/foundation/fields'; import { numToUInt8 } from '@aztec/foundation/serialize'; diff --git a/yarn-project/circuit-types/src/logs/l1_note_payload/l1_note_payload.ts b/yarn-project/circuit-types/src/logs/l1_note_payload/l1_note_payload.ts index 8b34dd37b8f3..1dd11c02ceea 100644 --- a/yarn-project/circuit-types/src/logs/l1_note_payload/l1_note_payload.ts +++ b/yarn-project/circuit-types/src/logs/l1_note_payload/l1_note_payload.ts @@ -1,5 +1,5 @@ -import { AztecAddress, type GrumpkinPrivateKey, type PublicKey } from '@aztec/circuits.js'; -import { type Grumpkin } from '@aztec/circuits.js/barretenberg'; +import { AztecAddress, GrumpkinPrivateKey, PublicKey } from '@aztec/circuits.js'; +import { Grumpkin } from '@aztec/circuits.js/barretenberg'; import { Fr, GrumpkinScalar } from '@aztec/foundation/fields'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; diff --git a/yarn-project/circuit-types/src/logs/l1_note_payload/tagged_note.ts b/yarn-project/circuit-types/src/logs/l1_note_payload/tagged_note.ts index ddc362e46281..f1ada6ec614b 100644 --- a/yarn-project/circuit-types/src/logs/l1_note_payload/tagged_note.ts +++ b/yarn-project/circuit-types/src/logs/l1_note_payload/tagged_note.ts @@ -1,5 +1,5 @@ -import { type GrumpkinPrivateKey, type PublicKey } from '@aztec/circuits.js'; -import { type Grumpkin } from '@aztec/circuits.js/barretenberg'; +import { GrumpkinPrivateKey, PublicKey } from '@aztec/circuits.js'; +import { Grumpkin } from '@aztec/circuits.js/barretenberg'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; diff --git a/yarn-project/circuit-types/src/logs/l2_block_l2_logs.ts b/yarn-project/circuit-types/src/logs/l2_block_l2_logs.ts index 28a71d5a5fcc..9aa780fda8b7 100644 --- a/yarn-project/circuit-types/src/logs/l2_block_l2_logs.ts +++ b/yarn-project/circuit-types/src/logs/l2_block_l2_logs.ts @@ -2,9 +2,9 @@ import { BufferReader, prefixBufferWithLength } from '@aztec/foundation/serializ import isEqual from 'lodash.isequal'; -import { type EncryptedL2Log } from './encrypted_l2_log.js'; -import { EncryptedTxL2Logs, type TxL2Logs, UnencryptedTxL2Logs } from './tx_l2_logs.js'; -import { type UnencryptedL2Log } from './unencrypted_l2_log.js'; +import { EncryptedL2Log } from './encrypted_l2_log.js'; +import { EncryptedTxL2Logs, TxL2Logs, UnencryptedTxL2Logs } from './tx_l2_logs.js'; +import { UnencryptedL2Log } from './unencrypted_l2_log.js'; /** * Data container of logs emitted in all txs in a given L2 block. diff --git a/yarn-project/circuit-types/src/logs/l2_logs_source.ts b/yarn-project/circuit-types/src/logs/l2_logs_source.ts index 1d5745484d69..d6d9ac4d1d96 100644 --- a/yarn-project/circuit-types/src/logs/l2_logs_source.ts +++ b/yarn-project/circuit-types/src/logs/l2_logs_source.ts @@ -1,7 +1,7 @@ -import { type GetUnencryptedLogsResponse } from './get_unencrypted_logs_response.js'; -import { type L2BlockL2Logs } from './l2_block_l2_logs.js'; -import { type LogFilter } from './log_filter.js'; -import { type FromLogType, type LogType } from './log_type.js'; +import { GetUnencryptedLogsResponse } from './get_unencrypted_logs_response.js'; +import { L2BlockL2Logs } from './l2_block_l2_logs.js'; +import { LogFilter } from './log_filter.js'; +import { FromLogType, LogType } from './log_type.js'; /** * Interface of classes allowing for the retrieval of logs. diff --git a/yarn-project/circuit-types/src/logs/log_filter.ts b/yarn-project/circuit-types/src/logs/log_filter.ts index deb81e98efa3..0b472bb99394 100644 --- a/yarn-project/circuit-types/src/logs/log_filter.ts +++ b/yarn-project/circuit-types/src/logs/log_filter.ts @@ -1,8 +1,8 @@ -import { type AztecAddress } from '@aztec/circuits.js'; -import { type EventSelector } from '@aztec/foundation/abi'; +import { AztecAddress } from '@aztec/circuits.js'; +import { EventSelector } from '@aztec/foundation/abi'; -import { type TxHash } from '../tx/tx_hash.js'; -import { type LogId } from './log_id.js'; +import { TxHash } from '../tx/tx_hash.js'; +import { LogId } from './log_id.js'; /** * Log filter used to fetch L2 logs. diff --git a/yarn-project/circuit-types/src/logs/log_type.ts b/yarn-project/circuit-types/src/logs/log_type.ts index 1f9c247cc4a2..00d2a49240c8 100644 --- a/yarn-project/circuit-types/src/logs/log_type.ts +++ b/yarn-project/circuit-types/src/logs/log_type.ts @@ -1,5 +1,5 @@ -import { type EncryptedL2Log } from './encrypted_l2_log.js'; -import { type UnencryptedL2Log } from './unencrypted_l2_log.js'; +import { EncryptedL2Log } from './encrypted_l2_log.js'; +import { UnencryptedL2Log } from './unencrypted_l2_log.js'; /** * Defines possible log types. diff --git a/yarn-project/circuit-types/src/logs/tx_l2_logs.ts b/yarn-project/circuit-types/src/logs/tx_l2_logs.ts index bd6fe976ed02..774e479cf651 100644 --- a/yarn-project/circuit-types/src/logs/tx_l2_logs.ts +++ b/yarn-project/circuit-types/src/logs/tx_l2_logs.ts @@ -3,9 +3,9 @@ import { BufferReader, prefixBufferWithLength, truncateAndPad } from '@aztec/fou import isEqual from 'lodash.isequal'; -import { type EncryptedL2Log } from './encrypted_l2_log.js'; -import { EncryptedFunctionL2Logs, type FunctionL2Logs, UnencryptedFunctionL2Logs } from './function_l2_logs.js'; -import { type UnencryptedL2Log } from './unencrypted_l2_log.js'; +import { EncryptedL2Log } from './encrypted_l2_log.js'; +import { EncryptedFunctionL2Logs, FunctionL2Logs, UnencryptedFunctionL2Logs } from './function_l2_logs.js'; +import { UnencryptedL2Log } from './unencrypted_l2_log.js'; /** * Data container of logs emitted in 1 tx. diff --git a/yarn-project/circuit-types/src/messaging/l1_to_l2_message_source.ts b/yarn-project/circuit-types/src/messaging/l1_to_l2_message_source.ts index 1bd0efab89dc..090726a671d2 100644 --- a/yarn-project/circuit-types/src/messaging/l1_to_l2_message_source.ts +++ b/yarn-project/circuit-types/src/messaging/l1_to_l2_message_source.ts @@ -1,4 +1,4 @@ -import { type Fr } from '@aztec/foundation/fields'; +import { Fr } from '@aztec/foundation/fields'; /** * Interface of classes allowing for the retrieval of L1 to L2 messages. diff --git a/yarn-project/circuit-types/src/mocks.ts b/yarn-project/circuit-types/src/mocks.ts index cb9808eaaadd..18700c91c163 100644 --- a/yarn-project/circuit-types/src/mocks.ts +++ b/yarn-project/circuit-types/src/mocks.ts @@ -7,13 +7,13 @@ import { computeContractClassId, getContractClassFromArtifact, } from '@aztec/circuits.js'; -import { type ContractArtifact } from '@aztec/foundation/abi'; +import { ContractArtifact } from '@aztec/foundation/abi'; import { makeTuple } from '@aztec/foundation/array'; import { times } from '@aztec/foundation/collection'; import { randomBytes } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; -import { type Tuple } from '@aztec/foundation/serialize'; -import { type ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/types/contracts'; +import { Tuple } from '@aztec/foundation/serialize'; +import { ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/types/contracts'; import { EncryptedL2Log } from './logs/encrypted_l2_log.js'; import { EncryptedFunctionL2Logs, EncryptedTxL2Logs, Note, UnencryptedTxL2Logs } from './logs/index.js'; diff --git a/yarn-project/circuit-types/src/notes/note_filter.ts b/yarn-project/circuit-types/src/notes/note_filter.ts index 7eb6c62c8650..90570f1f122b 100644 --- a/yarn-project/circuit-types/src/notes/note_filter.ts +++ b/yarn-project/circuit-types/src/notes/note_filter.ts @@ -1,6 +1,6 @@ -import { type AztecAddress, type Fr } from '@aztec/circuits.js'; +import { AztecAddress, Fr } from '@aztec/circuits.js'; -import { type TxHash } from '../tx/tx_hash.js'; +import { TxHash } from '../tx/tx_hash.js'; /** * The status of notes to retrieve. diff --git a/yarn-project/circuit-types/src/packed_arguments.ts b/yarn-project/circuit-types/src/packed_arguments.ts index 29452c88bfc6..d5589a77ad17 100644 --- a/yarn-project/circuit-types/src/packed_arguments.ts +++ b/yarn-project/circuit-types/src/packed_arguments.ts @@ -1,7 +1,7 @@ import { Fr, Vector } from '@aztec/circuits.js'; import { computeVarArgsHash } from '@aztec/circuits.js/hash'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import { FieldsOf } from '@aztec/foundation/types'; /** * Packs a set of arguments into a hash. diff --git a/yarn-project/circuit-types/src/sibling_path/sibling_path.ts b/yarn-project/circuit-types/src/sibling_path/sibling_path.ts index 086c57baf80c..fcfe0eb4d33c 100644 --- a/yarn-project/circuit-types/src/sibling_path/sibling_path.ts +++ b/yarn-project/circuit-types/src/sibling_path/sibling_path.ts @@ -1,12 +1,12 @@ import { makeTuple } from '@aztec/foundation/array'; import { Fr } from '@aztec/foundation/fields'; import { - type Tuple, + Tuple, assertLength, deserializeArrayFromVector, serializeArrayOfBufferableToVector, } from '@aztec/foundation/serialize'; -import { type Hasher } from '@aztec/types/interfaces'; +import { Hasher } from '@aztec/types/interfaces'; /** * Contains functionality to compute and serialize/deserialize a sibling path. diff --git a/yarn-project/circuit-types/src/simulation_error.ts b/yarn-project/circuit-types/src/simulation_error.ts index 69e1b98166f3..47188b7b05ad 100644 --- a/yarn-project/circuit-types/src/simulation_error.ts +++ b/yarn-project/circuit-types/src/simulation_error.ts @@ -1,5 +1,5 @@ -import { type AztecAddress, type FunctionSelector } from '@aztec/circuits.js'; -import { type OpcodeLocation } from '@aztec/foundation/abi'; +import { AztecAddress, FunctionSelector } from '@aztec/circuits.js'; +import { OpcodeLocation } from '@aztec/foundation/abi'; /** * Address and selector of a function that failed during simulation. diff --git a/yarn-project/circuit-types/src/stats/benchmarks.ts b/yarn-project/circuit-types/src/stats/benchmarks.ts index 37c09f407277..284cdadd48fc 100644 --- a/yarn-project/circuit-types/src/stats/benchmarks.ts +++ b/yarn-project/circuit-types/src/stats/benchmarks.ts @@ -1,4 +1,4 @@ -import { type MetricName } from './metrics.js'; +import { MetricName } from './metrics.js'; /** Aggregated benchmark results. */ export type BenchmarkResults = Partial>; diff --git a/yarn-project/circuit-types/src/stats/metrics.ts b/yarn-project/circuit-types/src/stats/metrics.ts index 467c80c78390..084fc0584357 100644 --- a/yarn-project/circuit-types/src/stats/metrics.ts +++ b/yarn-project/circuit-types/src/stats/metrics.ts @@ -1,4 +1,4 @@ -import { type StatsEventName } from './stats.js'; +import { StatsEventName } from './stats.js'; /** How a metric is grouped in benchmarks: by block size, by length of chain processed, or by circuit name. */ export type MetricGroupBy = @@ -8,8 +8,7 @@ export type MetricGroupBy = | 'classes-registered' | 'leaf-count' | 'data-writes' - | 'fee-payment-method' - | 'circuit-size-in-gates'; + | 'fee-payment-method'; /** Definition of a metric to track in benchmarks. */ export interface Metric { @@ -25,18 +24,6 @@ export interface Metric { /** Metric definitions to track from benchmarks. */ export const Metrics = [ - { - name: 'client_ivc_proving_time_in_ms', - groupBy: 'circuit-size-in-gates', - description: 'Proving time for ClientIVC grouped by circuit size.', - events: [], - }, - { - name: 'ultrahonk_proving_time_in_ms', - groupBy: 'circuit-size-in-gates', - description: 'Proving time for UltraHonk grouped by circuit size.', - events: [], - }, { name: 'l1_rollup_calldata_size_in_bytes', groupBy: 'block-size', diff --git a/yarn-project/circuit-types/src/tx/processed_tx.ts b/yarn-project/circuit-types/src/tx/processed_tx.ts index 4fe073090606..410052f705a1 100644 --- a/yarn-project/circuit-types/src/tx/processed_tx.ts +++ b/yarn-project/circuit-types/src/tx/processed_tx.ts @@ -1,28 +1,28 @@ import { EncryptedTxL2Logs, PublicDataWrite, - type SimulationError, - type Tx, + SimulationError, + Tx, TxEffect, TxHash, UnencryptedTxL2Logs, } from '@aztec/circuit-types'; import { Fr, - type Header, - type MAX_NEW_NOTE_HASHES_PER_TX, - type MAX_NEW_NULLIFIERS_PER_TX, - type MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, - type Proof, + Header, + MAX_NEW_NOTE_HASHES_PER_TX, + MAX_NEW_NULLIFIERS_PER_TX, + MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, + Proof, PublicAccumulatedNonRevertibleData, PublicAccumulatedRevertibleData, PublicKernelCircuitPublicInputs, - type SideEffect, - type SideEffectLinkedToNoteHash, + SideEffect, + SideEffectLinkedToNoteHash, ValidationRequests, makeEmptyProof, } from '@aztec/circuits.js'; -import { type Tuple } from '@aztec/foundation/serialize'; +import { Tuple } from '@aztec/foundation/serialize'; /** * Represents a tx that has been processed by the sequencer public processor, diff --git a/yarn-project/circuit-types/src/tx/tx.ts b/yarn-project/circuit-types/src/tx/tx.ts index 181bc5d969ba..4ce149a3720d 100644 --- a/yarn-project/circuit-types/src/tx/tx.ts +++ b/yarn-project/circuit-types/src/tx/tx.ts @@ -9,10 +9,10 @@ import { import { arrayNonEmptyLength } from '@aztec/foundation/collection'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type GetUnencryptedLogsResponse } from '../logs/get_unencrypted_logs_response.js'; -import { type L2LogsSource } from '../logs/l2_logs_source.js'; +import { GetUnencryptedLogsResponse } from '../logs/get_unencrypted_logs_response.js'; +import { L2LogsSource } from '../logs/l2_logs_source.js'; import { EncryptedTxL2Logs, UnencryptedTxL2Logs } from '../logs/tx_l2_logs.js'; -import { type TxStats } from '../stats/stats.js'; +import { TxStats } from '../stats/stats.js'; import { TxHash } from './tx_hash.js'; /** diff --git a/yarn-project/circuit-types/src/tx/tx_receipt.ts b/yarn-project/circuit-types/src/tx/tx_receipt.ts index 1cf7ef0797c8..997e1b5ef7ef 100644 --- a/yarn-project/circuit-types/src/tx/tx_receipt.ts +++ b/yarn-project/circuit-types/src/tx/tx_receipt.ts @@ -1,7 +1,7 @@ -import { type Fr } from '@aztec/foundation/fields'; +import { Fr } from '@aztec/foundation/fields'; -import { type ExtendedNote } from '../notes/extended_note.js'; -import { type PublicDataWrite } from '../public_data_write.js'; +import { ExtendedNote } from '../notes/extended_note.js'; +import { PublicDataWrite } from '../public_data_write.js'; import { TxHash } from './tx_hash.js'; /** diff --git a/yarn-project/circuit-types/src/tx_effect.ts b/yarn-project/circuit-types/src/tx_effect.ts index a078571d6a34..5814843f147c 100644 --- a/yarn-project/circuit-types/src/tx_effect.ts +++ b/yarn-project/circuit-types/src/tx_effect.ts @@ -12,7 +12,7 @@ import { padArrayEnd } from '@aztec/foundation/collection'; import { sha256 } from '@aztec/foundation/crypto'; import { BufferReader, - type Tuple, + Tuple, assertLength, serializeArrayOfBufferableToVector, truncateAndPad, diff --git a/yarn-project/circuit-types/src/tx_execution_request.ts b/yarn-project/circuit-types/src/tx_execution_request.ts index 479cbf0d7646..9f68f8fc6ebe 100644 --- a/yarn-project/circuit-types/src/tx_execution_request.ts +++ b/yarn-project/circuit-types/src/tx_execution_request.ts @@ -1,6 +1,6 @@ import { AztecAddress, Fr, FunctionData, TxContext, TxRequest, Vector } from '@aztec/circuits.js'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import { FieldsOf } from '@aztec/foundation/types'; import { AuthWitness } from './auth_witness.js'; import { PackedArguments } from './packed_arguments.js'; diff --git a/yarn-project/circuits.js/src/barretenberg/crypto/ecdsa/signature.ts b/yarn-project/circuits.js/src/barretenberg/crypto/ecdsa/signature.ts index a0d88a67ab5d..255f2292acb9 100644 --- a/yarn-project/circuits.js/src/barretenberg/crypto/ecdsa/signature.ts +++ b/yarn-project/circuits.js/src/barretenberg/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 { Signature } from '../signature/index.js'; /** * ECDSA signature used for transactions. diff --git a/yarn-project/circuits.js/src/barretenberg/crypto/grumpkin/index.test.ts b/yarn-project/circuits.js/src/barretenberg/crypto/grumpkin/index.test.ts index da7ec63df6d7..154ab39075fb 100644 --- a/yarn-project/circuits.js/src/barretenberg/crypto/grumpkin/index.test.ts +++ b/yarn-project/circuits.js/src/barretenberg/crypto/grumpkin/index.test.ts @@ -1,6 +1,6 @@ import { createDebugLogger } from '@aztec/foundation/log'; -import { GrumpkinScalar, type Point } from '../../../index.js'; +import { GrumpkinScalar, Point } from '../../../index.js'; import { Grumpkin } from './index.js'; const debug = createDebugLogger('bb:grumpkin_test'); diff --git a/yarn-project/circuits.js/src/barretenberg/crypto/grumpkin/index.ts b/yarn-project/circuits.js/src/barretenberg/crypto/grumpkin/index.ts index b9ea7e723253..3abf74fd20a7 100644 --- a/yarn-project/circuits.js/src/barretenberg/crypto/grumpkin/index.ts +++ b/yarn-project/circuits.js/src/barretenberg/crypto/grumpkin/index.ts @@ -1,5 +1,5 @@ import { BarretenbergSync } from '@aztec/bb.js'; -import { Fr, type GrumpkinScalar, Point } from '@aztec/foundation/fields'; +import { Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields'; /** * Grumpkin elliptic curve operations. diff --git a/yarn-project/circuits.js/src/barretenberg/crypto/schnorr/index.ts b/yarn-project/circuits.js/src/barretenberg/crypto/schnorr/index.ts index c0a3ccd0c3e5..e6c7cd56183a 100644 --- a/yarn-project/circuits.js/src/barretenberg/crypto/schnorr/index.ts +++ b/yarn-project/circuits.js/src/barretenberg/crypto/schnorr/index.ts @@ -2,8 +2,8 @@ import { BarretenbergSync } from '@aztec/bb.js'; import { Point } from '@aztec/foundation/fields'; import { numToUInt32BE } from '@aztec/foundation/serialize'; -import { type GrumpkinPrivateKey } from '../../../types/grumpkin_private_key.js'; -import { type PublicKey } from '../../../types/public_key.js'; +import { GrumpkinPrivateKey } from '../../../types/grumpkin_private_key.js'; +import { PublicKey } from '../../../types/public_key.js'; import { SchnorrSignature } from './signature.js'; export * from './signature.js'; diff --git a/yarn-project/circuits.js/src/barretenberg/crypto/schnorr/signature.ts b/yarn-project/circuits.js/src/barretenberg/crypto/schnorr/signature.ts index 16b200fcd89a..4ed9af1f607b 100644 --- a/yarn-project/circuits.js/src/barretenberg/crypto/schnorr/signature.ts +++ b/yarn-project/circuits.js/src/barretenberg/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 { Signature } from '../signature/index.js'; /** * Schnorr signature used for transactions. diff --git a/yarn-project/circuits.js/src/barretenberg/crypto/signature/index.ts b/yarn-project/circuits.js/src/barretenberg/crypto/signature/index.ts index d451121d9c0e..1d76139464ea 100644 --- a/yarn-project/circuits.js/src/barretenberg/crypto/signature/index.ts +++ b/yarn-project/circuits.js/src/barretenberg/crypto/signature/index.ts @@ -1,4 +1,4 @@ -import { type Fr } from '@aztec/foundation/fields'; +import { Fr } from '@aztec/foundation/fields'; /** * Interface to represent a signature. diff --git a/yarn-project/circuits.js/src/contract/artifact_hash.ts b/yarn-project/circuits.js/src/contract/artifact_hash.ts index e590084a51ed..f07138eb1673 100644 --- a/yarn-project/circuits.js/src/contract/artifact_hash.ts +++ b/yarn-project/circuits.js/src/contract/artifact_hash.ts @@ -1,10 +1,10 @@ -import { type ContractArtifact, type FunctionArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi'; +import { ContractArtifact, FunctionArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi'; import { sha256 } from '@aztec/foundation/crypto'; import { Fr, reduceFn } from '@aztec/foundation/fields'; import { createDebugLogger } from '@aztec/foundation/log'; import { numToUInt8 } from '@aztec/foundation/serialize'; -import { type MerkleTree } from '../merkle/merkle_tree.js'; +import { MerkleTree } from '../merkle/merkle_tree.js'; import { MerkleTreeCalculator } from '../merkle/merkle_tree_calculator.js'; const VERSION = 1; diff --git a/yarn-project/circuits.js/src/contract/contract_address.test.ts b/yarn-project/circuits.js/src/contract/contract_address.test.ts index 47a98c800715..46d6965291e5 100644 --- a/yarn-project/circuits.js/src/contract/contract_address.test.ts +++ b/yarn-project/circuits.js/src/contract/contract_address.test.ts @@ -1,4 +1,4 @@ -import { ABIParameterVisibility, type FunctionAbi, FunctionType } from '@aztec/foundation/abi'; +import { ABIParameterVisibility, FunctionAbi, FunctionType } from '@aztec/foundation/abi'; import { Fr, Point } from '@aztec/foundation/fields'; import { setupCustomSnapshotSerializers, updateInlineTestData } from '@aztec/foundation/testing'; diff --git a/yarn-project/circuits.js/src/contract/contract_address.ts b/yarn-project/circuits.js/src/contract/contract_address.ts index 96196f019719..68802e622cf9 100644 --- a/yarn-project/circuits.js/src/contract/contract_address.ts +++ b/yarn-project/circuits.js/src/contract/contract_address.ts @@ -1,12 +1,12 @@ -import { type FunctionAbi, FunctionSelector, encodeArguments } from '@aztec/foundation/abi'; +import { FunctionAbi, FunctionSelector, encodeArguments } from '@aztec/foundation/abi'; import { AztecAddress } from '@aztec/foundation/aztec-address'; import { pedersenHash } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; -import { type ContractInstance } from '@aztec/types/contracts'; +import { ContractInstance } from '@aztec/types/contracts'; import { GeneratorIndex } from '../constants.gen.js'; import { computeVarArgsHash } from '../hash/hash.js'; -import { type PublicKey } from '../types/public_key.js'; +import { PublicKey } from '../types/public_key.js'; // TODO(@spalladino): Review all generator indices in this file diff --git a/yarn-project/circuits.js/src/contract/contract_class.ts b/yarn-project/circuits.js/src/contract/contract_class.ts index b4834dc86739..8f270051f871 100644 --- a/yarn-project/circuits.js/src/contract/contract_class.ts +++ b/yarn-project/circuits.js/src/contract/contract_class.ts @@ -1,9 +1,9 @@ -import { type ContractArtifact, type FunctionArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi'; +import { ContractArtifact, FunctionArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi'; import { Fr } from '@aztec/foundation/fields'; -import { type ContractClass, type ContractClassWithId } from '@aztec/types/contracts'; +import { ContractClass, ContractClassWithId } from '@aztec/types/contracts'; import { computeArtifactHash } from './artifact_hash.js'; -import { type ContractClassIdPreimage, computeContractClassIdWithPreimage } from './contract_class_id.js'; +import { ContractClassIdPreimage, computeContractClassIdWithPreimage } from './contract_class_id.js'; import { packBytecode } from './public_bytecode.js'; /** Contract artifact including its artifact hash */ diff --git a/yarn-project/circuits.js/src/contract/contract_class_id.test.ts b/yarn-project/circuits.js/src/contract/contract_class_id.test.ts index 7f40b3029a08..2700c2481599 100644 --- a/yarn-project/circuits.js/src/contract/contract_class_id.test.ts +++ b/yarn-project/circuits.js/src/contract/contract_class_id.test.ts @@ -1,5 +1,5 @@ import { Fr } from '@aztec/foundation/fields'; -import { type ContractClass } from '@aztec/types/contracts'; +import { ContractClass } from '@aztec/types/contracts'; import { FunctionSelector, computeContractClassId } from '../index.js'; diff --git a/yarn-project/circuits.js/src/contract/contract_class_id.ts b/yarn-project/circuits.js/src/contract/contract_class_id.ts index 86020074ed6f..b82aac66f216 100644 --- a/yarn-project/circuits.js/src/contract/contract_class_id.ts +++ b/yarn-project/circuits.js/src/contract/contract_class_id.ts @@ -1,6 +1,6 @@ import { pedersenHash, sha256 } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; -import { type ContractClass } from '@aztec/types/contracts'; +import { ContractClass } from '@aztec/types/contracts'; import { GeneratorIndex } from '../constants.gen.js'; import { computePrivateFunctionsRoot } from './private_function.js'; diff --git a/yarn-project/circuits.js/src/contract/contract_instance.ts b/yarn-project/circuits.js/src/contract/contract_instance.ts index 4b3e135b3e71..dd96ec194915 100644 --- a/yarn-project/circuits.js/src/contract/contract_instance.ts +++ b/yarn-project/circuits.js/src/contract/contract_instance.ts @@ -1,12 +1,12 @@ -import { type ContractArtifact, type FunctionArtifact, getDefaultInitializer } from '@aztec/foundation/abi'; +import { ContractArtifact, FunctionArtifact, getDefaultInitializer } from '@aztec/foundation/abi'; import { AztecAddress } from '@aztec/foundation/aztec-address'; import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr, Point } from '@aztec/foundation/fields'; -import { type ContractInstance, type ContractInstanceWithAddress } from '@aztec/types/contracts'; +import { ContractInstance, ContractInstanceWithAddress } from '@aztec/types/contracts'; import { getContractClassFromArtifact } from '../contract/contract_class.js'; import { computeContractClassId } from '../contract/contract_class_id.js'; -import { type PublicKey } from '../types/public_key.js'; +import { PublicKey } from '../types/public_key.js'; import { computeContractAddressFromInstance, computeInitializationHash, diff --git a/yarn-project/circuits.js/src/contract/events/contract_class_registered_event.ts b/yarn-project/circuits.js/src/contract/events/contract_class_registered_event.ts index 418cc304696d..016dd1cbfb40 100644 --- a/yarn-project/circuits.js/src/contract/events/contract_class_registered_event.ts +++ b/yarn-project/circuits.js/src/contract/events/contract_class_registered_event.ts @@ -1,9 +1,9 @@ import { bufferFromFields } from '@aztec/foundation/abi'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; import { toBigIntBE } from '@aztec/foundation/bigint-buffer'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader } from '@aztec/foundation/serialize'; -import { type ContractClassPublic } from '@aztec/types/contracts'; +import { ContractClassPublic } from '@aztec/types/contracts'; import chunk from 'lodash.chunk'; diff --git a/yarn-project/circuits.js/src/contract/events/contract_instance_deployed_event.ts b/yarn-project/circuits.js/src/contract/events/contract_instance_deployed_event.ts index 19de6205fc68..b307070424e4 100644 --- a/yarn-project/circuits.js/src/contract/events/contract_instance_deployed_event.ts +++ b/yarn-project/circuits.js/src/contract/events/contract_instance_deployed_event.ts @@ -3,7 +3,7 @@ import { toBigIntBE } from '@aztec/foundation/bigint-buffer'; import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader } from '@aztec/foundation/serialize'; -import { type ContractInstanceWithAddress } from '@aztec/types/contracts'; +import { ContractInstanceWithAddress } from '@aztec/types/contracts'; import { DEPLOYER_CONTRACT_ADDRESS, DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE } from '../../constants.gen.js'; diff --git a/yarn-project/circuits.js/src/contract/events/private_function_broadcasted_event.ts b/yarn-project/circuits.js/src/contract/events/private_function_broadcasted_event.ts index ae579a2fac20..a11c23de56d0 100644 --- a/yarn-project/circuits.js/src/contract/events/private_function_broadcasted_event.ts +++ b/yarn-project/circuits.js/src/contract/events/private_function_broadcasted_event.ts @@ -1,9 +1,9 @@ import { FunctionSelector, bufferFromFields } from '@aztec/foundation/abi'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; import { toBigIntBE } from '@aztec/foundation/bigint-buffer'; import { Fr } from '@aztec/foundation/fields'; -import { BufferReader, type Tuple } from '@aztec/foundation/serialize'; -import { type ExecutablePrivateFunctionWithMembershipProof, type PrivateFunction } from '@aztec/types/contracts'; +import { BufferReader, Tuple } from '@aztec/foundation/serialize'; +import { ExecutablePrivateFunctionWithMembershipProof, PrivateFunction } from '@aztec/types/contracts'; import chunk from 'lodash.chunk'; diff --git a/yarn-project/circuits.js/src/contract/events/unconstrained_function_broadcasted_event.test.ts b/yarn-project/circuits.js/src/contract/events/unconstrained_function_broadcasted_event.test.ts index d331a41b1cf5..995f70d873e6 100644 --- a/yarn-project/circuits.js/src/contract/events/unconstrained_function_broadcasted_event.test.ts +++ b/yarn-project/circuits.js/src/contract/events/unconstrained_function_broadcasted_event.test.ts @@ -1,7 +1,7 @@ import { FunctionSelector } from '@aztec/foundation/abi'; import { randomBytes } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; -import { type Tuple } from '@aztec/foundation/serialize'; +import { Tuple } from '@aztec/foundation/serialize'; import { setupCustomSnapshotSerializers } from '@aztec/foundation/testing'; import { getSampleUnconstrainedFunctionBroadcastedEventPayload } from '../../tests/fixtures.js'; diff --git a/yarn-project/circuits.js/src/contract/events/unconstrained_function_broadcasted_event.ts b/yarn-project/circuits.js/src/contract/events/unconstrained_function_broadcasted_event.ts index 32556036e77e..0ac0fe0d58f8 100644 --- a/yarn-project/circuits.js/src/contract/events/unconstrained_function_broadcasted_event.ts +++ b/yarn-project/circuits.js/src/contract/events/unconstrained_function_broadcasted_event.ts @@ -1,10 +1,10 @@ import { FunctionSelector, bufferFromFields } from '@aztec/foundation/abi'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; import { toBigIntBE } from '@aztec/foundation/bigint-buffer'; import { removeArrayPaddingEnd } from '@aztec/foundation/collection'; import { Fr } from '@aztec/foundation/fields'; -import { BufferReader, type Tuple } from '@aztec/foundation/serialize'; -import { type UnconstrainedFunction, type UnconstrainedFunctionWithMembershipProof } from '@aztec/types/contracts'; +import { BufferReader, Tuple } from '@aztec/foundation/serialize'; +import { UnconstrainedFunction, UnconstrainedFunctionWithMembershipProof } from '@aztec/types/contracts'; import chunk from 'lodash.chunk'; diff --git a/yarn-project/circuits.js/src/contract/private_function.test.ts b/yarn-project/circuits.js/src/contract/private_function.test.ts index c4bbb377b010..e39d828bf3bf 100644 --- a/yarn-project/circuits.js/src/contract/private_function.test.ts +++ b/yarn-project/circuits.js/src/contract/private_function.test.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; import { setupCustomSnapshotSerializers } from '@aztec/foundation/testing'; -import { type PrivateFunction } from '@aztec/types/contracts'; +import { PrivateFunction } from '@aztec/types/contracts'; import { fr, makeSelector } from '../tests/factories.js'; import { computePrivateFunctionsRoot, computePrivateFunctionsTree } from './private_function.js'; diff --git a/yarn-project/circuits.js/src/contract/private_function.ts b/yarn-project/circuits.js/src/contract/private_function.ts index ea244b9d94ac..a6670b03c51f 100644 --- a/yarn-project/circuits.js/src/contract/private_function.ts +++ b/yarn-project/circuits.js/src/contract/private_function.ts @@ -1,9 +1,9 @@ import { pedersenHash } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; -import { type PrivateFunction } from '@aztec/types/contracts'; +import { PrivateFunction } from '@aztec/types/contracts'; import { FUNCTION_TREE_HEIGHT, GeneratorIndex } from '../constants.gen.js'; -import { type MerkleTree, MerkleTreeCalculator } from '../merkle/index.js'; +import { MerkleTree, MerkleTreeCalculator } from '../merkle/index.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/circuits.js/src/contract/private_function_membership_proof.test.ts b/yarn-project/circuits.js/src/contract/private_function_membership_proof.test.ts index 19b85857f266..e50b2332d67a 100644 --- a/yarn-project/circuits.js/src/contract/private_function_membership_proof.test.ts +++ b/yarn-project/circuits.js/src/contract/private_function_membership_proof.test.ts @@ -1,10 +1,10 @@ -import { type ContractArtifact, type FunctionArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi'; +import { ContractArtifact, FunctionArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi'; import { Fr } from '@aztec/foundation/fields'; -import { type ContractClass } from '@aztec/types/contracts'; +import { ContractClass } from '@aztec/types/contracts'; import { getBenchmarkContractArtifact } from '../tests/fixtures.js'; import { computeVerificationKeyHash, getContractClassFromArtifact } from './contract_class.js'; -import { type ContractClassIdPreimage } from './contract_class_id.js'; +import { ContractClassIdPreimage } from './contract_class_id.js'; import { createPrivateFunctionMembershipProof, isValidPrivateFunctionMembershipProof, diff --git a/yarn-project/circuits.js/src/contract/private_function_membership_proof.ts b/yarn-project/circuits.js/src/contract/private_function_membership_proof.ts index 81e4f08f95d3..bd11a3a98672 100644 --- a/yarn-project/circuits.js/src/contract/private_function_membership_proof.ts +++ b/yarn-project/circuits.js/src/contract/private_function_membership_proof.ts @@ -1,10 +1,10 @@ -import { type ContractArtifact, type FunctionSelector, FunctionType } from '@aztec/foundation/abi'; +import { ContractArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi'; import { Fr } from '@aztec/foundation/fields'; import { createDebugLogger } from '@aztec/foundation/log'; import { - type ContractClassPublic, - type ExecutablePrivateFunctionWithMembershipProof, - type PrivateFunctionMembershipProof, + ContractClassPublic, + ExecutablePrivateFunctionWithMembershipProof, + PrivateFunctionMembershipProof, } from '@aztec/types/contracts'; import { computeRootFromSiblingPath } from '../merkle/index.js'; diff --git a/yarn-project/circuits.js/src/contract/public_bytecode.test.ts b/yarn-project/circuits.js/src/contract/public_bytecode.test.ts index 86ed8beb1a77..8e4bd7887f4b 100644 --- a/yarn-project/circuits.js/src/contract/public_bytecode.test.ts +++ b/yarn-project/circuits.js/src/contract/public_bytecode.test.ts @@ -1,4 +1,4 @@ -import { type ContractArtifact } from '@aztec/foundation/abi'; +import { ContractArtifact } from '@aztec/foundation/abi'; import { getBenchmarkContractArtifact } from '../tests/fixtures.js'; import { getContractClassFromArtifact } from './contract_class.js'; diff --git a/yarn-project/circuits.js/src/contract/public_bytecode.ts b/yarn-project/circuits.js/src/contract/public_bytecode.ts index 66904656074f..0292fd55b9d6 100644 --- a/yarn-project/circuits.js/src/contract/public_bytecode.ts +++ b/yarn-project/circuits.js/src/contract/public_bytecode.ts @@ -5,7 +5,7 @@ import { serializeArrayOfBufferableToVector, serializeToBuffer, } from '@aztec/foundation/serialize'; -import { type ContractClass } from '@aztec/types/contracts'; +import { ContractClass } from '@aztec/types/contracts'; import { FUNCTION_SELECTOR_NUM_BYTES } from '../constants.gen.js'; diff --git a/yarn-project/circuits.js/src/contract/unconstrained_function_membership_proof.test.ts b/yarn-project/circuits.js/src/contract/unconstrained_function_membership_proof.test.ts index 35b983e08e29..c7b1a4eddeac 100644 --- a/yarn-project/circuits.js/src/contract/unconstrained_function_membership_proof.test.ts +++ b/yarn-project/circuits.js/src/contract/unconstrained_function_membership_proof.test.ts @@ -1,10 +1,10 @@ -import { type ContractArtifact, type FunctionArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi'; +import { ContractArtifact, FunctionArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi'; import { Fr } from '@aztec/foundation/fields'; -import { type ContractClass } from '@aztec/types/contracts'; +import { ContractClass } from '@aztec/types/contracts'; import { getTestContractArtifact } from '../tests/fixtures.js'; import { getContractClassFromArtifact } from './contract_class.js'; -import { type ContractClassIdPreimage } from './contract_class_id.js'; +import { ContractClassIdPreimage } from './contract_class_id.js'; import { createUnconstrainedFunctionMembershipProof, isValidUnconstrainedFunctionMembershipProof, diff --git a/yarn-project/circuits.js/src/contract/unconstrained_function_membership_proof.ts b/yarn-project/circuits.js/src/contract/unconstrained_function_membership_proof.ts index 06cc292b68de..144e11ed81d5 100644 --- a/yarn-project/circuits.js/src/contract/unconstrained_function_membership_proof.ts +++ b/yarn-project/circuits.js/src/contract/unconstrained_function_membership_proof.ts @@ -1,10 +1,10 @@ -import { type ContractArtifact, type FunctionSelector, FunctionType } from '@aztec/foundation/abi'; +import { ContractArtifact, FunctionSelector, FunctionType } from '@aztec/foundation/abi'; import { Fr } from '@aztec/foundation/fields'; import { createDebugLogger } from '@aztec/foundation/log'; import { - type ContractClassPublic, - type UnconstrainedFunctionMembershipProof, - type UnconstrainedFunctionWithMembershipProof, + ContractClassPublic, + UnconstrainedFunctionMembershipProof, + UnconstrainedFunctionWithMembershipProof, } from '@aztec/types/contracts'; import { computeRootFromSiblingPath } from '../merkle/index.js'; diff --git a/yarn-project/circuits.js/src/hash/hash.ts b/yarn-project/circuits.js/src/hash/hash.ts index b5f4f1c0a633..60440f4205e5 100644 --- a/yarn-project/circuits.js/src/hash/hash.ts +++ b/yarn-project/circuits.js/src/hash/hash.ts @@ -1,4 +1,4 @@ -import { type AztecAddress } from '@aztec/foundation/aztec-address'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; import { padArrayEnd } from '@aztec/foundation/collection'; import { pedersenHash, pedersenHashBuffer } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; diff --git a/yarn-project/circuits.js/src/hints/build_hints.test.ts b/yarn-project/circuits.js/src/hints/build_hints.test.ts index 7ac9ee39a521..9db861afe550 100644 --- a/yarn-project/circuits.js/src/hints/build_hints.test.ts +++ b/yarn-project/circuits.js/src/hints/build_hints.test.ts @@ -2,13 +2,13 @@ import { makeTuple } from '@aztec/foundation/array'; import { AztecAddress } from '@aztec/foundation/aztec-address'; import { padArrayEnd } from '@aztec/foundation/collection'; import { Fr } from '@aztec/foundation/fields'; -import { type Tuple } from '@aztec/foundation/serialize'; +import { Tuple } from '@aztec/foundation/serialize'; import { MAX_NEW_NULLIFIERS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX } from '../constants.gen.js'; import { siloNullifier } from '../hash/index.js'; import { NullifierNonExistentReadRequestHintsBuilder, - type NullifierReadRequestHints, + NullifierReadRequestHints, NullifierReadRequestHintsBuilder, PendingReadHint, ReadRequestContext, diff --git a/yarn-project/circuits.js/src/hints/build_hints.ts b/yarn-project/circuits.js/src/hints/build_hints.ts index 444a993220f1..c22df8b15fea 100644 --- a/yarn-project/circuits.js/src/hints/build_hints.ts +++ b/yarn-project/circuits.js/src/hints/build_hints.ts @@ -1,18 +1,18 @@ import { padArrayEnd } from '@aztec/foundation/collection'; -import { type Fr } from '@aztec/foundation/fields'; -import { type Tuple } from '@aztec/foundation/serialize'; -import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import { Fr } from '@aztec/foundation/fields'; +import { Tuple } from '@aztec/foundation/serialize'; +import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; import { MAX_NEW_NULLIFIERS_PER_TX, - type MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX, - type MAX_NULLIFIER_READ_REQUESTS_PER_TX, - type NULLIFIER_TREE_HEIGHT, + MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX, + MAX_NULLIFIER_READ_REQUESTS_PER_TX, + NULLIFIER_TREE_HEIGHT, } from '../constants.gen.js'; import { siloNullifier } from '../hash/index.js'; -import { type MembershipWitness } from '../structs/membership_witness.js'; +import { MembershipWitness } from '../structs/membership_witness.js'; import { NullifierNonExistentReadRequestHintsBuilder } from '../structs/non_existent_read_request_hints.js'; -import { type ReadRequestContext } from '../structs/read_request.js'; +import { ReadRequestContext } from '../structs/read_request.js'; import { NullifierReadRequestHintsBuilder } from '../structs/read_request_hints.js'; import { SideEffectLinkedToNoteHash } from '../structs/side_effects.js'; import { countAccumulatedItems } from './utils.js'; diff --git a/yarn-project/circuits.js/src/hints/utils.test.ts b/yarn-project/circuits.js/src/hints/utils.test.ts index 1ae2d47ead50..e5897e30a87f 100644 --- a/yarn-project/circuits.js/src/hints/utils.test.ts +++ b/yarn-project/circuits.js/src/hints/utils.test.ts @@ -1,6 +1,6 @@ -import { type IsEmpty } from '@aztec/circuits.js'; +import { IsEmpty } from '@aztec/circuits.js'; import { makeTuple } from '@aztec/foundation/array'; -import { type Tuple } from '@aztec/foundation/serialize'; +import { Tuple } from '@aztec/foundation/serialize'; import { concatAccumulatedData, countAccumulatedItems, mergeAccumulatedData } from './utils.js'; diff --git a/yarn-project/circuits.js/src/hints/utils.ts b/yarn-project/circuits.js/src/hints/utils.ts index c63dad6aa8d2..d98de228d7d3 100644 --- a/yarn-project/circuits.js/src/hints/utils.ts +++ b/yarn-project/circuits.js/src/hints/utils.ts @@ -1,4 +1,4 @@ -import { type Tuple } from '@aztec/foundation/serialize'; +import { Tuple } from '@aztec/foundation/serialize'; export interface IsEmpty { isEmpty: () => boolean; diff --git a/yarn-project/circuits.js/src/keys/index.ts b/yarn-project/circuits.js/src/keys/index.ts index def8b4801674..3f4969cf0cb5 100644 --- a/yarn-project/circuits.js/src/keys/index.ts +++ b/yarn-project/circuits.js/src/keys/index.ts @@ -1,9 +1,9 @@ -import { type AztecAddress } from '@aztec/foundation/aztec-address'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; import { pedersenHash } from '@aztec/foundation/crypto'; import { Fr, GrumpkinScalar } from '@aztec/foundation/fields'; import { Grumpkin } from '../barretenberg/crypto/grumpkin/index.js'; -import { type GrumpkinPrivateKey } from '../types/grumpkin_private_key.js'; +import { GrumpkinPrivateKey } from '../types/grumpkin_private_key.js'; /** * Derives the public key of a secret key. diff --git a/yarn-project/circuits.js/src/merkle/sibling_path.test.ts b/yarn-project/circuits.js/src/merkle/sibling_path.test.ts index 7b2852570d0e..6b59138a4769 100644 --- a/yarn-project/circuits.js/src/merkle/sibling_path.test.ts +++ b/yarn-project/circuits.js/src/merkle/sibling_path.test.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; -import { type MerkleTree } from './merkle_tree.js'; +import { MerkleTree } from './merkle_tree.js'; import { MerkleTreeCalculator } from './merkle_tree_calculator.js'; import { computeRootFromSiblingPath } from './sibling_path.js'; diff --git a/yarn-project/circuits.js/src/structs/aggregation_object.ts b/yarn-project/circuits.js/src/structs/aggregation_object.ts index 3056df1797b1..3cc56b45391c 100644 --- a/yarn-project/circuits.js/src/structs/aggregation_object.ts +++ b/yarn-project/circuits.js/src/structs/aggregation_object.ts @@ -2,7 +2,7 @@ import { times } from '@aztec/foundation/collection'; import { Fq, Fr } from '@aztec/foundation/fields'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type UInt32, Vector } from './shared.js'; +import { UInt32, Vector } from './shared.js'; import { G1AffineElement } from './verification_key.js'; /** diff --git a/yarn-project/circuits.js/src/structs/call_context.ts b/yarn-project/circuits.js/src/structs/call_context.ts index 68aaaa99c1a6..17438a431a74 100644 --- a/yarn-project/circuits.js/src/structs/call_context.ts +++ b/yarn-project/circuits.js/src/structs/call_context.ts @@ -3,7 +3,7 @@ import { AztecAddress } from '@aztec/foundation/aztec-address'; 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 { FieldsOf } from '@aztec/foundation/types'; import { CALL_CONTEXT_LENGTH } from '../constants.gen.js'; diff --git a/yarn-project/circuits.js/src/structs/call_request.ts b/yarn-project/circuits.js/src/structs/call_request.ts index 89fef28fcb7a..353cce504f4e 100644 --- a/yarn-project/circuits.js/src/structs/call_request.ts +++ b/yarn-project/circuits.js/src/structs/call_request.ts @@ -1,7 +1,7 @@ import { AztecAddress } from '@aztec/foundation/aztec-address'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import { FieldsOf } from '@aztec/foundation/types'; /** * Caller context. diff --git a/yarn-project/circuits.js/src/structs/complete_address.ts b/yarn-project/circuits.js/src/structs/complete_address.ts index 40794fbe5d42..da3d0be17b1f 100644 --- a/yarn-project/circuits.js/src/structs/complete_address.ts +++ b/yarn-project/circuits.js/src/structs/complete_address.ts @@ -4,9 +4,9 @@ import { BufferReader } from '@aztec/foundation/serialize'; import { Grumpkin } from '../barretenberg/index.js'; import { computeContractAddressFromPartial, computePartialAddress } from '../contract/contract_address.js'; -import { type GrumpkinPrivateKey } from '../types/grumpkin_private_key.js'; -import { type PartialAddress } from '../types/partial_address.js'; -import { type PublicKey } from '../types/public_key.js'; +import { GrumpkinPrivateKey } from '../types/grumpkin_private_key.js'; +import { PartialAddress } from '../types/partial_address.js'; +import { PublicKey } from '../types/public_key.js'; /** * A complete address is a combination of an Aztec address, a public key and a partial address. diff --git a/yarn-project/circuits.js/src/structs/contract_storage_update_request.ts b/yarn-project/circuits.js/src/structs/contract_storage_update_request.ts index 8508fa8c7b8a..37f9a678717a 100644 --- a/yarn-project/circuits.js/src/structs/contract_storage_update_request.ts +++ b/yarn-project/circuits.js/src/structs/contract_storage_update_request.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import { FieldsOf } from '@aztec/foundation/types'; import { CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH } from '../constants.gen.js'; diff --git a/yarn-project/circuits.js/src/structs/function_data.ts b/yarn-project/circuits.js/src/structs/function_data.ts index bb5001d9e2e3..08c803270b5a 100644 --- a/yarn-project/circuits.js/src/structs/function_data.ts +++ b/yarn-project/circuits.js/src/structs/function_data.ts @@ -1,10 +1,10 @@ -import { type FunctionAbi, FunctionSelector, FunctionType } from '@aztec/foundation/abi'; +import { FunctionAbi, FunctionSelector, FunctionType } from '@aztec/foundation/abi'; import { pedersenHash } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { FUNCTION_DATA_LENGTH, GeneratorIndex } from '../constants.gen.js'; -import { type ContractFunctionDao } from '../types/contract_function_dao.js'; +import { ContractFunctionDao } from '../types/contract_function_dao.js'; /** Function description for circuit. */ export class FunctionData { diff --git a/yarn-project/circuits.js/src/structs/global_variables.ts b/yarn-project/circuits.js/src/structs/global_variables.ts index d3f762785c4f..05c90e8b0e39 100644 --- a/yarn-project/circuits.js/src/structs/global_variables.ts +++ b/yarn-project/circuits.js/src/structs/global_variables.ts @@ -2,7 +2,7 @@ import { AztecAddress } from '@aztec/foundation/aztec-address'; 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 { FieldsOf } from '@aztec/foundation/types'; import { GLOBAL_VARIABLES_LENGTH } from '../constants.gen.js'; diff --git a/yarn-project/circuits.js/src/structs/header.ts b/yarn-project/circuits.js/src/structs/header.ts index 0a5413fa5a70..782486a1fb66 100644 --- a/yarn-project/circuits.js/src/structs/header.ts +++ b/yarn-project/circuits.js/src/structs/header.ts @@ -1,5 +1,5 @@ import { pedersenHash } from '@aztec/foundation/crypto'; -import { type Fr } from '@aztec/foundation/fields'; +import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { GeneratorIndex, HEADER_LENGTH } from '../constants.gen.js'; diff --git a/yarn-project/circuits.js/src/structs/kernel/combined_accumulated_data.ts b/yarn-project/circuits.js/src/structs/kernel/combined_accumulated_data.ts index 0de9b528bbdd..326e410a257e 100644 --- a/yarn-project/circuits.js/src/structs/kernel/combined_accumulated_data.ts +++ b/yarn-project/circuits.js/src/structs/kernel/combined_accumulated_data.ts @@ -2,12 +2,12 @@ import { makeTuple } from '@aztec/foundation/array'; import { padArrayEnd } from '@aztec/foundation/collection'; import { Fr } from '@aztec/foundation/fields'; import { createDebugOnlyLogger } from '@aztec/foundation/log'; -import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; +import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; import { inspect } from 'util'; import { - type MAX_NEW_L2_TO_L1_MSGS_PER_CALL, + MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_L2_TO_L1_MSGS_PER_TX, MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, diff --git a/yarn-project/circuits.js/src/structs/kernel/private_call_data.ts b/yarn-project/circuits.js/src/structs/kernel/private_call_data.ts index 7026461a9976..eba16946eea8 100644 --- a/yarn-project/circuits.js/src/structs/kernel/private_call_data.ts +++ b/yarn-project/circuits.js/src/structs/kernel/private_call_data.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; -import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; +import { FieldsOf } from '@aztec/foundation/types'; import { FUNCTION_TREE_HEIGHT, diff --git a/yarn-project/circuits.js/src/structs/kernel/private_kernel_inner_data.ts b/yarn-project/circuits.js/src/structs/kernel/private_kernel_inner_data.ts index 580de7e57e3f..ab18c8460a03 100644 --- a/yarn-project/circuits.js/src/structs/kernel/private_kernel_inner_data.ts +++ b/yarn-project/circuits.js/src/structs/kernel/private_kernel_inner_data.ts @@ -1,10 +1,10 @@ import { makeTuple } from '@aztec/foundation/array'; import { Fr } from '@aztec/foundation/fields'; -import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; +import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; import { VK_TREE_HEIGHT } from '../../constants.gen.js'; import { Proof, makeEmptyProof } from '../proof.js'; -import { type UInt32 } from '../shared.js'; +import { UInt32 } from '../shared.js'; import { VerificationKey } from '../verification_key.js'; import { PrivateKernelInnerCircuitPublicInputs } from './private_kernel_inner_circuit_public_inputs.js'; diff --git a/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_circuit_private_inputs.ts b/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_circuit_private_inputs.ts index ad629499041c..2f90462d3bd5 100644 --- a/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_circuit_private_inputs.ts +++ b/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_circuit_private_inputs.ts @@ -1,4 +1,4 @@ -import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; +import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; import { MAX_NEW_NOTE_HASHES_PER_TX, @@ -6,9 +6,9 @@ import { MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, } from '../../constants.gen.js'; -import { type GrumpkinPrivateKey } from '../../index.js'; +import { GrumpkinPrivateKey } from '../../index.js'; import { Fr, GrumpkinScalar } from '../index.js'; -import { type NullifierReadRequestHints, nullifierReadRequestHintsFromBuffer } from '../read_request_hints.js'; +import { NullifierReadRequestHints, nullifierReadRequestHintsFromBuffer } from '../read_request_hints.js'; import { SideEffect, SideEffectLinkedToNoteHash } from '../side_effects.js'; import { PrivateKernelInnerData } from './private_kernel_inner_data.js'; diff --git a/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_data.ts b/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_data.ts index 837b2a138e34..52afd0a3efde 100644 --- a/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_data.ts +++ b/yarn-project/circuits.js/src/structs/kernel/private_kernel_tail_data.ts @@ -1,10 +1,10 @@ import { makeTuple } from '@aztec/foundation/array'; import { Fr } from '@aztec/foundation/fields'; -import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; +import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; import { VK_TREE_HEIGHT } from '../../constants.gen.js'; import { Proof, makeEmptyProof } from '../proof.js'; -import { type UInt32 } from '../shared.js'; +import { UInt32 } from '../shared.js'; import { VerificationKey } from '../verification_key.js'; import { PrivateKernelTailCircuitPublicInputs } from './private_kernel_tail_circuit_public_inputs.js'; diff --git a/yarn-project/circuits.js/src/structs/kernel/public_call_data.ts b/yarn-project/circuits.js/src/structs/kernel/public_call_data.ts index 5d53b9a49a79..c73427c651c7 100644 --- a/yarn-project/circuits.js/src/structs/kernel/public_call_data.ts +++ b/yarn-project/circuits.js/src/structs/kernel/public_call_data.ts @@ -1,10 +1,10 @@ -import { type Fr } from '@aztec/foundation/fields'; -import { type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; +import { Fr } from '@aztec/foundation/fields'; +import { Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL } from '../../constants.gen.js'; -import { type CallRequest } from '../call_request.js'; -import { type Proof } from '../proof.js'; -import { type PublicCallStackItem } from '../public_call_stack_item.js'; +import { MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL } from '../../constants.gen.js'; +import { CallRequest } from '../call_request.js'; +import { Proof } from '../proof.js'; +import { PublicCallStackItem } from '../public_call_stack_item.js'; /** * Public calldata assembled from the kernel execution result and proof. diff --git a/yarn-project/circuits.js/src/structs/kernel/public_kernel_circuit_private_inputs.ts b/yarn-project/circuits.js/src/structs/kernel/public_kernel_circuit_private_inputs.ts index 86530dc0f4d9..b8b244d2435a 100644 --- a/yarn-project/circuits.js/src/structs/kernel/public_kernel_circuit_private_inputs.ts +++ b/yarn-project/circuits.js/src/structs/kernel/public_kernel_circuit_private_inputs.ts @@ -1,7 +1,7 @@ import { serializeToBuffer } from '@aztec/foundation/serialize'; -import { type PublicCallData } from './public_call_data.js'; -import { type PublicKernelData } from './public_kernel_data.js'; +import { PublicCallData } from './public_call_data.js'; +import { PublicKernelData } from './public_kernel_data.js'; /** * Inputs to the public kernel circuit. diff --git a/yarn-project/circuits.js/src/structs/kernel/public_kernel_data.ts b/yarn-project/circuits.js/src/structs/kernel/public_kernel_data.ts index c558b5aad571..2dfcb7fe9929 100644 --- a/yarn-project/circuits.js/src/structs/kernel/public_kernel_data.ts +++ b/yarn-project/circuits.js/src/structs/kernel/public_kernel_data.ts @@ -1,10 +1,10 @@ import { makeTuple } from '@aztec/foundation/array'; import { Fr } from '@aztec/foundation/fields'; -import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; +import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; import { VK_TREE_HEIGHT } from '../../constants.gen.js'; import { Proof, makeEmptyProof } from '../proof.js'; -import { type UInt32 } from '../shared.js'; +import { UInt32 } from '../shared.js'; import { VerificationKey } from '../verification_key.js'; import { PublicKernelCircuitPublicInputs } from './public_kernel_circuit_public_inputs.js'; diff --git a/yarn-project/circuits.js/src/structs/kernel/public_kernel_tail_circuit_private_inputs.ts b/yarn-project/circuits.js/src/structs/kernel/public_kernel_tail_circuit_private_inputs.ts index 073c0598861d..77f3bc4cf112 100644 --- a/yarn-project/circuits.js/src/structs/kernel/public_kernel_tail_circuit_private_inputs.ts +++ b/yarn-project/circuits.js/src/structs/kernel/public_kernel_tail_circuit_private_inputs.ts @@ -1,8 +1,8 @@ import { serializeToBuffer } from '@aztec/foundation/serialize'; -import { type NullifierNonExistentReadRequestHints } from '../non_existent_read_request_hints.js'; -import { type NullifierReadRequestHints } from '../read_request_hints.js'; -import { type PublicKernelData } from './public_kernel_data.js'; +import { NullifierNonExistentReadRequestHints } from '../non_existent_read_request_hints.js'; +import { NullifierReadRequestHints } from '../read_request_hints.js'; +import { PublicKernelData } from './public_kernel_data.js'; /** * Inputs to the public kernel circuit. diff --git a/yarn-project/circuits.js/src/structs/kernel/rollup_kernel_data.ts b/yarn-project/circuits.js/src/structs/kernel/rollup_kernel_data.ts index 384c383fac0a..9945403bdccd 100644 --- a/yarn-project/circuits.js/src/structs/kernel/rollup_kernel_data.ts +++ b/yarn-project/circuits.js/src/structs/kernel/rollup_kernel_data.ts @@ -1,10 +1,10 @@ import { makeTuple } from '@aztec/foundation/array'; import { Fr } from '@aztec/foundation/fields'; -import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; +import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; import { VK_TREE_HEIGHT } from '../../constants.gen.js'; import { Proof, makeEmptyProof } from '../proof.js'; -import { type UInt32 } from '../shared.js'; +import { UInt32 } from '../shared.js'; import { VerificationKey } from '../verification_key.js'; import { RollupKernelCircuitPublicInputs } from './rollup_kernel_circuit_public_inputs.js'; diff --git a/yarn-project/circuits.js/src/structs/max_block_number.ts b/yarn-project/circuits.js/src/structs/max_block_number.ts index 998fdd4a1a41..cc124de2e267 100644 --- a/yarn-project/circuits.js/src/structs/max_block_number.ts +++ b/yarn-project/circuits.js/src/structs/max_block_number.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import { FieldsOf } from '@aztec/foundation/types'; import { MAX_BLOCK_NUMBER_LENGTH } from '../constants.gen.js'; diff --git a/yarn-project/circuits.js/src/structs/membership_witness.ts b/yarn-project/circuits.js/src/structs/membership_witness.ts index db0457ef3940..b2d9211c58b4 100644 --- a/yarn-project/circuits.js/src/structs/membership_witness.ts +++ b/yarn-project/circuits.js/src/structs/membership_witness.ts @@ -1,7 +1,7 @@ import { assertMemberLength } from '@aztec/foundation/array'; import { toBigIntBE, toBufferBE } from '@aztec/foundation/bigint-buffer'; import { Fr } from '@aztec/foundation/fields'; -import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; +import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; /** * Contains information which can be used to prove that a leaf is a member of a Merkle tree. diff --git a/yarn-project/circuits.js/src/structs/non_existent_read_request_hints.ts b/yarn-project/circuits.js/src/structs/non_existent_read_request_hints.ts index a459be8be340..9cd254bc0b99 100644 --- a/yarn-project/circuits.js/src/structs/non_existent_read_request_hints.ts +++ b/yarn-project/circuits.js/src/structs/non_existent_read_request_hints.ts @@ -1,6 +1,6 @@ import { makeTuple } from '@aztec/foundation/array'; -import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; +import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; import { MAX_NEW_NULLIFIERS_PER_TX, @@ -9,7 +9,7 @@ import { } from '../constants.gen.js'; import { MembershipWitness } from './membership_witness.js'; import { NullifierLeafPreimage } from './rollup/nullifier_leaf/index.js'; -import { SideEffectLinkedToNoteHash, type SideEffectType } from './side_effects.js'; +import { SideEffectLinkedToNoteHash, SideEffectType } from './side_effects.js'; export class NonMembershipHint { constructor(public membershipWitness: MembershipWitness, public leafPreimage: LEAF_PREIMAGE) {} diff --git a/yarn-project/circuits.js/src/structs/note_hash_read_request_membership_witness.ts b/yarn-project/circuits.js/src/structs/note_hash_read_request_membership_witness.ts index 989b177ae2ae..d9bb37c0c09b 100644 --- a/yarn-project/circuits.js/src/structs/note_hash_read_request_membership_witness.ts +++ b/yarn-project/circuits.js/src/structs/note_hash_read_request_membership_witness.ts @@ -1,10 +1,10 @@ import { makeTuple, range } from '@aztec/foundation/array'; import { toBufferBE } from '@aztec/foundation/bigint-buffer'; import { Fr } from '@aztec/foundation/fields'; -import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; +import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; import { MAX_NEW_NOTE_HASHES_PER_CALL, NOTE_HASH_TREE_HEIGHT } from '../constants.gen.js'; -import { type MembershipWitness } from './membership_witness.js'; +import { MembershipWitness } from './membership_witness.js'; /** * A ReadRequestMembershipWitness is similar to a MembershipWitness but includes diff --git a/yarn-project/circuits.js/src/structs/nullifier_key_validation_request.ts b/yarn-project/circuits.js/src/structs/nullifier_key_validation_request.ts index 93844400528d..37f2a6ad9eab 100644 --- a/yarn-project/circuits.js/src/structs/nullifier_key_validation_request.ts +++ b/yarn-project/circuits.js/src/structs/nullifier_key_validation_request.ts @@ -1,12 +1,12 @@ import { AztecAddress } from '@aztec/foundation/aztec-address'; -import { type Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields'; +import { Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { NULLIFIER_KEY_VALIDATION_REQUEST_CONTEXT_LENGTH, NULLIFIER_KEY_VALIDATION_REQUEST_LENGTH, } from '../constants.gen.js'; -import { type GrumpkinPrivateKey } from '../types/grumpkin_private_key.js'; +import { GrumpkinPrivateKey } from '../types/grumpkin_private_key.js'; /** * Request for validating a nullifier key pair used in the app. diff --git a/yarn-project/circuits.js/src/structs/parity/base_parity_inputs.ts b/yarn-project/circuits.js/src/structs/parity/base_parity_inputs.ts index bb2e704dc043..c369424cdc08 100644 --- a/yarn-project/circuits.js/src/structs/parity/base_parity_inputs.ts +++ b/yarn-project/circuits.js/src/structs/parity/base_parity_inputs.ts @@ -1,7 +1,7 @@ import { Fr } from '@aztec/foundation/fields'; -import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; +import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUM_MSGS_PER_BASE_PARITY } from '../../constants.gen.js'; +import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUM_MSGS_PER_BASE_PARITY } from '../../constants.gen.js'; export class BaseParityInputs { constructor( diff --git a/yarn-project/circuits.js/src/structs/parity/parity_public_inputs.ts b/yarn-project/circuits.js/src/structs/parity/parity_public_inputs.ts index d1d82b601e40..3edf7909091b 100644 --- a/yarn-project/circuits.js/src/structs/parity/parity_public_inputs.ts +++ b/yarn-project/circuits.js/src/structs/parity/parity_public_inputs.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 { FieldsOf } from '@aztec/foundation/types'; import { AggregationObject } from '../aggregation_object.js'; diff --git a/yarn-project/circuits.js/src/structs/parity/root_parity_input.ts b/yarn-project/circuits.js/src/structs/parity/root_parity_input.ts index cab611415d68..1c55e5c83bb4 100644 --- a/yarn-project/circuits.js/src/structs/parity/root_parity_input.ts +++ b/yarn-project/circuits.js/src/structs/parity/root_parity_input.ts @@ -1,5 +1,5 @@ import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import { FieldsOf } from '@aztec/foundation/types'; import { Proof } from '../proof.js'; import { ParityPublicInputs } from './parity_public_inputs.js'; diff --git a/yarn-project/circuits.js/src/structs/parity/root_parity_inputs.ts b/yarn-project/circuits.js/src/structs/parity/root_parity_inputs.ts index 0556b9d172d8..4a73162a6af3 100644 --- a/yarn-project/circuits.js/src/structs/parity/root_parity_inputs.ts +++ b/yarn-project/circuits.js/src/structs/parity/root_parity_inputs.ts @@ -1,4 +1,4 @@ -import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; +import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; import { NUM_BASE_PARITY_PER_ROOT_PARITY } from '../../constants.gen.js'; import { RootParityInput } from './root_parity_input.js'; diff --git a/yarn-project/circuits.js/src/structs/partial_state_reference.ts b/yarn-project/circuits.js/src/structs/partial_state_reference.ts index 4ccac8d2318f..0ca6b790f383 100644 --- a/yarn-project/circuits.js/src/structs/partial_state_reference.ts +++ b/yarn-project/circuits.js/src/structs/partial_state_reference.ts @@ -1,4 +1,4 @@ -import { type Fr } from '@aztec/foundation/fields'; +import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { PARTIAL_STATE_REFERENCE_LENGTH } from '../constants.gen.js'; diff --git a/yarn-project/circuits.js/src/structs/private_call_stack_item.ts b/yarn-project/circuits.js/src/structs/private_call_stack_item.ts index 23f9060c372c..700cd968d173 100644 --- a/yarn-project/circuits.js/src/structs/private_call_stack_item.ts +++ b/yarn-project/circuits.js/src/structs/private_call_stack_item.ts @@ -2,10 +2,10 @@ import { AztecAddress } from '@aztec/foundation/aztec-address'; import { pedersenHash } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import { FieldsOf } from '@aztec/foundation/types'; import { GeneratorIndex, PRIVATE_CALL_STACK_ITEM_LENGTH } from '../constants.gen.js'; -import { type CallContext } from './call_context.js'; +import { CallContext } from './call_context.js'; import { CallRequest, CallerContext } from './call_request.js'; import { FunctionData } from './function_data.js'; import { PrivateCircuitPublicInputs } from './private_circuit_public_inputs.js'; diff --git a/yarn-project/circuits.js/src/structs/private_circuit_public_inputs.ts b/yarn-project/circuits.js/src/structs/private_circuit_public_inputs.ts index b591cd524040..67e9347eba00 100644 --- a/yarn-project/circuits.js/src/structs/private_circuit_public_inputs.ts +++ b/yarn-project/circuits.js/src/structs/private_circuit_public_inputs.ts @@ -2,14 +2,8 @@ import { makeTuple } from '@aztec/foundation/array'; import { isArrayEmpty } from '@aztec/foundation/collection'; import { pedersenHash } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; -import { - BufferReader, - FieldReader, - type Tuple, - serializeToBuffer, - serializeToFields, -} from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import { BufferReader, FieldReader, Tuple, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; +import { FieldsOf } from '@aztec/foundation/types'; import { GeneratorIndex, diff --git a/yarn-project/circuits.js/src/structs/public_call_request.ts b/yarn-project/circuits.js/src/structs/public_call_request.ts index 6b586045abb5..30f4faf8f8b6 100644 --- a/yarn-project/circuits.js/src/structs/public_call_request.ts +++ b/yarn-project/circuits.js/src/structs/public_call_request.ts @@ -1,7 +1,7 @@ import { AztecAddress } from '@aztec/foundation/aztec-address'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import { FieldsOf } from '@aztec/foundation/types'; import { computeVarArgsHash } from '../hash/hash.js'; import { CallContext } from './call_context.js'; diff --git a/yarn-project/circuits.js/src/structs/public_call_stack_item.ts b/yarn-project/circuits.js/src/structs/public_call_stack_item.ts index 0d53df6b95c2..454b695de625 100644 --- a/yarn-project/circuits.js/src/structs/public_call_stack_item.ts +++ b/yarn-project/circuits.js/src/structs/public_call_stack_item.ts @@ -2,10 +2,10 @@ import { AztecAddress } from '@aztec/foundation/aztec-address'; import { pedersenHash } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import { FieldsOf } from '@aztec/foundation/types'; import { GeneratorIndex } from '../constants.gen.js'; -import { type CallContext } from './call_context.js'; +import { CallContext } from './call_context.js'; import { CallRequest, CallerContext } from './call_request.js'; import { FunctionData } from './function_data.js'; import { PublicCircuitPublicInputs } from './public_circuit_public_inputs.js'; diff --git a/yarn-project/circuits.js/src/structs/public_circuit_public_inputs.ts b/yarn-project/circuits.js/src/structs/public_circuit_public_inputs.ts index 18f779c6ad33..8ba49eb659aa 100644 --- a/yarn-project/circuits.js/src/structs/public_circuit_public_inputs.ts +++ b/yarn-project/circuits.js/src/structs/public_circuit_public_inputs.ts @@ -3,14 +3,8 @@ import { AztecAddress } from '@aztec/foundation/aztec-address'; import { isArrayEmpty } from '@aztec/foundation/collection'; import { pedersenHash } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; -import { - BufferReader, - FieldReader, - type Tuple, - serializeToBuffer, - serializeToFields, -} from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import { BufferReader, FieldReader, Tuple, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize'; +import { FieldsOf } from '@aztec/foundation/types'; import { GeneratorIndex, diff --git a/yarn-project/circuits.js/src/structs/read_request_hints.ts b/yarn-project/circuits.js/src/structs/read_request_hints.ts index 6e6439ec426e..880b71a44671 100644 --- a/yarn-project/circuits.js/src/structs/read_request_hints.ts +++ b/yarn-project/circuits.js/src/structs/read_request_hints.ts @@ -1,6 +1,6 @@ import { makeTuple } from '@aztec/foundation/array'; -import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type TreeLeafPreimage } from '@aztec/foundation/trees'; +import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; +import { TreeLeafPreimage } from '@aztec/foundation/trees'; import { MAX_NULLIFIER_READ_REQUESTS_PER_TX, NULLIFIER_TREE_HEIGHT } from '../constants.gen.js'; import { MembershipWitness } from './membership_witness.js'; diff --git a/yarn-project/circuits.js/src/structs/rollup/append_only_tree_snapshot.ts b/yarn-project/circuits.js/src/structs/rollup/append_only_tree_snapshot.ts index 6929e58b412a..6f39790a1623 100644 --- a/yarn-project/circuits.js/src/structs/rollup/append_only_tree_snapshot.ts +++ b/yarn-project/circuits.js/src/structs/rollup/append_only_tree_snapshot.ts @@ -1,7 +1,7 @@ import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { STRING_ENCODING, type UInt32 } from '../shared.js'; +import { STRING_ENCODING, UInt32 } from '../shared.js'; /** * Snapshot of an append only tree. diff --git a/yarn-project/circuits.js/src/structs/rollup/base_or_merge_rollup_public_inputs.ts b/yarn-project/circuits.js/src/structs/rollup/base_or_merge_rollup_public_inputs.ts index 598e246a1047..87658904f2e8 100644 --- a/yarn-project/circuits.js/src/structs/rollup/base_or_merge_rollup_public_inputs.ts +++ b/yarn-project/circuits.js/src/structs/rollup/base_or_merge_rollup_public_inputs.ts @@ -3,7 +3,7 @@ import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { AggregationObject } from '../aggregation_object.js'; import { PartialStateReference } from '../partial_state_reference.js'; -import { type RollupTypes } from '../shared.js'; +import { RollupTypes } from '../shared.js'; import { ConstantRollupData } from './base_rollup.js'; /** diff --git a/yarn-project/circuits.js/src/structs/rollup/base_rollup.ts b/yarn-project/circuits.js/src/structs/rollup/base_rollup.ts index a1eac84c3e50..cbbfaf491ac1 100644 --- a/yarn-project/circuits.js/src/structs/rollup/base_rollup.ts +++ b/yarn-project/circuits.js/src/structs/rollup/base_rollup.ts @@ -1,22 +1,22 @@ import { Fr } from '@aztec/foundation/fields'; -import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; +import { FieldsOf } from '@aztec/foundation/types'; import { - type ARCHIVE_HEIGHT, - type MAX_PUBLIC_DATA_READS_PER_TX, - type MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, - type PUBLIC_DATA_TREE_HEIGHT, + ARCHIVE_HEIGHT, + MAX_PUBLIC_DATA_READS_PER_TX, + MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, + PUBLIC_DATA_TREE_HEIGHT, } from '../../constants.gen.js'; import { GlobalVariables } from '../global_variables.js'; -import { type RollupKernelData } from '../kernel/rollup_kernel_data.js'; -import { type MembershipWitness } from '../membership_witness.js'; -import { type PartialStateReference } from '../partial_state_reference.js'; -import { type UInt32 } from '../shared.js'; +import { RollupKernelData } from '../kernel/rollup_kernel_data.js'; +import { MembershipWitness } from '../membership_witness.js'; +import { PartialStateReference } from '../partial_state_reference.js'; +import { UInt32 } from '../shared.js'; import { AppendOnlyTreeSnapshot } from './append_only_tree_snapshot.js'; import { NullifierLeaf, NullifierLeafPreimage } from './nullifier_leaf/index.js'; import { PublicDataTreeLeaf, PublicDataTreeLeafPreimage } from './public_data_leaf/index.js'; -import { type StateDiffHints } from './state_diff_hints.js'; +import { StateDiffHints } from './state_diff_hints.js'; export { NullifierLeaf, NullifierLeafPreimage, PublicDataTreeLeaf, PublicDataTreeLeafPreimage }; diff --git a/yarn-project/circuits.js/src/structs/rollup/merge_rollup.ts b/yarn-project/circuits.js/src/structs/rollup/merge_rollup.ts index 96d8bbd0bf80..5c5f5f380d19 100644 --- a/yarn-project/circuits.js/src/structs/rollup/merge_rollup.ts +++ b/yarn-project/circuits.js/src/structs/rollup/merge_rollup.ts @@ -1,6 +1,6 @@ import { serializeToBuffer } from '@aztec/foundation/serialize'; -import { type PreviousRollupData } from './previous_rollup_data.js'; +import { PreviousRollupData } from './previous_rollup_data.js'; /** * Represents inputs of the merge rollup circuit. diff --git a/yarn-project/circuits.js/src/structs/rollup/nullifier_leaf/index.ts b/yarn-project/circuits.js/src/structs/rollup/nullifier_leaf/index.ts index 42160877895f..149ab6c0014f 100644 --- a/yarn-project/circuits.js/src/structs/rollup/nullifier_leaf/index.ts +++ b/yarn-project/circuits.js/src/structs/rollup/nullifier_leaf/index.ts @@ -1,7 +1,7 @@ import { toBigIntBE, toBufferBE } from '@aztec/foundation/bigint-buffer'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader } from '@aztec/foundation/serialize'; -import { type IndexedTreeLeaf, type IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import { IndexedTreeLeaf, IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; /** * Class containing the data of a preimage of a single leaf in the nullifier tree. diff --git a/yarn-project/circuits.js/src/structs/rollup/previous_rollup_data.ts b/yarn-project/circuits.js/src/structs/rollup/previous_rollup_data.ts index c457f6cd1594..e5154b7a9541 100644 --- a/yarn-project/circuits.js/src/structs/rollup/previous_rollup_data.ts +++ b/yarn-project/circuits.js/src/structs/rollup/previous_rollup_data.ts @@ -1,11 +1,11 @@ import { serializeToBuffer } from '@aztec/foundation/serialize'; -import { type ROLLUP_VK_TREE_HEIGHT } from '../../constants.gen.js'; -import { type MembershipWitness } from '../membership_witness.js'; -import { type Proof } from '../proof.js'; -import { type UInt32 } from '../shared.js'; -import { type VerificationKey } from '../verification_key.js'; -import { type BaseOrMergeRollupPublicInputs } from './base_or_merge_rollup_public_inputs.js'; +import { ROLLUP_VK_TREE_HEIGHT } from '../../constants.gen.js'; +import { MembershipWitness } from '../membership_witness.js'; +import { Proof } from '../proof.js'; +import { UInt32 } from '../shared.js'; +import { VerificationKey } from '../verification_key.js'; +import { BaseOrMergeRollupPublicInputs } from './base_or_merge_rollup_public_inputs.js'; /** * Represents the data of a previous merge or base rollup circuit. diff --git a/yarn-project/circuits.js/src/structs/rollup/public_data_leaf/index.ts b/yarn-project/circuits.js/src/structs/rollup/public_data_leaf/index.ts index 96a3eac57b99..5724f220e02b 100644 --- a/yarn-project/circuits.js/src/structs/rollup/public_data_leaf/index.ts +++ b/yarn-project/circuits.js/src/structs/rollup/public_data_leaf/index.ts @@ -1,7 +1,7 @@ import { toBigIntBE, toBufferBE } from '@aztec/foundation/bigint-buffer'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type IndexedTreeLeaf, type IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import { IndexedTreeLeaf, IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; /** * Class containing the data of a preimage of a single leaf in the public data tree. diff --git a/yarn-project/circuits.js/src/structs/rollup/root_rollup.ts b/yarn-project/circuits.js/src/structs/rollup/root_rollup.ts index 58ee9985c14b..e3fce3863c10 100644 --- a/yarn-project/circuits.js/src/structs/rollup/root_rollup.ts +++ b/yarn-project/circuits.js/src/structs/rollup/root_rollup.ts @@ -1,17 +1,17 @@ -import { type Fr } from '@aztec/foundation/fields'; -import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import { Fr } from '@aztec/foundation/fields'; +import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; +import { FieldsOf } from '@aztec/foundation/types'; import { - type ARCHIVE_HEIGHT, - type L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, - type NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, + ARCHIVE_HEIGHT, + L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, + NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, } from '../../constants.gen.js'; import { AggregationObject } from '../aggregation_object.js'; import { Header } from '../header.js'; -import { type RootParityInput } from '../parity/root_parity_input.js'; +import { RootParityInput } from '../parity/root_parity_input.js'; import { AppendOnlyTreeSnapshot } from './append_only_tree_snapshot.js'; -import { type PreviousRollupData } from './previous_rollup_data.js'; +import { PreviousRollupData } from './previous_rollup_data.js'; /** * Represents inputs of the root rollup circuit. diff --git a/yarn-project/circuits.js/src/structs/rollup/state_diff_hints.ts b/yarn-project/circuits.js/src/structs/rollup/state_diff_hints.ts index eb921135822d..1a8128194334 100644 --- a/yarn-project/circuits.js/src/structs/rollup/state_diff_hints.ts +++ b/yarn-project/circuits.js/src/structs/rollup/state_diff_hints.ts @@ -1,16 +1,16 @@ -import { type Fr } from '@aztec/foundation/fields'; -import { type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import { Fr } from '@aztec/foundation/fields'; +import { Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; +import { FieldsOf } from '@aztec/foundation/types'; import { - type MAX_NEW_NULLIFIERS_PER_TX, - type NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, - type NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, - type NULLIFIER_TREE_HEIGHT, - type PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH, + MAX_NEW_NULLIFIERS_PER_TX, + NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, + NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, + NULLIFIER_TREE_HEIGHT, + PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH, } from '../../constants.gen.js'; -import { type MembershipWitness } from '../membership_witness.js'; -import { type NullifierLeafPreimage } from './nullifier_leaf/index.js'; +import { MembershipWitness } from '../membership_witness.js'; +import { NullifierLeafPreimage } from './nullifier_leaf/index.js'; /** * Hints used while proving state diff validity. diff --git a/yarn-project/circuits.js/src/structs/shared.ts b/yarn-project/circuits.js/src/structs/shared.ts index c8cce1576fed..9b51ce8e1dd0 100644 --- a/yarn-project/circuits.js/src/structs/shared.ts +++ b/yarn-project/circuits.js/src/structs/shared.ts @@ -1,4 +1,4 @@ -import { type Bufferable, serializeToBuffer } from '@aztec/foundation/serialize'; +import { Bufferable, serializeToBuffer } from '@aztec/foundation/serialize'; /** * Implementation of a vector. Matches how we are serializing and deserializing vectors in cpp (length in the first position, followed by the items). diff --git a/yarn-project/circuits.js/src/structs/state_reference.ts b/yarn-project/circuits.js/src/structs/state_reference.ts index f3a78608ad9d..8d05ec2b9746 100644 --- a/yarn-project/circuits.js/src/structs/state_reference.ts +++ b/yarn-project/circuits.js/src/structs/state_reference.ts @@ -1,4 +1,4 @@ -import { type Fr } from '@aztec/foundation/fields'; +import { Fr } from '@aztec/foundation/fields'; import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize'; import { STATE_REFERENCE_LENGTH } from '../constants.gen.js'; diff --git a/yarn-project/circuits.js/src/structs/tx_context.ts b/yarn-project/circuits.js/src/structs/tx_context.ts index 73d484e54afb..0eae14c831dd 100644 --- a/yarn-project/circuits.js/src/structs/tx_context.ts +++ b/yarn-project/circuits.js/src/structs/tx_context.ts @@ -1,7 +1,7 @@ import { pedersenHash } 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 { FieldsOf } from '@aztec/foundation/types'; import { GeneratorIndex, TX_CONTEXT_DATA_LENGTH } from '../constants.gen.js'; diff --git a/yarn-project/circuits.js/src/structs/tx_request.ts b/yarn-project/circuits.js/src/structs/tx_request.ts index 6a3812692a74..6113bbb279aa 100644 --- a/yarn-project/circuits.js/src/structs/tx_request.ts +++ b/yarn-project/circuits.js/src/structs/tx_request.ts @@ -2,7 +2,7 @@ import { AztecAddress } from '@aztec/foundation/aztec-address'; import { pedersenHash } 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 { FieldsOf } from '@aztec/foundation/types'; import { GeneratorIndex, TX_REQUEST_LENGTH } from '../constants.gen.js'; import { FunctionData } from './function_data.js'; diff --git a/yarn-project/circuits.js/src/structs/validation_requests.ts b/yarn-project/circuits.js/src/structs/validation_requests.ts index faff930709e7..fbcbe3d2b359 100644 --- a/yarn-project/circuits.js/src/structs/validation_requests.ts +++ b/yarn-project/circuits.js/src/structs/validation_requests.ts @@ -1,5 +1,5 @@ import { makeTuple } from '@aztec/foundation/array'; -import { BufferReader, type Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; +import { BufferReader, Tuple, serializeToBuffer } from '@aztec/foundation/serialize'; import { MAX_NOTE_HASH_READ_REQUESTS_PER_TX, diff --git a/yarn-project/circuits.js/src/tests/factories.ts b/yarn-project/circuits.js/src/tests/factories.ts index 176e9248d324..aeec6e1ef038 100644 --- a/yarn-project/circuits.js/src/tests/factories.ts +++ b/yarn-project/circuits.js/src/tests/factories.ts @@ -4,11 +4,11 @@ import { toBufferBE } from '@aztec/foundation/bigint-buffer'; import { EthAddress } from '@aztec/foundation/eth-address'; import { numToUInt32BE } from '@aztec/foundation/serialize'; import { - type ContractClassPublic, - type ExecutablePrivateFunctionWithMembershipProof, - type PrivateFunction, - type PublicFunction, - type UnconstrainedFunctionWithMembershipProof, + ContractClassPublic, + ExecutablePrivateFunctionWithMembershipProof, + PrivateFunction, + PublicFunction, + UnconstrainedFunctionWithMembershipProof, } from '@aztec/types/contracts'; import { SchnorrSignature } from '../barretenberg/index.js'; @@ -35,7 +35,7 @@ import { FunctionData, FunctionSelector, G1AffineElement, - type GrumpkinPrivateKey, + GrumpkinPrivateKey, GrumpkinScalar, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, L2ToL1Message, diff --git a/yarn-project/circuits.js/src/tests/fixtures.ts b/yarn-project/circuits.js/src/tests/fixtures.ts index 1d45e9f834c3..d3d68199d89a 100644 --- a/yarn-project/circuits.js/src/tests/fixtures.ts +++ b/yarn-project/circuits.js/src/tests/fixtures.ts @@ -1,6 +1,6 @@ -import { type ContractArtifact } from '@aztec/foundation/abi'; +import { ContractArtifact } from '@aztec/foundation/abi'; import { loadContractArtifact } from '@aztec/types/abi'; -import { type NoirCompiledContract } from '@aztec/types/noir'; +import { NoirCompiledContract } from '@aztec/types/noir'; import { readFileSync } from 'fs'; import { dirname, resolve } from 'path'; diff --git a/yarn-project/circuits.js/src/types/contract_function_dao.ts b/yarn-project/circuits.js/src/types/contract_function_dao.ts index db0688ab873f..7d97ccda986b 100644 --- a/yarn-project/circuits.js/src/types/contract_function_dao.ts +++ b/yarn-project/circuits.js/src/types/contract_function_dao.ts @@ -1,4 +1,4 @@ -import { type FunctionArtifact, type FunctionSelector } from '@aztec/foundation/abi'; +import { FunctionArtifact, FunctionSelector } from '@aztec/foundation/abi'; /** * A contract function Data Access Object (DAO). diff --git a/yarn-project/circuits.js/src/types/deployment_info.ts b/yarn-project/circuits.js/src/types/deployment_info.ts index 484fb84b248f..637bab821b9f 100644 --- a/yarn-project/circuits.js/src/types/deployment_info.ts +++ b/yarn-project/circuits.js/src/types/deployment_info.ts @@ -1,6 +1,6 @@ -import { type Fr } from '@aztec/foundation/fields'; +import { Fr } from '@aztec/foundation/fields'; -import { type CompleteAddress } from '../structs/complete_address.js'; +import { CompleteAddress } from '../structs/complete_address.js'; /** * Represents the data generated as part of contract deployment. diff --git a/yarn-project/circuits.js/src/types/grumpkin_private_key.ts b/yarn-project/circuits.js/src/types/grumpkin_private_key.ts index cb96ce1cd8c1..16ed36795871 100644 --- a/yarn-project/circuits.js/src/types/grumpkin_private_key.ts +++ b/yarn-project/circuits.js/src/types/grumpkin_private_key.ts @@ -1,4 +1,4 @@ -import { type GrumpkinScalar } from '@aztec/foundation/fields'; +import { GrumpkinScalar } from '@aztec/foundation/fields'; /** A type alias for private key which belongs to the scalar field of Grumpkin curve. */ export type GrumpkinPrivateKey = GrumpkinScalar; diff --git a/yarn-project/circuits.js/src/types/partial_address.ts b/yarn-project/circuits.js/src/types/partial_address.ts index 29b2a8793ded..21877f72e889 100644 --- a/yarn-project/circuits.js/src/types/partial_address.ts +++ b/yarn-project/circuits.js/src/types/partial_address.ts @@ -1,4 +1,4 @@ -import { type Fr } from '@aztec/foundation/fields'; +import { 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/circuits.js/src/types/public_key.ts b/yarn-project/circuits.js/src/types/public_key.ts index 0109de4c8ea5..1a985a9a6a28 100644 --- a/yarn-project/circuits.js/src/types/public_key.ts +++ b/yarn-project/circuits.js/src/types/public_key.ts @@ -1,4 +1,4 @@ -import { type Point } from '@aztec/foundation/fields'; +import { Point } from '@aztec/foundation/fields'; /** Represents a user public key. */ export type PublicKey = Point; diff --git a/yarn-project/cli/CHANGELOG.md b/yarn-project/cli/CHANGELOG.md index be1ece896f1f..f9ef9369f549 100644 --- a/yarn-project/cli/CHANGELOG.md +++ b/yarn-project/cli/CHANGELOG.md @@ -1,12 +1,5 @@ # Changelog -## [0.32.1](https://github.com/AztecProtocol/aztec-packages/compare/aztec-cli-v0.32.0...aztec-cli-v0.32.1) (2024-04-02) - - -### Miscellaneous - -* Explicit type imports ([#5519](https://github.com/AztecProtocol/aztec-packages/issues/5519)) ([2a217de](https://github.com/AztecProtocol/aztec-packages/commit/2a217de4da2031a9f3913a657a4b39201f4483bf)) - ## [0.32.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-cli-v0.31.0...aztec-cli-v0.32.0) (2024-03-27) diff --git a/yarn-project/cli/package.json b/yarn-project/cli/package.json index 98b3f1bf8799..5ed05fbb2b6b 100644 --- a/yarn-project/cli/package.json +++ b/yarn-project/cli/package.json @@ -1,6 +1,6 @@ { "name": "@aztec/cli", - "version": "0.32.1", + "version": "0.32.0", "type": "module", "main": "./dest/index.js", "bin": { diff --git a/yarn-project/cli/src/client.test.ts b/yarn-project/cli/src/client.test.ts index ad21f399256a..8e879f762bae 100644 --- a/yarn-project/cli/src/client.test.ts +++ b/yarn-project/cli/src/client.test.ts @@ -1,7 +1,7 @@ -import { type NodeInfo } from '@aztec/aztec.js'; -import { type PXE } from '@aztec/circuit-types'; +import { NodeInfo } from '@aztec/aztec.js'; +import { PXE } from '@aztec/circuit-types'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; import { checkServerVersion } from './client.js'; diff --git a/yarn-project/cli/src/client.ts b/yarn-project/cli/src/client.ts index 8b3d55c37d9d..18ea8bd2d5e3 100644 --- a/yarn-project/cli/src/client.ts +++ b/yarn-project/cli/src/client.ts @@ -1,5 +1,5 @@ -import { type PXE, createPXEClient } from '@aztec/aztec.js'; -import { type DebugLogger } from '@aztec/foundation/log'; +import { PXE, createPXEClient } from '@aztec/aztec.js'; +import { DebugLogger } from '@aztec/foundation/log'; import { fileURLToPath } from '@aztec/foundation/url'; import { readFileSync } from 'fs'; diff --git a/yarn-project/cli/src/cmds/add_contract.ts b/yarn-project/cli/src/cmds/add_contract.ts index c77283083c8d..b09e87d6eb7f 100644 --- a/yarn-project/cli/src/cmds/add_contract.ts +++ b/yarn-project/cli/src/cmds/add_contract.ts @@ -1,13 +1,13 @@ import { AztecAddress, - type ContractInstanceWithAddress, + ContractInstanceWithAddress, EthAddress, - type Fr, - type Point, + Fr, + Point, getContractClassFromArtifact, } from '@aztec/aztec.js'; import { computeContractAddressFromInstance, computePublicKeysHash } from '@aztec/circuits.js/contract'; -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { createCompatibleClient } from '../client.js'; import { getContractArtifact } from '../utils.js'; diff --git a/yarn-project/cli/src/cmds/add_note.ts b/yarn-project/cli/src/cmds/add_note.ts index f6359bd5c1c3..988c2a45c12b 100644 --- a/yarn-project/cli/src/cmds/add_note.ts +++ b/yarn-project/cli/src/cmds/add_note.ts @@ -1,6 +1,6 @@ -import { type AztecAddress, type Fr } from '@aztec/aztec.js'; -import { ExtendedNote, Note, type TxHash } from '@aztec/circuit-types'; -import { type DebugLogger } from '@aztec/foundation/log'; +import { AztecAddress, Fr } from '@aztec/aztec.js'; +import { ExtendedNote, Note, TxHash } from '@aztec/circuit-types'; +import { DebugLogger } from '@aztec/foundation/log'; import { createCompatibleClient } from '../client.js'; import { parseFields } from '../parse_args.js'; diff --git a/yarn-project/cli/src/cmds/block_number.ts b/yarn-project/cli/src/cmds/block_number.ts index 5b6ca472d6b2..c5aed1264439 100644 --- a/yarn-project/cli/src/cmds/block_number.ts +++ b/yarn-project/cli/src/cmds/block_number.ts @@ -1,4 +1,4 @@ -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { createCompatibleClient } from '../client.js'; diff --git a/yarn-project/cli/src/cmds/call.ts b/yarn-project/cli/src/cmds/call.ts index 2864e8985ac2..cab98e2dd424 100644 --- a/yarn-project/cli/src/cmds/call.ts +++ b/yarn-project/cli/src/cmds/call.ts @@ -1,5 +1,5 @@ -import { type AztecAddress } from '@aztec/aztec.js'; -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { AztecAddress } from '@aztec/aztec.js'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { format } from 'util'; diff --git a/yarn-project/cli/src/cmds/check_deploy.ts b/yarn-project/cli/src/cmds/check_deploy.ts index 4a00c72a5182..c9777522e10e 100644 --- a/yarn-project/cli/src/cmds/check_deploy.ts +++ b/yarn-project/cli/src/cmds/check_deploy.ts @@ -1,5 +1,5 @@ -import { type AztecAddress } from '@aztec/aztec.js'; -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { AztecAddress } from '@aztec/aztec.js'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { createCompatibleClient } from '../client.js'; diff --git a/yarn-project/cli/src/cmds/compute_selector.ts b/yarn-project/cli/src/cmds/compute_selector.ts index 9d299a64eff4..074be33597ab 100644 --- a/yarn-project/cli/src/cmds/compute_selector.ts +++ b/yarn-project/cli/src/cmds/compute_selector.ts @@ -1,5 +1,5 @@ import { FunctionSelector } from '@aztec/foundation/abi'; -import { type LogFn } from '@aztec/foundation/log'; +import { LogFn } from '@aztec/foundation/log'; export function computeSelector(functionSignature: string, log: LogFn) { const selector = FunctionSelector.fromSignature(functionSignature); diff --git a/yarn-project/cli/src/cmds/create_account.ts b/yarn-project/cli/src/cmds/create_account.ts index 09cdadc361aa..2ad6a5d92d65 100644 --- a/yarn-project/cli/src/cmds/create_account.ts +++ b/yarn-project/cli/src/cmds/create_account.ts @@ -1,7 +1,7 @@ import { getSchnorrAccount } from '@aztec/accounts/schnorr'; import { GrumpkinScalar } from '@aztec/aztec.js'; -import { type Fq, Fr } from '@aztec/foundation/fields'; -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { Fq, Fr } from '@aztec/foundation/fields'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { createCompatibleClient } from '../client.js'; diff --git a/yarn-project/cli/src/cmds/deploy.ts b/yarn-project/cli/src/cmds/deploy.ts index 94cc35e5f276..a9fbda805274 100644 --- a/yarn-project/cli/src/cmds/deploy.ts +++ b/yarn-project/cli/src/cmds/deploy.ts @@ -1,7 +1,7 @@ import { getSchnorrAccount } from '@aztec/accounts/schnorr'; -import { ContractDeployer, type EthAddress, type Fq, Fr, type Point } from '@aztec/aztec.js'; +import { ContractDeployer, EthAddress, Fq, Fr, Point } from '@aztec/aztec.js'; import { getInitializer } from '@aztec/foundation/abi'; -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { createCompatibleClient } from '../client.js'; import { encodeArgs } from '../encoding.js'; diff --git a/yarn-project/cli/src/cmds/deploy_l1_contracts.ts b/yarn-project/cli/src/cmds/deploy_l1_contracts.ts index a96b3e277a26..a7a5af57fe14 100644 --- a/yarn-project/cli/src/cmds/deploy_l1_contracts.ts +++ b/yarn-project/cli/src/cmds/deploy_l1_contracts.ts @@ -1,4 +1,4 @@ -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { deployAztecContracts } from '../utils.js'; diff --git a/yarn-project/cli/src/cmds/example_contracts.ts b/yarn-project/cli/src/cmds/example_contracts.ts index 94c7437262b3..c7ee019ecccf 100644 --- a/yarn-project/cli/src/cmds/example_contracts.ts +++ b/yarn-project/cli/src/cmds/example_contracts.ts @@ -1,4 +1,4 @@ -import { type LogFn } from '@aztec/foundation/log'; +import { LogFn } from '@aztec/foundation/log'; import { getExampleContractArtifacts } from '../utils.js'; diff --git a/yarn-project/cli/src/cmds/generate_p2p_private_key.ts b/yarn-project/cli/src/cmds/generate_p2p_private_key.ts index f62617ae6ea7..928e61974ba6 100644 --- a/yarn-project/cli/src/cmds/generate_p2p_private_key.ts +++ b/yarn-project/cli/src/cmds/generate_p2p_private_key.ts @@ -1,4 +1,4 @@ -import { type LogFn } from '@aztec/foundation/log'; +import { LogFn } from '@aztec/foundation/log'; import { createSecp256k1PeerId } from '@libp2p/peer-id-factory'; diff --git a/yarn-project/cli/src/cmds/generate_private_key.ts b/yarn-project/cli/src/cmds/generate_private_key.ts index f7504de90def..b447cdcc7381 100644 --- a/yarn-project/cli/src/cmds/generate_private_key.ts +++ b/yarn-project/cli/src/cmds/generate_private_key.ts @@ -1,5 +1,5 @@ import { GrumpkinScalar, generatePublicKey } from '@aztec/aztec.js'; -import { type LogFn } from '@aztec/foundation/log'; +import { LogFn } from '@aztec/foundation/log'; import { mnemonicToAccount } from 'viem/accounts'; diff --git a/yarn-project/cli/src/cmds/get_account.ts b/yarn-project/cli/src/cmds/get_account.ts index c672c85fb856..8b3e9359d5f0 100644 --- a/yarn-project/cli/src/cmds/get_account.ts +++ b/yarn-project/cli/src/cmds/get_account.ts @@ -1,5 +1,5 @@ -import { type AztecAddress } from '@aztec/aztec.js'; -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { AztecAddress } from '@aztec/aztec.js'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { createCompatibleClient } from '../client.js'; diff --git a/yarn-project/cli/src/cmds/get_accounts.ts b/yarn-project/cli/src/cmds/get_accounts.ts index 9d84cc581ed0..1e36475f3a88 100644 --- a/yarn-project/cli/src/cmds/get_accounts.ts +++ b/yarn-project/cli/src/cmds/get_accounts.ts @@ -1,4 +1,4 @@ -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { createCompatibleClient } from '../client.js'; diff --git a/yarn-project/cli/src/cmds/get_contract_data.ts b/yarn-project/cli/src/cmds/get_contract_data.ts index 592358a9fd3c..d11180f7e4b2 100644 --- a/yarn-project/cli/src/cmds/get_contract_data.ts +++ b/yarn-project/cli/src/cmds/get_contract_data.ts @@ -1,5 +1,5 @@ -import { type AztecAddress } from '@aztec/aztec.js'; -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { AztecAddress } from '@aztec/aztec.js'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { createCompatibleClient } from '../client.js'; diff --git a/yarn-project/cli/src/cmds/get_logs.ts b/yarn-project/cli/src/cmds/get_logs.ts index 29afb7bbc6fb..76c27c767262 100644 --- a/yarn-project/cli/src/cmds/get_logs.ts +++ b/yarn-project/cli/src/cmds/get_logs.ts @@ -1,6 +1,6 @@ -import { type AztecAddress, type LogFilter, type LogId, type TxHash } from '@aztec/aztec.js'; -import { type EventSelector } from '@aztec/foundation/abi'; -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { AztecAddress, LogFilter, LogId, TxHash } from '@aztec/aztec.js'; +import { EventSelector } from '@aztec/foundation/abi'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { sleep } from '@aztec/foundation/sleep'; import { createCompatibleClient } from '../client.js'; diff --git a/yarn-project/cli/src/cmds/get_node_info.ts b/yarn-project/cli/src/cmds/get_node_info.ts index b66df822532e..b775c08aa0d6 100644 --- a/yarn-project/cli/src/cmds/get_node_info.ts +++ b/yarn-project/cli/src/cmds/get_node_info.ts @@ -1,4 +1,4 @@ -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { createCompatibleClient } from '../client.js'; diff --git a/yarn-project/cli/src/cmds/get_recipient.ts b/yarn-project/cli/src/cmds/get_recipient.ts index 4ae6baac8961..270bbad9ac2b 100644 --- a/yarn-project/cli/src/cmds/get_recipient.ts +++ b/yarn-project/cli/src/cmds/get_recipient.ts @@ -1,5 +1,5 @@ -import { type AztecAddress } from '@aztec/aztec.js'; -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { AztecAddress } from '@aztec/aztec.js'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { createCompatibleClient } from '../client.js'; diff --git a/yarn-project/cli/src/cmds/get_recipients.ts b/yarn-project/cli/src/cmds/get_recipients.ts index bc091bc5dd60..875b84b60387 100644 --- a/yarn-project/cli/src/cmds/get_recipients.ts +++ b/yarn-project/cli/src/cmds/get_recipients.ts @@ -1,4 +1,4 @@ -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { createCompatibleClient } from '../client.js'; diff --git a/yarn-project/cli/src/cmds/get_tx_receipt.ts b/yarn-project/cli/src/cmds/get_tx_receipt.ts index 6119f035aacf..beaa53e2f9b4 100644 --- a/yarn-project/cli/src/cmds/get_tx_receipt.ts +++ b/yarn-project/cli/src/cmds/get_tx_receipt.ts @@ -1,6 +1,6 @@ -import { type TxHash } from '@aztec/aztec.js'; +import { TxHash } from '@aztec/aztec.js'; import { JsonStringify } from '@aztec/foundation/json-rpc'; -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { createCompatibleClient } from '../client.js'; diff --git a/yarn-project/cli/src/cmds/inspect_contract.ts b/yarn-project/cli/src/cmds/inspect_contract.ts index 00823d218956..4728de02fd08 100644 --- a/yarn-project/cli/src/cmds/inspect_contract.ts +++ b/yarn-project/cli/src/cmds/inspect_contract.ts @@ -1,12 +1,12 @@ import { getContractClassFromArtifact } from '@aztec/circuits.js'; import { - type FunctionArtifact, + FunctionArtifact, FunctionSelector, decodeFunctionSignature, decodeFunctionSignatureWithParameterNames, } from '@aztec/foundation/abi'; import { sha256 } from '@aztec/foundation/crypto'; -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { getContractArtifact } from '../utils.js'; diff --git a/yarn-project/cli/src/cmds/parse_parameter_struct.ts b/yarn-project/cli/src/cmds/parse_parameter_struct.ts index 15bc057ede9b..d8b29211d3a9 100644 --- a/yarn-project/cli/src/cmds/parse_parameter_struct.ts +++ b/yarn-project/cli/src/cmds/parse_parameter_struct.ts @@ -1,6 +1,6 @@ -import { type StructType } from '@aztec/foundation/abi'; +import { StructType } from '@aztec/foundation/abi'; import { JsonStringify } from '@aztec/foundation/json-rpc'; -import { type LogFn } from '@aztec/foundation/log'; +import { LogFn } from '@aztec/foundation/log'; import { parseStructString } from '../encoding.js'; import { getContractArtifact } from '../utils.js'; diff --git a/yarn-project/cli/src/cmds/register_account.ts b/yarn-project/cli/src/cmds/register_account.ts index cf5dc168cb91..b6949cee4faa 100644 --- a/yarn-project/cli/src/cmds/register_account.ts +++ b/yarn-project/cli/src/cmds/register_account.ts @@ -1,5 +1,5 @@ -import { type Fq, type Fr } from '@aztec/foundation/fields'; -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { Fq, Fr } from '@aztec/foundation/fields'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { createCompatibleClient } from '../client.js'; diff --git a/yarn-project/cli/src/cmds/register_recipient.ts b/yarn-project/cli/src/cmds/register_recipient.ts index 7e9cf877f042..6458143c5423 100644 --- a/yarn-project/cli/src/cmds/register_recipient.ts +++ b/yarn-project/cli/src/cmds/register_recipient.ts @@ -1,6 +1,6 @@ -import { type AztecAddress, type Fr, type Point } from '@aztec/aztec.js'; +import { AztecAddress, Fr, Point } from '@aztec/aztec.js'; import { CompleteAddress } from '@aztec/circuit-types'; -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { createCompatibleClient } from '../client.js'; diff --git a/yarn-project/cli/src/cmds/send.ts b/yarn-project/cli/src/cmds/send.ts index c5195057e74e..8513fe1392ec 100644 --- a/yarn-project/cli/src/cmds/send.ts +++ b/yarn-project/cli/src/cmds/send.ts @@ -1,6 +1,6 @@ import { getSchnorrAccount } from '@aztec/accounts/schnorr'; -import { type AztecAddress, Contract, type Fq, Fr } from '@aztec/aztec.js'; -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { AztecAddress, Contract, Fq, Fr } from '@aztec/aztec.js'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { createCompatibleClient } from '../client.js'; import { prepTx } from '../utils.js'; diff --git a/yarn-project/cli/src/encoding.ts b/yarn-project/cli/src/encoding.ts index b06c9301b6e2..21ecba9fc8a2 100644 --- a/yarn-project/cli/src/encoding.ts +++ b/yarn-project/cli/src/encoding.ts @@ -1,4 +1,4 @@ -import { type ABIParameter, type ABIType, type StructType } from '@aztec/foundation/abi'; +import { ABIParameter, ABIType, StructType } from '@aztec/foundation/abi'; import { Fr } from '@aztec/foundation/fields'; /** diff --git a/yarn-project/cli/src/index.ts b/yarn-project/cli/src/index.ts index 13c56ba00010..16e5b15747a1 100644 --- a/yarn-project/cli/src/index.ts +++ b/yarn-project/cli/src/index.ts @@ -1,5 +1,5 @@ import { Fr } from '@aztec/circuits.js'; -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; import { fileURLToPath } from '@aztec/foundation/url'; import { addCodegenCommanderAction } from '@aztec/noir-compiler/cli'; diff --git a/yarn-project/cli/src/test/mocks.ts b/yarn-project/cli/src/test/mocks.ts index 1ca54bbee68c..afa693b8427c 100644 --- a/yarn-project/cli/src/test/mocks.ts +++ b/yarn-project/cli/src/test/mocks.ts @@ -1,4 +1,4 @@ -import { ABIParameterVisibility, type ContractArtifact, FunctionType } from '@aztec/foundation/abi'; +import { ABIParameterVisibility, ContractArtifact, FunctionType } from '@aztec/foundation/abi'; export const mockContractArtifact: ContractArtifact = { name: 'MockContract', diff --git a/yarn-project/cli/src/test/utils.test.ts b/yarn-project/cli/src/test/utils.test.ts index 56f3e109d914..e43d32d207a2 100644 --- a/yarn-project/cli/src/test/utils.test.ts +++ b/yarn-project/cli/src/test/utils.test.ts @@ -1,8 +1,8 @@ import { AztecAddress, Fr } from '@aztec/aztec.js'; -import { CompleteAddress, type PXE } from '@aztec/circuit-types'; +import { CompleteAddress, PXE } from '@aztec/circuit-types'; import { InvalidArgumentError } from 'commander'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; import { encodeArgs } from '../encoding.js'; import { parseFieldFromHexString } from '../parse_args.js'; diff --git a/yarn-project/cli/src/update/noir.ts b/yarn-project/cli/src/update/noir.ts index b18c38284b6d..0864293f4daa 100644 --- a/yarn-project/cli/src/update/noir.ts +++ b/yarn-project/cli/src/update/noir.ts @@ -1,4 +1,4 @@ -import { type LogFn } from '@aztec/foundation/log'; +import { LogFn } from '@aztec/foundation/log'; import { parseNoirPackageConfig } from '@aztec/foundation/noir'; import TOML from '@iarna/toml'; @@ -6,7 +6,7 @@ import { readFile } from 'fs/promises'; import { join, relative, resolve } from 'path'; import { atomicUpdateFile, prettyPrintNargoToml } from '../utils.js'; -import { type DependencyChanges } from './common.js'; +import { DependencyChanges } from './common.js'; /** * Updates Aztec.nr dependencies diff --git a/yarn-project/cli/src/update/npm.ts b/yarn-project/cli/src/update/npm.ts index c18716ca4746..ae085e6dfe70 100644 --- a/yarn-project/cli/src/update/npm.ts +++ b/yarn-project/cli/src/update/npm.ts @@ -1,13 +1,13 @@ -import { type LogFn } from '@aztec/foundation/log'; +import { LogFn } from '@aztec/foundation/log'; import { spawnSync } from 'child_process'; import { existsSync } from 'fs'; import { readFile } from 'fs/promises'; import { join, relative, resolve } from 'path'; -import { type SemVer, parse } from 'semver'; +import { SemVer, parse } from 'semver'; import { atomicUpdateFile } from '../utils.js'; -import { type DependencyChanges } from './common.js'; +import { DependencyChanges } from './common.js'; const deprecatedNpmPackages = new Set(['@aztec/cli', '@aztec/aztec-sandbox']); const npmDeprecationMessage = ` diff --git a/yarn-project/cli/src/update/update.ts b/yarn-project/cli/src/update/update.ts index e2bc90f79477..5c946f9953da 100644 --- a/yarn-project/cli/src/update/update.ts +++ b/yarn-project/cli/src/update/update.ts @@ -1,11 +1,11 @@ /* eslint-disable jsdoc/require-jsdoc */ -import { type LogFn } from '@aztec/foundation/log'; +import { LogFn } from '@aztec/foundation/log'; import { relative, resolve } from 'path'; import { parse } from 'semver'; import { GITHUB_TAG_PREFIX } from '../github.js'; -import { type DependencyChanges } from './common.js'; +import { DependencyChanges } from './common.js'; import { updateAztecNr } from './noir.js'; import { getNewestVersion, updateAztecDeps, updateLockfile } from './npm.js'; diff --git a/yarn-project/cli/src/utils.ts b/yarn-project/cli/src/utils.ts index 1c387db67bc5..756b3193c7bc 100644 --- a/yarn-project/cli/src/utils.ts +++ b/yarn-project/cli/src/utils.ts @@ -2,8 +2,8 @@ import { type ContractArtifact, type FunctionArtifact, loadContractArtifact } fr import { AztecAddress } from '@aztec/aztec.js/aztec_address'; import { type L1ContractArtifactsForDeployment } from '@aztec/aztec.js/ethereum'; import { type PXE } from '@aztec/aztec.js/interfaces/pxe'; -import { type DebugLogger, type LogFn } from '@aztec/foundation/log'; -import { type NoirPackageConfig } from '@aztec/foundation/noir'; +import { DebugLogger, LogFn } from '@aztec/foundation/log'; +import { NoirPackageConfig } from '@aztec/foundation/noir'; import { AvailabilityOracleAbi, AvailabilityOracleBytecode, diff --git a/yarn-project/end-to-end/Earthfile b/yarn-project/end-to-end/Earthfile index f88d7ca9b441..8a4e05523d27 100644 --- a/yarn-project/end-to-end/Earthfile +++ b/yarn-project/end-to-end/Earthfile @@ -2,26 +2,7 @@ VERSION 0.8 # requires first saving the images locally with ../+build-end-to-end -# run locally and build -E2E_TEST_LOCAL: - FUNCTION - ARG test - ARG compose_file=./scripts/docker-compose.yml - ARG enable_gas="" - ARG debug="aztec:*" - LOCALLY - ENV ENABLE_GAS=$enable_gas - ENV TEST=$test - ENV DEBUG="$debug" - WITH DOCKER \ - --load aztecprotocol/aztec:latest=../+aztec \ - --load aztecprotocol/end-to-end:latest=../+end-to-end-minimal \ - --load ghcr.io/foundry-rs/foundry:nightly-de33b6af53005037b463318d2628b5cfcaf39916=../../foundry/+get - # Run our docker compose, ending whenever sandbox ends, filtering out noisy eth_getLogs - RUN docker compose -f $compose_file up --exit-code-from=sandbox --force-recreate - END - -# run locally and take from cache, used for our mainly x86 jobs +# run locally, used for our mainly x86 jobs E2E_TEST_FROM_DOCKERHUB: FUNCTION ARG test @@ -32,10 +13,10 @@ E2E_TEST_FROM_DOCKERHUB: ENV ENABLE_GAS=$enable_gas ENV TEST=$test ENV DEBUG="$debug" - # In CI we do not use WITH DOCKER as we have had issues with earthly copying big images + # Locally, we do not use WITH DOCKER as we have had issues with earthly copying big images RUN docker compose -f $compose_file up --exit-code-from=end-to-end --force-recreate -# run on satellite and build, used for our few ARM jobs (means github runner doesn't need to be ARM) +# run on satellite, used for our few ARM jobs (means github runner doesn't need to be ARM) E2E_TEST_FROM_BUILD: FUNCTION ARG test @@ -61,209 +42,207 @@ E2E_TEST: ARG test ARG compose_file=./scripts/docker-compose.yml ARG enable_gas="" - ARG e2e_mode=local + ARG e2e_build=false ARG debug="aztec:*" LOCALLY - IF [ $e2e_mode = local ] - DO +E2E_TEST_LOCAL --test=$test --compose_file=$compose_file --enable_gas=$enable_gas --debug=$debug - ELSE IF [ $e2e_mode = cache ] - DO +E2E_TEST_FROM_DOCKERHUB --test=$test --compose_file=$compose_file --enable_gas=$enable_gas --debug=$debug - ELSE + IF [ $e2e_build = true ] DO +E2E_TEST_FROM_BUILD --test=$test --compose_file=$compose_file --enable_gas=$enable_gas --debug=$debug + ELSE + DO +E2E_TEST_FROM_DOCKERHUB --test=$test --compose_file=$compose_file --enable_gas=$enable_gas --debug=$debug END # Define e2e tests e2e-2-pxes: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_2_pxes.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_2_pxes.test.ts --e2e_build=$e2e_build e2e-note-getter: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_note_getter.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_note_getter.test.ts --e2e_build=$e2e_build e2e-counter: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_counter_contract.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_counter_contract.test.ts --e2e_build=$e2e_build e2e-private-voting: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_private_voting_contract.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_private_voting_contract.test.ts --e2e_build=$e2e_build e2e-max-block-number: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_max_block_number.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_max_block_number.test.ts --e2e_build=$e2e_build e2e-multiple-accounts-1-enc-key: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_multiple_accounts_1_enc_key.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_multiple_accounts_1_enc_key.test.ts --e2e_build=$e2e_build e2e-deploy-contract: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_deploy_contract.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_deploy_contract.test.ts --e2e_build=$e2e_build e2e-lending-contract: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_lending_contract.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_lending_contract.test.ts --e2e_build=$e2e_build e2e-token-contract: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_token_contract.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_token_contract.test.ts --e2e_build=$e2e_build e2e-authwit-test: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_authwit.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_authwit.test.ts --e2e_build=$e2e_build e2e-blacklist-token-contract: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_blacklist_token_contract.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_blacklist_token_contract.test.ts --e2e_build=$e2e_build # TODO(3458): Investigate intermittent failure # e2e-slow-tree: # DO +E2E_TEST --test=e2e_slow_tree e2e-sandbox-example: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_sandbox_example.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_sandbox_example.test.ts --e2e_build=$e2e_build e2e-state-vars: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_state_vars.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_state_vars.test.ts --e2e_build=$e2e_build e2e-block-building: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_block_building.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_block_building.test.ts --e2e_build=$e2e_build e2e-nested-contract: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_nested_contract.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_nested_contract.test.ts --e2e_build=$e2e_build e2e-static-calls: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_static_calls.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_static_calls.test.ts --e2e_build=$e2e_build e2e-delegate-calls: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_delegate_calls.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_delegate_calls.test.ts --e2e_build=$e2e_build e2e-non-contract-account: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_non_contract_account.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_non_contract_account.test.ts --e2e_build=$e2e_build e2e-cross-chain-messaging: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_cross_chain_messaging.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_cross_chain_messaging.test.ts --e2e_build=$e2e_build e2e-crowdfunding-and-claim: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_crowdfunding_and_claim.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_crowdfunding_and_claim.test.ts --e2e_build=$e2e_build e2e-public-cross-chain-messaging: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_public_cross_chain_messaging.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_public_cross_chain_messaging.test.ts --e2e_build=$e2e_build e2e-public-to-private-messaging: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_public_to_private_messaging.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_public_to_private_messaging.test.ts --e2e_build=$e2e_build e2e-account-contracts: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_account_contracts.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_account_contracts.test.ts --e2e_build=$e2e_build e2e-escrow-contract: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_escrow_contract.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_escrow_contract.test.ts --e2e_build=$e2e_build e2e-inclusion-proofs-contract: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_inclusion_proofs_contract.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_inclusion_proofs_contract.test.ts --e2e_build=$e2e_build e2e-pending-note-hashes-contract: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_pending_note_hashes_contract.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_pending_note_hashes_contract.test.ts --e2e_build=$e2e_build e2e-ordering: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_ordering.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_ordering.test.ts --e2e_build=$e2e_build e2e-outbox: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_outbox.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_outbox.test.ts --e2e_build=$e2e_build uniswap-trade-on-l1-from-l2: - ARG e2e_mode=local - DO +E2E_TEST --test=uniswap_trade_on_l1_from_l2.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=uniswap_trade_on_l1_from_l2.test.ts --e2e_build=$e2e_build integration-l1-publisher: - ARG e2e_mode=local - DO +E2E_TEST --test=integration_l1_publisher.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=integration_l1_publisher.test.ts --e2e_build=$e2e_build e2e-cli: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_cli.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_cli.test.ts --e2e_build=$e2e_build e2e-persistence: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_persistence.test.ts --compose_file=./scripts/docker-compose-no-sandbox.yml --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_persistence.test.ts --compose_file=./scripts/docker-compose-no-sandbox.yml --e2e_build=$e2e_build e2e-browser: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_aztec_js_browser.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_aztec_js_browser.test.ts --e2e_build=$e2e_build e2e-card-game: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_card_game.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_card_game.test.ts --e2e_build=$e2e_build e2e-avm-simulator: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_avm_simulator.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_avm_simulator.test.ts --e2e_build=$e2e_build e2e-fees: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_fees.test.ts --enable_gas=1 --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_fees.test.ts --enable_gas=1 --e2e_build=$e2e_build e2e-dapp-subscription: - ARG e2e_mode=local - DO +E2E_TEST --test=e2e_dapp_subscription.test.ts --enable_gas=1 --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=e2e_dapp_subscription.test.ts --enable_gas=1 --e2e_build=$e2e_build pxe: - ARG e2e_mode=local - DO +E2E_TEST --test=pxe.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=pxe.test.ts --e2e_build=$e2e_build cli-docs-sandbox: - ARG e2e_mode=local - DO +E2E_TEST --test=cli_docs_sandbox.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=cli_docs_sandbox.test.ts --e2e_build=$e2e_build e2e-docs-examples: - ARG e2e_mode=local - DO +E2E_TEST --test=docs_examples.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=docs_examples.test.ts --e2e_build=$e2e_build guides-writing-an-account-contract: - ARG e2e_mode=local - DO +E2E_TEST --test=guides/writing_an_account_contract.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=guides/writing_an_account_contract.test.ts --e2e_build=$e2e_build guides-dapp-testing: - ARG e2e_mode=local - DO +E2E_TEST --test=guides/dapp_testing.test.ts --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=guides/dapp_testing.test.ts --e2e_build=$e2e_build guides-sample-dapp: - ARG e2e_mode=local - DO +E2E_TEST --test=sample-dapp --e2e_mode=$e2e_mode + ARG e2e_build=false + DO +E2E_TEST --test=sample-dapp --e2e_build=$e2e_build # TODO currently hangs for hour+ # guides-up-quick-start: -# ARG e2e_mode=local -# DO +E2E_TEST --test=guides/up_quick_start.test.ts --e2e_mode=$e2e_mode +# ARG e2e_build=false +# DO +E2E_TEST --test=guides/up_quick_start.test.ts --e2e_build=$e2e_build bench-publish-rollup: - ARG e2e_mode=local - DO +E2E_TEST --test=benchmarks/bench_publish_rollup.test.ts --debug="aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees" --e2e_mode=$e2e_mode --compose_file=./scripts/docker-compose-no-sandbox.yml + ARG e2e_build=false + DO +E2E_TEST --test=benchmarks/bench_publish_rollup.test.ts --debug="aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees" --e2e_build=$e2e_build --compose_file=./scripts/docker-compose-no-sandbox.yml # TODO need to investigate why this isn't working # bench-process-history: -# ARG e2e_mode=local -# DO +E2E_TEST --test=benchmarks/bench_process_history.test.ts --debug="aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees" --e2e_mode=$e2e_mode --compose_file=./scripts/docker-compose-no-sandbox.yml +# ARG e2e_build=false +# DO +E2E_TEST --test=benchmarks/bench_process_history.test.ts --debug="aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees" --e2e_build=$e2e_build --compose_file=./scripts/docker-compose-no-sandbox.yml # TODO need to investigate why this isn't working # bench-tx-size: -# ARG e2e_mode=local -# DO +E2E_TEST --test=benchmarks/bench_tx_size_fees.test.ts --debug="aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees" --e2e_mode=$e2e_mode --compose_file=./scripts/docker-compose-no-sandbox.yml +# ARG e2e_build=false +# DO +E2E_TEST --test=benchmarks/bench_tx_size_fees.test.ts --debug="aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees" --e2e_build=$e2e_build --compose_file=./scripts/docker-compose-no-sandbox.yml diff --git a/yarn-project/end-to-end/src/benchmarks/bench_process_history.test.ts b/yarn-project/end-to-end/src/benchmarks/bench_process_history.test.ts index bc8fb1cfbb2d..8d0747cf27f5 100644 --- a/yarn-project/end-to-end/src/benchmarks/bench_process_history.test.ts +++ b/yarn-project/end-to-end/src/benchmarks/bench_process_history.test.ts @@ -1,14 +1,14 @@ -import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node'; +import { AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node'; import { AztecAddress, Fr, GrumpkinScalar, INITIAL_L2_BLOCK_NUM, elapsed, sleep } from '@aztec/aztec.js'; import { BENCHMARK_HISTORY_BLOCK_SIZE, BENCHMARK_HISTORY_CHAIN_LENGTHS, - type NodeSyncedChainHistoryStats, + NodeSyncedChainHistoryStats, } from '@aztec/circuit-types/stats'; -import { type BenchmarkingContract } from '@aztec/noir-contracts.js/Benchmarking'; -import { type SequencerClient } from '@aztec/sequencer-client'; +import { BenchmarkingContract } from '@aztec/noir-contracts.js/Benchmarking'; +import { SequencerClient } from '@aztec/sequencer-client'; -import { type EndToEndContext } from '../fixtures/utils.js'; +import { EndToEndContext } from '../fixtures/utils.js'; import { benchmarkSetup, getFolderSize, diff --git a/yarn-project/end-to-end/src/benchmarks/bench_publish_rollup.test.ts b/yarn-project/end-to-end/src/benchmarks/bench_publish_rollup.test.ts index fbbdcf49f58d..fea4012690b2 100644 --- a/yarn-project/end-to-end/src/benchmarks/bench_publish_rollup.test.ts +++ b/yarn-project/end-to-end/src/benchmarks/bench_publish_rollup.test.ts @@ -1,10 +1,10 @@ import { AztecNodeService } from '@aztec/aztec-node'; import { AztecAddress, Fr, GrumpkinScalar } from '@aztec/aztec.js'; import { BENCHMARK_BLOCK_SIZES } from '@aztec/circuit-types/stats'; -import { type BenchmarkingContract } from '@aztec/noir-contracts.js/Benchmarking'; -import { type SequencerClient } from '@aztec/sequencer-client'; +import { BenchmarkingContract } from '@aztec/noir-contracts.js/Benchmarking'; +import { SequencerClient } from '@aztec/sequencer-client'; -import { type EndToEndContext } from '../fixtures/utils.js'; +import { EndToEndContext } from '../fixtures/utils.js'; import { benchmarkSetup, sendTxs, waitNewPXESynced, waitRegisteredAccountSynced } from './utils.js'; describe('benchmarks/publish_rollup', () => { diff --git a/yarn-project/end-to-end/src/benchmarks/bench_tx_size_fees.test.ts b/yarn-project/end-to-end/src/benchmarks/bench_tx_size_fees.test.ts index a786e4d263a8..bfc942610727 100644 --- a/yarn-project/end-to-end/src/benchmarks/bench_tx_size_fees.test.ts +++ b/yarn-project/end-to-end/src/benchmarks/bench_tx_size_fees.test.ts @@ -1,7 +1,7 @@ import { - type AccountWalletWithPrivateKey, - type AztecAddress, - type FeePaymentMethod, + AccountWalletWithPrivateKey, + AztecAddress, + FeePaymentMethod, NativeFeePaymentMethod, PrivateFeePaymentMethod, PublicFeePaymentMethod, @@ -13,7 +13,7 @@ import { getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token import { jest } from '@jest/globals'; -import { type EndToEndContext, publicDeployAccounts, setup } from '../fixtures/utils.js'; +import { EndToEndContext, publicDeployAccounts, setup } from '../fixtures/utils.js'; jest.setTimeout(50_000); diff --git a/yarn-project/end-to-end/src/benchmarks/utils.ts b/yarn-project/end-to-end/src/benchmarks/utils.ts index 0841a9725c89..8fe85f16166a 100644 --- a/yarn-project/end-to-end/src/benchmarks/utils.ts +++ b/yarn-project/end-to-end/src/benchmarks/utils.ts @@ -1,25 +1,25 @@ -import { type AztecNodeConfig, type AztecNodeService } from '@aztec/aztec-node'; +import { AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node'; import { - type AztecNode, + AztecNode, BatchCall, - type GrumpkinScalar, + GrumpkinScalar, INITIAL_L2_BLOCK_NUM, - type PXE, - type PartialAddress, - type SentTx, + PXE, + PartialAddress, + SentTx, retryUntil, sleep, } from '@aztec/aztec.js'; import { times } from '@aztec/foundation/collection'; import { randomInt } from '@aztec/foundation/crypto'; import { BenchmarkingContract } from '@aztec/noir-contracts.js/Benchmarking'; -import { type PXEService, createPXEService } from '@aztec/pxe'; +import { PXEService, createPXEService } from '@aztec/pxe'; import { mkdirpSync } from 'fs-extra'; import { globSync } from 'glob'; import { join } from 'path'; -import { type EndToEndContext, setup } from '../fixtures/utils.js'; +import { EndToEndContext, setup } from '../fixtures/utils.js'; /** * Setup for benchmarks. Initializes a remote node with a single account and deploys a benchmark contract. diff --git a/yarn-project/end-to-end/src/e2e_2_pxes.test.ts b/yarn-project/end-to-end/src/e2e_2_pxes.test.ts index 409c4598db04..80f970483b16 100644 --- a/yarn-project/end-to-end/src/e2e_2_pxes.test.ts +++ b/yarn-project/end-to-end/src/e2e_2_pxes.test.ts @@ -1,15 +1,15 @@ import { getUnsafeSchnorrAccount } from '@aztec/accounts/single_key'; import { - type AztecAddress, - type AztecNode, - type CompleteAddress, - type DebugLogger, + AztecAddress, + AztecNode, + CompleteAddress, + DebugLogger, ExtendedNote, Fr, GrumpkinScalar, Note, - type PXE, - type Wallet, + PXE, + Wallet, computeMessageSecretHash, retryUntil, } from '@aztec/aztec.js'; diff --git a/yarn-project/end-to-end/src/e2e_account_contracts.test.ts b/yarn-project/end-to-end/src/e2e_account_contracts.test.ts index 0d44c5603c56..beb19f2ef511 100644 --- a/yarn-project/end-to-end/src/e2e_account_contracts.test.ts +++ b/yarn-project/end-to-end/src/e2e_account_contracts.test.ts @@ -2,15 +2,15 @@ import { EcdsaAccountContract } from '@aztec/accounts/ecdsa'; import { SchnorrAccountContract } from '@aztec/accounts/schnorr'; import { SingleKeyAccountContract } from '@aztec/accounts/single_key'; import { - type AccountContract, + AccountContract, AccountManager, AccountWallet, - type CompleteAddress, + CompleteAddress, Fr, - type GrumpkinPrivateKey, + GrumpkinPrivateKey, GrumpkinScalar, - type PXE, - type Wallet, + PXE, + Wallet, } from '@aztec/aztec.js'; import { randomBytes } from '@aztec/foundation/crypto'; import { ChildContract } from '@aztec/noir-contracts.js/Child'; diff --git a/yarn-project/end-to-end/src/e2e_authwit.test.ts b/yarn-project/end-to-end/src/e2e_authwit.test.ts index 44fb5e83da2a..09e4acf53fe2 100644 --- a/yarn-project/end-to-end/src/e2e_authwit.test.ts +++ b/yarn-project/end-to-end/src/e2e_authwit.test.ts @@ -1,10 +1,4 @@ -import { - type AccountWallet, - type CompleteAddress, - Fr, - computeInnerAuthWitHash, - computeOuterAuthWitHash, -} from '@aztec/aztec.js'; +import { AccountWallet, CompleteAddress, Fr, computeInnerAuthWitHash, computeOuterAuthWitHash } from '@aztec/aztec.js'; import { SchnorrAccountContract } from '@aztec/noir-contracts.js'; import { jest } from '@jest/globals'; diff --git a/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts b/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts index c4742bce15c0..99032a482280 100644 --- a/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts +++ b/yarn-project/end-to-end/src/e2e_avm_simulator.test.ts @@ -1,4 +1,4 @@ -import { AztecAddress, type Wallet } from '@aztec/aztec.js'; +import { AztecAddress, Wallet } from '@aztec/aztec.js'; import { AvmTestContract } from '@aztec/noir-contracts.js'; import { jest } from '@jest/globals'; diff --git a/yarn-project/end-to-end/src/e2e_blacklist_token_contract.test.ts b/yarn-project/end-to-end/src/e2e_blacklist_token_contract.test.ts index 8c1fe2ec1914..bd5bcb70637a 100644 --- a/yarn-project/end-to-end/src/e2e_blacklist_token_contract.test.ts +++ b/yarn-project/end-to-end/src/e2e_blacklist_token_contract.test.ts @@ -1,21 +1,21 @@ import { - type AccountWallet, + AccountWallet, AztecAddress, - type CheatCodes, - type CompleteAddress, - type DebugLogger, + CheatCodes, + CompleteAddress, + DebugLogger, ExtendedNote, Fr, FunctionSelector, Note, - type TxHash, - type Wallet, + TxHash, + Wallet, computeAuthWitMessageHash, computeMessageSecretHash, } from '@aztec/aztec.js'; import { openTmpStore } from '@aztec/kv-store/utils'; import { Pedersen, SparseTree, newTree } from '@aztec/merkle-tree'; -import { SlowTreeContract, TokenBlacklistContract, type TokenContract } from '@aztec/noir-contracts.js'; +import { SlowTreeContract, TokenBlacklistContract, TokenContract } from '@aztec/noir-contracts.js'; 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 cf7208ccb1f5..36c991911770 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,16 +1,16 @@ import { - type AztecAddress, - type AztecNode, + AztecAddress, + AztecNode, BatchCall, ContractDeployer, ContractFunctionInteraction, - type DebugLogger, + DebugLogger, Fr, - type PXE, - type SentTx, - type TxReceipt, + PXE, + SentTx, + TxReceipt, TxStatus, - type Wallet, + Wallet, } from '@aztec/aztec.js'; import { times } from '@aztec/foundation/collection'; import { pedersenHash } from '@aztec/foundation/crypto'; diff --git a/yarn-project/end-to-end/src/e2e_card_game.test.ts b/yarn-project/end-to-end/src/e2e_card_game.test.ts index 354196882bc0..1520f91c92aa 100644 --- a/yarn-project/end-to-end/src/e2e_card_game.test.ts +++ b/yarn-project/end-to-end/src/e2e_card_game.test.ts @@ -1,12 +1,12 @@ import { getSchnorrAccount } from '@aztec/accounts/schnorr'; import { INITIAL_TEST_ENCRYPTION_KEYS } from '@aztec/accounts/testing'; import { - type AccountWallet, + AccountWallet, AztecAddress, - type DebugLogger, + DebugLogger, GrumpkinScalar, - type PXE, - type Wallet, + PXE, + Wallet, generatePublicKey, } from '@aztec/aztec.js'; import { computeNullifierSecretKey, computeSiloedNullifierSecretKey } from '@aztec/circuits.js'; diff --git a/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts b/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts index f6f5568ec1c5..20c7761db90c 100644 --- a/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts +++ b/yarn-project/end-to-end/src/e2e_cheat_codes.test.ts @@ -1,27 +1,18 @@ import { - type CheatCodes, - type CompleteAddress, + CheatCodes, + CompleteAddress, EthAddress, ExtendedNote, Fr, Note, - type PXE, - type Wallet, + PXE, + Wallet, computeMessageSecretHash, } from '@aztec/aztec.js'; import { RollupAbi } from '@aztec/l1-artifacts'; import { TestContract, TokenContract } from '@aztec/noir-contracts.js'; -import { - type Account, - type Chain, - type HttpTransport, - type PublicClient, - type WalletClient, - getAddress, - getContract, - parseEther, -} from 'viem'; +import { Account, Chain, HttpTransport, PublicClient, WalletClient, getAddress, getContract, parseEther } from 'viem'; import { setup } from './fixtures/utils.js'; diff --git a/yarn-project/end-to-end/src/e2e_cli.test.ts b/yarn-project/end-to-end/src/e2e_cli.test.ts index 1edf7050eba8..7fd0884a0911 100644 --- a/yarn-project/end-to-end/src/e2e_cli.test.ts +++ b/yarn-project/end-to-end/src/e2e_cli.test.ts @@ -1,4 +1,4 @@ -import { type PXE, createDebugLogger } from '@aztec/aztec.js'; +import { PXE, createDebugLogger } from '@aztec/aztec.js'; import { startHttpRpcServer } from '@aztec/foundation/json-rpc/server'; import { createPXERpcServer } from '@aztec/pxe'; diff --git a/yarn-project/end-to-end/src/e2e_counter_contract.test.ts b/yarn-project/end-to-end/src/e2e_counter_contract.test.ts index 61e562eb3306..ea4f806fb7b0 100644 --- a/yarn-project/end-to-end/src/e2e_counter_contract.test.ts +++ b/yarn-project/end-to-end/src/e2e_counter_contract.test.ts @@ -1,4 +1,4 @@ -import { type AccountWallet, type AztecAddress, type CompleteAddress, type DebugLogger } from '@aztec/aztec.js'; +import { AccountWallet, AztecAddress, CompleteAddress, DebugLogger } from '@aztec/aztec.js'; import { CounterContract } from '@aztec/noir-contracts.js/Counter'; import { setup } from './fixtures/utils.js'; diff --git a/yarn-project/end-to-end/src/e2e_cross_chain_messaging.test.ts b/yarn-project/end-to-end/src/e2e_cross_chain_messaging.test.ts index b05638697a9d..52bfa8b5b06b 100644 --- a/yarn-project/end-to-end/src/e2e_cross_chain_messaging.test.ts +++ b/yarn-project/end-to-end/src/e2e_cross_chain_messaging.test.ts @@ -1,8 +1,8 @@ import { - type AccountWallet, - type AztecAddress, - type AztecNode, - type DebugLogger, + AccountWallet, + AztecAddress, + AztecNode, + DebugLogger, EthAddress, Fr, L1Actor, @@ -11,7 +11,7 @@ import { computeAuthWitMessageHash, } from '@aztec/aztec.js'; import { sha256ToField } from '@aztec/foundation/crypto'; -import { type TokenBridgeContract, type TokenContract } from '@aztec/noir-contracts.js'; +import { TokenBridgeContract, TokenContract } from '@aztec/noir-contracts.js'; import { toFunctionSelector } from 'viem/utils'; diff --git a/yarn-project/end-to-end/src/e2e_crowdfunding_and_claim.test.ts b/yarn-project/end-to-end/src/e2e_crowdfunding_and_claim.test.ts index 494a4bc1b115..eaa666f525c9 100644 --- a/yarn-project/end-to-end/src/e2e_crowdfunding_and_claim.test.ts +++ b/yarn-project/end-to-end/src/e2e_crowdfunding_and_claim.test.ts @@ -1,14 +1,14 @@ import { - type AccountWallet, - type AztecAddress, - type CheatCodes, - type DebugLogger, + AccountWallet, + AztecAddress, + CheatCodes, + DebugLogger, ExtendedNote, Fr, GrumpkinScalar, Note, - type PXE, - type TxHash, + PXE, + TxHash, computeMessageSecretHash, generatePublicKey, } from '@aztec/aztec.js'; diff --git a/yarn-project/end-to-end/src/e2e_dapp_subscription.test.ts b/yarn-project/end-to-end/src/e2e_dapp_subscription.test.ts index ac44271c959f..2dfd5ea8a10c 100644 --- a/yarn-project/end-to-end/src/e2e_dapp_subscription.test.ts +++ b/yarn-project/end-to-end/src/e2e_dapp_subscription.test.ts @@ -1,7 +1,7 @@ import { - type AccountWalletWithPrivateKey, - type AztecAddress, - type FeePaymentMethod, + AccountWalletWithPrivateKey, + AztecAddress, + FeePaymentMethod, Fr, PrivateFeePaymentMethod, PublicFeePaymentMethod, @@ -21,8 +21,8 @@ import { getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token import { jest } from '@jest/globals'; import { - type BalancesFn, - type EndToEndContext, + BalancesFn, + EndToEndContext, expectMapping, getBalancesFn, publicDeployAccounts, diff --git a/yarn-project/end-to-end/src/e2e_delegate_calls.test.ts b/yarn-project/end-to-end/src/e2e_delegate_calls.test.ts index 11a81b84f168..c2a36bb435c4 100644 --- a/yarn-project/end-to-end/src/e2e_delegate_calls.test.ts +++ b/yarn-project/end-to-end/src/e2e_delegate_calls.test.ts @@ -1,4 +1,4 @@ -import { type Wallet } from '@aztec/aztec.js'; +import { Wallet } from '@aztec/aztec.js'; import { DelegatedOnContract, DelegatorContract } from '@aztec/noir-contracts.js'; import { setup } from './fixtures/utils.js'; diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract.test.ts b/yarn-project/end-to-end/src/e2e_deploy_contract.test.ts index 75f152ad05c1..7638c537499c 100644 --- a/yarn-project/end-to-end/src/e2e_deploy_contract.test.ts +++ b/yarn-project/end-to-end/src/e2e_deploy_contract.test.ts @@ -1,20 +1,20 @@ import { AztecAddress, - type AztecNode, + AztecNode, BatchCall, CompleteAddress, - type ContractArtifact, - type ContractBase, - type ContractClassWithId, + ContractArtifact, + ContractBase, + ContractClassWithId, ContractDeployer, - type ContractInstanceWithAddress, - type DebugLogger, + ContractInstanceWithAddress, + DebugLogger, EthAddress, Fr, - type PXE, + PXE, SignerlessWallet, TxStatus, - type Wallet, + Wallet, getContractClassFromArtifact, getContractInstanceFromDeployParams, } from '@aztec/aztec.js'; @@ -24,14 +24,14 @@ import { deployInstance, registerContractClass, } from '@aztec/aztec.js/deployment'; -import { type ContractClassIdPreimage, Point } from '@aztec/circuits.js'; +import { ContractClassIdPreimage, Point } from '@aztec/circuits.js'; import { siloNullifier } from '@aztec/circuits.js/hash'; import { FunctionSelector, FunctionType } from '@aztec/foundation/abi'; import { writeTestData } from '@aztec/foundation/testing'; import { CounterContract, StatefulTestContract } from '@aztec/noir-contracts.js'; import { TestContract, TestContractArtifact } from '@aztec/noir-contracts.js/Test'; import { TokenContract, TokenContractArtifact } from '@aztec/noir-contracts.js/Token'; -import { type SequencerClient } from '@aztec/sequencer-client'; +import { SequencerClient } from '@aztec/sequencer-client'; import { setup } from './fixtures/utils.js'; 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 54b2f467c828..047e57674e4b 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 @@ -1,16 +1,16 @@ import { - type AccountWallet, - type AztecAddress, + AccountWallet, + AztecAddress, BatchCall, - type CompleteAddress, - type DebugLogger, + CompleteAddress, + DebugLogger, ExtendedNote, Fr, - type GrumpkinPrivateKey, + GrumpkinPrivateKey, GrumpkinScalar, Note, - type PXE, - type PublicKey, + PXE, + PublicKey, computeMessageSecretHash, generatePublicKey, } from '@aztec/aztec.js'; diff --git a/yarn-project/end-to-end/src/e2e_fees.test.ts b/yarn-project/end-to-end/src/e2e_fees.test.ts index 3b11f865776a..b03a1d67052c 100644 --- a/yarn-project/end-to-end/src/e2e_fees.test.ts +++ b/yarn-project/end-to-end/src/e2e_fees.test.ts @@ -1,22 +1,22 @@ import { - type AztecAddress, + AztecAddress, BatchCall, - type DebugLogger, + DebugLogger, ExtendedNote, Fr, - type FunctionCall, + FunctionCall, FunctionSelector, Note, PrivateFeePaymentMethod, PublicFeePaymentMethod, - type TxHash, + TxHash, TxStatus, - type Wallet, + Wallet, computeAuthWitMessageHash, computeMessageSecretHash, } from '@aztec/aztec.js'; import { FunctionData, getContractClassFromArtifact } from '@aztec/circuits.js'; -import { type ContractArtifact, decodeFunctionSignature } from '@aztec/foundation/abi'; +import { ContractArtifact, decodeFunctionSignature } from '@aztec/foundation/abi'; import { TokenContract as BananaCoin, FPCContract, @@ -27,14 +27,14 @@ import { import { jest } from '@jest/globals'; import { - type BalancesFn, - type EndToEndContext, + BalancesFn, + EndToEndContext, expectMapping, getBalancesFn, publicDeployAccounts, setup, } from './fixtures/utils.js'; -import { GasPortalTestingHarnessFactory, type IGasBridgingTestHarness } from './shared/gas_portal_test_harness.js'; +import { GasPortalTestingHarnessFactory, IGasBridgingTestHarness } from './shared/gas_portal_test_harness.js'; const TOKEN_NAME = 'BananaCoin'; const TOKEN_SYMBOL = 'BC'; diff --git a/yarn-project/end-to-end/src/e2e_inclusion_proofs_contract.test.ts b/yarn-project/end-to-end/src/e2e_inclusion_proofs_contract.test.ts index 3b4d88e5e6ef..850b349fa58a 100644 --- a/yarn-project/end-to-end/src/e2e_inclusion_proofs_contract.test.ts +++ b/yarn-project/end-to-end/src/e2e_inclusion_proofs_contract.test.ts @@ -1,10 +1,10 @@ import { - type AccountWallet, + AccountWallet, AztecAddress, - type CompleteAddress, + CompleteAddress, Fr, INITIAL_L2_BLOCK_NUM, - type PXE, + PXE, getContractInstanceFromDeployParams, } from '@aztec/aztec.js'; import { deployInstance, registerContractClass } from '@aztec/aztec.js/deployment'; 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 817e894b68fd..b349bfb39c34 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,8 +1,8 @@ import { - type AccountWallet, - type CheatCodes, - type CompleteAddress, - type DebugLogger, + AccountWallet, + CheatCodes, + CompleteAddress, + DebugLogger, ExtendedNote, Fr, Note, diff --git a/yarn-project/end-to-end/src/e2e_max_block_number.test.ts b/yarn-project/end-to-end/src/e2e_max_block_number.test.ts index 0b8307f1fb44..c54dab89ca0d 100644 --- a/yarn-project/end-to-end/src/e2e_max_block_number.test.ts +++ b/yarn-project/end-to-end/src/e2e_max_block_number.test.ts @@ -1,4 +1,4 @@ -import { type PXE, type Wallet } from '@aztec/aztec.js'; +import { PXE, Wallet } from '@aztec/aztec.js'; import { TestContract } from '@aztec/noir-contracts.js'; import { setup } from './fixtures/utils.js'; diff --git a/yarn-project/end-to-end/src/e2e_multiple_accounts_1_enc_key.test.ts b/yarn-project/end-to-end/src/e2e_multiple_accounts_1_enc_key.test.ts index f064e08ae997..b4d911dfb028 100644 --- a/yarn-project/end-to-end/src/e2e_multiple_accounts_1_enc_key.test.ts +++ b/yarn-project/end-to-end/src/e2e_multiple_accounts_1_enc_key.test.ts @@ -1,15 +1,15 @@ import { getSchnorrAccount } from '@aztec/accounts/schnorr'; import { - type AztecAddress, - type AztecNode, - type CompleteAddress, - type DebugLogger, + AztecAddress, + AztecNode, + CompleteAddress, + DebugLogger, ExtendedNote, Fr, GrumpkinScalar, Note, - type PXE, - type Wallet, + PXE, + Wallet, computeMessageSecretHash, generatePublicKey, } from '@aztec/aztec.js'; diff --git a/yarn-project/end-to-end/src/e2e_nested_contract.test.ts b/yarn-project/end-to-end/src/e2e_nested_contract.test.ts index ae73dabb6119..8582ae4ecdee 100644 --- a/yarn-project/end-to-end/src/e2e_nested_contract.test.ts +++ b/yarn-project/end-to-end/src/e2e_nested_contract.test.ts @@ -1,4 +1,4 @@ -import { type AztecAddress, BatchCall, type DebugLogger, Fr, type PXE, type Wallet, toBigIntBE } from '@aztec/aztec.js'; +import { AztecAddress, BatchCall, DebugLogger, Fr, PXE, Wallet, toBigIntBE } from '@aztec/aztec.js'; import { getTestData, isGenerateTestDataEnabled } from '@aztec/foundation/testing'; import { ChildContract, ImportTestContract, ParentContract, TestContract } from '@aztec/noir-contracts.js'; diff --git a/yarn-project/end-to-end/src/e2e_non_contract_account.test.ts b/yarn-project/end-to-end/src/e2e_non_contract_account.test.ts index 4e9df2086e5b..ef7e51ca9104 100644 --- a/yarn-project/end-to-end/src/e2e_non_contract_account.test.ts +++ b/yarn-project/end-to-end/src/e2e_non_contract_account.test.ts @@ -1,13 +1,4 @@ -import { - type DebugLogger, - ExtendedNote, - Fr, - Note, - type PXE, - SignerlessWallet, - type Wallet, - toBigInt, -} from '@aztec/aztec.js'; +import { DebugLogger, ExtendedNote, Fr, Note, PXE, SignerlessWallet, Wallet, toBigInt } from '@aztec/aztec.js'; import { siloNullifier } from '@aztec/circuits.js/hash'; import { TestContract } from '@aztec/noir-contracts.js/Test'; diff --git a/yarn-project/end-to-end/src/e2e_note_getter.test.ts b/yarn-project/end-to-end/src/e2e_note_getter.test.ts index 6ca1d04e782b..402b50f5b05c 100644 --- a/yarn-project/end-to-end/src/e2e_note_getter.test.ts +++ b/yarn-project/end-to-end/src/e2e_note_getter.test.ts @@ -1,4 +1,4 @@ -import { type AztecAddress, Comparator, Fr, type Wallet, toBigInt } from '@aztec/aztec.js'; +import { AztecAddress, Comparator, Fr, Wallet, toBigInt } from '@aztec/aztec.js'; import { DocsExampleContract, TestContract } from '@aztec/noir-contracts.js'; import { setup } from './fixtures/utils.js'; diff --git a/yarn-project/end-to-end/src/e2e_ordering.test.ts b/yarn-project/end-to-end/src/e2e_ordering.test.ts index d075e0a88ca8..450bc0eb214a 100644 --- a/yarn-project/end-to-end/src/e2e_ordering.test.ts +++ b/yarn-project/end-to-end/src/e2e_ordering.test.ts @@ -1,5 +1,5 @@ // Test suite for testing proper ordering of side effects -import { Fr, type FunctionSelector, type PXE, type Wallet, toBigIntBE } from '@aztec/aztec.js'; +import { Fr, FunctionSelector, PXE, Wallet, toBigIntBE } from '@aztec/aztec.js'; import { ChildContract } from '@aztec/noir-contracts.js/Child'; import { ParentContract } from '@aztec/noir-contracts.js/Parent'; diff --git a/yarn-project/end-to-end/src/e2e_outbox.test.ts b/yarn-project/end-to-end/src/e2e_outbox.test.ts index 1115cbee0626..e94ecec0cd56 100644 --- a/yarn-project/end-to-end/src/e2e_outbox.test.ts +++ b/yarn-project/end-to-end/src/e2e_outbox.test.ts @@ -1,11 +1,11 @@ import { - type AccountWalletWithPrivateKey, - type AztecNode, + AccountWalletWithPrivateKey, + AztecNode, BatchCall, - type DeployL1Contracts, + DeployL1Contracts, EthAddress, Fr, - type SiblingPath, + SiblingPath, } from '@aztec/aztec.js'; import { sha256ToField } from '@aztec/foundation/crypto'; import { truncateAndPad } from '@aztec/foundation/serialize'; diff --git a/yarn-project/end-to-end/src/e2e_p2p_network.test.ts b/yarn-project/end-to-end/src/e2e_p2p_network.test.ts index 3f7cc1c469e3..618986c2ab1f 100644 --- a/yarn-project/end-to-end/src/e2e_p2p_network.test.ts +++ b/yarn-project/end-to-end/src/e2e_p2p_network.test.ts @@ -1,17 +1,17 @@ import { getSchnorrAccount } from '@aztec/accounts/schnorr'; -import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node'; +import { AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node'; import { - type AztecAddress, + AztecAddress, CompleteAddress, - type DebugLogger, + DebugLogger, Fr, Grumpkin, GrumpkinScalar, - type SentTx, + SentTx, TxStatus, } from '@aztec/aztec.js'; -import { BootstrapNode, type P2PConfig, createLibP2PPeerId } from '@aztec/p2p'; -import { ConstantKeyPair, type PXEService, createPXEService, getPXEServiceConfig as getRpcConfig } from '@aztec/pxe'; +import { BootstrapNode, P2PConfig, createLibP2PPeerId } from '@aztec/p2p'; +import { ConstantKeyPair, PXEService, createPXEService, getPXEServiceConfig as getRpcConfig } from '@aztec/pxe'; import { mnemonicToAccount } from 'viem/accounts'; diff --git a/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts b/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts index 5cf47cd3f532..1e30daec2902 100644 --- a/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts +++ b/yarn-project/end-to-end/src/e2e_pending_note_hashes_contract.test.ts @@ -1,11 +1,4 @@ -import { - type AztecAddress, - type AztecNode, - type CompleteAddress, - type DebugLogger, - Fr, - type Wallet, -} from '@aztec/aztec.js'; +import { AztecAddress, AztecNode, CompleteAddress, DebugLogger, Fr, Wallet } from '@aztec/aztec.js'; import { PendingNoteHashesContract } from '@aztec/noir-contracts.js/PendingNoteHashes'; import { setup } from './fixtures/utils.js'; diff --git a/yarn-project/end-to-end/src/e2e_persistence.test.ts b/yarn-project/end-to-end/src/e2e_persistence.test.ts index e74cecc589ac..52eb18a4fe25 100644 --- a/yarn-project/end-to-end/src/e2e_persistence.test.ts +++ b/yarn-project/end-to-end/src/e2e_persistence.test.ts @@ -1,16 +1,16 @@ import { getUnsafeSchnorrAccount, getUnsafeSchnorrWallet } from '@aztec/accounts/single_key'; import { - type AccountWallet, - type ContractInstanceWithAddress, + AccountWallet, + ContractInstanceWithAddress, ExtendedNote, Note, - type TxHash, + TxHash, computeMessageSecretHash, waitForAccountSynch, } from '@aztec/aztec.js'; -import { type Salt } from '@aztec/aztec.js/account'; -import { type AztecAddress, type CompleteAddress, Fq, Fr } from '@aztec/circuits.js'; -import { type DeployL1Contracts } from '@aztec/ethereum'; +import { Salt } from '@aztec/aztec.js/account'; +import { AztecAddress, CompleteAddress, Fq, Fr } from '@aztec/circuits.js'; +import { DeployL1Contracts } from '@aztec/ethereum'; import { TokenContract } from '@aztec/noir-contracts.js/Token'; import { jest } from '@jest/globals'; @@ -18,7 +18,7 @@ import { mkdtemp } from 'fs/promises'; import { tmpdir } from 'os'; import { join } from 'path'; -import { type EndToEndContext, setup } from './fixtures/utils.js'; +import { EndToEndContext, setup } from './fixtures/utils.js'; jest.setTimeout(60_000); diff --git a/yarn-project/end-to-end/src/e2e_private_voting_contract.test.ts b/yarn-project/end-to-end/src/e2e_private_voting_contract.test.ts index e030088e40b5..7d700bdffdc0 100644 --- a/yarn-project/end-to-end/src/e2e_private_voting_contract.test.ts +++ b/yarn-project/end-to-end/src/e2e_private_voting_contract.test.ts @@ -1,4 +1,4 @@ -import { type AccountWallet, type AztecAddress, type CompleteAddress, type DebugLogger, Fr } from '@aztec/aztec.js'; +import { AccountWallet, AztecAddress, CompleteAddress, DebugLogger, Fr } from '@aztec/aztec.js'; import { EasyPrivateVotingContract } from '@aztec/noir-contracts.js/EasyPrivateVoting'; import { setup } from './fixtures/utils.js'; diff --git a/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging.test.ts b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging.test.ts index 10864f56c67f..740fb2a5c991 100644 --- a/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging.test.ts +++ b/yarn-project/end-to-end/src/e2e_public_cross_chain_messaging.test.ts @@ -1,26 +1,26 @@ import { - type AccountWallet, - type AztecAddress, - type AztecNode, - type CompleteAddress, - type DebugLogger, - type DeployL1Contracts, + AccountWallet, + AztecAddress, + AztecNode, + CompleteAddress, + DebugLogger, + DeployL1Contracts, EthAddress, Fr, L1Actor, L1ToL2Message, L2Actor, - type PXE, + PXE, computeAuthWitMessageHash, computeMessageSecretHash, } from '@aztec/aztec.js'; import { sha256ToField } from '@aztec/foundation/crypto'; import { InboxAbi, OutboxAbi } from '@aztec/l1-artifacts'; import { TestContract } from '@aztec/noir-contracts.js'; -import { type TokenContract } from '@aztec/noir-contracts.js/Token'; -import { type TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge'; +import { TokenContract } from '@aztec/noir-contracts.js/Token'; +import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge'; -import { type Chain, type GetContractReturnType, type Hex, type HttpTransport, type PublicClient } from 'viem'; +import { Chain, GetContractReturnType, Hex, HttpTransport, PublicClient } from 'viem'; import { decodeEventLog, toFunctionSelector } from 'viem/utils'; import { publicDeployAccounts, setup } from './fixtures/utils.js'; diff --git a/yarn-project/end-to-end/src/e2e_public_to_private_messaging.test.ts b/yarn-project/end-to-end/src/e2e_public_to_private_messaging.test.ts index cd2eaccf9153..0b67d07c67df 100644 --- a/yarn-project/end-to-end/src/e2e_public_to_private_messaging.test.ts +++ b/yarn-project/end-to-end/src/e2e_public_to_private_messaging.test.ts @@ -1,4 +1,4 @@ -import { type AztecAddress, type DebugLogger, type EthAddress } from '@aztec/aztec.js'; +import { AztecAddress, DebugLogger, EthAddress } from '@aztec/aztec.js'; import { setup } from './fixtures/utils.js'; import { CrossChainTestHarness } from './shared/cross_chain_test_harness.js'; diff --git a/yarn-project/end-to-end/src/e2e_sandbox_example.test.ts b/yarn-project/end-to-end/src/e2e_sandbox_example.test.ts index 24b602ea7bcc..a3c5867d4031 100644 --- a/yarn-project/end-to-end/src/e2e_sandbox_example.test.ts +++ b/yarn-project/end-to-end/src/e2e_sandbox_example.test.ts @@ -6,7 +6,7 @@ import { Fr, GrumpkinScalar, Note, - type PXE, + PXE, computeMessageSecretHash, createDebugLogger, createPXEClient, diff --git a/yarn-project/end-to-end/src/e2e_slow_tree.test.ts b/yarn-project/end-to-end/src/e2e_slow_tree.test.ts index b776ed3d3e3f..4e4d1c80f79c 100644 --- a/yarn-project/end-to-end/src/e2e_slow_tree.test.ts +++ b/yarn-project/end-to-end/src/e2e_slow_tree.test.ts @@ -1,5 +1,5 @@ /* eslint-disable camelcase */ -import { type CheatCodes, type DebugLogger, Fr, type Wallet } from '@aztec/aztec.js'; +import { CheatCodes, DebugLogger, Fr, Wallet } from '@aztec/aztec.js'; import { openTmpStore } from '@aztec/kv-store/utils'; import { Pedersen, SparseTree, newTree } from '@aztec/merkle-tree'; import { SlowTreeContract } from '@aztec/noir-contracts.js/SlowTree'; diff --git a/yarn-project/end-to-end/src/e2e_state_vars.test.ts b/yarn-project/end-to-end/src/e2e_state_vars.test.ts index 5e3f441ff2b0..8aebff157522 100644 --- a/yarn-project/end-to-end/src/e2e_state_vars.test.ts +++ b/yarn-project/end-to-end/src/e2e_state_vars.test.ts @@ -1,4 +1,4 @@ -import { type Wallet } from '@aztec/aztec.js'; +import { Wallet } from '@aztec/aztec.js'; import { DocsExampleContract } from '@aztec/noir-contracts.js'; import { setup } from './fixtures/utils.js'; 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 839e1628acc2..b51892a656c6 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 Wallet } from '@aztec/aztec.js'; +import { Wallet } from '@aztec/aztec.js'; import { ChildContract, ParentContract } from '@aztec/noir-contracts.js'; import { setup } from './fixtures/utils.js'; diff --git a/yarn-project/end-to-end/src/e2e_token_contract.test.ts b/yarn-project/end-to-end/src/e2e_token_contract.test.ts index 91f534a68eb4..d1f01897e01a 100644 --- a/yarn-project/end-to-end/src/e2e_token_contract.test.ts +++ b/yarn-project/end-to-end/src/e2e_token_contract.test.ts @@ -1,12 +1,12 @@ import { - type AccountWallet, - type CompleteAddress, - type DebugLogger, + AccountWallet, + CompleteAddress, + DebugLogger, ExtendedNote, Fr, FunctionSelector, Note, - type TxHash, + TxHash, computeAuthWitMessageHash, computeMessageSecretHash, } from '@aztec/aztec.js'; diff --git a/yarn-project/end-to-end/src/fixtures/utils.ts b/yarn-project/end-to-end/src/fixtures/utils.ts index 8210145c2238..463ddbe28d5f 100644 --- a/yarn-project/end-to-end/src/fixtures/utils.ts +++ b/yarn-project/end-to-end/src/fixtures/utils.ts @@ -1,24 +1,24 @@ import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr'; import { createAccounts, getDeployedTestAccountsWallets } from '@aztec/accounts/testing'; -import { type AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node'; +import { AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node'; import { - type AccountWalletWithPrivateKey, - type AztecAddress, - type AztecNode, + AccountWalletWithPrivateKey, + AztecAddress, + AztecNode, BatchCall, CheatCodes, - type CompleteAddress, - type ContractMethod, - type DebugLogger, - type DeployL1Contracts, + CompleteAddress, + ContractMethod, + DebugLogger, + DeployL1Contracts, EncryptedL2BlockL2Logs, EthCheatCodes, - type L1ContractArtifactsForDeployment, + L1ContractArtifactsForDeployment, LogType, - type PXE, - type SentTx, + PXE, + SentTx, SignerlessWallet, - type Wallet, + Wallet, createAztecNodeClient, createDebugLogger, createPXEClient, @@ -47,17 +47,17 @@ import { RollupBytecode, } from '@aztec/l1-artifacts'; import { getCanonicalGasToken, getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token'; -import { PXEService, type PXEServiceConfig, createPXEService, getPXEServiceConfig } from '@aztec/pxe'; -import { type SequencerClient } from '@aztec/sequencer-client'; +import { PXEService, PXEServiceConfig, createPXEService, getPXEServiceConfig } from '@aztec/pxe'; +import { SequencerClient } from '@aztec/sequencer-client'; import * as fs from 'fs/promises'; import * as path from 'path'; import { - type Account, - type Chain, - type HDAccount, - type HttpTransport, - type PrivateKeyAccount, + Account, + Chain, + HDAccount, + HttpTransport, + PrivateKeyAccount, createPublicClient, createWalletClient, getContract, diff --git a/yarn-project/end-to-end/src/guides/dapp_testing.test.ts b/yarn-project/end-to-end/src/guides/dapp_testing.test.ts index 16074a7e3069..32910fade34f 100644 --- a/yarn-project/end-to-end/src/guides/dapp_testing.test.ts +++ b/yarn-project/end-to-end/src/guides/dapp_testing.test.ts @@ -1,11 +1,11 @@ import { createAccount, getDeployedTestAccountsWallets } from '@aztec/accounts/testing'; import { - type AccountWallet, + AccountWallet, CheatCodes, ExtendedNote, Fr, Note, - type PXE, + PXE, TxStatus, computeMessageSecretHash, createPXEClient, diff --git a/yarn-project/end-to-end/src/guides/writing_an_account_contract.test.ts b/yarn-project/end-to-end/src/guides/writing_an_account_contract.test.ts index 8309946d1f5b..604f5edf9204 100644 --- a/yarn-project/end-to-end/src/guides/writing_an_account_contract.test.ts +++ b/yarn-project/end-to-end/src/guides/writing_an_account_contract.test.ts @@ -2,11 +2,11 @@ import { DefaultAccountContract } from '@aztec/accounts/defaults'; import { AccountManager, AuthWitness, - type AuthWitnessProvider, - type CompleteAddress, + AuthWitnessProvider, + CompleteAddress, ExtendedNote, Fr, - type GrumpkinPrivateKey, + GrumpkinPrivateKey, GrumpkinScalar, Note, Schnorr, diff --git a/yarn-project/end-to-end/src/integration_l1_publisher.test.ts b/yarn-project/end-to-end/src/integration_l1_publisher.test.ts index 8cd75292f5d4..050cf0da6bf7 100644 --- a/yarn-project/end-to-end/src/integration_l1_publisher.test.ts +++ b/yarn-project/end-to-end/src/integration_l1_publisher.test.ts @@ -1,25 +1,16 @@ -import { type ArchiveSource } from '@aztec/archiver'; +import { ArchiveSource } from '@aztec/archiver'; import { getConfigEnvVars } from '@aztec/aztec-node'; -import { - AztecAddress, - Body, - Fr, - GlobalVariables, - L2Actor, - type L2Block, - createDebugLogger, - mockTx, -} from '@aztec/aztec.js'; +import { AztecAddress, Body, Fr, GlobalVariables, L2Actor, L2Block, createDebugLogger, mockTx } from '@aztec/aztec.js'; // eslint-disable-next-line no-restricted-imports import { - type ProcessedTx, - type ProvingSuccess, + ProcessedTx, + ProvingSuccess, makeEmptyProcessedTx as makeEmptyProcessedTxFromHistoricalTreeRoots, makeProcessedTx, } from '@aztec/circuit-types'; import { EthAddress, - type Header, + Header, MAX_NEW_L2_TO_L1_MSGS_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, MAX_REVERTIBLE_NOTE_HASHES_PER_TX, @@ -31,34 +22,34 @@ import { SideEffectLinkedToNoteHash, } from '@aztec/circuits.js'; import { fr, makeNewSideEffect, makeNewSideEffectLinkedToNoteHash, makeProof } from '@aztec/circuits.js/testing'; -import { type L1ContractAddresses, createEthereumChain } from '@aztec/ethereum'; +import { L1ContractAddresses, createEthereumChain } from '@aztec/ethereum'; import { makeTuple, range } from '@aztec/foundation/array'; import { openTmpStore } from '@aztec/kv-store/utils'; import { AvailabilityOracleAbi, InboxAbi, OutboxAbi, RollupAbi } from '@aztec/l1-artifacts'; import { SHA256Trunc, StandardTree } from '@aztec/merkle-tree'; import { TxProver } from '@aztec/prover-client'; -import { type L1Publisher, getL1Publisher } from '@aztec/sequencer-client'; +import { L1Publisher, getL1Publisher } from '@aztec/sequencer-client'; import { WASMSimulator } from '@aztec/simulator'; -import { MerkleTrees, ServerWorldStateSynchronizer, type WorldStateConfig } from '@aztec/world-state'; +import { MerkleTrees, ServerWorldStateSynchronizer, WorldStateConfig } from '@aztec/world-state'; import { beforeEach, describe, expect, it } from '@jest/globals'; import * as fs from 'fs'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; import { - type Account, - type Address, - type Chain, - type GetContractReturnType, - type HttpTransport, - type PublicClient, - type WalletClient, + Account, + Address, + Chain, + GetContractReturnType, + HttpTransport, + PublicClient, + WalletClient, decodeEventLog, encodeFunctionData, getAbiItem, getAddress, getContract, } from 'viem'; -import { type PrivateKeyAccount, privateKeyToAccount } from 'viem/accounts'; +import { PrivateKeyAccount, privateKeyToAccount } from 'viem/accounts'; import { setupL1Contracts } from './fixtures/utils.js'; diff --git a/yarn-project/end-to-end/src/shared/browser.ts b/yarn-project/end-to-end/src/shared/browser.ts index 81d4725cf103..3f67c743f684 100644 --- a/yarn-project/end-to-end/src/shared/browser.ts +++ b/yarn-project/end-to-end/src/shared/browser.ts @@ -1,16 +1,16 @@ /* eslint-disable no-console */ -import type * as AztecAccountsSchnorr from '@aztec/accounts/schnorr'; -import type * as AztecAccountsSingleKey from '@aztec/accounts/single_key'; -import type * as AztecAccountsTesting from '@aztec/accounts/testing'; +import * as AztecAccountsSchnorr from '@aztec/accounts/schnorr'; +import * as AztecAccountsSingleKey from '@aztec/accounts/single_key'; +import * as AztecAccountsTesting from '@aztec/accounts/testing'; import * as AztecJs from '@aztec/aztec.js'; import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token'; import { contractArtifactToBuffer } from '@aztec/types/abi'; -import { type Server } from 'http'; +import { Server } from 'http'; import Koa from 'koa'; import serve from 'koa-static'; import path, { dirname } from 'path'; -import { type Browser, type Page, launch } from 'puppeteer'; +import { Browser, Page, launch } from 'puppeteer'; declare global { /** diff --git a/yarn-project/end-to-end/src/shared/cli.ts b/yarn-project/end-to-end/src/shared/cli.ts index 032a348eaf5e..9c47e30398ce 100644 --- a/yarn-project/end-to-end/src/shared/cli.ts +++ b/yarn-project/end-to-end/src/shared/cli.ts @@ -1,11 +1,4 @@ -import { - AztecAddress, - type CompleteAddress, - type DebugLogger, - Fr, - type PXE, - computeMessageSecretHash, -} from '@aztec/aztec.js'; +import { AztecAddress, CompleteAddress, DebugLogger, Fr, PXE, computeMessageSecretHash } from '@aztec/aztec.js'; import { getProgram } from '@aztec/cli'; import stringArgv from 'string-argv'; 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 603560339c81..89f8778ae5f6 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 @@ -1,18 +1,18 @@ // docs:start:cross_chain_test_harness import { - type AztecAddress, - type AztecNode, - type DebugLogger, + AztecAddress, + AztecNode, + DebugLogger, EthAddress, ExtendedNote, - type FieldsOf, + FieldsOf, Fr, Note, - type PXE, - type SiblingPath, - type TxHash, - type TxReceipt, - type Wallet, + PXE, + SiblingPath, + TxHash, + TxReceipt, + Wallet, computeMessageSecretHash, deployL1Contract, retryUntil, @@ -30,12 +30,12 @@ import { TokenContract } from '@aztec/noir-contracts.js/Token'; import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge'; import { - type Account, - type Chain, - type GetContractReturnType, - type HttpTransport, - type PublicClient, - type WalletClient, + Account, + Chain, + GetContractReturnType, + HttpTransport, + PublicClient, + WalletClient, getContract, toFunctionSelector, } from 'viem'; 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 9e7bb4d740e4..ef5140df02fa 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 @@ -1,25 +1,9 @@ -import { - type AztecAddress, - type DebugLogger, - EthAddress, - Fr, - type PXE, - type Wallet, - computeMessageSecretHash, -} from '@aztec/aztec.js'; +import { AztecAddress, DebugLogger, EthAddress, Fr, PXE, Wallet, computeMessageSecretHash } from '@aztec/aztec.js'; import { GasPortalAbi, OutboxAbi, PortalERC20Abi } from '@aztec/l1-artifacts'; import { GasTokenContract } from '@aztec/noir-contracts.js'; import { getCanonicalGasToken, getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token'; -import { - type Account, - type Chain, - type GetContractReturnType, - type HttpTransport, - type PublicClient, - type WalletClient, - getContract, -} from 'viem'; +import { Account, Chain, GetContractReturnType, HttpTransport, PublicClient, WalletClient, getContract } from 'viem'; export interface IGasBridgingTestHarness { bridgeFromL1ToL2(l1TokenBalance: bigint, bridgeAmount: bigint, owner: AztecAddress): Promise; diff --git a/yarn-project/end-to-end/src/shared/uniswap_l1_l2.ts b/yarn-project/end-to-end/src/shared/uniswap_l1_l2.ts index a5cd9744075e..865b0cb9cd45 100644 --- a/yarn-project/end-to-end/src/shared/uniswap_l1_l2.ts +++ b/yarn-project/end-to-end/src/shared/uniswap_l1_l2.ts @@ -1,11 +1,11 @@ import { - type AccountWallet, + AccountWallet, AztecAddress, - type AztecNode, - type DebugLogger, + AztecNode, + DebugLogger, EthAddress, Fr, - type PXE, + PXE, computeAuthWitMessageHash, } from '@aztec/aztec.js'; import { deployL1Contract } from '@aztec/ethereum'; @@ -15,12 +15,12 @@ import { UniswapContract } from '@aztec/noir-contracts.js/Uniswap'; import { jest } from '@jest/globals'; import { - type Account, - type Chain, - type GetContractReturnType, - type HttpTransport, - type PublicClient, - type WalletClient, + Account, + Chain, + GetContractReturnType, + HttpTransport, + PublicClient, + WalletClient, decodeEventLog, getContract, parseEther, 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 2d5c2f344a01..48bd93fcd151 100644 --- a/yarn-project/end-to-end/src/simulators/lending_simulator.ts +++ b/yarn-project/end-to-end/src/simulators/lending_simulator.ts @@ -1,9 +1,9 @@ // Convenience struct to hold an account's address and secret that can easily be passed around. -import { type AztecAddress, type CheatCodes, Fr } from '@aztec/aztec.js'; +import { AztecAddress, CheatCodes, Fr } from '@aztec/aztec.js'; import { pedersenHash } from '@aztec/foundation/crypto'; -import { type LendingContract } from '@aztec/noir-contracts.js/Lending'; +import { LendingContract } from '@aztec/noir-contracts.js/Lending'; -import { type TokenSimulator } from './token_simulator.js'; +import { 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 9a5a1938165a..686cec91cc56 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, type DebugLogger } from '@aztec/aztec.js'; -import { type TokenContract } from '@aztec/noir-contracts.js/Token'; +import { AztecAddress, DebugLogger } from '@aztec/aztec.js'; +import { TokenContract } from '@aztec/noir-contracts.js/Token'; export class TokenSimulator { private balancesPrivate: Map = new Map(); diff --git a/yarn-project/end-to-end/src/uniswap_trade_on_l1_from_l2.test.ts b/yarn-project/end-to-end/src/uniswap_trade_on_l1_from_l2.test.ts index f4bf1b92efd7..461e8307020d 100644 --- a/yarn-project/end-to-end/src/uniswap_trade_on_l1_from_l2.test.ts +++ b/yarn-project/end-to-end/src/uniswap_trade_on_l1_from_l2.test.ts @@ -1,5 +1,5 @@ import { setup as e2eSetup } from './fixtures/utils.js'; -import { type UniswapSetupContext, uniswapL1L2TestSuite } from './shared/uniswap_l1_l2.js'; +import { UniswapSetupContext, uniswapL1L2TestSuite } from './shared/uniswap_l1_l2.js'; // This tests works on forked mainnet. There is a dump of the data in `dumpedState` such that we // don't need to burn through RPC requests. diff --git a/yarn-project/entrypoints/src/account_entrypoint.ts b/yarn-project/entrypoints/src/account_entrypoint.ts index acc3c011e4e6..e855e48324f9 100644 --- a/yarn-project/entrypoints/src/account_entrypoint.ts +++ b/yarn-project/entrypoints/src/account_entrypoint.ts @@ -1,8 +1,8 @@ -import { type AuthWitnessProvider } from '@aztec/aztec.js/account'; -import { type EntrypointInterface, type FeeOptions } from '@aztec/aztec.js/entrypoint'; -import { type FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types'; -import { type AztecAddress, FunctionData, GeneratorIndex, TxContext } from '@aztec/circuits.js'; -import { type FunctionAbi, encodeArguments } from '@aztec/foundation/abi'; +import { AuthWitnessProvider } from '@aztec/aztec.js/account'; +import { EntrypointInterface, FeeOptions } from '@aztec/aztec.js/entrypoint'; +import { FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types'; +import { AztecAddress, FunctionData, GeneratorIndex, TxContext } from '@aztec/circuits.js'; +import { FunctionAbi, encodeArguments } from '@aztec/foundation/abi'; import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.js'; import { buildAppPayload, buildFeePayload, hashPayload } from './entrypoint_payload.js'; diff --git a/yarn-project/entrypoints/src/dapp_entrypoint.ts b/yarn-project/entrypoints/src/dapp_entrypoint.ts index 67e41819e681..5e851d59f441 100644 --- a/yarn-project/entrypoints/src/dapp_entrypoint.ts +++ b/yarn-project/entrypoints/src/dapp_entrypoint.ts @@ -1,9 +1,9 @@ import { computeInnerAuthWitHash, computeOuterAuthWitHash } from '@aztec/aztec.js'; -import { type AuthWitnessProvider } from '@aztec/aztec.js/account'; -import { type EntrypointInterface } from '@aztec/aztec.js/entrypoint'; -import { type FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types'; -import { type AztecAddress, Fr, FunctionData, TxContext } from '@aztec/circuits.js'; -import { type FunctionAbi, encodeArguments } from '@aztec/foundation/abi'; +import { AuthWitnessProvider } from '@aztec/aztec.js/account'; +import { EntrypointInterface } from '@aztec/aztec.js/entrypoint'; +import { FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types'; +import { AztecAddress, Fr, FunctionData, TxContext } from '@aztec/circuits.js'; +import { FunctionAbi, encodeArguments } from '@aztec/foundation/abi'; import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.js'; import { buildDappPayload } from './entrypoint_payload.js'; diff --git a/yarn-project/entrypoints/src/entrypoint_payload.ts b/yarn-project/entrypoints/src/entrypoint_payload.ts index 894dcdc4f5e3..c76d20e70dbb 100644 --- a/yarn-project/entrypoints/src/entrypoint_payload.ts +++ b/yarn-project/entrypoints/src/entrypoint_payload.ts @@ -1,7 +1,7 @@ -import { type FeeOptions } from '@aztec/aztec.js/entrypoint'; +import { FeeOptions } from '@aztec/aztec.js/entrypoint'; import { Fr } from '@aztec/aztec.js/fields'; -import { type FunctionCall, PackedArguments, emptyFunctionCall } from '@aztec/circuit-types'; -import { type AztecAddress } from '@aztec/circuits.js'; +import { FunctionCall, PackedArguments, emptyFunctionCall } from '@aztec/circuit-types'; +import { AztecAddress } from '@aztec/circuits.js'; import { padArrayEnd } from '@aztec/foundation/collection'; import { pedersenHash } from '@aztec/foundation/crypto'; diff --git a/yarn-project/entrypoints/src/multi_call_entrypoint.ts b/yarn-project/entrypoints/src/multi_call_entrypoint.ts index 86e3d82e0eab..594313438782 100644 --- a/yarn-project/entrypoints/src/multi_call_entrypoint.ts +++ b/yarn-project/entrypoints/src/multi_call_entrypoint.ts @@ -1,7 +1,7 @@ -import { type EntrypointInterface } from '@aztec/aztec.js/entrypoint'; -import { type FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types'; -import { type AztecAddress, FunctionData, TxContext } from '@aztec/circuits.js'; -import { type FunctionAbi, encodeArguments } from '@aztec/foundation/abi'; +import { EntrypointInterface } from '@aztec/aztec.js/entrypoint'; +import { FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types'; +import { AztecAddress, FunctionData, TxContext } from '@aztec/circuits.js'; +import { FunctionAbi, encodeArguments } from '@aztec/foundation/abi'; import { getCanonicalMultiCallEntrypointAddress } from '@aztec/protocol-contracts/multi-call-entrypoint'; import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.js'; diff --git a/yarn-project/ethereum/src/constants.ts b/yarn-project/ethereum/src/constants.ts index 92e0b01c9d3c..fa71f161b2ac 100644 --- a/yarn-project/ethereum/src/constants.ts +++ b/yarn-project/ethereum/src/constants.ts @@ -1,3 +1,3 @@ -import { type Hex } from 'viem'; +import { Hex } from 'viem'; export const NULL_KEY: Hex = `0x${'0000000000000000000000000000000000000000000000000000000000000000'}`; diff --git a/yarn-project/ethereum/src/deploy_l1_contracts.ts b/yarn-project/ethereum/src/deploy_l1_contracts.ts index 6df49139bd92..7fb7939056ea 100644 --- a/yarn-project/ethereum/src/deploy_l1_contracts.ts +++ b/yarn-project/ethereum/src/deploy_l1_contracts.ts @@ -1,23 +1,23 @@ import { EthAddress } from '@aztec/foundation/eth-address'; -import { type DebugLogger } from '@aztec/foundation/log'; +import { DebugLogger } from '@aztec/foundation/log'; import type { Abi, Narrow } from 'abitype'; import { - type Account, - type Chain, - type Hex, - type HttpTransport, - type PublicClient, - type WalletClient, + Account, + Chain, + Hex, + HttpTransport, + PublicClient, + WalletClient, createPublicClient, createWalletClient, getAddress, getContract, http, } from 'viem'; -import { type HDAccount, type PrivateKeyAccount } from 'viem/accounts'; +import { HDAccount, PrivateKeyAccount } from 'viem/accounts'; -import { type L1ContractAddresses } from './l1_contract_addresses.js'; +import { L1ContractAddresses } from './l1_contract_addresses.js'; /** * Return type of the deployL1Contract function. diff --git a/yarn-project/ethereum/src/ethereum_chain.ts b/yarn-project/ethereum/src/ethereum_chain.ts index 0f8d401a01d5..91d66239a005 100644 --- a/yarn-project/ethereum/src/ethereum_chain.ts +++ b/yarn-project/ethereum/src/ethereum_chain.ts @@ -1,4 +1,4 @@ -import { type Chain } from 'viem'; +import { Chain } from 'viem'; /** * Interface containing the connection and chain properties to interact with a blockchain. diff --git a/yarn-project/ethereum/src/index.ts b/yarn-project/ethereum/src/index.ts index 8ef2db852366..6765234a136c 100644 --- a/yarn-project/ethereum/src/index.ts +++ b/yarn-project/ethereum/src/index.ts @@ -1,6 +1,6 @@ import { foundry } from 'viem/chains'; -import { type EthereumChain } from './ethereum_chain.js'; +import { EthereumChain } from './ethereum_chain.js'; import { createTestnetChain } from './testnet.js'; export * from './testnet.js'; diff --git a/yarn-project/ethereum/src/l1_contract_addresses.ts b/yarn-project/ethereum/src/l1_contract_addresses.ts index bcbcddbc260b..ff4e4c6a3738 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 EthAddress } from '@aztec/foundation/eth-address'; +import { EthAddress } from '@aztec/foundation/eth-address'; export const l1ContractsNames = [ 'availabilityOracleAddress', diff --git a/yarn-project/ethereum/src/testnet.ts b/yarn-project/ethereum/src/testnet.ts index c6e28871a3ef..074e73ef096c 100644 --- a/yarn-project/ethereum/src/testnet.ts +++ b/yarn-project/ethereum/src/testnet.ts @@ -1,6 +1,6 @@ -import { type Chain } from 'viem'; +import { Chain } from 'viem'; -import { type EthereumChain } from './ethereum_chain.js'; +import { EthereumChain } from './ethereum_chain.js'; const { DEPLOY_TAG = 'aztec-dev', CHAIN_ID = 31337 } = process.env; diff --git a/yarn-project/foundation/.eslintrc.cjs b/yarn-project/foundation/.eslintrc.cjs index ec3bcb348b7b..daa6e7a51ebd 100644 --- a/yarn-project/foundation/.eslintrc.cjs +++ b/yarn-project/foundation/.eslintrc.cjs @@ -41,7 +41,6 @@ module.exports = { '@typescript-eslint/await-thenable': 'error', '@typescript-eslint/no-floating-promises': 2, '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_', varsIgnorePattern: '^_' }], - '@typescript-eslint/consistent-type-imports': ['error', { fixStyle: 'inline-type-imports' }], 'require-await': 2, 'no-console': 'error', 'no-constant-condition': 'off', diff --git a/yarn-project/foundation/src/abi/abi.test.ts b/yarn-project/foundation/src/abi/abi.test.ts index b7b1334e4325..afa4d484e6b0 100644 --- a/yarn-project/foundation/src/abi/abi.test.ts +++ b/yarn-project/foundation/src/abi/abi.test.ts @@ -1,10 +1,4 @@ -import { - type ContractArtifact, - type FunctionArtifact, - FunctionType, - getDefaultInitializer, - getInitializer, -} from './abi.js'; +import { ContractArtifact, FunctionArtifact, FunctionType, getDefaultInitializer, getInitializer } from './abi.js'; describe('abi', () => { describe('getDefaultInitializer', () => { diff --git a/yarn-project/foundation/src/abi/decoder.test.ts b/yarn-project/foundation/src/abi/decoder.test.ts index 717f3b38dde3..7cefecf772b9 100644 --- a/yarn-project/foundation/src/abi/decoder.test.ts +++ b/yarn-project/foundation/src/abi/decoder.test.ts @@ -1,4 +1,4 @@ -import { type ABIParameterVisibility, type FunctionArtifact } from './abi.js'; +import { ABIParameterVisibility, FunctionArtifact } from './abi.js'; import { decodeFunctionSignature, decodeFunctionSignatureWithParameterNames } from './decoder.js'; describe('abi/decoder', () => { diff --git a/yarn-project/foundation/src/abi/decoder.ts b/yarn-project/foundation/src/abi/decoder.ts index a65f52925ea3..e1f4558afa20 100644 --- a/yarn-project/foundation/src/abi/decoder.ts +++ b/yarn-project/foundation/src/abi/decoder.ts @@ -1,6 +1,6 @@ import { AztecAddress } from '../aztec-address/index.js'; -import { type Fr } from '../fields/index.js'; -import { type ABIParameter, type ABIType, type ABIVariable, type FunctionArtifact } from './abi.js'; +import { Fr } from '../fields/index.js'; +import { ABIParameter, type ABIType, ABIVariable, FunctionArtifact } from './abi.js'; import { isAztecAddressStruct } from './utils.js'; /** diff --git a/yarn-project/foundation/src/abi/encoder.test.ts b/yarn-project/foundation/src/abi/encoder.test.ts index f78e1325dfd9..a234bc04758c 100644 --- a/yarn-project/foundation/src/abi/encoder.test.ts +++ b/yarn-project/foundation/src/abi/encoder.test.ts @@ -1,7 +1,7 @@ import { AztecAddress } from '../aztec-address/index.js'; import { Fr } from '../fields/fields.js'; import { Point } from '../fields/point.js'; -import { ABIParameterVisibility, type FunctionAbi, FunctionType } from './abi.js'; +import { ABIParameterVisibility, FunctionAbi, FunctionType } from './abi.js'; import { encodeArguments } from './encoder.js'; describe('abi/encoder', () => { diff --git a/yarn-project/foundation/src/abi/encoder.ts b/yarn-project/foundation/src/abi/encoder.ts index 7ca7260db684..59fc8deb7494 100644 --- a/yarn-project/foundation/src/abi/encoder.ts +++ b/yarn-project/foundation/src/abi/encoder.ts @@ -1,5 +1,5 @@ import { Fr } from '../fields/index.js'; -import { type ABIType, type FunctionAbi } from './abi.js'; +import { ABIType, FunctionAbi } from './abi.js'; import { isAddressStruct, isFunctionSelectorStruct, isWrappedFieldStruct } from './utils.js'; /** diff --git a/yarn-project/foundation/src/abi/event_selector.ts b/yarn-project/foundation/src/abi/event_selector.ts index f9fa0a5b05e0..48779aabad65 100644 --- a/yarn-project/foundation/src/abi/event_selector.ts +++ b/yarn-project/foundation/src/abi/event_selector.ts @@ -1,6 +1,6 @@ import { fromHex, toBigIntBE } from '../bigint-buffer/index.js'; import { keccak, randomBytes } from '../crypto/index.js'; -import { type Fr } from '../fields/fields.js'; +import { Fr } from '../fields/fields.js'; import { BufferReader } from '../serialize/buffer_reader.js'; import { Selector } from './selector.js'; diff --git a/yarn-project/foundation/src/abi/function_selector.ts b/yarn-project/foundation/src/abi/function_selector.ts index 3c71482a6a03..9ffcc9588833 100644 --- a/yarn-project/foundation/src/abi/function_selector.ts +++ b/yarn-project/foundation/src/abi/function_selector.ts @@ -1,9 +1,9 @@ import { fromHex, toBigIntBE } from '../bigint-buffer/index.js'; import { keccak, randomBytes } from '../crypto/index.js'; -import { type Fr } from '../fields/fields.js'; +import { Fr } from '../fields/fields.js'; import { BufferReader } from '../serialize/buffer_reader.js'; import { FieldReader } from '../serialize/field_reader.js'; -import { type ABIParameter } from './abi.js'; +import { ABIParameter } from './abi.js'; import { decodeFunctionSignature } from './decoder.js'; import { Selector } from './selector.js'; diff --git a/yarn-project/foundation/src/array/array.ts b/yarn-project/foundation/src/array/array.ts index 4821aa45f8d2..97af4818fffe 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 { Tuple } from '../serialize/index.js'; export type { FieldsOf } from '../types/index.js'; diff --git a/yarn-project/foundation/src/aztec-address/index.ts b/yarn-project/foundation/src/aztec-address/index.ts index c932c10cdaa4..ea1407b9eaa0 100644 --- a/yarn-project/foundation/src/aztec-address/index.ts +++ b/yarn-project/foundation/src/aztec-address/index.ts @@ -1,7 +1,7 @@ import { inspect } from 'util'; import { Fr, fromBuffer } from '../fields/index.js'; -import { type BufferReader, FieldReader } from '../serialize/index.js'; +import { BufferReader, FieldReader } from '../serialize/index.js'; /** * AztecAddress represents a 32-byte address in the Aztec Protocol. diff --git a/yarn-project/foundation/src/collection/array.ts b/yarn-project/foundation/src/collection/array.ts index 3a397db8b501..4ec479470e8c 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 { 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/crypto/pedersen/pedersen.wasm.ts b/yarn-project/foundation/src/crypto/pedersen/pedersen.wasm.ts index 29fc82dcac3e..c7a90507001c 100644 --- a/yarn-project/foundation/src/crypto/pedersen/pedersen.wasm.ts +++ b/yarn-project/foundation/src/crypto/pedersen/pedersen.wasm.ts @@ -1,7 +1,7 @@ import { BarretenbergSync, Fr as FrBarretenberg } from '@aztec/bb.js'; import { Fr } from '../../fields/fields.js'; -import { type Bufferable, serializeToBufferArray } from '../../serialize/serialize.js'; +import { Bufferable, serializeToBufferArray } from '../../serialize/serialize.js'; /** * Create a pedersen commitment (point) from an array of input fields. diff --git a/yarn-project/foundation/src/crypto/sha256/index.ts b/yarn-project/foundation/src/crypto/sha256/index.ts index 1ff89efda47b..6b9676f39133 100644 --- a/yarn-project/foundation/src/crypto/sha256/index.ts +++ b/yarn-project/foundation/src/crypto/sha256/index.ts @@ -2,7 +2,7 @@ import { default as hash } from 'hash.js'; import { Fr } from '../../fields/fields.js'; import { truncateAndPad } from '../../serialize/free_funcs.js'; -import { type Bufferable, serializeToBuffer } from '../../serialize/serialize.js'; +import { Bufferable, serializeToBuffer } from '../../serialize/serialize.js'; export const sha256 = (data: Buffer) => Buffer.from(hash.sha256().update(data).digest()); diff --git a/yarn-project/foundation/src/fields/coordinate.ts b/yarn-project/foundation/src/fields/coordinate.ts index a8fad0b12d6d..be9d4ec39b9e 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 { Tuple } from '../serialize/types.js'; import { Fr } from './fields.js'; /** diff --git a/yarn-project/foundation/src/json-rpc/client/json_rpc_client.ts b/yarn-project/foundation/src/json-rpc/client/json_rpc_client.ts index 46ab33f0da5f..1e0c69d25794 100644 --- a/yarn-project/foundation/src/json-rpc/client/json_rpc_client.ts +++ b/yarn-project/foundation/src/json-rpc/client/json_rpc_client.ts @@ -2,12 +2,12 @@ // Dev dependency just for the somewhat complex RemoteObject type // This takes a {foo(): T} and makes {foo(): Promise} // while avoiding Promise of Promise. -import { type RemoteObject } from 'comlink'; +import { RemoteObject } from 'comlink'; import { format } from 'util'; -import { type DebugLogger, createDebugLogger } from '../../log/index.js'; +import { DebugLogger, createDebugLogger } from '../../log/index.js'; import { NoRetryError, makeBackoff, retry } from '../../retry/index.js'; -import { ClassConverter, type JsonClassConverterInput, type StringClassConverterInput } from '../class_converter.js'; +import { ClassConverter, JsonClassConverterInput, StringClassConverterInput } from '../class_converter.js'; import { JsonStringify, convertFromJsonObj, convertToJsonObj } from '../convert.js'; export { JsonStringify } from '../convert.js'; diff --git a/yarn-project/foundation/src/json-rpc/convert.ts b/yarn-project/foundation/src/json-rpc/convert.ts index 7bdb85aa34b5..6de58f4fee80 100644 --- a/yarn-project/foundation/src/json-rpc/convert.ts +++ b/yarn-project/foundation/src/json-rpc/convert.ts @@ -1,7 +1,7 @@ import { Buffer } from 'buffer'; import cloneDeepWith from 'lodash.clonedeepwith'; -import { type ClassConverter } from './class_converter.js'; +import { ClassConverter } from './class_converter.js'; /** * Check prototype chain to determine if an object is 'plain' (not a class instance). diff --git a/yarn-project/foundation/src/json-rpc/server/json_proxy.ts b/yarn-project/foundation/src/json-rpc/server/json_proxy.ts index 47cc279a401a..b46a1983ada0 100644 --- a/yarn-project/foundation/src/json-rpc/server/json_proxy.ts +++ b/yarn-project/foundation/src/json-rpc/server/json_proxy.ts @@ -1,7 +1,7 @@ import { format } from 'util'; import { createDebugLogger } from '../../log/index.js'; -import { ClassConverter, type JsonClassConverterInput, type StringClassConverterInput } from '../class_converter.js'; +import { ClassConverter, JsonClassConverterInput, StringClassConverterInput } from '../class_converter.js'; import { convertFromJsonObj, convertToJsonObj } from '../convert.js'; import { assert, hasOwnProperty } from '../js_utils.js'; diff --git a/yarn-project/foundation/src/json-rpc/server/json_rpc_server.ts b/yarn-project/foundation/src/json-rpc/server/json_rpc_server.ts index 9c342805d091..bd2d537bc544 100644 --- a/yarn-project/foundation/src/json-rpc/server/json_rpc_server.ts +++ b/yarn-project/foundation/src/json-rpc/server/json_rpc_server.ts @@ -6,9 +6,9 @@ import compress from 'koa-compress'; import Router from 'koa-router'; import { createDebugLogger } from '../../log/index.js'; -import { type JsonClassConverterInput, type StringClassConverterInput } from '../class_converter.js'; +import { JsonClassConverterInput, StringClassConverterInput } from '../class_converter.js'; import { convertBigintsInObj } from '../convert.js'; -import { type ClassMaps, JsonProxy } from './json_proxy.js'; +import { ClassMaps, JsonProxy } from './json_proxy.js'; /** * JsonRpcServer. diff --git a/yarn-project/foundation/src/log/console.ts b/yarn-project/foundation/src/log/console.ts index dee595f96c75..4e13f7422367 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 { 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 aeef1993b45c..074df6356e95 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 { 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/logger.ts b/yarn-project/foundation/src/log/logger.ts index 2747618147d8..9c9998a98c48 100644 --- a/yarn-project/foundation/src/log/logger.ts +++ b/yarn-project/foundation/src/log/logger.ts @@ -2,7 +2,7 @@ import debug from 'debug'; import isNode from 'detect-node'; import { isatty } from 'tty'; -import { type LogData, type LogFn } from './log_fn.js'; +import { LogData, LogFn } from './log_fn.js'; // Matches a subset of Winston log levels const LogLevels = ['silent', 'error', 'warn', 'info', 'verbose', 'debug', 'trace'] as const; diff --git a/yarn-project/foundation/src/mutex/index.ts b/yarn-project/foundation/src/mutex/index.ts index e7b7fcac9685..a3bb6c1575ac 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 { 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..0c2eb485d895 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 { MutexDatabase } from './mutex_database.js'; /** * Sleep function for introducing a delay in the execution of code. diff --git a/yarn-project/foundation/src/serialize/buffer_reader.ts b/yarn-project/foundation/src/serialize/buffer_reader.ts index be1bf669a823..d3bb2e12beac 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 { 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 1c1242457b40..be3a06e72dd8 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 { Fq, Fr } from '../fields/fields.js'; +import { 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 144827a907fb..319112ebede8 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 { 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/transport/browser/message_port_socket.ts b/yarn-project/foundation/src/transport/browser/message_port_socket.ts index 2f5cde890136..d7b55435a151 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 { 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..68a344920048 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 { 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..779a21cd2249 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 { 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..c019477d2385 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 { 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..502f65c7a178 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 { 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..e4dba2498cbb 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 { TransferDescriptor, isTransferDescriptor } from '../interface/transferable.js'; +import { TransportClient } from '../transport_client.js'; +import { 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..af01fd19520d 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 { 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..d71b3ffb1a85 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 EventEmitter from 'events'; -import { type Socket } from './socket.js'; +import { 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..37524380ca4b 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 { Worker } from 'worker_threads'; -import { type Connector } from '../interface/connector.js'; +import { 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..11cbb7d129ea 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 { TransferListItem, Worker } from 'worker_threads'; -import { type Socket } from '../interface/socket.js'; +import { 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..447aec1f08ef 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 { 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..25ebc40738e1 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 { MessagePort, TransferListItem } from 'worker_threads'; -import { type Socket } from '../interface/socket.js'; +import { 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 5709e662edc8..3fb2fd836d53 100644 --- a/yarn-project/foundation/src/transport/transport_client.ts +++ b/yarn-project/foundation/src/transport/transport_client.ts @@ -2,9 +2,9 @@ import EventEmitter from 'events'; import { format } from 'util'; import { createDebugLogger } 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 { EventMessage, ResponseMessage, isEventMessage } from './dispatch/messages.js'; +import { Connector } from './interface/connector.js'; +import { Socket } from './interface/socket.js'; const debug = createDebugLogger('aztec:transport_client'); diff --git a/yarn-project/foundation/src/transport/transport_server.ts b/yarn-project/foundation/src/transport/transport_server.ts index 706215779b79..64732ab857ba 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 { RequestMessage, ResponseMessage } from './dispatch/messages.js'; +import { Listener } from './interface/listener.js'; +import { Socket } from './interface/socket.js'; import { isTransferDescriptor } from './interface/transferable.js'; /** diff --git a/yarn-project/foundation/src/wasm/wasm_module.ts b/yarn-project/foundation/src/wasm/wasm_module.ts index 20851a05cc65..db4e1da83c94 100644 --- a/yarn-project/foundation/src/wasm/wasm_module.ts +++ b/yarn-project/foundation/src/wasm/wasm_module.ts @@ -2,7 +2,7 @@ import { Buffer } from 'buffer'; import { randomBytes } from '../crypto/index.js'; import { MemoryFifo } from '../fifo/index.js'; -import { type LogFn, createDebugOnlyLogger } from '../log/index.js'; +import { LogFn, createDebugOnlyLogger } from '../log/index.js'; import { getEmptyWasiSdk } from './empty_wasi_sdk.js'; /** 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 06a59e22c3df..37683aea5506 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 { DispatchMsg, TransportServer, WorkerListener } from '../../transport/index.js'; +import { 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..6e5322a37238 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 levelup, { LevelUp } from 'levelup'; import memdown from 'memdown'; -import { type DataStore } from '../data_store.js'; +import { 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 7560c60852ef..a28d3fd7482e 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 { DispatchMsg, TransportClient, WorkerConnector, createDispatchProxy } from '../../transport/index.js'; import { WasmModule } from '../../wasm/index.js'; -import { type WasmWorker } from '../wasm_worker.js'; +import { 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..24bb39747bf9 100644 --- a/yarn-project/foundation/src/worker/node/node_data_store.ts +++ b/yarn-project/foundation/src/worker/node/node_data_store.ts @@ -1,8 +1,8 @@ import leveldown from 'leveldown'; -import levelup, { type LevelUp } from 'levelup'; +import levelup, { LevelUp } from 'levelup'; import memdown from 'memdown'; -import { type DataStore } from '../data_store.js'; +import { 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 bd4c8b096f3e..d297ed727bc0 100644 --- a/yarn-project/foundation/src/worker/node/node_worker.ts +++ b/yarn-project/foundation/src/worker/node/node_worker.ts @@ -1,8 +1,8 @@ import { Worker } from 'worker_threads'; -import { type DispatchMsg, NodeConnector, TransportClient, createDispatchProxy } from '../../transport/index.js'; +import { DispatchMsg, NodeConnector, TransportClient, createDispatchProxy } from '../../transport/index.js'; import { WasmModule } from '../../wasm/wasm_module.js'; -import { type WasmWorker } from '../wasm_worker.js'; +import { 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 ac445de19264..14f01cfb70d4 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 { DispatchMsg, NodeListener, TransportServer } from '../../transport/index.js'; +import { 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..a9dcb4a7ad27 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 { Proxify } from '../transport/index.js'; +import { 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 7e1534895860..b121f8f85c84 100644 --- a/yarn-project/foundation/src/worker/worker_pool.ts +++ b/yarn-project/foundation/src/worker/worker_pool.ts @@ -1,5 +1,5 @@ import { createDebugLogger } from '../log/index.js'; -import { type WasmWorker } from './wasm_worker.js'; +import { WasmWorker } from './wasm_worker.js'; const debug = createDebugLogger('bb:worker_pool'); diff --git a/yarn-project/key-store/src/key_pair.ts b/yarn-project/key-store/src/key_pair.ts index 0202652cbc0f..fc40b3974859 100644 --- a/yarn-project/key-store/src/key_pair.ts +++ b/yarn-project/key-store/src/key_pair.ts @@ -1,6 +1,6 @@ -import { type KeyPair, type PublicKey } from '@aztec/circuit-types'; -import { type GrumpkinPrivateKey, GrumpkinScalar } from '@aztec/circuits.js'; -import { type Grumpkin } from '@aztec/circuits.js/barretenberg'; +import { KeyPair, PublicKey } from '@aztec/circuit-types'; +import { GrumpkinPrivateKey, GrumpkinScalar } from '@aztec/circuits.js'; +import { Grumpkin } from '@aztec/circuits.js/barretenberg'; /** * The ConstantKeyPair class is an implementation of the KeyPair interface, which allows generation and management of diff --git a/yarn-project/key-store/src/test_key_store.ts b/yarn-project/key-store/src/test_key_store.ts index a5bfe3144b3f..f0bab98c51d6 100644 --- a/yarn-project/key-store/src/test_key_store.ts +++ b/yarn-project/key-store/src/test_key_store.ts @@ -1,15 +1,15 @@ -import { type KeyPair, type KeyStore, type PublicKey } from '@aztec/circuit-types'; +import { KeyPair, KeyStore, PublicKey } from '@aztec/circuit-types'; import { - type AztecAddress, - type GrumpkinPrivateKey, + AztecAddress, + GrumpkinPrivateKey, GrumpkinScalar, Point, computeNullifierSecretKey, computeSiloedNullifierSecretKey, derivePublicKey, } from '@aztec/circuits.js'; -import { type Grumpkin } from '@aztec/circuits.js/barretenberg'; -import { type AztecKVStore, type AztecMap } from '@aztec/kv-store'; +import { Grumpkin } from '@aztec/circuits.js/barretenberg'; +import { AztecKVStore, AztecMap } from '@aztec/kv-store'; import { ConstantKeyPair } from './key_pair.js'; diff --git a/yarn-project/kv-store/src/interfaces/counter.ts b/yarn-project/kv-store/src/interfaces/counter.ts index 67c8151ffbc8..0f68626e6911 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 { 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 d763254d31a0..0916146a4ab9 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 { Key, Range } from './common.js'; /** * A map backed by a persistent store. diff --git a/yarn-project/kv-store/src/interfaces/store.ts b/yarn-project/kv-store/src/interfaces/store.ts index 16962cf5695c..9b0f1c9364da 100644 --- a/yarn-project/kv-store/src/interfaces/store.ts +++ b/yarn-project/kv-store/src/interfaces/store.ts @@ -1,8 +1,8 @@ -import { type AztecArray } from './array.js'; -import { type Key } from './common.js'; -import { type AztecCounter } from './counter.js'; -import { type AztecMap, type AztecMultiMap } from './map.js'; -import { type AztecSingleton } from './singleton.js'; +import { AztecArray } from './array.js'; +import { Key } from './common.js'; +import { AztecCounter } from './counter.js'; +import { AztecMap, AztecMultiMap } from './map.js'; +import { AztecSingleton } from './singleton.js'; /** A key-value store */ export interface AztecKVStore { diff --git a/yarn-project/kv-store/src/lmdb/array.test.ts b/yarn-project/kv-store/src/lmdb/array.test.ts index 140d620a87d5..3058302e87f0 100644 --- a/yarn-project/kv-store/src/lmdb/array.test.ts +++ b/yarn-project/kv-store/src/lmdb/array.test.ts @@ -1,4 +1,4 @@ -import { type Database, open } from 'lmdb'; +import { Database, open } from 'lmdb'; import { LmdbAztecArray } from './array.js'; diff --git a/yarn-project/kv-store/src/lmdb/array.ts b/yarn-project/kv-store/src/lmdb/array.ts index 3ba338d028fa..1da3676aac03 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 { Database, Key } from 'lmdb'; -import { type AztecArray } from '../interfaces/array.js'; +import { AztecArray } 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.test.ts b/yarn-project/kv-store/src/lmdb/counter.test.ts index 36ac3e426799..df490811a4ee 100644 --- a/yarn-project/kv-store/src/lmdb/counter.test.ts +++ b/yarn-project/kv-store/src/lmdb/counter.test.ts @@ -1,6 +1,6 @@ import { randomBytes } from '@aztec/foundation/crypto'; -import { type Database, open } from 'lmdb'; +import { Database, open } from 'lmdb'; import { LmdbAztecCounter } from './counter.js'; diff --git a/yarn-project/kv-store/src/lmdb/counter.ts b/yarn-project/kv-store/src/lmdb/counter.ts index 26b60b624f06..74886e89dbf3 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 { Key as BaseKey, Database } from 'lmdb'; -import { type Key, type Range } from '../interfaces/common.js'; -import { type AztecCounter } from '../interfaces/counter.js'; +import { Key, Range } from '../interfaces/common.js'; +import { AztecCounter } from '../interfaces/counter.js'; import { LmdbAztecMap } from './map.js'; /** diff --git a/yarn-project/kv-store/src/lmdb/map.test.ts b/yarn-project/kv-store/src/lmdb/map.test.ts index 9195dbcfd39b..007b4c4eb8fa 100644 --- a/yarn-project/kv-store/src/lmdb/map.test.ts +++ b/yarn-project/kv-store/src/lmdb/map.test.ts @@ -1,4 +1,4 @@ -import { type Database, open } from 'lmdb'; +import { Database, open } from 'lmdb'; import { LmdbAztecMap } from './map.js'; diff --git a/yarn-project/kv-store/src/lmdb/map.ts b/yarn-project/kv-store/src/lmdb/map.ts index be303a7ffabd..6e5fa67ef1e1 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 { Database, RangeOptions } from 'lmdb'; -import { type Key, type Range } from '../interfaces/common.js'; -import { type AztecMultiMap } from '../interfaces/map.js'; +import { Key, Range } from '../interfaces/common.js'; +import { 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/singleton.ts b/yarn-project/kv-store/src/lmdb/singleton.ts index abeefec242cd..0fa4ffe69e45 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 { Database, Key } from 'lmdb'; -import { type AztecSingleton } from '../interfaces/singleton.js'; +import { 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 ef1c735ed32e..af949224e971 100644 --- a/yarn-project/kv-store/src/lmdb/store.ts +++ b/yarn-project/kv-store/src/lmdb/store.ts @@ -1,12 +1,12 @@ import { createDebugLogger } from '@aztec/foundation/log'; -import { type Database, type Key, type RootDatabase, open } from 'lmdb'; +import { Database, Key, RootDatabase, open } from 'lmdb'; -import { type AztecArray } from '../interfaces/array.js'; -import { type AztecCounter } from '../interfaces/counter.js'; -import { type AztecMap, type AztecMultiMap } from '../interfaces/map.js'; -import { type AztecSingleton } from '../interfaces/singleton.js'; -import { type AztecKVStore } from '../interfaces/store.js'; +import { AztecArray } from '../interfaces/array.js'; +import { AztecCounter } from '../interfaces/counter.js'; +import { AztecMap, AztecMultiMap } from '../interfaces/map.js'; +import { AztecSingleton } from '../interfaces/singleton.js'; +import { AztecKVStore } from '../interfaces/store.js'; import { LmdbAztecArray } from './array.js'; import { LmdbAztecCounter } from './counter.js'; import { LmdbAztecMap } from './map.js'; diff --git a/yarn-project/kv-store/src/utils.ts b/yarn-project/kv-store/src/utils.ts index d527e43a8b5c..e41297b9e825 100644 --- a/yarn-project/kv-store/src/utils.ts +++ b/yarn-project/kv-store/src/utils.ts @@ -1,7 +1,7 @@ -import { type EthAddress } from '@aztec/foundation/eth-address'; -import { type Logger } from '@aztec/foundation/log'; +import { EthAddress } from '@aztec/foundation/eth-address'; +import { Logger } from '@aztec/foundation/log'; -import { type AztecKVStore } from './interfaces/store.js'; +import { AztecKVStore } from './interfaces/store.js'; import { AztecLmdbStore } from './lmdb/store.js'; /** diff --git a/yarn-project/merkle-tree/src/hasher_with_stats.ts b/yarn-project/merkle-tree/src/hasher_with_stats.ts index 7c77e8cf3709..34d00d6b41ae 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/types/interfaces'; +import { Hasher } from '@aztec/types/interfaces'; 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..ba6d0ad983ba 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 { Bufferable } from '@aztec/foundation/serialize'; -import { type TreeSnapshot, type TreeSnapshotBuilder } from '../snapshots/snapshot_builder.js'; -import { type MerkleTree } from './merkle_tree.js'; +import { TreeSnapshot, TreeSnapshotBuilder } from '../snapshots/snapshot_builder.js'; +import { 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 3e7c1b64c5c3..44bd849479bc 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 SiblingPath } from '@aztec/circuit-types'; -import { type IndexedTreeLeaf, type IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import { SiblingPath } from '@aztec/circuit-types'; +import { IndexedTreeLeaf, IndexedTreeLeafPreimage } from '@aztec/foundation/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 { IndexedTreeSnapshot, TreeSnapshot, TreeSnapshotBuilder } from '../snapshots/snapshot_builder.js'; +import { AppendOnlyTree } from './append_only_tree.js'; +import { 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 44fd8c4d4d71..dd5c30a78f08 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 SiblingPath } from '@aztec/circuit-types'; -import { type Bufferable } from '@aztec/foundation/serialize'; +import { SiblingPath } from '@aztec/circuit-types'; +import { Bufferable } from '@aztec/foundation/serialize'; /** * 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..f1e40d37dbd7 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 { Bufferable } from '@aztec/foundation/serialize'; -import { type TreeSnapshot, type TreeSnapshotBuilder } from '../snapshots/snapshot_builder.js'; -import { type MerkleTree } from './merkle_tree.js'; +import { TreeSnapshot, TreeSnapshotBuilder } from '../snapshots/snapshot_builder.js'; +import { 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 b2a1d396b49d..043d242f43ab 100644 --- a/yarn-project/merkle-tree/src/load_tree.ts +++ b/yarn-project/merkle-tree/src/load_tree.ts @@ -1,8 +1,8 @@ -import { type Bufferable, type FromBuffer } from '@aztec/foundation/serialize'; -import { type AztecKVStore } from '@aztec/kv-store'; -import { type Hasher } from '@aztec/types/interfaces'; +import { Bufferable, FromBuffer } from '@aztec/foundation/serialize'; +import { AztecKVStore } from '@aztec/kv-store'; +import { Hasher } from '@aztec/types/interfaces'; -import { type TreeBase, getTreeMeta } from './tree_base.js'; +import { TreeBase, getTreeMeta } from './tree_base.js'; /** * Creates a new tree and sets its root, depth and size based on the meta data which are associated with the name. diff --git a/yarn-project/merkle-tree/src/new_tree.ts b/yarn-project/merkle-tree/src/new_tree.ts index d8040fc9f46d..a4d73af3693c 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 AztecKVStore } from '@aztec/kv-store'; -import { type Hasher } from '@aztec/types/interfaces'; +import { Bufferable, FromBuffer } from '@aztec/foundation/serialize'; +import { AztecKVStore } from '@aztec/kv-store'; +import { Hasher } from '@aztec/types/interfaces'; -import { type TreeBase } from './tree_base.js'; +import { 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 b49c34c527e7..b4a749e5a8a8 100644 --- a/yarn-project/merkle-tree/src/pedersen.ts +++ b/yarn-project/merkle-tree/src/pedersen.ts @@ -1,5 +1,5 @@ import { pedersenHash } from '@aztec/foundation/crypto'; -import { type Hasher } from '@aztec/types/interfaces'; +import { Hasher } from '@aztec/types/interfaces'; /** * A helper class encapsulating Pedersen hash functionality. diff --git a/yarn-project/merkle-tree/src/sha_256.ts b/yarn-project/merkle-tree/src/sha_256.ts index a1cba65c5ae2..2945e0705d09 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/types/interfaces'; +import { Hasher } from '@aztec/types/interfaces'; /** * 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 111f6de0439b..84a205a7741f 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 { randomBytes } from '@aztec/foundation/crypto'; -import { type FromBuffer } from '@aztec/foundation/serialize'; -import { type AztecKVStore } from '@aztec/kv-store'; +import { FromBuffer } from '@aztec/foundation/serialize'; +import { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/utils'; 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 eca6d258f360..2549bf1544bb 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 { SiblingPath } from '@aztec/circuit-types'; -import { type Bufferable, type FromBuffer, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type AztecKVStore, type AztecMap } from '@aztec/kv-store'; -import { type Hasher } from '@aztec/types/interfaces'; +import { Bufferable, FromBuffer, serializeToBuffer } from '@aztec/foundation/serialize'; +import { AztecKVStore, AztecMap } from '@aztec/kv-store'; +import { Hasher } from '@aztec/types/interfaces'; -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 { AppendOnlyTree } from '../interfaces/append_only_tree.js'; +import { TreeBase } from '../tree_base.js'; +import { 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 63e416416220..89a3d5af722a 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 { SiblingPath } from '@aztec/circuit-types'; -import { type Bufferable, type FromBuffer, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type AztecKVStore, type AztecMap } from '@aztec/kv-store'; +import { Bufferable, FromBuffer, serializeToBuffer } from '@aztec/foundation/serialize'; +import { AztecKVStore, AztecMap } from '@aztec/kv-store'; -import { type TreeBase } from '../tree_base.js'; -import { type TreeSnapshot, type TreeSnapshotBuilder } from './snapshot_builder.js'; +import { TreeBase } from '../tree_base.js'; +import { 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 486f633262a7..bc01c0b9ea10 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 { randomBytes } from '@aztec/foundation/crypto'; -import { type FromBuffer } from '@aztec/foundation/serialize'; -import { type AztecKVStore } from '@aztec/kv-store'; +import { FromBuffer } from '@aztec/foundation/serialize'; +import { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/utils'; 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..9417dadf67ba 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 { Bufferable, FromBuffer } from '@aztec/foundation/serialize'; +import { AztecKVStore } from '@aztec/kv-store'; -import { type TreeBase } from '../tree_base.js'; +import { TreeBase } from '../tree_base.js'; import { BaseFullTreeSnapshot, BaseFullTreeSnapshotBuilder } from './base_full_snapshot.js'; -import { type TreeSnapshot, type TreeSnapshotBuilder } from './snapshot_builder.js'; +import { 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 aa374542a9f6..beedabaec476 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,7 +1,7 @@ import { Fr, NullifierLeaf, NullifierLeafPreimage } from '@aztec/circuits.js'; -import { type AztecKVStore } from '@aztec/kv-store'; +import { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/utils'; -import { type Hasher } from '@aztec/types/interfaces'; +import { Hasher } from '@aztec/types/interfaces'; import { Pedersen, newTree } from '../index.js'; import { StandardIndexedTreeWithAppend } from '../standard_indexed_tree/test/standard_indexed_tree_with_append.js'; 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 c39108239d9e..c608daa11185 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 { IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import { AztecKVStore, AztecMap } from '@aztec/kv-store'; -import { type IndexedTree, type PreimageFactory } from '../interfaces/indexed_tree.js'; -import { type TreeBase } from '../tree_base.js'; +import { IndexedTree, PreimageFactory } from '../interfaces/indexed_tree.js'; +import { TreeBase } from '../tree_base.js'; import { BaseFullTreeSnapshot, BaseFullTreeSnapshotBuilder } from './base_full_snapshot.js'; -import { type IndexedTreeSnapshot, type TreeSnapshotBuilder } from './snapshot_builder.js'; +import { 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 5821ae951046..bfdc30658469 100644 --- a/yarn-project/merkle-tree/src/snapshots/snapshot_builder.ts +++ b/yarn-project/merkle-tree/src/snapshots/snapshot_builder.ts @@ -1,6 +1,6 @@ -import { type SiblingPath } from '@aztec/circuit-types'; -import { type Bufferable } from '@aztec/foundation/serialize'; -import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import { SiblingPath } from '@aztec/circuit-types'; +import { Bufferable } from '@aztec/foundation/serialize'; +import { IndexedTreeLeafPreimage } 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..4dcf97bd5b4e 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 { 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 { TreeBase } from '../tree_base.js'; +import { 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 c7a97acffeec..4d11aa493599 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 @@ -1,12 +1,12 @@ import { SiblingPath } from '@aztec/circuit-types'; import { randomBigInt, randomBytes } from '@aztec/foundation/crypto'; import { createDebugLogger } from '@aztec/foundation/log'; -import { type AztecKVStore } from '@aztec/kv-store'; +import { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/utils'; -import { type Hasher } from '@aztec/types/interfaces'; +import { Hasher } from '@aztec/types/interfaces'; import { INITIAL_LEAF, newTree } from '../index.js'; -import { type UpdateOnlyTree } from '../interfaces/update_only_tree.js'; +import { 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..646f01a24127 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 { Bufferable, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type UpdateOnlyTree } from '../interfaces/update_only_tree.js'; +import { UpdateOnlyTree } from '../interfaces/update_only_tree.js'; import { FullTreeSnapshotBuilder } from '../snapshots/full_snapshot.js'; -import { type TreeSnapshot } from '../snapshots/snapshot_builder.js'; +import { 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 cfe3bc3ebdd6..42e9a3cbfbef 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,20 +1,15 @@ import { SiblingPath } from '@aztec/circuit-types'; -import { type TreeInsertionStats } from '@aztec/circuit-types/stats'; +import { TreeInsertionStats } from '@aztec/circuit-types/stats'; import { toBufferBE } from '@aztec/foundation/bigint-buffer'; -import { type FromBuffer } from '@aztec/foundation/serialize'; +import { FromBuffer } from '@aztec/foundation/serialize'; import { Timer } from '@aztec/foundation/timer'; -import { type IndexedTreeLeaf, type IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; -import { type AztecKVStore, type AztecMap } from '@aztec/kv-store'; -import { type Hasher } from '@aztec/types/interfaces'; - -import { - type BatchInsertionResult, - type IndexedTree, - type LowLeafWitnessData, - type PreimageFactory, -} from '../interfaces/indexed_tree.js'; +import { IndexedTreeLeaf, IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import { AztecKVStore, AztecMap } from '@aztec/kv-store'; +import { Hasher } from '@aztec/types/interfaces'; + +import { BatchInsertionResult, IndexedTree, LowLeafWitnessData, PreimageFactory } from '../interfaces/indexed_tree.js'; import { IndexedTreeSnapshotBuilder } from '../snapshots/indexed_tree_snapshot.js'; -import { type IndexedTreeSnapshot } from '../snapshots/snapshot_builder.js'; +import { 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 0ed6196c0e9e..a605e19025e1 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 @@ -7,12 +7,12 @@ import { PublicDataTreeLeafPreimage, } from '@aztec/circuits.js'; import { toBufferBE } from '@aztec/foundation/bigint-buffer'; -import { type FromBuffer } from '@aztec/foundation/serialize'; -import { type AztecKVStore } from '@aztec/kv-store'; +import { FromBuffer } from '@aztec/foundation/serialize'; +import { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/utils'; -import { type Hasher } from '@aztec/types/interfaces'; +import { Hasher } from '@aztec/types/interfaces'; -import { INITIAL_LEAF, type MerkleTree, Pedersen, loadTree, newTree } from '../../index.js'; +import { INITIAL_LEAF, MerkleTree, Pedersen, loadTree, newTree } from '../../index.js'; import { treeTestSuite } from '../../test/test_suite.js'; import { StandardIndexedTreeWithAppend } from './standard_indexed_tree_with_append.js'; 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 cd946ac771a7..baf96a21df92 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,8 +1,8 @@ import { randomBytes } from '@aztec/foundation/crypto'; -import { type FromBuffer } from '@aztec/foundation/serialize'; -import { type AztecKVStore } from '@aztec/kv-store'; +import { FromBuffer } from '@aztec/foundation/serialize'; +import { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/utils'; -import { type Hasher } from '@aztec/types/interfaces'; +import { Hasher } from '@aztec/types/interfaces'; import { loadTree } from '../load_tree.js'; import { newTree } from '../new_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 fe27a0fb7a52..45c8cc6a6ced 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 TreeInsertionStats } from '@aztec/circuit-types/stats'; -import { type Bufferable, serializeToBuffer } from '@aztec/foundation/serialize'; +import { TreeInsertionStats } from '@aztec/circuit-types/stats'; +import { Bufferable, serializeToBuffer } from '@aztec/foundation/serialize'; import { Timer } from '@aztec/foundation/timer'; -import { type AppendOnlyTree } from '../interfaces/append_only_tree.js'; +import { AppendOnlyTree } from '../interfaces/append_only_tree.js'; import { AppendOnlySnapshotBuilder } from '../snapshots/append_only_snapshot.js'; -import { type TreeSnapshot } from '../snapshots/snapshot_builder.js'; +import { 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 a2533ad9e6df..b544b661c5ed 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 { SiblingPath } from '@aztec/circuit-types'; import { randomBytes } from '@aztec/foundation/crypto'; -import { type AztecKVStore } from '@aztec/kv-store'; +import { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/utils'; -import { type Hasher } from '@aztec/types/interfaces'; +import { Hasher } from '@aztec/types/interfaces'; 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 { AppendOnlyTree } from '../interfaces/append_only_tree.js'; +import { 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 dba34f92d8fb..74b75c5dd439 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/circuit-types'; -import { type AztecKVStore } from '@aztec/kv-store'; +import { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/utils'; -import { type Hasher } from '@aztec/types/interfaces'; +import { Hasher } from '@aztec/types/interfaces'; import { Pedersen } from '../index.js'; -import { type AppendOnlyTree } from '../interfaces/append_only_tree.js'; -import { type UpdateOnlyTree } from '../interfaces/update_only_tree.js'; +import { AppendOnlyTree } from '../interfaces/append_only_tree.js'; +import { 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..b1a221988bf5 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 { AppendOnlyTree } from '../../interfaces/append_only_tree.js'; +import { 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 cd20e8e0f2d8..db2ed88bfb25 100644 --- a/yarn-project/merkle-tree/src/tree_base.ts +++ b/yarn-project/merkle-tree/src/tree_base.ts @@ -1,12 +1,12 @@ import { SiblingPath } from '@aztec/circuit-types'; import { toBigIntLE, toBufferLE } from '@aztec/foundation/bigint-buffer'; -import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log'; -import { type Bufferable, type FromBuffer, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type AztecKVStore, type AztecMap, type AztecSingleton } from '@aztec/kv-store'; -import { type Hasher } from '@aztec/types/interfaces'; +import { DebugLogger, createDebugLogger } from '@aztec/foundation/log'; +import { Bufferable, FromBuffer, serializeToBuffer } from '@aztec/foundation/serialize'; +import { AztecKVStore, AztecMap, AztecSingleton } from '@aztec/kv-store'; +import { Hasher } from '@aztec/types/interfaces'; import { HasherWithStats } from './hasher_with_stats.js'; -import { type MerkleTree } from './interfaces/merkle_tree.js'; +import { MerkleTree } from './interfaces/merkle_tree.js'; const MAX_DEPTH = 254; diff --git a/yarn-project/noir-compiler/src/cli/add_noir_compiler_commander_actions.ts b/yarn-project/noir-compiler/src/cli/add_noir_compiler_commander_actions.ts index 4ac4ce2b4c3f..ee3513d6b673 100644 --- a/yarn-project/noir-compiler/src/cli/add_noir_compiler_commander_actions.ts +++ b/yarn-project/noir-compiler/src/cli/add_noir_compiler_commander_actions.ts @@ -1,6 +1,6 @@ -import { type LogFn } from '@aztec/foundation/log'; +import { LogFn } from '@aztec/foundation/log'; -import { type Command } from 'commander'; +import { Command } from 'commander'; import { dirname } from 'path'; export function addNoirCompilerCommanderActions(program: Command, log: LogFn = () => {}) { diff --git a/yarn-project/noir-compiler/src/contract-interface-gen/noir.ts b/yarn-project/noir-compiler/src/contract-interface-gen/noir.ts index 3a2f1d92e2e8..eabae4c11a11 100644 --- a/yarn-project/noir-compiler/src/contract-interface-gen/noir.ts +++ b/yarn-project/noir-compiler/src/contract-interface-gen/noir.ts @@ -1,11 +1,11 @@ import { - type ABIParameter, - type ABIVariable, - type ContractArtifact, - type FunctionArtifact, + ABIParameter, + ABIVariable, + ContractArtifact, + FunctionArtifact, FunctionSelector, FunctionType, - type StructType, + StructType, } from '@aztec/foundation/abi'; import { times } from '@aztec/foundation/collection'; diff --git a/yarn-project/noir-compiler/src/contract-interface-gen/typescript.ts b/yarn-project/noir-compiler/src/contract-interface-gen/typescript.ts index 1a77f8916cb5..87e22fcb23e8 100644 --- a/yarn-project/noir-compiler/src/contract-interface-gen/typescript.ts +++ b/yarn-project/noir-compiler/src/contract-interface-gen/typescript.ts @@ -1,7 +1,7 @@ import { - type ABIParameter, - type ContractArtifact, - type FunctionArtifact, + ABIParameter, + ContractArtifact, + FunctionArtifact, getDefaultInitializer, isAztecAddressStruct, isEthAddressStruct, diff --git a/yarn-project/noir-compiler/src/utils.ts b/yarn-project/noir-compiler/src/utils.ts index 6a097708b01b..7a93eda2518e 100644 --- a/yarn-project/noir-compiler/src/utils.ts +++ b/yarn-project/noir-compiler/src/utils.ts @@ -1,4 +1,4 @@ -import { type ContractArtifact } from '@aztec/foundation/abi'; +import { ContractArtifact } from '@aztec/foundation/abi'; /** * Checks if the given input looks like a valid ContractArtifact. The check is not exhaustive, diff --git a/yarn-project/noir-protocol-circuits-types/src/index.test.ts b/yarn-project/noir-protocol-circuits-types/src/index.test.ts index 19e1c28c0600..3e381b6ba00f 100644 --- a/yarn-project/noir-protocol-circuits-types/src/index.test.ts +++ b/yarn-project/noir-protocol-circuits-types/src/index.test.ts @@ -1,5 +1,5 @@ import { PrivateKernelInnerCircuitPrivateInputs, PrivateKernelTailCircuitPrivateInputs } from '@aztec/circuits.js'; -import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log'; +import { DebugLogger, createDebugLogger } from '@aztec/foundation/log'; import { setupCustomSnapshotSerializers } from '@aztec/foundation/testing'; import { fileURLToPath } from '@aztec/foundation/url'; diff --git a/yarn-project/noir-protocol-circuits-types/src/index.ts b/yarn-project/noir-protocol-circuits-types/src/index.ts index fb07caed0b45..cf56cc0b7c1d 100644 --- a/yarn-project/noir-protocol-circuits-types/src/index.ts +++ b/yarn-project/noir-protocol-circuits-types/src/index.ts @@ -1,30 +1,26 @@ import { - type BaseOrMergeRollupPublicInputs, - type BaseParityInputs, - type BaseRollupInputs, - type MergeRollupInputs, - type ParityPublicInputs, - type PrivateKernelInitCircuitPrivateInputs, - type PrivateKernelInnerCircuitPrivateInputs, - type PrivateKernelInnerCircuitPublicInputs, - type PrivateKernelTailCircuitPrivateInputs, - type PrivateKernelTailCircuitPublicInputs, - type PublicKernelCircuitPrivateInputs, - type PublicKernelCircuitPublicInputs, - type PublicKernelTailCircuitPrivateInputs, - type RootParityInputs, - type RootRollupInputs, - type RootRollupPublicInputs, + BaseOrMergeRollupPublicInputs, + BaseParityInputs, + BaseRollupInputs, + MergeRollupInputs, + ParityPublicInputs, + PrivateKernelInitCircuitPrivateInputs, + PrivateKernelInnerCircuitPrivateInputs, + PrivateKernelInnerCircuitPublicInputs, + PrivateKernelTailCircuitPrivateInputs, + PrivateKernelTailCircuitPublicInputs, + PublicKernelCircuitPrivateInputs, + PublicKernelCircuitPublicInputs, + PublicKernelTailCircuitPrivateInputs, + RootParityInputs, + RootRollupInputs, + RootRollupPublicInputs, } from '@aztec/circuits.js'; -import { type NoirCompiledCircuit } from '@aztec/types/noir'; +import { NoirCompiledCircuit } from '@aztec/types/noir'; -import { - type WasmBlackBoxFunctionSolver, - createBlackBoxSolver, - executeCircuitWithBlackBoxSolver, -} from '@noir-lang/acvm_js'; -import { type Abi, abiDecode, abiEncode } from '@noir-lang/noirc_abi'; -import { type WitnessMap } from '@noir-lang/types'; +import { WasmBlackBoxFunctionSolver, createBlackBoxSolver, executeCircuitWithBlackBoxSolver } from '@noir-lang/acvm_js'; +import { Abi, abiDecode, abiEncode } from '@noir-lang/noirc_abi'; +import { WitnessMap } from '@noir-lang/types'; import BaseParityJson from './target/parity_base.json' assert { type: 'json' }; import RootParityJson from './target/parity_root.json' assert { type: 'json' }; @@ -59,25 +55,16 @@ import { mapRootRollupInputsToNoir, mapRootRollupPublicInputsFromNoir, } from './type_conversion.js'; -import { type ReturnType as BaseParityReturnType } from './types/parity_base_types.js'; -import { type ReturnType as RootParityReturnType } from './types/parity_root_types.js'; -import { - type InputType as InitInputType, - type ReturnType as InitReturnType, -} from './types/private_kernel_init_types.js'; -import { - type InputType as InnerInputType, - type ReturnType as InnerReturnType, -} from './types/private_kernel_inner_types.js'; -import { - type InputType as TailInputType, - type ReturnType as TailReturnType, -} from './types/private_kernel_tail_types.js'; -import { type ReturnType as PublicPublicPreviousReturnType } from './types/public_kernel_app_logic_types.js'; -import { type ReturnType as PublicSetupReturnType } from './types/public_kernel_setup_types.js'; -import { type ReturnType as BaseRollupReturnType } from './types/rollup_base_types.js'; -import { type ReturnType as MergeRollupReturnType } from './types/rollup_merge_types.js'; -import { type ReturnType as RootRollupReturnType } from './types/rollup_root_types.js'; +import { ReturnType as BaseParityReturnType } from './types/parity_base_types.js'; +import { ReturnType as RootParityReturnType } from './types/parity_root_types.js'; +import { InputType as InitInputType, ReturnType as InitReturnType } from './types/private_kernel_init_types.js'; +import { InputType as InnerInputType, ReturnType as InnerReturnType } from './types/private_kernel_inner_types.js'; +import { InputType as TailInputType, ReturnType as TailReturnType } from './types/private_kernel_tail_types.js'; +import { ReturnType as PublicPublicPreviousReturnType } from './types/public_kernel_app_logic_types.js'; +import { ReturnType as PublicSetupReturnType } from './types/public_kernel_setup_types.js'; +import { ReturnType as BaseRollupReturnType } from './types/rollup_base_types.js'; +import { ReturnType as MergeRollupReturnType } from './types/rollup_merge_types.js'; +import { ReturnType as RootRollupReturnType } from './types/rollup_root_types.js'; // TODO(Tom): This should be exported from noirc_abi /** diff --git a/yarn-project/noir-protocol-circuits-types/src/noir_test_gen.test.ts b/yarn-project/noir-protocol-circuits-types/src/noir_test_gen.test.ts index 6453b0313e0e..8082a6c7801d 100644 --- a/yarn-project/noir-protocol-circuits-types/src/noir_test_gen.test.ts +++ b/yarn-project/noir-protocol-circuits-types/src/noir_test_gen.test.ts @@ -16,7 +16,7 @@ import { Fr } from '@aztec/foundation/fields'; import { setupCustomSnapshotSerializers } from '@aztec/foundation/testing'; import { openTmpStore } from '@aztec/kv-store/utils'; import { Pedersen, StandardTree } from '@aztec/merkle-tree'; -import { type ContractClass, type ContractInstance } from '@aztec/types/contracts'; +import { ContractClass, ContractInstance } from '@aztec/types/contracts'; describe('Data generation for noir tests', () => { setupCustomSnapshotSerializers(expect); diff --git a/yarn-project/noir-protocol-circuits-types/src/scripts/generate_ts_from_abi.ts b/yarn-project/noir-protocol-circuits-types/src/scripts/generate_ts_from_abi.ts index 4c60072d12dc..1854a5fd73bf 100644 --- a/yarn-project/noir-protocol-circuits-types/src/scripts/generate_ts_from_abi.ts +++ b/yarn-project/noir-protocol-circuits-types/src/scripts/generate_ts_from_abi.ts @@ -1,6 +1,6 @@ -import { type ABIType } from '@aztec/foundation/abi'; +import { ABIType } from '@aztec/foundation/abi'; import { createConsoleLogger } from '@aztec/foundation/log'; -import { type NoirCompiledCircuit, type NoirFunctionAbi } from '@aztec/types/noir'; +import { NoirCompiledCircuit, NoirFunctionAbi } from '@aztec/types/noir'; import fs from 'fs/promises'; diff --git a/yarn-project/noir-protocol-circuits-types/src/type_conversion.ts b/yarn-project/noir-protocol-circuits-types/src/type_conversion.ts index 80835e3c71ac..f0c35c664377 100644 --- a/yarn-project/noir-protocol-circuits-types/src/type_conversion.ts +++ b/yarn-project/noir-protocol-circuits-types/src/type_conversion.ts @@ -1,11 +1,11 @@ import { - type ARCHIVE_HEIGHT, + ARCHIVE_HEIGHT, AggregationObject, AppendOnlyTreeSnapshot, AztecAddress, BaseOrMergeRollupPublicInputs, - type BaseParityInputs, - type BaseRollupInputs, + BaseParityInputs, + BaseRollupInputs, CallContext, CallRequest, CallerContext, @@ -13,18 +13,18 @@ import { CombinedConstantData, ConstantRollupData, ContentCommitment, - type ContractStorageRead, - type ContractStorageUpdateRequest, + ContractStorageRead, + ContractStorageUpdateRequest, EthAddress, - type FUNCTION_TREE_HEIGHT, + FUNCTION_TREE_HEIGHT, Fr, FunctionData, FunctionSelector, GlobalVariables, - type GrumpkinPrivateKey, + GrumpkinPrivateKey, GrumpkinScalar, Header, - type L2ToL1Message, + L2ToL1Message, MAX_NEW_L2_TO_L1_MSGS_PER_TX, MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, @@ -45,168 +45,168 @@ import { MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MaxBlockNumber, - type MembershipWitness, - type MergeRollupInputs, - type NULLIFIER_TREE_HEIGHT, + MembershipWitness, + MergeRollupInputs, + NULLIFIER_TREE_HEIGHT, NUM_BYTES_PER_SHA256, - type NonMembershipHint, - type NoteHashReadRequestMembershipWitness, + NonMembershipHint, + NoteHashReadRequestMembershipWitness, NullifierKeyValidationRequest, NullifierKeyValidationRequestContext, - type NullifierLeafPreimage, - type NullifierNonExistentReadRequestHints, - type NullifierReadRequestHints, - type PUBLIC_DATA_TREE_HEIGHT, + NullifierLeafPreimage, + NullifierNonExistentReadRequestHints, + NullifierReadRequestHints, + PUBLIC_DATA_TREE_HEIGHT, ParityPublicInputs, PartialStateReference, - type PendingReadHint, + PendingReadHint, Point, - type PreviousRollupData, + PreviousRollupData, PrivateAccumulatedNonRevertibleData, PrivateAccumulatedRevertibleData, - type PrivateCallData, - type PrivateCallStackItem, - type PrivateCircuitPublicInputs, - type PrivateKernelInitCircuitPrivateInputs, - type PrivateKernelInnerCircuitPrivateInputs, + PrivateCallData, + PrivateCallStackItem, + PrivateCircuitPublicInputs, + PrivateKernelInitCircuitPrivateInputs, + PrivateKernelInnerCircuitPrivateInputs, PrivateKernelInnerCircuitPublicInputs, - type PrivateKernelInnerData, - type PrivateKernelTailCircuitPrivateInputs, + PrivateKernelInnerData, + PrivateKernelTailCircuitPrivateInputs, PrivateKernelTailCircuitPublicInputs, PublicAccumulatedNonRevertibleData, PublicAccumulatedRevertibleData, - type PublicCallData, - type PublicCallStackItem, - type PublicCircuitPublicInputs, + PublicCallData, + PublicCallStackItem, + PublicCircuitPublicInputs, PublicDataRead, - type PublicDataTreeLeaf, - type PublicDataTreeLeafPreimage, + PublicDataTreeLeaf, + PublicDataTreeLeafPreimage, PublicDataUpdateRequest, - type PublicKernelCircuitPrivateInputs, + PublicKernelCircuitPrivateInputs, PublicKernelCircuitPublicInputs, - type PublicKernelData, - type PublicKernelTailCircuitPrivateInputs, + PublicKernelData, + PublicKernelTailCircuitPrivateInputs, ReadRequest, ReadRequestContext, - type ReadRequestStatus, + ReadRequestStatus, RevertCode, - type RollupKernelCircuitPublicInputs, - type RollupKernelData, + RollupKernelCircuitPublicInputs, + RollupKernelData, RollupValidationRequests, - type RootParityInput, - type RootParityInputs, - type RootRollupInputs, + RootParityInput, + RootParityInputs, + RootRollupInputs, RootRollupPublicInputs, - type SettledReadHint, + SettledReadHint, SideEffect, SideEffectLinkedToNoteHash, - type StateDiffHints, + StateDiffHints, StateReference, TxContext, - type TxRequest, + TxRequest, ValidationRequests, } from '@aztec/circuits.js'; import { toBufferBE } from '@aztec/foundation/bigint-buffer'; -import { type Tuple, mapTuple, toTruncField } from '@aztec/foundation/serialize'; +import { Tuple, mapTuple, toTruncField } from '@aztec/foundation/serialize'; -import { type BaseParityInputs as BaseParityInputsNoir } from './types/parity_base_types.js'; -import { type RootParityInputs as RootParityInputsNoir } from './types/parity_root_types.js'; +import { BaseParityInputs as BaseParityInputsNoir } from './types/parity_base_types.js'; +import { RootParityInputs as RootParityInputsNoir } from './types/parity_root_types.js'; import { - type CallContext as CallContextNoir, - type CallRequest as CallRequestNoir, - type CallerContext as CallerContextNoir, - type CombinedAccumulatedData as CombinedAccumulatedDataNoir, - type CombinedConstantData as CombinedConstantDataNoir, - type FunctionData as FunctionDataNoir, - type FunctionLeafMembershipWitness as FunctionLeafMembershipWitnessNoir, - type FunctionSelector as FunctionSelectorNoir, - type GrumpkinPrivateKey as GrumpkinPrivateKeyNoir, - type L2ToL1Message as L2ToL1MessageNoir, - type MaxBlockNumber as MaxBlockNumberNoir, - type AztecAddress as NoirAztecAddress, - type EthAddress as NoirEthAddress, - type Field as NoirField, - type GrumpkinPoint as NoirPoint, - type NoteHashReadRequestMembershipWitness as NoteHashReadRequestMembershipWitnessNoir, - type NullifierKeyValidationRequestContext as NullifierKeyValidationRequestContextNoir, - type NullifierKeyValidationRequest as NullifierKeyValidationRequestNoir, - type PrivateCallData as PrivateCallDataNoir, - type PrivateCallStackItem as PrivateCallStackItemNoir, - type PrivateCircuitPublicInputs as PrivateCircuitPublicInputsNoir, - type PrivateKernelInitCircuitPrivateInputs as PrivateKernelInitCircuitPrivateInputsNoir, - type PublicDataRead as PublicDataReadNoir, - type PublicDataUpdateRequest as PublicDataUpdateRequestNoir, - type ReadRequestContext as ReadRequestContextNoir, - type ReadRequest as ReadRequestNoir, - type RollupValidationRequests as RollupValidationRequestsNoir, - type SideEffectLinkedToNoteHash as SideEffectLinkedToNoteHashNoir, - type SideEffect as SideEffectNoir, - type TxContext as TxContextNoir, - type TxRequest as TxRequestNoir, - type ValidationRequests as ValidationRequestsNoir, + CallContext as CallContextNoir, + CallRequest as CallRequestNoir, + CallerContext as CallerContextNoir, + CombinedAccumulatedData as CombinedAccumulatedDataNoir, + CombinedConstantData as CombinedConstantDataNoir, + FunctionData as FunctionDataNoir, + FunctionLeafMembershipWitness as FunctionLeafMembershipWitnessNoir, + FunctionSelector as FunctionSelectorNoir, + GrumpkinPrivateKey as GrumpkinPrivateKeyNoir, + L2ToL1Message as L2ToL1MessageNoir, + MaxBlockNumber as MaxBlockNumberNoir, + AztecAddress as NoirAztecAddress, + EthAddress as NoirEthAddress, + Field as NoirField, + GrumpkinPoint as NoirPoint, + NoteHashReadRequestMembershipWitness as NoteHashReadRequestMembershipWitnessNoir, + NullifierKeyValidationRequestContext as NullifierKeyValidationRequestContextNoir, + NullifierKeyValidationRequest as NullifierKeyValidationRequestNoir, + PrivateCallData as PrivateCallDataNoir, + PrivateCallStackItem as PrivateCallStackItemNoir, + PrivateCircuitPublicInputs as PrivateCircuitPublicInputsNoir, + PrivateKernelInitCircuitPrivateInputs as PrivateKernelInitCircuitPrivateInputsNoir, + PublicDataRead as PublicDataReadNoir, + PublicDataUpdateRequest as PublicDataUpdateRequestNoir, + ReadRequestContext as ReadRequestContextNoir, + ReadRequest as ReadRequestNoir, + RollupValidationRequests as RollupValidationRequestsNoir, + SideEffectLinkedToNoteHash as SideEffectLinkedToNoteHashNoir, + SideEffect as SideEffectNoir, + TxContext as TxContextNoir, + TxRequest as TxRequestNoir, + ValidationRequests as ValidationRequestsNoir, } from './types/private_kernel_init_types.js'; import { - type PrivateKernelInnerCircuitPrivateInputs as PrivateKernelInnerCircuitPrivateInputsNoir, - type PrivateKernelInnerCircuitPublicInputs as PrivateKernelInnerCircuitPublicInputsNoir, - type PrivateKernelInnerData as PrivateKernelInnerDataNoir, + PrivateKernelInnerCircuitPrivateInputs as PrivateKernelInnerCircuitPrivateInputsNoir, + PrivateKernelInnerCircuitPublicInputs as PrivateKernelInnerCircuitPublicInputsNoir, + PrivateKernelInnerData as PrivateKernelInnerDataNoir, } from './types/private_kernel_inner_types.js'; import { - type NullifierReadRequestHints as NullifierReadRequestHintsNoir, - type NullifierSettledReadHint as NullifierSettledReadHintNoir, - type PendingReadHint as PendingReadHintNoir, - type PrivateAccumulatedNonRevertibleData as PrivateAccumulatedNonRevertibleDataNoir, - type PrivateAccumulatedRevertibleData as PrivateAccumulatedRevertibleDataNoir, - type PrivateKernelTailCircuitPrivateInputs as PrivateKernelTailCircuitPrivateInputsNoir, - type PrivateKernelTailCircuitPublicInputs as PrivateKernelTailCircuitPublicInputsNoir, - type ReadRequestStatus as ReadRequestStatusNoir, + NullifierReadRequestHints as NullifierReadRequestHintsNoir, + NullifierSettledReadHint as NullifierSettledReadHintNoir, + PendingReadHint as PendingReadHintNoir, + PrivateAccumulatedNonRevertibleData as PrivateAccumulatedNonRevertibleDataNoir, + PrivateAccumulatedRevertibleData as PrivateAccumulatedRevertibleDataNoir, + PrivateKernelTailCircuitPrivateInputs as PrivateKernelTailCircuitPrivateInputsNoir, + PrivateKernelTailCircuitPublicInputs as PrivateKernelTailCircuitPublicInputsNoir, + ReadRequestStatus as ReadRequestStatusNoir, } from './types/private_kernel_tail_types.js'; import { - type PublicAccumulatedNonRevertibleData as PublicAccumulatedNonRevertibleDataNoir, - type PublicAccumulatedRevertibleData as PublicAccumulatedRevertibleDataNoir, - type PublicKernelData as PublicKernelDataNoir, + PublicAccumulatedNonRevertibleData as PublicAccumulatedNonRevertibleDataNoir, + PublicAccumulatedRevertibleData as PublicAccumulatedRevertibleDataNoir, + PublicKernelData as PublicKernelDataNoir, } from './types/public_kernel_app_logic_types.js'; import { - type PublicCallData as PublicCallDataNoir, - type PublicCallStackItem as PublicCallStackItemNoir, - type PublicCircuitPublicInputs as PublicCircuitPublicInputsNoir, - type PublicKernelCircuitPublicInputs as PublicKernelCircuitPublicInputsNoir, - type PublicKernelSetupCircuitPrivateInputs as PublicKernelSetupCircuitPrivateInputsNoir, - type StorageRead as StorageReadNoir, - type StorageUpdateRequest as StorageUpdateRequestNoir, + PublicCallData as PublicCallDataNoir, + PublicCallStackItem as PublicCallStackItemNoir, + PublicCircuitPublicInputs as PublicCircuitPublicInputsNoir, + PublicKernelCircuitPublicInputs as PublicKernelCircuitPublicInputsNoir, + PublicKernelSetupCircuitPrivateInputs as PublicKernelSetupCircuitPrivateInputsNoir, + StorageRead as StorageReadNoir, + StorageUpdateRequest as StorageUpdateRequestNoir, } from './types/public_kernel_setup_types.js'; import { - type NullifierNonExistentReadRequestHints as NullifierNonExistentReadRequestHintsNoir, - type NullifierNonMembershipHint as NullifierNonMembershipHintNoir, - type PublicKernelTailCircuitPrivateInputs as PublicKernelTailCircuitPrivateInputsNoir, + NullifierNonExistentReadRequestHints as NullifierNonExistentReadRequestHintsNoir, + NullifierNonMembershipHint as NullifierNonMembershipHintNoir, + PublicKernelTailCircuitPrivateInputs as PublicKernelTailCircuitPrivateInputsNoir, } from './types/public_kernel_tail_types.js'; import { - type ArchiveRootMembershipWitness as ArchiveRootMembershipWitnessNoir, - type BaseRollupInputs as BaseRollupInputsNoir, - type NullifierLeafPreimage as NullifierLeafPreimageNoir, - type NullifierMembershipWitness as NullifierMembershipWitnessNoir, - type PublicDataMembershipWitness as PublicDataMembershipWitnessNoir, - type PublicDataTreeLeaf as PublicDataTreeLeafNoir, - type PublicDataTreeLeafPreimage as PublicDataTreeLeafPreimageNoir, - type RollupKernelCircuitPublicInputs as RollupKernelCircuitPublicInputsNoir, - type RollupKernelData as RollupKernelDataNoir, - type StateDiffHints as StateDiffHintsNoir, + ArchiveRootMembershipWitness as ArchiveRootMembershipWitnessNoir, + BaseRollupInputs as BaseRollupInputsNoir, + NullifierLeafPreimage as NullifierLeafPreimageNoir, + NullifierMembershipWitness as NullifierMembershipWitnessNoir, + PublicDataMembershipWitness as PublicDataMembershipWitnessNoir, + PublicDataTreeLeaf as PublicDataTreeLeafNoir, + PublicDataTreeLeafPreimage as PublicDataTreeLeafPreimageNoir, + RollupKernelCircuitPublicInputs as RollupKernelCircuitPublicInputsNoir, + RollupKernelData as RollupKernelDataNoir, + StateDiffHints as StateDiffHintsNoir, } from './types/rollup_base_types.js'; -import { type MergeRollupInputs as MergeRollupInputsNoir } from './types/rollup_merge_types.js'; +import { MergeRollupInputs as MergeRollupInputsNoir } from './types/rollup_merge_types.js'; import { - type AppendOnlyTreeSnapshot as AppendOnlyTreeSnapshotNoir, - type BaseOrMergeRollupPublicInputs as BaseOrMergeRollupPublicInputsNoir, - type ConstantRollupData as ConstantRollupDataNoir, - type ContentCommitment as ContentCommitmentNoir, - type Field, - type GlobalVariables as GlobalVariablesNoir, - type Header as HeaderNoir, - type ParityPublicInputs as ParityPublicInputsNoir, - type PartialStateReference as PartialStateReferenceNoir, - type PreviousRollupData as PreviousRollupDataNoir, - type RootParityInput as RootParityInputNoir, - type RootRollupInputs as RootRollupInputsNoir, - type RootRollupPublicInputs as RootRollupPublicInputsNoir, - type StateReference as StateReferenceNoir, + AppendOnlyTreeSnapshot as AppendOnlyTreeSnapshotNoir, + BaseOrMergeRollupPublicInputs as BaseOrMergeRollupPublicInputsNoir, + ConstantRollupData as ConstantRollupDataNoir, + ContentCommitment as ContentCommitmentNoir, + Field, + GlobalVariables as GlobalVariablesNoir, + Header as HeaderNoir, + ParityPublicInputs as ParityPublicInputsNoir, + PartialStateReference as PartialStateReferenceNoir, + PreviousRollupData as PreviousRollupDataNoir, + RootParityInput as RootParityInputNoir, + RootRollupInputs as RootRollupInputsNoir, + RootRollupPublicInputs as RootRollupPublicInputsNoir, + StateReference as StateReferenceNoir, } from './types/rollup_root_types.js'; /* eslint-disable camelcase */ diff --git a/yarn-project/p2p/src/bootstrap/bootstrap.ts b/yarn-project/p2p/src/bootstrap/bootstrap.ts index e70e871fbd6f..055f8ac6e14f 100644 --- a/yarn-project/p2p/src/bootstrap/bootstrap.ts +++ b/yarn-project/p2p/src/bootstrap/bootstrap.ts @@ -6,11 +6,11 @@ import type { ServiceMap } from '@libp2p/interface-libp2p'; import { kadDHT } from '@libp2p/kad-dht'; import { mplex } from '@libp2p/mplex'; import { tcp } from '@libp2p/tcp'; -import { type Libp2p, type Libp2pOptions, type ServiceFactoryMap, createLibp2p } from 'libp2p'; +import { Libp2p, Libp2pOptions, ServiceFactoryMap, createLibp2p } from 'libp2p'; import { identifyService } from 'libp2p/identify'; import { format } from 'util'; -import { type P2PConfig } from '../config.js'; +import { P2PConfig } from '../config.js'; import { createLibP2PPeerId } from '../service/index.js'; /** diff --git a/yarn-project/p2p/src/client/index.ts b/yarn-project/p2p/src/client/index.ts index a31752544ef9..b2411e801187 100644 --- a/yarn-project/p2p/src/client/index.ts +++ b/yarn-project/p2p/src/client/index.ts @@ -1,11 +1,11 @@ -import { type L2BlockSource } from '@aztec/circuit-types'; -import { type AztecKVStore } from '@aztec/kv-store'; +import { L2BlockSource } from '@aztec/circuit-types'; +import { AztecKVStore } from '@aztec/kv-store'; import { P2PClient } from '../client/p2p_client.js'; -import { type P2PConfig } from '../config.js'; +import { P2PConfig } from '../config.js'; import { DummyP2PService } from '../service/dummy_service.js'; import { LibP2PService } from '../service/index.js'; -import { type TxPool } from '../tx_pool/index.js'; +import { TxPool } from '../tx_pool/index.js'; export * from './p2p_client.js'; diff --git a/yarn-project/p2p/src/client/mocks.ts b/yarn-project/p2p/src/client/mocks.ts index f4e9a8d3e768..1b2134ac45d3 100644 --- a/yarn-project/p2p/src/client/mocks.ts +++ b/yarn-project/p2p/src/client/mocks.ts @@ -1,4 +1,4 @@ -import { L2Block, type L2BlockSource, type TxEffect, type TxHash, TxReceipt, TxStatus } from '@aztec/circuit-types'; +import { L2Block, L2BlockSource, TxEffect, TxHash, TxReceipt, TxStatus } from '@aztec/circuit-types'; import { EthAddress } from '@aztec/circuits.js'; /** diff --git a/yarn-project/p2p/src/client/p2p_client.test.ts b/yarn-project/p2p/src/client/p2p_client.test.ts index 91c0a5561f01..d0c9ba8da8ae 100644 --- a/yarn-project/p2p/src/client/p2p_client.test.ts +++ b/yarn-project/p2p/src/client/p2p_client.test.ts @@ -1,11 +1,11 @@ -import { type L2BlockSource, mockTx } from '@aztec/circuit-types'; -import { type AztecKVStore } from '@aztec/kv-store'; +import { L2BlockSource, mockTx } from '@aztec/circuit-types'; +import { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/utils'; import { expect, jest } from '@jest/globals'; -import { type P2PService } from '../index.js'; -import { type TxPool } from '../tx_pool/index.js'; +import { P2PService } from '../index.js'; +import { TxPool } from '../tx_pool/index.js'; import { MockBlockSource } from './mocks.js'; import { P2PClient } from './p2p_client.js'; diff --git a/yarn-project/p2p/src/client/p2p_client.ts b/yarn-project/p2p/src/client/p2p_client.ts index 920efc8ea37c..c93931afc1e0 100644 --- a/yarn-project/p2p/src/client/p2p_client.ts +++ b/yarn-project/p2p/src/client/p2p_client.ts @@ -1,18 +1,11 @@ -import { - type L2Block, - L2BlockContext, - L2BlockDownloader, - type L2BlockSource, - type Tx, - type TxHash, -} from '@aztec/circuit-types'; +import { L2Block, L2BlockContext, L2BlockDownloader, L2BlockSource, Tx, TxHash } from '@aztec/circuit-types'; import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants'; import { createDebugLogger } from '@aztec/foundation/log'; -import { type AztecKVStore, type AztecSingleton } from '@aztec/kv-store'; +import { AztecKVStore, AztecSingleton } from '@aztec/kv-store'; import { getP2PConfigEnvVars } from '../config.js'; -import { type P2PService } from '../service/service.js'; -import { type TxPool } from '../tx_pool/index.js'; +import { P2PService } from '../service/service.js'; +import { TxPool } from '../tx_pool/index.js'; /** * Enum defining the possible states of the p2p client. diff --git a/yarn-project/p2p/src/service/dummy_service.ts b/yarn-project/p2p/src/service/dummy_service.ts index aff96c9cdf88..bfc6b1d13647 100644 --- a/yarn-project/p2p/src/service/dummy_service.ts +++ b/yarn-project/p2p/src/service/dummy_service.ts @@ -1,6 +1,6 @@ -import { type Tx, type TxHash } from '@aztec/circuit-types'; +import { Tx, TxHash } from '@aztec/circuit-types'; -import { type P2PService } from './service.js'; +import { P2PService } from './service.js'; /** * A dummy implementation of the P2P Service. diff --git a/yarn-project/p2p/src/service/known_txs.test.ts b/yarn-project/p2p/src/service/known_txs.test.ts index a0c2772feec0..68ca52b7ec31 100644 --- a/yarn-project/p2p/src/service/known_txs.test.ts +++ b/yarn-project/p2p/src/service/known_txs.test.ts @@ -1,7 +1,7 @@ import { randomTxHash } from '@aztec/circuit-types'; import { expect } from '@jest/globals'; -import { type Ed25519PeerId, type PeerId } from '@libp2p/interface-peer-id'; +import { Ed25519PeerId, PeerId } from '@libp2p/interface-peer-id'; import { mock } from 'jest-mock-extended'; import { KnownTxLookup } from './known_txs.js'; diff --git a/yarn-project/p2p/src/service/known_txs.ts b/yarn-project/p2p/src/service/known_txs.ts index 6ee37d7d697f..b9a38f2cd0c2 100644 --- a/yarn-project/p2p/src/service/known_txs.ts +++ b/yarn-project/p2p/src/service/known_txs.ts @@ -1,4 +1,4 @@ -import { type PeerId } from '@libp2p/interface-peer-id'; +import { PeerId } from '@libp2p/interface-peer-id'; /** * Keeps a record of which Peers have 'seen' which transactions. diff --git a/yarn-project/p2p/src/service/libp2p_service.ts b/yarn-project/p2p/src/service/libp2p_service.ts index 4e73de1e5b09..4237307d9631 100644 --- a/yarn-project/p2p/src/service/libp2p_service.ts +++ b/yarn-project/p2p/src/service/libp2p_service.ts @@ -1,4 +1,4 @@ -import { type Tx, type TxHash } from '@aztec/circuit-types'; +import { Tx, TxHash } from '@aztec/circuit-types'; import { SerialQueue } from '@aztec/foundation/fifo'; import { createDebugLogger } from '@aztec/foundation/log'; @@ -6,20 +6,20 @@ import { noise } from '@chainsafe/libp2p-noise'; import { yamux } from '@chainsafe/libp2p-yamux'; import { bootstrap } from '@libp2p/bootstrap'; import type { ServiceMap } from '@libp2p/interface-libp2p'; -import { type PeerId } from '@libp2p/interface-peer-id'; -import { type IncomingStreamData } from '@libp2p/interface/stream-handler'; -import { type DualKadDHT, kadDHT } from '@libp2p/kad-dht'; +import { PeerId } from '@libp2p/interface-peer-id'; +import { IncomingStreamData } from '@libp2p/interface/stream-handler'; +import { DualKadDHT, kadDHT } from '@libp2p/kad-dht'; import { mplex } from '@libp2p/mplex'; import { createFromJSON, createSecp256k1PeerId, exportToProtobuf } from '@libp2p/peer-id-factory'; import { tcp } from '@libp2p/tcp'; import { pipe } from 'it-pipe'; -import { type Libp2p, type Libp2pOptions, type ServiceFactoryMap, createLibp2p } from 'libp2p'; +import { Libp2p, Libp2pOptions, ServiceFactoryMap, createLibp2p } from 'libp2p'; import { identifyService } from 'libp2p/identify'; -import { type P2PConfig } from '../config.js'; -import { type TxPool } from '../tx_pool/index.js'; +import { P2PConfig } from '../config.js'; +import { TxPool } from '../tx_pool/index.js'; import { KnownTxLookup } from './known_txs.js'; -import { type P2PService } from './service.js'; +import { P2PService } from './service.js'; import { Messages, createGetTransactionsRequestMessage, diff --git a/yarn-project/p2p/src/service/service.ts b/yarn-project/p2p/src/service/service.ts index fc9580d9b6d1..7c2410b129a8 100644 --- a/yarn-project/p2p/src/service/service.ts +++ b/yarn-project/p2p/src/service/service.ts @@ -1,4 +1,4 @@ -import { type Tx, type TxHash } from '@aztec/circuit-types'; +import { Tx, TxHash } from '@aztec/circuit-types'; /** * The interface for a P2P service implementation. diff --git a/yarn-project/p2p/src/service/tx_messages.test.ts b/yarn-project/p2p/src/service/tx_messages.test.ts index 6f097e363374..eedaca265608 100644 --- a/yarn-project/p2p/src/service/tx_messages.test.ts +++ b/yarn-project/p2p/src/service/tx_messages.test.ts @@ -1,4 +1,4 @@ -import { type Tx, mockTx, randomTxHash } from '@aztec/circuit-types'; +import { Tx, mockTx, randomTxHash } from '@aztec/circuit-types'; import { expect } from '@jest/globals'; diff --git a/yarn-project/p2p/src/tx_pool/aztec_kv_tx_pool.ts b/yarn-project/p2p/src/tx_pool/aztec_kv_tx_pool.ts index 13729720692e..fd1eba930e25 100644 --- a/yarn-project/p2p/src/tx_pool/aztec_kv_tx_pool.ts +++ b/yarn-project/p2p/src/tx_pool/aztec_kv_tx_pool.ts @@ -1,9 +1,9 @@ import { Tx, TxHash } from '@aztec/circuit-types'; -import { type TxAddedToPoolStats } from '@aztec/circuit-types/stats'; -import { type Logger, createDebugLogger } from '@aztec/foundation/log'; -import { type AztecKVStore, type AztecMap } from '@aztec/kv-store'; +import { TxAddedToPoolStats } from '@aztec/circuit-types/stats'; +import { Logger, createDebugLogger } from '@aztec/foundation/log'; +import { AztecKVStore, AztecMap } from '@aztec/kv-store'; -import { type TxPool } from './tx_pool.js'; +import { TxPool } from './tx_pool.js'; /** * In-memory implementation of the Transaction Pool. diff --git a/yarn-project/p2p/src/tx_pool/memory_tx_pool.ts b/yarn-project/p2p/src/tx_pool/memory_tx_pool.ts index 27aa1683fff4..8f4aad46a38d 100644 --- a/yarn-project/p2p/src/tx_pool/memory_tx_pool.ts +++ b/yarn-project/p2p/src/tx_pool/memory_tx_pool.ts @@ -1,8 +1,8 @@ import { Tx, TxHash } from '@aztec/circuit-types'; -import { type TxAddedToPoolStats } from '@aztec/circuit-types/stats'; +import { TxAddedToPoolStats } from '@aztec/circuit-types/stats'; import { createDebugLogger } from '@aztec/foundation/log'; -import { type TxPool } from './tx_pool.js'; +import { TxPool } from './tx_pool.js'; /** * In-memory implementation of the Transaction Pool. diff --git a/yarn-project/p2p/src/tx_pool/tx_pool.ts b/yarn-project/p2p/src/tx_pool/tx_pool.ts index 0ca939f79893..659f5a6d0ca8 100644 --- a/yarn-project/p2p/src/tx_pool/tx_pool.ts +++ b/yarn-project/p2p/src/tx_pool/tx_pool.ts @@ -1,4 +1,4 @@ -import { type Tx, type TxHash } from '@aztec/circuit-types'; +import { Tx, TxHash } from '@aztec/circuit-types'; /** * 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/tx_pool/tx_pool_test_suite.ts b/yarn-project/p2p/src/tx_pool/tx_pool_test_suite.ts index ea08bd1b4750..e2e9f74156ef 100644 --- a/yarn-project/p2p/src/tx_pool/tx_pool_test_suite.ts +++ b/yarn-project/p2p/src/tx_pool/tx_pool_test_suite.ts @@ -1,6 +1,6 @@ import { mockTx } from '@aztec/circuit-types'; -import { type TxPool } from './tx_pool.js'; +import { TxPool } from './tx_pool.js'; /** * Tests a TxPool implementation. diff --git a/yarn-project/protocol-contracts/src/class-registerer/artifact.ts b/yarn-project/protocol-contracts/src/class-registerer/artifact.ts index 433bf7b269cc..2a3ca423ce6f 100644 --- a/yarn-project/protocol-contracts/src/class-registerer/artifact.ts +++ b/yarn-project/protocol-contracts/src/class-registerer/artifact.ts @@ -1,5 +1,5 @@ import { loadContractArtifact } from '@aztec/types/abi'; -import { type NoirCompiledContract } from '@aztec/types/noir'; +import { NoirCompiledContract } from '@aztec/types/noir'; import ContractClassRegistererJson from '../artifacts/ContractClassRegisterer.json' assert { type: 'json' }; diff --git a/yarn-project/protocol-contracts/src/class-registerer/index.ts b/yarn-project/protocol-contracts/src/class-registerer/index.ts index d5f5fcbff004..ea85f6f6acf6 100644 --- a/yarn-project/protocol-contracts/src/class-registerer/index.ts +++ b/yarn-project/protocol-contracts/src/class-registerer/index.ts @@ -1,6 +1,6 @@ -import { type AztecAddress } from '@aztec/circuits.js'; +import { AztecAddress } from '@aztec/circuits.js'; -import { type ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js'; +import { ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js'; import { ContractClassRegistererArtifact } from './artifact.js'; /** Returns the canonical deployment of the class registerer contract. */ diff --git a/yarn-project/protocol-contracts/src/gas-token/artifact.ts b/yarn-project/protocol-contracts/src/gas-token/artifact.ts index 0dbaf8c2d747..042b3701e49a 100644 --- a/yarn-project/protocol-contracts/src/gas-token/artifact.ts +++ b/yarn-project/protocol-contracts/src/gas-token/artifact.ts @@ -1,5 +1,5 @@ import { loadContractArtifact } from '@aztec/types/abi'; -import { type NoirCompiledContract } from '@aztec/types/noir'; +import { NoirCompiledContract } from '@aztec/types/noir'; import GasTokenJson from '../artifacts/GasToken.json' assert { type: 'json' }; diff --git a/yarn-project/protocol-contracts/src/gas-token/index.ts b/yarn-project/protocol-contracts/src/gas-token/index.ts index d38126bf262f..2ecfe6c8ed15 100644 --- a/yarn-project/protocol-contracts/src/gas-token/index.ts +++ b/yarn-project/protocol-contracts/src/gas-token/index.ts @@ -1,6 +1,6 @@ -import { type AztecAddress, type EthAddress, Point } from '@aztec/circuits.js'; +import { AztecAddress, EthAddress, Point } from '@aztec/circuits.js'; -import { type ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js'; +import { ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js'; import { GasTokenArtifact } from './artifact.js'; /** Returns the canonical deployment of the gas token. */ diff --git a/yarn-project/protocol-contracts/src/instance-deployer/artifact.ts b/yarn-project/protocol-contracts/src/instance-deployer/artifact.ts index 809e35873ace..3ae928ab0454 100644 --- a/yarn-project/protocol-contracts/src/instance-deployer/artifact.ts +++ b/yarn-project/protocol-contracts/src/instance-deployer/artifact.ts @@ -1,5 +1,5 @@ import { loadContractArtifact } from '@aztec/types/abi'; -import { type NoirCompiledContract } from '@aztec/types/noir'; +import { NoirCompiledContract } from '@aztec/types/noir'; import ContractInstanceDeployerJson from '../artifacts/ContractInstanceDeployer.json' assert { type: 'json' }; diff --git a/yarn-project/protocol-contracts/src/instance-deployer/index.ts b/yarn-project/protocol-contracts/src/instance-deployer/index.ts index 7a3101fa7893..1a0942a9f2c5 100644 --- a/yarn-project/protocol-contracts/src/instance-deployer/index.ts +++ b/yarn-project/protocol-contracts/src/instance-deployer/index.ts @@ -1,6 +1,6 @@ import { AztecAddress, DEPLOYER_CONTRACT_ADDRESS } from '@aztec/circuits.js'; -import { type ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js'; +import { ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js'; import { ContractInstanceDeployerArtifact } from './artifact.js'; /** Returns the canonical deployment of the instance deployer contract. */ diff --git a/yarn-project/protocol-contracts/src/multi-call-entrypoint/artifact.ts b/yarn-project/protocol-contracts/src/multi-call-entrypoint/artifact.ts index b3cf23f9f41e..ede18eb397b9 100644 --- a/yarn-project/protocol-contracts/src/multi-call-entrypoint/artifact.ts +++ b/yarn-project/protocol-contracts/src/multi-call-entrypoint/artifact.ts @@ -1,5 +1,5 @@ import { loadContractArtifact } from '@aztec/types/abi'; -import { type NoirCompiledContract } from '@aztec/types/noir'; +import { NoirCompiledContract } from '@aztec/types/noir'; import MultiCallEntrypoint from '../artifacts/MultiCallEntrypoint.json' assert { type: 'json' }; 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 1d33cee36ed3..c9298b886f61 100644 --- a/yarn-project/protocol-contracts/src/multi-call-entrypoint/index.ts +++ b/yarn-project/protocol-contracts/src/multi-call-entrypoint/index.ts @@ -1,6 +1,6 @@ -import { type AztecAddress, EthAddress, Point } from '@aztec/circuits.js'; +import { AztecAddress, EthAddress, Point } from '@aztec/circuits.js'; -import { type ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js'; +import { ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js'; import { MultiCallEntrypointArtifact } from './artifact.js'; export function getCanonicalMultiCallEntrypointContract(): ProtocolContract { diff --git a/yarn-project/protocol-contracts/src/protocol_contract.ts b/yarn-project/protocol-contracts/src/protocol_contract.ts index 8286373e9da6..8d7e4ccb371f 100644 --- a/yarn-project/protocol-contracts/src/protocol_contract.ts +++ b/yarn-project/protocol-contracts/src/protocol_contract.ts @@ -1,12 +1,12 @@ import { - type AztecAddress, + AztecAddress, EthAddress, getContractClassFromArtifact, getContractInstanceFromDeployParams, } from '@aztec/circuits.js'; -import { type ContractArtifact } from '@aztec/foundation/abi'; +import { ContractArtifact } from '@aztec/foundation/abi'; import { Fr, Point } from '@aztec/foundation/fields'; -import { type ContractClassWithId, type ContractInstanceWithAddress } from '@aztec/types/contracts'; +import { ContractClassWithId, ContractInstanceWithAddress } from '@aztec/types/contracts'; /** Represents a canonical contract in the protocol. */ export interface ProtocolContract { diff --git a/yarn-project/prover-client/src/dummy-prover.ts b/yarn-project/prover-client/src/dummy-prover.ts index f95b46fb006a..d2c1f4842e40 100644 --- a/yarn-project/prover-client/src/dummy-prover.ts +++ b/yarn-project/prover-client/src/dummy-prover.ts @@ -1,13 +1,13 @@ import { L2Block, PROVING_STATUS, - type ProcessedTx, - type ProverClient, - type ProvingSuccess, - type ProvingTicket, + ProcessedTx, + ProverClient, + ProvingSuccess, + ProvingTicket, } from '@aztec/circuit-types'; -import { type GlobalVariables, makeEmptyProof } from '@aztec/circuits.js'; -import { type Fr } from '@aztec/foundation/fields'; +import { GlobalVariables, makeEmptyProof } from '@aztec/circuits.js'; +import { Fr } from '@aztec/foundation/fields'; export class DummyProver implements ProverClient { public start(): Promise { 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 587881aad0c6..5156edd63015 100644 --- a/yarn-project/prover-client/src/orchestrator/block-building-helpers.ts +++ b/yarn-project/prover-client/src/orchestrator/block-building-helpers.ts @@ -1,13 +1,13 @@ -import { MerkleTreeId, type ProcessedTx } from '@aztec/circuit-types'; +import { MerkleTreeId, ProcessedTx } from '@aztec/circuit-types'; import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, - type BaseOrMergeRollupPublicInputs, - type BaseParityInputs, + BaseOrMergeRollupPublicInputs, + BaseParityInputs, BaseRollupInputs, ConstantRollupData, Fr, - type GlobalVariables, + GlobalVariables, L1_TO_L2_MSG_SUBTREE_HEIGHT, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, MAX_NEW_NULLIFIERS_PER_TX, @@ -20,14 +20,14 @@ import { NULLIFIER_SUBTREE_HEIGHT, NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_TREE_HEIGHT, - type NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, + NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NullifierLeafPreimage, PUBLIC_DATA_SUBTREE_HEIGHT, PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH, PUBLIC_DATA_TREE_HEIGHT, PartialStateReference, PreviousRollupData, - type Proof, + Proof, PublicDataTreeLeaf, PublicDataTreeLeafPreimage, ROLLUP_VK_TREE_HEIGHT, @@ -35,22 +35,22 @@ import { RollupKernelData, RollupTypes, RootParityInput, - type RootParityInputs, + RootParityInputs, RootRollupInputs, - type RootRollupPublicInputs, + RootRollupPublicInputs, StateDiffHints, - type StateReference, + StateReference, VK_TREE_HEIGHT, - type VerificationKey, + VerificationKey, } from '@aztec/circuits.js'; import { assertPermutation, makeTuple } from '@aztec/foundation/array'; -import { type DebugLogger } from '@aztec/foundation/log'; -import { type Tuple, assertLength, toFriendlyJSON } from '@aztec/foundation/serialize'; -import { type MerkleTreeOperations } from '@aztec/world-state'; +import { DebugLogger } from '@aztec/foundation/log'; +import { Tuple, assertLength, toFriendlyJSON } from '@aztec/foundation/serialize'; +import { MerkleTreeOperations } from '@aztec/world-state'; -import { type VerificationKeys, getVerificationKeys } from '../mocks/verification_keys.js'; -import { type RollupProver } from '../prover/index.js'; -import { type RollupSimulator } from '../simulator/rollup.js'; +import { VerificationKeys, getVerificationKeys } from '../mocks/verification_keys.js'; +import { RollupProver } from '../prover/index.js'; +import { RollupSimulator } from '../simulator/rollup.js'; // Denotes fields that are not used now, but will be in the future const FUTURE_FR = new Fr(0n); diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator.test.ts b/yarn-project/prover-client/src/orchestrator/orchestrator.test.ts index d27a591b872d..c4af9a479dc6 100644 --- a/yarn-project/prover-client/src/orchestrator/orchestrator.test.ts +++ b/yarn-project/prover-client/src/orchestrator/orchestrator.test.ts @@ -1,15 +1,15 @@ import { MerkleTreeId, PROVING_STATUS, - type ProcessedTx, - type ProvingSuccess, + ProcessedTx, + ProvingSuccess, makeEmptyProcessedTx as makeEmptyProcessedTxFromHistoricalTreeRoots, makeProcessedTx, mockTx, } from '@aztec/circuit-types'; import { AztecAddress, - type BaseOrMergeRollupPublicInputs, + BaseOrMergeRollupPublicInputs, EthAddress, Fr, GlobalVariables, @@ -29,7 +29,7 @@ import { PublicDataTreeLeaf, PublicDataUpdateRequest, PublicKernelCircuitPublicInputs, - type RootRollupPublicInputs, + RootRollupPublicInputs, SideEffect, SideEffectLinkedToNoteHash, sideEffectCmp, @@ -48,14 +48,14 @@ import { padArrayEnd, times } from '@aztec/foundation/collection'; import { sleep } from '@aztec/foundation/sleep'; import { openTmpStore } from '@aztec/kv-store/utils'; import { WASMSimulator } from '@aztec/simulator'; -import { type MerkleTreeOperations, MerkleTrees } from '@aztec/world-state'; +import { MerkleTreeOperations, MerkleTrees } from '@aztec/world-state'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; import { type MemDown, default as memdown } from 'memdown'; import { getVerificationKeys } from '../mocks/verification_keys.js'; -import { type RollupProver } from '../prover/index.js'; -import { type RollupSimulator } from '../simulator/rollup.js'; +import { RollupProver } from '../prover/index.js'; +import { RollupSimulator } from '../simulator/rollup.js'; import { ProvingOrchestrator } from './orchestrator.js'; export const createMemDown = () => (memdown as any)() as MemDown; diff --git a/yarn-project/prover-client/src/orchestrator/orchestrator.ts b/yarn-project/prover-client/src/orchestrator/orchestrator.ts index 9845e6f51c53..d813a9dc0d19 100644 --- a/yarn-project/prover-client/src/orchestrator/orchestrator.ts +++ b/yarn-project/prover-client/src/orchestrator/orchestrator.ts @@ -1,33 +1,33 @@ -import { Body, L2Block, MerkleTreeId, type ProcessedTx, type TxEffect, toTxEffect } from '@aztec/circuit-types'; -import { PROVING_STATUS, type ProvingResult, type ProvingTicket } from '@aztec/circuit-types/interfaces'; -import { type CircuitSimulationStats } from '@aztec/circuit-types/stats'; +import { Body, L2Block, MerkleTreeId, ProcessedTx, TxEffect, toTxEffect } from '@aztec/circuit-types'; +import { PROVING_STATUS, ProvingResult, ProvingTicket } from '@aztec/circuit-types/interfaces'; +import { CircuitSimulationStats } from '@aztec/circuit-types/stats'; import { - type AppendOnlyTreeSnapshot, - type BaseOrMergeRollupPublicInputs, + AppendOnlyTreeSnapshot, + BaseOrMergeRollupPublicInputs, BaseParityInputs, - type BaseRollupInputs, + BaseRollupInputs, Fr, - type GlobalVariables, + GlobalVariables, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUM_BASE_PARITY_PER_ROOT_PARITY, - type Proof, - type RootParityInput, + Proof, + RootParityInput, RootParityInputs, } from '@aztec/circuits.js'; import { padArrayEnd } from '@aztec/foundation/collection'; import { MemoryFifo } from '@aztec/foundation/fifo'; import { createDebugLogger } from '@aztec/foundation/log'; -import { type Tuple } from '@aztec/foundation/serialize'; +import { Tuple } from '@aztec/foundation/serialize'; import { sleep } from '@aztec/foundation/sleep'; import { elapsed } from '@aztec/foundation/timer'; -import { type SimulationProvider } from '@aztec/simulator'; -import { type MerkleTreeOperations } from '@aztec/world-state'; +import { SimulationProvider } from '@aztec/simulator'; +import { MerkleTreeOperations } from '@aztec/world-state'; import { inspect } from 'util'; -import { type VerificationKeys, getVerificationKeys } from '../mocks/verification_keys.js'; -import { type RollupProver } from '../prover/index.js'; -import { RealRollupCircuitSimulator, type RollupSimulator } from '../simulator/rollup.js'; +import { VerificationKeys, getVerificationKeys } from '../mocks/verification_keys.js'; +import { RollupProver } from '../prover/index.js'; +import { RealRollupCircuitSimulator, RollupSimulator } from '../simulator/rollup.js'; import { buildBaseRollupInput, createMergeRollupInputs, @@ -39,7 +39,7 @@ import { getTreeSnapshot, validateTx, } from './block-building-helpers.js'; -import { type MergeRollupInputData, PROVING_JOB_TYPE, type ProvingJob, ProvingState } from './proving-state.js'; +import { MergeRollupInputData, PROVING_JOB_TYPE, ProvingJob, ProvingState } from './proving-state.js'; const logger = createDebugLogger('aztec:prover:proving-orchestrator'); diff --git a/yarn-project/prover-client/src/orchestrator/proving-state.ts b/yarn-project/prover-client/src/orchestrator/proving-state.ts index c21f7e4e3855..232f7ad40e58 100644 --- a/yarn-project/prover-client/src/orchestrator/proving-state.ts +++ b/yarn-project/prover-client/src/orchestrator/proving-state.ts @@ -1,14 +1,14 @@ -import { type ProcessedTx, type ProvingResult } from '@aztec/circuit-types'; +import { ProcessedTx, ProvingResult } from '@aztec/circuit-types'; import { - type BaseOrMergeRollupPublicInputs, - type Fr, - type GlobalVariables, - type NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, - type Proof, - type RootParityInput, + BaseOrMergeRollupPublicInputs, + Fr, + GlobalVariables, + NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, + Proof, + RootParityInput, } from '@aztec/circuits.js'; import { randomBytes } from '@aztec/foundation/crypto'; -import { type Tuple } from '@aztec/foundation/serialize'; +import { Tuple } from '@aztec/foundation/serialize'; /** * Enums and structs to communicate the type of work required in each request. diff --git a/yarn-project/prover-client/src/prover/empty.ts b/yarn-project/prover-client/src/prover/empty.ts index c06d68ad4441..7ca043c8f8fd 100644 --- a/yarn-project/prover-client/src/prover/empty.ts +++ b/yarn-project/prover-client/src/prover/empty.ts @@ -1,20 +1,20 @@ /* eslint-disable require-await */ import { AggregationObject, - type BaseOrMergeRollupPublicInputs, - type BaseParityInputs, - type BaseRollupInputs, - type MergeRollupInputs, - type ParityPublicInputs, + BaseOrMergeRollupPublicInputs, + BaseParityInputs, + BaseRollupInputs, + MergeRollupInputs, + ParityPublicInputs, Proof, - type PublicCircuitPublicInputs, - type PublicKernelCircuitPublicInputs, - type RootParityInputs, - type RootRollupInputs, - type RootRollupPublicInputs, + PublicCircuitPublicInputs, + PublicKernelCircuitPublicInputs, + RootParityInputs, + RootRollupInputs, + RootRollupPublicInputs, } from '@aztec/circuits.js'; -import { type PublicProver, type RollupProver } from './index.js'; +import { PublicProver, RollupProver } from './index.js'; const EMPTY_PROOF_SIZE = 42; diff --git a/yarn-project/prover-client/src/prover/index.ts b/yarn-project/prover-client/src/prover/index.ts index 4c1be5db4336..333d872cb960 100644 --- a/yarn-project/prover-client/src/prover/index.ts +++ b/yarn-project/prover-client/src/prover/index.ts @@ -1,15 +1,15 @@ import { - type BaseOrMergeRollupPublicInputs, - type BaseParityInputs, - type BaseRollupInputs, - type MergeRollupInputs, - type ParityPublicInputs, - type Proof, - type PublicCircuitPublicInputs, - type PublicKernelCircuitPublicInputs, - type RootParityInputs, - type RootRollupInputs, - type RootRollupPublicInputs, + BaseOrMergeRollupPublicInputs, + BaseParityInputs, + BaseRollupInputs, + MergeRollupInputs, + ParityPublicInputs, + Proof, + PublicCircuitPublicInputs, + PublicKernelCircuitPublicInputs, + RootParityInputs, + RootRollupInputs, + RootRollupPublicInputs, } from '@aztec/circuits.js'; /** diff --git a/yarn-project/prover-client/src/simulator/rollup.ts b/yarn-project/prover-client/src/simulator/rollup.ts index 9faf8bc158e7..5101c07b2d92 100644 --- a/yarn-project/prover-client/src/simulator/rollup.ts +++ b/yarn-project/prover-client/src/simulator/rollup.ts @@ -1,13 +1,13 @@ -import { type CircuitSimulationStats } from '@aztec/circuit-types/stats'; +import { CircuitSimulationStats } from '@aztec/circuit-types/stats'; import { - type BaseOrMergeRollupPublicInputs, - type BaseParityInputs, - type BaseRollupInputs, - type MergeRollupInputs, - type ParityPublicInputs, - type RootParityInputs, - type RootRollupInputs, - type RootRollupPublicInputs, + BaseOrMergeRollupPublicInputs, + BaseParityInputs, + BaseRollupInputs, + MergeRollupInputs, + ParityPublicInputs, + RootParityInputs, + RootRollupInputs, + RootRollupPublicInputs, } from '@aztec/circuits.js'; import { createDebugLogger } from '@aztec/foundation/log'; import { elapsed } from '@aztec/foundation/timer'; @@ -28,7 +28,7 @@ import { convertRootRollupInputsToWitnessMap, convertRootRollupOutputsFromWitnessMap, } from '@aztec/noir-protocol-circuits-types'; -import { type SimulationProvider, WASMSimulator } from '@aztec/simulator'; +import { SimulationProvider, WASMSimulator } from '@aztec/simulator'; /** * Circuit simulator for the rollup circuits. diff --git a/yarn-project/prover-client/src/tx-prover/tx-prover.ts b/yarn-project/prover-client/src/tx-prover/tx-prover.ts index a9cb35d5f7e5..782b65d14c24 100644 --- a/yarn-project/prover-client/src/tx-prover/tx-prover.ts +++ b/yarn-project/prover-client/src/tx-prover/tx-prover.ts @@ -1,11 +1,11 @@ -import { type ProcessedTx } from '@aztec/circuit-types'; -import { type ProverClient, type ProvingTicket } from '@aztec/circuit-types/interfaces'; -import { type Fr, type GlobalVariables } from '@aztec/circuits.js'; -import { type SimulationProvider } from '@aztec/simulator'; -import { type WorldStateSynchronizer } from '@aztec/world-state'; +import { ProcessedTx } from '@aztec/circuit-types'; +import { ProverClient, ProvingTicket } from '@aztec/circuit-types/interfaces'; +import { Fr, GlobalVariables } from '@aztec/circuits.js'; +import { SimulationProvider } from '@aztec/simulator'; +import { WorldStateSynchronizer } from '@aztec/world-state'; -import { type ProverConfig } from '../config.js'; -import { type VerificationKeys, getVerificationKeys } from '../mocks/verification_keys.js'; +import { ProverConfig } from '../config.js'; +import { VerificationKeys, getVerificationKeys } from '../mocks/verification_keys.js'; import { ProvingOrchestrator } from '../orchestrator/orchestrator.js'; import { EmptyRollupProver } from '../prover/empty.js'; diff --git a/yarn-project/pxe/src/contract_data_oracle/index.ts b/yarn-project/pxe/src/contract_data_oracle/index.ts index eaf53cb9be6f..ad51ed876c9c 100644 --- a/yarn-project/pxe/src/contract_data_oracle/index.ts +++ b/yarn-project/pxe/src/contract_data_oracle/index.ts @@ -1,17 +1,17 @@ -import { type AztecAddress, MembershipWitness, VK_TREE_HEIGHT } from '@aztec/circuits.js'; +import { AztecAddress, MembershipWitness, VK_TREE_HEIGHT } from '@aztec/circuits.js'; import { - type ContractArtifact, - type FunctionArtifact, - type FunctionDebugMetadata, - type FunctionSelector, + ContractArtifact, + FunctionArtifact, + FunctionDebugMetadata, + FunctionSelector, getFunctionDebugMetadata, } from '@aztec/foundation/abi'; -import { type Fr } from '@aztec/foundation/fields'; +import { Fr } from '@aztec/foundation/fields'; import { ContractClassNotFoundError, ContractNotFoundError } from '@aztec/simulator'; -import { type ContractClass, type ContractInstance } from '@aztec/types/contracts'; +import { ContractClass, ContractInstance } from '@aztec/types/contracts'; -import { type ContractArtifactDatabase } from '../database/contracts/contract_artifact_db.js'; -import { type ContractInstanceDatabase } from '../database/contracts/contract_instance_db.js'; +import { ContractArtifactDatabase } from '../database/contracts/contract_artifact_db.js'; +import { ContractInstanceDatabase } from '../database/contracts/contract_instance_db.js'; import { PrivateFunctionsTree } from './private_functions_tree.js'; /** diff --git a/yarn-project/pxe/src/contract_data_oracle/private_functions_tree.ts b/yarn-project/pxe/src/contract_data_oracle/private_functions_tree.ts index 4feffc5207ba..6ea2e0617237 100644 --- a/yarn-project/pxe/src/contract_data_oracle/private_functions_tree.ts +++ b/yarn-project/pxe/src/contract_data_oracle/private_functions_tree.ts @@ -5,11 +5,11 @@ import { computePrivateFunctionsTree, getContractClassFromArtifact, } from '@aztec/circuits.js'; -import { type MerkleTree } from '@aztec/circuits.js/merkle'; -import { type ContractArtifact, type FunctionSelector } from '@aztec/foundation/abi'; +import { MerkleTree } from '@aztec/circuits.js/merkle'; +import { ContractArtifact, FunctionSelector } from '@aztec/foundation/abi'; import { Fr } from '@aztec/foundation/fields'; import { assertLength } from '@aztec/foundation/serialize'; -import { type ContractClassWithId } from '@aztec/types/contracts'; +import { ContractClassWithId } from '@aztec/types/contracts'; /** * Represents a Merkle tree of functions for a particular Contract Class. 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 85f726d0973f..e49d96c061c7 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 ContractArtifact } from '@aztec/foundation/abi'; -import { type Fr } from '@aztec/foundation/fields'; +import { ContractArtifact } from '@aztec/foundation/abi'; +import { Fr } from '@aztec/foundation/fields'; /** * 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 77abb2f1641b..0fbd06963844 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/circuits.js'; -import { type ContractInstanceWithAddress } from '@aztec/types/contracts'; +import { AztecAddress } from '@aztec/circuits.js'; +import { ContractInstanceWithAddress } from '@aztec/types/contracts'; /** * PXE database for managing contract instances. diff --git a/yarn-project/pxe/src/database/deferred_note_dao.ts b/yarn-project/pxe/src/database/deferred_note_dao.ts index d45d179e5b28..06354bb4074c 100644 --- a/yarn-project/pxe/src/database/deferred_note_dao.ts +++ b/yarn-project/pxe/src/database/deferred_note_dao.ts @@ -1,5 +1,5 @@ import { Note, TxHash } from '@aztec/circuit-types'; -import { AztecAddress, Fr, Point, type PublicKey, Vector } from '@aztec/circuits.js'; +import { AztecAddress, Fr, Point, PublicKey, Vector } from '@aztec/circuits.js'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; /** diff --git a/yarn-project/pxe/src/database/kv_pxe_database.ts b/yarn-project/pxe/src/database/kv_pxe_database.ts index aae846bde607..8fabdf148729 100644 --- a/yarn-project/pxe/src/database/kv_pxe_database.ts +++ b/yarn-project/pxe/src/database/kv_pxe_database.ts @@ -1,21 +1,15 @@ -import { MerkleTreeId, type NoteFilter, NoteStatus, type PublicKey } from '@aztec/circuit-types'; +import { MerkleTreeId, NoteFilter, NoteStatus, PublicKey } from '@aztec/circuit-types'; import { AztecAddress, CompleteAddress, Header } from '@aztec/circuits.js'; -import { type ContractArtifact } from '@aztec/foundation/abi'; +import { ContractArtifact } from '@aztec/foundation/abi'; import { toBufferBE } from '@aztec/foundation/bigint-buffer'; -import { Fr, type Point } from '@aztec/foundation/fields'; -import { - type AztecArray, - type AztecKVStore, - type AztecMap, - type AztecMultiMap, - type AztecSingleton, -} from '@aztec/kv-store'; +import { Fr, Point } from '@aztec/foundation/fields'; +import { AztecArray, AztecKVStore, AztecMap, AztecMultiMap, AztecSingleton } from '@aztec/kv-store'; import { contractArtifactFromBuffer, contractArtifactToBuffer } from '@aztec/types/abi'; -import { type ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/types/contracts'; +import { ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/types/contracts'; import { DeferredNoteDao } from './deferred_note_dao.js'; import { NoteDao } from './note_dao.js'; -import { type PxeDatabase } from './pxe_database.js'; +import { 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 5717a668451c..5ca513111823 100644 --- a/yarn-project/pxe/src/database/note_dao.ts +++ b/yarn-project/pxe/src/database/note_dao.ts @@ -1,8 +1,8 @@ import { Note, TxHash } from '@aztec/circuit-types'; -import { AztecAddress, Fr, Point, type PublicKey } from '@aztec/circuits.js'; +import { AztecAddress, Fr, Point, PublicKey } from '@aztec/circuits.js'; import { toBigIntBE } from '@aztec/foundation/bigint-buffer'; import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type NoteData } from '@aztec/simulator'; +import { NoteData } from '@aztec/simulator'; /** * A note with contextual data. diff --git a/yarn-project/pxe/src/database/pxe_database.ts b/yarn-project/pxe/src/database/pxe_database.ts index 13aeccf6158f..a755f7103319 100644 --- a/yarn-project/pxe/src/database/pxe_database.ts +++ b/yarn-project/pxe/src/database/pxe_database.ts @@ -1,14 +1,14 @@ -import { type NoteFilter } from '@aztec/circuit-types'; -import { type CompleteAddress, type Header, type PublicKey } from '@aztec/circuits.js'; -import { type ContractArtifact } from '@aztec/foundation/abi'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; -import { type Fr } from '@aztec/foundation/fields'; -import { type ContractInstanceWithAddress } from '@aztec/types/contracts'; - -import { type ContractArtifactDatabase } from './contracts/contract_artifact_db.js'; -import { type ContractInstanceDatabase } from './contracts/contract_instance_db.js'; -import { type DeferredNoteDao } from './deferred_note_dao.js'; -import { type NoteDao } from './note_dao.js'; +import { NoteFilter } from '@aztec/circuit-types'; +import { CompleteAddress, Header, PublicKey } from '@aztec/circuits.js'; +import { ContractArtifact } from '@aztec/foundation/abi'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; +import { Fr } from '@aztec/foundation/fields'; +import { ContractInstanceWithAddress } from '@aztec/types/contracts'; + +import { ContractArtifactDatabase } from './contracts/contract_artifact_db.js'; +import { ContractInstanceDatabase } from './contracts/contract_instance_db.js'; +import { DeferredNoteDao } from './deferred_note_dao.js'; +import { 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 9a1fbbe46f81..7ee0a403ebec 100644 --- a/yarn-project/pxe/src/database/pxe_database_test_suite.ts +++ b/yarn-project/pxe/src/database/pxe_database_test_suite.ts @@ -1,4 +1,4 @@ -import { type NoteFilter, NoteStatus, randomTxHash } from '@aztec/circuit-types'; +import { NoteFilter, NoteStatus, randomTxHash } from '@aztec/circuit-types'; import { AztecAddress, CompleteAddress, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js'; import { makeHeader } from '@aztec/circuits.js/testing'; import { randomInt } from '@aztec/foundation/crypto'; @@ -6,9 +6,9 @@ import { Fr, Point } from '@aztec/foundation/fields'; import { BenchmarkingContractArtifact } from '@aztec/noir-contracts.js/Benchmarking'; import { SerializableContractInstance } from '@aztec/types/contracts'; -import { type NoteDao } from './note_dao.js'; +import { NoteDao } from './note_dao.js'; import { randomNoteDao } from './note_dao.test.js'; -import { type PxeDatabase } from './pxe_database.js'; +import { 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 a19482440936..d37b84338cd3 100644 --- a/yarn-project/pxe/src/kernel_oracle/index.ts +++ b/yarn-project/pxe/src/kernel_oracle/index.ts @@ -1,18 +1,18 @@ -import { type AztecNode, type KeyStore } from '@aztec/circuit-types'; +import { AztecNode, KeyStore } from '@aztec/circuit-types'; import { - type AztecAddress, - type Fr, - type FunctionSelector, + AztecAddress, + Fr, + FunctionSelector, MembershipWitness, - type NOTE_HASH_TREE_HEIGHT, - type Point, + NOTE_HASH_TREE_HEIGHT, + Point, computeContractClassIdPreimage, computeSaltedInitializationHash, } from '@aztec/circuits.js'; -import { type Tuple } from '@aztec/foundation/serialize'; +import { Tuple } from '@aztec/foundation/serialize'; -import { type ContractDataOracle } from '../contract_data_oracle/index.js'; -import { type ProvingDataOracle } from './../kernel_prover/proving_data_oracle.js'; +import { ContractDataOracle } from '../contract_data_oracle/index.js'; +import { 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_builder.ts b/yarn-project/pxe/src/kernel_prover/hints_builder.ts index f57f1d8c7b4a..eb7ee4519632 100644 --- a/yarn-project/pxe/src/kernel_prover/hints_builder.ts +++ b/yarn-project/pxe/src/kernel_prover/hints_builder.ts @@ -1,24 +1,24 @@ import { Fr, GrumpkinScalar, - type MAX_NEW_NOTE_HASHES_PER_TX, + MAX_NEW_NOTE_HASHES_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_TX, - type MAX_NULLIFIER_READ_REQUESTS_PER_TX, + MAX_NULLIFIER_READ_REQUESTS_PER_TX, MembershipWitness, NULLIFIER_TREE_HEIGHT, - type NullifierKeyValidationRequestContext, - type ReadRequestContext, - type SideEffect, - type SideEffectLinkedToNoteHash, - type SideEffectType, + NullifierKeyValidationRequestContext, + ReadRequestContext, + SideEffect, + SideEffectLinkedToNoteHash, + SideEffectType, buildNullifierReadRequestHints, } from '@aztec/circuits.js'; import { makeTuple } from '@aztec/foundation/array'; -import { type Tuple } from '@aztec/foundation/serialize'; +import { Tuple } from '@aztec/foundation/serialize'; -import { type ProvingDataOracle } from './proving_data_oracle.js'; +import { ProvingDataOracle } from './proving_data_oracle.js'; export class HintsBuilder { constructor(private oracle: ProvingDataOracle) {} 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 094acb789244..27ca152a1812 100644 --- a/yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts +++ b/yarn-project/pxe/src/kernel_prover/kernel_prover.test.ts @@ -13,7 +13,7 @@ import { PrivateKernelInnerCircuitPublicInputs, PrivateKernelTailCircuitPublicInputs, SideEffect, - type TxRequest, + TxRequest, VK_TREE_HEIGHT, VerificationKey, makeEmptyProof, @@ -22,13 +22,13 @@ import { makeTxRequest } from '@aztec/circuits.js/testing'; import { makeTuple } from '@aztec/foundation/array'; import { AztecAddress } from '@aztec/foundation/aztec-address'; import { Fr } from '@aztec/foundation/fields'; -import { type ExecutionResult, type NoteAndSlot } from '@aztec/simulator'; +import { ExecutionResult, NoteAndSlot } from '@aztec/simulator'; import { mock } from 'jest-mock-extended'; -import { KernelProver, type OutputNoteData } from './kernel_prover.js'; -import { type ProofCreator } from './proof_creator.js'; -import { type ProvingDataOracle } from './proving_data_oracle.js'; +import { KernelProver, OutputNoteData } from './kernel_prover.js'; +import { ProofCreator } from './proof_creator.js'; +import { 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 6875db0ec9f7..f2d8e65ad937 100644 --- a/yarn-project/pxe/src/kernel_prover/kernel_prover.ts +++ b/yarn-project/pxe/src/kernel_prover/kernel_prover.ts @@ -1,9 +1,9 @@ import { - type AztecAddress, + AztecAddress, CallRequest, Fr, - type MAX_NEW_NOTE_HASHES_PER_TX, - type MAX_NEW_NULLIFIERS_PER_TX, + MAX_NEW_NOTE_HASHES_PER_TX, + MAX_NEW_NULLIFIERS_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_CALL, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, @@ -14,9 +14,9 @@ import { PrivateKernelInnerCircuitPublicInputs, PrivateKernelInnerData, PrivateKernelTailCircuitPrivateInputs, - type SideEffect, - type SideEffectLinkedToNoteHash, - type TxRequest, + SideEffect, + SideEffectLinkedToNoteHash, + TxRequest, VK_TREE_HEIGHT, VerificationKey, makeEmptyProof, @@ -26,11 +26,11 @@ import { padArrayEnd } from '@aztec/foundation/collection'; import { createDebugLogger } from '@aztec/foundation/log'; import { assertLength, mapTuple } from '@aztec/foundation/serialize'; import { pushTestData } from '@aztec/foundation/testing'; -import { type ExecutionResult, type NoteAndSlot } from '@aztec/simulator'; +import { ExecutionResult, NoteAndSlot } from '@aztec/simulator'; import { HintsBuilder } from './hints_builder.js'; -import { KernelProofCreator, type ProofCreator, type ProofOutput, type ProofOutputFinal } from './proof_creator.js'; -import { type ProvingDataOracle } from './proving_data_oracle.js'; +import { KernelProofCreator, ProofCreator, ProofOutput, ProofOutputFinal } from './proof_creator.js'; +import { ProvingDataOracle } from './proving_data_oracle.js'; /** * Represents an output note data object. diff --git a/yarn-project/pxe/src/kernel_prover/proof_creator.ts b/yarn-project/pxe/src/kernel_prover/proof_creator.ts index c7db9590c60d..6dfabdc06421 100644 --- a/yarn-project/pxe/src/kernel_prover/proof_creator.ts +++ b/yarn-project/pxe/src/kernel_prover/proof_creator.ts @@ -1,16 +1,16 @@ -import { type CircuitSimulationStats } from '@aztec/circuit-types/stats'; +import { CircuitSimulationStats } from '@aztec/circuit-types/stats'; import { - type PrivateCircuitPublicInputs, - type PrivateKernelInitCircuitPrivateInputs, - type PrivateKernelInnerCircuitPrivateInputs, - type PrivateKernelInnerCircuitPublicInputs, - type PrivateKernelTailCircuitPrivateInputs, - type PrivateKernelTailCircuitPublicInputs, - type Proof, + PrivateCircuitPublicInputs, + PrivateKernelInitCircuitPrivateInputs, + PrivateKernelInnerCircuitPrivateInputs, + PrivateKernelInnerCircuitPublicInputs, + PrivateKernelTailCircuitPrivateInputs, + PrivateKernelTailCircuitPublicInputs, + Proof, makeEmptyProof, } from '@aztec/circuits.js'; import { siloNoteHash } from '@aztec/circuits.js/hash'; -import { type Fr } from '@aztec/foundation/fields'; +import { Fr } from '@aztec/foundation/fields'; import { createDebugLogger } from '@aztec/foundation/log'; import { elapsed } from '@aztec/foundation/timer'; import { executeInit, executeInner, executeTail } from '@aztec/noir-protocol-circuits-types'; 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 143b0c227c55..2126f70e38d3 100644 --- a/yarn-project/pxe/src/kernel_prover/proving_data_oracle.ts +++ b/yarn-project/pxe/src/kernel_prover/proving_data_oracle.ts @@ -1,16 +1,16 @@ -import { type NullifierMembershipWitness } from '@aztec/circuit-types'; +import { NullifierMembershipWitness } from '@aztec/circuit-types'; import { - type FUNCTION_TREE_HEIGHT, - type Fr, - type FunctionSelector, - type GrumpkinPrivateKey, - type MembershipWitness, - type NOTE_HASH_TREE_HEIGHT, - type Point, - type VK_TREE_HEIGHT, - type VerificationKey, + FUNCTION_TREE_HEIGHT, + Fr, + FunctionSelector, + GrumpkinPrivateKey, + MembershipWitness, + NOTE_HASH_TREE_HEIGHT, + Point, + VK_TREE_HEIGHT, + VerificationKey, } from '@aztec/circuits.js'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; /** * Provides functionality to fetch membership witnesses for verification keys, diff --git a/yarn-project/pxe/src/note_processor/note_processor.test.ts b/yarn-project/pxe/src/note_processor/note_processor.test.ts index 18b18ba0295b..3f026ce3a9d0 100644 --- a/yarn-project/pxe/src/note_processor/note_processor.test.ts +++ b/yarn-project/pxe/src/note_processor/note_processor.test.ts @@ -1,12 +1,12 @@ import { - type AztecNode, + AztecNode, EncryptedFunctionL2Logs, EncryptedL2BlockL2Logs, EncryptedL2Log, EncryptedTxL2Logs, - type KeyPair, - type KeyStore, - type L1NotePayload, + KeyPair, + KeyStore, + L1NotePayload, L2Block, L2BlockContext, TaggedNote, @@ -15,17 +15,17 @@ import { Fr, INITIAL_L2_BLOCK_NUM, MAX_NEW_NOTE_HASHES_PER_TX } from '@aztec/cir import { Grumpkin } from '@aztec/circuits.js/barretenberg'; import { pedersenHash } from '@aztec/foundation/crypto'; import { Point } from '@aztec/foundation/fields'; -import { type Tuple } from '@aztec/foundation/serialize'; +import { Tuple } from '@aztec/foundation/serialize'; import { ConstantKeyPair } from '@aztec/key-store'; import { openTmpStore } from '@aztec/kv-store/utils'; -import { type AcirSimulator } from '@aztec/simulator'; +import { AcirSimulator } from '@aztec/simulator'; import { jest } from '@jest/globals'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; -import { type PxeDatabase } from '../database/index.js'; +import { PxeDatabase } from '../database/index.js'; import { KVPxeDatabase } from '../database/kv_pxe_database.js'; -import { type NoteDao } from '../database/note_dao.js'; +import { NoteDao } from '../database/note_dao.js'; import { NoteProcessor } from './note_processor.js'; const TXS_PER_BLOCK = 4; diff --git a/yarn-project/pxe/src/note_processor/note_processor.ts b/yarn-project/pxe/src/note_processor/note_processor.ts index e5db07c9d71f..7edfe6e5b09c 100644 --- a/yarn-project/pxe/src/note_processor/note_processor.ts +++ b/yarn-project/pxe/src/note_processor/note_processor.ts @@ -1,22 +1,22 @@ import { - type AztecNode, - type EncryptedL2BlockL2Logs, - type KeyStore, + AztecNode, + EncryptedL2BlockL2Logs, + KeyStore, L1NotePayload, - type L2BlockContext, + L2BlockContext, TaggedNote, } from '@aztec/circuit-types'; -import { type NoteProcessorStats } from '@aztec/circuit-types/stats'; -import { INITIAL_L2_BLOCK_NUM, MAX_NEW_NOTE_HASHES_PER_TX, type PublicKey } from '@aztec/circuits.js'; +import { NoteProcessorStats } from '@aztec/circuit-types/stats'; +import { INITIAL_L2_BLOCK_NUM, MAX_NEW_NOTE_HASHES_PER_TX, PublicKey } from '@aztec/circuits.js'; import { Grumpkin } from '@aztec/circuits.js/barretenberg'; -import { type Fr } from '@aztec/foundation/fields'; +import { Fr } from '@aztec/foundation/fields'; import { createDebugLogger } from '@aztec/foundation/log'; import { Timer } from '@aztec/foundation/timer'; import { ContractNotFoundError } from '@aztec/simulator'; import { DeferredNoteDao } from '../database/deferred_note_dao.js'; -import { type PxeDatabase } from '../database/index.js'; -import { type NoteDao } from '../database/note_dao.js'; +import { PxeDatabase } from '../database/index.js'; +import { NoteDao } from '../database/note_dao.js'; import { getAcirSimulator } from '../simulator/index.js'; import { produceNoteDao } from './produce_note_dao.js'; diff --git a/yarn-project/pxe/src/note_processor/produce_note_dao.ts b/yarn-project/pxe/src/note_processor/produce_note_dao.ts index 02b8526be07a..396012a4ee93 100644 --- a/yarn-project/pxe/src/note_processor/produce_note_dao.ts +++ b/yarn-project/pxe/src/note_processor/produce_note_dao.ts @@ -1,7 +1,7 @@ -import { type L1NotePayload, type TxHash } from '@aztec/circuit-types'; -import { Fr, type PublicKey } from '@aztec/circuits.js'; +import { L1NotePayload, TxHash } from '@aztec/circuit-types'; +import { Fr, PublicKey } from '@aztec/circuits.js'; import { computeCommitmentNonce, siloNullifier } from '@aztec/circuits.js/hash'; -import { type AcirSimulator } from '@aztec/simulator'; +import { AcirSimulator } from '@aztec/simulator'; import { NoteDao } from '../database/note_dao.js'; diff --git a/yarn-project/pxe/src/pxe_http/pxe_http_server.ts b/yarn-project/pxe/src/pxe_http/pxe_http_server.ts index 955d4ae80d71..ef91f7836be8 100644 --- a/yarn-project/pxe/src/pxe_http/pxe_http_server.ts +++ b/yarn-project/pxe/src/pxe_http/pxe_http_server.ts @@ -8,7 +8,7 @@ import { LogId, Note, NullifierMembershipWitness, - type PXE, + PXE, Tx, TxEffect, TxExecutionRequest, diff --git a/yarn-project/pxe/src/pxe_service/create_pxe_service.ts b/yarn-project/pxe/src/pxe_service/create_pxe_service.ts index 7daead96c667..12813a382b17 100644 --- a/yarn-project/pxe/src/pxe_service/create_pxe_service.ts +++ b/yarn-project/pxe/src/pxe_service/create_pxe_service.ts @@ -1,4 +1,4 @@ -import { type AztecNode } from '@aztec/circuit-types'; +import { AztecNode } from '@aztec/circuit-types'; import { Grumpkin } from '@aztec/circuits.js/barretenberg'; import { randomBytes } from '@aztec/foundation/crypto'; import { TestKeyStore } from '@aztec/key-store'; @@ -11,7 +11,7 @@ import { getCanonicalMultiCallEntrypointContract } from '@aztec/protocol-contrac import { join } from 'path'; -import { type PXEServiceConfig } from '../config/index.js'; +import { PXEServiceConfig } from '../config/index.js'; import { KVPxeDatabase } from '../database/kv_pxe_database.js'; import { PXEService } from './pxe_service.js'; diff --git a/yarn-project/pxe/src/pxe_service/pxe_service.ts b/yarn-project/pxe/src/pxe_service/pxe_service.ts index 338d0c6cedc1..21e03cccf7d8 100644 --- a/yarn-project/pxe/src/pxe_service/pxe_service.ts +++ b/yarn-project/pxe/src/pxe_service/pxe_service.ts @@ -1,61 +1,61 @@ import { - type AuthWitness, - type AztecNode, + AuthWitness, + AztecNode, EncryptedTxL2Logs, ExtendedNote, - type FunctionCall, - type GetUnencryptedLogsResponse, - type KeyStore, - type L2Block, - type LogFilter, + FunctionCall, + GetUnencryptedLogsResponse, + KeyStore, + L2Block, + LogFilter, MerkleTreeId, - type NoteFilter, - type PXE, + NoteFilter, + PXE, SimulationError, Tx, - type TxEffect, - type TxExecutionRequest, - type TxHash, - type TxReceipt, + TxEffect, + TxExecutionRequest, + TxHash, + TxReceipt, UnencryptedTxL2Logs, isNoirCallStackUnresolved, } from '@aztec/circuit-types'; -import { type TxPXEProcessingStats } from '@aztec/circuit-types/stats'; +import { TxPXEProcessingStats } from '@aztec/circuit-types/stats'; import { AztecAddress, CallRequest, CompleteAddress, FunctionData, - type GrumpkinPrivateKey, + GrumpkinPrivateKey, MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, - type PartialAddress, - type PrivateKernelTailCircuitPublicInputs, - type PublicCallRequest, + PartialAddress, + PrivateKernelTailCircuitPublicInputs, + PublicCallRequest, computeContractClassId, getContractClassFromArtifact, } from '@aztec/circuits.js'; import { computeCommitmentNonce, siloNullifier } from '@aztec/circuits.js/hash'; -import { type ContractArtifact, type DecodedReturn, FunctionSelector, encodeArguments } from '@aztec/foundation/abi'; +import { ContractArtifact, DecodedReturn, FunctionSelector, encodeArguments } from '@aztec/foundation/abi'; import { arrayNonEmptyLength, padArrayEnd } from '@aztec/foundation/collection'; import { Fr } from '@aztec/foundation/fields'; import { SerialQueue } from '@aztec/foundation/fifo'; -import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log'; +import { DebugLogger, createDebugLogger } from '@aztec/foundation/log'; import { Timer } from '@aztec/foundation/timer'; import { - type AcirSimulator, - type ExecutionResult, + AcirSimulator, + ExecutionResult, collectEncryptedLogs, collectEnqueuedPublicFunctionCalls, collectUnencryptedLogs, resolveOpcodeLocations, } from '@aztec/simulator'; -import { type ContractClassWithId, type ContractInstanceWithAddress } from '@aztec/types/contracts'; -import { type NodeInfo } from '@aztec/types/interfaces'; +import { ContractClassWithId, ContractInstanceWithAddress } from '@aztec/types/contracts'; +import { NodeInfo } from '@aztec/types/interfaces'; -import { type PXEServiceConfig, getPackageInfo } from '../config/index.js'; +import { PXEServiceConfig, getPackageInfo } from '../config/index.js'; import { ContractDataOracle } from '../contract_data_oracle/index.js'; -import { type PxeDatabase } from '../database/index.js'; +import { PxeDatabase } from '../database/index.js'; import { NoteDao } from '../database/note_dao.js'; import { KernelOracle } from '../kernel_oracle/index.js'; import { KernelProver } from '../kernel_prover/kernel_prover.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 bbef70b77bab..fcb41bd90148 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,16 +1,16 @@ -import { type AztecNode, type PXE, TxEffect, mockTx } from '@aztec/circuit-types'; +import { AztecNode, PXE, TxEffect, mockTx } from '@aztec/circuit-types'; import { Grumpkin } from '@aztec/circuits.js/barretenberg'; import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants'; -import { type L1ContractAddresses } from '@aztec/ethereum'; +import { L1ContractAddresses } from '@aztec/ethereum'; import { EthAddress } from '@aztec/foundation/eth-address'; import { TestKeyStore } from '@aztec/key-store'; import { openTmpStore } from '@aztec/kv-store/utils'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { 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 { PxeDatabase } from '../../database/pxe_database.js'; +import { 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 7eb329c42e31..7c24b72307b4 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 @@ -1,5 +1,5 @@ import { - type PXE, + PXE, TxExecutionRequest, randomContractArtifact, randomContractInstanceWithAddress, diff --git a/yarn-project/pxe/src/simulator/index.ts b/yarn-project/pxe/src/simulator/index.ts index e1a4c8985784..40d30a9198db 100644 --- a/yarn-project/pxe/src/simulator/index.ts +++ b/yarn-project/pxe/src/simulator/index.ts @@ -1,8 +1,8 @@ -import { type AztecNode, type KeyStore } from '@aztec/circuit-types'; +import { AztecNode, KeyStore } from '@aztec/circuit-types'; import { AcirSimulator } from '@aztec/simulator'; import { ContractDataOracle } from '../contract_data_oracle/index.js'; -import { type PxeDatabase } from '../database/pxe_database.js'; +import { 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 56e65ee0e816..1be28074b651 100644 --- a/yarn-project/pxe/src/simulator_oracle/index.ts +++ b/yarn-project/pxe/src/simulator_oracle/index.ts @@ -1,30 +1,30 @@ import { - type AztecNode, - type KeyStore, - type L2Block, + AztecNode, + KeyStore, + L2Block, MerkleTreeId, - type NoteStatus, - type NullifierMembershipWitness, - type PublicDataWitness, - type SiblingPath, + NoteStatus, + NullifierMembershipWitness, + PublicDataWitness, + SiblingPath, } from '@aztec/circuit-types'; import { - type AztecAddress, - type CompleteAddress, - type EthAddress, - type Fr, - type FunctionSelector, - type Header, - type L1_TO_L2_MSG_TREE_HEIGHT, + AztecAddress, + CompleteAddress, + EthAddress, + Fr, + FunctionSelector, + Header, + L1_TO_L2_MSG_TREE_HEIGHT, } from '@aztec/circuits.js'; import { computeL1ToL2MessageNullifier } from '@aztec/circuits.js/hash'; -import { type FunctionArtifactWithDebugMetadata, getFunctionArtifactWithDebugMetadata } from '@aztec/foundation/abi'; +import { FunctionArtifactWithDebugMetadata, getFunctionArtifactWithDebugMetadata } from '@aztec/foundation/abi'; import { createDebugLogger } from '@aztec/foundation/log'; -import { type DBOracle, type KeyPair, MessageLoadOracleInputs } from '@aztec/simulator'; -import { type ContractInstance } from '@aztec/types/contracts'; +import { DBOracle, KeyPair, MessageLoadOracleInputs } from '@aztec/simulator'; +import { ContractInstance } from '@aztec/types/contracts'; -import { type ContractDataOracle } from '../contract_data_oracle/index.js'; -import { type PxeDatabase } from '../database/index.js'; +import { ContractDataOracle } from '../contract_data_oracle/index.js'; +import { PxeDatabase } from '../database/index.js'; /** * A data oracle that provides information needed for simulating a transaction. diff --git a/yarn-project/pxe/src/synchronizer/synchronizer.test.ts b/yarn-project/pxe/src/synchronizer/synchronizer.test.ts index 81f079c6b7e8..5de7f55dfb81 100644 --- a/yarn-project/pxe/src/synchronizer/synchronizer.test.ts +++ b/yarn-project/pxe/src/synchronizer/synchronizer.test.ts @@ -1,5 +1,5 @@ -import { type AztecNode, L2Block } from '@aztec/circuit-types'; -import { CompleteAddress, Fr, GrumpkinScalar, type Header, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js'; +import { AztecNode, L2Block } from '@aztec/circuit-types'; +import { CompleteAddress, Fr, GrumpkinScalar, Header, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js'; import { Grumpkin } from '@aztec/circuits.js/barretenberg'; import { makeHeader } from '@aztec/circuits.js/testing'; import { randomInt } from '@aztec/foundation/crypto'; @@ -7,9 +7,9 @@ import { SerialQueue } from '@aztec/foundation/fifo'; import { TestKeyStore } from '@aztec/key-store'; import { openTmpStore } from '@aztec/kv-store/utils'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; -import { type PxeDatabase } from '../database/index.js'; +import { 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 a73bc1416a22..7ae66192402b 100644 --- a/yarn-project/pxe/src/synchronizer/synchronizer.ts +++ b/yarn-project/pxe/src/synchronizer/synchronizer.ts @@ -1,20 +1,13 @@ -import { - type AztecNode, - type KeyStore, - L2BlockContext, - L2BlockL2Logs, - MerkleTreeId, - type TxHash, -} from '@aztec/circuit-types'; -import { type NoteProcessorCaughtUpStats } from '@aztec/circuit-types/stats'; -import { type AztecAddress, type Fr, INITIAL_L2_BLOCK_NUM, type PublicKey } from '@aztec/circuits.js'; -import { type SerialQueue } from '@aztec/foundation/fifo'; -import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log'; +import { AztecNode, KeyStore, L2BlockContext, L2BlockL2Logs, MerkleTreeId, TxHash } from '@aztec/circuit-types'; +import { NoteProcessorCaughtUpStats } from '@aztec/circuit-types/stats'; +import { AztecAddress, Fr, INITIAL_L2_BLOCK_NUM, PublicKey } from '@aztec/circuits.js'; +import { SerialQueue } from '@aztec/foundation/fifo'; +import { DebugLogger, createDebugLogger } from '@aztec/foundation/log'; import { RunningPromise } from '@aztec/foundation/running-promise'; -import { type DeferredNoteDao } from '../database/deferred_note_dao.js'; -import { type PxeDatabase } from '../database/index.js'; -import { type NoteDao } from '../database/note_dao.js'; +import { DeferredNoteDao } from '../database/deferred_note_dao.js'; +import { PxeDatabase } from '../database/index.js'; +import { NoteDao } from '../database/note_dao.js'; import { NoteProcessor } from '../note_processor/index.js'; /** diff --git a/yarn-project/scripts/src/benchmarks/aggregate.ts b/yarn-project/scripts/src/benchmarks/aggregate.ts index ac976e55050f..528dda9b2ca3 100644 --- a/yarn-project/scripts/src/benchmarks/aggregate.ts +++ b/yarn-project/scripts/src/benchmarks/aggregate.ts @@ -12,21 +12,21 @@ import { BENCHMARK_BLOCK_SIZES, BENCHMARK_HISTORY_BLOCK_SIZE, BENCHMARK_HISTORY_CHAIN_LENGTHS, - type BenchmarkMetricResults, - type BenchmarkResults, - type BenchmarkResultsWithTimestamp, - type CircuitSimulationStats, - type L1PublishStats, - type L2BlockBuiltStats, - type L2BlockHandledStats, - type MetricName, - type NodeSyncedChainHistoryStats, - type NoteProcessorCaughtUpStats, - type Stats, - type TreeInsertionStats, - type TxAddedToPoolStats, - type TxPXEProcessingStats, - type TxSequencerProcessingStats, + BenchmarkMetricResults, + BenchmarkResults, + BenchmarkResultsWithTimestamp, + CircuitSimulationStats, + L1PublishStats, + L2BlockBuiltStats, + L2BlockHandledStats, + MetricName, + NodeSyncedChainHistoryStats, + NoteProcessorCaughtUpStats, + Stats, + TreeInsertionStats, + TxAddedToPoolStats, + TxPXEProcessingStats, + TxSequencerProcessingStats, } from '@aztec/circuit-types/stats'; import { createConsoleLogger } from '@aztec/foundation/log'; @@ -228,15 +228,6 @@ function processEntry(entry: Stats, results: BenchmarkCollectedResults, fileName } } -function getBarretenbergMetric(context: { executable?: string }): MetricName | undefined { - if (context.executable?.includes('ultra_honk')) { - return 'ultrahonk_proving_time_in_ms'; - } else if (context.executable?.includes('client_ivc')) { - return 'client_ivc_proving_time_in_ms'; - } - return undefined; -} - /** Array of collected raw results for a given metric. */ type BenchmarkCollectedMetricResults = Record; @@ -278,28 +269,6 @@ export async function main() { } } - // Add google benchmark json files, which have data already averaged - const googleBenchmarkFiles = fs.readdirSync(LogsDir).filter(f => f.endsWith('.json')); - for (const file of googleBenchmarkFiles) { - const data = JSON.parse(fs.readFileSync(path.join(LogsDir, file), 'utf-8')); - if (!data.context || !data.benchmarks) { - log(`Invalid google benchmark file: ${file}`); - continue; - } - const metric = getBarretenbergMetric(data.context); - if (!metric) { - log(`Unknown executable in benchmark file ${file}: ${data.context.executable}`); - continue; - } - const circuitSize = '2^20'; // Where to load size from? - const value = data.benchmarks[0]?.real_time; - if (value === undefined) { - log(`Couldn't find real_time in benchmark file ${file}`); - continue; - } - results[metric] = { [circuitSize]: value }; - } - const timestampedResults: BenchmarkResultsWithTimestamp = { ...results, timestamp: new Date().toISOString() }; // Write results to disk diff --git a/yarn-project/scripts/src/benchmarks/markdown.ts b/yarn-project/scripts/src/benchmarks/markdown.ts index 85bbbe68cc37..2887805cfdcf 100644 --- a/yarn-project/scripts/src/benchmarks/markdown.ts +++ b/yarn-project/scripts/src/benchmarks/markdown.ts @@ -189,7 +189,6 @@ export function getMarkdown() { const metricsByClassesRegistered = Metrics.filter(m => m.groupBy === 'classes-registered').map(m => m.name); const metricsByFeePaymentMethod = Metrics.filter(m => m.groupBy === 'fee-payment-method').map(m => m.name); const metricsByLeafCount = Metrics.filter(m => m.groupBy === 'leaf-count').map(m => m.name); - const metricsByCircuitSize = Metrics.filter(m => m.groupBy === 'circuit-size-in-gates').map(m => m.name); const metricsTxPxeProcessing = Metrics.filter(m => m.name === 'tx_pxe_processing_time_ms').map(m => m.name); const metricsTxSeqProcessing = Metrics.filter(m => m.name === 'tx_sequencer_processing_time_ms').map(m => m.name); @@ -215,15 +214,10 @@ ${getWarningsSummary(benchmark, baseBenchmark)} Detailed results -Except for proving times, all benchmarks are run on txs on the \`Benchmarking\` contract on the repository. Each tx consists of a batch call to \`create_note\` and \`increment_balance\`, which guarantees that each tx has a private call, a nested private call, a public call, and a nested public call, as well as an emitted private note, an unencrypted log, and public storage read and write. +All benchmarks are run on txs on the \`Benchmarking\` contract on the repository. Each tx consists of a batch call to \`create_note\` and \`increment_balance\`, which guarantees that each tx has a private call, a nested private call, a public call, and a nested public call, as well as an emitted private note, an unencrypted log, and public storage read and write. ${prSourceDataText} ${baseCommitText} -### Proving times - -Average proving times for benchmarks measured in bb. -${getTableContent(pick(benchmark, metricsByCircuitSize), baseBenchmark, 'gates', 'Circuit')} - ### L2 block published to L1 Each column represents the number of txs on an L2 block published to L1. diff --git a/yarn-project/sequencer-client/src/client/sequencer-client.ts b/yarn-project/sequencer-client/src/client/sequencer-client.ts index 3cbf36567845..79a96f8fe14f 100644 --- a/yarn-project/sequencer-client/src/client/sequencer-client.ts +++ b/yarn-project/sequencer-client/src/client/sequencer-client.ts @@ -1,14 +1,14 @@ -import { type L1ToL2MessageSource, type L2BlockSource } from '@aztec/circuit-types'; -import { type BlockProver } from '@aztec/circuit-types/interfaces'; -import { type P2P } from '@aztec/p2p'; -import { type SimulationProvider } from '@aztec/simulator'; -import { type ContractDataSource } from '@aztec/types/contracts'; -import { type WorldStateSynchronizer } from '@aztec/world-state'; +import { L1ToL2MessageSource, L2BlockSource } from '@aztec/circuit-types'; +import { BlockProver } from '@aztec/circuit-types/interfaces'; +import { P2P } from '@aztec/p2p'; +import { SimulationProvider } from '@aztec/simulator'; +import { ContractDataSource } from '@aztec/types/contracts'; +import { WorldStateSynchronizer } from '@aztec/world-state'; -import { type SequencerClientConfig } from '../config.js'; +import { SequencerClientConfig } from '../config.js'; import { getGlobalVariableBuilder } from '../global_variable_builder/index.js'; import { getL1Publisher } from '../publisher/index.js'; -import { Sequencer, type SequencerConfig } from '../sequencer/index.js'; +import { Sequencer, SequencerConfig } from '../sequencer/index.js'; import { PublicProcessorFactory } from '../sequencer/public_processor.js'; import { TxValidatorFactory } from '../sequencer/tx_validator_factory.js'; diff --git a/yarn-project/sequencer-client/src/config.ts b/yarn-project/sequencer-client/src/config.ts index b86863b9393d..f54dabbe3a9e 100644 --- a/yarn-project/sequencer-client/src/config.ts +++ b/yarn-project/sequencer-client/src/config.ts @@ -1,12 +1,12 @@ import { AztecAddress, Fr } from '@aztec/circuits.js'; -import { type L1ContractAddresses, NULL_KEY } from '@aztec/ethereum'; +import { L1ContractAddresses, NULL_KEY } from '@aztec/ethereum'; import { EthAddress } from '@aztec/foundation/eth-address'; -import { type Hex } from 'viem'; +import { Hex } from 'viem'; -import { type GlobalReaderConfig } from './global_variable_builder/index.js'; -import { type PublisherConfig, type TxSenderConfig } from './publisher/config.js'; -import { type SequencerConfig } from './sequencer/config.js'; +import { GlobalReaderConfig } from './global_variable_builder/index.js'; +import { PublisherConfig, TxSenderConfig } from './publisher/config.js'; +import { SequencerConfig } from './sequencer/config.js'; /** Chain configuration. */ type ChainConfig = { diff --git a/yarn-project/sequencer-client/src/global_variable_builder/config.ts b/yarn-project/sequencer-client/src/global_variable_builder/config.ts index 156b0c38c939..2884374561a9 100644 --- a/yarn-project/sequencer-client/src/global_variable_builder/config.ts +++ b/yarn-project/sequencer-client/src/global_variable_builder/config.ts @@ -1,4 +1,4 @@ -import { type L1ContractAddresses } from '@aztec/ethereum'; +import { L1ContractAddresses } from '@aztec/ethereum'; /** * Configuration of the L1GlobalReader. 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 ea489d4dd3bd..2b6212b71daa 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 @@ -1,4 +1,4 @@ -import { type AztecAddress, type EthAddress, GlobalVariables } from '@aztec/circuits.js'; +import { AztecAddress, EthAddress, GlobalVariables } from '@aztec/circuits.js'; import { Fr } from '@aztec/foundation/fields'; import { createDebugLogger } from '@aztec/foundation/log'; diff --git a/yarn-project/sequencer-client/src/global_variable_builder/index.ts b/yarn-project/sequencer-client/src/global_variable_builder/index.ts index 7c762838e0aa..91ab6caecb8f 100644 --- a/yarn-project/sequencer-client/src/global_variable_builder/index.ts +++ b/yarn-project/sequencer-client/src/global_variable_builder/index.ts @@ -1,5 +1,5 @@ -import { type GlobalReaderConfig } from './config.js'; -import { type GlobalVariableBuilder, SimpleTestGlobalVariableBuilder } from './global_builder.js'; +import { GlobalReaderConfig } from './config.js'; +import { GlobalVariableBuilder, SimpleTestGlobalVariableBuilder } from './global_builder.js'; import { ViemReader } from './viem-reader.js'; export { SimpleTestGlobalVariableBuilder as SimpleGlobalVariableBuilder } from './global_builder.js'; diff --git a/yarn-project/sequencer-client/src/global_variable_builder/viem-reader.ts b/yarn-project/sequencer-client/src/global_variable_builder/viem-reader.ts index bb1acd8720c8..363e63ed8d11 100644 --- a/yarn-project/sequencer-client/src/global_variable_builder/viem-reader.ts +++ b/yarn-project/sequencer-client/src/global_variable_builder/viem-reader.ts @@ -2,18 +2,18 @@ import { createEthereumChain } from '@aztec/ethereum'; import { RollupAbi } from '@aztec/l1-artifacts'; import { - type GetContractReturnType, - type HttpTransport, - type PublicClient, + GetContractReturnType, + HttpTransport, + PublicClient, createPublicClient, getAddress, getContract, http, } from 'viem'; -import type * as chains from 'viem/chains'; +import * as chains from 'viem/chains'; -import { type GlobalReaderConfig } from './config.js'; -import { type L1GlobalReader } from './global_builder.js'; +import { GlobalReaderConfig } from './config.js'; +import { L1GlobalReader } from './global_builder.js'; /** * Reads values from L1 state using viem. diff --git a/yarn-project/sequencer-client/src/publisher/config.ts b/yarn-project/sequencer-client/src/publisher/config.ts index e78fa7c2d19d..96ad07bd6f15 100644 --- a/yarn-project/sequencer-client/src/publisher/config.ts +++ b/yarn-project/sequencer-client/src/publisher/config.ts @@ -1,4 +1,4 @@ -import { type L1ContractAddresses } from '@aztec/ethereum'; +import { L1ContractAddresses } from '@aztec/ethereum'; /** * The configuration of the rollup transaction publisher. diff --git a/yarn-project/sequencer-client/src/publisher/index.ts b/yarn-project/sequencer-client/src/publisher/index.ts index 529011d5005c..9fd03d258802 100644 --- a/yarn-project/sequencer-client/src/publisher/index.ts +++ b/yarn-project/sequencer-client/src/publisher/index.ts @@ -1,4 +1,4 @@ -import { type PublisherConfig, type TxSenderConfig } from './config.js'; +import { PublisherConfig, TxSenderConfig } from './config.js'; import { L1Publisher } from './l1-publisher.js'; import { ViemTxSender } from './viem-tx-sender.js'; diff --git a/yarn-project/sequencer-client/src/publisher/l1-publisher.test.ts b/yarn-project/sequencer-client/src/publisher/l1-publisher.test.ts index 9cedeee91223..d66e92757df0 100644 --- a/yarn-project/sequencer-client/src/publisher/l1-publisher.test.ts +++ b/yarn-project/sequencer-client/src/publisher/l1-publisher.test.ts @@ -1,9 +1,9 @@ import { L2Block } from '@aztec/circuit-types'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; import { sleep } from '../utils.js'; -import { L1Publisher, type L1PublisherTxSender, type MinimalTransactionReceipt } from './l1-publisher.js'; +import { L1Publisher, L1PublisherTxSender, MinimalTransactionReceipt } from './l1-publisher.js'; describe('L1Publisher', () => { let txSender: MockProxy; diff --git a/yarn-project/sequencer-client/src/publisher/l1-publisher.ts b/yarn-project/sequencer-client/src/publisher/l1-publisher.ts index c184a4fa4421..4fb6a11fcb2e 100644 --- a/yarn-project/sequencer-client/src/publisher/l1-publisher.ts +++ b/yarn-project/sequencer-client/src/publisher/l1-publisher.ts @@ -1,12 +1,12 @@ -import { type L2Block } from '@aztec/circuit-types'; -import { type L1PublishStats } from '@aztec/circuit-types/stats'; +import { L2Block } from '@aztec/circuit-types'; +import { L1PublishStats } from '@aztec/circuit-types/stats'; import { createDebugLogger } from '@aztec/foundation/log'; import { InterruptibleSleep } from '@aztec/foundation/sleep'; import pick from 'lodash.pick'; -import { type L2BlockReceiver } from '../receiver.js'; -import { type PublisherConfig } from './config.js'; +import { L2BlockReceiver } from '../receiver.js'; +import { PublisherConfig } from './config.js'; /** * Stats for a sent transaction. diff --git a/yarn-project/sequencer-client/src/publisher/viem-tx-sender.ts b/yarn-project/sequencer-client/src/publisher/viem-tx-sender.ts index 6691ac741da5..f703a22af69d 100644 --- a/yarn-project/sequencer-client/src/publisher/viem-tx-sender.ts +++ b/yarn-project/sequencer-client/src/publisher/viem-tx-sender.ts @@ -1,14 +1,14 @@ -import { type L2Block } from '@aztec/circuit-types'; +import { L2Block } from '@aztec/circuit-types'; import { createEthereumChain } from '@aztec/ethereum'; import { createDebugLogger } from '@aztec/foundation/log'; import { AvailabilityOracleAbi, RollupAbi } from '@aztec/l1-artifacts'; import { - type GetContractReturnType, - type Hex, - type HttpTransport, - type PublicClient, - type WalletClient, + GetContractReturnType, + Hex, + HttpTransport, + PublicClient, + WalletClient, createPublicClient, createWalletClient, getAddress, @@ -16,15 +16,15 @@ import { hexToBytes, http, } from 'viem'; -import { type PrivateKeyAccount, privateKeyToAccount } from 'viem/accounts'; +import { PrivateKeyAccount, privateKeyToAccount } from 'viem/accounts'; import * as chains from 'viem/chains'; -import { type TxSenderConfig } from './config.js'; +import { TxSenderConfig } from './config.js'; import { - type L1PublisherTxSender, - type MinimalTransactionReceipt, - type L1ProcessArgs as ProcessTxArgs, - type TransactionStats, + L1PublisherTxSender, + MinimalTransactionReceipt, + L1ProcessArgs as ProcessTxArgs, + TransactionStats, } from './l1-publisher.js'; /** diff --git a/yarn-project/sequencer-client/src/receiver.ts b/yarn-project/sequencer-client/src/receiver.ts index 07db079ba338..f731a8f85048 100644 --- a/yarn-project/sequencer-client/src/receiver.ts +++ b/yarn-project/sequencer-client/src/receiver.ts @@ -1,4 +1,4 @@ -import { type L2Block } from '@aztec/circuit-types'; +import { L2Block } from '@aztec/circuit-types'; /** * Given the necessary rollup data, verifies it, and updates the underlying state accordingly to advance the state of the system. diff --git a/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts index edb65cc32ee1..6508ec266184 100644 --- a/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts +++ b/yarn-project/sequencer-client/src/sequencer/abstract_phase_manager.ts @@ -1,12 +1,12 @@ -import { MerkleTreeId, type SimulationError, type Tx, type UnencryptedFunctionL2Logs } from '@aztec/circuit-types'; +import { MerkleTreeId, SimulationError, Tx, UnencryptedFunctionL2Logs } from '@aztec/circuit-types'; import { AztecAddress, CallRequest, ContractStorageRead, ContractStorageUpdateRequest, Fr, - type GlobalVariables, - type Header, + GlobalVariables, + Header, L2ToL1Message, MAX_NEW_L2_TO_L1_MSGS_PER_CALL, MAX_NEW_NOTE_HASHES_PER_CALL, @@ -20,16 +20,16 @@ import { MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL, MAX_REVERTIBLE_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MembershipWitness, - type PrivateKernelTailCircuitPublicInputs, - type Proof, + PrivateKernelTailCircuitPublicInputs, + Proof, PublicCallData, - type PublicCallRequest, + PublicCallRequest, PublicCallStackItem, PublicCircuitPublicInputs, PublicDataRead, PublicDataUpdateRequest, PublicKernelCircuitPrivateInputs, - type PublicKernelCircuitPublicInputs, + PublicKernelCircuitPublicInputs, PublicKernelData, PublicKernelTailCircuitPrivateInputs, RETURN_VALUES_LENGTH, @@ -43,19 +43,19 @@ import { } from '@aztec/circuits.js'; import { computeVarArgsHash } from '@aztec/circuits.js/hash'; import { arrayNonEmptyLength, padArrayEnd } from '@aztec/foundation/collection'; -import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log'; -import { type Tuple } from '@aztec/foundation/serialize'; +import { DebugLogger, createDebugLogger } from '@aztec/foundation/log'; +import { Tuple } from '@aztec/foundation/serialize'; import { - type PublicExecution, - type PublicExecutionResult, - type PublicExecutor, + PublicExecution, + PublicExecutionResult, + PublicExecutor, collectPublicDataReads, collectPublicDataUpdateRequests, isPublicExecutionResult, } from '@aztec/simulator'; -import { type MerkleTreeOperations } from '@aztec/world-state'; +import { MerkleTreeOperations } from '@aztec/world-state'; -import { type PublicKernelCircuitSimulator } from '../simulator/index.js'; +import { PublicKernelCircuitSimulator } from '../simulator/index.js'; import { HintsBuilder } from './hints_builder.js'; import { lastSideEffectCounter } from './utils.js'; diff --git a/yarn-project/sequencer-client/src/sequencer/app_logic_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/app_logic_phase_manager.ts index e09fe0051faf..9ba3cf971963 100644 --- a/yarn-project/sequencer-client/src/sequencer/app_logic_phase_manager.ts +++ b/yarn-project/sequencer-client/src/sequencer/app_logic_phase_manager.ts @@ -1,15 +1,10 @@ -import { type Tx } from '@aztec/circuit-types'; -import { - type GlobalVariables, - type Header, - type Proof, - type PublicKernelCircuitPublicInputs, -} from '@aztec/circuits.js'; -import { type PublicExecutor, type PublicStateDB } from '@aztec/simulator'; -import { type MerkleTreeOperations } from '@aztec/world-state'; +import { Tx } from '@aztec/circuit-types'; +import { GlobalVariables, Header, Proof, PublicKernelCircuitPublicInputs } from '@aztec/circuits.js'; +import { PublicExecutor, PublicStateDB } from '@aztec/simulator'; +import { MerkleTreeOperations } from '@aztec/world-state'; -import { type PublicKernelCircuitSimulator } from '../simulator/index.js'; -import { type ContractsDataSourcePublicDB } from '../simulator/public_executor.js'; +import { PublicKernelCircuitSimulator } from '../simulator/index.js'; +import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js'; import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js'; /** diff --git a/yarn-project/sequencer-client/src/sequencer/hints_builder.ts b/yarn-project/sequencer-client/src/sequencer/hints_builder.ts index 61e28fc5dcfc..0a92e862e958 100644 --- a/yarn-project/sequencer-client/src/sequencer/hints_builder.ts +++ b/yarn-project/sequencer-client/src/sequencer/hints_builder.ts @@ -1,21 +1,21 @@ import { MerkleTreeId } from '@aztec/circuit-types'; import { - type Fr, + Fr, MAX_NEW_NULLIFIERS_PER_TX, - type MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX, - type MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX, - type MAX_NULLIFIER_READ_REQUESTS_PER_TX, - type MAX_REVERTIBLE_NULLIFIERS_PER_TX, + MAX_NON_REVERTIBLE_NULLIFIERS_PER_TX, + MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX, + MAX_NULLIFIER_READ_REQUESTS_PER_TX, + MAX_REVERTIBLE_NULLIFIERS_PER_TX, MembershipWitness, NULLIFIER_TREE_HEIGHT, - type ReadRequestContext, - type SideEffectLinkedToNoteHash, + ReadRequestContext, + SideEffectLinkedToNoteHash, buildNullifierNonExistentReadRequestHints, buildNullifierReadRequestHints, concatAccumulatedData, } from '@aztec/circuits.js'; -import { type Tuple } from '@aztec/foundation/serialize'; -import { type MerkleTreeOperations } from '@aztec/world-state'; +import { Tuple } from '@aztec/foundation/serialize'; +import { MerkleTreeOperations } from '@aztec/world-state'; export class HintsBuilder { constructor(private db: MerkleTreeOperations) {} diff --git a/yarn-project/sequencer-client/src/sequencer/phase_manager_factory.ts b/yarn-project/sequencer-client/src/sequencer/phase_manager_factory.ts index d2e3ec594a4b..9c34ee17e1dd 100644 --- a/yarn-project/sequencer-client/src/sequencer/phase_manager_factory.ts +++ b/yarn-project/sequencer-client/src/sequencer/phase_manager_factory.ts @@ -1,11 +1,11 @@ -import { type Tx } from '@aztec/circuit-types'; -import { type GlobalVariables, type Header, type PublicKernelCircuitPublicInputs } from '@aztec/circuits.js'; -import { type PublicExecutor, type PublicStateDB } from '@aztec/simulator'; -import { type MerkleTreeOperations } from '@aztec/world-state'; +import { Tx } from '@aztec/circuit-types'; +import { GlobalVariables, Header, PublicKernelCircuitPublicInputs } from '@aztec/circuits.js'; +import { PublicExecutor, PublicStateDB } from '@aztec/simulator'; +import { MerkleTreeOperations } from '@aztec/world-state'; -import { type PublicKernelCircuitSimulator } from '../simulator/index.js'; -import { type ContractsDataSourcePublicDB } from '../simulator/public_executor.js'; -import { type AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js'; +import { PublicKernelCircuitSimulator } from '../simulator/index.js'; +import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js'; +import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js'; import { AppLogicPhaseManager } from './app_logic_phase_manager.js'; import { SetupPhaseManager } from './setup_phase_manager.js'; import { TailPhaseManager } from './tail_phase_manager.js'; diff --git a/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts b/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts index 592fe9019a53..7044472cb53b 100644 --- a/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts +++ b/yarn-project/sequencer-client/src/sequencer/public_processor.test.ts @@ -1,7 +1,7 @@ import { EncryptedTxL2Logs, - type FunctionCall, - type ProcessedTx, + FunctionCall, + ProcessedTx, PublicDataWrite, SiblingPath, SimulationError, @@ -13,7 +13,7 @@ import { } from '@aztec/circuit-types'; import { ARGS_LENGTH, - type AztecAddress, + AztecAddress, CallContext, CallRequest, ContractStorageUpdateRequest, @@ -26,11 +26,11 @@ import { MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, PUBLIC_DATA_TREE_HEIGHT, - type PrivateKernelTailCircuitPublicInputs, - type Proof, + PrivateKernelTailCircuitPublicInputs, + Proof, PublicAccumulatedNonRevertibleData, PublicAccumulatedRevertibleData, - type PublicCallRequest, + PublicCallRequest, PublicKernelCircuitPublicInputs, ValidationRequests, makeEmptyProof, @@ -45,14 +45,14 @@ import { } from '@aztec/circuits.js/testing'; import { makeTuple } from '@aztec/foundation/array'; import { arrayNonEmptyLength, padArrayEnd, times } from '@aztec/foundation/collection'; -import { type PublicExecution, type PublicExecutionResult, type PublicExecutor, WASMSimulator } from '@aztec/simulator'; -import { type MerkleTreeOperations, type TreeInfo } from '@aztec/world-state'; +import { PublicExecution, PublicExecutionResult, PublicExecutor, WASMSimulator } from '@aztec/simulator'; +import { MerkleTreeOperations, TreeInfo } from '@aztec/world-state'; import { jest } from '@jest/globals'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; -import { type PublicKernelCircuitSimulator } from '../simulator/index.js'; -import { type ContractsDataSourcePublicDB, type WorldStatePublicDB } from '../simulator/public_executor.js'; +import { PublicKernelCircuitSimulator } from '../simulator/index.js'; +import { ContractsDataSourcePublicDB, WorldStatePublicDB } from '../simulator/public_executor.js'; import { RealPublicKernelCircuitSimulator } from '../simulator/public_kernel.js'; import { PublicProcessor } from './public_processor.js'; diff --git a/yarn-project/sequencer-client/src/sequencer/public_processor.ts b/yarn-project/sequencer-client/src/sequencer/public_processor.ts index 064d0c45b4df..bb0b3dfe93aa 100644 --- a/yarn-project/sequencer-client/src/sequencer/public_processor.ts +++ b/yarn-project/sequencer-client/src/sequencer/public_processor.ts @@ -1,7 +1,7 @@ import { - type FailedTx, - type ProcessedTx, - type SimulationError, + FailedTx, + ProcessedTx, + SimulationError, Tx, getPreviousOutputAndProof, makeEmptyProcessedTx, @@ -9,18 +9,18 @@ import { toTxEffect, validateProcessedTx, } from '@aztec/circuit-types'; -import { type TxSequencerProcessingStats } from '@aztec/circuit-types/stats'; -import { type GlobalVariables, type Header } from '@aztec/circuits.js'; +import { TxSequencerProcessingStats } from '@aztec/circuit-types/stats'; +import { GlobalVariables, Header } from '@aztec/circuits.js'; import { createDebugLogger } from '@aztec/foundation/log'; import { Timer } from '@aztec/foundation/timer'; -import { PublicExecutor, type PublicStateDB, type SimulationProvider } from '@aztec/simulator'; -import { type ContractDataSource } from '@aztec/types/contracts'; -import { type MerkleTreeOperations } from '@aztec/world-state'; +import { PublicExecutor, PublicStateDB, SimulationProvider } from '@aztec/simulator'; +import { ContractDataSource } from '@aztec/types/contracts'; +import { MerkleTreeOperations } from '@aztec/world-state'; -import { type PublicKernelCircuitSimulator } from '../simulator/index.js'; +import { PublicKernelCircuitSimulator } from '../simulator/index.js'; import { ContractsDataSourcePublicDB, WorldStateDB, WorldStatePublicDB } from '../simulator/public_executor.js'; import { RealPublicKernelCircuitSimulator } from '../simulator/public_kernel.js'; -import { type AbstractPhaseManager } from './abstract_phase_manager.js'; +import { AbstractPhaseManager } from './abstract_phase_manager.js'; import { PhaseManagerFactory } from './phase_manager_factory.js'; /** diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts index 49d0b0748249..ed46187cd94c 100644 --- a/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts +++ b/yarn-project/sequencer-client/src/sequencer/sequencer.test.ts @@ -1,12 +1,12 @@ import { - type L1ToL2MessageSource, + L1ToL2MessageSource, L2Block, - type L2BlockSource, + L2BlockSource, MerkleTreeId, PROVING_STATUS, - type ProverClient, - type ProvingSuccess, - type ProvingTicket, + ProverClient, + ProvingSuccess, + ProvingTicket, makeEmptyProcessedTx, makeProcessedTx, mockTx, @@ -20,15 +20,15 @@ import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, makeEmptyProof, } from '@aztec/circuits.js'; -import { type P2P, P2PClientState } from '@aztec/p2p'; -import { type ContractDataSource } from '@aztec/types/contracts'; -import { type MerkleTreeOperations, WorldStateRunningState, type WorldStateSynchronizer } from '@aztec/world-state'; +import { P2P, P2PClientState } from '@aztec/p2p'; +import { ContractDataSource } from '@aztec/types/contracts'; +import { MerkleTreeOperations, WorldStateRunningState, WorldStateSynchronizer } from '@aztec/world-state'; -import { type MockProxy, mock, mockFn } from 'jest-mock-extended'; +import { MockProxy, mock, mockFn } from 'jest-mock-extended'; -import { type GlobalVariableBuilder } from '../global_variable_builder/global_builder.js'; -import { type L1Publisher } from '../index.js'; -import { type PublicProcessor, type PublicProcessorFactory } from './public_processor.js'; +import { GlobalVariableBuilder } from '../global_variable_builder/global_builder.js'; +import { L1Publisher } from '../index.js'; +import { PublicProcessor, PublicProcessorFactory } from './public_processor.js'; import { Sequencer } from './sequencer.js'; import { TxValidatorFactory } from './tx_validator_factory.js'; diff --git a/yarn-project/sequencer-client/src/sequencer/sequencer.ts b/yarn-project/sequencer-client/src/sequencer/sequencer.ts index 7976b9ae6fb7..4823f48d3fa6 100644 --- a/yarn-project/sequencer-client/src/sequencer/sequencer.ts +++ b/yarn-project/sequencer-client/src/sequencer/sequencer.ts @@ -1,20 +1,20 @@ -import { type L1ToL2MessageSource, type L2Block, type L2BlockSource, type ProcessedTx, Tx } from '@aztec/circuit-types'; -import { type BlockProver, PROVING_STATUS } from '@aztec/circuit-types/interfaces'; -import { type L2BlockBuiltStats } from '@aztec/circuit-types/stats'; -import { AztecAddress, EthAddress, type GlobalVariables } from '@aztec/circuits.js'; +import { L1ToL2MessageSource, L2Block, L2BlockSource, ProcessedTx, Tx } from '@aztec/circuit-types'; +import { BlockProver, PROVING_STATUS } from '@aztec/circuit-types/interfaces'; +import { L2BlockBuiltStats } from '@aztec/circuit-types/stats'; +import { AztecAddress, EthAddress, GlobalVariables } from '@aztec/circuits.js'; import { Fr } from '@aztec/foundation/fields'; import { createDebugLogger } from '@aztec/foundation/log'; import { RunningPromise } from '@aztec/foundation/running-promise'; import { Timer, elapsed } from '@aztec/foundation/timer'; -import { type P2P } from '@aztec/p2p'; -import { type WorldStateStatus, type WorldStateSynchronizer } from '@aztec/world-state'; - -import { type GlobalVariableBuilder } from '../global_variable_builder/global_builder.js'; -import { type L1Publisher } from '../publisher/l1-publisher.js'; -import { type SequencerConfig } from './config.js'; -import { type PublicProcessorFactory } from './public_processor.js'; -import { type TxValidator } from './tx_validator.js'; -import { type TxValidatorFactory } from './tx_validator_factory.js'; +import { P2P } from '@aztec/p2p'; +import { WorldStateStatus, WorldStateSynchronizer } from '@aztec/world-state'; + +import { GlobalVariableBuilder } from '../global_variable_builder/global_builder.js'; +import { L1Publisher } from '../publisher/l1-publisher.js'; +import { SequencerConfig } from './config.js'; +import { PublicProcessorFactory } from './public_processor.js'; +import { TxValidator } from './tx_validator.js'; +import { TxValidatorFactory } from './tx_validator_factory.js'; /** * Sequencer client diff --git a/yarn-project/sequencer-client/src/sequencer/setup_phase_manager.test.ts b/yarn-project/sequencer-client/src/sequencer/setup_phase_manager.test.ts index aa26bad1583c..9b198177c624 100644 --- a/yarn-project/sequencer-client/src/sequencer/setup_phase_manager.test.ts +++ b/yarn-project/sequencer-client/src/sequencer/setup_phase_manager.test.ts @@ -7,14 +7,14 @@ import { MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, } from '@aztec/circuits.js'; import { makeTuple } from '@aztec/foundation/array'; -import { type PublicExecutor } from '@aztec/simulator'; -import { type MerkleTreeOperations, type TreeInfo } from '@aztec/world-state'; +import { PublicExecutor } from '@aztec/simulator'; +import { MerkleTreeOperations, TreeInfo } from '@aztec/world-state'; import { it } from '@jest/globals'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; -import { type PublicKernelCircuitSimulator } from '../simulator/index.js'; -import { type ContractsDataSourcePublicDB, type WorldStatePublicDB } from '../simulator/public_executor.js'; +import { PublicKernelCircuitSimulator } from '../simulator/index.js'; +import { ContractsDataSourcePublicDB, WorldStatePublicDB } from '../simulator/public_executor.js'; import { SetupPhaseManager } from './setup_phase_manager.js'; class TestSetupPhaseManager extends SetupPhaseManager { diff --git a/yarn-project/sequencer-client/src/sequencer/setup_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/setup_phase_manager.ts index c491843436c3..76da4e232a66 100644 --- a/yarn-project/sequencer-client/src/sequencer/setup_phase_manager.ts +++ b/yarn-project/sequencer-client/src/sequencer/setup_phase_manager.ts @@ -1,15 +1,10 @@ -import { type Tx } from '@aztec/circuit-types'; -import { - type GlobalVariables, - type Header, - type Proof, - type PublicKernelCircuitPublicInputs, -} from '@aztec/circuits.js'; -import { type PublicExecutor, type PublicStateDB } from '@aztec/simulator'; -import { type MerkleTreeOperations } from '@aztec/world-state'; +import { Tx } from '@aztec/circuit-types'; +import { GlobalVariables, Header, Proof, PublicKernelCircuitPublicInputs } from '@aztec/circuits.js'; +import { PublicExecutor, PublicStateDB } from '@aztec/simulator'; +import { MerkleTreeOperations } from '@aztec/world-state'; -import { type PublicKernelCircuitSimulator } from '../simulator/index.js'; -import { type ContractsDataSourcePublicDB } from '../simulator/public_executor.js'; +import { PublicKernelCircuitSimulator } from '../simulator/index.js'; +import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js'; import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js'; /** diff --git a/yarn-project/sequencer-client/src/sequencer/tail_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/tail_phase_manager.ts index 684931c30a72..0fe236452d97 100644 --- a/yarn-project/sequencer-client/src/sequencer/tail_phase_manager.ts +++ b/yarn-project/sequencer-client/src/sequencer/tail_phase_manager.ts @@ -1,15 +1,10 @@ -import { type Tx } from '@aztec/circuit-types'; -import { - type GlobalVariables, - type Header, - type Proof, - type PublicKernelCircuitPublicInputs, -} from '@aztec/circuits.js'; -import { type PublicExecutor, type PublicStateDB } from '@aztec/simulator'; -import { type MerkleTreeOperations } from '@aztec/world-state'; +import { Tx } from '@aztec/circuit-types'; +import { GlobalVariables, Header, Proof, PublicKernelCircuitPublicInputs } from '@aztec/circuits.js'; +import { PublicExecutor, PublicStateDB } from '@aztec/simulator'; +import { MerkleTreeOperations } from '@aztec/world-state'; -import { type PublicKernelCircuitSimulator } from '../simulator/index.js'; -import { type ContractsDataSourcePublicDB } from '../simulator/public_executor.js'; +import { PublicKernelCircuitSimulator } from '../simulator/index.js'; +import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js'; import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js'; export class TailPhaseManager extends AbstractPhaseManager { diff --git a/yarn-project/sequencer-client/src/sequencer/teardown_phase_manager.ts b/yarn-project/sequencer-client/src/sequencer/teardown_phase_manager.ts index 62cd6bfdf3b0..ddaaa7c8943e 100644 --- a/yarn-project/sequencer-client/src/sequencer/teardown_phase_manager.ts +++ b/yarn-project/sequencer-client/src/sequencer/teardown_phase_manager.ts @@ -1,15 +1,10 @@ -import { type Tx } from '@aztec/circuit-types'; -import { - type GlobalVariables, - type Header, - type Proof, - type PublicKernelCircuitPublicInputs, -} from '@aztec/circuits.js'; -import { type PublicExecutor, type PublicStateDB } from '@aztec/simulator'; -import { type MerkleTreeOperations } from '@aztec/world-state'; +import { Tx } from '@aztec/circuit-types'; +import { GlobalVariables, Header, Proof, PublicKernelCircuitPublicInputs } from '@aztec/circuits.js'; +import { PublicExecutor, PublicStateDB } from '@aztec/simulator'; +import { MerkleTreeOperations } from '@aztec/world-state'; -import { type PublicKernelCircuitSimulator } from '../simulator/index.js'; -import { type ContractsDataSourcePublicDB } from '../simulator/public_executor.js'; +import { PublicKernelCircuitSimulator } from '../simulator/index.js'; +import { ContractsDataSourcePublicDB } from '../simulator/public_executor.js'; import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js'; /** diff --git a/yarn-project/sequencer-client/src/sequencer/tx_validator.test.ts b/yarn-project/sequencer-client/src/sequencer/tx_validator.test.ts index 8336bd316192..a9f13a430790 100644 --- a/yarn-project/sequencer-client/src/sequencer/tx_validator.test.ts +++ b/yarn-project/sequencer-client/src/sequencer/tx_validator.test.ts @@ -1,13 +1,13 @@ import { mockTx as baseMockTx } from '@aztec/circuit-types'; import { - type AztecAddress, + AztecAddress, CallContext, CallRequest, EthAddress, Fr, FunctionData, FunctionSelector, - type GlobalVariables, + GlobalVariables, MAX_NON_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_REVERTIBLE_PUBLIC_CALL_STACK_LENGTH_PER_TX, PublicCallRequest, @@ -16,11 +16,11 @@ import { makeAztecAddress, makeGlobalVariables } from '@aztec/circuits.js/testin import { makeTuple } from '@aztec/foundation/array'; import { pedersenHash } from '@aztec/foundation/crypto'; import { getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token'; -import { type ContractDataSource } from '@aztec/types/contracts'; +import { ContractDataSource } from '@aztec/types/contracts'; -import { type MockProxy, mock, mockFn } from 'jest-mock-extended'; +import { MockProxy, mock, mockFn } from 'jest-mock-extended'; -import { type NullifierSource, type PublicStateSource, TxValidator } from './tx_validator.js'; +import { NullifierSource, PublicStateSource, TxValidator } from './tx_validator.js'; describe('TxValidator', () => { let validator: TxValidator; diff --git a/yarn-project/sequencer-client/src/sequencer/tx_validator.ts b/yarn-project/sequencer-client/src/sequencer/tx_validator.ts index 5460aab82e39..ac5869655868 100644 --- a/yarn-project/sequencer-client/src/sequencer/tx_validator.ts +++ b/yarn-project/sequencer-client/src/sequencer/tx_validator.ts @@ -1,15 +1,9 @@ -import { type ProcessedTx, Tx } from '@aztec/circuit-types'; -import { - type AztecAddress, - type EthAddress, - Fr, - type GlobalVariables, - type PublicCallRequest, -} from '@aztec/circuits.js'; +import { ProcessedTx, Tx } from '@aztec/circuit-types'; +import { AztecAddress, EthAddress, Fr, GlobalVariables, PublicCallRequest } from '@aztec/circuits.js'; import { pedersenHash } from '@aztec/foundation/crypto'; -import { type Logger, createDebugLogger } from '@aztec/foundation/log'; +import { Logger, createDebugLogger } from '@aztec/foundation/log'; import { getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token'; -import { type ContractDataSource } from '@aztec/types/contracts'; +import { ContractDataSource } from '@aztec/types/contracts'; import { AbstractPhaseManager, PublicKernelPhase } from './abstract_phase_manager.js'; diff --git a/yarn-project/sequencer-client/src/sequencer/tx_validator_factory.ts b/yarn-project/sequencer-client/src/sequencer/tx_validator_factory.ts index 6608071edb91..75a7a7b2ce37 100644 --- a/yarn-project/sequencer-client/src/sequencer/tx_validator_factory.ts +++ b/yarn-project/sequencer-client/src/sequencer/tx_validator_factory.ts @@ -1,6 +1,6 @@ -import { type AztecAddress, type EthAddress, type Fr, type GlobalVariables } from '@aztec/circuits.js'; -import { type ContractDataSource } from '@aztec/types/contracts'; -import { type MerkleTreeOperations } from '@aztec/world-state'; +import { AztecAddress, EthAddress, Fr, GlobalVariables } from '@aztec/circuits.js'; +import { ContractDataSource } from '@aztec/types/contracts'; +import { MerkleTreeOperations } from '@aztec/world-state'; import { WorldStateDB, WorldStatePublicDB } from '../simulator/public_executor.js'; import { TxValidator } from './tx_validator.js'; diff --git a/yarn-project/sequencer-client/src/sequencer/utils.ts b/yarn-project/sequencer-client/src/sequencer/utils.ts index 8dbc45241f87..0780dd2d05fd 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 Tx } from '@aztec/circuit-types'; +import { Tx } from '@aztec/circuit-types'; import { CallRequest } from '@aztec/circuits.js'; /** diff --git a/yarn-project/sequencer-client/src/simulator/index.ts b/yarn-project/sequencer-client/src/simulator/index.ts index 0991a64755fc..ba9106b6b1a4 100644 --- a/yarn-project/sequencer-client/src/simulator/index.ts +++ b/yarn-project/sequencer-client/src/simulator/index.ts @@ -1,7 +1,7 @@ import { - type PublicKernelCircuitPrivateInputs, - type PublicKernelCircuitPublicInputs, - type PublicKernelTailCircuitPrivateInputs, + PublicKernelCircuitPrivateInputs, + PublicKernelCircuitPublicInputs, + PublicKernelTailCircuitPrivateInputs, } from '@aztec/circuits.js'; /** diff --git a/yarn-project/sequencer-client/src/simulator/public_executor.ts b/yarn-project/sequencer-client/src/simulator/public_executor.ts index d943af10530f..6ff7728fb1d8 100644 --- a/yarn-project/sequencer-client/src/simulator/public_executor.ts +++ b/yarn-project/sequencer-client/src/simulator/public_executor.ts @@ -1,31 +1,22 @@ -import { MerkleTreeId, NullifierMembershipWitness, type Tx } from '@aztec/circuit-types'; +import { MerkleTreeId, NullifierMembershipWitness, Tx } from '@aztec/circuit-types'; import { - type AztecAddress, + AztecAddress, ContractClassRegisteredEvent, ContractInstanceDeployedEvent, - type EthAddress, + EthAddress, Fr, - type FunctionSelector, - type L1_TO_L2_MSG_TREE_HEIGHT, - type NULLIFIER_TREE_HEIGHT, - type NullifierLeafPreimage, - type PublicDataTreeLeafPreimage, + FunctionSelector, + L1_TO_L2_MSG_TREE_HEIGHT, + NULLIFIER_TREE_HEIGHT, + NullifierLeafPreimage, + PublicDataTreeLeafPreimage, } from '@aztec/circuits.js'; import { computeL1ToL2MessageNullifier, computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash'; import { createDebugLogger } from '@aztec/foundation/log'; import { getCanonicalClassRegistererAddress } from '@aztec/protocol-contracts/class-registerer'; -import { - type CommitmentsDB, - MessageLoadOracleInputs, - type PublicContractsDB, - type PublicStateDB, -} from '@aztec/simulator'; -import { - type ContractClassPublic, - type ContractDataSource, - type ContractInstanceWithAddress, -} from '@aztec/types/contracts'; -import { type MerkleTreeOperations } from '@aztec/world-state'; +import { CommitmentsDB, MessageLoadOracleInputs, PublicContractsDB, PublicStateDB } from '@aztec/simulator'; +import { ContractClassPublic, ContractDataSource, ContractInstanceWithAddress } from '@aztec/types/contracts'; +import { MerkleTreeOperations } from '@aztec/world-state'; /** * Implements the PublicContractsDB using a ContractDataSource. diff --git a/yarn-project/sequencer-client/src/simulator/public_kernel.ts b/yarn-project/sequencer-client/src/simulator/public_kernel.ts index 3cf576f29812..c60e74b63aea 100644 --- a/yarn-project/sequencer-client/src/simulator/public_kernel.ts +++ b/yarn-project/sequencer-client/src/simulator/public_kernel.ts @@ -1,8 +1,8 @@ -import { type CircuitSimulationStats } from '@aztec/circuit-types/stats'; +import { CircuitSimulationStats } from '@aztec/circuit-types/stats'; import { - type PublicKernelCircuitPrivateInputs, - type PublicKernelCircuitPublicInputs, - type PublicKernelTailCircuitPrivateInputs, + PublicKernelCircuitPrivateInputs, + PublicKernelCircuitPublicInputs, + PublicKernelTailCircuitPrivateInputs, } from '@aztec/circuits.js'; import { createDebugLogger } from '@aztec/foundation/log'; import { elapsed } from '@aztec/foundation/timer'; @@ -20,9 +20,9 @@ import { convertPublicTeardownRollupInputsToWitnessMap, convertPublicTeardownRollupOutputFromWitnessMap, } from '@aztec/noir-protocol-circuits-types'; -import { type SimulationProvider, WASMSimulator } from '@aztec/simulator'; +import { SimulationProvider, WASMSimulator } from '@aztec/simulator'; -import { type PublicKernelCircuitSimulator } from './index.js'; +import { PublicKernelCircuitSimulator } from './index.js'; /** * Implements the PublicKernelCircuitSimulator. diff --git a/yarn-project/sequencer-client/src/simulator/world_state_public_db.test.ts b/yarn-project/sequencer-client/src/simulator/world_state_public_db.test.ts index 42a4d2576ae2..d33e8a06d564 100644 --- a/yarn-project/sequencer-client/src/simulator/world_state_public_db.test.ts +++ b/yarn-project/sequencer-client/src/simulator/world_state_public_db.test.ts @@ -1,10 +1,10 @@ import { MerkleTreeId } from '@aztec/circuit-types'; import { AztecAddress, Fr, PublicDataTreeLeafPreimage } from '@aztec/circuits.js'; import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash'; -import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; -import { type MerkleTreeOperations } from '@aztec/world-state'; +import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import { MerkleTreeOperations } from '@aztec/world-state'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; import { WorldStatePublicDB } from './public_executor.js'; diff --git a/yarn-project/simulator/src/acvm/acvm.ts b/yarn-project/simulator/src/acvm/acvm.ts index d33a660e92e7..ffa53b6ad051 100644 --- a/yarn-project/simulator/src/acvm/acvm.ts +++ b/yarn-project/simulator/src/acvm/acvm.ts @@ -1,18 +1,18 @@ -import { type NoirCallStack, type SourceCodeLocation } from '@aztec/circuit-types'; -import { type FunctionDebugMetadata, type OpcodeLocation } from '@aztec/foundation/abi'; +import { NoirCallStack, SourceCodeLocation } from '@aztec/circuit-types'; +import { FunctionDebugMetadata, OpcodeLocation } from '@aztec/foundation/abi'; import { createDebugLogger } from '@aztec/foundation/log'; import { - type ExecutionError, - type ForeignCallInput, - type ForeignCallOutput, - type WasmBlackBoxFunctionSolver, + ExecutionError, + ForeignCallInput, + ForeignCallOutput, + WasmBlackBoxFunctionSolver, executeCircuitWithBlackBoxSolver, } from '@noir-lang/acvm_js'; import { traverseCauseChain } from '../common/errors.js'; -import { type ACVMWitness } from './acvm_types.js'; -import { type ORACLE_NAMES } from './oracle/index.js'; +import { ACVMWitness } from './acvm_types.js'; +import { 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..d155d6680489 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 { 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 74701582330e..6a04ec9e5b0d 100644 --- a/yarn-project/simulator/src/acvm/deserialize.ts +++ b/yarn-project/simulator/src/acvm/deserialize.ts @@ -2,7 +2,7 @@ import { Fr } from '@aztec/foundation/fields'; import { getReturnWitness } from '@noir-lang/acvm_js'; -import { type ACVMField, type ACVMWitness } from './acvm_types.js'; +import { ACVMField, ACVMWitness } from './acvm_types.js'; /** * Converts an ACVM field to a Fr. diff --git a/yarn-project/simulator/src/acvm/oracle/debug.ts b/yarn-project/simulator/src/acvm/oracle/debug.ts index 655584512e98..e3080d16ac1f 100644 --- a/yarn-project/simulator/src/acvm/oracle/debug.ts +++ b/yarn-project/simulator/src/acvm/oracle/debug.ts @@ -1,6 +1,6 @@ -import { type ForeignCallInput } from '@noir-lang/acvm_js'; +import { ForeignCallInput } from '@noir-lang/acvm_js'; -import { type ACVMField } from '../acvm_types.js'; +import { ACVMField } from '../acvm_types.js'; /** * Convert an array of ACVMFields to a string. diff --git a/yarn-project/simulator/src/acvm/oracle/index.ts b/yarn-project/simulator/src/acvm/oracle/index.ts index a89ffce2a1ba..56f45c81f705 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 { Oracle } from './oracle.js'; export * from './debug.js'; export * from './oracle.js'; diff --git a/yarn-project/simulator/src/acvm/oracle/oracle.ts b/yarn-project/simulator/src/acvm/oracle/oracle.ts index 9266daff20ed..812c41bc0689 100644 --- a/yarn-project/simulator/src/acvm/oracle/oracle.ts +++ b/yarn-project/simulator/src/acvm/oracle/oracle.ts @@ -6,11 +6,11 @@ import { padArrayEnd } from '@aztec/foundation/collection'; import { Fr, Point } from '@aztec/foundation/fields'; import { createDebugLogger } from '@aztec/foundation/log'; -import { type ACVMField } from '../acvm_types.js'; +import { ACVMField } from '../acvm_types.js'; import { frToBoolean, frToNumber, fromACVMField } from '../deserialize.js'; import { toACVMField, toAcvmEnqueuePublicFunctionResult } from '../serialize.js'; import { acvmFieldMessageToString, oracleDebugCallToFormattedStr } from './debug.js'; -import { type TypedOracle } from './typed_oracle.js'; +import { 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 9d15b4467fda..b315f61d371b 100644 --- a/yarn-project/simulator/src/acvm/oracle/typed_oracle.ts +++ b/yarn-project/simulator/src/acvm/oracle/typed_oracle.ts @@ -1,26 +1,26 @@ import { - type CompleteAddress, - type MerkleTreeId, - type Note, - type NoteStatus, - type NullifierMembershipWitness, - type PublicDataWitness, - type PublicKey, - type SiblingPath, - type UnencryptedL2Log, + CompleteAddress, + MerkleTreeId, + Note, + NoteStatus, + NullifierMembershipWitness, + PublicDataWitness, + PublicKey, + SiblingPath, + UnencryptedL2Log, } from '@aztec/circuit-types'; import { - type GrumpkinPrivateKey, - type Header, - type L1_TO_L2_MSG_TREE_HEIGHT, - type PrivateCallStackItem, - type PublicCallRequest, + GrumpkinPrivateKey, + Header, + L1_TO_L2_MSG_TREE_HEIGHT, + PrivateCallStackItem, + PublicCallRequest, } from '@aztec/circuits.js'; -import { type FunctionSelector } from '@aztec/foundation/abi'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; -import { type EthAddress } from '@aztec/foundation/eth-address'; +import { FunctionSelector } from '@aztec/foundation/abi'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; +import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; -import { type ContractInstance } from '@aztec/types/contracts'; +import { ContractInstance } from '@aztec/types/contracts'; /** * A pair of public key and secret key. diff --git a/yarn-project/simulator/src/acvm/serialize.ts b/yarn-project/simulator/src/acvm/serialize.ts index 0e3a1656d050..c35f16545b1b 100644 --- a/yarn-project/simulator/src/acvm/serialize.ts +++ b/yarn-project/simulator/src/acvm/serialize.ts @@ -1,9 +1,9 @@ -import { ENQUEUE_PUBLIC_FUNCTION_CALL_RETURN_LENGTH, type PublicCallRequest } from '@aztec/circuits.js'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; -import { type EthAddress } from '@aztec/foundation/eth-address'; +import { ENQUEUE_PUBLIC_FUNCTION_CALL_RETURN_LENGTH, PublicCallRequest } from '@aztec/circuits.js'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; +import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; -import { type ACVMField } from './acvm_types.js'; +import { 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 269908b3ae17..3ae5e6dfe3c7 100644 --- a/yarn-project/simulator/src/avm/avm_context.ts +++ b/yarn-project/simulator/src/avm/avm_context.ts @@ -1,9 +1,9 @@ -import { type AztecAddress, FunctionSelector } from '@aztec/circuits.js'; -import { type Fr } from '@aztec/foundation/fields'; +import { AztecAddress, FunctionSelector } from '@aztec/circuits.js'; +import { Fr } from '@aztec/foundation/fields'; -import { type AvmExecutionEnvironment } from './avm_execution_environment.js'; +import { AvmExecutionEnvironment } from './avm_execution_environment.js'; import { AvmMachineState } from './avm_machine_state.js'; -import { type AvmPersistableStateManager } from './journal/journal.js'; +import { AvmPersistableStateManager } from './journal/journal.js'; /** * An execution context includes the information necessary to initiate AVM diff --git a/yarn-project/simulator/src/avm/avm_execution_environment.ts b/yarn-project/simulator/src/avm/avm_execution_environment.ts index ee6c9e3d3017..2381cf2f16bb 100644 --- a/yarn-project/simulator/src/avm/avm_execution_environment.ts +++ b/yarn-project/simulator/src/avm/avm_execution_environment.ts @@ -1,8 +1,8 @@ -import { FunctionSelector, type GlobalVariables } from '@aztec/circuits.js'; +import { FunctionSelector, GlobalVariables } from '@aztec/circuits.js'; import { computeVarArgsHash } from '@aztec/circuits.js/hash'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; -import { type EthAddress } from '@aztec/foundation/eth-address'; -import { type Fr } from '@aztec/foundation/fields'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; +import { EthAddress } from '@aztec/foundation/eth-address'; +import { Fr } from '@aztec/foundation/fields'; export class AvmContextInputs { static readonly SIZE = 2; diff --git a/yarn-project/simulator/src/avm/avm_machine_state.ts b/yarn-project/simulator/src/avm/avm_machine_state.ts index a7b6f04334f8..5b4888185a65 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/circuits.js'; +import { Fr } from '@aztec/circuits.js'; -import { type GasCost, GasDimensions } from './avm_gas_cost.js'; +import { GasCost, GasDimensions } from './avm_gas_cost.js'; import { TaggedMemory } from './avm_memory_types.js'; import { AvmContractCallResults } from './avm_message_call_result.js'; import { 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 a9b2f1f9a5ba..7f4b07462a09 100644 --- a/yarn-project/simulator/src/avm/avm_memory_types.ts +++ b/yarn-project/simulator/src/avm/avm_memory_types.ts @@ -1,6 +1,6 @@ import { toBufferBE } from '@aztec/foundation/bigint-buffer'; import { Fr } from '@aztec/foundation/fields'; -import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log'; +import { DebugLogger, createDebugLogger } from '@aztec/foundation/log'; import { strict as assert } from 'assert'; diff --git a/yarn-project/simulator/src/avm/avm_message_call_result.ts b/yarn-project/simulator/src/avm/avm_message_call_result.ts index 9585ff75448c..3b7b4e87a0fa 100644 --- a/yarn-project/simulator/src/avm/avm_message_call_result.ts +++ b/yarn-project/simulator/src/avm/avm_message_call_result.ts @@ -1,4 +1,4 @@ -import { type Fr } from '@aztec/foundation/fields'; +import { Fr } from '@aztec/foundation/fields'; /** * Results of an contract call's execution in the AVM. diff --git a/yarn-project/simulator/src/avm/avm_simulator.test.ts b/yarn-project/simulator/src/avm/avm_simulator.test.ts index 21402c71d4fd..287ad4c8acdc 100644 --- a/yarn-project/simulator/src/avm/avm_simulator.test.ts +++ b/yarn-project/simulator/src/avm/avm_simulator.test.ts @@ -130,7 +130,6 @@ describe('AVM simulator: transpiled Noir contracts', () => { describe.each([ ['poseidon_hash', poseidonHash], ['pedersen_hash', pedersenHash], - ['pedersen_hash_with_index', (m: Buffer[]) => pedersenHash(m, 20)], ])('Hashes with field returned in noir contracts', (name: string, hashFunction: (data: Buffer[]) => Fr) => { it(`Should execute contract function that performs ${name} hash`, async () => { const calldata = [new Fr(1), new Fr(2), new Fr(3)]; diff --git a/yarn-project/simulator/src/avm/avm_simulator.ts b/yarn-project/simulator/src/avm/avm_simulator.ts index 2448b5e1bafe..5404cded4501 100644 --- a/yarn-project/simulator/src/avm/avm_simulator.ts +++ b/yarn-project/simulator/src/avm/avm_simulator.ts @@ -1,4 +1,4 @@ -import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log'; +import { DebugLogger, createDebugLogger } from '@aztec/foundation/log'; import { strict as assert } from 'assert'; diff --git a/yarn-project/simulator/src/avm/errors.ts b/yarn-project/simulator/src/avm/errors.ts index 403853e7e02e..cf3b3294227a 100644 --- a/yarn-project/simulator/src/avm/errors.ts +++ b/yarn-project/simulator/src/avm/errors.ts @@ -1,4 +1,4 @@ -import { type AztecAddress } from '@aztec/circuits.js'; +import { AztecAddress } from '@aztec/circuits.js'; /** * Avm-specific errors should derive from this diff --git a/yarn-project/simulator/src/avm/fixtures/index.ts b/yarn-project/simulator/src/avm/fixtures/index.ts index cb7fb7e776bd..88fc65a2de2e 100644 --- a/yarn-project/simulator/src/avm/fixtures/index.ts +++ b/yarn-project/simulator/src/avm/fixtures/index.ts @@ -8,12 +8,7 @@ import { Fr } from '@aztec/foundation/fields'; import { mock } from 'jest-mock-extended'; import merge from 'lodash.merge'; -import { - type CommitmentsDB, - MessageLoadOracleInputs, - type PublicContractsDB, - type PublicStateDB, -} from '../../index.js'; +import { CommitmentsDB, MessageLoadOracleInputs, PublicContractsDB, PublicStateDB } from '../../index.js'; import { AvmContext } from '../avm_context.js'; import { AvmContextInputs, AvmExecutionEnvironment } from '../avm_execution_environment.js'; import { AvmMachineState } from '../avm_machine_state.js'; diff --git a/yarn-project/simulator/src/avm/journal/host_storage.ts b/yarn-project/simulator/src/avm/journal/host_storage.ts index 03f7cfea29b5..6d249d49e0db 100644 --- a/yarn-project/simulator/src/avm/journal/host_storage.ts +++ b/yarn-project/simulator/src/avm/journal/host_storage.ts @@ -1,4 +1,4 @@ -import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from '../../public/db.js'; +import { CommitmentsDB, PublicContractsDB, PublicStateDB } from '../../public/db.js'; /** * Host storage diff --git a/yarn-project/simulator/src/avm/journal/journal.test.ts b/yarn-project/simulator/src/avm/journal/journal.test.ts index 302a403d4e5e..83be8cbf5609 100644 --- a/yarn-project/simulator/src/avm/journal/journal.test.ts +++ b/yarn-project/simulator/src/avm/journal/journal.test.ts @@ -3,12 +3,12 @@ import { AztecAddress, EthAddress } from '@aztec/circuits.js'; import { EventSelector } from '@aztec/foundation/abi'; import { Fr } from '@aztec/foundation/fields'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; -import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from '../../index.js'; +import { CommitmentsDB, PublicContractsDB, PublicStateDB } from '../../index.js'; import { initL1ToL2MessageOracleInput } from '../fixtures/index.js'; import { HostStorage } from './host_storage.js'; -import { AvmPersistableStateManager, type JournalData } from './journal.js'; +import { AvmPersistableStateManager, JournalData } from './journal.js'; describe('journal', () => { let publicDb: MockProxy; diff --git a/yarn-project/simulator/src/avm/journal/journal.ts b/yarn-project/simulator/src/avm/journal/journal.ts index d7274dec92b9..b2709d01d3c0 100644 --- a/yarn-project/simulator/src/avm/journal/journal.ts +++ b/yarn-project/simulator/src/avm/journal/journal.ts @@ -3,11 +3,11 @@ import { AztecAddress, EthAddress, L2ToL1Message } from '@aztec/circuits.js'; import { EventSelector } from '@aztec/foundation/abi'; import { Fr } from '@aztec/foundation/fields'; -import { type HostStorage } from './host_storage.js'; +import { HostStorage } from './host_storage.js'; import { Nullifiers } from './nullifiers.js'; import { PublicStorage } from './public_storage.js'; import { WorldStateAccessTrace } from './trace.js'; -import { type TracedL1toL2MessageCheck, type TracedNoteHashCheck, type TracedNullifierCheck } from './trace_types.js'; +import { TracedL1toL2MessageCheck, TracedNoteHashCheck, TracedNullifierCheck } from './trace_types.js'; /** * Data held within the journal diff --git a/yarn-project/simulator/src/avm/journal/nullifiers.test.ts b/yarn-project/simulator/src/avm/journal/nullifiers.test.ts index 16f4d359a53e..5a459823acc7 100644 --- a/yarn-project/simulator/src/avm/journal/nullifiers.test.ts +++ b/yarn-project/simulator/src/avm/journal/nullifiers.test.ts @@ -1,8 +1,8 @@ import { Fr } from '@aztec/foundation/fields'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; -import { type CommitmentsDB } from '../../index.js'; +import { CommitmentsDB } from '../../index.js'; import { Nullifiers } from './nullifiers.js'; describe('avm nullifier caching', () => { 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 33c747977d72..d8b79fc79c0a 100644 --- a/yarn-project/simulator/src/avm/journal/public_storage.test.ts +++ b/yarn-project/simulator/src/avm/journal/public_storage.test.ts @@ -1,8 +1,8 @@ import { Fr } from '@aztec/foundation/fields'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; -import { type PublicStateDB } from '../../index.js'; +import { PublicStateDB } from '../../index.js'; import { PublicStorage } from './public_storage.js'; describe('avm public storage', () => { diff --git a/yarn-project/simulator/src/avm/journal/trace.test.ts b/yarn-project/simulator/src/avm/journal/trace.test.ts index 93231b4b7270..a7b309fbb30a 100644 --- a/yarn-project/simulator/src/avm/journal/trace.test.ts +++ b/yarn-project/simulator/src/avm/journal/trace.test.ts @@ -1,7 +1,7 @@ import { Fr } from '@aztec/foundation/fields'; import { WorldStateAccessTrace } from './trace.js'; -import { type TracedL1toL2MessageCheck, type TracedNullifierCheck } from './trace_types.js'; +import { TracedL1toL2MessageCheck, TracedNullifierCheck } from './trace_types.js'; describe('world state access trace', () => { let trace: WorldStateAccessTrace; diff --git a/yarn-project/simulator/src/avm/journal/trace.ts b/yarn-project/simulator/src/avm/journal/trace.ts index 48e4df34dc75..620e2e0462ca 100644 --- a/yarn-project/simulator/src/avm/journal/trace.ts +++ b/yarn-project/simulator/src/avm/journal/trace.ts @@ -1,6 +1,6 @@ import { Fr } from '@aztec/foundation/fields'; -import { type TracedL1toL2MessageCheck, type TracedNoteHashCheck, type TracedNullifierCheck } from './trace_types.js'; +import { TracedL1toL2MessageCheck, TracedNoteHashCheck, TracedNullifierCheck } from './trace_types.js'; export class WorldStateAccessTrace { public accessCounter: number; diff --git a/yarn-project/simulator/src/avm/journal/trace_types.ts b/yarn-project/simulator/src/avm/journal/trace_types.ts index f86b51e57e56..3d065c4fd7d4 100644 --- a/yarn-project/simulator/src/avm/journal/trace_types.ts +++ b/yarn-project/simulator/src/avm/journal/trace_types.ts @@ -1,4 +1,4 @@ -import { type Fr } from '@aztec/foundation/fields'; +import { Fr } from '@aztec/foundation/fields'; //export type TracedContractCall = { // callPointer: 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 9b064a20827c..3976c805a04b 100644 --- a/yarn-project/simulator/src/avm/opcodes/accrued_substate.test.ts +++ b/yarn-project/simulator/src/avm/opcodes/accrued_substate.test.ts @@ -4,8 +4,8 @@ import { EventSelector } from '@aztec/foundation/abi'; import { mock } from 'jest-mock-extended'; -import { type CommitmentsDB } from '../../index.js'; -import { type AvmContext } from '../avm_context.js'; +import { CommitmentsDB } from '../../index.js'; +import { AvmContext } from '../avm_context.js'; import { Field, Uint8 } from '../avm_memory_types.js'; import { InstructionExecutionError } from '../errors.js'; import { diff --git a/yarn-project/simulator/src/avm/opcodes/addressing_mode.ts b/yarn-project/simulator/src/avm/opcodes/addressing_mode.ts index c3d0308c1c87..97e19d9f0834 100644 --- a/yarn-project/simulator/src/avm/opcodes/addressing_mode.ts +++ b/yarn-project/simulator/src/avm/opcodes/addressing_mode.ts @@ -1,6 +1,6 @@ import { strict as assert } from 'assert'; -import { type TaggedMemory } from '../avm_memory_types.js'; +import { TaggedMemory } from '../avm_memory_types.js'; export enum AddressingMode { DIRECT, diff --git a/yarn-project/simulator/src/avm/opcodes/arithmetic.test.ts b/yarn-project/simulator/src/avm/opcodes/arithmetic.test.ts index 10c92d9588c1..23ba3b195395 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 { 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 { Add, Div, FieldDiv, Mul, Sub } from './arithmetic.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/arithmetic.ts b/yarn-project/simulator/src/avm/opcodes/arithmetic.ts index 597ead05cc73..44790a692d87 100644 --- a/yarn-project/simulator/src/avm/opcodes/arithmetic.ts +++ b/yarn-project/simulator/src/avm/opcodes/arithmetic.ts @@ -1,6 +1,6 @@ import type { AvmContext } from '../avm_context.js'; -import { type GasCost, GasCostConstants, getGasCostMultiplierFromTypeTag, makeGasCost } from '../avm_gas_cost.js'; -import { type Field, type MemoryValue, TypeTag } from '../avm_memory_types.js'; +import { GasCost, GasCostConstants, getGasCostMultiplierFromTypeTag, makeGasCost } from '../avm_gas_cost.js'; +import { Field, MemoryValue, TypeTag } from '../avm_memory_types.js'; import { Opcode, OperandType } from '../serialization/instruction_serialization.js'; import { Addressing, AddressingMode } from './addressing_mode.js'; import { Instruction } from './instruction.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/bitwise.test.ts b/yarn-project/simulator/src/avm/opcodes/bitwise.test.ts index afd6fa261266..8a16f215f033 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 { AvmContext } from '../avm_context.js'; import { TypeTag, Uint16, Uint32 } from '../avm_memory_types.js'; import { initContext } from '../fixtures/index.js'; import { And, Not, Or, Shl, Shr, Xor } from './bitwise.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/bitwise.ts b/yarn-project/simulator/src/avm/opcodes/bitwise.ts index a7aeb0cfe0bc..9161c8bb22c5 100644 --- a/yarn-project/simulator/src/avm/opcodes/bitwise.ts +++ b/yarn-project/simulator/src/avm/opcodes/bitwise.ts @@ -1,5 +1,5 @@ import type { AvmContext } from '../avm_context.js'; -import { type IntegralValue } from '../avm_memory_types.js'; +import { IntegralValue } from '../avm_memory_types.js'; import { Opcode } from '../serialization/instruction_serialization.js'; import { ThreeOperandInstruction, TwoOperandInstruction } from './instruction_impl.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/comparators.test.ts b/yarn-project/simulator/src/avm/opcodes/comparators.test.ts index 34ee18be64f7..4591a05a1954 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 { AvmContext } from '../avm_context.js'; import { Field, TypeTag, 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/control_flow.test.ts b/yarn-project/simulator/src/avm/opcodes/control_flow.test.ts index abd6ea2958f2..660c561a3e54 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 { 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 4f88e6139f18..0ebc96b6ccb4 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 { IntegralValue } from '../avm_memory_types.js'; import { InstructionExecutionError } from '../errors.js'; import { Opcode, OperandType } from '../serialization/instruction_serialization.js'; import { Instruction } from './instruction.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/environment_getters.ts b/yarn-project/simulator/src/avm/opcodes/environment_getters.ts index b82ed7508448..f2ddd5d67f65 100644 --- a/yarn-project/simulator/src/avm/opcodes/environment_getters.ts +++ b/yarn-project/simulator/src/avm/opcodes/environment_getters.ts @@ -1,4 +1,4 @@ -import { type Fr } from '@aztec/circuits.js'; +import { Fr } from '@aztec/circuits.js'; import type { AvmContext } from '../avm_context.js'; import type { AvmExecutionEnvironment } from '../avm_execution_environment.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 9647aaeea3d6..d6112104d450 100644 --- a/yarn-project/simulator/src/avm/opcodes/external_calls.test.ts +++ b/yarn-project/simulator/src/avm/opcodes/external_calls.test.ts @@ -3,15 +3,15 @@ import { Fr } from '@aztec/foundation/fields'; import { jest } from '@jest/globals'; import { mock } from 'jest-mock-extended'; -import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from '../../index.js'; -import { type AvmContext } from '../avm_context.js'; +import { CommitmentsDB, PublicContractsDB, PublicStateDB } from '../../index.js'; +import { AvmContext } from '../avm_context.js'; import { Field, Uint8 } from '../avm_memory_types.js'; import { adjustCalldataIndex, initContext } from '../fixtures/index.js'; import { HostStorage } from '../journal/host_storage.js'; import { AvmPersistableStateManager } from '../journal/journal.js'; import { encodeToBytecode } from '../serialization/bytecode_serialization.js'; import { Call, Return, Revert, StaticCall } from './external_calls.js'; -import { type Instruction } from './instruction.js'; +import { Instruction } from './instruction.js'; import { CalldataCopy } from './memory.js'; import { SStore } from './storage.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/hashing.test.ts b/yarn-project/simulator/src/avm/opcodes/hashing.test.ts index 42e6d690e48b..957f62ca5077 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 { keccak, pedersenHash, poseidonHash, sha256 } from '@aztec/foundation/crypto'; -import { type AvmContext } from '../avm_context.js'; +import { AvmContext } from '../avm_context.js'; import { Field, Uint32 } from '../avm_memory_types.js'; import { initContext } from '../fixtures/index.js'; import { Addressing, AddressingMode } from './addressing_mode.js'; @@ -205,14 +205,12 @@ describe('Hashing Opcodes', () => { const buf = Buffer.from([ Pedersen.opcode, // opcode 1, // indirect - ...Buffer.from('02345678', 'hex'), // genIndexOffset ...Buffer.from('12345678', 'hex'), // dstOffset ...Buffer.from('23456789', 'hex'), // messageOffset ...Buffer.from('3456789a', 'hex'), // hashSize ]); const inst = new Pedersen( /*indirect=*/ 1, - /*genIndexOffset=*/ 0x02345678, /*dstOffset=*/ 0x12345678, /*messageOffset=*/ 0x23456789, /*hashSizeOffset=*/ 0x3456789a, @@ -226,18 +224,15 @@ describe('Hashing Opcodes', () => { const args = [new Field(1n), new Field(2n), new Field(3n)]; const messageOffset = 0; const sizeOffset = 10; - const genIndexOffset = 20; const indirect = 0; - const genIndex = 20; context.machineState.memory.setSlice(messageOffset, args); context.machineState.memory.set(sizeOffset, new Uint32(args.length)); - context.machineState.memory.set(genIndexOffset, new Uint32(genIndex)); const dstOffset = 3; - const expectedHash = pedersenHash(args, genIndex); - await new Pedersen(indirect, genIndexOffset, dstOffset, messageOffset, sizeOffset).execute(context); + const expectedHash = pedersenHash(args); + await new Pedersen(indirect, dstOffset, messageOffset, sizeOffset).execute(context); const result = context.machineState.memory.get(dstOffset); expect(result).toEqual(new Field(expectedHash)); @@ -246,7 +241,6 @@ describe('Hashing Opcodes', () => { it('Should hash correctly - indirect', async () => { const args = [new Field(1n), new Field(2n), new Field(3n)]; const indirect = new Addressing([ - /*genIndexOffset=*/ AddressingMode.DIRECT, /*dstOffset=*/ AddressingMode.DIRECT, /*messageOffset*/ AddressingMode.INDIRECT, /*messageSizeOffset*/ AddressingMode.INDIRECT, @@ -255,18 +249,16 @@ describe('Hashing Opcodes', () => { const sizeOffset = 10; const realLocation = 4; const realSizeLocation = 20; - const genIndexOffset = 50; context.machineState.memory.set(messageOffset, new Uint32(realLocation)); context.machineState.memory.set(sizeOffset, new Uint32(realSizeLocation)); context.machineState.memory.setSlice(realLocation, args); context.machineState.memory.set(realSizeLocation, new Uint32(args.length)); - context.machineState.memory.set(genIndexOffset, new Uint32(0)); const dstOffset = 300; const expectedHash = pedersenHash(args); - await new Pedersen(indirect, genIndexOffset, dstOffset, messageOffset, sizeOffset).execute(context); + await new Pedersen(indirect, dstOffset, messageOffset, sizeOffset).execute(context); const result = context.machineState.memory.get(dstOffset); expect(result).toEqual(new Field(expectedHash)); diff --git a/yarn-project/simulator/src/avm/opcodes/hashing.ts b/yarn-project/simulator/src/avm/opcodes/hashing.ts index aecbd4a71a1d..a7e54e539e66 100644 --- a/yarn-project/simulator/src/avm/opcodes/hashing.ts +++ b/yarn-project/simulator/src/avm/opcodes/hashing.ts @@ -1,7 +1,7 @@ import { toBigIntBE } from '@aztec/foundation/bigint-buffer'; import { keccak, pedersenHash, poseidonHash, sha256 } from '@aztec/foundation/crypto'; -import { type AvmContext } from '../avm_context.js'; +import { AvmContext } from '../avm_context.js'; import { Field } from '../avm_memory_types.js'; import { Opcode, OperandType } from '../serialization/instruction_serialization.js'; import { Addressing } from './addressing_mode.js'; @@ -147,12 +147,10 @@ export class Pedersen extends Instruction { OperandType.UINT32, OperandType.UINT32, OperandType.UINT32, - OperandType.UINT32, ]; constructor( private indirect: number, - private genIndexOffset: number, private dstOffset: number, private messageOffset: number, private messageSizeOffset: number, @@ -161,17 +159,17 @@ export class Pedersen extends Instruction { } async execute(context: AvmContext): Promise { - const [genIndexOffset, dstOffset, messageOffset, messageSizeOffset] = Addressing.fromWire(this.indirect).resolve( - [this.genIndexOffset, this.dstOffset, this.messageOffset, this.messageSizeOffset], + const [dstOffset, messageOffset, messageSizeOffset] = Addressing.fromWire(this.indirect).resolve( + [this.dstOffset, this.messageOffset, this.messageSizeOffset], context.machineState.memory, ); // We hash a set of field elements - const genIndex = Number(context.machineState.memory.get(genIndexOffset).toBigInt()); const messageSize = Number(context.machineState.memory.get(messageSizeOffset).toBigInt()); const hashData = context.machineState.memory.getSlice(messageOffset, messageSize); - const hash = pedersenHash(hashData, genIndex); + // No domain sep for now + const hash = pedersenHash(hashData); context.machineState.memory.set(dstOffset, new Field(hash)); context.machineState.incrementPc(); diff --git a/yarn-project/simulator/src/avm/opcodes/instruction.ts b/yarn-project/simulator/src/avm/opcodes/instruction.ts index 93bf6c307dcb..2660052c2650 100644 --- a/yarn-project/simulator/src/avm/opcodes/instruction.ts +++ b/yarn-project/simulator/src/avm/opcodes/instruction.ts @@ -1,9 +1,9 @@ import { strict as assert } from 'assert'; import type { AvmContext } from '../avm_context.js'; -import { DynamicGasCost, type GasCost, GasCosts } from '../avm_gas_cost.js'; -import { type BufferCursor } from '../serialization/buffer_cursor.js'; -import { Opcode, type OperandType, deserialize, serialize } from '../serialization/instruction_serialization.js'; +import { DynamicGasCost, GasCost, GasCosts } from '../avm_gas_cost.js'; +import { BufferCursor } from '../serialization/buffer_cursor.js'; +import { Opcode, OperandType, deserialize, serialize } from '../serialization/instruction_serialization.js'; type InstructionConstructor = { new (...args: any[]): Instruction; diff --git a/yarn-project/simulator/src/avm/opcodes/memory.test.ts b/yarn-project/simulator/src/avm/opcodes/memory.test.ts index c133f4a4c04a..0b8102f98c72 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 { AvmContext } from '../avm_context.js'; import { Field, TypeTag, Uint8, Uint16, Uint32, Uint64, Uint128 } from '../avm_memory_types.js'; import { InstructionExecutionError } from '../errors.js'; import { adjustCalldataIndex, initContext, initExecutionEnvironment } from '../fixtures/index.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/memory.ts b/yarn-project/simulator/src/avm/opcodes/memory.ts index 74137183d8bd..87a5ccdd4655 100644 --- a/yarn-project/simulator/src/avm/opcodes/memory.ts +++ b/yarn-project/simulator/src/avm/opcodes/memory.ts @@ -1,5 +1,5 @@ import type { AvmContext } from '../avm_context.js'; -import { type GasCost, GasCostConstants, getGasCostMultiplierFromTypeTag, makeGasCost } from '../avm_gas_cost.js'; +import { GasCost, GasCostConstants, getGasCostMultiplierFromTypeTag, makeGasCost } from '../avm_gas_cost.js'; import { Field, TaggedMemory, TypeTag } from '../avm_memory_types.js'; import { InstructionExecutionError } from '../errors.js'; import { BufferCursor } from '../serialization/buffer_cursor.js'; diff --git a/yarn-project/simulator/src/avm/opcodes/storage.test.ts b/yarn-project/simulator/src/avm/opcodes/storage.test.ts index 79b0bb3f0d70..ab98f3e7140a 100644 --- a/yarn-project/simulator/src/avm/opcodes/storage.test.ts +++ b/yarn-project/simulator/src/avm/opcodes/storage.test.ts @@ -1,12 +1,12 @@ import { AztecAddress } from '@aztec/foundation/aztec-address'; import { Fr } from '@aztec/foundation/fields'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; -import { type AvmContext } from '../avm_context.js'; +import { AvmContext } from '../avm_context.js'; import { Field } from '../avm_memory_types.js'; import { initContext, initExecutionEnvironment } from '../fixtures/index.js'; -import { type AvmPersistableStateManager } from '../journal/journal.js'; +import { AvmPersistableStateManager } from '../journal/journal.js'; import { SLoad, SStore, StaticCallStorageAlterError } 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 82641334b25c..a9d8f08bec2b 100644 --- a/yarn-project/simulator/src/avm/serialization/bytecode_serialization.test.ts +++ b/yarn-project/simulator/src/avm/serialization/bytecode_serialization.test.ts @@ -1,9 +1,9 @@ import { strict as assert } from 'assert'; import { Add, Address, Call, StaticCall, Sub } from '../opcodes/index.js'; -import { type BufferCursor } from './buffer_cursor.js'; -import { type InstructionSet, decodeFromBytecode, encodeToBytecode } from './bytecode_serialization.js'; -import { type Opcode } from './instruction_serialization.js'; +import { BufferCursor } from './buffer_cursor.js'; +import { InstructionSet, decodeFromBytecode, encodeToBytecode } from './bytecode_serialization.js'; +import { Opcode } from './instruction_serialization.js'; class InstA { constructor(private n: number) {} diff --git a/yarn-project/simulator/src/avm/temporary_executor_migration.ts b/yarn-project/simulator/src/avm/temporary_executor_migration.ts index 2d226c7de489..4c2e0bb203d2 100644 --- a/yarn-project/simulator/src/avm/temporary_executor_migration.ts +++ b/yarn-project/simulator/src/avm/temporary_executor_migration.ts @@ -3,19 +3,19 @@ import { UnencryptedFunctionL2Logs } from '@aztec/circuit-types'; import { ContractStorageRead, ContractStorageUpdateRequest, - type GlobalVariables, + GlobalVariables, L2ToL1Message, - type ReadRequest, + ReadRequest, SideEffect, - type SideEffectLinkedToNoteHash, + SideEffectLinkedToNoteHash, } from '@aztec/circuits.js'; import { Fr } from '@aztec/foundation/fields'; import { createSimulationError } from '../common/errors.js'; -import { type PublicExecution, type PublicExecutionResult } from '../public/execution.js'; +import { PublicExecution, PublicExecutionResult } from '../public/execution.js'; import { AvmExecutionEnvironment } from './avm_execution_environment.js'; -import { type AvmContractCallResults } from './avm_message_call_result.js'; -import { type JournalData } from './journal/journal.js'; +import { AvmContractCallResults } from './avm_message_call_result.js'; +import { JournalData } from './journal/journal.js'; /** Temporary Method * diff --git a/yarn-project/simulator/src/client/client_execution_context.ts b/yarn-project/simulator/src/client/client_execution_context.ts index 3f6262931219..8586f777ae13 100644 --- a/yarn-project/simulator/src/client/client_execution_context.ts +++ b/yarn-project/simulator/src/client/client_execution_context.ts @@ -1,37 +1,37 @@ import { - type AuthWitness, - type AztecNode, + AuthWitness, + AztecNode, EncryptedFunctionL2Logs, EncryptedL2Log, L1NotePayload, Note, - type NoteStatus, + NoteStatus, TaggedNote, UnencryptedFunctionL2Logs, - type UnencryptedL2Log, + UnencryptedL2Log, } from '@aztec/circuit-types'; import { CallContext, FunctionData, FunctionSelector, - type Header, + Header, NoteHashReadRequestMembershipWitness, PublicCallRequest, - type SideEffect, + SideEffect, TxContext, } from '@aztec/circuits.js'; -import { type Grumpkin } from '@aztec/circuits.js/barretenberg'; +import { Grumpkin } from '@aztec/circuits.js/barretenberg'; import { computePublicDataTreeLeafSlot, computeUniqueCommitment, siloNoteHash } from '@aztec/circuits.js/hash'; -import { type FunctionAbi, type FunctionArtifact, countArgumentsSize } from '@aztec/foundation/abi'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; -import { Fr, type Point } from '@aztec/foundation/fields'; +import { FunctionAbi, FunctionArtifact, countArgumentsSize } from '@aztec/foundation/abi'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; +import { Fr, Point } from '@aztec/foundation/fields'; import { createDebugLogger } from '@aztec/foundation/log'; -import { type NoteData, toACVMWitness } from '../acvm/index.js'; -import { type PackedArgsCache } from '../common/packed_args_cache.js'; -import { type DBOracle } from './db_oracle.js'; -import { type ExecutionNoteCache } from './execution_note_cache.js'; -import { type ExecutionResult, type NoteAndSlot } from './execution_result.js'; +import { NoteData, toACVMWitness } from '../acvm/index.js'; +import { PackedArgsCache } from '../common/packed_args_cache.js'; +import { DBOracle } from './db_oracle.js'; +import { ExecutionNoteCache } from './execution_note_cache.js'; +import { ExecutionResult, NoteAndSlot } from './execution_result.js'; import { pickNotes } from './pick_notes.js'; import { executePrivateFunction } 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 4338f4c3a9b8..9f6462e331a0 100644 --- a/yarn-project/simulator/src/client/db_oracle.ts +++ b/yarn-project/simulator/src/client/db_oracle.ts @@ -1,19 +1,13 @@ -import { - type L2Block, - type MerkleTreeId, - type NoteStatus, - type NullifierMembershipWitness, - type PublicDataWitness, -} from '@aztec/circuit-types'; -import { type CompleteAddress, type Header } from '@aztec/circuits.js'; -import { type FunctionArtifactWithDebugMetadata, type FunctionSelector } from '@aztec/foundation/abi'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; -import { type EthAddress } from '@aztec/foundation/eth-address'; -import { type Fr } from '@aztec/foundation/fields'; -import { type ContractInstance } from '@aztec/types/contracts'; - -import { type KeyPair, type NoteData } from '../acvm/index.js'; -import { type CommitmentsDB } from '../public/db.js'; +import { L2Block, MerkleTreeId, NoteStatus, NullifierMembershipWitness, PublicDataWitness } from '@aztec/circuit-types'; +import { CompleteAddress, Header } from '@aztec/circuits.js'; +import { FunctionArtifactWithDebugMetadata, FunctionSelector } from '@aztec/foundation/abi'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; +import { EthAddress } from '@aztec/foundation/eth-address'; +import { Fr } from '@aztec/foundation/fields'; +import { ContractInstance } from '@aztec/types/contracts'; + +import { KeyPair, NoteData } from '../acvm/index.js'; +import { CommitmentsDB } from '../public/db.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 67752a52a292..ad4be3e8c34b 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 { siloNullifier } from '@aztec/circuits.js/hash'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; import { Fr } from '@aztec/foundation/fields'; -import { type NoteData } from '../acvm/index.js'; +import { NoteData } from '../acvm/index.js'; /** * Data that's accessible by all the function calls in an execution. diff --git a/yarn-project/simulator/src/client/execution_result.test.ts b/yarn-project/simulator/src/client/execution_result.test.ts index 0938c50af58f..f09c5bf07443 100644 --- a/yarn-project/simulator/src/client/execution_result.test.ts +++ b/yarn-project/simulator/src/client/execution_result.test.ts @@ -7,7 +7,7 @@ import { import { AztecAddress, PrivateCallStackItem } from '@aztec/circuits.js'; import { EventSelector } from '@aztec/foundation/abi'; -import { type ExecutionResult, collectEncryptedLogs, collectUnencryptedLogs } from './execution_result.js'; +import { ExecutionResult, collectEncryptedLogs, collectUnencryptedLogs } from './execution_result.js'; function emptyExecutionResult(): ExecutionResult { return { diff --git a/yarn-project/simulator/src/client/execution_result.ts b/yarn-project/simulator/src/client/execution_result.ts index 5118b28d6070..4fccc6e8e015 100644 --- a/yarn-project/simulator/src/client/execution_result.ts +++ b/yarn-project/simulator/src/client/execution_result.ts @@ -1,13 +1,9 @@ -import { type EncryptedFunctionL2Logs, type Note, type UnencryptedFunctionL2Logs } from '@aztec/circuit-types'; -import { - type NoteHashReadRequestMembershipWitness, - type PrivateCallStackItem, - type PublicCallRequest, -} from '@aztec/circuits.js'; -import { type DecodedReturn } from '@aztec/foundation/abi'; -import { type Fr } from '@aztec/foundation/fields'; +import { EncryptedFunctionL2Logs, Note, UnencryptedFunctionL2Logs } from '@aztec/circuit-types'; +import { NoteHashReadRequestMembershipWitness, PrivateCallStackItem, PublicCallRequest } from '@aztec/circuits.js'; +import { DecodedReturn } from '@aztec/foundation/abi'; +import { Fr } from '@aztec/foundation/fields'; -import { type ACVMField } from '../acvm/index.js'; +import { ACVMField } from '../acvm/index.js'; /** * The contents of a new note. diff --git a/yarn-project/simulator/src/client/pick_notes.ts b/yarn-project/simulator/src/client/pick_notes.ts index 26e65e64616b..4531a487ef60 100644 --- a/yarn-project/simulator/src/client/pick_notes.ts +++ b/yarn-project/simulator/src/client/pick_notes.ts @@ -1,4 +1,4 @@ -import { Comparator, type Note } from '@aztec/circuit-types'; +import { Comparator, Note } from '@aztec/circuit-types'; import { Fr } from '@aztec/foundation/fields'; export interface PropertySelector { diff --git a/yarn-project/simulator/src/client/private_execution.test.ts b/yarn-project/simulator/src/client/private_execution.test.ts index e79629abfd19..1c959d2ae9b6 100644 --- a/yarn-project/simulator/src/client/private_execution.test.ts +++ b/yarn-project/simulator/src/client/private_execution.test.ts @@ -1,4 +1,4 @@ -import { type AztecNode, type L1ToL2Message, Note, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types'; +import { AztecNode, L1ToL2Message, Note, PackedArguments, TxExecutionRequest } from '@aztec/circuit-types'; import { AppendOnlyTreeSnapshot, CallContext, @@ -21,7 +21,7 @@ import { import { computeCommitmentNonce, computeMessageSecretHash, computeVarArgsHash } from '@aztec/circuits.js/hash'; import { makeHeader } from '@aztec/circuits.js/testing'; import { - type FunctionArtifact, + FunctionArtifact, FunctionSelector, encodeArguments, getFunctionArtifact, @@ -33,10 +33,10 @@ import { times } from '@aztec/foundation/collection'; import { pedersenHash, randomInt } from '@aztec/foundation/crypto'; import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr, GrumpkinScalar } from '@aztec/foundation/fields'; -import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log'; -import { type FieldsOf } from '@aztec/foundation/types'; +import { DebugLogger, createDebugLogger } from '@aztec/foundation/log'; +import { FieldsOf } from '@aztec/foundation/types'; import { openTmpStore } from '@aztec/kv-store/utils'; -import { type AppendOnlyTree, Pedersen, StandardTree, newTree } from '@aztec/merkle-tree'; +import { AppendOnlyTree, Pedersen, StandardTree, newTree } from '@aztec/merkle-tree'; import { ChildContractArtifact, ImportTestContractArtifact, @@ -47,13 +47,13 @@ import { } from '@aztec/noir-contracts.js'; import { jest } from '@jest/globals'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; import { toFunctionSelector } from 'viem'; -import { type KeyPair, MessageLoadOracleInputs } from '../acvm/index.js'; +import { KeyPair, MessageLoadOracleInputs } from '../acvm/index.js'; import { buildL1ToL2Message } from '../test/utils.js'; import { computeSlotForMapping } from '../utils.js'; -import { type DBOracle } from './db_oracle.js'; +import { DBOracle } from './db_oracle.js'; import { collectUnencryptedLogs } from './execution_result.js'; import { AcirSimulator } from './simulator.js'; diff --git a/yarn-project/simulator/src/client/private_execution.ts b/yarn-project/simulator/src/client/private_execution.ts index de31eae0da15..75bc079900b5 100644 --- a/yarn-project/simulator/src/client/private_execution.ts +++ b/yarn-project/simulator/src/client/private_execution.ts @@ -1,14 +1,14 @@ -import { type FunctionData, PrivateCallStackItem, PrivateCircuitPublicInputs } from '@aztec/circuits.js'; -import { type FunctionArtifactWithDebugMetadata, decodeReturnValues } from '@aztec/foundation/abi'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; +import { FunctionData, PrivateCallStackItem, PrivateCircuitPublicInputs } from '@aztec/circuits.js'; +import { FunctionArtifactWithDebugMetadata, decodeReturnValues } from '@aztec/foundation/abi'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; import { Fr } from '@aztec/foundation/fields'; import { createDebugLogger } from '@aztec/foundation/log'; import { extractReturnWitness } from '../acvm/deserialize.js'; import { Oracle, acvm, extractCallStack } from '../acvm/index.js'; import { ExecutionError } from '../common/errors.js'; -import { type ClientExecutionContext } from './client_execution_context.js'; -import { type ExecutionResult } from './execution_result.js'; +import { ClientExecutionContext } from './client_execution_context.js'; +import { ExecutionResult } from './execution_result.js'; import { AcirSimulator } from './simulator.js'; /** diff --git a/yarn-project/simulator/src/client/simulator.test.ts b/yarn-project/simulator/src/client/simulator.test.ts index 4bb3dc3d3f36..636f3349fb50 100644 --- a/yarn-project/simulator/src/client/simulator.test.ts +++ b/yarn-project/simulator/src/client/simulator.test.ts @@ -1,19 +1,15 @@ -import { type AztecNode, Note } from '@aztec/circuit-types'; +import { AztecNode, Note } from '@aztec/circuit-types'; import { CompleteAddress } from '@aztec/circuits.js'; import { computeUniqueCommitment, siloNoteHash } from '@aztec/circuits.js/hash'; -import { - ABIParameterVisibility, - type FunctionArtifactWithDebugMetadata, - getFunctionArtifact, -} from '@aztec/foundation/abi'; +import { ABIParameterVisibility, FunctionArtifactWithDebugMetadata, getFunctionArtifact } from '@aztec/foundation/abi'; import { AztecAddress } from '@aztec/foundation/aztec-address'; import { pedersenHash } from '@aztec/foundation/crypto'; import { Fr, GrumpkinScalar, Point } from '@aztec/foundation/fields'; import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; -import { type DBOracle } from './db_oracle.js'; +import { DBOracle } from './db_oracle.js'; import { AcirSimulator } from './simulator.js'; describe('Simulator', () => { diff --git a/yarn-project/simulator/src/client/simulator.ts b/yarn-project/simulator/src/client/simulator.ts index 6f7058a59bbc..4c1e829c8e63 100644 --- a/yarn-project/simulator/src/client/simulator.ts +++ b/yarn-project/simulator/src/client/simulator.ts @@ -1,26 +1,26 @@ -import { type AztecNode, type FunctionCall, type Note, type TxExecutionRequest } from '@aztec/circuit-types'; +import { AztecNode, FunctionCall, Note, TxExecutionRequest } from '@aztec/circuit-types'; import { CallContext, FunctionData } from '@aztec/circuits.js'; import { Grumpkin } from '@aztec/circuits.js/barretenberg'; import { - type ArrayType, - type FunctionArtifactWithDebugMetadata, + ArrayType, + FunctionArtifactWithDebugMetadata, FunctionSelector, FunctionType, encodeArguments, } from '@aztec/foundation/abi'; import { AztecAddress } from '@aztec/foundation/aztec-address'; -import { type EthAddress } from '@aztec/foundation/eth-address'; +import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; -import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log'; +import { DebugLogger, createDebugLogger } from '@aztec/foundation/log'; -import { type WasmBlackBoxFunctionSolver, createBlackBoxSolver } from '@noir-lang/acvm_js'; +import { WasmBlackBoxFunctionSolver, createBlackBoxSolver } from '@noir-lang/acvm_js'; import { createSimulationError } from '../common/errors.js'; import { PackedArgsCache } from '../common/packed_args_cache.js'; import { ClientExecutionContext } from './client_execution_context.js'; -import { type DBOracle } from './db_oracle.js'; +import { DBOracle } from './db_oracle.js'; import { ExecutionNoteCache } from './execution_note_cache.js'; -import { type ExecutionResult } from './execution_result.js'; +import { ExecutionResult } from './execution_result.js'; import { executePrivateFunction } from './private_execution.js'; import { executeUnconstrainedFunction } from './unconstrained_execution.js'; import { ViewDataOracle } from './view_data_oracle.js'; diff --git a/yarn-project/simulator/src/client/unconstrained_execution.test.ts b/yarn-project/simulator/src/client/unconstrained_execution.test.ts index dea57f9e00b0..b4997ddba214 100644 --- a/yarn-project/simulator/src/client/unconstrained_execution.test.ts +++ b/yarn-project/simulator/src/client/unconstrained_execution.test.ts @@ -1,4 +1,4 @@ -import { type AztecNode, type FunctionCall, Note } from '@aztec/circuit-types'; +import { AztecNode, FunctionCall, Note } from '@aztec/circuit-types'; import { CompleteAddress, FunctionData, Header } from '@aztec/circuits.js'; import { FunctionSelector, encodeArguments } from '@aztec/foundation/abi'; import { AztecAddress } from '@aztec/foundation/aztec-address'; @@ -7,7 +7,7 @@ import { StatefulTestContractArtifact } from '@aztec/noir-contracts.js/StatefulT import { mock } from 'jest-mock-extended'; -import { type DBOracle } from './db_oracle.js'; +import { 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 352c3a52e624..19b78bec0f5a 100644 --- a/yarn-project/simulator/src/client/unconstrained_execution.ts +++ b/yarn-project/simulator/src/client/unconstrained_execution.ts @@ -1,14 +1,14 @@ -import { type FunctionData } from '@aztec/circuits.js'; -import { type DecodedReturn, type FunctionArtifactWithDebugMetadata, decodeReturnValues } from '@aztec/foundation/abi'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; -import { type Fr } from '@aztec/foundation/fields'; +import { FunctionData } from '@aztec/circuits.js'; +import { DecodedReturn, FunctionArtifactWithDebugMetadata, decodeReturnValues } from '@aztec/foundation/abi'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; +import { Fr } from '@aztec/foundation/fields'; import { createDebugLogger } from '@aztec/foundation/log'; import { extractReturnWitness } from '../acvm/deserialize.js'; import { Oracle, acvm, extractCallStack, toACVMWitness } from '../acvm/index.js'; import { ExecutionError } from '../common/errors.js'; import { AcirSimulator } from './simulator.js'; -import { type ViewDataOracle } from './view_data_oracle.js'; +import { 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 92fac26f4ad9..5e6f33e3b6af 100644 --- a/yarn-project/simulator/src/client/view_data_oracle.ts +++ b/yarn-project/simulator/src/client/view_data_oracle.ts @@ -1,21 +1,21 @@ import { - type AuthWitness, - type AztecNode, - type CompleteAddress, + AuthWitness, + AztecNode, + CompleteAddress, MerkleTreeId, - type NoteStatus, - type NullifierMembershipWitness, - type PublicDataWitness, + NoteStatus, + NullifierMembershipWitness, + PublicDataWitness, } from '@aztec/circuit-types'; -import { type Header } from '@aztec/circuits.js'; +import { Header } from '@aztec/circuits.js'; import { siloNullifier } from '@aztec/circuits.js/hash'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; import { Fr } from '@aztec/foundation/fields'; import { createDebugLogger } from '@aztec/foundation/log'; -import { type ContractInstance } from '@aztec/types/contracts'; +import { ContractInstance } from '@aztec/types/contracts'; -import { type NoteData, TypedOracle } from '../acvm/index.js'; -import { type DBOracle } from './db_oracle.js'; +import { NoteData, TypedOracle } from '../acvm/index.js'; +import { DBOracle } from './db_oracle.js'; import { pickNotes } from './pick_notes.js'; /** diff --git a/yarn-project/simulator/src/common/errors.ts b/yarn-project/simulator/src/common/errors.ts index 1d0bdf184028..722819537a2d 100644 --- a/yarn-project/simulator/src/common/errors.ts +++ b/yarn-project/simulator/src/common/errors.ts @@ -1,4 +1,4 @@ -import { type FailingFunction, type NoirCallStack, SimulationError } from '@aztec/circuit-types'; +import { FailingFunction, NoirCallStack, SimulationError } from '@aztec/circuit-types'; /** * An error that occurred during the execution of a function. diff --git a/yarn-project/simulator/src/public/avm_executor.test.ts b/yarn-project/simulator/src/public/avm_executor.test.ts index 89cfdd48988b..23f31610c1af 100644 --- a/yarn-project/simulator/src/public/avm_executor.test.ts +++ b/yarn-project/simulator/src/public/avm_executor.test.ts @@ -1,13 +1,13 @@ -import { AztecAddress, CallContext, EthAddress, FunctionData, FunctionSelector, type Header } from '@aztec/circuits.js'; +import { AztecAddress, CallContext, EthAddress, FunctionData, FunctionSelector, Header } from '@aztec/circuits.js'; import { makeHeader } from '@aztec/circuits.js/testing'; import { randomInt } from '@aztec/foundation/crypto'; import { Fr } from '@aztec/foundation/fields'; import { AvmTestContractArtifact } from '@aztec/noir-contracts.js'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; -import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from './db.js'; -import { type PublicExecution } from './execution.js'; +import { CommitmentsDB, PublicContractsDB, PublicStateDB } from './db.js'; +import { PublicExecution } from './execution.js'; import { PublicExecutor } from './executor.js'; describe('AVM WitGen and Proof Generation', () => { diff --git a/yarn-project/simulator/src/public/db.ts b/yarn-project/simulator/src/public/db.ts index 88d2a66025a9..3e05d7212f89 100644 --- a/yarn-project/simulator/src/public/db.ts +++ b/yarn-project/simulator/src/public/db.ts @@ -1,10 +1,10 @@ -import { type NullifierMembershipWitness } from '@aztec/circuit-types'; -import { type EthAddress, type FunctionSelector, type L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; -import { type Fr } from '@aztec/foundation/fields'; -import { type ContractInstanceWithAddress } from '@aztec/types/contracts'; +import { NullifierMembershipWitness } from '@aztec/circuit-types'; +import { EthAddress, FunctionSelector, L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; +import { Fr } from '@aztec/foundation/fields'; +import { ContractInstanceWithAddress } from '@aztec/types/contracts'; -import { type MessageLoadOracleInputs } from '../acvm/index.js'; +import { MessageLoadOracleInputs } from '../acvm/index.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 96ac9e84e97c..d0a5e387b06a 100644 --- a/yarn-project/simulator/src/public/execution.ts +++ b/yarn-project/simulator/src/public/execution.ts @@ -1,16 +1,16 @@ -import { type SimulationError, type UnencryptedFunctionL2Logs } from '@aztec/circuit-types'; +import { SimulationError, UnencryptedFunctionL2Logs } from '@aztec/circuit-types'; import { - type AztecAddress, - type ContractStorageRead, - type ContractStorageUpdateRequest, - type Fr, - type L2ToL1Message, - type PublicCallRequest, + AztecAddress, + ContractStorageRead, + ContractStorageUpdateRequest, + Fr, + L2ToL1Message, + PublicCallRequest, PublicDataRead, PublicDataUpdateRequest, - type ReadRequest, - type SideEffect, - type SideEffectLinkedToNoteHash, + ReadRequest, + SideEffect, + SideEffectLinkedToNoteHash, } from '@aztec/circuits.js'; import { computePublicDataTreeLeafSlot, computePublicDataTreeValue } from '@aztec/circuits.js/hash'; diff --git a/yarn-project/simulator/src/public/executor.ts b/yarn-project/simulator/src/public/executor.ts index 9b79022825c0..13ffcecc79b5 100644 --- a/yarn-project/simulator/src/public/executor.ts +++ b/yarn-project/simulator/src/public/executor.ts @@ -1,5 +1,5 @@ import { UnencryptedFunctionL2Logs } from '@aztec/circuit-types'; -import { Fr, type GlobalVariables, type Header, PublicCircuitPublicInputs } from '@aztec/circuits.js'; +import { Fr, GlobalVariables, Header, PublicCircuitPublicInputs } from '@aztec/circuits.js'; import { createDebugLogger } from '@aztec/foundation/log'; import { spawn } from 'child_process'; @@ -20,8 +20,8 @@ import { AcirSimulator } from '../client/simulator.js'; import { ExecutionError, createSimulationError } from '../common/errors.js'; import { SideEffectCounter } from '../common/index.js'; import { PackedArgsCache } from '../common/packed_args_cache.js'; -import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from './db.js'; -import { type PublicExecution, type PublicExecutionResult, checkValidStaticCall } from './execution.js'; +import { CommitmentsDB, PublicContractsDB, PublicStateDB } from './db.js'; +import { PublicExecution, PublicExecutionResult, checkValidStaticCall } from './execution.js'; import { PublicExecutionContext } from './public_execution_context.js'; /** diff --git a/yarn-project/simulator/src/public/index.test.ts b/yarn-project/simulator/src/public/index.test.ts index d5c33178652e..03f6a631f9b3 100644 --- a/yarn-project/simulator/src/public/index.test.ts +++ b/yarn-project/simulator/src/public/index.test.ts @@ -1,10 +1,10 @@ -import { type L1ToL2Message, NullifierMembershipWitness, SiblingPath } from '@aztec/circuit-types'; +import { L1ToL2Message, NullifierMembershipWitness, SiblingPath } from '@aztec/circuit-types'; import { AppendOnlyTreeSnapshot, CallContext, FunctionData, GlobalVariables, - type Header, + Header, L1_TO_L2_MSG_TREE_HEIGHT, L2ToL1Message, NULLIFIER_TREE_HEIGHT, @@ -13,7 +13,7 @@ import { } from '@aztec/circuits.js'; import { siloNullifier } from '@aztec/circuits.js/hash'; import { makeHeader } from '@aztec/circuits.js/testing'; -import { type FunctionArtifact, FunctionSelector, encodeArguments } from '@aztec/foundation/abi'; +import { FunctionArtifact, FunctionSelector, encodeArguments } from '@aztec/foundation/abi'; import { AztecAddress } from '@aztec/foundation/aztec-address'; import { pedersenHash, randomInt } from '@aztec/foundation/crypto'; import { EthAddress } from '@aztec/foundation/eth-address'; @@ -25,15 +25,15 @@ import { ParentContractArtifact } from '@aztec/noir-contracts.js/Parent'; import { TestContractArtifact } from '@aztec/noir-contracts.js/Test'; import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token'; -import { type MockProxy, mock } from 'jest-mock-extended'; +import { MockProxy, mock } from 'jest-mock-extended'; import { type MemDown, default as memdown } from 'memdown'; import { toFunctionSelector } from 'viem'; import { MessageLoadOracleInputs } from '../index.js'; import { buildL1ToL2Message } from '../test/utils.js'; import { computeSlotForMapping } from '../utils.js'; -import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from './db.js'; -import { type PublicExecution } from './execution.js'; +import { CommitmentsDB, PublicContractsDB, PublicStateDB } from './db.js'; +import { PublicExecution } from './execution.js'; import { PublicExecutor } from './executor.js'; export const createMemDown = () => (memdown as any)() as MemDown; diff --git a/yarn-project/simulator/src/public/public_execution_context.ts b/yarn-project/simulator/src/public/public_execution_context.ts index b999d27ad138..ab54bf1c7921 100644 --- a/yarn-project/simulator/src/public/public_execution_context.ts +++ b/yarn-project/simulator/src/public/public_execution_context.ts @@ -1,25 +1,15 @@ -import { - type NullifierMembershipWitness, - UnencryptedFunctionL2Logs, - type UnencryptedL2Log, -} from '@aztec/circuit-types'; -import { - CallContext, - FunctionData, - type FunctionSelector, - type GlobalVariables, - type Header, -} from '@aztec/circuits.js'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; +import { NullifierMembershipWitness, UnencryptedFunctionL2Logs, UnencryptedL2Log } from '@aztec/circuit-types'; +import { CallContext, FunctionData, FunctionSelector, GlobalVariables, Header } from '@aztec/circuits.js'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; import { createDebugLogger } from '@aztec/foundation/log'; -import { type ContractInstance } from '@aztec/types/contracts'; +import { ContractInstance } from '@aztec/types/contracts'; import { TypedOracle, toACVMWitness } from '../acvm/index.js'; -import { type PackedArgsCache, type SideEffectCounter } from '../common/index.js'; -import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from './db.js'; -import { type PublicExecution, type PublicExecutionResult, checkValidStaticCall } from './execution.js'; +import { PackedArgsCache, SideEffectCounter } from '../common/index.js'; +import { CommitmentsDB, PublicContractsDB, PublicStateDB } from './db.js'; +import { PublicExecution, PublicExecutionResult, checkValidStaticCall } from './execution.js'; import { executePublicFunction } from './executor.js'; import { ContractStorageActionsCollector } from './state_actions.js'; diff --git a/yarn-project/simulator/src/public/state_actions.ts b/yarn-project/simulator/src/public/state_actions.ts index a4b63c54a604..dd995566e308 100644 --- a/yarn-project/simulator/src/public/state_actions.ts +++ b/yarn-project/simulator/src/public/state_actions.ts @@ -1,8 +1,8 @@ import { ContractStorageRead, ContractStorageUpdateRequest } from '@aztec/circuits.js'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; import { Fr } from '@aztec/foundation/fields'; -import { type PublicStateDB } from './db.js'; +import { PublicStateDB } from './db.js'; /** * Implements read/write operations on a contract public storage, collecting diff --git a/yarn-project/simulator/src/simulator/acvm_native.ts b/yarn-project/simulator/src/simulator/acvm_native.ts index df1df4a1be63..ec777bdea392 100644 --- a/yarn-project/simulator/src/simulator/acvm_native.ts +++ b/yarn-project/simulator/src/simulator/acvm_native.ts @@ -1,11 +1,11 @@ import { randomBytes } from '@aztec/foundation/crypto'; -import { type NoirCompiledCircuit } from '@aztec/types/noir'; +import { NoirCompiledCircuit } from '@aztec/types/noir'; -import { type WitnessMap } from '@noir-lang/types'; +import { WitnessMap } from '@noir-lang/types'; import * as proc from 'child_process'; import fs from 'fs/promises'; -import { type SimulationProvider } from './simulation_provider.js'; +import { SimulationProvider } from './simulation_provider.js'; /** * Parses a TOML format witness map string into a Map structure diff --git a/yarn-project/simulator/src/simulator/acvm_wasm.ts b/yarn-project/simulator/src/simulator/acvm_wasm.ts index 16e83ddda1b1..cdf49df7f5af 100644 --- a/yarn-project/simulator/src/simulator/acvm_wasm.ts +++ b/yarn-project/simulator/src/simulator/acvm_wasm.ts @@ -1,13 +1,9 @@ -import { type NoirCompiledCircuit } from '@aztec/types/noir'; +import { NoirCompiledCircuit } from '@aztec/types/noir'; -import { - type WasmBlackBoxFunctionSolver, - createBlackBoxSolver, - executeCircuitWithBlackBoxSolver, -} from '@noir-lang/acvm_js'; -import { type WitnessMap } from '@noir-lang/types'; +import { WasmBlackBoxFunctionSolver, createBlackBoxSolver, executeCircuitWithBlackBoxSolver } from '@noir-lang/acvm_js'; +import { WitnessMap } from '@noir-lang/types'; -import { type SimulationProvider } from './simulation_provider.js'; +import { SimulationProvider } from './simulation_provider.js'; let solver: Promise; diff --git a/yarn-project/simulator/src/simulator/simulation_provider.ts b/yarn-project/simulator/src/simulator/simulation_provider.ts index e0a087fcc371..a9fd92663517 100644 --- a/yarn-project/simulator/src/simulator/simulation_provider.ts +++ b/yarn-project/simulator/src/simulator/simulation_provider.ts @@ -1,6 +1,6 @@ -import { type NoirCompiledCircuit } from '@aztec/types/noir'; +import { NoirCompiledCircuit } from '@aztec/types/noir'; -import { type WitnessMap } from '@noir-lang/types'; +import { WitnessMap } from '@noir-lang/types'; /** * Low level simulation interface diff --git a/yarn-project/simulator/src/test/utils.ts b/yarn-project/simulator/src/test/utils.ts index 5b611e846022..1e0118b9c979 100644 --- a/yarn-project/simulator/src/test/utils.ts +++ b/yarn-project/simulator/src/test/utils.ts @@ -1,5 +1,5 @@ import { L1Actor, L1ToL2Message, L2Actor } from '@aztec/circuit-types'; -import { type AztecAddress, EthAddress, type Fr } from '@aztec/circuits.js'; +import { AztecAddress, EthAddress, Fr } from '@aztec/circuits.js'; import { computeMessageSecretHash } from '@aztec/circuits.js/hash'; import { sha256ToField } from '@aztec/foundation/crypto'; diff --git a/yarn-project/simulator/src/utils.ts b/yarn-project/simulator/src/utils.ts index 380222fa5785..9dc93abe392a 100644 --- a/yarn-project/simulator/src/utils.ts +++ b/yarn-project/simulator/src/utils.ts @@ -1,5 +1,5 @@ import { pedersenHash } from '@aztec/foundation/crypto'; -import { type Fr } from '@aztec/foundation/fields'; +import { Fr } from '@aztec/foundation/fields'; /** * Computes the resulting storage slot for an entry in a mapping. diff --git a/yarn-project/types/src/abi/contract_artifact.ts b/yarn-project/types/src/abi/contract_artifact.ts index 587e6c195c8a..1185cc5f04f2 100644 --- a/yarn-project/types/src/abi/contract_artifact.ts +++ b/yarn-project/types/src/abi/contract_artifact.ts @@ -1,9 +1,9 @@ import { - type ABIParameter, - type ABIParameterVisibility, - type ABIType, - type ContractArtifact, - type FunctionArtifact, + ABIParameter, + ABIParameterVisibility, + ABIType, + ContractArtifact, + FunctionArtifact, FunctionType, } from '@aztec/foundation/abi'; @@ -13,7 +13,7 @@ import { AZTEC_PRIVATE_ATTRIBUTE, AZTEC_PUBLIC_ATTRIBUTE, AZTEC_PUBLIC_VM_ATTRIBUTE, - type NoirCompiledContract, + NoirCompiledContract, } from '../noir/index.js'; import { mockVerificationKey } from './mocked_keys.js'; diff --git a/yarn-project/types/src/contracts/contract_class.ts b/yarn-project/types/src/contracts/contract_class.ts index a7869382f3f5..a532dfb9e1cf 100644 --- a/yarn-project/types/src/contracts/contract_class.ts +++ b/yarn-project/types/src/contracts/contract_class.ts @@ -1,5 +1,5 @@ -import { type FunctionSelector } from '@aztec/foundation/abi'; -import { type Fr } from '@aztec/foundation/fields'; +import { FunctionSelector } from '@aztec/foundation/abi'; +import { Fr } from '@aztec/foundation/fields'; const VERSION = 1 as const; diff --git a/yarn-project/types/src/contracts/contract_data_source.ts b/yarn-project/types/src/contracts/contract_data_source.ts index e785b9486394..c9d438cd24e2 100644 --- a/yarn-project/types/src/contracts/contract_data_source.ts +++ b/yarn-project/types/src/contracts/contract_data_source.ts @@ -1,9 +1,9 @@ -import { type FunctionSelector } from '@aztec/foundation/abi'; -import { type AztecAddress } from '@aztec/foundation/aztec-address'; -import { type Fr } from '@aztec/foundation/fields'; +import { FunctionSelector } from '@aztec/foundation/abi'; +import { AztecAddress } from '@aztec/foundation/aztec-address'; +import { Fr } from '@aztec/foundation/fields'; -import { type ContractClassPublic, type PublicFunction } from './contract_class.js'; -import { type ContractInstanceWithAddress } from './contract_instance.js'; +import { ContractClassPublic, PublicFunction } from './contract_class.js'; +import { ContractInstanceWithAddress } from './contract_instance.js'; export interface ContractDataSource { /** diff --git a/yarn-project/types/src/contracts/contract_instance.ts b/yarn-project/types/src/contracts/contract_instance.ts index 8f14656bc900..354857b6b618 100644 --- a/yarn-project/types/src/contracts/contract_instance.ts +++ b/yarn-project/types/src/contracts/contract_instance.ts @@ -2,7 +2,7 @@ import { AztecAddress } from '@aztec/foundation/aztec-address'; import { EthAddress } from '@aztec/foundation/eth-address'; import { Fr } from '@aztec/foundation/fields'; import { BufferReader, numToUInt8, serializeToBuffer } from '@aztec/foundation/serialize'; -import { type FieldsOf } from '@aztec/foundation/types'; +import { FieldsOf } from '@aztec/foundation/types'; const VERSION = 1 as const; diff --git a/yarn-project/types/src/interfaces/node-info.ts b/yarn-project/types/src/interfaces/node-info.ts index b4c96b6cedb3..48d77996d896 100644 --- a/yarn-project/types/src/interfaces/node-info.ts +++ b/yarn-project/types/src/interfaces/node-info.ts @@ -1,4 +1,4 @@ -import { type L1ContractAddresses } from '@aztec/ethereum'; +import { L1ContractAddresses } from '@aztec/ethereum'; /** * Provides basic information about the running node. diff --git a/yarn-project/types/src/noir/index.ts b/yarn-project/types/src/noir/index.ts index c244ee699958..097129d74fb5 100644 --- a/yarn-project/types/src/noir/index.ts +++ b/yarn-project/types/src/noir/index.ts @@ -1,10 +1,10 @@ import { - type ABIParameter, - type ABIParameterVisibility, - type ABIType, - type DebugFileMap, - type DebugInfo, - type EventAbi, + ABIParameter, + ABIParameterVisibility, + ABIType, + DebugFileMap, + DebugInfo, + EventAbi, } from '@aztec/foundation/abi'; export const AZTEC_PRIVATE_ATTRIBUTE = 'aztec(private)'; diff --git a/yarn-project/types/src/test/fixtures.ts b/yarn-project/types/src/test/fixtures.ts index 9796b24cb12f..4395b58033d8 100644 --- a/yarn-project/types/src/test/fixtures.ts +++ b/yarn-project/types/src/test/fixtures.ts @@ -1,11 +1,11 @@ -import { type ContractArtifact } from '@aztec/foundation/abi'; +import { ContractArtifact } from '@aztec/foundation/abi'; import { readFileSync } from 'fs'; import { dirname, resolve } from 'path'; import { fileURLToPath } from 'url'; import { loadContractArtifact } from '../abi/contract_artifact.js'; -import { type NoirCompiledContract } from '../noir/index.js'; +import { NoirCompiledContract } from '../noir/index.js'; // Copied from the build output for the contract `Benchmarking` in noir-contracts export function getSampleContractArtifact(): ContractArtifact { 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 1ccdb134c641..4da1279012bb 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 @@ -1,17 +1,17 @@ -import { type L1ToL2MessageSource, L2Block, type L2BlockSource, MerkleTreeId, SiblingPath } from '@aztec/circuit-types'; +import { L1ToL2MessageSource, L2Block, L2BlockSource, MerkleTreeId, SiblingPath } from '@aztec/circuit-types'; import { Fr } from '@aztec/circuits.js'; import { L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/circuits.js/constants'; import { randomInt } from '@aztec/foundation/crypto'; import { createDebugLogger } from '@aztec/foundation/log'; import { sleep } from '@aztec/foundation/sleep'; -import { type AztecKVStore } from '@aztec/kv-store'; +import { AztecKVStore } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/utils'; import { INITIAL_LEAF, Pedersen, SHA256Trunc, StandardTree } from '@aztec/merkle-tree'; import { jest } from '@jest/globals'; import { mock } from 'jest-mock-extended'; -import { type MerkleTreeDb, type MerkleTrees, type WorldStateConfig } from '../index.js'; +import { MerkleTreeDb, MerkleTrees, WorldStateConfig } from '../index.js'; import { ServerWorldStateSynchronizer } from './server_world_state_synchronizer.js'; import { WorldStateRunningState } from './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 548c37a0f197..001fd91abc2f 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,27 +1,19 @@ -import { type L1ToL2MessageSource, type L2Block, L2BlockDownloader, type L2BlockSource } from '@aztec/circuit-types'; -import { type L2BlockHandledStats } from '@aztec/circuit-types/stats'; +import { L1ToL2MessageSource, L2Block, L2BlockDownloader, L2BlockSource } from '@aztec/circuit-types'; +import { L2BlockHandledStats } from '@aztec/circuit-types/stats'; import { L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/circuits.js/constants'; import { Fr } from '@aztec/foundation/fields'; import { SerialQueue } from '@aztec/foundation/fifo'; import { createDebugLogger } from '@aztec/foundation/log'; import { elapsed } from '@aztec/foundation/timer'; -import { type AztecKVStore, type AztecSingleton } from '@aztec/kv-store'; +import { AztecKVStore, AztecSingleton } from '@aztec/kv-store'; import { openTmpStore } from '@aztec/kv-store/utils'; import { SHA256Trunc, StandardTree } from '@aztec/merkle-tree'; -import { - type HandleL2BlockAndMessagesResult, - type MerkleTreeOperations, - type MerkleTrees, -} from '../world-state-db/index.js'; +import { HandleL2BlockAndMessagesResult, MerkleTreeOperations, MerkleTrees } from '../world-state-db/index.js'; import { MerkleTreeOperationsFacade } from '../world-state-db/merkle_tree_operations_facade.js'; import { MerkleTreeSnapshotOperationsFacade } from '../world-state-db/merkle_tree_snapshot_operations_facade.js'; -import { type WorldStateConfig } from './config.js'; -import { - WorldStateRunningState, - type WorldStateStatus, - type WorldStateSynchronizer, -} from './world_state_synchronizer.js'; +import { WorldStateConfig } from './config.js'; +import { WorldStateRunningState, WorldStateStatus, WorldStateSynchronizer } from './world_state_synchronizer.js'; /** * Synchronizes the world state with the L2 blocks from a L2BlockSource. diff --git a/yarn-project/world-state/src/synchronizer/world_state_synchronizer.ts b/yarn-project/world-state/src/synchronizer/world_state_synchronizer.ts index 24dfa22226c4..51b8e1d4880d 100644 --- a/yarn-project/world-state/src/synchronizer/world_state_synchronizer.ts +++ b/yarn-project/world-state/src/synchronizer/world_state_synchronizer.ts @@ -1,4 +1,4 @@ -import { type MerkleTreeOperations } from '../world-state-db/index.js'; +import { MerkleTreeOperations } from '../world-state-db/index.js'; /** * Defines the possible states of the world state synchronizer. 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 19cadde30a3a..7df7a084f323 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,8 +1,8 @@ -import { type MerkleTreeId } from '@aztec/circuit-types'; -import { type Fr, MAX_NEW_NULLIFIERS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX } from '@aztec/circuits.js'; -import { type IndexedTreeSnapshot, type TreeSnapshot } from '@aztec/merkle-tree'; +import { MerkleTreeId } from '@aztec/circuit-types'; +import { Fr, MAX_NEW_NULLIFIERS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX } from '@aztec/circuits.js'; +import { IndexedTreeSnapshot, TreeSnapshot } from '@aztec/merkle-tree'; -import { type MerkleTreeOperations } from './merkle_tree_operations.js'; +import { MerkleTreeOperations } from './merkle_tree_operations.js'; /** * diff --git a/yarn-project/world-state/src/world-state-db/merkle_tree_operations.ts b/yarn-project/world-state/src/world-state-db/merkle_tree_operations.ts index fd6fc5801c05..3cacb652fe00 100644 --- a/yarn-project/world-state/src/world-state-db/merkle_tree_operations.ts +++ b/yarn-project/world-state/src/world-state-db/merkle_tree_operations.ts @@ -1,8 +1,8 @@ -import { type L2Block, type MerkleTreeId, type SiblingPath } from '@aztec/circuit-types'; -import { type Fr, type Header, type NullifierLeafPreimage, type StateReference } from '@aztec/circuits.js'; +import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/circuit-types'; +import { Fr, Header, NullifierLeafPreimage, StateReference } from '@aztec/circuits.js'; import { createDebugLogger } from '@aztec/foundation/log'; -import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; -import { type AppendOnlyTree, type BatchInsertionResult, type IndexedTree } from '@aztec/merkle-tree'; +import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import { AppendOnlyTree, BatchInsertionResult, IndexedTree } from '@aztec/merkle-tree'; /** * Type alias for the nullifier tree ID. diff --git a/yarn-project/world-state/src/world-state-db/merkle_tree_operations_facade.ts b/yarn-project/world-state/src/world-state-db/merkle_tree_operations_facade.ts index d26a7d12b661..aad3c019a6be 100644 --- a/yarn-project/world-state/src/world-state-db/merkle_tree_operations_facade.ts +++ b/yarn-project/world-state/src/world-state-db/merkle_tree_operations_facade.ts @@ -1,15 +1,15 @@ -import { type L2Block, type MerkleTreeId, type SiblingPath } from '@aztec/circuit-types'; -import { type Fr, type Header, type NullifierLeafPreimage, type StateReference } from '@aztec/circuits.js'; -import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; -import { type BatchInsertionResult } from '@aztec/merkle-tree'; +import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/circuit-types'; +import { Fr, Header, NullifierLeafPreimage, StateReference } from '@aztec/circuits.js'; +import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import { BatchInsertionResult } from '@aztec/merkle-tree'; -import { type MerkleTreeDb } from './merkle_tree_db.js'; +import { MerkleTreeDb } from './merkle_tree_db.js'; import { - type HandleL2BlockAndMessagesResult, - type IndexedTreeId, - type MerkleTreeLeafType, - type MerkleTreeOperations, - type TreeInfo, + HandleL2BlockAndMessagesResult, + IndexedTreeId, + MerkleTreeLeafType, + MerkleTreeOperations, + TreeInfo, } from './merkle_tree_operations.js'; /** diff --git a/yarn-project/world-state/src/world-state-db/merkle_tree_snapshot_operations_facade.ts b/yarn-project/world-state/src/world-state-db/merkle_tree_snapshot_operations_facade.ts index 850899e7d0cd..188213d66c74 100644 --- a/yarn-project/world-state/src/world-state-db/merkle_tree_snapshot_operations_facade.ts +++ b/yarn-project/world-state/src/world-state-db/merkle_tree_snapshot_operations_facade.ts @@ -1,15 +1,15 @@ -import { MerkleTreeId, type SiblingPath } from '@aztec/circuit-types'; -import { AppendOnlyTreeSnapshot, Fr, type Header, PartialStateReference, StateReference } from '@aztec/circuits.js'; -import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; -import { type BatchInsertionResult, type IndexedTreeSnapshot } from '@aztec/merkle-tree'; +import { MerkleTreeId, SiblingPath } from '@aztec/circuit-types'; +import { AppendOnlyTreeSnapshot, Fr, Header, PartialStateReference, StateReference } from '@aztec/circuits.js'; +import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import { BatchInsertionResult, IndexedTreeSnapshot } from '@aztec/merkle-tree'; -import { type MerkleTreeDb, type TreeSnapshots } from './merkle_tree_db.js'; +import { MerkleTreeDb, TreeSnapshots } from './merkle_tree_db.js'; import { - type HandleL2BlockAndMessagesResult, - type IndexedTreeId, - type MerkleTreeLeafType, - type MerkleTreeOperations, - type TreeInfo, + HandleL2BlockAndMessagesResult, + IndexedTreeId, + MerkleTreeLeafType, + MerkleTreeOperations, + TreeInfo, } from './merkle_tree_operations.js'; /** diff --git a/yarn-project/world-state/src/world-state-db/merkle_trees.ts b/yarn-project/world-state/src/world-state-db/merkle_trees.ts index 6a12541500b8..352d94e8fb72 100644 --- a/yarn-project/world-state/src/world-state-db/merkle_trees.ts +++ b/yarn-project/world-state/src/world-state-db/merkle_trees.ts @@ -1,4 +1,4 @@ -import { type L2Block, MerkleTreeId, type SiblingPath } from '@aztec/circuit-types'; +import { L2Block, MerkleTreeId, SiblingPath } from '@aztec/circuit-types'; import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, @@ -23,36 +23,36 @@ import { } from '@aztec/circuits.js'; import { padArrayEnd } from '@aztec/foundation/collection'; import { SerialQueue } from '@aztec/foundation/fifo'; -import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log'; -import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; -import { type AztecKVStore } from '@aztec/kv-store'; +import { DebugLogger, createDebugLogger } from '@aztec/foundation/log'; +import { IndexedTreeLeafPreimage } from '@aztec/foundation/trees'; +import { AztecKVStore } from '@aztec/kv-store'; import { - type AppendOnlyTree, - type BatchInsertionResult, - type IndexedTree, + AppendOnlyTree, + BatchInsertionResult, + IndexedTree, Pedersen, StandardIndexedTree, StandardTree, - type UpdateOnlyTree, + UpdateOnlyTree, getTreeMeta, loadTree, newTree, } from '@aztec/merkle-tree'; -import { type Hasher } from '@aztec/types/interfaces'; +import { Hasher } from '@aztec/types/interfaces'; import { INITIAL_NULLIFIER_TREE_SIZE, INITIAL_PUBLIC_DATA_TREE_SIZE, - type MerkleTreeDb, - type TreeSnapshots, + MerkleTreeDb, + TreeSnapshots, } from './merkle_tree_db.js'; import { - type HandleL2BlockAndMessagesResult, - type IndexedTreeId, - type MerkleTreeLeafType, - type MerkleTreeMap, - type MerkleTreeOperations, - type TreeInfo, + HandleL2BlockAndMessagesResult, + IndexedTreeId, + MerkleTreeLeafType, + MerkleTreeMap, + MerkleTreeOperations, + TreeInfo, } from './merkle_tree_operations.js'; import { MerkleTreeOperationsFacade } from './merkle_tree_operations_facade.js';