Remove move feature (#6605)

automerge

Cargo.lock

@@ -3441,8 +3441,6 @@ dependencies = [
  "solana-config-program 0.21.0",
  "solana-exchange-api 0.21.0",
  "solana-exchange-program 0.21.0",
- "solana-move-loader-api 0.21.0",
- "solana-move-loader-program 0.21.0",
  "solana-runtime 0.21.0",
  "solana-sdk 0.21.0",
  "solana-stake-api 0.21.0",

Cargo.toml

@@ -34,9 +34,6 @@ members = [
     "programs/exchange_api",
     "programs/exchange_program",
     "programs/failure_program",
-    "programs/move_loader_api",
-    "programs/move_loader_program",
-    "programs/librapay_api",
     "programs/noop_program",
     "programs/stake_api",
     "programs/stake_program",
@@ -61,4 +58,7 @@ members = [
 
 exclude = [
     "programs/bpf",
+    "programs/move_loader_api",
+    "programs/move_loader_program",
+    "programs/librapay_api",
 ]

bench-tps/Cargo.toml

@@ -35,4 +35,4 @@ serial_test = "0.2.0"
 serial_test_derive = "0.2.0"
 
 [features]
-move = ["solana-core/move", "solana-librapay-api", "solana-move-loader-program", "solana-move-loader-api"]
+move = ["solana-librapay-api", "solana-move-loader-program", "solana-move-loader-api"]

ci/test-stable.sh

@@ -31,10 +31,10 @@ testName=$(basename "$0" .sh)
 case $testName in
 test-stable)
   echo "Executing $testName"
-
-  _ cargo +"$rust_stable" build --tests --bins ${V:+--verbose}
-  _ cargo +"$rust_stable" test --all --exclude solana-local-cluster ${V:+--verbose} -- --nocapture
   _ cargo +"$rust_stable" test --manifest-path local_cluster/Cargo.toml --features=move ${V:+--verbose} test_bench_tps_local_cluster_move -- --nocapture
+  _ cargo +"$rust_stable" test --manifest-path programs/move_loader_api/Cargo.toml ${V:+--verbose} -- --nocapture
+  _ cargo +"$rust_stable" test --manifest-path programs/move_loader_program/Cargo.toml ${V:+--verbose} -- --nocapture
+  _ cargo +"$rust_stable" test --manifest-path programs/librapay_api/Cargo.toml ${V:+--verbose} -- --nocapture
   ;;
 test-stable-perf)
   echo "Executing $testName"

core/Cargo.toml

@@ -15,7 +15,6 @@ codecov = { repository = "solana-labs/solana", branch = "master", service = "git
 
 [features]
 pin_gpu_memory = []
-move = []
 
 [dependencies]
 bincode = "1.2.0"

genesis_programs/Cargo.toml

@@ -18,8 +18,6 @@ solana-config-api = { path = "../programs/config_api", version = "0.21.0" }
 solana-config-program = { path = "../programs/config_program", version = "0.21.0" }
 solana-exchange-api = { path = "../programs/exchange_api", version = "0.21.0" }
 solana-exchange-program = { path = "../programs/exchange_program", version = "0.21.0" }
-solana-move-loader-program = { path = "../programs/move_loader_program", version = "0.21.0", optional = true }
-solana-move-loader-api = { path = "../programs/move_loader_api", version = "0.21.0", optional = true }
 solana-runtime = { path = "../runtime", version = "0.21.0" }
 solana-sdk = { path = "../sdk", version = "0.21.0" }
 solana-stake-api = { path = "../programs/stake_api", version = "0.21.0" }
@@ -34,6 +32,3 @@ solana-vote-program = { path = "../programs/vote_program", version = "0.21.0" }
 [lib]
 crate-type = ["lib"]
 name = "solana_genesis_programs"
-
-[features]
-move = ["solana-move-loader-program", "solana-move-loader-api"]

genesis_programs/src/lib.rs

@@ -1,6 +1,6 @@
 use solana_sdk::{
-    clock::Epoch, genesis_block::OperatingMode, pubkey::Pubkey,
+    clock::Epoch, genesis_block::OperatingMode, move_loader::solana_move_loader_program,
-    system_program::solana_system_program,
+    pubkey::Pubkey, system_program::solana_system_program,
 };
 
 #[macro_use]
@@ -11,9 +11,6 @@ extern crate solana_budget_program;
 extern crate solana_config_program;
 #[macro_use]
 extern crate solana_exchange_program;
-#[cfg(feature = "move")]
-#[macro_use]
-extern crate solana_move_loader_program;
 #[macro_use]
 extern crate solana_stake_program;
 #[macro_use]
@@ -42,8 +39,7 @@ pub fn get(operating_mode: OperatingMode, epoch: Epoch) -> Option<Vec<(String, P
                     // Programs that are only available in Development mode
                     solana_budget_program!(),
                     solana_exchange_program!(),
-                    #[cfg(feature = "move")]
+                    solana_move_loader_program(),
-                    solana_move_loader_program!(),
                 ])
             } else {
                 None
@@ -107,7 +103,7 @@ mod tests {
 
     #[test]
     fn test_development_programs() {
-        assert_eq!(get(OperatingMode::Development, 0).unwrap().len(), 9);
+        assert_eq!(get(OperatingMode::Development, 0).unwrap().len(), 10);
         assert_eq!(get(OperatingMode::Development, 1), None);
     }
 

local_cluster/src/lib.rs

@@ -29,7 +29,6 @@ extern crate solana_drone;
 extern crate solana_exchange_program;
 
 #[cfg(feature = "move")]
-#[macro_use]
 #[cfg(test)]
 extern crate solana_move_loader_program;
 

local_cluster/src/tests/bench_tps.rs

@@ -7,14 +7,14 @@ use solana_core::cluster_info::VALIDATOR_PORT_RANGE;
 use solana_core::validator::ValidatorConfig;
 use solana_drone::drone::run_local_drone;
 #[cfg(feature = "move")]
-use solana_move_loader_program;
+use solana_sdk::move_loader::solana_move_loader_program;
 use solana_sdk::signature::{Keypair, KeypairUtil};
 use std::sync::mpsc::channel;
 use std::time::Duration;
 
 fn test_bench_tps_local_cluster(config: Config) {
     #[cfg(feature = "move")]
-    let native_instruction_processors = vec![solana_move_loader_program!()];
+    let native_instruction_processors = vec![solana_move_loader_program()];
 
     #[cfg(not(feature = "move"))]
     let native_instruction_processors = vec![];

programs/librapay_api/src/lib.rs

@@ -34,7 +34,7 @@ pub fn create_genesis<T: Client>(from_key: &Keypair, client: &T, amount: u64) ->
         1,
         bincode::serialized_size(&LibraAccountState::create_genesis(amount).unwrap()).unwrap()
             as u64,
-        &solana_move_loader_api::id(),
+        &solana_sdk::move_loader::id(),
     );
     client.send_instruction(&from_key, instruction).unwrap();
 
@@ -52,7 +52,12 @@ pub fn upload_move_program<T: Client>(from: &Keypair, client: &T, code: &str) ->
     let account_state = LibraAccountState::create_program(&address, code, vec![]);
     let program_bytes = bincode::serialize(&account_state).unwrap();
 
-    load_program(client, &from, &solana_move_loader_api::id(), program_bytes)
+    load_program(
+        client,
+        &from,
+        &solana_sdk::move_loader::id(),
+        program_bytes,
+    )
 }
 
 pub fn upload_mint_program<T: Client>(from: &Keypair, client: &T) -> Pubkey {

programs/librapay_api/src/librapay_instruction.rs

@@ -13,7 +13,7 @@ pub fn genesis(genesis_pubkey: &Pubkey, microlibras: u64) -> Instruction {
 
     let accounts = vec![AccountMeta::new(*genesis_pubkey, true)];
 
-    Instruction::new(solana_move_loader_api::id(), &ix_data, accounts)
+    Instruction::new(solana_sdk::move_loader::id(), &ix_data, accounts)
 }
 
 pub fn mint(
@@ -41,7 +41,7 @@ pub fn mint(
         AccountMeta::new(*to_pubkey, false),
     ];
 
-    Instruction::new(solana_move_loader_api::id(), &ix_data, accounts)
+    Instruction::new(solana_sdk::move_loader::id(), &ix_data, accounts)
 }
 
 pub fn transfer(
@@ -71,7 +71,7 @@ pub fn transfer(
         AccountMeta::new(*to_pubkey, false),
     ];
 
-    Instruction::new(solana_move_loader_api::id(), &ix_data, accounts)
+    Instruction::new(solana_sdk::move_loader::id(), &ix_data, accounts)
 }
 
 #[cfg(test)]

programs/librapay_api/src/librapay_transaction.rs

@@ -75,7 +75,7 @@ pub fn create_accounts(
                 to,
                 lamports,
                 400,
-                &solana_move_loader_api::id(),
+                &solana_sdk::move_loader::id(),
             )
         })
         .collect();
@@ -148,7 +148,7 @@ mod tests {
         let (genesis_block, mint_keypair) = create_genesis_block(lamports);
         let mut bank = Bank::new(&genesis_block);
         bank.add_instruction_processor(
-            solana_move_loader_api::id(),
+            solana_sdk::move_loader::id(),
             solana_move_loader_api::processor::process_instruction,
         );
         let shared_bank = Arc::new(bank);

programs/move_loader_api/src/lib.rs

@@ -2,13 +2,3 @@ pub mod account_state;
 pub mod data_store;
 pub mod error_mappers;
 pub mod processor;
-
-const MOVE_LOADER_PROGRAM_ID: [u8; 32] = [
-    5, 84, 172, 160, 172, 5, 64, 41, 134, 4, 81, 31, 45, 11, 30, 64, 219, 238, 140, 38, 194, 100,
-    192, 219, 156, 94, 62, 208, 0, 0, 0, 0,
-];
-
-solana_sdk::solana_name_id!(
-    MOVE_LOADER_PROGRAM_ID,
-    "MoveLdr111111111111111111111111111111111111"
-);

programs/move_loader_api/src/processor.rs

@@ -1,14 +1,13 @@
 use crate::account_state::{pubkey_to_address, LibraAccountState, ModuleBytes};
 use crate::data_store::DataStore;
 use crate::error_mappers::*;
-use crate::id;
 use bytecode_verifier::verifier::{VerifiedModule, VerifiedScript};
 use log::*;
 use serde_derive::{Deserialize, Serialize};
 use solana_sdk::{
     account::KeyedAccount, instruction::InstructionError,
     instruction_processor_utils::limited_deserialize, loader_instruction::LoaderInstruction,
-    pubkey::Pubkey, sysvar::rent,
+    move_loader::id, pubkey::Pubkey, sysvar::rent,
 };
 use types::{
     account_address::AccountAddress,

programs/move_loader_program/src/lib.rs

@@ -1,12 +1,2 @@
-#[macro_export]
-macro_rules! solana_move_loader_program {
-    () => {
-        (
-            "solana_move_loader_program".to_string(),
-            solana_move_loader_api::id(),
-        )
-    };
-}
-
 use solana_move_loader_api::processor::process_instruction;
 solana_sdk::solana_entrypoint!(process_instruction);

scripts/cargo-install-all.sh

@@ -37,6 +37,9 @@ SECONDS=0
   set -x
   # shellcheck disable=SC2086 # Don't want to double quote $rust_version
   $cargo $rust_version build $maybeReleaseFlag
+
+  # shellcheck disable=SC2086 # Don't want to double quote $rust_version
+  $cargo $rust_version build $maybeReleaseFlag --manifest-path programs/move_loader_program/Cargo.toml
 )
 
 BINS=(

sdk/src/lib.rs

@@ -10,6 +10,7 @@ pub mod instruction;
 pub mod instruction_processor_utils;
 pub mod loader_instruction;
 pub mod message;
+pub mod move_loader;
 pub mod native_loader;
 pub mod native_token;
 pub mod poh_config;

sdk/src/move_loader.rs

@@ -0,0 +1,13 @@
+const MOVE_LOADER_PROGRAM_ID: [u8; 32] = [
+    5, 84, 172, 160, 172, 5, 64, 41, 134, 4, 81, 31, 45, 11, 30, 64, 219, 238, 140, 38, 194, 100,
+    192, 219, 156, 94, 62, 208, 0, 0, 0, 0,
+];
+
+crate::solana_name_id!(
+    MOVE_LOADER_PROGRAM_ID,
+    "MoveLdr111111111111111111111111111111111111"
+);
+
+pub fn solana_move_loader_program() -> (String, crate::pubkey::Pubkey) {
+    ("solana_move_loader_program".to_string(), id())
+}