Remove move feature (#6605)

automerge

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);