From 73a97eca9a251eca589b4eee64a2afccb9d8dfd6 Mon Sep 17 00:00:00 2001 From: Jon C Date: Tue, 4 Nov 2025 17:41:38 +0100 Subject: [PATCH] repo: Patch local crates in build #### Problem The publish job is still failing to select versions for packages, because we have duplicate crates in our Cargo.lock. #### Summary of changes Patch the crates that are duplicated, which helps the cargo publish correctly select versions. --- Cargo.lock | 159 ++++++++++++++--------------------------------------- Cargo.toml | 5 ++ 2 files changed, 45 insertions(+), 119 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8ed2b10fb..cf8d6156f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -161,7 +161,7 @@ dependencies = [ "solana-bn254", "solana-clock", "solana-cpi", - "solana-curve25519 3.0.7", + "solana-curve25519", "solana-hash", "solana-instruction", "solana-keccak-hasher", @@ -5769,7 +5769,7 @@ dependencies = [ "solana-sysvar", "solana-vote-interface", "spl-generic-token", - "spl-token-2022-interface 2.0.0", + "spl-token-2022-interface", "spl-token-group-interface", "spl-token-interface", "spl-token-metadata-interface", @@ -5887,7 +5887,7 @@ dependencies = [ "serde", "serde_derive", "solana-atomic-u64", - "solana-define-syscall 3.0.0", + "solana-define-syscall", "solana-program-error", "solana-sanitize", "solana-sha256-hasher", @@ -6007,7 +6007,7 @@ checksum = "30c80fb6d791b3925d5ec4bf23a7c169ef5090c013059ec3ed7d0b2c04efa085" dependencies = [ "num-bigint 0.4.6", "num-traits", - "solana-define-syscall 3.0.0", + "solana-define-syscall", ] [[package]] @@ -6028,7 +6028,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffa2e3bdac3339c6d0423275e45dafc5ac25f4d43bf344d026a3cc9a85e244a6" dependencies = [ "blake3", - "solana-define-syscall 3.0.0", + "solana-define-syscall", "solana-hash", ] @@ -6058,7 +6058,7 @@ dependencies = [ "ark-ff", "ark-serialize", "bytemuck", - "solana-define-syscall 3.0.0", + "solana-define-syscall", "thiserror 2.0.17", ] @@ -6641,27 +6641,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16238feb63d1cbdf915fb287f29ef7a7ebf81469bd6214f8b72a53866b593f8f" dependencies = [ "solana-account-info", - "solana-define-syscall 3.0.0", + "solana-define-syscall", "solana-instruction", "solana-program-error", "solana-pubkey", "solana-stable-layout", ] -[[package]] -name = "solana-curve25519" -version = "2.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae4261b9a8613d10e77ac831a8fa60b6fa52b9b103df46d641deff9f9812a23" -dependencies = [ - "bytemuck", - "bytemuck_derive", - "curve25519-dalek 4.1.3", - "solana-define-syscall 2.3.0", - "subtle", - "thiserror 2.0.17", -] - [[package]] name = "solana-curve25519" version = "3.0.7" @@ -6671,17 +6657,11 @@ dependencies = [ "bytemuck", "bytemuck_derive", "curve25519-dalek 4.1.3", - "solana-define-syscall 3.0.0", + "solana-define-syscall", "subtle", "thiserror 2.0.17", ] -[[package]] -name = "solana-define-syscall" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae3e2abcf541c8122eafe9a625d4d194b4023c20adde1e251f94e056bb1aee2" - [[package]] name = "solana-define-syscall" version = "3.0.0" @@ -6791,7 +6771,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc6693d0ea833b880514b9b88d95afb80b42762dca98b0712465d1fcbbcb89e" dependencies = [ - "solana-define-syscall 3.0.0", + "solana-define-syscall", "solana-pubkey", ] @@ -7076,7 +7056,7 @@ dependencies = [ "borsh", "serde", "serde_derive", - "solana-define-syscall 3.0.0", + "solana-define-syscall", "solana-instruction-error", "solana-pubkey", ] @@ -7118,7 +7098,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57eebd3012946913c8c1b8b43cdf8a6249edb09c0b6be3604ae910332a3acd97" dependencies = [ "sha3", - "solana-define-syscall 3.0.0", + "solana-define-syscall", "solana-hash", ] @@ -7406,7 +7386,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "264275c556ea7e22b9d3f87d56305546a38d4eee8ec884f3b126236cb7dcbbb4" dependencies = [ - "solana-define-syscall 3.0.0", + "solana-define-syscall", ] [[package]] @@ -7573,7 +7553,7 @@ checksum = "4a9a6bf2b300b7b65a89f2c5b59832a86c46be8b6b67507231ee58f9343d7e9a" dependencies = [ "ark-bn254", "light-poseidon", - "solana-define-syscall 3.0.0", + "solana-define-syscall", "thiserror 2.0.17", ] @@ -7610,7 +7590,7 @@ dependencies = [ "solana-borsh", "solana-clock", "solana-cpi", - "solana-define-syscall 3.0.0", + "solana-define-syscall", "solana-epoch-rewards", "solana-epoch-schedule", "solana-epoch-stake", @@ -7651,7 +7631,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6557cf5b5e91745d1667447438a1baa7823c6086e4ece67f8e6ebfa7a8f72660" dependencies = [ "solana-account-info", - "solana-define-syscall 3.0.0", + "solana-define-syscall", "solana-msg", "solana-program-error", "solana-pubkey", @@ -7674,7 +7654,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10e5660c60749c7bfb30b447542529758e4dbcecd31b1e8af1fdc92e2bdde90a" dependencies = [ - "solana-define-syscall 3.0.0", + "solana-define-syscall", ] [[package]] @@ -8009,7 +7989,7 @@ dependencies = [ "solana-vote", "solana-vote-program", "spl-generic-token", - "spl-token-2022-interface 2.0.0", + "spl-token-2022-interface", "spl-token-interface", "stream-cancel", "thiserror 2.0.17", @@ -8381,7 +8361,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "394a4470477d66296af5217970a905b1c5569032a7732c367fb69e5666c8607e" dependencies = [ "k256", - "solana-define-syscall 3.0.0", + "solana-define-syscall", "thiserror 2.0.17", ] @@ -8487,7 +8467,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9b912ba6f71cb202c0c3773ec77bf898fa9fe0c78691a2d6859b3b5b8954719" dependencies = [ "sha2 0.10.9", - "solana-define-syscall 3.0.0", + "solana-define-syscall", "solana-hash", ] @@ -8920,7 +8900,7 @@ dependencies = [ "serde_derive", "solana-account-info", "solana-clock", - "solana-define-syscall 3.0.0", + "solana-define-syscall", "solana-epoch-rewards", "solana-epoch-schedule", "solana-fee-calculator", @@ -9184,7 +9164,7 @@ dependencies = [ "solana-vote-interface", "spl-associated-token-account-interface", "spl-memo-interface", - "spl-token-2022-interface 2.0.0", + "spl-token-2022-interface", "spl-token-group-interface", "spl-token-interface", "spl-token-metadata-interface", @@ -9564,7 +9544,7 @@ dependencies = [ "serde_derive", "serde_json", "sha3", - "solana-curve25519 3.0.7", + "solana-curve25519", "solana-derivation-path", "solana-instruction", "solana-pubkey", @@ -9670,7 +9650,7 @@ dependencies = [ "solana-zk-sdk", "spl-elgamal-registry-interface", "spl-pod", - "spl-token-confidential-transfer-proof-extraction 0.5.1", + "spl-token-confidential-transfer-proof-extraction", ] [[package]] @@ -9683,7 +9663,7 @@ dependencies = [ "solana-pubkey", "solana-sdk-ids", "solana-zk-sdk", - "spl-token-confidential-transfer-proof-extraction 0.5.1", + "spl-token-confidential-transfer-proof-extraction", ] [[package]] @@ -9851,10 +9831,10 @@ dependencies = [ "spl-memo-interface", "spl-pod", "spl-tlv-account-resolution", - "spl-token-2022-interface 2.1.0", + "spl-token-2022-interface", "spl-token-confidential-transfer-ciphertext-arithmetic", - "spl-token-confidential-transfer-proof-extraction 0.5.1", - "spl-token-confidential-transfer-proof-generation 0.5.1", + "spl-token-confidential-transfer-proof-extraction", + "spl-token-confidential-transfer-proof-generation", "spl-token-group-interface", "spl-token-metadata-interface", "spl-transfer-hook-interface", @@ -9862,34 +9842,6 @@ dependencies = [ "thiserror 2.0.17", ] -[[package]] -name = "spl-token-2022-interface" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0888304af6b3d839e435712e6c84025e09513017425ff62045b6b8c41feb77d9" -dependencies = [ - "arrayref", - "bytemuck", - "num-derive", - "num-traits", - "num_enum", - "solana-account-info", - "solana-instruction", - "solana-program-error", - "solana-program-option", - "solana-program-pack", - "solana-pubkey", - "solana-sdk-ids", - "solana-zk-sdk", - "spl-pod", - "spl-token-confidential-transfer-proof-extraction 0.5.0", - "spl-token-confidential-transfer-proof-generation 0.5.0", - "spl-token-group-interface", - "spl-token-metadata-interface", - "spl-type-length-value", - "thiserror 2.0.17", -] - [[package]] name = "spl-token-2022-interface" version = "2.1.0" @@ -9913,9 +9865,9 @@ dependencies = [ "solana-sdk-ids", "solana-zk-sdk", "spl-pod", - "spl-token-2022-interface 2.1.0", - "spl-token-confidential-transfer-proof-extraction 0.5.1", - "spl-token-confidential-transfer-proof-generation 0.5.1", + "spl-token-2022-interface", + "spl-token-confidential-transfer-proof-extraction", + "spl-token-confidential-transfer-proof-generation", "spl-token-group-interface", "spl-token-interface", "spl-token-metadata-interface", @@ -9957,9 +9909,9 @@ dependencies = [ "spl-memo-interface", "spl-pod", "spl-token-2022", - "spl-token-2022-interface 2.1.0", + "spl-token-2022-interface", "spl-token-client", - "spl-token-confidential-transfer-proof-generation 0.5.1", + "spl-token-confidential-transfer-proof-generation", "spl-token-group-interface", "spl-token-interface", "spl-token-metadata-interface", @@ -10009,10 +9961,10 @@ dependencies = [ "spl-record", "spl-tlv-account-resolution", "spl-token-2022", - "spl-token-2022-interface 2.1.0", + "spl-token-2022-interface", "spl-token-client", - "spl-token-confidential-transfer-proof-extraction 0.5.1", - "spl-token-confidential-transfer-proof-generation 0.5.1", + "spl-token-confidential-transfer-proof-extraction", + "spl-token-confidential-transfer-proof-generation", "spl-token-group-interface", "spl-token-interface", "spl-token-metadata-interface", @@ -10029,29 +9981,9 @@ dependencies = [ "base64 0.22.1", "bytemuck", "curve25519-dalek 4.1.3", - "solana-curve25519 3.0.7", - "solana-zk-sdk", - "spl-token-confidential-transfer-proof-generation 0.5.1", -] - -[[package]] -name = "spl-token-confidential-transfer-proof-extraction" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a22217af69b7a61ca813f47c018afb0b00b02a74a4c70ff099cd4287740bc3d" -dependencies = [ - "bytemuck", - "solana-account-info", - "solana-curve25519 2.3.13", - "solana-instruction", - "solana-instructions-sysvar", - "solana-msg", - "solana-program-error", - "solana-pubkey", - "solana-sdk-ids", + "solana-curve25519", "solana-zk-sdk", - "spl-pod", - "thiserror 2.0.17", + "spl-token-confidential-transfer-proof-generation", ] [[package]] @@ -10060,7 +9992,7 @@ version = "0.5.1" dependencies = [ "bytemuck", "solana-account-info", - "solana-curve25519 3.0.7", + "solana-curve25519", "solana-instruction", "solana-instructions-sysvar", "solana-msg", @@ -10072,17 +10004,6 @@ dependencies = [ "thiserror 2.0.17", ] -[[package]] -name = "spl-token-confidential-transfer-proof-generation" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63a2b41095945dc15274b924b21ccae9b3ec9dc2fdd43dbc08de8c33bbcd915" -dependencies = [ - "curve25519-dalek 4.1.3", - "solana-zk-sdk", - "thiserror 2.0.17", -] - [[package]] name = "spl-token-confidential-transfer-proof-generation" version = "0.5.1" @@ -10098,8 +10019,8 @@ version = "0.0.1" dependencies = [ "curve25519-dalek 4.1.3", "solana-zk-sdk", - "spl-token-confidential-transfer-proof-extraction 0.5.1", - "spl-token-confidential-transfer-proof-generation 0.5.1", + "spl-token-confidential-transfer-proof-extraction", + "spl-token-confidential-transfer-proof-generation", "thiserror 2.0.17", ] diff --git a/Cargo.toml b/Cargo.toml index e7aa0cee6..715f22d2c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,3 +54,8 @@ config = "scripts/spellcheck.toml" pre-release-commit-message = "Publish {{crate_name}} v{{version}}" tag-message = "Publish {{crate_name}} v{{version}}" consolidate-commits = false + +[patch.crates-io] +spl-token-confidential-transfer-proof-extraction = { path = "confidential/proof-extraction" } +spl-token-confidential-transfer-proof-generation = { path = "confidential/proof-generation" } +spl-token-2022-interface = { path = "interface" }