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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions yarn-project/accounts/src/defaults/account_contract.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type AccountContract, type AccountInterface, type AuthWitnessProvider } from '@aztec/aztec.js/account';
import { type ContractArtifact } from '@aztec/stdlib/abi';
import { type CompleteAddress, type NodeInfo } from '@aztec/stdlib/contract';
import type { AccountContract, AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account';
import type { ContractArtifact } from '@aztec/stdlib/abi';
import type { CompleteAddress, NodeInfo } from '@aztec/stdlib/contract';

import { DefaultAccountInterface } from '../defaults/account_interface.js';

Expand Down
6 changes: 3 additions & 3 deletions yarn-project/accounts/src/defaults/account_interface.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { AztecAddress, NodeInfo } from '@aztec/aztec.js';
import { type AccountInterface, type AuthWitnessProvider, CompleteAddress } from '@aztec/aztec.js/account';
import { type EntrypointInterface, type ExecutionRequestInit } from '@aztec/aztec.js/entrypoint';
import type { EntrypointInterface, ExecutionRequestInit } from '@aztec/aztec.js/entrypoint';
import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
import { Fr } from '@aztec/foundation/fields';
import { type AuthWitness } from '@aztec/stdlib/auth-witness';
import { type TxExecutionRequest } from '@aztec/stdlib/tx';
import type { AuthWitness } from '@aztec/stdlib/auth-witness';
import type { TxExecutionRequest } from '@aztec/stdlib/tx';

/**
* Default implementation for an account interface. Requires that the account uses the default
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/accounts/src/ecdsa/ecdsa_k/account_contract.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type AuthWitnessProvider } from '@aztec/aztec.js/account';
import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
import { Ecdsa } from '@aztec/foundation/crypto';
import { type Fr } from '@aztec/foundation/fields';
import { type ContractArtifact } from '@aztec/stdlib/abi';
import type { Fr } from '@aztec/foundation/fields';
import type { ContractArtifact } from '@aztec/stdlib/abi';
import { AuthWitness } from '@aztec/stdlib/auth-witness';
import { CompleteAddress } from '@aztec/stdlib/contract';

Expand Down
2 changes: 1 addition & 1 deletion yarn-project/accounts/src/ecdsa/ecdsa_k/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import type { AztecAddress, Fr } from '@aztec/aztec.js';
import { AccountManager, type Salt } from '@aztec/aztec.js/account';
import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
import { type PXE } from '@aztec/stdlib/interfaces/client';
import type { PXE } from '@aztec/stdlib/interfaces/client';

import { EcdsaKAccountContract } from './account_contract.js';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type AuthWitnessProvider, CompleteAddress } from '@aztec/aztec.js/account';
import { EcdsaSignature } from '@aztec/foundation/crypto';
import { type Fr } from '@aztec/foundation/fields';
import { type ContractArtifact } from '@aztec/stdlib/abi';
import type { Fr } from '@aztec/foundation/fields';
import type { ContractArtifact } from '@aztec/stdlib/abi';
import { AuthWitness } from '@aztec/stdlib/auth-witness';

import { DefaultAccountContract } from '../../defaults/account_contract.js';
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/accounts/src/ecdsa/ssh_ecdsa_r/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import type { AztecAddress, Fr } from '@aztec/aztec.js';
import { AccountManager, type Salt } from '@aztec/aztec.js/account';
import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
import { type PXE } from '@aztec/stdlib/interfaces/client';
import type { PXE } from '@aztec/stdlib/interfaces/client';

import { EcdsaRSSHAccountContract } from './account_contract.js';

Expand Down
4 changes: 2 additions & 2 deletions yarn-project/accounts/src/schnorr/account_contract.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { CompleteAddress, getAccountContractAddress } from '@aztec/aztec.js';
import { type AuthWitnessProvider } from '@aztec/aztec.js/account';
import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
import { Schnorr } from '@aztec/foundation/crypto';
import { type Fr, GrumpkinScalar } from '@aztec/foundation/fields';
import { type ContractArtifact } from '@aztec/stdlib/abi';
import type { ContractArtifact } from '@aztec/stdlib/abi';
import { AuthWitness } from '@aztec/stdlib/auth-witness';
import { deriveSigningKey } from '@aztec/stdlib/keys';

Expand Down
2 changes: 1 addition & 1 deletion yarn-project/accounts/src/schnorr/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import type { AztecAddress, Fr, GrumpkinScalar } from '@aztec/aztec.js';
import { AccountManager, type Salt } from '@aztec/aztec.js/account';
import { type AccountWallet, type AccountWalletWithSecretKey, getWallet } from '@aztec/aztec.js/wallet';
import { type PXE } from '@aztec/stdlib/interfaces/client';
import type { PXE } from '@aztec/stdlib/interfaces/client';

import { SchnorrAccountContract } from './account_contract.js';

Expand Down
2 changes: 1 addition & 1 deletion yarn-project/accounts/src/single_key/account_contract.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type AuthWitnessProvider, CompleteAddress } from '@aztec/aztec.js/account';
import { Schnorr } from '@aztec/foundation/crypto';
import { type Fr, GrumpkinScalar } from '@aztec/foundation/fields';
import { type ContractArtifact } from '@aztec/stdlib/abi';
import type { ContractArtifact } from '@aztec/stdlib/abi';
import { AuthWitness } from '@aztec/stdlib/auth-witness';

import { DefaultAccountContract } from '../defaults/account_contract.js';
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/accounts/src/single_key/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import type { AztecAddress, Fr, GrumpkinScalar } from '@aztec/aztec.js';
import { AccountManager, type Salt } from '@aztec/aztec.js/account';
import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
import { type PXE } from '@aztec/stdlib/interfaces/client';
import type { PXE } from '@aztec/stdlib/interfaces/client';
import { deriveMasterIncomingViewingSecretKey } from '@aztec/stdlib/keys';

import { SingleKeyAccountContract } from './account_contract.js';
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/accounts/src/testing/configuration.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type PXE } from '@aztec/aztec.js';
import { type AccountWalletWithSecretKey } from '@aztec/aztec.js/wallet';
import type { PXE } from '@aztec/aztec.js';
import type { AccountWalletWithSecretKey } from '@aztec/aztec.js/wallet';
import { Fr, type GrumpkinScalar } from '@aztec/foundation/fields';
import { type AztecAddress } from '@aztec/stdlib/aztec-address';
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
import { deriveMasterIncomingViewingSecretKey } from '@aztec/stdlib/keys';

import {
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/accounts/src/testing/create_account.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { deriveSigningKey } from '@aztec/stdlib/keys';

import { getSchnorrAccountContractAddress } from '../schnorr/account_contract.js';
import { getSchnorrAccount } from '../schnorr/index.js';
import { type InitialAccountData } from './configuration.js';
import type { InitialAccountData } from './configuration.js';

/**
* Generate a fixed amount of random schnorr account contract instance.
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/archiver/src/archiver/archiver.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Blob } from '@aztec/blob-lib';
import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
import { DefaultL1ContractsConfig } from '@aztec/ethereum';
import { EthAddress } from '@aztec/foundation/eth-address';
Expand All @@ -26,8 +26,8 @@ import {
} from 'viem';

import { Archiver } from './archiver.js';
import { type ArchiverDataStore } from './archiver_store.js';
import { type ArchiverInstrumentation } from './instrumentation.js';
import type { ArchiverDataStore } from './archiver_store.js';
import type { ArchiverInstrumentation } from './instrumentation.js';
import { MemoryArchiverStore } from './memory_archiver_store/memory_archiver_store.js';

interface MockRollupContractRead {
Expand Down
25 changes: 9 additions & 16 deletions yarn-project/archiver/src/archiver/archiver.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
import { createEthereumChain } from '@aztec/ethereum';
import { type EthAddress } from '@aztec/foundation/eth-address';
import type { EthAddress } from '@aztec/foundation/eth-address';
import { Fr } from '@aztec/foundation/fields';
import { type Logger, createLogger } from '@aztec/foundation/log';
import { RunningPromise } from '@aztec/foundation/running-promise';
Expand All @@ -16,16 +16,9 @@ import {
ContractInstanceDeployedEvent,
ContractInstanceUpdatedEvent,
} from '@aztec/protocol-contracts/instance-deployer';
import { type FunctionSelector } from '@aztec/stdlib/abi';
import { type AztecAddress } from '@aztec/stdlib/aztec-address';
import {
type InBlock,
type L2Block,
type L2BlockId,
type L2BlockSource,
type L2Tips,
type NullifierWithBlockSource,
} from '@aztec/stdlib/block';
import type { FunctionSelector } from '@aztec/stdlib/abi';
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
import type { InBlock, L2Block, L2BlockId, L2BlockSource, L2Tips, NullifierWithBlockSource } from '@aztec/stdlib/block';
import {
type ContractClassPublic,
type ContractDataSource,
Expand Down Expand Up @@ -62,13 +55,13 @@ import {
http,
} from 'viem';

import { type ArchiverDataStore, type ArchiverL1SynchPoint } from './archiver_store.js';
import { type ArchiverConfig } from './config.js';
import type { ArchiverDataStore, ArchiverL1SynchPoint } from './archiver_store.js';
import type { ArchiverConfig } from './config.js';
import { retrieveBlocksFromRollup, retrieveL1ToL2Messages } from './data_retrieval.js';
import { NoBlobBodiesFoundError } from './errors.js';
import { ArchiverInstrumentation } from './instrumentation.js';
import { type DataRetrieval } from './structs/data_retrieval.js';
import { type L1Published } from './structs/published.js';
import type { DataRetrieval } from './structs/data_retrieval.js';
import type { L1Published } from './structs/published.js';

/**
* Helper interface to combine all sources this archiver implementation provides.
Expand Down
20 changes: 10 additions & 10 deletions yarn-project/archiver/src/archiver/archiver_store.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import type { Fr } from '@aztec/foundation/fields';
import { type FunctionSelector } from '@aztec/stdlib/abi';
import { type AztecAddress } from '@aztec/stdlib/aztec-address';
import type { FunctionSelector } from '@aztec/stdlib/abi';
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
import type { InBlock, L2Block } from '@aztec/stdlib/block';
import {
type ContractClassPublic,
type ContractInstanceUpdateWithAddress,
type ContractInstanceWithAddress,
type ExecutablePrivateFunctionWithMembershipProof,
type UnconstrainedFunctionWithMembershipProof,
import type {
ContractClassPublic,
ContractInstanceUpdateWithAddress,
ContractInstanceWithAddress,
ExecutablePrivateFunctionWithMembershipProof,
UnconstrainedFunctionWithMembershipProof,
} from '@aztec/stdlib/contract';
import type { GetContractClassLogsResponse, GetPublicLogsResponse } from '@aztec/stdlib/interfaces/client';
import type { LogFilter, PrivateLog, TxScopedL2Log } from '@aztec/stdlib/logs';
import type { InboxLeaf } from '@aztec/stdlib/messaging';
import { BlockHeader, type TxEffect, type TxHash, type TxReceipt } from '@aztec/stdlib/tx';

import { type DataRetrieval } from './structs/data_retrieval.js';
import { type L1Published } from './structs/published.js';
import type { DataRetrieval } from './structs/data_retrieval.js';
import type { L1Published } from './structs/published.js';

/**
* Represents the latest L1 block processed by the archiver for various objects in L2.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import {
import '@aztec/stdlib/testing/jest';
import { TxEffect, TxHash } from '@aztec/stdlib/tx';

import { type ArchiverDataStore, type ArchiverL1SynchPoint } from './archiver_store.js';
import { type L1Published } from './structs/published.js';
import type { ArchiverDataStore, ArchiverL1SynchPoint } from './archiver_store.js';
import type { L1Published } from './structs/published.js';

/**
* @param testName - The name of the test suite.
Expand Down
10 changes: 5 additions & 5 deletions yarn-project/archiver/src/archiver/data_retrieval.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Blob, BlobDeserializationError } from '@aztec/blob-lib';
import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
import { asyncPool } from '@aztec/foundation/async-pool';
import { type EthAddress } from '@aztec/foundation/eth-address';
import { type ViemSignature } from '@aztec/foundation/eth-signature';
import type { EthAddress } from '@aztec/foundation/eth-address';
import type { ViemSignature } from '@aztec/foundation/eth-signature';
import { Fr } from '@aztec/foundation/fields';
import { type Logger, createLogger } from '@aztec/foundation/log';
import { numToUInt32BE } from '@aztec/foundation/serialize';
Expand All @@ -26,8 +26,8 @@ import {
} from 'viem';

import { NoBlobBodiesFoundError } from './errors.js';
import { type DataRetrieval } from './structs/data_retrieval.js';
import { type L1Published, type L1PublishedData } from './structs/published.js';
import type { DataRetrieval } from './structs/data_retrieval.js';
import type { L1Published, L1PublishedData } from './structs/published.js';

/**
* Fetches new L2 blocks.
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/archiver/src/archiver/instrumentation.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createLogger } from '@aztec/foundation/log';
import { type L2Block } from '@aztec/stdlib/block';
import type { L2Block } from '@aztec/stdlib/block';
import {
Attributes,
type Gauge,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
import { toArray } from '@aztec/foundation/iterable';
import { createLogger } from '@aztec/foundation/log';
import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncSingleton, Range } from '@aztec/kv-store';
import { type AztecAddress } from '@aztec/stdlib/aztec-address';
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
import { Body, type InBlock, L2Block, L2BlockHash } from '@aztec/stdlib/block';
import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
import { BlockHeader, TxEffect, TxHash, TxReceipt } from '@aztec/stdlib/tx';

import { type L1Published, type L1PublishedData } from '../structs/published.js';
import type { L1Published, L1PublishedData } from '../structs/published.js';

export { type TxEffect, type TxHash, TxReceipt } from '@aztec/stdlib/tx';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { toArray } from '@aztec/foundation/iterable';
import { BufferReader, numToUInt8, serializeToBuffer } from '@aztec/foundation/serialize';
import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
import { FunctionSelector } from '@aztec/stdlib/abi';
import {
type ContractClassPublic,
type ContractClassPublicWithBlockNumber,
type ExecutablePrivateFunctionWithMembershipProof,
type UnconstrainedFunctionWithMembershipProof,
import type {
ContractClassPublic,
ContractClassPublicWithBlockNumber,
ExecutablePrivateFunctionWithMembershipProof,
UnconstrainedFunctionWithMembershipProof,
} from '@aztec/stdlib/contract';
import { Vector } from '@aztec/stdlib/types';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
import type { Fr } from '@aztec/foundation/fields';
import { toArray } from '@aztec/foundation/iterable';
import { createLogger } from '@aztec/foundation/log';
import { type AztecAsyncKVStore, type StoreSize } from '@aztec/kv-store';
import type { AztecAsyncKVStore, StoreSize } from '@aztec/kv-store';
import { FunctionSelector } from '@aztec/stdlib/abi';
import { type AztecAddress } from '@aztec/stdlib/aztec-address';
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
import type { InBlock, L2Block } from '@aztec/stdlib/block';
import {
type ContractClassPublic,
type ContractInstanceUpdateWithAddress,
type ContractInstanceWithAddress,
type ExecutablePrivateFunctionWithMembershipProof,
type UnconstrainedFunctionWithMembershipProof,
import type {
ContractClassPublic,
ContractInstanceUpdateWithAddress,
ContractInstanceWithAddress,
ExecutablePrivateFunctionWithMembershipProof,
UnconstrainedFunctionWithMembershipProof,
} from '@aztec/stdlib/contract';
import type { GetContractClassLogsResponse, GetPublicLogsResponse } from '@aztec/stdlib/interfaces/client';
import { type LogFilter, PrivateLog, type TxScopedL2Log } from '@aztec/stdlib/logs';
import type { InboxLeaf } from '@aztec/stdlib/messaging';
import type { BlockHeader, TxHash, TxReceipt } from '@aztec/stdlib/tx';

import { type ArchiverDataStore, type ArchiverL1SynchPoint } from '../archiver_store.js';
import { type DataRetrieval } from '../structs/data_retrieval.js';
import { type L1Published } from '../structs/published.js';
import type { ArchiverDataStore, ArchiverL1SynchPoint } from '../archiver_store.js';
import type { DataRetrieval } from '../structs/data_retrieval.js';
import type { L1Published } from '../structs/published.js';
import { BlockStore } from './block_store.js';
import { ContractClassStore } from './contract_class_store.js';
import { ContractInstanceStore } from './contract_instance_store.js';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
UnencryptedL2Log,
} from '@aztec/stdlib/logs';

import { type BlockStore } from './block_store.js';
import type { BlockStore } from './block_store.js';

/**
* A store for logs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { createLogger } from '@aztec/foundation/log';
import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncSingleton } from '@aztec/kv-store';
import { InboxLeaf } from '@aztec/stdlib/messaging';

import { type DataRetrieval } from '../structs/data_retrieval.js';
import type { DataRetrieval } from '../structs/data_retrieval.js';

/**
* LMDB implementation of the ArchiverDataStore interface.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { MAX_NULLIFIERS_PER_TX } from '@aztec/constants';
import { type Fr } from '@aztec/foundation/fields';
import type { Fr } from '@aztec/foundation/fields';
import { createLogger } from '@aztec/foundation/log';
import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
import { type InBlock, type L2Block } from '@aztec/stdlib/block';
import type { InBlock, L2Block } from '@aztec/stdlib/block';

export class NullifierStore {
#nullifiersToBlockNumber: AztecAsyncMap<string, number>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/constants';
import { type Fr } from '@aztec/foundation/fields';
import type { Fr } from '@aztec/foundation/fields';
import { InboxLeaf } from '@aztec/stdlib/messaging';

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { timesParallel } from '@aztec/foundation/collection';
import { L2Block } from '@aztec/stdlib/block';

import { type ArchiverDataStore } from '../archiver_store.js';
import type { ArchiverDataStore } from '../archiver_store.js';
import { describeArchiverDataStore } from '../archiver_store_test_suite.js';
import { MemoryArchiverStore } from './memory_archiver_store.js';

Expand Down
Loading
Loading