Skip to content
Merged
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
162 changes: 139 additions & 23 deletions Cargo.lock

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

17 changes: 13 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ borsh = { version = "1.5.3", features = [ "derive" ] }
bytemuck = { version = ">=1", features = [ "derive" ] }
const-crypto = { version = "0.3.0", optional = true }
num_enum = "^0.7.2"
pinocchio = { version = "0.9.2", optional = true }
pinocchio-log = { version = "0.5.0", optional = true }
pinocchio-pubkey = { version = "0.3.0", optional = true }
pinocchio-system = { version = "0.3.0", optional = true }
rkyv = { version = "0.7.45", optional = true }
solana-curve25519 = { version = ">=2.2", optional = true }
solana-program = { version = ">=1.16, <3.0.0" }
Expand All @@ -53,6 +49,19 @@ static_assertions = "1.1.0"
strum = { version = ">=0.27", features = ["derive"] }
thiserror = { version = ">=1" }

pinocchio = { version = "0.10.1", optional = true }
pinocchio-log = { version = "0.5.1" , optional = true }
pinocchio-pubkey = { version = "0.3.0" , optional = true }
pinocchio-system = { version = "0.5.0" , optional = true }
pinocchio-token = { version = "0.5.0" , optional = true }
pinocchio-associated-token-account = { version = "0.3.0" , optional = true }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this needed?


# version must match the one imported by pinocchio
solana-address = { version = "2.0", features = ["bytemuck", "decode", "syscalls", "curve25519", "std"] }

# manually resolves the conflict with a pinned version of serde
serde = "=1.0.226"

[dev-dependencies]
assertables = "9.8.2"
magicblock-delegation-program = { path = ".", features = ["unit_test_config"] }
Expand Down
2 changes: 1 addition & 1 deletion src/args/types.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::ops::Deref;

use bytemuck::{Pod, Zeroable};
use pinocchio::program_error::ProgramError;
use pinocchio::error::ProgramError;

use crate::{pod_view::PodView, require_ge};

Expand Down
Loading