move inner_instruction.rs to solana-message

anza-xyz · Dec 17, 2024 · 632f9b2 · 632f9b2
1 parent e27e2be
commit 632f9b2
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -150,6 +150,7 @@ solana-instruction = { workspace = true }
 solana-keypair = { workspace = true, optional = true, features = [
     "seed-derivable",
 ] }
+solana-message = { workspace = true, features = ["inner-instruction", "serde"] }
 solana-native-token = { workspace = true }
 solana-nonce-account = { workspace = true }
 solana-offchain-message = { workspace = true, optional = true, features = ["verify"] }

diff --git a/sdk/message/Cargo.toml b/sdk/message/Cargo.toml
@@ -62,6 +62,7 @@ frozen-abi = [
     "solana-hash/frozen-abi",
     "solana-pubkey/frozen-abi",
 ]
+inner-instruction = []
 serde = [
     "dep:serde",
     "dep:serde_derive",

diff --git a/sdk/src/inner_instruction.rs → sdk/message/src/inner_instruction.rs b/sdk/src/inner_instruction.rs → sdk/message/src/inner_instruction.rs
@@ -1,10 +1,11 @@
-use {
-    crate::instruction::CompiledInstruction,
-    serde::{Deserialize, Serialize},
-};
+use crate::compiled_instruction::CompiledInstruction;
 
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
+#[derive(Clone, Debug, PartialEq, Eq)]
+#[cfg_attr(
+    feature = "serde",
+    derive(serde_derive::Deserialize, serde_derive::Serialize),
+    serde(rename_all = "camelCase")
+)]
 pub struct InnerInstruction {
     pub instruction: CompiledInstruction,
     /// Invocation stack height of this instruction. Instruction stack height

diff --git a/sdk/message/src/lib.rs b/sdk/message/src/lib.rs
@@ -41,6 +41,8 @@
 
 pub mod compiled_instruction;
 mod compiled_keys;
+#[cfg(feature = "inner-instruction")]
+pub mod inner_instruction;
 pub mod legacy;
 #[cfg(feature = "serde")]
 use serde_derive::{Deserialize, Serialize};

diff --git a/sdk/src/lib.rs b/sdk/src/lib.rs
@@ -72,7 +72,6 @@ pub mod genesis_config;
 #[deprecated(since = "2.2.0", note = "Use `solana-hard-forks` crate instead")]
 pub use solana_hard_forks as hard_forks;
 pub mod hash;
-pub mod inner_instruction;
 pub mod log;
 pub mod native_loader;
 pub mod net;
@@ -134,6 +133,8 @@ pub use solana_feature_set as feature_set;
 pub use solana_fee_structure as fee;
 #[deprecated(since = "2.1.0", note = "Use `solana-inflation` crate instead")]
 pub use solana_inflation as inflation;
+#[deprecated(since = "2.2.0", note = "Use `solana-inner-instruction` crate instead")]
+pub use solana_message::inner_instruction;
 #[deprecated(since = "2.2.0", note = "Use `solana-nonce-account` crate instead")]
 pub use solana_nonce_account as nonce_account;
 #[cfg(feature = "full")]

diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock