diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
deleted file mode 100644
index 31bafe7b..00000000
--- a/.github/actions/setup/action.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-name: Setup environment
-
-inputs:
-  cargo-cache-key:
-    description: The key to cache cargo dependencies. Skips cargo caching if not provided.
-    required: false
-  cargo-cache-fallback-key:
-    description: The fallback key to use when caching cargo dependencies. Default to not using a fallback key.
-    required: false
-  cargo-cache-local-key:
-    description: The key to cache local cargo dependencies. Skips local cargo caching if not provided.
-    required: false
-  clippy:
-    description: Install Clippy if `true`. Defaults to `false`.
-    required: false
-  rustfmt:
-    description: Install Rustfmt if `true`. Defaults to `false`.
-    required: false
-  solana:
-    description: Install Solana if `true`. Defaults to `false`.
-    required: false
-  cli:
-    description: Install CLI dependencies if `true`. Defaults to `false`.
-    required: false
-  purge:
-    description: Purge unused directories if `true`. Defaults to `false`.
-    required: false
-
-runs:
-  using: 'composite'
-  steps:
-    - name: Setup pnpm
-      uses: pnpm/action-setup@v3
-
-    - name: Setup Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: 20
-        cache: 'pnpm'
-
-    - name: Purge unused ubuntu runner directories
-      if: ${{ inputs.purge == 'true' }}
-      shell: bash
-      run: |
-        sudo rm -rf /usr/share/dotnet
-        sudo rm -rf /usr/share/swift
-        sudo rm -rf /usr/share/mysql
-        sudo rm -rf /usr/share/az_*
-        sudo rm -rf /usr/share/postgresql-common
-        sudo rm -rf /opt/ghc
-        sudo rm -rf /opt/az
-        sudo rm -rf /opt/pipx
-        sudo rm -rf /opt/microsoft
-        sudo rm -rf /opt/google
-        sudo rm -rf /opt/hostedtoolcache
-        sudo rm -rf /usr/local/lib/android
-        sudo rm -rf /usr/local/lib/heroku
-        sudo rm -rf /imagegeneration
-
-    - name: Install Dependencies
-      run: pnpm install --frozen-lockfile
-      shell: bash
-
-    - name: Set Environment Variables
-      shell: bash
-      run: pnpm zx ./scripts/ci/set-env.mjs
-
-    - name: Install Rustfmt
-      if: ${{ inputs.rustfmt == 'true' }}
-      uses: dtolnay/rust-toolchain@master
-      with:
-        toolchain: ${{ env.TOOLCHAIN_NIGHTLY }}
-        components: rustfmt
-
-    - name: Install Clippy
-      if: ${{ inputs.clippy == 'true' }}
-      uses: dtolnay/rust-toolchain@master
-      with:
-        toolchain: ${{ env.TOOLCHAIN_NIGHTLY }}
-        components: clippy
-
-    - name: Install Solana
-      if: ${{ inputs.solana == 'true' }}
-      uses: solana-program/actions/install-solana@v1
-      with:
-        version: ${{ env.SOLANA_VERSION }}
-        cache: true
-
-    - name: Install CLI dependencies
-      if: ${{ inputs.cli == 'true' }}
-      shell: bash
-      run: sudo apt update && sudo apt install libudev-dev protobuf-compiler libclang-dev -y
-
-    - name: Cache Cargo Dependencies
-      if: ${{ inputs.cargo-cache-key && !inputs.cargo-cache-fallback-key }}
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          target/
-        key: ${{ runner.os }}-${{ inputs.cargo-cache-key }}-${{ hashFiles('**/Cargo.lock') }}
-        restore-keys: ${{ runner.os }}-${{ inputs.cargo-cache-key }}
-
-    - name: Cache Cargo Dependencies With Fallback
-      if: ${{ inputs.cargo-cache-key && inputs.cargo-cache-fallback-key }}
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          target/
-        key: ${{ runner.os }}-${{ inputs.cargo-cache-key }}-${{ hashFiles('**/Cargo.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ inputs.cargo-cache-key }}
-          ${{ runner.os }}-${{ inputs.cargo-cache-fallback-key }}-${{ hashFiles('**/Cargo.lock') }}
-          ${{ runner.os }}-${{ inputs.cargo-cache-fallback-key }}
-
-    - name: Cache Local Cargo Dependencies
-      if: ${{ inputs.cargo-cache-local-key }}
-      uses: actions/cache@v4
-      with:
-        path: |
-          .cargo/bin/
-          .cargo/registry/index/
-          .cargo/registry/cache/
-          .cargo/git/db/
-        key: ${{ runner.os }}-${{ inputs.cargo-cache-local-key }}-${{ hashFiles('**/Cargo.lock') }}
-        restore-keys: ${{ runner.os }}-${{ inputs.cargo-cache-local-key }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c1963d3f..8d71bf2f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,227 +6,46 @@ on:
   pull_request:
     branches: [main]
 
-jobs:
-  format_and_lint_programs:
-    name: Format & Lint Programs
-    runs-on: ubuntu-latest
-    steps:
-      - name: Git Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Environment
-        uses: ./.github/actions/setup
-        with:
-          clippy: true
-          rustfmt: true
-
-      - name: Format Programs
-        run: pnpm programs:format
-
-      - name: Lint Programs
-        run: pnpm programs:lint
-
-  format_and_lint_client_js:
-    name: Format & Lint Client JS
-    runs-on: ubuntu-latest
-    steps:
-      - name: Git Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Environment
-        uses: ./.github/actions/setup
-
-      - name: Format Client JS
-        run: pnpm clients:js:format
-
-      - name: Lint Client JS
-        run: pnpm clients:js:lint
-
-  format_and_lint_client_js_legacy:
-    name: Format & Lint Client JS Legacy
-    runs-on: ubuntu-latest
-    steps:
-      - name: Git Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Environment
-        uses: ./.github/actions/setup
-
-      - name: Format Client JS
-        run: pnpm clients:js-legacy:format
-
-      - name: Lint Client JS
-        run: pnpm clients:js-legacy:lint
-
-  format_and_lint_cli:
-    name: Format & Lint CLI
-    runs-on: ubuntu-latest
-    steps:
-      - name: Git Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Environment
-        uses: ./.github/actions/setup
-        with:
-          clippy: true
-          rustfmt: true
-          cli: true
-
-      - name: Format
-        run: pnpm clients:cli:format
-
-      - name: Lint
-        run: pnpm clients:cli:lint
-
-  audit_rust:
-    name: Audit Rust
-    runs-on: ubuntu-latest
-    steps:
-      - name: Git Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Environment
-        uses: ./.github/actions/setup
-        with:
-          cargo-cache-key: cargo-audit
-
-      - name: Install cargo-audit
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cargo-audit
-
-      - name: Run cargo-audit
-        run: pnpm rust:audit
-
-  spellcheck_rust:
-    name: Spellcheck Rust
-    runs-on: ubuntu-latest
-    steps:
-      - name: Git Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Environment
-        uses: ./.github/actions/setup
-        with:
-          cargo-cache-key: cargo-spellcheck
-
-      - name: Install cargo-spellcheck
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cargo-spellcheck
-
-      - name: Run cargo-spellcheck
-        run: pnpm rust:spellcheck
-
-  build_programs:
-    name: Build programs
-    runs-on: ubuntu-latest
-    steps:
-      - name: Git Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Environment
-        uses: ./.github/actions/setup
-        with:
-          cargo-cache-key: cargo-programs
-          solana: true
-
-      - name: Build Programs
-        run: pnpm programs:build
-
-      - name: Upload Program Builds
-        uses: actions/upload-artifact@v4
-        with:
-          name: program-builds
-          path: ./target/deploy/*.so
-          if-no-files-found: error
-
-      - name: Save Program Builds For Client Jobs
-        uses: actions/cache/save@v4
-        with:
-          path: ./**/*.so
-          key: ${{ runner.os }}-builds-${{ github.sha }}
-
-  test_programs:
-    name: Test Programs
-    runs-on: ubuntu-latest
-    needs: build_programs
-    steps:
-      - name: Git Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Environment
-        uses: ./.github/actions/setup
-        with:
-          cargo-cache-key: cargo-program-tests
-          cargo-cache-fallback-key: cargo-programs
-          solana: true
-          purge: true
-
-      - name: Test Programs
-        run: pnpm programs:test
-
-  test_client_js:
-    name: Test Client JS
-    runs-on: ubuntu-latest
-    steps:
-      - name: Git Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Environment
-        uses: ./.github/actions/setup
-        with:
-          solana: true
-
-      - name: Test Client JS
-        run: pnpm clients:js:test
-
-  test_client_js_legacy:
-    name: Test Client JS Legacy
-    runs-on: ubuntu-latest
-    needs: build_programs
-    steps:
-      - name: Git Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Environment
-        uses: ./.github/actions/setup
-        with:
-          solana: true
+env:
+  JS_PACKAGES: "['clients-js', 'clients-js-legacy']"
+  SBPF_PROGRAM_PACKAGES: "['program']"
+  RUST_PACKAGES: "['clients-cli', 'program']"
+  WASM_PACKAGES: "['program']"
 
-      - name: Restore Program Builds
-        uses: actions/cache/restore@v4
-        with:
-          path: ./**/*.so
-          key: ${{ runner.os }}-builds-${{ github.sha }}
-
-      - name: Build dependency
-        run: pnpm clients:js:build
-
-      - name: Test
-        run: pnpm clients:js-legacy:test
-
-  test_client_cli:
-    name: Test Client CLI
-    runs-on: ubuntu-latest
-    needs: build_programs
-    steps:
-      - name: Git Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Environment
-        uses: ./.github/actions/setup
-        with:
-          cargo-cache-key: cargo-cli
-          solana: true
-          cli: true
-          purge: true
-
-      - name: Restore Program Builds
-        uses: actions/cache/restore@v4
-        with:
-          path: ./**/*.so
-          key: ${{ runner.os }}-builds-${{ github.sha }}
-
-      - name: Test
-        run: pnpm clients:cli:test
+jobs:
+  set_env:
+    name: Set variables to be used in strategy definitions in reusable workflow
+    runs-on: ubuntu-latest
+    outputs:
+      JS_PACKAGES: ${{ steps.compute.outputs.JS_PACKAGES }}
+      SBPF_PROGRAM_PACKAGES: ${{ steps.compute.outputs.SBPF_PROGRAM_PACKAGES }}
+      RUST_PACKAGES: ${{ steps.compute.outputs.RUST_PACKAGES }}
+      WASM_PACKAGES: ${{ steps.compute.outputs.WASM_PACKAGES }}
+      RUST_TOOLCHAIN_NIGHTLY: ${{ steps.compute.outputs.RUST_TOOLCHAIN_NIGHTLY }}
+      SOLANA_CLI_VERSION: ${{ steps.compute.outputs.SOLANA_CLI_VERSION }}
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v4
+
+      - name: Compute variables
+        id: compute
+        shell: bash
+        run: |
+          echo "JS_PACKAGES=${{ env.JS_PACKAGES }}" >> $GITHUB_OUTPUT
+          echo "SBPF_PROGRAM_PACKAGES=${{ env.SBPF_PROGRAM_PACKAGES }}" >> $GITHUB_OUTPUT
+          echo "RUST_PACKAGES=${{ env.RUST_PACKAGES }}" >> $GITHUB_OUTPUT
+          echo "WASM_PACKAGES=${{ env.WASM_PACKAGES }}" >> $GITHUB_OUTPUT
+          echo "RUST_TOOLCHAIN_NIGHTLY=$(make rust-toolchain-nightly)" >> "$GITHUB_OUTPUT"
+          echo "SOLANA_CLI_VERSION=$(make solana-cli-version)" >> "$GITHUB_OUTPUT"
+
+  main:
+    needs: set_env
+    uses: solana-program/actions/.github/workflows/main.yml@main
+    with:
+      js-packages: ${{ needs.set_env.outputs.JS_PACKAGES }}
+      sbpf-program-packages: ${{ needs.set_env.outputs.SBPF_PROGRAM_PACKAGES }}
+      rust-packages: ${{ needs.set_env.outputs.RUST_PACKAGES }}
+      wasm-packages: ${{ needs.set_env.outputs.WASM_PACKAGES }}
+      rustfmt-toolchain: ${{ needs.set_env.outputs.RUST_TOOLCHAIN_NIGHTLY }}
+      clippy-toolchain: ${{ needs.set_env.outputs.RUST_TOOLCHAIN_NIGHTLY }}
+      solana-cli-version: ${{ needs.set_env.outputs.SOLANA_CLI_VERSION }}
diff --git a/.github/workflows/publish-js-client.yml b/.github/workflows/publish-js-client.yml
deleted file mode 100644
index 3a59decd..00000000
--- a/.github/workflows/publish-js-client.yml
+++ /dev/null
@@ -1,150 +0,0 @@
-name: Publish JS Client
-
-on:
-  workflow_dispatch:
-    inputs:
-      package_path:
-        description: Path to directory with package to release
-        required: true
-        default: 'clients/js'
-        type: choice
-        options:
-          - clients/js
-          - clients/js-legacy
-      level:
-        description: Version level
-        required: true
-        default: patch
-        type: choice
-        options:
-          - patch
-          - minor
-          - major
-          - prerelease
-          - prepatch
-          - preminor
-          - premajor
-      tag:
-        description: NPM Tag (and preid for pre-releases)
-        required: true
-        type: string
-        default: latest
-      create_release:
-        description: Create a GitHub release
-        required: true
-        type: boolean
-        default: true
-
-jobs:
-  test:
-    name: Test JS package
-    runs-on: ubuntu-latest
-    steps:
-      - name: Git Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Environment
-        uses: ./.github/actions/setup
-        with:
-          solana: true
-          cargo-cache-key: cargo-js-test-publish-${{ inputs.package_path }}
-          cargo-cache-fallback-key: cargo-js-test-publish
-
-      - name: Format
-        run: pnpm zx ./scripts/js/format.mjs "${{ inputs.package_path }}"
-
-      - name: Lint
-        run: pnpm zx ./scripts/js/lint.mjs "${{ inputs.package_path }}"
-
-      - name: Build Programs
-        run: pnpm programs:build
-
-      - name: Test
-        run: pnpm zx ./scripts/js/test.mjs "${{ inputs.package_path }}"
-
-  publish:
-    name: Publish JS package
-    runs-on: ubuntu-latest
-    needs: test
-    permissions:
-      contents: write
-    steps:
-      - name: Git Checkout
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.ANZA_TEAM_PAT }}
-          fetch-depth: 0 # get the whole history for git-cliff
-
-      - name: Setup Environment
-        uses: ./.github/actions/setup
-
-      - name: Ensure SOLANA_NPM_TOKEN variable is set
-        env:
-          token: ${{ secrets.SOLANA_NPM_TOKEN }}
-        if: ${{ env.token == '' }}
-        run: |
-          echo "The SOLANA_NPM_TOKEN secret variable is not set"
-          echo "Go to \"Settings\" -> \"Secrets and variables\" -> \"Actions\" -> \"New repository secret\"."
-          exit 1
-
-      # NOTE there is no @solana-program token because this is reserved for future codama clients
-      # uncomment this, and the pnpm config command in the npm auth job, when it is to be deployed
-      # - name: Ensure SOLANA_PROGRAM_NPM_TOKEN variable is set
-      #   env:
-      #     token: ${{ secrets.SOLANA_PROGRAM_NPM_TOKEN }}
-      #   if: ${{ env.token == '' }}
-      #   run: |
-      #     echo "The SOLANA_PROGRAM_NPM_TOKEN secret variable is not set"
-      #     echo "Go to \"Settings\" -> \"Secrets and variables\" -> \"Actions\" -> \"New repository secret\"."
-      #     exit 1
-
-      - name: NPM Authentication
-        env:
-          SOLANA_NPM_TOKEN: ${{ secrets.SOLANA_NPM_TOKEN }}
-          SOLANA_PROGRAM_NPM_TOKEN: ${{ secrets.SOLANA_PROGRAM_NPM_TOKEN }}
-        shell: bash
-        run: |
-          cd "${{ inputs.package_path }}"
-          org="$(jq '.name|split("/")|.[0]' package.json)"
-          if [[ $org == "\"@solana-program\"" ]] then
-            # pnpm config set '//registry.npmjs.org/:_authToken' "${SOLANA_PROGRAM_NPM_TOKEN}"
-            echo "The SOLANA_PROGRAM_NPM_TOKEN secret variable is not set"
-            exit 1
-          elif [[ $org == "\"@solana\"" ]] then
-            pnpm config set '//registry.npmjs.org/:_authToken' "${SOLANA_NPM_TOKEN}"
-          else
-            echo "Unknown organization: $org"
-            exit 1
-          fi
-
-      - name: Set Git Author
-        run: |
-          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git config --global user.name "github-actions[bot]"
-
-      - name: Publish JS Client
-        id: publish
-        run: zx ./scripts/js/publish.mjs ${{ inputs.level }} "${{ inputs.package_path }}" ${{ inputs.tag }}
-
-      - name: Push Commit and Tag
-        run: git push origin --follow-tags
-
-      - name: Generate a changelog
-        if: github.event.inputs.create_release == 'true'
-        uses: orhun/git-cliff-action@v3
-        with:
-          config: "scripts/cliff.toml"
-          args: |
-            "${{ steps.publish.outputs.old_git_tag }}"..main
-            --include-path "${{ inputs.package_path }}/**"
-            --github-repo "${{ github.repository }}"
-        env:
-          OUTPUT: TEMP_CHANGELOG.md
-          GITHUB_REPO: ${{ github.repository }}
-
-      - name: Create GitHub release
-        if: github.event.inputs.create_release == 'true'
-        uses: ncipollo/release-action@v1
-        with:
-          tag: ${{ steps.publish.outputs.new_git_tag }}
-          bodyFile: TEMP_CHANGELOG.md
diff --git a/.github/workflows/publish-js.yml b/.github/workflows/publish-js.yml
new file mode 100644
index 00000000..0849d6eb
--- /dev/null
+++ b/.github/workflows/publish-js.yml
@@ -0,0 +1,68 @@
+name: Publish JS
+
+on:
+  workflow_dispatch:
+    inputs:
+      package-path:
+        description: Path to directory with package to release
+        required: true
+        default: 'clients/js'
+        type: choice
+        options:
+          - clients/js
+          - clients/js-legacy
+      level:
+        description: Version level
+        required: true
+        default: patch
+        type: choice
+        options:
+          - patch
+          - minor
+          - major
+          - prerelease
+          - prepatch
+          - preminor
+          - premajor
+      tag:
+        description: NPM Tag (and preid for pre-releases)
+        required: true
+        type: string
+        default: latest
+      create-release:
+        description: Create a GitHub release
+        required: true
+        type: boolean
+        default: true
+
+jobs:
+  set_env:
+    name: Set variables to be used in strategy definitions
+    runs-on: ubuntu-latest
+    outputs:
+      SOLANA_CLI_VERSION: ${{ steps.compute.outputs.SOLANA_CLI_VERSION }}
+      TARGET: ${{ steps.compute.outputs.TARGET }}
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v4
+
+      - name: Compute variables
+        id: compute
+        shell: bash
+        run: |
+          echo "SOLANA_CLI_VERSION=$(make solana-cli-version)" >> "$GITHUB_OUTPUT"
+          TARGET=$(echo ${{ inputs.package-path }} | sed 's#/#-#')
+          echo "TARGET=$TARGET" >> "$GITHUB_OUTPUT"
+
+  main:
+    needs: set_env
+    uses: solana-program/actions/.github/workflows/publish-js.yml@main
+    with:
+      sbpf-program-packages: "program"
+      solana-cli-version: ${{ needs.set_env.outputs.SOLANA_CLI_VERSION }}
+      target: ${{ needs.set_env.outputs.TARGET }}
+      package-path: ${{ inputs.package-path }}
+      level: ${{ inputs.level }}
+      tag: ${{ inputs.tag }}
+      create-release: ${{ inputs.create-release }}
+    secrets: inherit
diff --git a/.github/workflows/publish-rust.yml b/.github/workflows/publish-rust.yml
index c37de3d8..b863b581 100644
--- a/.github/workflows/publish-rust.yml
+++ b/.github/workflows/publish-rust.yml
@@ -3,7 +3,7 @@ name: Publish Rust Crate
 on:
   workflow_dispatch:
     inputs:
-      package_path:
+      package-path:
         description: Path to directory with package to release
         required: true
         default: 'clients/cli'
@@ -20,119 +20,59 @@ on:
           - patch
           - minor
           - major
-      dry_run:
+          - rc
+          - beta
+          - alpha
+          - release
+          - version
+      version:
+        description: Version (used with level "version")
+        required: false
+        type: string
+      dry-run:
         description: Dry run
         required: true
         default: true
         type: boolean
-      create_release:
+      create-release:
         description: Create a GitHub release
         required: true
         type: boolean
         default: true
 
 jobs:
-  test:
-    name: Test Rust Crate
+  set_env:
+    name: Set variables to be used in strategy definitions
     runs-on: ubuntu-latest
+    outputs:
+      RUST_TOOLCHAIN_NIGHTLY: ${{ steps.compute.outputs.RUST_TOOLCHAIN_NIGHTLY }}
+      SOLANA_CLI_VERSION: ${{ steps.compute.outputs.SOLANA_CLI_VERSION }}
+      TARGET: ${{ steps.compute.outputs.TARGET }}
     steps:
       - name: Git Checkout
         uses: actions/checkout@v4
 
-      - name: Setup Environment
-        uses: ./.github/actions/setup
-        with:
-          clippy: true
-          rustfmt: true
-          solana: true
-          cli: true
-          cargo-cache-key: cargo-test-publish-${{ inputs.package_path }}
-          cargo-cache-fallback-key: cargo-test-publish
-
-      - name: Install cargo-audit
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cargo-semver-checks
-
-      - name: Format
-        run: pnpm zx ./scripts/rust/format.mjs "${{ inputs.package_path }}"
-
-      - name: Lint
-        run: pnpm zx ./scripts/rust/lint.mjs "${{ inputs.package_path }}"
-
-      - name: Build programs
-        run: pnpm programs:build
-
-      - name: Test
-        run: pnpm zx ./scripts/rust/test.mjs "${{ inputs.package_path }}"
-
-      - name: Check semver
-        if: ${{ inputs.package_path == 'program' }}
-        run: pnpm rust:semver ${{ inputs.package_path }} --release-type ${{ inputs.level }}
-
-  publish:
-    name: Publish Rust Crate
-    runs-on: ubuntu-latest
-    needs: test
-    permissions:
-      contents: write
-    steps:
-      - name: Git Checkout
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.ANZA_TEAM_PAT }}
-          fetch-depth: 0 # get the whole history for git-cliff
-
-      - name: Setup Environment
-        uses: ./.github/actions/setup
-        with:
-          cli: true
-          cargo-cache-key: cargo-publish-${{ inputs.package_path }}
-          cargo-cache-fallback-key: cargo-publish
-
-      - name: Install Cargo Release
-        run: which cargo-release || cargo install cargo-release
-
-      - name: Ensure CARGO_REGISTRY_TOKEN variable is set
-        env:
-          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
-        if: ${{ env.CARGO_REGISTRY_TOKEN == '' }}
-        run: |
-          echo "The CARGO_REGISTRY_TOKEN secret variable is not set"
-          echo "Go to \"Settings\" -> \"Secrets and variables\" -> \"Actions\" -> \"New repository secret\"."
-          exit 1
-
-      - name: Set Git Author
+      - name: Compute variables
+        id: compute
+        shell: bash
         run: |
