From 4058c6d14f251e78591abbdbe6464bcb3d3417a0 Mon Sep 17 00:00:00 2001 From: Michael Danenberg <56533526+danenbm@users.noreply.github.com> Date: Tue, 26 Mar 2024 14:52:56 -0700 Subject: [PATCH] Update mpl-core version, derive clone --- Cargo.lock | 4 ++-- blockbuster/Cargo.toml | 4 +--- blockbuster/src/programs/mpl_core_program/mod.rs | 1 + blockbuster/src/programs/token_extensions/mod.rs | 1 - 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index efa2455..b9b8ed6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2175,9 +2175,9 @@ dependencies = [ [[package]] name = "mpl-core" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2aa89feb937353e5744ca7d30132a07e7380127ad42278e92b90796c60c4b11" +checksum = "2d7e1f1a471cd145c7649ff062c553a7370488a8564ac0629eed85c37bb86dea" dependencies = [ "base64 0.22.0", "borsh 0.10.3", diff --git a/blockbuster/Cargo.toml b/blockbuster/Cargo.toml index bf16b3d..84ae8e8 100644 --- a/blockbuster/Cargo.toml +++ b/blockbuster/Cargo.toml @@ -14,14 +14,12 @@ spl-token-2022 = { version = "1.0", features = ["no-entrypoint"] } spl-account-compression = { version = "0.3.0", features = ["no-entrypoint"] } spl-noop = { version = "0.2.0", features = ["no-entrypoint"] } mpl-bubblegum = "1.2.0" -mpl-core = { version = "0.1.0", features = ["serde"] } +mpl-core = { version = "0.2.0", features = ["serde"] } mpl-token-metadata = { version = "4.1.1", features = ["serde"] } -plerkle_serialization = { version = "1.6.0" } spl-token = { version = "4.0.0", features = ["no-entrypoint"] } async-trait = "0.1.57" bs58 = "0.4.0" lazy_static = "1.4.0" -flatbuffers = "23.1.21" borsh = "~0.10.3" thiserror = "1.0.32" log = "0.4.17" diff --git a/blockbuster/src/programs/mpl_core_program/mod.rs b/blockbuster/src/programs/mpl_core_program/mod.rs index fd4d6ff..cafbd0a 100644 --- a/blockbuster/src/programs/mpl_core_program/mod.rs +++ b/blockbuster/src/programs/mpl_core_program/mod.rs @@ -9,6 +9,7 @@ use solana_sdk::{pubkey::Pubkey, pubkeys}; pubkeys!(mpl_core_id, "CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d"); +#[derive(Clone, Debug, PartialEq)] pub enum MplCoreAccountData { Asset(IndexableAsset), Collection(IndexableAsset), diff --git a/blockbuster/src/programs/token_extensions/mod.rs b/blockbuster/src/programs/token_extensions/mod.rs index 0609196..1d5e2c8 100644 --- a/blockbuster/src/programs/token_extensions/mod.rs +++ b/blockbuster/src/programs/token_extensions/mod.rs @@ -4,7 +4,6 @@ use crate::{ program_handler::{ParseResult, ProgramParser}, programs::ProgramParseResult, }; -use plerkle_serialization::AccountInfo; use serde::{Deserialize, Serialize}; use solana_sdk::{pubkey::Pubkey, pubkeys}; use spl_token_2022::{