Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sdk: Extract solana-sysvar-id crate #3309

Merged
merged 5 commits into from
Oct 29, 2024
Merged

sdk: Extract solana-sysvar-id crate #3309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2bbbd65
sdk: Extract `solana-sysvar` crate
joncinque Oct 25, 2024
d197bb5
Add solana-define-syscall for solana builds
joncinque Oct 25, 2024
b9b101a
Rename solana-sysvar -> solana-sysvar-id
joncinque Oct 28, 2024
6cae9ed
Move back `get_sysvar` to solana-program
joncinque Oct 28, 2024
b731ba0
Update lockfile for v2.2
joncinque Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ members = [
"sdk/slot-hashes",
"sdk/slot-history",
"sdk/stable-layout",
"sdk/sysvar-id",
"sdk/transaction-error",
"send-transaction-service",
"short-vec",
Expand Down Expand Up @@ -505,6 +506,7 @@ solana-svm-example-paytube = { path = "svm/examples/paytube", version = "=2.2.0"
solana-svm-rent-collector = { path = "svm-rent-collector", version = "=2.2.0" }
solana-svm-transaction = { path = "svm-transaction", version = "=2.2.0" }
solana-system-program = { path = "programs/system", version = "=2.2.0" }
solana-sysvar-id = { path = "sdk/sysvar-id", version = "=2.2.0" }
solana-test-validator = { path = "test-validator", version = "=2.2.0" }
solana-thin-client = { path = "thin-client", version = "=2.2.0" }
solana-transaction-error = { path = "sdk/transaction-error", version = "=2.2.0" }
Expand Down
14 changes: 14 additions & 0 deletions programs/sbf/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions sdk/clock/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,17 @@ edition = { workspace = true }
serde = { workspace = true, optional = true }
serde_derive = { workspace = true, optional = true }
solana-sdk-macro = { workspace = true }
solana-sysvar-id = { workspace = true, optional = true }

[dev-dependencies]
solana-clock = { path = ".", features = ["sysvar"] }
static_assertions = { workspace = true }

[features]
serde = ["dep:serde", "dep:serde_derive"]
sysvar = ["dep:solana-sysvar-id"]

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
all-features = true
rustdoc-args = ["--cfg=docsrs"]
4 changes: 4 additions & 0 deletions sdk/clock/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
//!
//! [oracle]: https://docs.solanalabs.com/implemented-proposals/validator-timestamp-oracle
#![no_std]
#![cfg_attr(docsrs, feature(doc_auto_cfg))]

#[cfg(feature = "sysvar")]
pub mod sysvar;

#[cfg(feature = "serde")]
use serde_derive::{Deserialize, Serialize};
Expand Down
3 changes: 3 additions & 0 deletions sdk/clock/src/sysvar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
use {crate::Clock, solana_sysvar_id::declare_sysvar_id};

declare_sysvar_id!("SysvarC1ock11111111111111111111111111111111", Clock);
3 changes: 3 additions & 0 deletions sdk/epoch-schedule/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,20 @@ serde_derive = { workspace = true, optional = true }
solana-frozen-abi = { workspace = true, optional = true }
solana-frozen-abi-macro = { workspace = true, optional = true }
solana-sdk-macro = { workspace = true }
solana-sysvar-id = { workspace = true, optional = true }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

[dev-dependencies]
solana-clock = { workspace = true }
solana-epoch-schedule = { path = ".", features = ["sysvar"] }
static_assertions = { workspace = true }

[features]
frozen-abi = ["dep:solana-frozen-abi", "dep:solana-frozen-abi-macro"]
serde = ["dep:serde", "dep:serde_derive"]
sysvar = ["dep:solana-sysvar-id"]

[lints]
workspace = true
3 changes: 3 additions & 0 deletions sdk/epoch-schedule/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
#[cfg(feature = "frozen-abi")]
extern crate std;

#[cfg(feature = "sysvar")]
pub mod sysvar;

#[cfg(feature = "serde")]
use serde_derive::{Deserialize, Serialize};
use solana_sdk_macro::CloneZeroed;
Expand Down
3 changes: 3 additions & 0 deletions sdk/epoch-schedule/src/sysvar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
use {crate::EpochSchedule, solana_sysvar_id::declare_sysvar_id};

declare_sysvar_id!("SysvarEpochSchedu1e111111111111111111111111", EpochSchedule);
2 changes: 2 additions & 0 deletions sdk/last-restart-slot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ edition = { workspace = true }
serde = { workspace = true, optional = true }
serde_derive = { workspace = true, optional = true }
solana-sdk-macro = { workspace = true }
solana-sysvar-id = { workspace = true, optional = true }

[features]
serde = ["dep:serde", "dep:serde_derive"]
sysvar = ["dep:solana-sysvar-id"]

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
Expand Down
3 changes: 3 additions & 0 deletions sdk/last-restart-slot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
//! Information about the last restart slot (hard fork).
#![cfg_attr(docsrs, feature(doc_auto_cfg))]

#[cfg(feature = "sysvar")]
pub mod sysvar;

use solana_sdk_macro::CloneZeroed;

#[repr(C)]
Expand Down
6 changes: 6 additions & 0 deletions sdk/last-restart-slot/src/sysvar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
use {crate::LastRestartSlot, solana_sysvar_id::declare_sysvar_id};

declare_sysvar_id!(
"SysvarLastRestartS1ot1111111111111111111111",
LastRestartSlot
);
13 changes: 7 additions & 6 deletions sdk/program/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ solana-account-info = { workspace = true, features = ["bincode"] }
solana-atomic-u64 = { workspace = true }
solana-bincode = { workspace = true }
solana-borsh = { workspace = true, optional = true }
solana-clock = { workspace = true, features = ["serde"] }
solana-clock = { workspace = true, features = ["serde", "sysvar"] }
solana-cpi = { workspace = true }
solana-decode-error = { workspace = true }
solana-epoch-schedule = { workspace = true, features = ["serde"] }
solana-epoch-schedule = { workspace = true, features = ["serde", "sysvar"] }
solana-fee-calculator = { workspace = true, features = ["serde"] }
solana-frozen-abi = { workspace = true, optional = true, features = ["frozen-abi"] }
solana-frozen-abi-macro = { workspace = true, optional = true, features = ["frozen-abi"] }
Expand All @@ -53,7 +53,7 @@ solana-instruction = { workspace = true, default-features = false, features = [
"serde",
"std",
] }
solana-last-restart-slot = { workspace = true, features = ["serde"] }
solana-last-restart-slot = { workspace = true, features = ["serde", "sysvar"] }
solana-msg = { workspace = true }
solana-native-token = { workspace = true }
solana-program-entrypoint = { workspace = true }
Expand All @@ -62,17 +62,18 @@ solana-program-memory = { workspace = true }
solana-program-option = { workspace = true }
solana-program-pack = { workspace = true }
solana-pubkey = { workspace = true, features = ["bytemuck", "curve25519", "serde", "std"] }
solana-rent = { workspace = true, features = ["serde"] }
solana-rent = { workspace = true, features = ["serde", "sysvar"] }
solana-sanitize = { workspace = true }
solana-sdk-macro = { workspace = true }
solana-secp256k1-recover = { workspace = true }
solana-serde-varint = { workspace = true }
solana-serialize-utils = { workspace = true }
solana-sha256-hasher = { workspace = true, features = ["sha2"] }
solana-short-vec = { workspace = true }
solana-slot-hashes = { workspace = true, features = ["serde"] }
solana-slot-history = { workspace = true, features = ["serde"] }
solana-slot-hashes = { workspace = true, features = ["serde", "sysvar"] }
solana-slot-history = { workspace = true, features = ["serde", "sysvar"] }
solana-stable-layout = { workspace = true }
solana-sysvar-id = { workspace = true }
thiserror = { workspace = true }

# This is currently needed to build on-chain programs reliably.
Expand Down
2 changes: 2 additions & 0 deletions sdk/program/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,8 @@ pub mod sdk_ids {
#[deprecated(since = "2.1.0", note = "Use `solana-decode-error` crate instead")]
pub use solana_decode_error as decode_error;
pub use solana_pubkey::{declare_deprecated_id, declare_id, pubkey};
#[deprecated(since = "2.1.0", note = "Use `solana-sysvar-id` crate instead")]
pub use solana_sysvar_id::{declare_deprecated_sysvar_id, declare_sysvar_id};

#[macro_use]
extern crate serde_derive;
Expand Down
11 changes: 6 additions & 5 deletions sdk/program/src/sysvar/clock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
//! Ok(())
//! }
//! #
//! # use solana_program::sysvar::SysvarId;
//! # use solana_sysvar_id::SysvarId;
//! # let p = Clock::id();
//! # let l = &mut 1169280;
//! # let d = &mut vec![240, 153, 233, 7, 0, 0, 0, 0, 11, 115, 118, 98, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 0, 0, 52, 1, 0, 0, 0, 0, 0, 0, 121, 50, 119, 98, 0, 0, 0, 0];
Expand Down Expand Up @@ -81,7 +81,7 @@
//! Ok(())
//! }
//! #
//! # use solana_program::sysvar::SysvarId;
//! # use solana_sysvar_id::SysvarId;
//! # let p = Clock::id();
//! # let l = &mut 1169280;
//! # let d = &mut vec![240, 153, 233, 7, 0, 0, 0, 0, 11, 115, 118, 98, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 0, 0, 52, 1, 0, 0, 0, 0, 0, 0, 121, 50, 119, 98, 0, 0, 0, 0];
Expand Down Expand Up @@ -127,9 +127,10 @@
//! ```
use crate::{impl_sysvar_get, program_error::ProgramError, sysvar::Sysvar};
pub use solana_clock::Clock;

crate::declare_sysvar_id!("SysvarC1ock11111111111111111111111111111111", Clock);
pub use solana_clock::{
sysvar::{check_id, id, ID},
Clock,
};

impl Sysvar for Clock {
impl_sysvar_get!(sol_get_clock_sysvar);
Expand Down
11 changes: 7 additions & 4 deletions sdk/program/src/sysvar/epoch_rewards.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
//! Ok(())
//! }
//! #
//! # use solana_program::sysvar::SysvarId;
//! # use solana_sysvar_id::SysvarId;
//! # let p = EpochRewards::id();
//! # let l = &mut 1559040;
//! # let epoch_rewards = EpochRewards {
Expand Down Expand Up @@ -99,7 +99,7 @@
//! Ok(())
//! }
//! #
//! # use solana_program::sysvar::SysvarId;
//! # use solana_sysvar_id::SysvarId;
//! # let p = EpochRewards::id();
//! # let l = &mut 1559040;
//! # let epoch_rewards = EpochRewards {
Expand Down Expand Up @@ -160,9 +160,12 @@
//! ```

pub use crate::epoch_rewards::EpochRewards;
use crate::{impl_sysvar_get, program_error::ProgramError, sysvar::Sysvar};
use {
crate::{impl_sysvar_get, program_error::ProgramError, sysvar::Sysvar},
solana_sysvar_id::declare_sysvar_id,
};

crate::declare_sysvar_id!("SysvarEpochRewards1111111111111111111111111", EpochRewards);
declare_sysvar_id!("SysvarEpochRewards1111111111111111111111111", EpochRewards);

impl Sysvar for EpochRewards {
impl_sysvar_get!(sol_get_epoch_rewards_sysvar);
Expand Down
Loading
Loading