diff --git a/src/app/archive/archive_lib/dune b/src/app/archive/archive_lib/dune index 8f4e57239398..a1b50477d516 100644 --- a/src/app/archive/archive_lib/dune +++ b/src/app/archive/archive_lib/dune @@ -1,7 +1,60 @@ (library (name archive_lib) (public_name archive_lib) - (libraries core async mina_base mina_transition one_or_two transition_frontier caqti-async caqti caqti-driver-postgresql genesis_ledger_helper) + (libraries + ;;opam libraries + sexplib0 + async_unix + base64 + async_rpc_kernel + base.caml + bin_prot.shape + async_kernel + caqti-driver-postgresql + core + async + core_kernel + caqti + caqti-async + async.async_rpc + integers + ppx_inline_test.config + uri + ;;local libraries + child_processes + precomputed_values + coda_genesis_ledger + coda_runtime_config + sgn + pickles + pipe_lib + block_time + currency + staged_ledger + data_hash_lib + transition_frontier_base + genesis_ledger_helper + one_or_two + mina_base + mina_transition + transition_frontier + logger + mina_metrics + signature_lib + mina_numbers + unsigned_extended + mina_state + pickles_types + pickles.backend + with_hash + consensus + genesis_constants + genesis_ledger_helper.lib + mina_compile_config + verifier + quickcheck_lib + snark_params + ) (inline_tests) (modes native) (instrumentation (backend bisect_ppx)) diff --git a/src/app/archive/archive_lib/dune-project b/src/app/archive/archive_lib/dune-project index cf301b203d14..f6c2744f1966 100644 --- a/src/app/archive/archive_lib/dune-project +++ b/src/app/archive/archive_lib/dune-project @@ -1,2 +1,3 @@ (lang dune 2.7) (name graphql_query) +(implicit_transitive_deps false) diff --git a/src/app/archive/archive_lib/graphql_query/dune b/src/app/archive/archive_lib/graphql_query/dune index 3ff7ce8f7aef..8b1d5aca5f09 100644 --- a/src/app/archive/archive_lib/graphql_query/dune +++ b/src/app/archive/archive_lib/graphql_query/dune @@ -1,7 +1,18 @@ (library (name graphql_query) (public_name graphql_query) - (libraries core mina_base mina_transition graphql_lib) + (libraries + ;;opam libraries + core + yojson + core_kernel + ;;local libraries + block_time + currency + signature_lib + mina_base + mina_numbers + ) (preprocessor_deps ../../archive_graphql_schema.json) (instrumentation (backend bisect_ppx)) (preprocess (pps ppx_jane ppx_version graphql_ppx -- -schema src/app/archive/archive_graphql_schema.json)) diff --git a/src/app/archive/cli/dune b/src/app/archive/cli/dune index a070201b700f..8c21aaa57f7d 100644 --- a/src/app/archive/cli/dune +++ b/src/app/archive/cli/dune @@ -1,6 +1,22 @@ (library (name archive_cli) (public_name archive.cli) - (libraries core async archive_lib cli_lib caqti caqti-async caqti-driver-postgresql) + (libraries + ;;opam libraries + async_kernel + caqti + archive_lib + core + async + caqti-async + core_kernel + async.async_command + ;;local libraries + genesis_constants + coda_runtime_config + cli_lib + logger + block_time + ) (instrumentation (backend bisect_ppx)) (preprocess (pps ppx_version ppx_jane ppx_coda))) diff --git a/src/app/archive/dune b/src/app/archive/dune index 9e654150bd75..6d4640fba7ce 100644 --- a/src/app/archive/dune +++ b/src/app/archive/dune @@ -4,7 +4,7 @@ (public_name archive) (modules archive) (modes native) - (libraries archive_cli) + (libraries archive_cli async core_kernel base) (instrumentation (backend bisect_ppx)) (preprocess (pps ppx_version))) @@ -14,7 +14,7 @@ (public_name archive-testnet) (modules archive_testnet_signatures) (modes native) - (libraries archive_cli mina_signature_kind.testnet) + (libraries archive_cli mina_signature_kind.testnet async core_kernel base) (instrumentation (backend bisect_ppx)) (preprocess (pps ppx_version))) @@ -24,6 +24,6 @@ (public_name archive-mainnet) (modules archive_mainnet_signatures) (modes native) - (libraries archive_cli mina_signature_kind.mainnet) + (libraries archive_cli mina_signature_kind.mainnet async core_kernel base) (instrumentation (backend bisect_ppx)) (preprocess (pps ppx_version))) diff --git a/src/app/archive/dune-project b/src/app/archive/dune-project index f9e0bc02daf5..2e4d5f81f1e6 100644 --- a/src/app/archive/dune-project +++ b/src/app/archive/dune-project @@ -1,2 +1,3 @@ (lang dune 2.7) (name archive_lib) +(implicit_transitive_deps false) diff --git a/src/app/benchmarks/dune b/src/app/benchmarks/dune index 5cf90ea25459..43ccba29772a 100644 --- a/src/app/benchmarks/dune +++ b/src/app/benchmarks/dune @@ -1,7 +1,7 @@ (executable (name main) (public_name main) - (libraries core_bench.inline_benchmarks vrf_lib_tests mina_base) + (libraries core_bench.inline_benchmarks vrf_lib_tests mina_base core_kernel core base) ; the -w list here should be the same as in src/dune (flags -short-paths -g -w @a-4-29-40-41-42-44-45-48-58-59-60) (instrumentation (backend bisect_ppx)) diff --git a/src/app/benchmarks/dune-project b/src/app/benchmarks/dune-project index 78bcea75bf17..a1e60075648f 100644 --- a/src/app/benchmarks/dune-project +++ b/src/app/benchmarks/dune-project @@ -1,2 +1,3 @@ (lang dune 2.7) (name benchmarks) +(implicit_transitive_deps false) diff --git a/src/app/cli/src/cli_entrypoint/dune b/src/app/cli/src/cli_entrypoint/dune index 7352bddaf534..e444647beee4 100644 --- a/src/app/cli/src/cli_entrypoint/dune +++ b/src/app/cli/src/cli_entrypoint/dune @@ -4,7 +4,67 @@ (name mina_cli_entrypoint) (public_name cli.mina_cli_entrypoint) (modes native) - (libraries init tests consensus child_processes memory_stats node_addrs_and_ports jemalloc genesis_ledger_helper mina_plugins error_json) + (libraries + ;;opam libraries + stdio + async_kernel + async_unix + base + core_kernel + core + init + tests + async + core.daemon + base.caml + uri + async.async_command + result + ;;local libraries + verifier + ledger_proof + snark_worker + mina_transition + pipe_lib + gossip_net + data_hash_lib + precomputed_values + mina_networking + cache_dir + parallel + secrets + logger + mina_lib + currency + signature_lib + mina_base + error_json + genesis_ledger_helper + memory_stats + consensus + child_processes + node_addrs_and_ports + mina_plugins + cli_lib + genesis_constants + blake2 + mina_metrics + mina_compile_config + mina_user_error + file_system + mina_version + mina_net2 + block_time + coda_runtime_config + trust_system + coda_genesis_proof + with_hash + block_producer + prover + blockchain_snark + snarky.backendless + o1trace + ) (preprocessor_deps ../../../../config.mlh) (instrumentation (backend bisect_ppx)) (preprocess (pps ppx_coda ppx_version ppx_here ppx_let ppx_sexp_conv ppx_optcomp ppx_deriving_yojson))) diff --git a/src/app/cli/src/dune-project b/src/app/cli/src/dune-project index f9881d56205a..37a98e13cfc8 100644 --- a/src/app/cli/src/dune-project +++ b/src/app/cli/src/dune-project @@ -1,2 +1,3 @@ (lang dune 2.7) (name graphql) +(implicit_transitive_deps false) diff --git a/src/app/cli/src/init/dune b/src/app/cli/src/init/dune index 6225ea07a8ee..722ff4e229ab 100644 --- a/src/app/cli/src/init/dune +++ b/src/app/cli/src/init/dune @@ -7,17 +7,91 @@ (name init) (public_name init) (libraries - ; opam deps - async cohttp core - ; libs - snarky_log - cli_lib - mina_base mina_graphql mina_lib mina_state - consensus mina_transition mina_version + ;;opam libraries + stdio + integers + astring + async_ssl + sexplib0 + async.async_rpc + result + graphql + async_kernel + async_unix + uri + core_kernel + core + async + cohttp + graphql_parser + async.async_command + async_rpc_kernel + base.caml + graphql-cohttp + cohttp-async + graphql-async + archive_lib + ;;local libraries + perf_histograms + one_or_two + block_time + child_processes + mina_net2 + snark_worker + allocation_functor + blockchain_snark + genesis_ledger_helper.lib + transaction_inclusion_status + error_json + network_pool + user_command_input + network_peer + logger + coda_genesis_proof + data_hash_lib + currency + genesis_constants + bash_colors + graphql_lib + node_status + o1trace_webkit_event mina_user_error - o1trace o1trace_webkit_event protocol_version node_status node_error_service - transition_frontier web_client_pipe - web_request graphql_lib genesis_ledger_helper bash_colors) + mina_transition + mina_lib + mina_base + cli_lib + mina_graphql + mina_state + consensus + mina_version + o1trace + protocol_version + node_error_service + genesis_ledger_helper + signature_lib + mina_numbers + precomputed_values + with_hash + transaction_snark + transaction_protocol_state + test_util + file_system + daemon_rpcs + trust_system + secrets + participating_state + staged_ledger + mina_commands + coda_runtime_config + coda_genesis_ledger + mina_networking + sgn + unsigned_extended + mina_metrics + group_map + snark_work_lib + mina_compile_config + ) (instrumentation (backend bisect_ppx)) (preprocessor_deps ../../../../config.mlh ../../../../../graphql_schema.json) (preprocess (pps ppx_coda graphql_ppx ppx_version ppx_jane ppx_deriving_yojson))) diff --git a/src/app/cli/src/tests/dune b/src/app/cli/src/tests/dune index 87fdb9eb2b77..d1af831c4e53 100644 --- a/src/app/cli/src/tests/dune +++ b/src/app/cli/src/tests/dune @@ -2,15 +2,73 @@ (name tests) (public_name tests) (libraries - ; opam deps - async core - ; libs - mina_base mina_graphql mina_lib mina_state mina_net2 - mina_transition mina_version child_processes - parallel protocol_version - node_addrs_and_ports transition_frontier - ; internal deps - init) + ;;opam libraries + uri + archive_lib + caqti-async + rpc_parallel + base + core_kernel + async_kernel + bin_prot.shape + graphql-async + integers + init + async + core + sexplib0 + ppx_hash.runtime-lib + async.async_command + base.caml + caqti + base.base_internalhash_types + graphql_parser + async_unix + ;;local libraries + transaction_snark_work + staged_ledger_diff + o1trace + genesis_constants + file_system + mina_commands + genesis_ledger_helper + sync_status + logger + user_command_input + data_hash_lib + block_time + coda_genesis_proof + participating_state + trust_system + protocol_version + child_processes + mina_transition + mina_state + mina_graphql + mina_base + mina_lib + mina_net2 + parallel + node_addrs_and_ports + mina_networking + gossip_net + coda_genesis_ledger + consensus + precomputed_values + with_hash + network_peer + currency + coda_runtime_config + pipe_lib + signature_lib + cli_lib + mina_numbers + filtered_external_transition + work_selector + mina_compile_config + unsigned_extended + ) + (preprocessor_deps ../../../../config.mlh) (instrumentation (backend bisect_ppx)) (preprocess (pps diff --git a/src/app/logproc/dune b/src/app/logproc/dune index d262656ab87f..e0d55fa743f6 100644 --- a/src/app/logproc/dune +++ b/src/app/logproc/dune @@ -2,6 +2,20 @@ (name logproc) (public_name logproc) (modules logproc) - (libraries logproc_lib bash_colors core yojson angstrom cmdliner logger) + (libraries + ;;opam libraries + result + stdio + core + yojson + cmdliner + core_kernel + ppx_deriving_yojson.runtime + ;;local libraries + logger + logproc_lib + bash_colors + interpolator_lib + ) (instrumentation (backend bisect_ppx)) (preprocess (pps ppx_version ppx_jane ppx_deriving.std))) diff --git a/src/app/logproc/dune-project b/src/app/logproc/dune-project index e12e3867b182..55becff70fe8 100644 --- a/src/app/logproc/dune-project +++ b/src/app/logproc/dune-project @@ -1,2 +1,3 @@ (lang dune 2.7) (name logproc) +(implicit_transitive_deps false) diff --git a/src/app/reformat/dune b/src/app/reformat/dune index 1f36182d0a96..e069e49a5da9 100644 --- a/src/app/reformat/dune +++ b/src/app/reformat/dune @@ -1,7 +1,7 @@ (executable (name reformat) (public_name reformat) - (libraries core async) + (libraries core async async_kernel async_unix core_kernel sexplib0 async.async_command) (preprocess (pps ppx_jane)) ; the -w list here should be the same as in src/dune diff --git a/src/app/reformat/dune-project b/src/app/reformat/dune-project index 3a52b09404bf..3e40dc4c097f 100644 --- a/src/app/reformat/dune-project +++ b/src/app/reformat/dune-project @@ -1,2 +1,3 @@ -(lang dune 1.6) +(lang dune 2.7) (name reformat) +(implicit_transitive_deps false) diff --git a/src/app/rosetta/dune b/src/app/rosetta/dune index 00ef3de0dd5f..6275778c0d0e 100644 --- a/src/app/rosetta/dune +++ b/src/app/rosetta/dune @@ -4,7 +4,7 @@ (public_name rosetta) (modules rosetta) (modes native) - (libraries lib) + (libraries lib async core_kernel base async.async_command core async_kernel) (instrumentation (backend bisect_ppx)) (preprocess (pps ppx_version)) ) @@ -15,7 +15,7 @@ (public_name rosetta-testnet) (modules rosetta_testnet_signatures) (modes native) - (libraries lib mina_signature_kind.testnet) + (libraries lib mina_signature_kind.testnet async core_kernel base async.async_command core async_kernel) (instrumentation (backend bisect_ppx)) (preprocess (pps ppx_version)) ) @@ -26,7 +26,7 @@ (public_name rosetta-mainnet) (modules rosetta_mainnet_signatures) (modes native) - (libraries lib mina_signature_kind.mainnet) + (libraries lib mina_signature_kind.mainnet async core_kernel base async.async_command core async_kernel) (instrumentation (backend bisect_ppx)) (preprocess (pps ppx_version)) ) diff --git a/src/app/rosetta/dune-project b/src/app/rosetta/dune-project index 8bbaed92a41e..99edecc7c938 100644 --- a/src/app/rosetta/dune-project +++ b/src/app/rosetta/dune-project @@ -1,2 +1,3 @@ (lang dune 2.7) (name rosetta) +(implicit_transitive_deps false) diff --git a/src/app/rosetta/lib/dune b/src/app/rosetta/lib/dune index 9a8bed7e65a0..5f669a46b944 100644 --- a/src/app/rosetta/lib/dune +++ b/src/app/rosetta/lib/dune @@ -3,26 +3,48 @@ (public_name lib) (inline_tests) (libraries - async - async_ssl + ;;opam libraries + ppx_inline_test.config + integers + async_unix + result + base + core_kernel + cohttp caqti + async caqti-async - caqti-driver-postgresql - cohttp - ctypes cohttp-async - core_kernel + archive_lib + base.caml + async_kernel + uri + core + ;;local libraries + mina_signature_kind + graphql_lib + interpolator_lib + pickles + random_oracle_input + unsigned_extended + signature_lib + rosetta_coding + rosetta_lib logger mina_compile_config - ppx_deriving_yojson.runtime - rosetta_lib rosetta_models - rosetta_coding - yojson - archive_lib - signature_lib secrets - unsigned_extended + mina_base + snark_params + random_oracle + pickles.backend + currency + genesis_constants + hex + mina_numbers + zexe_backend.pasta + logproc_lib + ) (preprocessor_deps ../../../config.mlh) (instrumentation (backend bisect_ppx)) diff --git a/src/app/rosetta/ocaml-signer/dune b/src/app/rosetta/ocaml-signer/dune index 2233f013531e..90913851b92b 100644 --- a/src/app/rosetta/ocaml-signer/dune +++ b/src/app/rosetta/ocaml-signer/dune @@ -3,15 +3,24 @@ (public_name signer.cli) (modules signer_cli) (libraries - async - async_ssl + ;;opam libraries + async_kernel + core core_kernel - logger - rosetta_models + async lib - ppx_deriving_yojson.runtime - yojson + async_unix + async.async_command + ;;local libraries + pickles + rosetta_coding + rosetta_lib string_sign + signature_lib + mina_base + snark_params + pickles.backend + zexe_backend.pasta ) (instrumentation (backend bisect_ppx)) (preprocess (pps @@ -31,7 +40,7 @@ (public_name signer) (modes native) (modules signer) - (libraries signer_cli) + (libraries signer_cli async core_kernel) (instrumentation (backend bisect_ppx)) (preprocess (pps graphql_ppx @@ -50,7 +59,7 @@ (public_name signer-testnet) (modes native) (modules signer_testnet_signatures) - (libraries signer_cli) + (libraries signer_cli async core_kernel) (instrumentation (backend bisect_ppx)) (preprocess (pps graphql_ppx @@ -69,7 +78,7 @@ (public_name signer-mainnet) (modes native) (modules signer_mainnet_signatures) - (libraries signer_cli) + (libraries signer_cli async core_kernel) (instrumentation (backend bisect_ppx)) (preprocess (pps graphql_ppx diff --git a/src/app/runtime_genesis_ledger/dune b/src/app/runtime_genesis_ledger/dune index d346e95a4cbe..2dd27537d5ff 100644 --- a/src/app/runtime_genesis_ledger/dune +++ b/src/app/runtime_genesis_ledger/dune @@ -2,19 +2,22 @@ (name runtime_genesis_ledger) (public_name runtime_genesis_ledger) (libraries - ;; opam deps + ;;opam libraries + base + core_kernel + async_kernel async core - ;; libraries - blockchain_snark - mina_base - coda_genesis_proof - mina_state - genesis_ledger_helper + result + async.async_command + ;;local libraries + genesis_constants coda_runtime_config - snark_params - snarky.backendless - staged_ledger) + genesis_ledger_helper + logger + cache_dir + mina_base + ) (preprocessor_deps ../../config.mlh) (instrumentation (backend bisect_ppx)) (preprocess (pps ppx_version ppx_let ppx_optcomp ppx_deriving_yojson))) diff --git a/src/app/runtime_genesis_ledger/dune-project b/src/app/runtime_genesis_ledger/dune-project index 34bd00c35273..5e99dd7d2637 100644 --- a/src/app/runtime_genesis_ledger/dune-project +++ b/src/app/runtime_genesis_ledger/dune-project @@ -1,2 +1,3 @@ (lang dune 2.7) (name runtime_genesis_ledger) +(implicit_transitive_deps false)