chore: fix compilation errors by using solana-* =1.18.11 (#862)

This update modifies multiple Cargo.toml files in the project to reference local workspace packages instead of specific versions. --------- Co-authored-by: Swen <[email protected]>
Lightprotocol · Jun 23, 2024 · 81782f4 · 81782f4
1 parent bd4b7de
commit 81782f4
Show file tree

Hide file tree

Showing 25 changed files with 751 additions and 1,199 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,16 +28,31 @@ overflow-checks = true
 [profile.test]
 opt-level = 2
 
+[workspace.dependencies]
+solana-banks-interface = "1.18.11"
+solana-program = "=1.18.11"
+solana-sdk = "=1.18.11"
+solana-program-test = "=1.18.11"
+solana-client = "=1.18.11"
+solana-cli-output = "=1.18.11"
+
 [patch.crates-io]
-solana-account-decoder = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
-solana-accounts-db = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
-solana-banks-client = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
-solana-banks-interface = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
-solana-banks-server = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
-solana-program = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
-solana-program-runtime = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
-solana-rpc-client = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
-solana-rpc-client-api = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
-solana-runtime = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
-solana-sdk = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
-solana-transaction-status = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
+"solana-account-decoder" = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
+"solana-accounts-db" = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
+"solana-banks-client" = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
+"solana-banks-interface" = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
+"solana-banks-server" = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
+"solana-program" = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
+"solana-cli-output" = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
+"solana-program-test" = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
+"solana-program-runtime" = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
+"solana-rpc-client" = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
+"solana-rpc-client-api" = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
+"solana-runtime" = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
+"solana-sdk" = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
+"solana-sdk-macro" = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
+"solana-client" = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
+"solana-zk-token-sdk" = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
+"solana-frozen-abi" = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
+"solana-frozen-abi-macro" = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
+"solana-transaction-status" = { git = "https://github.com/Lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
diff --git a/circuit-lib/light-prover-client/Cargo.toml b/circuit-lib/light-prover-client/Cargo.toml
@@ -31,7 +31,7 @@ bytemuck = "1.14.3"
 
 # solana
 groth16-solana = "0.0.3"
-solana-program = "1.18.11"
+solana-program = { workspace = true }
 num-bigint = { version = "0.4.4", features = ["serde"] }
 
 once_cell = "1.8"

diff --git a/circuit-lib/verifier/Cargo.toml b/circuit-lib/verifier/Cargo.toml
@@ -13,7 +13,7 @@ solana = ["solana-program"]
 groth16-solana = "0.0.3"
 thiserror = "1.0"
 borsh = "0.10"
-solana-program = { version = "1.18.11", optional = true }
+solana-program = { workspace = true, optional = true }
 
 [dev-dependencies]
 tokio = { version = "1.36.0", features = ["rt", "macros"] }

diff --git a/examples/token-escrow/programs/token-escrow/Cargo.toml b/examples/token-escrow/programs/token-escrow/Cargo.toml
@@ -33,7 +33,7 @@ light-sdk = { path = "../../../../sdk", version = "0.2.0", features = ["cpi", "c
 solana-sdk = "1.18.11"
 
 [dev-dependencies]
-solana-program-test = "1.18.11"
+solana-program-test = { workspace = true }
 light-test-utils = { version = "0.2.0", path = "../../../../test-utils", features = ["cpi-context"] }
 reqwest = "0.12"
 tokio = "1.36.0"

diff --git a/merkle-tree/bounded-vec/Cargo.toml b/merkle-tree/bounded-vec/Cargo.toml
@@ -12,7 +12,7 @@ solana = ["solana-program"]
 [dependencies]
 bytemuck = { version = "1.14", features = ["min_const_generics"] }
 memoffset = "0.9"
-solana-program = { version = "1.18.11", optional = true }
+solana-program = { workspace = true, optional = true }
 thiserror = "1.0"
 
 [dev-dependencies]

diff --git a/merkle-tree/concurrent/Cargo.toml b/merkle-tree/concurrent/Cargo.toml
@@ -21,7 +21,7 @@ light-bounded-vec = { path = "../bounded-vec", version = "0.2.0" }
 light-hasher = { path = "../hasher", version = "0.2.0" }
 light-utils = { version = "0.2.0", path = "../../utils" }
 memoffset = "0.8"
-solana-program = { version = "1.18.11", optional = true }
+solana-program = { workspace = true, optional = true }
 thiserror = "1.0"
 
 [dev-dependencies]
@@ -30,7 +30,7 @@ ark-ff = "0.4"
 light-merkle-tree-reference = { path = "../reference", version = "0.2.0" }
 light-hash-set = { version = "0.2.0", path = "../hash-set", features = ["solana"] }
 rand = "0.8"
-solana-program = { version = "1.18.11" }
+solana-program = {  workspace = true }
 spl-account-compression = { version = "0.3.0", default-features = false}
 spl-concurrent-merkle-tree = { version = "0.2.0", default-features = false}
 tokio = { version = "1.35", features = ["full"] }

diff --git a/merkle-tree/hash-set/Cargo.toml b/merkle-tree/hash-set/Cargo.toml
@@ -15,7 +15,7 @@ light-utils = { path = "../../utils", version = "0.2.0" }
 memoffset = "0.9"
 num-bigint = "0.4"
 num-traits = "0.2"
-solana-program = { version = "1.18.11", optional = true }
+solana-program = { workspace = true, optional = true }
 thiserror = "1.0"
 [target.'cfg(target_os = "solana")'.dependencies]
 light-heap = { path = "../../heap", version = "0.2.0" }

diff --git a/merkle-tree/hasher/Cargo.toml b/merkle-tree/hasher/Cargo.toml
@@ -11,7 +11,7 @@ solana = ["solana-program"]
 
 [dependencies]
 light-poseidon = "0.2.0"
-solana-program = { version = "1.18.11", optional = true }
+solana-program = { workspace = true, optional = true }
 thiserror = "1.0"
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]

diff --git a/merkle-tree/indexed/Cargo.toml b/merkle-tree/indexed/Cargo.toml
@@ -24,7 +24,7 @@ memoffset = "0.9"
 num-bigint = "0.4"
 num-traits = "0.2"
 
-solana-program = { version = "1.18.11", optional = true }
+solana-program = { workspace = true, optional = true }
 thiserror = "1.0"
 
 [dev-dependencies]

diff --git a/programs/account-compression/Cargo.toml b/programs/account-compression/Cargo.toml
@@ -39,4 +39,4 @@ num-traits = "0.2.18"
 solana-security-txt = "1.1.0"
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]
-solana-sdk = "1.18.11"
+solana-sdk = { workspace = true }
diff --git a/programs/compressed-token/Cargo.toml b/programs/compressed-token/Cargo.toml
@@ -36,7 +36,7 @@ light-heap = { version = "0.2.0", path = "../../heap", optional = true }
 light-utils = { version = "0.2.0", path = "../../utils" }
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]
-solana-sdk = "1.18.11"
+solana-sdk = { workspace = true }
 
 [dev-dependencies]
-rand = "0.8.5"
+rand = "0.8.5"
diff --git a/programs/registry/Cargo.toml b/programs/registry/Cargo.toml
@@ -31,10 +31,10 @@ light-heap = { version = "0.2.0", path = "../../heap", optional = true }
 account-compression = { version = "0.4.0", path = "../account-compression", features = ["cpi"]  }
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]
-solana-sdk = "1.18.11"
+solana-sdk = { workspace = true }
 
 [dev-dependencies]
