deps: Use bytemuck_derive explicitly instead of "derive" feature on b…

…ytemuck (anza-xyz#1799) * deps: Use bytemuck_derive explicitly * Missed a couple in zk-token-sdk * Fix last few bits * Fixup a re-export * Use re-exports properly
samkim-crypto · Jul 31, 2024 · 8afa5c2 · 8afa5c2
1 parent 30c7d98
commit 8afa5c2
Show file tree

Hide file tree

Showing 66 changed files with 156 additions and 119 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/accounts-db/Cargo.toml b/accounts-db/Cargo.toml
@@ -14,6 +14,7 @@ bincode = { workspace = true }
 blake3 = { workspace = true }
 bv = { workspace = true, features = ["serde"] }
 bytemuck = { workspace = true }
+bytemuck_derive = { workspace = true }
 bzip2 = { workspace = true }
 crossbeam-channel = { workspace = true }
 dashmap = { workspace = true, features = ["rayon", "raw-api"] }

diff --git a/accounts-db/src/accounts_hash.rs b/accounts-db/src/accounts_hash.rs
@@ -5,7 +5,7 @@ use {
         ancestors::Ancestors,
         pubkey_bins::PubkeyBinCalculator24,
     },
-    bytemuck::{Pod, Zeroable},
+    bytemuck_derive::{Pod, Zeroable},
     log::*,
     memmap2::MmapMut,
     rayon::prelude::*,

diff --git a/accounts-db/src/cache_hash_data.rs b/accounts-db/src/cache_hash_data.rs
@@ -3,7 +3,7 @@
 use crate::pubkey_bins::PubkeyBinCalculator24;
 use {
     crate::{accounts_hash::CalculateHashIntermediate, cache_hash_data_stats::CacheHashDataStats},
-    bytemuck::{Pod, Zeroable},
+    bytemuck_derive::{Pod, Zeroable},
     memmap2::MmapMut,
     solana_measure::measure::Measure,
     solana_sdk::clock::Slot,

diff --git a/accounts-db/src/tiered_storage/file.rs b/accounts-db/src/tiered_storage/file.rs
@@ -1,6 +1,6 @@
 use {
     super::{error::TieredStorageError, TieredStorageResult},
-    bytemuck::{AnyBitPattern, NoUninit, Pod, Zeroable},
+    bytemuck::{AnyBitPattern, NoUninit, Zeroable},
     std::{
         fs::{File, OpenOptions},
         io::{BufWriter, Read, Result as IoResult, Seek, SeekFrom, Write},
@@ -13,7 +13,7 @@ use {
 /// The ending 8 bytes of a valid tiered account storage file.
 pub const FILE_MAGIC_NUMBER: u64 = u64::from_le_bytes(*b"AnzaTech");
 
-#[derive(Debug, PartialEq, Eq, Clone, Copy, Pod, Zeroable)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy, bytemuck_derive::Pod, bytemuck_derive::Zeroable)]
 #[repr(C)]
 pub struct TieredStorageMagicNumber(pub u64);
 

diff --git a/accounts-db/src/tiered_storage/hot.rs b/accounts-db/src/tiered_storage/hot.rs
@@ -19,7 +19,7 @@ use {
             StorableAccounts, TieredStorageError, TieredStorageFormat, TieredStorageResult,
         },
     },
-    bytemuck::{Pod, Zeroable},
+    bytemuck_derive::{Pod, Zeroable},
     memmap2::{Mmap, MmapOptions},
     modular_bitfield::prelude::*,
     solana_sdk::{

diff --git a/accounts-db/src/tiered_storage/index.rs b/accounts-db/src/tiered_storage/index.rs
@@ -24,7 +24,7 @@ pub trait AccountOffset: Clone + Copy + Pod + Zeroable {}
 /// This can be used to obtain the AccountOffset and address by looking through
 /// the accounts index block.
 #[repr(C)]
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Pod, Zeroable)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq, bytemuck_derive::Pod, bytemuck_derive::Zeroable)]
 pub struct IndexOffset(pub u32);
 
 // Ensure there are no implicit padding bytes

diff --git a/accounts-db/src/tiered_storage/meta.rs b/accounts-db/src/tiered_storage/meta.rs
@@ -2,7 +2,7 @@
 
 use {
     crate::tiered_storage::owners::OwnerOffset,
-    bytemuck::{Pod, Zeroable},
+    bytemuck_derive::{Pod, Zeroable},
     modular_bitfield::prelude::*,
     solana_sdk::{pubkey::Pubkey, stake_history::Epoch},
 };

diff --git a/bucket_map/Cargo.toml b/bucket_map/Cargo.toml
@@ -12,7 +12,8 @@ edition = { workspace = true }
 
 [dependencies]
 bv = { workspace = true, features = ["serde"] }
-bytemuck = { workspace = true, features = ["derive"] }
+bytemuck = { workspace = true }
+bytemuck_derive = { workspace = true }
 log = { workspace = true }
 memmap2 = { workspace = true }
 modular-bitfield = { workspace = true }

diff --git a/bucket_map/src/restart.rs b/bucket_map/src/restart.rs
@@ -1,7 +1,7 @@
 //! Persistent info of disk index files to allow files to be reused on restart.
 use {
     crate::bucket_map::{BucketMapConfig, MAX_SEARCH_DEFAULT},
-    bytemuck::{Pod, Zeroable},
+    bytemuck_derive::{Pod, Zeroable},
     memmap2::MmapMut,
     std::{
         collections::HashMap,

diff --git a/curves/curve25519/Cargo.toml b/curves/curve25519/Cargo.toml
@@ -10,7 +10,8 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-bytemuck = { workspace = true, features = ["derive"] }
+bytemuck = { workspace = true }
+bytemuck_derive = { workspace = true }
 solana-program = { workspace = true }
 thiserror = { workspace = true }
 

diff --git a/curves/curve25519/src/edwards.rs b/curves/curve25519/src/edwards.rs
@@ -1,4 +1,4 @@
-use bytemuck::{Pod, Zeroable};
+use bytemuck_derive::{Pod, Zeroable};
 pub use target_arch::*;
 
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Pod, Zeroable)]
@@ -140,6 +140,7 @@ mod target_arch {
             curve_syscall_traits::{ADD, CURVE25519_EDWARDS, MUL, SUB},
             scalar::PodScalar,
         },
+        bytemuck::Zeroable,
     };
 
     pub fn validate_edwards(point: &PodEdwardsPoint) -> bool {

diff --git a/curves/curve25519/src/ristretto.rs b/curves/curve25519/src/ristretto.rs
@@ -1,4 +1,4 @@
-use bytemuck::{Pod, Zeroable};
+use bytemuck_derive::{Pod, Zeroable};
 pub use target_arch::*;
 
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Pod, Zeroable)]
@@ -141,6 +141,7 @@ mod target_arch {
             curve_syscall_traits::{ADD, CURVE25519_RISTRETTO, MUL, SUB},
             scalar::PodScalar,
         },
