diff --git a/Cargo.lock b/Cargo.lock index 00adec5b9324b3..18861955d640c4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8106,6 +8106,14 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "solana-rent-debits" +version = "2.2.0" +dependencies = [ + "solana-pubkey", + "solana-reward-info", +] + [[package]] name = "solana-reserved-account-keys" version = "2.2.0" @@ -8477,6 +8485,7 @@ dependencies = [ "solana-program-memory", "solana-pubkey", "solana-quic-definitions", + "solana-rent-debits", "solana-reserved-account-keys", "solana-reward-info", "solana-sanitize", diff --git a/Cargo.toml b/Cargo.toml index 7abac53c5eaf79..8ce0d900782c02 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -149,7 +149,9 @@ members = [ "sdk/pubkey", "sdk/quic-definitions", "sdk/rent", + "sdk/rent-debits", "sdk/reserved-account-keys", + "sdk/reward-info", "sdk/sanitize", "sdk/sdk-ids", "sdk/secp256k1-program", @@ -515,6 +517,7 @@ solana-quic-definitions = { path = "sdk/quic-definitions", version = "=2.2.0" } solana-rayon-threadlimit = { path = "rayon-threadlimit", version = "=2.2.0" } solana-remote-wallet = { path = "remote-wallet", version = "=2.2.0", default-features = false } solana-rent = { path = "sdk/rent", version = "=2.2.0", default-features = false } +solana-rent-debits = { path = "sdk/rent-debits", version = "=2.2.0" } solana-reserved-account-keys = { path = "sdk/reserved-account-keys", version = "=2.2.0", default-features = false } solana-reward-info = { path = "sdk/reward-info", version = "=2.2.0" } solana-secp256r1-program = { path = "sdk/secp256r1-program", version = "=2.2.0", default-features = false } diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index 721cf464714ece..8bd0c2a50d1a80 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -6408,6 +6408,14 @@ dependencies = [ "solana-sysvar-id", ] +[[package]] +name = "solana-rent-debits" +version = "2.2.0" +dependencies = [ + "solana-pubkey", + "solana-reward-info", +] + [[package]] name = "solana-reserved-account-keys" version = "2.2.0" @@ -7188,6 +7196,7 @@ dependencies = [ "solana-program-memory", "solana-pubkey", "solana-quic-definitions", + "solana-rent-debits", "solana-reserved-account-keys", "solana-reward-info", "solana-sanitize", diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index 7ee6a5e8c9a037..d2aa4ea9841fda 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -59,6 +59,7 @@ dev-context-only-utils = [ "qualifier_attr", "solana-account/dev-context-only-utils", "solana-compute-budget-interface/dev-context-only-utils", + "solana-rent-debits/dev-context-only-utils", "solana-transaction-context/dev-context-only-utils", ] frozen-abi = [ @@ -142,6 +143,7 @@ solana-program = { workspace = true } solana-program-memory = { workspace = true } solana-pubkey = { workspace = true, default-features = false, features = ["std"] } solana-quic-definitions = { workspace = true, optional = true } +solana-rent-debits = { workspace = true } solana-reserved-account-keys = { workspace = true } solana-reward-info = { workspace = true, features = ["serde"] } solana-sanitize = { workspace = true } diff --git a/sdk/rent-debits/Cargo.toml b/sdk/rent-debits/Cargo.toml new file mode 100644 index 00000000000000..c907006ca27744 --- /dev/null +++ b/sdk/rent-debits/Cargo.toml @@ -0,0 +1,25 @@ +[package] +name = "solana-rent-debits" +description = "Solana rent debit types." +documentation = "https://docs.rs/solana-rent-debits" +version = { workspace = true } +authors = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +edition = { workspace = true } + +[dependencies] +solana-pubkey = { workspace = true } +solana-reward-info = { workspace = true } + +[features] +dev-context-only-utils = [] + +[package.metadata.docs.rs] +targets = ["x86_64-unknown-linux-gnu"] +all-features = true +rustdoc-args = ["--cfg=docsrs"] + +[lints] +workspace = true diff --git a/sdk/src/rent_debits.rs b/sdk/rent-debits/src/lib.rs similarity index 93% rename from sdk/src/rent_debits.rs rename to sdk/rent-debits/src/lib.rs index 588f7c67a2a929..d6f38d95827c3c 100644 --- a/sdk/src/rent_debits.rs +++ b/sdk/rent-debits/src/lib.rs @@ -1,5 +1,7 @@ +#![cfg_attr(docsrs, feature(doc_auto_cfg))] use { - solana_sdk::{pubkey::Pubkey, reward_info::RewardInfo, reward_type::RewardType}, + solana_pubkey::Pubkey, + solana_reward_info::{RewardInfo, RewardType}, std::collections::HashMap, }; diff --git a/sdk/src/lib.rs b/sdk/src/lib.rs index dd352c55830c50..b51f88e7c6ef56 100644 --- a/sdk/src/lib.rs +++ b/sdk/src/lib.rs @@ -82,7 +82,6 @@ pub mod precompiles; pub mod program_utils; pub mod pubkey; pub mod rent_collector; -pub mod rent_debits; #[deprecated(since = "2.2.0", note = "Use `solana-reward-info` crate instead")] pub mod reward_info { pub use solana_reward_info::RewardInfo; @@ -155,6 +154,8 @@ pub use solana_pubkey::pubkey; #[cfg(feature = "full")] #[deprecated(since = "2.2.0", note = "Use `solana-quic-definitions` crate instead")] pub use solana_quic_definitions as quic; +#[deprecated(since = "2.2.0", note = "Use `solana-rent-debits` crate instead")] +pub use solana_rent_debits as rent_debits; #[cfg(feature = "full")] #[deprecated( since = "2.2.0", diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock index e6f0e05902867c..b3b473bbb9db64 100644 --- a/svm/examples/Cargo.lock +++ b/svm/examples/Cargo.lock @@ -6228,6 +6228,14 @@ dependencies = [ "solana-sysvar-id", ] +[[package]] +name = "solana-rent-debits" +version = "2.2.0" +dependencies = [ + "solana-pubkey", + "solana-reward-info", +] + [[package]] name = "solana-reserved-account-keys" version = "2.2.0" @@ -6523,6 +6531,7 @@ dependencies = [ "solana-program-memory", "solana-pubkey", "solana-quic-definitions", + "solana-rent-debits", "solana-reserved-account-keys", "solana-reward-info", "solana-sanitize",