-solana-program-test = "1.18.11"
-solana-sdk = "1.18.11"
+solana-program-test = { workspace = true }
+solana-sdk = { workspace = true }
 tokio = "1.36.0"
 light-macros= { version = "0.4.0", path = "../../macros/light" }
diff --git a/programs/system/Cargo.toml b/programs/system/Cargo.toml
@@ -37,7 +37,7 @@ light-verifier = { path = "../../circuit-lib/verifier", version = "0.2.0", featu
 solana-security-txt = "1.1.0"
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]
-solana-sdk = "1.18.11"
+solana-sdk = { workspace = true }
 
 [dev-dependencies]
 rand = "0.8.5"
diff --git a/scripts/release-all-rust-crates.sh b/scripts/release-all-rust-crates.sh
@@ -12,7 +12,8 @@ echo "Tagging and releasing all Rust projects..."
 echo "Logging in to crates.io..."
 cargo login "${CRATES_IO_TOKEN}"
 # TODO: allow dynamic releases, and add gh release workflow
-PACKAGES=("aligned-sized" "light-heap" "light-bounded-vec" "light-utils" "light-hasher" "light-macros" "light-hash-set" "light-merkle-tree-reference" "light-concurrent-merkle-tree" "light-indexed-merkle-tree" "light-prover-client" "light-verifier" "account-compression" "light-registry" "light-system-program" "light-compressed-token" "light-test-utils")
+# PACKAGES=("aligned-sized" "light-heap" "light-bounded-vec" "light-utils" "light-hasher" "light-macros" "light-hash-set" "light-merkle-tree-reference" "light-concurrent-merkle-tree" "light-indexed-merkle-tree" "light-prover-client" "light-verifier" "account-compression" "light-registry" "light-system-program" "light-compressed-token" "light-test-utils")
+PACKAGES=("light-compressed-token" "light-test-utils")
 for PACKAGE in "${PACKAGES[@]}"; do
     PKG_VERSION=$(cargo pkgid -p "$PACKAGE" | cut -d "#" -f2)
     VERSION=${PKG_VERSION#*@}

diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -38,13 +38,13 @@ light-verifier = { path = "../circuit-lib/verifier", version = "0.2.0", features
 borsh = "0.10.0"
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]
-solana-sdk = "1.18.11"
+solana-sdk = { workspace = true }
 
 [dev-dependencies]
-solana-banks-interface = "1.18.11"
-solana-cli-output = "1.18.11"
-solana-program-test = "1.18.11"
-solana-sdk = "1.18.11"
+solana-banks-interface = { workspace = true }
+solana-cli-output = { workspace = true }
+solana-program-test = { workspace = true }
+solana-sdk = { workspace = true }
 serde_json = "1.0.114"
 reqwest = "0.12"
 tokio = "1.36.0"

diff --git a/test-programs/account-compression-test/Cargo.toml b/test-programs/account-compression-test/Cargo.toml
@@ -21,7 +21,7 @@ default = ["custom-heap"]
 
 
 [dev-dependencies]
-solana-program-test = "1.18.11"
+solana-program-test =  { workspace = true}
 light-test-utils = { version = "0.2.0", path = "../../test-utils" }
 reqwest = "0.11.26"
 tokio = "1.36.0"
@@ -44,6 +44,6 @@ light-utils = {path = "../../utils"}
 light-verifier = {path = "../../circuit-lib/verifier"}
 solana-cli-output = "1.18.11"
 serde_json = "1.0.114"
-solana-sdk = "1.18.11"
+solana-sdk = { workspace = true }
 thiserror = "1.0"
 memoffset = "0.9.1"
diff --git a/test-programs/compressed-token-test/Cargo.toml b/test-programs/compressed-token-test/Cargo.toml
@@ -29,11 +29,11 @@ light-utils = {path = "../../utils"}
 light-verifier = {path = "../../circuit-lib/verifier"}
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]
-solana-sdk = "1.18.11"
+solana-sdk = { workspace = true }
 
 
 [dev-dependencies]
