extract stable-layout crate

anza-xyz · Sep 13, 2024 · 98f9cb0 · 98f9cb0
1 parent b4ed7a4
commit 98f9cb0
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -121,6 +121,7 @@ members = [
     "sdk/serde-varint",
     "sdk/sha256-hasher",
     "sdk/signature",
+    "sdk/stable-layout",
     "send-transaction-service",
     "short-vec",
     "stake-accounts",
@@ -450,6 +451,7 @@ 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-stable-layout = { path = "sdk/stable-layout", 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/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml
@@ -56,6 +56,7 @@ solana-secp256k1-recover = { workspace = true }
 solana-serde-varint = { workspace = true }
 solana-sha256-hasher = { workspace = true, features = ["sha2"] }
 solana-short-vec = { workspace = true }
+solana-stable-layout = { workspace = true }
 thiserror = { workspace = true }
 
 # This is currently needed to build on-chain programs reliably.

diff --git a/sdk/program/src/lib.rs b/sdk/program/src/lib.rs
@@ -516,7 +516,6 @@ pub mod secp256k1_program;
 pub mod serialize_utils;
 pub mod slot_hashes;
 pub mod slot_history;
-pub mod stable_layout;
 pub mod stake;
 pub mod stake_history;
 pub mod syscalls;
@@ -536,6 +535,8 @@ pub use solana_secp256k1_recover as secp256k1_recover;
 pub use solana_serde_varint as serde_varint;
 #[deprecated(since = "2.1.0", note = "Use `solana-short-vec` crate instead")]
 pub use solana_short_vec as short_vec;
+#[deprecated(since = "2.1.0", note = "Use `solana-stable-layout` crate instead")]
+pub use solana_stable_layout as stable_layout;
 #[cfg(target_arch = "wasm32")]
 pub use wasm_bindgen::prelude::wasm_bindgen;
 pub use {

diff --git a/sdk/stable-layout/Cargo.toml b/sdk/stable-layout/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "solana-stable-layout"
+description = "Solana types with stable memory layouts. Internal use only."
+documentation = "https://docs.rs/solana-stable-layout"
+version = { workspace = true }
+authors = { workspace = true }
+repository = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+
+[dependencies]
+solana-instruction = { workspace = true, default-features = false, features = [
+    "std",
+] }
+solana-pubkey = { workspace = true, default-features = false }
+
+[dev-dependencies]
+memoffset = { workspace = true }
diff --git a/sdk/program/src/stable_layout.rs → sdk/stable-layout/src/lib.rs b/sdk/program/src/stable_layout.rs → sdk/stable-layout/src/lib.rs
diff --git a/...m/src/stable_layout/stable_instruction.rs → sdk/stable-layout/src/stable_instruction.rs b/...m/src/stable_layout/stable_instruction.rs → sdk/stable-layout/src/stable_instruction.rs
@@ -1,11 +1,9 @@
 //! `Instruction`, with a stable memory layout
 
 use {
-    crate::{
-        instruction::{AccountMeta, Instruction},
-        pubkey::Pubkey,
-        stable_layout::stable_vec::StableVec,
-    },
+    crate::stable_vec::StableVec,
+    solana_instruction::{AccountMeta, Instruction},
+    solana_pubkey::Pubkey,
     std::fmt::Debug,
 };
 
@@ -21,7 +19,9 @@ use {
 /// Creating a `StableInstruction` from an `Instruction`
 ///
 /// ```
-/// # use solana_program::{instruction::Instruction, pubkey::Pubkey, stable_layout::stable_instruction::StableInstruction};
+/// # use solana_instruction::Instruction;
+/// # use solana_pubkey::Pubkey;
+/// # use solana_stable_layout::stable_instruction::StableInstruction;
 /// # let program_id = Pubkey::default();
 /// # let accounts = Vec::default();
 /// # let data = Vec::default();

diff --git a/sdk/program/src/stable_layout/stable_rc.rs → sdk/stable-layout/src/stable_rc.rs b/sdk/program/src/stable_layout/stable_rc.rs → sdk/stable-layout/src/stable_rc.rs
diff --git a/...gram/src/stable_layout/stable_ref_cell.rs → sdk/stable-layout/src/stable_ref_cell.rs b/...gram/src/stable_layout/stable_ref_cell.rs → sdk/stable-layout/src/stable_ref_cell.rs
diff --git a/...program/src/stable_layout/stable_slice.rs → sdk/stable-layout/src/stable_slice.rs b/...program/src/stable_layout/stable_slice.rs → sdk/stable-layout/src/stable_slice.rs
diff --git a/sdk/program/src/stable_layout/stable_vec.rs → sdk/stable-layout/src/stable_vec.rs b/sdk/program/src/stable_layout/stable_vec.rs → sdk/stable-layout/src/stable_vec.rs
@@ -18,7 +18,7 @@ use std::{marker::PhantomData, mem::ManuallyDrop, ptr::NonNull};
 /// Creating a `StableVec` from a `Vec`
 ///
 /// ```
-/// # use solana_program::stable_layout::stable_vec::StableVec;
+/// # use solana_stable_layout::stable_vec::StableVec;
 /// let vec = vec!["meow", "woof", "moo"];
 /// let vec = StableVec::from(vec);
 /// ```