Revert "[anza migration] rename crates (solana-labs#10)"

This reverts commit 3f9a7a5.
stevenbooke · Mar 18, 2024 · 55b31e4 · 55b31e4
1 parent 05e6bb3
commit 55b31e4
Show file tree

Hide file tree

Showing 73 changed files with 568 additions and 290 deletions.
diff --git a/.github/scripts/downstream-project-spl-common.sh b/.github/scripts/downstream-project-spl-common.sh
@@ -22,6 +22,3 @@ if semverGT "$project_used_solana_version" "$SOLANA_VER"; then
 fi
 
 ./patch.crates-io.sh "$SOLANA_DIR"
-
-# anza migration stopgap. can be removed when agave is fully recommended for public usage.
-sed -i 's/solana-geyser-plugin-interface/agave-geyser-plugin-interface/g' ./Cargo.toml
diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml
@@ -61,7 +61,7 @@ jobs:
           mkdir -p "windows-release/$FOLDER_NAME"
           cp -v "solana-release-x86_64-pc-windows-msvc.tar.bz2" "windows-release/$FOLDER_NAME/"
           cp -v "solana-release-x86_64-pc-windows-msvc.yml" "windows-release/$FOLDER_NAME/"
-          cp -v "agave-install-init-x86_64-pc-windows-msvc"* "windows-release/$FOLDER_NAME"
+          cp -v "solana-install-init-x86_64-pc-windows-msvc"* "windows-release/$FOLDER_NAME"
 
       - name: Upload Artifacts
         if: ${{ steps.build.outputs.channel != '' || steps.build.outputs.tag != '' }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cargo-registry/Cargo.toml b/cargo-registry/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
-name = "agave-cargo-registry"
+name = "solana-cargo-registry"
 description = "Solana cargo registry"
-documentation = "https://docs.rs/agave-cargo-registry"
+documentation = "https://docs.rs/solana-cargo-registry"
 version = { workspace = true }
 authors = { workspace = true }
 repository = { workspace = true }

diff --git a/ci/localnet-sanity.sh b/ci/localnet-sanity.sh
@@ -202,8 +202,8 @@ killNodes() {
   # Try to use the RPC exit API to cleanly exit the first two nodes
   # (dynamic nodes, -x, are just killed)
   echo "--- RPC exit"
-  $agave_validator --ledger "$SOLANA_CONFIG_DIR"/bootstrap-validator exit --force || true
-  $agave_validator --ledger "$SOLANA_CONFIG_DIR"/validator exit --force || true
+  $solana_validator --ledger "$SOLANA_CONFIG_DIR"/bootstrap-validator exit --force || true
+  $solana_validator --ledger "$SOLANA_CONFIG_DIR"/validator exit --force || true
 
   # Give the nodes a splash of time to cleanly exit before killing them
   sleep 2

diff --git a/ci/publish-installer.sh b/ci/publish-installer.sh
@@ -31,7 +31,7 @@ SOLANA_RELEASE=$CHANNEL_OR_TAG
 SOLANA_INSTALL_INIT_ARGS=$CHANNEL_OR_TAG
 SOLANA_DOWNLOAD_ROOT=https://release.anza.xyz
 EOF
-cat install/agave-install-init.sh >>release.anza.xyz-install
+cat install/solana-install-init.sh >>release.anza.xyz-install
 
 echo --- GCS: "install"
 upload-gcs-artifact "/solana/release.anza.xyz-install" "gs://anza-release/$CHANNEL_OR_TAG/install"

diff --git a/ci/publish-tarball.sh b/ci/publish-tarball.sh
@@ -93,7 +93,7 @@ echo --- Creating release tarball
 
   tar cvf "${TARBALL_BASENAME}"-$TARGET.tar "${RELEASE_BASENAME}"
   bzip2 "${TARBALL_BASENAME}"-$TARGET.tar
-  cp "${RELEASE_BASENAME}"/bin/agave-install-init agave-install-init-$TARGET
+  cp "${RELEASE_BASENAME}"/bin/solana-install-init solana-install-init-$TARGET
   cp "${RELEASE_BASENAME}"/version.yml "${TARBALL_BASENAME}"-$TARGET.yml
 )
 
@@ -110,7 +110,7 @@ fi
 
 source ci/upload-ci-artifact.sh
 
-for file in "${TARBALL_BASENAME}"-$TARGET.tar.bz2 "${TARBALL_BASENAME}"-$TARGET.yml agave-install-init-"$TARGET"* $MAYBE_TARBALLS; do
+for file in "${TARBALL_BASENAME}"-$TARGET.tar.bz2 "${TARBALL_BASENAME}"-$TARGET.yml solana-install-init-"$TARGET"* $MAYBE_TARBALLS; do
   if [[ -n $DO_NOT_PUBLISH_TAR ]]; then
     upload-ci-artifact "$file"
     echo "Skipped $file due to DO_NOT_PUBLISH_TAR"

diff --git a/ci/run-sanity.sh b/ci/run-sanity.sh
@@ -31,7 +31,7 @@ while [[ $latest_slot -le $((snapshot_slot + 1)) ]]; do
   latest_slot=$($solana_cli --url http://localhost:8899 slot --commitment processed)
 done
 
-$agave_validator --ledger config/ledger exit --force || true
+$solana_validator --ledger config/ledger exit --force || true
 
 wait $pid
 

diff --git a/docs/src/backwards-compatibility.md b/docs/src/backwards-compatibility.md
@@ -76,7 +76,7 @@ Major releases:
 - [`solana-program`](https://docs.rs/solana-program/) - Rust SDK for writing programs
 - [`solana-client`](https://docs.rs/solana-client/) - Rust client for connecting to RPC API
 - [`solana-cli-config`](https://docs.rs/solana-cli-config/) - Rust client for managing Solana CLI config files
-- [`agave-geyser-plugin-interface`](https://docs.rs/agave-geyser-plugin-interface/) - Rust interface for developing Solana Geyser plugins.
+- [`solana-geyser-plugin-interface`](https://docs.rs/solana-geyser-plugin-interface/) - Rust interface for developing Solana Geyser plugins.
 
 Patch releases:
 

diff --git a/docs/src/cli/install.md b/docs/src/cli/install.md
@@ -56,7 +56,7 @@ Please update your PATH environment variable to include the solana programs:
 solana --version
 ```
 
-- After a successful install, `agave-install update` may be used to easily
+- After a successful install, `solana-install update` may be used to easily
   update the Solana software to a newer version at any time.
 
 ---
@@ -74,15 +74,15 @@ solana --version
   installer into a temporary directory:
 
 ```bash
-cmd /c "curl https://release.solana.com/LATEST_SOLANA_RELEASE_VERSION/agave-install-init-x86_64-pc-windows-msvc.exe --output C:\agave-install-tmp\agave-install-init.exe --create-dirs"
+cmd /c "curl https://release.solana.com/LATEST_SOLANA_RELEASE_VERSION/solana-install-init-x86_64-pc-windows-msvc.exe --output C:\solana-install-tmp\solana-install-init.exe --create-dirs"
 ```
 
 - Copy and paste the following command, then press Enter to install the latest
   version of Solana. If you see a security pop-up by your system, please select
   to allow the program to run.
 
 ```bash
-C:\agave-install-tmp\agave-install-init.exe LATEST_SOLANA_RELEASE_VERSION
+C:\solana-install-tmp\solana-install-init.exe LATEST_SOLANA_RELEASE_VERSION
 ```
 
 - When the installer is finished, press Enter.
@@ -97,12 +97,12 @@ C:\agave-install-tmp\agave-install-init.exe LATEST_SOLANA_RELEASE_VERSION
 solana --version
 ```
 
-- After a successful install, `agave-install update` may be used to easily
+- After a successful install, `solana-install update` may be used to easily
   update the Solana software to a newer version at any time.
 
 ## Download Prebuilt Binaries
 
-If you would rather not use `agave-install` to manage the install, you can
+If you would rather not use `solana-install` to manage the install, you can
 manually download and install the binaries.
 
 ### Linux
@@ -255,7 +255,7 @@ You can then run the following command to obtain the same result as with
 prebuilt binaries:
 
 ```bash
-agave-install init
+solana-install init
 ```
 
 ## Use Homebrew