Fix: Ephemeral Rollups Pinocchio SDK (#69)

* fix: pinocchio sdk

* fix: linter & CI

* feat: fix pinocchio delegation

* chore: lint

* chore: enable tests in CI

* chore: cancel prev workflow if newer

* chore: remove test

* fix: undelegation callback

* chore: simplify and refactor

* chore: refactor

Author: GabrielePicco

.github/workflows/build.yml

@@ -6,6 +6,9 @@ on:
   pull_request:
     branches:
       - "main"
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 env:
   rust_version: 1.89.0
   node_version: 23
@@ -135,3 +138,4 @@ jobs:
           solana --version
           cargo build
           anchor build --no-idl
+#          anchor test

.github/workflows/publish-crates-and-sdk.yml

@@ -6,6 +6,9 @@ on:
     branches:
       - 'release/v*'
   workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 env:
   rust_version: 1.85.0

rust/Cargo.lock

@@ -55,11 +55,11 @@ solana-program = { version = ">=1.16" }
 sdk = { package = "solana-sdk", version = ">=1.16" }
 rpc = { package = "solana-rpc-client", version = ">=1.16" }
 rpc-api = { package = "solana-rpc-client-api", version = ">=1.16" }
-pinocchio = "0.8.1"
-pinocchio-log = "0.4.0"
-pinocchio-pubkey = "0.2.4"
-pinocchio-system = "0.2.3"
-pinocchio-token = "0.3.0"
+pinocchio = { version = "0.8.1", default-features = false }
+pinocchio-log = { version = "0.4.0", default-features = false }
+pinocchio-pubkey = { version = "0.2.4", default-features = false }
+pinocchio-system = { version = "0.2.3", default-features = false }
+pinocchio-token = { version = "0.3.0", default-features = false }
 
 # serialization/parsing
 serde = { version = "1.0", features = [ "derive" ] }

rust/Cargo.toml

@@ -18,3 +18,9 @@ pinocchio-pubkey  = { workspace = true }
 pinocchio-system  = { workspace = true }
 pinocchio-token  = { workspace = true }
 
+[features]
+default = []
+std = [
+    "pinocchio/std",
+]
+

rust/pinocchio/Cargo.toml

@@ -1,50 +1,32 @@
-use core::mem::MaybeUninit;
+use alloc::vec::Vec;
 use pinocchio::{
     account_info::AccountInfo,
     cpi::{slice_invoke, MAX_CPI_ACCOUNTS},
-    instruction::Instruction,
     program_error::ProgramError,
     ProgramResult,
 };
 
 use crate::utils::create_schedule_commit_ix;
 
-pub fn commit_accounts(accounts: &[AccountInfo]) -> ProgramResult {
-    let [payer, magic_context, magic_program, rest @ ..] = accounts else {
-        return Err(ProgramError::NotEnoughAccountKeys);
-    };
+pub fn commit_accounts(
+    payer: &AccountInfo,
+    accounts: &[AccountInfo],
+    magic_context: &AccountInfo,
+    magic_program: &AccountInfo,
+) -> ProgramResult {
+    let ix = create_schedule_commit_ix(payer, accounts, magic_context, magic_program, false)?;
 
-    let (ix_data, ix_accounts) = create_schedule_commit_ix(payer, rest, magic_context, false)?;
-    let ix = Instruction {
-        program_id: magic_program.key(),
-        data: ix_data,
-        accounts: ix_accounts,
-    };
-
-    let num_accounts = 2 + rest.len(); // payer + magic_context + rest
+    let num_accounts = 1 + accounts.len(); // payer + accounts
     if num_accounts > MAX_CPI_ACCOUNTS {
         return Err(ProgramError::InvalidArgument);
     }
 
-    const UNINIT_REF: MaybeUninit<&AccountInfo> = MaybeUninit::<&AccountInfo>::uninit();
-    let mut account_refs = [UNINIT_REF; MAX_CPI_ACCOUNTS];
-
-    unsafe {
-        // SAFETY: num_accounts <= MAX_CPI_ACCOUNTS
-        account_refs.get_unchecked_mut(0).write(payer);
-        account_refs.get_unchecked_mut(1).write(magic_context);
-
-        // Add rest accounts
-        for i in 0..rest.len() {
-            let account = rest.get_unchecked(i);
-            account_refs.get_unchecked_mut(2 + i).write(account);
-        }
+    let mut all_accounts: Vec<&AccountInfo> = Vec::with_capacity(accounts.len() + 1);
+    all_accounts.push(payer);
+    for account in accounts.iter() {
+        all_accounts.push(account);
     }
 
-    let all_accounts = unsafe {
-        core::slice::from_raw_parts(account_refs.as_ptr() as *const &AccountInfo, num_accounts)
-    };
-
-    slice_invoke(&ix, all_accounts)?;
+    slice_invoke(&ix, &all_accounts)?;
     Ok(())
 }

rust/pinocchio/src/instruction/commit.rs

@@ -1,50 +1,32 @@
-use core::mem::MaybeUninit;
+use alloc::vec::Vec;
 use pinocchio::{
     account_info::AccountInfo,
     cpi::{slice_invoke, MAX_CPI_ACCOUNTS},
-    instruction::Instruction,
     program_error::ProgramError,
     ProgramResult,
 };
 
 use crate::utils::create_schedule_commit_ix;
 
-pub fn commit_and_undelegate_accounts(accounts: &[AccountInfo]) -> ProgramResult {
-    let [payer, magic_context, magic_program, rest @ ..] = accounts else {
-        return Err(ProgramError::NotEnoughAccountKeys);
-    };
+pub fn commit_and_undelegate_accounts(
+    payer: &AccountInfo,
+    accounts: &[AccountInfo],
+    magic_context: &AccountInfo,
+    magic_program: &AccountInfo,
+) -> ProgramResult {
+    let ix = create_schedule_commit_ix(payer, accounts, magic_context, magic_program, true)?;
 
-    let (ix_data, ix_accounts) = create_schedule_commit_ix(payer, rest, magic_context, true)?;
-    let ix = Instruction {
-        program_id: magic_program.key(),
-        data: ix_data,
-        accounts: ix_accounts,
-    };
-
-    let num_accounts = 2 + rest.len(); // payer + magic_context + rest
+    let num_accounts = 1 + accounts.len(); // payer + accounts
     if num_accounts > MAX_CPI_ACCOUNTS {
         return Err(ProgramError::InvalidArgument);
     }
 
-    const UNINIT_REF: MaybeUninit<&AccountInfo> = MaybeUninit::<&AccountInfo>::uninit();
-    let mut account_refs = [UNINIT_REF; MAX_CPI_ACCOUNTS];
-
-    unsafe {
-        // SAFETY: num_accounts <= MAX_CPI_ACCOUNTS
-        account_refs.get_unchecked_mut(0).write(payer);
-        account_refs.get_unchecked_mut(1).write(magic_context);
-
-        // Add rest accounts
-        for i in 0..rest.len() {
-            let account = rest.get_unchecked(i);
-            account_refs.get_unchecked_mut(2 + i).write(account);
-        }
+    let mut all_accounts: Vec<&AccountInfo> = Vec::with_capacity(accounts.len() + 1);
+    all_accounts.push(payer);
+    for account in accounts.iter() {
+        all_accounts.push(account);
     }
 
-    let all_accounts = unsafe {
-        core::slice::from_raw_parts(account_refs.as_ptr() as *const &AccountInfo, num_accounts)
-    };
-
-    slice_invoke(&ix, all_accounts)?;
+    slice_invoke(&ix, &all_accounts)?;
     Ok(())
 }