+        bytemuck::Zeroable,
     };
 
     pub fn validate_ristretto(point: &PodRistrettoPoint) -> bool {

diff --git a/curves/curve25519/src/scalar.rs b/curves/curve25519/src/scalar.rs
@@ -1,4 +1,4 @@
-pub use bytemuck::{Pod, Zeroable};
+pub use bytemuck_derive::{Pod, Zeroable};
 
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Pod, Zeroable)]
 #[repr(transparent)]

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/programs/zk-elgamal-proof/Cargo.toml b/programs/zk-elgamal-proof/Cargo.toml
@@ -9,7 +9,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-bytemuck = { workspace = true, features = ["derive"] }
+bytemuck = { workspace = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true }
 solana-program-runtime = { workspace = true }

diff --git a/programs/zk-token-proof-tests/Cargo.toml b/programs/zk-token-proof-tests/Cargo.toml
@@ -8,7 +8,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dev-dependencies]
-bytemuck = { workspace = true, features = ["derive"] }
+bytemuck = { workspace = true }
 curve25519-dalek = { workspace = true }
 solana-compute-budget = { workspace = true }
 solana-program-test = { workspace = true }

diff --git a/programs/zk-token-proof/Cargo.toml b/programs/zk-token-proof/Cargo.toml
@@ -9,7 +9,7 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-bytemuck = { workspace = true, features = ["derive"] }
+bytemuck = { workspace = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true }
 solana-program-runtime = { workspace = true }

