rebase

Cargo.toml

@@ -206,10 +206,10 @@ sha2 = "0.10.8"
 sha3 = "0.10.8"
 signal-hook = "0.3.17"
 siphasher = "0.3.11"
-solana-account = { path = "account", version = "2.2.1" }
+solana-account = { path = "account", version = "3.0.0" }
 solana-account-info = { path = "account-info", version = "3.0.0" }
 solana-address = { path = "address", version = "1.0.0" }
-solana-address-lookup-table-interface = { path = "address-lookup-table-interface", version = "2.2.2" }
+solana-address-lookup-table-interface = { path = "address-lookup-table-interface", version = "3.0.0" }
 solana-atomic-u64 = { path = "atomic-u64", version = "3.0.0" }
 solana-big-mod-exp = { path = "big-mod-exp", version = "3.0.0" }
 solana-bincode = { path = "bincode", version = "3.0.0" }
@@ -229,11 +229,11 @@ solana-ed25519-program = { path = "ed25519-program", version = "3.0.0" }
 solana-epoch-info = { path = "epoch-info", version = "3.0.0" }
 solana-epoch-rewards = { path = "epoch-rewards", version = "3.0.0" }
 solana-epoch-rewards-hasher = { path = "epoch-rewards-hasher", version = "3.0.0" }
-solana-epoch-schedule = { path = "epoch-schedule", version = "2.2.1" }
+solana-epoch-schedule = { path = "epoch-schedule", version = "3.0.0" }
 solana-epoch-stake = { path = "epoch-stake", version = "3.0.0" }
 solana-example-mocks = { path = "example-mocks", version = "2.2.1" }
 solana-feature-gate-interface = { path = "feature-gate-interface", version = "2.2.1" }
-solana-fee-calculator = { path = "fee-calculator", version = "2.2.1" }
+solana-fee-calculator = { path = "fee-calculator", version = "3.0.0" }
 solana-fee-structure = { path = "fee-structure", version = "3.0.0" }
 solana-file-download = { path = "file-download", version = "3.0.0" }
 solana-frozen-abi = { path = "frozen-abi", version = "3.0.0" }
@@ -244,7 +244,7 @@ solana-hash = { path = "hash", version = "3.0.0", default-features = false }
 solana-inflation = { path = "inflation", version = "3.0.0" }
 solana-instruction = { path = "instruction", version = "3.0.0", default-features = false }
 solana-instruction-error = { path = "instruction-error", version = "2.0.0" }
-solana-instructions-sysvar = { path = "instructions-sysvar", version = "2.2.1" }
+solana-instructions-sysvar = { path = "instructions-sysvar", version = "3.0.0" }
 solana-keccak-hasher = { path = "keccak-hasher", version = "3.0.0" }
 solana-keypair = { path = "keypair", version = "3.0.0" }
 solana-last-restart-slot = { path = "last-restart-slot", version = "3.0.0" }
@@ -255,32 +255,32 @@ solana-logger = { path = "logger", version = "3.0.0" }
 solana-message = { path = "message", version = "2.2.1" }
 solana-msg = { path = "msg", version = "3.0.0" }
 solana-native-token = { path = "native-token", version = "3.0.0" }
-solana-nonce = { path = "nonce", version = "2.2.1" }
+solana-nonce = { path = "nonce", version = "3.0.0" }
 solana-nonce-account = { path = "nonce-account", version = "2.2.1" }
-solana-offchain-message = { path = "offchain-message", version = "2.2.1" }
+solana-offchain-message = { path = "offchain-message", version = "3.0.0" }
 solana-package-metadata = { path = "package-metadata", version = "3.0.0" }
 solana-package-metadata-macro = { path = "package-metadata-macro", version = "3.0.0" }
 solana-packet = { path = "packet", version = "3.0.0" }
-solana-poh-config = { path = "poh-config", version = "2.2.1" }
+solana-poh-config = { path = "poh-config", version = "3.0.0" }
 solana-precompile-error = { path = "precompile-error", version = "3.0.0" }
-solana-presigner = { path = "presigner", version = "2.2.1" }
+solana-presigner = { path = "presigner", version = "3.0.0" }
 solana-program = { path = "program", version = "2.2.1", default-features = false }
 solana-program-entrypoint = { path = "program-entrypoint", version = "3.0.0" }
 solana-program-error = { path = "program-error", version = "3.0.0" }
 solana-program-memory = { path = "program-memory", version = "3.0.0" }
 solana-program-option = { path = "program-option", version = "3.0.0" }
 solana-program-pack = { path = "program-pack", version = "3.0.0" }
 solana-pubkey = { path = "pubkey", version = "3.0.0", default-features = false }
