diff --git a/README-ci-failures.md b/README-ci-failures.md index 6e4f678c8b9..595b083f84b 100644 --- a/README-ci-failures.md +++ b/README-ci-failures.md @@ -46,7 +46,7 @@ In this case, you should: [Google Cloud](https://console.cloud.google.com/gcr/images/o1labs-192920/global/mina-toolchain) where they have been automatically uploaded. Look for your branch name and commit hash in the second column. You should find several images suffixed - with `-bullseye` and `-focal` (Debian versions). + with `-bullseye` or `-focal` (Debian versions). 3. For each such image, retrieve its full name and hash by hovering its link and clicking the `Copy full image name` tooltip that appears (or retrieve it on the image's page). diff --git a/README-dev.md b/README-dev.md index 9e0478ae2aa..61617d1c4bf 100644 --- a/README-dev.md +++ b/README-dev.md @@ -261,7 +261,7 @@ Debian package can be build locally by using below commands: ``` make build ``` -2. Build debian for mina-devet (example for ubuntu 18.04): +2. Build debian for mina-devnet (example for ubuntu 18.04): ``` ./scripts/debian/build.sh daemon_devnet ``` diff --git a/automation/services/watchdog/Dockerfile b/automation/services/watchdog/Dockerfile index 43e6e00f825..05e207350f6 100644 --- a/automation/services/watchdog/Dockerfile +++ b/automation/services/watchdog/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9.16-slim-buster +FROM python:3.9.16-slim-bullseye ARG GCLOUDSDK_DOWNLOAD_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-296.0.1-linux-x86_64.tar.gz" ARG WATCHMAN_DEB_URL="http://ftp.us.debian.org/debian/pool/main/w/watchman/watchman_4.9.0-5+b1_amd64.deb" diff --git a/buildkite/Makefile b/buildkite/Makefile index eff56f84029..dceeec07ab4 100644 --- a/buildkite/Makefile +++ b/buildkite/Makefile @@ -32,4 +32,4 @@ check_dups: dump_pipelines check_names: dump_pipelines python3 scripts/dhall/checker.py --root "$(TMP)" names -all: check_syntax lint format check_deps check_dirty check_dups check_names \ No newline at end of file +all: check_syntax lint format check_deps check_dirty check_dups check_names diff --git a/buildkite/scripts/bench/install.sh b/buildkite/scripts/bench/install.sh index ea06e6ee02b..b9e0292dae0 100644 --- a/buildkite/scripts/bench/install.sh +++ b/buildkite/scripts/bench/install.sh @@ -8,7 +8,7 @@ export DEBIAN_FRONTEND=noninteractive sudo apt-get update sudo apt-get install -y git apt-transport-https ca-certificates tzdata curl python3 -TESTNET_NAME="berkeley" +TESTNET_NAME="devnet" git config --global --add safe.directory /workdir source buildkite/scripts/export-git-env-vars.sh diff --git a/buildkite/scripts/check-compatibility.sh b/buildkite/scripts/check-compatibility.sh index 6808c61e9e3..241de3c15d6 100755 --- a/buildkite/scripts/check-compatibility.sh +++ b/buildkite/scripts/check-compatibility.sh @@ -10,7 +10,7 @@ function get_shas { function image_tag { SHA=$1 - IMAGE_TAG="$SHA-bullseye-berkeley" + IMAGE_TAG="$SHA-bullseye-devnet" } function download-docker { @@ -22,17 +22,25 @@ function download-docker { function try_docker_shas { DOCKER_SHAS=$1 GOT_DOCKER=0 - for sha in $DOCKER_SHAS; do - download-docker $sha - if [ $? -eq 0 ] ; then - GOT_DOCKER=1 - image_tag $sha - break - else - echo "No docker available for SHA=$sha" - fi + + set +e + download-docker $sha + + if [ $? -eq 0 ] ; then + GOT_DOCKER=1 + image_tag $sha + break + else + echo "No docker available for SHA=$sha" + fi + set -e done + + if [[ $GOT_DOCKER == 0 ]]; then + echo "docker cannot be found for given shas: $DOCKER_SHAS" + exit 1 + fi } function image_id { diff --git a/buildkite/scripts/connect-to-berkeley.sh b/buildkite/scripts/connect-to-berkeley.sh deleted file mode 100755 index 1b2aa7cfe82..00000000000 --- a/buildkite/scripts/connect-to-berkeley.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -set -eo pipefail - -case "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" in - rampup|berkeley|release/2.0.0|develop) - ;; - *) - echo "Not pulling against rampup, not running the connect test" - exit 0 ;; -esac - -# Don't prompt for answers during apt-get install -export DEBIAN_FRONTEND=noninteractive - -apt-get update -apt-get install -y git apt-transport-https ca-certificates tzdata curl - -TESTNET_VERSION_NAME="berkeley" -TESTNET_NAME="testworld-2-0" - -git config --global --add safe.directory /workdir - -source buildkite/scripts/export-git-env-vars.sh - -source buildkite/scripts/debian/install.sh "mina-${TESTNET_VERSION_NAME}" - -# Remove lockfile if present -rm ~/.mina-config/.mina-lock ||: - -mkdir -p /root/libp2p-keys/ -# Pre-generated random password for this quick test -export MINA_LIBP2P_PASS=eithohShieshichoh8uaJ5iefo1reiRudaekohG7AeCeib4XuneDet2uGhu7lahf -mina libp2p generate-keypair --privkey-path /root/libp2p-keys/key -# Set permissions on the keypair so the daemon doesn't complain -chmod -R 0700 /root/libp2p-keys/ - -# Restart in the background -mina daemon \ - --peer-list-url "https://storage.googleapis.com/seed-lists/${TESTNET_NAME}_seeds.txt" \ - --libp2p-keypair "/root/libp2p-keys/key" \ -& # -background - -# Attempt to connect to the GraphQL client every 30s for up to 12 minutes -num_status_retries=24 -for ((i=1;i<=$num_status_retries;i++)); do - sleep 30s - set +e - mina client status - status_exit_code=$? - set -e - if [ $status_exit_code -eq 0 ]; then - break - elif [ $i -eq $num_status_retries ]; then - exit $status_exit_code - fi -done - -# Check that the daemon has connected to peers and is still up after 2 mins -sleep 2m -mina client status -if [ $(mina advanced get-peers | wc -l) -gt 0 ]; then - echo "Found some peers" -else - echo "No peers found" - exit 1 -fi - diff --git a/buildkite/scripts/connect-to-testnet.sh b/buildkite/scripts/connect-to-testnet.sh index 3cfd7a4aa7b..cba27c93759 100755 --- a/buildkite/scripts/connect-to-testnet.sh +++ b/buildkite/scripts/connect-to-testnet.sh @@ -7,53 +7,46 @@ if [[ $# -ne 3 ]]; then exit 1 fi -TESTNET_VERSION_NAME="berkeley" TESTNET_NAME=$1 WAIT_BETWEEN_POLLING_GRAPHQL=$2 WAIT_AFTER_FINAL_CHECK=$3 -case "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" in - rampup|berkeley|release/2.0.0|develop) - ;; - *) - echo "Not pulling against rampup, not running the connect test" - exit 0 ;; -esac - # Don't prompt for answers during apt-get install export DEBIAN_FRONTEND=noninteractive -apt-get update -apt-get install -y git apt-transport-https ca-certificates tzdata curl +sudo apt-get update +sudo apt-get install -y git apt-transport-https ca-certificates tzdata curl libwww-perl jq git config --global --add safe.directory /workdir source buildkite/scripts/export-git-env-vars.sh -source buildkite/scripts/debian/install.sh "mina-${TESTNET_VERSION_NAME}" +source buildkite/scripts/debian/install.sh "mina-${TESTNET_NAME}" 1 # Remove lockfile if present -rm ~/.mina-config/.mina-lock ||: +sudo rm ~/.mina-config/.mina-lock ||: + +sudo mkdir -p /root/libp2p-keys/ -mkdir -p /root/libp2p-keys/ -# Pre-generated random password for this quick test -export MINA_LIBP2P_PASS=eithohShieshichoh8uaJ5iefo1reiRudaekohG7AeCeib4XuneDet2uGhu7lahf -mina libp2p generate-keypair --privkey-path /root/libp2p-keys/key # Set permissions on the keypair so the daemon doesn't complain -chmod -R 0700 /root/libp2p-keys/ +sudo chmod -R 0700 /root/libp2p-keys/ +# Pre-generated random password for this quick test +sudo MINA_LIBP2P_PASS=eithohShieshichoh8uaJ5iefo1reiRudaekohG7AeCeib4XuneDet2uGhu7lahf mina libp2p generate-keypair --privkey-path /root/libp2p-keys/key # Restart in the background -mina daemon \ - --peer-list-url "https://storage.googleapis.com/seed-lists/${TESTNET_NAME}_seeds.txt" \ - --libp2p-keypair "/root/libp2p-keys/key" \ -& # -background +sudo MINA_LIBP2P_PASS=eithohShieshichoh8uaJ5iefo1reiRudaekohG7AeCeib4XuneDet2uGhu7lahf \ + TESTNET_NAME=$TESTNET_NAME \ + bash -c "mina daemon \ + --peer-list-url \"https://storage.googleapis.com/seed-lists/${TESTNET_NAME}_seeds.txt\" \ + --libp2p-keypair \"/root/libp2p-keys/key\" \ + --seed &" # -background # Attempt to connect to the GraphQL client every 10s for up to 8 minutes num_status_retries=24 for ((i=1;i<=$num_status_retries;i++)); do sleep $WAIT_BETWEEN_POLLING_GRAPHQL set +e - mina client status + sudo mina client status status_exit_code=$? set -e if [ $status_exit_code -eq 0 ]; then @@ -63,13 +56,18 @@ for ((i=1;i<=$num_status_retries;i++)); do fi done -# Check that the daemon has connected to peers and is still up after 2 mins -sleep $WAIT_AFTER_FINAL_CHECK -mina client status -if [ $(mina advanced get-peers | wc -l) -gt 0 ]; then - echo "Found some peers" -else - echo "No peers found" - exit 1 -fi +peer_retries=10 +for ((i=1;i<=$peer_retries;i++)); do + peer_count=$(sudo mina advanced get-peers | wc -l) + sudo mina client status + + if [ "$peer_count" -gt 0 ]; then + echo "Found some peers" + exit 0; + else + echo "No peers found" + fi + sleep $WAIT_AFTER_FINAL_CHECK +done +exit 1; \ No newline at end of file diff --git a/buildkite/scripts/debian/install.sh b/buildkite/scripts/debian/install.sh index 75848a7d23c..dfe1c425367 100755 --- a/buildkite/scripts/debian/install.sh +++ b/buildkite/scripts/debian/install.sh @@ -34,7 +34,7 @@ else debs=(${DEBS//,/ }) for i in "${debs[@]}"; do case $i in - mina-berkeley*|mina-devnet|mina-mainnet) + mina-devnet*|mina-mainnet) # Downaload mina-logproc too source ./buildkite/scripts/download-artifact-from-cache.sh "mina-logproc*" $MINA_DEB_CODENAME/_build "" $LOCAL_DEB_FOLDER ;; diff --git a/buildkite/scripts/dump-mina-type-shapes.sh b/buildkite/scripts/dump-mina-type-shapes.sh index 5c1d402e215..c803937d3d0 100755 --- a/buildkite/scripts/dump-mina-type-shapes.sh +++ b/buildkite/scripts/dump-mina-type-shapes.sh @@ -8,7 +8,7 @@ export DEBIAN_FRONTEND=noninteractive sudo apt-get update sudo apt-get install -y git apt-transport-https ca-certificates tzdata curl -TESTNET_NAME="berkeley" +TESTNET_NAME="devnet" git config --global --add safe.directory /workdir source buildkite/scripts/export-git-env-vars.sh diff --git a/buildkite/scripts/rosetta-integration-tests.sh b/buildkite/scripts/rosetta-integration-tests.sh index fd8d48aca49..452eaec2acd 100755 --- a/buildkite/scripts/rosetta-integration-tests.sh +++ b/buildkite/scripts/rosetta-integration-tests.sh @@ -250,10 +250,12 @@ if [[ "$MODE" == "full" ]]; then send_zkapp_transactions & fi -next_block_time=$(mina client status --json | jq '.next_block_production.timing[1].time' | tr -d '"') curr_time=$(date +%s%N | cut -b1-13) -sleep_time=$((($next_block_time - $curr_time) / 1000)) +mina client status --json + +next_block_time=$(mina client status --json | jq '.next_block_production.timing[1]' | tr -d '"') curr_time=$(date +%s%N | cut -b1-13) +sleep_time=$((($next_block_time - $curr_time) / 10000000)) echo "Sleeping for ${sleep_time}s until next block is created..." -sleep ${sleep_time} +sleep $sleep_time # Mina Rosetta Checks (spec construction data perf) echo "============ ROSETTA CLI: VALIDATE CONF FILE ${ROSETTA_CONFIGURATION_FILE} ==============" diff --git a/buildkite/scripts/run-test-executive-cloud.sh b/buildkite/scripts/run-test-executive-cloud.sh index 884b8222cbc..8a3df280401 100755 --- a/buildkite/scripts/run-test-executive-cloud.sh +++ b/buildkite/scripts/run-test-executive-cloud.sh @@ -2,7 +2,7 @@ set -o pipefail -x TEST_NAME="$1" -MINA_IMAGE="gcr.io/o1labs-192920/mina-daemon:$MINA_DOCKER_TAG-berkeley" +MINA_IMAGE="gcr.io/o1labs-192920/mina-daemon:$MINA_DOCKER_TAG-devnet" ARCHIVE_IMAGE="gcr.io/o1labs-192920/mina-archive:$MINA_DOCKER_TAG" if [[ "${TEST_NAME:0:15}" == "block-prod-prio" ]] && [[ "$RUN_OPT_TESTS" == "" ]]; then diff --git a/buildkite/scripts/run-test-executive-local.sh b/buildkite/scripts/run-test-executive-local.sh index 09c37c2b206..8512b93df0f 100755 --- a/buildkite/scripts/run-test-executive-local.sh +++ b/buildkite/scripts/run-test-executive-local.sh @@ -26,7 +26,7 @@ cleanup TEST_NAME="$1" -MINA_IMAGE="gcr.io/o1labs-192920/mina-daemon:$MINA_DOCKER_TAG-berkeley" +MINA_IMAGE="gcr.io/o1labs-192920/mina-daemon:$MINA_DOCKER_TAG-devnet" ARCHIVE_IMAGE="gcr.io/o1labs-192920/mina-archive:$MINA_DOCKER_TAG" if [[ "${TEST_NAME:0:15}" == "block-prod-prio" ]] && [[ "$RUN_OPT_TESTS" == "" ]]; then @@ -42,7 +42,7 @@ rm -f /etc/apt/sources.list.d/hashicorp.list apt-get update apt-get install -y git apt-transport-https ca-certificates tzdata curl -TESTNET_NAME="berkeley" +TESTNET_NAME="devnet" git config --global --add safe.directory /workdir diff --git a/buildkite/scripts/run_promote_build_job.sh b/buildkite/scripts/run_promote_build_job.sh index 191c24e197b..c7d02b1a5fa 100755 --- a/buildkite/scripts/run_promote_build_job.sh +++ b/buildkite/scripts/run_promote_build_job.sh @@ -61,7 +61,7 @@ DHALL_DEBIANS="([] : List $DEBIAN_DHALL_DEF.Type)" if [[ -n "$DEBIANS" ]]; then if [[ -z "$CODENAMES" ]]; then usage "Codenames is not set!"; exit 1; fi; if [[ -z "$PROFILE" ]]; then PROFILE="Standard"; fi; - if [[ -z "$NETWORK" ]]; then NETWORK="Berkeley"; fi; + if [[ -z "$NETWORK" ]]; then NETWORK="Devnet"; fi; if [[ -z "$REMOVE_PROFILE_FROM_NAME" ]]; then REMOVE_PROFILE_FROM_NAME=0; fi; if [[ -z "$PUBLISH" ]]; then PUBLISH=0; fi; if [[ -z "$FROM_CHANNEL" ]]; then FROM_CHANNEL="Unstable"; fi; diff --git a/buildkite/scripts/run_verify_promoted_build_job.sh b/buildkite/scripts/run_verify_promoted_build_job.sh index 713749f642f..5821d199a5e 100755 --- a/buildkite/scripts/run_verify_promoted_build_job.sh +++ b/buildkite/scripts/run_verify_promoted_build_job.sh @@ -59,7 +59,7 @@ DHALL_DEBIANS="([] : List $DEBIAN_DHALL_DEF.Type)" if [[ -n "$DEBIANS" ]]; then if [[ -z "$CODENAMES" ]]; then usage "Codenames is not set!"; exit 1; fi; if [[ -z "$PROFILE" ]]; then PROFILE="Standard"; fi; - if [[ -z "$NETWORK" ]]; then NETWORK="Berkeley"; fi; + if [[ -z "$NETWORK" ]]; then NETWORK="Devnet"; fi; if [[ -z "$REMOVE_PROFILE_FROM_NAME" ]]; then REMOVE_PROFILE_FROM_NAME=0; fi; if [[ -z "$PUBLISH" ]]; then PUBLISH=0; fi; if [[ -z "$TO_CHANNEL" ]]; then TO_CHANNEL="Unstable"; fi; diff --git a/buildkite/scripts/single-node-tests.sh b/buildkite/scripts/single-node-tests.sh index 93b224c5ba8..dcd6752ae23 100755 --- a/buildkite/scripts/single-node-tests.sh +++ b/buildkite/scripts/single-node-tests.sh @@ -12,7 +12,7 @@ git config --global --add safe.directory /workdir source buildkite/scripts/export-git-env-vars.sh -source buildkite/scripts/debian/install.sh "mina-test-suite,mina-berkeley-lightnet" 1 +source buildkite/scripts/debian/install.sh "mina-test-suite,mina-devnet-lightnet" 1 export MINA_LIBP2P_PASS="naughty blue worm" export MINA_PRIVKEY_PASS="naughty blue worm" diff --git a/buildkite/scripts/tests/ledger_test_apply.sh b/buildkite/scripts/tests/ledger_test_apply.sh index d72c20154b7..ce8304244a6 100755 --- a/buildkite/scripts/tests/ledger_test_apply.sh +++ b/buildkite/scripts/tests/ledger_test_apply.sh @@ -12,7 +12,7 @@ git config --global --add safe.directory /workdir source buildkite/scripts/export-git-env-vars.sh -source buildkite/scripts/debian/install.sh "mina-berkeley-instrumented" 1 +source buildkite/scripts/debian/install.sh "mina-devnet-instrumented" 1 echo "removing magic config files" sudo rm -f /var/lib/coda/config_* diff --git a/buildkite/scripts/version-linter.sh b/buildkite/scripts/version-linter.sh index fb1ea8c9d89..8af413c2436 100755 --- a/buildkite/scripts/version-linter.sh +++ b/buildkite/scripts/version-linter.sh @@ -7,7 +7,7 @@ if [[ $# -ne 1 ]]; then exit 1 fi -TESTNET_NAME="${TESTNET_NAME:-berkeley}" +TESTNET_NAME="${TESTNET_NAME:-devnet}" # Don't prompt for answers during apt-get install export DEBIAN_FRONTEND=noninteractive diff --git a/buildkite/src/Command/Bench/Base.dhall b/buildkite/src/Command/Bench/Base.dhall index 3d2431943b6..48427e6738d 100644 --- a/buildkite/src/Command/Bench/Base.dhall +++ b/buildkite/src/Command/Bench/Base.dhall @@ -10,6 +10,8 @@ let DebianVersions = ../../Constants/DebianVersions.dhall let RunInToolchain = ../../Command/RunInToolchain.dhall +let Network = ../../Constants/Network.dhall + let Profiles = ../../Constants/Profiles.dhall let Command = ../../Command/Base.dhall @@ -42,6 +44,7 @@ let Spec = , dependsOn = DebianVersions.dependsOn DebianVersions.DebVersion.Bullseye + Network.Type.Devnet Profiles.Type.Standard , additionalDirtyWhen = [] : List SelectFiles.Type , yellowThreshold = 0.1 diff --git a/buildkite/src/Command/ConnectToTestnet.dhall b/buildkite/src/Command/ConnectToTestnet.dhall index ba4bba1b974..91bf6ee8bea 100644 --- a/buildkite/src/Command/ConnectToTestnet.dhall +++ b/buildkite/src/Command/ConnectToTestnet.dhall @@ -4,9 +4,9 @@ let Command = ./Base.dhall let Size = ./Size.dhall -let B/SoftFail = B.definitions/commandStep/properties/soft_fail/Type +let RunInToolchain = ./RunInToolchain.dhall -let Cmd = ../Lib/Cmds.dhall +let B/SoftFail = B.definitions/commandStep/properties/soft_fail/Type in { step = \(dependsOn : List Command.TaggedKey.Type) @@ -17,12 +17,9 @@ in { step = -> Command.build Command.Config::{ , commands = - [ Cmd.runInDocker - Cmd.Docker::{ - , image = (../Constants/ContainerImages.dhall).ubuntu2004 - } + RunInToolchain.runInToolchain + ([] : List Text) "./buildkite/scripts/connect-to-testnet.sh ${testnet} ${wait_between_graphql_poll} ${wait_before_final_check}" - ] , label = "Connect to ${testnet}" , soft_fail = Some soft_fail , key = "connect-to-${testnet}" diff --git a/buildkite/src/Command/DockerImage.dhall b/buildkite/src/Command/DockerImage.dhall index 0741138fa97..d834fd58b5d 100644 --- a/buildkite/src/Command/DockerImage.dhall +++ b/buildkite/src/Command/DockerImage.dhall @@ -10,8 +10,6 @@ let Size = ./Size.dhall let Profiles = ../Constants/Profiles.dhall -let Artifacts = ../Constants/Artifacts.dhall - let BuildFlags = ../Constants/BuildFlags.dhall let Cmd = ../Lib/Cmds.dhall @@ -20,57 +18,81 @@ let DockerLogin = ../Command/DockerLogin/Type.dhall let DebianRepo = ../Constants/DebianRepo.dhall +let DebianVersions = ../Constants/DebianVersions.dhall + +let Network = ../Constants/Network.dhall + +let Artifacts = ../Constants/Artifacts.dhall + let ReleaseSpec = { Type = { deps : List Command.TaggedKey.Type , network : Text - , service : Text + , service : Artifacts.Type , version : Text , branch : Text , repo : Text , no_cache : Bool - , deb_codename : Text + , deb_codename : DebianVersions.DebVersion , deb_release : Text , deb_version : Text , deb_profile : Profiles.Type , deb_repo : DebianRepo.Type , build_flags : BuildFlags.Type - , step_key : Text + , step_key_suffix : Text , if : Optional B/If } , default = { deps = [] : List Command.TaggedKey.Type - , network = "devnet" + , network = "${Network.lowerName Network.Type.Devnet}" , version = "\\\${MINA_DOCKER_TAG}" - , service = Artifacts.dockerName Artifacts.Type.Daemon + , service = Artifacts.Type.Daemon , branch = "\\\${BUILDKITE_BRANCH}" , repo = "\\\${BUILDKITE_REPO}" - , deb_codename = "bullseye" + , deb_codename = DebianVersions.DebVersion.Bullseye , deb_release = "\\\${MINA_DEB_RELEASE}" , deb_version = "\\\${MINA_DEB_VERSION}" , deb_profile = Profiles.Type.Standard , build_flags = BuildFlags.Type.None , deb_repo = DebianRepo.Type.PackagesO1Test , no_cache = False - , step_key = "daemon-standard-docker-image" + , step_key_suffix = "-docker-image" , if = None B/If } } +let stepKey = + \(spec : ReleaseSpec.Type) + -> "${Artifacts.lowerName + spec.service}${Profiles.toLabelSegment + spec.deb_profile}${BuildFlags.toLabelSegment + spec.build_flags}${spec.step_key_suffix}" + +let stepLabel = + \(spec : ReleaseSpec.Type) + -> "Docker: ${Artifacts.capitalName + spec.service} ${spec.network} ${DebianVersions.capitalName + spec.deb_codename} ${Profiles.toSuffixUppercase + spec.deb_profile} ${BuildFlags.toSuffixUppercase + spec.build_flags}" + let generateStep = \(spec : ReleaseSpec.Type) - -> let exportMinaDebCmd = "export MINA_DEB_CODENAME=${spec.deb_codename}" + -> let exportMinaDebCmd = + "export MINA_DEB_CODENAME=${DebianVersions.lowerName + spec.deb_codename}" let maybeCacheOption = if spec.no_cache then "--no-cache" else "" let buildDockerCmd = "./scripts/docker/build.sh" - ++ " --service ${spec.service}" + ++ " --service ${Artifacts.dockerName spec.service}" ++ " --network ${spec.network}" ++ " --version ${spec.version}" ++ " --branch ${spec.branch}" ++ " ${maybeCacheOption} " - ++ " --deb-codename ${spec.deb_codename}" + ++ " --deb-codename ${DebianVersions.lowerName + spec.deb_codename}" ++ " --deb-repo ${DebianRepo.address spec.deb_repo}" ++ " --deb-release ${spec.deb_release}" ++ " --deb-version ${spec.deb_version}" @@ -81,10 +103,11 @@ let generateStep = let releaseDockerCmd = "./scripts/docker/release.sh" - ++ " --service ${spec.service}" + ++ " --service ${Artifacts.dockerName spec.service}" ++ " --version ${spec.version}" ++ " --network ${spec.network}" - ++ " --deb-codename ${spec.deb_codename}" + ++ " --deb-codename ${DebianVersions.lowerName + spec.deb_codename}" ++ " --deb-version ${spec.deb_version}" ++ " --deb-profile ${Profiles.lowerName spec.deb_profile}" ++ " --deb-build-flags ${BuildFlags.lowerName @@ -126,12 +149,16 @@ let generateStep = in Command.build Command.Config::{ , commands = commands - , label = "Docker: ${spec.step_key}" - , key = spec.step_key + , label = "${stepLabel spec}" + , key = "${stepKey spec}" , target = Size.XLarge , docker_login = Some DockerLogin::{=} , depends_on = spec.deps , if = spec.if } -in { generateStep = generateStep, ReleaseSpec = ReleaseSpec } +in { generateStep = generateStep + , ReleaseSpec = ReleaseSpec + , stepKey = stepKey + , stepLabel = stepLabel + } diff --git a/buildkite/src/Command/HardforkPackageGeneration.dhall b/buildkite/src/Command/HardforkPackageGeneration.dhall index 183826d81b4..9e9af392e52 100644 --- a/buildkite/src/Command/HardforkPackageGeneration.dhall +++ b/buildkite/src/Command/HardforkPackageGeneration.dhall @@ -30,14 +30,14 @@ let DebianVersions = ../Constants/DebianVersions.dhall let DebianRepo = ../Constants/DebianRepo.dhall -let Artifacts = ../Constants/Artifacts.dhall - let Profiles = ../Constants/Profiles.dhall let Toolchain = ../Constants/Toolchain.dhall let Network = ../Constants/Network.dhall +let Artifacts = ../Constants/Artifacts.dhall + let Spec = { Type = { codename : DebianVersions.DebVersion @@ -98,6 +98,17 @@ let pipeline "gcr.io/o1labs-192920/mina-daemon:\${BUILDKITE_COMMIT:0:7}-${DebianVersions.lowerName debVersion}-${network_name}" + let dockerSpec = + DockerImage.ReleaseSpec::{ + , deps = + [ { name = pipelineName, key = generateLedgersJobKey } ] + , service = Artifacts.Type.Daemon + , network = network_name + , deb_codename = debVersion + , deb_profile = profile + , deb_repo = DebianRepo.Type.Local + } + in Pipeline.Config::{ , spec = JobSpec::{ , dirtyWhen = [ S.everything ] @@ -155,20 +166,7 @@ let pipeline , key = "publish-hardfork-deb-pkg" , target = Size.Small } - , DockerImage.generateStep - DockerImage.ReleaseSpec::{ - , deps = - [ { name = pipelineName, key = generateLedgersJobKey } ] - , service = Artifacts.dockerName Artifacts.Type.Daemon - , network = network_name - , deb_codename = "${DebianVersions.lowerName debVersion}" - , deb_profile = profile - , deb_repo = DebianRepo.Type.Local - , step_key = - "daemon-berkeley-${DebianVersions.lowerName - debVersion}${Profiles.toLabelSegment - profile}-docker-image" - } + , DockerImage.generateStep dockerSpec , Command.build Command.Config::{ , commands = @@ -182,10 +180,7 @@ let pipeline , target = Size.XLarge , depends_on = [ { name = pipelineName - , key = - "daemon-berkeley-${DebianVersions.lowerName - debVersion}${Profiles.toLabelSegment - profile}-docker-image" + , key = DockerImage.stepKey dockerSpec } ] , if = None B/If @@ -202,10 +197,7 @@ let pipeline , target = Size.XLarge , depends_on = [ { name = pipelineName - , key = - "daemon-berkeley-${DebianVersions.lowerName - debVersion}${Profiles.toLabelSegment - profile}-docker-image" + , key = DockerImage.stepKey dockerSpec } ] , if = None B/If @@ -214,28 +206,20 @@ let pipeline DockerImage.ReleaseSpec::{ , deps = [ { name = pipelineName, key = generateLedgersJobKey } ] - , service = Artifacts.dockerName Artifacts.Type.Archive + , service = Artifacts.Type.Archive , network = network_name - , deb_codename = "${DebianVersions.lowerName debVersion}" + , deb_codename = debVersion , deb_profile = profile , deb_repo = DebianRepo.Type.Local - , step_key = - "archive-${DebianVersions.lowerName - debVersion}${Profiles.toLabelSegment - profile}-docker-image" } , DockerImage.generateStep DockerImage.ReleaseSpec::{ , deps = [ { name = pipelineName, key = generateLedgersJobKey } ] - , service = Artifacts.dockerName Artifacts.Type.Rosetta + , service = Artifacts.Type.Rosetta , network = network_name , deb_repo = DebianRepo.Type.Local - , deb_codename = "${DebianVersions.lowerName debVersion}" - , step_key = - "rosetta-${DebianVersions.lowerName - debVersion}${Profiles.toLabelSegment - profile}-docker-image" + , deb_codename = debVersion } ] } diff --git a/buildkite/src/Command/MinaArtifact.dhall b/buildkite/src/Command/MinaArtifact.dhall index dbe9d587c05..c0d7a070df8 100644 --- a/buildkite/src/Command/MinaArtifact.dhall +++ b/buildkite/src/Command/MinaArtifact.dhall @@ -40,7 +40,7 @@ let MinaBuildSpec = , artifacts : List Artifacts.Type , debVersion : DebianVersions.DebVersion , profile : Profiles.Type - , networks : List Network.Type + , network : Network.Type , buildFlags : BuildFlags.Type , toolchainSelectMode : Toolchain.SelectionMode , mode : PipelineMode.Type @@ -54,7 +54,7 @@ let MinaBuildSpec = , debVersion = DebianVersions.DebVersion.Bullseye , profile = Profiles.Type.Standard , buildFlags = BuildFlags.Type.None - , networks = [ Network.Type.Berkeley ] + , network = Network.Type.Devnet , toolchainSelectMode = Toolchain.SelectionMode.ByDebian , mode = PipelineMode.Type.PullRequest , tags = [ PipelineTag.Type.Long, PipelineTag.Type.Release ] @@ -63,6 +63,30 @@ let MinaBuildSpec = } } +let labelSuffix + : MinaBuildSpec.Type -> Text + = \(spec : MinaBuildSpec.Type) + -> "${DebianVersions.capitalName + spec.debVersion} ${Network.capitalName + spec.network} ${Profiles.toSuffixUppercase + spec.profile} ${BuildFlags.toSuffixUppercase + spec.buildFlags}" + +let nameSuffix + : MinaBuildSpec.Type -> Text + = \(spec : MinaBuildSpec.Type) + -> "${DebianVersions.capitalName + spec.debVersion}${Network.capitalName + spec.network}${Profiles.toSuffixUppercase + spec.profile}${BuildFlags.toSuffixUppercase + spec.buildFlags}" + +let keySuffix + : MinaBuildSpec.Type -> Text + = \(spec : MinaBuildSpec.Type) + -> "${Profiles.toLabelSegment spec.profile}${BuildFlags.toLabelSegment + spec.buildFlags}" + let build_artifacts : MinaBuildSpec.Type -> Command.Type = \(spec : MinaBuildSpec.Type) @@ -79,22 +103,18 @@ let build_artifacts , "MINA_COMMIT_SHA1=\$BUILDKITE_COMMIT" , "MINA_DEB_CODENAME=${DebianVersions.lowerName spec.debVersion}" - , Network.foldMinaBuildMainnetEnv spec.networks + , Network.buildMainnetEnv spec.network ] # BuildFlags.buildEnvs spec.buildFlags ) "./buildkite/scripts/build-release.sh ${Artifacts.toDebianNames spec.artifacts - spec.networks}" + spec.network}" # [ Cmd.run "./buildkite/scripts/debian/upload-to-gs.sh ${DebianVersions.lowerName spec.debVersion}" ] - , label = - "Build Mina for ${DebianVersions.capitalName - spec.debVersion} ${Profiles.toSuffixUppercase - spec.profile} ${BuildFlags.toSuffixUppercase - spec.buildFlags}" + , label = "Debian: Build ${labelSuffix spec}" , key = "build-deb-pkg" , target = Size.XLarge , retries = @@ -145,123 +165,97 @@ let docker_step DebianVersions.dependsOnStep (Some spec.prefix) spec.debVersion + spec.network spec.profile spec.buildFlags step_dep_name in merge { Daemon = - Prelude.List.map - Network.Type - DockerImage.ReleaseSpec.Type - ( \(n : Network.Type) - -> DockerImage.ReleaseSpec::{ - , deps = deps - , service = - Artifacts.dockerName Artifacts.Type.Daemon - , network = Network.lowerName n - , deb_codename = - "${DebianVersions.lowerName spec.debVersion}" - , deb_profile = spec.profile - , build_flags = spec.buildFlags - , deb_repo = DebianRepo.Type.Local - , step_key = - "daemon-${Network.lowerName - n}-${DebianVersions.lowerName - spec.debVersion}${Profiles.toLabelSegment - spec.profile}${BuildFlags.toLabelSegment - spec.buildFlags}-docker-image" - } - ) - spec.networks + [ DockerImage.ReleaseSpec::{ + , deps = deps + , service = Artifacts.Type.Daemon + , network = Network.lowerName spec.network + , deb_codename = spec.debVersion + , deb_profile = spec.profile + , build_flags = spec.buildFlags + , deb_repo = DebianRepo.Type.Local + } + ] , TestExecutive = [] : List DockerImage.ReleaseSpec.Type , LogProc = [] : List DockerImage.ReleaseSpec.Type + , Toolchain = + [ DockerImage.ReleaseSpec::{ + , service = Artifacts.Type.Toolchain + , network = Network.lowerName Network.Type.Devnet + , deb_codename = spec.debVersion + , deb_profile = spec.profile + , build_flags = spec.buildFlags + , deb_repo = DebianRepo.Type.Local + } + ] + , ItnOrchestrator = + [ DockerImage.ReleaseSpec::{ + , service = Artifacts.Type.ItnOrchestrator + , network = Network.lowerName Network.Type.Devnet + , deb_repo = DebianRepo.Type.Local + } + ] + , Leaderboard = + [ DockerImage.ReleaseSpec::{ + , service = Artifacts.Type.Leaderboard + } + ] , BatchTxn = [ DockerImage.ReleaseSpec::{ , deps = deps - , service = "mina-batch-txn" - , network = "berkeley" - , deb_codename = - "${DebianVersions.lowerName spec.debVersion}" + , service = Artifacts.Type.BatchTxn + , network = Network.lowerName spec.network + , deb_codename = spec.debVersion , deb_profile = spec.profile , build_flags = spec.buildFlags , deb_repo = DebianRepo.Type.Local - , step_key = - "batch-txn-${DebianVersions.lowerName - spec.debVersion}${BuildFlags.toLabelSegment - spec.buildFlags}--docker-image" } ] , Archive = [ DockerImage.ReleaseSpec::{ , deps = deps - , service = "mina-archive" - , deb_codename = - "${DebianVersions.lowerName spec.debVersion}" + , service = Artifacts.Type.Archive + , deb_codename = spec.debVersion , deb_profile = spec.profile , build_flags = spec.buildFlags , deb_repo = DebianRepo.Type.Local - , step_key = - "archive-${DebianVersions.lowerName - spec.debVersion}${Profiles.toLabelSegment - spec.profile}${BuildFlags.toLabelSegment - spec.buildFlags}-docker-image" } ] , Rosetta = - Prelude.List.map - Network.Type - DockerImage.ReleaseSpec.Type - ( \(n : Network.Type) - -> DockerImage.ReleaseSpec::{ - , deps = deps - , service = - Artifacts.dockerName Artifacts.Type.Rosetta - , network = Network.lowerName n - , deb_codename = - "${DebianVersions.lowerName spec.debVersion}" - , deb_profile = spec.profile - , build_flags = spec.buildFlags - , deb_repo = DebianRepo.Type.Local - , step_key = - "rosetta-${Network.lowerName - n}-${DebianVersions.lowerName - spec.debVersion}${BuildFlags.toLabelSegment - spec.buildFlags}-docker-image" - } - ) - spec.networks + [ DockerImage.ReleaseSpec::{ + , deps = deps + , service = Artifacts.Type.Rosetta + , network = Network.lowerName spec.network + , deb_codename = spec.debVersion + , deb_profile = spec.profile + , deb_repo = DebianRepo.Type.Local + } + ] , ZkappTestTransaction = [ DockerImage.ReleaseSpec::{ , deps = deps - , service = "mina-zkapp-test-transaction" + , service = Artifacts.Type.ZkappTestTransaction , build_flags = spec.buildFlags , deb_repo = DebianRepo.Type.Local , deb_profile = spec.profile - , deb_codename = - "${DebianVersions.lowerName spec.debVersion}" - , step_key = - "zkapp-test-transaction-${DebianVersions.lowerName - spec.debVersion}${Profiles.toLabelSegment - spec.profile}${BuildFlags.toLabelSegment - spec.buildFlags}--docker-image" + , deb_codename = spec.debVersion } ] , FunctionalTestSuite = [ DockerImage.ReleaseSpec::{ , deps = deps - , service = "mina-test-suite" - , deb_codename = - "${DebianVersions.lowerName spec.debVersion}" + , service = Artifacts.Type.FunctionalTestSuite + , network = Network.lowerName Network.Type.Devnet + , deb_codename = spec.debVersion , build_flags = spec.buildFlags , deb_repo = DebianRepo.Type.Local , deb_profile = spec.profile - , step_key = - "functional_test_suite-${DebianVersions.lowerName - spec.debVersion}${Profiles.toLabelSegment - spec.profile}${BuildFlags.toLabelSegment - spec.buildFlags}-docker-image" - , network = "berkeley" } ] } @@ -304,11 +298,7 @@ let pipelineBuilder , spec = JobSpec::{ , dirtyWhen = DebianVersions.dirtyWhen spec.debVersion , path = "Release" - , name = - "${spec.prefix}${DebianVersions.capitalName - spec.debVersion}${Profiles.toSuffixUppercase - spec.profile}${BuildFlags.toSuffixUppercase - spec.buildFlags}" + , name = "${spec.prefix}${nameSuffix spec}" , tags = spec.tags , mode = spec.mode } @@ -326,6 +316,7 @@ let onlyDebianPipeline ( DebianVersions.dependsOnStep (Some spec.prefix) spec.debVersion + spec.network spec.profile spec.buildFlags "build" @@ -341,4 +332,6 @@ in { pipeline = pipeline , onlyDebianPipeline = onlyDebianPipeline , publishToDebian = publish_to_debian_repo , MinaBuildSpec = MinaBuildSpec + , labelSuffix = labelSuffix + , keySuffix = keySuffix } diff --git a/buildkite/src/Command/PromotePackage.dhall b/buildkite/src/Command/PromotePackage.dhall new file mode 100644 index 00000000000..5ed52c22d9b --- /dev/null +++ b/buildkite/src/Command/PromotePackage.dhall @@ -0,0 +1,305 @@ +let B = ../External/Buildkite.dhall + +let B/If = B.definitions/commandStep/properties/if/Type + +let Prelude = ../External/Prelude.dhall + +let List/map = Prelude.List.map + +let Package = ../Constants/DebianPackage.dhall + +let Network = ../Constants/Network.dhall + +let PipelineMode = ../Pipeline/Mode.dhall + +let PipelineTag = ../Pipeline/Tag.dhall + +let Pipeline = ../Pipeline/Dsl.dhall + +let JobSpec = ../Pipeline/JobSpec.dhall + +let DebianChannel = ../Constants/DebianChannel.dhall + +let Profiles = ../Constants/Profiles.dhall + +let Artifact = ../Constants/Artifacts.dhall + +let DebianVersions = ../Constants/DebianVersions.dhall + +let Toolchain = ../Constants/Toolchain.dhall + +let Command = ./Base.dhall + +let Size = ./Size.dhall + +let Cmd = ../Lib/Cmds.dhall + +let PromoteDebianSpec = + { Type = + { deps : List Command.TaggedKey.Type + , package : Package.Type + , version : Text + , new_version : Text + , architecture : Text + , network : Network.Type + , codename : DebianVersions.DebVersion + , from_channel : DebianChannel.Type + , to_channel : DebianChannel.Type + , profile : Profiles.Type + , remove_profile_from_name : Bool + , step_key : Text + , if : Optional B/If + } + , default = + { deps = [] : List Command.TaggedKey.Type + , package = Package.Type.LogProc + , version = "" + , new_version = "" + , architecture = "amd64" + , network = Network.Type.Devnet + , codename = DebianVersions.DebVersion.Bullseye + , from_channel = DebianChannel.Type.Unstable + , to_channel = DebianChannel.Type.Develop + , profile = Profiles.Type.Standard + , remove_profile_from_name = False + , step_key = "promote-debian-package" + , if = None B/If + } + } + +let PromoteDockerSpec = + { Type = + { deps : List Command.TaggedKey.Type + , name : Artifact.Type + , version : Text + , profile : Profiles.Type + , codename : DebianVersions.DebVersion + , new_tag : Text + , network : Network.Type + , step_key : Text + , if : Optional B/If + , publish : Bool + , remove_profile_from_name : Bool + } + , default = + { deps = [] : List Command.TaggedKey.Type + , name = Artifact.Type.Daemon + , version = "" + , new_tag = "" + , step_key = "promote-docker" + , profile = Profiles.Type.Standard + , network = Network.Type.Devnet + , codename = DebianVersions.DebVersion.Bullseye + , if = None B/If + , publish = False + , remove_profile_from_name = False + } + } + +let promoteDebianStep = + \(spec : PromoteDebianSpec.Type) + -> let package_name + : Text + = Package.debianName spec.package spec.profile spec.network + + let new_name = + if spec.remove_profile_from_name + + then "--new-name ${Package.debianName + spec.package + Profiles.Type.Standard + spec.network}" + + else "" + + in Command.build + Command.Config::{ + , commands = + Toolchain.runner + DebianVersions.DebVersion.Bullseye + [ "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY" ] + "./buildkite/scripts/promote-deb.sh --package ${package_name} --version ${spec.version} --new-version ${spec.new_version} --architecture ${spec.architecture} --codename ${DebianVersions.lowerName + spec.codename} --from-component ${DebianChannel.lowerName + spec.from_channel} --to-component ${DebianChannel.lowerName + spec.to_channel} ${new_name}" + , label = "Debian: ${spec.step_key}" + , key = spec.step_key + , target = Size.XLarge + , depends_on = spec.deps + , if = spec.if + } + +let promoteDebianVerificationStep = + \(spec : PromoteDebianSpec.Type) + -> let name = + if spec.remove_profile_from_name + + then "${Package.debianName + spec.package + Profiles.Type.Standard + spec.network}" + + else Package.debianName spec.package spec.profile spec.network + + in Command.build + Command.Config::{ + , commands = + [ Cmd.run + "./scripts/debian/verify.sh --package ${name} --version ${spec.new_version} --codename ${DebianVersions.lowerName + spec.codename} --channel ${DebianChannel.lowerName + spec.to_channel}" + ] + , label = "Debian: ${spec.step_key}" + , key = spec.step_key + , target = Size.Small + , depends_on = spec.deps + , if = spec.if + } + +let promoteDockerStep = + \(spec : PromoteDockerSpec.Type) + -> let old_tag = + Artifact.dockerTag + spec.name + spec.version + spec.codename + spec.profile + spec.network + False + + let new_tag = + Artifact.dockerTag + spec.name + spec.new_tag + spec.codename + spec.profile + spec.network + spec.remove_profile_from_name + + let publish = if spec.publish then "-p" else "" + + in Command.build + Command.Config::{ + , commands = + [ Cmd.run + "./buildkite/scripts/promote-docker.sh --name ${Artifact.dockerName + spec.name} --version ${old_tag} --tag ${new_tag} ${publish}" + ] + , label = "Docker: ${spec.step_key}" + , key = spec.step_key + , target = Size.XLarge + , depends_on = spec.deps + , if = spec.if + } + +let promoteDockerVerificationStep = + \(spec : PromoteDockerSpec.Type) + -> let new_tag = + Artifact.dockerTag + spec.name + spec.new_tag + spec.codename + spec.profile + spec.network + spec.remove_profile_from_name + + let repo = + if spec.publish + + then "docker.io/minaprotocol" + + else "gcr.io/o1labs-192920" + + in Command.build + Command.Config::{ + , commands = + [ Cmd.run + "docker pull ${repo}/${Artifact.dockerName + spec.name}:${new_tag}" + ] + , label = "Docker: ${spec.step_key}" + , key = spec.step_key + , target = Size.Small + , depends_on = spec.deps + , if = spec.if + } + +let promotePipeline + : List PromoteDebianSpec.Type + -> List PromoteDockerSpec.Type + -> DebianVersions.DebVersion + -> PipelineMode.Type + -> Pipeline.Config.Type + = \(debians_spec : List PromoteDebianSpec.Type) + -> \(dockers_spec : List PromoteDockerSpec.Type) + -> \(debVersion : DebianVersions.DebVersion) + -> \(mode : PipelineMode.Type) + -> let steps = + List/map + PromoteDebianSpec.Type + Command.Type + (\(spec : PromoteDebianSpec.Type) -> promoteDebianStep spec) + debians_spec + # List/map + PromoteDockerSpec.Type + Command.Type + (\(spec : PromoteDockerSpec.Type) -> promoteDockerStep spec) + dockers_spec + + in Pipeline.Config::{ + , spec = JobSpec::{ + , dirtyWhen = DebianVersions.dirtyWhen debVersion + , path = "Release" + , name = "PromotePackage" + , tags = [] : List PipelineTag.Type + , mode = mode + } + , steps = steps + } + +let verifyPipeline + : List PromoteDebianSpec.Type + -> List PromoteDockerSpec.Type + -> DebianVersions.DebVersion + -> PipelineMode.Type + -> Pipeline.Config.Type + = \(debians_spec : List PromoteDebianSpec.Type) + -> \(dockers_spec : List PromoteDockerSpec.Type) + -> \(debVersion : DebianVersions.DebVersion) + -> \(mode : PipelineMode.Type) + -> let steps = + List/map + PromoteDebianSpec.Type + Command.Type + ( \(spec : PromoteDebianSpec.Type) + -> promoteDebianVerificationStep spec + ) + debians_spec + # List/map + PromoteDockerSpec.Type + Command.Type + ( \(spec : PromoteDockerSpec.Type) + -> promoteDockerVerificationStep spec + ) + dockers_spec + + in Pipeline.Config::{ + , spec = JobSpec::{ + , dirtyWhen = DebianVersions.dirtyWhen debVersion + , path = "Release" + , name = "VerifyPackage" + , tags = [] : List PipelineTag.Type + , mode = mode + } + , steps = steps + } + +in { promoteDebianStep = promoteDebianStep + , promoteDockerStep = promoteDockerStep + , promoteDebianVerificationStep = promoteDebianVerificationStep + , promoteDockerVerificationStep = promoteDockerVerificationStep + , promotePipeline = promotePipeline + , verifyPipeline = verifyPipeline + , PromoteDebianSpec = PromoteDebianSpec + , PromoteDockerSpec = PromoteDockerSpec + } diff --git a/buildkite/src/Command/Promotion/PromoteDebian.dhall b/buildkite/src/Command/Promotion/PromoteDebian.dhall index 487e5d09720..dd9f3f65f2b 100644 --- a/buildkite/src/Command/Promotion/PromoteDebian.dhall +++ b/buildkite/src/Command/Promotion/PromoteDebian.dhall @@ -44,7 +44,7 @@ let PromoteDebianSpec = , version = "\\\\\$MINA_DEB_VERSION" , new_version = "\\\\\$MINA_DEB_VERSION" , architecture = "amd64" - , network = Network.Type.Berkeley + , network = Network.Type.Devnet , codename = DebianVersions.DebVersion.Bullseye , from_channel = DebianChannel.Type.Unstable , to_channel = DebianChannel.Type.Compatible diff --git a/buildkite/src/Command/Promotion/PromoteDocker.dhall b/buildkite/src/Command/Promotion/PromoteDocker.dhall index cbc60627dc8..7e56225d5ef 100644 --- a/buildkite/src/Command/Promotion/PromoteDocker.dhall +++ b/buildkite/src/Command/Promotion/PromoteDocker.dhall @@ -41,7 +41,7 @@ let PromoteDockerSpec = , new_tags = [] : List Text , step_key = "promote-docker" , profile = Profiles.Type.Standard - , network = Network.Type.Berkeley + , network = Network.Type.Devnet , codename = DebianVersions.DebVersion.Bullseye , if = None B/If , publish = False diff --git a/buildkite/src/Command/Rosetta/Connectivity.dhall b/buildkite/src/Command/Rosetta/Connectivity.dhall index 9a62c3b8209..0335aeeced1 100644 --- a/buildkite/src/Command/Rosetta/Connectivity.dhall +++ b/buildkite/src/Command/Rosetta/Connectivity.dhall @@ -37,11 +37,11 @@ let Spec = } , default = { dockerType = Dockers.Type.Bullseye - , network = Network.Type.Berkeley + , network = Network.Type.Devnet , mode = PipelineMode.Type.Stable , additionalDirtyWhen = [] : List S.Type , softFail = B/SoftFail.Boolean False - , timeout = 900 + , timeout = 1000 } } @@ -67,10 +67,9 @@ let command , target = Size.XLarge , soft_fail = Some spec.softFail , depends_on = - Dockers.dependsOnStep + Dockers.dependsOn spec.dockerType - "MinaArtifactMainnet" - (Some spec.network) + spec.network Profiles.Type.Standard Artifacts.Type.Rosetta } diff --git a/buildkite/src/Command/RunWithPostgres.dhall b/buildkite/src/Command/RunWithPostgres.dhall index b6279112a23..1c10cae985e 100644 --- a/buildkite/src/Command/RunWithPostgres.dhall +++ b/buildkite/src/Command/RunWithPostgres.dhall @@ -4,12 +4,12 @@ let P = Prelude let Text/concatMap = P.Text.concatMap +let Cmd = ../Lib/Cmds.dhall + let Optional/map = Prelude.Optional.map let Optional/default = Prelude.Optional.default -let Cmd = ../Lib/Cmds.dhall - let ContainerImages = ../Constants/ContainerImages.dhall let Artifacts = ../Constants/Artifacts.dhall diff --git a/buildkite/src/Constants/Artifacts.dhall b/buildkite/src/Constants/Artifacts.dhall index b41f52cf28c..673b14c3808 100644 --- a/buildkite/src/Constants/Artifacts.dhall +++ b/buildkite/src/Constants/Artifacts.dhall @@ -18,6 +18,9 @@ let Artifact | Rosetta | ZkappTestTransaction | FunctionalTestSuite + | Toolchain + | ItnOrchestrator + | Leaderboard > let AllButTests = @@ -33,7 +36,13 @@ let AllButTests = let Main = [ Artifact.Daemon, Artifact.LogProc, Artifact.Archive, Artifact.Rosetta ] -let All = AllButTests # [ Artifact.FunctionalTestSuite ] +let All = + AllButTests + # [ Artifact.FunctionalTestSuite + , Artifact.Toolchain + , Artifact.ItnOrchestrator + , Artifact.Leaderboard + ] let capitalName = \(artifact : Artifact) @@ -46,6 +55,9 @@ let capitalName = , Rosetta = "Rosetta" , ZkappTestTransaction = "ZkappTestTransaction" , FunctionalTestSuite = "FunctionalTestSuite" + , Toolchain = "Toolchain" + , ItnOrchestrator = "ItnOrchestrator" + , Leaderboard = "Leaderboard" } artifact @@ -60,6 +72,9 @@ let lowerName = , Rosetta = "rosetta" , ZkappTestTransaction = "zkapp_test_transaction" , FunctionalTestSuite = "functional_test_suite" + , Toolchain = "toolchain" + , ItnOrchestrator = "itnOrchestrator" + , Leaderboard = "leaderboard" } artifact @@ -74,6 +89,9 @@ let dockerName = , Rosetta = "mina-rosetta" , ZkappTestTransaction = "mina-zkapp-test-transaction" , FunctionalTestSuite = "mina-test-suite" + , Toolchain = "mina-toolchain" + , ItnOrchestrator = "itn-orchestrator" + , Leaderboard = "leaderboard" } artifact @@ -89,38 +107,32 @@ let toDebianName = , Rosetta = "rosetta_${Network.lowerName network}" , ZkappTestTransaction = "zkapp_test_transaction" , FunctionalTestSuite = "functional_test_suite" + , Toolchain = "" + , ItnOrchestrator = "" + , Leaderboard = "" } artifact let toDebianNames = \(artifacts : List Artifact) - -> \(networks : List Network.Type) + -> \(network : Network.Type) -> let list_of_list_of_debians = Prelude.List.map Artifact (List Text) ( \(a : Artifact) -> merge - { Daemon = - Prelude.List.map - Network.Type - Text - (\(n : Network.Type) -> toDebianName a n) - networks + { Daemon = [ toDebianName a network ] , Archive = [ "archive" ] , LogProc = [ "logproc" ] , TestExecutive = [ "test_executive" ] , BatchTxn = [ "batch_txn" ] - , Rosetta = - Prelude.List.map - Network.Type - Text - ( \(n : Network.Type) - -> "rosetta_${Network.lowerName n}" - ) - networks + , Rosetta = [ toDebianName a network ] , ZkappTestTransaction = [ "zkapp_test_transaction" ] , FunctionalTestSuite = [ "functional_test_suite" ] + , Toolchain = [] : List Text + , ItnOrchestrator = [] : List Text + , Leaderboard = [] : List Text } a ) @@ -165,6 +177,9 @@ let dockerTag = "${version_and_codename}-${Network.lowerName network}" , ZkappTestTransaction = "${version_and_codename}" , FunctionalTestSuite = "${version_and_codename}" + , Toolchain = "${version_and_codename}" + , ItnOrchestrator = "${version_and_codename}" + , Leaderboard = "${version_and_codename}" } artifact diff --git a/buildkite/src/Constants/ContainerImages.dhall b/buildkite/src/Constants/ContainerImages.dhall index b42dfd5ecae..463af9f56a4 100644 --- a/buildkite/src/Constants/ContainerImages.dhall +++ b/buildkite/src/Constants/ContainerImages.dhall @@ -4,11 +4,11 @@ -- NOTE: minaToolchainBookworm is also used for building Ubuntu Jammy packages in CI { toolchainBase = "codaprotocol/ci-toolchain-base:v3" , minaToolchainBullseye = - "gcr.io/o1labs-192920/mina-toolchain@sha256:fee11e64a54fd8f026c4632fed7b7b9835b8262a037cdb156deb61d3d0aac8b2" + "gcr.io/o1labs-192920/mina-toolchain@sha256:de33ba62503099b76dbdd936a65ebc50128238deb88e573cd6fee49ec403ae2d" , minaToolchainBookworm = - "gcr.io/o1labs-192920/mina-toolchain@sha256:fee11e64a54fd8f026c4632fed7b7b9835b8262a037cdb156deb61d3d0aac8b2" + "gcr.io/o1labs-192920/mina-toolchain@sha256:de33ba62503099b76dbdd936a65ebc50128238deb88e573cd6fee49ec403ae2d" , minaToolchain = - "gcr.io/o1labs-192920/mina-toolchain@sha256:fee11e64a54fd8f026c4632fed7b7b9835b8262a037cdb156deb61d3d0aac8b2" + "gcr.io/o1labs-192920/mina-toolchain@sha256:de33ba62503099b76dbdd936a65ebc50128238deb88e573cd6fee49ec403ae2d" , elixirToolchain = "elixir:1.10-alpine" , nodeToolchain = "node:14.13.1-stretch-slim" , ubuntu2004 = "ubuntu:20.04" diff --git a/buildkite/src/Constants/DebianVersions.dhall b/buildkite/src/Constants/DebianVersions.dhall index 138a0533803..e62660a0316 100644 --- a/buildkite/src/Constants/DebianVersions.dhall +++ b/buildkite/src/Constants/DebianVersions.dhall @@ -4,6 +4,8 @@ let Optional/default = Prelude.Optional.default let Profiles = ./Profiles.dhall +let Network = ./Network.dhall + let BuildFlags = ./BuildFlags.dhall let S = ../Lib/SelectFiles.dhall @@ -33,6 +35,7 @@ let lowerName = let dependsOnStep = \(prefix : Optional Text) -> \(debVersion : DebVersion) + -> \(network : Network.Type) -> \(profile : Profiles.Type) -> \(buildFlag : BuildFlags.Type) -> \(step : Text) @@ -40,47 +43,28 @@ let dependsOnStep = let prefix = Optional/default Text "MinaArtifact" prefix + let name = + "${prefix}${capitalName + debVersion}${Network.capitalName + network}${profileSuffix}${BuildFlags.toSuffixUppercase + buildFlag}" + in merge - { Bookworm = - [ { name = - "${prefix}${profileSuffix}${BuildFlags.toSuffixUppercase - buildFlag}" - , key = "${step}-deb-pkg" - } - ] - , Bullseye = - [ { name = - "${prefix}${capitalName - debVersion}${profileSuffix}${BuildFlags.toSuffixUppercase - buildFlag}" - , key = "${step}-deb-pkg" - } - ] - , Jammy = - [ { name = - "${prefix}${capitalName - debVersion}${profileSuffix}${BuildFlags.toSuffixUppercase - buildFlag}" - , key = "${step}-deb-pkg" - } - ] - , Focal = - [ { name = - "${prefix}${capitalName - debVersion}${profileSuffix}${BuildFlags.toSuffixUppercase - buildFlag}" - , key = "${step}-deb-pkg" - } - ] + { Bookworm = [ { name = name, key = "${step}-deb-pkg" } ] + , Bullseye = [ { name = name, key = "${step}-deb-pkg" } ] + , Jammy = [ { name = name, key = "${step}-deb-pkg" } ] + , Focal = [ { name = name, key = "${step}-deb-pkg" } ] } debVersion let dependsOn = \(debVersion : DebVersion) + -> \(network : Network.Type) -> \(profile : Profiles.Type) -> dependsOnStep (None Text) debVersion + network profile BuildFlags.Type.None "build" @@ -94,10 +78,8 @@ let minimalDirtyWhen = , S.exactly "buildkite/src/Command/ReplayerTest" "dhall" , S.strictlyStart (S.contains "buildkite/src/Jobs/Release/MinaArtifact") , S.strictlyStart (S.contains "dockerfiles/stages") - , S.exactly "scripts/debian/build" "sh" - , S.exactly "scripts/debian/builder-helpers" "sh" - , S.exactly "scripts/docker/release" "sh" - , S.exactly "scripts/docker/build" "sh" + , S.strictlyStart (S.contains "scripts/debian") + , S.strictlyStart (S.contains "scripts/docker") , S.exactly "buildkite/scripts/build-artifact" "sh" , S.exactly "buildkite/scripts/build-hardfork-package" "sh" , S.exactly "buildkite/scripts/check-compatibility" "sh" @@ -111,7 +93,7 @@ let bullseyeDirtyWhen = [ S.strictlyStart (S.contains "src") , S.strictlyStart (S.contains "automation") , S.strictly (S.contains "Makefile") - , S.exactly "buildkite/scripts/connect-to-berkeley" "sh" + , S.exactly "buildkite/scripts/connect-to-testnet" "sh" , S.exactly "buildkite/scripts/connect-to-mainnet-on-compatible" "sh" , S.exactly "buildkite/scripts/rosetta-integration-tests" "sh" , S.exactly "buildkite/scripts/rosetta-integration-tests-full" "sh" diff --git a/buildkite/src/Constants/DockerVersions.dhall b/buildkite/src/Constants/DockerVersions.dhall index b700603b17d..eb2dfeb9600 100644 --- a/buildkite/src/Constants/DockerVersions.dhall +++ b/buildkite/src/Constants/DockerVersions.dhall @@ -1,9 +1,3 @@ -let Prelude = ../External/Prelude.dhall - -let Optional/map = Prelude.Optional.map - -let Optional/default = Prelude.Optional.default - let Profiles = ./Profiles.dhall let Artifacts = ./Artifacts.dhall @@ -37,44 +31,45 @@ let lowerName = let dependsOnStep = \(docker : Docker) -> \(prefix : Text) - -> \(network : Optional Network.Type) + -> \(network : Network.Type) -> \(profile : Profiles.Type) -> \(binary : Artifacts.Type) - -> let profileSuffix = Profiles.toSuffixUppercase profile + -> let network = "${Network.capitalName network}" - let suffix = "docker-image" - - let maybeNetwork = - Optional/map - Network.Type - Text - (\(network : Network.Type) -> "-${Network.lowerName network}") - network + let profileSuffix = "${Profiles.toSuffixUppercase profile}" - let networkOrDefault = Optional/default Text "" maybeNetwork + let suffix = "docker-image" - let key = - "${Artifacts.lowerName - binary}${networkOrDefault}-${lowerName docker}-${suffix}" + let key = "${Artifacts.lowerName binary}-${suffix}" in merge { Bookworm = - [ { name = "${prefix}${capitalName docker}${profileSuffix}" + [ { name = + "${prefix}${capitalName + docker}${network}${profileSuffix}" , key = key } ] , Bullseye = - [ { name = "${prefix}${capitalName docker}${profileSuffix}" + [ { name = + "${prefix}${capitalName + docker}${network}${profileSuffix}" , key = key } ] , Jammy = - [ { name = "${prefix}${capitalName docker}${profileSuffix}" + [ { name = + "${prefix}${capitalName + docker}${network}${capitalName + docker}${profileSuffix}" , key = key } ] , Focal = - [ { name = "${prefix}${capitalName docker}${profileSuffix}" + [ { name = + "${prefix}${capitalName + docker}${network}${capitalName + docker}${profileSuffix}" , key = key } ] @@ -83,7 +78,7 @@ let dependsOnStep = let dependsOn = \(docker : Docker) - -> \(network : Optional Network.Type) + -> \(network : Network.Type) -> \(profile : Profiles.Type) -> \(binary : Artifacts.Type) -> dependsOnStep docker "MinaArtifact" network profile binary diff --git a/buildkite/src/Constants/Network.dhall b/buildkite/src/Constants/Network.dhall index 92462c87ae3..86094577017 100644 --- a/buildkite/src/Constants/Network.dhall +++ b/buildkite/src/Constants/Network.dhall @@ -4,23 +4,18 @@ let List/any = Prelude.List.any let Network : Type - = < Devnet | Mainnet | Berkeley > + = < Devnet | Mainnet > let capitalName = \(network : Network) - -> merge - { Devnet = "Devnet", Mainnet = "Mainnet", Berkeley = "Berkeley" } - network + -> merge { Devnet = "Devnet", Mainnet = "Mainnet" } network let lowerName = \(network : Network) - -> merge - { Devnet = "devnet", Mainnet = "mainnet", Berkeley = "berkeley" } - network + -> merge { Devnet = "devnet", Mainnet = "mainnet" } network let requiresMainnetBuild = - \(network : Network) - -> merge { Devnet = True, Mainnet = True, Berkeley = False } network + \(network : Network) -> merge { Devnet = False, Mainnet = True } network let foldMinaBuildMainnetEnv = \(networks : List Network) @@ -30,9 +25,28 @@ let foldMinaBuildMainnetEnv = else "MINA_BUILD_MAINNET=false" +let buildMainnetEnv = + \(network : Network) + -> if requiresMainnetBuild network + + then "MINA_BUILD_MAINNET=true" + + else "MINA_BUILD_MAINNET=false" + +let foldNames = + \(networks : List Network) + -> Prelude.List.fold + Network + networks + Text + (\(x : Network) -> \(y : Text) -> "${capitalName x}" ++ y) + "" + in { Type = Network , capitalName = capitalName , lowerName = lowerName , requiresMainnetBuild = requiresMainnetBuild , foldMinaBuildMainnetEnv = foldMinaBuildMainnetEnv + , buildMainnetEnv = buildMainnetEnv + , foldNames = foldNames } diff --git a/buildkite/src/Jobs/Lint/Merge.dhall b/buildkite/src/Jobs/Lint/Merge.dhall index 660027486f0..a2bb91b05a8 100644 --- a/buildkite/src/Jobs/Lint/Merge.dhall +++ b/buildkite/src/Jobs/Lint/Merge.dhall @@ -73,19 +73,6 @@ in Pipeline.build , image = (../../Constants/ContainerImages.dhall).toolchainBase } } - , Command.build - Command.Config::{ - , commands = - [ Cmd.run "scripts/merged-to-proof-systems.sh berkeley" ] - , label = - "[proof-systems] Check merges cleanly into proof-systems berkeley branch" - , key = "merged-to-proof-systems-berkeley" - , soft_fail = Some (B/SoftFail.Boolean True) - , target = Size.Multi - , docker = Some Docker::{ - , image = (../../Constants/ContainerImages.dhall).toolchainBase - } - } , Command.build Command.Config::{ , commands = diff --git a/buildkite/src/Jobs/Release/ItnOrchestratorArtifact.dhall b/buildkite/src/Jobs/Release/ItnOrchestratorArtifact.dhall deleted file mode 100644 index 5c88037f8d1..00000000000 --- a/buildkite/src/Jobs/Release/ItnOrchestratorArtifact.dhall +++ /dev/null @@ -1,46 +0,0 @@ -let S = ../../Lib/SelectFiles.dhall - -let Pipeline = ../../Pipeline/Dsl.dhall - -let PipelineTag = ../../Pipeline/Tag.dhall - -let JobSpec = ../../Pipeline/JobSpec.dhall - -let DockerImage = ../../Command/DockerImage.dhall - -let Profiles = ../../Constants/Profiles.dhall - -let DebianVersions = ../../Constants/DebianVersions.dhall - -let DebianRepo = ../../Constants/DebianRepo.dhall - -let spec = - DockerImage.ReleaseSpec::{ - , service = "itn-orchestrator" - , step_key = "itn-orchestrator-docker-image" - , network = "berkeley" - , deb_repo = DebianRepo.Type.Local - , deps = - DebianVersions.dependsOn - DebianVersions.DebVersion.Bullseye - Profiles.Type.Standard - } - -in Pipeline.build - Pipeline.Config::{ - , spec = JobSpec::{ - , dirtyWhen = - [ S.strictlyStart - (S.contains "buildkite/src/Jobs/Release/ItnOrchestratorArtifact") - , S.strictlyStart (S.contains "src/app/itn_orchestrator") - ] - , path = "Release" - , name = "ItnOrchestratorArtifact" - , tags = - [ PipelineTag.Type.Long - , PipelineTag.Type.Release - , PipelineTag.Type.Stable - ] - } - , steps = [ DockerImage.generateStep spec ] - } diff --git a/buildkite/src/Jobs/Release/MinaArtifactBullseye.dhall b/buildkite/src/Jobs/Release/MinaArtifactBullseyeDevnet.dhall similarity index 100% rename from buildkite/src/Jobs/Release/MinaArtifactBullseye.dhall rename to buildkite/src/Jobs/Release/MinaArtifactBullseyeDevnet.dhall diff --git a/buildkite/src/Jobs/Release/MinaArtifactBullseyeInstrumented.dhall b/buildkite/src/Jobs/Release/MinaArtifactBullseyeDevnetInstrumented.dhall similarity index 100% rename from buildkite/src/Jobs/Release/MinaArtifactBullseyeInstrumented.dhall rename to buildkite/src/Jobs/Release/MinaArtifactBullseyeDevnetInstrumented.dhall diff --git a/buildkite/src/Jobs/Release/MinaArtifactBullseyeLightnet.dhall b/buildkite/src/Jobs/Release/MinaArtifactBullseyeDevnetLightnet.dhall similarity index 100% rename from buildkite/src/Jobs/Release/MinaArtifactBullseyeLightnet.dhall rename to buildkite/src/Jobs/Release/MinaArtifactBullseyeDevnetLightnet.dhall diff --git a/buildkite/src/Jobs/Release/MinaArtifactMainnetBullseye.dhall b/buildkite/src/Jobs/Release/MinaArtifactBullseyeMainnet.dhall similarity index 88% rename from buildkite/src/Jobs/Release/MinaArtifactMainnetBullseye.dhall rename to buildkite/src/Jobs/Release/MinaArtifactBullseyeMainnet.dhall index aa4037d8626..18633217d3c 100644 --- a/buildkite/src/Jobs/Release/MinaArtifactMainnetBullseye.dhall +++ b/buildkite/src/Jobs/Release/MinaArtifactBullseyeMainnet.dhall @@ -21,13 +21,12 @@ in Pipeline.build , Artifacts.Type.Rosetta , Artifacts.Type.ZkappTestTransaction ] - , networks = [ Network.Type.Devnet, Network.Type.Mainnet ] + , network = Network.Type.Mainnet , tags = [ PipelineTag.Type.Long , PipelineTag.Type.Release , PipelineTag.Type.Stable ] , mode = PipelineMode.Type.Stable - , prefix = "MinaArtifactMainnet" } ) diff --git a/buildkite/src/Jobs/Release/MinaArtifactFocal.dhall b/buildkite/src/Jobs/Release/MinaArtifactFocalDevnet.dhall similarity index 100% rename from buildkite/src/Jobs/Release/MinaArtifactFocal.dhall rename to buildkite/src/Jobs/Release/MinaArtifactFocalDevnet.dhall diff --git a/buildkite/src/Jobs/Release/MinaArtifactMainnetFocal.dhall b/buildkite/src/Jobs/Release/MinaArtifactFocalMainnet.dhall similarity index 89% rename from buildkite/src/Jobs/Release/MinaArtifactMainnetFocal.dhall rename to buildkite/src/Jobs/Release/MinaArtifactFocalMainnet.dhall index 82d9d49a532..76829c42836 100644 --- a/buildkite/src/Jobs/Release/MinaArtifactMainnetFocal.dhall +++ b/buildkite/src/Jobs/Release/MinaArtifactFocalMainnet.dhall @@ -24,13 +24,12 @@ in Pipeline.build , Artifacts.Type.ZkappTestTransaction ] , debVersion = DebianVersions.DebVersion.Focal - , networks = [ Network.Type.Devnet, Network.Type.Mainnet ] + , network = Network.Type.Mainnet , tags = [ PipelineTag.Type.Long , PipelineTag.Type.Release , PipelineTag.Type.Stable ] , mode = PipelineMode.Type.Stable - , prefix = "MinaArtifactMainnet" } ) diff --git a/buildkite/src/Jobs/Release/MinaArtifactOnlyDebianBullseye.dhall b/buildkite/src/Jobs/Release/MinaArtifactOnlyDebianBullseyeDevnet.dhall similarity index 100% rename from buildkite/src/Jobs/Release/MinaArtifactOnlyDebianBullseye.dhall rename to buildkite/src/Jobs/Release/MinaArtifactOnlyDebianBullseyeDevnet.dhall diff --git a/buildkite/src/Jobs/Release/MinaToolchainArtifactBullseye.dhall b/buildkite/src/Jobs/Release/MinaToolchainArtifactBullseye.dhall index 86e483e1e31..357da774d05 100644 --- a/buildkite/src/Jobs/Release/MinaToolchainArtifactBullseye.dhall +++ b/buildkite/src/Jobs/Release/MinaToolchainArtifactBullseye.dhall @@ -8,6 +8,10 @@ let JobSpec = ../../Pipeline/JobSpec.dhall let DockerImage = ../../Command/DockerImage.dhall +let DebianVersions = ../../Constants/DebianVersions.dhall + +let Artifacts = ../../Constants/Artifacts.dhall + in Pipeline.build Pipeline.Config::{ , spec = JobSpec::{ @@ -27,10 +31,9 @@ in Pipeline.build , steps = [ let toolchainBullseyeSpec = DockerImage.ReleaseSpec::{ - , service = "mina-toolchain" - , deb_codename = "bullseye" + , service = Artifacts.Type.Toolchain + , deb_codename = DebianVersions.DebVersion.Bullseye , no_cache = True - , step_key = "toolchain-bullseye-docker-image" } in DockerImage.generateStep toolchainBullseyeSpec diff --git a/buildkite/src/Jobs/Release/MinaToolchainArtifactFocal.dhall b/buildkite/src/Jobs/Release/MinaToolchainArtifactFocal.dhall index ab0030f99f4..2ffe0472892 100644 --- a/buildkite/src/Jobs/Release/MinaToolchainArtifactFocal.dhall +++ b/buildkite/src/Jobs/Release/MinaToolchainArtifactFocal.dhall @@ -8,6 +8,10 @@ let JobSpec = ../../Pipeline/JobSpec.dhall let DockerImage = ../../Command/DockerImage.dhall +let DebianVersions = ../../Constants/DebianVersions.dhall + +let Artifacts = ../../Constants/Artifacts.dhall + in Pipeline.build Pipeline.Config::{ , spec = JobSpec::{ @@ -25,14 +29,13 @@ in Pipeline.build , tags = [ PipelineTag.Type.Toolchain ] } , steps = - [ let toolchainSpec = + [ let toolchainBullseyeSpec = DockerImage.ReleaseSpec::{ - , service = "mina-toolchain" - , deb_codename = "focal" + , service = Artifacts.Type.Toolchain + , deb_codename = DebianVersions.DebVersion.Focal , no_cache = True - , step_key = "toolchain-focal-docker-image" } - in DockerImage.generateStep toolchainSpec + in DockerImage.generateStep toolchainBullseyeSpec ] } diff --git a/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall b/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall deleted file mode 100644 index b44d2b6ea96..00000000000 --- a/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall +++ /dev/null @@ -1,48 +0,0 @@ -let JobSpec = ../../Pipeline/JobSpec.dhall - -let Pipeline = ../../Pipeline/Dsl.dhall - -let PipelineTag = ../../Pipeline/Tag.dhall - -let Cmd = ../../Lib/Cmds.dhall - -let S = ../../Lib/SelectFiles.dhall - -let Command = ../../Command/Base.dhall - -let Docker = ../../Command/Docker/Type.dhall - -let Size = ../../Command/Size.dhall - -let dependsOn = - [ { name = "MinaArtifactBullseye" - , key = "daemon-berkeley-bullseye-docker-image" - } - ] - -in Pipeline.build - Pipeline.Config::{ - , spec = JobSpec::{ - , dirtyWhen = - [ S.strictlyStart (S.contains "src") - , S.exactly "buildkite/scripts/check-compatibility" "sh" - , S.exactly "buildkite/src/Jobs/Test/BerkeleyCompatibility" "dhall" - ] - , path = "Test" - , tags = [ PipelineTag.Type.Long, PipelineTag.Type.Test ] - , name = "BerkeleyCompatibility" - } - , steps = - [ Command.build - Command.Config::{ - , commands = - [ Cmd.run "buildkite/scripts/check-compatibility.sh berkeley" ] - , label = "Test: berkeley compatibilty test" - , key = "berkeley-compatibilty-test" - , target = Size.XLarge - , docker = None Docker.Type - , depends_on = dependsOn - , timeout_in_minutes = Some +60 - } - ] - } diff --git a/buildkite/src/Jobs/Test/CheckGraphQLSchema.dhall b/buildkite/src/Jobs/Test/CheckGraphQLSchema.dhall index dee29949cd5..bef4ebb1e47 100644 --- a/buildkite/src/Jobs/Test/CheckGraphQLSchema.dhall +++ b/buildkite/src/Jobs/Test/CheckGraphQLSchema.dhall @@ -12,9 +12,12 @@ let DebianVersions = ../../Constants/DebianVersions.dhall let Profiles = ../../Constants/Profiles.dhall +let Network = ../../Constants/Network.dhall + let dependsOn = DebianVersions.dependsOn DebianVersions.DebVersion.Bullseye + Network.Type.Devnet Profiles.Type.Standard in Pipeline.build diff --git a/buildkite/src/Jobs/Test/ConnectToBerkeley.dhall b/buildkite/src/Jobs/Test/ConnectToDevnet.dhall similarity index 74% rename from buildkite/src/Jobs/Test/ConnectToBerkeley.dhall rename to buildkite/src/Jobs/Test/ConnectToDevnet.dhall index 312e63f9435..526ee022143 100644 --- a/buildkite/src/Jobs/Test/ConnectToBerkeley.dhall +++ b/buildkite/src/Jobs/Test/ConnectToDevnet.dhall @@ -14,18 +14,15 @@ let ConnectToTestnet = ../../Command/ConnectToTestnet.dhall let Profiles = ../../Constants/Profiles.dhall -let Artifacts = ../../Constants/Artifacts.dhall +let DebianVersions = ../../Constants/DebianVersions.dhall let Network = ../../Constants/Network.dhall -let Dockers = ../../Constants/DockerVersions.dhall - let dependsOn = - Dockers.dependsOn - Dockers.Type.Bullseye - (Some Network.Type.Berkeley) + DebianVersions.dependsOn + DebianVersions.DebVersion.Bullseye + Network.Type.Devnet Profiles.Type.Standard - Artifacts.Type.Daemon in Pipeline.build Pipeline.Config::{ @@ -33,17 +30,17 @@ in Pipeline.build , dirtyWhen = [ S.strictlyStart (S.contains "src") , S.exactly "buildkite/scripts/connect-to-testnet" "sh" - , S.exactly "buildkite/src/Jobs/Test/ConnectToBerkeley" "dhall" + , S.exactly "buildkite/src/Jobs/Test/ConnectToDevnet" "dhall" , S.exactly "buildkite/src/Command/ConnectToTestnet" "dhall" ] , path = "Test" - , name = "ConnectToBerkeley" + , name = "ConnectToDevnet" , tags = [ PipelineTag.Type.Long, PipelineTag.Type.Test ] } , steps = [ ConnectToTestnet.step dependsOn - "berkeley" + "${Network.lowerName Network.Type.Devnet}" "40s" "2m" (B/SoftFail.Boolean True) diff --git a/buildkite/src/Jobs/Test/DevelopCompatibility.dhall b/buildkite/src/Jobs/Test/DevelopCompatibility.dhall index 99132224a5b..8bcecf6c27f 100644 --- a/buildkite/src/Jobs/Test/DevelopCompatibility.dhall +++ b/buildkite/src/Jobs/Test/DevelopCompatibility.dhall @@ -14,11 +14,17 @@ let Docker = ../../Command/Docker/Type.dhall let Size = ../../Command/Size.dhall +let DebianVersions = ../../Constants/DebianVersions.dhall + +let Network = ../../Constants/Network.dhall + +let Profiles = ../../Constants/Profiles.dhall + let dependsOn = - [ { name = "MinaArtifactBullseye" - , key = "daemon-berkeley-bullseye-docker-image" - } - ] + DebianVersions.dependsOn + DebianVersions.DebVersion.Bullseye + Network.Type.Devnet + Profiles.Type.Lightnet in Pipeline.build Pipeline.Config::{ diff --git a/buildkite/src/Jobs/Test/LedgerTestApplyTx.dhall b/buildkite/src/Jobs/Test/LedgerTestApplyTx.dhall index c0a4b2c26cc..9cbab00b41b 100644 --- a/buildkite/src/Jobs/Test/LedgerTestApplyTx.dhall +++ b/buildkite/src/Jobs/Test/LedgerTestApplyTx.dhall @@ -18,6 +18,8 @@ let Profiles = ../../Constants/Profiles.dhall let BuildFlags = ../../Constants/BuildFlags.dhall +let Network = ../../Constants/Network.dhall + let Docker = ../../Command/Docker/Type.dhall let Size = ../../Command/Size.dhall @@ -26,12 +28,14 @@ let dependsOn = DebianVersions.dependsOnStep (None Text) DebianVersions.DebVersion.Bullseye + Network.Type.Devnet Profiles.Type.Standard BuildFlags.Type.Instrumented "build" # DebianVersions.dependsOnStep (None Text) DebianVersions.DebVersion.Bullseye + Network.Type.Devnet Profiles.Type.Standard BuildFlags.Type.None "build" diff --git a/buildkite/src/Jobs/Test/PatchArchiveTest.dhall b/buildkite/src/Jobs/Test/PatchArchiveTest.dhall index a0414c85a4f..67cbfc24f21 100644 --- a/buildkite/src/Jobs/Test/PatchArchiveTest.dhall +++ b/buildkite/src/Jobs/Test/PatchArchiveTest.dhall @@ -10,16 +10,16 @@ let PatchArchiveTest = ../../Command/PatchArchiveTest.dhall let Profiles = ../../Constants/Profiles.dhall +let Dockers = ../../Constants/DockerVersions.dhall + let Network = ../../Constants/Network.dhall let Artifacts = ../../Constants/Artifacts.dhall -let Dockers = ../../Constants/DockerVersions.dhall - let dependsOn = Dockers.dependsOn Dockers.Type.Bullseye - (None Network.Type) + Network.Type.Devnet Profiles.Type.Standard Artifacts.Type.FunctionalTestSuite diff --git a/buildkite/src/Jobs/Test/ReplayerTest.dhall b/buildkite/src/Jobs/Test/ReplayerTest.dhall index f9caa4f30a7..45b7840f749 100644 --- a/buildkite/src/Jobs/Test/ReplayerTest.dhall +++ b/buildkite/src/Jobs/Test/ReplayerTest.dhall @@ -19,7 +19,7 @@ let Artifacts = ../../Constants/Artifacts.dhall let dependsOn = Dockers.dependsOn Dockers.Type.Bullseye - (None Network.Type) + Network.Type.Devnet Profiles.Type.Standard Artifacts.Type.FunctionalTestSuite diff --git a/buildkite/src/Jobs/Test/RosettaIntegrationTests.dhall b/buildkite/src/Jobs/Test/RosettaIntegrationTests.dhall index 21397b34be7..21bfdcb7498 100644 --- a/buildkite/src/Jobs/Test/RosettaIntegrationTests.dhall +++ b/buildkite/src/Jobs/Test/RosettaIntegrationTests.dhall @@ -18,14 +18,16 @@ let Profiles = ../../Constants/Profiles.dhall let Dockers = ../../Constants/DockerVersions.dhall -let Artifacts = ../../Constants/Artifacts.dhall +let RunWithPostgres = ../../Command/RunWithPostgres.dhall let Network = ../../Constants/Network.dhall -let RunWithPostgres = ../../Command/RunWithPostgres.dhall +let Artifacts = ../../Constants/Artifacts.dhall let B/SoftFail = B.definitions/commandStep/properties/soft_fail/Type +let network = Network.Type.Devnet + let dirtyWhen = [ S.strictlyStart (S.contains "src") , S.exactly "buildkite/src/Jobs/Test/RosettaIntegrationTests" "dhall" @@ -55,12 +57,13 @@ in Pipeline.build ([] : List Text) "./src/test/archive/sample_db/archive_db.sql" Artifacts.Type.Rosetta - (Some Network.Type.Berkeley) + (Some Network.Type.Devnet) "./buildkite/scripts/rosetta-indexer-test.sh" , Cmd.runInDocker Cmd.Docker::{ , image = - "gcr.io/o1labs-192920/mina-rosetta:\\\${MINA_DOCKER_TAG}-berkeley" + "gcr.io/o1labs-192920/mina-rosetta:\\\${MINA_DOCKER_TAG}-${Network.lowerName + network}" } "buildkite/scripts/rosetta-integration-tests-fast.sh" ] @@ -71,7 +74,7 @@ in Pipeline.build , depends_on = Dockers.dependsOn Dockers.Type.Bullseye - (Some Network.Type.Berkeley) + network Profiles.Type.Standard Artifacts.Type.Rosetta } diff --git a/buildkite/src/Jobs/Test/RosettaIntegrationTestsLong.dhall b/buildkite/src/Jobs/Test/RosettaIntegrationTestsLong.dhall index 9fb8d631225..ab0731cd45e 100644 --- a/buildkite/src/Jobs/Test/RosettaIntegrationTestsLong.dhall +++ b/buildkite/src/Jobs/Test/RosettaIntegrationTestsLong.dhall @@ -20,12 +20,14 @@ let Network = ../../Constants/Network.dhall let Profiles = ../../Constants/Profiles.dhall -let Artifacts = ../../Constants/Artifacts.dhall - let Dockers = ../../Constants/DockerVersions.dhall +let Artifacts = ../../Constants/Artifacts.dhall + let B/SoftFail = B.definitions/commandStep/properties/soft_fail/Type +let network = Network.Type.Devnet + let dirtyWhen = [ S.strictlyStart (S.contains "src") , S.exactly "buildkite/src/Jobs/Test/RosettaIntegrationTests" "dhall" @@ -55,18 +57,20 @@ in Pipeline.build , Cmd.runInDocker Cmd.Docker::{ , image = - "gcr.io/o1labs-192920/mina-rosetta:\\\${MINA_DOCKER_TAG}-berkeley" + "gcr.io/o1labs-192920/mina-rosetta:\\\${MINA_DOCKER_TAG}-${Network.lowerName + network}" } "buildkite/scripts/rosetta-integration-tests-full.sh" ] , label = "Rosetta integration tests Bullseye Long" , key = "rosetta-integration-tests-bullseye-long" , soft_fail = Some (B/SoftFail.Boolean True) + , timeout_in_minutes = Some +90 , target = Size.Small , depends_on = Dockers.dependsOn Dockers.Type.Bullseye - (Some Network.Type.Berkeley) + network Profiles.Type.Standard Artifacts.Type.Rosetta } diff --git a/buildkite/src/Jobs/Test/RunSnarkProfiler.dhall b/buildkite/src/Jobs/Test/RunSnarkProfiler.dhall index 9bfa98eb8a5..599b946a2ad 100644 --- a/buildkite/src/Jobs/Test/RunSnarkProfiler.dhall +++ b/buildkite/src/Jobs/Test/RunSnarkProfiler.dhall @@ -16,11 +16,14 @@ let RunInToolchain = ../../Command/RunInToolchain.dhall let Docker = ../../Command/Docker/Type.dhall +let Network = ../../Constants/Network.dhall + let Size = ../../Command/Size.dhall let dependsOn = DebianVersions.dependsOn DebianVersions.DebVersion.Bullseye + Network.Type.Devnet Profiles.Type.Standard let buildTestCmd diff --git a/buildkite/src/Jobs/Test/SingleNodeTest.dhall b/buildkite/src/Jobs/Test/SingleNodeTest.dhall index 74959dd325a..e5bbae08182 100644 --- a/buildkite/src/Jobs/Test/SingleNodeTest.dhall +++ b/buildkite/src/Jobs/Test/SingleNodeTest.dhall @@ -14,6 +14,8 @@ let DebianVersions = ../../Constants/DebianVersions.dhall let Profiles = ../../Constants/Profiles.dhall +let Network = ../../Constants/Network.dhall + let Docker = ../../Command/Docker/Type.dhall let Size = ../../Command/Size.dhall @@ -21,9 +23,11 @@ let Size = ../../Command/Size.dhall let dependsOn = DebianVersions.dependsOn DebianVersions.DebVersion.Bullseye + Network.Type.Devnet Profiles.Type.Lightnet # DebianVersions.dependsOn DebianVersions.DebVersion.Bullseye + Network.Type.Devnet Profiles.Type.Standard let buildTestCmd diff --git a/buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall b/buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall index 240902fe732..8f09d7ebc18 100644 --- a/buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall +++ b/buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall @@ -21,12 +21,12 @@ let Artifacts = ../../Constants/Artifacts.dhall let dependsOn = Dockers.dependsOn Dockers.Type.Bullseye - (Some Network.Type.Berkeley) + Network.Type.Devnet Profiles.Type.Standard Artifacts.Type.Daemon # Dockers.dependsOn Dockers.Type.Bullseye - (None Network.Type) + Network.Type.Devnet Profiles.Type.Standard Artifacts.Type.Archive diff --git a/buildkite/src/Jobs/Test/TestnetIntegrationTestsLong.dhall b/buildkite/src/Jobs/Test/TestnetIntegrationTestsLong.dhall index 77bd48b49ff..742f708aa09 100644 --- a/buildkite/src/Jobs/Test/TestnetIntegrationTestsLong.dhall +++ b/buildkite/src/Jobs/Test/TestnetIntegrationTestsLong.dhall @@ -21,12 +21,12 @@ let Artifacts = ../../Constants/Artifacts.dhall let dependsOn = Dockers.dependsOn Dockers.Type.Bullseye - (Some Network.Type.Berkeley) + Network.Type.Devnet Profiles.Type.Standard Artifacts.Type.Daemon # Dockers.dependsOn Dockers.Type.Bullseye - (None Network.Type) + Network.Type.Devnet Profiles.Type.Standard Artifacts.Type.Archive diff --git a/buildkite/src/Jobs/Test/VersionLint.dhall b/buildkite/src/Jobs/Test/VersionLint.dhall index 1368e8e70bc..8e55d8e7067 100644 --- a/buildkite/src/Jobs/Test/VersionLint.dhall +++ b/buildkite/src/Jobs/Test/VersionLint.dhall @@ -18,7 +18,17 @@ let Docker = ../../Command/Docker/Type.dhall let Size = ../../Command/Size.dhall -let dependsOn = [ { name = "MinaArtifactBullseye", key = "build-deb-pkg" } ] +let DebianVersions = ../../Constants/DebianVersions.dhall + +let Network = ../../Constants/Network.dhall + +let Profiles = ../../Constants/Profiles.dhall + +let dependsOn = + DebianVersions.dependsOn + DebianVersions.DebVersion.Bullseye + Network.Type.Devnet + Profiles.Type.Standard let buildTestCmd : Text -> Size -> List Command.TaggedKey.Type -> B/SoftFail -> Command.Type diff --git a/buildkite/src/Jobs/Test/ZkappMetrics.dhall b/buildkite/src/Jobs/Test/ZkappMetrics.dhall index 90117a87a34..e03be0b2b0e 100644 --- a/buildkite/src/Jobs/Test/ZkappMetrics.dhall +++ b/buildkite/src/Jobs/Test/ZkappMetrics.dhall @@ -12,6 +12,8 @@ let DebianVersions = ../../Constants/DebianVersions.dhall let Profiles = ../../Constants/Profiles.dhall +let Network = ../../Constants/Network.dhall + let Docker = ../../Command/Docker/Type.dhall let Size = ../../Command/Size.dhall @@ -21,6 +23,7 @@ let JobSpec = ../../Pipeline/JobSpec.dhall let dependsOn = DebianVersions.dependsOn DebianVersions.DebVersion.Bullseye + Network.Type.Devnet Profiles.Type.Standard in Pipeline.build diff --git a/scripts/debian/aptly.sh b/scripts/debian/aptly.sh index 2c661e5a821..408bda8f105 100755 --- a/scripts/debian/aptly.sh +++ b/scripts/debian/aptly.sh @@ -12,7 +12,6 @@ CLEAR='\033[0m' RED='\033[0;31m' # global variables -declare CLI_VERSION='1.0.0'; declare CLI_NAME='aptly.sh'; declare PS4='debug($LINENO) ${FUNCNAME[0]:+${FUNCNAME[0]}}(): '; @@ -34,28 +33,28 @@ function start_aptly() { local __background=$3 local __clean=$4 local __component=$5 - local __repo="$__distribution-$__component" + local __repo="${__distribution}"-"${__component}" local __port=$6 - if [ $__clean = 1 ]; then + if [ "${__clean}" = 1 ]; then rm -rf ~/.aptly fi - - aptly repo create -component $__component -distribution $__distribution $__repo - aptly repo add $__repo $__debs + aptly repo create -component "${__component}" -distribution "${__distribution}" "${__repo}" - aptly snapshot create $__component from repo $__repo + aptly repo add "${__repo}" "${__debs}" - aptly publish snapshot -distribution=$__distribution -skip-signing $__component + aptly snapshot create "${__component}" from repo "${__repo}" - if [ $__background = 1 ]; then - aptly serve -listen localhost:$__port & - else - aptly serve -listen localhost:$__port + aptly publish snapshot -distribution="${__distribution}" -skip-signing "${__component}" + + if [ "${__background}" = 1 ]; then + aptly serve -listen localhost:"${__port}" & + else + aptly serve -listen localhost:"${__port}" fi - + } @@ -68,7 +67,7 @@ function start_help(){ echo "" echo "Parameters:" echo "" - echo " -b, --background The Docker name (mina-devnet, mina-archive etc.)" + echo " -b, --background The Docker name (mina, mina-archive etc.)" echo " -c, --codename The Codename for debian repository" echo " -d, --debians The Debian(s) to be available in aptly. Supports regular expression" echo " -m, --component The Component for debian repository. For example: unstable" @@ -91,7 +90,7 @@ function start(){ local __clean=0 local __component="unstable" local __port=$PORT - + while [ ${#} -gt 0 ]; do error_message="Error: a value is needed for '$1'"; @@ -99,7 +98,7 @@ function start(){ -h | --help ) start_help; ;; - -b | --background ) + -b | --background ) __background=1 shift; ;; @@ -130,13 +129,13 @@ function start(){ ;; esac done - - start_aptly $__distribution \ - $__debs \ - $__background \ - $__clean \ - $__component \ - $__port + + start_aptly "${__distribution}" \ + "${__debs}" \ + "${__background}" \ + "${__clean}" \ + "${__component}" \ + "${__port}" } @@ -156,9 +155,9 @@ function stop_help(){ } function stop(){ - + local __clean=0 - + while [ ${#} -gt 0 ]; do case $1 in -h | --help ) @@ -175,9 +174,9 @@ function stop(){ ;; esac done - + pkill aptly - if [ $__clean = 1 ]; then + if [ "${__clean}" = 1 ]; then rm -rf ~/.aptly fi } @@ -215,4 +214,4 @@ function main(){ esac } -main "$@"; \ No newline at end of file +main "$@"; diff --git a/scripts/debian/build.sh b/scripts/debian/build.sh index 1c1fff73126..81b8c2a01e4 100755 --- a/scripts/debian/build.sh +++ b/scripts/debian/build.sh @@ -8,16 +8,16 @@ SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" # In case of running this script on detached head, script has difficulties in finding out # what is the current branch. -if [[ -n "$BRANCH_NAME" ]]; then - BRANCH_NAME="$BRANCH_NAME" source ${SCRIPTPATH}/../export-git-env-vars.sh +if [[ -n "${BRANCH_NAME}" ]]; then + BRANCH_NAME="${BRANCH_NAME}" source "${SCRIPTPATH}"/../export-git-env-vars.sh else - source ${SCRIPTPATH}/../export-git-env-vars.sh -fi + source "${SCRIPTPATH}"/../export-git-env-vars.sh +fi echo "after export" -source ${SCRIPTPATH}/builder-helpers.sh - +source "${SCRIPTPATH}"/builder-helpers.sh + if [ $# -eq 0 ] then echo "No arguments supplied. Building all known debian packages" @@ -25,7 +25,6 @@ if [ $# -eq 0 ] build_keypair_deb build_archive_deb build_batch_txn_deb - build_daemon_berkeley_deb build_daemon_mainnet_deb build_daemon_devnet_deb build_rosetta_berkeley_deb @@ -35,15 +34,15 @@ if [ $# -eq 0 ] build_functional_test_suite_deb build_zkapp_test_transaction_deb - else + else for i in "$@"; do - if [[ $(type -t "build_${i}_deb") == function ]] - then + if [[ $(type -t "build_${i}_deb") == function ]] + then echo "Building $i debian package" "build_${i}_deb" - else + else echo "invalid debian package name '$i'" exit 1 fi done -fi \ No newline at end of file +fi diff --git a/scripts/debian/builder-helpers.sh b/scripts/debian/builder-helpers.sh index 6441eb2e380..eec166227fb 100755 --- a/scripts/debian/builder-helpers.sh +++ b/scripts/debian/builder-helpers.sh @@ -10,7 +10,7 @@ MINA_DEB_RELEASE=${MINA_DEB_RELEASE:-"unstable"} # Helper script to include when building deb archives. -echo "--- Setting up the envrionment to build debian packages..." +echo "--- Setting up the environment to build debian packages..." SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" cd "${SCRIPTPATH}/../../_build" @@ -46,13 +46,13 @@ esac # Add suffix to debian to distinguish different profiles (mainnet/devnet/lightnet) case "${DUNE_PROFILE}" in devnet|mainnet) - MINA_DEB_NAME="mina-berkeley" + MINA_DEB_NAME="mina-devnet" DEB_SUFFIX="" ;; *) # use dune profile as suffix but replace underscore to dashes so deb builder won't complain _SUFFIX=${DUNE_PROFILE//_/-} - MINA_DEB_NAME="mina-berkeley-${_SUFFIX}" + MINA_DEB_NAME="mina-devnet-${_SUFFIX}" DEB_SUFFIX="-${_SUFFIX}" ;; esac @@ -63,7 +63,7 @@ if [[ -v DUNE_INSTRUMENT_WITH ]]; then INSTRUMENTED_SUFFIX=instrumented MINA_DEB_NAME="${MINA_DEB_NAME}-${INSTRUMENTED_SUFFIX}" DEB_SUFFIX="${DEB_SUFFIX}-${INSTRUMENTED_SUFFIX}" -fi +fi BUILDDIR="deb_build" @@ -123,9 +123,9 @@ build_deb() { # Build the package echo "------------------------------------------------------------" - fakeroot dpkg-deb --build "${BUILDDIR}" ${1}_${MINA_DEB_VERSION}.deb + fakeroot dpkg-deb --build "${BUILDDIR}" "${1}"_"${MINA_DEB_VERSION}".deb echo "build_deb outputs:" - ls -lh ${1}_*.deb + ls -lh "${1}"_*.deb echo "deleting BUILDDIR ${BUILDDIR}" rm -rf "${BUILDDIR}" @@ -137,9 +137,9 @@ copy_common_daemon_configs() { echo "------------------------------------------------------------" echo "copy_common_daemon_configs inputs:" - echo "Network Name: ${1} (like mainnet, devnet, berkeley)" + echo "Network Name: ${1} (like mainnet, devnet)" echo "Signature Type: ${2} (mainnet or testnet)" - echo "Seed List URL path: ${3} (like seed-lists/berkeley_seeds.txt)" + echo "Seed List URL path: ${3} (like seed-lists/devnet_seeds.txt)" # Copy shared binaries cp ../src/app/libp2p_helper/result/bin/libp2p_helper "${BUILDDIR}/usr/local/bin/coda-libp2p_helper" @@ -148,7 +148,7 @@ copy_common_daemon_configs() { cp ./default/src/app/validate_keypair/validate_keypair.exe "${BUILDDIR}/usr/local/bin/mina-validate-keypair" cp ./default/src/lib/snark_worker/standalone/run_snark_worker.exe "${BUILDDIR}/usr/local/bin/mina-standalone-snark-worker" # Copy signature-based Binaries (based on signature type $2 passed into the function) - cp ./default/src/app/cli/src/mina_${2}_signatures.exe "${BUILDDIR}/usr/local/bin/mina" + cp ./default/src/app/cli/src/mina_"${2}"_signatures.exe "${BUILDDIR}/usr/local/bin/mina" # Copy over Build Configs (based on $2) mkdir -p "${BUILDDIR}/etc/coda/build_config" @@ -161,9 +161,8 @@ copy_common_daemon_configs() { # Include all useful genesis ledgers cp ../genesis_ledgers/mainnet.json "${BUILDDIR}/var/lib/coda/mainnet.json" cp ../genesis_ledgers/devnet.json "${BUILDDIR}/var/lib/coda/devnet.json" - cp ../genesis_ledgers/berkeley.json "${BUILDDIR}/var/lib/coda/berkeley.json" # Set the default configuration based on Network name ($1) - cp ../genesis_ledgers/${1}.json "${BUILDDIR}/var/lib/coda/config_${GITHASH_CONFIG}.json" + cp ../genesis_ledgers/"${1}".json "${BUILDDIR}/var/lib/coda/config_${GITHASH_CONFIG}.json" cp ../scripts/hardfork/create_runtime_config.sh "${BUILDDIR}/usr/local/bin/mina-hf-create-runtime-config" cp ../scripts/mina-verify-packaged-fork-config "${BUILDDIR}/usr/local/bin/mina-verify-packaged-fork-config" # Update the mina.service with a new default PEERS_URL based on Seed List URL $3 @@ -239,6 +238,10 @@ build_batch_txn_deb() { build_functional_test_suite_deb() { create_control_file mina-test-suite "${SHARED_DEPS}" 'Test suite apps for mina.' + mkdir -p "${BUILDDIR}/etc/mina/test/archive" + + cp -r ../src/test/archive/* "${BUILDDIR}"/etc/mina/test/archive/ + # Binaries cp ./default/src/test/command_line_tests/command_line_tests.exe "${BUILDDIR}/usr/local/bin/mina-command-line-tests" cp ./default/src/app/heap_usage/heap_usage.exe "${BUILDDIR}/usr/local/bin/mina-heap-usage" @@ -251,11 +254,11 @@ build_functional_test_suite_deb() { ##################################### END TEST SUITE PACKAGE ####################################### function copy_common_rosetta_configs () { - - # Copy rosetta-based Binaries - cp ./default/src/app/rosetta/rosetta_${1}_signatures.exe "${BUILDDIR}/usr/local/bin/mina-rosetta" - cp ./default/src/app/rosetta/ocaml-signer/signer_${1}_signatures.exe "${BUILDDIR}/usr/local/bin/mina-ocaml-signer" - + + # Copy rosetta-based Binaries + cp ./default/src/app/rosetta/rosetta_"${1}"_signatures.exe "${BUILDDIR}/usr/local/bin/mina-rosetta" + cp ./default/src/app/rosetta/ocaml-signer/signer_"${1}"_signatures.exe "${BUILDDIR}/usr/local/bin/mina-ocaml-signer" + mkdir -p "${BUILDDIR}/etc/mina/rosetta" mkdir -p "${BUILDDIR}/etc/mina/rosetta/rosetta-cli-config" mkdir -p "${BUILDDIR}/etc/mina/rosetta/scripts" @@ -265,52 +268,38 @@ function copy_common_rosetta_configs () { cp ../src/app/rosetta/rosetta-cli-config/*.json "${BUILDDIR}/etc/mina/rosetta/rosetta-cli-config" cp ../src/app/rosetta/rosetta-cli-config/*.ros "${BUILDDIR}/etc/mina/rosetta/rosetta-cli-config" cp ./default/src/app/rosetta/indexer_test/indexer_test.exe "${BUILDDIR}/usr/local/bin/mina-rosetta-indexer-test" - + } ##################################### ROSETTA MAINNET PACKAGE ####################################### build_rosetta_mainnet_deb() { - + echo "------------------------------------------------------------" echo "--- Building mainnet rosetta deb" create_control_file mina-rosetta-mainnet "${SHARED_DEPS}" 'Mina Protocol Rosetta Client' "${SUGGESTED_DEPS}" copy_common_rosetta_configs "mainnet" - + build_deb mina-rosetta-mainnet } ##################################### ROSETTA MAINNET PACKAGE ####################################### build_rosetta_devnet_deb() { - + echo "------------------------------------------------------------" echo "--- Building devnet rosetta deb" create_control_file mina-rosetta-devnet "${SHARED_DEPS}" 'Mina Protocol Rosetta Client' "${SUGGESTED_DEPS}" copy_common_rosetta_configs "testnet" - - build_deb mina-rosetta-devnet -} - -##################################### ROSETTA BERKELEY PACKAGE ####################################### -build_rosetta_berkeley_deb() { - - echo "------------------------------------------------------------" - echo "--- Building rosetta berkeley deb" - create_control_file mina-rosetta-berkeley "${SHARED_DEPS}" 'Mina Protocol Rosetta Client' "${SUGGESTED_DEPS}" - - copy_common_rosetta_configs "testnet" - - build_deb mina-rosetta-berkeley + build_deb mina-rosetta-devnet } - ##################################### MAINNET PACKAGE ####################################### build_daemon_mainnet_deb() { - + echo "------------------------------------------------------------" echo "--- Building mainnet deb without keys:" @@ -324,32 +313,17 @@ build_daemon_mainnet_deb() { ##################################### DEVNET PACKAGE ####################################### build_daemon_devnet_deb() { - + echo "------------------------------------------------------------" echo "--- Building testnet signatures deb without keys:" - create_control_file mina-devnet "${SHARED_DEPS}${DAEMON_DEPS}" 'Mina Protocol Client and Daemon for the Devnet Network' "${SUGGESTED_DEPS}" + create_control_file "${MINA_DEB_NAME}" "${SHARED_DEPS}${DAEMON_DEPS}" 'Mina Protocol Client and Daemon for the Devnet Network' copy_common_daemon_configs devnet testnet 'seed-lists/devnet_seeds.txt' - build_deb mina-devnet -} -##################################### END DEVNET PACKAGE ####################################### - -##################################### BERKELEY PACKAGE ####################################### -build_daemon_berkeley_deb() { - - echo "------------------------------------------------------------" - echo "--- Building Mina Berkeley testnet signatures deb without keys:" - - create_control_file "${MINA_DEB_NAME}" "${SHARED_DEPS}${DAEMON_DEPS}" 'Mina Protocol Client and Daemon' - - copy_common_daemon_configs berkeley testnet 'seed-lists/berkeley_seeds.txt' - build_deb "${MINA_DEB_NAME}" - } -##################################### END BERKELEY PACKAGE ####################################### +##################################### END DEVNET PACKAGE ####################################### ##################################### ARCHIVE PACKAGE ########################################## build_archive_deb () { @@ -365,13 +339,13 @@ build_archive_deb () { cp ./default/src/app/archive/archive.exe "${BUILDDIR}/usr/local/bin/mina-archive" cp ./default/src/app/archive_blocks/archive_blocks.exe "${BUILDDIR}/usr/local/bin/mina-archive-blocks" cp ./default/src/app/extract_blocks/extract_blocks.exe "${BUILDDIR}/usr/local/bin/mina-extract-blocks" - + mkdir -p "${BUILDDIR}/etc/mina/archive" cp ../scripts/archive/missing-blocks-guardian.sh "${BUILDDIR}/usr/local/bin/mina-missing-blocks-guardian" - + cp ./default/src/app/missing_blocks_auditor/missing_blocks_auditor.exe "${BUILDDIR}/usr/local/bin/mina-missing-blocks-auditor" cp ./default/src/app/replayer/replayer.exe "${BUILDDIR}/usr/local/bin/mina-replayer" - + cp ../src/app/archive/create_schema.sql "${BUILDDIR}/etc/mina/archive" cp ../src/app/archive/drop_tables.sql "${BUILDDIR}/etc/mina/archive" @@ -389,6 +363,6 @@ build_zkapp_test_transaction_deb () { # Binaries cp ./default/src/app/zkapp_test_transaction/zkapp_test_transaction.exe "${BUILDDIR}/usr/local/bin/mina-zkapp-test-transaction" - build_deb mina-zkapp-test-transaction + build_deb mina-zkapp-test-transaction } ##################################### END ZKAPP TEST TXN PACKAGE ####################################### diff --git a/scripts/debian/reversion.sh b/scripts/debian/reversion.sh index b3ded0a853c..b62bccb9a66 100755 --- a/scripts/debian/reversion.sh +++ b/scripts/debian/reversion.sh @@ -71,4 +71,4 @@ function rebuild_deb() { } rebuild_deb -source scripts/debian/publish.sh --names "${NEW_NAME}_${NEW_VERSION}.deb" --version ${NEW_VERSION} --codename ${CODENAME} --release ${NEW_RELEASE} --bucket ${NEW_REPO} \ No newline at end of file +source scripts/debian/publish.sh --names "${NEW_NAME}_${NEW_VERSION}.deb" --version "${NEW_VERSION}" --codename "${CODENAME}" --release "${NEW_RELEASE}" --bucket ${BUCKET} ${SIGN_ARG} diff --git a/scripts/debian/verify.sh b/scripts/debian/verify.sh index 5364e817097..b0837a142a6 100755 --- a/scripts/debian/verify.sh +++ b/scripts/debian/verify.sh @@ -15,7 +15,7 @@ while [[ "$#" -gt 0 ]]; do case $1 in *) echo "Unknown parameter passed: $1"; exit 1;; esac; shift; done -if [ -z $PACKAGE ]; then +if [ -z "${PACKAGE}" ]; then echo "No package defined. exiting.."; exit 1; fi diff --git a/src/app/archive/cli/dune b/src/app/archive/cli/dune index 69f4c7aa20c..2a815358764 100644 --- a/src/app/archive/cli/dune +++ b/src/app/archive/cli/dune @@ -2,22 +2,23 @@ (name archive_cli) (public_name archive.cli) (libraries - ;;opam libraries - async_kernel - caqti - archive_lib - core - async - caqti-async - core_kernel - async.async_command - ;;local libraries - genesis_constants - mina_runtime_config - cli_lib - logger - block_time - mina_version - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_jane ppx_mina))) + ;;opam libraries + async_kernel + caqti + archive_lib + core + async + caqti-async + core_kernel + async.async_command + ;;local libraries + genesis_constants + mina_runtime_config + cli_lib + logger + block_time + mina_version) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version ppx_jane ppx_mina))) diff --git a/src/app/archive/dune b/src/app/archive/dune index 27c2526bfc1..29b24b628ab 100644 --- a/src/app/archive/dune +++ b/src/app/archive/dune @@ -4,9 +4,18 @@ (public_name archive) (modules archive) (modes native) - (libraries archive_cli async async_unix core_kernel base mina_version bounded_types) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version))) + (libraries + archive_cli + async + async_unix + core_kernel + base + mina_version + bounded_types) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version))) (executable (package archive) @@ -14,9 +23,19 @@ (public_name archive-testnet) (modules archive_testnet_signatures) (modes native) - (libraries archive_cli mina_signature_kind.testnet async async_unix core_kernel base mina_version bounded_types) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version))) + (libraries + archive_cli + mina_signature_kind.testnet + async + async_unix + core_kernel + base + mina_version + bounded_types) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version))) (executable (package archive) @@ -24,6 +43,16 @@ (public_name archive-mainnet) (modules archive_mainnet_signatures) (modes native) - (libraries archive_cli mina_signature_kind.mainnet async async_unix core_kernel base mina_version bounded_types) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version))) + (libraries + archive_cli + mina_signature_kind.mainnet + async + async_unix + core_kernel + base + mina_version + bounded_types) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version))) diff --git a/src/app/archive/lib/dune b/src/app/archive/lib/dune index b24273b9de8..3752fa03a60 100644 --- a/src/app/archive/lib/dune +++ b/src/app/archive/lib/dune @@ -2,80 +2,88 @@ (name archive_lib) (public_name archive_lib) (libraries - ;;opam libraries - sexplib0 - async_unix - base64 - async_rpc_kernel - base.caml - base.base_internalhash_types - 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 - bounded_types - mina_wire_types - kimchi_backend - child_processes - precomputed_values - coda_genesis_ledger - consensus.vrf - mina_runtime_config - sgn - mina_base.util - kimchi_pasta - kimchi_pasta.basic - pickles - random_oracle - pipe_lib - block_time - currency - staged_ledger - data_hash_lib - transition_frontier_base - genesis_ledger_helper - one_or_two - mina_caqti - mina_generators - zkapp_command_builder - mina_base - mina_ledger - mina_block - transition_frontier - logger - mina_metrics - signature_lib - mina_numbers - unsigned_extended - mina_state - pickles_types - pickles.backend - with_hash - mina_base.import - consensus - genesis_constants - genesis_ledger_helper.lib - verifier - quickcheck_lib - snark_params - mina_transaction - protocol_version - staged_ledger_diff - error_json - ppx_deriving_yojson.runtime - ppx_version.runtime - o1trace - ) - (inline_tests (flags -verbose -show-counts)) + ;;opam libraries + sexplib0 + async_unix + base64 + async_rpc_kernel + base.caml + base.base_internalhash_types + 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 + bounded_types + mina_wire_types + kimchi_backend + child_processes + precomputed_values + coda_genesis_ledger + consensus.vrf + mina_runtime_config + sgn + mina_base.util + kimchi_pasta + kimchi_pasta.basic + pickles + random_oracle + pipe_lib + block_time + currency + staged_ledger + data_hash_lib + transition_frontier_base + genesis_ledger_helper + one_or_two + mina_caqti + mina_generators + zkapp_command_builder + mina_base + mina_ledger + mina_block + transition_frontier + logger + mina_metrics + signature_lib + mina_numbers + unsigned_extended + mina_state + pickles_types + pickles.backend + with_hash + mina_base.import + consensus + genesis_constants + genesis_ledger_helper.lib + verifier + quickcheck_lib + snark_params + mina_transaction + protocol_version + staged_ledger_diff + error_json + ppx_deriving_yojson.runtime + ppx_version.runtime + o1trace) + (inline_tests + (flags -verbose -show-counts)) (modes native) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_mina ppx_version ppx_jane ppx_custom_printf ppx_deriving_yojson h_list.ppx))) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + ppx_mina + ppx_version + ppx_jane + ppx_custom_printf + ppx_deriving_yojson + h_list.ppx))) diff --git a/src/app/archive_blocks/dune b/src/app/archive_blocks/dune index 48f0db5aabd..152986ce769 100644 --- a/src/app/archive_blocks/dune +++ b/src/app/archive_blocks/dune @@ -3,27 +3,28 @@ (name archive_blocks) (public_name archive_blocks) (libraries - ;; opam libraries - async_unix - core - result - async_kernel - uri - stdio - caqti-driver-postgresql - caqti - async - core_kernel - caqti-async - base - base.caml - async.async_command - ;; local libraries - logger - mina_block - bounded_types - genesis_constants - archive_lib - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_mina ppx_let ppx_hash ppx_compare ppx_sexp_conv))) + ;; opam libraries + async_unix + core + result + async_kernel + uri + stdio + caqti-driver-postgresql + caqti + async + core_kernel + caqti-async + base + base.caml + async.async_command + ;; local libraries + logger + mina_block + bounded_types + genesis_constants + archive_lib) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version ppx_mina ppx_let ppx_hash ppx_compare ppx_sexp_conv))) diff --git a/src/app/batch_txn_tool/dune b/src/app/batch_txn_tool/dune index f55ebfdf875..8b957922d9f 100644 --- a/src/app/batch_txn_tool/dune +++ b/src/app/batch_txn_tool/dune @@ -1,37 +1,34 @@ (executable (name batch_txn_tool) (libraries - ;; opam libraries - async.async_command - integers - base - uri - core_kernel - core - async - async_kernel - yojson - async_unix - ;; local libraries - currency - mina_base.import - graphql_lib - signature_lib - mina_base - secrets - mina_numbers - snark_params - unsigned_extended - mina_compile_config - mina_wire_types - integration_test_lib - logger - bounded_types - ) - (instrumentation (backend bisect_ppx)) + ;; opam libraries + async.async_command + integers + base + uri + core_kernel + core + async + async_kernel + yojson + async_unix + ;; local libraries + currency + mina_base.import + graphql_lib + signature_lib + mina_base + secrets + mina_numbers + snark_params + unsigned_extended + mina_compile_config + mina_wire_types + integration_test_lib + logger + bounded_types) + (instrumentation + (backend bisect_ppx)) (preprocessor_deps ../../../graphql_schema.json) - (preprocess (pps - ppx_version - ppx_let - ppx_mina -))) + (preprocess + (pps ppx_version ppx_let ppx_mina))) diff --git a/src/app/benchmarks/benchmarks.ml b/src/app/benchmarks/benchmarks.ml index bc09c3c7b8f..0396bee99c6 100644 --- a/src/app/benchmarks/benchmarks.ml +++ b/src/app/benchmarks/benchmarks.ml @@ -3,11 +3,11 @@ (* you can control which libraries are benchmarked using the environment variable BENCHMARK_LIBRARIES, which is either "all" or a comma-delimited list of libraries; if the variable is not present, or empty, run benchmarks for all libraries - *) +*) open Core_kernel -let available_libraries = ["vrf_lib_tests"; "mina_base"] +let available_libraries = [ "vrf_lib_tests"; "mina_base" ] let run_benchmarks_in_lib libname = printf "Running inline tests in library \"%s\"\n%!" libname ; diff --git a/src/app/benchmarks/dune b/src/app/benchmarks/dune index 23918c24e7c..4052d497da6 100644 --- a/src/app/benchmarks/dune +++ b/src/app/benchmarks/dune @@ -3,8 +3,17 @@ (executable (name benchmarks) (public_name main) - (libraries core_bench.inline_benchmarks vrf_lib_tests mina_base core_kernel core base bounded_types) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version)) + (libraries + core_bench.inline_benchmarks + vrf_lib_tests + mina_base + core_kernel + core + base + bounded_types) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version)) (link_flags -linkall) (modes native)) diff --git a/src/app/best_tip_merger/dune b/src/app/best_tip_merger/dune index 2b8ab0c9e03..93c2ff1087b 100644 --- a/src/app/best_tip_merger/dune +++ b/src/app/best_tip_merger/dune @@ -1,50 +1,50 @@ (executable - (package best_tip_merger) - (name best_tip_merger) - (public_name best_tip_merger) - (modes native) - (libraries - ;; opam libraries - async.async_command - async_kernel - stdio - base.caml - yojson - lib - core_kernel - async - ppx_deriving_yojson.runtime - core - sexplib0 - result - base.base_internalhash_types - async_unix - ;; local libraries - visualization - mina_numbers - mina_state - transition_frontier_extensions - mina_base - logger.file_system - logger - cli_lib - transition_frontier - data_hash_lib - rose_tree - consensus - mina_wire_types - pickles.backend - snark_params - pickles - kimchi_pasta - bounded_types - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps - ppx_mina - ppx_deriving.show - ppx_deriving_yojson - ppx_jane - ppx_version - ppx_compare)) - ) + (package best_tip_merger) + (name best_tip_merger) + (public_name best_tip_merger) + (modes native) + (libraries + ;; opam libraries + async.async_command + async_kernel + stdio + base.caml + yojson + lib + core_kernel + async + ppx_deriving_yojson.runtime + core + sexplib0 + result + base.base_internalhash_types + async_unix + ;; local libraries + visualization + mina_numbers + mina_state + transition_frontier_extensions + mina_base + logger.file_system + logger + cli_lib + transition_frontier + data_hash_lib + rose_tree + consensus + mina_wire_types + pickles.backend + snark_params + pickles + kimchi_pasta + bounded_types) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + ppx_mina + ppx_deriving.show + ppx_deriving_yojson + ppx_jane + ppx_version + ppx_compare))) diff --git a/src/app/cli/src/cli_entrypoint/dune b/src/app/cli/src/cli_entrypoint/dune index 9c321cf212c..cefa0dc0d61 100644 --- a/src/app/cli/src/cli_entrypoint/dune +++ b/src/app/cli/src/cli_entrypoint/dune @@ -5,77 +5,84 @@ (public_name cli.mina_cli_entrypoint) (modes native) (libraries - ;;opam libraries - stdio - async_kernel - async_unix - base - core_kernel - core - bin_prot - bin_prot.shape - init - async - core.daemon - base.caml - uri - async.async_command - result - sexplib0 - ;;local libraries - verifier - ledger_proof - snark_worker - mina_block - pipe_lib - gossip_net - data_hash_lib - mina_ledger - precomputed_values - mina_networking - cache_dir - parallel - secrets - logger - mina_lib - currency - signature_lib - mina_base - mina_base.import - error_json - genesis_ledger_helper - consensus - child_processes - node_addrs_and_ports - mina_plugins - logger.file_system - cli_lib - genesis_constants - blake2 - mina_metrics - transaction_witness - snark_work_lib - transaction_snark - mina_compile_config - node_error_service - mina_user_error - file_system - mina_version - mina_net2 - block_time - mina_runtime_config - trust_system - protocol_version - coda_genesis_proof - with_hash - block_producer - prover - blockchain_snark - snarky.backendless - o1trace - ppx_version.runtime - internal_tracing - itn_logger - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_mina ppx_version ppx_here ppx_let ppx_sexp_conv ppx_deriving_yojson))) + ;;opam libraries + stdio + async_kernel + async_unix + base + core_kernel + core + bin_prot + bin_prot.shape + init + async + core.daemon + base.caml + uri + async.async_command + result + sexplib0 + ;;local libraries + verifier + ledger_proof + snark_worker + mina_block + pipe_lib + gossip_net + data_hash_lib + mina_ledger + precomputed_values + mina_networking + cache_dir + parallel + secrets + logger + mina_lib + currency + signature_lib + mina_base + mina_base.import + error_json + genesis_ledger_helper + consensus + child_processes + node_addrs_and_ports + mina_plugins + logger.file_system + cli_lib + genesis_constants + blake2 + mina_metrics + transaction_witness + snark_work_lib + transaction_snark + mina_compile_config + node_error_service + mina_user_error + file_system + mina_version + mina_net2 + block_time + mina_runtime_config + trust_system + protocol_version + coda_genesis_proof + with_hash + block_producer + prover + blockchain_snark + snarky.backendless + o1trace + ppx_version.runtime + internal_tracing + itn_logger) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + ppx_mina + ppx_version + ppx_here + ppx_let + ppx_sexp_conv + ppx_deriving_yojson))) diff --git a/src/app/cli/src/dune b/src/app/cli/src/dune index ce6717a5cb4..d88c44698a4 100644 --- a/src/app/cli/src/dune +++ b/src/app/cli/src/dune @@ -7,8 +7,10 @@ (modules mina) (modes native) (libraries mina_cli_entrypoint) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version)) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version)) (flags -short-paths -w @a-4-29-40-41-42-44-45-48-58-59-60-66)) (executable @@ -18,8 +20,10 @@ (modules mina_testnet_signatures) (modes native) (libraries mina_cli_entrypoint mina_signature_kind.testnet) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version)) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version)) (flags -short-paths -w @a-4-29-40-41-42-44-45-48-58-59-60-66)) (executable @@ -29,6 +33,8 @@ (modules mina_mainnet_signatures) (modes native) (libraries mina_cli_entrypoint mina_signature_kind.mainnet) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version)) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version)) (flags -short-paths -w @a-4-29-40-41-42-44-45-48-58-59-60-66)) diff --git a/src/app/cli/src/init/dune b/src/app/cli/src/init/dune index aaa7df52dba..00a4dee6b0a 100644 --- a/src/app/cli/src/init/dune +++ b/src/app/cli/src/init/dune @@ -1,135 +1,158 @@ (rule (targets assets.ml) - (deps (source_tree assets)) - (action (run %{bin:ocaml-crunch} -m plain assets -o assets.ml))) + (deps + (source_tree assets)) + (action + (run %{bin:ocaml-crunch} -m plain assets -o assets.ml))) (library (name init) (public_name init) (libraries - ;;opam libraries - stdio - integers - astring - async_ssl - sexplib0 - async.async_rpc - result - graphql - async_kernel - async_unix - uri - core_kernel - core_kernel.uuid - core - core.uuid - base - async - cohttp - graphql_parser - async.async_command - async_rpc_kernel - base.caml - base.base_internalhash_types - graphql-cohttp - cohttp-async - graphql-async - mirage-crypto-ec - base_quickcheck - ;;local libraries - bounded_types - snark_profiler_lib - archive_lib - mina_wire_types - 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 - itn_logger - coda_genesis_proof - data_hash_lib - currency - genesis_constants - bash_colors - graphql_lib - o1trace_webkit_event - generated_graphql_queries - itn_crypto - mina_transaction - mina_generators - mina_user_error - mina_ledger - mina_block - 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_base.import - mina_numbers - precomputed_values - with_hash - transaction_snark - transaction_snark_tests - transaction_protocol_state - test_util - file_system - daemon_rpcs - trust_system - secrets - participating_state - staged_ledger - mina_commands - mina_runtime_config - coda_genesis_ledger - mina_networking - sgn - unsigned_extended - mina_metrics - group_map - 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 - mina_signature_kind - string_sign - zkapp_command_builder - internal_tracing - transaction_snark_scan_state - ) - (instrumentation (backend bisect_ppx)) - (preprocessor_deps ../../../../../graphql_schema.json - ../../../../graphql-ppx-config.inc) - (preprocess (pps ppx_deriving_yojson ppx_mina ppx_version - 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 - graphql_ppx -- %{read-lines:../../../../graphql-ppx-config.inc}))) + ;;opam libraries + stdio + integers + astring + async_ssl + sexplib0 + async.async_rpc + result + graphql + async_kernel + async_unix + uri + core_kernel + core_kernel.uuid + core + core.uuid + base + async + cohttp + graphql_parser + async.async_command + async_rpc_kernel + base.caml + base.base_internalhash_types + graphql-cohttp + cohttp-async + graphql-async + mirage-crypto-ec + base_quickcheck + ;;local libraries + bounded_types + snark_profiler_lib + archive_lib + mina_wire_types + 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 + itn_logger + coda_genesis_proof + data_hash_lib + currency + genesis_constants + bash_colors + graphql_lib + o1trace_webkit_event + generated_graphql_queries + itn_crypto + mina_transaction + mina_generators + mina_user_error + mina_ledger + mina_block + 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_base.import + mina_numbers + precomputed_values + with_hash + transaction_snark + transaction_snark_tests + transaction_protocol_state + test_util + file_system + daemon_rpcs + trust_system + secrets + participating_state + staged_ledger + mina_commands + mina_runtime_config + coda_genesis_ledger + mina_networking + sgn + unsigned_extended + mina_metrics + group_map + 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 + mina_signature_kind + string_sign + zkapp_command_builder + internal_tracing + transaction_snark_scan_state) + (instrumentation + (backend bisect_ppx)) + (preprocessor_deps + ../../../../../graphql_schema.json + ../../../../graphql-ppx-config.inc) + (preprocess + (pps + ppx_deriving_yojson + ppx_mina + ppx_version + 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 + graphql_ppx + -- + %{read-lines:../../../../graphql-ppx-config.inc}))) diff --git a/src/app/delegation_verify/dune b/src/app/delegation_verify/dune index af2363a72c9..90b52ac1f3a 100644 --- a/src/app/delegation_verify/dune +++ b/src/app/delegation_verify/dune @@ -1,49 +1,50 @@ (executable (name delegation_verify) (libraries - core_kernel - async - async_kernel - async_unix - core - stdio - base - base.caml - ppx_deriving_yojson.runtime - yojson - base64 - integers - async.async_command - sexplib0 - sexplib - hex - ; mina libs - signature_lib - mina_block - transaction_snark - blockchain_snark - mina_base - genesis_constants - uptime_service - currency - ledger_proof - mina_base.import - mina_state - mina_wire_types - consensus - data_hash_lib - mina_numbers - snark_params - kimchi_pasta - kimchi_pasta.basic - pasta_bindings - pickles - pickles_types - pickles.backend - genesis_ledger_helper - mina_runtime_config - precomputed_values - logger - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_mina ppx_version ppx_jane ppx_custom_printf h_list.ppx))) + core_kernel + async + async_kernel + async_unix + core + stdio + base + base.caml + ppx_deriving_yojson.runtime + yojson + base64 + integers + async.async_command + sexplib0 + sexplib + hex + ; mina libs + signature_lib + mina_block + transaction_snark + blockchain_snark + mina_base + genesis_constants + uptime_service + currency + ledger_proof + mina_base.import + mina_state + mina_wire_types + consensus + data_hash_lib + mina_numbers + snark_params + kimchi_pasta + kimchi_pasta.basic + pasta_bindings + pickles + pickles_types + pickles.backend + genesis_ledger_helper + mina_runtime_config + precomputed_values + logger) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_mina ppx_version ppx_jane ppx_custom_printf h_list.ppx))) diff --git a/src/app/disk_caching_stats/dune b/src/app/disk_caching_stats/dune index 57292875db8..6a8db8e8632 100644 --- a/src/app/disk_caching_stats/dune +++ b/src/app/disk_caching_stats/dune @@ -1,11 +1,45 @@ (executable (name disk_caching_stats) - (libraries pickles pickles_types pickles.backend snark_params crypto_params network_pool mina_base - signature_lib one_or_two currency ledger_proof mina_state mina_base.import mina_wire_types - mina_numbers random_oracle random_oracle_input kimchi_pasta.basic data_hash_lib with_hash - kimchi_pasta mina_ledger transaction_snark_scan_state mina_transaction_logic transaction_snark - sgn snark_profiler_lib genesis_constants digestif bigarray-compat - ; -- - core core_kernel base base.caml bin_prot splittable_random sexplib0) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_jane ppx_version))) + (libraries + pickles + pickles_types + pickles.backend + snark_params + crypto_params + network_pool + mina_base + signature_lib + one_or_two + currency + ledger_proof + mina_state + mina_base.import + mina_wire_types + mina_numbers + random_oracle + random_oracle_input + kimchi_pasta.basic + data_hash_lib + with_hash + kimchi_pasta + mina_ledger + transaction_snark_scan_state + mina_transaction_logic + transaction_snark + sgn + snark_profiler_lib + genesis_constants + digestif + bigarray-compat + ; -- + core + core_kernel + base + base.caml + bin_prot + splittable_random + sexplib0) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_jane ppx_version))) diff --git a/src/app/dump_blocks/dune b/src/app/dump_blocks/dune index 1e499797f02..4c403c5a92d 100644 --- a/src/app/dump_blocks/dune +++ b/src/app/dump_blocks/dune @@ -2,27 +2,29 @@ (name dump_blocks) (public_name dump_blocks) (libraries - async - async_kernel - async_unix - base - block_time - bounded_types - core - core_kernel - core_unix.command_unix - logger - mina_base - mina_block - mina_state - mina_wire_types - ppx_inline_test.runner.lib - precomputed_values - sexplib0 - transition_frontier - transition_frontier_base - transition_frontier_full_frontier - yojson) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_let ppx_custom_printf)) + async + async_kernel + async_unix + base + block_time + bounded_types + core + core_kernel + core_unix.command_unix + logger + mina_base + mina_block + mina_state + mina_wire_types + ppx_inline_test.runner.lib + precomputed_values + sexplib0 + transition_frontier + transition_frontier_base + transition_frontier_full_frontier + yojson) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version ppx_let ppx_custom_printf)) (modes native)) diff --git a/src/app/extract_blocks/dune b/src/app/extract_blocks/dune index a41ea72fc19..1b31d5f0471 100644 --- a/src/app/extract_blocks/dune +++ b/src/app/extract_blocks/dune @@ -3,47 +3,55 @@ (name extract_blocks) (public_name extract_blocks) (libraries - ;; opam libraries - async_unix - core - base - base64 - integers - caqti-async - caqti-driver-postgresql - async - core_kernel - caqti - async_kernel - uri - async.async_command - ;; local libraries - consensus.vrf - mina_wire_types - bounded_types - mina_base - mina_base.import - kimchi_pasta - kimchi_pasta.basic - pasta_bindings - pickles - pickles_types - pickles.backend - archive_lib - data_hash_lib - signature_lib - logger - mina_caqti - block_time - mina_numbers - mina_transaction - protocol_version - snark_params - currency - unsigned_extended - sgn - with_hash - error_json - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_mina ppx_let ppx_hash ppx_compare ppx_sexp_conv h_list.ppx))) + ;; opam libraries + async_unix + core + base + base64 + integers + caqti-async + caqti-driver-postgresql + async + core_kernel + caqti + async_kernel + uri + async.async_command + ;; local libraries + consensus.vrf + mina_wire_types + bounded_types + mina_base + mina_base.import + kimchi_pasta + kimchi_pasta.basic + pasta_bindings + pickles + pickles_types + pickles.backend + archive_lib + data_hash_lib + signature_lib + logger + mina_caqti + block_time + mina_numbers + mina_transaction + protocol_version + snark_params + currency + unsigned_extended + sgn + with_hash + error_json) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + ppx_version + ppx_mina + ppx_let + ppx_hash + ppx_compare + ppx_sexp_conv + h_list.ppx))) diff --git a/src/app/generate_keypair/dune b/src/app/generate_keypair/dune index 1a987e63659..6ef13957692 100644 --- a/src/app/generate_keypair/dune +++ b/src/app/generate_keypair/dune @@ -4,6 +4,8 @@ (public_name generate_keypair) (modes native) (libraries cli_lib async core_kernel mina_version async_unix bounded_types) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_let ppx_sexp_conv)) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version ppx_let ppx_sexp_conv)) (flags -short-paths -w @a-4-29-40-41-42-44-45-48-58-59-60)) diff --git a/src/app/graphql_schema_dump/dune b/src/app/graphql_schema_dump/dune index 7116105997b..6294dcf3ae4 100644 --- a/src/app/graphql_schema_dump/dune +++ b/src/app/graphql_schema_dump/dune @@ -1,5 +1,16 @@ (executable (name graphql_schema_dump) - (libraries graphql_parser mina_version mina_graphql async async_unix graphql-async yojson bounded_types genesis_constants) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version))) + (libraries + graphql_parser + mina_version + mina_graphql + async + async_unix + graphql-async + yojson + bounded_types + genesis_constants) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version))) diff --git a/src/app/heap_usage/dune b/src/app/heap_usage/dune index a74b285b81f..e9b41204cb6 100644 --- a/src/app/heap_usage/dune +++ b/src/app/heap_usage/dune @@ -3,57 +3,58 @@ (name heap_usage) (public_name heap_usage) (libraries - ;; opam libraries - async_unix - core - result - async_kernel - stdio - async - core_kernel - base - base.caml - base.base_internalhash_types - async.async_command - yojson - sexplib0 - ;; local libraries - mina_block ; temp - mina_base - mina_base.import - mina_numbers - currency - bounded_types - data_hash_lib - signature_lib - merkle_ledger - mina_compile_config - mina_ledger - mina_state - mina_transaction_logic - genesis_constants - staged_ledger_diff - parallel_scan - pickles - pickles.backend - pickles_types - transaction_snark - transaction_snark_scan_state - ledger_proof - blake2 - mina_generators - with_hash - random_oracle - snark_params - crypto_params - kimchi_bindings - kimchi_backend - kimchi_pasta - kimchi_pasta.basic - pasta_bindings - zkapp_command_builder - transaction_snark_tests - snark_profiler_lib - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_mina ppx_let ppx_hash ppx_compare ppx_sexp_conv))) + ;; opam libraries + async_unix + core + result + async_kernel + stdio + async + core_kernel + base + base.caml + base.base_internalhash_types + async.async_command + yojson + sexplib0 + ;; local libraries + mina_block ; temp + mina_base + mina_base.import + mina_numbers + currency + bounded_types + data_hash_lib + signature_lib + merkle_ledger + mina_compile_config + mina_ledger + mina_state + mina_transaction_logic + genesis_constants + staged_ledger_diff + parallel_scan + pickles + pickles.backend + pickles_types + transaction_snark + transaction_snark_scan_state + ledger_proof + blake2 + mina_generators + with_hash + random_oracle + snark_params + crypto_params + kimchi_bindings + kimchi_backend + kimchi_pasta + kimchi_pasta.basic + pasta_bindings + zkapp_command_builder + transaction_snark_tests + snark_profiler_lib) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version ppx_mina ppx_let ppx_hash ppx_compare ppx_sexp_conv))) diff --git a/src/app/ledger_export_bench/dune b/src/app/ledger_export_bench/dune index 2352ffd4130..6ee4c2a05c7 100644 --- a/src/app/ledger_export_bench/dune +++ b/src/app/ledger_export_bench/dune @@ -1,15 +1,17 @@ (executable (name ledger_export_benchmark) (libraries - base - core - core_bench - core_kernel - yojson - ; mina libraries - mina_runtime_config) + base + core + core_bench + core_kernel + yojson + ; mina libraries + mina_runtime_config) ; 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)) - (preprocess (pps ppx_version ppx_jane)) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version ppx_jane)) (modes native)) diff --git a/src/app/logproc/dune b/src/app/logproc/dune index 4d38e6278e4..77ac3b6d14e 100644 --- a/src/app/logproc/dune +++ b/src/app/logproc/dune @@ -3,20 +3,21 @@ (public_name logproc) (modules logproc) (libraries - ;;opam libraries - result - stdio - core - yojson - cmdliner - core_kernel - ppx_deriving_yojson.runtime - ;;local libraries - logger - logproc_lib - bounded_types - bash_colors - interpolator_lib - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_jane ppx_deriving.std))) + ;;opam libraries + result + stdio + core + yojson + cmdliner + core_kernel + ppx_deriving_yojson.runtime + ;;local libraries + logger + logproc_lib + bounded_types + bash_colors + interpolator_lib) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version ppx_jane ppx_deriving.std))) diff --git a/src/app/logproc/logproc.ml b/src/app/logproc/logproc.ml index 8c519b962f1..44a1f7d3fa9 100644 --- a/src/app/logproc/logproc.ml +++ b/src/app/logproc/logproc.ml @@ -81,8 +81,9 @@ let process_line ~timezone ~interpolation_config ~filter line = type parser_state = | Start_of_line - | Processable_line of {line_start_pos: int; previous_elements: string list} - | Unprocessable_line of {line_start_pos: int} + | Processable_line of + { line_start_pos : int; previous_elements : string list } + | Unprocessable_line of { line_start_pos : int } (* Iterates over lines prefixed by `prefix`, invoking `on_hit` for each * line. If a line does not start with `prefix`, `on_miss` is invoked, @@ -105,11 +106,11 @@ let iter_lines_prefixed_with input_channel output_channel ~prefix ~on_hit match state with | Start_of_line -> failwith "cannot extract start of line state" - | Processable_line {line_start_pos; previous_elements} -> + | Processable_line { line_start_pos; previous_elements } -> let this_element = extract_input_string line_start_pos i in let elements = List.rev (this_element :: previous_elements) in on_hit (String.concat elements ~sep:"") - | Unprocessable_line {line_start_pos} -> + | Unprocessable_line { line_start_pos } -> forward_input line_start_pos i ; Out_channel.output_char output_channel '\n' in @@ -117,14 +118,15 @@ let iter_lines_prefixed_with input_channel output_channel ~prefix ~on_hit match state with | Start_of_line -> Start_of_line - | Processable_line {line_start_pos; previous_elements} -> + | Processable_line { line_start_pos; previous_elements } -> let this_element = extract_input_string line_start_pos buf_len in Processable_line - { line_start_pos= 0 - ; previous_elements= this_element :: previous_elements } - | Unprocessable_line {line_start_pos} -> + { line_start_pos = 0 + ; previous_elements = this_element :: previous_elements + } + | Unprocessable_line { line_start_pos } -> forward_input line_start_pos buf_len ; - Unprocessable_line {line_start_pos= 0} + Unprocessable_line { line_start_pos = 0 } in let parse_char ~buf_len i state = if i >= buf_len then `Stop (carryover_state ~buf_len state) @@ -133,10 +135,10 @@ let iter_lines_prefixed_with input_channel output_channel ~prefix ~on_hit | Start_of_line -> let next_state = if Char.equal (Bytes.unsafe_get input_buffer i) prefix then - Processable_line {line_start_pos= i; previous_elements= []} + Processable_line { line_start_pos = i; previous_elements = [] } else ( on_miss () ; - Unprocessable_line {line_start_pos= i} ) + Unprocessable_line { line_start_pos = i } ) in `Continue next_state | Processable_line _ | Unprocessable_line _ -> @@ -209,9 +211,9 @@ let () = Arg.( value & opt - (enum [("hidden", Hidden); ("inline", Inline); ("after", After)]) + (enum [ ("hidden", Hidden); ("inline", Inline); ("after", After) ]) Inline - & info ["i"; "interpolation-mode"] ~docv:"MODE" ~doc) + & info [ "i"; "interpolation-mode" ] ~docv:"MODE" ~doc) in let max_interpolation_length = let doc = @@ -221,16 +223,17 @@ let () = Arg.( value & opt int 25 & info - ["m"; "max-interpolation-length"] + [ "m"; "max-interpolation-length" ] ~docv:"MAX_INTERPOLATION_LENGTH" ~doc) in let pretty_print = let doc = "Pretty print json values." in - Arg.(value & flag & info ["p"; "pretty-print"] ~docv:"PRETTY_PRINT" ~doc) + Arg.( + value & flag & info [ "p"; "pretty-print" ] ~docv:"PRETTY_PRINT" ~doc) in let lift_interpolation_config mode max_interpolation_length pretty_print = let open Interpolator in - {mode; max_interpolation_length; pretty_print} + { mode; max_interpolation_length; pretty_print } in Term.( const lift_interpolation_config @@ -240,23 +243,23 @@ let () = let doc = "Timezone to display timestamps in. Defaults to the system's timezone." in - Arg.(value & opt string "" & info ["z"; "zone"] ~docv:"TIMEZONE" ~doc) + Arg.(value & opt string "" & info [ "z"; "zone" ] ~docv:"TIMEZONE" ~doc) in let filter = let doc = "Filter displayed log lines. The filter language has similar syntax to \ - javascript, with a few notable differences. Similar to \"jq\", doing \ - an anymous access like \"[\"a\"]\" or \".a\" will refer to that key on \ - the javascript object being processed, which in the context of \ - logproc, is the json log entry itself. Basic literals (such as strings \ - and integers) are supported, as is structural equality (\"==\") and \ - boolean operations (\"!\", \"&&\", \"||\"). There is also support for \ - the \"in\" operator for checking existence in arrays (works like \ + javascript, with a few notable differences. Similar to \"jq\", doing an \ + anymous access like \"[\"a\"]\" or \".a\" will refer to that key on the \ + javascript object being processed, which in the context of logproc, is \ + the json log entry itself. Basic literals (such as strings and \ + integers) are supported, as is structural equality (\"==\") and boolean \ + operations (\"!\", \"&&\", \"||\"). There is also support for the \ + \"in\" operator for checking existence in arrays (works like \ javascript, not like jq). Regexes can also be expressed \ (\"/some_regex/\") and can be matched on using a special \"match\" \ operator. See examples for more information." in - Arg.(value & opt string "" & info ["f"; "filter"] ~docv:"FILTER" ~doc) + Arg.(value & opt string "" & info [ "f"; "filter" ] ~docv:"FILTER" ~doc) in let main_term = Term.(const main $ timezone $ interpolation_config $ filter) @@ -289,7 +292,8 @@ let () = ; `I ( "a complex filter:" , {|logproc -f '.message match /broadcast/ && .metadata.peer.host == "182.9.63.3" || .metadata.peer.discover_port == 8302|} - ) ] + ) + ] in Term.info ~version:"0.1" ~doc ~exits:Term.default_exits ~man "logproc" in diff --git a/src/app/missing_blocks_auditor/dune b/src/app/missing_blocks_auditor/dune index 49e9020bc1c..a08801fafa2 100644 --- a/src/app/missing_blocks_auditor/dune +++ b/src/app/missing_blocks_auditor/dune @@ -3,21 +3,22 @@ (name missing_blocks_auditor) (public_name missing_blocks_auditor) (libraries - ;; opam libraries - core - async_kernel - uri - caqti-driver-postgresql - caqti - async - core_kernel - caqti-async - base - async_unix - async.async_command - ;; local libraries - logger - bounded_types - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_mina ppx_version ppx_let))) + ;; opam libraries + core + async_kernel + uri + caqti-driver-postgresql + caqti + async + core_kernel + caqti-async + base + async_unix + async.async_command + ;; local libraries + logger + bounded_types) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_mina ppx_version ppx_let))) diff --git a/src/app/print_blockchain_snark_vk/dune b/src/app/print_blockchain_snark_vk/dune index 28872e1df1e..ad5287fc4fd 100644 --- a/src/app/print_blockchain_snark_vk/dune +++ b/src/app/print_blockchain_snark_vk/dune @@ -1,19 +1,23 @@ (executable (name print_blockchain_snark_vk) - (libraries - blockchain_snark genesis_constants) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version))) + (libraries blockchain_snark genesis_constants) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version))) (rule (deps print_blockchain_snark_vk.exe) (targets blockchain_snark_vk.json.computed) (action - (with-stdout-to %{targets} + (with-stdout-to + %{targets} (run %{deps})))) (rule - (deps (:orig blockchain_snark_vk.json) (:computed blockchain_snark_vk.json.computed)) + (deps + (:orig blockchain_snark_vk.json) + (:computed blockchain_snark_vk.json.computed)) (alias runtest) (action (diff %{orig} %{computed}))) diff --git a/src/app/reformat/dune b/src/app/reformat/dune index e069e49a5da..c0fbc0fa245 100644 --- a/src/app/reformat/dune +++ b/src/app/reformat/dune @@ -1,7 +1,14 @@ (executable (name reformat) (public_name reformat) - (libraries core async async_kernel async_unix core_kernel sexplib0 async.async_command) + (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/reformat.ml b/src/app/reformat/reformat.ml index 0ea294650e1..e71dad30c28 100644 --- a/src/app/reformat/reformat.ml +++ b/src/app/reformat/reformat.ml @@ -19,7 +19,8 @@ let dirs_trustlist = ; "snarky" ; "_opam" ; "opam_switches" - ; ".direnv" ] + ; ".direnv" + ] let rec fold_over_files ~path ~process_path ~init ~f = let%bind all = Sys.ls_dir path in @@ -42,11 +43,11 @@ let main dry_run check path = | `Dir -> not (List.exists dirs_trustlist ~f:(fun s -> - String.is_suffix ~suffix:s path )) + String.is_suffix ~suffix:s path ) ) | `File -> (not (List.exists trustlist ~f:(fun s -> - String.is_suffix ~suffix:s path ))) + String.is_suffix ~suffix:s path ) ) ) && ( String.is_suffix ~suffix:".ml" path || String.is_suffix ~suffix:".mli" path ) ) ~f:(fun () file -> @@ -55,7 +56,7 @@ let main dry_run check path = return () in if check then - let prog, args = ("ocamlformat", ["--doc-comments=before"; file]) in + let prog, args = ("ocamlformat", [ "--doc-comments=before"; file ]) in let%bind formatted = Process.run_exn ~prog ~args () in let%bind raw = Reader.file_contents file in if not (String.equal formatted raw) then ( @@ -64,7 +65,7 @@ let main dry_run check path = else return () else let prog, args = - ("ocamlformat", ["--doc-comments=before"; "-i"; file]) + ("ocamlformat", [ "--doc-comments=before"; "-i"; file ]) in if dry_run then dump prog args else @@ -77,16 +78,16 @@ let _cli = let open Command.Let_syntax in Command.async ~summary:"Format all ml and mli files" (let%map_open path = - flag "--path" ~aliases:["path"] ~doc:"Path to traverse" + flag "--path" ~aliases:[ "path" ] ~doc:"Path to traverse" (required string) - and dry_run = flag "--dry-run" ~aliases:["dry-run"] no_arg ~doc:"Dry run" + and dry_run = flag "--dry-run" ~aliases:[ "dry-run" ] no_arg ~doc:"Dry run" and check = - flag "--check" ~aliases:["check"] no_arg + flag "--check" ~aliases:[ "check" ] no_arg ~doc: "Return with an error code if there exists an ml file that was \ formatted improperly" in - fun () -> main dry_run check path) + fun () -> main dry_run check path ) |> Command.run let () = never_returns (Scheduler.go ()) diff --git a/src/app/replayer/dune b/src/app/replayer/dune index 394d304b180..8cd2e071d22 100644 --- a/src/app/replayer/dune +++ b/src/app/replayer/dune @@ -3,66 +3,74 @@ (name replayer) (public_name replayer) (libraries - ;; opam libraries - stdio - sexplib0 - result - async.async_command - async - base.caml - bin_prot.shape - caqti-async - core_kernel - archive_lib - caqti-driver-postgresql - async_kernel - core - yojson - caqti - base - base.base_internalhash_types - uri - integers - async_unix - ;; local libraries - mina_wire_types - with_hash - snark_params - crypto_params - pickles_types - mina_numbers - coda_genesis_ledger - currency - pickles.backend - signature_lib - genesis_ledger_helper.lib - genesis_ledger_helper - mina_state - mina_ledger - mina_base - bounded_types - mina_base.import - mina_transaction - mina_transaction_logic - mina_caqti - genesis_constants - mina_runtime_config - logger - kimchi_backend - kimchi_pasta - kimchi_pasta.basic - kimchi_backend_common - block_time - data_hash_lib - pickles - sgn - unsigned_extended - random_oracle - codable - ppx_version.runtime - cli_lib - mina_version - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_mina ppx_version ppx_let ppx_sexp_conv - ppx_hash ppx_compare ppx_deriving_yojson h_list.ppx))) + ;; opam libraries + stdio + sexplib0 + result + async.async_command + async + base.caml + bin_prot.shape + caqti-async + core_kernel + archive_lib + caqti-driver-postgresql + async_kernel + core + yojson + caqti + base + base.base_internalhash_types + uri + integers + async_unix + ;; local libraries + mina_wire_types + with_hash + snark_params + crypto_params + pickles_types + mina_numbers + coda_genesis_ledger + currency + pickles.backend + signature_lib + genesis_ledger_helper.lib + genesis_ledger_helper + mina_state + mina_ledger + mina_base + bounded_types + mina_base.import + mina_transaction + mina_transaction_logic + mina_caqti + genesis_constants + mina_runtime_config + logger + kimchi_backend + kimchi_pasta + kimchi_pasta.basic + kimchi_backend_common + block_time + data_hash_lib + pickles + sgn + unsigned_extended + random_oracle + codable + ppx_version.runtime + cli_lib + mina_version) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + ppx_mina + ppx_version + ppx_let + ppx_sexp_conv + ppx_hash + ppx_compare + ppx_deriving_yojson + h_list.ppx))) diff --git a/src/app/rosetta/dune b/src/app/rosetta/dune index 83be7c2bc27..d1120e13d02 100644 --- a/src/app/rosetta/dune +++ b/src/app/rosetta/dune @@ -4,10 +4,19 @@ (public_name rosetta) (modules rosetta) (modes native) - (libraries lib async core_kernel base async.async_command core async_kernel genesis_constants) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version)) -) + (libraries + lib + async + core_kernel + base + async.async_command + core + async_kernel + genesis_constants) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version))) (executable (package rosetta) @@ -15,10 +24,20 @@ (public_name rosetta-testnet) (modules rosetta_testnet_signatures) (modes native) - (libraries lib mina_signature_kind.testnet async core_kernel base async.async_command core async_kernel genesis_constants) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version)) -) + (libraries + lib + mina_signature_kind.testnet + async + core_kernel + base + async.async_command + core + async_kernel + genesis_constants) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version))) (executable (package rosetta) @@ -26,7 +45,17 @@ (public_name rosetta-mainnet) (modules rosetta_mainnet_signatures) (modes native) - (libraries lib mina_signature_kind.mainnet async core_kernel base async.async_command core async_kernel genesis_constants) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version)) -) + (libraries + lib + mina_signature_kind.mainnet + async + core_kernel + base + async.async_command + core + async_kernel + genesis_constants) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version))) diff --git a/src/app/rosetta/lib/dune b/src/app/rosetta/lib/dune index 9c6bf25cd02..7515da8d47c 100644 --- a/src/app/rosetta/lib/dune +++ b/src/app/rosetta/lib/dune @@ -51,8 +51,7 @@ hex mina_numbers mina_transaction - mina_version - ) + mina_version) (preprocessor_deps ../../../graphql-ppx-config.inc ../../../../graphql_schema.json) diff --git a/src/app/rosetta/ocaml-signer/dune b/src/app/rosetta/ocaml-signer/dune index f72365e98d9..f4ac9458523 100644 --- a/src/app/rosetta/ocaml-signer/dune +++ b/src/app/rosetta/ocaml-signer/dune @@ -3,40 +3,39 @@ (public_name signer.cli) (modules signer_cli) (libraries - ;;opam libraries - async_kernel - core - core_kernel - async - base - lib - async_unix - async.async_command - ;;local libraries - kimchi_pasta - kimchi_pasta.basic - pickles - rosetta_coding - rosetta_lib - string_sign - signature_lib - mina_base - snark_params - pickles.backend - secrets - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps - graphql_ppx - ppx_mina - ppx_deriving.show - ppx_deriving_yojson - ppx_base - ppx_let - ppx_version - ppx_compare - )) -) + ;;opam libraries + async_kernel + core + core_kernel + async + base + lib + async_unix + async.async_command + ;;local libraries + kimchi_pasta + kimchi_pasta.basic + pickles + rosetta_coding + rosetta_lib + string_sign + signature_lib + mina_base + snark_params + pickles.backend + secrets) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + graphql_ppx + ppx_mina + ppx_deriving.show + ppx_deriving_yojson + ppx_base + ppx_let + ppx_version + ppx_compare))) (executable (package signer) @@ -45,18 +44,18 @@ (modes native) (modules signer) (libraries signer_cli async core_kernel base) - (instrumentation (backend bisect_ppx)) - (preprocess (pps - graphql_ppx - ppx_mina - ppx_deriving.show - ppx_deriving_yojson - ppx_base - ppx_let - ppx_version - ppx_compare - )) -) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + graphql_ppx + ppx_mina + ppx_deriving.show + ppx_deriving_yojson + ppx_base + ppx_let + ppx_version + ppx_compare))) (executable (package signer) @@ -65,18 +64,18 @@ (modes native) (modules signer_testnet_signatures) (libraries signer_cli async core_kernel base) - (instrumentation (backend bisect_ppx)) - (preprocess (pps - graphql_ppx - ppx_mina - ppx_deriving.show - ppx_deriving_yojson - ppx_base - ppx_let - ppx_version - ppx_compare - )) -) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + graphql_ppx + ppx_mina + ppx_deriving.show + ppx_deriving_yojson + ppx_base + ppx_let + ppx_version + ppx_compare))) (executable (package signer) @@ -85,15 +84,15 @@ (modes native) (modules signer_mainnet_signatures) (libraries signer_cli async core_kernel base) - (instrumentation (backend bisect_ppx)) - (preprocess (pps - graphql_ppx - ppx_mina - ppx_deriving.show - ppx_deriving_yojson - ppx_base - ppx_let - ppx_version - ppx_compare - )) -) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + graphql_ppx + ppx_mina + ppx_deriving.show + ppx_deriving_yojson + ppx_base + ppx_let + ppx_version + ppx_compare))) diff --git a/src/app/rosetta/scripts/berkeley.env b/src/app/rosetta/scripts/berkeley.env deleted file mode 100644 index d64c3057ffe..00000000000 --- a/src/app/rosetta/scripts/berkeley.env +++ /dev/null @@ -1,5 +0,0 @@ -MINA_NETWORK=berkeley -PEER_LIST_URL=https://bootnodes.minaprotocol.com/networks/berkeley.txt -MINA_ARCHIVE_DUMP_URL=https://storage.googleapis.com/mina-archive-dumps -MINA_GENESIS_LEDGER_URL=https://673156464838-mina-genesis-ledgers.s3.us-west-2.amazonaws.com/berkeley/genesis_ledger.json -BLOCKS_BUCKET=https://storage.googleapis.com/mina_network_block_data diff --git a/src/app/runtime_genesis_ledger/dune b/src/app/runtime_genesis_ledger/dune index 0a1191a086d..a6dba29e46b 100644 --- a/src/app/runtime_genesis_ledger/dune +++ b/src/app/runtime_genesis_ledger/dune @@ -2,28 +2,29 @@ (name runtime_genesis_ledger) (public_name runtime_genesis_ledger) (libraries - ;;opam libraries - base - core_kernel - async_kernel - async - core - result - async.async_command - yojson - async_unix - ;;local libraries - genesis_constants - mina_runtime_config - mina_ledger - genesis_ledger_helper - bounded_types - logger - cache_dir - precomputed_values - coda_genesis_ledger - consensus - mina_base - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_mina ppx_version ppx_let ppx_deriving_yojson))) + ;;opam libraries + base + core_kernel + async_kernel + async + core + result + async.async_command + yojson + async_unix + ;;local libraries + genesis_constants + mina_runtime_config + mina_ledger + genesis_ledger_helper + bounded_types + logger + cache_dir + precomputed_values + coda_genesis_ledger + consensus + mina_base) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_mina ppx_version ppx_let ppx_deriving_yojson))) diff --git a/src/app/snark_work_debugger/dune b/src/app/snark_work_debugger/dune index 0f8b91aaea9..9eda39a4279 100644 --- a/src/app/snark_work_debugger/dune +++ b/src/app/snark_work_debugger/dune @@ -4,33 +4,40 @@ (public_name snark_work_debugger) (modes native) (libraries - ;; opam libraries - base - async - async_kernel - async_unix - unix - core - core_kernel - sexplib0 - ;; local libraries - mina_base - snark_worker - bounded_types - snark_work_lib - transaction_witness - transaction_snark - genesis_constants - logger - error_json - transaction_protocol_state - mina_state - currency - mina_ledger - signature_lib - mina_base.import - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_here ppx_custom_printf ppx_version ppx_mina ppx_let ppx_deriving_yojson ppx_sexp_conv)) + ;; opam libraries + base + async + async_kernel + async_unix + unix + core + core_kernel + sexplib0 + ;; local libraries + mina_base + snark_worker + bounded_types + snark_work_lib + transaction_witness + transaction_snark + genesis_constants + logger + error_json + transaction_protocol_state + mina_state + currency + mina_ledger + signature_lib + mina_base.import) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + ppx_here + ppx_custom_printf + ppx_version + ppx_mina + ppx_let + ppx_deriving_yojson + ppx_sexp_conv)) (flags -short-paths -w @a-4-29-40-41-42-44-45-48-58-59-60)) - diff --git a/src/app/validate_keypair/dune b/src/app/validate_keypair/dune index 78e187b0fa9..4346b5856f5 100644 --- a/src/app/validate_keypair/dune +++ b/src/app/validate_keypair/dune @@ -4,15 +4,16 @@ (public_name validate_keypair) (modes native) (libraries - ;; opam libraries - core_kernel - async - async_unix - ;; local libraries - mina_version - bounded_types - cli_lib - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_let ppx_sexp_conv)) + ;; opam libraries + core_kernel + async + async_unix + ;; local libraries + mina_version + bounded_types + cli_lib) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps ppx_version ppx_let ppx_sexp_conv)) (flags -short-paths -w @a-4-29-40-41-42-44-45-48-58-59-60)) diff --git a/src/app/zkapp_limits/dune b/src/app/zkapp_limits/dune index 6cb781b71b2..2c50a3c87ac 100644 --- a/src/app/zkapp_limits/dune +++ b/src/app/zkapp_limits/dune @@ -3,14 +3,22 @@ (name zkapp_limits) (public_name zkapp_limits) (libraries - ;; opam libraries - base - base.caml - core_kernel - ;; local libraries - mina_base - genesis_constants - bounded_types - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_version ppx_mina ppx_custom_printf ppx_let ppx_hash ppx_compare ppx_sexp_conv))) + ;; opam libraries + base + base.caml + core_kernel + ;; local libraries + mina_base + genesis_constants + bounded_types) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + ppx_version + ppx_mina + ppx_custom_printf + ppx_let + ppx_hash + ppx_compare + ppx_sexp_conv))) diff --git a/src/app/zkapp_test_transaction/dune b/src/app/zkapp_test_transaction/dune index ca1edcbdd3c..c81e6d48a82 100644 --- a/src/app/zkapp_test_transaction/dune +++ b/src/app/zkapp_test_transaction/dune @@ -3,24 +3,34 @@ (name zkapp_test_transaction) (public_name zkapp_test_transaction) (libraries - ;;opam libraries - async.async_command - base - core_kernel - core - async_kernel - zkapp_test_transaction_lib - async - async_unix - ;;local libraries - mina_graphql - mina_numbers - currency - bounded_types - cli_lib - mina_base - signature_lib - ) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_custom_printf ppx_mina ppx_assert ppx_version ppx_let ppx_sexp_conv - ppx_hash ppx_compare ppx_deriving_yojson h_list.ppx))) + ;;opam libraries + async.async_command + base + core_kernel + core + async_kernel + zkapp_test_transaction_lib + async + async_unix + ;;local libraries + mina_graphql + mina_numbers + currency + bounded_types + cli_lib + mina_base + signature_lib) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + ppx_custom_printf + ppx_mina + ppx_assert + ppx_version + ppx_let + ppx_sexp_conv + ppx_hash + ppx_compare + ppx_deriving_yojson + h_list.ppx))) diff --git a/src/app/zkapp_test_transaction/lib/dune b/src/app/zkapp_test_transaction/lib/dune index 3b0f5a18ded..81420ca2622 100644 --- a/src/app/zkapp_test_transaction/lib/dune +++ b/src/app/zkapp_test_transaction/lib/dune @@ -2,58 +2,69 @@ (name zkapp_test_transaction_lib) (public_name zkapp_test_transaction_lib) (libraries - ;;opam libraries - async_unix - graphql_parser - splittable_random - result - async - async_kernel - core - core_kernel - base - sexplib0 - base_quickcheck - ppx_inline_test.config - graphql-async - ;;local libraries - pickles - kimchi_pasta - kimchi_pasta.basic - bounded_types - random_oracle - mina_runtime_config - transaction_witness - transaction_protocol_state - coda_genesis_ledger - pickles_types - mina_numbers - random_oracle_input - genesis_ledger_helper - mina_state - mina_generators - mina_base - currency - mina_ledger - mina_graphql - genesis_constants - secrets - transaction_snark - signature_lib - data_hash_lib - consensus - with_hash - genesis_ledger_helper.lib - snark_params - pickles.backend - kimchi_backend - mina_base.import - mina_transaction_logic - mina_transaction - staged_ledger_diff - mina_wire_types - ) - (inline_tests (flags -verbose -show-counts)) - (instrumentation (backend bisect_ppx)) - (preprocess (pps ppx_custom_printf ppx_mina ppx_version ppx_let ppx_sexp_conv - ppx_hash ppx_compare ppx_deriving_yojson h_list.ppx ppx_inline_test))) + ;;opam libraries + async_unix + graphql_parser + splittable_random + result + async + async_kernel + core + core_kernel + base + sexplib0 + base_quickcheck + ppx_inline_test.config + graphql-async + ;;local libraries + pickles + kimchi_pasta + kimchi_pasta.basic + bounded_types + random_oracle + mina_runtime_config + transaction_witness + transaction_protocol_state + coda_genesis_ledger + pickles_types + mina_numbers + random_oracle_input + genesis_ledger_helper + mina_state + mina_generators + mina_base + currency + mina_ledger + mina_graphql + genesis_constants + secrets + transaction_snark + signature_lib + data_hash_lib + consensus + with_hash + genesis_ledger_helper.lib + snark_params + pickles.backend + kimchi_backend + mina_base.import + mina_transaction_logic + mina_transaction + staged_ledger_diff + mina_wire_types) + (inline_tests + (flags -verbose -show-counts)) + (instrumentation + (backend bisect_ppx)) + (preprocess + (pps + ppx_custom_printf + ppx_mina + ppx_version + ppx_let + ppx_sexp_conv + ppx_hash + ppx_compare + ppx_deriving_yojson + h_list.ppx + ppx_inline_test))) diff --git a/src/app/zkapps_examples/add_events/dune b/src/app/zkapps_examples/add_events/dune index 618100a98a1..d8b70325b92 100644 --- a/src/app/zkapps_examples/add_events/dune +++ b/src/app/zkapps_examples/add_events/dune @@ -1,19 +1,20 @@ (library (name zkapps_add_events) (libraries - ;; opam libraries - base - core_kernel - ;; local libraries - crypto_params - currency - mina_base - pickles - pickles_types - snarky.backendless - snark_params - signature_lib - zkapps_examples) - (instrumentation (backend bisect_ppx)) + ;; opam libraries + base + core_kernel + ;; local libraries + crypto_params + currency + mina_base + pickles + pickles_types + snarky.backendless + snark_params + signature_lib + zkapps_examples) + (instrumentation + (backend bisect_ppx)) (preprocess (pps ppx_version))) diff --git a/src/app/zkapps_examples/calls/dune b/src/app/zkapps_examples/calls/dune index eaaa1d87239..0bf875a0810 100644 --- a/src/app/zkapps_examples/calls/dune +++ b/src/app/zkapps_examples/calls/dune @@ -1,33 +1,32 @@ (library (name zkapps_calls) (libraries - ;; opam libraries - base - core_kernel - ;; local libraries - crypto_params - currency - pasta_bindings - kimchi_backend - kimchi_backend_common - kimchi_pasta - kimchi_pasta.basic - mina_base - mina_base.import - pickles - pickles.backend - pickles_types - random_oracle - random_oracle_input - snarky.backendless - snark_params - sgn - signature_lib - tuple_lib - with_hash - zkapps_examples) - (instrumentation (backend bisect_ppx)) + ;; opam libraries + base + core_kernel + ;; local libraries + crypto_params + currency + pasta_bindings + kimchi_backend + kimchi_backend_common + kimchi_pasta + kimchi_pasta.basic + mina_base + mina_base.import + pickles + pickles.backend + pickles_types + random_oracle + random_oracle_input + snarky.backendless + snark_params + sgn + signature_lib + tuple_lib + with_hash + zkapps_examples) + (instrumentation + (backend bisect_ppx)) (preprocess - (pps - ppx_version - h_list.ppx))) + (pps ppx_version h_list.ppx))) diff --git a/src/app/zkapps_examples/dune b/src/app/zkapps_examples/dune index 1db21807142..393112daabf 100644 --- a/src/app/zkapps_examples/dune +++ b/src/app/zkapps_examples/dune @@ -2,36 +2,35 @@ (name zkapps_examples) (public_name zkapps_examples) (libraries - ;; opam libraries - base - async_kernel - core_kernel - ;; local libraries - mina_numbers - crypto_params - currency - pasta_bindings - kimchi_backend - kimchi_backend_common - kimchi_pasta - kimchi_pasta.basic - mina_base - mina_base.import - mina_ledger - pickles - pickles.backend - pickles_types - random_oracle - random_oracle_input - snarky.backendless - snark_params - bounded_types - sgn - signature_lib - tuple_lib - with_hash) - (instrumentation (backend bisect_ppx)) + ;; opam libraries + base + async_kernel + core_kernel + ;; local libraries + mina_numbers + crypto_params + currency + pasta_bindings + kimchi_backend + kimchi_backend_common + kimchi_pasta + kimchi_pasta.basic + mina_base + mina_base.import + mina_ledger + pickles + pickles.backend + pickles_types + random_oracle + random_oracle_input + snarky.backendless + snark_params + bounded_types + sgn + signature_lib + tuple_lib + with_hash) + (instrumentation + (backend bisect_ppx)) (preprocess - (pps - ppx_let - ppx_version))) + (pps ppx_let ppx_version))) diff --git a/src/app/zkapps_examples/empty_update/dune b/src/app/zkapps_examples/empty_update/dune index 10790066528..11e0c98a278 100644 --- a/src/app/zkapps_examples/empty_update/dune +++ b/src/app/zkapps_examples/empty_update/dune @@ -1,28 +1,28 @@ (library (name zkapps_empty_update) (libraries - ;; opam libraries - core_kernel - ;; local libraries - crypto_params - currency - pasta_bindings - kimchi_backend - kimchi_backend_common - kimchi_pasta - kimchi_pasta.basic - mina_base - pickles - pickles.backend - pickles_types - random_oracle - snarky.backendless - snark_params - sgn - signature_lib - tuple_lib - zkapps_examples) - (instrumentation (backend bisect_ppx)) + ;; opam libraries + core_kernel + ;; local libraries + crypto_params + currency + pasta_bindings + kimchi_backend + kimchi_backend_common + kimchi_pasta + kimchi_pasta.basic + mina_base + pickles + pickles.backend + pickles_types + random_oracle + snarky.backendless + snark_params + sgn + signature_lib + tuple_lib + zkapps_examples) + (instrumentation + (backend bisect_ppx)) (preprocess - (pps - ppx_version))) + (pps ppx_version))) diff --git a/src/app/zkapps_examples/initialize_state/dune b/src/app/zkapps_examples/initialize_state/dune index 5dc9bcf172f..63590bd026c 100644 --- a/src/app/zkapps_examples/initialize_state/dune +++ b/src/app/zkapps_examples/initialize_state/dune @@ -1,29 +1,29 @@ (library (name zkapps_initialize_state) (libraries - ;; opam libraries - base - core_kernel - ;; local libraries - crypto_params - currency - pasta_bindings - kimchi_backend - kimchi_backend_common - kimchi_pasta - kimchi_pasta.basic - mina_base - pickles - pickles.backend - pickles_types - random_oracle - snarky.backendless - snark_params - sgn - signature_lib - tuple_lib - zkapps_examples) - (instrumentation (backend bisect_ppx)) + ;; opam libraries + base + core_kernel + ;; local libraries + crypto_params + currency + pasta_bindings + kimchi_backend + kimchi_backend_common + kimchi_pasta + kimchi_pasta.basic + mina_base + pickles + pickles.backend + pickles_types + random_oracle + snarky.backendless + snark_params + sgn + signature_lib + tuple_lib + zkapps_examples) + (instrumentation + (backend bisect_ppx)) (preprocess - (pps - ppx_version))) + (pps ppx_version))) diff --git a/src/app/zkapps_examples/test/actions/dune b/src/app/zkapps_examples/test/actions/dune index baa85f43623..3c02027061c 100644 --- a/src/app/zkapps_examples/test/actions/dune +++ b/src/app/zkapps_examples/test/actions/dune @@ -40,7 +40,8 @@ zkapps_examples yojson mina_wire_types) - (inline_tests (flags -verbose -show-counts)) + (inline_tests + (flags -verbose -show-counts)) (preprocess (pps ppx_version ppx_jane)) (instrumentation diff --git a/src/app/zkapps_examples/test/add_events/dune b/src/app/zkapps_examples/test/add_events/dune index 583a5c247c7..e86b6cad48e 100644 --- a/src/app/zkapps_examples/test/add_events/dune +++ b/src/app/zkapps_examples/test/add_events/dune @@ -1,41 +1,42 @@ (library (name add_events) (libraries - ;; opam libraries - async - async_kernel - async_unix - core - core_kernel - ppx_inline_test.config - ;; local libraries - cache_dir - currency - data_hash_lib - genesis_constants - kimchi_backend - kimchi_pasta - kimchi_pasta.basic - merkle_ledger - merkle_list_verifier - mina_base - mina_base.import - mina_ledger - mina_numbers - pickles - pickles.backend - pickles_types - random_oracle_input - random_oracle - signature_lib - snark_params - transaction_snark - transaction_snark_tests - with_hash - zkapps_add_events - zkapps_examples - ) - (inline_tests (flags -verbose -show-counts)) - (preprocess - (pps ppx_version ppx_jane)) - (instrumentation (backend bisect_ppx))) + ;; opam libraries + async + async_kernel + async_unix + core + core_kernel + ppx_inline_test.config + ;; local libraries + cache_dir + currency + data_hash_lib + genesis_constants + kimchi_backend + kimchi_pasta + kimchi_pasta.basic + merkle_ledger + merkle_list_verifier + mina_base + mina_base.import + mina_ledger + mina_numbers + pickles + pickles.backend + pickles_types + random_oracle_input + random_oracle + signature_lib + snark_params + transaction_snark + transaction_snark_tests + with_hash + zkapps_add_events + zkapps_examples) + (inline_tests + (flags -verbose -show-counts)) + (preprocess + (pps ppx_version ppx_jane)) + (instrumentation + (backend bisect_ppx))) diff --git a/src/app/zkapps_examples/test/calls/dune b/src/app/zkapps_examples/test/calls/dune index 25706b15533..d1ed0f79578 100644 --- a/src/app/zkapps_examples/test/calls/dune +++ b/src/app/zkapps_examples/test/calls/dune @@ -1,48 +1,49 @@ (library (name calls) (libraries - ;; opam libraries - async - async_kernel - async_unix - base - core - core_kernel - ppx_inline_test.config - yojson - ;; local libraries - cache_dir - currency - data_hash_lib - genesis_constants - pasta_bindings - kimchi_backend - kimchi_pasta - kimchi_pasta.basic - merkle_ledger - 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_calls - zkapps_examples - ) - (inline_tests (flags -verbose -show-counts)) - (preprocess - (pps ppx_snarky ppx_version ppx_jane)) - (instrumentation (backend bisect_ppx))) + ;; opam libraries + async + async_kernel + async_unix + base + core + core_kernel + ppx_inline_test.config + yojson + ;; local libraries + cache_dir + currency + data_hash_lib + genesis_constants + pasta_bindings + kimchi_backend + kimchi_pasta + kimchi_pasta.basic + merkle_ledger + 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_calls + zkapps_examples) + (inline_tests + (flags -verbose -show-counts)) + (preprocess + (pps ppx_snarky ppx_version ppx_jane)) + (instrumentation + (backend bisect_ppx))) diff --git a/src/app/zkapps_examples/test/empty_update/dune b/src/app/zkapps_examples/test/empty_update/dune index 534cf6ac7b1..c36a8be7eff 100644 --- a/src/app/zkapps_examples/test/empty_update/dune +++ b/src/app/zkapps_examples/test/empty_update/dune @@ -1,51 +1,51 @@ (executable (name empty_update) (libraries - ;; opam libraries - async - async_kernel - async_unix - base - core - core_kernel - ppx_inline_test.config - yojson - ;; 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_base - 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 - ) - (preprocess - (pps ppx_snarky ppx_version ppx_jane)) - (instrumentation (backend bisect_ppx))) + ;; opam libraries + async + async_kernel + async_unix + base + core + core_kernel + ppx_inline_test.config + yojson + ;; 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_base + 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) + (preprocess + (pps ppx_snarky ppx_version ppx_jane)) + (instrumentation + (backend bisect_ppx))) (rule (alias runtest) diff --git a/src/app/zkapps_examples/test/initialize_state/dune b/src/app/zkapps_examples/test/initialize_state/dune index eac8a441070..e5693dee970 100644 --- a/src/app/zkapps_examples/test/initialize_state/dune +++ b/src/app/zkapps_examples/test/initialize_state/dune @@ -1,48 +1,49 @@ (library (name initialize_state) (libraries - ;; opam libraries - async - async_kernel - async_unix - base - core - core_kernel - ppx_inline_test.config - yojson - ;; local libraries - cache_dir - currency - data_hash_lib - genesis_constants - pasta_bindings - kimchi_backend - kimchi_pasta - kimchi_pasta.basic - merkle_ledger - 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_initialize_state - zkapps_examples - ) - (inline_tests (flags -verbose -show-counts)) - (preprocess - (pps ppx_snarky ppx_version ppx_jane)) - (instrumentation (backend bisect_ppx))) + ;; opam libraries + async + async_kernel + async_unix + base + core + core_kernel + ppx_inline_test.config + yojson + ;; local libraries + cache_dir + currency + data_hash_lib + genesis_constants + pasta_bindings + kimchi_backend + kimchi_pasta + kimchi_pasta.basic + merkle_ledger + 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_initialize_state + zkapps_examples) + (inline_tests + (flags -verbose -show-counts)) + (preprocess + (pps ppx_snarky ppx_version ppx_jane)) + (instrumentation + (backend bisect_ppx))) diff --git a/src/app/zkapps_examples/test/optional_custom_gates/dune b/src/app/zkapps_examples/test/optional_custom_gates/dune index ecf9f3905ac..573edf08c77 100644 --- a/src/app/zkapps_examples/test/optional_custom_gates/dune +++ b/src/app/zkapps_examples/test/optional_custom_gates/dune @@ -1,43 +1,44 @@ (library - (name zkapp_optional_custom_gates_tests) + (name zkapp_optional_custom_gates_tests) (libraries - ;; opam libraries - ppx_inline_test.config - async - async_kernel - async_unix - core - core_kernel - result - base - base.caml - sexplib0 - integers - ;; local libraries - mina_base.import - transaction_snark - mina_ledger - mina_base - mina_generators - currency - pickles - pickles_types - mina_numbers - zkapp_command_builder - signature_lib - genesis_constants - sgn - transaction_snark_tests - test_util - mina_transaction_logic - zkapps_examples - pickles_optional_custom_gates_circuits - snark_keys_header - snark_params - data_hash_lib - ) - (library_flags -linkall) - (inline_tests (flags -verbose -show-counts)) - (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 + core_kernel + result + base + base.caml + sexplib0 + integers + ;; local libraries + mina_base.import + transaction_snark + mina_ledger + mina_base + mina_generators + currency + pickles + pickles_types + mina_numbers + zkapp_command_builder + signature_lib + genesis_constants + sgn + transaction_snark_tests + test_util + mina_transaction_logic + zkapps_examples + pickles_optional_custom_gates_circuits + snark_keys_header + snark_params + data_hash_lib) + (library_flags -linkall) + (inline_tests + (flags -verbose -show-counts)) + (preprocess + (pps ppx_snarky ppx_version ppx_jane ppx_mina)) + (instrumentation + (backend bisect_ppx))) diff --git a/src/app/zkapps_examples/test/tokens/dune b/src/app/zkapps_examples/test/tokens/dune index 48ecefc7bbe..05877f35fdf 100644 --- a/src/app/zkapps_examples/test/tokens/dune +++ b/src/app/zkapps_examples/test/tokens/dune @@ -1,49 +1,50 @@ (library (name tokens) (libraries - ;; opam libraries - async - async_kernel - async_unix - base - core - core_kernel - ppx_inline_test.config - yojson - ;; local libraries - cache_dir - currency - data_hash_lib - genesis_constants - pasta_bindings - kimchi_backend - kimchi_pasta - kimchi_pasta.basic - merkle_ledger - 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_tokens - zkapps_examples - bounded_types - ) - (inline_tests (flags -verbose -show-counts)) - (preprocess - (pps ppx_snarky ppx_version ppx_jane)) - (instrumentation (backend bisect_ppx))) + ;; opam libraries + async + async_kernel + async_unix + base + core + core_kernel + ppx_inline_test.config + yojson + ;; local libraries + cache_dir + currency + data_hash_lib + genesis_constants + pasta_bindings + kimchi_backend + kimchi_pasta + kimchi_pasta.basic + merkle_ledger + 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_tokens + zkapps_examples + bounded_types) + (inline_tests + (flags -verbose -show-counts)) + (preprocess + (pps ppx_snarky ppx_version ppx_jane)) + (instrumentation + (backend bisect_ppx))) diff --git a/src/app/zkapps_examples/tokens/dune b/src/app/zkapps_examples/tokens/dune index 1e82e848990..d9f359830bd 100644 --- a/src/app/zkapps_examples/tokens/dune +++ b/src/app/zkapps_examples/tokens/dune @@ -1,40 +1,38 @@ (library (name zkapps_tokens) (libraries - ;; opam libraries - async - async_kernel - async_unix - base - core_kernel - ;; local libraries - cache_dir - crypto_params - currency - genesis_constants - kimchi_backend - kimchi_backend_common - kimchi_pasta - mina_base - mina_base.import - pasta_bindings - pickles - pickles.backend - pickles_base - pickles_types - random_oracle - random_oracle_input - sgn - signature_lib - snark_params - snarky.backendless - tuple_lib - with_hash - yojson - zkapps_examples) - (instrumentation (backend bisect_ppx)) + ;; opam libraries + async + async_kernel + async_unix + base + core_kernel + ;; local libraries + cache_dir + crypto_params + currency + genesis_constants + kimchi_backend + kimchi_backend_common + kimchi_pasta + mina_base + mina_base.import + pasta_bindings + pickles + pickles.backend + pickles_base + pickles_types + random_oracle + random_oracle_input + sgn + signature_lib + snark_params + snarky.backendless + tuple_lib + with_hash + yojson + zkapps_examples) + (instrumentation + (backend bisect_ppx)) (preprocess - (pps - ppx_version - h_list.ppx - ppx_let))) + (pps ppx_version h_list.ppx ppx_let))) diff --git a/src/dune-project b/src/dune-project index 2f20023ccf9..00cf502607a 100644 --- a/src/dune-project +++ b/src/dune-project @@ -134,8 +134,8 @@ (package (name parallel)) (package (name parallel_scan)) (package (name participating_state)) -(package (name pasta_bindings)) (package (name patch_archive_test)) +(package (name pasta_bindings)) (package (name perf_histograms)) (package (name pickles_base)) (package (name pickles)) 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/cache_dir.ml b/src/lib/cache_dir/native/cache_dir.ml index 8450d40bfd7..d76cd00aa38 100644 --- a/src/lib/cache_dir/native/cache_dir.ml +++ b/src/lib/cache_dir/native/cache_dir.ml @@ -55,7 +55,7 @@ let load_from_s3 s3_bucket_prefix s3_install_path ~logger = @@ Monitor.try_with ~here:[%here] (fun () -> let each_uri (uri_string, file_path) = let open Deferred.Let_syntax in - [%log trace] "Downloading file from S3" + [%log trace] "Downloading file from S3: $url to $local_file_path" ~metadata: [ ("url", `String uri_string) ; ("local_file_path", `String file_path) 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..8c7023e6d49 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 @@ -45,8 +46,9 @@ kimchi_pasta.basic ppx_version.runtime gossip_net - mina_runtime_config) + 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/integration_test_lib/test_config.ml b/src/lib/integration_test_lib/test_config.ml index 26f85f98338..c31dff82ae2 100644 --- a/src/lib/integration_test_lib/test_config.ml +++ b/src/lib/integration_test_lib/test_config.ml @@ -88,14 +88,14 @@ type t = let proof_config_default : Runtime_config.Proof_keys.t = { level = Some Full - ; sub_windows_per_window = None - ; ledger_depth = None - ; work_delay = None + ; sub_windows_per_window = Some 11 + ; ledger_depth = Some 35 + ; work_delay = Some 2 ; block_window_duration_ms = Some 120000 - ; transaction_capacity = None - ; coinbase_amount = None - ; supercharged_coinbase_factor = None - ; account_creation_fee = None + ; transaction_capacity = Some (Log_2 7) + ; coinbase_amount = Some (Currency.Amount.of_mina_int_exn 720) + ; supercharged_coinbase_factor = Some 1 + ; account_creation_fee = Some (Currency.Fee.of_mina_string_exn "1") ; fork = Some { blockchain_length = 0 diff --git a/src/lib/integration_test_local_engine/docker_node_config.ml b/src/lib/integration_test_local_engine/docker_node_config.ml index 16bba170998..f207055960d 100644 --- a/src/lib/integration_test_local_engine/docker_node_config.ml +++ b/src/lib/integration_test_local_engine/docker_node_config.ml @@ -105,6 +105,7 @@ module Base_node_config = struct mina accounts import -config-directory /root/.mina-config -privkey-path "$key_file" fi done + rm /var/lib/coda/config* # Execute the puppeteer script exec /mina_daemon_puppeteer.py "$@" |} diff --git a/src/lib/integration_test_local_engine/mina_docker.ml b/src/lib/integration_test_local_engine/mina_docker.ml index 6b23207352e..12ef4242312 100644 --- a/src/lib/integration_test_local_engine/mina_docker.ml +++ b/src/lib/integration_test_local_engine/mina_docker.ml @@ -154,8 +154,17 @@ module Network_config = struct Some { Runtime_config.Daemon.default with txpool_max_size = Some txpool_max_size + ; peer_list_url = None + ; zkapp_proof_update_cost = Some 10.26 + ; zkapp_signed_single_update_cost = Some 9.140000000000001 + ; zkapp_signed_pair_update_cost = Some 10.08 + ; zkapp_transaction_cost_limit = Some 69.45 + ; max_event_elements = Some 100 + ; max_action_elements = Some 100 + ; zkapp_cmd_limit_hardcap = Some 128 ; slot_tx_end ; slot_chain_end + ; minimum_user_command_fee = Some (Currency.Fee.of_string "1000000") ; network_id } ; genesis = 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..25d27c92d4a 100644 --- a/src/lib/mina_compile_config/dune +++ b/src/lib/mina_compile_config/dune @@ -1,6 +1,8 @@ (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 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")) diff --git a/src/test/archive/patch_archive_test/patch_archive_test.ml b/src/test/archive/patch_archive_test/patch_archive_test.ml index 5ba17608041..cdeaa635ddf 100644 --- a/src/test/archive/patch_archive_test/patch_archive_test.ml +++ b/src/test/archive/patch_archive_test/patch_archive_test.ml @@ -77,10 +77,10 @@ let main ~db_uri ~network_data_folder () = let n = List.init missing_blocks_count ~f:(fun _ -> - (* never remove last block as missing-block-guardian can have issues when patching it + (* never remove last and first block as missing-block-guardian can have issues when patching it as it patching only gaps *) - Random.int (List.length extensional_files - 1) ) + Random.int (List.length extensional_files - 2) + 1 ) in let unpatched_extensional_files =