Skip to content

Commit

Permalink
Extract rent-debits crate (#3150)
Browse files Browse the repository at this point in the history
* extract rent-debits crate

* fix dcou activation

* sort deps

* post-rebase fix

* sort deps

* fmt

* fmt

* update new lock file

* add doc_auto_cfg

Co-authored-by: Jon C <[email protected]>

* remove unused dep

---------

Co-authored-by: Jon C <[email protected]>
  • Loading branch information
kevinheavey and joncinque authored Nov 22, 2024
1 parent d249aee commit 2a9ab0b
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 2 deletions.
9 changes: 9 additions & 0 deletions Cargo.lock

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

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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 }
Expand Down
9 changes: 9 additions & 0 deletions programs/sbf/Cargo.lock

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

2 changes: 2 additions & 0 deletions sdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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 }
Expand Down
25 changes: 25 additions & 0 deletions sdk/rent-debits/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion sdk/src/rent_debits.rs → sdk/rent-debits/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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,
};

Expand Down
3 changes: 2 additions & 1 deletion sdk/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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",
Expand Down
9 changes: 9 additions & 0 deletions svm/examples/Cargo.lock

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

0 comments on commit 2a9ab0b

Please sign in to comment.