From 680aed6090e1f97c95d90c6436ecea363f7766f5 Mon Sep 17 00:00:00 2001 From: JeremyLi28 Date: Thu, 17 Oct 2024 11:15:52 -0700 Subject: [PATCH] try old version to prevent solana 2.0 upgrade --- Cargo.lock | 52 ++++++++++++++++++++--------------------- programs/mmm/Cargo.toml | 4 ++-- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 733ac72..f47f3d7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -191,7 +191,6 @@ dependencies = [ "anchor-derive-accounts", "anchor-derive-serde", "anchor-derive-space", - "anchor-syn", "arrayref", "base64 0.13.1", "bincode", @@ -646,9 +645,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" dependencies = [ "bytemuck_derive", ] @@ -1389,9 +1388,9 @@ dependencies = [ [[package]] name = "mpl-bubblegum" -version = "1.4.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9eff5ae5cafd1acdf7e7c93359da1eec91dcaede318470d9f68b78e8b7469f4" +checksum = "c5a1b35011638a594a660e8ec1fce8612fb1da428b31feeb2fdcdfca95162554" dependencies = [ "borsh 0.10.3", "kaigan", @@ -1699,9 +1698,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.87" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" dependencies = [ "unicode-ident", ] @@ -1912,9 +1911,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "ryu" @@ -2380,13 +2379,12 @@ dependencies = [ [[package]] name = "spl-account-compression" -version = "0.4.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8314ec6ae26084ec7c6c0802c3dc173ee86aee5f5d5026a3f82c52cfe1c07" +checksum = "85c43bd4455d9fb29b9e4f83c087ccffa2f6f41fecfc0549932ae391d00f3378" dependencies = [ "anchor-lang", "bytemuck", - "solana-program 2.0.13", "spl-concurrent-merkle-tree", "spl-noop", ] @@ -2401,7 +2399,7 @@ dependencies = [ "borsh 0.10.3", "num-derive 0.4.2", "num-traits", - "solana-program 1.17.24", + "solana-program 2.0.13", "spl-token", "spl-token-2022 2.0.1", "thiserror", @@ -2409,12 +2407,12 @@ dependencies = [ [[package]] name = "spl-concurrent-merkle-tree" -version = "0.4.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85d1bbb97252d8a1b90d3d56425038928382a306b71dbba4c836973c94b33f96" +checksum = "141eaea58588beae81b71d101373a53f096737739873de42d6b1368bc2b8fc30" dependencies = [ "bytemuck", - "solana-program 2.0.13", + "solana-program 1.17.24", "thiserror", ] @@ -2425,7 +2423,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daa600f2fe56f32e923261719bae640d873edadbc5237681a39b8e37bfd4d263" dependencies = [ "bytemuck", - "solana-program 1.17.24", + "solana-program 2.0.13", "spl-discriminator-derive", ] @@ -2459,7 +2457,7 @@ version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58e9bae02de3405079a057fe244c867a08f92d48327d231fc60da831f94caf0a" dependencies = [ - "solana-program 1.17.24", + "solana-program 2.0.13", ] [[package]] @@ -2479,7 +2477,7 @@ checksum = "85a5db7e4efb1107b0b8e52a13f035437cdcb36ef99c58f6d467f089d9b2915a" dependencies = [ "borsh 0.10.3", "bytemuck", - "solana-program 1.17.24", + "solana-program 2.0.13", "solana-zk-token-sdk", "spl-program-error", ] @@ -2492,7 +2490,7 @@ checksum = "7e0657b6490196971d9e729520ba934911ff41fbb2cb9004463dbe23cf8b4b4f" dependencies = [ "num-derive 0.4.2", "num-traits", - "solana-program 1.17.24", + "solana-program 2.0.13", "spl-program-error-derive", "thiserror", ] @@ -2530,7 +2528,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56f335787add7fa711819f9e7c573f8145a5358a709446fe2d24bf2a88117c90" dependencies = [ "bytemuck", - "solana-program 1.17.24", + "solana-program 2.0.13", "spl-discriminator", "spl-pod", "spl-program-error", @@ -2548,7 +2546,7 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "num_enum 0.7.2", - "solana-program 1.17.24", + "solana-program 2.0.13", "thiserror", ] @@ -2609,7 +2607,7 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "num_enum 0.7.2", - "solana-program 1.17.24", + "solana-program 2.0.13", "solana-security-txt", "solana-zk-token-sdk", "spl-memo", @@ -2629,7 +2627,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7eb67fbacd587377a400aba81718abe4424d0e9d5ea510034d3b7f130d102153" dependencies = [ "bytemuck", - "solana-program 1.17.24", + "solana-program 2.0.13", "spl-discriminator", "spl-pod", "spl-program-error", @@ -2642,7 +2640,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e16aa8f64b6e0eaab3f5034e84d867c8435d8216497b4543a4978a31f4b6e8a8" dependencies = [ "borsh 0.10.3", - "solana-program 1.17.24", + "solana-program 2.0.13", "spl-discriminator", "spl-pod", "spl-program-error", @@ -2689,7 +2687,7 @@ checksum = "5f6dfe329fcff44cbe2eea994bd8f737f0b0a69faed39e56f9b6ee03badf7e14" dependencies = [ "arrayref", "bytemuck", - "solana-program 1.17.24", + "solana-program 2.0.13", "spl-discriminator", "spl-pod", "spl-program-error", @@ -2704,7 +2702,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f9ebd75d29c5f48de5f6a9c114e08531030b75b8ac2c557600ac7da0b73b1e8" dependencies = [ "bytemuck", - "solana-program 1.17.24", + "solana-program 2.0.13", "spl-discriminator", "spl-pod", "spl-program-error", diff --git a/programs/mmm/Cargo.toml b/programs/mmm/Cargo.toml index a8c455a..00d5dde 100644 --- a/programs/mmm/Cargo.toml +++ b/programs/mmm/Cargo.toml @@ -31,5 +31,5 @@ spl-associated-token-account = { version = "2.2.0", features = [ spl-token-2022 = {version = "1.0.0", features = ["no-entrypoint"] } m2_interface = { path = "../m2_interface" } mpl-core = "0.7.0" -mpl-bubblegum = "1.4.0" -spl-account-compression = "0.4.1" +mpl-bubblegum = "1.1.0" +spl-account-compression = "0.3.0"