Skip to content

Commit 33d3153

Browse files
committed
chore: upgrade pinocchio
1 parent 889a61c commit 33d3153

31 files changed

+579
-444
lines changed

Cargo.lock

Lines changed: 139 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ borsh = { version = "1.5.3", features = [ "derive" ] }
4040
bytemuck = { version = ">=1", features = [ "derive" ] }
4141
const-crypto = { version = "0.3.0", optional = true }
4242
num_enum = "^0.7.2"
43-
pinocchio = { version = "0.9.2", optional = true }
44-
pinocchio-log = { version = "0.5.0", optional = true }
45-
pinocchio-pubkey = { version = "0.3.0", optional = true }
46-
pinocchio-system = { version = "0.3.0", optional = true }
4743
rkyv = { version = "0.7.45", optional = true }
4844
solana-curve25519 = { version = ">=2.2", optional = true }
4945
solana-program = { version = ">=1.16, <3.0.0" }
@@ -53,6 +49,19 @@ static_assertions = "1.1.0"
5349
strum = { version = ">=0.27", features = ["derive"] }
5450
thiserror = { version = ">=1" }
5551

52+
pinocchio = { version = "0.10.1", optional = true }
53+
pinocchio-log = { version = "0.5.1" , optional = true }
54+
pinocchio-pubkey = { version = "0.3.0" , optional = true }
55+
pinocchio-system = { version = "0.5.0" , optional = true }
56+
pinocchio-token = { version = "0.5.0" , optional = true }
57+
pinocchio-associated-token-account = { version = "0.3.0" , optional = true }
58+
59+
# version must match the one imported by pinocchio
60+
solana-address = { version = "2.0", features = ["bytemuck", "decode", "syscalls", "curve25519", "std"] }
61+
62+
# manually resolves the conflict with a pinned version of serde
63+
serde = "=1.0.226"
64+
5665
[dev-dependencies]
5766
assertables = "9.8.2"
5867
magicblock-delegation-program = { path = ".", features = ["unit_test_config"] }

src/args/types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::ops::Deref;
22

33
use bytemuck::{Pod, Zeroable};
4-
use pinocchio::program_error::ProgramError;
4+
use pinocchio::error::ProgramError;
55

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

0 commit comments

Comments
 (0)