Skip to content

Commit

Permalink
curves: Move bn254 and secp256k1-recover to sdk (#4675)
Browse files Browse the repository at this point in the history
#### Problem

`solana-sdk` depends on `solana-bn254` and `solana-secp256k1-recover`,
but they currently live in the `curves/` subdirectory. When the sdk gets
moved to a new Cargo workspace and repository, it needs to have all of
its solana crate dependencies, which is not currently the case.

#### Summary of changes

Move `curves/bn254` and `curves/secp256k1-recover` into `sdk/`, and
update all paths as needed.
  • Loading branch information
joncinque authored Feb 3, 2025
1 parent ec9b85a commit 6538879
Show file tree
Hide file tree
Showing 8 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ solana-big-mod-exp = { path = "sdk/big-mod-exp", version = "=2.2.0" }
solana-bincode = { path = "sdk/bincode", version = "=2.2.0" }
solana-blake3-hasher = { path = "sdk/blake3-hasher" }
solana-bloom = { path = "bloom", version = "=2.2.0" }
solana-bn254 = { path = "curves/bn254", version = "=2.2.0" }
solana-bn254 = { path = "sdk/bn254", version = "=2.2.0" }
solana-borsh = { path = "sdk/borsh", version = "=2.2.0" }
solana-bpf-loader-program = { path = "programs/bpf_loader", version = "=2.2.0" }
solana-bucket-map = { path = "bucket_map", version = "=2.2.0" }
Expand Down Expand Up @@ -608,7 +608,7 @@ solana-sdk = { path = "sdk/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-program = { path = "sdk/secp256k1-program", version = "=2.2.0" }
solana-secp256k1-recover = { path = "curves/secp256k1-recover", version = "=2.2.0", default-features = false }
solana-secp256k1-recover = { path = "sdk/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" }
solana-shred-version = { path = "sdk/shred-version", version = "=2.2.0" }
Expand Down
4 changes: 2 additions & 2 deletions programs/sbf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ serde_derive = "1.0.112"
serde_json = "1.0.56"
solana-account-decoder = { path = "../../account-decoder", version = "=2.2.0" }
solana-accounts-db = { path = "../../accounts-db", version = "=2.2.0" }
solana-bn254 = { path = "../../curves/bn254", version = "=2.2.0" }
solana-bn254 = { path = "../../sdk/bn254", version = "=2.2.0" }
solana-bpf-loader-program = { path = "../bpf_loader", version = "=2.2.0" }
solana-cli-output = { path = "../../cli-output", version = "=2.2.0" }
solana-compute-budget = { path = "../../compute-budget", version = "=2.2.0" }
Expand Down Expand Up @@ -63,7 +63,7 @@ solana-sbf-rust-realloc-dep = { path = "rust/realloc_dep", version = "=2.2.0" }
solana-sbf-rust-realloc-invoke-dep = { path = "rust/realloc_invoke_dep", version = "=2.2.0" }
solana-sdk = { path = "../../sdk/sdk", version = "=2.2.0" }
solana-sbpf = "=0.10.0"
solana-secp256k1-recover = { path = "../../curves/secp256k1-recover", version = "=2.2.0" }
solana-secp256k1-recover = { path = "../../sdk/secp256k1-recover", version = "=2.2.0" }
solana-svm = { path = "../../svm", version = "=2.2.0" }
solana-svm-transaction = { path = "../../svm-transaction", version = "=2.2.0" }
solana-timings = { path = "../../timings", version = "=2.2.0" }
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 6538879

Please sign in to comment.