From 185cf476f49836d4f4146febd0cf7214aabacad1 Mon Sep 17 00:00:00 2001
From: Danny Willems <be.danny.willems@gmail.com>
Date: Mon, 16 Dec 2024 13:22:19 +0100
Subject: [PATCH] Dune/lib: run `dune build @fmt --auto-promote

Revamping an old small PR
---
 src/lib/allocation_functor/dune               |  32 +--
 src/lib/base58_check/dune                     |  35 +--
 src/lib/bash_colors/dune                      |   6 +-
 src/lib/best_tip_prover/dune                  |  63 ++---
 src/lib/bignum_bigint/dune                    |  19 +-
 src/lib/blake2/dune                           |  33 +--
 src/lib/block_producer/dune                   | 139 +++++------
 src/lib/block_time/dune                       |  70 +++---
 src/lib/blockchain_snark/dune                 |  75 +++---
 src/lib/bootstrap_controller/dune             | 126 +++++-----
 src/lib/bounded_types/dune                    |  18 +-
 src/lib/bowe_gabizon_hash/dune                |  12 +-
 src/lib/cache_dir/dune                        |  17 +-
 src/lib/cache_dir/fake/dune                   |  16 +-
 src/lib/cache_dir/native/dune                 |  31 +--
 src/lib/cache_lib/dune                        |  34 +--
 src/lib/child_processes/dune                  |  66 +++---
 src/lib/cli_lib/dune                          |   8 +-
 src/lib/coda_plugins/examples/toplevel/dune   |  18 +-
 src/lib/codable/dune                          |  26 ++-
 src/lib/consensus/dune                        | 202 ++++++++--------
 src/lib/consensus/vrf/dune                    | 123 +++++-----
 src/lib/crs/dune                              |   6 +-
 src/lib/crypto/kimchi_backend/common/dune     |   3 +-
 src/lib/crypto/kimchi_backend/dune            |   3 +-
 src/lib/crypto/kimchi_backend/gadgets/dune    |   9 +-
 .../crypto/kimchi_backend/gadgets/runner/dune |  87 +++----
 .../gadgets/runner/example/dune               |  89 ++++----
 .../crypto/kimchi_backend/pasta/basic/dune    |   3 +-
 .../pasta/constraint_system/caml/dune         |   3 +-
 .../pasta/constraint_system/dune              |   3 +-
 src/lib/crypto/kimchi_backend/pasta/dune      |   3 +-
 src/lib/crypto/kimchi_bindings/js/test/dune   |  47 ++--
 .../kimchi_bindings/pasta_fp_poseidon/dune    |   9 +-
 .../kimchi_bindings/pasta_fq_poseidon/dune    |   9 +-
 src/lib/crypto/kimchi_bindings/stubs/dune     |  18 +-
 .../stubs/pasta_bindings_backend/dune         |   3 +-
 .../stubs/pasta_bindings_backend/none/dune    |   3 +-
 src/lib/crypto/plonkish_prelude/dune          |   5 +-
 src/lib/crypto/plonkish_prelude/test/dune     |  12 +-
 src/lib/crypto_params/dune                    |  35 +--
 src/lib/crypto_params/gen/dune                |  62 ++---
 src/lib/cstubs_applicative/dune               |  15 +-
 src/lib/currency/dune                         |  60 ++---
 src/lib/daemon_rpcs/dune                      |  89 ++++----
 src/lib/data_hash_lib/dune                    |  77 ++++---
 src/lib/debug_assert/dune                     |   9 +-
 src/lib/direction/dune                        |   3 +-
 src/lib/downloader/dune                       |  40 ++--
 src/lib/dummy_values/dune                     |  16 +-
 src/lib/dummy_values/gen_values/dune          |  44 ++--
 src/lib/empty_hashes/dune                     |   9 +-
 src/lib/error_json/dune                       |  17 +-
 src/lib/exit_handlers/dune                    |   6 +-
 src/lib/fake_network/dune                     | 101 ++++----
 src/lib/fields_derivers/dune                  |  16 +-
 src/lib/fields_derivers_graphql/dune          |  39 ++--
 src/lib/fields_derivers_json/dune             |  34 ++-
 src/lib/fields_derivers_zkapps/dune           |  53 ++---
 src/lib/file_system/dune                      |  12 +-
 src/lib/filtered_external_transition/dune     |  79 ++++---
 src/lib/gadt_lib/dune                         |   6 +-
 src/lib/generated_graphql_queries/dune        |  30 ++-
 src/lib/generated_graphql_queries/gen/dune    |  17 +-
 src/lib/genesis_constants/dune                |  79 ++++---
 src/lib/genesis_ledger/dune                   |  34 +--
 src/lib/genesis_ledger_helper/dune            | 100 ++++----
 src/lib/genesis_ledger_helper/lib/dune        |  83 ++++---
 src/lib/genesis_proof/dune                    |  71 +++---
 src/lib/global_signer_private_key/dune        |  12 +-
 src/lib/gossip_net/dune                       |  97 ++++----
 src/lib/graph_algorithms/dune                 |   9 +-
 src/lib/graphql_basic_scalars/dune            |  46 ++--
 src/lib/graphql_lib/block_time/dune           |  29 +--
 src/lib/graphql_lib/consensus/dune            |  42 ++--
 src/lib/graphql_lib/currency/dune             |  32 +--
 src/lib/graphql_lib/data_hash_lib/dune        |   3 +-
 src/lib/graphql_lib/dune                      |  56 ++---
 .../filtered_external_transition/dune         |  29 +--
 src/lib/graphql_lib/mina_base/dune            |  44 ++--
 src/lib/graphql_lib/mina_block/dune           |  35 +--
 src/lib/graphql_lib/mina_numbers/dune         |  29 +--
 src/lib/graphql_lib/pickles/dune              |  47 ++--
 src/lib/graphql_lib/pickles/test/dune         |  17 +-
 src/lib/graphql_lib/signature_lib/dune        |   3 +-
 src/lib/graphql_lib/snark_params/dune         |  32 +--
 src/lib/graphql_lib/transaction/dune          |  36 +--
 .../ocaml_graphql_server_tests/dune           |   3 +-
 src/lib/hash_prefix_states/dune               |  38 ++--
 src/lib/hash_prefixes/dune                    |   7 +-
 src/lib/hex/dune                              |   9 +-
 src/lib/immutable_array/dune                  |   6 +-
 src/lib/integers_stubs_js/dune                |   9 +-
 src/lib/integers_stubs_js/test/dune           |   9 +-
 src/lib/integration_test_lib/dune             | 140 +++++++-----
 src/lib/internal_tracing/context_call/dune    |   3 +-
 src/lib/internal_tracing/dune                 |   6 +-
 src/lib/interruptible/dune                    |  22 +-
 src/lib/itn_crypto/dune                       |  31 +--
 src/lib/itn_logger/dune                       |  31 +--
 src/lib/key_cache/async/dune                  |  29 +--
 src/lib/key_cache/dune                        |   6 +-
 src/lib/key_cache/native/dune                 |   6 +-
 src/lib/key_cache/sync/dune                   |  25 +-
 src/lib/key_gen/dune                          |   8 +-
 src/lib/key_value_database/dune               |   6 +-
 src/lib/ledger_catchup/dune                   | 136 +++++------
 src/lib/ledger_proof/dune                     |  37 +--
 src/lib/linked_tree/dune                      |  11 +-
 src/lib/lmdb_storage/dune                     |  26 ++-
 src/lib/logger/context_logger/dune            |   6 +-
 src/lib/logger/dune                           |  17 +-
 src/lib/logger/fake/dune                      |  26 +--
 src/lib/logger/file_system/dune               |   6 +-
 src/lib/logger/native/dune                    |  33 +--
 src/lib/logger/test/dune                      |  23 +-
 src/lib/logproc_lib/dune                      |  48 ++--
 src/lib/merkle_address/dune                   |  18 +-
 src/lib/merkle_ledger/dune                    |  19 +-
 src/lib/merkle_ledger_tests/dune              |  76 ++++---
 src/lib/merkle_ledger_tests/test/dune         |  14 +-
 src/lib/merkle_list_prover/dune               |   6 +-
 src/lib/merkle_list_verifier/dune             |   6 +-
 src/lib/merkle_mask/dune                      |  19 +-
 src/lib/mina_base/dune                        | 175 +++++++-------
 src/lib/mina_base/import/dune                 |   8 +-
 src/lib/mina_base/test/dune                   |   6 +-
 src/lib/mina_base/test/fee_excess/dune        |   6 +-
 src/lib/mina_base/util/dune                   |  19 +-
 src/lib/mina_block/dune                       | 120 +++++-----
 src/lib/mina_caqti/dune                       |  23 +-
 src/lib/mina_commands/dune                    | 105 ++++-----
 src/lib/mina_compile_config/dune              |  12 +-
 src/lib/mina_debug/dune                       |   3 +-
 src/lib/mina_generators/dune                  |  89 ++++----
 src/lib/mina_graphql/dune                     | 215 +++++++++---------
 src/lib/mina_incremental/dune                 |   9 +-
 src/lib/mina_intf/dune                        |  59 ++---
 src/lib/mina_ledger/dune                      | 117 +++++-----
 src/lib/mina_lib/dune                         | 204 +++++++++--------
 src/lib/mina_lib/tests/dune                   | 110 ++++-----
 src/lib/mina_metrics/dune                     |   6 +-
 src/lib/mina_metrics/js_test/dune             |   6 +-
 src/lib/mina_metrics/no_metrics/dune          |   6 +-
 src/lib/mina_metrics/prometheus_metrics/dune  |  47 ++--
 src/lib/mina_net2/dune                        |  86 +++----
 src/lib/mina_net2/tests/dune                  |  48 ++--
 src/lib/mina_networking/dune                  | 121 +++++-----
 src/lib/mina_numbers/dune                     |  79 ++++---
 src/lib/mina_plugins/dune                     |  23 +-
 src/lib/mina_plugins/examples/do_nothing/dune |  21 +-
 src/lib/mina_state/dune                       | 116 ++++++----
 src/lib/mina_stdlib/dune                      |  28 +--
 src/lib/mina_user_error/dune                  |   6 +-
 src/lib/mina_version/dummy/dune               |   6 +-
 src/lib/mina_version/dune                     |   6 +-
 src/lib/mina_version/normal/dune              |  15 +-
 src/lib/mina_version/runtime/dune             |   6 +-
 src/lib/mina_wire_types/dune                  |  30 +--
 src/lib/mina_wire_types/test/dune             |  82 +++----
 src/lib/monad_lib/dune                        |   6 +-
 src/lib/network_peer/dune                     |  37 +--
 src/lib/network_pool/dune                     | 173 +++++++-------
 src/lib/network_pool/test/dune                |   7 +-
 src/lib/node_addrs_and_ports/dune             |  34 +--
 src/lib/node_config/dune                      |  12 +-
 src/lib/node_config/for_unit_tests/dune       |  12 +-
 src/lib/node_config/intf/dune                 |   7 +-
 src/lib/node_config/version/dune              |   7 +-
 src/lib/node_error_service/dune               |  85 +++----
 src/lib/node_status_service/dune              |  76 ++++---
 src/lib/non_zero_curve_point/dune             |  70 +++---
 src/lib/o1trace/dune                          |  33 +--
 src/lib/o1trace/webkit_event/dune             |  35 +--
 src/lib/one_or_two/dune                       |  17 +-
 src/lib/otp_lib/dune                          |  22 +-
 src/lib/outside_hash_image/dune               |   6 +-
 src/lib/parallel/dune                         |  18 +-
 src/lib/parallel_scan/dune                    |  45 ++--
 src/lib/participating_state/dune              |   6 +-
 src/lib/perf_histograms/dune                  |  37 +--
 src/lib/pickles/backend/dune                  |  12 +-
 src/lib/pickles/composition_types/dune        |  25 +-
 src/lib/pickles/dune                          | 124 +++++-----
 src/lib/pickles/limb_vector/dune              |  40 ++--
 src/lib/pickles/limb_vector/test/dune         |  13 +-
 src/lib/pickles/plonk_checks/dune             |  42 ++--
 src/lib/pickles/plonk_checks/gen_scalars/dune |  30 +--
 src/lib/pickles/pseudo/dune                   |  31 ++-
 src/lib/pickles/test/dune                     |  15 +-
 .../pickles/test/optional_custom_gates/dune   |   5 +-
 src/lib/pickles_base/dune                     |  44 ++--
 src/lib/pickles_base/one_hot_vector/dune      |  24 +-
 src/lib/pickles_base/test/dune                |  14 +-
 src/lib/pickles_types/dune                    |   5 +-
 src/lib/pipe_lib/dune                         |  28 +--
 src/lib/ppx_annot/dune                        |   6 +-
 src/lib/ppx_annot/tests/dune                  |   9 +-
 src/lib/ppx_mina/dune                         |  30 +--
 src/lib/ppx_mina/ppx_representatives/dune     |  19 +-
 src/lib/ppx_mina/ppx_to_enum/dune             |   6 +-
 src/lib/ppx_register_event/dune               |  29 +--
 src/lib/ppx_util/dune                         |  13 +-
 src/lib/ppx_version/dune                      |  25 +-
 src/lib/ppx_version/runtime/dune              |   9 +-
 src/lib/precomputed_values/dune               |  36 +--
 src/lib/promise/dune                          |   6 +-
 src/lib/promise/js/dune                       |   9 +-
 src/lib/promise/js_helpers/dune               |   7 +-
 src/lib/promise/native/dune                   |   6 +-
 src/lib/proof_carrying_data/dune              |  21 +-
 src/lib/protocol_version/dune                 |  32 +--
 src/lib/prover/dune                           | 105 ++++-----
 src/lib/quickcheck_lib/dune                   |  24 +-
 src/lib/random_oracle/dune                    |  50 ++--
 src/lib/random_oracle/permutation/dune        |   6 +-
 .../random_oracle/permutation/external/dune   |  40 ++--
 src/lib/random_oracle/permutation/ocaml/dune  |  29 +--
 src/lib/random_oracle_input/dune              |  15 +-
 src/lib/rc_pool/dune                          |   6 +-
 src/lib/rfc3339_time/dune                     |   6 +-
 src/lib/rocksdb/dune                          |  13 +-
 src/lib/rose_tree/dune                        |  19 +-
 src/lib/rosetta_coding/dune                   |  26 ++-
 src/lib/rosetta_lib/dune                      |  70 +++---
 src/lib/rosetta_lib/test/dune                 |  21 +-
 src/lib/rosetta_models/dune                   |  16 +-
 src/lib/run_in_thread/dune                    |   6 +-
 src/lib/run_in_thread/fake/dune               |   6 +-
 src/lib/run_in_thread/native/dune             |   6 +-
 src/lib/runtime_config/dune                   |  97 ++++----
 src/lib/secrets/dune                          |  71 +++---
 src/lib/sgn/dune                              |  41 ++--
 src/lib/sgn_type/dune                         |  27 +--
 src/lib/sha256_lib/dune                       |  13 +-
 src/lib/signature_kind/compile_config/dune    |   6 +-
 src/lib/signature_kind/dune                   |   6 +-
 src/lib/signature_kind/mainnet/dune           |   6 +-
 src/lib/signature_kind/testnet/dune           |   6 +-
 src/lib/signature_kind/type/dune              |   6 +-
 src/lib/signature_lib/dune                    |  95 ++++----
 src/lib/signature_lib/find_address/dune       |  28 +--
 src/lib/signature_lib/test/dune               |  26 +--
 src/lib/snark_bits/dune                       |  11 +-
 src/lib/snark_keys_header/dune                |  35 +--
 src/lib/snark_params/dune                     |  74 +++---
 src/lib/snark_profiler_lib/dune               | 145 ++++++------
 src/lib/snark_work_lib/dune                   |  33 +--
 src/lib/snark_worker/dune                     | 109 ++++-----
 src/lib/snark_worker/standalone/dune          |  61 ++---
 src/lib/snarky_blake2/dune                    |  28 +--
 src/lib/snarky_blake2/test/dune               |  38 ++--
 src/lib/snarky_curves/dune                    |  23 +-
 src/lib/snarky_field_extensions/dune          |  28 +--
 src/lib/snarky_group_map/dune                 |  19 +-
 src/lib/snarky_log/dune                       |   6 +-
 src/lib/snarky_taylor/dune                    |  26 ++-
 src/lib/snarky_taylor/tests/dune              |  38 ++--
 src/lib/sparse_ledger_lib/dune                |  31 +--
 src/lib/staged_ledger/dune                    | 156 +++++++------
 src/lib/staged_ledger_diff/dune               |  69 +++---
 src/lib/state_or_error/dune                   |  13 +-
 src/lib/storage/dune                          |  35 +--
 src/lib/string_sign/dune                      |  42 ++--
 src/lib/structured_log_events/dune            |  26 ++-
 src/lib/sync_handler/dune                     |  68 +++---
 src/lib/sync_status/dune                      |  23 +-
 src/lib/syncable_ledger/dune                  |  52 +++--
 src/lib/syncable_ledger/test/dune             |  65 +++---
 src/lib/test_genesis_ledger/dune              |   6 +-
 src/lib/test_util/dune                        |  24 +-
 src/lib/timeout_lib/dune                      |  17 +-
 src/lib/transaction/dune                      |  79 +++----
 src/lib/transaction_inclusion_status/dune     |  72 +++---
 src/lib/transaction_logic/dune                |  97 ++++----
 src/lib/transaction_logic/test/dune           |  97 ++++----
 .../test/transaction_logic/dune               |  88 +++----
 src/lib/transaction_protocol_state/dune       |  37 +--
 src/lib/transaction_snark/dune                | 144 ++++++------
 .../test/access_permission/dune               | 102 +++++----
 .../test/account_timing/dune                  | 105 ++++-----
 .../test/account_update_network_id/dune       |  84 +++----
 src/lib/transaction_snark/test/app_state/dune |  70 +++---
 src/lib/transaction_snark/test/delegate/dune  |  70 +++---
 src/lib/transaction_snark/test/dune           | 126 +++++-----
 src/lib/transaction_snark/test/fee_payer/dune |  84 +++----
 .../test/multisig_account/dune                | 102 +++++----
 .../transaction_snark/test/permissions/dune   |  70 +++---
 .../transaction_snark/test/token_symbol/dune  |  72 +++---
 .../test/transaction_union/dune               |  95 ++++----
 .../test/verification_key/dune                |  80 +++----
 .../test/verification_key_permission/dune     |  72 +++---
 .../test/verify-simple-test/dune              | 111 ++++-----
 .../transaction_snark/test/voting_for/dune    |  80 +++----
 .../transaction_snark/test/zkapp_deploy/dune  |  78 +++----
 .../transaction_snark/test/zkapp_fuzzy/dune   |  92 ++++----
 .../test/zkapp_payments/dune                  |  86 +++----
 .../test/zkapp_preconditions/dune             |  93 ++++----
 .../transaction_snark/test/zkapp_tokens/dune  |  66 +++---
 src/lib/transaction_snark/test/zkapp_uri/dune |  72 +++---
 src/lib/transaction_snark_scan_state/dune     |  98 ++++----
 src/lib/transaction_snark_work/dune           |  49 ++--
 src/lib/transaction_witness/dune              |  52 +++--
 src/lib/transition_chain_prover/dune          |  47 ++--
 src/lib/transition_chain_verifier/dune        |  25 +-
 src/lib/transition_frontier/dune              | 107 ++++-----
 src/lib/transition_frontier/extensions/dune   |  49 ++--
 .../transition_frontier/frontier_base/dune    | 121 +++++-----
 .../transition_frontier/full_frontier/dune    | 109 ++++-----
 .../persistent_frontier/dune                  | 117 +++++-----
 .../transition_frontier/persistent_root/dune  |  37 +--
 src/lib/transition_frontier/tests/dune        |  82 +++----
 src/lib/transition_frontier_controller/dune   |  57 ++---
 src/lib/transition_handler/dune               | 114 +++++-----
 src/lib/transition_router/dune                |  99 ++++----
 src/lib/trust_system/dune                     |  81 +++----
 src/lib/truth/dune                            |   6 +-
 src/lib/unix_timestamp/dune                   |   6 +-
 src/lib/unsigned_extended/dune                |  50 ++--
 src/lib/uptime_service/dune                   | 122 +++++-----
 src/lib/user_command_input/dune               |  47 ++--
 src/lib/verifier/dune                         |  94 ++++----
 src/lib/visualization/dune                    |   6 +-
 src/lib/vrf_evaluator/dune                    |  61 ++---
 src/lib/vrf_lib/dune                          |  43 ++--
 src/lib/vrf_lib/tests/dune                    |  74 +++---
 src/lib/web_client_pipe/dune                  |  29 +--
 src/lib/web_request/dune                      |   6 +-
 src/lib/webkit_trace_event/binary_output/dune |  23 +-
 src/lib/webkit_trace_event/dune               |   6 +-
 src/lib/with_hash/dune                        |  14 +-
 src/lib/work_selector/dune                    |  96 ++++----
 src/lib/zkapp_command_builder/dune            |  42 ++--
 333 files changed, 7610 insertions(+), 6693 deletions(-)

diff --git a/src/lib/allocation_functor/dune b/src/lib/allocation_functor/dune
index 5692f826334..4e3a2b14d42 100644
--- a/src/lib/allocation_functor/dune
+++ b/src/lib/allocation_functor/dune
@@ -1,16 +1,18 @@
 (library
-  (name allocation_functor)
-  (public_name allocation_functor)
-  (inline_tests (flags -verbose -show-counts))
-  (libraries
-   ;; opam libraries
-   core_kernel
-   result
-   ppx_inline_test.config
-   sexplib0
-   ;; local libraries
-   mina_metrics
-   ppx_version.runtime
-  )
-  (instrumentation (backend bisect_ppx))
-  (preprocess (pps ppx_jane ppx_compare ppx_deriving_yojson ppx_version)))
+ (name allocation_functor)
+ (public_name allocation_functor)
+ (inline_tests
+  (flags -verbose -show-counts))
+ (libraries
+  ;; opam libraries
+  core_kernel
+  result
+  ppx_inline_test.config
+  sexplib0
+  ;; local libraries
+  mina_metrics
+  ppx_version.runtime)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_compare ppx_deriving_yojson ppx_version)))
diff --git a/src/lib/base58_check/dune b/src/lib/base58_check/dune
index 7e73ce87860..c29af1a6264 100644
--- a/src/lib/base58_check/dune
+++ b/src/lib/base58_check/dune
@@ -1,25 +1,26 @@
 (library
  (name base58_check)
  (public_name base58_check)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   digestif
-   core_kernel
-   base58
-   base
-   ppx_inline_test.config
- )
+  ;; opam libraries
+  digestif
+  core_kernel
+  base58
+  base
+  ppx_inline_test.config)
  (library_flags (-linkall))
  (preprocess
   (pps
-    ppx_assert
-    ppx_base
-    ppx_deriving.std
-    ppx_deriving_yojson
-    ppx_inline_test
-    ppx_let
-    ppx_sexp_conv
-    ppx_version))
- (instrumentation (backend bisect_ppx))
+   ppx_assert
+   ppx_base
+   ppx_deriving.std
+   ppx_deriving_yojson
+   ppx_inline_test
+   ppx_let
+   ppx_sexp_conv
+   ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Base58Check implementation"))
diff --git a/src/lib/bash_colors/dune b/src/lib/bash_colors/dune
index ef7bca7d4f9..84de0cdb082 100644
--- a/src/lib/bash_colors/dune
+++ b/src/lib/bash_colors/dune
@@ -1,5 +1,7 @@
 (library
  (name bash_colors)
  (public_name bash_colors)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version)))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version)))
diff --git a/src/lib/best_tip_prover/dune b/src/lib/best_tip_prover/dune
index 7a0e1daa377..af27846dfb9 100644
--- a/src/lib/best_tip_prover/dune
+++ b/src/lib/best_tip_prover/dune
@@ -1,35 +1,36 @@
 (library
  (name best_tip_prover)
  (public_name best_tip_prover)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_jane ppx_compare))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_version ppx_jane ppx_compare))
  (libraries
-   ;; opam libraries
-   core
-   core_kernel
-   async_kernel
-   ;; local libraries
-   genesis_constants
-   consensus
-   with_hash
-   precomputed_values
-   proof_carrying_data
-   logger
-   truth
-   merkle_list_verifier
-   transition_frontier
-   mina_base
-   mina_intf
-   mina_state
-   mina_block
-   data_hash_lib
-   transition_frontier_base
-   merkle_list_prover
-   mina_stdlib
-   mina_wire_types
-   pickles.backend
-   snark_params
-   pickles
-   kimchi_pasta
-   kimchi_pasta.basic
-))
+  ;; opam libraries
+  core
+  core_kernel
+  async_kernel
+  ;; local libraries
+  genesis_constants
+  consensus
+  with_hash
+  precomputed_values
+  proof_carrying_data
+  logger
+  truth
+  merkle_list_verifier
+  transition_frontier
+  mina_base
+  mina_intf
+  mina_state
+  mina_block
+  data_hash_lib
+  transition_frontier_base
+  merkle_list_prover
+  mina_stdlib
+  mina_wire_types
+  pickles.backend
+  snark_params
+  pickles
+  kimchi_pasta
+  kimchi_pasta.basic))
diff --git a/src/lib/bignum_bigint/dune b/src/lib/bignum_bigint/dune
index 8e5719924da..a00bfaf9166 100644
--- a/src/lib/bignum_bigint/dune
+++ b/src/lib/bignum_bigint/dune
@@ -2,16 +2,17 @@
  (name bignum_bigint)
  (public_name bignum_bigint)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   core_kernel
-   async_kernel
-   bignum.bigint
-   ;; local libraries
-   fold_lib
-)
+  ;; opam libraries
+  core_kernel
+  async_kernel
+  bignum.bigint
+  ;; local libraries
+  fold_lib)
  (preprocess
   (pps ppx_version ppx_jane))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Bignum's bigint re-exported as Bignum_bigint"))
diff --git a/src/lib/blake2/dune b/src/lib/blake2/dune
index 4221b60d0c5..914d55d315e 100644
--- a/src/lib/blake2/dune
+++ b/src/lib/blake2/dune
@@ -1,19 +1,22 @@
 (library
  (name blake2)
  (public_name blake2)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_mina ppx_version ppx_compare ppx_deriving_yojson))
- (inline_tests (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_mina ppx_version ppx_compare ppx_deriving_yojson))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   base.base_internalhash_types
-   bigarray-compat
-   bin_prot.shape
-   core_kernel
-   digestif
-   sexplib0
-   base.caml
-   ppx_inline_test.config
-   ;; local libraries
-   bounded_types
-   ppx_version.runtime))
+  ;; opam libraries
+  base.base_internalhash_types
+  bigarray-compat
+  bin_prot.shape
+  core_kernel
+  digestif
+  sexplib0
+  base.caml
+  ppx_inline_test.config
+  ;; local libraries
+  bounded_types
+  ppx_version.runtime))
diff --git a/src/lib/block_producer/dune b/src/lib/block_producer/dune
index b2b1b7d3e40..d1cdfce5fb2 100644
--- a/src/lib/block_producer/dune
+++ b/src/lib/block_producer/dune
@@ -2,76 +2,77 @@
  (name block_producer)
  (public_name block_producer)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   sexplib0
-   async_kernel
-   core_kernel
-   core
-   async
-   integers
-   ;; local libraries
-   mina_wire_types
-   mina_metrics
-   mina_net2
-   debug_assert
-   blockchain_snark
-   with_hash
-   truth
-   mina_numbers
-   transaction_snark
-   ledger_proof
-   error_json
-   currency
-   logger
-   signature_lib
-   transition_frontier
-   transaction_snark_scan_state
-   prover
-   mina_state
-   mina_intf
-   mina_ledger
-   mina_base
-   mina_transaction
-   mina_transaction_logic
-   mina_block
-   protocol_version
-   consensus
-   interruptible
-   o1trace
-   pipe_lib
-   network_pool
-   unix_timestamp
-   otp_lib
-   transition_chain_prover
-   vrf_evaluator
-   transition_frontier_base
-   block_time
-   staged_ledger
-   staged_ledger_diff
-   mina_compile_config
-   precomputed_values
-   coda_genesis_proof
-   transition_frontier_extensions
-   unsigned_extended
-   genesis_constants
-   data_hash_lib
-   sgn
-   sgn_type
-   node_error_service
-   pickles.backend
-   pasta_bindings
-   pickles
-   snark_params
-   kimchi_backend
-   kimchi_pasta
-   kimchi_pasta.basic
-   internal_tracing
-   mina_networking
-   mina_runtime_config
- )
+  ;; opam libraries
+  sexplib0
+  async_kernel
+  core_kernel
+  core
+  async
+  integers
+  ;; local libraries
+  mina_wire_types
+  mina_metrics
+  mina_net2
+  debug_assert
+  blockchain_snark
+  with_hash
+  truth
+  mina_numbers
+  transaction_snark
+  ledger_proof
+  error_json
+  currency
+  logger
+  signature_lib
+  transition_frontier
+  transaction_snark_scan_state
+  prover
+  mina_state
+  mina_intf
+  mina_ledger
+  mina_base
+  mina_transaction
+  mina_transaction_logic
+  mina_block
+  protocol_version
+  consensus
+  interruptible
+  o1trace
+  pipe_lib
+  network_pool
+  unix_timestamp
+  otp_lib
+  transition_chain_prover
+  vrf_evaluator
+  transition_frontier_base
+  block_time
+  staged_ledger
+  staged_ledger_diff
+  mina_compile_config
+  precomputed_values
+  coda_genesis_proof
+  transition_frontier_extensions
+  unsigned_extended
+  genesis_constants
+  data_hash_lib
+  sgn
+  sgn_type
+  node_error_service
+  pickles.backend
+  pasta_bindings
+  pickles
+  snark_params
+  kimchi_backend
+  kimchi_pasta
+  kimchi_pasta.basic
+  internal_tracing
+  mina_networking
+  mina_runtime_config)
  (preprocess
   (pps ppx_mina ppx_version ppx_jane ppx_register_event))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Coda block producer"))
diff --git a/src/lib/block_time/dune b/src/lib/block_time/dune
index 2a8363aae35..9ddd687ab9c 100644
--- a/src/lib/block_time/dune
+++ b/src/lib/block_time/dune
@@ -2,35 +2,45 @@
  (name block_time)
  (public_name block_time)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   integers
-   base.caml
-   bin_prot.shape
-   sexplib0
-   async_kernel
-   core_kernel
-   base
-   base.base_internalhash_types
-   ;; local libraries
-   mina_wire_types
-   bitstring_lib
-   pickles
-   unsigned_extended
-   snark_params
-   mina_numbers
-   logger
-   snark_bits
-   timeout_lib
-   crypto_params
-   snarky.backendless
-   random_oracle_input
-   random_oracle
-   ppx_version.runtime
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_hash ppx_let
-                  ppx_mina ppx_version ppx_deriving_yojson ppx_bin_prot ppx_compare ppx_sexp_conv ppx_compare
-                  ppx_inline_test))
+  ;; opam libraries
+  integers
+  base.caml
+  bin_prot.shape
+  sexplib0
+  async_kernel
+  core_kernel
+  base
+  base.base_internalhash_types
+  ;; local libraries
+  mina_wire_types
+  bitstring_lib
+  pickles
+  unsigned_extended
+  snark_params
+  mina_numbers
+  logger
+  snark_bits
+  timeout_lib
+  crypto_params
+  snarky.backendless
+  random_oracle_input
+  random_oracle
+  ppx_version.runtime)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_hash
+   ppx_let
+   ppx_mina
+   ppx_version
+   ppx_deriving_yojson
+   ppx_bin_prot
+   ppx_compare
+   ppx_sexp_conv
+   ppx_compare
+   ppx_inline_test))
  (synopsis "Block time"))
diff --git a/src/lib/blockchain_snark/dune b/src/lib/blockchain_snark/dune
index 18114dda9f6..68ec6df7cfe 100644
--- a/src/lib/blockchain_snark/dune
+++ b/src/lib/blockchain_snark/dune
@@ -3,43 +3,44 @@
  (public_name blockchain_snark)
  (library_flags -linkall)
  (libraries
-   ;; opam libraries
-   base.md5
-   base.caml
-   core_kernel
-   core
-   sexplib0
-   async
-   bin_prot.shape
-   async_kernel
-   ;; local libraries
-   pickles.backend
-   allocation_functor
-   crypto_params
-   logger
-   consensus
-   transaction_snark
-   cache_dir
-   snarky.backendless
-   snark_params
-   mina_base
-   mina_transaction_logic
-   mina_state
-   pickles_types
-   pickles_base
-   pickles
-   genesis_constants
-   currency
-   sgn
-   random_oracle
-   kimchi_pasta
-   kimchi_pasta.basic
-   data_hash_lib
-   ppx_version.runtime
-   snark_keys_header
- )
- (inline_tests (flags -verbose -show-counts))
+  ;; opam libraries
+  base.md5
+  base.caml
+  core_kernel
+  core
+  sexplib0
+  async
+  bin_prot.shape
+  async_kernel
+  ;; local libraries
+  pickles.backend
+  allocation_functor
+  crypto_params
+  logger
+  consensus
+  transaction_snark
+  cache_dir
+  snarky.backendless
+  snark_params
+  mina_base
+  mina_transaction_logic
+  mina_state
+  pickles_types
+  pickles_base
+  pickles
+  genesis_constants
+  currency
+  sgn
+  random_oracle
+  kimchi_pasta
+  kimchi_pasta.basic
+  data_hash_lib
+  ppx_version.runtime
+  snark_keys_header)
+ (inline_tests
+  (flags -verbose -show-counts))
  (preprocess
   (pps ppx_snarky ppx_mina ppx_version ppx_jane ppx_compare))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "blockchain state transition snarking library"))
diff --git a/src/lib/bootstrap_controller/dune b/src/lib/bootstrap_controller/dune
index dca613dc3b8..d1ec0975926 100644
--- a/src/lib/bootstrap_controller/dune
+++ b/src/lib/bootstrap_controller/dune
@@ -1,66 +1,68 @@
 (library
  (name bootstrap_controller)
  (public_name bootstrap_controller)
- (inline_tests (flags -verbose -show-counts))
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_jane ppx_compare ppx_register_event))
+ (inline_tests
+  (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_version ppx_jane ppx_compare ppx_register_event))
  (libraries
-   ;; opam libraries
-   sexplib0
-   core
-   async_kernel
-   core_kernel
-   async
-   async_unix
-   ppx_inline_test.config
-   ;; local libraries
-   mina_numbers
-   gadt_lib
-   child_processes
-   transition_frontier_base
-   mina_metrics
-   error_json
-   bounded_types
-   with_hash
-   mina_state
-   transition_frontier_persistent_frontier
-   verifier
-   data_hash_lib
-   logger
-   network_peer
-   sync_handler
-   transition_frontier
-   pipe_lib
-   mina_intf
-   mina_block
-   mina_base
-   mina_ledger
-   mina_stdlib
-   mina_transaction_logic
-   syncable_ledger
-   consensus
-   mina_networking
-   fake_network
-   trust_system
-   transition_frontier_persistent_root
-   precomputed_values
-   truth
-   merkle_ledger
-   staged_ledger
-   genesis_constants
-   coda_genesis_ledger
-   block_time
-   mina_base.util
-   o1trace
-   mina_net2
-   pickles.backend
-   pickles
-   snark_params
-   kimchi_backend
-   sgn_type
-   sgn
-   currency
-   kimchi_pasta
-   kimchi_pasta.basic
-   mina_wire_types
-   ))
+  ;; opam libraries
+  sexplib0
+  core
+  async_kernel
+  core_kernel
+  async
+  async_unix
+  ppx_inline_test.config
+  ;; local libraries
+  mina_numbers
+  gadt_lib
+  child_processes
+  transition_frontier_base
+  mina_metrics
+  error_json
+  bounded_types
+  with_hash
+  mina_state
+  transition_frontier_persistent_frontier
+  verifier
+  data_hash_lib
+  logger
+  network_peer
+  sync_handler
+  transition_frontier
+  pipe_lib
+  mina_intf
+  mina_block
+  mina_base
+  mina_ledger
+  mina_stdlib
+  mina_transaction_logic
+  syncable_ledger
+  consensus
+  mina_networking
+  fake_network
+  trust_system
+  transition_frontier_persistent_root
+  precomputed_values
+  truth
+  merkle_ledger
+  staged_ledger
+  genesis_constants
+  coda_genesis_ledger
+  block_time
+  mina_base.util
+  o1trace
+  mina_net2
+  pickles.backend
+  pickles
+  snark_params
+  kimchi_backend
+  sgn_type
+  sgn
+  currency
+  kimchi_pasta
+  kimchi_pasta.basic
+  mina_wire_types))
diff --git a/src/lib/bounded_types/dune b/src/lib/bounded_types/dune
index 4cbd371fc39..38639996728 100644
--- a/src/lib/bounded_types/dune
+++ b/src/lib/bounded_types/dune
@@ -1,9 +1,19 @@
 (library
  (name bounded_types)
  (public_name bounded_types)
- (instrumentation (backend bisect_ppx))
- (libraries ppx_version.runtime stdlib base.caml core_kernel bin_prot bin_prot.shape ppx_inline_test.config sexplib0)
+ (instrumentation
+  (backend bisect_ppx))
+ (libraries
+  ppx_version.runtime
+  stdlib
+  base.caml
+  core_kernel
+  bin_prot
+  bin_prot.shape
+  ppx_inline_test.config
+  sexplib0)
  (inline_tests)
- (preprocess (pps ppx_jane ppx_mina ppx_deriving_yojson ppx_inline_test))
+ (preprocess
+  (pps ppx_jane ppx_mina ppx_deriving_yojson ppx_inline_test))
  (library_flags -linkall)
- (synopsis "Put bounds on bin_prot deserializing"))
\ No newline at end of file
+ (synopsis "Put bounds on bin_prot deserializing"))
diff --git a/src/lib/bowe_gabizon_hash/dune b/src/lib/bowe_gabizon_hash/dune
index d0bba718e80..05cfef33560 100644
--- a/src/lib/bowe_gabizon_hash/dune
+++ b/src/lib/bowe_gabizon_hash/dune
@@ -1,8 +1,10 @@
 (library
  (name bowe_gabizon_hash)
  (public_name bowe_gabizon_hash)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane ppx_compare))
- (inline_tests (flags -verbose -show-counts))
- (libraries
-   core_kernel))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane ppx_compare))
+ (inline_tests
+  (flags -verbose -show-counts))
+ (libraries core_kernel))
diff --git a/src/lib/cache_dir/dune b/src/lib/cache_dir/dune
index bec8fd552af..0bef7037794 100644
--- a/src/lib/cache_dir/dune
+++ b/src/lib/cache_dir/dune
@@ -2,13 +2,14 @@
  (name cache_dir)
  (public_name cache_dir)
  (libraries
-   ;; opam libraries
-   async_kernel
-   ;; local libraries
-   key_cache
-   logger
-   )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+  ;; opam libraries
+  async_kernel
+  ;; local libraries
+  key_cache
+  logger)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (virtual_modules cache_dir)
  (default_implementation cache_dir.native))
diff --git a/src/lib/cache_dir/fake/dune b/src/lib/cache_dir/fake/dune
index da0abde929c..dbcaa3dc472 100644
--- a/src/lib/cache_dir/fake/dune
+++ b/src/lib/cache_dir/fake/dune
@@ -2,11 +2,13 @@
  (public_name cache_dir.fake)
  (name cache_dir_fake)
  (libraries
-   ; opam deps
-   async_kernel
-   core_kernel
-   ; libs
-   key_cache)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+  ; opam deps
+  async_kernel
+  core_kernel
+  ; libs
+  key_cache)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (implements cache_dir))
diff --git a/src/lib/cache_dir/native/dune b/src/lib/cache_dir/native/dune
index 4690fecf2f6..4920e7215a7 100644
--- a/src/lib/cache_dir/native/dune
+++ b/src/lib/cache_dir/native/dune
@@ -2,19 +2,20 @@
  (public_name cache_dir.native)
  (name cache_dir_native)
  (libraries
-   ;; opam libraries
-   base.caml
-   async_unix
-   base
-   core
-   async
-   core_kernel
-   stdio
-   async_kernel
-   ;; local libraries
-   key_cache
-   logger
-)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_here ppx_let ppx_custom_printf))
+  ;; opam libraries
+  base.caml
+  async_unix
+  base
+  core
+  async
+  core_kernel
+  stdio
+  async_kernel
+  ;; local libraries
+  key_cache
+  logger)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_version ppx_here ppx_let ppx_custom_printf))
  (implements cache_dir))
diff --git a/src/lib/cache_lib/dune b/src/lib/cache_lib/dune
index 74a0248f957..e113c6dcc34 100644
--- a/src/lib/cache_lib/dune
+++ b/src/lib/cache_lib/dune
@@ -1,17 +1,25 @@
 (library
  (name cache_lib)
  (public_name cache_lib)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   async_kernel
-   core_kernel
-   base
-   base.base_internalhash_types
-   core
-   ppx_inline_test.config
-   ;; local libraries
-   logger
-   )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_base ppx_let ppx_custom_printf ppx_inline_test)))
+  ;; opam libraries
+  async_kernel
+  core_kernel
+  base
+  base.base_internalhash_types
+  core
+  ppx_inline_test.config
+  ;; local libraries
+  logger)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_mina
+   ppx_version
+   ppx_base
+   ppx_let
+   ppx_custom_printf
+   ppx_inline_test)))
diff --git a/src/lib/child_processes/dune b/src/lib/child_processes/dune
index 59f3afd5997..ca6849f20c0 100644
--- a/src/lib/child_processes/dune
+++ b/src/lib/child_processes/dune
@@ -1,32 +1,42 @@
 (library
  (name child_processes)
  (public_name child_processes)
- (foreign_stubs (language c) (names caml_syslimits))
- (inline_tests (flags -verbose -show-counts))
- (instrumentation (backend bisect_ppx))
- (preprocess (pps
-               ppx_assert ppx_mina ppx_version ppx_here ppx_custom_printf ppx_deriving.show
-               ppx_inline_test ppx_let ppx_pipebang))
+ (foreign_stubs
+  (language c)
+  (names caml_syslimits))
+ (inline_tests
+  (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_assert
+   ppx_mina
+   ppx_version
+   ppx_here
+   ppx_custom_printf
+   ppx_deriving.show
+   ppx_inline_test
+   ppx_let
+   ppx_pipebang))
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   integers
-   async_unix
-   base.base_internalhash_types
-   core_kernel
-   async
-   core
-   ctypes
-   ctypes.foreign
-   base
-   ppx_hash.runtime-lib
-   async_kernel
-   base.caml
-   sexplib0
-   ;; local libraries
-   file_system
-   error_json
-   logger
-   pipe_lib
- )
-)
+  ;; opam libraries
+  ppx_inline_test.config
+  integers
+  async_unix
+  base.base_internalhash_types
+  core_kernel
+  async
+  core
+  ctypes
+  ctypes.foreign
+  base
+  ppx_hash.runtime-lib
+  async_kernel
+  base.caml
+  sexplib0
+  ;; local libraries
+  file_system
+  error_json
+  logger
+  pipe_lib))
diff --git a/src/lib/cli_lib/dune b/src/lib/cli_lib/dune
index dc0f9c72a9d..ddcec762a5c 100644
--- a/src/lib/cli_lib/dune
+++ b/src/lib/cli_lib/dune
@@ -2,9 +2,10 @@
  (name cli_lib)
  (public_name cli_lib)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
+  ;; opam libraries
   result
   sexplib0
   async.async_command
@@ -48,5 +49,6 @@
   mina_runtime_config)
  (preprocess
   (pps ppx_version ppx_jane ppx_deriving_yojson ppx_deriving.make))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Library to communicate with Mina as cli as the front-end"))
diff --git a/src/lib/coda_plugins/examples/toplevel/dune b/src/lib/coda_plugins/examples/toplevel/dune
index f31b85873f3..99689dc4a36 100644
--- a/src/lib/coda_plugins/examples/toplevel/dune
+++ b/src/lib/coda_plugins/examples/toplevel/dune
@@ -1,10 +1,18 @@
 (executable
  (name plugin_toplevel)
  (libraries coda_plugins ocamlnat.lib)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_let ppx_mina))
- (modes (native plugin))
- (embed_in_plugin_libraries compiler-libs.common compiler-libs.optcomp ocamlnat.lib.407 ocamlnat.lib)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_let ppx_mina))
+ (modes
+  (native plugin))
+ (embed_in_plugin_libraries
+  compiler-libs.common
+  compiler-libs.optcomp
+  ocamlnat.lib.407
+  ocamlnat.lib)
  (flags (-linkall))
  (optional)
- (enabled_if (= %{ocaml_version} 4.07.0)))
+ (enabled_if
+  (= %{ocaml_version} 4.07.0)))
diff --git a/src/lib/codable/dune b/src/lib/codable/dune
index ece501a06d7..d08247b3eb8 100644
--- a/src/lib/codable/dune
+++ b/src/lib/codable/dune
@@ -2,17 +2,19 @@
  (name codable)
  (public_name codable)
  (library_flags (-linkall))
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   core_kernel
-   base64
-   ppx_deriving_yojson.runtime
-   yojson
-   result
-   ;; local libraries
-   base58_check
-   )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane ppx_deriving_yojson))
+  ;; opam libraries
+  core_kernel
+  base64
+  ppx_deriving_yojson.runtime
+  yojson
+  result
+  ;; local libraries
+  base58_check)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane ppx_deriving_yojson))
  (synopsis "Extension of Yojson to make it easy for a type to derive yojson"))
diff --git a/src/lib/consensus/dune b/src/lib/consensus/dune
index 4d139cd97c2..f5b2f02cd27 100644
--- a/src/lib/consensus/dune
+++ b/src/lib/consensus/dune
@@ -1,108 +1,120 @@
 (library
  (name consensus)
  (public_name consensus)
- (inline_tests (flags -verbose -show-counts))
- (modules (:standard \ proof_of_stake_fuzzer))
+ (inline_tests
+  (flags -verbose -show-counts))
+ (modules
+  (:standard \ proof_of_stake_fuzzer))
  (library_flags (-linkall))
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async_unix
-   core.uuid
-   async_kernel
-   sexplib0
-   base.caml
-   integers
-   async
-   core
-   yojson
-   core_kernel
-   bin_prot.shape
-   base
-   result
-   core_kernel.uuid
-   async_rpc_kernel
-   sexp_diff_kernel
-   ;; local libraries
-   mina_wire_types
-   mina_base.util
-   bounded_types
-   unsigned_extended
-   kimchi_pasta
-   kimchi_pasta.basic
-   fold_lib
-   random_oracle_input
-   outside_hash_image
-   logger
-   hash_prefix_states
-   genesis_constants
-   error_json
-   merkle_ledger
-   pickles.backend
-   random_oracle
-   pipe_lib
-   bignum_bigint
-   vrf_lib
-   snark_params
-   with_hash
-   mina_ledger
-   consensus.vrf
-   snarky_taylor
-   mina_base
-   mina_transaction_logic
-   key_gen
-   block_time
-   perf_histograms
-   test_util
-   unix_timestamp
-   non_zero_curve_point
-   mina_metrics
-   mina_numbers
-   mina_stdlib
-   signature_lib
-   snarky.backendless
-   blake2
-   crypto_params
-   data_hash_lib
-   currency
-   file_system
-   coda_genesis_ledger
-   interruptible
-   network_peer
-   pickles
-   snark_bits
-   sparse_ledger_lib
-   syncable_ledger
-   trust_system
-   mina_base.import
-   ppx_version.runtime
-   internal_tracing
-   o1trace
- )
+  ;; opam libraries
+  ppx_inline_test.config
+  async_unix
+  core.uuid
+  async_kernel
+  sexplib0
+  base.caml
+  integers
+  async
+  core
+  yojson
+  core_kernel
+  bin_prot.shape
+  base
+  result
+  core_kernel.uuid
+  async_rpc_kernel
+  sexp_diff_kernel
+  ;; local libraries
+  mina_wire_types
+  mina_base.util
+  bounded_types
+  unsigned_extended
+  kimchi_pasta
+  kimchi_pasta.basic
+  fold_lib
+  random_oracle_input
+  outside_hash_image
+  logger
+  hash_prefix_states
+  genesis_constants
+  error_json
+  merkle_ledger
+  pickles.backend
+  random_oracle
+  pipe_lib
+  bignum_bigint
+  vrf_lib
+  snark_params
+  with_hash
+  mina_ledger
+  consensus.vrf
+  snarky_taylor
+  mina_base
+  mina_transaction_logic
+  key_gen
+  block_time
+  perf_histograms
+  test_util
+  unix_timestamp
+  non_zero_curve_point
+  mina_metrics
+  mina_numbers
+  mina_stdlib
+  signature_lib
+  snarky.backendless
+  blake2
+  crypto_params
+  data_hash_lib
+  currency
+  file_system
+  coda_genesis_ledger
+  interruptible
+  network_peer
+  pickles
+  snark_bits
+  sparse_ledger_lib
+  syncable_ledger
+  trust_system
+  mina_base.import
+  ppx_version.runtime
+  internal_tracing
+  o1trace)
  (preprocess
   (pps
-    h_list.ppx
-    ppx_assert
-    ppx_base
-    ppx_bin_prot
-    ppx_mina
-    ppx_custom_printf
-    ppx_deriving.std
-    ppx_deriving_yojson
-    ppx_fields_conv
-    ppx_inline_test
-    ppx_let
-    ppx_sexp_conv
-    ppx_snarky
-    ppx_version))
- (instrumentation (backend bisect_ppx))
+   h_list.ppx
+   ppx_assert
+   ppx_base
+   ppx_bin_prot
+   ppx_mina
+   ppx_custom_printf
+   ppx_deriving.std
+   ppx_deriving_yojson
+   ppx_fields_conv
+   ppx_inline_test
+   ppx_let
+   ppx_sexp_conv
+   ppx_snarky
+   ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Consensus mechanisms"))
 
 (executable
  (name proof_of_stake_fuzzer)
  (modules proof_of_stake_fuzzer)
- (libraries core_kernel signature_lib mina_state mina_block consensus prover blockchain_snark logger.file_system)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane))
+ (libraries
+  core_kernel
+  signature_lib
+  mina_state
+  mina_block
+  consensus
+  prover
+  blockchain_snark
+  logger.file_system)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane))
  (enabled_if false) ;; Compilation is disabled until this executable has been fixed.
-)
+ )
diff --git a/src/lib/consensus/vrf/dune b/src/lib/consensus/vrf/dune
index ba0cba1e1c3..4ff04a2e686 100644
--- a/src/lib/consensus/vrf/dune
+++ b/src/lib/consensus/vrf/dune
@@ -2,66 +2,67 @@
  (name consensus_vrf)
  (public_name consensus.vrf)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   bignum.bigint
-   base.caml
-   base
-   base64
-   core_kernel
-   sexplib0
-   result
-   bignum
-   integers
-   bin_prot.shape
-   ;; local libraries
-   mina_wire_types
-   mina_base.util
-   kimchi_pasta
-   kimchi_pasta.basic
-   genesis_constants
-   bounded_types
-   crypto_params
-   random_oracle
-   blake2
-   base58_check
-   random_oracle_input
-   unsigned_extended
-   snarky.backendless
-   pickles
-   snarky_taylor
-   mina_numbers
-   fold_lib
-   mina_base
-   snark_params
-   vrf_lib
-   snarky_integer
-   test_util
-   pickles.backend
-   non_zero_curve_point
-   bignum_bigint
-   codable
-   signature_lib
-   currency
-   hash_prefix_states
-   kimchi_backend
-   kimchi_bindings
-   kimchi_types
-   pasta_bindings
-   ppx_deriving_yojson.runtime
-   ppx_version.runtime
- )
- (inline_tests (flags -verbose -show-counts))
- (instrumentation (backend bisect_ppx))
+  ;; opam libraries
+  ppx_inline_test.config
+  bignum.bigint
+  base.caml
+  base
+  base64
+  core_kernel
+  sexplib0
+  result
+  bignum
+  integers
+  bin_prot.shape
+  ;; local libraries
+  mina_wire_types
+  mina_base.util
+  kimchi_pasta
+  kimchi_pasta.basic
+  genesis_constants
+  bounded_types
+  crypto_params
+  random_oracle
+  blake2
+  base58_check
+  random_oracle_input
+  unsigned_extended
+  snarky.backendless
+  pickles
+  snarky_taylor
+  mina_numbers
+  fold_lib
+  mina_base
+  snark_params
+  vrf_lib
+  snarky_integer
+  test_util
+  pickles.backend
+  non_zero_curve_point
+  bignum_bigint
+  codable
+  signature_lib
+  currency
+  hash_prefix_states
+  kimchi_backend
+  kimchi_bindings
+  kimchi_types
+  pasta_bindings
+  ppx_deriving_yojson.runtime
+  ppx_version.runtime)
+ (inline_tests
+  (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
  (preprocess
   (pps
-    ppx_mina
-    h_list.ppx
-    ppx_assert
-    ppx_compare
-    ppx_deriving_yojson
-    ppx_hash
-    ppx_inline_test
-    ppx_let
-    ppx_sexp_conv
-    ppx_version)))
+   ppx_mina
+   h_list.ppx
+   ppx_assert
+   ppx_compare
+   ppx_deriving_yojson
+   ppx_hash
+   ppx_inline_test
+   ppx_let
+   ppx_sexp_conv
+   ppx_version)))
diff --git a/src/lib/crs/dune b/src/lib/crs/dune
index 22f0ddf6e0e..c4a76087fe7 100644
--- a/src/lib/crs/dune
+++ b/src/lib/crs/dune
@@ -1,8 +1,10 @@
 (library
  (name crs)
  (public_name crs)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (library_flags -linkall)
  (libraries digestif)
  (synopsis "Common random string generation library"))
diff --git a/src/lib/crypto/kimchi_backend/common/dune b/src/lib/crypto/kimchi_backend/common/dune
index b8021c08b94..9abd4a71e1a 100644
--- a/src/lib/crypto/kimchi_backend/common/dune
+++ b/src/lib/crypto/kimchi_backend/common/dune
@@ -1,5 +1,6 @@
 (library
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (name kimchi_backend_common)
  (public_name kimchi_backend_common)
  (flags -warn-error -27)
diff --git a/src/lib/crypto/kimchi_backend/dune b/src/lib/crypto/kimchi_backend/dune
index 4e9d79457ec..6cc525cbdf8 100644
--- a/src/lib/crypto/kimchi_backend/dune
+++ b/src/lib/crypto/kimchi_backend/dune
@@ -1,5 +1,6 @@
 (library
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (name kimchi_backend)
  (public_name kimchi_backend)
  (flags -warn-error -27)
diff --git a/src/lib/crypto/kimchi_backend/gadgets/dune b/src/lib/crypto/kimchi_backend/gadgets/dune
index d7eef711141..f6386b04e3f 100644
--- a/src/lib/crypto/kimchi_backend/gadgets/dune
+++ b/src/lib/crypto/kimchi_backend/gadgets/dune
@@ -1,9 +1,12 @@
 (library
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (name kimchi_gadgets)
  (public_name kimchi_backend.gadgets)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane))
  (libraries
   ;; opam libraries
   bignum.bigint
diff --git a/src/lib/crypto/kimchi_backend/gadgets/runner/dune b/src/lib/crypto/kimchi_backend/gadgets/runner/dune
index 72e6b9cf91d..9ea6d108770 100644
--- a/src/lib/crypto/kimchi_backend/gadgets/runner/dune
+++ b/src/lib/crypto/kimchi_backend/gadgets/runner/dune
@@ -1,47 +1,48 @@
 (library
  (name kimchi_gadgets_test_runner)
  (public_name kimchi_backend.gadgets_test_runner)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_mina ppx_jane ppx_deriving.std ppx_deriving_yojson))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_mina ppx_jane ppx_deriving.std ppx_deriving_yojson))
  (libraries
-   ;; opam libraries
-   stdio
-   integers
-   result
-   base.caml
-   bignum.bigint
-   core_kernel
-   base64
-   digestif
-   ppx_inline_test.config
-   sexplib0
-   base
-   async_kernel
-   bin_prot.shape
-   ;; local libraries
-   mina_wire_types
-   kimchi_bindings
-   kimchi_types
-   pasta_bindings
-   kimchi_pasta
-   kimchi_pasta.basic
-   kimchi_pasta.constraint_system
-   bitstring_lib
-   snarky.intf
-   snarky.backendless
-   snarky_group_map
-   sponge
-   kimchi_backend
-   base58_check
-   codable
-   random_oracle_input
-   snarky_log
-   group_map
-   snarky_curve
-   key_cache
-   snark_keys_header
-   tuple_lib
-   promise
-   kimchi_backend_common
-   ppx_version.runtime
-))
+  ;; opam libraries
+  stdio
+  integers
+  result
+  base.caml
+  bignum.bigint
+  core_kernel
+  base64
+  digestif
+  ppx_inline_test.config
+  sexplib0
+  base
+  async_kernel
+  bin_prot.shape
+  ;; local libraries
+  mina_wire_types
+  kimchi_bindings
+  kimchi_types
+  pasta_bindings
+  kimchi_pasta
+  kimchi_pasta.basic
+  kimchi_pasta.constraint_system
+  bitstring_lib
+  snarky.intf
+  snarky.backendless
+  snarky_group_map
+  sponge
+  kimchi_backend
+  base58_check
+  codable
+  random_oracle_input
+  snarky_log
+  group_map
+  snarky_curve
+  key_cache
+  snark_keys_header
+  tuple_lib
+  promise
+  kimchi_backend_common
+  ppx_version.runtime))
diff --git a/src/lib/crypto/kimchi_backend/gadgets/runner/example/dune b/src/lib/crypto/kimchi_backend/gadgets/runner/example/dune
index d62d6868754..cc37baa9d12 100644
--- a/src/lib/crypto/kimchi_backend/gadgets/runner/example/dune
+++ b/src/lib/crypto/kimchi_backend/gadgets/runner/example/dune
@@ -1,47 +1,48 @@
 (executable
  (name example)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_mina ppx_jane ppx_deriving.std ppx_deriving_yojson))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_mina ppx_jane ppx_deriving.std ppx_deriving_yojson))
  (libraries
-   ;; opam libraries
-   stdio
-   integers
-   result
-   base.caml
-   bignum.bigint
-   core_kernel
-   base64
-   digestif
-   ppx_inline_test.config
-   sexplib0
-   base
-   async_kernel
-   bin_prot.shape
-   ;; local libraries
-   mina_wire_types
-   kimchi_bindings
-   kimchi_types
-   pasta_bindings
-   kimchi_pasta
-   kimchi_pasta.basic
-   kimchi_pasta.constraint_system
-   bitstring_lib
-   snarky.intf
-   snarky.backendless
-   snarky_group_map
-   sponge
-   kimchi_backend
-   base58_check
-   codable
-   random_oracle_input
-   snarky_log
-   group_map
-   snarky_curve
-   key_cache
-   snark_keys_header
-   tuple_lib
-   promise
-   kimchi_backend_common
-   ppx_version.runtime
-   kimchi_backend.gadgets_test_runner
-))
+  ;; opam libraries
+  stdio
+  integers
+  result
+  base.caml
+  bignum.bigint
+  core_kernel
+  base64
+  digestif
+  ppx_inline_test.config
+  sexplib0
+  base
+  async_kernel
+  bin_prot.shape
+  ;; local libraries
+  mina_wire_types
+  kimchi_bindings
+  kimchi_types
+  pasta_bindings
+  kimchi_pasta
+  kimchi_pasta.basic
+  kimchi_pasta.constraint_system
+  bitstring_lib
+  snarky.intf
+  snarky.backendless
+  snarky_group_map
+  sponge
+  kimchi_backend
+  base58_check
+  codable
+  random_oracle_input
+  snarky_log
+  group_map
+  snarky_curve
+  key_cache
+  snark_keys_header
+  tuple_lib
+  promise
+  kimchi_backend_common
+  ppx_version.runtime
+  kimchi_backend.gadgets_test_runner))
diff --git a/src/lib/crypto/kimchi_backend/pasta/basic/dune b/src/lib/crypto/kimchi_backend/pasta/basic/dune
index ebe9b975221..4d56610b154 100644
--- a/src/lib/crypto/kimchi_backend/pasta/basic/dune
+++ b/src/lib/crypto/kimchi_backend/pasta/basic/dune
@@ -1,5 +1,6 @@
 (library
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (name kimchi_pasta_basic)
  (public_name kimchi_pasta.basic)
  (flags -warn-error -27)
diff --git a/src/lib/crypto/kimchi_backend/pasta/constraint_system/caml/dune b/src/lib/crypto/kimchi_backend/pasta/constraint_system/caml/dune
index bd837879f05..62a2a11add6 100644
--- a/src/lib/crypto/kimchi_backend/pasta/constraint_system/caml/dune
+++ b/src/lib/crypto/kimchi_backend/pasta/constraint_system/caml/dune
@@ -1,5 +1,6 @@
 (library
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (name kimchi_pasta_constraint_system_caml)
  (public_name kimchi_pasta.constraint_system.caml)
  (flags -warn-error -27)
diff --git a/src/lib/crypto/kimchi_backend/pasta/constraint_system/dune b/src/lib/crypto/kimchi_backend/pasta/constraint_system/dune
index 62938792279..c7afe6604ec 100644
--- a/src/lib/crypto/kimchi_backend/pasta/constraint_system/dune
+++ b/src/lib/crypto/kimchi_backend/pasta/constraint_system/dune
@@ -1,5 +1,6 @@
 (library
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (name kimchi_pasta_constraint_system)
  (public_name kimchi_pasta.constraint_system)
  (flags -warn-error -27)
diff --git a/src/lib/crypto/kimchi_backend/pasta/dune b/src/lib/crypto/kimchi_backend/pasta/dune
index c5802df174b..7a3d1801cc3 100644
--- a/src/lib/crypto/kimchi_backend/pasta/dune
+++ b/src/lib/crypto/kimchi_backend/pasta/dune
@@ -1,5 +1,6 @@
 (library
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (name kimchi_pasta)
  (public_name kimchi_pasta)
  (flags -warn-error -27)
diff --git a/src/lib/crypto/kimchi_bindings/js/test/dune b/src/lib/crypto/kimchi_bindings/js/test/dune
index 17b44e4a913..d54930341df 100644
--- a/src/lib/crypto/kimchi_bindings/js/test/dune
+++ b/src/lib/crypto/kimchi_bindings/js/test/dune
@@ -1,25 +1,28 @@
 (library
  (name bindings_js_test)
- (js_of_ocaml (flags +toplevel.js +dynlink.js))
+ (js_of_ocaml
+  (flags +toplevel.js +dynlink.js))
  (libraries
-   base
-   bindings_js
-   core_kernel
-   digestif.ocaml
-   digestif
-   integers_stubs_js
-   js_of_ocaml
-   kimchi_bindings
-   kimchi_types
-   pasta_bindings
-   kimchi_backend
-   kimchi_backend_common
-   kimchi_pasta
-   kimchi_pasta.basic
-   kimchi_pasta.constraint_system
-   mina_metrics.none
-   run_in_thread.fake
-   snarky.backendless
-   snarky.intf)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version js_of_ocaml-ppx)))
+  base
+  bindings_js
+  core_kernel
+  digestif.ocaml
+  digestif
+  integers_stubs_js
+  js_of_ocaml
+  kimchi_bindings
+  kimchi_types
+  pasta_bindings
+  kimchi_backend
+  kimchi_backend_common
+  kimchi_pasta
+  kimchi_pasta.basic
+  kimchi_pasta.constraint_system
+  mina_metrics.none
+  run_in_thread.fake
+  snarky.backendless
+  snarky.intf)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version js_of_ocaml-ppx)))
diff --git a/src/lib/crypto/kimchi_bindings/pasta_fp_poseidon/dune b/src/lib/crypto/kimchi_bindings/pasta_fp_poseidon/dune
index 1b9151e7a0d..5c3c76cd60b 100644
--- a/src/lib/crypto/kimchi_bindings/pasta_fp_poseidon/dune
+++ b/src/lib/crypto/kimchi_bindings/pasta_fp_poseidon/dune
@@ -2,6 +2,9 @@
  (public_name kimchi_bindings.pasta_fp_poseidon)
  (name kimchi_pasta_fp_poseidon)
  (libraries kimchi_bindings)
- (instrumentation (backend bisect_ppx))
- (inline_tests (flags -verbose -show-counts))
- (preprocess (pps ppx_version ppx_inline_test)))
+ (instrumentation
+  (backend bisect_ppx))
+ (inline_tests
+  (flags -verbose -show-counts))
+ (preprocess
+  (pps ppx_version ppx_inline_test)))
diff --git a/src/lib/crypto/kimchi_bindings/pasta_fq_poseidon/dune b/src/lib/crypto/kimchi_bindings/pasta_fq_poseidon/dune
index 77323d2b710..e4439de1695 100644
--- a/src/lib/crypto/kimchi_bindings/pasta_fq_poseidon/dune
+++ b/src/lib/crypto/kimchi_bindings/pasta_fq_poseidon/dune
@@ -2,6 +2,9 @@
  (public_name kimchi_bindings.pasta_fq_poseidon)
  (name kimchi_pasta_fq_poseidon)
  (libraries kimchi_bindings)
- (instrumentation (backend bisect_ppx))
- (inline_tests (flags -verbose -show-counts))
- (preprocess (pps ppx_version ppx_inline_test)))
+ (instrumentation
+  (backend bisect_ppx))
+ (inline_tests
+  (flags -verbose -show-counts))
+ (preprocess
+  (pps ppx_version ppx_inline_test)))
diff --git a/src/lib/crypto/kimchi_bindings/stubs/dune b/src/lib/crypto/kimchi_bindings/stubs/dune
index 6c1400892a4..d2ad9906156 100644
--- a/src/lib/crypto/kimchi_bindings/stubs/dune
+++ b/src/lib/crypto/kimchi_bindings/stubs/dune
@@ -21,7 +21,8 @@
   (<> %{env:RUST_TARGET_FEATURE_OPTIMISATIONS=y} n))
  (targets rustflags.sexp)
  (action
-  (with-stdout-to rustflags.sexp
+  (with-stdout-to
+   rustflags.sexp
    (echo "-C target-feature=+bmi2,+adx"))))
 
 (rule
@@ -29,7 +30,8 @@
   (= %{env:RUST_TARGET_FEATURE_OPTIMISATIONS=y} n))
  (targets rustflags.sexp)
  (action
-  (with-stdout-to rustflags.sexp
+  (with-stdout-to
+   rustflags.sexp
    (echo "-C target-feature=-bmi2,-adx"))))
 
 ;;
@@ -90,7 +92,8 @@
  (instrumentation
   (backend bisect_ppx))
  (libraries bounded_types)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (preprocess
   (pps ppx_version ppx_inline_test)))
 
@@ -101,7 +104,8 @@
  (libraries kimchi_types pasta_bindings.backend bounded_types)
  (instrumentation
   (backend bisect_ppx))
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (preprocess
   (pps ppx_version ppx_inline_test)))
 
@@ -112,7 +116,8 @@
  (libraries pasta_bindings kimchi_types bounded_types)
  (instrumentation
   (backend bisect_ppx))
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (preprocess
   (pps ppx_version ppx_inline_test)))
 
@@ -128,7 +133,8 @@
  (libraries bounded_types)
  (instrumentation
   (backend bisect_ppx))
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (preprocess
   (pps ppx_version ppx_inline_test))
  (implements pasta_bindings.backend))
diff --git a/src/lib/crypto/kimchi_bindings/stubs/pasta_bindings_backend/dune b/src/lib/crypto/kimchi_bindings/stubs/pasta_bindings_backend/dune
index 31091c455b4..873ff1c47fb 100644
--- a/src/lib/crypto/kimchi_bindings/stubs/pasta_bindings_backend/dune
+++ b/src/lib/crypto/kimchi_bindings/stubs/pasta_bindings_backend/dune
@@ -4,7 +4,8 @@
  (modules pasta_bindings_backend)
  (instrumentation
   (backend bisect_ppx))
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (preprocess
   (pps ppx_version ppx_inline_test))
  (virtual_modules pasta_bindings_backend)
diff --git a/src/lib/crypto/kimchi_bindings/stubs/pasta_bindings_backend/none/dune b/src/lib/crypto/kimchi_bindings/stubs/pasta_bindings_backend/none/dune
index 9dc4e3757f3..27754330a3d 100644
--- a/src/lib/crypto/kimchi_bindings/stubs/pasta_bindings_backend/none/dune
+++ b/src/lib/crypto/kimchi_bindings/stubs/pasta_bindings_backend/none/dune
@@ -3,7 +3,8 @@
  (name pasta_bindings_backend_none)
  (instrumentation
   (backend bisect_ppx))
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (preprocess
   (pps ppx_version ppx_inline_test))
  (implements pasta_bindings.backend))
diff --git a/src/lib/crypto/plonkish_prelude/dune b/src/lib/crypto/plonkish_prelude/dune
index eceb81fce2b..301a98173fd 100644
--- a/src/lib/crypto/plonkish_prelude/dune
+++ b/src/lib/crypto/plonkish_prelude/dune
@@ -25,7 +25,7 @@
  (instrumentation
   (backend bisect_ppx))
  (libraries
-   ;; opam libraries
+  ;; opam libraries
   sexplib0
   result
   core_kernel
@@ -37,5 +37,4 @@
   tuple_lib
   ppx_version.runtime
   bounded_types
-  mina_wire_types
-  ))
+  mina_wire_types))
diff --git a/src/lib/crypto/plonkish_prelude/test/dune b/src/lib/crypto/plonkish_prelude/test/dune
index c4169721e9d..fed9d2205a0 100644
--- a/src/lib/crypto/plonkish_prelude/test/dune
+++ b/src/lib/crypto/plonkish_prelude/test/dune
@@ -2,13 +2,15 @@
  (names main)
  (flags
   (:standard -warn-error +a)
-  -open Core_kernel)
- (preprocess (pps ppx_jane))
+  -open
+  Core_kernel)
+ (preprocess
+  (pps ppx_jane))
  (libraries
   ; Opam
   core_kernel
   alcotest
   ; Mina
-  plonkish_prelude
-  )
- (action (run %{test})))
+  plonkish_prelude)
+ (action
+  (run %{test})))
diff --git a/src/lib/crypto_params/dune b/src/lib/crypto_params/dune
index 777ba6967bc..df671189ba7 100644
--- a/src/lib/crypto_params/dune
+++ b/src/lib/crypto_params/dune
@@ -3,26 +3,27 @@
  (public_name crypto_params)
  (flags :standard -short-paths -warn-error -58)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   core_kernel
-   bin_prot.shape
-   sexplib0
-   ;; local libraries
-   kimchi_pasta
-   kimchi_pasta.basic
-   pickles.backend
-   snarky.backendless
-   cache_dir
-   group_map
-   pickles
-   tuple_lib
-   kimchi_backend
- )
+  ;; opam libraries
+  core_kernel
+  bin_prot.shape
+  sexplib0
+  ;; local libraries
+  kimchi_pasta
+  kimchi_pasta.basic
+  pickles.backend
+  snarky.backendless
+  cache_dir
+  group_map
+  pickles
+  tuple_lib
+  kimchi_backend)
  (preprocess
   (pps ppx_version ppx_jane h_list.ppx))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Cryptographic parameters"))
 
 (rule
diff --git a/src/lib/crypto_params/gen/dune b/src/lib/crypto_params/gen/dune
index 4a2f552e3f5..8a1caee9da3 100644
--- a/src/lib/crypto_params/gen/dune
+++ b/src/lib/crypto_params/gen/dune
@@ -1,38 +1,38 @@
 (executable
  (name gen)
  (libraries
-   ;; opam libraries
-   stdio
-   base.caml
-   sexplib0
-   core_kernel
-   compiler-libs
-   ppxlib
-   ppxlib.astlib
-   digestif
-   core
-   async
-   ocaml-migrate-parsetree
-   ppxlib.ast
-   base
-   bin_prot.shape
-   ocaml-compiler-libs.common
-   ;; local libraries
-   kimchi_pasta
-   kimchi_pasta.basic
-   group_map
-   tuple_lib
-   snarky.backendless
-   fold_lib
-   crs
-   pickles
-   pickles.backend
-   kimchi_backend
-   mina_metrics.none
-   logger.fake
- )
+  ;; opam libraries
+  stdio
+  base.caml
+  sexplib0
+  core_kernel
+  compiler-libs
+  ppxlib
+  ppxlib.astlib
+  digestif
+  core
+  async
+  ocaml-migrate-parsetree
+  ppxlib.ast
+  base
+  bin_prot.shape
+  ocaml-compiler-libs.common
+  ;; local libraries
+  kimchi_pasta
+  kimchi_pasta.basic
+  group_map
+  tuple_lib
+  snarky.backendless
+  fold_lib
+  crs
+  pickles
+  pickles.backend
+  kimchi_backend
+  mina_metrics.none
+  logger.fake)
  (forbidden_libraries mina_node_config)
  (preprocess
   (pps ppx_version ppx_bin_prot ppxlib.metaquot))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (modes native))
diff --git a/src/lib/cstubs_applicative/dune b/src/lib/cstubs_applicative/dune
index 124c6f4512c..12028ef3ed2 100644
--- a/src/lib/cstubs_applicative/dune
+++ b/src/lib/cstubs_applicative/dune
@@ -2,10 +2,11 @@
  (name cstubs_applicative)
  (public_name cstubs_applicative)
  (libraries
-   ;; opam libraries
-   base
-   ctypes
-   ctypes.stubs
-)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version)))
+  ;; opam libraries
+  base
+  ctypes
+  ctypes.stubs)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version)))
diff --git a/src/lib/currency/dune b/src/lib/currency/dune
index 15d83534664..828de49b209 100644
--- a/src/lib/currency/dune
+++ b/src/lib/currency/dune
@@ -2,37 +2,37 @@
  (name currency)
  (public_name currency)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   base.base_internalhash_types
-   core_kernel
-   bin_prot.shape
-   base.caml
-   sexplib0
-   base
-   integers
-   result
-   ppx_inline_test.config
-   zarith
-   mina_wire_types
-   ;; local libraries
-   bignum_bigint
-   bitstring_lib
-   codable
-   test_util
-   unsigned_extended
-   mina_numbers
-   snark_bits
-   sgn
-   snark_params
-   random_oracle
-   random_oracle_input
-   pickles
-   snarky.backendless
-   kimchi_backend_common
-   ppx_version.runtime
- )
+  ;; opam libraries
+  base.base_internalhash_types
+  core_kernel
+  bin_prot.shape
+  base.caml
+  sexplib0
+  base
+  integers
+  result
+  ppx_inline_test.config
+  zarith
+  mina_wire_types
+  ;; local libraries
+  bignum_bigint
+  bitstring_lib
+  codable
+  test_util
+  unsigned_extended
+  mina_numbers
+  snark_bits
+  sgn
+  snark_params
+  random_oracle
+  random_oracle_input
+  pickles
+  snarky.backendless
+  kimchi_backend_common
+  ppx_version.runtime)
  (preprocess
   (pps
    ppx_annot
diff --git a/src/lib/daemon_rpcs/dune b/src/lib/daemon_rpcs/dune
index a9abbb47f89..0f3597e902d 100644
--- a/src/lib/daemon_rpcs/dune
+++ b/src/lib/daemon_rpcs/dune
@@ -2,48 +2,53 @@
  (name daemon_rpcs)
  (public_name daemon_rpcs)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   base.caml
-   sexplib0
-   bin_prot.shape
-   yojson
-   core
-   async
-   ppx_deriving_yojson.runtime
-   core_kernel
-   async_unix
-   async.async_rpc
-   async_rpc_kernel
-   async_kernel
-   ;; local libraries
-   network_peer
-   genesis_constants
-   bounded_types
-   currency
-   mina_net2
-   transition_frontier
-   block_time
-   mina_numbers
-   itn_logger
-   cli_lib
-   transaction_inclusion_status
-   consensus
-   mina_networking
-   mina_base
-   user_command_input
-   perf_histograms
-   sync_status
-   node_addrs_and_ports
-   logger
-   network_pool
-   data_hash_lib
-   trust_system
-   ppx_version.runtime
- )
+  ;; opam libraries
+  base.caml
+  sexplib0
+  bin_prot.shape
+  yojson
+  core
+  async
+  ppx_deriving_yojson.runtime
+  core_kernel
+  async_unix
+  async.async_rpc
+  async_rpc_kernel
+  async_kernel
+  ;; local libraries
+  network_peer
+  genesis_constants
+  bounded_types
+  currency
+  mina_net2
+  transition_frontier
+  block_time
+  mina_numbers
+  itn_logger
+  cli_lib
+  transaction_inclusion_status
+  consensus
+  mina_networking
+  mina_base
+  user_command_input
+  perf_histograms
+  sync_status
+  node_addrs_and_ports
+  logger
+  network_pool
+  data_hash_lib
+  trust_system
+  ppx_version.runtime)
  (preprocess
-  (pps ppx_version ppx_jane ppx_deriving_yojson ppx_compare ppx_deriving.make
- ))
- (instrumentation (backend bisect_ppx))
+  (pps
+   ppx_version
+   ppx_jane
+   ppx_deriving_yojson
+   ppx_compare
+   ppx_deriving.make))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Lib powering the client interactions with the daemon"))
diff --git a/src/lib/data_hash_lib/dune b/src/lib/data_hash_lib/dune
index 6efabfd9267..775c443fcb2 100644
--- a/src/lib/data_hash_lib/dune
+++ b/src/lib/data_hash_lib/dune
@@ -1,41 +1,50 @@
 (library
  (name data_hash_lib)
  (public_name data_hash_lib)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (library_flags -linkall)
  (libraries
-   ;; opam libraries
-   result
-   base.base_internalhash_types
-   core_kernel
-   bin_prot.shape
-   ppx_inline_test.config
-   base
-   sexplib0
-   base.caml
-   ;; local libraries
-   fields_derivers.graphql
-   fields_derivers
-   bitstring_lib
-   pickles
-   snark_params
-   outside_hash_image
-   random_oracle_input
-   bignum_bigint
-   snarky.backendless
-   fold_lib
-   snark_bits
-   codable
-   random_oracle
-   base58_check
-   snarky.intf
-   fields_derivers.zkapps
-   fields_derivers.json
-   test_util
-   ppx_version.runtime
-   mina_wire_types
- )
+  ;; opam libraries
+  result
+  base.base_internalhash_types
+  core_kernel
+  bin_prot.shape
+  ppx_inline_test.config
+  base
+  sexplib0
+  base.caml
+  ;; local libraries
+  fields_derivers.graphql
+  fields_derivers
+  bitstring_lib
+  pickles
+  snark_params
+  outside_hash_image
+  random_oracle_input
+  bignum_bigint
+  snarky.backendless
+  fold_lib
+  snark_bits
+  codable
+  random_oracle
+  base58_check
+  snarky.intf
+  fields_derivers.zkapps
+  fields_derivers.json
+  test_util
+  ppx_version.runtime
+  mina_wire_types)
  (preprocess
-  (pps ppx_mina ppx_version ppx_snarky ppx_let ppx_inline_test ppx_sexp_conv ppx_compare ppx_hash))
- (instrumentation (backend bisect_ppx))
+  (pps
+   ppx_mina
+   ppx_version
+   ppx_snarky
+   ppx_let
+   ppx_inline_test
+   ppx_sexp_conv
+   ppx_compare
+   ppx_hash))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Data hash"))
diff --git a/src/lib/debug_assert/dune b/src/lib/debug_assert/dune
index 1f5aca9ac6f..51e377a2622 100644
--- a/src/lib/debug_assert/dune
+++ b/src/lib/debug_assert/dune
@@ -1,8 +1,9 @@
 (library
  (name debug_assert)
  (public_name debug_assert)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (libraries async_kernel)
- (synopsis "Debug assertion library")
-)
+ (synopsis "Debug assertion library"))
diff --git a/src/lib/direction/dune b/src/lib/direction/dune
index 864da931cb5..5eb2634e786 100644
--- a/src/lib/direction/dune
+++ b/src/lib/direction/dune
@@ -5,5 +5,6 @@
  (libraries core_kernel sexplib0)
  (preprocess
   (pps ppx_version ppx_jane ppx_compare))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Representation of direction in a binary tree"))
diff --git a/src/lib/downloader/dune b/src/lib/downloader/dune
index c9364282f89..2b0e0c1019e 100644
--- a/src/lib/downloader/dune
+++ b/src/lib/downloader/dune
@@ -2,23 +2,23 @@
  (name downloader)
  (public_name downloader)
  (libraries
-   ;; opam libraries
-   async_kernel
-   async
-   core
-   core_kernel
-   sexplib0
-   core_kernel.pairing_heap
-   async_unix
-   base.caml
-   ;; local libraries
-   network_peer
-   pipe_lib
-   trust_system
-   logger
-   o1trace
-   bounded_types
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_mina ppx_version ppx_deriving.std ppx_deriving_yojson)))
-
+  ;; opam libraries
+  async_kernel
+  async
+  core
+  core_kernel
+  sexplib0
+  core_kernel.pairing_heap
+  async_unix
+  base.caml
+  ;; local libraries
+  network_peer
+  pipe_lib
+  trust_system
+  logger
+  o1trace
+  bounded_types)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_mina ppx_version ppx_deriving.std ppx_deriving_yojson)))
diff --git a/src/lib/dummy_values/dune b/src/lib/dummy_values/dune
index 8749ba27615..8fb026206b6 100644
--- a/src/lib/dummy_values/dune
+++ b/src/lib/dummy_values/dune
@@ -3,17 +3,17 @@
  (public_name dummy_values)
  (flags :standard -short-paths)
  (libraries
-   ;; opam libraries
-   core_kernel
-   ;; local libraries
-   crypto_params
-   snarky.backendless
-   pickles
- )
+  ;; opam libraries
+  core_kernel
+  ;; local libraries
+  crypto_params
+  snarky.backendless
+  pickles)
  (ppx_runtime_libraries base)
  (preprocess
   (pps ppx_version ppx_jane ppxlib.metaquot))
- (instrumentation (backend bisect_ppx)))
+ (instrumentation
+  (backend bisect_ppx)))
 
 (rule
  (targets dummy_values.ml)
diff --git a/src/lib/dummy_values/gen_values/dune b/src/lib/dummy_values/gen_values/dune
index 6405f8d8e2d..1e92c74850c 100644
--- a/src/lib/dummy_values/gen_values/dune
+++ b/src/lib/dummy_values/gen_values/dune
@@ -2,29 +2,29 @@
  (name gen_values)
  (link_flags (-linkall))
  (libraries
-   ;; opam libraries
-   async_unix
-   stdio
-   base.caml
-   ocaml-migrate-parsetree
-   core
-   async
-   ppxlib
-   ppxlib.ast
-   ppxlib.astlib
-   core_kernel
-   compiler-libs
-   async_kernel
-   ocaml-compiler-libs.common
-   ;; local libraries
-   pickles_types
-   pickles
-   crypto_params
-   mina_metrics.none
-   logger.fake
- )
+  ;; opam libraries
+  async_unix
+  stdio
+  base.caml
+  ocaml-migrate-parsetree
+  core
+  async
+  ppxlib
+  ppxlib.ast
+  ppxlib.astlib
+  core_kernel
+  compiler-libs
+  async_kernel
+  ocaml-compiler-libs.common
+  ;; local libraries
+  pickles_types
+  pickles
+  crypto_params
+  mina_metrics.none
+  logger.fake)
  (forbidden_libraries mina_node_config protocol_version)
  (preprocess
   (pps ppx_version ppx_jane ppxlib.metaquot))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (modes native))
diff --git a/src/lib/empty_hashes/dune b/src/lib/empty_hashes/dune
index 150628e0cd9..33669acd341 100644
--- a/src/lib/empty_hashes/dune
+++ b/src/lib/empty_hashes/dune
@@ -1,8 +1,9 @@
 (library
  (name empty_hashes)
  (public_name empty_hashes)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (library_flags (-linkall))
- (libraries core_kernel immutable_array base)
-)
+ (libraries core_kernel immutable_array base))
diff --git a/src/lib/error_json/dune b/src/lib/error_json/dune
index 7f2363a6324..903568994b7 100644
--- a/src/lib/error_json/dune
+++ b/src/lib/error_json/dune
@@ -2,11 +2,12 @@
  (name error_json)
  (public_name error_json)
  (libraries
-   ;; opam libraries
-   sexplib0
-   yojson
-   base
-   sexplib
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_deriving_yojson ppx_version)))
+  ;; opam libraries
+  sexplib0
+  yojson
+  base
+  sexplib)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_deriving_yojson ppx_version)))
diff --git a/src/lib/exit_handlers/dune b/src/lib/exit_handlers/dune
index 34c2824072b..df828aeb393 100644
--- a/src/lib/exit_handlers/dune
+++ b/src/lib/exit_handlers/dune
@@ -3,6 +3,8 @@
  (public_name exit_handlers)
  (library_flags -linkall)
  (libraries core_kernel async_kernel async_unix logger core base base.caml)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_here ppx_let))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_version ppx_here ppx_let))
  (synopsis "Exit handlers"))
diff --git a/src/lib/fake_network/dune b/src/lib/fake_network/dune
index 80c526eb52a..7664735eb6a 100644
--- a/src/lib/fake_network/dune
+++ b/src/lib/fake_network/dune
@@ -2,53 +2,54 @@
  (name fake_network)
  (public_name fake_network)
  (libraries
-   ;; opam libraries
-   core.uuid
-   core_kernel.uuid
-   async_unix
-   async
-   core
-   core_kernel
-   base.caml
-   async_kernel
-   sexplib0
-   ;; local libraries
-   snark_params
-   pickles
-   pickles.backend
-   genesis_constants
-   signature_lib
-   verifier
-   bounded_types
-   precomputed_values
-   block_time
-   trust_system
-   logger
-   consensus
-   transition_frontier
-   mina_base
-   gadt_lib
-   mina_networking
-   sync_handler
-   network_peer
-   staged_ledger
-   mina_state
-   with_hash
-   proof_carrying_data
-   mina_block
-   coda_genesis_proof
-   transition_chain_prover
-   mina_ledger
-   kimchi_bindings
-   kimchi_types
-   pasta_bindings
-   kimchi_pasta
-   kimchi_pasta.basic
-   data_hash_lib
-   transition_handler
-   network_pool
-   mina_intf
-   pipe_lib
-   )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_jane ppx_deriving.std)))
+  ;; opam libraries
+  core.uuid
+  core_kernel.uuid
+  async_unix
+  async
+  core
+  core_kernel
+  base.caml
+  async_kernel
+  sexplib0
+  ;; local libraries
+  snark_params
+  pickles
+  pickles.backend
+  genesis_constants
+  signature_lib
+  verifier
+  bounded_types
+  precomputed_values
+  block_time
+  trust_system
+  logger
+  consensus
+  transition_frontier
+  mina_base
+  gadt_lib
+  mina_networking
+  sync_handler
+  network_peer
+  staged_ledger
+  mina_state
+  with_hash
+  proof_carrying_data
+  mina_block
+  coda_genesis_proof
+  transition_chain_prover
+  mina_ledger
+  kimchi_bindings
+  kimchi_types
+  pasta_bindings
+  kimchi_pasta
+  kimchi_pasta.basic
+  data_hash_lib
+  transition_handler
+  network_pool
+  mina_intf
+  pipe_lib)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_version ppx_jane ppx_deriving.std)))
diff --git a/src/lib/fields_derivers/dune b/src/lib/fields_derivers/dune
index be69ccb6d8b..370eabcd7ba 100644
--- a/src/lib/fields_derivers/dune
+++ b/src/lib/fields_derivers/dune
@@ -2,6 +2,16 @@
  (name fields_derivers)
  (public_name fields_derivers)
  (libraries core_kernel ppx_inline_test.config fieldslib sexplib0 base.caml)
- (instrumentation (backend bisect_ppx))
- (inline_tests (flags -verbose -show-counts))
- (preprocess (pps ppx_annot ppx_jane ppx_fields_conv ppx_let ppx_inline_test ppx_custom_printf ppx_version)))
+ (instrumentation
+  (backend bisect_ppx))
+ (inline_tests
+  (flags -verbose -show-counts))
+ (preprocess
+  (pps
+   ppx_annot
+   ppx_jane
+   ppx_fields_conv
+   ppx_let
+   ppx_inline_test
+   ppx_custom_printf
+   ppx_version)))
diff --git a/src/lib/fields_derivers_graphql/dune b/src/lib/fields_derivers_graphql/dune
index b6310542a91..71a0539fa43 100644
--- a/src/lib/fields_derivers_graphql/dune
+++ b/src/lib/fields_derivers_graphql/dune
@@ -2,18 +2,27 @@
  (name fields_derivers_graphql)
  (public_name fields_derivers.graphql)
  (libraries
-   ;; opam libraries
-   async_kernel
-   graphql_parser
-   graphql-async
-   graphql
-   fieldslib
-   core_kernel
-   yojson
-   ppx_inline_test.config
-   ;; local libraries
-   fields_derivers
- )
- (instrumentation (backend bisect_ppx))
- (inline_tests (flags -verbose -show-counts))
- (preprocess (pps ppx_annot ppx_jane ppx_fields_conv ppx_let ppx_inline_test ppx_custom_printf ppx_version)))
+  ;; opam libraries
+  async_kernel
+  graphql_parser
+  graphql-async
+  graphql
+  fieldslib
+  core_kernel
+  yojson
+  ppx_inline_test.config
+  ;; local libraries
+  fields_derivers)
+ (instrumentation
+  (backend bisect_ppx))
+ (inline_tests
+  (flags -verbose -show-counts))
+ (preprocess
+  (pps
+   ppx_annot
+   ppx_jane
+   ppx_fields_conv
+   ppx_let
+   ppx_inline_test
+   ppx_custom_printf
+   ppx_version)))
diff --git a/src/lib/fields_derivers_json/dune b/src/lib/fields_derivers_json/dune
index 85f64120244..8599a1fbe17 100644
--- a/src/lib/fields_derivers_json/dune
+++ b/src/lib/fields_derivers_json/dune
@@ -2,15 +2,25 @@
  (name fields_derivers_json)
  (public_name fields_derivers.json)
  (libraries
-   ;; opam libraries
-   yojson
-   fieldslib
-   ppx_inline_test.config
-   core_kernel
-   result
-   ;; local libraries
-   fields_derivers
- )
- (instrumentation (backend bisect_ppx))
- (inline_tests (flags -verbose -show-counts))
- (preprocess (pps ppx_annot ppx_deriving_yojson ppx_jane ppx_fields_conv ppx_let ppx_inline_test ppx_custom_printf ppx_version)))
+  ;; opam libraries
+  yojson
+  fieldslib
+  ppx_inline_test.config
+  core_kernel
+  result
+  ;; local libraries
+  fields_derivers)
+ (instrumentation
+  (backend bisect_ppx))
+ (inline_tests
+  (flags -verbose -show-counts))
+ (preprocess
+  (pps
+   ppx_annot
+   ppx_deriving_yojson
+   ppx_jane
+   ppx_fields_conv
+   ppx_let
+   ppx_inline_test
+   ppx_custom_printf
+   ppx_version)))
diff --git a/src/lib/fields_derivers_zkapps/dune b/src/lib/fields_derivers_zkapps/dune
index fcfec989f08..64a21faabb9 100644
--- a/src/lib/fields_derivers_zkapps/dune
+++ b/src/lib/fields_derivers_zkapps/dune
@@ -2,32 +2,33 @@
  (name fields_derivers_zkapps)
  (public_name fields_derivers.zkapps)
  (libraries
-   ;; opam libraries
-   result
-   ppx_inline_test.config
-   integers
-   graphql
-   fieldslib
-   core_kernel
-   base.caml
-   base
-   sexplib0
-   graphql_parser
-   ;; local libraries
-   signature_lib
-   fields_derivers.graphql
-   fields_derivers.json
-   currency
-   mina_numbers
-   snark_params
-   pickles
-   fields_derivers
-   sgn
-   unsigned_extended
-   with_hash
- )
- (inline_tests (flags -verbose -show-counts))
- (instrumentation (backend bisect_ppx))
+  ;; opam libraries
+  result
+  ppx_inline_test.config
+  integers
+  graphql
+  fieldslib
+  core_kernel
+  base.caml
+  base
+  sexplib0
+  graphql_parser
+  ;; local libraries
+  signature_lib
+  fields_derivers.graphql
+  fields_derivers.json
+  currency
+  mina_numbers
+  snark_params
+  pickles
+  fields_derivers
+  sgn
+  unsigned_extended
+  with_hash)
+ (inline_tests
+  (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
  (preprocess
   (pps
    ppx_annot
diff --git a/src/lib/file_system/dune b/src/lib/file_system/dune
index 964664ad655..ecf8dfefc7c 100644
--- a/src/lib/file_system/dune
+++ b/src/lib/file_system/dune
@@ -2,15 +2,9 @@
  (name file_system)
  (public_name file_system)
  (library_flags -linkall)
- (libraries
-   core_kernel
-   async_kernel
-   core
-   async
-   async_unix
-   base.caml
- )
+ (libraries core_kernel async_kernel core async async_unix base.caml)
  (preprocess
   (pps ppx_version ppx_jane))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Interface to make system calls to the Unix file system"))
diff --git a/src/lib/filtered_external_transition/dune b/src/lib/filtered_external_transition/dune
index 1e55eb09f16..a9623a9da38 100644
--- a/src/lib/filtered_external_transition/dune
+++ b/src/lib/filtered_external_transition/dune
@@ -3,42 +3,47 @@
  (public_name filtered_external_transition)
  (library_flags -linkall)
  (libraries
-   ;; opam libraries
-   core_kernel
-   bin_prot.shape
-   base.caml
-   base
-   core
-   sexplib0
-   ;; local libraries
-   staged_ledger_diff
-   staged_ledger
-   transaction_snark_work
-   consensus
-   data_hash_lib
-   currency
-   with_hash
-   mina_base
-   mina_state
-   mina_transaction
-   mina_block
-   signature_lib
-   mina_base.import
-   mina_numbers
-   ppx_version.runtime
-   pickles.backend
-   pickles
-   snark_params
-   kimchi_backend
-   sgn_type
-   sgn
-   mina_transaction_logic
-   block_time
-   kimchi_pasta
-   kimchi_pasta.basic
-   mina_wire_types
- )
+  ;; opam libraries
+  core_kernel
+  bin_prot.shape
+  base.caml
+  base
+  core
+  sexplib0
+  ;; local libraries
+  staged_ledger_diff
+  staged_ledger
+  transaction_snark_work
+  consensus
+  data_hash_lib
+  currency
+  with_hash
+  mina_base
+  mina_state
+  mina_transaction
+  mina_block
+  signature_lib
+  mina_base.import
+  mina_numbers
+  ppx_version.runtime
+  pickles.backend
+  pickles
+  snark_params
+  kimchi_backend
+  sgn_type
+  sgn
+  mina_transaction_logic
+  block_time
+  kimchi_pasta
+  kimchi_pasta.basic
+  mina_wire_types)
  (preprocess
-  (pps base_quickcheck.ppx_quickcheck ppx_jane ppx_mina ppx_version ppx_deriving_yojson))
- (instrumentation (backend bisect_ppx))
+  (pps
+   base_quickcheck.ppx_quickcheck
+   ppx_jane
+   ppx_mina
+   ppx_version
+   ppx_deriving_yojson))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Filtering operations for external transitions"))
diff --git a/src/lib/gadt_lib/dune b/src/lib/gadt_lib/dune
index ad6032f84bc..20b5b201283 100644
--- a/src/lib/gadt_lib/dune
+++ b/src/lib/gadt_lib/dune
@@ -2,5 +2,7 @@
  (name gadt_lib)
  (public_name gadt_lib)
  (libraries core_kernel)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane)))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane)))
diff --git a/src/lib/generated_graphql_queries/dune b/src/lib/generated_graphql_queries/dune
index c4d019950f9..e4919f2ba6f 100644
--- a/src/lib/generated_graphql_queries/dune
+++ b/src/lib/generated_graphql_queries/dune
@@ -2,14 +2,28 @@
  (name generated_graphql_queries)
  (public_name generated_graphql_queries)
  (libraries
-   async cohttp core cohttp-async mina_base graphql-async graphql-cohttp yojson
-   graphql_lib base
- )
- (instrumentation (backend bisect_ppx))
- (preprocessor_deps ../../../graphql_schema.json ../../graphql-ppx-config.inc)
- (preprocess (pps ppx_base ppx_version
-                  graphql_ppx -- %{read-lines:../../graphql-ppx-config.inc}
-)))
+  async
+  cohttp
+  core
+  cohttp-async
+  mina_base
+  graphql-async
+  graphql-cohttp
+  yojson
+  graphql_lib
+  base)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocessor_deps
+  ../../../graphql_schema.json
+  ../../graphql-ppx-config.inc)
+ (preprocess
+  (pps
+   ppx_base
+   ppx_version
+   graphql_ppx
+   --
+   %{read-lines:../../graphql-ppx-config.inc})))
 
 (rule
  (targets generated_graphql_queries.ml)
diff --git a/src/lib/generated_graphql_queries/gen/dune b/src/lib/generated_graphql_queries/gen/dune
index 1f2abdc3a4b..ec9cfddbf57 100644
--- a/src/lib/generated_graphql_queries/gen/dune
+++ b/src/lib/generated_graphql_queries/gen/dune
@@ -1,8 +1,19 @@
 (executable
  (name gen)
- (libraries base core_kernel ppxlib ppxlib.ast ppxlib.astlib yojson mina_base base.caml compiler-libs ocaml-migrate-parsetree stdio)
+ (libraries
+  base
+  core_kernel
+  ppxlib
+  ppxlib.ast
+  ppxlib.astlib
+  yojson
+  mina_base
+  base.caml
+  compiler-libs
+  ocaml-migrate-parsetree
+  stdio)
  (preprocess
   (pps ppx_base ppx_version ppxlib.metaquot graphql_ppx))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (modes native))
-
diff --git a/src/lib/genesis_constants/dune b/src/lib/genesis_constants/dune
index 175e6734300..dc73063c4b1 100644
--- a/src/lib/genesis_constants/dune
+++ b/src/lib/genesis_constants/dune
@@ -2,39 +2,50 @@
  (name genesis_constants)
  (public_name genesis_constants)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   base
-   bin_prot.shape
-   core_kernel
-   base.caml
-   sexplib0
-   integers
-   ;; local libraries
-   mina_node_config.intf
-   mina_node_config.for_unit_tests
-   mina_node_config
-   mina_wire_types
-   unsigned_extended
-   mina_numbers
-   pickles
-   currency
-   blake2
-   data_hash_lib
-   pickles.backend
-   snark_keys_header
-   kimchi_pasta
-   kimchi_pasta.basic
-   test_util
-   ppx_version.runtime
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps
-               ppx_mina ppx_version ppx_bin_prot ppx_compare ppx_hash
-               ppx_fields_conv ppx_compare ppx_deriving.ord
-               ppx_sexp_conv ppx_let ppx_custom_printf ppx_deriving_yojson
-               h_list.ppx
-               ppx_inline_test))
+  ;; opam libraries
+  ppx_inline_test.config
+  base
+  bin_prot.shape
+  core_kernel
+  base.caml
+  sexplib0
+  integers
+  ;; local libraries
+  mina_node_config.intf
+  mina_node_config.for_unit_tests
+  mina_node_config
+  mina_wire_types
+  unsigned_extended
+  mina_numbers
+  pickles
+  currency
+  blake2
+  data_hash_lib
+  pickles.backend
+  snark_keys_header
+  kimchi_pasta
+  kimchi_pasta.basic
+  test_util
+  ppx_version.runtime)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_mina
+   ppx_version
+   ppx_bin_prot
+   ppx_compare
+   ppx_hash
+   ppx_fields_conv
+   ppx_compare
+   ppx_deriving.ord
+   ppx_sexp_conv
+   ppx_let
+   ppx_custom_printf
+   ppx_deriving_yojson
+   h_list.ppx
+   ppx_inline_test))
  (synopsis "Coda genesis constants"))
diff --git a/src/lib/genesis_ledger/dune b/src/lib/genesis_ledger/dune
index 53f0b5c7e1d..9ca1d93cb03 100644
--- a/src/lib/genesis_ledger/dune
+++ b/src/lib/genesis_ledger/dune
@@ -2,19 +2,21 @@
  (public_name coda_genesis_ledger)
  (name genesis_ledger)
  (libraries
-   ;; opam libraries
-   core_kernel
-   base
-   ;; local libraries
-   key_gen
-   mina_base
-   signature_lib
-   currency
-   mina_numbers
-   genesis_constants
-   data_hash_lib
-   mina_ledger
-   mina_base.import
-   bounded_types)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_let)))
+  ;; opam libraries
+  core_kernel
+  base
+  ;; local libraries
+  key_gen
+  mina_base
+  signature_lib
+  currency
+  mina_numbers
+  genesis_constants
+  data_hash_lib
+  mina_ledger
+  mina_base.import
+  bounded_types)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_let)))
diff --git a/src/lib/genesis_ledger_helper/dune b/src/lib/genesis_ledger_helper/dune
index 66a7769661b..345eac51167 100644
--- a/src/lib/genesis_ledger_helper/dune
+++ b/src/lib/genesis_ledger_helper/dune
@@ -1,49 +1,59 @@
 (library
  (public_name genesis_ledger_helper)
  (name genesis_ledger_helper)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   core_kernel.uuid
-   async_unix
-   async
-   core_kernel
-   core
-   async_kernel
-   core.uuid
-   base.caml
-   sexplib0
-   digestif
-   ;; local libraries
-   mina_ledger
-   with_hash
-   bounded_types
-   blockchain_snark
-   error_json
-   mina_state
-   random_oracle
-   blake2
-   mina_numbers
-   genesis_ledger_helper.lib
-   precomputed_values
-   coda_genesis_ledger
-   mina_runtime_config
-   signature_lib
-   mina_base
-   genesis_constants
-   cache_dir
-   coda_genesis_proof
-   currency
-   data_hash_lib
-   snark_params
-   unsigned_extended
-   consensus
-   pickles
-   logger
-   mina_base.import
-   staged_ledger_diff
-   file_system
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_jane ppx_version ppx_inline_test ppx_let ppx_deriving.std ppx_deriving_yojson ppx_custom_printf)))
+  ;; opam libraries
+  ppx_inline_test.config
+  core_kernel.uuid
+  async_unix
+  async
+  core_kernel
+  core
+  async_kernel
+  core.uuid
+  base.caml
+  sexplib0
+  digestif
+  ;; local libraries
+  mina_ledger
+  with_hash
+  bounded_types
+  blockchain_snark
+  error_json
+  mina_state
+  random_oracle
+  blake2
+  mina_numbers
+  genesis_ledger_helper.lib
+  precomputed_values
+  coda_genesis_ledger
+  mina_runtime_config
+  signature_lib
+  mina_base
+  genesis_constants
+  cache_dir
+  coda_genesis_proof
+  currency
+  data_hash_lib
+  snark_params
+  unsigned_extended
+  consensus
+  pickles
+  logger
+  mina_base.import
+  staged_ledger_diff
+  file_system)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_mina
+   ppx_jane
+   ppx_version
+   ppx_inline_test
+   ppx_let
+   ppx_deriving.std
+   ppx_deriving_yojson
+   ppx_custom_printf)))
diff --git a/src/lib/genesis_ledger_helper/lib/dune b/src/lib/genesis_ledger_helper/lib/dune
index 4bc0630cf1c..d0174ac2975 100644
--- a/src/lib/genesis_ledger_helper/lib/dune
+++ b/src/lib/genesis_ledger_helper/lib/dune
@@ -2,40 +2,49 @@
  (name genesis_ledger_helper_lib)
  (public_name genesis_ledger_helper.lib)
  (libraries
-   ;; opam libraries
-   splittable_random
-   integers
-   core_kernel
-   core
-   sexplib0
-   base64
-   ;; local libraries
-   mina_wire_types
-   mina_base.import
-   random_oracle
-   data_hash_lib
-   pickles
-   pickles_types
-   unsigned_extended
-   bounded_types
-   key_cache.native
-   mina_base
-   mina_runtime_config
-   genesis_constants
-   coda_genesis_proof
-   signature_lib
-   mina_numbers
-   mina_stdlib
-   with_hash
-   currency
-   pickles.backend
-   logger
-   snark_params
-   kimchi_pasta
-   kimchi_pasta.basic
-   ppx_inline_test.config
- )
- (inline_tests (flags -verbose -show-counts))
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_jane ppx_version ppx_inline_test
-                  ppx_let ppx_deriving.std ppx_deriving_yojson ppx_custom_printf)))
+  ;; opam libraries
+  splittable_random
+  integers
+  core_kernel
+  core
+  sexplib0
+  base64
+  ;; local libraries
+  mina_wire_types
+  mina_base.import
+  random_oracle
+  data_hash_lib
+  pickles
+  pickles_types
+  unsigned_extended
+  bounded_types
+  key_cache.native
+  mina_base
+  mina_runtime_config
+  genesis_constants
+  coda_genesis_proof
+  signature_lib
+  mina_numbers
+  mina_stdlib
+  with_hash
+  currency
+  pickles.backend
+  logger
+  snark_params
+  kimchi_pasta
+  kimchi_pasta.basic
+  ppx_inline_test.config)
+ (inline_tests
+  (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_mina
+   ppx_jane
+   ppx_version
+   ppx_inline_test
+   ppx_let
+   ppx_deriving.std
+   ppx_deriving_yojson
+   ppx_custom_printf)))
diff --git a/src/lib/genesis_proof/dune b/src/lib/genesis_proof/dune
index 2a489446f6d..cc05c366085 100644
--- a/src/lib/genesis_proof/dune
+++ b/src/lib/genesis_proof/dune
@@ -2,38 +2,39 @@
  (name genesis_proof)
  (public_name coda_genesis_proof)
  (libraries
-   ;; opam libraries
-   base
-   core_kernel
-   base.md5
-   core
-   async
-   async_kernel
-   ;; local libraries
-   snarky.backendless
-   pickles_types
-   currency
-   pickles
-   consensus
-   mina_runtime_config
-   blockchain_snark
-   mina_base
-   mina_state
-   genesis_constants
-   with_hash
-   coda_genesis_ledger
-   transaction_snark
-   sgn
-   snark_params
-   mina_wire_types
-   sgn_type
-   pickles.backend
-   mina_transaction_logic
-   kimchi_backend
-   mina_numbers
-   block_time
-   kimchi_pasta
-   kimchi_pasta.basic
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_let)))
+  ;; opam libraries
+  base
+  core_kernel
+  base.md5
+  core
+  async
+  async_kernel
+  ;; local libraries
+  snarky.backendless
+  pickles_types
+  currency
+  pickles
+  consensus
+  mina_runtime_config
+  blockchain_snark
+  mina_base
+  mina_state
+  genesis_constants
+  with_hash
+  coda_genesis_ledger
+  transaction_snark
+  sgn
+  snark_params
+  mina_wire_types
+  sgn_type
+  pickles.backend
+  mina_transaction_logic
+  kimchi_backend
+  mina_numbers
+  block_time
+  kimchi_pasta
+  kimchi_pasta.basic)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_let)))
diff --git a/src/lib/global_signer_private_key/dune b/src/lib/global_signer_private_key/dune
index 3f078325808..147da881b1f 100644
--- a/src/lib/global_signer_private_key/dune
+++ b/src/lib/global_signer_private_key/dune
@@ -3,12 +3,14 @@
  (public_name global_signer_private_key)
  (flags :standard -short-paths)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; local libraries
-   snark_params
-   pickles)
+  ;; local libraries
+  snark_params
+  pickles)
  (preprocess
   (pps ppx_version ppx_jane ppx_compare))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "fold types"))
diff --git a/src/lib/gossip_net/dune b/src/lib/gossip_net/dune
index 53de4833839..693beda9574 100644
--- a/src/lib/gossip_net/dune
+++ b/src/lib/gossip_net/dune
@@ -2,48 +2,61 @@
  (name gossip_net)
  (public_name gossip_net)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   uri
-   async.async_rpc
-   async_kernel
-   base
-   base.caml
-   bin_prot.shape
-   async_rpc_kernel
-   async
-   core
-   core_kernel
-   sexplib0
-   cohttp-async
-   async_unix
-   base.base_internalhash_types
-   ppx_hash.runtime-lib
-   integers
-   ;; local libraries
-   ppx_version.runtime
-   network_peer
-   logger
-   pipe_lib
-   trust_system
-   network_pool
-   mina_net2
-   mina_block
-   mina_base
-   mina_transaction
-   perf_histograms
-   o1trace
-   node_addrs_and_ports
-   mina_metrics
-   child_processes
-   error_json
-   block_time
-   genesis_constants
-   bounded_types
-)
+  ;; opam libraries
+  uri
+  async.async_rpc
+  async_kernel
+  base
+  base.caml
+  bin_prot.shape
+  async_rpc_kernel
+  async
+  core
+  core_kernel
+  sexplib0
+  cohttp-async
+  async_unix
+  base.base_internalhash_types
+  ppx_hash.runtime-lib
+  integers
+  ;; local libraries
+  ppx_version.runtime
+  network_peer
+  logger
+  pipe_lib
+  trust_system
+  network_pool
+  mina_net2
+  mina_block
+  mina_base
+  mina_transaction
+  perf_histograms
+  o1trace
+  node_addrs_and_ports
+  mina_metrics
+  child_processes
+  error_json
+  block_time
+  genesis_constants
+  bounded_types)
  (preprocess
-  (pps ppx_mina ppx_version ppx_inline_test ppx_compare ppx_deriving.make ppx_deriving_yojson
-       ppx_here ppx_bin_prot ppx_sexp_conv ppx_fields_conv ppx_let ppx_custom_printf ppx_pipebang))
- (instrumentation (backend bisect_ppx))
+  (pps
+   ppx_mina
+   ppx_version
+   ppx_inline_test
+   ppx_compare
+   ppx_deriving.make
+   ppx_deriving_yojson
+   ppx_here
+   ppx_bin_prot
+   ppx_sexp_conv
+   ppx_fields_conv
+   ppx_let
+   ppx_custom_printf
+   ppx_pipebang))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Gossip Network"))
diff --git a/src/lib/graph_algorithms/dune b/src/lib/graph_algorithms/dune
index 1232c1fd345..22128aab640 100644
--- a/src/lib/graph_algorithms/dune
+++ b/src/lib/graph_algorithms/dune
@@ -1,7 +1,10 @@
 (library
  (name graph_algorithms)
  (public_name graph_algorithms)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries core_kernel ppx_inline_test.config)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_deriving.std ppx_jane)))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_deriving.std ppx_jane)))
diff --git a/src/lib/graphql_basic_scalars/dune b/src/lib/graphql_basic_scalars/dune
index 1b00688370b..421e316c10a 100644
--- a/src/lib/graphql_basic_scalars/dune
+++ b/src/lib/graphql_basic_scalars/dune
@@ -1,26 +1,28 @@
 (library
  (name graphql_basic_scalars)
  (public_name graphql_basic_scalars)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   async
-   async_unix
-   async_kernel
-   core_kernel
-   integers
-   core
-   graphql
-   graphql-async
-   graphql_parser
-   yojson
-   sexplib0
-   ppx_inline_test.config
-   ;; local libraries
-   graphql_wrapper
-   base_quickcheck
-   quickcheck_lib
-   unix
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_version)))
+  ;; opam libraries
+  async
+  async_unix
+  async_kernel
+  core_kernel
+  integers
+  core
+  graphql
+  graphql-async
+  graphql_parser
+  yojson
+  sexplib0
+  ppx_inline_test.config
+  ;; local libraries
+  graphql_wrapper
+  base_quickcheck
+  quickcheck_lib
+  unix)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_version)))
diff --git a/src/lib/graphql_lib/block_time/dune b/src/lib/graphql_lib/block_time/dune
index 081ba08f9fe..e2732fd4ff5 100644
--- a/src/lib/graphql_lib/block_time/dune
+++ b/src/lib/graphql_lib/block_time/dune
@@ -1,21 +1,22 @@
 (library
  (name block_time_graphql)
  (public_name graphql_lib.block_time)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   graphql-async
-   graphql
-   yojson
-   core_kernel
-   core
-   sexplib0
-   ppx_inline_test.config
-   ;; local libraries
-   graphql_basic_scalars
-   block_time
- )
- (preprocess (pps ppx_jane ppx_version))
+  ;; opam libraries
+  graphql-async
+  graphql
+  yojson
+  core_kernel
+  core
+  sexplib0
+  ppx_inline_test.config
+  ;; local libraries
+  graphql_basic_scalars
+  block_time)
+ (preprocess
+  (pps ppx_jane ppx_version))
  (instrumentation
   (backend bisect_ppx))
  (synopsis "Definitions required for graphql implementation"))
diff --git a/src/lib/graphql_lib/consensus/dune b/src/lib/graphql_lib/consensus/dune
index 2b9dce1af3d..64a11a352d4 100644
--- a/src/lib/graphql_lib/consensus/dune
+++ b/src/lib/graphql_lib/consensus/dune
@@ -1,25 +1,27 @@
 (library
  (name consensus_graphql)
  (public_name graphql_lib.consensus)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   graphql-async
-   graphql
-   yojson
-   core_kernel
-   core
-   sexplib0
-   ppx_inline_test.config
-   ;; local libraries
-   graphql_basic_scalars
-   consensus
-   consensus.vrf
-   graphql_lib.currency
-   graphql_lib.mina_base
-   graphql_lib.mina_numbers
-   graphql_lib.signature_lib
- )
- (preprocess (pps ppx_jane ppx_version))
- (instrumentation (backend bisect_ppx))
+  ;; opam libraries
+  graphql-async
+  graphql
+  yojson
+  core_kernel
+  core
+  sexplib0
+  ppx_inline_test.config
+  ;; local libraries
+  graphql_basic_scalars
+  consensus
+  consensus.vrf
+  graphql_lib.currency
+  graphql_lib.mina_base
+  graphql_lib.mina_numbers
+  graphql_lib.signature_lib)
+ (preprocess
+  (pps ppx_jane ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Definitions required for graphql implementation"))
diff --git a/src/lib/graphql_lib/currency/dune b/src/lib/graphql_lib/currency/dune
index 01f67b8125c..16f6b7d6d9a 100644
--- a/src/lib/graphql_lib/currency/dune
+++ b/src/lib/graphql_lib/currency/dune
@@ -1,20 +1,22 @@
 (library
  (name currency_graphql)
  (public_name graphql_lib.currency)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   graphql-async
-   graphql
-   yojson
-   core_kernel
-   core
-   sexplib0
-   ppx_inline_test.config
-   ;; local libraries
-   graphql_basic_scalars
-   currency
- )
- (preprocess (pps ppx_jane ppx_version))
- (instrumentation (backend bisect_ppx))
+  ;; opam libraries
+  graphql-async
+  graphql
+  yojson
+  core_kernel
+  core
+  sexplib0
+  ppx_inline_test.config
+  ;; local libraries
+  graphql_basic_scalars
+  currency)
+ (preprocess
+  (pps ppx_jane ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Unix specific utils for currency types"))
diff --git a/src/lib/graphql_lib/data_hash_lib/dune b/src/lib/graphql_lib/data_hash_lib/dune
index 829b8f7c08a..3fa9906c42a 100644
--- a/src/lib/graphql_lib/data_hash_lib/dune
+++ b/src/lib/graphql_lib/data_hash_lib/dune
@@ -1,7 +1,8 @@
 (library
  (name data_hash_lib_graphql)
  (public_name graphql_lib.data_hash_lib)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
   ;; opam libraries
   graphql-async
diff --git a/src/lib/graphql_lib/dune b/src/lib/graphql_lib/dune
index 5a04bb55bfc..949cb83078a 100644
--- a/src/lib/graphql_lib/dune
+++ b/src/lib/graphql_lib/dune
@@ -1,45 +1,47 @@
 (library
  (name graphql_lib)
  (public_name graphql_lib)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   uri
-   core_kernel
-   integers
-   async
-   cohttp
-   core
-   cohttp-async
-   graphql-async
-   graphql-cohttp
-   graphql
-   graphql_parser
-   async_kernel
-   result
+  ;; opam libraries
+  uri
+  core_kernel
+  integers
+  async
+  cohttp
+  core
+  cohttp-async
+  graphql-async
+  graphql-cohttp
+  graphql
+  graphql_parser
+  async_kernel
+  result
   ;; local libraries
   graphql_wrapper
   (re_export mina_numbers_graphql)
-   mina_numbers
+  mina_numbers
   (re_export currency_graphql)
-   currency
+  currency
   (re_export signature_lib_graphql)
-   signature_lib
+  signature_lib
   (re_export mina_base_graphql)
-   mina_transaction
-   mina_base
+  mina_transaction
+  mina_base
   (re_export block_time_graphql)
-   block_time
+  block_time
   (re_export graphql_basic_scalars)
   (re_export mina_block_graphql)
-   mina_block
+  mina_block
   (re_export filtered_external_transition_graphql)
-   filtered_external_transition
+  filtered_external_transition
   (re_export mina_transaction_graphql)
   (re_export snark_params_graphql)
   (re_export data_hash_lib_graphql)
   (re_export pickles_graphql)
-  (re_export consensus_graphql)
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_version ppx_compare ppx_deriving_yojson)))
+  (re_export consensus_graphql))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_version ppx_compare ppx_deriving_yojson)))
diff --git a/src/lib/graphql_lib/filtered_external_transition/dune b/src/lib/graphql_lib/filtered_external_transition/dune
index e403566d1fe..1cb97318257 100644
--- a/src/lib/graphql_lib/filtered_external_transition/dune
+++ b/src/lib/graphql_lib/filtered_external_transition/dune
@@ -1,21 +1,22 @@
 (library
  (name filtered_external_transition_graphql)
  (public_name graphql_lib.filtered_external_transition)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   graphql-async
-   graphql
-   yojson
-   core_kernel
-   core
-   sexplib0
-   ppx_inline_test.config
-   ;; local libraries
-   graphql_basic_scalars
-   filtered_external_transition
- )
- (preprocess (pps ppx_jane ppx_version))
+  ;; opam libraries
+  graphql-async
+  graphql
+  yojson
+  core_kernel
+  core
+  sexplib0
+  ppx_inline_test.config
+  ;; local libraries
+  graphql_basic_scalars
+  filtered_external_transition)
+ (preprocess
+  (pps ppx_jane ppx_version))
  (instrumentation
   (backend bisect_ppx))
  (synopsis "Definitions required for graphql implementation"))
diff --git a/src/lib/graphql_lib/mina_base/dune b/src/lib/graphql_lib/mina_base/dune
index a5d0e182978..9595a391187 100644
--- a/src/lib/graphql_lib/mina_base/dune
+++ b/src/lib/graphql_lib/mina_base/dune
@@ -1,26 +1,28 @@
 (library
  (name mina_base_graphql)
  (public_name graphql_lib.mina_base)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   graphql-async
-   graphql
-   yojson
-   ppx_inline_test.config
-   core_kernel
-   sexplib0
-   result
-   base
-   ;; local libraries
-   pasta_bindings
-   graphql_basic_scalars
-   mina_base
-   pickles
-   pickles.backend
-   kimchi_pasta
-   kimchi_pasta.basic
- )
- (preprocess (pps ppx_jane ppx_version))
- (instrumentation (backend bisect_ppx))
+  ;; opam libraries
+  graphql-async
+  graphql
+  yojson
+  ppx_inline_test.config
+  core_kernel
+  sexplib0
+  result
+  base
+  ;; local libraries
+  pasta_bindings
+  graphql_basic_scalars
+  mina_base
+  pickles
+  pickles.backend
+  kimchi_pasta
+  kimchi_pasta.basic)
+ (preprocess
+  (pps ppx_jane ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Definitions required for graphql implementation"))
diff --git a/src/lib/graphql_lib/mina_block/dune b/src/lib/graphql_lib/mina_block/dune
index 9717205405a..f8c3c9551bf 100644
--- a/src/lib/graphql_lib/mina_block/dune
+++ b/src/lib/graphql_lib/mina_block/dune
@@ -1,24 +1,25 @@
 (library
  (name mina_block_graphql)
  (public_name graphql_lib.mina_block)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   graphql-async
-   graphql
-   yojson
-   core_kernel
-   core
-   sexplib0
-   ppx_inline_test.config
-   ;; local libraries
-   graphql_basic_scalars
-   mina_block
-   mina_base
-   pickles
-   pickles_types
- )
- (preprocess (pps ppx_jane ppx_version))
+  ;; opam libraries
+  graphql-async
+  graphql
+  yojson
+  core_kernel
+  core
+  sexplib0
+  ppx_inline_test.config
+  ;; local libraries
+  graphql_basic_scalars
+  mina_block
+  mina_base
+  pickles
+  pickles_types)
+ (preprocess
+  (pps ppx_jane ppx_version))
  (instrumentation
   (backend bisect_ppx))
  (synopsis "Definitions required for graphql implementation"))
diff --git a/src/lib/graphql_lib/mina_numbers/dune b/src/lib/graphql_lib/mina_numbers/dune
index 08e6b391d27..842e25b4342 100644
--- a/src/lib/graphql_lib/mina_numbers/dune
+++ b/src/lib/graphql_lib/mina_numbers/dune
@@ -1,21 +1,22 @@
 (library
  (name mina_numbers_graphql)
  (public_name graphql_lib.mina_numbers)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   graphql-async
-   graphql
-   yojson
-   core_kernel
-   core
-   sexplib0
-   ppx_inline_test.config
-   ;; local libraries
-   graphql_basic_scalars
-   mina_numbers
- )
- (preprocess (pps ppx_jane ppx_version))
+  ;; opam libraries
+  graphql-async
+  graphql
+  yojson
+  core_kernel
+  core
+  sexplib0
+  ppx_inline_test.config
+  ;; local libraries
+  graphql_basic_scalars
+  mina_numbers)
+ (preprocess
+  (pps ppx_jane ppx_version))
  (instrumentation
   (backend bisect_ppx))
  (synopsis "Definitions required for graphql implementation"))
diff --git a/src/lib/graphql_lib/pickles/dune b/src/lib/graphql_lib/pickles/dune
index 66010a08d50..1dea8980c55 100644
--- a/src/lib/graphql_lib/pickles/dune
+++ b/src/lib/graphql_lib/pickles/dune
@@ -2,28 +2,29 @@
  (name pickles_graphql)
  (public_name graphql_lib.pickles)
  (flags
-  (:standard
-    -w +a-40..42-44
-    -warn-error +a)
-  -open Core_kernel)
- (inline_tests (flags -verbose -show-counts))
+  (:standard -w +a-40..42-44 -warn-error +a)
+  -open
+  Core_kernel)
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   base
-   core_kernel
-   graphql
-   sexplib0
-   yojson
-   graphql-async
-   ;; local libraries
-   graphql_basic_scalars
-   kimchi_pasta
-   kimchi_pasta.basic
-   mina_base
-   pickles
-   pickles.backend
-   pasta_bindings
- )
- (preprocess (pps ppx_jane ppx_version))
- (instrumentation (backend bisect_ppx))
+  ;; opam libraries
+  base
+  core_kernel
+  graphql
+  sexplib0
+  yojson
+  graphql-async
+  ;; local libraries
+  graphql_basic_scalars
+  kimchi_pasta
+  kimchi_pasta.basic
+  mina_base
+  pickles
+  pickles.backend
+  pasta_bindings)
+ (preprocess
+  (pps ppx_jane ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Definitions required for graphql implementation"))
diff --git a/src/lib/graphql_lib/pickles/test/dune b/src/lib/graphql_lib/pickles/test/dune
index 53a34dcd043..ffa717d4eb4 100644
--- a/src/lib/graphql_lib/pickles/test/dune
+++ b/src/lib/graphql_lib/pickles/test/dune
@@ -2,13 +2,15 @@
  (name test_pickles)
  (flags
   (:standard -warn-error +a)
-  -open Core_kernel
-  -open Pickles_graphql
-  )
+  -open
+  Core_kernel
+  -open
+  Pickles_graphql)
  (package graphql_lib)
- (preprocess (pps ppx_jane))
+ (preprocess
+  (pps ppx_jane))
  (libraries
-   ; opam libraries
+  ; opam libraries
   alcotest
   core_kernel
   sexplib0
@@ -18,6 +20,7 @@
   graphql_basic_scalars
   pasta_bindings
   pickles
-  pickles.backend  
+  pickles.backend
   graphql_lib.pickles)
- (action (run %{test})))
+ (action
+  (run %{test})))
diff --git a/src/lib/graphql_lib/signature_lib/dune b/src/lib/graphql_lib/signature_lib/dune
index 42f556caf18..29a326dfe9a 100644
--- a/src/lib/graphql_lib/signature_lib/dune
+++ b/src/lib/graphql_lib/signature_lib/dune
@@ -1,7 +1,8 @@
 (library
  (name signature_lib_graphql)
  (public_name graphql_lib.signature_lib)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
   ;; opam libraries
   graphql-async
diff --git a/src/lib/graphql_lib/snark_params/dune b/src/lib/graphql_lib/snark_params/dune
index 96dbe356079..4d73dbf92b2 100644
--- a/src/lib/graphql_lib/snark_params/dune
+++ b/src/lib/graphql_lib/snark_params/dune
@@ -1,20 +1,22 @@
 (library
  (name snark_params_graphql)
  (public_name graphql_lib.snark_params)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   graphql-async
-   graphql
-   yojson
-   ppx_inline_test.config
-   core_kernel
-   sexplib0
-   base
-   ;; local libraries
-   graphql_basic_scalars
-   snark_params
- )
- (preprocess (pps ppx_jane ppx_version))
- (instrumentation (backend bisect_ppx))
+  ;; opam libraries
+  graphql-async
+  graphql
+  yojson
+  ppx_inline_test.config
+  core_kernel
+  sexplib0
+  base
+  ;; local libraries
+  graphql_basic_scalars
+  snark_params)
+ (preprocess
+  (pps ppx_jane ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Definitions required for graphql implementation"))
diff --git a/src/lib/graphql_lib/transaction/dune b/src/lib/graphql_lib/transaction/dune
index 62ee13f6ba5..4042dd709d8 100644
--- a/src/lib/graphql_lib/transaction/dune
+++ b/src/lib/graphql_lib/transaction/dune
@@ -1,22 +1,24 @@
 (library
  (name mina_transaction_graphql)
  (public_name graphql_lib.mina_transaction)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   graphql-async
-   graphql
-   yojson
-   core_kernel
-   core
-   sexplib0
-   ppx_inline_test.config
-   ;; local libraries
-   graphql_basic_scalars
-   mina_transaction
-   mina_base
-   genesis_constants
- )
- (preprocess (pps ppx_jane ppx_version))
- (instrumentation (backend bisect_ppx))
+  ;; opam libraries
+  graphql-async
+  graphql
+  yojson
+  core_kernel
+  core
+  sexplib0
+  ppx_inline_test.config
+  ;; local libraries
+  graphql_basic_scalars
+  mina_transaction
+  mina_base
+  genesis_constants)
+ (preprocess
+  (pps ppx_jane ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Definitions required for graphql implementation"))
diff --git a/src/lib/graphql_wrapper/ocaml_graphql_server_tests/dune b/src/lib/graphql_wrapper/ocaml_graphql_server_tests/dune
index c6805448dd3..906f6852ca6 100644
--- a/src/lib/graphql_wrapper/ocaml_graphql_server_tests/dune
+++ b/src/lib/graphql_wrapper/ocaml_graphql_server_tests/dune
@@ -22,6 +22,7 @@
   graphql_parser)
  (instrumentation
   (backend bisect_ppx))
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (preprocess
   (pps ppx_inline_test ppx_assert ppx_version)))
diff --git a/src/lib/hash_prefix_states/dune b/src/lib/hash_prefix_states/dune
index e6814059fda..a501814f29b 100644
--- a/src/lib/hash_prefix_states/dune
+++ b/src/lib/hash_prefix_states/dune
@@ -2,20 +2,28 @@
  (name hash_prefix_states)
  (public_name hash_prefix_states)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   core_kernel
-   base
-   ;; local libraries
-   snark_params
-   random_oracle
-   mina_signature_kind
-   hash_prefixes
-   hash_prefix_create
-   pickles
-   )
+  ;; opam libraries
+  core_kernel
+  base
+  ;; local libraries
+  snark_params
+  random_oracle
+  mina_signature_kind
+  hash_prefixes
+  hash_prefix_create
+  pickles)
  (preprocess
-  (pps ppx_custom_printf ppx_snarky ppx_version ppx_inline_test ppx_compare ppx_deriving_yojson))
- (instrumentation (backend bisect_ppx))
- (synopsis "Values corresponding to the internal state of the Pedersen hash function on the prefixes used in Coda"))
+  (pps
+   ppx_custom_printf
+   ppx_snarky
+   ppx_version
+   ppx_inline_test
+   ppx_compare
+   ppx_deriving_yojson))
+ (instrumentation
+  (backend bisect_ppx))
+ (synopsis
+  "Values corresponding to the internal state of the Pedersen hash function on the prefixes used in Coda"))
diff --git a/src/lib/hash_prefixes/dune b/src/lib/hash_prefixes/dune
index d1c40124621..d35aad8c9ae 100644
--- a/src/lib/hash_prefixes/dune
+++ b/src/lib/hash_prefixes/dune
@@ -2,6 +2,7 @@
  (name hash_prefixes)
  (public_name hash_prefixes)
  (libraries mina_signature_kind)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
-)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version)))
diff --git a/src/lib/hex/dune b/src/lib/hex/dune
index a8c80660c1c..6e7c7bd54cb 100644
--- a/src/lib/hex/dune
+++ b/src/lib/hex/dune
@@ -1,7 +1,10 @@
 (library
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (name hex)
  (public_name hex)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_version ppx_inline_test))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_version ppx_inline_test))
  (libraries core_kernel ppx_inline_test.config))
diff --git a/src/lib/immutable_array/dune b/src/lib/immutable_array/dune
index 5fa8da900ea..af062967a97 100644
--- a/src/lib/immutable_array/dune
+++ b/src/lib/immutable_array/dune
@@ -1,7 +1,9 @@
 (library
  (name immutable_array)
  (public_name immutable_array)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (library_flags -linkall)
  (synopsis "Access only array utility"))
diff --git a/src/lib/integers_stubs_js/dune b/src/lib/integers_stubs_js/dune
index f64f2a244d4..0b4f488533d 100644
--- a/src/lib/integers_stubs_js/dune
+++ b/src/lib/integers_stubs_js/dune
@@ -2,8 +2,9 @@
  (name integers_stubs_js)
  (public_name integers_stubs_js)
  (js_of_ocaml
-  (javascript_files ./runtime.js)
- )
+  (javascript_files ./runtime.js))
  (libraries zarith_stubs_js)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version)))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version)))
diff --git a/src/lib/integers_stubs_js/test/dune b/src/lib/integers_stubs_js/test/dune
index d24ffa0b460..3b793d7ef07 100644
--- a/src/lib/integers_stubs_js/test/dune
+++ b/src/lib/integers_stubs_js/test/dune
@@ -1,7 +1,10 @@
 (executable
  (name test)
  (modes js)
- (js_of_ocaml (flags +nat.js --source-map --pretty))
+ (js_of_ocaml
+  (flags +nat.js --source-map --pretty))
  (libraries integers integers_stubs_js)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version)))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version)))
diff --git a/src/lib/integration_test_lib/dune b/src/lib/integration_test_lib/dune
index 05d36e70f6f..80c47ee740b 100644
--- a/src/lib/integration_test_lib/dune
+++ b/src/lib/integration_test_lib/dune
@@ -1,66 +1,82 @@
 (library
  (public_name integration_test_lib)
  (name integration_test_lib)
- (inline_tests (flags -verbose -show-counts))
- (instrumentation (backend bisect_ppx))
- (preprocessor_deps ../../graphql-ppx-config.inc ../../../graphql_schema.json)
- (preprocess (pps
-    ppx_base ppx_fields_conv ppx_mina ppx_version ppx_let
-    ppx_inline_test ppx_custom_printf ppx_deriving.std ppx_sexp_conv ppx_compare
-    ppx_assert lens.ppx_deriving ppx_pipebang
-    graphql_ppx -- %{read-lines:../../graphql-ppx-config.inc}))
+ (inline_tests
+  (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocessor_deps
+  ../../graphql-ppx-config.inc
+  ../../../graphql_schema.json)
+ (preprocess
+  (pps
+   ppx_base
+   ppx_fields_conv
+   ppx_mina
+   ppx_version
+   ppx_let
+   ppx_inline_test
+   ppx_custom_printf
+   ppx_deriving.std
+   ppx_sexp_conv
+   ppx_compare
+   ppx_assert
+   lens.ppx_deriving
+   ppx_pipebang
+   graphql_ppx
+   --
+   %{read-lines:../../graphql-ppx-config.inc}))
  (libraries
-   ;; opam libraries
-   result
-   base.base_internalhash_types
-   base.caml
-   base
-   uri
-   sexplib0
-   cmdliner
-   async
-   core
-   lens
-   core_kernel
-   async_kernel
-   ppx_inline_test.config
-   async_unix
-   stdio
-   sexp_diff_kernel
-   ;; local libraries
-   key_gen
-   visualization
-   timeout_lib
-   pipe_lib
-   mina_networking
-   logger
-   graph_algorithms
-   block_producer
-   transition_frontier
-   mina_runtime_config
-   mina_base
-   mina_lib
-   bounded_types
-   genesis_constants
-   transition_router
-   signature_lib
-   secrets
-   network_pool
-   currency
-   mina_base.import
-   mina_numbers
-   mina_transaction
-   pickles
-   pickles_types
-   with_hash
-   data_hash_lib
-   generated_graphql_queries
-   mina_graphql
-   graphql_lib
-   integers
-   transition_handler
-   snark_worker
-   one_or_two
-   error_json
-   mina_compile_config
-))
+  ;; opam libraries
+  result
+  base.base_internalhash_types
+  base.caml
+  base
+  uri
+  sexplib0
+  cmdliner
+  async
+  core
+  lens
+  core_kernel
+  async_kernel
+  ppx_inline_test.config
+  async_unix
+  stdio
+  sexp_diff_kernel
+  ;; local libraries
+  key_gen
+  visualization
+  timeout_lib
+  pipe_lib
+  mina_networking
+  logger
+  graph_algorithms
+  block_producer
+  transition_frontier
+  mina_runtime_config
+  mina_base
+  mina_lib
+  bounded_types
+  genesis_constants
+  transition_router
+  signature_lib
+  secrets
+  network_pool
+  currency
+  mina_base.import
+  mina_numbers
+  mina_transaction
+  pickles
+  pickles_types
+  with_hash
+  data_hash_lib
+  generated_graphql_queries
+  mina_graphql
+  graphql_lib
+  integers
+  transition_handler
+  snark_worker
+  one_or_two
+  error_json
+  mina_compile_config))
diff --git a/src/lib/internal_tracing/context_call/dune b/src/lib/internal_tracing/context_call/dune
index 950f9d8fb8c..6d6a866c256 100644
--- a/src/lib/internal_tracing/context_call/dune
+++ b/src/lib/internal_tracing/context_call/dune
@@ -2,7 +2,8 @@
  (name internal_tracing_context_call)
  (public_name internal_tracing.context_call)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
   ;; opam libraries
   base.base_internalhash_types
diff --git a/src/lib/internal_tracing/dune b/src/lib/internal_tracing/dune
index f580ce4aeaf..5d165a55cc4 100644
--- a/src/lib/internal_tracing/dune
+++ b/src/lib/internal_tracing/dune
@@ -2,7 +2,8 @@
  (name internal_tracing)
  (public_name internal_tracing)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
   ;; opam libraries
   base.base_internalhash_types
@@ -16,8 +17,7 @@
   mina_base
   mina_numbers
   internal_tracing.context_call
-  logger.context_logger
-  )
+  logger.context_logger)
  (preprocess
   (pps ppx_jane ppx_mina ppx_version ppx_deriving_yojson))
  (instrumentation
diff --git a/src/lib/interruptible/dune b/src/lib/interruptible/dune
index cbdb342f05b..a6543cd3a11 100644
--- a/src/lib/interruptible/dune
+++ b/src/lib/interruptible/dune
@@ -2,16 +2,18 @@
  (name interruptible)
  (public_name interruptible)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   core_kernel
-   async_kernel
-   ppx_inline_test.config
-   ;; local libraries
-   run_in_thread
-   )
+  ;; opam libraries
+  core_kernel
+  async_kernel
+  ppx_inline_test.config
+  ;; local libraries
+  run_in_thread)
  (preprocess
   (pps ppx_version ppx_jane ppx_deriving.std))
- (instrumentation (backend bisect_ppx))
- (synopsis "Interruptible monad (deferreds, that can be triggered to cancel)"))
+ (instrumentation
+  (backend bisect_ppx))
+ (synopsis
+  "Interruptible monad (deferreds, that can be triggered to cancel)"))
diff --git a/src/lib/itn_crypto/dune b/src/lib/itn_crypto/dune
index 184c4fa4ad6..1ed31b65f43 100644
--- a/src/lib/itn_crypto/dune
+++ b/src/lib/itn_crypto/dune
@@ -1,19 +1,20 @@
 (library
  (name itn_crypto)
  (public_name itn_crypto)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   core_kernel
-   base64
-   cstruct
-   mirage-crypto-ec
-   mirage-crypto-rng
-   mirage-crypto-rng-async
-   ppx_inline_test.config
-   ;; local libraries
-   codable
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_version ppx_inline_test)))
-
+  ;; opam libraries
+  core_kernel
+  base64
+  cstruct
+  mirage-crypto-ec
+  mirage-crypto-rng
+  mirage-crypto-rng-async
+  ppx_inline_test.config
+  ;; local libraries
+  codable)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_version ppx_inline_test)))
diff --git a/src/lib/itn_logger/dune b/src/lib/itn_logger/dune
index 6f9c8936a26..6522e1b6fdf 100644
--- a/src/lib/itn_logger/dune
+++ b/src/lib/itn_logger/dune
@@ -2,18 +2,19 @@
  (name itn_logger)
  (public_name itn_logger)
  (libraries
-   ;; opam libraries
-   base
-   base.caml
-   bin_prot.shape
-   async
-   async.async_rpc
-   async_kernel
-   async_rpc_kernel
-   async_unix
-   core
-   core_kernel
-   yojson
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_mina ppx_jane)))
+  ;; opam libraries
+  base
+  base.caml
+  bin_prot.shape
+  async
+  async.async_rpc
+  async_kernel
+  async_rpc_kernel
+  async_unix
+  core
+  core_kernel
+  yojson)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_mina ppx_jane)))
diff --git a/src/lib/key_cache/async/dune b/src/lib/key_cache/async/dune
index d0e0fcb3de7..942c6400677 100644
--- a/src/lib/key_cache/async/dune
+++ b/src/lib/key_cache/async/dune
@@ -2,17 +2,18 @@
  (public_name key_cache.async)
  (name key_cache_async)
  (libraries
-   ;; opam libraries
-   async
-   core
-   async_kernel
-   async_unix
-   core_kernel
-   base
-   base.caml
-   ;; local libraries
-   key_cache
-   logger
-   )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_base ppx_here ppx_let)))
+  ;; opam libraries
+  async
+  core
+  async_kernel
+  async_unix
+  core_kernel
+  base
+  base.caml
+  ;; local libraries
+  key_cache
+  logger)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_version ppx_base ppx_here ppx_let)))
diff --git a/src/lib/key_cache/dune b/src/lib/key_cache/dune
index ab8a598ed75..4cd71cbee1b 100644
--- a/src/lib/key_cache/dune
+++ b/src/lib/key_cache/dune
@@ -2,5 +2,7 @@
  (name key_cache)
  (public_name key_cache)
  (libraries core_kernel async_kernel)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version)))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version)))
diff --git a/src/lib/key_cache/native/dune b/src/lib/key_cache/native/dune
index 02840a62d30..a1bb6305120 100644
--- a/src/lib/key_cache/native/dune
+++ b/src/lib/key_cache/native/dune
@@ -2,5 +2,7 @@
  (public_name key_cache.native)
  (name key_cache_native)
  (libraries key_cache key_cache.async key_cache.sync)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version)))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version)))
diff --git a/src/lib/key_cache/sync/dune b/src/lib/key_cache/sync/dune
index ed7ab2b48ce..3a8533a27c2 100644
--- a/src/lib/key_cache/sync/dune
+++ b/src/lib/key_cache/sync/dune
@@ -2,15 +2,16 @@
  (public_name key_cache.sync)
  (name key_cache_sync)
  (libraries
-   ;; opam libraries
-   async
-   core
-   core_kernel
-   base
-   stdio
-   ;; local libraries
-   key_cache
-   logger
-   )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_base ppx_here ppx_let)))
+  ;; opam libraries
+  async
+  core
+  core_kernel
+  base
+  stdio
+  ;; local libraries
+  key_cache
+  logger)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_version ppx_base ppx_here ppx_let)))
diff --git a/src/lib/key_gen/dune b/src/lib/key_gen/dune
index 31fbedc41c0..15c61a2c560 100644
--- a/src/lib/key_gen/dune
+++ b/src/lib/key_gen/dune
@@ -1,6 +1,8 @@
 (library
  (name key_gen)
  (public_name key_gen)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
- (libraries core_kernel signature_lib base))
\ No newline at end of file
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
+ (libraries core_kernel signature_lib base))
diff --git a/src/lib/key_value_database/dune b/src/lib/key_value_database/dune
index 13029f74fae..863255370c2 100644
--- a/src/lib/key_value_database/dune
+++ b/src/lib/key_value_database/dune
@@ -3,6 +3,8 @@
  (public_name key_value_database)
  (library_flags (-linkall))
  (libraries core_kernel sexplib0)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane))
  (synopsis "Collection of key-value databases used in Coda"))
diff --git a/src/lib/ledger_catchup/dune b/src/lib/ledger_catchup/dune
index 33dfe192fe8..00c9e946f44 100644
--- a/src/lib/ledger_catchup/dune
+++ b/src/lib/ledger_catchup/dune
@@ -1,71 +1,73 @@
 (library
  (name ledger_catchup)
  (public_name ledger_catchup)
- (inline_tests (flags -verbose -show-counts))
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_jane))
+ (inline_tests
+  (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_version ppx_jane))
  (libraries
-   ;; opam libraries
-   integers
-   base.base_internalhash_types
-   async
-   core
-   core_kernel
-   ocamlgraph
-   async_kernel
-   sexplib0
-   ppx_inline_test.config
-   async_unix
-   ;; local libraries
-   bounded_types
-   mina_wire_types
-   genesis_constants
-   mina_base.import
-   pickles.backend
-   one_or_two
-   transition_frontier_extensions
-   child_processes
-   block_time
-   unsigned_extended
-   downloader
-   mina_state
-   protocol_version
-   verifier
-   with_hash
-   data_hash_lib
-   precomputed_values
-   mina_numbers
-   mina_networking
-   mina_metrics
-   pipe_lib
-   transition_handler
-   mina_stdlib
-   transition_frontier
-   consensus
-   mina_base
-   transition_chain_verifier
-   fake_network
-   mina_block
-   proof_carrying_data
-   cache_lib
-   network_peer
-   logger
-   trust_system
-   truth
-   error_json
-   rose_tree
-   transition_frontier_base
-   network_pool
-   staged_ledger_diff
-   gadt_lib
-   transaction_snark_work
-   pickles
-   snark_params
-   kimchi_pasta
-   kimchi_pasta.basic
-   o1trace
-   mina_net2
-   internal_tracing
-   mina_runtime_config
-   mina_compile_config
-))
+  ;; opam libraries
+  integers
+  base.base_internalhash_types
+  async
+  core
+  core_kernel
+  ocamlgraph
+  async_kernel
+  sexplib0
+  ppx_inline_test.config
+  async_unix
+  ;; local libraries
+  bounded_types
+  mina_wire_types
+  genesis_constants
+  mina_base.import
+  pickles.backend
+  one_or_two
+  transition_frontier_extensions
+  child_processes
+  block_time
+  unsigned_extended
+  downloader
+  mina_state
+  protocol_version
+  verifier
+  with_hash
+  data_hash_lib
+  precomputed_values
+  mina_numbers
+  mina_networking
+  mina_metrics
+  pipe_lib
+  transition_handler
+  mina_stdlib
+  transition_frontier
+  consensus
+  mina_base
+  transition_chain_verifier
+  fake_network
+  mina_block
+  proof_carrying_data
+  cache_lib
+  network_peer
+  logger
+  trust_system
+  truth
+  error_json
+  rose_tree
+  transition_frontier_base
+  network_pool
+  staged_ledger_diff
+  gadt_lib
+  transaction_snark_work
+  pickles
+  snark_params
+  kimchi_pasta
+  kimchi_pasta.basic
+  o1trace
+  mina_net2
+  internal_tracing
+  mina_runtime_config
+  mina_compile_config))
diff --git a/src/lib/ledger_proof/dune b/src/lib/ledger_proof/dune
index cea1cde8a85..48394d09618 100644
--- a/src/lib/ledger_proof/dune
+++ b/src/lib/ledger_proof/dune
@@ -2,18 +2,25 @@
  (name ledger_proof)
  (public_name ledger_proof)
  (libraries
-   ;; opam libraries
-   base
-   sexplib0
-   core_kernel
-   bin_prot.shape
-   base.caml
-   ;; local libraries
-   transaction_snark
-   mina_base
-   mina_state
-   mina_transaction_logic
-   ppx_version.runtime
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_bin_prot ppx_sexp_conv ppx_hash ppx_compare ppx_version ppx_deriving_yojson)))
+  ;; opam libraries
+  base
+  sexplib0
+  core_kernel
+  bin_prot.shape
+  base.caml
+  ;; local libraries
+  transaction_snark
+  mina_base
+  mina_state
+  mina_transaction_logic
+  ppx_version.runtime)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_bin_prot
+   ppx_sexp_conv
+   ppx_hash
+   ppx_compare
+   ppx_version
+   ppx_deriving_yojson)))
diff --git a/src/lib/linked_tree/dune b/src/lib/linked_tree/dune
index 181fa8705cb..eba95d1ea6d 100644
--- a/src/lib/linked_tree/dune
+++ b/src/lib/linked_tree/dune
@@ -1,9 +1,8 @@
 (library
  (name linked_tree)
  (public_name linked_tree)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane ppx_compare))
- (libraries
-   core_kernel
-   mina_numbers
-))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane ppx_compare))
+ (libraries core_kernel mina_numbers))
diff --git a/src/lib/lmdb_storage/dune b/src/lib/lmdb_storage/dune
index 66429313a10..1960b383a5a 100644
--- a/src/lib/lmdb_storage/dune
+++ b/src/lib/lmdb_storage/dune
@@ -2,12 +2,20 @@
  (name lmdb_storage)
  (public_name lmdb_storage)
  (libraries
-   ;; opam libraries
-   lmdb
-   ;; local libraries
-   file_system
-   blake2
-   )
- (inline_tests (flags -verbose -show-counts))
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_jane ppx_deriving.std ppx_let ppx_deriving_yojson)))
+  ;; opam libraries
+  lmdb
+  ;; local libraries
+  file_system
+  blake2)
+ (inline_tests
+  (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_mina
+   ppx_version
+   ppx_jane
+   ppx_deriving.std
+   ppx_let
+   ppx_deriving_yojson)))
diff --git a/src/lib/logger/context_logger/dune b/src/lib/logger/context_logger/dune
index 8b61d1756b9..53175f54f93 100644
--- a/src/lib/logger/context_logger/dune
+++ b/src/lib/logger/context_logger/dune
@@ -2,7 +2,8 @@
  (name context_logger)
  (public_name logger.context_logger)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
   ;; opam libraries
   base.base_internalhash_types
@@ -15,4 +16,5 @@
   (pps ppx_jane ppx_mina ppx_version ppx_deriving_yojson))
  (instrumentation
   (backend bisect_ppx))
- (synopsis "Context logger: useful for passing logger down the deep callstacks"))
+ (synopsis
+  "Context logger: useful for passing logger down the deep callstacks"))
diff --git a/src/lib/logger/dune b/src/lib/logger/dune
index e7bd69404a0..67e655385a3 100644
--- a/src/lib/logger/dune
+++ b/src/lib/logger/dune
@@ -2,13 +2,14 @@
  (public_name logger)
  (name logger)
  (libraries
-   ;; opam libraries
-   core_kernel
-   sexplib0
-   ;; local libraries
-   interpolator_lib
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_mina ppx_jane ppx_deriving_yojson ppx_deriving.std))
+  ;; opam libraries
+  core_kernel
+  sexplib0
+  ;; local libraries
+  interpolator_lib)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_mina ppx_jane ppx_deriving_yojson ppx_deriving.std))
  (virtual_modules logger)
  (default_implementation logger.native))
diff --git a/src/lib/logger/fake/dune b/src/lib/logger/fake/dune
index f370d1f2c9c..8df61548e9b 100644
--- a/src/lib/logger/fake/dune
+++ b/src/lib/logger/fake/dune
@@ -2,19 +2,19 @@
  (public_name logger.fake)
  (name logger_fake)
  (libraries
-   ;; opam libraries
-   result
-   core_kernel
-   sexplib0
-   bin_prot.shape
-   base.caml
-   base.base_internalhash_types
-   ;; local libraries
-   interpolator_lib
-   ppx_version.runtime
-   bounded_types
- )
- (instrumentation (backend bisect_ppx))
+  ;; opam libraries
+  result
+  core_kernel
+  sexplib0
+  bin_prot.shape
+  base.caml
+  base.base_internalhash_types
+  ;; local libraries
+  interpolator_lib
+  ppx_version.runtime
+  bounded_types)
+ (instrumentation
+  (backend bisect_ppx))
  (preprocess
   (pps ppx_version ppx_mina ppx_jane ppx_deriving.std ppx_deriving_yojson))
  (implements logger)
diff --git a/src/lib/logger/file_system/dune b/src/lib/logger/file_system/dune
index 19a8968dbdd..3e44dbcba78 100644
--- a/src/lib/logger/file_system/dune
+++ b/src/lib/logger/file_system/dune
@@ -2,9 +2,11 @@
  (name logger_file_system)
  (public_name logger.file_system)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries core yojson logger core_kernel)
  (preprocess
   (pps ppx_version ppx_mina ppx_jane ppx_deriving.std ppx_deriving_yojson))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Logging library"))
diff --git a/src/lib/logger/native/dune b/src/lib/logger/native/dune
index 24f193060dc..a531e0abd5f 100644
--- a/src/lib/logger/native/dune
+++ b/src/lib/logger/native/dune
@@ -2,24 +2,25 @@
  (name logger_native)
  (public_name logger.native)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   result
-   core
-   core_kernel
-   sexplib0
-   bin_prot.shape
-   base.caml
-   base.base_internalhash_types
-   ;; local libraries
-   itn_logger
-   interpolator_lib
-   ppx_version.runtime
-   bounded_types
- )
+  ;; opam libraries
+  result
+  core
+  core_kernel
+  sexplib0
+  bin_prot.shape
+  base.caml
+  base.base_internalhash_types
+  ;; local libraries
+  itn_logger
+  interpolator_lib
+  ppx_version.runtime
+  bounded_types)
  (preprocess
   (pps ppx_version ppx_mina ppx_jane ppx_deriving.std ppx_deriving_yojson))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (implements logger)
  (synopsis "Logging library"))
diff --git a/src/lib/logger/test/dune b/src/lib/logger/test/dune
index 967bec7e7fa..77b73050135 100644
--- a/src/lib/logger/test/dune
+++ b/src/lib/logger/test/dune
@@ -1,16 +1,17 @@
 (library
  (name logger_test)
  (libraries
-   ;; opam libraries 
-   ppx_inline_test.config
-   core
-   async
-   core_kernel
-   ;; local libraries
-   logger
-   logger.file_system
- )
- (inline_tests (flags -verbose -show-counts))
+  ;; opam libraries 
+  ppx_inline_test.config
+  core
+  async
+  core_kernel
+  ;; local libraries
+  logger
+  logger.file_system)
+ (inline_tests
+  (flags -verbose -show-counts))
  (preprocess
   (pps ppx_version ppx_mina ppx_jane ppx_deriving.std ppx_deriving_yojson))
- (instrumentation (backend bisect_ppx)))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/logproc_lib/dune b/src/lib/logproc_lib/dune
index 550db41f297..3db6c3dcdde 100644
--- a/src/lib/logproc_lib/dune
+++ b/src/lib/logproc_lib/dune
@@ -3,33 +3,39 @@
  (public_name logproc_lib)
  (modules logproc_lib filter)
  (libraries
-   ;; opam libraries
-   core_kernel
-   yojson
-   angstrom
-   re2
-   ppx_inline_test.config
-   ;; local libraries
-   interpolator_lib
-)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane ppx_deriving.std))
- (inline_tests (flags -verbose -show-counts)))
+  ;; opam libraries
+  core_kernel
+  yojson
+  angstrom
+  re2
+  ppx_inline_test.config
+  ;; local libraries
+  interpolator_lib)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane ppx_deriving.std))
+ (inline_tests
+  (flags -verbose -show-counts)))
 
 ;; interpolator is made separately available because
 ;; filter depends on re2, which binds to C++ code,
 ;; making it unusable from js_of_ocaml
+
 (library
  (name interpolator_lib)
  (public_name interpolator_lib)
  (modules interpolator)
  (libraries
-   ;; opam libraries
-   core_kernel
-   yojson
-   angstrom
-   ;; local libraries
-)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane ppx_deriving.std))
- (inline_tests (flags -verbose -show-counts)))
+  ;; opam libraries
+  core_kernel
+  yojson
+  angstrom
+  ;; local libraries
+  )
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane ppx_deriving.std))
+ (inline_tests
+  (flags -verbose -show-counts)))
diff --git a/src/lib/merkle_address/dune b/src/lib/merkle_address/dune
index 0ef792ec731..2696ee48b55 100644
--- a/src/lib/merkle_address/dune
+++ b/src/lib/merkle_address/dune
@@ -2,8 +2,9 @@
  (name merkle_address)
  (public_name merkle_address)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
-(libraries
+ (inline_tests
+  (flags -verbose -show-counts))
+ (libraries
   ;; opam libraries
   base.base_internalhash_types
   bin_prot.shape
@@ -18,7 +19,14 @@
   bounded_types
   test_util)
  (preprocess
-  (pps ppx_mina ppx_version ppx_jane ppx_hash ppx_compare ppx_deriving_yojson
-       ppx_bitstring))
- (instrumentation (backend bisect_ppx))
+  (pps
+   ppx_mina
+   ppx_version
+   ppx_jane
+   ppx_hash
+   ppx_compare
+   ppx_deriving_yojson
+   ppx_bitstring))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Address for merkle database representations"))
diff --git a/src/lib/merkle_ledger/dune b/src/lib/merkle_ledger/dune
index 674f9feb690..c762e732bae 100644
--- a/src/lib/merkle_ledger/dune
+++ b/src/lib/merkle_ledger/dune
@@ -13,10 +13,9 @@
   ; 44: open-shadow-identifier (operation overloading is common in the codebase)
   (:standard -w +a-40..42-44 -warn-error +a-70 -open Core_kernel))
  (library_flags -linkall)
- (modules_without_implementation
-   location_intf)
+ (modules_without_implementation location_intf)
  (libraries
-   ;; opam libraries
+  ;; opam libraries
   async
   async_kernel
   async_unix
@@ -41,9 +40,15 @@
   merkle_address
   mina_stdlib
   ppx_version.runtime
-  visualization
-  )
+  visualization)
  (preprocess
-  (pps ppx_mina ppx_version ppx_jane ppx_compare ppx_deriving.show ppx_deriving_yojson))
- (instrumentation (backend bisect_ppx))
+  (pps
+   ppx_mina
+   ppx_version
+   ppx_jane
+   ppx_compare
+   ppx_deriving.show
+   ppx_deriving_yojson))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Implementation of different account databases"))
diff --git a/src/lib/merkle_ledger_tests/dune b/src/lib/merkle_ledger_tests/dune
index d7be98a9159..a12ba03f482 100644
--- a/src/lib/merkle_ledger_tests/dune
+++ b/src/lib/merkle_ledger_tests/dune
@@ -4,38 +4,46 @@
  (library_flags -linkall)
  (flags
   (:standard -warn-error +a)
-   -open Core_kernel )
- (preprocess (pps ppx_version ppx_jane ppx_compare ppx_deriving.show ppx_deriving_yojson))
+  -open
+  Core_kernel)
+ (preprocess
+  (pps
+   ppx_version
+   ppx_jane
+   ppx_compare
+   ppx_deriving.show
+   ppx_deriving_yojson))
  (libraries
-   ; Opam
-   alcotest
-   async
-   async_kernel
-   async_unix
-   base.base_internalhash_types
-   base.caml
-   bin_prot.shape
-   core
-   core.uuid
-   core_kernel
-   core_kernel.uuid
-   result
-   sexplib0
-   ; Mina
-   base58_check
-   bounded_types
-   codable
-   currency
-   data_hash_lib
-   direction
-   key_value_database
-   merkle_address
-   merkle_ledger
-   merkle_mask
-   mina_base
-   mina_base.import
-   mina_numbers
-   mina_stdlib
-   ppx_version.runtime
-   signature_lib )
- (instrumentation (backend bisect_ppx)) )
\ No newline at end of file
+  ; Opam
+  alcotest
+  async
+  async_kernel
+  async_unix
+  base.base_internalhash_types
+  base.caml
+  bin_prot.shape
+  core
+  core.uuid
+  core_kernel
+  core_kernel.uuid
+  result
+  sexplib0
+  ; Mina
+  base58_check
+  bounded_types
+  codable
+  currency
+  data_hash_lib
+  direction
+  key_value_database
+  merkle_address
+  merkle_ledger
+  merkle_mask
+  mina_base
+  mina_base.import
+  mina_numbers
+  mina_stdlib
+  ppx_version.runtime
+  signature_lib)
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/merkle_ledger_tests/test/dune b/src/lib/merkle_ledger_tests/test/dune
index c3582ef418e..5db9c08df22 100644
--- a/src/lib/merkle_ledger_tests/test/dune
+++ b/src/lib/merkle_ledger_tests/test/dune
@@ -2,10 +2,10 @@
  (names main)
  (flags
   (:standard -warn-error +a)
-   -open Merkle_ledger_tests )
- (libraries
-   alcotest
-   merkle_ledger_tests )
- (action (run %{test}))
- (instrumentation (backend bisect_ppx))
- )
+  -open
+  Merkle_ledger_tests)
+ (libraries alcotest merkle_ledger_tests)
+ (action
+  (run %{test}))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/merkle_list_prover/dune b/src/lib/merkle_list_prover/dune
index ceeb3f09d0b..0c6978b5ffc 100644
--- a/src/lib/merkle_list_prover/dune
+++ b/src/lib/merkle_list_prover/dune
@@ -1,6 +1,8 @@
 (library
  (name merkle_list_prover)
  (public_name merkle_list_prover)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane))
  (libraries core_kernel))
diff --git a/src/lib/merkle_list_verifier/dune b/src/lib/merkle_list_verifier/dune
index f83cf4e7bf1..51e4257b6e9 100644
--- a/src/lib/merkle_list_verifier/dune
+++ b/src/lib/merkle_list_verifier/dune
@@ -1,6 +1,8 @@
 (library
  (name merkle_list_verifier)
  (public_name merkle_list_verifier)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane ppx_compare))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane ppx_compare))
  (libraries core_kernel mina_stdlib))
diff --git a/src/lib/merkle_mask/dune b/src/lib/merkle_mask/dune
index 7580ff1671d..8656338c71f 100644
--- a/src/lib/merkle_mask/dune
+++ b/src/lib/merkle_mask/dune
@@ -14,12 +14,12 @@
   (:standard -w +a-40..42-44 -warn-error +a))
  (library_flags -linkall)
  (modules_without_implementation
-   base_merkle_tree_intf
-   inputs_intf
-   maskable_merkle_tree_intf
-   masking_merkle_tree_intf)
+  base_merkle_tree_intf
+  inputs_intf
+  maskable_merkle_tree_intf
+  masking_merkle_tree_intf)
  (libraries
-   ;; opam libraries
+  ;; opam libraries
   async
   async_kernel
   base.base_internalhash_types
@@ -40,8 +40,7 @@
   logger
   merkle_ledger
   mina_stdlib
-  visualization
-  )
+  visualization)
  (preprocess
   (pps
    ppx_compare
@@ -49,7 +48,7 @@
    ppx_deriving_yojson
    ppx_jane
    ppx_mina
-   ppx_version
-   ))
- (instrumentation (backend bisect_ppx))
+   ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Implementation of Merkle tree masks"))
diff --git a/src/lib/mina_base/dune b/src/lib/mina_base/dune
index 5324ac38daf..2ba12ac2de8 100644
--- a/src/lib/mina_base/dune
+++ b/src/lib/mina_base/dune
@@ -1,84 +1,105 @@
 (library
  (name mina_base)
  (public_name mina_base)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (library_flags -linkall)
  (libraries
-   ;; opam libraries
-   async_kernel
-   result
-   bin_prot.shape
-   ppx_inline_test.config
-   sexplib0
-   yojson
-   digestif
-   sexp_diff_kernel
-   core_kernel
-   base.caml
-   base
-   base.base_internalhash_types
-   integers
-   base_quickcheck
-   base_quickcheck.ppx_quickcheck
-   core_kernel.uuid
-   ;; local libraries
-   protocol_version
-   mina_wire_types
-   run_in_thread
-   kimchi_backend_common
-   kimchi_pasta
-   kimchi_pasta.basic
-   mina_base.import
-   sgn
-   sgn_type
-   pickles_types
-   blake2
-   pickles
-   sparse_ledger_lib
-   snark_params
-   signature_lib
-   bounded_types
-   rosetta_coding
-   random_oracle
-   hash_prefix_states
-   hash_prefix_create
-   dummy_values
-   currency
-   mina_numbers
-   genesis_constants
-   block_time
-   base58_check
-   bignum_bigint
-   codable
-   crypto_params
-   debug_assert
-   fold_lib
-   fields_derivers.zkapps
-   fields_derivers.json
-   fields_derivers.graphql
-   one_or_two
-   outside_hash_image
-   quickcheck_lib
-   snarky.backendless
-   test_util
-   unsigned_extended
-   with_hash
-   random_oracle_input
-   data_hash_lib
-   pickles.backend
-   mina_signature_kind
-   mina_base.util
-   kimchi_backend
-   hex
-   snark_bits
-   error_json
-   ppx_version.runtime
-   mina_compile_config
- )
+  ;; opam libraries
+  async_kernel
+  result
+  bin_prot.shape
+  ppx_inline_test.config
+  sexplib0
+  yojson
+  digestif
+  sexp_diff_kernel
+  core_kernel
+  base.caml
+  base
+  base.base_internalhash_types
+  integers
+  base_quickcheck
+  base_quickcheck.ppx_quickcheck
+  core_kernel.uuid
+  ;; local libraries
+  protocol_version
+  mina_wire_types
+  run_in_thread
+  kimchi_backend_common
+  kimchi_pasta
+  kimchi_pasta.basic
+  mina_base.import
+  sgn
+  sgn_type
+  pickles_types
+  blake2
+  pickles
+  sparse_ledger_lib
+  snark_params
+  signature_lib
+  bounded_types
+  rosetta_coding
+  random_oracle
+  hash_prefix_states
+  hash_prefix_create
+  dummy_values
+  currency
+  mina_numbers
+  genesis_constants
+  block_time
+  base58_check
+  bignum_bigint
+  codable
+  crypto_params
+  debug_assert
+  fold_lib
+  fields_derivers.zkapps
+  fields_derivers.json
+  fields_derivers.graphql
+  one_or_two
+  outside_hash_image
+  quickcheck_lib
+  snarky.backendless
+  test_util
+  unsigned_extended
+  with_hash
+  random_oracle_input
+  data_hash_lib
+  pickles.backend
+  mina_signature_kind
+  mina_base.util
+  kimchi_backend
+  hex
+  snark_bits
+  error_json
+  ppx_version.runtime
+  mina_compile_config)
  (preprocess
-  (pps ppx_annot ppx_snarky ppx_here ppx_mina ppx_version ppx_compare ppx_deriving.enum ppx_deriving.ord ppx_deriving.make
-       ppx_base base_quickcheck.ppx_quickcheck ppx_bench ppx_let ppx_sexp_conv ppx_bin_prot ppx_fields_conv ppx_custom_printf ppx_assert ppx_deriving_yojson ppx_inline_test h_list.ppx
-       ppx_variants_conv ppx_pipebang
- ))
- (instrumentation (backend bisect_ppx))
+  (pps
+   ppx_annot
+   ppx_snarky
+   ppx_here
+   ppx_mina
+   ppx_version
+   ppx_compare
+   ppx_deriving.enum
+   ppx_deriving.ord
+   ppx_deriving.make
+   ppx_base
+   base_quickcheck.ppx_quickcheck
+   ppx_bench
+   ppx_let
+   ppx_sexp_conv
+   ppx_bin_prot
+   ppx_fields_conv
+   ppx_custom_printf
+   ppx_assert
+   ppx_deriving_yojson
+   ppx_inline_test
+   h_list.ppx
+   ppx_variants_conv
+   ppx_pipebang))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Snarks and friends necessary for keypair generation"))
diff --git a/src/lib/mina_base/import/dune b/src/lib/mina_base/import/dune
index ef40c70aeb6..802f711cdd8 100644
--- a/src/lib/mina_base/import/dune
+++ b/src/lib/mina_base/import/dune
@@ -2,7 +2,7 @@
  (public_name mina_base.import)
  (name mina_base_import)
  (libraries signature_lib)
- (preprocess (pps
-    ppx_version
-    ))
- (instrumentation (backend bisect_ppx)))
+ (preprocess
+  (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/mina_base/test/dune b/src/lib/mina_base/test/dune
index 62125958edc..b7e0da2975d 100644
--- a/src/lib/mina_base/test/dune
+++ b/src/lib/mina_base/test/dune
@@ -37,10 +37,6 @@
   snark_params
   with_hash)
  (preprocess
-  (pps
-   ppx_base
-   ppx_let
-   ppx_assert))
+  (pps ppx_base ppx_let ppx_assert))
  (instrumentation
   (backend bisect_ppx)))
-
diff --git a/src/lib/mina_base/test/fee_excess/dune b/src/lib/mina_base/test/fee_excess/dune
index 3e5090e7cb4..3680abf60b6 100644
--- a/src/lib/mina_base/test/fee_excess/dune
+++ b/src/lib/mina_base/test/fee_excess/dune
@@ -21,10 +21,6 @@
   snarky.backendless
   test_util)
  (preprocess
-  (pps
-   ppx_base
-   ppx_let
-   ppx_assert))
+  (pps ppx_base ppx_let ppx_assert))
  (instrumentation
   (backend bisect_ppx)))
-
diff --git a/src/lib/mina_base/util/dune b/src/lib/mina_base/util/dune
index 2c97914e507..09026dc377d 100644
--- a/src/lib/mina_base/util/dune
+++ b/src/lib/mina_base/util/dune
@@ -2,13 +2,12 @@
  (name mina_base_util)
  (public_name mina_base.util)
  (libraries
-   ;; opam libraries
-   core_kernel
-   ;; local libraries
-   snark_params
-   bignum_bigint
-)
- (preprocess (pps
-    ppx_version
-    ))
- (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  core_kernel
+  ;; local libraries
+  snark_params
+  bignum_bigint)
+ (preprocess
+  (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/mina_block/dune b/src/lib/mina_block/dune
index 3a94360aef1..1e26002a9c2 100644
--- a/src/lib/mina_block/dune
+++ b/src/lib/mina_block/dune
@@ -1,63 +1,65 @@
 (library
  (name mina_block)
  (public_name mina_block)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   integers
-   core_kernel
-   async_kernel
-   bin_prot.shape
-   base.caml
-   sexplib0
-   base64
-   result
-   ppx_inline_test.config
-   base
-   core
-   ;; local libraries
-   mina_ledger
-   mina_numbers
-   currency
-   unsigned_extended
-   ledger_proof
-   logger
-   blockchain_snark
-   unix_timestamp
-   allocation_functor
-   verifier
-   staged_ledger_diff
-   protocol_version
-   consensus
-   precomputed_values
-   mina_state
-   mina_net2
-   mina_base
-   mina_transaction
-   truth
-   transition_chain_verifier
-   staged_ledger
-   data_hash_lib
-   block_time
-   mina_stdlib
-   with_hash
-   signature_lib
-   genesis_constants
-   transaction_snark_work
-   coda_genesis_proof
-   blake2
-   snark_params
-   crypto_params
-   pickles
-   pickles.backend
-   pasta_bindings
-   kimchi_pasta
-   kimchi_pasta.basic
-   random_oracle
-   random_oracle_input
-   ppx_version.runtime
-   mina_wire_types
-   internal_tracing
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_jane ppx_deriving.std ppx_deriving_yojson)))
+  ;; opam libraries
+  integers
+  core_kernel
+  async_kernel
+  bin_prot.shape
+  base.caml
+  sexplib0
+  base64
+  result
+  ppx_inline_test.config
+  base
+  core
+  ;; local libraries
+  mina_ledger
+  mina_numbers
+  currency
+  unsigned_extended
+  ledger_proof
+  logger
+  blockchain_snark
+  unix_timestamp
+  allocation_functor
+  verifier
+  staged_ledger_diff
+  protocol_version
+  consensus
+  precomputed_values
+  mina_state
+  mina_net2
+  mina_base
+  mina_transaction
+  truth
+  transition_chain_verifier
+  staged_ledger
+  data_hash_lib
+  block_time
+  mina_stdlib
+  with_hash
+  signature_lib
+  genesis_constants
+  transaction_snark_work
+  coda_genesis_proof
+  blake2
+  snark_params
+  crypto_params
+  pickles
+  pickles.backend
+  pasta_bindings
+  kimchi_pasta
+  kimchi_pasta.basic
+  random_oracle
+  random_oracle_input
+  ppx_version.runtime
+  mina_wire_types
+  internal_tracing)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_version ppx_jane ppx_deriving.std ppx_deriving_yojson)))
diff --git a/src/lib/mina_caqti/dune b/src/lib/mina_caqti/dune
index 5d40f466222..9d2f52c4ef6 100644
--- a/src/lib/mina_caqti/dune
+++ b/src/lib/mina_caqti/dune
@@ -1,18 +1,19 @@
 (library
  (name mina_caqti)
  (public_name mina_caqti)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   core_kernel
-   async
-   caqti-async
-   caqti
-   async_kernel
-   ;; local libraries
-   mina_base
-   )
+  ;; opam libraries
+  core_kernel
+  async
+  caqti-async
+  caqti
+  async_kernel
+  ;; local libraries
+  mina_base)
  (preprocess
   (pps ppx_mina ppx_version ppx_jane ppx_custom_printf h_list.ppx))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Helpers for the Caqti database bindings"))
diff --git a/src/lib/mina_commands/dune b/src/lib/mina_commands/dune
index fa1c232dd54..d891c28fe40 100644
--- a/src/lib/mina_commands/dune
+++ b/src/lib/mina_commands/dune
@@ -2,55 +2,56 @@
  (name mina_commands)
  (public_name mina_commands)
  (libraries
-   ;; opam libraries
-   async_kernel
-   base
-   core_kernel
-   core
-   async
-   async_unix
-   sexplib0
-   ;; local libraries
-   pickles.backend
-   mina_base.import
-   kimchi_backend
-   mina_metrics
-   bounded_types
-   transition_frontier
-   sync_status
-   pipe_lib
-   perf_histograms
-   network_peer
-   consensus
-   precomputed_values
-   logger
-   currency
-   mina_state
-   signature_lib
-   daemon_rpcs
-   mina_lib
-   mina_base
-   user_command_input
-   node_addrs_and_ports
-   mina_numbers
-   participating_state
-   trust_system
-   network_pool
-   merkle_list_verifier
-   mina_stdlib
-   genesis_constants
-   block_time
-   mina_block
-   mina_incremental
-   gossip_net
-   data_hash_lib
-   mina_ledger
-   kimchi_pasta
-   kimchi_pasta.basic
-   pickles
-   protocol_version
-   random_oracle
-   transition_frontier_base
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_let ppx_custom_printf ppx_compare)))
+  ;; opam libraries
+  async_kernel
+  base
+  core_kernel
+  core
+  async
+  async_unix
+  sexplib0
+  ;; local libraries
+  pickles.backend
+  mina_base.import
+  kimchi_backend
+  mina_metrics
+  bounded_types
+  transition_frontier
+  sync_status
+  pipe_lib
+  perf_histograms
+  network_peer
+  consensus
+  precomputed_values
+  logger
+  currency
+  mina_state
+  signature_lib
+  daemon_rpcs
+  mina_lib
+  mina_base
+  user_command_input
+  node_addrs_and_ports
+  mina_numbers
+  participating_state
+  trust_system
+  network_pool
+  merkle_list_verifier
+  mina_stdlib
+  genesis_constants
+  block_time
+  mina_block
+  mina_incremental
+  gossip_net
+  data_hash_lib
+  mina_ledger
+  kimchi_pasta
+  kimchi_pasta.basic
+  pickles
+  protocol_version
+  random_oracle
+  transition_frontier_base)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_version ppx_let ppx_custom_printf ppx_compare)))
diff --git a/src/lib/mina_compile_config/dune b/src/lib/mina_compile_config/dune
index fac058923b4..b15425ad7e2 100644
--- a/src/lib/mina_compile_config/dune
+++ b/src/lib/mina_compile_config/dune
@@ -1,6 +1,12 @@
 (library
  (name mina_compile_config)
  (public_name mina_compile_config)
- (libraries mina_node_config mina_node_config.for_unit_tests core_kernel currency)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_base ppx_deriving_yojson)))
+ (libraries
+  mina_node_config
+  mina_node_config.for_unit_tests
+  core_kernel
+  currency)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_base ppx_deriving_yojson)))
diff --git a/src/lib/mina_debug/dune b/src/lib/mina_debug/dune
index eb72fcd69d8..63ccdac0822 100644
--- a/src/lib/mina_debug/dune
+++ b/src/lib/mina_debug/dune
@@ -5,4 +5,5 @@
  (flags :standard -short-paths)
  (preprocess
   (pps ppx_version ppx_jane))
- (instrumentation (backend bisect_ppx)))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/mina_generators/dune b/src/lib/mina_generators/dune
index 97c1b8c524b..241591cde19 100644
--- a/src/lib/mina_generators/dune
+++ b/src/lib/mina_generators/dune
@@ -1,45 +1,52 @@
 (library
  (name mina_generators)
  (public_name mina_generators)
- (inline_tests (flags -verbose -show-counts))
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_let ppx_version ppx_custom_printf ppx_inline_test ppx_deriving_yojson))
+ (inline_tests
+  (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_let
+   ppx_version
+   ppx_custom_printf
+   ppx_inline_test
+   ppx_deriving_yojson))
  (libraries
-   ;; opam libraries
-   yojson
-   core_kernel
-   base_quickcheck
-   core
-   async
-   async_unix
-   base
-   sexplib0
-   ppx_inline_test.config
-   ppx_deriving_yojson.runtime
-   ;; local libraries
-   bounded_types
-   genesis_constants
-   sgn
-   pickles_types
-   pickles
-   data_hash_lib
-   kimchi_pasta
-   kimchi_pasta.basic
-   mina_numbers
-   zkapp_command_builder
-   signature_lib
-   mina_ledger
-   mina_base
-   random_oracle
-   with_hash
-   mina_base.import
-   block_time
-   currency
-   kimchi_backend
-   pickles.backend
-   random_oracle_input
-   snark_params
-   snarky.backendless
-   transaction_snark
-   splittable_random
-))
+  ;; opam libraries
+  yojson
+  core_kernel
+  base_quickcheck
+  core
+  async
+  async_unix
+  base
+  sexplib0
+  ppx_inline_test.config
+  ppx_deriving_yojson.runtime
+  ;; local libraries
+  bounded_types
+  genesis_constants
+  sgn
+  pickles_types
+  pickles
+  data_hash_lib
+  kimchi_pasta
+  kimchi_pasta.basic
+  mina_numbers
+  zkapp_command_builder
+  signature_lib
+  mina_ledger
+  mina_base
+  random_oracle
+  with_hash
+  mina_base.import
+  block_time
+  currency
+  kimchi_backend
+  pickles.backend
+  random_oracle_input
+  snark_params
+  snarky.backendless
+  transaction_snark
+  splittable_random))
diff --git a/src/lib/mina_graphql/dune b/src/lib/mina_graphql/dune
index a0e9d357e9b..8b831359c7f 100644
--- a/src/lib/mina_graphql/dune
+++ b/src/lib/mina_graphql/dune
@@ -2,110 +2,111 @@
  (name mina_graphql)
  (public_name mina_graphql)
  (libraries
-   ;; opam libraries
-   archive_lib
-   integers
-   bignum
-   async_kernel
-   base.caml
-   base.base_internalhash_types
-   re2
-   graphql-async
-   core_kernel.uuid
-   core
-   core.uuid
-   async
-   core_kernel
-   async_unix
-   result
-   sexplib0
-   ppx_deriving_yojson.runtime
-   graphql_parser
-   splittable_random
-   stdio
-   ;; local libraries
-   bounded_types
-   mina_generators
-   mina_wire_types
-   network_pool
-   cli_lib
-   exit_handlers
-   file_system
-   itn_crypto
-   kimchi_pasta
-   kimchi_pasta.basic
-   mina_base.util
-   mina_ledger
-   block_producer
-   pickles
-   mina_incremental
-   coda_genesis_ledger
-   work_selector
-   error_json
-   mina_networking
-   consensus.vrf
-   vrf_evaluator
-   trust_system
-   with_hash
-   data_hash_lib
-   staged_ledger
-   genesis_constants
-   pipe_lib
-   sgn
-   transaction_snark_work
-   unsigned_extended
-   precomputed_values
-   transaction_inclusion_status
-   graphql_lib
-   block_time
-   currency
-   merkle_ledger
-   mina_lib
-   mina_commands
-   mina_state
-   filtered_external_transition
-   node_addrs_and_ports
-   network_peer
-   mina_base
-   mina_transaction
-   mina_block
-   user_command_input
-   signature_lib
-   transition_frontier
-   sync_status
-   consensus
-   daemon_rpcs
-   mina_numbers
-   perf_histograms
-   one_or_two
-   transaction_snark
-   transition_frontier_base
-   participating_state
-   secrets
-   logger
-   base58_check
-   mina_net2
-   snark_params
-   rosetta_lib
-   random_oracle
-   coda_genesis_proof
-   mina_compile_config
-   mina_runtime_config
-   mina_base.import
-   pickles.backend
-   pickles_types
-   graphql
-   fields_derivers.graphql
-   o1trace
-   verifier
-   graphql_wrapper
-   staged_ledger_diff
-   kimchi_backend
-   sgn_type
-   mina_transaction_logic
-   zkapp_command_builder
-   gossip_net
-   itn_logger
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_jane ppx_deriving_yojson ppx_deriving.make)))
+  ;; opam libraries
+  archive_lib
+  integers
+  bignum
+  async_kernel
+  base.caml
+  base.base_internalhash_types
+  re2
+  graphql-async
+  core_kernel.uuid
+  core
+  core.uuid
+  async
+  core_kernel
+  async_unix
+  result
+  sexplib0
+  ppx_deriving_yojson.runtime
+  graphql_parser
+  splittable_random
+  stdio
+  ;; local libraries
+  bounded_types
+  mina_generators
+  mina_wire_types
+  network_pool
+  cli_lib
+  exit_handlers
+  file_system
+  itn_crypto
+  kimchi_pasta
+  kimchi_pasta.basic
+  mina_base.util
+  mina_ledger
+  block_producer
+  pickles
+  mina_incremental
+  coda_genesis_ledger
+  work_selector
+  error_json
+  mina_networking
+  consensus.vrf
+  vrf_evaluator
+  trust_system
+  with_hash
+  data_hash_lib
+  staged_ledger
+  genesis_constants
+  pipe_lib
+  sgn
+  transaction_snark_work
+  unsigned_extended
+  precomputed_values
+  transaction_inclusion_status
+  graphql_lib
+  block_time
+  currency
+  merkle_ledger
+  mina_lib
+  mina_commands
+  mina_state
+  filtered_external_transition
+  node_addrs_and_ports
+  network_peer
+  mina_base
+  mina_transaction
+  mina_block
+  user_command_input
+  signature_lib
+  transition_frontier
+  sync_status
+  consensus
+  daemon_rpcs
+  mina_numbers
+  perf_histograms
+  one_or_two
+  transaction_snark
+  transition_frontier_base
+  participating_state
+  secrets
+  logger
+  base58_check
+  mina_net2
+  snark_params
+  rosetta_lib
+  random_oracle
+  coda_genesis_proof
+  mina_compile_config
+  mina_runtime_config
+  mina_base.import
+  pickles.backend
+  pickles_types
+  graphql
+  fields_derivers.graphql
+  o1trace
+  verifier
+  graphql_wrapper
+  staged_ledger_diff
+  kimchi_backend
+  sgn_type
+  mina_transaction_logic
+  zkapp_command_builder
+  gossip_net
+  itn_logger)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_version ppx_jane ppx_deriving_yojson ppx_deriving.make)))
diff --git a/src/lib/mina_incremental/dune b/src/lib/mina_incremental/dune
index 1be6b2997b0..c5f671d78b6 100644
--- a/src/lib/mina_incremental/dune
+++ b/src/lib/mina_incremental/dune
@@ -1,7 +1,8 @@
 (library
  (name mina_incremental)
  (public_name mina_incremental)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
- (libraries incremental pipe_lib async_kernel)
-)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
+ (libraries incremental pipe_lib async_kernel))
diff --git a/src/lib/mina_intf/dune b/src/lib/mina_intf/dune
index 7a379b18612..a85c31116cc 100644
--- a/src/lib/mina_intf/dune
+++ b/src/lib/mina_intf/dune
@@ -2,32 +2,33 @@
  (public_name mina_intf)
  (name mina_intf)
  (libraries
-   ;; opam libraries
-   async_kernel
-   core
-   core_kernel
-   sexplib0
-   ;; local libraries
-   mina_net2
-   staged_ledger
-   consensus
-   precomputed_values
-   genesis_constants
-   mina_block
-   proof_carrying_data
-   cache_lib
-   mina_base
-   mina_state
-   pipe_lib
-   network_peer
-    network_pool
-   logger
-   trust_system
-   block_time
-   verifier
-   rose_tree
-   mina_ledger
-   transaction_snark_work
-   )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_version ppx_deriving.std ppx_deriving_yojson)))
+  ;; opam libraries
+  async_kernel
+  core
+  core_kernel
+  sexplib0
+  ;; local libraries
+  mina_net2
+  staged_ledger
+  consensus
+  precomputed_values
+  genesis_constants
+  mina_block
+  proof_carrying_data
+  cache_lib
+  mina_base
+  mina_state
+  pipe_lib
+  network_peer
+  network_pool
+  logger
+  trust_system
+  block_time
+  verifier
+  rose_tree
+  mina_ledger
+  transaction_snark_work)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_version ppx_deriving.std ppx_deriving_yojson)))
diff --git a/src/lib/mina_ledger/dune b/src/lib/mina_ledger/dune
index d67ae5fafc7..b1b0dfc6893 100644
--- a/src/lib/mina_ledger/dune
+++ b/src/lib/mina_ledger/dune
@@ -1,58 +1,67 @@
 (library
  (name mina_ledger)
  (public_name mina_ledger)
- (inline_tests (flags -verbose -show-counts))
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_let ppx_custom_printf ppx_base ppx_deriving_yojson ppx_inline_test ppx_assert))
+ (inline_tests
+  (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_version
+   ppx_let
+   ppx_custom_printf
+   ppx_base
+   ppx_deriving_yojson
+   ppx_inline_test
+   ppx_assert))
  (libraries
-   ;; opam libraries
-   rocks
-   integers
-   async_kernel
-   base.caml
-   base
-   core
-   core_kernel
-   sexplib0
-   bin_prot.shape
-   base.base_internalhash_types
-   async
-   core_kernel.uuid
-   ppx_inline_test.config
-   ;; local libraries
-   bounded_types
-   mina_wire_types
-   sgn
-   syncable_ledger
-   snark_params
-   zkapp_command_builder
-   pickles
-   pickles.backend
-   pickles_types
-   mina_base.import
-   o1trace
-   rocksdb
-   random_oracle
-   currency
-   genesis_constants
-   kimchi_backend
-   kimchi_pasta
-   kimchi_pasta.basic
-   merkle_mask
-   merkle_ledger
-   mina_base
-   mina_transaction
-   mina_transaction_logic
-   signature_lib
-   mina_numbers
-   debug_assert
-   merkle_address
-   key_value_database
-   data_hash_lib
-   quickcheck_lib
-   snarky.backendless
-   unsigned_extended
-   with_hash
-   ppx_version.runtime
-   direction
-))
+  ;; opam libraries
+  rocks
+  integers
+  async_kernel
+  base.caml
+  base
+  core
+  core_kernel
+  sexplib0
+  bin_prot.shape
+  base.base_internalhash_types
+  async
+  core_kernel.uuid
+  ppx_inline_test.config
+  ;; local libraries
+  bounded_types
+  mina_wire_types
+  sgn
+  syncable_ledger
+  snark_params
+  zkapp_command_builder
+  pickles
+  pickles.backend
+  pickles_types
+  mina_base.import
+  o1trace
+  rocksdb
+  random_oracle
+  currency
+  genesis_constants
+  kimchi_backend
+  kimchi_pasta
+  kimchi_pasta.basic
+  merkle_mask
+  merkle_ledger
+  mina_base
+  mina_transaction
+  mina_transaction_logic
+  signature_lib
+  mina_numbers
+  debug_assert
+  merkle_address
+  key_value_database
+  data_hash_lib
+  quickcheck_lib
+  snarky.backendless
+  unsigned_extended
+  with_hash
+  ppx_version.runtime
+  direction))
diff --git a/src/lib/mina_lib/dune b/src/lib/mina_lib/dune
index 5fe7a7e01e2..d16b37e11b7 100644
--- a/src/lib/mina_lib/dune
+++ b/src/lib/mina_lib/dune
@@ -2,106 +2,108 @@
  (name mina_lib)
  (public_name mina_lib)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   integers
-   async_unix
-   sexplib0
-   archive_lib
-   core
-   async
-   incremental
-   core_kernel
-   async_kernel
-   base.caml
-   base.base_internalhash_types
-   uri
-   stdio
-   result
-   bin_prot.shape
-   ;; local libraries
-   bounded_types
-   transition_chain_prover
-   best_tip_prover
-   proof_carrying_data
-   mina_runtime_config
-   ledger_proof
-   mina_net2
-   network_peer
-   mina_incremental
-   mina_numbers
-   precomputed_values
-   transition_frontier_base
-   with_hash
-   currency
-   mina_stdlib
-   mina_user_error
-   gossip_net
-   transition_frontier
-   trust_system
-   node_status_service
-   vrf_evaluator
-   uptime_service
-   exit_handlers
-   daemon_rpcs
-   sync_status
-   node_addrs_and_ports
-   transition_router
-   sync_handler
-   genesis_constants
-   block_producer
-   mina_networking
-   consensus
-   o1trace
-   unix_timestamp
-   filtered_external_transition
-   pipe_lib
-   user_command_input
-   logger
-   child_processes
-   secrets
-   work_selector
-   mina_ledger
-   protocol_version
-   snark_worker
-   participating_state
-   cli_lib
-   signature_lib
-   mina_base
-   mina_transaction
-   mina_block
-   transition_frontier_extensions
-   block_time
-   error_json
-   unsigned_extended
-   mina_metrics
-   staged_ledger
-   mina_state
-   network_pool
-   timeout_lib
-   prover
-   verifier
-   snark_work_lib
-   truth
-   ledger_catchup
-   genesis_ledger_helper
-   coda_genesis_proof
-   mina_base.import
-   data_hash_lib
-   transition_handler
-   ppx_version.runtime
-   mina_intf
-   node_error_service
-   mina_transaction_logic
-   pickles.backend
-   pickles
-   snark_params
-   kimchi_pasta
-   kimchi_pasta.basic
-   mina_wire_types
-   internal_tracing
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_mina ppx_version ppx_inline_test ppx_deriving.std))
+  ;; opam libraries
+  integers
+  async_unix
+  sexplib0
+  archive_lib
+  core
+  async
+  incremental
+  core_kernel
+  async_kernel
+  base.caml
+  base.base_internalhash_types
+  uri
+  stdio
+  result
+  bin_prot.shape
+  ;; local libraries
+  bounded_types
+  transition_chain_prover
+  best_tip_prover
+  proof_carrying_data
+  mina_runtime_config
+  ledger_proof
+  mina_net2
+  network_peer
+  mina_incremental
+  mina_numbers
+  precomputed_values
+  transition_frontier_base
+  with_hash
+  currency
+  mina_stdlib
+  mina_user_error
+  gossip_net
+  transition_frontier
+  trust_system
+  node_status_service
+  vrf_evaluator
+  uptime_service
+  exit_handlers
+  daemon_rpcs
+  sync_status
+  node_addrs_and_ports
+  transition_router
+  sync_handler
+  genesis_constants
+  block_producer
+  mina_networking
+  consensus
+  o1trace
+  unix_timestamp
+  filtered_external_transition
+  pipe_lib
+  user_command_input
+  logger
+  child_processes
+  secrets
+  work_selector
+  mina_ledger
+  protocol_version
+  snark_worker
+  participating_state
+  cli_lib
+  signature_lib
+  mina_base
+  mina_transaction
+  mina_block
+  transition_frontier_extensions
+  block_time
+  error_json
+  unsigned_extended
+  mina_metrics
+  staged_ledger
+  mina_state
+  network_pool
+  timeout_lib
+  prover
+  verifier
+  snark_work_lib
+  truth
+  ledger_catchup
+  genesis_ledger_helper
+  coda_genesis_proof
+  mina_base.import
+  data_hash_lib
+  transition_handler
+  ppx_version.runtime
+  mina_intf
+  node_error_service
+  mina_transaction_logic
+  pickles.backend
+  pickles
+  snark_params
+  kimchi_pasta
+  kimchi_pasta.basic
+  mina_wire_types
+  internal_tracing)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_mina ppx_version ppx_inline_test ppx_deriving.std))
  (synopsis "Mina gut layer"))
diff --git a/src/lib/mina_lib/tests/dune b/src/lib/mina_lib/tests/dune
index 2680a6221d1..6d314db57da 100644
--- a/src/lib/mina_lib/tests/dune
+++ b/src/lib/mina_lib/tests/dune
@@ -1,59 +1,61 @@
 (library
  (name mina_lib_tests)
  (public_name mina_lib_tests)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   core
-   core.uuid
-   core_kernel
-   core_kernel.uuid
-   async_kernel
-   async
-   async_unix
-   cohttp
-   cohttp-async
-   ppx_inline_test.config
-   base.caml
-   ;; local libraries
-   mina_lib
-   logger
-   precomputed_values
-   genesis_constants
-   cli_lib
-   child_processes
-   consensus
-   currency
-   verifier
-   network_pool
-   genesis_ledger_helper
-   data_hash_lib
-   mina_base
-   mina_base.import
-   mina_block
-   mina_intf
-   mina_ledger
-   mina_networking
-   mina_numbers
-   mina_wire_types
-   gossip_net
-   node_addrs_and_ports
-   mina_net2
-   network_peer
-   block_time
-   pipe_lib
-   signature_lib
-   mina_runtime_config
-   trust_system
-   protocol_version
-   transition_frontier_base
-   transition_handler
-   transition_router
-   syncable_ledger
-   sync_handler
-   with_hash
-   bounded_types
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_mina ppx_version ppx_inline_test ppx_deriving.std))
+  ;; opam libraries
+  core
+  core.uuid
+  core_kernel
+  core_kernel.uuid
+  async_kernel
+  async
+  async_unix
+  cohttp
+  cohttp-async
+  ppx_inline_test.config
+  base.caml
+  ;; local libraries
+  mina_lib
+  logger
+  precomputed_values
+  genesis_constants
+  cli_lib
+  child_processes
+  consensus
+  currency
+  verifier
+  network_pool
+  genesis_ledger_helper
+  data_hash_lib
+  mina_base
+  mina_base.import
+  mina_block
+  mina_intf
+  mina_ledger
+  mina_networking
+  mina_numbers
+  mina_wire_types
+  gossip_net
+  node_addrs_and_ports
+  mina_net2
+  network_peer
+  block_time
+  pipe_lib
+  signature_lib
+  mina_runtime_config
+  trust_system
+  protocol_version
+  transition_frontier_base
+  transition_handler
+  transition_router
+  syncable_ledger
+  sync_handler
+  with_hash
+  bounded_types)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_mina ppx_version ppx_inline_test ppx_deriving.std))
  (synopsis "Mina_lib testsr"))
diff --git a/src/lib/mina_metrics/dune b/src/lib/mina_metrics/dune
index 0d431427a67..0d584e5f85e 100644
--- a/src/lib/mina_metrics/dune
+++ b/src/lib/mina_metrics/dune
@@ -2,7 +2,9 @@
  (name mina_metrics)
  (public_name mina_metrics)
  (libraries async_kernel logger uri core_kernel)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (virtual_modules mina_metrics)
  (default_implementation mina_metrics.prometheus))
diff --git a/src/lib/mina_metrics/js_test/dune b/src/lib/mina_metrics/js_test/dune
index a9d462285b2..a1e4fb1f78d 100644
--- a/src/lib/mina_metrics/js_test/dune
+++ b/src/lib/mina_metrics/js_test/dune
@@ -2,6 +2,8 @@
  (name mina_metrics_js_test)
  (libraries mina_metrics mina_metrics.none logger.fake)
  (modes js)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (forbidden_libraries async core re2))
diff --git a/src/lib/mina_metrics/no_metrics/dune b/src/lib/mina_metrics/no_metrics/dune
index 664e87cb27c..0788a36a35c 100644
--- a/src/lib/mina_metrics/no_metrics/dune
+++ b/src/lib/mina_metrics/no_metrics/dune
@@ -2,6 +2,8 @@
  (public_name mina_metrics.none)
  (name mina_metrics_none)
  (libraries async_kernel logger uri core_kernel)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (implements mina_metrics))
diff --git a/src/lib/mina_metrics/prometheus_metrics/dune b/src/lib/mina_metrics/prometheus_metrics/dune
index 97833ca2ae2..e3d13703c09 100644
--- a/src/lib/mina_metrics/prometheus_metrics/dune
+++ b/src/lib/mina_metrics/prometheus_metrics/dune
@@ -2,27 +2,28 @@
  (public_name mina_metrics.prometheus)
  (name mina_metrics_prometheus)
  (libraries
-   ;; opam libraries
-   conduit-async
-   ppx_hash.runtime-lib
-   fmt
-   re
-   base
-   core
-   async_kernel
-   core_kernel
-   prometheus
-   cohttp-async
-   cohttp
-   async
-   base.base_internalhash_types
-   uri
-   async_unix
-   base.caml
-   ;; local libraries
-   logger
-   o1trace
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_let ppx_version ppx_pipebang ppx_custom_printf ppx_here))
+  ;; opam libraries
+  conduit-async
+  ppx_hash.runtime-lib
+  fmt
+  re
+  base
+  core
+  async_kernel
+  core_kernel
+  prometheus
+  cohttp-async
+  cohttp
+  async
+  base.base_internalhash_types
+  uri
+  async_unix
+  base.caml
+  ;; local libraries
+  logger
+  o1trace)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_let ppx_version ppx_pipebang ppx_custom_printf ppx_here))
  (implements mina_metrics))
diff --git a/src/lib/mina_net2/dune b/src/lib/mina_net2/dune
index a53efc64c56..b317608b7ce 100644
--- a/src/lib/mina_net2/dune
+++ b/src/lib/mina_net2/dune
@@ -2,42 +2,50 @@
  (name mina_net2)
  (public_name mina_net2)
  (libraries
-   ;; opam libraries
-   async
-   base58
-   base64
-   capnp
-   digestif
-   stdio
-   core
-   libp2p_ipc
-   yojson
-   async_kernel
-   core_kernel
-   bin_prot.shape
-   ppx_inline_test.config
-   async_unix
-   sexplib0
-   base.caml
-   base.base_internalhash_types
-   splittable_random
-   integers
-   ;; local libraries
-   blake2
-   error_json
-   child_processes
-   file_system
-   logger
-   network_peer
-   pipe_lib
-   timeout_lib
-   mina_metrics
-   o1trace
-   staged_ledger_diff
-   ppx_version.runtime
-   consensus
-   bounded_types
- )
- (inline_tests (flags -verbose -show-counts))
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_jane ppx_deriving.std ppx_let ppx_deriving_yojson)))
+  ;; opam libraries
+  async
+  base58
+  base64
+  capnp
+  digestif
+  stdio
+  core
+  libp2p_ipc
+  yojson
+  async_kernel
+  core_kernel
+  bin_prot.shape
+  ppx_inline_test.config
+  async_unix
+  sexplib0
+  base.caml
+  base.base_internalhash_types
+  splittable_random
+  integers
+  ;; local libraries
+  blake2
+  error_json
+  child_processes
+  file_system
+  logger
+  network_peer
+  pipe_lib
+  timeout_lib
+  mina_metrics
+  o1trace
+  staged_ledger_diff
+  ppx_version.runtime
+  consensus
+  bounded_types)
+ (inline_tests
+  (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_mina
+   ppx_version
+   ppx_jane
+   ppx_deriving.std
+   ppx_let
+   ppx_deriving_yojson)))
diff --git a/src/lib/mina_net2/tests/dune b/src/lib/mina_net2/tests/dune
index d97745b40c2..de90ac5bfe7 100644
--- a/src/lib/mina_net2/tests/dune
+++ b/src/lib/mina_net2/tests/dune
@@ -1,26 +1,28 @@
 (library
  (name mina_net2_tests)
  (libraries
-   ;; opam libraries
-   core
-   async
-   ppx_inline_test.config
-   async_kernel
-   async_unix
-   core_kernel
-   sexplib0
-   bin_prot.shape
-   base.caml
-   ;; local libraries
-   mina_net2
-   mina_stdlib
-   logger
-   child_processes
-   network_peer
-   file_system
-   bounded_types
-   mina_compile_config
-   )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_mina ppx_version))
- (inline_tests (flags -verbose -show-counts)))
+  ;; opam libraries
+  core
+  async
+  ppx_inline_test.config
+  async_kernel
+  async_unix
+  core_kernel
+  sexplib0
+  bin_prot.shape
+  base.caml
+  ;; local libraries
+  mina_net2
+  mina_stdlib
+  logger
+  child_processes
+  network_peer
+  file_system
+  bounded_types
+  mina_compile_config)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_mina ppx_version))
+ (inline_tests
+  (flags -verbose -show-counts)))
diff --git a/src/lib/mina_networking/dune b/src/lib/mina_networking/dune
index e4165e976ca..dd882f91155 100644
--- a/src/lib/mina_networking/dune
+++ b/src/lib/mina_networking/dune
@@ -3,58 +3,73 @@
  (public_name mina_networking)
  (library_flags -linkall)
  (libraries
-   ;; opam libraries
-   base.caml
-   async_rpc_kernel
-   result
-   core
-   async
-   core_kernel
-   sexplib0
-   base
-   bin_prot.shape
-   async_unix
-   async_kernel
-   base.base_internalhash_types
-   ;; local libraries
-   precomputed_values
-   merkle_ledger
-   downloader
-   protocol_version
-   error_json
-   mina_net2
-   block_time
-   trust_system
-   signature_lib
-   with_hash
-   mina_state
-   pipe_lib
-   staged_ledger
-   mina_block
-   consensus
-   perf_histograms
-   mina_base
-   gossip_net
-   proof_carrying_data
-   network_pool
-   sync_status
-   network_peer
-   data_hash_lib
-   logger
-   genesis_constants
-   mina_metrics
-   syncable_ledger
-   mina_ledger
-   transition_handler
-   o1trace
-   ppx_version.runtime
-   bounded_types
-   sync_handler
-   transition_chain_prover
-   work_selector
- )
- (inline_tests (flags -verbose -show-counts))
+  ;; opam libraries
+  base.caml
+  async_rpc_kernel
+  result
+  core
+  async
+  core_kernel
+  sexplib0
+  base
+  bin_prot.shape
+  async_unix
+  async_kernel
+  base.base_internalhash_types
+  ;; local libraries
+  precomputed_values
+  merkle_ledger
+  downloader
+  protocol_version
+  error_json
+  mina_net2
+  block_time
+  trust_system
+  signature_lib
+  with_hash
+  mina_state
+  pipe_lib
+  staged_ledger
+  mina_block
+  consensus
+  perf_histograms
+  mina_base
+  gossip_net
+  proof_carrying_data
+  network_pool
+  sync_status
+  network_peer
+  data_hash_lib
+  logger
+  genesis_constants
+  mina_metrics
+  syncable_ledger
+  mina_ledger
+  transition_handler
+  o1trace
+  ppx_version.runtime
+  bounded_types
+  sync_handler
+  transition_chain_prover
+  work_selector)
+ (inline_tests
+  (flags -verbose -show-counts))
  (preprocess
-  (pps ppx_mina ppx_compare ppx_hash ppx_version ppx_inline_test ppx_compare ppx_deriving.make ppx_deriving_yojson ppx_bin_prot ppx_sexp_conv ppx_fields_conv ppx_let ppx_register_event ppx_custom_printf))
- (instrumentation (backend bisect_ppx))
+  (pps
+   ppx_mina
+   ppx_compare
+   ppx_hash
+   ppx_version
+   ppx_inline_test
+   ppx_compare
+   ppx_deriving.make
+   ppx_deriving_yojson
+   ppx_bin_prot
+   ppx_sexp_conv
+   ppx_fields_conv
+   ppx_let
+   ppx_register_event
+   ppx_custom_printf))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Networking layer for coda"))
diff --git a/src/lib/mina_numbers/dune b/src/lib/mina_numbers/dune
index 5fb96004511..5b193ff4fa1 100644
--- a/src/lib/mina_numbers/dune
+++ b/src/lib/mina_numbers/dune
@@ -1,41 +1,52 @@
 (library
  (name mina_numbers)
  (public_name mina_numbers)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (library_flags -linkall)
  (libraries
-   ;; opam libraries
-   result
-   base.caml
-   bin_prot.shape
-   bignum.bigint
-   core_kernel
-   integers
-   sexplib0
-   base
-   base.base_internalhash_types
-   ppx_inline_test.config
-   ;; local libraries
-   protocol_version
-   mina_wire_types
-   bignum_bigint
-   pickles
-   codable
-   snarky.backendless
-   fold_lib
-   tuple_lib
-   snark_bits
-   snark_params
-   unsigned_extended
-   random_oracle
-   random_oracle_input
-   bitstring_lib
-   test_util
-   kimchi_backend_common
-   ppx_version.runtime
- )
+  ;; opam libraries
+  result
+  base.caml
+  bin_prot.shape
+  bignum.bigint
+  core_kernel
+  integers
+  sexplib0
+  base
+  base.base_internalhash_types
+  ppx_inline_test.config
+  ;; local libraries
+  protocol_version
+  mina_wire_types
+  bignum_bigint
+  pickles
+  codable
+  snarky.backendless
+  fold_lib
+  tuple_lib
+  snark_bits
+  snark_params
+  unsigned_extended
+  random_oracle
+  random_oracle_input
+  bitstring_lib
+  test_util
+  kimchi_backend_common
+  ppx_version.runtime)
  (preprocess
-  (pps ppx_version ppx_mina ppx_bin_prot ppx_sexp_conv ppx_compare ppx_hash
-       ppx_let ppx_inline_test ppx_compare ppx_deriving_yojson ppx_assert))
- (instrumentation (backend bisect_ppx))
+  (pps
+   ppx_version
+   ppx_mina
+   ppx_bin_prot
+   ppx_sexp_conv
+   ppx_compare
+   ppx_hash
+   ppx_let
+   ppx_inline_test
+   ppx_compare
+   ppx_deriving_yojson
+   ppx_assert))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Snark-friendly numbers used in Coda consensus"))
diff --git a/src/lib/mina_plugins/dune b/src/lib/mina_plugins/dune
index 80628aba2f6..2424ddf47fb 100644
--- a/src/lib/mina_plugins/dune
+++ b/src/lib/mina_plugins/dune
@@ -2,14 +2,15 @@
  (public_name mina_plugins)
  (name mina_plugins)
  (libraries
-   ;; opam libraries
-   core_kernel
-   dynlink
-   core
-   base
-   ;; local libraries
-   mina_lib
-   logger
-)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version)))
+  ;; opam libraries
+  core_kernel
+  dynlink
+  core
+  base
+  ;; local libraries
+  mina_lib
+  logger)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_version)))
diff --git a/src/lib/mina_plugins/examples/do_nothing/dune b/src/lib/mina_plugins/examples/do_nothing/dune
index ccaf93b73d9..c45ec56935c 100644
--- a/src/lib/mina_plugins/examples/do_nothing/dune
+++ b/src/lib/mina_plugins/examples/do_nothing/dune
@@ -1,13 +1,14 @@
 (library
  (name plugin_do_nothing)
  (libraries
-   ;; opam libraries
-   core_kernel
-   core
-   ;; local libraries
-   mina_plugins
-   mina_lib
-   logger
-)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_mina)))
+  ;; opam libraries
+  core_kernel
+  core
+  ;; local libraries
+  mina_plugins
+  mina_lib
+  logger)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_mina)))
diff --git a/src/lib/mina_state/dune b/src/lib/mina_state/dune
index d5a2ac71c0c..3f0b692fbe5 100644
--- a/src/lib/mina_state/dune
+++ b/src/lib/mina_state/dune
@@ -1,54 +1,70 @@
 (library
  (name mina_state)
  (public_name mina_state)
- (inline_tests (flags -verbose -show-counts))
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_custom_printf ppx_mina ppx_version ppx_snarky ppx_bin_prot ppx_compare ppx_sexp_conv ppx_hash ppx_fields_conv ppx_let ppx_inline_test ppx_assert ppx_deriving.std ppx_deriving_yojson h_list.ppx))
+ (inline_tests
+  (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_custom_printf
+   ppx_mina
+   ppx_version
+   ppx_snarky
+   ppx_bin_prot
+   ppx_compare
+   ppx_sexp_conv
+   ppx_hash
+   ppx_fields_conv
+   ppx_let
+   ppx_inline_test
+   ppx_assert
+   ppx_deriving.std
+   ppx_deriving_yojson
+   h_list.ppx))
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   base.base_internalhash_types
-   base.caml
-   bin_prot.shape
-   base
-   sexplib0
-   core_kernel
-   core
-   ;; local libraries
-   signature_lib
-   pickles.backend
-   outside_hash_image
-   pickles
-   random_oracle_input
-   random_oracle
-   genesis_constants
-   block_time
-   mina_base
-   mina_debug
-   mina_transaction_logic
-   snark_params
-   consensus
-   bitstring_lib
-   fold_lib
-   tuple_lib
-   with_hash
-   snarky.backendless
-   crypto_params
-   data_hash_lib
-   currency
-   visualization
-   linked_tree
-   mina_numbers
-   kimchi_pasta
-   kimchi_pasta.basic
-   kimchi_backend
-   mina_base.util
-   mina_ledger
-   unsigned_extended
-   sgn
-   sgn_type
-   blake2
-   ppx_version.runtime
-   mina_wire_types
- )
-)
+  ;; opam libraries
+  ppx_inline_test.config
+  base.base_internalhash_types
+  base.caml
+  bin_prot.shape
+  base
+  sexplib0
+  core_kernel
+  core
+  ;; local libraries
+  signature_lib
+  pickles.backend
+  outside_hash_image
+  pickles
+  random_oracle_input
+  random_oracle
+  genesis_constants
+  block_time
+  mina_base
+  mina_debug
+  mina_transaction_logic
+  snark_params
+  consensus
+  bitstring_lib
+  fold_lib
+  tuple_lib
+  with_hash
+  snarky.backendless
+  crypto_params
+  data_hash_lib
+  currency
+  visualization
+  linked_tree
+  mina_numbers
+  kimchi_pasta
+  kimchi_pasta.basic
+  kimchi_backend
+  mina_base.util
+  mina_ledger
+  unsigned_extended
+  sgn
+  sgn_type
+  blake2
+  ppx_version.runtime
+  mina_wire_types))
diff --git a/src/lib/mina_stdlib/dune b/src/lib/mina_stdlib/dune
index 0501ba8fa58..e9ac5c08329 100644
--- a/src/lib/mina_stdlib/dune
+++ b/src/lib/mina_stdlib/dune
@@ -1,26 +1,22 @@
 (library
  (name mina_stdlib)
  (public_name mina_stdlib)
- (modules_without_implementation
-  sigs)
+ (modules_without_implementation sigs)
  (flags
   (:standard -w a -warn-error +a)
-  -open Core_kernel)
+  -open
+  Core_kernel)
  (libraries
-   ; opam libraries
-   base.caml
-   core_kernel
-   async_kernel
-   sexplib0
-   bin_prot.shape
-   ; local libraries
-   ppx_version.runtime)
+  ; opam libraries
+  base.caml
+  core_kernel
+  async_kernel
+  sexplib0
+  bin_prot.shape
+  ; local libraries
+  ppx_version.runtime)
  (instrumentation
   (backend bisect_ppx))
  (preprocess
-  (pps ppx_jane
-       ppx_version
-       ppx_deriving.std
-       ppx_mina ppx_compare))
+  (pps ppx_jane ppx_version ppx_deriving.std ppx_mina ppx_compare))
  (synopsis "Mina standard library"))
-
diff --git a/src/lib/mina_user_error/dune b/src/lib/mina_user_error/dune
index c0a2d9ec099..d5082b41059 100644
--- a/src/lib/mina_user_error/dune
+++ b/src/lib/mina_user_error/dune
@@ -2,5 +2,7 @@
  (name mina_user_error)
  (public_name mina_user_error)
  (libraries base)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version)))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version)))
diff --git a/src/lib/mina_version/dummy/dune b/src/lib/mina_version/dummy/dune
index cc058400b6f..70576d2c5b2 100644
--- a/src/lib/mina_version/dummy/dune
+++ b/src/lib/mina_version/dummy/dune
@@ -1,7 +1,9 @@
 (library
  (name mina_version_dummy)
  (libraries core_kernel base)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (public_name mina_version.dummy)
  (implements mina_version))
diff --git a/src/lib/mina_version/dune b/src/lib/mina_version/dune
index 4de182f8aed..ea21bdef4ca 100644
--- a/src/lib/mina_version/dune
+++ b/src/lib/mina_version/dune
@@ -1,8 +1,10 @@
 (library
  (name mina_version)
  (libraries core_kernel)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (public_name mina_version)
  (virtual_modules mina_version)
  (default_implementation mina_version.normal))
diff --git a/src/lib/mina_version/normal/dune b/src/lib/mina_version/normal/dune
index e07a87cc253..bbc74dcff73 100644
--- a/src/lib/mina_version/normal/dune
+++ b/src/lib/mina_version/normal/dune
@@ -1,15 +1,18 @@
 (library
  (name mina_version_normal)
  (libraries core_kernel base)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (public_name mina_version.normal)
  (implements mina_version))
 
 (rule
  (targets mina_version.ml)
  (deps
-   (sandbox none)
-   (:< gen.sh)
-   (universe))
- (action (run bash %{<} %{targets})))
+  (sandbox none)
+  (:< gen.sh)
+  (universe))
+ (action
+  (run bash %{<} %{targets})))
diff --git a/src/lib/mina_version/runtime/dune b/src/lib/mina_version/runtime/dune
index 1841e27ab91..4c7cde02807 100644
--- a/src/lib/mina_version/runtime/dune
+++ b/src/lib/mina_version/runtime/dune
@@ -1,7 +1,9 @@
 (library
  (name mina_version_runtime)
  (libraries core_kernel base unix)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (public_name mina_version.runtime)
  (implements mina_version))
diff --git a/src/lib/mina_wire_types/dune b/src/lib/mina_wire_types/dune
index 6922cffccd3..e901281a6a4 100644
--- a/src/lib/mina_wire_types/dune
+++ b/src/lib/mina_wire_types/dune
@@ -1,20 +1,24 @@
 ; We want modules defined in subdirectories (such as mina_base) to be available
 ; in the top level.
+
 (include_subdirs unqualified)
 
 (library
-  (name mina_wire_types)
-  (public_name mina_wire_types)
-  (libraries
-    ; Keep these dependencies to an absolute minimum
-    integers
-    pasta_bindings
-    kimchi_types
-    kimchi_bindings
-    blake2
-    )
-  (preprocess (pps ppx_version))
-  (instrumentation (backend bisect_ppx)))
+ (name mina_wire_types)
+ (public_name mina_wire_types)
+ (libraries
+  ; Keep these dependencies to an absolute minimum
+  integers
+  pasta_bindings
+  kimchi_types
+  kimchi_bindings
+  blake2)
+ (preprocess
+  (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx)))
 
 ; Include index.mld in generated doc
-(documentation (package mina_wire_types))
+
+(documentation
+ (package mina_wire_types))
diff --git a/src/lib/mina_wire_types/test/dune b/src/lib/mina_wire_types/test/dune
index dae9cf14f82..38cf163451b 100644
--- a/src/lib/mina_wire_types/test/dune
+++ b/src/lib/mina_wire_types/test/dune
@@ -1,44 +1,44 @@
 (include_subdirs no)
 
 (test
-  (name type_equalities)
-  (libraries
-    mina_wire_types
-    currency
-    snark_params
-    signature_lib
-    mina_base
-    mina_base.import
-    mina_numbers
-    block_time
-    one_or_two
-    mina_transaction
-    mina_state
-    mina_transaction_logic
-    transaction_snark
-    transaction_snark_work
-    ledger_proof
-    network_pool
-    consensus
-    consensus.vrf
-    protocol_version
-    genesis_constants
-    mina_block
-    ; Necessary for the type equality
-    sgn
-    sgn_type
-    data_hash_lib
-    kimchi_pasta
-    kimchi_pasta.basic
-    kimchi_backend
-    pickles
-    pickles.backend
-    pickles_base
-    pasta_bindings
-    blake2
-    staged_ledger_diff
-    bounded_types
-    )
-  (preprocess (pps ppx_version))
-  (instrumentation (backend bisect_ppx))
-  )
+ (name type_equalities)
+ (libraries
+  mina_wire_types
+  currency
+  snark_params
+  signature_lib
+  mina_base
+  mina_base.import
+  mina_numbers
+  block_time
+  one_or_two
+  mina_transaction
+  mina_state
+  mina_transaction_logic
+  transaction_snark
+  transaction_snark_work
+  ledger_proof
+  network_pool
+  consensus
+  consensus.vrf
+  protocol_version
+  genesis_constants
+  mina_block
+  ; Necessary for the type equality
+  sgn
+  sgn_type
+  data_hash_lib
+  kimchi_pasta
+  kimchi_pasta.basic
+  kimchi_backend
+  pickles
+  pickles.backend
+  pickles_base
+  pasta_bindings
+  blake2
+  staged_ledger_diff
+  bounded_types)
+ (preprocess
+  (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/monad_lib/dune b/src/lib/monad_lib/dune
index ea527d662e0..82013a11fef 100644
--- a/src/lib/monad_lib/dune
+++ b/src/lib/monad_lib/dune
@@ -2,5 +2,7 @@
  (name monad_lib)
  (public_name monad_lib)
  (libraries core_kernel)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane)))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane)))
diff --git a/src/lib/network_peer/dune b/src/lib/network_peer/dune
index 1b0927ff813..c5e063b7a0d 100644
--- a/src/lib/network_peer/dune
+++ b/src/lib/network_peer/dune
@@ -2,21 +2,22 @@
  (name network_peer)
  (public_name network_peer)
  (libraries
-   ;; opam libraries
-   core
-   async
-   async.async_rpc
-   async_rpc_kernel
-   core_kernel
-   bin_prot.shape
-   sexplib0
-   base.caml
-   base.base_internalhash_types
-   result
-   async_kernel
-   mina_metrics
-   ppx_version.runtime
-   bounded_types
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_compare ppx_mina ppx_version ppx_jane ppx_deriving_yojson)))
+  ;; opam libraries
+  core
+  async
+  async.async_rpc
+  async_rpc_kernel
+  core_kernel
+  bin_prot.shape
+  sexplib0
+  base.caml
+  base.base_internalhash_types
+  result
+  async_kernel
+  mina_metrics
+  ppx_version.runtime
+  bounded_types)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_compare ppx_mina ppx_version ppx_jane ppx_deriving_yojson)))
diff --git a/src/lib/network_pool/dune b/src/lib/network_pool/dune
index abb5daf99b5..892189e18c7 100644
--- a/src/lib/network_pool/dune
+++ b/src/lib/network_pool/dune
@@ -1,84 +1,101 @@
 (library
  (name network_pool)
  (public_name network_pool)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (library_flags -linkall)
  (libraries
-   ;; opam libraries
-   result
-   async_unix
-   base.base_internalhash_types
-   base
-   stdio
-   async_kernel
-   core_kernel
-   core
-   async
-   sexplib0
-   base.caml
-   bin_prot.shape
-   ppx_inline_test.config
-   integers
-   ;; local libraries
-   bounded_types
-   mina_generators
-   sgn
-   sgn_type
-   transition_frontier_base
-   staged_ledger
-   child_processes
-   precomputed_values
-   o1trace
-   snark_work_lib
-   mina_net2
-   logger
-   transaction_snark_work
-   genesis_constants
-   mina_numbers
-   mina_transaction_logic
-   transition_frontier
-   ledger_proof
-   verifier
-   pipe_lib
-   one_or_two
-   quickcheck_lib
-   mina_base
-   mina_transaction
-   mina_state
-   transaction_snark
-   consensus
-   network_peer
-   currency
-   trust_system
-   block_time
-   transition_frontier_extensions
-   signature_lib
-   mina_signature_kind
-   pickles
-   pickles_types
-   pickles.backend
-   random_oracle
-   error_json
-   mina_metrics
-   interruptible
-   merkle_ledger
-   data_hash_lib
-   with_hash
-   mina_ledger
-   mina_base.import
-   snark_params
-   zkapp_command_builder
-   ppx_version.runtime
-   random_oracle_input
-   kimchi_backend
-   kimchi_backend_common
-   kimchi_pasta
-   kimchi_pasta.basic
-   coda_genesis_ledger
-   staged_ledger_diff
-   mina_wire_types
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_base ppx_mina ppx_version ppx_register_event ppx_let ppx_assert ppx_pipebang ppx_deriving.std ppx_sexp_conv ppx_bin_prot ppx_custom_printf ppx_inline_test ppx_snarky ppx_deriving_yojson ppx_fields_conv))
+  ;; opam libraries
+  result
+  async_unix
+  base.base_internalhash_types
+  base
+  stdio
+  async_kernel
+  core_kernel
+  core
+  async
+  sexplib0
+  base.caml
+  bin_prot.shape
+  ppx_inline_test.config
+  integers
+  ;; local libraries
+  bounded_types
+  mina_generators
+  sgn
+  sgn_type
+  transition_frontier_base
+  staged_ledger
+  child_processes
+  precomputed_values
+  o1trace
+  snark_work_lib
+  mina_net2
+  logger
+  transaction_snark_work
+  genesis_constants
+  mina_numbers
+  mina_transaction_logic
+  transition_frontier
+  ledger_proof
+  verifier
+  pipe_lib
+  one_or_two
+  quickcheck_lib
+  mina_base
+  mina_transaction
+  mina_state
+  transaction_snark
+  consensus
+  network_peer
+  currency
+  trust_system
+  block_time
+  transition_frontier_extensions
+  signature_lib
+  mina_signature_kind
+  pickles
+  pickles_types
+  pickles.backend
+  random_oracle
+  error_json
+  mina_metrics
+  interruptible
+  merkle_ledger
+  data_hash_lib
+  with_hash
+  mina_ledger
+  mina_base.import
+  snark_params
+  zkapp_command_builder
+  ppx_version.runtime
+  random_oracle_input
+  kimchi_backend
+  kimchi_backend_common
+  kimchi_pasta
+  kimchi_pasta.basic
+  coda_genesis_ledger
+  staged_ledger_diff
+  mina_wire_types)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_base
+   ppx_mina
+   ppx_version
+   ppx_register_event
+   ppx_let
+   ppx_assert
+   ppx_pipebang
+   ppx_deriving.std
+   ppx_sexp_conv
+   ppx_bin_prot
+   ppx_custom_printf
+   ppx_inline_test
+   ppx_snarky
+   ppx_deriving_yojson
+   ppx_fields_conv))
  (synopsis
-   "Network pool is an interface that processes incoming diffs and then broadcasts them"))
+  "Network pool is an interface that processes incoming diffs and then broadcasts them"))
diff --git a/src/lib/network_pool/test/dune b/src/lib/network_pool/test/dune
index 9653b630f7d..e880ee53664 100644
--- a/src/lib/network_pool/test/dune
+++ b/src/lib/network_pool/test/dune
@@ -41,11 +41,6 @@
   mina_transaction
   with_hash)
  (preprocess
-  (pps
-   ppx_base
-   ppx_let
-   ppx_custom_printf
-   ppx_assert))
+  (pps ppx_base ppx_let ppx_custom_printf ppx_assert))
  (instrumentation
   (backend bisect_ppx)))
-
diff --git a/src/lib/node_addrs_and_ports/dune b/src/lib/node_addrs_and_ports/dune
index 21c13c0b274..7ec2813bd6b 100644
--- a/src/lib/node_addrs_and_ports/dune
+++ b/src/lib/node_addrs_and_ports/dune
@@ -2,19 +2,21 @@
  (name node_addrs_and_ports)
  (public_name node_addrs_and_ports)
  (libraries
-   ;; opam libraries
-   core
-   async
-   yojson
-   sexplib0
-   base.caml
-   core_kernel
-   bin_prot.shape
-   ;; local libraries
-   network_peer
-   ppx_version.runtime
-   bounded_types
- )
- (inline_tests (flags -verbose -show-counts))
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane ppx_let ppx_deriving_yojson)))
+  ;; opam libraries
+  core
+  async
+  yojson
+  sexplib0
+  base.caml
+  core_kernel
+  bin_prot.shape
+  ;; local libraries
+  network_peer
+  ppx_version.runtime
+  bounded_types)
+ (inline_tests
+  (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane ppx_let ppx_deriving_yojson)))
diff --git a/src/lib/node_config/dune b/src/lib/node_config/dune
index 019dba43c42..033f056dd83 100644
--- a/src/lib/node_config/dune
+++ b/src/lib/node_config/dune
@@ -1,11 +1,9 @@
 (library
  (name node_config)
  (public_name mina_node_config)
- (libraries
-   node_config_intf
-   node_config_version
-   )
+ (libraries node_config_intf node_config_version)
  (preprocessor_deps ../../config.mlh)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_base ppx_optcomp))
-)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_base ppx_optcomp)))
diff --git a/src/lib/node_config/for_unit_tests/dune b/src/lib/node_config/for_unit_tests/dune
index 003ed5d630e..be13bbe37d0 100644
--- a/src/lib/node_config/for_unit_tests/dune
+++ b/src/lib/node_config/for_unit_tests/dune
@@ -1,10 +1,8 @@
 (library
  (name node_config_for_unit_tests)
  (public_name mina_node_config.for_unit_tests)
- (libraries
-   node_config_intf
-   node_config_version
-   )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_base ppx_optcomp))
-)
+ (libraries node_config_intf node_config_version)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_base ppx_optcomp)))
diff --git a/src/lib/node_config/intf/dune b/src/lib/node_config/intf/dune
index b7f80d092f6..0a7e2fc7440 100644
--- a/src/lib/node_config/intf/dune
+++ b/src/lib/node_config/intf/dune
@@ -2,6 +2,7 @@
  (name node_config_intf)
  (public_name mina_node_config.intf)
  (modules_without_implementation node_config_intf)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_base ppx_optcomp))
-)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_base ppx_optcomp)))
diff --git a/src/lib/node_config/version/dune b/src/lib/node_config/version/dune
index e44cc2d039e..61d1f79144b 100644
--- a/src/lib/node_config/version/dune
+++ b/src/lib/node_config/version/dune
@@ -2,6 +2,7 @@
  (name node_config_version)
  (public_name mina_node_config.version)
  (libraries node_config_intf)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_base ppx_optcomp))
-)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_base ppx_optcomp)))
diff --git a/src/lib/node_error_service/dune b/src/lib/node_error_service/dune
index 60ff87630d2..4aeb5d59134 100644
--- a/src/lib/node_error_service/dune
+++ b/src/lib/node_error_service/dune
@@ -1,42 +1,45 @@
 (library
-  (name node_error_service)
-  (public_name node_error_service)
-  (inline_tests (flags -verbose -show-counts))
-  (libraries
-    ;; opam libraries
-    core.uuid
-    uri
-    cohttp-async
-    async
-    core_kernel
-    core
-    cohttp
-    async_kernel
-    core_kernel.uuid
-    integers
-    base.caml
-    ;; local libraries
-    error_json
-    transition_frontier_base
-    rfc3339_time
-    gossip_net
-    signature_lib
-    network_peer
-    mina_base
-    mina_networking
-    mina_incremental
-    sync_status
-    pipe_lib
-    transition_frontier
-    logger
-    node_addrs_and_ports
-    participating_state
-    mina_metrics
-    mina_block
-    mina_state
-    consensus
-    mina_numbers
-   )
-  (preprocess (pps ppx_jane ppx_deriving.std ppx_mina ppx_version))
-  (instrumentation (backend bisect_ppx))
-  (synopsis "Node error service library for collection error report from nodes"))
+ (name node_error_service)
+ (public_name node_error_service)
+ (inline_tests
+  (flags -verbose -show-counts))
+ (libraries
+  ;; opam libraries
+  core.uuid
+  uri
+  cohttp-async
+  async
+  core_kernel
+  core
+  cohttp
+  async_kernel
+  core_kernel.uuid
+  integers
+  base.caml
+  ;; local libraries
+  error_json
+  transition_frontier_base
+  rfc3339_time
+  gossip_net
+  signature_lib
+  network_peer
+  mina_base
+  mina_networking
+  mina_incremental
+  sync_status
+  pipe_lib
+  transition_frontier
+  logger
+  node_addrs_and_ports
+  participating_state
+  mina_metrics
+  mina_block
+  mina_state
+  consensus
+  mina_numbers)
+ (preprocess
+  (pps ppx_jane ppx_deriving.std ppx_mina ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (synopsis
+  "Node error service library for collection error report from nodes"))
diff --git a/src/lib/node_status_service/dune b/src/lib/node_status_service/dune
index 486b9f167fa..e79588d7445 100644
--- a/src/lib/node_status_service/dune
+++ b/src/lib/node_status_service/dune
@@ -1,39 +1,41 @@
 (library
-  (name node_status_service)
-  (public_name node_status_service)
-  (inline_tests (flags -verbose -show-counts))
+ (name node_status_service)
+ (public_name node_status_service)
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   core
-   core.linux_ext
-   cohttp-async
-   async
-   core_kernel
-   cohttp
-   async_kernel
-   uri
-   integers
-   base.caml
-   ;; local libraries
-   network_peer
-   mina_base
-   mina_networking
-   mina_incremental
-   sync_status
-   pipe_lib
-   transition_frontier
-   mina_metrics
-   logger
-   rfc3339_time
-   transition_frontier_base
-   node_addrs_and_ports
-   block_time
-   mina_numbers
-   mina_block
-   mina_state
-   consensus
-   o1trace
-   )
-  (preprocess (pps ppx_jane ppx_deriving.std ppx_mina ppx_version))
-  (instrumentation (backend bisect_ppx))
-  (synopsis "Node status service library for collect data from nodes"))
+  ;; opam libraries
+  core
+  core.linux_ext
+  cohttp-async
+  async
+  core_kernel
+  cohttp
+  async_kernel
+  uri
+  integers
+  base.caml
+  ;; local libraries
+  network_peer
+  mina_base
+  mina_networking
+  mina_incremental
+  sync_status
+  pipe_lib
+  transition_frontier
+  mina_metrics
+  logger
+  rfc3339_time
+  transition_frontier_base
+  node_addrs_and_ports
+  block_time
+  mina_numbers
+  mina_block
+  mina_state
+  consensus
+  o1trace)
+ (preprocess
+  (pps ppx_jane ppx_deriving.std ppx_mina ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (synopsis "Node status service library for collect data from nodes"))
diff --git a/src/lib/non_zero_curve_point/dune b/src/lib/non_zero_curve_point/dune
index ea811345513..eb3b42547c2 100644
--- a/src/lib/non_zero_curve_point/dune
+++ b/src/lib/non_zero_curve_point/dune
@@ -2,34 +2,48 @@
  (name non_zero_curve_point)
  (public_name non_zero_curve_point)
  (flags :standard -short-paths)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (library_flags -linkall)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   base.caml
-   sexplib0
-   core_kernel
-   bin_prot.shape
-   base
-   base.base_internalhash_types
-   ;; local libraries
-   mina_wire_types
-   snarky.backendless
-   random_oracle_input
-   pickles.backend
-   pickles
-   codable
-   snark_params
-   fold_lib
-   base58_check
-   random_oracle
-   bitstring_lib
-   kimchi_pasta
-   kimchi_pasta.basic
-   test_util
-   ppx_version.runtime
- )
+  ;; opam libraries
+  ppx_inline_test.config
+  base.caml
+  sexplib0
+  core_kernel
+  bin_prot.shape
+  base
+  base.base_internalhash_types
+  ;; local libraries
+  mina_wire_types
+  snarky.backendless
+  random_oracle_input
+  pickles.backend
+  pickles
+  codable
+  snark_params
+  fold_lib
+  base58_check
+  random_oracle
+  bitstring_lib
+  kimchi_pasta
+  kimchi_pasta.basic
+  test_util
+  ppx_version.runtime)
  (preprocess
-  (pps ppx_snarky ppx_mina ppx_version ppx_let ppx_hash ppx_compare ppx_sexp_conv ppx_bin_prot ppx_inline_test ppx_deriving_yojson ppx_compare h_list.ppx ppx_custom_printf))
- (instrumentation (backend bisect_ppx)))
+  (pps
+   ppx_snarky
+   ppx_mina
+   ppx_version
+   ppx_let
+   ppx_hash
+   ppx_compare
+   ppx_sexp_conv
+   ppx_bin_prot
+   ppx_inline_test
+   ppx_deriving_yojson
+   ppx_compare
+   h_list.ppx
+   ppx_custom_printf))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/o1trace/dune b/src/lib/o1trace/dune
index 29cf14ed330..b9f3aa24921 100644
--- a/src/lib/o1trace/dune
+++ b/src/lib/o1trace/dune
@@ -2,19 +2,22 @@
  (name o1trace)
  (public_name o1trace)
  (libraries
-   ;;opam libraries
-   async
-   async_kernel
-   async_unix
-   base.base_internalhash_types
-   core
-   core_kernel
-   ocamlgraph
-   ppx_inline_test.config
-   sexplib0
-   ;;local libraries
-   logger)
- (inline_tests (flags -verbose -show-counts))
+  ;;opam libraries
+  async
+  async_kernel
+  async_unix
+  base.base_internalhash_types
+  core
+  core_kernel
+  ocamlgraph
+  ppx_inline_test.config
+  sexplib0
+  ;;local libraries
+  logger)
+ (inline_tests
+  (flags -verbose -show-counts))
  (synopsis "Basic event tracing")
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane ppx_mina)))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane ppx_mina)))
diff --git a/src/lib/o1trace/webkit_event/dune b/src/lib/o1trace/webkit_event/dune
index a939e4c5979..fdeec844804 100644
--- a/src/lib/o1trace/webkit_event/dune
+++ b/src/lib/o1trace/webkit_event/dune
@@ -2,20 +2,21 @@
  (public_name o1trace_webkit_event)
  (name o1trace_webkit_event)
  (libraries
-   ;; opam libraries
-   base
-   base.caml
-   async
-   async_kernel
-   async_unix
-   core
-   core.time_stamp_counter
-   core_kernel
-   sexplib0
-   ;; local libraries
-   webkit_trace_event.binary
-   webkit_trace_event
-   o1trace
-)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane)))
+  ;; opam libraries
+  base
+  base.caml
+  async
+  async_kernel
+  async_unix
+  core
+  core.time_stamp_counter
+  core_kernel
+  sexplib0
+  ;; local libraries
+  webkit_trace_event.binary
+  webkit_trace_event
+  o1trace)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane)))
diff --git a/src/lib/one_or_two/dune b/src/lib/one_or_two/dune
index c552d87de9f..3eac81b510d 100644
--- a/src/lib/one_or_two/dune
+++ b/src/lib/one_or_two/dune
@@ -3,7 +3,7 @@
  (public_name one_or_two)
  (flags :standard -short-paths)
  (library_flags -linkall)
-(libraries
+ (libraries
   ;; opam libraries
   bin_prot.shape
   base
@@ -12,9 +12,14 @@
   ppx_hash.runtime-lib
   sexplib0
   base.caml
-  ppx_version.runtime
-)
+  ppx_version.runtime)
  (preprocess
-  (pps ppx_base ppx_bin_prot ppx_version ppx_deriving.std ppx_deriving_yojson ppx_let))
- (instrumentation (backend bisect_ppx))
-)
+  (pps
+   ppx_base
+   ppx_bin_prot
+   ppx_version
+   ppx_deriving.std
+   ppx_deriving_yojson
+   ppx_let))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/otp_lib/dune b/src/lib/otp_lib/dune
index bb9f8c6e232..52a6f296603 100644
--- a/src/lib/otp_lib/dune
+++ b/src/lib/otp_lib/dune
@@ -1,14 +1,16 @@
 (library
  (name otp_lib)
  (public_name otp_lib)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   core_kernel
-   async_kernel
-   ppx_inline_test.config
-   ;; local libraries
-   pipe_lib
-   )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane)))
+  ;; opam libraries
+  core_kernel
+  async_kernel
+  ppx_inline_test.config
+  ;; local libraries
+  pipe_lib)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane)))
diff --git a/src/lib/outside_hash_image/dune b/src/lib/outside_hash_image/dune
index f0c4f0fe2cb..cac7851610e 100644
--- a/src/lib/outside_hash_image/dune
+++ b/src/lib/outside_hash_image/dune
@@ -2,5 +2,7 @@
  (name outside_hash_image)
  (public_name outside_hash_image)
  (libraries snark_params)
- (preprocess (pps ppx_version))
- (instrumentation (backend bisect_ppx)))
+ (preprocess
+  (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/parallel/dune b/src/lib/parallel/dune
index b22da93c720..bfd2740f499 100644
--- a/src/lib/parallel/dune
+++ b/src/lib/parallel/dune
@@ -3,15 +3,15 @@
  (public_name parallel)
  (library_flags -linkall)
  (libraries
-   ;; opam libraries
-   async_rpc_kernel
-   async
-   core
-   rpc_parallel
-   async.async_rpc
-   core_kernel
- )
+  ;; opam libraries
+  async_rpc_kernel
+  async
+  core
+  rpc_parallel
+  async.async_rpc
+  core_kernel)
  (preprocess
   (pps ppx_version ppx_jane ppx_compare))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Template code to run programs that rely Rpc_parallel.Expert"))
diff --git a/src/lib/parallel_scan/dune b/src/lib/parallel_scan/dune
index 3f6ccc9f548..c590beed405 100644
--- a/src/lib/parallel_scan/dune
+++ b/src/lib/parallel_scan/dune
@@ -1,30 +1,31 @@
 (library
  (name parallel_scan)
  (public_name parallel_scan)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (library_flags -linkall)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   base
-   core_kernel
-   sexplib0
-   async
-   digestif
-   core
-   lens
-   async_kernel
-   bin_prot.shape
-   base.caml
-   async_unix
-   ;; local libraries
-   mina_metrics
-   mina_stdlib
-   pipe_lib
-   state_or_error
-   ppx_version.runtime
- )
+  ;; opam libraries
+  ppx_inline_test.config
+  base
+  core_kernel
+  sexplib0
+  async
+  digestif
+  core
+  lens
+  async_kernel
+  bin_prot.shape
+  base.caml
+  async_unix
+  ;; local libraries
+  mina_metrics
+  mina_stdlib
+  pipe_lib
+  state_or_error
+  ppx_version.runtime)
  (preprocess
   (pps ppx_jane ppx_mina ppx_version ppx_compare lens.ppx_deriving))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Parallel scan over an infinite stream (incremental map-reduce)"))
diff --git a/src/lib/participating_state/dune b/src/lib/participating_state/dune
index cd5d7df4c10..4236ff4c713 100644
--- a/src/lib/participating_state/dune
+++ b/src/lib/participating_state/dune
@@ -1,6 +1,8 @@
 (library
  (name participating_state)
  (public_name participating_state)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (libraries async_kernel core_kernel base))
diff --git a/src/lib/perf_histograms/dune b/src/lib/perf_histograms/dune
index deccd3d8a9c..3948bfa8948 100644
--- a/src/lib/perf_histograms/dune
+++ b/src/lib/perf_histograms/dune
@@ -3,24 +3,25 @@
  (public_name perf_histograms)
  (library_flags -linkall)
  (modules perf_histograms0 perf_histograms histogram rpc intf)
- (inline_tests (flags -verbose -show-counts))
-(libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   bin_prot.shape
-   async_rpc_kernel
-   yojson
-   async
-   core
-   core_kernel
-   ppx_deriving_yojson.runtime
-   async.async_rpc
-   base.caml
-   async_kernel
-   ;; local libraries
-   mina_metrics
-)
+ (inline_tests
+  (flags -verbose -show-counts))
+ (libraries
+  ;; opam libraries
+  ppx_inline_test.config
+  bin_prot.shape
+  async_rpc_kernel
+  yojson
+  async
+  core
+  core_kernel
+  ppx_deriving_yojson.runtime
+  async.async_rpc
+  base.caml
+  async_kernel
+  ;; local libraries
+  mina_metrics)
  (preprocess
   (pps ppx_version ppx_jane ppx_compare ppx_deriving_yojson))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Performance monitoring with histograms"))
diff --git a/src/lib/pickles/backend/dune b/src/lib/pickles/backend/dune
index 5ba47f763b4..01ce6707c9e 100644
--- a/src/lib/pickles/backend/dune
+++ b/src/lib/pickles/backend/dune
@@ -1,10 +1,8 @@
 (library
  (name backend)
  (public_name pickles.backend)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_mina ppx_jane ppx_deriving.std ppx_deriving_yojson ))
- (libraries
-   kimchi_backend
-   kimchi_pasta
-   kimchi_pasta.basic
-))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_mina ppx_jane ppx_deriving.std ppx_deriving_yojson))
+ (libraries kimchi_backend kimchi_pasta kimchi_pasta.basic))
diff --git a/src/lib/pickles/composition_types/dune b/src/lib/pickles/composition_types/dune
index 16bcfac638a..9d73c055e9f 100644
--- a/src/lib/pickles/composition_types/dune
+++ b/src/lib/pickles/composition_types/dune
@@ -15,14 +15,21 @@
  ; we use the `_intf` module naming pattern (see
  ; https://www.craigfe.io/posts/the-intf-trick for a rationale)
  (flags
-  (:standard
-    -w +a-40..42-44
-    -warn-error +a-70-27)
-  -open Core_kernel)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_mina ppx_jane ppx_deriving.std ppx_deriving_yojson h_list.ppx ))
+  (:standard -w +a-40..42-44 -warn-error +a-70-27)
+  -open
+  Core_kernel)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_version
+   ppx_mina
+   ppx_jane
+   ppx_deriving.std
+   ppx_deriving_yojson
+   h_list.ppx))
  (libraries
-   ;; opam libraries
+  ;; opam libraries
   sexplib0
   bin_prot.shape
   core_kernel
@@ -38,6 +45,4 @@
   pickles_base
   pickles.backend
   kimchi_backend_common
-  ppx_version.runtime
-  )
- )
+  ppx_version.runtime))
diff --git a/src/lib/pickles/dune b/src/lib/pickles/dune
index 8016271a4d7..78b5dc2fe2e 100644
--- a/src/lib/pickles/dune
+++ b/src/lib/pickles/dune
@@ -1,16 +1,13 @@
 (library
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (name pickles)
  (public_name pickles)
- (modules_without_implementation
-  full_signature
-  type
-  intf
-  pickles_intf)
+ (modules_without_implementation full_signature type intf pickles_intf)
  (flags
-  (:standard -w +a-40..42-44
-             -warn-error +a-27)
-   -open Core_kernel)
+  (:standard -w +a-40..42-44 -warn-error +a-27)
+  -open
+  Core_kernel)
  (instrumentation
   (backend bisect_ppx))
  (preprocess
@@ -22,58 +19,57 @@
    ppx_deriving_yojson
    h_list.ppx))
  (libraries
-   ;; opam libraries
-   stdio
-   integers
-   result
-   base.caml
-   bignum.bigint
-   core_kernel
-   base64
-   digestif
-   ppx_inline_test.config
-   sexplib0
-   base
-   async_kernel
-   bin_prot.shape
-   ;; local libraries
-   mina_wire_types
-   kimchi_bindings
-   kimchi_types
-   pasta_bindings
-   kimchi_pasta
-   kimchi_pasta.basic
-   kimchi_pasta.constraint_system
-   kimchi_pasta_snarky_backend
-   bitstring_lib
-   snarky.intf
-   pickles.backend
-   pickles_types
-   snarky.backendless
-   snarky_group_map
-   sponge
-   pickles.pseudo
-   pickles.limb_vector
-   pickles_base
-   plonkish_prelude
-   kimchi_backend
-   base58_check
-   codable
-   random_oracle_input
-   pickles.composition_types
-   pickles.plonk_checks
-   pickles_base.one_hot_vector
-   snarky_log
-   group_map
-   snarky_curve
-   key_cache
-   snark_keys_header
-   tuple_lib
-   promise
-   kimchi_backend_common
-   logger
-   logger.context_logger
-   ppx_version.runtime
-   error_json
-   bounded_types
-))
+  ;; opam libraries
+  stdio
+  integers
+  result
+  base.caml
+  bignum.bigint
+  core_kernel
+  base64
+  digestif
+  ppx_inline_test.config
+  sexplib0
+  base
+  async_kernel
+  bin_prot.shape
+  ;; local libraries
+  mina_wire_types
+  kimchi_bindings
+  kimchi_types
+  pasta_bindings
+  kimchi_pasta
+  kimchi_pasta.basic
+  kimchi_pasta.constraint_system
+  kimchi_pasta_snarky_backend
+  bitstring_lib
+  snarky.intf
+  pickles.backend
+  pickles_types
+  snarky.backendless
+  snarky_group_map
+  sponge
+  pickles.pseudo
+  pickles.limb_vector
+  pickles_base
+  plonkish_prelude
+  kimchi_backend
+  base58_check
+  codable
+  random_oracle_input
+  pickles.composition_types
+  pickles.plonk_checks
+  pickles_base.one_hot_vector
+  snarky_log
+  group_map
+  snarky_curve
+  key_cache
+  snark_keys_header
+  tuple_lib
+  promise
+  kimchi_backend_common
+  logger
+  logger.context_logger
+  ppx_version.runtime
+  error_json
+  bounded_types))
diff --git a/src/lib/pickles/limb_vector/dune b/src/lib/pickles/limb_vector/dune
index 5b2577dc254..2010d4aaf28 100644
--- a/src/lib/pickles/limb_vector/dune
+++ b/src/lib/pickles/limb_vector/dune
@@ -2,25 +2,25 @@
  (name limb_vector)
  (public_name pickles.limb_vector)
  (flags
-   (:standard
-    -w +a-40..42-44
-    -warn-error +a)
-    -open Core_kernel)
+  (:standard -w +a-40..42-44 -warn-error +a)
+  -open
+  Core_kernel)
  (modules_without_implementation limb_vector)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_mina ppx_jane ppx_deriving.std ppx_deriving_yojson ))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_mina ppx_jane ppx_deriving.std ppx_deriving_yojson))
  (libraries
-   ;; opam libraries
-   bin_prot.shape
-   sexplib0
-   core_kernel
-   base.caml
-   result
-   ;; local libraries
-   snarky.backendless
-   pickles.backend
-   pickles_types
-   kimchi_pasta
-   kimchi_pasta.basic
-   ppx_version.runtime
-))
+  ;; opam libraries
+  bin_prot.shape
+  sexplib0
+  core_kernel
+  base.caml
+  result
+  ;; local libraries
+  snarky.backendless
+  pickles.backend
+  pickles_types
+  kimchi_pasta
+  kimchi_pasta.basic
+  ppx_version.runtime))
diff --git a/src/lib/pickles/limb_vector/test/dune b/src/lib/pickles/limb_vector/test/dune
index a02db51996c..267eed800bc 100644
--- a/src/lib/pickles/limb_vector/test/dune
+++ b/src/lib/pickles/limb_vector/test/dune
@@ -2,10 +2,13 @@
  (names test_constant)
  (flags
   (:standard -warn-error +a)
-  -open Core_kernel
-  -open Limb_vector
-  )
+  -open
+  Core_kernel
+  -open
+  Limb_vector)
  (package pickles)
- (preprocess (pps ppx_jane))
+ (preprocess
+  (pps ppx_jane))
  (libraries alcotest core_kernel pickles pickles.limb_vector)
- (action (run %{test})))
+ (action
+  (run %{test})))
diff --git a/src/lib/pickles/plonk_checks/dune b/src/lib/pickles/plonk_checks/dune
index b08feb7819c..44f2e1db1b8 100644
--- a/src/lib/pickles/plonk_checks/dune
+++ b/src/lib/pickles/plonk_checks/dune
@@ -1,29 +1,29 @@
 (library
  (name plonk_checks)
  (public_name pickles.plonk_checks)
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (flags
-  (:standard
-    -w +a-40..42-44
-    -warn-error +a-4-70)
-  -open Core_kernel)
- (preprocess (pps ppx_mina ppx_version ppx_jane ppx_deriving.std ppx_deriving_yojson))
+  (:standard -w +a-40..42-44 -warn-error +a-4-70)
+  -open
+  Core_kernel)
+ (preprocess
+  (pps ppx_mina ppx_version ppx_jane ppx_deriving.std ppx_deriving_yojson))
  (libraries
-   ;; opam libraries
-   sexplib0
-   ppxlib.ast
-   core_kernel
-   ocaml-migrate-parsetree
-   base.base_internalhash_types
-   ;; local libraries
-   pickles_types
-   pickles_base
-   pickles.composition_types
-   kimchi_backend
-   kimchi_types
-   snarky.backendless
-   tuple_lib
- ))
+  ;; opam libraries
+  sexplib0
+  ppxlib.ast
+  core_kernel
+  ocaml-migrate-parsetree
+  base.base_internalhash_types
+  ;; local libraries
+  pickles_types
+  pickles_base
+  pickles.composition_types
+  kimchi_backend
+  kimchi_types
+  snarky.backendless
+  tuple_lib))
 
 (rule
  (target scalars.ml)
diff --git a/src/lib/pickles/plonk_checks/gen_scalars/dune b/src/lib/pickles/plonk_checks/gen_scalars/dune
index 2c0d1635198..3e08abc11e0 100644
--- a/src/lib/pickles/plonk_checks/gen_scalars/dune
+++ b/src/lib/pickles/plonk_checks/gen_scalars/dune
@@ -2,20 +2,20 @@
  (name gen_scalars)
  (modes native)
  (flags
-  (:standard
-    -w +a-40..42-44
-    -warn-error +a)
-  -open Core_kernel)
+  (:standard -w +a-40..42-44 -warn-error +a)
+  -open
+  Core_kernel)
  (link_flags (-linkall))
  (libraries
-   ;; opam libraries
-   core_kernel
-   stdio
-   base
-   ;; local libraries
-   kimchi_bindings
-   kimchi_types
-   pasta_bindings
-)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version)))
+  ;; opam libraries
+  core_kernel
+  stdio
+  base
+  ;; local libraries
+  kimchi_bindings
+  kimchi_types
+  pasta_bindings)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version)))
diff --git a/src/lib/pickles/pseudo/dune b/src/lib/pickles/pseudo/dune
index 9d815bc9b84..67a24708654 100644
--- a/src/lib/pickles/pseudo/dune
+++ b/src/lib/pickles/pseudo/dune
@@ -2,20 +2,19 @@
  (name pseudo)
  (public_name pickles.pseudo)
  (flags
-  (:standard
-    -w +a-40..42-44
-    -warn-error +a)
-  -open Core_kernel)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_mina ppx_jane ppx_deriving.std ppx_deriving_yojson ))
+  (:standard -w +a-40..42-44 -warn-error +a)
+  -open
+  Core_kernel)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_mina ppx_jane ppx_deriving.std ppx_deriving_yojson))
  (libraries
-   ;; opam libraries
-   core_kernel
-   ;; local libraries
-   pickles_types
-   pickles.plonk_checks
-   pickles_base.one_hot_vector
-   snarky.backendless
-   pickles_base
- )
-)
+  ;; opam libraries
+  core_kernel
+  ;; local libraries
+  pickles_types
+  pickles.plonk_checks
+  pickles_base.one_hot_vector
+  snarky.backendless
+  pickles_base))
diff --git a/src/lib/pickles/test/dune b/src/lib/pickles/test/dune
index 172cde734d7..ae0a4a66180 100644
--- a/src/lib/pickles/test/dune
+++ b/src/lib/pickles/test/dune
@@ -2,9 +2,12 @@
  (names main)
  (flags
   (:standard -warn-error +a)
-  -open Core_kernel
-  -open Pickles)
- (preprocess (pps ppx_jane))
+  -open
+  Core_kernel
+  -open
+  Pickles)
+ (preprocess
+  (pps ppx_jane))
  (package pickles)
  (libraries
   ; Opam libraries
@@ -33,6 +36,6 @@
   snark_keys_header
   snarky.backendless
   sponge
-  tuple_lib
-  )
- (action (run %{test})))
+  tuple_lib)
+ (action
+  (run %{test})))
diff --git a/src/lib/pickles/test/optional_custom_gates/dune b/src/lib/pickles/test/optional_custom_gates/dune
index d3ae564b5e7..2c33bf7a810 100644
--- a/src/lib/pickles/test/optional_custom_gates/dune
+++ b/src/lib/pickles/test/optional_custom_gates/dune
@@ -1,5 +1,8 @@
 (tests
- (names test_fix_domains pickles_test_optional_custom_gates lookup_range_check)
+ (names
+  test_fix_domains
+  pickles_test_optional_custom_gates
+  lookup_range_check)
  (libraries
   ;; opam libraries
   alcotest
diff --git a/src/lib/pickles_base/dune b/src/lib/pickles_base/dune
index ae0d36bf404..17ebf908867 100644
--- a/src/lib/pickles_base/dune
+++ b/src/lib/pickles_base/dune
@@ -6,22 +6,30 @@
  ; 44: open-shadow-identifier (the use of Core_kernel makes it ubiquitous)
  (flags
   (:standard -w +a-44 -warn-error +a))
- (instrumentation (backend bisect_ppx))
- (preprocess (pps h_list.ppx ppx_version ppx_mina ppx_jane ppx_deriving.std ppx_deriving_yojson h_list.ppx))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   h_list.ppx
+   ppx_version
+   ppx_mina
+   ppx_jane
+   ppx_deriving.std
+   ppx_deriving_yojson
+   h_list.ppx))
  (libraries
-   ;; opam libraries
-   base.base_internalhash_types
-   sexplib0
-   bin_prot.shape
-   base.caml
-   ppxlib
-   core_kernel
-   ;; local libraries
-   mina_wire_types
-   snarky.backendless
-   random_oracle_input
-   pickles_types
-   pickles_base.one_hot_vector
-   plonkish_prelude
-   ppx_version.runtime
-))
+  ;; opam libraries
+  base.base_internalhash_types
+  sexplib0
+  bin_prot.shape
+  base.caml
+  ppxlib
+  core_kernel
+  ;; local libraries
+  mina_wire_types
+  snarky.backendless
+  random_oracle_input
+  pickles_types
+  pickles_base.one_hot_vector
+  plonkish_prelude
+  ppx_version.runtime))
diff --git a/src/lib/pickles_base/one_hot_vector/dune b/src/lib/pickles_base/one_hot_vector/dune
index 6d668505d46..27773bdf37b 100644
--- a/src/lib/pickles_base/one_hot_vector/dune
+++ b/src/lib/pickles_base/one_hot_vector/dune
@@ -2,16 +2,16 @@
  (name one_hot_vector)
  (public_name pickles_base.one_hot_vector)
  (flags
-   (:standard
-    -w +a-40..42-44
-    -warn-error +a)
-  -open Core_kernel)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane))
+  (:standard -w +a-40..42-44 -warn-error +a)
+  -open
+  Core_kernel)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane))
  (libraries
-   ;; opam libraries
-   core_kernel
-   ;; local libraries
-   snarky.backendless
-   pickles_types
-))
+  ;; opam libraries
+  core_kernel
+  ;; local libraries
+  snarky.backendless
+  pickles_types))
diff --git a/src/lib/pickles_base/test/dune b/src/lib/pickles_base/test/dune
index 83b8e6c7c07..98618b8680d 100644
--- a/src/lib/pickles_base/test/dune
+++ b/src/lib/pickles_base/test/dune
@@ -2,14 +2,16 @@
  (names main)
  (flags
   (:standard -warn-error +a)
-  -open Core_kernel)
- (preprocess (pps ppx_jane))
+  -open
+  Core_kernel)
+ (preprocess
+  (pps ppx_jane))
  (libraries
-   ; Opam
+  ; Opam
   alcotest
   core_kernel
   ; Mina
   pickles_base
-  pickles_types
-  )
- (action (run %{test})))
+  pickles_types)
+ (action
+  (run %{test})))
diff --git a/src/lib/pickles_types/dune b/src/lib/pickles_types/dune
index 5359eff50c6..3720d4e1942 100644
--- a/src/lib/pickles_types/dune
+++ b/src/lib/pickles_types/dune
@@ -24,7 +24,7 @@
  (instrumentation
   (backend bisect_ppx))
  (libraries
-   ;; opam libraries
+  ;; opam libraries
   sexplib0
   result
   core_kernel
@@ -39,5 +39,4 @@
   tuple_lib
   ppx_version.runtime
   bounded_types
-  mina_wire_types
-  ))
+  mina_wire_types))
diff --git a/src/lib/pipe_lib/dune b/src/lib/pipe_lib/dune
index f9b8fd722f0..a25dd583f32 100644
--- a/src/lib/pipe_lib/dune
+++ b/src/lib/pipe_lib/dune
@@ -1,17 +1,19 @@
 (library
  (name pipe_lib)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (public_name pipe_lib)
  (libraries
-   ;; opam libraries
-   sexplib
-   core_kernel
-   async_kernel
-   core
-   ppx_inline_test.config
-   ;; local libraries
-   run_in_thread
-   logger
-)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_jane ppx_deriving.make)))
+  ;; opam libraries
+  sexplib
+  core_kernel
+  async_kernel
+  core
+  ppx_inline_test.config
+  ;; local libraries
+  run_in_thread
+  logger)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_version ppx_jane ppx_deriving.make)))
diff --git a/src/lib/ppx_annot/dune b/src/lib/ppx_annot/dune
index cbc898646f7..aa95595a50e 100644
--- a/src/lib/ppx_annot/dune
+++ b/src/lib/ppx_annot/dune
@@ -3,5 +3,7 @@
  (public_name ppx_annot)
  (kind ppx_deriver)
  (libraries ppxlib core_kernel base compiler-libs)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppxlib.metaquot)))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppxlib.metaquot)))
diff --git a/src/lib/ppx_annot/tests/dune b/src/lib/ppx_annot/tests/dune
index 58382156ffe..2691f9e564b 100644
--- a/src/lib/ppx_annot/tests/dune
+++ b/src/lib/ppx_annot/tests/dune
@@ -1,8 +1,11 @@
 (executable
  (name ppx_annot_tests)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_annot)))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_annot)))
 
 (rule
  (alias runtest)
- (action (run ./ppx_annot_tests.exe)))
+ (action
+  (run ./ppx_annot_tests.exe)))
diff --git a/src/lib/ppx_mina/dune b/src/lib/ppx_mina/dune
index a6a0a9e21ae..a5bd01c973a 100644
--- a/src/lib/ppx_mina/dune
+++ b/src/lib/ppx_mina/dune
@@ -1,4 +1,5 @@
 ;; Don't build tests automatically
+
 (vendored_dirs tests)
 
 (library
@@ -6,17 +7,18 @@
  (public_name ppx_mina)
  (kind ppx_deriver)
  (libraries
-   ;; opam libraries
-   ppx_deriving.api
-   ppxlib
-   ppx_bin_prot
-   core_kernel
-   base
-   base.caml
-   ;; local libraries
-   ppx_representatives
-   ppx_register_event
-   ppx_to_enum
-)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppxlib.metaquot)))
+  ;; opam libraries
+  ppx_deriving.api
+  ppxlib
+  ppx_bin_prot
+  core_kernel
+  base
+  base.caml
+  ;; local libraries
+  ppx_representatives
+  ppx_register_event
+  ppx_to_enum)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppxlib.metaquot)))
diff --git a/src/lib/ppx_mina/ppx_representatives/dune b/src/lib/ppx_mina/ppx_representatives/dune
index 7f74ca00e3b..4ee1232199a 100644
--- a/src/lib/ppx_mina/ppx_representatives/dune
+++ b/src/lib/ppx_mina/ppx_representatives/dune
@@ -3,13 +3,14 @@
  (public_name ppx_representatives)
  (kind ppx_deriver)
  (libraries
-   ;; opam libraries
-   ppxlib.ast
-   ocaml-compiler-libs.common
-   compiler-libs.common
-   ppxlib
-   base
-)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppxlib.metaquot))
+  ;; opam libraries
+  ppxlib.ast
+  ocaml-compiler-libs.common
+  compiler-libs.common
+  ppxlib
+  base)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppxlib.metaquot))
  (ppx_runtime_libraries ppx_representatives.runtime))
diff --git a/src/lib/ppx_mina/ppx_to_enum/dune b/src/lib/ppx_mina/ppx_to_enum/dune
index f076bb358d1..21df058507c 100644
--- a/src/lib/ppx_mina/ppx_to_enum/dune
+++ b/src/lib/ppx_mina/ppx_to_enum/dune
@@ -3,5 +3,7 @@
  (public_name ppx_to_enum)
  (kind ppx_deriver)
  (libraries compiler-libs.common ppxlib base)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppxlib.metaquot)))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppxlib.metaquot)))
diff --git a/src/lib/ppx_register_event/dune b/src/lib/ppx_register_event/dune
index 78c357e1c3f..b64f6d47e2f 100644
--- a/src/lib/ppx_register_event/dune
+++ b/src/lib/ppx_register_event/dune
@@ -3,18 +3,19 @@
  (public_name ppx_register_event)
  (kind ppx_deriver)
  (libraries
-   ;; opam libraries
-   ocaml-compiler-libs.common
-   ppxlib.ast
-   ppx_deriving_yojson
-   core_kernel
-   ppxlib
-   compiler-libs.common
-   ocaml-migrate-parsetree
-   base
-   ;; local libraries
-   interpolator_lib
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppxlib.metaquot))
+  ;; opam libraries
+  ocaml-compiler-libs.common
+  ppxlib.ast
+  ppx_deriving_yojson
+  core_kernel
+  ppxlib
+  compiler-libs.common
+  ocaml-migrate-parsetree
+  base
+  ;; local libraries
+  interpolator_lib)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppxlib.metaquot))
  (ppx_runtime_libraries structured_log_events yojson))
diff --git a/src/lib/ppx_util/dune b/src/lib/ppx_util/dune
index 5118921fa40..cabfcc9dce3 100644
--- a/src/lib/ppx_util/dune
+++ b/src/lib/ppx_util/dune
@@ -2,13 +2,14 @@
  (name ppx_util)
  (public_name ppx_util)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   core_kernel
-   ppxlib
- )
+  ;; opam libraries
+  core_kernel
+  ppxlib)
  (preprocess
   (pps ppx_version ppx_jane ppxlib.metaquot))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "PPX utilities"))
diff --git a/src/lib/ppx_version/dune b/src/lib/ppx_version/dune
index 7c49da249af..9234de609ae 100644
--- a/src/lib/ppx_version/dune
+++ b/src/lib/ppx_version/dune
@@ -1,4 +1,5 @@
 ;; Don't build tests automatically
+
 (vendored_dirs test)
 
 (library
@@ -6,14 +7,16 @@
  (public_name ppx_version)
  (kind ppx_deriver)
  (libraries
-   ;; opam libs
-   compiler-libs.common
-   ppxlib
-   ppxlib.astlib
-   ppx_derivers
-   ppx_bin_prot
-   base base.caml
-   core_kernel
-   ppx_version.runtime
-   bin_prot)
- (preprocess (pps ppx_compare ppxlib.metaquot)))
+  ;; opam libs
+  compiler-libs.common
+  ppxlib
+  ppxlib.astlib
+  ppx_derivers
+  ppx_bin_prot
+  base
+  base.caml
+  core_kernel
+  ppx_version.runtime
+  bin_prot)
+ (preprocess
+  (pps ppx_compare ppxlib.metaquot)))
diff --git a/src/lib/ppx_version/runtime/dune b/src/lib/ppx_version/runtime/dune
index f7e0b6c542b..61310daecd8 100644
--- a/src/lib/ppx_version/runtime/dune
+++ b/src/lib/ppx_version/runtime/dune
@@ -1,11 +1,4 @@
 (library
  (name ppx_version_runtime)
  (public_name ppx_version.runtime)
- (libraries
-   base
-   core_kernel
-   sexplib0
-   bin_prot
-   bin_prot.shape))
-
-
+ (libraries base core_kernel sexplib0 bin_prot bin_prot.shape))
diff --git a/src/lib/precomputed_values/dune b/src/lib/precomputed_values/dune
index f5ba2846016..0dd0a3b0574 100644
--- a/src/lib/precomputed_values/dune
+++ b/src/lib/precomputed_values/dune
@@ -2,24 +2,24 @@
  (name precomputed_values)
  (public_name precomputed_values)
  (libraries
-   ;; opam libraries
-   core
-   core_kernel
-   ;; local libraries
-   genesis_constants
-   mina_state
-   coda_genesis_proof
-   crypto_params
-   mina_base
-   dummy_values
-   snarky.backendless
-   coda_genesis_ledger
-   consensus
-   mina_runtime_config
-   test_genesis_ledger
-   staged_ledger_diff
- )
+  ;; opam libraries
+  core
+  core_kernel
+  ;; local libraries
+  genesis_constants
+  mina_state
+  coda_genesis_proof
+  crypto_params
+  mina_base
+  dummy_values
+  snarky.backendless
+  coda_genesis_ledger
+  consensus
+  mina_runtime_config
+  test_genesis_ledger
+  staged_ledger_diff)
  (ppx_runtime_libraries base)
  (preprocess
   (pps ppx_version ppx_jane ppxlib.metaquot))
- (instrumentation (backend bisect_ppx)))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/promise/dune b/src/lib/promise/dune
index a485fc28147..892c55c007c 100644
--- a/src/lib/promise/dune
+++ b/src/lib/promise/dune
@@ -2,7 +2,9 @@
  (public_name promise)
  (name promise)
  (libraries base async_kernel)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (virtual_modules promise)
  (default_implementation promise.native))
diff --git a/src/lib/promise/js/dune b/src/lib/promise/js/dune
index bb261edc889..b2c2bcfc9a2 100644
--- a/src/lib/promise/js/dune
+++ b/src/lib/promise/js/dune
@@ -1,8 +1,11 @@
 (library
  (public_name promise.js)
  (name promise_js)
- (js_of_ocaml (javascript_files promise.js))
+ (js_of_ocaml
+  (javascript_files promise.js))
  (libraries base async_kernel)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (implements promise))
diff --git a/src/lib/promise/js_helpers/dune b/src/lib/promise/js_helpers/dune
index 3f7ef732f5f..2662139928c 100644
--- a/src/lib/promise/js_helpers/dune
+++ b/src/lib/promise/js_helpers/dune
@@ -2,6 +2,7 @@
  (public_name promise.js_helpers)
  (name promise_js_helpers)
  (libraries promise.js)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
-)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version)))
diff --git a/src/lib/promise/native/dune b/src/lib/promise/native/dune
index 70c7390278d..92e27bf145f 100644
--- a/src/lib/promise/native/dune
+++ b/src/lib/promise/native/dune
@@ -2,6 +2,8 @@
  (public_name promise.native)
  (name promise_native)
  (libraries base async_kernel run_in_thread)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (implements promise))
diff --git a/src/lib/proof_carrying_data/dune b/src/lib/proof_carrying_data/dune
index 32c9d796a7e..b1040ee77dc 100644
--- a/src/lib/proof_carrying_data/dune
+++ b/src/lib/proof_carrying_data/dune
@@ -1,11 +1,16 @@
 (library
  (name proof_carrying_data)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane))
  (libraries
-   ;; opam libraries
-   core_kernel bin_prot.shape base base.caml sexplib0
-   ;; local libraries
-   ppx_version.runtime)
- (public_name proof_carrying_data)
-)
+  ;; opam libraries
+  core_kernel
+  bin_prot.shape
+  base
+  base.caml
+  sexplib0
+  ;; local libraries
+  ppx_version.runtime)
+ (public_name proof_carrying_data))
diff --git a/src/lib/protocol_version/dune b/src/lib/protocol_version/dune
index 89b881a3aeb..da63096b2bf 100644
--- a/src/lib/protocol_version/dune
+++ b/src/lib/protocol_version/dune
@@ -3,18 +3,24 @@
  (public_name protocol_version)
  (library_flags -linkall)
  (libraries
-   ;; opam libraries
-   core_kernel
-   sexplib0
-   bin_prot.shape
-   base.caml
-   base
-   ppx_version.runtime
-   ;; local libraries
-   mina_wire_types
-   mina_node_config.version
- )
+  ;; opam libraries
+  core_kernel
+  sexplib0
+  bin_prot.shape
+  base.caml
+  base
+  ppx_version.runtime
+  ;; local libraries
+  mina_wire_types
+  mina_node_config.version)
  (preprocess
-  (pps ppx_version ppx_bin_prot ppx_fields_conv ppx_sexp_conv ppx_compare ppx_deriving_yojson))
- (instrumentation (backend bisect_ppx))
+  (pps
+   ppx_version
+   ppx_bin_prot
+   ppx_fields_conv
+   ppx_sexp_conv
+   ppx_compare
+   ppx_deriving_yojson))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Protocol version representation"))
diff --git a/src/lib/prover/dune b/src/lib/prover/dune
index 1ed3ab02cbd..014468c2207 100644
--- a/src/lib/prover/dune
+++ b/src/lib/prover/dune
@@ -2,55 +2,56 @@
  (name prover)
  (public_name prover)
  (libraries
-   ;; opam libraries
-   base64
-   async_unix
-   rpc_parallel
-   core
-   async
-   async_kernel
-   core_kernel
-   bin_prot.shape
-   base.caml
-   sexplib0
-   ;; local libraries
-   with_hash
-   coda_genesis_ledger
-   mina_metrics
-   error_json
-   pickles_types
-   snarky.backendless
-   snark_params
-   pickles
-   sgn
-   currency
-   child_processes
-   blockchain_snark
-   mina_block
-   mina_state
-   mina_base
-   mina_compile_config
-   logger
-   itn_logger
-   internal_tracing
-   genesis_constants
-   ledger_proof
-   consensus
-   coda_genesis_proof
-   transaction_snark
-   logger.file_system
-   data_hash_lib
-   staged_ledger_diff
-   ppx_version.runtime
-   mina_transaction_logic
-   pickles.backend
-   sgn_type
-   kimchi_backend
-   mina_numbers
-   kimchi_pasta
-   kimchi_pasta.basic
-   mina_wire_types
-   promise
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_jane ppx_bin_prot)))
+  ;; opam libraries
+  base64
+  async_unix
+  rpc_parallel
+  core
+  async
+  async_kernel
+  core_kernel
+  bin_prot.shape
+  base.caml
+  sexplib0
+  ;; local libraries
+  with_hash
+  coda_genesis_ledger
+  mina_metrics
+  error_json
+  pickles_types
+  snarky.backendless
+  snark_params
+  pickles
+  sgn
+  currency
+  child_processes
+  blockchain_snark
+  mina_block
+  mina_state
+  mina_base
+  mina_compile_config
+  logger
+  itn_logger
+  internal_tracing
+  genesis_constants
+  ledger_proof
+  consensus
+  coda_genesis_proof
+  transaction_snark
+  logger.file_system
+  data_hash_lib
+  staged_ledger_diff
+  ppx_version.runtime
+  mina_transaction_logic
+  pickles.backend
+  sgn_type
+  kimchi_backend
+  mina_numbers
+  kimchi_pasta
+  kimchi_pasta.basic
+  mina_wire_types
+  promise)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_version ppx_jane ppx_bin_prot)))
diff --git a/src/lib/quickcheck_lib/dune b/src/lib/quickcheck_lib/dune
index d741a18929b..67f0e560c4d 100644
--- a/src/lib/quickcheck_lib/dune
+++ b/src/lib/quickcheck_lib/dune
@@ -2,14 +2,16 @@
  (name quickcheck_lib)
  (public_name quickcheck_lib)
  (libraries
-   ;; opam libraries
-   core_kernel
-   base
-   ppx_inline_test.config
-   ;; local libraries
-   currency
-   rose_tree
-)
- (inline_tests (flags -verbose -show-counts))
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_let ppx_inline_test ppx_custom_printf)))
+  ;; opam libraries
+  core_kernel
+  base
+  ppx_inline_test.config
+  ;; local libraries
+  currency
+  rose_tree)
+ (inline_tests
+  (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_let ppx_inline_test ppx_custom_printf)))
diff --git a/src/lib/random_oracle/dune b/src/lib/random_oracle/dune
index 33083e21038..3580046494b 100644
--- a/src/lib/random_oracle/dune
+++ b/src/lib/random_oracle/dune
@@ -1,24 +1,34 @@
 (library
  (name random_oracle)
  (public_name random_oracle)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_sexp_conv ppx_compare ppx_inline_test ppx_assert ppx_compare ppx_deriving_yojson ppx_let))
- (inline_tests (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_version
+   ppx_sexp_conv
+   ppx_compare
+   ppx_inline_test
+   ppx_assert
+   ppx_compare
+   ppx_deriving_yojson
+   ppx_let))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   base
-   core_kernel
-   sexplib0
-   ;; local libraries
-   snark_params
-   pickles.backend
-   sponge
-   pickles
-   random_oracle_input
-   snarky.backendless
-   kimchi_pasta
-   kimchi_pasta.basic
-   fold_lib
-   random_oracle.permutation
-))
+  ;; opam libraries
+  ppx_inline_test.config
+  base
+  core_kernel
+  sexplib0
+  ;; local libraries
+  snark_params
+  pickles.backend
+  sponge
+  pickles
+  random_oracle_input
+  snarky.backendless
+  kimchi_pasta
+  kimchi_pasta.basic
+  fold_lib
+  random_oracle.permutation))
diff --git a/src/lib/random_oracle/permutation/dune b/src/lib/random_oracle/permutation/dune
index 3db3a785259..cc9ab5f2c57 100644
--- a/src/lib/random_oracle/permutation/dune
+++ b/src/lib/random_oracle/permutation/dune
@@ -1,8 +1,10 @@
 (library
  (name random_oracle_permutation)
  (public_name random_oracle.permutation)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (libraries sponge kimchi_backend kimchi_pasta kimchi_pasta.basic)
  (virtual_modules random_oracle_permutation)
  (default_implementation random_oracle.permutation.external))
diff --git a/src/lib/random_oracle/permutation/external/dune b/src/lib/random_oracle/permutation/external/dune
index 9c87863ebeb..2f65a83b6b2 100644
--- a/src/lib/random_oracle/permutation/external/dune
+++ b/src/lib/random_oracle/permutation/external/dune
@@ -1,24 +1,26 @@
 (library
  (name random_oracle_permutation_external)
  (public_name random_oracle.permutation.external)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_inline_test ppx_assert))
- (inline_tests (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_inline_test ppx_assert))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   base
-   core_kernel
-   sexplib0
-   ;; local libraries
-   sponge
-   pickles
-   pickles.backend
-   kimchi_bindings.pasta_fp_poseidon
-   kimchi_bindings
-   kimchi_backend
-   kimchi_backend_common
-   kimchi_pasta
-   kimchi_pasta.basic
- )
+  ;; opam libraries
+  ppx_inline_test.config
+  base
+  core_kernel
+  sexplib0
+  ;; local libraries
+  sponge
+  pickles
+  pickles.backend
+  kimchi_bindings.pasta_fp_poseidon
+  kimchi_bindings
+  kimchi_backend
+  kimchi_backend_common
+  kimchi_pasta
+  kimchi_pasta.basic)
  (implements random_oracle.permutation))
diff --git a/src/lib/random_oracle/permutation/ocaml/dune b/src/lib/random_oracle/permutation/ocaml/dune
index abf5fda40c4..2795e4d6792 100644
--- a/src/lib/random_oracle/permutation/ocaml/dune
+++ b/src/lib/random_oracle/permutation/ocaml/dune
@@ -1,18 +1,19 @@
 (library
  (name random_oracle_permutation_ocaml)
  (public_name random_oracle.permutation.ocaml)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (libraries
-   ;; opam libraries
-   base
-   core_kernel
-   ;; local libraries
-   sponge
-   pickles
-   pickles.backend
-   kimchi_backend
-   kimchi_pasta
-   kimchi_pasta.basic
-)
-(implements random_oracle.permutation))
+  ;; opam libraries
+  base
+  core_kernel
+  ;; local libraries
+  sponge
+  pickles
+  pickles.backend
+  kimchi_backend
+  kimchi_pasta
+  kimchi_pasta.basic)
+ (implements random_oracle.permutation))
diff --git a/src/lib/random_oracle_input/dune b/src/lib/random_oracle_input/dune
index 0e9916458f3..b42a552bdc0 100644
--- a/src/lib/random_oracle_input/dune
+++ b/src/lib/random_oracle_input/dune
@@ -1,7 +1,16 @@
 (library
  (name random_oracle_input)
  (public_name random_oracle_input)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_sexp_conv ppx_inline_test ppx_let ppx_version ppx_deriving_yojson))
- (inline_tests (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_jane
+   ppx_sexp_conv
+   ppx_inline_test
+   ppx_let
+   ppx_version
+   ppx_deriving_yojson))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries core_kernel sexplib0 base.caml ppx_inline_test.config))
diff --git a/src/lib/rc_pool/dune b/src/lib/rc_pool/dune
index 030f5bd9e21..eff5513d6c4 100644
--- a/src/lib/rc_pool/dune
+++ b/src/lib/rc_pool/dune
@@ -2,9 +2,11 @@
  (name rc_pool)
  (public_name rc_pool)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries core_kernel)
  (preprocess
   (pps ppx_version ppx_jane ppx_compare))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "A pool for reference-counting large things"))
diff --git a/src/lib/rfc3339_time/dune b/src/lib/rfc3339_time/dune
index eac5cea63fc..f6f11ed2e2a 100644
--- a/src/lib/rfc3339_time/dune
+++ b/src/lib/rfc3339_time/dune
@@ -1,6 +1,8 @@
 (library
  (name rfc3339_time)
  (public_name rfc3339_time)
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (libraries core_kernel core ptime)
- (preprocess (pps ppx_mina ppx_version)))
+ (preprocess
+  (pps ppx_mina ppx_version)))
diff --git a/src/lib/rocksdb/dune b/src/lib/rocksdb/dune
index 66bfcc0b8f7..767cf4f5038 100644
--- a/src/lib/rocksdb/dune
+++ b/src/lib/rocksdb/dune
@@ -2,9 +2,12 @@
  (name rocksdb)
  (public_name rocksdb)
  (library_flags -linkall)
- (flags (:standard -w +a-40..42-44 -warn-error +a-70) -open Core_kernel)
+ (flags
+  (:standard -w +a-40..42-44 -warn-error +a-70)
+  -open
+  Core_kernel)
  (libraries
-   ;; opam libraries
+  ;; opam libraries
   async
   async_kernel
   async_unix
@@ -19,9 +22,9 @@
   sexplib0
   ;; local libraries
   file_system
-  key_value_database
-  )
+  key_value_database)
  (preprocess
   (pps ppx_version ppx_jane))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "RocksDB Database module"))
diff --git a/src/lib/rose_tree/dune b/src/lib/rose_tree/dune
index b4084fd0b89..deb2e6fa184 100644
--- a/src/lib/rose_tree/dune
+++ b/src/lib/rose_tree/dune
@@ -2,12 +2,13 @@
  (name rose_tree)
  (public_name rose_tree)
  (libraries
-   ;; opam libraries
-   core_kernel
-   async_kernel
-   result
-   ;; local libraries
-   mina_stdlib
-)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane ppx_deriving_yojson)))
+  ;; opam libraries
+  core_kernel
+  async_kernel
+  result
+  ;; local libraries
+  mina_stdlib)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane ppx_deriving_yojson)))
diff --git a/src/lib/rosetta_coding/dune b/src/lib/rosetta_coding/dune
index e2f69a0b884..b102a4dcb6a 100644
--- a/src/lib/rosetta_coding/dune
+++ b/src/lib/rosetta_coding/dune
@@ -2,17 +2,19 @@
  (name rosetta_coding)
  (public_name rosetta_coding)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   base
-   core_kernel
-   ppx_inline_test.config
-   ;; local libraries
-   mina_stdlib
-   snark_params
-   signature_lib
-)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_assert ppx_let ppx_inline_test))
+  ;; opam libraries
+  base
+  core_kernel
+  ppx_inline_test.config
+  ;; local libraries
+  mina_stdlib
+  snark_params
+  signature_lib)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_assert ppx_let ppx_inline_test))
  (synopsis "Encoders and decoders for Rosetta"))
diff --git a/src/lib/rosetta_lib/dune b/src/lib/rosetta_lib/dune
index a2e13d38186..090013ac75e 100644
--- a/src/lib/rosetta_lib/dune
+++ b/src/lib/rosetta_lib/dune
@@ -2,35 +2,45 @@
  (name rosetta_lib)
  (public_name rosetta_lib)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   result
-   ppx_inline_test.config
-   base.caml
-   caqti
-   core_kernel
-   base
-   async_kernel
-   uri
-   sexplib0
-   integers
-   ;; local libraries
-   mina_wire_types
-   hex
-   random_oracle_input
-   mina_numbers
-   mina_stdlib
-   signature_lib
-   snark_params
-   rosetta_models
-   mina_base
-   currency
-   unsigned_extended
-   mina_base.import
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_assert ppx_let ppx_sexp_conv
-                  ppx_compare ppx_deriving.std ppx_custom_printf
-                  ppx_deriving_yojson ppx_inline_test))
+  ;; opam libraries
+  result
+  ppx_inline_test.config
+  base.caml
+  caqti
+  core_kernel
+  base
+  async_kernel
+  uri
+  sexplib0
+  integers
+  ;; local libraries
+  mina_wire_types
+  hex
+  random_oracle_input
+  mina_numbers
+  mina_stdlib
+  signature_lib
+  snark_params
+  rosetta_models
+  mina_base
+  currency
+  unsigned_extended
+  mina_base.import)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_mina
+   ppx_version
+   ppx_assert
+   ppx_let
+   ppx_sexp_conv
+   ppx_compare
+   ppx_deriving.std
+   ppx_custom_printf
+   ppx_deriving_yojson
+   ppx_inline_test))
  (synopsis "Rosetta-related support code"))
diff --git a/src/lib/rosetta_lib/test/dune b/src/lib/rosetta_lib/test/dune
index db39414d363..7c26b94e896 100644
--- a/src/lib/rosetta_lib/test/dune
+++ b/src/lib/rosetta_lib/test/dune
@@ -5,13 +5,14 @@
  (modes native)
  (modules test_encodings)
  (libraries
-   ;; opam libraries
-   core_kernel
-   base
-   ;; local libraries
-   signature_lib
-   rosetta_lib
-   rosetta_coding
-)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version)))
+  ;; opam libraries
+  core_kernel
+  base
+  ;; local libraries
+  signature_lib
+  rosetta_lib
+  rosetta_coding)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version)))
diff --git a/src/lib/rosetta_models/dune b/src/lib/rosetta_models/dune
index 742de65a203..b1691f80e3b 100644
--- a/src/lib/rosetta_models/dune
+++ b/src/lib/rosetta_models/dune
@@ -1,14 +1,8 @@
 (library
  (name rosetta_models)
  (public_name rosetta_models)
- (libraries
-   ppx_deriving_yojson.runtime
-   yojson
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps
-               ppx_deriving_yojson
-               ppx_deriving.eq
-               ppx_deriving.show
-               ppx_version
-)))
+ (libraries ppx_deriving_yojson.runtime yojson)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_deriving_yojson ppx_deriving.eq ppx_deriving.show ppx_version)))
diff --git a/src/lib/run_in_thread/dune b/src/lib/run_in_thread/dune
index e6d80b0875e..5ccce00bfec 100644
--- a/src/lib/run_in_thread/dune
+++ b/src/lib/run_in_thread/dune
@@ -2,7 +2,9 @@
  (public_name run_in_thread)
  (name run_in_thread)
  (libraries async_kernel)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (virtual_modules run_in_thread)
  (default_implementation run_in_thread.native))
diff --git a/src/lib/run_in_thread/fake/dune b/src/lib/run_in_thread/fake/dune
index 914425edd75..47653dcf454 100644
--- a/src/lib/run_in_thread/fake/dune
+++ b/src/lib/run_in_thread/fake/dune
@@ -2,6 +2,8 @@
  (public_name run_in_thread.fake)
  (name run_in_thread_fake)
  (libraries async_kernel)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (implements run_in_thread))
diff --git a/src/lib/run_in_thread/native/dune b/src/lib/run_in_thread/native/dune
index 8718bc473c6..c5f77529fc6 100644
--- a/src/lib/run_in_thread/native/dune
+++ b/src/lib/run_in_thread/native/dune
@@ -2,6 +2,8 @@
  (public_name run_in_thread.native)
  (name run_in_thread_native)
  (libraries async async_unix)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (implements run_in_thread))
diff --git a/src/lib/runtime_config/dune b/src/lib/runtime_config/dune
index 268a52776e2..b1fa698a665 100644
--- a/src/lib/runtime_config/dune
+++ b/src/lib/runtime_config/dune
@@ -2,47 +2,56 @@
  (name runtime_config)
  (public_name mina_runtime_config)
  (libraries
-   ;; opam libraries
-   async
-   async_kernel
-   async_unix
-   core_kernel
-   bin_prot.shape
-   base.caml
-   base
-   base64
-   integers
-   result
-   sexplib0
-   ;; local libraries
-   block_time
-   currency
-   genesis_constants
-   data_hash_lib
-   kimchi_backend
-   kimchi_pasta
-   kimchi_pasta.basic
-   mina_ledger
-   merkle_ledger
-   mina_base
-   mina_base.import
-   mina_numbers
-   mina_wire_types
-   mina_state
-   snark_params
-   unsigned_extended
-   pickles
-   pickles.backend
-   pickles_types
-   random_oracle
-   with_hash
-   signature_lib
-   staged_ledger
-   bounded_types
-   mina_compile_config
-   mina_version
-   mina_user_error
-   )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_custom_printf ppx_sexp_conv ppx_let ppx_deriving_yojson
-                  ppx_fields_conv ppx_version ppx_compare ppx_jane ppx_mina)))
+  ;; opam libraries
+  async
+  async_kernel
+  async_unix
+  core_kernel
+  bin_prot.shape
+  base.caml
+  base
+  base64
+  integers
+  result
+  sexplib0
+  ;; local libraries
+  block_time
+  currency
+  genesis_constants
+  data_hash_lib
+  kimchi_backend
+  kimchi_pasta
+  kimchi_pasta.basic
+  mina_ledger
+  merkle_ledger
+  mina_base
+  mina_base.import
+  mina_numbers
+  mina_wire_types
+  mina_state
+  snark_params
+  unsigned_extended
+  pickles
+  pickles.backend
+  pickles_types
+  random_oracle
+  with_hash
+  signature_lib
+  staged_ledger
+  bounded_types
+  mina_compile_config
+  mina_version
+  mina_user_error)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_custom_printf
+   ppx_sexp_conv
+   ppx_let
+   ppx_deriving_yojson
+   ppx_fields_conv
+   ppx_version
+   ppx_compare
+   ppx_jane
+   ppx_mina)))
diff --git a/src/lib/secrets/dune b/src/lib/secrets/dune
index 94e63ccd02e..edb4a29b5d4 100644
--- a/src/lib/secrets/dune
+++ b/src/lib/secrets/dune
@@ -2,42 +2,43 @@
  (name secrets)
  (public_name secrets)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   result
-   base.caml
-   bignum.bigint
-   async_kernel
-   async
-   core
-   async_unix
-   sodium
-   ppx_deriving_yojson.runtime
-   yojson
-   core_kernel
-   sexplib0
-   base58
-   ppx_inline_test.config
-   ;; local libraries
-   file_system
-   random_oracle
-   pickles
-   logger
-   snark_params
-   mina_user_error
-   mina_net2
-   mina_base
-   base58_check
-   signature_lib
-   network_peer
-   mina_numbers
-   snarky.backendless
-   error_json
-   mina_base.import
-   bounded_types
- )
+  ;; opam libraries
+  result
+  base.caml
+  bignum.bigint
+  async_kernel
+  async
+  core
+  async_unix
+  sodium
+  ppx_deriving_yojson.runtime
+  yojson
+  core_kernel
+  sexplib0
+  base58
+  ppx_inline_test.config
+  ;; local libraries
+  file_system
+  random_oracle
+  pickles
+  logger
+  snark_params
+  mina_user_error
+  mina_net2
+  mina_base
+  base58_check
+  signature_lib
+  network_peer
+  mina_numbers
+  snarky.backendless
+  error_json
+  mina_base.import
+  bounded_types)
  (preprocess
   (pps ppx_mina ppx_version ppx_jane ppx_deriving_yojson ppx_deriving.make))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Managing secrets including passwords and keypairs"))
diff --git a/src/lib/sgn/dune b/src/lib/sgn/dune
index d753fde9fa6..94b41bc6cda 100644
--- a/src/lib/sgn/dune
+++ b/src/lib/sgn/dune
@@ -3,22 +3,29 @@
  (public_name sgn)
  (library_flags -linkall)
  (libraries
-   ;; opam libraries
-   ppx_deriving_yojson.runtime
-   core_kernel
-   yojson
-   sexplib0
-   base
-   bin_prot.shape
-   base.caml
-   ;; local libraries
-   snark_params
-   sgn_type
-   pickles
-   snarky.backendless
-   ppx_version.runtime
- )
+  ;; opam libraries
+  ppx_deriving_yojson.runtime
+  core_kernel
+  yojson
+  sexplib0
+  base
+  bin_prot.shape
+  base.caml
+  ;; local libraries
+  snark_params
+  sgn_type
+  pickles
+  snarky.backendless
+  ppx_version.runtime)
  (preprocess
-  (pps ppx_version ppx_bin_prot ppx_sexp_conv ppx_compare ppx_hash ppx_compare ppx_deriving_yojson))
- (instrumentation (backend bisect_ppx))
+  (pps
+   ppx_version
+   ppx_bin_prot
+   ppx_sexp_conv
+   ppx_compare
+   ppx_hash
+   ppx_compare
+   ppx_deriving_yojson))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "sgn library"))
diff --git a/src/lib/sgn_type/dune b/src/lib/sgn_type/dune
index df049622b1e..a1069236594 100644
--- a/src/lib/sgn_type/dune
+++ b/src/lib/sgn_type/dune
@@ -1,17 +1,18 @@
 (library
  (name sgn_type)
  (public_name sgn_type)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_version ppx_compare ppx_deriving_yojson))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_version ppx_compare ppx_deriving_yojson))
  (libraries
-   ;; opam libraries
-   core_kernel
-   ppx_deriving_yojson.runtime
-   yojson
-   sexplib0
-   bin_prot.shape
-   base.caml
-   ppx_version.runtime
-   ;; local libraries
-   mina_wire_types
-))
+  ;; opam libraries
+  core_kernel
+  ppx_deriving_yojson.runtime
+  yojson
+  sexplib0
+  bin_prot.shape
+  base.caml
+  ppx_version.runtime
+  ;; local libraries
+  mina_wire_types))
diff --git a/src/lib/sha256_lib/dune b/src/lib/sha256_lib/dune
index 28d63ad16b8..f78406c5179 100644
--- a/src/lib/sha256_lib/dune
+++ b/src/lib/sha256_lib/dune
@@ -2,13 +2,14 @@
  (name sha256_lib)
  (public_name sha256_lib)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   core
-   digestif
-)
+  ;; opam libraries
+  core
+  digestif)
  (preprocess
   (pps ppx_version ppx_jane ppx_compare))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "SNARK keys"))
diff --git a/src/lib/signature_kind/compile_config/dune b/src/lib/signature_kind/compile_config/dune
index cd9dfd21794..bb85b3d0992 100644
--- a/src/lib/signature_kind/compile_config/dune
+++ b/src/lib/signature_kind/compile_config/dune
@@ -2,6 +2,8 @@
  (name mina_signature_kind_config)
  (public_name mina_signature_kind.config)
  (libraries mina_node_config)
- (preprocess (pps ppx_version))
- (instrumentation (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
  (implements mina_signature_kind))
diff --git a/src/lib/signature_kind/dune b/src/lib/signature_kind/dune
index 49f8609f479..b57c0a9fed6 100644
--- a/src/lib/signature_kind/dune
+++ b/src/lib/signature_kind/dune
@@ -2,7 +2,9 @@
  (name mina_signature_kind)
  (public_name mina_signature_kind)
  (libraries mina_signature_kind.type)
- (preprocess (pps ppx_version))
- (instrumentation (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
  (virtual_modules mina_signature_kind)
  (default_implementation mina_signature_kind_config))
diff --git a/src/lib/signature_kind/mainnet/dune b/src/lib/signature_kind/mainnet/dune
index a6b9d2425b1..b6a7ce56304 100644
--- a/src/lib/signature_kind/mainnet/dune
+++ b/src/lib/signature_kind/mainnet/dune
@@ -1,6 +1,8 @@
 (library
  (name mina_signature_kind_mainnet)
  (public_name mina_signature_kind.mainnet)
- (preprocess (pps ppx_version))
- (instrumentation (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
  (implements mina_signature_kind))
diff --git a/src/lib/signature_kind/testnet/dune b/src/lib/signature_kind/testnet/dune
index 7308e2ecbe9..8345ee15e17 100644
--- a/src/lib/signature_kind/testnet/dune
+++ b/src/lib/signature_kind/testnet/dune
@@ -1,6 +1,8 @@
 (library
  (name mina_signature_kind_testnet)
  (public_name mina_signature_kind.testnet)
- (preprocess (pps ppx_version))
- (instrumentation (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
  (implements mina_signature_kind))
diff --git a/src/lib/signature_kind/type/dune b/src/lib/signature_kind/type/dune
index 19b8f4bdb7f..7ba368c91ba 100644
--- a/src/lib/signature_kind/type/dune
+++ b/src/lib/signature_kind/type/dune
@@ -1,5 +1,7 @@
 (library
  (name mina_signature_kind_type)
  (public_name mina_signature_kind.type)
- (preprocess (pps ppx_version))
- (instrumentation (backend bisect_ppx)))
+ (preprocess
+  (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/signature_lib/dune b/src/lib/signature_lib/dune
index 7038b38ca2c..f002a77c7d8 100644
--- a/src/lib/signature_lib/dune
+++ b/src/lib/signature_lib/dune
@@ -2,47 +2,58 @@
  (name signature_lib)
  (public_name signature_lib)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   bignum.bigint
-   ppx_inline_test.config
-   base
-   sexplib0
-   yojson
-   core_kernel
-   bin_prot.shape
-   base.caml
-   result
-   ;; local libraries
-   mina_wire_types
-   crypto_params
-   kimchi_pasta
-   kimchi_pasta.basic
-   random_oracle_input
-   bitstring_lib
-   codable
-   snark_params
-   mina_debug
-   blake2
-   hash_prefix_states
-   non_zero_curve_point
-   random_oracle
-   snarky.backendless
-   bignum_bigint
-   base58_check
-   snarky_curves
-   pickles
-   fold_lib
-   pickles.backend
-   kimchi_backend
-   h_list
-   test_util
-   ppx_version.runtime
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps
-               ppx_snarky ppx_mina ppx_version ppx_custom_printf ppx_sexp_conv
-               ppx_bin_prot ppx_hash ppx_compare ppx_compare ppx_deriving_yojson
-               ppx_inline_test ppx_let))
+  ;; opam libraries
+  bignum.bigint
+  ppx_inline_test.config
+  base
+  sexplib0
+  yojson
+  core_kernel
+  bin_prot.shape
+  base.caml
+  result
+  ;; local libraries
+  mina_wire_types
+  crypto_params
+  kimchi_pasta
+  kimchi_pasta.basic
+  random_oracle_input
+  bitstring_lib
+  codable
+  snark_params
+  mina_debug
+  blake2
+  hash_prefix_states
+  non_zero_curve_point
+  random_oracle
+  snarky.backendless
+  bignum_bigint
+  base58_check
+  snarky_curves
+  pickles
+  fold_lib
+  pickles.backend
+  kimchi_backend
+  h_list
+  test_util
+  ppx_version.runtime)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_snarky
+   ppx_mina
+   ppx_version
+   ppx_custom_printf
+   ppx_sexp_conv
+   ppx_bin_prot
+   ppx_hash
+   ppx_compare
+   ppx_compare
+   ppx_deriving_yojson
+   ppx_inline_test
+   ppx_let))
  (synopsis "Schnorr signatures using the tick and tock curves"))
diff --git a/src/lib/signature_lib/find_address/dune b/src/lib/signature_lib/find_address/dune
index 1ba9457ca6a..a6f6d4ae31a 100644
--- a/src/lib/signature_lib/find_address/dune
+++ b/src/lib/signature_lib/find_address/dune
@@ -1,16 +1,18 @@
 (executable
  (name find_address)
  (libraries
-   ;; opam libraries
-   base
-   core_kernel
-   ;; local libraries
-   pickles.backend
-   pickles
-   kimchi_pasta
-   kimchi_pasta.basic
-   kimchi_backend
-   signature_lib
-   snark_params)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version)))
+  ;; opam libraries
+  base
+  core_kernel
+  ;; local libraries
+  pickles.backend
+  pickles
+  kimchi_pasta
+  kimchi_pasta.basic
+  kimchi_backend
+  signature_lib
+  snark_params)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version)))
diff --git a/src/lib/signature_lib/test/dune b/src/lib/signature_lib/test/dune
index 61bc4014ae6..b0bef68956d 100644
--- a/src/lib/signature_lib/test/dune
+++ b/src/lib/signature_lib/test/dune
@@ -1,17 +1,17 @@
 (library
  (name signature_lib_tests)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   ;; local libraries
-   pickles
-   random_oracle
-   random_oracle_input
-   signature_lib
-   snark_params)
- (instrumentation (backend bisect_ppx))
- (inline_tests (flags -verbose -show-counts))
+  ;; opam libraries
+  ppx_inline_test.config
+  ;; local libraries
+  pickles
+  random_oracle
+  random_oracle_input
+  signature_lib
+  snark_params)
+ (instrumentation
+  (backend bisect_ppx))
+ (inline_tests
+  (flags -verbose -show-counts))
  (preprocess
-  (pps
-    ppx_inline_test
-    ppx_version)))
+  (pps ppx_inline_test ppx_version)))
diff --git a/src/lib/snark_bits/dune b/src/lib/snark_bits/dune
index d8202de1b0d..3d953fa7006 100644
--- a/src/lib/snark_bits/dune
+++ b/src/lib/snark_bits/dune
@@ -2,9 +2,10 @@
  (name snark_bits)
  (public_name snark_bits)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
+  ;; opam libraries
   core_kernel
   integers
   base
@@ -14,9 +15,9 @@
   tuple_lib
   bitstring_lib
   snarky.intf
-  mina_stdlib
-  )
+  mina_stdlib)
  (preprocess
   (pps ppx_version ppx_snarky ppx_let ppx_inline_test ppx_compare))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Snark parameters"))
diff --git a/src/lib/snark_keys_header/dune b/src/lib/snark_keys_header/dune
index 2458ab2c6ee..d4173bd6443 100644
--- a/src/lib/snark_keys_header/dune
+++ b/src/lib/snark_keys_header/dune
@@ -2,16 +2,25 @@
  (name snark_keys_header)
  (public_name snark_keys_header)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   sexplib0
-   base
-   core_kernel
-   integers
-   base.caml
-   result
-   stdio
- )
- (inline_tests (flags -verbose -show-counts))
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_deriving_yojson ppx_sexp_conv ppx_inline_test ppx_let ppx_deriving.ord ppx_compare)))
+  ;; opam libraries
+  ppx_inline_test.config
+  sexplib0
+  base
+  core_kernel
+  integers
+  base.caml
+  result
+  stdio)
+ (inline_tests
+  (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_version
+   ppx_deriving_yojson
+   ppx_sexp_conv
+   ppx_inline_test
+   ppx_let
+   ppx_deriving.ord
+   ppx_compare)))
diff --git a/src/lib/snark_params/dune b/src/lib/snark_params/dune
index 3ed0beb899c..ab123cfb0df 100644
--- a/src/lib/snark_params/dune
+++ b/src/lib/snark_params/dune
@@ -2,37 +2,49 @@
  (name snark_params)
  (public_name snark_params)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   base.base_internalhash_types
-   ppx_inline_test.config
-   core_kernel
-   digestif
-   base
-   sexplib0
-   ;; local libraries
-   mina_wire_types
-   kimchi_pasta
-   kimchi_pasta.basic
-   bignum_bigint
-   pickles.backend
-   snarky_curves
-   snarky.backendless
-   snarky_group_map
-   sponge
-   group_map
-   fold_lib
-   bitstring_lib
-   snark_bits
-   pickles
-   crypto_params
-   snarky_field_extensions
-   snarky.intf
-   kimchi_backend
- )
+  ;; opam libraries
+  base.base_internalhash_types
+  ppx_inline_test.config
+  core_kernel
+  digestif
+  base
+  sexplib0
+  ;; local libraries
+  mina_wire_types
+  kimchi_pasta
+  kimchi_pasta.basic
+  bignum_bigint
+  pickles.backend
+  snarky_curves
+  snarky.backendless
+  snarky_group_map
+  sponge
+  group_map
+  fold_lib
+  bitstring_lib
+  snark_bits
+  pickles
+  crypto_params
+  snarky_field_extensions
+  snarky.intf
+  kimchi_backend)
  (preprocess
-  (pps ppx_version ppx_assert ppx_base ppx_bench ppx_let ppx_deriving.std ppx_deriving_yojson ppx_sexp_conv ppx_bin_prot
-       ppx_custom_printf ppx_inline_test ppx_snarky))
- (instrumentation (backend bisect_ppx))
+  (pps
+   ppx_version
+   ppx_assert
+   ppx_base
+   ppx_bench
+   ppx_let
+   ppx_deriving.std
+   ppx_deriving_yojson
+   ppx_sexp_conv
+   ppx_bin_prot
+   ppx_custom_printf
+   ppx_inline_test
+   ppx_snarky))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Snark parameters"))
diff --git a/src/lib/snark_profiler_lib/dune b/src/lib/snark_profiler_lib/dune
index 90fd318d575..65385441ec2 100644
--- a/src/lib/snark_profiler_lib/dune
+++ b/src/lib/snark_profiler_lib/dune
@@ -2,67 +2,84 @@
  (name snark_profiler_lib)
  (public_name snark_profiler_lib)
  (libraries
-   ;;opam libraries
-   integers
-   astring
-   sexplib0
-   result
-   async_kernel
-   async_unix
-   core_kernel
-   core
-   base
-   async
-   base.caml
-   base.base_internalhash_types
-   ;;local libraries
-   bounded_types
-   mina_wire_types
-   child_processes
-   snark_worker
-   genesis_ledger_helper.lib
-   logger
-   coda_genesis_proof
-   data_hash_lib
-   currency
-   genesis_constants
-   generated_graphql_queries
-   mina_transaction
-   mina_generators
-   mina_ledger
-   mina_base
-   mina_state
-   genesis_ledger_helper
-   signature_lib
-   mina_base.import
-   mina_numbers
-   precomputed_values
-   with_hash
-   transaction_snark
-   transaction_snark_tests
-   transaction_protocol_state
-   test_util
-   sgn
-   unsigned_extended
-   snark_work_lib
-   mina_compile_config
-   mina_transaction_logic
-   verifier
-   parallel
-   random_oracle
-   kimchi_backend
-   kimchi_pasta
-   kimchi_pasta.basic
-   pickles_types
-   pickles
-   pickles.backend
-   snark_params
-   zkapp_command_builder
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version
-                  ; ppx_jane except ppx_optcomp
-                  ppx_base ppx_assert ppx_bench ppx_bin_prot ppx_custom_printf
-                  ppx_fields_conv ppx_fixed_literal ppx_here ppx_inline_test ppx_let
-                  ppx_module_timer ppx_optional ppx_pipebang ppx_sexp_message
-                  ppx_sexp_value ppx_string ppx_typerep_conv ppx_variants_conv)))
+  ;;opam libraries
+  integers
+  astring
+  sexplib0
+  result
+  async_kernel
+  async_unix
+  core_kernel
+  core
+  base
+  async
+  base.caml
+  base.base_internalhash_types
+  ;;local libraries
+  bounded_types
+  mina_wire_types
+  child_processes
+  snark_worker
+  genesis_ledger_helper.lib
+  logger
+  coda_genesis_proof
+  data_hash_lib
+  currency
+  genesis_constants
+  generated_graphql_queries
+  mina_transaction
+  mina_generators
+  mina_ledger
+  mina_base
+  mina_state
+  genesis_ledger_helper
+  signature_lib
+  mina_base.import
+  mina_numbers
+  precomputed_values
+  with_hash
+  transaction_snark
+  transaction_snark_tests
+  transaction_protocol_state
+  test_util
+  sgn
+  unsigned_extended
+  snark_work_lib
+  mina_compile_config
+  mina_transaction_logic
+  verifier
+  parallel
+  random_oracle
+  kimchi_backend
+  kimchi_pasta
+  kimchi_pasta.basic
+  pickles_types
+  pickles
+  pickles.backend
+  snark_params
+  zkapp_command_builder)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_mina
+   ppx_version
+   ; ppx_jane except ppx_optcomp
+   ppx_base
+   ppx_assert
+   ppx_bench
+   ppx_bin_prot
+   ppx_custom_printf
+   ppx_fields_conv
+   ppx_fixed_literal
+   ppx_here
+   ppx_inline_test
+   ppx_let
+   ppx_module_timer
+   ppx_optional
+   ppx_pipebang
+   ppx_sexp_message
+   ppx_sexp_value
+   ppx_string
+   ppx_typerep_conv
+   ppx_variants_conv)))
diff --git a/src/lib/snark_work_lib/dune b/src/lib/snark_work_lib/dune
index 6026434c9b6..1d5b60fdc12 100644
--- a/src/lib/snark_work_lib/dune
+++ b/src/lib/snark_work_lib/dune
@@ -2,23 +2,24 @@
  (name snark_work_lib)
  (public_name snark_work_lib)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   bin_prot.shape
-   core_kernel
-   base.caml
-   sexplib0
-   core
-   ;; local libraries
-   transaction_snark
-   mina_state
-   signature_lib
-   one_or_two
-   currency
-   ppx_version.runtime
- )
+  ;; opam libraries
+  bin_prot.shape
+  core_kernel
+  base.caml
+  sexplib0
+  core
+  ;; local libraries
+  transaction_snark
+  mina_state
+  signature_lib
+  one_or_two
+  currency
+  ppx_version.runtime)
  (preprocess
   (pps ppx_jane ppx_deriving_yojson ppx_version))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Snark work types"))
diff --git a/src/lib/snark_worker/dune b/src/lib/snark_worker/dune
index db1f2151555..d88895de884 100644
--- a/src/lib/snark_worker/dune
+++ b/src/lib/snark_worker/dune
@@ -2,61 +2,62 @@
  (name snark_worker)
  (public_name snark_worker)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   async_rpc_kernel
-   sexplib0
-   async_kernel
-   base
-   base.caml
-   async
-   core
-   core_kernel.hash_heap
-   core_kernel
-   async.async_rpc
-   async.async_command
-   base.base_internalhash_types
-   ppx_hash.runtime-lib
-   result
-   async_unix
-   bin_prot.shape
-   ;; local libraries
-   bounded_types
-   one_or_two
-   mina_metrics
-   logger
-   signature_lib
-   logger.file_system
-   mina_base.import
-   cli_lib
-   genesis_constants
-   transaction_witness
-   perf_histograms
-   snark_work_lib
-   currency
-   mina_base
-   mina_transaction
-   transaction_snark
-   ledger_proof
-   mina_ledger
-   transaction_snark_work
-   error_json
-   mina_state
-   transaction_protocol_state
-   ppx_version.runtime
- )
+  ;; opam libraries
+  async_rpc_kernel
+  sexplib0
+  async_kernel
+  base
+  base.caml
+  async
+  core
+  core_kernel.hash_heap
+  core_kernel
+  async.async_rpc
+  async.async_command
+  base.base_internalhash_types
+  ppx_hash.runtime-lib
+  result
+  async_unix
+  bin_prot.shape
+  ;; local libraries
+  bounded_types
+  one_or_two
+  mina_metrics
+  logger
+  signature_lib
+  logger.file_system
+  mina_base.import
+  cli_lib
+  genesis_constants
+  transaction_witness
+  perf_histograms
+  snark_work_lib
+  currency
+  mina_base
+  mina_transaction
+  transaction_snark
+  ledger_proof
+  mina_ledger
+  transaction_snark_work
+  error_json
+  mina_state
+  transaction_protocol_state
+  ppx_version.runtime)
  (preprocess
   (pps
-    ppx_bin_prot
-    ppx_mina
-    ppx_here
-    ppx_custom_printf
-    ppx_deriving_yojson
-    ppx_inline_test
-    ppx_let
-    ppx_register_event
-    ppx_sexp_conv
-    ppx_version))
- (instrumentation (backend bisect_ppx))
+   ppx_bin_prot
+   ppx_mina
+   ppx_here
+   ppx_custom_printf
+   ppx_deriving_yojson
+   ppx_inline_test
+   ppx_let
+   ppx_register_event
+   ppx_sexp_conv
+   ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Lib powering the snark_worker interactions with the daemon"))
diff --git a/src/lib/snark_worker/standalone/dune b/src/lib/snark_worker/standalone/dune
index f5d7a009f97..dc947c33815 100644
--- a/src/lib/snark_worker/standalone/dune
+++ b/src/lib/snark_worker/standalone/dune
@@ -1,29 +1,38 @@
 (executable
  (name run_snark_worker)
  (libraries
-   ;; opam libraries 
-   base.caml
-   base
-   async
-   core_kernel
-   core
-   async.async_command
-   async_unix
-   async_kernel
-   sexplib0
-   uri
-   ;; local libraries
-   mina_base
-   currency
-   key_gen
-   snark_worker
-   mina_base.import
-   genesis_constants
-   signature_lib
-   transaction_snark
-   graphql_lib
-   mina_graphql
- )
- (instrumentation (backend bisect_ppx))
- (preprocessor_deps ../../../graphql-ppx-config.inc ../../../../graphql_schema.json)
- (preprocess (pps ppx_let ppx_custom_printf ppx_version graphql_ppx -- %{read-lines:../../../graphql-ppx-config.inc})))
+  ;; opam libraries 
+  base.caml
+  base
+  async
+  core_kernel
+  core
+  async.async_command
+  async_unix
+  async_kernel
+  sexplib0
+  uri
+  ;; local libraries
+  mina_base
+  currency
+  key_gen
+  snark_worker
+  mina_base.import
+  genesis_constants
+  signature_lib
+  transaction_snark
+  graphql_lib
+  mina_graphql)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocessor_deps
+  ../../../graphql-ppx-config.inc
+  ../../../../graphql_schema.json)
+ (preprocess
+  (pps
+   ppx_let
+   ppx_custom_printf
+   ppx_version
+   graphql_ppx
+   --
+   %{read-lines:../../../graphql-ppx-config.inc})))
diff --git a/src/lib/snarky_blake2/dune b/src/lib/snarky_blake2/dune
index 48456a2ccfd..88451fc5152 100644
--- a/src/lib/snarky_blake2/dune
+++ b/src/lib/snarky_blake2/dune
@@ -1,17 +1,19 @@
 (library
  (name snarky_blake2)
  (public_name snarky_blake2)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane ppx_compare))
- (inline_tests (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane ppx_compare))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   core_kernel
-   digestif
-   integers
-   bignum.bigint
-   ;; local libraries
-   blake2
-   snarky.backendless
-   mina_stdlib
-))
+  ;; opam libraries
+  core_kernel
+  digestif
+  integers
+  bignum.bigint
+  ;; local libraries
+  blake2
+  snarky.backendless
+  mina_stdlib))
diff --git a/src/lib/snarky_blake2/test/dune b/src/lib/snarky_blake2/test/dune
index 9acc0cf5855..8cb7e8a6787 100644
--- a/src/lib/snarky_blake2/test/dune
+++ b/src/lib/snarky_blake2/test/dune
@@ -1,21 +1,23 @@
 (library
  (name snarky_blake2_tests)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries 
-   base
-   ppx_inline_test.config
-   core_kernel
-   base.base_internalhash_types
-   digestif
-   ;; local libraries
-   blake2
-   pickles
-   snark_params
-   snarky
-   snarky_blake2
-   snarky.backendless
-   crypto_params
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_inline_test ppx_let ppx_assert ppx_sexp_conv ppx_version)))
+  ;; opam libraries 
+  base
+  ppx_inline_test.config
+  core_kernel
+  base.base_internalhash_types
+  digestif
+  ;; local libraries
+  blake2
+  pickles
+  snark_params
+  snarky
+  snarky_blake2
+  snarky.backendless
+  crypto_params)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_inline_test ppx_let ppx_assert ppx_sexp_conv ppx_version)))
diff --git a/src/lib/snarky_curves/dune b/src/lib/snarky_curves/dune
index cdac3134a7e..aa3cb23d553 100644
--- a/src/lib/snarky_curves/dune
+++ b/src/lib/snarky_curves/dune
@@ -1,15 +1,16 @@
 (library
  (name snarky_curves)
  (public_name snarky_curves)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_snarky ppx_jane ppx_compare))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_snarky ppx_jane ppx_compare))
  (libraries
-   ;; opam libraries
-   core_kernel
-   sexplib0
-   bignum.bigint
-   ;; local libraries
-   bitstring_lib
-   snarky.backendless
-   snarky_field_extensions
-))
+  ;; opam libraries
+  core_kernel
+  sexplib0
+  bignum.bigint
+  ;; local libraries
+  bitstring_lib
+  snarky.backendless
+  snarky_field_extensions))
diff --git a/src/lib/snarky_field_extensions/dune b/src/lib/snarky_field_extensions/dune
index 0dde288969b..6ab7dc5cf2e 100644
--- a/src/lib/snarky_field_extensions/dune
+++ b/src/lib/snarky_field_extensions/dune
@@ -1,17 +1,19 @@
 (library
  (name snarky_field_extensions)
  (public_name snarky_field_extensions)
- (inline_tests (flags -verbose -show-counts))
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane ppx_compare ppx_deriving_yojson))
+ (inline_tests
+  (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane ppx_compare ppx_deriving_yojson))
  (libraries
-   ;; opam libraries
-   bignum.bigint
-   sexplib0
-   core_kernel
-   ppx_inline_test.config
-   result
-   ;; local libraries
-   snarkette
-   snarky.backendless
-))
+  ;; opam libraries
+  bignum.bigint
+  sexplib0
+  core_kernel
+  ppx_inline_test.config
+  result
+  ;; local libraries
+  snarkette
+  snarky.backendless))
diff --git a/src/lib/snarky_group_map/dune b/src/lib/snarky_group_map/dune
index 15fdf6a073e..5d96bd93ef8 100644
--- a/src/lib/snarky_group_map/dune
+++ b/src/lib/snarky_group_map/dune
@@ -1,12 +1,15 @@
 (library
  (name snarky_group_map)
  (public_name snarky_group_map)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane ppx_compare))
- (inline_tests (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane ppx_compare))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   core_kernel
-   ;; local libraries
-   snarky.backendless
-   group_map))
+  ;; opam libraries
+  core_kernel
+  ;; local libraries
+  snarky.backendless
+  group_map))
diff --git a/src/lib/snarky_log/dune b/src/lib/snarky_log/dune
index ec82523af65..88164aab2a3 100644
--- a/src/lib/snarky_log/dune
+++ b/src/lib/snarky_log/dune
@@ -1,6 +1,8 @@
 (library
  (name snarky_log)
  (public_name snarky_log)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (libraries yojson snarky.backendless webkit_trace_event))
diff --git a/src/lib/snarky_taylor/dune b/src/lib/snarky_taylor/dune
index 2c5bc31ec36..2b4845d13f2 100644
--- a/src/lib/snarky_taylor/dune
+++ b/src/lib/snarky_taylor/dune
@@ -1,16 +1,18 @@
 (library
  (name snarky_taylor)
  (public_name snarky_taylor)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane ppx_compare))
- (inline_tests (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane ppx_compare))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   bignum.bigint
-   core_kernel
-   bignum
-   sexplib0
-   ;; local libraries
-   snarky.backendless
-   snarky_integer
-   ))
+  ;; opam libraries
+  bignum.bigint
+  core_kernel
+  bignum
+  sexplib0
+  ;; local libraries
+  snarky.backendless
+  snarky_integer))
diff --git a/src/lib/snarky_taylor/tests/dune b/src/lib/snarky_taylor/tests/dune
index 2338aeafe3c..68d838ffafc 100644
--- a/src/lib/snarky_taylor/tests/dune
+++ b/src/lib/snarky_taylor/tests/dune
@@ -1,21 +1,23 @@
 (library
  (name snarky_taylor_tests)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   bignum.bigint
-   core_kernel
-   bignum
-   ppx_inline_test.config
-   base
-   ;; local libraries
-   pickles
-   snarky_integer
-   snark_params
-   snarky_taylor
-   snarky
-   bitstring_lib
-   snarky.backendless
-   )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_inline_test ppx_let ppx_version)))
+  ;; opam libraries
+  bignum.bigint
+  core_kernel
+  bignum
+  ppx_inline_test.config
+  base
+  ;; local libraries
+  pickles
+  snarky_integer
+  snark_params
+  snarky_taylor
+  snarky
+  bitstring_lib
+  snarky.backendless)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_inline_test ppx_let ppx_version)))
diff --git a/src/lib/sparse_ledger_lib/dune b/src/lib/sparse_ledger_lib/dune
index e88cb1eb06f..6cb90bcbf7a 100644
--- a/src/lib/sparse_ledger_lib/dune
+++ b/src/lib/sparse_ledger_lib/dune
@@ -2,22 +2,23 @@
  (name sparse_ledger_lib)
  (public_name sparse_ledger_lib)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   base.caml
-   core_kernel
-   sexplib0
-   base
-   ppx_inline_test.config
-   bin_prot.shape
-   result
-   ppx_version.runtime
-   ;; mina
-   mina_stdlib
-   bounded_types
- )
+  ;; opam libraries
+  base.caml
+  core_kernel
+  sexplib0
+  base
+  ppx_inline_test.config
+  bin_prot.shape
+  result
+  ppx_version.runtime
+  ;; mina
+  mina_stdlib
+  bounded_types)
  (preprocess
   (pps ppx_jane ppx_compare ppx_deriving_yojson ppx_version))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "sparse Ledger implementation"))
diff --git a/src/lib/staged_ledger/dune b/src/lib/staged_ledger/dune
index 63c134e4dff..b999ff45d2c 100644
--- a/src/lib/staged_ledger/dune
+++ b/src/lib/staged_ledger/dune
@@ -2,76 +2,90 @@
  (name staged_ledger)
  (public_name staged_ledger)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   ppx_hash.runtime-lib
-   async_kernel
-   base.caml
-   base
-   sexplib0
-   core_kernel
-   core
-   lens
-   async
-   async_unix
-   base.base_internalhash_types
-   integers
-   ;; local libraries
-   kimchi_pasta
-   kimchi_pasta.basic
-   random_oracle_input
-   bounded_types
-   mina_base.import
-   mina_ledger
-   quickcheck_lib
-   mina_metrics
-   coda_genesis_ledger
-   error_json
-   transaction_witness
-   mina_numbers
-   data_hash_lib
-   transaction_snark_work
-   ledger_proof
-   logger
-   transaction_snark
-   transaction_snark_scan_state
-   sgn
-   mina_base
-   mina_transaction
-   mina_transaction_logic
-   verifier
-   staged_ledger_diff
-   signature_lib
-   mina_signature_kind
-   currency
-   genesis_constants
-   one_or_two
-   o1trace
-   mina_state
-   mina_stdlib
-   snark_work_lib
-   child_processes
-   consensus
-   merkle_ledger
-   pickles
-   pickles_types
-   snark_params
-   snarky.backendless
-   with_hash
-   mina_generators
-   random_oracle
-   kimchi_backend
-   pickles.backend
-   zkapp_command_builder
-   ppx_version.runtime
-   mina_wire_types
-   internal_tracing
-   cache_dir
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps
-               lens.ppx_deriving ppx_mina ppx_version ppx_bin_prot ppx_fields_conv ppx_sexp_conv ppx_compare ppx_deriving.make
-               ppx_deriving_yojson ppx_custom_printf ppx_let ppx_inline_test ppx_assert ppx_pipebang))
+  ;; opam libraries
+  ppx_inline_test.config
+  ppx_hash.runtime-lib
+  async_kernel
+  base.caml
+  base
+  sexplib0
+  core_kernel
+  core
+  lens
+  async
+  async_unix
+  base.base_internalhash_types
+  integers
+  ;; local libraries
+  kimchi_pasta
+  kimchi_pasta.basic
+  random_oracle_input
+  bounded_types
+  mina_base.import
+  mina_ledger
+  quickcheck_lib
+  mina_metrics
+  coda_genesis_ledger
+  error_json
+  transaction_witness
+  mina_numbers
+  data_hash_lib
+  transaction_snark_work
+  ledger_proof
+  logger
+  transaction_snark
+  transaction_snark_scan_state
+  sgn
+  mina_base
+  mina_transaction
+  mina_transaction_logic
+  verifier
+  staged_ledger_diff
+  signature_lib
+  mina_signature_kind
+  currency
+  genesis_constants
+  one_or_two
+  o1trace
+  mina_state
+  mina_stdlib
+  snark_work_lib
+  child_processes
+  consensus
+  merkle_ledger
+  pickles
+  pickles_types
+  snark_params
+  snarky.backendless
+  with_hash
+  mina_generators
+  random_oracle
+  kimchi_backend
+  pickles.backend
+  zkapp_command_builder
+  ppx_version.runtime
+  mina_wire_types
+  internal_tracing
+  cache_dir)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   lens.ppx_deriving
+   ppx_mina
+   ppx_version
+   ppx_bin_prot
+   ppx_fields_conv
+   ppx_sexp_conv
+   ppx_compare
+   ppx_deriving.make
+   ppx_deriving_yojson
+   ppx_custom_printf
+   ppx_let
+   ppx_inline_test
+   ppx_assert
+   ppx_pipebang))
  (synopsis "Staged Ledger updates the current ledger with new transactions"))
diff --git a/src/lib/staged_ledger_diff/dune b/src/lib/staged_ledger_diff/dune
index 16106aa144a..84d6de6342a 100644
--- a/src/lib/staged_ledger_diff/dune
+++ b/src/lib/staged_ledger_diff/dune
@@ -2,37 +2,38 @@
  (name staged_ledger_diff)
  (public_name staged_ledger_diff)
  (libraries
-   ;; opam libraries
-   core_kernel
-   sexplib0
-   async
-   bin_prot.shape
-   base.caml
-   blake2
-   stdint
-   ppx_inline_test.config
-   splittable_random
-   stdio
-   async_unix
-   async_kernel
-   ;; local libraries
-   mina_base
-   transaction_snark_work
-   genesis_constants
-   currency
-   allocation_functor
-   consensus
-   logger
-   ppx_version.runtime
-   mina_wire_types
-   mina_base.import
-   signature_lib
-   pickles.backend
-   snark_params
-   pickles
-   kimchi_pasta
-   kimchi_pasta.basic
-   mina_numbers
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_jane ppx_version ppx_deriving.std ppx_deriving_yojson)))
+  ;; opam libraries
+  core_kernel
+  sexplib0
+  async
+  bin_prot.shape
+  base.caml
+  blake2
+  stdint
+  ppx_inline_test.config
+  splittable_random
+  stdio
+  async_unix
+  async_kernel
+  ;; local libraries
+  mina_base
+  transaction_snark_work
+  genesis_constants
+  currency
+  allocation_functor
+  consensus
+  logger
+  ppx_version.runtime
+  mina_wire_types
+  mina_base.import
+  signature_lib
+  pickles.backend
+  snark_params
+  pickles
+  kimchi_pasta
+  kimchi_pasta.basic
+  mina_numbers)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_jane ppx_version ppx_deriving.std ppx_deriving_yojson)))
diff --git a/src/lib/state_or_error/dune b/src/lib/state_or_error/dune
index bd79f568422..91fe9bf3cb8 100644
--- a/src/lib/state_or_error/dune
+++ b/src/lib/state_or_error/dune
@@ -2,9 +2,16 @@
  (name state_or_error)
  (public_name state_or_error)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries core_kernel ppx_fields_conv)
  (preprocess
-  (pps ppx_jane ppx_version ppx_compare ppx_deriving.make ppx_deriving_yojson))
- (instrumentation (backend bisect_ppx))
+  (pps
+   ppx_jane
+   ppx_version
+   ppx_compare
+   ppx_deriving.make
+   ppx_deriving_yojson))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "State monad with or_error"))
diff --git a/src/lib/storage/dune b/src/lib/storage/dune
index b37ead85d0e..7d0bd4450e1 100644
--- a/src/lib/storage/dune
+++ b/src/lib/storage/dune
@@ -1,25 +1,26 @@
 (library
  (name storage)
  (public_name storage)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (library_flags -linkall)
  (libraries
-   ;; opam libraries
-   core
-   async
-   core_kernel
-   bin_prot.shape
-   bin_prot
-   base
-   sexplib0
-   async_kernel
-   async_unix
-   base.caml
-   ;; local libraries
-   logger
-   ppx_version.runtime
- )
+  ;; opam libraries
+  core
+  async
+  core_kernel
+  bin_prot.shape
+  bin_prot
+  base
+  sexplib0
+  async_kernel
+  async_unix
+  base.caml
+  ;; local libraries
+  logger
+  ppx_version.runtime)
  (preprocess
   (pps ppx_version ppx_jane))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Storage module checksums data and stores it"))
diff --git a/src/lib/string_sign/dune b/src/lib/string_sign/dune
index 95f90df83a2..35b2c707439 100644
--- a/src/lib/string_sign/dune
+++ b/src/lib/string_sign/dune
@@ -1,25 +1,27 @@
 (library
  (name string_sign)
  (public_name string_sign)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   core_kernel
-   ppx_inline_test.config
-   result
-   ;; local libraries
-   kimchi_backend
-   pickles.backend
-   kimchi_pasta
-   kimchi_pasta.basic
-   random_oracle_input
-   signature_lib
-   snark_params
-   random_oracle
-   pickles
-   mina_signature_kind
-   mina_base
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_jane ppx_version ppx_inline_test))
+  ;; opam libraries
+  core_kernel
+  ppx_inline_test.config
+  result
+  ;; local libraries
+  kimchi_backend
+  pickles.backend
+  kimchi_pasta
+  kimchi_pasta.basic
+  random_oracle_input
+  signature_lib
+  snark_params
+  random_oracle
+  pickles
+  mina_signature_kind
+  mina_base)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_jane ppx_version ppx_inline_test))
  (synopsis "Schnorr signatures for strings"))
diff --git a/src/lib/structured_log_events/dune b/src/lib/structured_log_events/dune
index 33809a0b434..8a17068ac36 100644
--- a/src/lib/structured_log_events/dune
+++ b/src/lib/structured_log_events/dune
@@ -1,17 +1,23 @@
 (library
  (name structured_log_events)
  (public_name structured_log_events)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (library_flags -linkall)
  (libraries
-   ;; opam libraries
-   core_kernel
-   yojson
-   sexplib0
-   ;; local libraries
-   interpolator_lib
-   )
+  ;; opam libraries
+  core_kernel
+  yojson
+  sexplib0
+  ;; local libraries
+  interpolator_lib)
  (preprocess
-  (pps ppx_version ppx_jane ppx_deriving.std ppx_deriving_yojson ppx_inline_test))
- (instrumentation (backend bisect_ppx))
+  (pps
+   ppx_version
+   ppx_jane
+   ppx_deriving.std
+   ppx_deriving_yojson
+   ppx_inline_test))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Events, logging and parsing"))
diff --git a/src/lib/sync_handler/dune b/src/lib/sync_handler/dune
index b13c2b4482f..434b4fe8a96 100644
--- a/src/lib/sync_handler/dune
+++ b/src/lib/sync_handler/dune
@@ -1,37 +1,39 @@
 (library
  (name sync_handler)
  (public_name sync_handler)
- (inline_tests (flags -verbose -show-counts))
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_jane))
+ (inline_tests
+  (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_version ppx_jane))
  (libraries
-   ;; opam libraries
-   sexplib0
-   core
-   async
-   core_kernel
-   async_kernel
-   ;; local libraries
-   with_hash
-   data_hash_lib
-   precomputed_values
-   genesis_constants
-   trust_system
-   transition_frontier_extensions
-   transition_frontier_base
-   consensus
-   syncable_ledger
-   mina_base
-   mina_intf
-   transition_frontier
-   best_tip_prover
-   mina_block
-   network_peer
-   logger
-   merkle_ledger
-   staged_ledger
-   truth
-   proof_carrying_data
-   mina_ledger
-   mina_wire_types
-))
+  ;; opam libraries
+  sexplib0
+  core
+  async
+  core_kernel
+  async_kernel
+  ;; local libraries
+  with_hash
+  data_hash_lib
+  precomputed_values
+  genesis_constants
+  trust_system
+  transition_frontier_extensions
+  transition_frontier_base
+  consensus
+  syncable_ledger
+  mina_base
+  mina_intf
+  transition_frontier
+  best_tip_prover
+  mina_block
+  network_peer
+  logger
+  merkle_ledger
+  staged_ledger
+  truth
+  proof_carrying_data
+  mina_ledger
+  mina_wire_types))
diff --git a/src/lib/sync_status/dune b/src/lib/sync_status/dune
index abf87506c2f..b697cbe81c5 100644
--- a/src/lib/sync_status/dune
+++ b/src/lib/sync_status/dune
@@ -1,18 +1,19 @@
 (library
  (name sync_status)
  (public_name sync_status)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   core_kernel
-   bin_prot.shape
-   base.caml
-   sexplib0
-   base.base_internalhash_types
-   ppx_inline_test.config
-   ppx_version.runtime
- )
+  ;; opam libraries
+  core_kernel
+  bin_prot.shape
+  base.caml
+  sexplib0
+  base.base_internalhash_types
+  ppx_inline_test.config
+  ppx_version.runtime)
  (preprocess
   (pps ppx_jane ppx_version ppx_deriving_yojson ppx_enumerate))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Different kinds of status for Coda "))
diff --git a/src/lib/syncable_ledger/dune b/src/lib/syncable_ledger/dune
index 5e51630c4b9..a42df45c207 100644
--- a/src/lib/syncable_ledger/dune
+++ b/src/lib/syncable_ledger/dune
@@ -4,27 +4,33 @@
  (library_flags -linkall)
  (flags :standard -short-paths)
  (libraries
-   ;; opam libraries
-   async_kernel
-   core_kernel
-   bin_prot.shape
-   base.caml
-   sexplib0
-   core
-   async
-   ;; local libraries
-   trust_system
-   logger
-   merkle_ledger
-   pipe_lib
-   network_peer
-   merkle_address
-   direction
-   error_json
-   ppx_version.runtime
-   mina_compile_config
- )
+  ;; opam libraries
+  async_kernel
+  core_kernel
+  bin_prot.shape
+  base.caml
+  sexplib0
+  core
+  async
+  ;; local libraries
+  trust_system
+  logger
+  merkle_ledger
+  pipe_lib
+  network_peer
+  merkle_address
+  direction
+  error_json
+  ppx_version.runtime
+  mina_compile_config)
  (preprocess
-  (pps ppx_mina ppx_version ppx_jane ppx_compare ppx_deriving_yojson ppx_register_event))
- (instrumentation (backend bisect_ppx))
- (synopsis "Synchronization of Merkle-tree backed ledgers"))
\ No newline at end of file
+  (pps
+   ppx_mina
+   ppx_version
+   ppx_jane
+   ppx_compare
+   ppx_deriving_yojson
+   ppx_register_event))
+ (instrumentation
+  (backend bisect_ppx))
+ (synopsis "Synchronization of Merkle-tree backed ledgers"))
diff --git a/src/lib/syncable_ledger/test/dune b/src/lib/syncable_ledger/test/dune
index c1573d877b2..0a45c7a4d6b 100644
--- a/src/lib/syncable_ledger/test/dune
+++ b/src/lib/syncable_ledger/test/dune
@@ -1,37 +1,38 @@
 (library
  (name test)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   result
-   base.base_internalhash_types
-   bin_prot.shape
-   async_unix
-   async_kernel
-   core_kernel
-   core
-   async
-   sexplib0
-   ppx_inline_test.config
-   base.caml
-   ;; local libraries
-   mina_numbers
-   mina_base
-   merkle_address
-   logger
-   pipe_lib
-   merkle_ledger_tests
-   merkle_ledger
-   syncable_ledger
-   network_peer
-   trust_system
-   currency
-   data_hash_lib
-   mina_base.import
-   signature_lib
-   bounded_types
-   mina_compile_config
-   )
+  ;; opam libraries
+  result
+  base.base_internalhash_types
+  bin_prot.shape
+  async_unix
+  async_kernel
+  core_kernel
+  core
+  async
+  sexplib0
+  ppx_inline_test.config
+  base.caml
+  ;; local libraries
+  mina_numbers
+  mina_base
+  merkle_address
+  logger
+  pipe_lib
+  merkle_ledger_tests
+  merkle_ledger
+  syncable_ledger
+  network_peer
+  trust_system
+  currency
+  data_hash_lib
+  mina_base.import
+  signature_lib
+  bounded_types
+  mina_compile_config)
  (preprocess
   (pps ppx_version ppx_jane ppx_compare ppx_deriving_yojson))
- (instrumentation (backend bisect_ppx)))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/test_genesis_ledger/dune b/src/lib/test_genesis_ledger/dune
index 8f234cb295f..4013aeff77d 100644
--- a/src/lib/test_genesis_ledger/dune
+++ b/src/lib/test_genesis_ledger/dune
@@ -2,5 +2,7 @@
  (public_name test_genesis_ledger)
  (name test_genesis_ledger)
  (libraries coda_genesis_ledger core_kernel)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_let)))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_let)))
diff --git a/src/lib/test_util/dune b/src/lib/test_util/dune
index 8485ca2d3df..d20ea81f6e5 100644
--- a/src/lib/test_util/dune
+++ b/src/lib/test_util/dune
@@ -3,18 +3,18 @@
  (public_name test_util)
  (library_flags -linkall)
  (libraries
-   ;; opam libraries
-   core_kernel
-   base.caml
-   bin_prot
-   ;; local libraries
-   snark_params
-   fold_lib
-   snarky.backendless
-   pickles
-   crypto_params
-   )
+  ;; opam libraries
+  core_kernel
+  base.caml
+  bin_prot
+  ;; local libraries
+  snark_params
+  fold_lib
+  snarky.backendless
+  pickles
+  crypto_params)
  (preprocess
   (pps ppx_version ppx_jane ppx_compare))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "test utils"))
diff --git a/src/lib/timeout_lib/dune b/src/lib/timeout_lib/dune
index 4e5dba5cce7..8a429d42358 100644
--- a/src/lib/timeout_lib/dune
+++ b/src/lib/timeout_lib/dune
@@ -2,11 +2,12 @@
  (name timeout_lib)
  (public_name timeout_lib)
  (libraries
-   ;; opam libraries
-   core_kernel
-   async_kernel
-   ;; local libraries
-   logger
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_version ppx_mina)))
+  ;; opam libraries
+  core_kernel
+  async_kernel
+  ;; local libraries
+  logger)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_version ppx_mina)))
diff --git a/src/lib/transaction/dune b/src/lib/transaction/dune
index b6b1dd91618..9ccac2cfe23 100644
--- a/src/lib/transaction/dune
+++ b/src/lib/transaction/dune
@@ -1,45 +1,46 @@
 (library
  (name mina_transaction)
  (public_name mina_transaction)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   base.caml
-   base
-   base.base_internalhash_types
-   bin_prot.shape
-   core_kernel
-   ppx_inline_test.config
-   result
-   sexplib0
-   base64
-   ;; local libraries
-   base58_check
-   blake2
-   codable
-   currency
-   mina_base
-   mina_base.import
-   mina_numbers
-   one_or_two
-   pickles
-   random_oracle
-   signature_lib
-   sgn
-   snark_params
-   snarky.backendless
-   ppx_version.runtime
-   with_hash
-   mina_wire_types
- )
- (instrumentation (backend bisect_ppx))
+  ;; opam libraries
+  base.caml
+  base
+  base.base_internalhash_types
+  bin_prot.shape
+  core_kernel
+  ppx_inline_test.config
+  result
+  sexplib0
+  base64
+  ;; local libraries
+  base58_check
+  blake2
+  codable
+  currency
+  mina_base
+  mina_base.import
+  mina_numbers
+  one_or_two
+  pickles
+  random_oracle
+  signature_lib
+  sgn
+  snark_params
+  snarky.backendless
+  ppx_version.runtime
+  with_hash
+  mina_wire_types)
+ (instrumentation
+  (backend bisect_ppx))
  (preprocess
   (pps
-    h_list.ppx
-    ppx_mina
-    ppx_inline_test
-    ppx_compare
-    ppx_deriving_yojson
-    ppx_hash
-    ppx_sexp_conv
-    ppx_version)))
+   h_list.ppx
+   ppx_mina
+   ppx_inline_test
+   ppx_compare
+   ppx_deriving_yojson
+   ppx_hash
+   ppx_sexp_conv
+   ppx_version)))
diff --git a/src/lib/transaction_inclusion_status/dune b/src/lib/transaction_inclusion_status/dune
index 7a850594236..434c5a1f0ea 100644
--- a/src/lib/transaction_inclusion_status/dune
+++ b/src/lib/transaction_inclusion_status/dune
@@ -1,39 +1,41 @@
 (library
  (name transaction_inclusion_status)
  (public_name transaction_inclusion_status)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   async_kernel
-   core
-   base.caml
-   bin_prot.shape
-   sexplib0
-   core_kernel
-   ppx_inline_test.config
-   async
-   async_unix
-   ;; local libraries
-   signature_lib
-   child_processes
-   verifier
-   precomputed_values
-   block_time
-   logger
-   mina_numbers
-   pipe_lib
-   mina_base
-   mina_transaction
-   transition_frontier
-   network_pool
-   transition_frontier_base
-   coda_genesis_ledger
-   trust_system
-   genesis_constants
-   mina_stdlib
-   mina_base.import
-   mina_block
-   ppx_version.runtime
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_mina ppx_version)))
+  ;; opam libraries
+  async_kernel
+  core
+  base.caml
+  bin_prot.shape
+  sexplib0
+  core_kernel
+  ppx_inline_test.config
+  async
+  async_unix
+  ;; local libraries
+  signature_lib
+  child_processes
+  verifier
+  precomputed_values
+  block_time
+  logger
+  mina_numbers
+  pipe_lib
+  mina_base
+  mina_transaction
+  transition_frontier
+  network_pool
+  transition_frontier_base
+  coda_genesis_ledger
+  trust_system
+  genesis_constants
+  mina_stdlib
+  mina_base.import
+  mina_block
+  ppx_version.runtime)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_mina ppx_version)))
diff --git a/src/lib/transaction_logic/dune b/src/lib/transaction_logic/dune
index cc8571d59f2..3b234f62a1c 100644
--- a/src/lib/transaction_logic/dune
+++ b/src/lib/transaction_logic/dune
@@ -2,54 +2,55 @@
  (name mina_transaction_logic)
  (public_name mina_transaction_logic)
  (libraries
-   ;; opam libraries
-   async_kernel
-   result
-   bin_prot.shape
-   ppx_inline_test.config
-   sexplib0
-   yojson
-   sexp_diff_kernel
-   core_kernel
-   base.caml
-   base
-   base.base_internalhash_types
-   integers
-   base_quickcheck
-   ;; local libraries
-   mina_stdlib
-   mina_wire_types
-   block_time
-   currency
-   data_hash_lib
-   debug_assert
-   genesis_constants
-   kimchi_bindings
-   kimchi_types
-   pasta_bindings
-   kimchi_backend_common
-   kimchi_backend
-   kimchi_pasta
-   kimchi_pasta.basic
-   mina_base
-   mina_base.import
-   mina_numbers
-   mina_transaction
-   one_or_two
-   pickles_types
-   pickles
-   pickles.backend
-   random_oracle
-   random_oracle_input
-   signature_lib
-   sgn
-   snarky.backendless
-   snark_params
-   unsigned_extended
-   ppx_version.runtime
-   with_hash
-   bounded_types)
- (instrumentation (backend bisect_ppx))
+  ;; opam libraries
+  async_kernel
+  result
+  bin_prot.shape
+  ppx_inline_test.config
+  sexplib0
+  yojson
+  sexp_diff_kernel
+  core_kernel
+  base.caml
+  base
+  base.base_internalhash_types
+  integers
+  base_quickcheck
+  ;; local libraries
+  mina_stdlib
+  mina_wire_types
+  block_time
+  currency
+  data_hash_lib
+  debug_assert
+  genesis_constants
+  kimchi_bindings
+  kimchi_types
+  pasta_bindings
+  kimchi_backend_common
+  kimchi_backend
+  kimchi_pasta
+  kimchi_pasta.basic
+  mina_base
+  mina_base.import
+  mina_numbers
+  mina_transaction
+  one_or_two
+  pickles_types
+  pickles
+  pickles.backend
+  random_oracle
+  random_oracle_input
+  signature_lib
+  sgn
+  snarky.backendless
+  snark_params
+  unsigned_extended
+  ppx_version.runtime
+  with_hash
+  bounded_types)
+ (instrumentation
+  (backend bisect_ppx))
  (preprocess
   (pps
    h_list.ppx
diff --git a/src/lib/transaction_logic/test/dune b/src/lib/transaction_logic/test/dune
index a13bc9d23d1..f36d0a5f43b 100644
--- a/src/lib/transaction_logic/test/dune
+++ b/src/lib/transaction_logic/test/dune
@@ -1,48 +1,55 @@
 (library
  (name transaction_logic_tests)
  (libraries
-   ;; opam libraries
-   async_kernel
-   async_unix
-   base
-   base.base_internalhash_types
-   core
-   core_kernel
-   integers
-   ppx_inline_test.config
-   sexplib0
-   yojson
-   ;; local libraries
-   currency
-   data_hash_lib
-   genesis_constants
-   kimchi_backend_common
-   kimchi_pasta
-   kimchi_pasta.basic
-   bounded_types
-   mina_base
-   mina_base.import
-   mina_base.test_helpers
-   mina_ledger
-   mina_ledger_test_helpers
-   mina_transaction
-   mina_transaction_logic
-   mina_numbers
-   mina_wire_types
-   monad_lib
-   pasta_bindings
-   pickles
-   pickles.backend
-   pickles_types
-   random_oracle
-   sgn
-   sgn_type
-   signature_lib
-   snark_params
-   zkapp_command_builder
-   )
-(library_flags -linkall)
-(inline_tests (flags -verbose -show-counts))
-(preprocess
- (pps ppx_snarky ppx_version ppx_jane ppx_sexp_conv ppx_inline_test ppx_assert))
-(instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  async_kernel
+  async_unix
+  base
+  base.base_internalhash_types
+  core
+  core_kernel
+  integers
+  ppx_inline_test.config
+  sexplib0
+  yojson
+  ;; local libraries
+  currency
+  data_hash_lib
+  genesis_constants
+  kimchi_backend_common
+  kimchi_pasta
+  kimchi_pasta.basic
+  bounded_types
+  mina_base
+  mina_base.import
+  mina_base.test_helpers
+  mina_ledger
+  mina_ledger_test_helpers
+  mina_transaction
+  mina_transaction_logic
+  mina_numbers
+  mina_wire_types
+  monad_lib
+  pasta_bindings
+  pickles
+  pickles.backend
+  pickles_types
+  random_oracle
+  sgn
+  sgn_type
+  signature_lib
+  snark_params
+  zkapp_command_builder)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts))
+ (preprocess
+  (pps
+   ppx_snarky
+   ppx_version
+   ppx_jane
+   ppx_sexp_conv
+   ppx_inline_test
+   ppx_assert))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_logic/test/transaction_logic/dune b/src/lib/transaction_logic/test/transaction_logic/dune
index 5be42af9d4c..65989a7830a 100644
--- a/src/lib/transaction_logic/test/transaction_logic/dune
+++ b/src/lib/transaction_logic/test/transaction_logic/dune
@@ -1,47 +1,47 @@
 (tests
  (names main)
  (libraries
-   ;; opam libraries
-   alcotest
-   async_kernel
-   async_unix
-   base
-   base.base_internalhash_types
-   core
-   core_kernel
-   integers
-   ppx_inline_test.config
-   sexplib0
-   yojson
-   ;; local libraries
-   currency
-   data_hash_lib
-   genesis_constants
-   kimchi_backend_common
-   kimchi_pasta
-   kimchi_pasta.basic
-   mina_base
-   mina_base.import
-   mina_base.test_helpers
-   mina_transaction
-   mina_transaction_logic
-   mina_numbers
-   mina_ledger
-   mina_ledger_test_helpers
-   mina_wire_types
-   monad_lib
-   pasta_bindings
-   pickles
-   pickles.backend
-   pickles_types
-   random_oracle
-   sgn
-   sgn_type
-   signature_lib
-   transaction_logic_tests
-   snark_params
-   zkapp_command_builder
-   )
-(preprocess
- (pps ppx_snarky ppx_version ppx_jane ppx_sexp_conv ppx_assert))
-(instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  alcotest
+  async_kernel
+  async_unix
+  base
+  base.base_internalhash_types
+  core
+  core_kernel
+  integers
+  ppx_inline_test.config
+  sexplib0
+  yojson
+  ;; local libraries
+  currency
+  data_hash_lib
+  genesis_constants
+  kimchi_backend_common
+  kimchi_pasta
+  kimchi_pasta.basic
+  mina_base
+  mina_base.import
+  mina_base.test_helpers
+  mina_transaction
+  mina_transaction_logic
+  mina_numbers
+  mina_ledger
+  mina_ledger_test_helpers
+  mina_wire_types
+  monad_lib
+  pasta_bindings
+  pickles
+  pickles.backend
+  pickles_types
+  random_oracle
+  sgn
+  sgn_type
+  signature_lib
+  transaction_logic_tests
+  snark_params
+  zkapp_command_builder)
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane ppx_sexp_conv ppx_assert))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_protocol_state/dune b/src/lib/transaction_protocol_state/dune
index a6e09068a4e..0b5000b5c27 100644
--- a/src/lib/transaction_protocol_state/dune
+++ b/src/lib/transaction_protocol_state/dune
@@ -2,25 +2,26 @@
  (name transaction_protocol_state)
  (public_name transaction_protocol_state)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   sexplib0
-   core_kernel
-   core
-   bin_prot.shape
-   base.caml
-   ;; local libraries
-   pickles
-   genesis_constants
-   snark_params
-   snarky.backendless
-   mina_state
-   mina_numbers
-   sgn
-   ppx_version.runtime
- )
+  ;; opam libraries
+  sexplib0
+  core_kernel
+  core
+  bin_prot.shape
+  base.caml
+  ;; local libraries
+  pickles
+  genesis_constants
+  snark_params
+  snarky.backendless
+  mina_state
+  mina_numbers
+  sgn
+  ppx_version.runtime)
  (preprocess
   (pps ppx_snarky ppx_version ppx_jane ppx_deriving.std ppx_deriving_yojson))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Transaction protocol state library"))
diff --git a/src/lib/transaction_snark/dune b/src/lib/transaction_snark/dune
index aefd99a2e1d..2b21bd70441 100644
--- a/src/lib/transaction_snark/dune
+++ b/src/lib/transaction_snark/dune
@@ -2,74 +2,82 @@
  (name transaction_snark)
  (public_name transaction_snark)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async_kernel
-   base.base_internalhash_types
-   bin_prot.shape
-   async
-   sexplib0
-   bignum
-   core
-   core_kernel
-   base.md5
-   base.caml
-   async_unix
-   splittable_random
-   ;; local libraries
-   bounded_types
-   mina_wire_types
-   mina_base.import
-   mina_transaction
-   mina_transaction_logic
-   hash_prefix_states
-   kimchi_backend_common
-   kimchi_backend
-   with_hash
-   bitstring_lib
-   one_or_two
-   snarky_integer
-   pickles.backend
-   signature_lib
-   mina_signature_kind
-   genesis_constants
-   currency
-   random_oracle
-   snark_params
-   transaction_protocol_state
-   mina_base
-   cache_dir
-   snarky.backendless
-   sgn
-   sgn_type
-   mina_state
-   o1trace
-   pickles
-   pickles_base
-   random_oracle_input
-   pickles_types
-   coda_genesis_ledger
-   mina_numbers
-   crypto_params
-   tuple_lib
-   consensus
-   data_hash_lib
-   quickcheck_lib
-   test_util
-   transaction_witness
-   mina_ledger
-   kimchi_pasta
-   kimchi_pasta.basic
-   merkle_ledger
-   mina_base.util
-   ppx_version.runtime
-   logger
-   zkapp_command_builder
-   snark_keys_header
- )
+  ;; opam libraries
+  ppx_inline_test.config
+  async_kernel
+  base.base_internalhash_types
+  bin_prot.shape
+  async
+  sexplib0
+  bignum
+  core
+  core_kernel
+  base.md5
+  base.caml
+  async_unix
+  splittable_random
+  ;; local libraries
+  bounded_types
+  mina_wire_types
+  mina_base.import
+  mina_transaction
+  mina_transaction_logic
+  hash_prefix_states
+  kimchi_backend_common
+  kimchi_backend
+  with_hash
+  bitstring_lib
+  one_or_two
+  snarky_integer
+  pickles.backend
+  signature_lib
+  mina_signature_kind
+  genesis_constants
+  currency
+  random_oracle
+  snark_params
+  transaction_protocol_state
+  mina_base
+  cache_dir
+  snarky.backendless
+  sgn
+  sgn_type
+  mina_state
+  o1trace
+  pickles
+  pickles_base
+  random_oracle_input
+  pickles_types
+  coda_genesis_ledger
+  mina_numbers
+  crypto_params
+  tuple_lib
+  consensus
+  data_hash_lib
+  quickcheck_lib
+  test_util
+  transaction_witness
+  mina_ledger
+  kimchi_pasta
+  kimchi_pasta.basic
+  merkle_ledger
+  mina_base.util
+  ppx_version.runtime
+  logger
+  zkapp_command_builder
+  snark_keys_header)
  (preprocess
-  (pps ppx_snarky ppx_version ppx_mina ppx_jane ppx_deriving.std ppx_deriving_yojson h_list.ppx))
- (instrumentation (backend bisect_ppx))
+  (pps
+   ppx_snarky
+   ppx_version
+   ppx_mina
+   ppx_jane
+   ppx_deriving.std
+   ppx_deriving_yojson
+   h_list.ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Transaction state transition snarking library"))
diff --git a/src/lib/transaction_snark/test/access_permission/dune b/src/lib/transaction_snark/test/access_permission/dune
index b97da5c60cc..0f2e31214c3 100644
--- a/src/lib/transaction_snark/test/access_permission/dune
+++ b/src/lib/transaction_snark/test/access_permission/dune
@@ -1,52 +1,54 @@
 (library
-  (name transaction_snark_tests_access_permission)
+ (name transaction_snark_tests_access_permission)
  (libraries
-   ;; opam libraries
-   async
-   async_kernel
-   async_unix
-   base
-   core
-   core_kernel
-   ppx_inline_test.config
-   sexplib0
-   yojson
-   ppx_deriving_yojson.runtime
-   result
-   ;; local libraries
-   cache_dir
-   currency
-   data_hash_lib
-   genesis_constants
-   pasta_bindings
-   kimchi_backend
-   kimchi_pasta
-   kimchi_pasta.basic
-   mina_base
-   mina_base.import
-   mina_ledger
-   mina_numbers
-   mina_state
-   mina_transaction_logic
-   pickles
-   pickles.backend
-   pickles_types
-   random_oracle_input
-   random_oracle
-   sgn
-   signature_lib
-   snark_params
-   snarky.backendless
-   transaction_protocol_state
-   transaction_snark
-   transaction_snark_tests
-   with_hash
-   zkapps_empty_update
-   zkapps_examples
-   bounded_types
-   )
-  (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts) (deps proof_cache.json))
-  (preprocess
-    (pps ppx_snarky ppx_version ppx_jane ppx_sexp_conv))
-  (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  async
+  async_kernel
+  async_unix
+  base
+  core
+  core_kernel
+  ppx_inline_test.config
+  sexplib0
+  yojson
+  ppx_deriving_yojson.runtime
+  result
+  ;; local libraries
+  cache_dir
+  currency
+  data_hash_lib
+  genesis_constants
+  pasta_bindings
+  kimchi_backend
+  kimchi_pasta
+  kimchi_pasta.basic
+  mina_base
+  mina_base.import
+  mina_ledger
+  mina_numbers
+  mina_state
+  mina_transaction_logic
+  pickles
+  pickles.backend
+  pickles_types
+  random_oracle_input
+  random_oracle
+  sgn
+  signature_lib
+  snark_params
+  snarky.backendless
+  transaction_protocol_state
+  transaction_snark
+  transaction_snark_tests
+  with_hash
+  zkapps_empty_update
+  zkapps_examples
+  bounded_types)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts)
+  (deps proof_cache.json))
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane ppx_sexp_conv))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/account_timing/dune b/src/lib/transaction_snark/test/account_timing/dune
index 7bea2f2b2af..348f35ad0dc 100644
--- a/src/lib/transaction_snark/test/account_timing/dune
+++ b/src/lib/transaction_snark/test/account_timing/dune
@@ -1,54 +1,55 @@
 (library
-  (name account_timing_tests)
+ (name account_timing_tests)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async
-   async_kernel
-   async_unix
-   core
-   base
-   base.caml
-   core_kernel
-   sexplib0
-   yojson
-   ;; local libraries
-   mina_base.import
-   pickles
-   pickles.backend
-   kimchi_pasta
-   kimchi_pasta.basic
-   transaction_snark
-   snark_params
-   data_hash_lib
-   coda_genesis_proof
-   bounded_types
-   mina_ledger
-   mina_base
-   mina_transaction
-   mina_compile_config
-   precomputed_values
-   currency
-   mina_state
-   signature_lib
-   random_oracle
-   genesis_constants
-   transaction_protocol_state
-   with_hash
-   pickles_types
-   mina_numbers
-   sgn
-   transaction_snark_tests
-   test_util
-   consensus
-   one_or_two
-   coda_genesis_ledger
-   snarky.backendless
-   mina_transaction_logic
-   mina_wire_types
-   )
-  (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts))
-  (preprocess
-    (pps ppx_snarky ppx_version ppx_jane))
-  (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  ppx_inline_test.config
+  async
+  async_kernel
+  async_unix
+  core
+  base
+  base.caml
+  core_kernel
+  sexplib0
+  yojson
+  ;; local libraries
+  mina_base.import
+  pickles
+  pickles.backend
+  kimchi_pasta
+  kimchi_pasta.basic
+  transaction_snark
+  snark_params
+  data_hash_lib
+  coda_genesis_proof
+  bounded_types
+  mina_ledger
+  mina_base
+  mina_transaction
+  mina_compile_config
+  precomputed_values
+  currency
+  mina_state
+  signature_lib
+  random_oracle
+  genesis_constants
+  transaction_protocol_state
+  with_hash
+  pickles_types
+  mina_numbers
+  sgn
+  transaction_snark_tests
+  test_util
+  consensus
+  one_or_two
+  coda_genesis_ledger
+  snarky.backendless
+  mina_transaction_logic
+  mina_wire_types)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts))
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/account_update_network_id/dune b/src/lib/transaction_snark/test/account_update_network_id/dune
index a543c6d8b56..92c92063264 100644
--- a/src/lib/transaction_snark/test/account_update_network_id/dune
+++ b/src/lib/transaction_snark/test/account_update_network_id/dune
@@ -1,44 +1,44 @@
 (library
-  (name account_update_network_id)
+ (name account_update_network_id)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async
-   async_kernel
-   async_unix
-   core
-   base
-   core_kernel
-   yojson
-   sexplib0
-   ;; local libraries
-   logger
-   mina_base.import
-   pickles
-   pickles.backend
-   kimchi_pasta
-   kimchi_pasta.basic
-   transaction_snark
-   snark_params
-   mina_ledger
-   mina_base
-   currency
-   mina_state
-   signature_lib
-   mina_signature_kind
-   genesis_constants
-   transaction_protocol_state
-   pickles_types
-   mina_numbers
-   sgn
-   transaction_snark_tests
-   test_util
-   mina_transaction_logic
-   mina_transaction
-   bounded_types
-   )
-  (library_flags -linkall)
-  (inline_tests)
-  (preprocess
-    (pps ppx_snarky ppx_version ppx_jane ppx_mina))
-  (instrumentation (backend bisect_ppx)))
\ No newline at end of file
+  ;; opam libraries
+  ppx_inline_test.config
+  async
+  async_kernel
+  async_unix
+  core
+  base
+  core_kernel
+  yojson
+  sexplib0
+  ;; local libraries
+  logger
+  mina_base.import
+  pickles
+  pickles.backend
+  kimchi_pasta
+  kimchi_pasta.basic
+  transaction_snark
+  snark_params
+  mina_ledger
+  mina_base
+  currency
+  mina_state
+  signature_lib
+  mina_signature_kind
+  genesis_constants
+  transaction_protocol_state
+  pickles_types
+  mina_numbers
+  sgn
+  transaction_snark_tests
+  test_util
+  mina_transaction_logic
+  mina_transaction
+  bounded_types)
+ (library_flags -linkall)
+ (inline_tests)
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane ppx_mina))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/app_state/dune b/src/lib/transaction_snark/test/app_state/dune
index ad83573fd6d..4722d46b4b1 100644
--- a/src/lib/transaction_snark/test/app_state/dune
+++ b/src/lib/transaction_snark/test/app_state/dune
@@ -1,36 +1,38 @@
 (library
-  (name app_state_tests)
+ (name app_state_tests)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async_unix
-   async
-   core
-   base
-   core_kernel
-   yojson
-   ppx_deriving_yojson.runtime
-   result
-   ;; local libraries
-   mina_base.import
-   pickles
-   transaction_snark
-   snark_params
-   mina_ledger
-   mina_base
-   mina_transaction_logic
-   currency
-   mina_state
-   signature_lib
-   genesis_constants
-   transaction_protocol_state
-   pickles_types
-   mina_numbers
-   sgn
-   transaction_snark_tests
-   )
-  (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts) (deps proof_cache.json))
-  (preprocess
-    (pps ppx_snarky ppx_version ppx_jane))
-  (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  ppx_inline_test.config
+  async_unix
+  async
+  core
+  base
+  core_kernel
+  yojson
+  ppx_deriving_yojson.runtime
+  result
+  ;; local libraries
+  mina_base.import
+  pickles
+  transaction_snark
+  snark_params
+  mina_ledger
+  mina_base
+  mina_transaction_logic
+  currency
+  mina_state
+  signature_lib
+  genesis_constants
+  transaction_protocol_state
+  pickles_types
+  mina_numbers
+  sgn
+  transaction_snark_tests)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts)
+  (deps proof_cache.json))
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/delegate/dune b/src/lib/transaction_snark/test/delegate/dune
index da283c1271c..92f5a05fbb2 100644
--- a/src/lib/transaction_snark/test/delegate/dune
+++ b/src/lib/transaction_snark/test/delegate/dune
@@ -1,36 +1,38 @@
 (library
-  (name delegate_tests)
+ (name delegate_tests)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async_unix
-   async
-   core
-   base
-   core_kernel
-   yojson
-   ppx_deriving_yojson.runtime
-   result
-   ;; local libraries
-   mina_base.import
-   pickles
-   transaction_snark
-   snark_params
-   mina_ledger
-   mina_base
-   currency
-   mina_state
-   mina_transaction_logic
-   signature_lib
-   genesis_constants
-   transaction_protocol_state
-   pickles_types
-   mina_numbers
-   sgn
-   transaction_snark_tests
-   )
-  (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts) (deps proof_cache.json))
-  (preprocess
-    (pps ppx_snarky ppx_version ppx_jane))
-  (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  ppx_inline_test.config
+  async_unix
+  async
+  core
+  base
+  core_kernel
+  yojson
+  ppx_deriving_yojson.runtime
+  result
+  ;; local libraries
+  mina_base.import
+  pickles
+  transaction_snark
+  snark_params
+  mina_ledger
+  mina_base
+  currency
+  mina_state
+  mina_transaction_logic
+  signature_lib
+  genesis_constants
+  transaction_protocol_state
+  pickles_types
+  mina_numbers
+  sgn
+  transaction_snark_tests)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts)
+  (deps proof_cache.json))
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/dune b/src/lib/transaction_snark/test/dune
index b988a30caa8..ea03e9418c6 100644
--- a/src/lib/transaction_snark/test/dune
+++ b/src/lib/transaction_snark/test/dune
@@ -1,64 +1,66 @@
 (library
-  (name transaction_snark_tests)
-  (public_name transaction_snark_tests)
+ (name transaction_snark_tests)
+ (public_name transaction_snark_tests)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async
-   async_kernel
-   async_unix
-   core
-   base
-   core_kernel
-   base64
-   yojson
-   integers
-   ppx_deriving_yojson.runtime
-   result
-   ;; local libraries
-   bounded_types
-   logger
-   random_oracle_input
-   pickles.backend
-   mina_base.import
-   crypto_params
-   kimchi_backend
-   with_hash
-   pickles
-   pickles_base
-   consensus
-   transaction_snark
-   snark_params
-   mina_ledger
-   mina_base
-   mina_transaction
-   mina_transaction_logic
-   currency
-   mina_state
-   signature_lib
-   snarky.backendless
-   genesis_constants
-   transaction_protocol_state
-   coda_genesis_ledger
-   pickles_types
-   kimchi_pasta
-   kimchi_pasta.basic
-   cache_dir
-   data_hash_lib
-   mina_numbers
-   random_oracle
-   sgn
-   sgn_type
-   sexplib0
-   test_util
-   transaction_witness
-   staged_ledger_diff
-   mina_wire_types
-   block_time
-   zkapps_examples
-   )
-  (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts) (deps proof_cache.json))
-  (preprocess
-    (pps ppx_mina ppx_snarky ppx_version ppx_jane ppx_sexp_conv))
-  (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  ppx_inline_test.config
+  async
+  async_kernel
+  async_unix
+  core
+  base
+  core_kernel
+  base64
+  yojson
+  integers
+  ppx_deriving_yojson.runtime
+  result
+  ;; local libraries
+  bounded_types
+  logger
+  random_oracle_input
+  pickles.backend
+  mina_base.import
+  crypto_params
+  kimchi_backend
+  with_hash
+  pickles
+  pickles_base
+  consensus
+  transaction_snark
+  snark_params
+  mina_ledger
+  mina_base
+  mina_transaction
+  mina_transaction_logic
+  currency
+  mina_state
+  signature_lib
+  snarky.backendless
+  genesis_constants
+  transaction_protocol_state
+  coda_genesis_ledger
+  pickles_types
+  kimchi_pasta
+  kimchi_pasta.basic
+  cache_dir
+  data_hash_lib
+  mina_numbers
+  random_oracle
+  sgn
+  sgn_type
+  sexplib0
+  test_util
+  transaction_witness
+  staged_ledger_diff
+  mina_wire_types
+  block_time
+  zkapps_examples)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts)
+  (deps proof_cache.json))
+ (preprocess
+  (pps ppx_mina ppx_snarky ppx_version ppx_jane ppx_sexp_conv))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/fee_payer/dune b/src/lib/transaction_snark/test/fee_payer/dune
index a56a94d7e78..61d3db38627 100644
--- a/src/lib/transaction_snark/test/fee_payer/dune
+++ b/src/lib/transaction_snark/test/fee_payer/dune
@@ -1,43 +1,45 @@
 (library
-  (name fee_payer_tests)
+ (name fee_payer_tests)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async_unix
-   async
-   async_kernel
-   core
-   base
-   core_kernel
-   yojson
-   sexplib0
-   integers
-   ppx_deriving_yojson.runtime
-   result
-   ;; local libraries
-   mina_base.import
-   pickles
-   pickles.backend
-   kimchi_pasta
-   kimchi_pasta.basic
-   transaction_snark
-   snark_params
-   mina_ledger
-   mina_base
-   mina_transaction
-   mina_transaction_logic
-   currency
-   mina_state
-   signature_lib
-   genesis_constants
-   transaction_protocol_state
-   pickles_types
-   mina_numbers
-   sgn
-   transaction_snark_tests
-   )
-  (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts) (deps proof_cache.json))
-  (preprocess
-    (pps ppx_snarky ppx_version ppx_jane))
-  (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  ppx_inline_test.config
+  async_unix
+  async
+  async_kernel
+  core
+  base
+  core_kernel
+  yojson
+  sexplib0
+  integers
+  ppx_deriving_yojson.runtime
+  result
+  ;; local libraries
+  mina_base.import
+  pickles
+  pickles.backend
+  kimchi_pasta
+  kimchi_pasta.basic
+  transaction_snark
+  snark_params
+  mina_ledger
+  mina_base
+  mina_transaction
+  mina_transaction_logic
+  currency
+  mina_state
+  signature_lib
+  genesis_constants
+  transaction_protocol_state
+  pickles_types
+  mina_numbers
+  sgn
+  transaction_snark_tests)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts)
+  (deps proof_cache.json))
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/multisig_account/dune b/src/lib/transaction_snark/test/multisig_account/dune
index c0a2ac0534e..35a29bda0d8 100644
--- a/src/lib/transaction_snark/test/multisig_account/dune
+++ b/src/lib/transaction_snark/test/multisig_account/dune
@@ -1,52 +1,54 @@
 (library
-  (name multisig_tests)
+ (name multisig_tests)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async
-   async_kernel
-   async_unix
-   core
-   base
-   core_kernel
-   yojson
-   ppx_deriving_yojson.runtime
-   result
-   ;; local libraries
-   mina_wire_types
-   mina_base.import
-   pickles
-   pickles.backend
-   pickles_base
-   kimchi_pasta
-   kimchi_pasta.basic
-   kimchi_backend_common
-   kimchi_backend
-   cache_dir
-   transaction_snark
-   snark_params
-   crypto_params
-   snarky.backendless
-   mina_ledger
-   mina_base
-   currency
-   mina_state
-   mina_transaction_logic
-   signature_lib
-   genesis_constants
-   transaction_protocol_state
-   pickles_types
-   mina_numbers
-   sgn
-   transaction_snark_tests
-   random_oracle
-   random_oracle_input
-   with_hash
-   data_hash_lib
-   bounded_types
-   )
-  (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts) (deps proof_cache.json))
-  (preprocess
-    (pps ppx_snarky ppx_version ppx_jane))
-  (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  ppx_inline_test.config
+  async
+  async_kernel
+  async_unix
+  core
+  base
+  core_kernel
+  yojson
+  ppx_deriving_yojson.runtime
+  result
+  ;; local libraries
+  mina_wire_types
+  mina_base.import
+  pickles
+  pickles.backend
+  pickles_base
+  kimchi_pasta
+  kimchi_pasta.basic
+  kimchi_backend_common
+  kimchi_backend
+  cache_dir
+  transaction_snark
+  snark_params
+  crypto_params
+  snarky.backendless
+  mina_ledger
+  mina_base
+  currency
+  mina_state
+  mina_transaction_logic
+  signature_lib
+  genesis_constants
+  transaction_protocol_state
+  pickles_types
+  mina_numbers
+  sgn
+  transaction_snark_tests
+  random_oracle
+  random_oracle_input
+  with_hash
+  data_hash_lib
+  bounded_types)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts)
+  (deps proof_cache.json))
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/permissions/dune b/src/lib/transaction_snark/test/permissions/dune
index 1263a7ae52c..7cf609965ef 100644
--- a/src/lib/transaction_snark/test/permissions/dune
+++ b/src/lib/transaction_snark/test/permissions/dune
@@ -1,36 +1,38 @@
 (library
-  (name permissions_tests)
+ (name permissions_tests)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async_unix
-   async
-   core
-   base
-   core_kernel
-   yojson
-   ppx_deriving_yojson.runtime
-   result
-   ;; local libraries
-   mina_base.import
-   pickles
-   transaction_snark
-   snark_params
-   mina_ledger
-   mina_base
-   mina_transaction_logic
-   currency
-   mina_state
-   signature_lib
-   genesis_constants
-   transaction_protocol_state
-   pickles_types
-   mina_numbers
-   sgn
-   transaction_snark_tests
-   )
-  (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts) (deps proof_cache.json))
-  (preprocess
-    (pps ppx_snarky ppx_version ppx_jane))
-  (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  ppx_inline_test.config
+  async_unix
+  async
+  core
+  base
+  core_kernel
+  yojson
+  ppx_deriving_yojson.runtime
+  result
+  ;; local libraries
+  mina_base.import
+  pickles
+  transaction_snark
+  snark_params
+  mina_ledger
+  mina_base
+  mina_transaction_logic
+  currency
+  mina_state
+  signature_lib
+  genesis_constants
+  transaction_protocol_state
+  pickles_types
+  mina_numbers
+  sgn
+  transaction_snark_tests)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts)
+  (deps proof_cache.json))
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/token_symbol/dune b/src/lib/transaction_snark/test/token_symbol/dune
index f1db98e58f1..07f57bdcf35 100644
--- a/src/lib/transaction_snark/test/token_symbol/dune
+++ b/src/lib/transaction_snark/test/token_symbol/dune
@@ -1,37 +1,39 @@
 (library
-  (name token_symbol_tests)
+ (name token_symbol_tests)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async_unix
-   async
-   core
-   base
-   core_kernel
-   yojson
-   ppx_deriving_yojson.runtime
-   result
-   ;; local libraries
-   mina_base.import
-   pickles
-   transaction_snark
-   snark_params
-   mina_ledger
-   mina_base
-   mina_transaction_logic
-   currency
-   bounded_types
-   mina_state
-   signature_lib
-   genesis_constants
-   transaction_protocol_state
-   pickles_types
-   mina_numbers
-   sgn
-   transaction_snark_tests
-   )
-  (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts) (deps proof_cache.json))
-  (preprocess
-    (pps ppx_snarky ppx_version ppx_jane))
-  (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  ppx_inline_test.config
+  async_unix
+  async
+  core
+  base
+  core_kernel
+  yojson
+  ppx_deriving_yojson.runtime
+  result
+  ;; local libraries
+  mina_base.import
+  pickles
+  transaction_snark
+  snark_params
+  mina_ledger
+  mina_base
+  mina_transaction_logic
+  currency
+  bounded_types
+  mina_state
+  signature_lib
+  genesis_constants
+  transaction_protocol_state
+  pickles_types
+  mina_numbers
+  sgn
+  transaction_snark_tests)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts)
+  (deps proof_cache.json))
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/transaction_union/dune b/src/lib/transaction_snark/test/transaction_union/dune
index ef250c98efa..f96f54ea319 100644
--- a/src/lib/transaction_snark/test/transaction_union/dune
+++ b/src/lib/transaction_snark/test/transaction_union/dune
@@ -1,49 +1,50 @@
 (library
-  (name transaction_union_tests)
+ (name transaction_union_tests)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async
-   async_kernel
-   async_unix
-   core
-   base
-   core_kernel
-   yojson
-   ;; local libraries
-   mina_base.import
-   bounded_types
-   pickles
-   pickles.backend
-   kimchi_pasta
-   kimchi_pasta.basic
-   transaction_snark
-   snark_params
-   data_hash_lib
-   mina_ledger
-   mina_base
-   currency
-   mina_state
-   signature_lib
-   genesis_constants
-   transaction_protocol_state
-   pickles_types
-   mina_numbers
-   sgn
-   transaction_snark_tests
-   test_util
-   consensus
-   one_or_two
-   coda_genesis_ledger
-   sexplib0
-   quickcheck_lib
-   mina_transaction
-   mina_transaction_logic
-   staged_ledger_diff
-   mina_wire_types
-   )
-  (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts))
-  (preprocess
-    (pps ppx_snarky ppx_version ppx_jane))
-  (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  ppx_inline_test.config
+  async
+  async_kernel
+  async_unix
+  core
+  base
+  core_kernel
+  yojson
+  ;; local libraries
+  mina_base.import
+  bounded_types
+  pickles
+  pickles.backend
+  kimchi_pasta
+  kimchi_pasta.basic
+  transaction_snark
+  snark_params
+  data_hash_lib
+  mina_ledger
+  mina_base
+  currency
+  mina_state
+  signature_lib
+  genesis_constants
+  transaction_protocol_state
+  pickles_types
+  mina_numbers
+  sgn
+  transaction_snark_tests
+  test_util
+  consensus
+  one_or_two
+  coda_genesis_ledger
+  sexplib0
+  quickcheck_lib
+  mina_transaction
+  mina_transaction_logic
+  staged_ledger_diff
+  mina_wire_types)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts))
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/verification_key/dune b/src/lib/transaction_snark/test/verification_key/dune
index 84852e794f2..b050bbbf5a5 100644
--- a/src/lib/transaction_snark/test/verification_key/dune
+++ b/src/lib/transaction_snark/test/verification_key/dune
@@ -1,41 +1,43 @@
 (library
-  (name verification_key_tests)
+ (name verification_key_tests)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async_unix
-   async
-   core
-   base
-   core_kernel
-   yojson
-   ppx_deriving_yojson.runtime
-   result
-   ;; local libraries
-   mina_base.import
-   pickles.backend
-   kimchi_pasta
-   kimchi_pasta.basic
-   pickles
-   transaction_snark
-   snark_params
-   mina_ledger
-   mina_base
-   currency
-   mina_state
-   signature_lib
-   genesis_constants
-   transaction_protocol_state
-   pickles_types
-   mina_numbers
-   mina_transaction_logic
-   sgn
-   transaction_snark_tests
-   with_hash
-   random_oracle
-   )
-  (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts) (deps proof_cache.json))
-  (preprocess
-    (pps ppx_snarky ppx_version ppx_jane))
-  (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  ppx_inline_test.config
+  async_unix
+  async
+  core
+  base
+  core_kernel
+  yojson
+  ppx_deriving_yojson.runtime
+  result
+  ;; local libraries
+  mina_base.import
+  pickles.backend
+  kimchi_pasta
+  kimchi_pasta.basic
+  pickles
+  transaction_snark
+  snark_params
+  mina_ledger
+  mina_base
+  currency
+  mina_state
+  signature_lib
+  genesis_constants
+  transaction_protocol_state
+  pickles_types
+  mina_numbers
+  mina_transaction_logic
+  sgn
+  transaction_snark_tests
+  with_hash
+  random_oracle)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts)
+  (deps proof_cache.json))
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/verification_key_permission/dune b/src/lib/transaction_snark/test/verification_key_permission/dune
index ee44342979f..e4a7df67111 100644
--- a/src/lib/transaction_snark/test/verification_key_permission/dune
+++ b/src/lib/transaction_snark/test/verification_key_permission/dune
@@ -1,37 +1,39 @@
 (library
-  (name verification_key_permission_tests)
+ (name verification_key_permission_tests)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async_unix
-   async
-   core
-   base
-   core_kernel
-   yojson
-   ppx_deriving_yojson.runtime
-   result
-   ;; local libraries
-   protocol_version
-   mina_base.import
-   pickles
-   transaction_snark
-   snark_params
-   mina_ledger
-   mina_base
-   mina_transaction_logic
-   currency
-   mina_state
-   signature_lib
-   genesis_constants
-   transaction_protocol_state
-   pickles_types
-   mina_numbers
-   sgn
-   transaction_snark_tests
-   )
-  (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts) (deps proof_cache.json))
-  (preprocess
-    (pps ppx_snarky ppx_version ppx_jane))
-  (instrumentation (backend bisect_ppx)))
\ No newline at end of file
+  ;; opam libraries
+  ppx_inline_test.config
+  async_unix
+  async
+  core
+  base
+  core_kernel
+  yojson
+  ppx_deriving_yojson.runtime
+  result
+  ;; local libraries
+  protocol_version
+  mina_base.import
+  pickles
+  transaction_snark
+  snark_params
+  mina_ledger
+  mina_base
+  mina_transaction_logic
+  currency
+  mina_state
+  signature_lib
+  genesis_constants
+  transaction_protocol_state
+  pickles_types
+  mina_numbers
+  sgn
+  transaction_snark_tests)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts)
+  (deps proof_cache.json))
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/verify-simple-test/dune b/src/lib/transaction_snark/test/verify-simple-test/dune
index 4158a212760..fdc52417acb 100644
--- a/src/lib/transaction_snark/test/verify-simple-test/dune
+++ b/src/lib/transaction_snark/test/verify-simple-test/dune
@@ -1,57 +1,58 @@
 (library
-  (name transaction_snark_tests_verify_simple_test)
+ (name transaction_snark_tests_verify_simple_test)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async
-   async_kernel
-   async_unix
-   core
-   base
-   core_kernel
-   base64
-   yojson
-   ;; local libraries
-   random_oracle_input
-   pickles.backend
-   mina_base.import
-   crypto_params
-   kimchi_backend
-   with_hash
-   pickles
-   pickles_base
-   consensus
-   transaction_snark
-   snark_params
-   mina_ledger
-   mina_base
-   mina_transaction
-   mina_transaction_logic
-   currency
-   mina_state
-   signature_lib
-   snarky.backendless
-   genesis_constants
-   transaction_protocol_state
-   coda_genesis_ledger
-   pickles_types
-   kimchi_pasta
-   kimchi_pasta.basic
-   cache_dir
-   data_hash_lib
-   mina_numbers
-   random_oracle
-   sgn
-   sgn_type
-   sexplib0
-   test_util
-   transaction_witness
-   staged_ledger_diff
-   mina_wire_types
-   block_time
-   )
-  (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts))
-  (preprocess
-    (pps ppx_snarky ppx_version ppx_jane ppx_sexp_conv))
-  (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  ppx_inline_test.config
+  async
+  async_kernel
+  async_unix
+  core
+  base
+  core_kernel
+  base64
+  yojson
+  ;; local libraries
+  random_oracle_input
+  pickles.backend
+  mina_base.import
+  crypto_params
+  kimchi_backend
+  with_hash
+  pickles
+  pickles_base
+  consensus
+  transaction_snark
+  snark_params
+  mina_ledger
+  mina_base
+  mina_transaction
+  mina_transaction_logic
+  currency
+  mina_state
+  signature_lib
+  snarky.backendless
+  genesis_constants
+  transaction_protocol_state
+  coda_genesis_ledger
+  pickles_types
+  kimchi_pasta
+  kimchi_pasta.basic
+  cache_dir
+  data_hash_lib
+  mina_numbers
+  random_oracle
+  sgn
+  sgn_type
+  sexplib0
+  test_util
+  transaction_witness
+  staged_ledger_diff
+  mina_wire_types
+  block_time)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts))
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane ppx_sexp_conv))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/voting_for/dune b/src/lib/transaction_snark/test/voting_for/dune
index 6056695000e..2c6ded34c11 100644
--- a/src/lib/transaction_snark/test/voting_for/dune
+++ b/src/lib/transaction_snark/test/voting_for/dune
@@ -1,41 +1,43 @@
 (library
-  (name voting_for_tests)
+ (name voting_for_tests)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async_unix
-   async
-   core
-   base
-   core_kernel
-   yojson
-   ppx_deriving_yojson.runtime
-   result
-   ;; local libraries
-   mina_base.import
-   pickles.backend
-   kimchi_pasta
-   kimchi_pasta.basic
-   pickles
-   transaction_snark
-   snark_params
-   mina_ledger
-   mina_base
-   mina_transaction_logic
-   currency
-   mina_state
-   signature_lib
-   genesis_constants
-   transaction_protocol_state
-   pickles_types
-   mina_numbers
-   sgn
-   transaction_snark_tests
-   with_hash
-   random_oracle
-   )
-  (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts) (deps proof_cache.json))
-  (preprocess
-    (pps ppx_snarky ppx_version ppx_jane))
-  (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  ppx_inline_test.config
+  async_unix
+  async
+  core
+  base
+  core_kernel
+  yojson
+  ppx_deriving_yojson.runtime
+  result
+  ;; local libraries
+  mina_base.import
+  pickles.backend
+  kimchi_pasta
+  kimchi_pasta.basic
+  pickles
+  transaction_snark
+  snark_params
+  mina_ledger
+  mina_base
+  mina_transaction_logic
+  currency
+  mina_state
+  signature_lib
+  genesis_constants
+  transaction_protocol_state
+  pickles_types
+  mina_numbers
+  sgn
+  transaction_snark_tests
+  with_hash
+  random_oracle)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts)
+  (deps proof_cache.json))
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/zkapp_deploy/dune b/src/lib/transaction_snark/test/zkapp_deploy/dune
index 3169e636a52..623696695bd 100644
--- a/src/lib/transaction_snark/test/zkapp_deploy/dune
+++ b/src/lib/transaction_snark/test/zkapp_deploy/dune
@@ -1,40 +1,42 @@
 (library
-  (name zkapp_deploy_tests)
+ (name zkapp_deploy_tests)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async
-   async_kernel
-   async_unix
-   core
-   base
-   core_kernel
-   yojson
-   ppx_deriving_yojson.runtime
-   result
-   ;; local libraries
-   mina_base.import
-   pickles
-   pickles.backend
-   kimchi_pasta
-   kimchi_pasta.basic
-   transaction_snark
-   snark_params
-   mina_ledger
-   mina_base
-   mina_transaction_logic
-   currency
-   mina_state
-   signature_lib
-   genesis_constants
-   transaction_protocol_state
-   pickles_types
-   mina_numbers
-   sgn
-   transaction_snark_tests
-   )
-  (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts) (deps proof_cache.json))
-  (preprocess
-    (pps ppx_snarky ppx_version ppx_jane))
-  (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  ppx_inline_test.config
+  async
+  async_kernel
+  async_unix
+  core
+  base
+  core_kernel
+  yojson
+  ppx_deriving_yojson.runtime
+  result
+  ;; local libraries
+  mina_base.import
+  pickles
+  pickles.backend
+  kimchi_pasta
+  kimchi_pasta.basic
+  transaction_snark
+  snark_params
+  mina_ledger
+  mina_base
+  mina_transaction_logic
+  currency
+  mina_state
+  signature_lib
+  genesis_constants
+  transaction_protocol_state
+  pickles_types
+  mina_numbers
+  sgn
+  transaction_snark_tests)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts)
+  (deps proof_cache.json))
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/zkapp_fuzzy/dune b/src/lib/transaction_snark/test/zkapp_fuzzy/dune
index 59b7d81c0d9..eb10bff0cb2 100644
--- a/src/lib/transaction_snark/test/zkapp_fuzzy/dune
+++ b/src/lib/transaction_snark/test/zkapp_fuzzy/dune
@@ -1,48 +1,48 @@
 (executable
-  (name zkapp_fuzzy)
+ (name zkapp_fuzzy)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async
-   async_kernel
-   async_unix
-   async.async_command
-   core
-   base
-   core_kernel
-   yojson
-   splittable_random
-   ;; local libraries
-   logger
-   mina_base.import
-   data_hash_lib
-   mina_generators
-   pickles
-   pickles.backend
-   kimchi_pasta
-   kimchi_pasta.basic
-   transaction_snark
-   snark_params
-   mina_ledger
-   mina_base
-   currency
-   mina_state
-   signature_lib
-   genesis_constants
-   transaction_protocol_state
-   pickles_types
-   mina_numbers
-   sgn
-   transaction_snark_tests
-   test_util
-   mina_transaction_logic
-   with_hash
-   random_oracle
-   sexplib0
-   zkapp_command_builder
-   bounded_types
-   )
-  (link_flags (-linkall))
-  (preprocess
-    (pps ppx_mina ppx_snarky ppx_version ppx_jane))
-  (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  ppx_inline_test.config
+  async
+  async_kernel
+  async_unix
+  async.async_command
+  core
+  base
+  core_kernel
+  yojson
+  splittable_random
+  ;; local libraries
+  logger
+  mina_base.import
+  data_hash_lib
+  mina_generators
+  pickles
+  pickles.backend
+  kimchi_pasta
+  kimchi_pasta.basic
+  transaction_snark
+  snark_params
+  mina_ledger
+  mina_base
+  currency
+  mina_state
+  signature_lib
+  genesis_constants
+  transaction_protocol_state
+  pickles_types
+  mina_numbers
+  sgn
+  transaction_snark_tests
+  test_util
+  mina_transaction_logic
+  with_hash
+  random_oracle
+  sexplib0
+  zkapp_command_builder
+  bounded_types)
+ (link_flags (-linkall))
+ (preprocess
+  (pps ppx_mina ppx_snarky ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/zkapp_payments/dune b/src/lib/transaction_snark/test/zkapp_payments/dune
index 748afe6cd57..458aa255056 100644
--- a/src/lib/transaction_snark/test/zkapp_payments/dune
+++ b/src/lib/transaction_snark/test/zkapp_payments/dune
@@ -1,44 +1,46 @@
 (library
-  (name zkapp_payments_tests)
+ (name zkapp_payments_tests)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async
-   async_kernel
-   async_unix
-   core
-   base
-   core_kernel
-   yojson
-   sexplib0
-   ppx_deriving_yojson.runtime
-   result
-   ;; local libraries
-   logger
-   mina_base.import
-   pickles
-   pickles.backend
-   kimchi_pasta
-   kimchi_pasta.basic
-   transaction_snark
-   snark_params
-   mina_ledger
-   mina_base
-   currency
-   mina_state
-   signature_lib
-   genesis_constants
-   transaction_protocol_state
-   pickles_types
-   mina_numbers
-   sgn
-   transaction_snark_tests
-   test_util
-   mina_transaction_logic
-   mina_transaction
-   )
-  (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts) (deps proof_cache.json))
-  (preprocess
-    (pps ppx_snarky ppx_version ppx_jane ppx_mina))
-  (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  ppx_inline_test.config
+  async
+  async_kernel
+  async_unix
+  core
+  base
+  core_kernel
+  yojson
+  sexplib0
+  ppx_deriving_yojson.runtime
+  result
+  ;; local libraries
+  logger
+  mina_base.import
+  pickles
+  pickles.backend
+  kimchi_pasta
+  kimchi_pasta.basic
+  transaction_snark
+  snark_params
+  mina_ledger
+  mina_base
+  currency
+  mina_state
+  signature_lib
+  genesis_constants
+  transaction_protocol_state
+  pickles_types
+  mina_numbers
+  sgn
+  transaction_snark_tests
+  test_util
+  mina_transaction_logic
+  mina_transaction)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts)
+  (deps proof_cache.json))
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane ppx_mina))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/zkapp_preconditions/dune b/src/lib/transaction_snark/test/zkapp_preconditions/dune
index a1154c40836..a6ac3774756 100644
--- a/src/lib/transaction_snark/test/zkapp_preconditions/dune
+++ b/src/lib/transaction_snark/test/zkapp_preconditions/dune
@@ -1,47 +1,50 @@
 (library
-  (name account_update_precondition_tests)
+ (name account_update_precondition_tests)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async_unix
-   async
-   async_kernel
-   core
-   base
-   core_kernel
-   yojson
-   ppx_deriving_yojson.runtime
-   result
-   ;; local libraries
-   mina_base.import
-   data_hash_lib
-   pickles
-   pickles.backend
-   kimchi_backend
-   kimchi_backend_common
-   kimchi_pasta
-   kimchi_pasta.basic
-   transaction_snark
-   snark_params
-   mina_ledger
-   mina_base
-   mina_generators
-   mina_transaction
-   mina_transaction_logic
-   currency
-   mina_state
-   signature_lib
-   genesis_constants
-   transaction_protocol_state
-   pickles_types
-   mina_numbers
-   sgn
-   transaction_snark_tests
-   random_oracle
-   random_oracle_input
-   zkapp_command_builder)
-  (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts) (deps proof_cache.json))
-  (preprocess
-    (pps ppx_snarky ppx_version ppx_jane))
-  (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  ppx_inline_test.config
+  async_unix
+  async
+  async_kernel
+  core
+  base
+  core_kernel
+  yojson
+  ppx_deriving_yojson.runtime
+  result
+  ;; local libraries
+  mina_base.import
+  data_hash_lib
+  pickles
+  pickles.backend
+  kimchi_backend
+  kimchi_backend_common
+  kimchi_pasta
+  kimchi_pasta.basic
+  transaction_snark
+  snark_params
+  mina_ledger
+  mina_base
+  mina_generators
+  mina_transaction
+  mina_transaction_logic
+  currency
+  mina_state
+  signature_lib
+  genesis_constants
+  transaction_protocol_state
+  pickles_types
+  mina_numbers
+  sgn
+  transaction_snark_tests
+  random_oracle
+  random_oracle_input
+  zkapp_command_builder)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts)
+  (deps proof_cache.json))
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/zkapp_tokens/dune b/src/lib/transaction_snark/test/zkapp_tokens/dune
index 7917433e5fe..d7a53d0541e 100644
--- a/src/lib/transaction_snark/test/zkapp_tokens/dune
+++ b/src/lib/transaction_snark/test/zkapp_tokens/dune
@@ -1,34 +1,36 @@
 (library
-  (name zkapp_tokens_tests)
+ (name zkapp_tokens_tests)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async
-   async_kernel
-   async_unix
-   core_kernel
-   sexplib0
-   ppx_deriving_yojson.runtime
-   result
-   ;; local libraries
-   mina_base.import
-   transaction_snark
-   mina_ledger
-   mina_base
-   mina_generators
-   currency
-   pickles
-   mina_numbers
-   zkapp_command_builder
-   signature_lib
-   genesis_constants
-   sgn
-   transaction_snark_tests
-   test_util
-   mina_transaction_logic
-   )
-  (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts) (deps proof_cache.json))
-  (preprocess
-    (pps ppx_snarky ppx_version ppx_jane ppx_mina))
-  (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  ppx_inline_test.config
+  async
+  async_kernel
+  async_unix
+  core_kernel
+  sexplib0
+  ppx_deriving_yojson.runtime
+  result
+  ;; local libraries
+  mina_base.import
+  transaction_snark
+  mina_ledger
+  mina_base
+  mina_generators
+  currency
+  pickles
+  mina_numbers
+  zkapp_command_builder
+  signature_lib
+  genesis_constants
+  sgn
+  transaction_snark_tests
+  test_util
+  mina_transaction_logic)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts)
+  (deps proof_cache.json))
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane ppx_mina))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark/test/zkapp_uri/dune b/src/lib/transaction_snark/test/zkapp_uri/dune
index e0b746bf729..0fd22b1eaef 100644
--- a/src/lib/transaction_snark/test/zkapp_uri/dune
+++ b/src/lib/transaction_snark/test/zkapp_uri/dune
@@ -1,37 +1,39 @@
 (library
-  (name zkapp_uri_tests)
+ (name zkapp_uri_tests)
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   async_unix
-   async
-   core
-   base
-   core_kernel
-   yojson
-   ppx_deriving_yojson.runtime
-   result
-   ;; local libraries
-   mina_base.import
-   pickles
-   transaction_snark
-   bounded_types
-   snark_params
-   mina_ledger
-   mina_base
-   mina_transaction_logic
-   currency
-   mina_state
-   signature_lib
-   genesis_constants
-   transaction_protocol_state
-   pickles_types
-   mina_numbers
-   sgn
-   transaction_snark_tests
-   )
-  (library_flags -linkall)
-  (inline_tests (flags -verbose -show-counts) (deps proof_cache.json))
-  (preprocess
-    (pps ppx_snarky ppx_version ppx_jane))
-  (instrumentation (backend bisect_ppx)))
+  ;; opam libraries
+  ppx_inline_test.config
+  async_unix
+  async
+  core
+  base
+  core_kernel
+  yojson
+  ppx_deriving_yojson.runtime
+  result
+  ;; local libraries
+  mina_base.import
+  pickles
+  transaction_snark
+  bounded_types
+  snark_params
+  mina_ledger
+  mina_base
+  mina_transaction_logic
+  currency
+  mina_state
+  signature_lib
+  genesis_constants
+  transaction_protocol_state
+  pickles_types
+  mina_numbers
+  sgn
+  transaction_snark_tests)
+ (library_flags -linkall)
+ (inline_tests
+  (flags -verbose -show-counts)
+  (deps proof_cache.json))
+ (preprocess
+  (pps ppx_snarky ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/transaction_snark_scan_state/dune b/src/lib/transaction_snark_scan_state/dune
index ca3e00d6294..04f098f426b 100644
--- a/src/lib/transaction_snark_scan_state/dune
+++ b/src/lib/transaction_snark_scan_state/dune
@@ -3,50 +3,58 @@
  (public_name transaction_snark_scan_state)
  (library_flags -linkall)
  (libraries
-   ;; opam libraries
-   base.base_internalhash_types
-   async_kernel
-   core
-   ppx_deriving_yojson.runtime
-   sexplib0
-   base.caml
-   digestif
-   base
-   core_kernel
-   async
-   yojson
-   bin_prot.shape
-   async_unix
-   ;; local libraries
-   mina_stdlib
-   mina_base.import
-   data_hash_lib
-   mina_state
-   transaction_witness
-   transaction_snark
-   mina_base
-   mina_numbers
-   mina_transaction
-   mina_transaction_logic
-   snark_work_lib
-   one_or_two
-   mina_ledger
-   merkle_ledger
-   currency
-   logger
-   transaction_snark_work
-   parallel_scan
-   sgn
-   ledger_proof
-   genesis_constants
-   o1trace
-   with_hash
-   ppx_version.runtime
-   mina_wire_types
-   internal_tracing
- )
+  ;; opam libraries
+  base.base_internalhash_types
+  async_kernel
+  core
+  ppx_deriving_yojson.runtime
+  sexplib0
+  base.caml
+  digestif
+  base
+  core_kernel
+  async
+  yojson
+  bin_prot.shape
+  async_unix
+  ;; local libraries
+  mina_stdlib
+  mina_base.import
+  data_hash_lib
+  mina_state
+  transaction_witness
+  transaction_snark
+  mina_base
+  mina_numbers
+  mina_transaction
+  mina_transaction_logic
+  snark_work_lib
+  one_or_two
+  mina_ledger
+  merkle_ledger
+  currency
+  logger
+  transaction_snark_work
+  parallel_scan
+  sgn
+  ledger_proof
+  genesis_constants
+  o1trace
+  with_hash
+  ppx_version.runtime
+  mina_wire_types
+  internal_tracing)
  (preprocess
-  (pps ppx_base ppx_mina ppx_version ppx_let ppx_sexp_conv ppx_bin_prot ppx_custom_printf
-       ppx_compare ppx_deriving_yojson))
- (instrumentation (backend bisect_ppx))
+  (pps
+   ppx_base
+   ppx_mina
+   ppx_version
+   ppx_let
+   ppx_sexp_conv
+   ppx_bin_prot
+   ppx_custom_printf
+   ppx_compare
+   ppx_deriving_yojson))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Transaction-snark specialization of the parallel scan state"))
diff --git a/src/lib/transaction_snark_work/dune b/src/lib/transaction_snark_work/dune
index 8faec137b6c..2dc6e16c1f9 100644
--- a/src/lib/transaction_snark_work/dune
+++ b/src/lib/transaction_snark_work/dune
@@ -2,27 +2,28 @@
  (name transaction_snark_work)
  (public_name transaction_snark_work)
  (libraries
-   ;; opam libraries
-   core_kernel
-   sexplib0
-   bin_prot.shape
-   base.caml
-   base.base_internalhash_types
-   core
-   ;; local libraries
-   currency
-   transaction_snark
-   mina_state
-   one_or_two
-   ledger_proof
-   signature_lib
-   ppx_version.runtime
-   mina_wire_types
-   pickles.backend
-   snark_params
-   pickles
-   kimchi_pasta
-   kimchi_pasta.basic
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_version ppx_compare ppx_deriving_yojson)))
+  ;; opam libraries
+  core_kernel
+  sexplib0
+  bin_prot.shape
+  base.caml
+  base.base_internalhash_types
+  core
+  ;; local libraries
+  currency
+  transaction_snark
+  mina_state
+  one_or_two
+  ledger_proof
+  signature_lib
+  ppx_version.runtime
+  mina_wire_types
+  pickles.backend
+  snark_params
+  pickles
+  kimchi_pasta
+  kimchi_pasta.basic)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_version ppx_compare ppx_deriving_yojson)))
diff --git a/src/lib/transaction_witness/dune b/src/lib/transaction_witness/dune
index fe75cdc836e..0b073a8138f 100644
--- a/src/lib/transaction_witness/dune
+++ b/src/lib/transaction_witness/dune
@@ -1,29 +1,31 @@
 (library
  (name transaction_witness)
  (public_name transaction_witness)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   base.caml
-   bin_prot.shape
-   sexplib0
-   core_kernel
-   core
-   ;; local libraries
-   currency
-   signature_lib
-   mina_ledger
-   mina_state
-   mina_base
-   mina_numbers
-   mina_transaction
-   mina_transaction_logic
-   kimchi_backend
-   kimchi_pasta
-   kimchi_pasta.basic
-   sgn
-   with_hash
-   ppx_version.runtime
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_deriving_yojson ppx_version ppx_mina)))
+  ;; opam libraries
+  base.caml
+  bin_prot.shape
+  sexplib0
+  core_kernel
+  core
+  ;; local libraries
+  currency
+  signature_lib
+  mina_ledger
+  mina_state
+  mina_base
+  mina_numbers
+  mina_transaction
+  mina_transaction_logic
+  kimchi_backend
+  kimchi_pasta
+  kimchi_pasta.basic
+  sgn
+  with_hash
+  ppx_version.runtime)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_deriving_yojson ppx_version ppx_mina)))
diff --git a/src/lib/transition_chain_prover/dune b/src/lib/transition_chain_prover/dune
index 194f169466d..5ed06e3caeb 100644
--- a/src/lib/transition_chain_prover/dune
+++ b/src/lib/transition_chain_prover/dune
@@ -1,27 +1,28 @@
 (library
  (name transition_chain_prover)
  (public_name transition_chain_prover)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane))
  (libraries
-   ;; opam libraries
-   core
-   core_kernel
-   ;; local libraries
-   transition_frontier_extensions
-   mina_block
-   mina_state
-   mina_intf
-   mina_base
-   transition_frontier
-   merkle_list_prover
-   transition_frontier_base
-   data_hash_lib
-   with_hash
-   mina_wire_types
-   pickles.backend
-   snark_params
-   pickles
-   kimchi_pasta
-   kimchi_pasta.basic
-))
+  ;; opam libraries
+  core
+  core_kernel
+  ;; local libraries
+  transition_frontier_extensions
+  mina_block
+  mina_state
+  mina_intf
+  mina_base
+  transition_frontier
+  merkle_list_prover
+  transition_frontier_base
+  data_hash_lib
+  with_hash
+  mina_wire_types
+  pickles.backend
+  snark_params
+  pickles
+  kimchi_pasta
+  kimchi_pasta.basic))
diff --git a/src/lib/transition_chain_verifier/dune b/src/lib/transition_chain_verifier/dune
index 98c96e31df7..6730daca887 100644
--- a/src/lib/transition_chain_verifier/dune
+++ b/src/lib/transition_chain_verifier/dune
@@ -1,16 +1,17 @@
 (library
  (name transition_chain_verifier)
  (public_name transition_chain_verifier)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane ppx_compare))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane ppx_compare))
  (libraries
-   ;; opam libraries
-   core_kernel
-   core
-   ;; local libraries
-   merkle_list_verifier
-   mina_state
-   mina_base
-   mina_stdlib
-   data_hash_lib
-))
+  ;; opam libraries
+  core_kernel
+  core
+  ;; local libraries
+  merkle_list_verifier
+  mina_state
+  mina_base
+  mina_stdlib
+  data_hash_lib))
diff --git a/src/lib/transition_frontier/dune b/src/lib/transition_frontier/dune
index f3ade7fde42..a66f45fed74 100644
--- a/src/lib/transition_frontier/dune
+++ b/src/lib/transition_frontier/dune
@@ -2,56 +2,57 @@
  (name transition_frontier)
  (public_name transition_frontier)
  (libraries
-   ;;opam libraries
-   core_kernel.uuid
-   async_unix
-   integers
-   base.caml
-   sexplib0
-   async
-   core
-   core_kernel
-   async_kernel
-   bin_prot.shape
-   base.base_internalhash_types
-   result
-   core.uuid
-   ;;local libraries
-   o1trace
-   mina_metrics
-   mina_wire_types
-   merkle_ledger
-   staged_ledger
-   mina_state
-   signature_lib
-   mina_ledger
-   consensus
-   genesis_constants
-   mina_numbers
-   mina_block
-   logger
-   transition_frontier_full_frontier
-   transition_frontier_persistent_root
-   downloader
-   transition_frontier_base
-   transition_frontier_persistent_frontier
-   transition_frontier_extensions
-   mina_base
-   cache_lib
-   data_hash_lib
-   network_peer
-   unsigned_extended
-   verifier
-   precomputed_values
-   block_time
-   trust_system
-   with_hash
-   rose_tree
-   quickcheck_lib
-   protocol_version
-   mina_net2
-   internal_tracing
-   mina_transaction
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_mina ppx_version ppx_compare ppx_deriving_yojson)))
+  ;;opam libraries
+  core_kernel.uuid
+  async_unix
+  integers
+  base.caml
+  sexplib0
+  async
+  core
+  core_kernel
+  async_kernel
+  bin_prot.shape
+  base.base_internalhash_types
+  result
+  core.uuid
+  ;;local libraries
+  o1trace
+  mina_metrics
+  mina_wire_types
+  merkle_ledger
+  staged_ledger
+  mina_state
+  signature_lib
+  mina_ledger
+  consensus
+  genesis_constants
+  mina_numbers
+  mina_block
+  logger
+  transition_frontier_full_frontier
+  transition_frontier_persistent_root
+  downloader
+  transition_frontier_base
+  transition_frontier_persistent_frontier
+  transition_frontier_extensions
+  mina_base
+  cache_lib
+  data_hash_lib
+  network_peer
+  unsigned_extended
+  verifier
+  precomputed_values
+  block_time
+  trust_system
+  with_hash
+  rose_tree
+  quickcheck_lib
+  protocol_version
+  mina_net2
+  internal_tracing
+  mina_transaction)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_mina ppx_version ppx_compare ppx_deriving_yojson)))
diff --git a/src/lib/transition_frontier/extensions/dune b/src/lib/transition_frontier/extensions/dune
index d8c126dd30d..8278d65a5fd 100644
--- a/src/lib/transition_frontier/extensions/dune
+++ b/src/lib/transition_frontier/extensions/dune
@@ -2,27 +2,28 @@
  (name extensions)
  (public_name transition_frontier_extensions)
  (libraries
-   ;;opam libraries
-   base.caml
-   async_kernel
-   core_kernel
-   sexplib0
-   result
-   base.base_internalhash_types
-   ;;local libraries
-   with_hash
-   mina_block
-   transaction_snark_work
-   data_hash_lib
-   pipe_lib
-   mina_base
-   transition_frontier_base
-   transition_frontier_full_frontier
-   mina_ledger
-   logger
-   mina_state
-   staged_ledger
-   mina_wire_types
-   )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_mina ppx_version)))
+  ;;opam libraries
+  base.caml
+  async_kernel
+  core_kernel
+  sexplib0
+  result
+  base.base_internalhash_types
+  ;;local libraries
+  with_hash
+  mina_block
+  transaction_snark_work
+  data_hash_lib
+  pipe_lib
+  mina_base
+  transition_frontier_base
+  transition_frontier_full_frontier
+  mina_ledger
+  logger
+  mina_state
+  staged_ledger
+  mina_wire_types)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_mina ppx_version)))
diff --git a/src/lib/transition_frontier/frontier_base/dune b/src/lib/transition_frontier/frontier_base/dune
index c1cdbad9be1..74c9b132842 100644
--- a/src/lib/transition_frontier/frontier_base/dune
+++ b/src/lib/transition_frontier/frontier_base/dune
@@ -2,63 +2,64 @@
  (name frontier_base)
  (public_name transition_frontier_base)
  (libraries
-   ;;opam libraries
-   async_unix
-   base.caml
-   async_kernel
-   core_kernel
-   bin_prot.shape
-   sexplib0
-   integers
-   core
-   async
-   base.base_internalhash_types
-   ;;local libraries
-   unsigned_extended
-   staged_ledger_diff
-   block_time
-   one_or_two
-   mina_base.import
-   currency
-   truth
-   allocation_functor
-   genesis_constants
-   transaction_snark_work
-   trust_system
-   precomputed_values
-   consensus
-   network_peer
-   mina_ledger
-   mina_block
-   mina_base
-   mina_transaction_logic
-   mina_state
-   staged_ledger
-   data_hash_lib
-   signature_lib
-   logger
-   verifier
-   with_hash
-   o1trace
-   visualization
-   mina_numbers
-   ledger_proof
-   protocol_version
-   mina_net2
-   transaction_snark
-   mina_stdlib
-   coda_genesis_proof
-   ppx_version.runtime
-   pickles.backend
-   snark_params
-   pickles
-   kimchi_backend
-   sgn
-   sgn_type
-   kimchi_pasta
-   kimchi_pasta.basic
-   mina_wire_types
-   internal_tracing
-   )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_mina ppx_version ppx_deriving.std ppx_deriving_yojson)))
+  ;;opam libraries
+  async_unix
+  base.caml
+  async_kernel
+  core_kernel
+  bin_prot.shape
+  sexplib0
+  integers
+  core
+  async
+  base.base_internalhash_types
+  ;;local libraries
+  unsigned_extended
+  staged_ledger_diff
+  block_time
+  one_or_two
+  mina_base.import
+  currency
+  truth
+  allocation_functor
+  genesis_constants
+  transaction_snark_work
+  trust_system
+  precomputed_values
+  consensus
+  network_peer
+  mina_ledger
+  mina_block
+  mina_base
+  mina_transaction_logic
+  mina_state
+  staged_ledger
+  data_hash_lib
+  signature_lib
+  logger
+  verifier
+  with_hash
+  o1trace
+  visualization
+  mina_numbers
+  ledger_proof
+  protocol_version
+  mina_net2
+  transaction_snark
+  mina_stdlib
+  coda_genesis_proof
+  ppx_version.runtime
+  pickles.backend
+  snark_params
+  pickles
+  kimchi_backend
+  sgn
+  sgn_type
+  kimchi_pasta
+  kimchi_pasta.basic
+  mina_wire_types
+  internal_tracing)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_mina ppx_version ppx_deriving.std ppx_deriving_yojson)))
diff --git a/src/lib/transition_frontier/full_frontier/dune b/src/lib/transition_frontier/full_frontier/dune
index 5105a5fcf72..0abb99a932e 100644
--- a/src/lib/transition_frontier/full_frontier/dune
+++ b/src/lib/transition_frontier/full_frontier/dune
@@ -2,57 +2,58 @@
  (name full_frontier)
  (public_name transition_frontier_full_frontier)
  (libraries
-   ;;opam libraries
-   integers
-   core
-   base.caml
-   core_kernel
-   sexplib0
-   base.base_internalhash_types
-   stdio
-   ;;local libraries
-   mina_wire_types
-   unsigned_extended
-   o1trace
-   visualization
-   mina_metrics
-   block_time
-   logger
-   staged_ledger
-   mina_state
-   mina_base
-   transition_frontier_persistent_root
-   transition_frontier_base
-   consensus
-   mina_ledger
-   mina_block
-   data_hash_lib
-   precomputed_values
-   with_hash
-   mina_stdlib
-   staged_ledger_diff
-   mina_numbers
-   debug_assert
-   internal_tracing
-   ; for tests
-   async
-   async_kernel
-   async_unix
-   child_processes
-   coda_genesis_ledger
-   core.uuid
-   core_kernel.uuid
-   genesis_constants
-   merkle_ledger
-   protocol_version
-   signature_lib
-   verifier
-   pickles.backend
-   snark_params
-   pickles
-   kimchi_pasta
-   kimchi_pasta.basic
-   mina_transaction_logic
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_mina ppx_version ppx_deriving.std ppx_deriving_yojson)))
+  ;;opam libraries
+  integers
+  core
+  base.caml
+  core_kernel
+  sexplib0
+  base.base_internalhash_types
+  stdio
+  ;;local libraries
+  mina_wire_types
+  unsigned_extended
+  o1trace
+  visualization
+  mina_metrics
+  block_time
+  logger
+  staged_ledger
+  mina_state
+  mina_base
+  transition_frontier_persistent_root
+  transition_frontier_base
+  consensus
+  mina_ledger
+  mina_block
+  data_hash_lib
+  precomputed_values
+  with_hash
+  mina_stdlib
+  staged_ledger_diff
+  mina_numbers
+  debug_assert
+  internal_tracing
+  ; for tests
+  async
+  async_kernel
+  async_unix
+  child_processes
+  coda_genesis_ledger
+  core.uuid
+  core_kernel.uuid
+  genesis_constants
+  merkle_ledger
+  protocol_version
+  signature_lib
+  verifier
+  pickles.backend
+  snark_params
+  pickles
+  kimchi_pasta
+  kimchi_pasta.basic
+  mina_transaction_logic)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_mina ppx_version ppx_deriving.std ppx_deriving_yojson)))
diff --git a/src/lib/transition_frontier/persistent_frontier/dune b/src/lib/transition_frontier/persistent_frontier/dune
index 5cfda6e0d20..7510b6a3869 100644
--- a/src/lib/transition_frontier/persistent_frontier/dune
+++ b/src/lib/transition_frontier/persistent_frontier/dune
@@ -2,58 +2,65 @@
  (name persistent_frontier)
  (public_name transition_frontier_persistent_frontier)
  (libraries
-   ;;opam libraries
-   result
-   bin_prot.shape
-   core_kernel
-   async
-   core
-   async_kernel
-   base.caml
-   sexplib0
-   async_unix
-   ;;local libraries
-   bounded_types
-   o1trace
-   mina_metrics
-   trust_system
-   truth
-   staged_ledger
-   precomputed_values
-   data_hash_lib
-   logger
-   otp_lib
-   consensus
-   mina_ledger
-   file_system
-   transition_frontier_full_frontier
-   transition_frontier_persistent_root
-   transition_frontier_base
-   block_time
-   transition_frontier_extensions
-   mina_base
-   mina_transaction_logic
-   rocksdb
-   mina_block
-   mina_state
-   genesis_constants
-   verifier
-   with_hash
-   debug_assert
-   mina_stdlib
-   ppx_version.runtime
-   pickles.backend
-   snark_params
-   pickles
-   kimchi_backend
-   sgn
-   sgn_type
-   currency
-   mina_numbers
-   kimchi_pasta
-   kimchi_pasta.basic
-   mina_wire_types
-   internal_tracing
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_jane ppx_compare ppx_bin_prot ppx_deriving_yojson)))
+  ;;opam libraries
+  result
+  bin_prot.shape
+  core_kernel
+  async
+  core
+  async_kernel
+  base.caml
+  sexplib0
+  async_unix
+  ;;local libraries
+  bounded_types
+  o1trace
+  mina_metrics
+  trust_system
+  truth
+  staged_ledger
+  precomputed_values
+  data_hash_lib
+  logger
+  otp_lib
+  consensus
+  mina_ledger
+  file_system
+  transition_frontier_full_frontier
+  transition_frontier_persistent_root
+  transition_frontier_base
+  block_time
+  transition_frontier_extensions
+  mina_base
+  mina_transaction_logic
+  rocksdb
+  mina_block
+  mina_state
+  genesis_constants
+  verifier
+  with_hash
+  debug_assert
+  mina_stdlib
+  ppx_version.runtime
+  pickles.backend
+  snark_params
+  pickles
+  kimchi_backend
+  sgn
+  sgn_type
+  currency
+  mina_numbers
+  kimchi_pasta
+  kimchi_pasta.basic
+  mina_wire_types
+  internal_tracing)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_mina
+   ppx_version
+   ppx_jane
+   ppx_compare
+   ppx_bin_prot
+   ppx_deriving_yojson)))
diff --git a/src/lib/transition_frontier/persistent_root/dune b/src/lib/transition_frontier/persistent_root/dune
index 2a2a2732db7..c46bcc01c70 100644
--- a/src/lib/transition_frontier/persistent_root/dune
+++ b/src/lib/transition_frontier/persistent_root/dune
@@ -2,21 +2,22 @@
  (name persistent_root)
  (public_name transition_frontier_persistent_root)
  (libraries
-   ;;opam libraries
-   core_kernel.uuid
-   core_kernel
-   core
-   core.uuid
-   base.caml
-   ;;local libraries
-   precomputed_values
-   file_system
-   merkle_ledger
-   transition_frontier_base
-   mina_base
-   mina_ledger
-   logger
-   data_hash_lib
-   )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_mina ppx_version)))
+  ;;opam libraries
+  core_kernel.uuid
+  core_kernel
+  core
+  core.uuid
+  base.caml
+  ;;local libraries
+  precomputed_values
+  file_system
+  merkle_ledger
+  transition_frontier_base
+  mina_base
+  mina_ledger
+  logger
+  data_hash_lib)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_mina ppx_version)))
diff --git a/src/lib/transition_frontier/tests/dune b/src/lib/transition_frontier/tests/dune
index 020d6276d7a..9217a72b433 100644
--- a/src/lib/transition_frontier/tests/dune
+++ b/src/lib/transition_frontier/tests/dune
@@ -1,43 +1,45 @@
 (library
  (name transition_frontier_tests)
  (libraries
-   ;;opam libraries
-   core.uuid
-   core
-   async
-   async_kernel
-   core_kernel
-   ppx_inline_test.config
-   async_unix
-   core_kernel.uuid
-   sexplib0
-   ;;local libraries
-   mina_state
-   staged_ledger
-   with_hash
-   mina_ledger
-   child_processes
-   genesis_constants
-   logger
-   mina_block
-   transition_frontier_persistent_root
-   mina_base
-   precomputed_values
-   verifier
-   coda_genesis_ledger
-   merkle_ledger
-   consensus
-   data_hash_lib
-   block_time
-   transition_frontier_full_frontier
-   transition_frontier_base
-   transition_frontier
-   protocol_version
-   yojson
-   mina_net2
-   libp2p_ipc
-   staged_ledger_diff
- )
- (inline_tests (flags -verbose -show-counts))
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_version ppx_mina)))
+  ;;opam libraries
+  core.uuid
+  core
+  async
+  async_kernel
+  core_kernel
+  ppx_inline_test.config
+  async_unix
+  core_kernel.uuid
+  sexplib0
+  ;;local libraries
+  mina_state
+  staged_ledger
+  with_hash
+  mina_ledger
+  child_processes
+  genesis_constants
+  logger
+  mina_block
+  transition_frontier_persistent_root
+  mina_base
+  precomputed_values
+  verifier
+  coda_genesis_ledger
+  merkle_ledger
+  consensus
+  data_hash_lib
+  block_time
+  transition_frontier_full_frontier
+  transition_frontier_base
+  transition_frontier
+  protocol_version
+  yojson
+  mina_net2
+  libp2p_ipc
+  staged_ledger_diff)
+ (inline_tests
+  (flags -verbose -show-counts))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_version ppx_mina)))
diff --git a/src/lib/transition_frontier_controller/dune b/src/lib/transition_frontier_controller/dune
index 21623e9856f..2ec39b75dbc 100644
--- a/src/lib/transition_frontier_controller/dune
+++ b/src/lib/transition_frontier_controller/dune
@@ -1,32 +1,33 @@
 (library
  (name transition_frontier_controller)
  (public_name transition_frontier_controller)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_mina))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_mina))
  (libraries
-   ;; opam libraries
-   base
-   async_kernel
-   core_kernel
-   core
-   ;; local libraries
-   transition_frontier
-   data_hash_lib
-   mina_metrics
-   network_peer
-   cache_lib
-   mina_block
-   o1trace
-   pipe_lib
-   mina_base
-   transition_handler
-   ledger_catchup
-   transition_frontier_extensions
-   transition_frontier_base
-   precomputed_values
-   logger
-   with_hash
-   genesis_constants
-   consensus
-   bootstrap_controller
-))
+  ;; opam libraries
+  base
+  async_kernel
+  core_kernel
+  core
+  ;; local libraries
+  transition_frontier
+  data_hash_lib
+  mina_metrics
+  network_peer
+  cache_lib
+  mina_block
+  o1trace
+  pipe_lib
+  mina_base
+  transition_handler
+  ledger_catchup
+  transition_frontier_extensions
+  transition_frontier_base
+  precomputed_values
+  logger
+  with_hash
+  genesis_constants
+  consensus
+  bootstrap_controller))
diff --git a/src/lib/transition_handler/dune b/src/lib/transition_handler/dune
index 6468df722f2..5a00d0deb53 100644
--- a/src/lib/transition_handler/dune
+++ b/src/lib/transition_handler/dune
@@ -1,60 +1,62 @@
 (library
  (name transition_handler)
  (public_name transition_handler)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   ppx_inline_test.config
-   sexplib0
-   core_kernel
-   core
-   async
-   async_unix
-   base.base_internalhash_types
-   async_kernel
-   integers
-   result
-   ;; local libraries
-   error_json
-   data_hash_lib
-   block_time
-   trust_system
-   o1trace
-   transition_frontier_base
-   cache_lib
-   mina_base
-   otp_lib
-   pipe_lib
-   rose_tree
-   consensus
-   transition_frontier
-   perf_histograms
-   mina_metrics
-   mina_block
-   mina_transaction
-   network_peer
-   with_hash
-   logger
-   truth
-   mina_state
-   precomputed_values
-   child_processes
-   verifier
-   genesis_constants
-   mina_stdlib
-   network_pool
-   mina_net2
-   mina_numbers
-   mina_wire_types
-   pickles.backend
-   snark_params
-   pickles
-   kimchi_pasta
-   kimchi_pasta.basic
-   internal_tracing
-   transition_frontier_extensions
-   staged_ledger_diff
-   mina_runtime_config
-   )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_jane)))
+  ;; opam libraries
+  ppx_inline_test.config
+  sexplib0
+  core_kernel
+  core
+  async
+  async_unix
+  base.base_internalhash_types
+  async_kernel
+  integers
+  result
+  ;; local libraries
+  error_json
+  data_hash_lib
+  block_time
+  trust_system
+  o1trace
+  transition_frontier_base
+  cache_lib
+  mina_base
+  otp_lib
+  pipe_lib
+  rose_tree
+  consensus
+  transition_frontier
+  perf_histograms
+  mina_metrics
+  mina_block
+  mina_transaction
+  network_peer
+  with_hash
+  logger
+  truth
+  mina_state
+  precomputed_values
+  child_processes
+  verifier
+  genesis_constants
+  mina_stdlib
+  network_pool
+  mina_net2
+  mina_numbers
+  mina_wire_types
+  pickles.backend
+  snark_params
+  pickles
+  kimchi_pasta
+  kimchi_pasta.basic
+  internal_tracing
+  transition_frontier_extensions
+  staged_ledger_diff
+  mina_runtime_config)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_version ppx_jane)))
diff --git a/src/lib/transition_router/dune b/src/lib/transition_router/dune
index e8756a99023..3a35465fdef 100644
--- a/src/lib/transition_router/dune
+++ b/src/lib/transition_router/dune
@@ -1,53 +1,54 @@
 (library
  (name transition_router)
  (public_name transition_router)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_jane ppx_compare))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_version ppx_jane ppx_compare))
  (libraries
-   ;; opam libraries
-   integers
-   base.caml
-   async_kernel
-   core_kernel
-   core
-   async
-   sexplib0
-   ;; local libraries
-   best_tip_prover
-   transition_handler
-   o1trace
-   bounded_types
-   truth
-   mina_net2
-   consensus
-   logger
-   error_json
-   trust_system
-   mina_block
-   mina_state
-   transition_frontier_persistent_frontier
-   mina_networking
-   transition_frontier_controller
-   pipe_lib
-   transition_frontier
-   bootstrap_controller
-   mina_intf
-   transition_frontier_persistent_root
-   transition_frontier_base
-   mina_base
-   signature_lib
-   network_peer
-   with_hash
-   block_time
-   mina_metrics
-   precomputed_values
-   mina_numbers
-   interruptible
-   genesis_constants
-   unsigned_extended
-   proof_carrying_data
-   ledger_catchup
-   data_hash_lib
-   mina_wire_types
-   internal_tracing
-))
+  ;; opam libraries
+  integers
+  base.caml
+  async_kernel
+  core_kernel
+  core
+  async
+  sexplib0
+  ;; local libraries
+  best_tip_prover
+  transition_handler
+  o1trace
+  bounded_types
+  truth
+  mina_net2
+  consensus
+  logger
+  error_json
+  trust_system
+  mina_block
+  mina_state
+  transition_frontier_persistent_frontier
+  mina_networking
+  transition_frontier_controller
+  pipe_lib
+  transition_frontier
+  bootstrap_controller
+  mina_intf
+  transition_frontier_persistent_root
+  transition_frontier_base
+  mina_base
+  signature_lib
+  network_peer
+  with_hash
+  block_time
+  mina_metrics
+  precomputed_values
+  mina_numbers
+  interruptible
+  genesis_constants
+  unsigned_extended
+  proof_carrying_data
+  ledger_catchup
+  data_hash_lib
+  mina_wire_types
+  internal_tracing))
diff --git a/src/lib/trust_system/dune b/src/lib/trust_system/dune
index 035629ea3da..3031920c73c 100644
--- a/src/lib/trust_system/dune
+++ b/src/lib/trust_system/dune
@@ -3,46 +3,47 @@
  (public_name trust_system)
  (library_flags (-linkall))
  (libraries
-   ;; opam libraries
-   sexplib0
-   core
-   ppx_inline_test.config
-   base.caml
-   async_kernel
-   core_kernel
-   bin_prot.shape
-   base
-   result
-   async
-   async_unix
-   ;; local libraries
-   mina_metrics
-   rocksdb
-   pipe_lib
-   logger
-   key_value_database
-   network_peer
-   run_in_thread
-   test_util
-   ppx_version.runtime
-   bounded_types
- )
- (inline_tests (flags -verbose -show-counts))
+  ;; opam libraries
+  sexplib0
+  core
+  ppx_inline_test.config
+  base.caml
+  async_kernel
+  core_kernel
+  bin_prot.shape
+  base
+  result
+  async
+  async_unix
+  ;; local libraries
+  mina_metrics
+  rocksdb
+  pipe_lib
+  logger
+  key_value_database
+  network_peer
+  run_in_thread
+  test_util
+  ppx_version.runtime
+  bounded_types)
+ (inline_tests
+  (flags -verbose -show-counts))
  (preprocess
   (pps
-    ppx_assert
-    ppx_base
-    ppx_bin_prot
-    ppx_mina
-    ppx_custom_printf
-    ppx_deriving.std
-    ppx_deriving_yojson
-    ppx_fields_conv
-    ppx_inline_test
-    ppx_let
-    ppx_register_event
-    ppx_sexp_conv
-    ppx_snarky
-    ppx_version))
- (instrumentation (backend bisect_ppx))
+   ppx_assert
+   ppx_base
+   ppx_bin_prot
+   ppx_mina
+   ppx_custom_printf
+   ppx_deriving.std
+   ppx_deriving_yojson
+   ppx_fields_conv
+   ppx_inline_test
+   ppx_let
+   ppx_register_event
+   ppx_sexp_conv
+   ppx_snarky
+   ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Track how much we trust peers"))
diff --git a/src/lib/truth/dune b/src/lib/truth/dune
index a9ce606ca50..b8a2de01420 100644
--- a/src/lib/truth/dune
+++ b/src/lib/truth/dune
@@ -1,6 +1,8 @@
 (library
  (name truth)
  (public_name truth)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane))
  (libraries core_kernel))
diff --git a/src/lib/unix_timestamp/dune b/src/lib/unix_timestamp/dune
index 0cc9eade010..6d5c544fa2b 100644
--- a/src/lib/unix_timestamp/dune
+++ b/src/lib/unix_timestamp/dune
@@ -1,7 +1,9 @@
 (library
  (name unix_timestamp)
  (public_name unix_timestamp)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (library_flags -linkall)
  (libraries core_kernel))
diff --git a/src/lib/unsigned_extended/dune b/src/lib/unsigned_extended/dune
index fde844d24b2..a190cc42397 100644
--- a/src/lib/unsigned_extended/dune
+++ b/src/lib/unsigned_extended/dune
@@ -2,26 +2,36 @@
  (name unsigned_extended)
  (public_name unsigned_extended)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   base.caml
-   result
-   base
-   core_kernel
-   integers
-   sexplib0
-   bignum.bigint
-   base.base_internalhash_types
-   bin_prot.shape
-   ppx_inline_test.config
-   ;; local libraries
-   bignum_bigint
-   snark_params
-   test_util
-   ppx_version.runtime
- )
+  ;; opam libraries
+  base.caml
+  result
+  base
+  core_kernel
+  integers
+  sexplib0
+  bignum.bigint
+  base.base_internalhash_types
+  bin_prot.shape
+  ppx_inline_test.config
+  ;; local libraries
+  bignum_bigint
+  snark_params
+  test_util
+  ppx_version.runtime)
  (preprocess
-  (pps ppx_mina ppx_version ppx_bin_prot ppx_sexp_conv ppx_compare ppx_hash ppx_inline_test ppx_deriving.std ppx_deriving_yojson))
- (instrumentation (backend bisect_ppx))
+  (pps
+   ppx_mina
+   ppx_version
+   ppx_bin_prot
+   ppx_sexp_conv
+   ppx_compare
+   ppx_hash
+   ppx_inline_test
+   ppx_deriving.std
+   ppx_deriving_yojson))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Unsigned integer functions"))
diff --git a/src/lib/uptime_service/dune b/src/lib/uptime_service/dune
index e39bba48df3..7954a1f2314 100644
--- a/src/lib/uptime_service/dune
+++ b/src/lib/uptime_service/dune
@@ -1,65 +1,67 @@
 (library
  (name uptime_service)
  (public_name uptime_service)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   base64
-   cohttp-async
-   async_unix
-   rpc_parallel
-   ptime
-   core_kernel
-   async
-   bin_prot.shape
-   async_kernel
-   core
-   base.caml
-   cohttp
-   uri
-   ;; local libraries
-   kimchi_bindings
-   kimchi_types
-   pasta_bindings
-   network_peer
-   block_time
-   transaction_witness
-   mina_state
-   staged_ledger
-   pickles
-   random_oracle_input
-   snark_params
-   transition_frontier
-   currency
-   signature_lib
-   child_processes
-   genesis_constants
-   logger
-   mina_base
-   snark_worker
-   mina_block
-   daemon_rpcs
-   snark_work_lib
-   rfc3339_time
-   ledger_proof
-   error_json
-   pipe_lib
-   blake2
-   with_hash
-   transition_frontier_base
-   random_oracle
-   interruptible
-   truth
-   one_or_two
-   transaction_snark
-   pickles.backend
-   consensus
-   mina_base.import
-   kimchi_pasta
-   kimchi_pasta.basic
-   mina_wire_types
-   o1trace
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_jane ppx_mina ppx_version ppx_inline_test ppx_deriving.std))
+  ;; opam libraries
+  base64
+  cohttp-async
+  async_unix
+  rpc_parallel
+  ptime
+  core_kernel
+  async
+  bin_prot.shape
+  async_kernel
+  core
+  base.caml
+  cohttp
+  uri
+  ;; local libraries
+  kimchi_bindings
+  kimchi_types
+  pasta_bindings
+  network_peer
+  block_time
+  transaction_witness
+  mina_state
+  staged_ledger
+  pickles
+  random_oracle_input
+  snark_params
+  transition_frontier
+  currency
+  signature_lib
+  child_processes
+  genesis_constants
+  logger
+  mina_base
+  snark_worker
+  mina_block
+  daemon_rpcs
+  snark_work_lib
+  rfc3339_time
+  ledger_proof
+  error_json
+  pipe_lib
+  blake2
+  with_hash
+  transition_frontier_base
+  random_oracle
+  interruptible
+  truth
+  one_or_two
+  transaction_snark
+  pickles.backend
+  consensus
+  mina_base.import
+  kimchi_pasta
+  kimchi_pasta.basic
+  mina_wire_types
+  o1trace)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_jane ppx_mina ppx_version ppx_inline_test ppx_deriving.std))
  (synopsis "Uptime service library for delegation program"))
diff --git a/src/lib/user_command_input/dune b/src/lib/user_command_input/dune
index d9e7856f17d..fc145b28c9e 100644
--- a/src/lib/user_command_input/dune
+++ b/src/lib/user_command_input/dune
@@ -2,26 +2,27 @@
  (name user_command_input)
  (public_name user_command_input)
  (libraries
-   ;; opam libraries
-   bin_prot.shape
-   core
-   core_kernel
-   async_kernel
-   sexplib0
-   base.caml
-   async
-   ;; local libraries
-   logger
-   genesis_constants
-   currency
-   unsigned_extended
-   participating_state
-   secrets
-   signature_lib
-   mina_base
-   mina_numbers
-   mina_base.import
-   ppx_version.runtime
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_deriving_yojson ppx_jane ppx_deriving.make)))
+  ;; opam libraries
+  bin_prot.shape
+  core
+  core_kernel
+  async_kernel
+  sexplib0
+  base.caml
+  async
+  ;; local libraries
+  logger
+  genesis_constants
+  currency
+  unsigned_extended
+  participating_state
+  secrets
+  signature_lib
+  mina_base
+  mina_numbers
+  mina_base.import
+  ppx_version.runtime)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_version ppx_deriving_yojson ppx_jane ppx_deriving.make)))
diff --git a/src/lib/verifier/dune b/src/lib/verifier/dune
index b3492ab39b4..c6f67326c5d 100644
--- a/src/lib/verifier/dune
+++ b/src/lib/verifier/dune
@@ -2,44 +2,56 @@
  (name verifier)
  (public_name verifier)
  (libraries
-   ;; opam libraries
-   base.caml
-   async
-   core_kernel
-   async_kernel
-   rpc_parallel
-   sexplib0
-   base
-   bin_prot.shape
-   core
-   async_unix
-   ;; local libraries
-   kimchi_backend
-   logger.file_system
-   error_json
-   transaction_snark
-   random_oracle_input
-   child_processes
-   logger
-   itn_logger
-   ledger_proof
-   snark_params
-   blockchain_snark
-   mina_base
-   mina_state
-   pickles
-   genesis_constants
-   signature_lib
-   pickles.backend
-   random_oracle
-   o1trace
-   mina_base.import
-   kimchi_pasta
-   kimchi_pasta.basic
-   with_hash
-   snarky.backendless
-   internal_tracing
-   )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_custom_printf ppx_version ppx_compare ppx_hash ppx_mina ppx_version ppx_here ppx_bin_prot ppx_let
-                  ppx_deriving.std ppx_deriving_yojson ppx_sexp_conv)))
+  ;; opam libraries
+  base.caml
+  async
+  core_kernel
+  async_kernel
+  rpc_parallel
+  sexplib0
+  base
+  bin_prot.shape
+  core
+  async_unix
+  ;; local libraries
+  kimchi_backend
+  logger.file_system
+  error_json
+  transaction_snark
+  random_oracle_input
+  child_processes
+  logger
+  itn_logger
+  ledger_proof
+  snark_params
+  blockchain_snark
+  mina_base
+  mina_state
+  pickles
+  genesis_constants
+  signature_lib
+  pickles.backend
+  random_oracle
+  o1trace
+  mina_base.import
+  kimchi_pasta
+  kimchi_pasta.basic
+  with_hash
+  snarky.backendless
+  internal_tracing)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps
+   ppx_custom_printf
+   ppx_version
+   ppx_compare
+   ppx_hash
+   ppx_mina
+   ppx_version
+   ppx_here
+   ppx_bin_prot
+   ppx_let
+   ppx_deriving.std
+   ppx_deriving_yojson
+   ppx_sexp_conv)))
diff --git a/src/lib/visualization/dune b/src/lib/visualization/dune
index 739091df7e7..67ae073673d 100644
--- a/src/lib/visualization/dune
+++ b/src/lib/visualization/dune
@@ -2,5 +2,7 @@
  (name visualization)
  (public_name visualization)
  (libraries core_kernel async_kernel ocamlgraph yojson sexplib0)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version ppx_jane ppx_deriving_yojson ppx_sexp_conv)))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version ppx_jane ppx_deriving_yojson ppx_sexp_conv)))
diff --git a/src/lib/vrf_evaluator/dune b/src/lib/vrf_evaluator/dune
index cd1cacde338..5ddbee5b1c2 100644
--- a/src/lib/vrf_evaluator/dune
+++ b/src/lib/vrf_evaluator/dune
@@ -2,33 +2,34 @@
  (name vrf_evaluator)
  (public_name vrf_evaluator)
  (libraries
-   ;; opam libraries
-   async_unix
-   async_kernel
-   rpc_parallel
-   core
-   async
-   core_kernel
-   bin_prot.shape
-   sexplib0
-   base.caml
-   integers
-   ;; local libraries
-   mina_wire_types
-   error_json
-   currency
-   unsigned_extended
-   interruptible
-   signature_lib
-   consensus
-   mina_base
-   child_processes
-   mina_numbers
-   genesis_constants
-   logger
-   logger.file_system
-   ppx_version.runtime
-   mina_compile_config
- )
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_mina ppx_version ppx_jane)))
+  ;; opam libraries
+  async_unix
+  async_kernel
+  rpc_parallel
+  core
+  async
+  core_kernel
+  bin_prot.shape
+  sexplib0
+  base.caml
+  integers
+  ;; local libraries
+  mina_wire_types
+  error_json
+  currency
+  unsigned_extended
+  interruptible
+  signature_lib
+  consensus
+  mina_base
+  child_processes
+  mina_numbers
+  genesis_constants
+  logger
+  logger.file_system
+  ppx_version.runtime
+  mina_compile_config)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_mina ppx_version ppx_jane)))
diff --git a/src/lib/vrf_lib/dune b/src/lib/vrf_lib/dune
index 49fdad7af73..2549d1d3da4 100644
--- a/src/lib/vrf_lib/dune
+++ b/src/lib/vrf_lib/dune
@@ -4,29 +4,24 @@
  (flags :standard -short-paths)
  (library_flags -linkall)
  (libraries
-   ;; opam libraries
-   zarith
-   bignum.bigint
-   bin_prot.shape
-   base.caml
-   core
-   sexplib0
-   core_kernel
-   bignum
-   ppx_inline_test.config
-   ;; local libraries
-   snarky.backendless
-   genesis_constants
-   snarky_curves
-   bitstring_lib
-   ppx_version.runtime
- )
+  ;; opam libraries
+  zarith
+  bignum.bigint
+  bin_prot.shape
+  base.caml
+  core
+  sexplib0
+  core_kernel
+  bignum
+  ppx_inline_test.config
+  ;; local libraries
+  snarky.backendless
+  genesis_constants
+  snarky_curves
+  bitstring_lib
+  ppx_version.runtime)
  (preprocess
-  (pps
-    h_list.ppx
-    ppx_bench
-    ppx_compare
-    ppx_jane
-    ppx_version))
- (instrumentation (backend bisect_ppx))
+  (pps h_list.ppx ppx_bench ppx_compare ppx_jane ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "VRF instantiation"))
diff --git a/src/lib/vrf_lib/tests/dune b/src/lib/vrf_lib/tests/dune
index f72363ddcfd..b81344c6379 100644
--- a/src/lib/vrf_lib/tests/dune
+++ b/src/lib/vrf_lib/tests/dune
@@ -2,44 +2,40 @@
  (name vrf_lib_tests)
  (public_name vrf_lib_tests)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   core
-   core_kernel
-   ppx_inline_test.config
-   sexplib0
-   ppx_deriving.runtime
-   ;; local libraries
-   snark_params
-   signature_lib
-   snarky_curves
-   snarky
-   vrf_lib
-   mina_base
-   random_oracle
-   fold_lib
-   pickles
-   bignum.bigint
-   snarky.backendless
-   bitstring_lib
-   crypto_params
-   pickles.backend
-   kimchi_backend
-   kimchi_bindings
-   kimchi_types
-   pasta_bindings
-   kimchi_pasta
-   kimchi_pasta.basic
-   snarky_field_extensions
-   tuple_lib
-   genesis_constants
-)
+  ;; opam libraries
+  core
+  core_kernel
+  ppx_inline_test.config
+  sexplib0
+  ppx_deriving.runtime
+  ;; local libraries
+  snark_params
+  signature_lib
+  snarky_curves
+  snarky
+  vrf_lib
+  mina_base
+  random_oracle
+  fold_lib
+  pickles
+  bignum.bigint
+  snarky.backendless
+  bitstring_lib
+  crypto_params
+  pickles.backend
+  kimchi_backend
+  kimchi_bindings
+  kimchi_types
+  pasta_bindings
+  kimchi_pasta
+  kimchi_pasta.basic
+  snarky_field_extensions
+  tuple_lib
+  genesis_constants)
  (preprocess
-  (pps
-    h_list.ppx
-    ppx_bench
-    ppx_compare
-    ppx_jane
-    ppx_version))
- (instrumentation (backend bisect_ppx)))
+  (pps h_list.ppx ppx_bench ppx_compare ppx_jane ppx_version))
+ (instrumentation
+  (backend bisect_ppx)))
diff --git a/src/lib/web_client_pipe/dune b/src/lib/web_client_pipe/dune
index c94a2f0b786..97db93a765c 100644
--- a/src/lib/web_client_pipe/dune
+++ b/src/lib/web_client_pipe/dune
@@ -2,21 +2,22 @@
  (name web_client_pipe)
  (public_name web_client_pipe)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   core
-   async
-   core_kernel
-   async_kernel
-   ;; local libraries
-   error_json
-   pipe_lib
-   logger
-   web_request
-   )
+  ;; opam libraries
+  core
+  async
+  core_kernel
+  async_kernel
+  ;; local libraries
+  error_json
+  pipe_lib
+  logger
+  web_request)
  (preprocess
   (pps ppx_mina ppx_version ppx_jane ppx_deriving.std))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis
-   "Transforming Coda data such that it can be easy for the Web Client to process"))
+  "Transforming Coda data such that it can be easy for the Web Client to process"))
diff --git a/src/lib/web_request/dune b/src/lib/web_request/dune
index 47a50ca2ce1..9af62bae22a 100644
--- a/src/lib/web_request/dune
+++ b/src/lib/web_request/dune
@@ -1,7 +1,9 @@
 (library
  (name web_request)
  (public_name web_request)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (libraries core async core_kernel base async_kernel async_unix)
  (synopsis "Web tools that are used to send put requests"))
diff --git a/src/lib/webkit_trace_event/binary_output/dune b/src/lib/webkit_trace_event/binary_output/dune
index 8fdf98b34f5..c0f535b0a25 100644
--- a/src/lib/webkit_trace_event/binary_output/dune
+++ b/src/lib/webkit_trace_event/binary_output/dune
@@ -2,14 +2,15 @@
  (public_name webkit_trace_event.binary)
  (name webkit_trace_event_binary_output)
  (libraries
-   ;; opam libraries
-   core
-   async
-   base
-   core_kernel
-   async_unix
-   ;; local libraries
-   webkit_trace_event
-)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version)))
+  ;; opam libraries
+  core
+  async
+  base
+  core_kernel
+  async_unix
+  ;; local libraries
+  webkit_trace_event)
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version)))
diff --git a/src/lib/webkit_trace_event/dune b/src/lib/webkit_trace_event/dune
index 44560c0bf86..564e4929d84 100644
--- a/src/lib/webkit_trace_event/dune
+++ b/src/lib/webkit_trace_event/dune
@@ -1,7 +1,9 @@
 (library
  (name webkit_trace_event)
  (public_name webkit_trace_event)
- (instrumentation (backend bisect_ppx))
- (preprocess (pps ppx_version))
+ (instrumentation
+  (backend bisect_ppx))
+ (preprocess
+  (pps ppx_version))
  (libraries core_kernel base)
  (synopsis "Binary and JSON output of WebKit trace events"))
diff --git a/src/lib/with_hash/dune b/src/lib/with_hash/dune
index 36714ec4a6e..57f8fd9b2d1 100644
--- a/src/lib/with_hash/dune
+++ b/src/lib/with_hash/dune
@@ -2,12 +2,14 @@
  (name with_hash)
  (public_name with_hash)
  (libraries
-   ;; opam libraries
-   bin_prot.shape sexplib0 base.caml core_kernel
-   ;; local libraries
-   mina_wire_types
-   ppx_version.runtime
- )
+  ;; opam libraries
+  bin_prot.shape
+  sexplib0
+  base.caml
+  core_kernel
+  ;; local libraries
+  mina_wire_types
+  ppx_version.runtime)
  (instrumentation
   (backend bisect_ppx))
  (preprocess
diff --git a/src/lib/work_selector/dune b/src/lib/work_selector/dune
index f62f91f5933..14f9b99413f 100644
--- a/src/lib/work_selector/dune
+++ b/src/lib/work_selector/dune
@@ -2,48 +2,60 @@
  (name work_selector)
  (public_name work_selector)
  (library_flags -linkall)
- (inline_tests (flags -verbose -show-counts))
+ (inline_tests
+  (flags -verbose -show-counts))
  (libraries
-   ;; opam libraries
-   bin_prot.shape
-   sexplib0
-   core
-   async
-   core_kernel
-   base
-   base.caml
-   base.base_internalhash_types
-   async_kernel
-   ppx_inline_test.config
-   async_unix
-   ;; local libraries
-   transaction_protocol_state
-   transaction_snark_work
-   transition_frontier_base
-   error_json
-   ledger_proof
-   precomputed_values
-   transaction_witness
-   snark_work_lib
-   mina_state
-   mina_base
-   mina_transaction
-   network_pool
-   staged_ledger
-   logger
-   currency
-   one_or_two
-   transaction_snark
-   pipe_lib
-   transition_frontier
-   with_hash
-   mina_metrics
-   transition_frontier_extensions
-   mina_ledger
-   ppx_version.runtime
-   o1trace)
+  ;; opam libraries
+  bin_prot.shape
+  sexplib0
+  core
+  async
+  core_kernel
+  base
+  base.caml
+  base.base_internalhash_types
+  async_kernel
+  ppx_inline_test.config
+  async_unix
+  ;; local libraries
+  transaction_protocol_state
+  transaction_snark_work
+  transition_frontier_base
+  error_json
+  ledger_proof
+  precomputed_values
+  transaction_witness
+  snark_work_lib
+  mina_state
+  mina_base
+  mina_transaction
+  network_pool
+  staged_ledger
+  logger
+  currency
+  one_or_two
+  transaction_snark
+  pipe_lib
+  transition_frontier
+  with_hash
+  mina_metrics
+  transition_frontier_extensions
+  mina_ledger
+  ppx_version.runtime
+  o1trace)
  (preprocess
-  (pps ppx_mina ppx_version ppx_assert ppx_base ppx_let ppx_deriving.std ppx_deriving_yojson ppx_sexp_conv ppx_bin_prot
-       ppx_custom_printf ppx_inline_test))
- (instrumentation (backend bisect_ppx))
+  (pps
+   ppx_mina
+   ppx_version
+   ppx_assert
+   ppx_base
+   ppx_let
+   ppx_deriving.std
+   ppx_deriving_yojson
+   ppx_sexp_conv
+   ppx_bin_prot
+   ppx_custom_printf
+   ppx_inline_test))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Selects work from the work pool"))
diff --git a/src/lib/zkapp_command_builder/dune b/src/lib/zkapp_command_builder/dune
index 7010c6ad551..dfc326a3957 100644
--- a/src/lib/zkapp_command_builder/dune
+++ b/src/lib/zkapp_command_builder/dune
@@ -3,27 +3,27 @@
  (public_name zkapp_command_builder)
  (library_flags -linkall)
  (libraries
-   ;; opam libraries
-   async_kernel
-   async_unix
-   core_kernel
-   ;; local libraries
-   mina_base
-   currency
-   kimchi_backend
-   kimchi_pasta
-   kimchi_pasta.basic
-   pickles
-   pickles.backend
-   pickles_types
-   random_oracle
-   random_oracle_input
-   signature_lib
-   sgn
-   snark_params
-   snarky.backendless
- )
+  ;; opam libraries
+  async_kernel
+  async_unix
+  core_kernel
+  ;; local libraries
+  mina_base
+  currency
+  kimchi_backend
+  kimchi_pasta
+  kimchi_pasta.basic
+  pickles
+  pickles.backend
+  pickles_types
+  random_oracle
+  random_oracle_input
+  signature_lib
+  sgn
+  snark_params
+  snarky.backendless)
  (preprocess
   (pps ppx_jane ppx_annot ppx_snarky ppx_here ppx_mina ppx_version))
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (synopsis "Builder Zkapp_command.t via combinators"))