Address pr comments.

Author: wen-coding

Cargo.lock

@@ -38,7 +38,6 @@ frozen-abi = [
 serde = [
     "dep:cfg_eval",
     "dep:serde",
-    "dep:serde_bytes",
     "dep:serde_derive",
     "dep:serde_with",
     "dep:solana-serde-varint",
@@ -55,7 +54,6 @@ cfg_eval = { workspace = true, optional = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true }
 serde = { workspace = true, optional = true }
-serde_bytes = { workspace = true, optional = true }
 serde_derive = { workspace = true, optional = true }
 serde_with = { workspace = true, features = ["macros"], optional = true }
 solana-clock = { workspace = true }

vote-interface/Cargo.toml

@@ -40,6 +40,9 @@ pub enum VoteInstruction {
     ///   0. `[WRITE]` Vote account to be updated with the Pubkey for authorization
     ///   1. `[]` Clock sysvar
     ///   2. `[SIGNER]` Vote or withdraw authority
+    ///
+    /// When SIMD-0387 is enabled, the `VoteAuthorize::Voter` variant is
+    /// disallowed for any vote accounts whose BLS pubkey is set to `Some`.
     Authorize(Pubkey, VoteAuthorize),
 
     /// A Vote instruction with recent votes
@@ -93,6 +96,9 @@ pub enum VoteInstruction {
     ///   1. `[]` Clock sysvar
     ///   2. `[SIGNER]` Vote or withdraw authority
     ///   3. `[SIGNER]` New vote or withdraw authority
+    ///
+    /// When SIMD-0387 is enabled, the `VoteAuthorize::Voter` variant is
+    /// disallowed for any vote accounts whose BLS pubkey is set to `Some`.
     AuthorizeChecked(VoteAuthorize),
 
     /// Update the onchain vote state for the signer.
@@ -117,6 +123,10 @@ pub enum VoteInstruction {
     ///   0. `[Write]` Vote account to be updated
     ///   1. `[]` Clock sysvar
     ///   2. `[SIGNER]` Base key of current Voter or Withdrawer authority's derived key
+    ///
+    /// When SIMD-0387 is enabled, the `VoteAuthorize::Voter` variant in
+    /// `authorization_type` is disallowed for any vote accounts whose BLS
+    /// pubkey is set to `Some`.
     AuthorizeWithSeed(VoteAuthorizeWithSeedArgs),
 
     /// Given that the current Voter or Withdrawer authority is a derived key,
@@ -131,6 +141,10 @@ pub enum VoteInstruction {
     ///   1. `[]` Clock sysvar
     ///   2. `[SIGNER]` Base key of current Voter or Withdrawer authority's derived key
     ///   3. `[SIGNER]` New vote or withdraw authority
+    ///
+    /// When SIMD-0387 is enabled, the `VoteAuthorize::Voter` variant in
+    /// `authorization_type` is disallowed for any vote accounts whose BLS
+    /// pubkey is set to `Some`.
     AuthorizeCheckedWithSeed(VoteAuthorizeCheckedWithSeedArgs),
 
     /// Update the onchain vote state for the signer.

vote-interface/src/instruction.rs

@@ -1,5 +1,8 @@
 #[cfg(feature = "serde")]
-use serde_derive::{Deserialize, Serialize};
+use {
+    serde_derive::{Deserialize, Serialize},
+    serde_with::serde_as,
+};
 #[cfg(feature = "frozen-abi")]
 use solana_frozen_abi_macro::{frozen_abi, AbiExample};
 use {
@@ -203,56 +206,56 @@ pub struct VoteInit {
     pub commission: u8,
 }
 
+#[cfg_attr(feature = "serde", cfg_eval::cfg_eval, serde_as)]
 #[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub struct BLSPubkeyCompressed(
-    #[cfg_attr(feature = "serde", serde(with = "serde_bytes"))]
-    [u8; BLS_PUBLIC_KEY_COMPRESSED_SIZE],
-);
-
-impl Default for BLSPubkeyCompressed {
-    fn default() -> Self {
-        Self([0u8; BLS_PUBLIC_KEY_COMPRESSED_SIZE])
-    }
-}
-
-impl From<BLSPubkeyCompressed> for [u8; BLS_PUBLIC_KEY_COMPRESSED_SIZE] {
-    fn from(wrapper: BLSPubkeyCompressed) -> Self {
-        wrapper.0
-    }
-}
-
-#[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub struct BLSSignatureCompressed(
-    #[cfg_attr(feature = "serde", serde(with = "serde_bytes"))] [u8; BLS_SIGNATURE_COMPRESSED_SIZE],
-);
-
-impl Default for BLSSignatureCompressed {
-    fn default() -> Self {
-        Self([0u8; BLS_SIGNATURE_COMPRESSED_SIZE])
-    }
-}
-
-#[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
-#[derive(Debug, Default, PartialEq, Eq, Clone, Copy)]
 pub struct VoteInitV2 {
     pub node_pubkey: Pubkey,
     pub authorized_voter: Pubkey,
-    pub authorized_voter_bls_pubkey: BLSPubkeyCompressed,
-    pub authorized_voter_bls_proof_of_possession: BLSSignatureCompressed,
+    #[cfg_attr(feature = "serde", serde_as(as = "[_; BLS_PUBLIC_KEY_COMPRESSED_SIZE]"))]
+    pub authorized_voter_bls_pubkey: [u8; BLS_PUBLIC_KEY_COMPRESSED_SIZE],  
+    #[cfg_attr(feature = "serde", serde_as(as = "[_; BLS_SIGNATURE_COMPRESSED_SIZE]"))]
+    pub authorized_voter_bls_proof_of_possession: [u8; BLS_SIGNATURE_COMPRESSED_SIZE],
     pub authorized_withdrawer: Pubkey,
     pub inflation_rewards_commission_bps: u16,
     pub inflation_rewards_collector: Pubkey,
     pub block_revenue_commission_bps: u16,
     pub block_revenue_collector: Pubkey,
 }
 
+impl Default for VoteInitV2 {
+    fn default() -> Self {
+        Self {
+            node_pubkey: Pubkey::default(),
+            authorized_voter: Pubkey::default(),
+            authorized_voter_bls_pubkey: [0u8; BLS_PUBLIC_KEY_COMPRESSED_SIZE],
+            authorized_voter_bls_proof_of_possession: [0u8; BLS_SIGNATURE_COMPRESSED_SIZE],
+            authorized_withdrawer: Pubkey::default(),
+            inflation_rewards_commission_bps: 0,
+            inflation_rewards_collector: Pubkey::default(),
+            block_revenue_commission_bps: 0,
+            block_revenue_collector: Pubkey::default(),
+        }
+    }
+}
+
+#[cfg_attr(feature = "serde", cfg_eval::cfg_eval, serde_as)]
 #[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
-#[derive(Debug, Default, PartialEq, Eq, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub struct VoterWithBLSArgs {
-    bls_pub_key: BLSPubkeyCompressed,
-    bls_proof_of_possession: BLSSignatureCompressed,
+    #[cfg_attr(feature = "serde", serde_as(as = "[_; BLS_PUBLIC_KEY_COMPRESSED_SIZE]"))]
+    pub bls_pub_key: [u8; BLS_PUBLIC_KEY_COMPRESSED_SIZE],
+    #[cfg_attr(feature = "serde", serde_as(as = "[_; BLS_SIGNATURE_COMPRESSED_SIZE]"))]
+    pub bls_proof_of_possession: [u8; BLS_SIGNATURE_COMPRESSED_SIZE],
+}
+
+impl Default for VoterWithBLSArgs {
+    fn default() -> Self {
+        Self {
+            bls_pub_key: [0u8; BLS_PUBLIC_KEY_COMPRESSED_SIZE],
+            bls_proof_of_possession: [0u8; BLS_SIGNATURE_COMPRESSED_SIZE],
+        }
+    }
 }
 
 #[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]