From c6821d15954cb847feadc8a00122b5089d9c5fd8 Mon Sep 17 00:00:00 2001 From: kevinheavey Date: Thu, 14 Nov 2024 19:56:13 +0400 Subject: [PATCH] rename to solana-secp256k1-program like in #3632 --- Cargo.lock | 6 +++--- Cargo.toml | 4 ++-- programs/sbf/Cargo.lock | 4 ++-- sdk/Cargo.toml | 4 ++-- .../Cargo.toml | 6 +++--- .../src/lib.rs | 0 sdk/src/lib.rs | 7 ++----- 7 files changed, 14 insertions(+), 17 deletions(-) rename sdk/{secp256k1-instruction => secp256k1-program}/Cargo.toml (89%) rename sdk/{secp256k1-instruction => secp256k1-program}/src/lib.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 620c233742c890..b82ddb2405f009 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8400,7 +8400,7 @@ dependencies = [ "solana-sdk", "solana-sdk-ids", "solana-sdk-macro", - "solana-secp256k1-instruction", + "solana-secp256k1-program", "solana-secp256k1-recover", "solana-secp256r1-program", "solana-seed-derivable", @@ -8436,7 +8436,7 @@ dependencies = [ ] [[package]] -name = "solana-secp256k1-instruction" +name = "solana-secp256k1-program" version = "2.2.0" dependencies = [ "anyhow", @@ -8456,7 +8456,7 @@ dependencies = [ "solana-program", "solana-sdk", "solana-sdk-ids", - "solana-secp256k1-instruction", + "solana-secp256k1-program", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 6da8cf0996ce0e..03a8750a23fbed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -147,7 +147,7 @@ members = [ "sdk/reserved-account-keys", "sdk/sanitize", "sdk/sdk-ids", - "sdk/secp256k1-instruction", + "sdk/secp256k1-program", "sdk/secp256r1-program", "sdk/seed-derivable", "sdk/seed-phrase", @@ -530,7 +530,7 @@ solana-runtime-transaction = { path = "runtime-transaction", version = "=2.2.0" solana-sdk = { path = "sdk", version = "=2.2.0" } solana-sdk-ids = { path = "sdk/sdk-ids", version = "=2.2.0" } solana-sdk-macro = { path = "sdk/macro", version = "=2.2.0" } -solana-secp256k1-instruction = { path = "sdk/secp256k1-instruction", version = "=2.2.0" } +solana-secp256k1-program = { path = "sdk/secp256k1-program", version = "=2.2.0" } solana-secp256k1-recover = { path = "curves/secp256k1-recover", version = "=2.2.0", default-features = false } solana-send-transaction-service = { path = "send-transaction-service", version = "=2.2.0" } solana-short-vec = { path = "sdk/short-vec", version = "=2.2.0" } diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index ce380cfd306351..359e09f5613c5d 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -7132,7 +7132,7 @@ dependencies = [ "solana-sanitize", "solana-sdk-ids", "solana-sdk-macro", - "solana-secp256k1-instruction", + "solana-secp256k1-program", "solana-secp256k1-recover", "solana-secp256r1-program", "solana-seed-derivable", @@ -7166,7 +7166,7 @@ dependencies = [ ] [[package]] -name = "solana-secp256k1-instruction" +name = "solana-secp256k1-program" version = "2.2.0" dependencies = [ "bincode", diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index 7da88c597b3f1e..7ed681cc4f7af8 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -40,7 +40,7 @@ full = [ "dep:solana-precompile-error", "dep:solana-presigner", "dep:solana-quic-definitions", - "dep:solana-secp256k1-instruction", + "dep:solana-secp256k1-program", "dep:solana-seed-derivable", "dep:solana-seed-phrase", "dep:solana-signer", @@ -133,7 +133,7 @@ solana-reward-info = { workspace = true, features = ["serde"] } solana-sanitize = { workspace = true } solana-sdk-ids = { workspace = true } solana-sdk-macro = { workspace = true } -solana-secp256k1-instruction = { workspace = true, optional = true, features = ["bincode"] } +solana-secp256k1-program = { workspace = true, optional = true, features = ["bincode"] } solana-secp256k1-recover = { workspace = true } solana-secp256r1-program = { workspace = true, default-features = false } solana-seed-derivable = { workspace = true, optional = true } diff --git a/sdk/secp256k1-instruction/Cargo.toml b/sdk/secp256k1-program/Cargo.toml similarity index 89% rename from sdk/secp256k1-instruction/Cargo.toml rename to sdk/secp256k1-program/Cargo.toml index 70c9378789e58f..148fd01229358f 100644 --- a/sdk/secp256k1-instruction/Cargo.toml +++ b/sdk/secp256k1-program/Cargo.toml @@ -1,7 +1,7 @@ [package] -name = "solana-secp256k1-instruction" +name = "solana-secp256k1-program" description = "Instructions for the Solana Secp256k1 native program." -documentation = "https://docs.rs/solana-secp256k1-instruction" +documentation = "https://docs.rs/solana-secp256k1-program" version = { workspace = true } authors = { workspace = true } repository = { workspace = true } @@ -29,7 +29,7 @@ solana-hash = { workspace = true } solana-logger = { workspace = true } solana-program = { path = "../program" } solana-sdk = { path = ".." } -solana-secp256k1-instruction = { path = ".", features = [ +solana-secp256k1-program = { path = ".", features = [ "dev-context-only-utils", ] } diff --git a/sdk/secp256k1-instruction/src/lib.rs b/sdk/secp256k1-program/src/lib.rs similarity index 100% rename from sdk/secp256k1-instruction/src/lib.rs rename to sdk/secp256k1-program/src/lib.rs diff --git a/sdk/src/lib.rs b/sdk/src/lib.rs index 3ecb9e457d0ba9..d5c8b5f4541cc6 100644 --- a/sdk/src/lib.rs +++ b/sdk/src/lib.rs @@ -184,12 +184,9 @@ pub use solana_sdk_macro::declare_deprecated_id; pub use solana_sdk_macro::declare_id; /// Convenience macro to define multiple static public keys. pub use solana_sdk_macro::pubkeys; -#[deprecated( - since = "2.2.0", - note = "Use `solana-secp256k1-instruction` crate instead" -)] +#[deprecated(since = "2.2.0", note = "Use `solana-secp256k1-program` crate instead")] #[cfg(feature = "full")] -pub use solana_secp256k1_instruction as secp256k1_instruction; +pub use solana_secp256k1_program as secp256k1_instruction; #[deprecated(since = "2.1.0", note = "Use `solana-secp256k1-recover` crate instead")] pub use solana_secp256k1_recover as secp256k1_recover; #[deprecated(since = "2.2.0", note = "Use `solana-serde` crate instead")]