Use define syscall dependency

febo · febo · commit da237d48219a · 2025-10-05T01:02:17.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,6 +25,7 @@ quote = "1.0"
 regex = "1"
 solana-account-view = { version = "0.0.0", git = "https://github.com/febo/solana-sdk.git", branch = "solana-instruction-view" }
 solana-address = { version = "1.0", git = "https://github.com/febo/solana-sdk.git", branch = "solana-instruction-view" }
+solana-define-syscall = { version = "3.0.0", git = "https://github.com/febo/solana-sdk.git", branch = "solana-instruction-view" }
 solana-instruction-view = { version = "0.0.0", git = "https://github.com/febo/solana-sdk.git", branch = "solana-instruction-view" }
 solana-program-error = { version = "3.0.0", git = "https://github.com/febo/solana-sdk.git", branch = "solana-instruction-view" }
 syn = "1.0"
diff --git a/sdk/pinocchio/Cargo.toml b/sdk/pinocchio/Cargo.toml
@@ -27,5 +27,8 @@ solana-address = { workspace = true, features = ["syscalls"] }
 solana-instruction-view = { workspace = true, features = ["cpi"] }
 solana-program-error = { workspace = true }
 
+[target.'cfg(target_os = "solana")'.dependencies]
+solana-define-syscall = { workspace = true }
+
 [dev-dependencies]
 five8_const = { workspace = true }
diff --git a/sdk/pinocchio/src/lib.rs b/sdk/pinocchio/src/lib.rs
@@ -214,7 +214,6 @@
 extern crate std;
 
 pub mod entrypoint;
-pub mod syscalls;
 pub mod sysvars;
 
 #[deprecated(since = "0.7.0", note = "Use the `entrypoint` module instead")]
@@ -227,6 +226,10 @@ pub use solana_account_view as account;
 pub use solana_address as address;
 pub use solana_address::Address;
 
+// Re-export the `solana_define_syscall` for downstream use.
+#[cfg(target_os = "solana")]
+pub use solana_define_syscall::definitions as syscalls;
+
 // Re-export the `solana_instruction_view` for downstream use.
 pub use solana_instruction_view as instruction;
 
diff --git a/sdk/pinocchio/src/syscalls.rs b/sdk/pinocchio/src/syscalls.rs
diff --git a/sdk/pinocchio/src/sysvars/clock.rs b/sdk/pinocchio/src/sysvars/clock.rs
@@ -1,5 +1,7 @@
 //! Information about the network's clock, ticks, slots, etc.
 
+#![allow(deprecated)]
+
 use crate::{
     account::{AccountView, Ref},
     error::ProgramError,
diff --git a/sdk/pinocchio/src/sysvars/rent.rs b/sdk/pinocchio/src/sysvars/rent.rs
@@ -2,6 +2,8 @@
 //!
 //! This is required for the rent sysvar implementation.
 
+#![allow(deprecated)]
+
 use crate::{
     account::{AccountView, Ref},
     error::ProgramError,
