Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 89 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,13 @@ solana-cli-config = "^2.1"
solana-program = "^2.1"
solana-sdk = "^2.1"
spl-token = { features = ["no-entrypoint"], version = "^4" }
spl-associated-token-account = { features = [ "no-entrypoint" ], version = "6.0" }
spl-associated-token-account = { features = ["no-entrypoint"], version = "6.0" }
thiserror = "1.0.57"
tokio = "1.35"
quote = "1.0"
toml = "0.8.19"
serde_json = "1.0.137"
pinocchio = "0.7.1"
pinocchio-log = "0.3.0"
pinocchio-pubkey = "0.2.2"
pinocchio-system = "0.2.1"
13 changes: 11 additions & 2 deletions lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,14 @@ repository.workspace = true
keywords.workspace = true

[features]
deafult = []
default = []
spl = ["spl-token", "spl-associated-token-account"]
pinocchio = [
"dep:pinocchio",
"dep:pinocchio-log",
"dep:pinocchio-pubkey",
"dep:pinocchio-system",
]

[dependencies]
bytemuck.workspace = true
Expand All @@ -21,4 +27,7 @@ solana-program.workspace = true
spl-token = { workspace = true, optional = true }
spl-associated-token-account = { workspace = true, optional = true }
thiserror.workspace = true

pinocchio = { workspace = true, optional = true }
pinocchio-log = { workspace = true, optional = true }
pinocchio-pubkey = { workspace = true, optional = true }
pinocchio-system = { workspace = true, optional = true }
26 changes: 26 additions & 0 deletions lib/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
#[cfg(not(feature = "pinocchio"))]
mod cpi;
mod loaders;
mod log;
pub mod macros;
#[cfg(feature = "pinocchio")]
mod pinocchio_cpi;
mod traits;
mod utils;

#[cfg(not(feature = "pinocchio"))]
pub use cpi::*;
pub use log::*;
#[cfg(feature = "pinocchio")]
pub use pinocchio_cpi::*;
pub use traits::*;
pub use utils::*;

pub use bytemuck::{Pod, Zeroable};
pub use num_enum::{IntoPrimitive, TryFromPrimitive};

#[cfg(not(feature = "pinocchio"))]
pub use solana_program::{
account_info::AccountInfo,
clock::Clock,
Expand All @@ -23,4 +31,22 @@ pub use solana_program::{
system_program, sysvar,
sysvar::Sysvar,
};

pub use thiserror::Error;

#[cfg(feature = "pinocchio")]
pub use pinocchio::{
account_info::AccountInfo,
entrypoint,
instruction::{AccountMeta, Instruction},
msg,
program_error::ProgramError,
pubkey::{self, Pubkey},
ProgramResult,
};

#[cfg(feature = "pinocchio")]
pub use pinocchio_pubkey::declare_id;

#[cfg(feature = "pinocchio")]
pub use pinocchio_system as system_program;
Loading