processing-instructions/steel - add api

Author: thewuhxyz

basics/processing-instructions/steel/Cargo.toml

@@ -1,3 +1,9 @@
 [workspace]
-members = ["program"]
+members = ["api", "program"]
 resolver = "2"
+
+[workspace.dependencies]
+solana-program = "1.18.17"
+steel = "2.1"
+bytemuck = "1.4"
+num_enum = "0.7"

basics/processing-instructions/steel/api/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "processing-instructions-steel-api"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+solana-program = "1.18.17"
+steel = "2.1"
+bytemuck = "1.4"
+num_enum = "0.7"
+
+[lib]
+crate-type = ["cdylib", "lib"]

basics/processing-instructions/steel/api/src/instruction.rs

@@ -0,0 +1,39 @@
+use solana_program::msg;
+use std::ffi::CStr;
+use steel::*;
+
+#[repr(u8)]
+#[derive(Clone, Copy, Debug, Zeroable, TryFromPrimitive, IntoPrimitive)]
+pub enum ParkInstruction {
+    Park = 0,
+}
+
+instruction!(ParkInstruction, Park);
+#[repr(C, packed)]
+#[derive(Clone, Copy, Debug, Pod, Zeroable)]
+pub struct Park {
+    pub name: [u8; 32],
+    pub height: u32,
+}
+
+impl Park {
+    pub fn process_instruction_data(instruction_data: &[u8]) -> ProgramResult {
+        // Steel uses bytemuck under the hood to process instruction data
+        //  bytemuck::try_from_bytes::<Park>(instruction_data)
+        //
+        let instruction_data_object = Park::try_from_bytes(instruction_data)?;
+
+        msg!(
+            "Welcome to the park, {:?}!",
+            CStr::from_bytes_until_nul(&instruction_data_object.name).unwrap()
+        );
+
+        if instruction_data_object.height > 5 {
+            msg!("You are tall enough to ride this ride. Congratulations.");
+        } else {
+            msg!("You are NOT tall enough to ride this ride. Sorry mate.");
+        };
+
+        Ok(())
+    }
+}

basics/processing-instructions/steel/api/src/lib.rs

@@ -0,0 +1,9 @@
+mod instruction;
+
+use steel::*;
+
+declare_id!("z7msBPQHDJjTvdQRoEcKyENgXDhSRYeHieN1ZMTqo35");
+
+pub mod prelude {
+    pub use crate::instruction::*;
+}

basics/processing-instructions/steel/program/Cargo.toml

@@ -4,10 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-solana-program = "1.18.17"
-steel = "2.1"
-bytemuck = "1.4"
-num_enum = "0.7"
+steel.workspace = true
+processing-instructions-steel-api = {path = "../api"}
 
 [lib]
 crate-type = ["cdylib", "lib"]

basics/processing-instructions/steel/program/src/lib.rs

@@ -1,46 +1,26 @@
-use std::ffi::CStr;
-
-use solana_program::msg;
+use processing_instructions_steel_api::prelude::*;
 use steel::*;
 
-declare_id!("z7msBPQHDJjTvdQRoEcKyENgXDhSRYeHieN1ZMTqo35");
-
 entrypoint!(process_instruction);
 
 fn process_instruction(
-    _program_id: &Pubkey,
+    program_id: &Pubkey,
     _accounts: &[AccountInfo],
     instruction_data: &[u8],
 ) -> ProgramResult {
-    // Steel uses bytemuck under the hood to process instruction data
-    //  bytemuck::try_from_bytes::<Park>(instruction_data)
+    // get the first bytes from the instruction data as the instruction discriminator
     //
-    let instruction_data_object = Park::try_from_bytes(instruction_data)?;
-
-    msg!(
-        "Welcome to the park, {:?}!",
-        CStr::from_bytes_until_nul(&instruction_data_object.name).unwrap()
-    );
+    let (ix, data) = parse_instruction(
+        &processing_instructions_steel_api::ID,
+        program_id,
+        instruction_data,
+    )?;
 
-    if instruction_data_object.height > 5 {
-        msg!("You are tall enough to ride this ride. Congratulations.");
-    } else {
-        msg!("You are NOT tall enough to ride this ride. Sorry mate.");
-    };
-
-    Ok(())
-}
-
-instruction!(ParkInstruction, Park);
-#[repr(C, packed)]
-#[derive(Clone, Copy, Debug, Pod, Zeroable)]
-pub struct Park {
-    pub name: [u8; 32],
-    pub height: u32,
-}
-
-#[repr(u8)]
-#[derive(Clone, Copy, Debug, Zeroable)]
-pub enum ParkInstruction {
-    Park = 0,
+    // match the discriminator
+    //
+    match ix {
+        // process the rest of the data
+        //
+        ParkInstruction::Park => Park::process_instruction_data(data),
+    }
 }

basics/processing-instructions/steel/tests/test.ts

@@ -5,7 +5,7 @@ import * as borsh from 'borsh';
 import { start } from 'solana-bankrun';
 
 describe('custom-instruction-data', async () => {
-  const PROGRAM_ID = PublicKey.unique();
+  const PROGRAM_ID = new PublicKey('z7msBPQHDJjTvdQRoEcKyENgXDhSRYeHieN1ZMTqo35');
   const context = await start([{ name: 'processing_instructions_steel_program', programId: PROGRAM_ID }], []);
   const client = context.banksClient;
   const payer = context.payer;
@@ -50,6 +50,14 @@ describe('custom-instruction-data', async () => {
     ],
   ]);
 
+  enum ParkInstruction {
+    Park = 0,
+  }
+
+  const addInstructionDiscriminator = (discriminator: ParkInstruction, instructionData: InstructionData) => {
+    return Buffer.concat([Buffer.from([discriminator]), instructionData.toBuffer()]);
+  };
+
   test('Go to the park!', async () => {
     const blockhash = context.lastBlockhash;
 
@@ -66,12 +74,12 @@ describe('custom-instruction-data', async () => {
     const ix1 = new TransactionInstruction({
       keys: [{ pubkey: payer.publicKey, isSigner: true, isWritable: true }],
       programId: PROGRAM_ID,
-      data: jimmy.toBuffer(),
+      data: addInstructionDiscriminator(ParkInstruction.Park, jimmy),
     });
 
     const ix2 = new TransactionInstruction({
       ...ix1,
-      data: mary.toBuffer(),
+      data: addInstructionDiscriminator(ParkInstruction.Park, mary),
     });
 
     const tx = new Transaction();