Enforce import order in TS (#1069)

* Enforce TS import order

* use modern TS type assertion

* fix merge

yarn-project/acir-simulator/src/acvm/acvm.ts

@@ -2,6 +2,7 @@ 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 { ForeignCallInput, ForeignCallOutput, WitnessMap, executeCircuit } from 'acvm_js';
 
 /**

yarn-project/acir-simulator/src/acvm/acvm_fields_reader.ts

@@ -1,4 +1,5 @@
 import { Fr } from '@aztec/foundation/fields';
+
 import { ACVMField, fromACVMField } from './acvm.js';
 
 /**

yarn-project/acir-simulator/src/acvm/deserialize.ts

@@ -4,17 +4,19 @@ import {
   MAX_NEW_COMMITMENTS_PER_CALL,
   MAX_NEW_L2_TO_L1_MSGS_PER_CALL,
   MAX_NEW_NULLIFIERS_PER_CALL,
-  NUM_FIELDS_PER_SHA256,
   MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL,
   MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
+  NUM_FIELDS_PER_SHA256,
   PrivateCircuitPublicInputs,
   MAX_READ_REQUESTS_PER_CALL,
   RETURN_VALUES_LENGTH,
 } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr, Point } from '@aztec/foundation/fields';
+
 import { getReturnWitness } from 'acvm_js';
+
 import { ACVMField, ACVMWitness, fromACVMField } from './acvm.js';
 
 // Utilities to read TS classes from ACVM Field arrays

yarn-project/acir-simulator/src/acvm/serialize.ts

@@ -1,5 +1,3 @@
-import { ACVMField, toACVMField } from './acvm.js';
-
 import {
   CallContext,
   ContractDeploymentData,
@@ -8,9 +6,11 @@ import {
   PrivateCircuitPublicInputs,
   PublicCallRequest,
 } from '@aztec/circuits.js';
-import { CommitmentDataOracleInputs, MessageLoadOracleInputs } from '../client/db_oracle.js';
 import { Fr } from '@aztec/foundation/fields';
 
+import { CommitmentDataOracleInputs, MessageLoadOracleInputs } from '../client/db_oracle.js';
+import { ACVMField, toACVMField } from './acvm.js';
+
 // Utilities to write TS classes to ACVM Field arrays
 // In the order that the ACVM expects them
 

yarn-project/acir-simulator/src/client/client_execution_context.ts

@@ -1,6 +1,7 @@
 import { PrivateHistoricTreeRoots, ReadRequestMembershipWitness, TxContext } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr, Point } from '@aztec/foundation/fields';
+
 import {
   ACVMField,
   fromACVMField,

yarn-project/acir-simulator/src/client/db_oracle.ts

@@ -1,8 +1,8 @@
+import { PartialContractAddress } from '@aztec/circuits.js';
+import { FunctionAbi } 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 { FunctionAbi } from '@aztec/foundation/abi';
-import { PartialContractAddress } from '@aztec/circuits.js';
 
 import { CommitmentsDB } from '../index.js';
 

yarn-project/acir-simulator/src/client/debug.ts

@@ -1,4 +1,5 @@
 import { ForeignCallInput } from 'acvm_js';
+
 import { ACVMField } from '../acvm/index.js';
 
 /**

yarn-project/acir-simulator/src/client/execution_result.ts

@@ -1,6 +1,7 @@
 import { PrivateCallStackItem, PublicCallRequest, ReadRequestMembershipWitness } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
 import { FunctionL2Logs } from '@aztec/types';
+
 import { ACVMField } from '../acvm/index.js';
 
 /**

yarn-project/acir-simulator/src/client/private_execution.test.ts

@@ -29,10 +29,11 @@ import {
   ZkTokenContractAbi,
 } from '@aztec/noir-contracts/examples';
 import { PackedArguments, TxExecutionRequest } from '@aztec/types';
+
 import { jest } from '@jest/globals';
 import { MockProxy, mock } from 'jest-mock-extended';
 import { default as levelup } from 'levelup';
-import { default as memdown, type MemDown } from 'memdown';
+import { type MemDown, default as memdown } from 'memdown';
 
 import { buildL1ToL2Message } from '../test/utils.js';
 import { NoirPoint, computeSlotForMapping, toPublicKey } from '../utils.js';

yarn-project/acir-simulator/src/client/private_execution.ts

@@ -16,6 +16,7 @@ import { Fr, Point } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { to2Fields } from '@aztec/foundation/serialize';
 import { FunctionL2Logs, NotePreimage, NoteSpendingInfo } from '@aztec/types';
+
 import { extractPublicInputs, frToAztecAddress, frToSelector } from '../acvm/deserialize.js';
 import {
   ZERO_ACVM_FIELD,

yarn-project/acir-simulator/src/client/simulator.ts

@@ -6,6 +6,7 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 import { ExecutionRequest, TxExecutionRequest } from '@aztec/types';
+
 import { PackedArgsCache } from '../packed_args_cache.js';
 import { ClientTxExecutionContext } from './client_execution_context.js';
 import { DBOracle } from './db_oracle.js';

yarn-project/acir-simulator/src/client/unconstrained_execution.test.ts

@@ -1,16 +1,17 @@
 import { CircuitsWasm, FunctionData, PrivateHistoricTreeRoots } from '@aztec/circuits.js';
 import { Grumpkin } from '@aztec/circuits.js/barretenberg';
-
+import { encodeArguments } 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 { ZkTokenContractAbi } from '@aztec/noir-contracts/examples';
 import { ExecutionRequest } from '@aztec/types';
+
 import { mock } from 'jest-mock-extended';
+
 import { NoirPoint, toPublicKey } from '../utils.js';
 import { DBOracle } from './db_oracle.js';
 import { AcirSimulator } from './simulator.js';
-import { encodeArguments } from '@aztec/foundation/abi';
 
 describe('Unconstrained Execution test suite', () => {
   let bbWasm: CircuitsWasm;

yarn-project/acir-simulator/src/public/db.ts

@@ -1,6 +1,7 @@
 import { EthAddress, PrivateHistoricTreeRoots } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
+
 import { CommitmentDataOracleInputs, MessageLoadOracleInputs } from '../index.js';
 
 /**

yarn-project/acir-simulator/src/public/executor.ts

@@ -10,6 +10,7 @@ import {
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { FunctionL2Logs } from '@aztec/types';
+
 import {
   ZERO_ACVM_FIELD,
   acvm,
@@ -23,11 +24,11 @@ import {
   toAcvmCommitmentLoadOracleInputs,
   toAcvmL1ToL2MessageLoadOracleInputs,
 } from '../acvm/index.js';
+import { oracleDebugCallToFormattedStr } from '../client/debug.js';
+import { PackedArgsCache } from '../packed_args_cache.js';
 import { CommitmentsDB, PublicContractsDB, PublicStateDB } from './db.js';
 import { PublicExecution, PublicExecutionResult } from './execution.js';
 import { ContractStorageActionsCollector } from './state_actions.js';
-import { oracleDebugCallToFormattedStr } from '../client/debug.js';
-import { PackedArgsCache } from '../packed_args_cache.js';
 
 // Copied from crate::abi at noir-contracts/src/contracts/noir-aztec/src/abi.nr
 const NOIR_MAX_RETURN_VALUES = 4;

yarn-project/acir-simulator/src/public/index.test.ts

@@ -1,33 +1,34 @@
-import { Grumpkin, pedersenPlookupCommitInputs } from '@aztec/circuits.js/barretenberg';
 import {
   CallContext,
-  FunctionData,
   CircuitsWasm,
-  PrivateHistoricTreeRoots,
-  L1_TO_L2_MSG_TREE_HEIGHT,
+  FunctionData,
   GlobalVariables,
+  L1_TO_L2_MSG_TREE_HEIGHT,
+  PrivateHistoricTreeRoots,
 } from '@aztec/circuits.js';
+import { Grumpkin, pedersenPlookupCommitInputs } from '@aztec/circuits.js/barretenberg';
+import { FunctionAbi, encodeArguments } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { keccak } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
-import { FunctionAbi, encodeArguments } from '@aztec/foundation/abi';
+import { toBigInt } from '@aztec/foundation/serialize';
 import {
   ChildAbi,
   NonNativeTokenContractAbi,
   ParentAbi,
   PublicTokenContractAbi,
   TestContractAbi,
 } from '@aztec/noir-contracts/examples';
-import { toBigInt } from '@aztec/foundation/serialize';
-import { keccak } from '@aztec/foundation/crypto';
+
 import { MockProxy, mock } from 'jest-mock-extended';
-import { default as memdown, type MemDown } from 'memdown';
+import { type MemDown, default as memdown } from 'memdown';
 
+import { buildL1ToL2Message } from '../test/utils.js';
 import { NoirPoint, computeSlotForMapping, toPublicKey } from '../utils.js';
 import { CommitmentsDB, PublicContractsDB, PublicStateDB } from './db.js';
 import { PublicExecution } from './execution.js';
 import { PublicExecutor } from './executor.js';
-import { buildL1ToL2Message } from '../test/utils.js';
 
 export const createMemDown = () => (memdown as any)() as MemDown<any, any>;
 

yarn-project/acir-simulator/src/public/state_actions.ts

@@ -1,6 +1,7 @@
 import { ContractStorageRead, ContractStorageUpdateRequest } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
+
 import { PublicStateDB } from './db.js';
 
 /**

yarn-project/acir-simulator/src/test/utils.ts

@@ -1,7 +1,7 @@
+import { AztecAddress, CircuitsWasm, EthAddress, Fr } from '@aztec/circuits.js';
 import { computeSecretMessageHash } from '@aztec/circuits.js/abis';
-import { L1ToL2Message, L1Actor, L2Actor } from '@aztec/types';
 import { sha256ToField } from '@aztec/foundation/crypto';
-import { AztecAddress, CircuitsWasm, EthAddress, Fr } from '@aztec/circuits.js';
+import { L1Actor, L1ToL2Message, L2Actor } from '@aztec/types';
 
 /**
  * Test utility function to craft an L1 to L2 message.

yarn-project/acir-simulator/src/utils.ts

@@ -1,6 +1,6 @@
-import { Fr, Point } from '@aztec/foundation/fields';
-import { Grumpkin, pedersenPlookupCommitInputs } from '@aztec/circuits.js/barretenberg';
 import { CircuitsWasm } from '@aztec/circuits.js';
+import { Grumpkin, pedersenPlookupCommitInputs } from '@aztec/circuits.js/barretenberg';
+import { Fr, Point } from '@aztec/foundation/fields';
 
 /**
  * A point in the format that noir uses.

yarn-project/archiver/src/archiver/archiver.test.ts

@@ -1,4 +1,9 @@
-import { InboxAbi, RollupAbi, ContractDeploymentEmitterAbi } from '@aztec/l1-artifacts';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { randomBytes } from '@aztec/foundation/crypto';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { Fr } from '@aztec/foundation/fields';
+import { sleep } from '@aztec/foundation/sleep';
+import { ContractDeploymentEmitterAbi, InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
 import {
   ContractData,
   ContractPublicData,
@@ -7,15 +12,12 @@ import {
   L2BlockL2Logs,
   LogType,
 } from '@aztec/types';
+
 import { MockProxy, mock } from 'jest-mock-extended';
 import { Chain, HttpTransport, Log, PublicClient, Transaction, encodeFunctionData, toHex } from 'viem';
+
 import { Archiver } from './archiver.js';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import { sleep } from '@aztec/foundation/sleep';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { randomBytes } from '@aztec/foundation/crypto';
 import { ArchiverDataStore, MemoryArchiverStore } from './archiver_store.js';
-import { Fr } from '@aztec/foundation/fields';
 
 describe('Archiver', () => {
   const rollupAddress = '0x0000000000000000000000000000000000000000';

yarn-project/archiver/src/archiver/archiver.ts

@@ -1,30 +1,31 @@
-import omit from 'lodash.omit';
+import { createEthereumChain } from '@aztec/ethereum';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { Fr } from '@aztec/foundation/fields';
 import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { INITIAL_L2_BLOCK_NUM, L1ToL2Message, L1ToL2MessageSource, L2BlockL2Logs, LogType } from '@aztec/types';
 import {
   ContractData,
-  ContractPublicData,
   ContractDataSource,
+  ContractPublicData,
   EncodedContractFunction,
   L2Block,
   L2BlockSource,
   L2LogsSource,
 } from '@aztec/types';
+
+import omit from 'lodash.omit';
 import { Chain, HttpTransport, PublicClient, createPublicClient, http } from 'viem';
-import { createEthereumChain } from '@aztec/ethereum';
-import { Fr } from '@aztec/foundation/fields';
 
+import { ArchiverDataStore, MemoryArchiverStore } from './archiver_store.js';
 import { ArchiverConfig } from './config.js';
 import {
   retrieveBlocks,
+  retrieveNewCancelledL1ToL2Messages,
   retrieveNewContractData,
   retrieveNewPendingL1ToL2Messages,
-  retrieveNewCancelledL1ToL2Messages,
 } from './data_retrieval.js';
-import { ArchiverDataStore, MemoryArchiverStore } from './archiver_store.js';
 
 /**
  * Pulls L2 blocks in a non-blocking manner and provides interface for their retrieval.

yarn-project/archiver/src/archiver/archiver_store.ts

@@ -1,14 +1,15 @@
+import { Fr, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/circuits.js';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
 import {
+  ContractData,
   ContractPublicData,
-  L2Block,
   INITIAL_L2_BLOCK_NUM,
-  ContractData,
   L1ToL2Message,
+  L2Block,
   L2BlockL2Logs,
   LogType,
 } from '@aztec/types';
-import { Fr, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+
 import { L1ToL2MessageStore, PendingL1ToL2MessageStore } from './l1_to_l2_message_store.js';
 
 /**

yarn-project/archiver/src/archiver/data_retrieval.ts

@@ -1,17 +1,19 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { Fr } from '@aztec/foundation/fields';
+import { ContractPublicData, L1ToL2Message, L2Block } from '@aztec/types';
+
 import { PublicClient } from 'viem';
+
 import {
   getContractDeploymentLogs,
+  getL1ToL2MessageCancelledLogs,
   getL2BlockProcessedLogs,
   getPendingL1ToL2MessageLogs,
-  getL1ToL2MessageCancelledLogs,
   processBlockLogs,
+  processCancelledL1ToL2MessagesLogs,
   processContractDeploymentLogs,
   processPendingL1ToL2MessageAddedLogs,
-  processCancelledL1ToL2MessagesLogs,
 } from './eth_log_handlers.js';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import { ContractPublicData, L1ToL2Message, L2Block } from '@aztec/types';
-import { Fr } from '@aztec/foundation/fields';
 
 /**
  * Data retrieved from logs

yarn-project/archiver/src/archiver/eth_log_handlers.ts

@@ -1,18 +1,19 @@
-import { Hex, Log, PublicClient, decodeFunctionData, getAbiItem, getAddress, hexToBytes } from 'viem';
-import { InboxAbi, RollupAbi, ContractDeploymentEmitterAbi } from '@aztec/l1-artifacts';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
+import { ContractDeploymentEmitterAbi, InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
 import {
-  L1ToL2Message,
-  L1Actor,
-  L2Actor,
-  L2Block,
-  ContractPublicData,
   BufferReader,
   ContractData,
+  ContractPublicData,
   EncodedContractFunction,
+  L1Actor,
+  L1ToL2Message,
+  L2Actor,
+  L2Block,
 } from '@aztec/types';
-import { EthAddress } from '@aztec/foundation/eth-address';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+
+import { Hex, Log, PublicClient, decodeFunctionData, getAbiItem, getAddress, hexToBytes } from 'viem';
 
 /**
  * Processes newly received MessageAdded (L1 to L2) logs.

yarn-project/archiver/src/archiver/l1_to_l2_message_store.test.ts

@@ -1,7 +1,8 @@
 import { Fr } from '@aztec/foundation/fields';
-import { L1ToL2MessageStore, PendingL1ToL2MessageStore } from './l1_to_l2_message_store.js';
 import { L1Actor, L1ToL2Message, L2Actor } from '@aztec/types';
 
+import { L1ToL2MessageStore, PendingL1ToL2MessageStore } from './l1_to_l2_message_store.js';
+
 describe('l1_to_l2_message_store', () => {
   let store: L1ToL2MessageStore;
   let entryKey: Fr;