diff --git a/Cargo.lock b/Cargo.lock index 6f317ae34..d451b505a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3245,7 +3245,6 @@ dependencies = [ "bincode", "borsh 1.5.5", "getrandom 0.2.15", - "js-sys", "serde", "serde_derive", "solana-define-syscall", @@ -3547,23 +3546,9 @@ dependencies = [ name = "solana-program" version = "2.3.0" dependencies = [ - "arbitrary", - "bincode", - "blake3", - "borsh 0.10.4", - "borsh 1.5.5", - "bytemuck", "getrandom 0.2.15", - "lazy_static", - "log", "memoffset", - "num-bigint", - "num-traits", - "serde", - "serde_derive", "solana-account-info", - "solana-address-lookup-table-interface", - "solana-atomic-u64", "solana-big-mod-exp", "solana-blake3-hasher", "solana-borsh", @@ -3592,7 +3577,6 @@ dependencies = [ "solana-pubkey", "solana-rent", "solana-sdk-ids", - "solana-sdk-macro", "solana-secp256k1-recover", "solana-serde-varint", "solana-serialize-utils", @@ -3604,7 +3588,6 @@ dependencies = [ "solana-system-interface", "solana-sysvar", "solana-sysvar-id", - "thiserror 2.0.12", ] [[package]] @@ -3660,7 +3643,6 @@ dependencies = [ "curve25519-dalek 4.1.3", "five8", "five8_const", - "getrandom 0.2.15", "js-sys", "num-traits", "rand 0.8.5", @@ -3757,16 +3739,13 @@ dependencies = [ "getrandom 0.1.16", "serde", "solana-account", - "solana-derivation-path", "solana-epoch-info", "solana-epoch-rewards-hasher", "solana-fee-structure", "solana-inflation", - "solana-instruction", "solana-instructions-sysvar", "solana-keypair", "solana-message", - "solana-native-token", "solana-offchain-message", "solana-presigner", "solana-program", @@ -3813,7 +3792,6 @@ version = "1.0.0" dependencies = [ "console_error_panic_hook", "console_log", - "js-sys", "log", "solana-instruction", "solana-program", @@ -4094,7 +4072,6 @@ dependencies = [ "solana-program-memory", "solana-pubkey", "solana-rent", - "solana-sanitize", "solana-sdk-ids", "solana-sdk-macro", "solana-sha256-hasher", diff --git a/genesis-config/Cargo.toml b/genesis-config/Cargo.toml index bedf50875..3f2126b42 100644 --- a/genesis-config/Cargo.toml +++ b/genesis-config/Cargo.toml @@ -15,7 +15,11 @@ all-features = true rustdoc-args = ["--cfg=docsrs"] [features] -frozen-abi = ["dep:solana-frozen-abi", "dep:solana-frozen-abi-macro"] +frozen-abi = [ + "dep:solana-frozen-abi", + "dep:solana-frozen-abi-macro", + "dep:solana-logger", +] serde = [ "dep:serde", "dep:serde_derive", @@ -45,7 +49,7 @@ solana-frozen-abi-macro = { workspace = true, optional = true } solana-hash = { workspace = true } solana-inflation = { workspace = true } solana-keypair = { workspace = true } -solana-logger = { workspace = true } +solana-logger = { workspace = true, optional = true } solana-poh-config = { workspace = true } solana-pubkey = { workspace = true } solana-rent = { workspace = true } diff --git a/instruction/Cargo.toml b/instruction/Cargo.toml index 2af715cf2..d99158816 100644 --- a/instruction/Cargo.toml +++ b/instruction/Cargo.toml @@ -40,7 +40,6 @@ solana-pubkey = { workspace = true, default-features = false } [target.'cfg(target_arch = "wasm32")'.dependencies] getrandom = { workspace = true, features = ["js", "wasm-bindgen"] } -js-sys = { workspace = true } wasm-bindgen = { workspace = true } [target.'cfg(target_os = "solana")'.dependencies] diff --git a/program/Cargo.toml b/program/Cargo.toml index 3651484ed..2714ddd0c 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -23,8 +23,6 @@ crate-type = ["rlib"] [features] default = ["borsh"] borsh = [ - "dep:borsh", - "dep:borsh0-10", "dep:solana-borsh", "solana-hash/borsh", "solana-instruction/borsh", @@ -47,20 +45,8 @@ frozen-abi = [ ] [dependencies] -bincode = { workspace = true } -blake3 = { workspace = true, features = ["traits-preview"] } -borsh = { workspace = true, optional = true } -borsh0-10 = { workspace = true, optional = true } -bytemuck = { workspace = true } -lazy_static = { workspace = true } -log = { workspace = true } memoffset = { workspace = true } -num-traits = { workspace = true, features = ["i128"] } -serde = { workspace = true } -serde_derive = { workspace = true } solana-account-info = { workspace = true, features = ["bincode"] } -solana-address-lookup-table-interface = { workspace = true, features = ["bincode", "bytemuck"] } -solana-atomic-u64 = { workspace = true } solana-big-mod-exp = { workspace = true } solana-blake3-hasher = { workspace = true, features = ["blake3"] } solana-borsh = { workspace = true, optional = true } @@ -96,7 +82,6 @@ solana-program-pack = { workspace = true } solana-pubkey = { workspace = true, features = ["bytemuck", "curve25519", "serde", "std"] } solana-rent = { workspace = true, features = ["serde", "sysvar"] } solana-sdk-ids = { workspace = true } -solana-sdk-macro = { workspace = true } solana-secp256k1-recover = { workspace = true } solana-serde-varint = { workspace = true } solana-serialize-utils = { workspace = true } @@ -107,10 +92,8 @@ solana-slot-history = { workspace = true, features = ["serde", "sysvar"] } solana-stable-layout = { workspace = true } solana-sysvar = { workspace = true, features = ["bincode", "bytemuck"] } solana-sysvar-id = { workspace = true } -thiserror = { workspace = true } [target.'cfg(not(target_os = "solana"))'.dependencies] -num-bigint = { workspace = true } solana-example-mocks = { workspace = true } # This is currently needed to build on-chain programs reliably. @@ -128,8 +111,5 @@ solana-pubkey = { workspace = true, features = ["dev-context-only-utils"] } solana-system-interface = { workspace = true } solana-sysvar = { workspace = true, features = ["dev-context-only-utils"] } -[target.'cfg(not(target_os = "solana"))'.dev-dependencies] -arbitrary = { workspace = true, features = ["derive"] } - [lints] workspace = true diff --git a/pubkey/Cargo.toml b/pubkey/Cargo.toml index 40ae59f77..4336c045d 100644 --- a/pubkey/Cargo.toml +++ b/pubkey/Cargo.toml @@ -53,7 +53,6 @@ curve25519-dalek = { workspace = true, optional = true } solana-sha256-hasher = { workspace = true, optional = true } [target.'cfg(target_arch = "wasm32")'.dependencies] -getrandom = { workspace = true, features = ["js", "wasm-bindgen"] } js-sys = { workspace = true } wasm-bindgen = { workspace = true } diff --git a/sdk-wasm-js/Cargo.toml b/sdk-wasm-js/Cargo.toml index ed838d355..7e5c091bc 100644 --- a/sdk-wasm-js/Cargo.toml +++ b/sdk-wasm-js/Cargo.toml @@ -25,7 +25,6 @@ solana-sdk = { workspace = true } [target.'cfg(target_arch = "wasm32")'.dependencies] console_error_panic_hook = { workspace = true } console_log = { workspace = true } -js-sys = { workspace = true } log = { workspace = true } wasm-bindgen = { workspace = true } diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index e58c640b2..30e819828 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -63,17 +63,14 @@ bincode = { workspace = true } bs58 = { workspace = true } serde = { workspace = true } solana-account = { workspace = true, features = ["bincode"] } -solana-derivation-path = { workspace = true } solana-epoch-info = { workspace = true, features = ["serde"] } solana-epoch-rewards-hasher = { workspace = true } solana-fee-structure = { workspace = true, features = ["serde"] } solana-inflation = { workspace = true, features = ["serde"] } -solana-instruction = { workspace = true } solana-keypair = { workspace = true, optional = true, features = [ "seed-derivable", ] } solana-message = { workspace = true, features = ["serde"] } -solana-native-token = { workspace = true } solana-offchain-message = { workspace = true, optional = true, features = ["verify"] } solana-presigner = { workspace = true, optional = true } solana-program = { workspace = true } diff --git a/sysvar/Cargo.toml b/sysvar/Cargo.toml index c79b00224..3877d7f7d 100644 --- a/sysvar/Cargo.toml +++ b/sysvar/Cargo.toml @@ -59,7 +59,6 @@ solana-program-entrypoint = { workspace = true } solana-program-error = { workspace = true } solana-pubkey = { workspace = true } solana-rent = { workspace = true, features = ["sysvar"] } -solana-sanitize = { workspace = true } solana-sdk-ids = { workspace = true } solana-sdk-macro = { workspace = true } solana-slot-hashes = { workspace = true, features = ["sysvar"] }