-solana-program-test = "1.18.11"
+solana-program-test = { workspace = true }
 light-test-utils = { version = "0.2.0", path = "../../test-utils" }
 reqwest = "0.11.26"
 tokio = "1.36.0"

diff --git a/test-programs/e2e-test/Cargo.toml b/test-programs/e2e-test/Cargo.toml
@@ -30,11 +30,11 @@ light-utils = {path = "../../utils"}
 light-verifier = {path = "../../circuit-lib/verifier"}
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]
-solana-sdk = "1.18.11"
-solana-client = "1.18.11"
+solana-sdk = { workspace = true }
+solana-client = { workspace = true }
 
 [dev-dependencies]
-solana-program-test = "1.18.11"
+solana-program-test = { workspace = true }
 light-test-utils = { version = "0.2.0", path = "../../test-utils" }
 reqwest = "0.11.26"
 tokio = "1.36.0"

diff --git a/test-programs/registry-test/Cargo.toml b/test-programs/registry-test/Cargo.toml
@@ -21,7 +21,7 @@ default = ["custom-heap"]
 
 
 [dev-dependencies]
-solana-program-test = "1.18.11"
+solana-program-test = { workspace = true }
 light-test-utils = { version = "0.2.0", path = "../../test-utils" }
 reqwest = "0.11.26"
 tokio = "1.36.0"