diff --git a/zk-sdk/Cargo.toml b/zk-sdk/Cargo.toml
@@ -11,7 +11,8 @@ edition = { workspace = true }
 
 [dependencies]
 base64 = { workspace = true }
-bytemuck = { workspace = true, features = ["derive"] }
+bytemuck = { workspace = true }
+bytemuck_derive = { workspace = true }
 merlin = { workspace = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true }

diff --git a/zk-sdk/src/encryption/pod/elgamal.rs b/zk-sdk/src/encryption/pod/elgamal.rs
@@ -5,7 +5,7 @@ use {
         pod::impl_from_str, DECRYPT_HANDLE_LEN, ELGAMAL_CIPHERTEXT_LEN, ELGAMAL_PUBKEY_LEN,
     },
     base64::{prelude::BASE64_STANDARD, Engine},
-    bytemuck::{Pod, Zeroable},
+    bytemuck::Zeroable,
     std::fmt,
 };
 #[cfg(not(target_os = "solana"))]
@@ -24,7 +24,7 @@ const ELGAMAL_PUBKEY_MAX_BASE64_LEN: usize = 44;
 const ELGAMAL_CIPHERTEXT_MAX_BASE64_LEN: usize = 88;
 
 /// The `ElGamalCiphertext` type as a `Pod`.
-#[derive(Clone, Copy, Pod, Zeroable, PartialEq, Eq)]
+#[derive(Clone, Copy, bytemuck_derive::Pod, bytemuck_derive::Zeroable, PartialEq, Eq)]
 #[repr(transparent)]
 pub struct PodElGamalCiphertext(pub(crate) [u8; ELGAMAL_CIPHERTEXT_LEN]);
 
@@ -69,7 +69,7 @@ impl TryFrom<PodElGamalCiphertext> for ElGamalCiphertext {
 }
 
 /// The `ElGamalPubkey` type as a `Pod`.
-#[derive(Clone, Copy, Default, Pod, Zeroable, PartialEq, Eq)]
+#[derive(Clone, Copy, Default, bytemuck_derive::Pod, bytemuck_derive::Zeroable, PartialEq, Eq)]
 #[repr(transparent)]
 pub struct PodElGamalPubkey(pub(crate) [u8; ELGAMAL_PUBKEY_LEN]);
 
@@ -108,7 +108,7 @@ impl TryFrom<PodElGamalPubkey> for ElGamalPubkey {
 }
 
 /// The `DecryptHandle` type as a `Pod`.
-#[derive(Clone, Copy, Default, Pod, Zeroable, PartialEq, Eq)]
+#[derive(Clone, Copy, Default, bytemuck_derive::Pod, bytemuck_derive::Zeroable, PartialEq, Eq)]
 #[repr(transparent)]
 pub struct PodDecryptHandle(pub(crate) [u8; DECRYPT_HANDLE_LEN]);
 

diff --git a/zk-sdk/src/encryption/pod/grouped_elgamal.rs b/zk-sdk/src/encryption/pod/grouped_elgamal.rs
@@ -10,7 +10,7 @@ use {
         },
         errors::ElGamalError,
     },
-    bytemuck::{Pod, Zeroable},
+    bytemuck::Zeroable,
     std::fmt,
 };
 
@@ -61,7 +61,7 @@ const GROUPED_ELGAMAL_CIPHERTEXT_3_HANDLES: usize =
     PEDERSEN_COMMITMENT_LEN + DECRYPT_HANDLE_LEN + DECRYPT_HANDLE_LEN + DECRYPT_HANDLE_LEN;
 
 /// The `GroupedElGamalCiphertext` type with two decryption handles as a `Pod`
