Remove some t_DEPRECATED usage across codebase

Makefile

@@ -178,30 +178,6 @@ build-logproc: ocaml_checks reformat-diff libp2p_helper ## Build the logproc exe
 		--profile=$(DUNE_PROFILE) \
 		&& echo "✅ Build complete"
 
-.PHONY: build-mainnet-sigs
-build-mainnet-sigs: ocaml_checks reformat-diff libp2p_helper build ## Build mainnet signature variants of the daemon
-	$(info 🏗️  Building mainnet signature variants with profile $(DUNE_PROFILE) and commit $(GITLONGHASH))
-	@(ulimit -s 65532 || true) && (ulimit -n 10240 || true) && \
-	env MINA_COMMIT_SHA1=$(GITLONGHASH) \
-	dune build \
-		src/app/cli/src/mina_mainnet_signatures.exe \
-		src/app/rosetta/rosetta_mainnet_signatures.exe \
-		src/app/rosetta/ocaml-signer/signer_mainnet_signatures.exe \
-		--profile=mainnet \
-		&& echo "✅ Build complete"
-
-.PHONY: build-devnet-sigs
-build-devnet-sigs: ocaml_checks reformat-diff libp2p_helper build ## Build devnet signature variants of the daemon
-	$(info 🏗️  Building devnet signature variants with profile $(DUNE_PROFILE) and commit $(GITLONGHASH))
-	@(ulimit -s 65532 || true) && (ulimit -n 10240 || true) && \
-	env MINA_COMMIT_SHA1=$(GITLONGHASH) \
-	dune build \
-		src/app/cli/src/mina_testnet_signatures.exe \
-		src/app/rosetta/rosetta_testnet_signatures.exe \
-		src/app/rosetta/ocaml-signer/signer_testnet_signatures.exe \
-		--profile=devnet \
-		&& echo "✅ Build complete"
-
 .PHONY: build-archive
 build-archive: ocaml_checks reformat-diff ## Build the archive node
 	$(info 🏗️  Building archive with profile $(DUNE_PROFILE) and commit $(GITLONGHASH))

buildkite/scripts/bench/install.sh

@@ -5,13 +5,11 @@ set -eo pipefail
 # Don't prompt for answers during apt-get install
 export DEBIAN_FRONTEND=noninteractive
 
-TESTNET_NAME="berkeley"
-
 git config --global --add safe.directory /workdir
 source buildkite/scripts/export-git-env-vars.sh
 
 source buildkite/scripts/debian/update.sh --verbose
 
-source buildkite/scripts/debian/install.sh "mina-test-suite,mina-$TESTNET_NAME" 1
+source buildkite/scripts/debian/install.sh "mina-test-suite-instrumented,mina-base-instrumented" 1
 
 pip3 install -r scripts/benchmarks/requirements.txt

buildkite/scripts/build-artifact.sh

@@ -14,21 +14,20 @@ if [[ -v DUNE_INSTRUMENT_WITH ]]; then
   export DUNE_INSTRUMENT_WITH="$DUNE_INSTRUMENT_WITH"
 fi
 
-
 echo "--- Build all major targets required for packaging"
 echo "Building from Commit SHA: ${MINA_COMMIT_SHA1}"
 echo "Rust Version: $(rustc --version)"
 
 make libp2p_helper
 
-make build-logproc
-
-[[ ${MINA_BUILD_MAINNET} ]] && make build-mainnet-sigs
+make build
 
-make build-devnet-sigs
+make build-logproc
 
 make build-daemon-utils
 
 make build-archive-utils
 
+make build-rosetta
+
 make build-test-utils

buildkite/scripts/build-release.sh

@@ -8,8 +8,6 @@ set -eo pipefail
 
 echo "--- Bundle all packages for Debian ${MINA_DEB_CODENAME}"
 echo " Includes mina daemon, archive-node, rosetta"
-[[ ${MINA_BUILD_MAINNET} ]] && echo " MINA_BUILD_MAINNET is true so this includes the mainnet and devnet packages for mina-daemon as well"
-
 
 echo "--- Prepare debian packages"
 BRANCH_NAME="$BUILDKITE_BRANCH" ./scripts/debian/build.sh "$@"

buildkite/scripts/debian/install.sh

