anza-xyz · febo · Mar 27, 2025 · Mar 28, 2025 · Sep 12, 2025 · Oct 4, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/memo/src/instructions/mod.rs b/programs/memo/src/instructions/mod.rs
@@ -3,8 +3,8 @@ use core::mem::MaybeUninit;
 use pinocchio::{
     account_info::AccountInfo,
     cpi::{slice_invoke_signed, MAX_CPI_ACCOUNTS},
+    error::ProgramError,
     instruction::{AccountMeta, Instruction, Signer},
-    program_error::ProgramError,
     ProgramResult,
 };
 

diff --git a/programs/system/src/instructions/create_account.rs b/programs/system/src/instructions/create_account.rs
@@ -1,8 +1,8 @@
 use pinocchio::{
     account_info::AccountInfo,
+    error::ProgramError,
     instruction::{AccountMeta, Instruction, Signer},
     program::invoke_signed,
-    program_error::ProgramError,
     pubkey::Pubkey,
     sysvars::rent::Rent,
     ProgramResult,

diff --git a/programs/system/src/instructions/create_account_with_seed.rs b/programs/system/src/instructions/create_account_with_seed.rs
@@ -1,8 +1,8 @@
 use pinocchio::{
     account_info::AccountInfo,
+    error::ProgramError,
     instruction::{AccountMeta, Instruction, Signer},
     program::invoke_signed,
-    program_error::ProgramError,
     pubkey::Pubkey,
     sysvars::rent::Rent,
     ProgramResult,

diff --git a/programs/token-2022/src/instructions/initialize_multisig.rs b/programs/token-2022/src/instructions/initialize_multisig.rs
@@ -3,8 +3,8 @@ use core::{mem::MaybeUninit, slice};
 use pinocchio::{
     account_info::AccountInfo,
     cpi::invoke_with_bounds,
+    error::ProgramError,
     instruction::{AccountMeta, Instruction},
-    program_error::ProgramError,
     pubkey::Pubkey,
     ProgramResult,
 };

diff --git a/programs/token-2022/src/instructions/initialize_multisig_2.rs b/programs/token-2022/src/instructions/initialize_multisig_2.rs
@@ -3,8 +3,8 @@ use core::{mem::MaybeUninit, slice};
 use pinocchio::{
     account_info::AccountInfo,
     cpi::invoke_with_bounds,
+    error::ProgramError,
     instruction::{AccountMeta, Instruction},
-    program_error::ProgramError,
     pubkey::Pubkey,
     ProgramResult,
 };

diff --git a/programs/token-2022/src/state/mint.rs b/programs/token-2022/src/state/mint.rs
@@ -1,6 +1,6 @@
 use pinocchio::{
     account_info::{AccountInfo, Ref},
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::Pubkey,
 };
 

diff --git a/programs/token-2022/src/state/multisig.rs b/programs/token-2022/src/state/multisig.rs
@@ -1,7 +1,7 @@
 use core::mem::size_of;
 use pinocchio::{
     account_info::{AccountInfo, Ref},
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::Pubkey,
 };
 

diff --git a/programs/token-2022/src/state/token.rs b/programs/token-2022/src/state/token.rs
@@ -1,7 +1,7 @@
 use super::AccountState;
 use pinocchio::{
     account_info::{AccountInfo, Ref},
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::Pubkey,
 };
 

diff --git a/programs/token/src/instructions/initialize_multisig.rs b/programs/token/src/instructions/initialize_multisig.rs
@@ -3,8 +3,8 @@ use core::{mem::MaybeUninit, slice};
 use pinocchio::{
     account_info::AccountInfo,
     cpi::invoke_with_bounds,
+    error::ProgramError,
     instruction::{AccountMeta, Instruction},
-    program_error::ProgramError,
     ProgramResult,
 };
 

diff --git a/programs/token/src/instructions/initialize_multisig_2.rs b/programs/token/src/instructions/initialize_multisig_2.rs
@@ -3,8 +3,8 @@ use core::{mem::MaybeUninit, slice};
 use pinocchio::{
     account_info::AccountInfo,
     cpi::invoke_with_bounds,
+    error::ProgramError,
     instruction::{AccountMeta, Instruction},
-    program_error::ProgramError,
     ProgramResult,
 };
 

diff --git a/programs/token/src/state/mint.rs b/programs/token/src/state/mint.rs
@@ -1,6 +1,6 @@
 use pinocchio::{
     account_info::{AccountInfo, Ref},
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::Pubkey,
 };
 

diff --git a/programs/token/src/state/multisig.rs b/programs/token/src/state/multisig.rs
@@ -1,7 +1,7 @@
 use core::mem::size_of;
 use pinocchio::{
     account_info::{AccountInfo, Ref},
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::Pubkey,
 };
 

diff --git a/programs/token/src/state/token.rs b/programs/token/src/state/token.rs
@@ -1,7 +1,7 @@
 use super::AccountState;
 use pinocchio::{
     account_info::{AccountInfo, Ref},
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::Pubkey,
 };
 

diff --git a/sdk/pinocchio/Cargo.toml b/sdk/pinocchio/Cargo.toml
@@ -20,5 +20,8 @@ unexpected_cfgs = { level = "warn", check-cfg = [
 [features]
 std = []
 
+[dependencies]
+solana-program-error = "3.0"
+
 [dev-dependencies]
 five8_const = { workspace = true }
diff --git a/sdk/pinocchio/src/account_info.rs b/sdk/pinocchio/src/account_info.rs
@@ -11,7 +11,7 @@ use core::{
 use crate::syscalls::sol_memset_;
 
 use crate::{
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::{pubkey_eq, Pubkey},
     ProgramResult,
 };

diff --git a/sdk/pinocchio/src/cpi.rs b/sdk/pinocchio/src/cpi.rs
@@ -4,9 +4,9 @@ use core::{mem::MaybeUninit, ops::Deref, slice::from_raw_parts};
 
 use crate::{
     account_info::{AccountInfo, BorrowState},
+    error::ProgramError,
     hint::unlikely,
     instruction::{Account, Instruction, Signer},
-    program_error::ProgramError,
     pubkey::{pubkey_eq, Pubkey},
     ProgramResult,
 };

diff --git a/sdk/pinocchio/src/entrypoint/lazy.rs b/sdk/pinocchio/src/entrypoint/lazy.rs
@@ -4,7 +4,7 @@
 use crate::{
     account_info::{Account, AccountInfo},
     entrypoint::{NON_DUP_MARKER, STATIC_ACCOUNT_DATA},
-    program_error::ProgramError,
+    error::ProgramError,
     pubkey::Pubkey,
     BPF_ALIGN_OF_U128,
 };

diff --git a/sdk/pinocchio/src/lib.rs b/sdk/pinocchio/src/lib.rs
@@ -233,13 +233,14 @@ pub mod memory;
 pub mod program {
     pub use crate::cpi::*;
 }
-pub mod program_error;
 pub mod pubkey;
 pub mod syscalls;
 pub mod sysvars;
 
 #[deprecated(since = "0.7.0", note = "Use the `entrypoint` module instead")]
 pub use entrypoint::lazy as lazy_entrypoint;
+pub use solana_program_error as error;
+pub use solana_program_error::ProgramResult;
 
 /// Maximum number of accounts that a transaction may process.
 ///
@@ -259,9 +260,6 @@ const BPF_ALIGN_OF_U128: usize = 8;
 /// Return value for a successful program execution.
 pub const SUCCESS: u64 = 0;
 
-/// The result of a program execution.
-pub type ProgramResult = Result<(), program_error::ProgramError>;
-
 /// Module with functions to provide hints to the compiler about how code
 /// should be optimized.
 pub mod hint {