Revert runtime changes

Author: joncinque

Cargo.lock

@@ -20,12 +20,11 @@ use {
             cap_accounts_data_len, enable_early_verification_of_account_modifications, FeatureSet,
         },
         hash::Hash,
-        instruction::{AccountMeta, InstructionError},
+        instruction::{AccountMeta, Instruction, InstructionError},
         native_loader,
         pubkey::Pubkey,
         rent::Rent,
         saturating_add_assign,
-        stable_layout::stable_instruction::StableInstruction,
         transaction_context::{InstructionAccount, TransactionAccount, TransactionContext},
     },
     std::{
@@ -564,7 +563,7 @@ impl<'a> InvokeContext<'a> {
     /// Entrypoint for a cross-program invocation from a builtin program
     pub fn native_invoke(
         &mut self,
-        instruction: StableInstruction,
+        instruction: Instruction,
         signers: &[Pubkey],
     ) -> Result<(), InstructionError> {
         let (instruction_accounts, program_indices) =
@@ -584,7 +583,7 @@ impl<'a> InvokeContext<'a> {
     #[allow(clippy::type_complexity)]
     pub fn prepare_instruction(
         &mut self,
-        instruction: &StableInstruction,
+        instruction: &Instruction,
         signers: &[Pubkey],
     ) -> Result<(Vec<InstructionAccount>, Vec<usize>), InstructionError> {
         // Finds the index of each account in the instruction by its pubkey.
@@ -1112,7 +1111,7 @@ mod tests {
         super::*,
         crate::compute_budget,
         serde::{Deserialize, Serialize},
-        solana_sdk::{account::WritableAccount, instruction::Instruction},
+        solana_sdk::account::WritableAccount,
     };
 
     #[derive(Debug, Serialize, Deserialize)]
@@ -1232,7 +1231,7 @@ mod tests {
                     assert_eq!(result, Err(InstructionError::UnbalancedInstruction));
                     result?;
                     invoke_context
-                        .native_invoke(inner_instruction.into(), &[])
+                        .native_invoke(inner_instruction, &[])
                         .and(invoke_context.pop())?;
                 }
                 MockInstruction::UnbalancedPop => instruction_context
@@ -1385,7 +1384,7 @@ mod tests {
             let inner_instruction =
                 Instruction::new_with_bincode(callee_program_id, &case.0, metas.clone());
             let result = invoke_context
-                .native_invoke(inner_instruction.into(), &[])
+                .native_invoke(inner_instruction, &[])
                 .and(invoke_context.pop());
             assert_eq!(result, case.1);
         }
@@ -1405,7 +1404,6 @@ mod tests {
                 },
                 metas.clone(),
             );
-            let inner_instruction = StableInstruction::from(inner_instruction);
             let (inner_instruction_accounts, program_indices) = invoke_context
                 .prepare_instruction(&inner_instruction, &[])
                 .unwrap();

program-runtime/src/invoke_context.rs

@@ -37,7 +37,6 @@ use {
         pubkey::Pubkey,
         rent::Rent,
         signature::{Keypair, Signer},
-        stable_layout::stable_instruction::StableInstruction,
         sysvar::{Sysvar, SysvarId},
     },
     solana_vote_program::vote_state::{VoteState, VoteStateVersions},
@@ -227,7 +226,6 @@ impl solana_sdk::program_stubs::SyscallStubs for SyscallStubs {
         account_infos: &[AccountInfo],
         signers_seeds: &[&[&[u8]]],
     ) -> ProgramResult {
-        let instruction = StableInstruction::from(instruction.clone());
         let invoke_context = get_invoke_context();
         let log_collector = invoke_context.get_log_collector();
         let transaction_context = &invoke_context.transaction_context;
@@ -250,7 +248,7 @@ impl solana_sdk::program_stubs::SyscallStubs for SyscallStubs {
             .collect::<Vec<_>>();
 
         let (instruction_accounts, program_indices) = invoke_context
-            .prepare_instruction(&instruction, &signers)
+            .prepare_instruction(instruction, &signers)
             .unwrap();
 
         // Copy caller's account_info modifications into invoke_context accounts

program-test/src/lib.rs

@@ -125,18 +125,18 @@ impl Processor {
 
         if required_lamports > 0 {
             invoke_context.native_invoke(
-                system_instruction::transfer(&payer_key, &table_key, required_lamports).into(),
+                system_instruction::transfer(&payer_key, &table_key, required_lamports),
                 &[payer_key],
             )?;
         }
 
         invoke_context.native_invoke(
-            system_instruction::allocate(&table_key, table_account_data_len as u64).into(),
+            system_instruction::allocate(&table_key, table_account_data_len as u64),
             &[table_key],
         )?;
 
         invoke_context.native_invoke(
-            system_instruction::assign(&table_key, &crate::id()).into(),
+            system_instruction::assign(&table_key, &crate::id()),
             &[table_key],
         )?;
 
@@ -313,7 +313,7 @@ impl Processor {
             drop(payer_account);
 
             invoke_context.native_invoke(
-                system_instruction::transfer(&payer_key, &table_key, required_lamports).into(),
+                system_instruction::transfer(&payer_key, &table_key, required_lamports),
                 &[payer_key],
             )?;
         }

programs/address-lookup-table/src/processor.rs

@@ -23,7 +23,6 @@ solana_rbpf = "=0.2.31"
 thiserror = "1.0"
 
 [dev-dependencies]
-memoffset = "0.6"
 rand = "0.7.3"
 solana-runtime = { path = "../../runtime", version = "=1.14.24" }
 

programs/bpf_loader/Cargo.toml

@@ -652,7 +652,7 @@ fn process_loader_upgradeable_instruction(
                 .iter()
                 .map(|seeds| Pubkey::create_program_address(*seeds, caller_program_id))
                 .collect::<Result<Vec<Pubkey>, solana_sdk::pubkey::PubkeyError>>()?;
-            invoke_context.native_invoke(instruction.into(), signers.as_slice())?;
+            invoke_context.native_invoke(instruction, signers.as_slice())?;
 
             // Load and verify the program bits
             let executor = create_executor(
@@ -1146,8 +1146,7 @@ fn process_loader_upgradeable_instruction(
                 )?;
 
                 invoke_context.native_invoke(
-                    system_instruction::transfer(&payer_key, &programdata_key, required_payment)
-                        .into(),
+                    system_instruction::transfer(&payer_key, &programdata_key, required_payment),
                     &[],
                 )?;
             }

programs/bpf_loader/src/lib.rs

@@ -1,11 +1,8 @@
 use {
     super::*,
     crate::declare_syscall,
-    solana_sdk::{
-        stable_layout::stable_instruction::StableInstruction,
-        syscalls::{
-            MAX_CPI_ACCOUNT_INFOS, MAX_CPI_INSTRUCTION_ACCOUNTS, MAX_CPI_INSTRUCTION_DATA_LEN,
-        },
+    solana_sdk::syscalls::{
+        MAX_CPI_ACCOUNT_INFOS, MAX_CPI_INSTRUCTION_ACCOUNTS, MAX_CPI_INSTRUCTION_DATA_LEN,
     },
 };
 
@@ -30,7 +27,7 @@ trait SyscallInvokeSigned<'a, 'b> {
         addr: u64,
         memory_mapping: &mut MemoryMapping,
         invoke_context: &mut InvokeContext,
-    ) -> Result<StableInstruction, EbpfError<BpfError>>;
+    ) -> Result<Instruction, EbpfError<BpfError>>;
     fn translate_accounts<'c>(
         &'c self,
         instruction_accounts: &[InstructionAccount],
@@ -87,8 +84,8 @@ impl<'a, 'b> SyscallInvokeSigned<'a, 'b> for SyscallInvokeSignedRust<'a, 'b> {
         addr: u64,
         memory_mapping: &mut MemoryMapping,
         invoke_context: &mut InvokeContext,
-    ) -> Result<StableInstruction, EbpfError<BpfError>> {
-        let ix = translate_type::<StableInstruction>(
+    ) -> Result<Instruction, EbpfError<BpfError>> {
+        let ix = translate_type::<Instruction>(
             memory_mapping,
             addr,
             invoke_context.get_check_aligned(),
@@ -124,11 +121,10 @@ impl<'a, 'b> SyscallInvokeSigned<'a, 'b> for SyscallInvokeSignedRust<'a, 'b> {
             invoke_context.get_check_size(),
         )?
         .to_vec();
-
-        Ok(StableInstruction {
-            accounts: accounts.into(),
-            data: data.into(),
+        Ok(Instruction {
             program_id: ix.program_id,
+            accounts,
+            data,
         })
     }
 
@@ -398,7 +394,7 @@ impl<'a, 'b> SyscallInvokeSigned<'a, 'b> for SyscallInvokeSignedC<'a, 'b> {
         addr: u64,
         memory_mapping: &mut MemoryMapping,
         invoke_context: &mut InvokeContext,
-    ) -> Result<StableInstruction, EbpfError<BpfError>> {
+    ) -> Result<Instruction, EbpfError<BpfError>> {
         let ix_c = translate_type::<SolInstruction>(
             memory_mapping,
             addr,
@@ -458,10 +454,10 @@ impl<'a, 'b> SyscallInvokeSigned<'a, 'b> for SyscallInvokeSignedC<'a, 'b> {
             })
             .collect::<Result<Vec<AccountMeta>, EbpfError<BpfError>>>()?;
 
-        Ok(StableInstruction {
-            accounts: accounts.into(),
-            data: data.into(),
+        Ok(Instruction {
             program_id: *program_id,
+            accounts,
+            data,
         })
     }
 

programs/bpf_loader/src/syscalls/cpi.rs

@@ -41,7 +41,7 @@ use {
         },
         hash::{Hasher, HASH_BYTES},
         instruction::{
-            AccountMeta, InstructionError, ProcessedSiblingInstruction,
+            AccountMeta, Instruction, InstructionError, ProcessedSiblingInstruction,
             TRANSACTION_LEVEL_STACK_HEIGHT,
         },
         keccak, native_loader,
@@ -2073,9 +2073,7 @@ mod tests {
             bpf_loader,
             fee_calculator::FeeCalculator,
             hash::hashv,
-            instruction::Instruction,
             program::check_type_assumptions,
-            stable_layout::stable_instruction::StableInstruction,
             sysvar::{clock::Clock, epoch_schedule::EpochSchedule, rent::Rent},
             transaction_context::TransactionContext,
         },
@@ -2193,12 +2191,11 @@ mod tests {
             &"foobar",
             vec![AccountMeta::new(solana_sdk::pubkey::new_rand(), false)],
         );
-        let instruction = StableInstruction::from(instruction);
         let addr = &instruction as *const _ as u64;
         let mut memory_region = MemoryRegion {
             host_addr: addr,
             vm_addr: 0x100000000,
-            len: std::mem::size_of::<StableInstruction>() as u64,
+            len: std::mem::size_of::<Instruction>() as u64,
             vm_gap_shift: 63,
             is_writable: false,
         };
@@ -2208,13 +2205,13 @@ mod tests {
         )
         .unwrap();
         let translated_instruction =
-            translate_type::<StableInstruction>(&memory_mapping, 0x100000000, true).unwrap();
+            translate_type::<Instruction>(&memory_mapping, 0x100000000, true).unwrap();
         assert_eq!(instruction, *translated_instruction);
         memory_region.len = 1;
         memory_mapping
             .replace_region::<BpfError>(1, memory_region)
             .unwrap();
-        assert!(translate_type::<StableInstruction>(&memory_mapping, 0x100000000, true).is_err());
+        assert!(translate_type::<Instruction>(&memory_mapping, 0x100000000, true).is_err());
     }
 
     #[test]