Move short_vec to its own crate (#1796)

* move short_vec.rs to its own crate * update short_vec dependents to use new crate * update lock file * reexport short_vec with deprecation notice * re-export in sdk too * fmt * remove duplicate frozen-abi stuff * fix frozen-abi usage and activation * update lock file * fmt * update expected digests after confirming not a real abi change * update another digest * add missing activation of frozen-abi feature * update digests in sdk and program * update VoteTransaction digest * fmt
anza-xyz · Jul 17, 2024 · b2c4742 · b2c4742
1 parent 150f4d7
commit b2c4742
Show file tree

Hide file tree

Showing 33 changed files with 118 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -105,6 +105,7 @@ members = [
     "sdk/package-metadata-macro",
     "sdk/program",
     "send-transaction-service",
+    "short-vec",
     "stake-accounts",
     "storage-bigtable",
     "storage-bigtable/build-proto",
@@ -399,6 +400,7 @@ solana-sdk = { path = "sdk", version = "=2.1.0" }
 solana-sdk-macro = { path = "sdk/macro", version = "=2.1.0" }
 solana-secp256k1-recover = { path = "curves/secp256k1-recover", version = "=2.1.0", default-features = false }
 solana-send-transaction-service = { path = "send-transaction-service", version = "=2.1.0" }
+solana-short-vec = { path = "short-vec", version = "=2.1.0" }
 solana-stake-program = { path = "programs/stake", version = "=2.1.0" }
 solana-storage-bigtable = { path = "storage-bigtable", version = "=2.1.0" }
 solana-storage-proto = { path = "storage-proto", version = "=2.1.0" }

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -68,6 +68,7 @@ solana-runtime = { workspace = true }
 solana-sanitize = { workspace = true }
 solana-sdk = { workspace = true }
 solana-send-transaction-service = { workspace = true }
+solana-short-vec = { workspace = true }
 solana-streamer = { workspace = true }
 solana-svm = { workspace = true }
 solana-timings = { workspace = true }
@@ -129,6 +130,7 @@ frozen-abi = [
     "solana-program-runtime/frozen-abi",
     "solana-runtime/frozen-abi",
     "solana-sdk/frozen-abi",
+    "solana-short-vec/frozen-abi",
     "solana-svm/frozen-abi",
     "solana-vote/frozen-abi",
     "solana-vote-program/frozen-abi",

diff --git a/core/src/banking_stage/immutable_deserialized_packet.rs b/core/src/banking_stage/immutable_deserialized_packet.rs
@@ -7,13 +7,13 @@ use {
         hash::Hash,
         message::Message,
         pubkey::Pubkey,
-        short_vec::decode_shortu16_len,
         signature::Signature,
         transaction::{
             AddressLoader, SanitizedTransaction, SanitizedVersionedTransaction,
             VersionedTransaction,
         },
     },
+    solana_short_vec::decode_shortu16_len,
     std::{cmp::Ordering, collections::HashSet, mem::size_of},
     thiserror::Error,
 };

diff --git a/core/src/consensus.rs b/core/src/consensus.rs
@@ -237,7 +237,7 @@ pub(crate) enum BlockhashStatus {
 #[cfg_attr(
     feature = "frozen-abi",
     derive(AbiExample),
-    frozen_abi(digest = "679XkZ4upGc389SwqAsjs5tr2qB4wisqjbwtei7fGhxC")
+    frozen_abi(digest = "H6T5A66kgJYANFXVrUprxV76WD5ce7Gf62q9SiBC2uYk")
 )]
 #[derive(Clone, Serialize, Deserialize, Debug, PartialEq)]
 pub struct Tower {

diff --git a/core/src/consensus/tower1_14_11.rs b/core/src/consensus/tower1_14_11.rs
@@ -9,7 +9,7 @@ use {
 #[cfg_attr(
     feature = "frozen-abi",
     derive(AbiExample),
-    frozen_abi(digest = "4LayQwoKrE2jPhbNtg3TSpKrtEtjcPiwsVPJN7aCavri")
+    frozen_abi(digest = "EqYa8kwY9Z1Zbjxgs2aBbqKyCK4f7WAG8gJ7pVSQyKzk")
 )]
 #[derive(Clone, Serialize, Deserialize, Debug, PartialEq)]
 pub struct Tower1_14_11 {

diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml
@@ -45,6 +45,7 @@ solana-rpc-client = { workspace = true }
 solana-runtime = { workspace = true }
 solana-sanitize = { workspace = true }
 solana-sdk = { workspace = true }
+solana-short-vec = { workspace = true }
 solana-streamer = { workspace = true }
 solana-tpu-client = { workspace = true }
 solana-version = { workspace = true }
@@ -71,6 +72,7 @@ frozen-abi = [
     "solana-perf/frozen-abi",
     "solana-runtime/frozen-abi",
     "solana-sdk/frozen-abi",
+    "solana-short-vec/frozen-abi",
     "solana-version/frozen-abi",
     "solana-vote/frozen-abi",
     "solana-vote-program/frozen-abi",

diff --git a/gossip/src/cluster_info.rs b/gossip/src/cluster_info.rs
@@ -310,7 +310,7 @@ pub(crate) type Ping = ping_pong::Ping<[u8; GOSSIP_PING_TOKEN_SIZE]>;
 #[cfg_attr(
     feature = "frozen-abi",
     derive(AbiExample, AbiEnumVisitor),
-    frozen_abi(digest = "ogEqvffeEkPpojAaSiUbCv2HdJcdXDQ1ykgYyvKvLo2")
+    frozen_abi(digest = "6YaMJand6tKtNLUrqvusC5QVDmVLCWYRg5LtxYNi6XN4")
 )]
 #[derive(Serialize, Deserialize, Debug)]
 #[allow(clippy::large_enum_variant)]

diff --git a/gossip/src/contact_info.rs b/gossip/src/contact_info.rs
@@ -8,8 +8,9 @@ use {
         pubkey::Pubkey,
         quic::QUIC_PORT_OFFSET,
         rpc_port::{DEFAULT_RPC_PORT, DEFAULT_RPC_PUBSUB_PORT},
-        serde_varint, short_vec,
+        serde_varint,
     },
+    solana_short_vec as short_vec,
     solana_streamer::socket::SocketAddrSpace,
     static_assertions::const_assert_eq,
     std::{

diff --git a/perf/Cargo.toml b/perf/Cargo.toml
@@ -26,6 +26,7 @@ solana-frozen-abi-macro = { workspace = true, optional = true }
 solana-metrics = { workspace = true }
 solana-rayon-threadlimit = { workspace = true }
 solana-sdk = { workspace = true }
+solana-short-vec = { workspace = true }
 solana-vote-program = { workspace = true }
 
 [target."cfg(target_os = \"linux\")".dependencies]
@@ -50,6 +51,7 @@ frozen-abi = [
     "dep:solana-frozen-abi",
     "dep:solana-frozen-abi-macro",
     "solana-sdk/frozen-abi",
+    "solana-short-vec/frozen-abi",
     "solana-vote-program/frozen-abi",
 ]
 

diff --git a/perf/src/sigverify.rs b/perf/src/sigverify.rs
@@ -17,9 +17,9 @@ use {
         hash::Hash,
         message::{MESSAGE_HEADER_LENGTH, MESSAGE_VERSION_PREFIX},
         pubkey::Pubkey,
-        short_vec::decode_shortu16_len,
         signature::Signature,
     },
+    solana_short_vec::decode_shortu16_len,
     std::{convert::TryFrom, mem::size_of},
 };
 

diff --git a/programs/config/Cargo.toml b/programs/config/Cargo.toml
@@ -17,6 +17,7 @@ serde_derive = { workspace = true }
 solana-log-collector = { workspace = true }
 solana-program-runtime = { workspace = true }
 solana-sdk = { workspace = true }
+solana-short-vec = { workspace = true }
 
 [dev-dependencies]
 solana-logger = { workspace = true }

diff --git a/programs/config/src/lib.rs b/programs/config/src/lib.rs
@@ -16,8 +16,8 @@ use {
     solana_sdk::{
         account::{Account, AccountSharedData},
         pubkey::Pubkey,
-        short_vec,
     },
+    solana_short_vec as short_vec,
 };
 
 pub trait ConfigState: serde::Serialize + Default {

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/programs/vote/src/vote_state/mod.rs b/programs/vote/src/vote_state/mod.rs
@@ -31,7 +31,7 @@ use {
 #[cfg_attr(
     feature = "frozen-abi",
     derive(AbiExample, AbiEnumVisitor),
-    frozen_abi(digest = "EcS3xgfomytEAQ1eVd8R76ZejwyHp2Ed8dHqQWh6zi5v")
+    frozen_abi(digest = "3R2hRL3FM6jovbYubq2UWeiVDEVzrhH6M1ihoCPZWLsk")
 )]
 #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
 pub enum VoteTransaction {

diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -42,6 +42,7 @@ frozen-abi = [
   "dep:solana-frozen-abi",
   "dep:solana-frozen-abi-macro",
   "solana-program/frozen-abi",
+  "solana-short-vec/frozen-abi"
 ]
 
 [dependencies]
@@ -85,6 +86,7 @@ solana-program = { workspace = true }
 solana-sanitize = { workspace = true }
 solana-sdk-macro = { workspace = true }
 solana-secp256k1-recover = { workspace = true }
+solana-short-vec = { workspace = true }
 thiserror = { workspace = true }
 uriparse = { workspace = true }
 

diff --git a/sdk/benches/short_vec.rs b/sdk/benches/short_vec.rs
@@ -1,7 +1,7 @@
 #![feature(test)]
 
 extern crate test;
-use {bincode::deserialize, solana_sdk::short_vec::ShortVec, test::Bencher};
+use {bincode::deserialize, solana_short_vec::ShortVec, test::Bencher};
 
 // Return a ShortVec with 127 bytes
 fn create_encoded_short_vec() -> Vec<u8> {

diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml
@@ -37,6 +37,7 @@ solana-frozen-abi-macro = { workspace = true, optional = true }
 solana-sanitize = { workspace = true }
 solana-sdk-macro = { workspace = true }
 solana-secp256k1-recover = { workspace = true }
+solana-short-vec = { workspace = true }
 thiserror = { workspace = true }
 
 # This is currently needed to build on-chain programs reliably.
@@ -97,4 +98,4 @@ crate-type = ["cdylib", "rlib"]
 default = ["borsh"]
 borsh = ["dep:borsh", "dep:borsh0-10"]
 dev-context-only-utils = ["dep:qualifier_attr"]
-frozen-abi = ["dep:solana-frozen-abi", "dep:solana-frozen-abi-macro"]
+frozen-abi = ["dep:solana-frozen-abi", "dep:solana-frozen-abi-macro", "solana-short-vec/frozen-abi"]
diff --git a/sdk/program/src/instruction.rs b/sdk/program/src/instruction.rs
@@ -18,11 +18,8 @@ use crate::wasm_bindgen;
 #[cfg(feature = "borsh")]
 use borsh::BorshSerialize;
 use {
-    crate::{pubkey::Pubkey, short_vec},
-    bincode::serialize,
-    serde::Serialize,
-    solana_sanitize::Sanitize,
-    thiserror::Error,
+    crate::pubkey::Pubkey, bincode::serialize, serde::Serialize, solana_sanitize::Sanitize,
+    solana_short_vec as short_vec, thiserror::Error,
 };
 
 /// Reasons the runtime might have rejected an instruction.

diff --git a/sdk/program/src/lib.rs b/sdk/program/src/lib.rs
@@ -521,7 +521,6 @@ pub mod rent;
 pub mod secp256k1_program;
 pub mod serde_varint;
 pub mod serialize_utils;
-pub mod short_vec;
 pub mod slot_hashes;
 pub mod slot_history;
 pub mod stable_layout;
@@ -538,6 +537,8 @@ pub mod wasm;
 pub use solana_sanitize as sanitize;
 #[deprecated(since = "2.1.0", note = "Use `solana-secp256k1-recover` crate instead")]
 pub use solana_secp256k1_recover as secp256k1_recover;
+#[deprecated(since = "2.1.0", note = "Use `solana-short-vec` crate instead")]
+pub use solana_short_vec as short_vec;
 #[cfg(target_arch = "wasm32")]
 pub use wasm_bindgen::prelude::wasm_bindgen;