diff --git a/Cargo.lock b/Cargo.lock index c9fb253cac920c..78c67d3c5bc072 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6443,8 +6443,7 @@ name = "solana-inline-spl" version = "2.1.0" dependencies = [ "bytemuck", - "rustc_version 0.4.0", - "solana-sdk", + "solana-program", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 49607558a8860a..2d4eb9feebb131 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -382,7 +382,7 @@ solana-package-metadata-macro = { path = "sdk/package-metadata-macro", version = solana-perf = { path = "perf", version = "=2.1.0" } solana-poh = { path = "poh", version = "=2.1.0" } solana-poseidon = { path = "poseidon", version = "=2.1.0" } -solana-program = { path = "sdk/program", version = "=2.1.0" } +solana-program = { path = "sdk/program", version = "=2.1.0", default-features = false } solana-program-runtime = { path = "program-runtime", version = "=2.1.0" } solana-program-test = { path = "program-test", version = "=2.1.0" } solana-pubsub-client = { path = "pubsub-client", version = "=2.1.0" } diff --git a/inline-spl/Cargo.toml b/inline-spl/Cargo.toml index e3ca8d06357981..82aa5907ce0aa2 100644 --- a/inline-spl/Cargo.toml +++ b/inline-spl/Cargo.toml @@ -11,7 +11,7 @@ edition = { workspace = true } [dependencies] bytemuck = { workspace = true } -solana-sdk = { workspace = true } +solana-program = { workspace = true, default-features = false } [lib] crate-type = ["lib"] @@ -21,6 +21,3 @@ name = "solana_inline_spl" [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] - -[build-dependencies] -rustc_version = { workspace = true } diff --git a/inline-spl/src/associated_token_account.rs b/inline-spl/src/associated_token_account.rs index 9057bee3840ee2..2048c5b743d222 100644 --- a/inline-spl/src/associated_token_account.rs +++ b/inline-spl/src/associated_token_account.rs @@ -1,6 +1,6 @@ // Partial SPL Associated Token Account declarations inlined to avoid an external dependency on the spl-associated-token-account crate -solana_sdk::declare_id!("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"); +solana_program::declare_id!("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"); pub mod program_v1_1_0 { - solana_sdk::declare_id!("NatA1Zyo48dJ7yuwR7cGURwhskKA8ywUyxb9GvG7mTC"); + solana_program::declare_id!("NatA1Zyo48dJ7yuwR7cGURwhskKA8ywUyxb9GvG7mTC"); } diff --git a/inline-spl/src/token.rs b/inline-spl/src/token.rs index a15822932c8f7c..1a495d8ca3a241 100644 --- a/inline-spl/src/token.rs +++ b/inline-spl/src/token.rs @@ -1,10 +1,10 @@ /// Partial SPL Token declarations inlined to avoid an external dependency on the spl-token crate -use solana_sdk::pubkey::{Pubkey, PUBKEY_BYTES}; +use solana_program::pubkey::{Pubkey, PUBKEY_BYTES}; -solana_sdk::declare_id!("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"); +solana_program::declare_id!("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"); pub mod program_v3_4_0 { - solana_sdk::declare_id!("NToK4t5AQzxPNpUA84DkxgfXaVDbDQQjpHKCqsbY46B"); + solana_program::declare_id!("NToK4t5AQzxPNpUA84DkxgfXaVDbDQQjpHKCqsbY46B"); } /* @@ -72,7 +72,7 @@ impl GenericTokenAccount for Account { } pub mod native_mint { - solana_sdk::declare_id!("So11111111111111111111111111111111111111112"); + solana_program::declare_id!("So11111111111111111111111111111111111111112"); /* Mint { diff --git a/inline-spl/src/token_2022.rs b/inline-spl/src/token_2022.rs index 1787fa817645f9..4b0e0d1b3c05db 100644 --- a/inline-spl/src/token_2022.rs +++ b/inline-spl/src/token_2022.rs @@ -1,7 +1,7 @@ /// Partial SPL Token declarations inlined to avoid an external dependency on the spl-token-2022 crate use crate::token::{self, GenericTokenAccount}; -solana_sdk::declare_id!("TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"); +solana_program::declare_id!("TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"); // `spl_token_program_2022::extension::AccountType::Account` ordinal value pub const ACCOUNTTYPE_ACCOUNT: u8 = 2; diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index 6c5079324c9f16..c0a6b7558bf3aa 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -5086,8 +5086,7 @@ name = "solana-inline-spl" version = "2.1.0" dependencies = [ "bytemuck", - "rustc_version", - "solana-sdk", + "solana-program", ] [[package]]