-          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git config --global user.name "github-actions[bot]"
-
-      - name: Publish Crate
-        id: publish
-        env:
-          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
-        run: |
-          if [ "${{ inputs.dry_run }}" == "true" ]; then
-            OPTIONS="--dry-run"
-          else
-            OPTIONS=""
-          fi
-
-          pnpm rust:publish "${{ inputs.package_path }}" "${{ inputs.level }}" $OPTIONS
-
-      - name: Generate a changelog
-        if: github.event.inputs.create_release == 'true'
-        uses: orhun/git-cliff-action@v4
-        with:
-          config: "scripts/cliff.toml"
-          args: ${{ steps.publish.outputs.old_git_tag }}..HEAD --include-path "${{ inputs.package_path }}/**" --github-repo ${{ github.repository }}
-        env:
-          OUTPUT: TEMP_CHANGELOG.md
-          GITHUB_REPO: ${{ github.repository }}
-
-      - name: Create GitHub release
-        if: github.event.inputs.create_release == 'true' && github.event.inputs.dry_run != 'true'
-        uses: ncipollo/release-action@v1
-        with:
-          tag: ${{ steps.publish.outputs.new_git_tag }}
-          bodyFile: TEMP_CHANGELOG.md
+          echo "RUST_TOOLCHAIN_NIGHTLY=$(make rust-toolchain-nightly)" >> "$GITHUB_OUTPUT"
+          echo "SOLANA_CLI_VERSION=$(make solana-cli-version)" >> "$GITHUB_OUTPUT"
+          TARGET=$(echo ${{ inputs.package-path }} | sed 's#/#-#')
+          echo "TARGET=$TARGET" >> "$GITHUB_OUTPUT"
+
+  main:
+    needs: set_env
+    uses: solana-program/actions/.github/workflows/publish-rust.yml@main
+    with:
+      sbpf-program-packages: "program"
+      solana-cli-version: ${{ needs.set_env.outputs.SOLANA_CLI_VERSION }}
+      clippy-toolchain: ${{ needs.set_env.outputs.RUST_TOOLCHAIN_NIGHTLY }}
+      rustfmt-toolchain: ${{ needs.set_env.outputs.RUST_TOOLCHAIN_NIGHTLY }}
+      target: ${{ needs.set_env.outputs.TARGET }}
+      package-path: ${{ inputs.package-path }}
+      level: ${{ inputs.level }}
+      version: ${{ inputs.version }}
+      create-release: ${{ inputs.create-release }}
+      dry-run: ${{ inputs.dry-run }}
+    secrets: inherit
diff --git a/Cargo.lock b/Cargo.lock
index e111ba09..e29f27a5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10906,9 +10906,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
 dependencies = [
  "sharded-slab",
  "thread_local",
diff --git a/Cargo.toml b/Cargo.toml
index ce2ac836..fc26ac18 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,11 +5,6 @@ members = ["clients/cli", "program"]
 [workspace.metadata.cli]
 solana = "2.3.4"
 
-# Specify Rust toolchains for rustfmt, clippy, and build.
-# Any unprovided toolchains default to stable.
-[workspace.metadata.toolchains]
-nightly = "nightly-2025-02-16"
-
 [workspace.metadata.spellcheck]
 config = "scripts/spellcheck.toml"
 
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..4acbee37
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,119 @@
+RUST_TOOLCHAIN_NIGHTLY = nightly-2025-02-16
+SOLANA_CLI_VERSION = 2.3.4
+
+nightly = +${RUST_TOOLCHAIN_NIGHTLY}
+
+# This is a bit tricky -- findstring returns the found string, so we're looking
+# for "directory-", returning that, and replacing "-" with "/" to change the
+# first "-" to a "/". But if it isn't found, we replace "" with "", which works
+# in the case where there is no subdirectory.
+pattern-dir = $(firstword $(subst -, ,$1))
+find-pattern-dir = $(findstring $(call pattern-dir,$1)-,$1)
+make-path = $(subst $(call find-pattern-dir,$1),$(subst -,/,$(call find-pattern-dir,$1)),$1)
+
+rust-toolchain-nightly:
+	@echo ${RUST_TOOLCHAIN_NIGHTLY}
+
+solana-cli-version:
+	@echo ${SOLANA_CLI_VERSION}
+
+cargo-nightly:
+	cargo $(nightly) $(ARGS)
+
+audit:
+	cargo audit \
+			--ignore RUSTSEC-2022-0093 \
+			--ignore RUSTSEC-2024-0421 \
+			--ignore RUSTSEC-2024-0344 \
+			--ignore RUSTSEC-2024-0376 $(ARGS)
+
+spellcheck:
+	cargo spellcheck --code 1 $(ARGS)
+
+clippy-%:
+	cargo $(nightly) clippy --manifest-path $(call make-path,$*)/Cargo.toml \
+	  --all-targets \
+	  --all-features \
+		-- \
+		--deny=warnings \
+		--deny=clippy::default_trait_access \
+		--deny=clippy::arithmetic_side_effects \
+		--deny=clippy::manual_let_else \
+		--deny=clippy::used_underscore_binding $(ARGS)
+
+format-check-%:
+	cargo $(nightly) fmt --check --manifest-path $(call make-path,$*)/Cargo.toml $(ARGS)
+
+powerset-%:
+	cargo $(nightly) hack check --feature-powerset --all-targets --manifest-path $(call make-path,$*)/Cargo.toml $(ARGS)
+
+semver-check-%:
+	cargo semver-checks --manifest-path $(call make-path,$*)/Cargo.toml $(ARGS)
+
+shellcheck:
+	git ls-files -- '*.sh' | xargs shellcheck --color=always --external-sources --shell=bash $(ARGS)
+
+sort-check:
+	cargo $(nightly) sort --workspace --check $(ARGS)
+
+bench-%:
+	cargo $(nightly) bench --manifest-path $(call make-path,$*)/Cargo.toml $(ARGS)
+
+format-rust:
+	cargo $(nightly) fmt --all $(ARGS)
+
+build-sbf-%:
+	cargo build-sbf --manifest-path $(call make-path,$*)/Cargo.toml $(ARGS)
+
+build-wasm-%:
+	cargo build --target wasm32-unknown-unknown --manifest-path $(call make-path,$*)/Cargo.toml --all-features $(ARGS)
+
+build-doc-%:
+	RUSTDOCFLAGS="--cfg docsrs -D warnings" cargo $(nightly) doc --all-features --no-deps --manifest-path $(call make-path,$*)/Cargo.toml $(ARGS)
+
+test-doc-%:
+	cargo $(nightly) test --doc --all-features --manifest-path $(call make-path,$*)/Cargo.toml $(ARGS)
+
+test-%:
+	SBF_OUT_DIR=$(PWD)/target/deploy cargo $(nightly) test --manifest-path $(call make-path,$*)/Cargo.toml $(ARGS)
+
+format-check-js-%:
+	cd $(call make-path,$*) && pnpm install && pnpm format $(ARGS)
+
+lint-js-%:
+	cd $(call make-path,$*) && pnpm install && pnpm lint $(ARGS)
+
+test-js-%:
+	make restart-test-validator
+	cd $(call make-path,$*) && pnpm -r install && pnpm -r build && pnpm test $(ARGS)
+	make stop-test-validator
+
+restart-test-validator:
+	./scripts/restart-test-validator.sh
+
+stop-test-validator:
+	pkill -f solana-test-validator
+
+generate-clients:
+	pnpm generate:clients $(ARGS)
+
+# Helpers for publishing
+tag-name = $(lastword $(subst /, ,$(call make-path,$1)))
+preid-arg = $(subst pre,--preid $2,$(findstring pre,$1))
+package-version = $(subst ",,$(shell jq -r '.version' $(call make-path,$1)/package.json))
+crate-version = $(subst ",,$(shell toml get $(call make-path,$1)/Cargo.toml package.version))
+
+git-tag-js-%:
+	@echo "$(call tag-name,$*)@v$(call package-version,$*)"
+
+publish-js-%:
+	cd "$(call make-path,$*)" && pnpm install && pnpm version $(LEVEL) --no-git-tag-version  $(call preid-arg,$(LEVEL),$(TAG)) && pnpm publish --no-git-checks --tag $(TAG)
+
+git-tag-rust-%:
+	@echo "$(call tag-name,$*)@v$(call crate-version,$*)"
+
+publish-rust-%:
+	cd "$(call make-path,$*)" && cargo release $(LEVEL) --tag-name "$(call tag-name,$*)@v{{version}}" --execute --no-confirm --dependent-version fix
+
+publish-rust-dry-run-%:
+	cd "$(call make-path,$*)" && cargo release $(LEVEL) --tag-name "$(call tag-name,$*)@v{{version}}"
diff --git a/clients/js-legacy/package.json b/clients/js-legacy/package.json
index a98ed571..00b841bf 100644
--- a/clients/js-legacy/package.json
+++ b/clients/js-legacy/package.json
@@ -20,8 +20,7 @@
     "format:fix": "prettier --write .",
     "lint": "eslint --max-warnings 0 .",
     "lint:fix": "eslint . --fix",
-    "test": "ava --serial",
-    "prepublishOnly": "pnpm build"
+    "test": "ava --serial"
   },
   "files": [
     "./dist/src",
diff --git a/package.json b/package.json
index 1a164249..53521d82 100644
--- a/package.json
+++ b/package.json
@@ -1,33 +1,7 @@
 {
   "private": true,
   "scripts": {
-    "programs:build": "zx ./scripts/rust/build-sbf.mjs program",
-    "programs:test": "zx ./scripts/rust/test.mjs program",
-    "programs:format": "zx ./scripts/rust/format.mjs program",
-    "programs:lint": "zx ./scripts/rust/lint.mjs program",
-    "solana:check": "zx ./scripts/check-solana-version.mjs",
-    "solana:link": "zx ./scripts/link-solana-version.mjs",
-    "clients:js:build": "zx ./scripts/js/build.mjs clients/js",
-    "clients:js:format": "zx ./scripts/js/format.mjs clients/js",
-    "clients:js:lint": "zx ./scripts/js/lint.mjs clients/js",
-    "clients:js:test": "zx ./scripts/js/test.mjs clients/js",
-    "clients:js-legacy:build": "zx ./scripts/js/build.mjs clients/js-legacy",
-    "clients:js-legacy:format": "zx ./scripts/js/format.mjs clients/js-legacy",
-    "clients:js-legacy:lint": "zx ./scripts/js/lint.mjs clients/js-legacy",
-    "clients:js-legacy:test": "zx ./scripts/js/test.mjs clients/js-legacy",
-    "clients:cli:format": "zx ./scripts/rust/format.mjs clients/cli",
-    "clients:cli:lint": "zx ./scripts/rust/lint.mjs clients/cli",
-    "clients:cli:test": "zx ./scripts/rust/test.mjs clients/cli",
-    "template:upgrade": "zx ./scripts/upgrade-template.mjs",
-    "rust:audit": "zx ./scripts/rust/audit.mjs",
-    "rust:publish": "zx ./scripts/rust/publish.mjs",
-    "rust:spellcheck": "cargo spellcheck --code 1",
-    "rust:semver": "zx ./scripts/rust/semver.mjs"
-  },
-  "devDependencies": {
-    "@iarna/toml": "^2.2.5",
-    "typescript": "^5.9.2",
-    "zx": "^8.8.1"
+    "generate:clients": "exit 0"
   },
   "engines": {
     "node": ">=v20.0.0"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 228756a9..939723d0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,17 +6,7 @@ settings:
 
 importers:
 
-  .:
-    devDependencies:
-      '@iarna/toml':
-        specifier: ^2.2.5
-        version: 2.2.5
-      typescript:
-        specifier: ^5.9.2
-        version: 5.9.2
-      zx:
-        specifier: ^8.8.1
-        version: 8.8.1
+  .: {}
 
   clients/js:
     dependencies:
@@ -445,9 +435,6 @@ packages:
     resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==}
     deprecated: Use @eslint/object-schema instead
 
-  '@iarna/toml@2.2.5':
-    resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==}
-
   '@isaacs/cliui@8.0.2':
     resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
     engines: {node: '>=12'}
@@ -2200,11 +2187,6 @@ packages:
     resolution: {integrity: sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==}
     engines: {node: '>=18'}
 
-  zx@8.8.1:
-    resolution: {integrity: sha512-qvsKBnvWHstHKCluKPlEgI/D3+mdiQyMoSSeFR8IX/aXzWIas5A297KxKgPJhuPXdrR6ma0Jzx43+GQ/8sqbrw==}
-    engines: {node: '>= 12.17.0'}
-    hasBin: true
-
 snapshots:
 
   '@ava/typescript@6.0.0':
@@ -2401,8 +2383,6 @@ snapshots:
 
   '@humanwhocodes/object-schema@2.0.3': {}
 
-  '@iarna/toml@2.2.5': {}
-
   '@isaacs/cliui@8.0.2':
     dependencies:
       string-width: 5.1.2
@@ -4183,5 +4163,3 @@ snapshots:
   yocto-queue@0.1.0: {}
 
   yoctocolors@2.1.1: {}
-
-  zx@8.8.1: {}
diff --git a/program/Cargo.toml b/program/Cargo.toml
index 343a1e0d..b67c69c4 100644
--- a/program/Cargo.toml
+++ b/program/Cargo.toml
@@ -9,7 +9,6 @@ edition = "2021"
 
 [features]
 no-entrypoint = []
-test-sbf = []
 
 [dependencies]
 arrayref = "0.3.9"
diff --git a/program/tests/accounts.rs b/program/tests/accounts.rs
index 60acc2c2..dbe5d2dd 100644
--- a/program/tests/accounts.rs
+++ b/program/tests/accounts.rs
@@ -1,6 +1,5 @@
 #![allow(clippy::arithmetic_side_effects)]
 #![allow(clippy::items_after_test_module)]
-#![cfg(feature = "test-sbf")]
 
 mod helpers;
 
diff --git a/program/tests/create_pool_token_metadata.rs b/program/tests/create_pool_token_metadata.rs
index 930c0f4f..d3b2046d 100644
--- a/program/tests/create_pool_token_metadata.rs
+++ b/program/tests/create_pool_token_metadata.rs
@@ -1,5 +1,4 @@
 #![allow(clippy::arithmetic_side_effects)]
-#![cfg(feature = "test-sbf")]
 
 mod helpers;
 
diff --git a/program/tests/deposit.rs b/program/tests/deposit.rs
index b63e9987..97a76643 100644
--- a/program/tests/deposit.rs
+++ b/program/tests/deposit.rs
@@ -1,5 +1,4 @@
 #![allow(clippy::arithmetic_side_effects)]
-#![cfg(feature = "test-sbf")]
 
 mod helpers;
 
diff --git a/program/tests/helpers/mod.rs b/program/tests/helpers/mod.rs
index f77a35b9..05b7fe49 100644
--- a/program/tests/helpers/mod.rs
+++ b/program/tests/helpers/mod.rs
@@ -442,9 +442,8 @@ where
     // error-> program error` because StakeError impls the former but not the
     // latter... and that conversion is merely surjective........
     // infomercial lady: "if only there were a better way!"
-    let expected_p = match expected.clone().try_into() {
-        Ok(v) => v,
-        Err(_) => panic!("could not unwrap {:?}", expected),
+    let Ok(expected_p) = expected.clone().try_into() else {
+        panic!("could not unwrap {:?}", expected);
     };
 
     if got_p != expected_p {
diff --git a/program/tests/initialize.rs b/program/tests/initialize.rs
index 2fac6924..bbd1c524 100644
--- a/program/tests/initialize.rs
+++ b/program/tests/initialize.rs
@@ -1,5 +1,4 @@
 #![allow(clippy::arithmetic_side_effects)]
-#![cfg(feature = "test-sbf")]
 
 mod helpers;
 
diff --git a/program/tests/replenish.rs b/program/tests/replenish.rs
index 3737d63f..d420e364 100644
--- a/program/tests/replenish.rs
+++ b/program/tests/replenish.rs
@@ -1,5 +1,4 @@
 #![allow(clippy::arithmetic_side_effects)]
-#![cfg(feature = "test-sbf")]
 
 mod helpers;
 
diff --git a/program/tests/update_pool_token_metadata.rs b/program/tests/update_pool_token_metadata.rs
index 6642af4b..ee5f41a5 100644
--- a/program/tests/update_pool_token_metadata.rs
+++ b/program/tests/update_pool_token_metadata.rs
@@ -1,5 +1,4 @@
 #![allow(clippy::arithmetic_side_effects)]
-#![cfg(feature = "test-sbf")]
 mod helpers;
 
 use {
diff --git a/program/tests/withdraw.rs b/program/tests/withdraw.rs
index 11f247ff..cabcaf6b 100644
--- a/program/tests/withdraw.rs
+++ b/program/tests/withdraw.rs
@@ -1,6 +1,4 @@
 #![allow(clippy::arithmetic_side_effects)]
-#![cfg(feature = "test-sbf")]
-
 mod helpers;
 
 use {
diff --git a/scripts/check-solana-version.mjs b/scripts/check-solana-version.mjs
deleted file mode 100644
index 28c1d198..00000000
--- a/scripts/check-solana-version.mjs
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env zx
-import 'zx/globals';
-import { getInstalledSolanaVersion, getSolanaVersion } from './utils.mjs';
-
-const expectedVersion = getSolanaVersion();
-const installedVersion = await getInstalledSolanaVersion();
-
-if (!installedVersion) {
-  echo(
-    chalk.red('[ ERROR ]'),
-    `No Solana installation found. Please install Solana ${expectedVersion} before proceeding.`
-  );
-  process.exit(1);
-} else if (installedVersion !== expectedVersion) {
-  echo(
-    chalk.yellow('[ WARNING ]'),
-    `The installed Solana version ${installedVersion} does not match the expected version ${expectedVersion}.`
-  );
-} else {
-  echo(
-    chalk.green('[ SUCCESS ]'),
-    `The expected Solana version ${expectedVersion} is installed.`
-  );
-}
diff --git a/scripts/ci/set-env.mjs b/scripts/ci/set-env.mjs
deleted file mode 100644
index 44f3b036..00000000
--- a/scripts/ci/set-env.mjs
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env zx
-import { getSolanaVersion, getToolchain } from '../utils.mjs';
-
-await $`echo "SOLANA_VERSION=${getSolanaVersion()}" >> $GITHUB_ENV`;
-await $`echo "TOOLCHAIN_NIGHTLY=${getToolchain('nightly')}" >> $GITHUB_ENV`;
diff --git a/scripts/js/build.mjs b/scripts/js/build.mjs
deleted file mode 100644
index 1294171a..00000000
--- a/scripts/js/build.mjs
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env zx
-import 'zx/globals';
-import { cliArguments, workingDirectory } from '../utils.mjs';
-
-const [folder, ...args] = cliArguments();
-
-// Build the client and run the tests.
-cd(path.join(workingDirectory, folder));
-await $`pnpm install`;
-await $`pnpm build`;
diff --git a/scripts/js/format.mjs b/scripts/js/format.mjs
deleted file mode 100644
index 87e64843..00000000
--- a/scripts/js/format.mjs
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env zx
-import 'zx/globals';
-import { cliArguments, workingDirectory } from '../utils.mjs';
-
-const [folder, ...formatArgs] = cliArguments();
-
-// Format the client using Prettier.
-cd(path.join(workingDirectory, folder));
-await $`pnpm install`;
-await $`pnpm format ${formatArgs}`;
diff --git a/scripts/js/lint.mjs b/scripts/js/lint.mjs
deleted file mode 100644
index a4f25a7a..00000000
--- a/scripts/js/lint.mjs
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env zx
-import 'zx/globals';
-import { cliArguments, workingDirectory } from '../utils.mjs';
-
-const [folder, ...args] = cliArguments();
-
-// Check the client using ESLint.
-cd(path.join(workingDirectory, folder));
-await $`pnpm install`;
-await $`pnpm lint ${args}`;
diff --git a/scripts/js/publish.mjs b/scripts/js/publish.mjs
deleted file mode 100644
index 190fc233..00000000
--- a/scripts/js/publish.mjs
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env zx
-import 'zx/globals';
-import { cliArguments, workingDirectory } from '../utils.mjs';
-
-const [level, folder, tag = 'latest'] = cliArguments();
-if (!level) {
-  throw new Error('A version level — e.g. "path" — must be provided.');
-}
-
-// Go to the client directory and install the dependencies.
-cd(path.join(workingDirectory, folder));
-await $`pnpm install`;
-
-// Update the version.
-const versionArgs = [
-  '--no-git-tag-version',
-  ...(level.startsWith('pre') ? [`--preid ${tag}`] : []),
-];
-let { stdout } = await $`pnpm version ${level} ${versionArgs}`;
-const newVersion = stdout.slice(1).trim();
-
-// Expose the new version to CI if needed.
-if (process.env.CI) {
-  await $`echo "new_version=${newVersion}" >> $GITHUB_OUTPUT`;
-}
-
-// Publish the package.
-// This will also build the package before publishing (see prepublishOnly script).
-await $`pnpm publish --no-git-checks --tag ${tag}`;
-
-// Commit the new version.
-await $`git commit -am "Publish ${folder} JS client v${newVersion}"`;
-
-// Tag the new version.
-await $`git tag -a ${folder}-js@v${newVersion} -m "${folder} JS client v${newVersion}"`;
diff --git a/scripts/js/test.mjs b/scripts/js/test.mjs
deleted file mode 100644
index e9d8e72a..00000000
--- a/scripts/js/test.mjs
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env zx
-import 'zx/globals';
-import { cliArguments, workingDirectory } from '../utils.mjs';
-
-const [folder, ...args] = cliArguments();
-
-// Build the client and run the tests.
-cd(path.join(workingDirectory, folder));
-await $`pnpm install`;
-await $`pnpm build`;
-await $`pnpm test ${args}`;
diff --git a/scripts/link-solana-version.mjs b/scripts/link-solana-version.mjs
deleted file mode 100644
index f92ae457..00000000
--- a/scripts/link-solana-version.mjs
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env zx
-import 'zx/globals';
-import { getInstalledSolanaVersion, getSolanaVersion } from './utils.mjs';
-
-const expectedVersion = getSolanaVersion();
-const installedVersion = await getInstalledSolanaVersion();
-
-const installPath = path.join(
-  os.homedir(),
-  '.local',
-  'share',
-  'solana',
-  'install'
-);
-const releasePath = path.join(
-  installPath,
-  'releases',
-  expectedVersion,
-  'solana-release'
-);
-const activeReleasePath = path.join(installPath, 'active_release');
-const hasRelease = await fs.exists(releasePath);
-
-if (!installedVersion) {
-  echo(
-    chalk.red('[ ERROR ]'),
-    `No Solana installation found. Solana ${expectedVersion} is required for this project.`
-  );
-  await askToInstallSolana(expectedVersion);
-} else if (installedVersion === expectedVersion) {
-  echo(
-    chalk.green('[ SUCCESS ]'),
-    `The expected Solana version ${expectedVersion} is installed.`
-  );
-} else if (hasRelease) {
-  await $`rm -f "${activeReleasePath}"`;
-  await $`ln -s "${releasePath}" "${activeReleasePath}"`;
-  echo(
-    chalk.green('[ SUCCESS ]'),
-    `Successfully switched from Solana version ${installedVersion} to ${expectedVersion} to match the project's requirements.`
-  );
-} else {
-  echo(
-    chalk.yellow('[ WARNING ]'),
-    `Cannot switch from Solana version ${installedVersion} to ${expectedVersion} because it is not installed.`
-  );
-  await askToInstallSolana(expectedVersion);
-}
-
-async function askToInstallSolana(version) {
-  const installRelease = await question('Should we install it now? [y/N] ');
-  if (installRelease === 'y') {
-    await installSolana(version);
-    echo(
-      chalk.green('[ SUCCESS ]'),
-      `Successfully installed Solana version ${version}.`
-    );
-  } else {
-    process.exit(1);
-  }
-}
-
-async function installSolana(version) {
-  echo(`Installing Solana ${version}...`);
-  const cutoff = '1.18.19';
-  const isBeforeCutoff =
-    (await $`[[ "$(printf '%s\n' "${cutoff}" "${version}" | sort -V | head -n1)" = "${version}" ]] && [[ "${cutoff}" != "${version}" ]]`.quiet()
-      .exitCode) == 0;
-  if (isBeforeCutoff) {
-    await $`sh -c "$(curl -sSfL https://release.solana.com/v${version}/install)"`;
-  } else {
-    await $`sh -c "$(curl -sSfL https://release.anza.xyz/v${version}/install)"`;
-  }
-}
diff --git a/scripts/restart-test-validator.sh b/scripts/restart-test-validator.sh
new file mode 100755
index 00000000..32ab3f31
--- /dev/null
+++ b/scripts/restart-test-validator.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+here="$(dirname "$0")"
+src_root="$(readlink -f "${here}/..")"
+cd "${src_root}"
+
+ARGS=(
+  -r
+  -q
+  --bpf-program SVSPxpvHdN29nkVg9rPapPNDddN5DipNLRUFhyjFThE ./target/deploy/spl_single_pool.so
+)
+PORT=8899
+PID=$(lsof -t -i:$PORT)
+
+if [ -n "$PID" ]; then
+  echo "Detected test validator running on PID $PID. Restarting..."
+  kill "$PID"
+  sleep 1
+fi
+
+echo "Starting Solana test validator..."
+solana-test-validator "${ARGS[@]}" &
+VALIDATOR_PID=$!
+
+# Wait for test validator to move past slot 0.
+echo -n "Waiting for validator to stabilize"
+for i in {1..8}; do
+  if ! kill -0 "$VALIDATOR_PID" 2>/dev/null; then
+    echo -e "\nTest validator exited early."
+    exit 1
+  fi
+
+  SLOT=$(solana slot -ul 2>/dev/null)
+  if [[ "$SLOT" =~ ^[0-9]+$ ]] && [ "$SLOT" -gt 8 ]; then
+    echo -e "\nTest validator is ready. Slot: $SLOT"
+    exit 0
+  fi
+
+  echo -n "."
+  sleep 1
+done
+
+echo -e "\nTimed out waiting for test validator to stabilize."
+exit 1
diff --git a/scripts/rust/audit.mjs b/scripts/rust/audit.mjs
deleted file mode 100644
index 51f825b7..00000000
--- a/scripts/rust/audit.mjs
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env zx
-import 'zx/globals';
-
-const advisories = [
-  // ed25519-dalek: Double Public Key Signing Function Oracle Attack
-  //
-  // Remove once repo upgrades to ed25519-dalek v2
-  'RUSTSEC-2022-0093',
-
-  // curve25519-dalek
-  //
-  // Remove once repo upgrades to curve25519-dalek v4
-  'RUSTSEC-2024-0344',
-
-  // Crate:     tonic
-  // Version:   0.9.2
-  // Title:     Remotely exploitable Denial of Service in Tonic
-  // Date:      2024-10-01
-  // ID:        RUSTSEC-2024-0376
-  // URL:       https://rustsec.org/advisories/RUSTSEC-2024-0376
-  // Solution:  Upgrade to >=0.12.3
-  'RUSTSEC-2024-0376',
-
-  // Crate:     idna
-  // Version:   0.1.5
-  // Title:     `idna` accepts Punycode labels that do not produce any non-ASCII when decoded
-  // Date:      2024-12-09
-  // ID:        RUSTSEC-2024-0421
-  // URL:       https://rustsec.org/advisories/RUSTSEC-2024-0421
-  // Solution:  Upgrade to >=1.0.0
-  // need to solve this dependency tree:
-  // jsonrpc-core-client v18.0.0 -> jsonrpc-client-transports v18.0.0 -> url v1.7.2 -> idna v0.1.5
-  'RUSTSEC-2024-0421',
-];
-const ignores = []
-advisories.forEach(x => {
-  ignores.push('--ignore');
-  ignores.push(x);
-});
-
-// Check Solana version.
-await $`cargo audit ${ignores}`;
diff --git a/scripts/rust/build-sbf.mjs b/scripts/rust/build-sbf.mjs
deleted file mode 100644
index 64a80d34..00000000
--- a/scripts/rust/build-sbf.mjs
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env zx
-import 'zx/globals';
-import {
-  cliArguments,
-  workingDirectory,
-} from '../utils.mjs';
-
-const [folder, ...args] = cliArguments();
-const manifestPath = path.join(workingDirectory, folder, 'Cargo.toml');
-await $`cargo-build-sbf --manifest-path ${manifestPath} ${args}`;
diff --git a/scripts/rust/format.mjs b/scripts/rust/format.mjs
deleted file mode 100644
index 7e24c575..00000000
--- a/scripts/rust/format.mjs
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env zx
-import 'zx/globals';
-import {
-  cliArguments,
-  getToolchainArgument,
-  partitionArguments,
-  popArgument,
-  workingDirectory,
-} from '../utils.mjs';
-
-const [folder, ...formatArgs] = cliArguments();
-
-const fix = popArgument(formatArgs, '--fix');
-const [cargoArgs, fmtArgs] = partitionArguments(formatArgs, '--');
-const toolchain = getToolchainArgument('nightly');
-
-const manifestPath = path.join(workingDirectory, folder, 'Cargo.toml');
-
-if (fix) {
-  await $`cargo ${toolchain} fmt --manifest-path ${manifestPath} ${cargoArgs} -- ${fmtArgs}`;
-} else {
-  await $`cargo ${toolchain} fmt --manifest-path ${manifestPath} ${cargoArgs} -- --check ${fmtArgs}`;
-}
diff --git a/scripts/rust/hack.mjs b/scripts/rust/hack.mjs
deleted file mode 100644
index 2e90c7a2..00000000
--- a/scripts/rust/hack.mjs
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env zx
-import 'zx/globals';
-import { cliArguments, getToolchainArgument } from '../utils.mjs';
-
-const toolchain = getToolchainArgument('nightly');
-await $`cargo ${toolchain} hack check --all-targets --feature-powerset ${cliArguments()}`;
diff --git a/scripts/rust/lint.mjs b/scripts/rust/lint.mjs
deleted file mode 100644
index 17be05a0..00000000
--- a/scripts/rust/lint.mjs
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env zx
-import 'zx/globals';
-import {
-  cliArguments,
-  getToolchainArgument,
-  popArgument,
-  workingDirectory,
-} from '../utils.mjs';
-
-const [folder, ...args] = cliArguments();
-
-// Configure arguments here.
-const lintArgs = [
-  '-Zunstable-options',
-  '--all-targets',
-  '--all-features',
-  '--',
-  '--deny=warnings',
-  '--deny=clippy::arithmetic_side_effects',
-  ...args,
-];
-
-const fix = popArgument(lintArgs, '--fix');
-const toolchain = getToolchainArgument('nightly');
-
-const manifestPath = path.join(workingDirectory, folder, 'Cargo.toml');
-
-if (fix) {
-  await $`cargo ${toolchain} clippy --manifest-path ${manifestPath} --fix ${lintArgs}`;
-} else {
-  await $`cargo ${toolchain} clippy --manifest-path ${manifestPath} ${lintArgs}`;
-}
diff --git a/scripts/rust/publish.mjs b/scripts/rust/publish.mjs
deleted file mode 100644
index 28bd91b8..00000000
--- a/scripts/rust/publish.mjs
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env zx
-import 'zx/globals';
-import { cliArguments, getCargo, workingDirectory } from '../utils.mjs';
-
-const dryRun = argv['dry-run'] ?? false;
-const [folder, level] = cliArguments();
-if (!folder) {
-  throw new Error('A path to a directory with a Rust package — e.g. "clients/cli" — must be provided.');
-}
-if (!level) {
-  throw new Error('A version level — e.g. "patch" — must be provided.');
-}
-
-cd(path.join(workingDirectory, folder));
-
-const packageToml = getCargo(folder).package;
-const oldVersion = packageToml.version;
-const packageName = packageToml.name;
-const tagName = path.basename(folder);
-
-// Publish the new version, commit the repo change, tag it, and push it all.
-const releaseArgs = dryRun
-  ? []
-  : ['--tag-name', `${tagName}@v{{version}}`, '--no-confirm', '--execute'];
-await $`cargo release ${level} ${releaseArgs}`;
-
-// Stop here if this is a dry run.
-if (dryRun) {
-  process.exit(0);
-}
-
-// Get the new version.
-const newVersion = getCargo(folder).package.version;
-const newGitTag = `${tagName}@v${newVersion}`;
-const oldGitTag = `${tagName}@v${oldVersion}`;
-
-// Expose the new version to CI if needed.
-if (process.env.CI) {
-  await $`echo "new_git_tag=${newGitTag}" >> $GITHUB_OUTPUT`;
-  await $`echo "old_git_tag=${oldGitTag}" >> $GITHUB_OUTPUT`;
-}
diff --git a/scripts/rust/semver.mjs b/scripts/rust/semver.mjs
deleted file mode 100644
index 07670ead..00000000
--- a/scripts/rust/semver.mjs
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env zx
-import 'zx/globals';
-import { cliArguments, getCargo, workingDirectory } from '../utils.mjs';
-
-const [folder, ...args] = cliArguments();
-const manifestPath = path.join(workingDirectory, folder, 'Cargo.toml');
-await $`cargo semver-checks --manifest-path ${manifestPath} ${args}`;
diff --git a/scripts/rust/test.mjs b/scripts/rust/test.mjs
deleted file mode 100644
index 6c5e0f9a..00000000
--- a/scripts/rust/test.mjs
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env zx
-import 'zx/globals';
-import {
-  cliArguments,
-  workingDirectory,
-} from '../utils.mjs';
-
-const [folder, ...args] = cliArguments();
-const manifestPath = path.join(workingDirectory, folder, 'Cargo.toml');
-
-await $`RUST_LOG=error cargo test --manifest-path ${manifestPath} ${args}`;
diff --git a/scripts/solana.dic b/scripts/solana.dic
index 874e9679..78e11b80 100644
--- a/scripts/solana.dic
+++ b/scripts/solana.dic
@@ -65,3 +65,4 @@ restake/D
 destake/D
 bpf
 sbf
+MEV
diff --git a/scripts/spellcheck.toml b/scripts/spellcheck.toml
index 2aa63cfc..67d80b07 100644
--- a/scripts/spellcheck.toml
+++ b/scripts/spellcheck.toml
@@ -3,3 +3,4 @@ use_builtin = true
 skip_os_lookups = false
 search_dirs = ["."]
 extra_dictionaries = ["solana.dic"]
+
diff --git a/scripts/upgrade-template.mjs b/scripts/upgrade-template.mjs
deleted file mode 100644
index a1e01b45..00000000
--- a/scripts/upgrade-template.mjs
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env zx
-import 'zx/globals';
-import { getCargo } from './utils.mjs';
-
-// Arguments to pass to the `create-solana-program` command.
-const rustClientCargo = getCargo(path.join('clients', 'rust'));
-const jsClientPkg = require(
-  path.join(__dirname, '..', 'clients', 'js', 'package.json')
-);
-const templateArgs = [
-  'memo',
-  '--address',
-  'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr',
-  '--org',
-  'solana-program',
-  '--rust-client-crate-name',
-  rustClientCargo.package.name,
-  '--js-client-package-name',
-  jsClientPkg.name,
-  '--default',
-  '--force',
-];
-
-// File and folder patterns that should not be overwritten by the template upgrade.
-const unchangedGlobs = [
-  'clients/**/src/**',
-  'clients/**/src/*',
-  'clients/js/test/*',
-  'clients/rust/tests/*',
-  'program/**/*',
-  'program/*',
-  'scripts/generate-clients.mjs',
-  'scripts/generate-idls.mjs',
-  'scripts/upgrade-template.mjs',
-  'scripts/program/*',
-  'Cargo.lock',
-  '**/pnpm-lock.yaml',
-  'pnpm-lock.yaml',
-];
-
-// Prevent CLI arguments from being escaped.
-$.quote = (command) => command;
-
-// Re-generate the repo from the parent directory.
-cd('..');
-await $`pnpm create solana-program@latest ${templateArgs}`;
-
-// Go back inside the updated repo.
-cd('memo');
-
-// Restore files and folders that should not be overwritten.
-await $`git add --all`;
-for (const glob of unchangedGlobs) {
-  await $`git restore --worktree --staged "${glob}"`;
-}
-
-// Re-install dependencies.
-await $`pnpm install`;
diff --git a/scripts/utils.mjs b/scripts/utils.mjs
deleted file mode 100644
index e298a4c7..00000000
--- a/scripts/utils.mjs
+++ /dev/null
@@ -1,127 +0,0 @@
-import 'zx/globals';
-import { parse as parseToml } from '@iarna/toml';
-
-$.verbose = true;
-process.env.FORCE_COLOR = 3;
-process.env.CARGO_TERM_COLOR = 'always';
-
-export const workingDirectory = (await $`pwd`.quiet()).toString().trim();
-
-export function getAllProgramIdls() {
-  return getAllProgramFolders().map((folder) =>
-    path.join(workingDirectory, folder, 'idl.json')
-  );
-}
-
-export function getExternalProgramOutputDir() {
-  const config = getCargoMetadata()?.solana?.['external-programs-output'];
-  return path.join(workingDirectory, config ?? 'target/deploy');
-}
-
-export function getExternalProgramAddresses() {
-  const addresses = getProgramFolders().flatMap(
-    (folder) => getCargoMetadata(folder)?.solana?.['program-dependencies'] ?? []
-  );
-  return Array.from(new Set(addresses));
-}
-
-export function getExternalAccountAddresses() {
-  const addresses = getProgramFolders().flatMap(
-    (folder) => getCargoMetadata(folder)?.solana?.['account-dependencies'] ?? []
-  );
-  return Array.from(new Set(addresses));
-}
-
-let didWarnAboutMissingPrograms = false;
-export function getProgramFolders() {
-  let programs;
-
-  if (process.env.PROGRAMS) {
-    try {
-      programs = JSON.parse(process.env.PROGRAMS);
-    } catch (error) {
-      programs = process.env.PROGRAMS.split(/\s+/);
-    }
-  } else {
-    programs = getAllProgramFolders();
-  }
-
-  const filteredPrograms = programs.filter((program) =>
-    fs.existsSync(path.join(workingDirectory, program))
-  );
-
-  if (
-    filteredPrograms.length !== programs.length &&
-    !didWarnAboutMissingPrograms
-  ) {
-    didWarnAboutMissingPrograms = true;
-    programs
-      .filter((program) => !filteredPrograms.includes(program))
-      .forEach((program) => {
-        echo(chalk.yellow(`Program not found: ${workingDirectory}/${program}`));
-      });
-  }
-
-  return filteredPrograms;
-}
-
-export function getAllProgramFolders() {
-  return getCargo().workspace.members.filter((member) =>
-    (getCargo(member).lib?.['crate-type'] ?? []).includes('cdylib')
-  );
-}
-
-export function getCargo(folder) {
-  return parseToml(
-    fs.readFileSync(
-      path.join(workingDirectory, folder ? folder : '.', 'Cargo.toml'),
-      'utf8'
-    )
-  );
-}
-
-export function getCargoMetadata(folder) {
-  const cargo = getCargo(folder);
-  return folder ? cargo?.package?.metadata : cargo?.workspace?.metadata;
-}
-
-export function getSolanaVersion() {
-  return getCargoMetadata()?.cli?.solana;
-}
-
-export function getToolchain(operation) {
-  return getCargoMetadata()?.toolchains?.[operation];
-}
-
-export function getToolchainArgument(operation) {
-  const channel = getToolchain(operation);
-  return channel ? `+${channel}` : '';
-}
-
-export function cliArguments() {
-  return process.argv.slice(3);
-}
-
-export function popArgument(args, arg) {
-  const index = args.indexOf(arg);
-  if (index >= 0) {
-    args.splice(index, 1);
-  }
-  return index >= 0;
-}
-
-export function partitionArguments(args, delimiter) {
-  const index = args.indexOf(delimiter);
-  return index >= 0
-    ? [args.slice(0, index), args.slice(index + 1)]
-    : [args, []];
-}
-
-export async function getInstalledSolanaVersion() {
-  try {
-    const { stdout } = await $`solana --version`.quiet();
-    return stdout.match(/(\d+\.\d+\.\d+)/)?.[1];
-  } catch (error) {
-    return '';
-  }
-}