-solana-quic-definitions = { path = "quic-definitions", version = "2.2.1" }
-solana-rent = { path = "rent", version = "2.2.1", default-features = false }
+solana-quic-definitions = { path = "quic-definitions", version = "3.0.0" }
+solana-rent = { path = "rent", version = "3.0.0", default-features = false }
 solana-rent-collector = { path = "rent-collector", version = "2.2.1" }
 solana-reward-info = { path = "reward-info", version = "3.0.0" }
 solana-sanitize = { path = "sanitize", version = "3.0.0" }
 solana-sdk = { path = "sdk", version = "2.2.1" }
 solana-sdk-ids = { path = "sdk-ids", version = "3.0.0" }
 solana-sdk-macro = { path = "sdk-macro", version = "3.0.0" }
 solana-sdk-wasm-js = { path = "sdk-wasm-js", version = "1.0.0" }
-solana-secp256k1-program = { path = "secp256k1-program", version = "2.2.1" }
+solana-secp256k1-program = { path = "secp256k1-program", version = "3.0.0" }
 solana-secp256k1-recover = { path = "secp256k1-recover", version = "3.0.0" }
 solana-secp256r1-program = { path = "secp256r1-program", version = "3.0.0", default-features = false }
 solana-seed-derivable = { path = "seed-derivable", version = "3.0.0" }
@@ -297,9 +297,9 @@ solana-signer-store = { path = "signer-store", version = "0.1.0" }
 solana-slot-hashes = { path = "slot-hashes", version = "3.0.0" }
 solana-slot-history = { path = "slot-history", version = "3.0.0" }
 solana-stable-layout = { path = "stable-layout", version = "3.0.0" }
-solana-system-interface = { path = "system-interface", version = "1.0" }
+solana-system-interface = { path = "system-interface", version = "2.0" }
 solana-system-transaction = { path = "system-transaction", version = "2.2.1" }
-solana-sysvar = { path = "sysvar", version = "2.2.1" }
+solana-sysvar = { path = "sysvar", version = "3.0.0" }
 solana-sysvar-id = { path = "sysvar-id", version = "3.0.0" }
 solana-time-utils = { path = "time-utils", version = "3.0.0" }
 solana-transaction = { path = "transaction", version = "2.2.1" }

account/Cargo.toml

@@ -2,7 +2,7 @@
 name = "solana-account"
 description = "Solana Account type"
 documentation = "https://docs.rs/solana-account"
-version = "2.2.1"
+version = "3.0.0"
 authors = { workspace = true }
 repository = { workspace = true }
 homepage = { workspace = true }

address-lookup-table-interface/Cargo.toml

@@ -2,7 +2,7 @@
 name = "solana-address-lookup-table-interface"
 description = "Solana address lookup table interface."
 documentation = "https://docs.rs/solana-address-lookup-table-interface"
-version = "2.2.2"
+version = "3.0.0"
 rust-version = "1.81.0"
 authors = { workspace = true }
 repository = { workspace = true }

epoch-schedule/Cargo.toml

@@ -2,7 +2,7 @@
 name = "solana-epoch-schedule"
 description = "Configuration for Solana epochs and slots."
 documentation = "https://docs.rs/solana-epoch-schedule"
-version = "2.2.1"
+version = "3.0.0"
 authors = { workspace = true }
 repository = { workspace = true }
 homepage = { workspace = true }

fee-calculator/Cargo.toml

@@ -2,7 +2,7 @@
 name = "solana-fee-calculator"
 description = "Solana transaction fee calculation"
 documentation = "https://docs.rs/solana-fee-calculator"
-version = "2.2.1"
+version = "3.0.0"
 authors = { workspace = true }
 repository = { workspace = true }
 homepage = { workspace = true }

instructions-sysvar/Cargo.toml

@@ -2,7 +2,7 @@
 name = "solana-instructions-sysvar"
 description = "Type for instruction introspection during execution of Solana programs."
 documentation = "https://docs.rs/solana-instructions-sysvar"
-version = "2.2.2"
+version = "3.0.0"
 authors = { workspace = true }
 repository = { workspace = true }
 homepage = { workspace = true }

nonce/Cargo.toml

@@ -2,7 +2,7 @@
 name = "solana-nonce"
 description = "Solana durable transaction nonces."
 documentation = "https://docs.rs/solana-nonce"
-version = "2.2.1"
+version = "3.0.0"
 authors = { workspace = true }
 repository = { workspace = true }
 homepage = { workspace = true }

