fix: ixs discs

Author: sonicfromnewyoke

programs/address-lookup-table/src/instructions/close.rs

@@ -34,24 +34,15 @@ impl Close<'_> {
             AccountMeta::writable(self.recipient.key()),
         ];
 
-        // Instruction data:
-        // - [0]: Instruction discriminator (1 byte, u8) (4 for Close)
-
-        let instruction_data = [4u8];
-
         let instruction = Instruction {
             program_id: &crate::ID,
             accounts: &account_metas,
-            data: &instruction_data,
+            data: &[4],
         };
 
         invoke_signed(
             &instruction,
-            &[
-                self.lookup_table,
-                self.authority,
-                self.recipient,
-            ],
+            &[self.lookup_table, self.authority, self.recipient],
             signers,
         )
     }

programs/address-lookup-table/src/instructions/create.rs

@@ -1,3 +1,4 @@
+use core::slice::from_raw_parts;
 use pinocchio::{
     account_info::AccountInfo,
     instruction::{AccountMeta, Instruction, Signer},
@@ -6,6 +7,8 @@ use pinocchio::{
     ProgramResult,
 };
 
+use crate::{write_bytes, UNINIT_BYTE};
+
 /// Create an address lookup table
 ///
 /// # Account references
@@ -52,18 +55,21 @@ impl Create<'_> {
         ];
 
         // Instruction data:
-        // - [0..4 ]: Instruction discriminator (1 byte, u8) (0 for Create)
+        // - [0..4 ]: Instruction discriminator (4 bytes, u32) (0 for Create)
         // - [4..12]: Recent Slot
         // - [12   ]: bump seed
-        let mut instruction_data = [0; 13];
-        instruction_data[0] = 0;
-        instruction_data[4..12].copy_from_slice(&self.recent_slot.to_le_bytes());
-        instruction_data[12] = self.bump_seed;
+        let mut instruction_data = [UNINIT_BYTE; 13];
+        write_bytes(&mut instruction_data, &[0]);
+        write_bytes(
+            &mut instruction_data[4..12],
+            &self.recent_slot.to_le_bytes(),
+        );
+        write_bytes(&mut instruction_data[12..], &[self.bump_seed]);
 
         let instruction = Instruction {
             program_id: &crate::ID,
             accounts: &account_metas,
-            data: &instruction_data,
+            data: unsafe { from_raw_parts(instruction_data.as_ptr() as _, 13) },
         };
 
         invoke_signed(

programs/address-lookup-table/src/instructions/deactivate.rs

@@ -31,21 +31,12 @@ impl Deactivate<'_> {
             AccountMeta::readonly_signer(self.authority.key()),
         ];
 
-        // Instruction data:
-        // - [0]: Instruction discriminator (1 byte, u8) (3 for Deactivate)
-
-        let instruction_data = [3u8];
-
         let instruction = Instruction {
             program_id: &crate::ID,
             accounts: &account_metas,
-            data: &instruction_data,
+            data: &[3],
         };
 
-        invoke_signed(
-            &instruction,
-            &[self.lookup_table, self.authority],
-            signers,
-        )
+        invoke_signed(&instruction, &[self.lookup_table, self.authority], signers)
     }
 }

programs/address-lookup-table/src/instructions/extend.rs

@@ -1,3 +1,4 @@
+use alloc::vec::Vec;
 use pinocchio::{
     account_info::AccountInfo,
     instruction::{AccountMeta, Instruction, Signer},
@@ -27,7 +28,7 @@ pub struct Extend<'a> {
     /// System program for CPI.
     pub system_program: Option<&'a AccountInfo>,
     /// Addresses to extend the table with
-    pub new_addresses: &'a [Pubkey],
+    pub new_addresses: Vec<&'a Pubkey>,
 }
 
 impl Extend<'_> {
@@ -38,7 +39,7 @@ impl Extend<'_> {
 
     pub fn invoke_signed(&self, signers: &[Signer]) -> ProgramResult {
         // Instruction data:
-        // - [0]: Instruction discriminator (1 byte, u8) (2 for Extend)
+        // - [0]: Instruction discriminator (4 bytes, u32) (2 for Extend)
 
         // LOOKUP_TABLE_MAX_ADDRESSES == u8::MAX + 1.
         let mut instruction_data = [0; 8196]; // TODO: huge for stack, maybe forget about no_std and use vector

programs/address-lookup-table/src/instructions/freeze.rs

@@ -30,21 +30,12 @@ impl Freeze<'_> {
             AccountMeta::readonly_signer(self.authority.key()),
         ];
 
-        // Instruction data:
-        // - [0]: Instruction discriminator (1 byte, u8) (1 for Freeze)
-
-        let instruction_data = [1u8];
-
         let instruction = Instruction {
             program_id: &crate::ID,
             accounts: &account_metas,
-            data: &instruction_data,
+            data: &[1],
         };
 
-        invoke_signed(
-            &instruction,
-            &[self.lookup_table, self.authority],
-            signers,
-        )
+        invoke_signed(&instruction, &[self.lookup_table, self.authority], signers)
     }
 }

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

@@ -2,4 +2,18 @@
 
 pub mod instructions;
 
+extern crate alloc;
+
 pinocchio_pubkey::declare_id!("AddressLookupTab1e1111111111111111111111111");
+
+use core::mem::MaybeUninit;
+
+// TODO: copy-pasted from token program/ Maybe it'll be better to move it under pinochio or even into dedicated crate
+const UNINIT_BYTE: MaybeUninit<u8> = MaybeUninit::<u8>::uninit();
+
+#[inline(always)]
+fn write_bytes(destination: &mut [MaybeUninit<u8>], source: &[u8]) {
+    for (d, s) in destination.iter_mut().zip(source.iter()) {
+        d.write(*s);
+    }
+}