-#[derive(Clone, Copy, Pod, Zeroable, PartialEq, Eq)]
+#[derive(Clone, Copy, bytemuck_derive::Pod, bytemuck_derive::Zeroable, PartialEq, Eq)]
 #[repr(transparent)]
 pub struct PodGroupedElGamalCiphertext2Handles(
     pub(crate) [u8; GROUPED_ELGAMAL_CIPHERTEXT_2_HANDLES],
@@ -97,7 +97,7 @@ impl TryFrom<PodGroupedElGamalCiphertext2Handles> for GroupedElGamalCiphertext<2
 impl_extract!(TYPE = PodGroupedElGamalCiphertext2Handles);
 
 /// The `GroupedElGamalCiphertext` type with three decryption handles as a `Pod`
-#[derive(Clone, Copy, Pod, Zeroable, PartialEq, Eq)]
+#[derive(Clone, Copy, bytemuck_derive::Pod, bytemuck_derive::Zeroable, PartialEq, Eq)]
 #[repr(transparent)]
 pub struct PodGroupedElGamalCiphertext3Handles(
     pub(crate) [u8; GROUPED_ELGAMAL_CIPHERTEXT_3_HANDLES],

diff --git a/zk-sdk/src/encryption/pod/pedersen.rs b/zk-sdk/src/encryption/pod/pedersen.rs
@@ -2,7 +2,7 @@
 
 use {
     crate::encryption::PEDERSEN_COMMITMENT_LEN,
-    bytemuck::{Pod, Zeroable},
+    bytemuck_derive::{Pod, Zeroable},
     std::fmt,
 };
 #[cfg(not(target_os = "solana"))]

diff --git a/zk-sdk/src/pod.rs b/zk-sdk/src/pod.rs
@@ -1,4 +1,4 @@
-use bytemuck::{Pod, Zeroable};
+use bytemuck_derive::{Pod, Zeroable};
 
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Pod, Zeroable)]
 #[repr(transparent)]

diff --git a/zk-sdk/src/sigma_proofs/pod.rs b/zk-sdk/src/sigma_proofs/pod.rs
@@ -192,7 +192,7 @@ impl TryFrom<PodZeroCiphertextProof> for ZeroCiphertextProof {
 }
 
 /// The `PercentageWithCapProof` type as a `Pod`.
-#[derive(Clone, Copy, Pod, Zeroable)]
+#[derive(Clone, Copy, bytemuck_derive::Pod, bytemuck_derive::Zeroable)]
 #[repr(transparent)]
 pub struct PodPercentageWithCapProof(pub(crate) [u8; PERCENTAGE_WITH_CAP_PROOF_LEN]);
 
@@ -213,7 +213,7 @@ impl TryFrom<PodPercentageWithCapProof> for PercentageWithCapProof {
 }
 
 /// The `PubkeyValidityProof` type as a `Pod`.
-#[derive(Clone, Copy, Pod, Zeroable)]
+#[derive(Clone, Copy, bytemuck_derive::Pod, bytemuck_derive::Zeroable)]
 #[repr(transparent)]
 pub struct PodPubkeyValidityProof(pub(crate) [u8; PUBKEY_VALIDITY_PROOF_LEN]);
 

diff --git a/.../src/zk_elgamal_proof_program/proof_data/batched_grouped_ciphertext_validity/handles_2.rs b/.../src/zk_elgamal_proof_program/proof_data/batched_grouped_ciphertext_validity/handles_2.rs
@@ -13,7 +13,7 @@ use {
         sigma_proofs::pod::PodBatchedGroupedCiphertext2HandlesValidityProof,
         zk_elgamal_proof_program::proof_data::{ProofType, ZkProofData},
     },
-    bytemuck::{Pod, Zeroable},
+    bytemuck_derive::{Pod, Zeroable},
 };
 #[cfg(not(target_os = "solana"))]
 use {