Remove move_loader ID

genesis-programs/src/lib.rs

@@ -1,6 +1,5 @@
 use solana_sdk::{
-    clock::Epoch, genesis_config::OperatingMode, inflation::Inflation,
-    move_loader::solana_move_loader_program, pubkey::Pubkey,
+    clock::Epoch, genesis_config::OperatingMode, inflation::Inflation, pubkey::Pubkey,
 };
 
 #[macro_use]
@@ -57,7 +56,6 @@ pub fn get_programs(operating_mode: OperatingMode, epoch: Epoch) -> Option<Vec<(
                     // Programs that are only available in Development mode
                     solana_budget_program!(),
                     solana_exchange_program!(),
-                    solana_move_loader_program(),
                 ])
             } else {
                 None

scripts/cargo-install-all.sh

@@ -11,23 +11,19 @@ usage() {
     echo "Error: $*"
   fi
   cat <<EOF
-usage: $0 [+<cargo version>] [--use-move] [--debug] <install directory>
+usage: $0 [+<cargo version>] [--debug] <install directory>
 EOF
   exit $exitcode
 }
 
 maybeRustVersion=
-useMove=false
 installDir=
 buildVariant=release
 maybeReleaseFlag=--release
 
 while [[ -n $1 ]]; do
   if [[ ${1:0:1} = - ]]; then
-    if [[ $1 = --use-move ]]; then
-      useMove=true
-      shift
-    elif [[ $1 = --debug ]]; then
+    if [[ $1 = --debug ]]; then
       maybeReleaseFlag=
       buildVariant=debug
       shift
@@ -75,13 +71,6 @@ else
     set -x
     # shellcheck disable=SC2086 # Don't want to double quote $rust_version
     $cargo $maybeRustVersion build $maybeReleaseFlag
-
-    if $useMove; then
-      moveLoaderDir=programs/move_loader
-      # shellcheck disable=SC2086 # Don't want to double quote $rust_version
-      $cargo $maybeRustVersion build $maybeReleaseFlag --manifest-path "$moveLoaderDir/Cargo.toml"
-      cp -fv $moveLoaderDir/target/$buildVariant/libsolana_move_loader_program.* "$installDir/bin/deps"
-    fi
   )
 
 

sdk/src/lib.rs

@@ -25,7 +25,6 @@ pub mod inflation;
 pub mod instruction;
 pub mod loader_instruction;
 pub mod message;
-pub mod move_loader;
 pub mod native_loader;
 pub mod native_token;
 pub mod nonce;