@@ -37,15 +37,16 @@ else
   debs=(${DEBS//,/ })
   for i in "${debs[@]}"; do
     case $i in
-      mina-berkeley*|mina-devnet|mina-mainnet)
-        # Downaload mina-logproc too
+      mina-base*|mina-devnet|mina-mainnet)
+        # Download mina-logproc, mina-base too
+        ./buildkite/scripts/cache/manager.sh read "debians/$MINA_DEB_CODENAME/mina-base*" $LOCAL_DEB_FOLDER
         ./buildkite/scripts/cache/manager.sh read "debians/$MINA_DEB_CODENAME/mina-logproc*" $LOCAL_DEB_FOLDER
       ;;
       mina-devnet-legacy|mina-mainnet-legacy)
         # Download mina-logproc legacy too
         ./buildkite/scripts/cache/manager.sh read --root "legacy" "debians/$MINA_DEB_CODENAME/${i}*" $LOCAL_DEB_FOLDER
     esac
-    ./buildkite/scripts/cache/manager.sh read "debians/$MINA_DEB_CODENAME/${i}_*" $LOCAL_DEB_FOLDER
+    ./buildkite/scripts/cache/manager.sh read "debians/$MINA_DEB_CODENAME/${i}*" $LOCAL_DEB_FOLDER
   done
 fi
 
@@ -66,7 +67,5 @@ $SUDO apt-get update --yes -o Dir::Etc::sourcelist="sources.list.d/mina.list" -o
 $SUDO apt-get remove --yes "${debs[@]}"
 $SUDO apt-get install --yes --allow-downgrades "${debs_with_version[@]}"
 
-
-
 # Cleaning up
 source ./scripts/debian/aptly.sh stop  --clean

buildkite/scripts/dump-mina-type-shapes.sh

@@ -4,12 +4,10 @@ set -eo pipefail
 
 buildkite/scripts/debian/update.sh --verbose
 
-TESTNET_NAME="berkeley"
-
 git config --global --add safe.directory /workdir
 source buildkite/scripts/export-git-env-vars.sh
 
-source buildkite/scripts/debian/install.sh "mina-${TESTNET_NAME}" 1
+source buildkite/scripts/debian/install.sh "mina-base" 1
 
 MINA_COMMIT_SHA1=$(git log -n 1 --format=%h --abbrev=7)
 export TYPE_SHAPE_FILE=${MINA_COMMIT_SHA1}-type_shape.txt

buildkite/scripts/run-test-executive-local.sh

@@ -26,8 +26,8 @@ cleanup
 
 TEST_NAME="$1"
 
-MINA_IMAGE="gcr.io/o1labs-192920/mina-daemon:$MINA_DOCKER_TAG-berkeley"
-ARCHIVE_IMAGE="gcr.io/o1labs-192920/mina-archive:$MINA_DOCKER_TAG-berkeley"
+MINA_IMAGE="gcr.io/o1labs-192920/mina-daemon:$MINA_DOCKER_TAG"
+ARCHIVE_IMAGE="gcr.io/o1labs-192920/mina-archive:$MINA_DOCKER_TAG"
 
 if [[ "${TEST_NAME:0:15}" == "block-prod-prio" ]] && [[ "$RUN_OPT_TESTS" == "" ]]; then
   echo "Skipping $TEST_NAME"

buildkite/scripts/single-node-tests.sh

@@ -11,9 +11,10 @@ source buildkite/scripts/export-git-env-vars.sh
 
 source buildkite/scripts/debian/update.sh --verbose
 
-source buildkite/scripts/debian/install.sh "mina-test-suite,mina-berkeley-lightnet" 1
+source buildkite/scripts/debian/install.sh "mina-test-suite-instrumented,mina-base-instrumented" 1
 
 export MINA_LIBP2P_PASS="naughty blue worm"
 export MINA_PRIVKEY_PASS="naughty blue worm"
+export MINA_SIGNATURE_KIND="testnet"
 
 mina-command-line-tests test -v

buildkite/scripts/test-nix.sh

@@ -67,7 +67,8 @@ git reset --hard $BUILDKITE_COMMIT
 # Test developer terminal with lsp server
 nix "${NIX_OPTS[@]}" develop "$PWD?submodules=1#with-lsp" --command bash -c "echo tested"
 nix "${NIX_OPTS[@]}" develop "$PWD?submodules=1#with-lsp" --command bash -c "dune build src" &
-  nix "${NIX_OPTS[@]}" build "$PWD?submodules=1#devnet" --no-link
+nix "${NIX_OPTS[@]}" build "$PWD?submodules=1" --no-link
+
 wait
 
 if [[ "$NIX_CACHE_GCP_ID" != "" ]] && [[ "$NIX_CACHE_GCP_SECRET" != "" ]]; then

buildkite/scripts/tests/ledger_test_apply.sh