@@ -40,6 +40,6 @@ light-concurrent-merkle-tree = {path = "../../merkle-tree/concurrent"}
 light-indexed-merkle-tree = {path = "../../merkle-tree/indexed"}
 light-utils = {path = "../../utils"}
 light-verifier = {path = "../../circuit-lib/verifier"}
-solana-cli-output = "1.18.11"
+solana-cli-output = { workspace = true }
 serde_json = "1.0.114"
-solana-sdk = "1.18.11"
+solana-sdk = { workspace = true }
diff --git a/test-programs/system-cpi-test/Cargo.toml b/test-programs/system-cpi-test/Cargo.toml
@@ -30,11 +30,10 @@ light-hasher = { path = "../../merkle-tree/hasher", version = "0.2.0" }
 light-utils = { path = "../../utils", version = "0.2.0" }
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]
-solana-sdk = "1.18.11"
-
+solana-sdk = { workspace = true }
 
 [dev-dependencies]
-solana-program-test = "1.18.11"
+solana-program-test = { workspace = true }
 light-test-utils = { version = "0.2.0", path = "../../test-utils" }
 reqwest = "0.11.26"
 tokio = "1.36.0"

diff --git a/test-programs/system-test/Cargo.toml b/test-programs/system-test/Cargo.toml
@@ -21,7 +21,7 @@ default = ["custom-heap"]
 
 
 [dev-dependencies]
-solana-program-test = "1.18.11"
+solana-program-test = { workspace = true }
 light-test-utils = { version = "0.2.0", path = "../../test-utils" }
 reqwest = "0.11.26"
 tokio = "1.36.0"
@@ -41,4 +41,4 @@ light-utils = {path = "../../utils"}
 light-verifier = {path = "../../circuit-lib/verifier"}
 solana-cli-output = "1.18.11"
 serde_json = "1.0.114"
-solana-sdk = "1.18.11"
+solana-sdk = { workspace = true }
diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml
@@ -17,9 +17,9 @@ ark-ff = "0.4"
 light-hash-set = { path = "../merkle-tree/hash-set", version = "0.2.0" }
 num-bigint = "0.4"
 num-traits = "0.2"
-solana-program-test = "1.18.11"
-solana-sdk = "1.18.11"
-solana-client = "1.18.11"
+solana-program-test = { workspace = true }
+solana-sdk = { workspace = true }
+solana-client = { workspace = true }
 thiserror = "1.0"
 light-macros = { path = "../macros/light", version = "0.4.0" }
 account-compression = { path = "../programs/account-compression", version = "0.4.0", features = ["cpi"] }

diff --git a/utils/Cargo.toml b/utils/Cargo.toml
@@ -12,6 +12,6 @@ ark-ff = "0.4"
 light-bounded-vec = { version = "0.2.0", path = "../merkle-tree/bounded-vec" }
 num-bigint = { version = "0.4", features = ["rand"] }
 thiserror = "1.0"
-solana-program = "1.18.11"
+solana-program = { workspace = true }
 ark-bn254 = "0.4.0"
 rand = "0.8"
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
@@ -19,5 +19,5 @@ num-bigint = "0.4"
 rand = "0.8"
 quote = "1.0"
 sha2 = "0.10"
-solana-program = "1.18.11"
+solana-program = { workspace = true }
 tabled = "0.15"