use bytemuck_derive 1.7.0 explicitly in sdk and program

anza-xyz · Jun 19, 2024 · 0b2fc28 · 0b2fc28
1 parent 403b793
commit 0b2fc28
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -174,6 +174,7 @@ bv = "0.11.1"
 byte-unit = "4.0.19"
 bytecount = "0.6.8"
 bytemuck = "1.16.1"
+bytemuck_derive = "1.7.0"
 byteorder = "1.5.0"
 bytes = "1.6"
 bzip2 = "0.4.4"

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -49,7 +49,8 @@ bincode = { workspace = true }
 bitflags = { workspace = true, features = ["serde"] }
 borsh = { workspace = true, optional = true }
 bs58 = { workspace = true }
-bytemuck = { workspace = true, features = ["derive"] }
+bytemuck = { workspace = true }
+bytemuck_derive = { workspace = true }
 byteorder = { workspace = true, optional = true }
 chrono = { workspace = true, features = ["alloc"], optional = true }
 curve25519-dalek = { workspace = true, optional = true }

diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml
@@ -18,7 +18,8 @@ borsh = { workspace = true, optional = true }
 borsh0-10 = { package = "borsh", version = "0.10.3", optional = true }
 bs58 = { workspace = true }
 bv = { workspace = true, features = ["serde"] }
-bytemuck = { workspace = true, features = ["derive"] }
+bytemuck = { workspace = true }
+bytemuck_derive = { workspace = true }
 itertools =  { workspace = true }
 lazy_static = { workspace = true }
 log = { workspace = true }

diff --git a/sdk/program/src/alt_bn128/mod.rs b/sdk/program/src/alt_bn128/mod.rs
@@ -4,7 +4,7 @@ pub mod prelude {
 }
 
 use {
-    bytemuck::{Pod, Zeroable},
+    bytemuck_derive::{Pod, Zeroable},
     consts::*,
     thiserror::Error,
 };

diff --git a/sdk/program/src/hash.rs b/sdk/program/src/hash.rs
@@ -9,7 +9,7 @@ use crate::wasm_bindgen;
 use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
 use {
     crate::sanitize::Sanitize,
-    bytemuck::{Pod, Zeroable},
+    bytemuck_derive::{Pod, Zeroable},
     sha2::{Digest, Sha256},
     std::{convert::TryFrom, fmt, mem, str::FromStr},
     thiserror::Error,

diff --git a/sdk/program/src/pubkey.rs b/sdk/program/src/pubkey.rs
@@ -10,7 +10,7 @@ use arbitrary::Arbitrary;
 use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
 use {
     crate::{decode_error::DecodeError, hash::hashv},
-    bytemuck::{Pod, Zeroable},
+    bytemuck_derive::{Pod, Zeroable},
     num_derive::{FromPrimitive, ToPrimitive},
     std::{
         convert::{Infallible, TryFrom},

diff --git a/sdk/program/src/sysvar/slot_hashes.rs b/sdk/program/src/sysvar/slot_hashes.rs
@@ -55,7 +55,7 @@ use {
         slot_hashes::MAX_ENTRIES,
         sysvar::{get_sysvar, Sysvar, SysvarId},
     },
-    bytemuck::{Pod, Zeroable},
+    bytemuck_derive::{Pod, Zeroable},
 };
 
 crate::declare_sysvar_id!("SysvarS1otHashes111111111111111111111111111", SlotHashes);

diff --git a/sdk/src/ed25519_instruction.rs b/sdk/src/ed25519_instruction.rs
@@ -6,7 +6,8 @@
 
 use {
     crate::{feature_set::FeatureSet, instruction::Instruction, precompiles::PrecompileError},
-    bytemuck::{bytes_of, Pod, Zeroable},
+    bytemuck::bytes_of,
+    bytemuck_derive::{Pod, Zeroable},
     ed25519_dalek::{ed25519::signature::Signature, Signer, Verifier},
 };