@@ -11,7 +11,7 @@ source buildkite/scripts/export-git-env-vars.sh
 
 source buildkite/scripts/debian/update.sh --verbose
 
-source buildkite/scripts/debian/install.sh "mina-berkeley-instrumented" 1
+source buildkite/scripts/debian/install.sh "mina-base-instrumented" 1
 
 echo "removing magic config files"
 sudo rm -f /var/lib/coda/config_*

buildkite/scripts/version-linter.sh

@@ -7,8 +7,6 @@ if [[ $# -ne 1 ]]; then
     exit 1
 fi
 
-TESTNET_NAME="${TESTNET_NAME:-berkeley}"
-
 git config --global --add safe.directory /workdir
 
 source buildkite/scripts/debian/update.sh --verbose
@@ -30,7 +28,7 @@ echo "--- Run Python version linter with branches: ${pr_branch} ${base_branch} $
 echo "--- Install Mina"
 source buildkite/scripts/export-git-env-vars.sh
 
-source buildkite/scripts/debian/install.sh "mina-${TESTNET_NAME}" 1
+source buildkite/scripts/debian/install.sh "mina-base" 1
 
 echo "--- Audit type shapes"
 mina internal audit-type-shapes

buildkite/src/Command/Base.dhall

@@ -102,7 +102,7 @@ let Config =
           , flake_retry_limit : Optional Natural
           , soft_fail : Optional B/SoftFail
           , skip : Optional B/Skip
-          , if : Optional B/If
+          , if_ : Optional B/If
           , timeout_in_minutes : Optional Integer
           }
       , default =
@@ -116,7 +116,7 @@ let Config =
           , flake_retry_limit = Some 0
           , soft_fail = None B/SoftFail
           , skip = None B/Skip
-          , if = None B/If
+          , if_ = None B/If
           , timeout_in_minutes = None Integer
           }
       }
@@ -244,7 +244,7 @@ let build
               }
           , soft_fail = c.soft_fail
           , skip = c.skip
-          , if = c.if
+          , `if` = c.if_
           , plugins =
               let dockerPart =
                     Optional/toList

buildkite/src/Command/Bench/Base.dhall

@@ -51,7 +51,6 @@ let Spec =
                   DebianVersions.DepsSpec::{
                   , build_flag = BuildFlags.Type.Instrumented
                   }
-              # DebianVersions.dependsOn DebianVersions.DepsSpec::{=}
           , additionalDirtyWhen = [] : List SelectFiles.Type
           , yellowThreshold = 0.1
           , redThreshold = 0.2

buildkite/src/Command/DockerImage.dhall

@@ -54,11 +54,11 @@ let ReleaseSpec =
           , step_key_suffix : Text
           , docker_publish : DockerPublish.Type
           , verify : Bool
-          , if : Optional B/If
+          , if_ : Optional B/If
           }
       , default =
           { deps = [] : List Command.TaggedKey.Type
-          , network = Network.Type.Berkeley
+          , network = Network.Type.Base
           , arch = Arch.Type.Amd64
           , version = "\\\${MINA_DOCKER_TAG}"
           , service = Artifacts.Type.Daemon
@@ -68,7 +68,7 @@ let ReleaseSpec =
           , deb_release = "unstable"
           , deb_version = "\\\${MINA_DEB_VERSION}"
           , deb_legacy_version = "3.1.1-alpha1-compatible-14a8b92"
-          , deb_profile = Profiles.Type.Devnet
+          , deb_profile = Profiles.Type.PublicNetwork
           , build_flags = BuildFlags.Type.None
           , deb_repo = DebianRepo.Type.Local
           , docker_publish = DockerPublish.Type.Essential
@@ -77,7 +77,7 @@ let ReleaseSpec =
           , step_key_suffix = "-docker-image"
           , verify = False
           , deb_suffix = None Text
-          , if = None B/If
+          , if_ = None B/If
           }
       }
 
@@ -124,8 +124,7 @@ let generateStep =
                 Extensions.joinOptionals
                   "-"
                   [ merge
-                      { Mainnet = None Text
-                      , Devnet = None Text
+                      { PublicNetwork = None Text
                       , Dev = None Text
                       , Lightnet = Some
                           "${Profiles.toSuffixLowercase spec.deb_profile}"
@@ -253,7 +252,7 @@ let generateStep =
                 , target = Size.XLarge
                 , docker_login = Some DockerLogin::{=}
                 , depends_on = spec.deps
-                , if = spec.if
+                , if_ = spec.if_
                 }
 
 in  { generateStep = generateStep