offchain-message/Cargo.toml

@@ -2,7 +2,7 @@
 name = "solana-offchain-message"
 description = "Solana offchain message signing"
 documentation = "https://docs.rs/solana-offchain-message"
-version = "2.2.1"
+version = "3.0.0"
 authors = { workspace = true }
 repository = { workspace = true }
 homepage = { workspace = true }

poh-config/Cargo.toml

@@ -2,7 +2,7 @@
 name = "solana-poh-config"
 description = "Definitions of Solana's proof of history."
 documentation = "https://docs.rs/solana-poh-config"
-version = "2.2.1"
+version = "3.0.0"
 authors = { workspace = true }
 repository = { workspace = true }
 homepage = { workspace = true }

presigner/Cargo.toml

@@ -2,7 +2,7 @@
 name = "solana-presigner"
 description = "A Solana `Signer` implementation representing an externally-constructed `Signature`."
 documentation = "https://docs.rs/solana-presigner"
-version = "2.2.1"
+version = "3.0.0"
 authors = { workspace = true }
 repository = { workspace = true }
 homepage = { workspace = true }

quic-definitions/Cargo.toml

@@ -2,7 +2,7 @@
 name = "solana-quic-definitions"
 description = "Definitions related to Solana over QUIC."
 documentation = "https://docs.rs/solana-quic-definitions"
-version = "2.3.1"
+version = "3.0.0"
 rust-version = "1.81.0"
 authors = { workspace = true }
 repository = { workspace = true }

rent/Cargo.toml

@@ -2,7 +2,7 @@
 name = "solana-rent"
 description = "Configuration for Solana network rent."
 documentation = "https://docs.rs/solana-rent"
-version = "2.2.1"
+version = "3.0.0"
 authors = { workspace = true }
 repository = { workspace = true }
 homepage = { workspace = true }

secp256k1-program/Cargo.toml

@@ -2,7 +2,7 @@
 name = "solana-secp256k1-program"
 description = "Instructions for the Solana Secp256k1 native program."
 documentation = "https://docs.rs/solana-secp256k1-program"
-version = "2.2.3"
+version = "3.0.0"
 authors = { workspace = true }
 repository = { workspace = true }
 homepage = { workspace = true }

system-interface/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-system-interface"
-version = "1.0.0"
+version = "2.0.0"
 description = "Instructions and constructors for the System program"
 readme = "README.md"
 authors = { workspace = true }

sysvar/Cargo.toml

@@ -2,7 +2,7 @@
 name = "solana-sysvar"
 description = "Solana sysvar account types"
 documentation = "https://docs.rs/solana-sysvar"
-version = "2.2.2"
+version = "3.0.0"
 authors = { workspace = true }
 repository = { workspace = true }
 homepage = { workspace = true }

vote-interface/Cargo.toml

@@ -36,8 +36,10 @@ frozen-abi = [
     "solana-short-vec/frozen-abi",
 ]
 serde = [
+    "dep:cfg_eval",
     "dep:serde",
     "dep:serde_derive",
+    "dep:serde_with",
     "dep:solana-serde-varint",
     "dep:solana-short-vec",
     "solana-hash/serde",
@@ -47,10 +49,12 @@ serde = [
 [dependencies]
 arbitrary = { workspace = true, features = ["derive"], optional = true }
 bincode = { workspace = true, optional = true }
+cfg_eval = { workspace = true, optional = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true }
 serde = { workspace = true, optional = true }
 serde_derive = { workspace = true, optional = true }
+serde_with = { workspace = true, features = ["macros"], optional = true }
 solana-clock = { workspace = true }
 solana-frozen-abi = { workspace = true, features = [
     "frozen-abi",

vote-interface/src/state/mod.rs

@@ -23,8 +23,15 @@ pub mod vote_state_versions;
 pub use vote_state_versions::*;
 pub mod vote_state_v3;
 pub use vote_state_v3::VoteStateV3;
+pub mod vote_state_v4;
+pub use vote_state_v4::VoteStateV4;
 mod vote_instruction_data;
 pub use vote_instruction_data::*;
+#[cfg(any(target_os = "solana", feature = "bincode"))]
+pub(crate) mod vote_state_deserialize;
+
+/// Size of a BLS public key in a compressed point representation
+pub const BLS_PUBLIC_KEY_COMPRESSED_SIZE: usize = 48;
 
 // Maximum number of votes to keep around, tightly coupled with epoch_schedule::MINIMUM_SLOTS_PER_EPOCH
 pub const MAX_LOCKOUT_HISTORY: usize = 31;