From 91a2cd2feb117d698b4cda7e97bdf03786e7a97b Mon Sep 17 00:00:00 2001 From: Linus Kendall Date: Tue, 25 Jul 2023 22:23:09 +0530 Subject: [PATCH] fix: creator indexing (#86) Co-authored-by: Nicolas Pennie --- Cargo.lock | 5 +- Cargo.toml | 1 + das_api/Cargo.lock | 840 ++++++++---------- das_api/Cargo.toml | 2 +- digital_asset_types/Cargo.toml | 2 +- migration/Cargo.lock | 774 +++++++--------- migration/Cargo.toml | 2 +- nft_ingester/Cargo.toml | 2 +- .../bubblegum/creator_verification.rs | 68 +- .../program_transformers/bubblegum/mint_v1.rs | 1 + 10 files changed, 780 insertions(+), 917 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1a90c407c..0ea90e8f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -701,9 +701,8 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blockbuster" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e81021acdb7d3d6378f4ab943d381e16bbe07a89e8d97d3587dca35bc05f498" +version = "0.7.4" +source = "git+https://github.com/rpcpool/blockbuster#409e1affd7248339c3a17c4a70788f8a019bad1c" dependencies = [ "anchor-lang", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index ed5fcaaaf..91188292a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,6 +20,7 @@ solana-client = { git = "https://github.com/rpcpool/solana-public.git", tag = "v solana-program = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.14.15-client-custom-header" } solana-sdk = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.14.15-client-custom-header" } solana-transaction-status = { git = "https://github.com/rpcpool/solana-public.git", tag = "v1.14.15-client-custom-header" } +blockbuster = { git = "https://github.com/rpcpool/blockbuster" } [profile.release] lto = true diff --git a/das_api/Cargo.lock b/das_api/Cargo.lock index cf38d8dde..353cf1ab3 100644 --- a/das_api/Cargo.lock +++ b/das_api/Cargo.lock @@ -100,12 +100,26 @@ name = "anchor-attribute-access-control" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#d88a09dbb7f4f7cca4c2801f9703dd959ddef296" dependencies = [ - "anchor-syn", + "anchor-syn 0.25.0", "anyhow", "proc-macro2", "quote", "regex", - "syn", + "syn 1.0.107", +] + +[[package]] +name = "anchor-attribute-access-control" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf7d535e1381be3de2c0716c0a1c1e32ad9df1042cddcf7bc18d743569e53319" +dependencies = [ + "anchor-syn 0.26.0", + "anyhow", + "proc-macro2", + "quote", + "regex", + "syn 1.0.107", ] [[package]] @@ -113,13 +127,28 @@ name = "anchor-attribute-account" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#d88a09dbb7f4f7cca4c2801f9703dd959ddef296" dependencies = [ - "anchor-syn", + "anchor-syn 0.25.0", + "anyhow", + "bs58 0.4.0", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.107", +] + +[[package]] +name = "anchor-attribute-account" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3bcd731f21048a032be27c7791701120e44f3f6371358fc4261a7f716283d29" +dependencies = [ + "anchor-syn 0.26.0", "anyhow", "bs58 0.4.0", "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.107", ] [[package]] @@ -127,9 +156,20 @@ name = "anchor-attribute-constant" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#d88a09dbb7f4f7cca4c2801f9703dd959ddef296" dependencies = [ - "anchor-syn", + "anchor-syn 0.25.0", "proc-macro2", - "syn", + "syn 1.0.107", +] + +[[package]] +name = "anchor-attribute-constant" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1be64a48e395fe00b8217287f226078be2cf32dae42fdf8a885b997945c3d28" +dependencies = [ + "anchor-syn 0.26.0", + "proc-macro2", + "syn 1.0.107", ] [[package]] @@ -137,10 +177,22 @@ name = "anchor-attribute-error" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#d88a09dbb7f4f7cca4c2801f9703dd959ddef296" dependencies = [ - "anchor-syn", + "anchor-syn 0.25.0", "proc-macro2", "quote", - "syn", + "syn 1.0.107", +] + +[[package]] +name = "anchor-attribute-error" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38ea6713d1938c0da03656ff8a693b17dc0396da66d1ba320557f07e86eca0d4" +dependencies = [ + "anchor-syn 0.26.0", + "proc-macro2", + "quote", + "syn 1.0.107", ] [[package]] @@ -148,11 +200,24 @@ name = "anchor-attribute-event" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#d88a09dbb7f4f7cca4c2801f9703dd959ddef296" dependencies = [ - "anchor-syn", + "anchor-syn 0.25.0", "anyhow", "proc-macro2", "quote", - "syn", + "syn 1.0.107", +] + +[[package]] +name = "anchor-attribute-event" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d401f11efb3644285685f8339829a9786d43ed7490bb1699f33c478d04d5a582" +dependencies = [ + "anchor-syn 0.26.0", + "anyhow", + "proc-macro2", + "quote", + "syn 1.0.107", ] [[package]] @@ -160,12 +225,26 @@ name = "anchor-attribute-interface" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#d88a09dbb7f4f7cca4c2801f9703dd959ddef296" dependencies = [ - "anchor-syn", + "anchor-syn 0.25.0", + "anyhow", + "heck 0.3.3", + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "anchor-attribute-interface" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6700a6f5c888a9c33fe8afc0c64fd8575fa28d05446037306d0f96102ae4480" +dependencies = [ + "anchor-syn 0.26.0", "anyhow", "heck 0.3.3", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -173,11 +252,24 @@ name = "anchor-attribute-program" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#d88a09dbb7f4f7cca4c2801f9703dd959ddef296" dependencies = [ - "anchor-syn", + "anchor-syn 0.25.0", "anyhow", "proc-macro2", "quote", - "syn", + "syn 1.0.107", +] + +[[package]] +name = "anchor-attribute-program" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ad769993b5266714e8939e47fbdede90e5c030333c7522d99a4d4748cf26712" +dependencies = [ + "anchor-syn 0.26.0", + "anyhow", + "proc-macro2", + "quote", + "syn 1.0.107", ] [[package]] @@ -185,11 +277,24 @@ name = "anchor-attribute-state" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#d88a09dbb7f4f7cca4c2801f9703dd959ddef296" dependencies = [ - "anchor-syn", + "anchor-syn 0.25.0", + "anyhow", + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "anchor-attribute-state" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e677fae4a016a554acdd0e3b7f178d3acafaa7e7ffac6b8690cf4e171f1c116" +dependencies = [ + "anchor-syn 0.26.0", "anyhow", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -197,11 +302,24 @@ name = "anchor-derive-accounts" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#d88a09dbb7f4f7cca4c2801f9703dd959ddef296" dependencies = [ - "anchor-syn", + "anchor-syn 0.25.0", "anyhow", "proc-macro2", "quote", - "syn", + "syn 1.0.107", +] + +[[package]] +name = "anchor-derive-accounts" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "340beef6809d1c3fcc7ae219153d981e95a8a277ff31985bd7050e32645dc9a8" +dependencies = [ + "anchor-syn 0.26.0", + "anyhow", + "proc-macro2", + "quote", + "syn 1.0.107", ] [[package]] @@ -209,15 +327,39 @@ name = "anchor-lang" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#d88a09dbb7f4f7cca4c2801f9703dd959ddef296" dependencies = [ - "anchor-attribute-access-control", - "anchor-attribute-account", - "anchor-attribute-constant", - "anchor-attribute-error", - "anchor-attribute-event", - "anchor-attribute-interface", - "anchor-attribute-program", - "anchor-attribute-state", - "anchor-derive-accounts", + "anchor-attribute-access-control 0.25.0", + "anchor-attribute-account 0.25.0", + "anchor-attribute-constant 0.25.0", + "anchor-attribute-error 0.25.0", + "anchor-attribute-event 0.25.0", + "anchor-attribute-interface 0.25.0", + "anchor-attribute-program 0.25.0", + "anchor-attribute-state 0.25.0", + "anchor-derive-accounts 0.25.0", + "arrayref", + "base64 0.13.1", + "bincode", + "borsh", + "bytemuck", + "solana-program", + "thiserror", +] + +[[package]] +name = "anchor-lang" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "662ceafe667448ee4199a4be2ee83b6bb76da28566eee5cea05f96ab38255af8" +dependencies = [ + "anchor-attribute-access-control 0.26.0", + "anchor-attribute-account 0.26.0", + "anchor-attribute-constant 0.26.0", + "anchor-attribute-error 0.26.0", + "anchor-attribute-event 0.26.0", + "anchor-attribute-interface 0.26.0", + "anchor-attribute-program 0.26.0", + "anchor-attribute-state 0.26.0", + "anchor-derive-accounts 0.26.0", "arrayref", "base64 0.13.1", "bincode", @@ -241,7 +383,26 @@ dependencies = [ "serde", "serde_json", "sha2 0.9.9", - "syn", + "syn 1.0.107", + "thiserror", +] + +[[package]] +name = "anchor-syn" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0418bcb5daac3b8cb1b60d8fdb1d468ca36f5509f31fb51179326fae1028fdcc" +dependencies = [ + "anyhow", + "bs58 0.3.1", + "heck 0.3.3", + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "serde", + "serde_json", + "sha2 0.9.9", + "syn 1.0.107", "thiserror", ] @@ -310,7 +471,7 @@ checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -321,7 +482,7 @@ checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -369,7 +530,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -458,10 +619,10 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blockbuster" -version = "0.7.3" -source = "git+https://github.com/metaplex-foundation/blockbuster?branch=1.14#91c96fde6511641f0150c57934ea5b88be578520" +version = "0.7.4" +source = "git+https://github.com/rpcpool/blockbuster#409e1affd7248339c3a17c4a70788f8a019bad1c" dependencies = [ - "anchor-lang", + "anchor-lang 0.26.0", "async-trait", "borsh", "bs58 0.4.0", @@ -469,8 +630,8 @@ dependencies = [ "lazy_static", "mpl-bubblegum", "mpl-candy-guard", - "mpl-candy-machine-core", - "mpl-token-metadata", + "mpl-candy-machine-core 0.1.4", + "mpl-token-metadata 1.13.0", "plerkle_serialization", "solana-sdk", "spl-account-compression", @@ -499,7 +660,7 @@ dependencies = [ "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", "proc-macro2", - "syn", + "syn 1.0.107", ] [[package]] @@ -510,7 +671,7 @@ checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -521,7 +682,7 @@ checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -601,7 +762,7 @@ checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -621,7 +782,7 @@ checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -636,27 +797,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - [[package]] name = "cadence" version = "0.29.0" @@ -926,7 +1066,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 1.0.107", ] [[package]] @@ -943,7 +1083,7 @@ checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -967,7 +1107,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn", + "syn 1.0.107", ] [[package]] @@ -978,12 +1118,12 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.107", ] [[package]] name = "das_api" -version = "0.7.1" +version = "0.7.12" dependencies = [ "async-trait", "bs58 0.4.0", @@ -1008,17 +1148,6 @@ dependencies = [ "tower-http", ] -[[package]] -name = "dashmap" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" -dependencies = [ - "cfg-if", - "num_cpus", - "rayon", -] - [[package]] name = "derivation-path" version = "0.2.0" @@ -1047,7 +1176,7 @@ dependencies = [ [[package]] name = "digital_asset_types" -version = "0.6.8" +version = "0.7.12" dependencies = [ "blockbuster", "bs58 0.4.0", @@ -1063,15 +1192,6 @@ dependencies = [ "url", ] -[[package]] -name = "dir-diff" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2860407d7d7e2e004bb2128510ad9e8d669e76fa005ccf567977b5d71b8b4a0b" -dependencies = [ - "walkdir", -] - [[package]] name = "dirs" version = "4.0.0" @@ -1180,7 +1300,7 @@ checksum = "8958699f9359f0b04e691a13850d48b7de329138023876d07cbd024c2c820598" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1202,15 +1322,6 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "fastrand" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] - [[package]] name = "feature-probe" version = "0.1.1" @@ -1230,23 +1341,11 @@ dependencies = [ "version_check", ] -[[package]] -name = "filetime" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "windows-sys", -] - [[package]] name = "flatbuffers" -version = "22.10.26" +version = "23.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ba319fc85cd1d8994d42c95b13cdf051786b35f9e401b1c03bff1c67efd899" +checksum = "4dac53e22462d78c16d64a1cd22371b54cc3fe94aa15e7886a2fa6e5d1ab8640" dependencies = [ "bitflags", "rustc_version", @@ -1344,7 +1443,7 @@ checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1694,12 +1793,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "index_list" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9d968042a4902e08810946fc7cd5851eb75e80301342305af755ca06cb82ce" - [[package]] name = "indexmap" version = "1.9.2" @@ -1833,7 +1926,7 @@ dependencies = [ "proc-macro-crate 1.2.1", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1979,35 +2072,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "lru" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" -dependencies = [ - "hashbrown 0.12.3", -] - -[[package]] -name = "lz4" -version = "1.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1" -dependencies = [ - "libc", - "lz4-sys", -] - -[[package]] -name = "lz4-sys" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "md-5" version = "0.10.5" @@ -2105,35 +2169,14 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "modular-bitfield" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53d79ba8304ac1c4f9eb3b9d281f21f7be9d4626f72ce7df4ad8fbde4f38a74" -dependencies = [ - "modular-bitfield-impl", - "static_assertions", -] - -[[package]] -name = "modular-bitfield-impl" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "mpl-bubblegum" version = "0.7.0" source = "git+https://github.com/metaplex-foundation/metaplex-program-library?branch=update-deps#94b06af274ba7eff1f02546b35dd922912d0136b" dependencies = [ - "anchor-lang", + "anchor-lang 0.25.0", "bytemuck", - "mpl-token-metadata", + "mpl-token-metadata 1.7.0", "solana-program", "spl-account-compression", "spl-associated-token-account", @@ -2145,11 +2188,11 @@ name = "mpl-candy-guard" version = "0.3.0" source = "git+https://github.com/metaplex-foundation/mpl-candy-guard?branch=update-deps#7abc0b7640b807640850131d14214edbf12248bc" dependencies = [ - "anchor-lang", + "anchor-lang 0.25.0", "arrayref", "mpl-candy-guard-derive", - "mpl-candy-machine-core", - "mpl-token-metadata", + "mpl-candy-machine-core 0.2.0", + "mpl-token-metadata 1.7.0", "solana-gateway", "solana-program", "spl-associated-token-account", @@ -2162,7 +2205,21 @@ version = "0.2.0" source = "git+https://github.com/metaplex-foundation/mpl-candy-guard?branch=update-deps#7abc0b7640b807640850131d14214edbf12248bc" dependencies = [ "quote", - "syn", + "syn 1.0.107", +] + +[[package]] +name = "mpl-candy-machine-core" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "979975275820465e1ae68742c2ca86af143d07097a0b174ed6f7687be697d8f3" +dependencies = [ + "anchor-lang 0.26.0", + "arrayref", + "mpl-token-metadata 1.13.0", + "solana-program", + "spl-associated-token-account", + "spl-token", ] [[package]] @@ -2170,15 +2227,34 @@ name = "mpl-candy-machine-core" version = "0.2.0" source = "git+https://github.com/metaplex-foundation/metaplex-program-library?branch=update-deps#94b06af274ba7eff1f02546b35dd922912d0136b" dependencies = [ - "anchor-lang", + "anchor-lang 0.25.0", "arrayref", - "mpl-token-metadata", - "mpl-utils", + "mpl-token-metadata 1.7.0", + "mpl-utils 0.0.5", "solana-program", "spl-associated-token-account", "spl-token", ] +[[package]] +name = "mpl-token-auth-rules" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c376f2cc7dae80e2949cd6ca8a2420b3c61c1ecb7a275c6433d9a4d2d24f994d" +dependencies = [ + "borsh", + "bytemuck", + "mpl-token-metadata-context-derive", + "num-derive", + "num-traits", + "rmp-serde", + "serde", + "shank", + "solana-program", + "solana-zk-token-sdk", + "thiserror", +] + [[package]] name = "mpl-token-metadata" version = "1.7.0" @@ -2186,7 +2262,27 @@ source = "git+https://github.com/metaplex-foundation/metaplex-program-library?br dependencies = [ "arrayref", "borsh", - "mpl-utils", + "mpl-utils 0.0.5", + "num-derive", + "num-traits", + "shank", + "solana-program", + "spl-associated-token-account", + "spl-token", + "thiserror", +] + +[[package]] +name = "mpl-token-metadata" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "803d414222c1b648d14559d6d1aaa5fa6f7dfdde3a26c76c331a87d6124aeb5e" +dependencies = [ + "arrayref", + "borsh", + "mpl-token-auth-rules", + "mpl-token-metadata-context-derive", + "mpl-utils 0.2.0", "num-derive", "num-traits", "serde", @@ -2198,6 +2294,16 @@ dependencies = [ "thiserror", ] +[[package]] +name = "mpl-token-metadata-context-derive" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12989bc45715b0ee91944855130131479f9c772e198a910c3eb0ea327d5bffc3" +dependencies = [ + "quote", + "syn 1.0.107", +] + [[package]] name = "mpl-utils" version = "0.0.5" @@ -2210,6 +2316,18 @@ dependencies = [ "spl-token", ] +[[package]] +name = "mpl-utils" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "822133b6cba8f9a43e5e0e189813be63dd795858f54155c729833be472ffdb51" +dependencies = [ + "arrayref", + "borsh", + "solana-program", + "spl-token", +] + [[package]] name = "nom" version = "7.1.1" @@ -2239,7 +2357,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2289,7 +2407,7 @@ dependencies = [ "proc-macro-crate 1.2.1", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2313,7 +2431,7 @@ dependencies = [ "open-rpc-schema", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2348,7 +2466,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2443,7 +2561,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2464,23 +2582,19 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - [[package]] name = "plerkle_serialization" -version = "1.1.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c275cbc142157beecb6b332d9fd5dcef2b69c7355a48e168fed1f19dd9932f91" +checksum = "b468c4528b0e3d4f7db608e08bfcfb5893892f8cd6fd7a427458eb537bdc0311" dependencies = [ + "bs58 0.4.0", "chrono", "flatbuffers", "serde", - "solana-geyser-plugin-interface", - "solana-runtime", + "solana-sdk", + "solana-transaction-status", + "thiserror", ] [[package]] @@ -2530,7 +2644,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.107", "version_check", ] @@ -2547,9 +2661,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.50" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -2562,7 +2676,7 @@ checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "version_check", "yansi", ] @@ -2584,7 +2698,7 @@ checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2598,9 +2712,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.23" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -2744,15 +2858,6 @@ version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - [[package]] name = "rend" version = "0.3.6" @@ -2840,7 +2945,29 @@ checksum = "6eaedadc88b53e36dd32d940ed21ae4d850d5916f2581526921f553a72ac34c4" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", +] + +[[package]] +name = "rmp" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmp-serde" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +dependencies = [ + "byteorder", + "rmp", + "serde", ] [[package]] @@ -2909,15 +3036,6 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - [[package]] name = "schemars" version = "0.8.11" @@ -2939,7 +3057,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn", + "syn 1.0.107", ] [[package]] @@ -3002,7 +3120,7 @@ dependencies = [ "heck 0.3.3", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -3043,7 +3161,7 @@ dependencies = [ "heck 0.3.3", "proc-macro2", "quote", - "syn", + "syn 1.0.107", "thiserror", ] @@ -3066,7 +3184,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.107", ] [[package]] @@ -3107,7 +3225,7 @@ checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -3118,7 +3236,7 @@ checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -3164,7 +3282,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -3255,7 +3373,7 @@ dependencies = [ "proc-macro2", "quote", "shank_macro_impl", - "syn", + "syn 1.0.107", ] [[package]] @@ -3268,7 +3386,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn", + "syn 1.0.107", ] [[package]] @@ -3396,31 +3514,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "solana-bucket-map" -version = "1.14.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fbbb3fa652dfea91b7576f1ffd0dbc04c8d497c62de4260ea6352f274e688b8" -dependencies = [ - "log", - "memmap2", - "modular-bitfield", - "rand 0.7.3", - "solana-measure", - "solana-sdk", - "tempfile", -] - -[[package]] -name = "solana-compute-budget-program" -version = "1.14.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29801945272acb8d0cf1eb46f6f9f17c630b1c1dc5f95cd1d4833e16313b3561" -dependencies = [ - "solana-program-runtime", - "solana-sdk", -] - [[package]] name = "solana-config-program" version = "1.14.16" @@ -3478,7 +3571,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn", + "syn 1.0.107", ] [[package]] @@ -3496,18 +3589,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "solana-geyser-plugin-interface" -version = "1.14.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a66c395890383c3ec5ac4041608a3ced90b3fd956fad6858ef0b2a4e00e712a" -dependencies = [ - "log", - "solana-sdk", - "solana-transaction-status", - "thiserror", -] - [[package]] name = "solana-logger" version = "1.14.16" @@ -3619,77 +3700,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "solana-rayon-threadlimit" -version = "1.14.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10e1d068ba8080ca1e41703c600cc9b263ff7ce26b6811cd83221723ae0d10ae" -dependencies = [ - "lazy_static", - "num_cpus", -] - -[[package]] -name = "solana-runtime" -version = "1.14.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e79c7c2bfc2308bac38952759713fe3d50c127f3f8a001bead82c02c385a050" -dependencies = [ - "arrayref", - "bincode", - "blake3", - "bv", - "bytemuck", - "byteorder", - "bzip2", - "crossbeam-channel", - "dashmap", - "dir-diff", - "flate2", - "fnv", - "im", - "index_list", - "itertools", - "lazy_static", - "log", - "lru", - "lz4", - "memmap2", - "num-derive", - "num-traits", - "num_cpus", - "once_cell", - "ouroboros", - "rand 0.7.3", - "rayon", - "regex", - "rustc_version", - "serde", - "serde_derive", - "solana-address-lookup-table-program", - "solana-bucket-map", - "solana-compute-budget-program", - "solana-config-program", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-measure", - "solana-metrics", - "solana-program-runtime", - "solana-rayon-threadlimit", - "solana-sdk", - "solana-stake-program", - "solana-vote-program", - "solana-zk-token-proof-program", - "solana-zk-token-sdk", - "strum", - "strum_macros", - "symlink", - "tar", - "tempfile", - "thiserror", - "zstd", -] - [[package]] name = "solana-sdk" version = "1.14.16" @@ -3751,30 +3761,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", -] - -[[package]] -name = "solana-stake-program" -version = "1.14.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a3aca202edb3d30cc711e55469e9efebebbf8ccbda702a9df8c72c8a8feb0c" -dependencies = [ - "bincode", - "log", - "num-derive", - "num-traits", - "rustc_version", - "serde", - "serde_derive", - "solana-config-program", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-metrics", - "solana-program-runtime", - "solana-sdk", - "solana-vote-program", - "thiserror", + "syn 1.0.107", ] [[package]] @@ -3827,21 +3814,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "solana-zk-token-proof-program" -version = "1.14.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba228bf732741df3b21222beadf86407f54a814d621b478c0666da06d1ef1083" -dependencies = [ - "bytemuck", - "getrandom 0.1.16", - "num-derive", - "num-traits", - "solana-program-runtime", - "solana-sdk", - "solana-zk-token-sdk", -] - [[package]] name = "solana-zk-token-sdk" version = "1.14.16" @@ -3885,7 +3857,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f7d92234d687ea747283907e0e89eca8f3679a5408d9a3f01b7e0763b720aea" dependencies = [ - "anchor-lang", + "anchor-lang 0.25.0", "bytemuck", "spl-concurrent-merkle-tree", "spl-noop", @@ -4066,7 +4038,7 @@ dependencies = [ "sha2 0.10.6", "sqlx-core", "sqlx-rt", - "syn", + "syn 1.0.107", "url", ] @@ -4081,12 +4053,6 @@ dependencies = [ "tokio-rustls", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "stringprep" version = "0.1.2" @@ -4104,44 +4070,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "strum" -version = "0.24.1" +name = "subtle" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" -dependencies = [ - "strum_macros", -] +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] -name = "strum_macros" -version = "0.24.3" +name = "syn" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ - "heck 0.4.0", "proc-macro2", "quote", - "rustversion", - "syn", + "unicode-ident", ] -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "symlink" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a" - [[package]] name = "syn" -version = "1.0.107" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ "proc-macro2", "quote", @@ -4156,35 +4105,10 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "unicode-xid", ] -[[package]] -name = "tar" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", -] - [[package]] name = "termcolor" version = "1.1.3" @@ -4196,22 +4120,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.27", ] [[package]] @@ -4313,7 +4237,7 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -4424,7 +4348,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -4564,17 +4488,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi", - "winapi-util", -] - [[package]] name = "want" version = "0.3.0" @@ -4624,7 +4537,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.107", "wasm-bindgen-shared", ] @@ -4658,7 +4571,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4806,15 +4719,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "xattr" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" -dependencies = [ - "libc", -] - [[package]] name = "yansi" version = "0.5.1" @@ -4838,7 +4742,7 @@ checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "synstructure", ] diff --git a/das_api/Cargo.toml b/das_api/Cargo.toml index 7a0b9aeb8..746eaa109 100644 --- a/das_api/Cargo.toml +++ b/das_api/Cargo.toml @@ -29,7 +29,7 @@ tower = { version = "0.4.13", features = [] } [patch.crates-io] anchor-lang = { git = "https://github.com/metaplex-foundation/anchor" } -blockbuster = { git = "https://github.com/metaplex-foundation/blockbuster", branch = "1.14" } +blockbuster = { git = "https://github.com/rpcpool/blockbuster" } mpl-bubblegum = { git = "https://github.com/metaplex-foundation/metaplex-program-library", branch = "update-deps" } mpl-candy-guard = { git = "https://github.com/metaplex-foundation/mpl-candy-guard", branch = "update-deps" } mpl-candy-machine-core = { git = "https://github.com/metaplex-foundation/metaplex-program-library", branch = "update-deps" } diff --git a/digital_asset_types/Cargo.toml b/digital_asset_types/Cargo.toml index d9e554cef..5704ef8ec 100644 --- a/digital_asset_types/Cargo.toml +++ b/digital_asset_types/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies] -blockbuster = "0.7.3" +blockbuster = "0.7.4" bs58 = "0.4.0" jsonpath_lib = "0.3.0" log = "0.4.17" diff --git a/migration/Cargo.lock b/migration/Cargo.lock index faa2b7156..4857e906f 100644 --- a/migration/Cargo.lock +++ b/migration/Cargo.lock @@ -100,7 +100,21 @@ name = "anchor-attribute-access-control" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#b00fe70d1bb2bf38807bcb3a1987cfb14eb62058" dependencies = [ - "anchor-syn", + "anchor-syn 0.25.0", + "anyhow", + "proc-macro2", + "quote", + "regex", + "syn 1.0.107", +] + +[[package]] +name = "anchor-attribute-access-control" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf7d535e1381be3de2c0716c0a1c1e32ad9df1042cddcf7bc18d743569e53319" +dependencies = [ + "anchor-syn 0.26.0", "anyhow", "proc-macro2", "quote", @@ -113,7 +127,22 @@ name = "anchor-attribute-account" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#b00fe70d1bb2bf38807bcb3a1987cfb14eb62058" dependencies = [ - "anchor-syn", + "anchor-syn 0.25.0", + "anyhow", + "bs58 0.4.0", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.107", +] + +[[package]] +name = "anchor-attribute-account" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3bcd731f21048a032be27c7791701120e44f3f6371358fc4261a7f716283d29" +dependencies = [ + "anchor-syn 0.26.0", "anyhow", "bs58 0.4.0", "proc-macro2", @@ -127,7 +156,18 @@ name = "anchor-attribute-constant" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#b00fe70d1bb2bf38807bcb3a1987cfb14eb62058" dependencies = [ - "anchor-syn", + "anchor-syn 0.25.0", + "proc-macro2", + "syn 1.0.107", +] + +[[package]] +name = "anchor-attribute-constant" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1be64a48e395fe00b8217287f226078be2cf32dae42fdf8a885b997945c3d28" +dependencies = [ + "anchor-syn 0.26.0", "proc-macro2", "syn 1.0.107", ] @@ -137,7 +177,19 @@ name = "anchor-attribute-error" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#b00fe70d1bb2bf38807bcb3a1987cfb14eb62058" dependencies = [ - "anchor-syn", + "anchor-syn 0.25.0", + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "anchor-attribute-error" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38ea6713d1938c0da03656ff8a693b17dc0396da66d1ba320557f07e86eca0d4" +dependencies = [ + "anchor-syn 0.26.0", "proc-macro2", "quote", "syn 1.0.107", @@ -148,7 +200,20 @@ name = "anchor-attribute-event" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#b00fe70d1bb2bf38807bcb3a1987cfb14eb62058" dependencies = [ - "anchor-syn", + "anchor-syn 0.25.0", + "anyhow", + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "anchor-attribute-event" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d401f11efb3644285685f8339829a9786d43ed7490bb1699f33c478d04d5a582" +dependencies = [ + "anchor-syn 0.26.0", "anyhow", "proc-macro2", "quote", @@ -160,7 +225,21 @@ name = "anchor-attribute-interface" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#b00fe70d1bb2bf38807bcb3a1987cfb14eb62058" dependencies = [ - "anchor-syn", + "anchor-syn 0.25.0", + "anyhow", + "heck 0.3.3", + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "anchor-attribute-interface" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6700a6f5c888a9c33fe8afc0c64fd8575fa28d05446037306d0f96102ae4480" +dependencies = [ + "anchor-syn 0.26.0", "anyhow", "heck 0.3.3", "proc-macro2", @@ -173,7 +252,20 @@ name = "anchor-attribute-program" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#b00fe70d1bb2bf38807bcb3a1987cfb14eb62058" dependencies = [ - "anchor-syn", + "anchor-syn 0.25.0", + "anyhow", + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "anchor-attribute-program" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ad769993b5266714e8939e47fbdede90e5c030333c7522d99a4d4748cf26712" +dependencies = [ + "anchor-syn 0.26.0", "anyhow", "proc-macro2", "quote", @@ -185,7 +277,20 @@ name = "anchor-attribute-state" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#b00fe70d1bb2bf38807bcb3a1987cfb14eb62058" dependencies = [ - "anchor-syn", + "anchor-syn 0.25.0", + "anyhow", + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "anchor-attribute-state" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e677fae4a016a554acdd0e3b7f178d3acafaa7e7ffac6b8690cf4e171f1c116" +dependencies = [ + "anchor-syn 0.26.0", "anyhow", "proc-macro2", "quote", @@ -197,7 +302,20 @@ name = "anchor-derive-accounts" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#b00fe70d1bb2bf38807bcb3a1987cfb14eb62058" dependencies = [ - "anchor-syn", + "anchor-syn 0.25.0", + "anyhow", + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "anchor-derive-accounts" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "340beef6809d1c3fcc7ae219153d981e95a8a277ff31985bd7050e32645dc9a8" +dependencies = [ + "anchor-syn 0.26.0", "anyhow", "proc-macro2", "quote", @@ -209,15 +327,39 @@ name = "anchor-lang" version = "0.25.0" source = "git+https://github.com/metaplex-foundation/anchor#b00fe70d1bb2bf38807bcb3a1987cfb14eb62058" dependencies = [ - "anchor-attribute-access-control", - "anchor-attribute-account", - "anchor-attribute-constant", - "anchor-attribute-error", - "anchor-attribute-event", - "anchor-attribute-interface", - "anchor-attribute-program", - "anchor-attribute-state", - "anchor-derive-accounts", + "anchor-attribute-access-control 0.25.0", + "anchor-attribute-account 0.25.0", + "anchor-attribute-constant 0.25.0", + "anchor-attribute-error 0.25.0", + "anchor-attribute-event 0.25.0", + "anchor-attribute-interface 0.25.0", + "anchor-attribute-program 0.25.0", + "anchor-attribute-state 0.25.0", + "anchor-derive-accounts 0.25.0", + "arrayref", + "base64 0.13.0", + "bincode", + "borsh", + "bytemuck", + "solana-program", + "thiserror", +] + +[[package]] +name = "anchor-lang" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "662ceafe667448ee4199a4be2ee83b6bb76da28566eee5cea05f96ab38255af8" +dependencies = [ + "anchor-attribute-access-control 0.26.0", + "anchor-attribute-account 0.26.0", + "anchor-attribute-constant 0.26.0", + "anchor-attribute-error 0.26.0", + "anchor-attribute-event 0.26.0", + "anchor-attribute-interface 0.26.0", + "anchor-attribute-program 0.26.0", + "anchor-attribute-state 0.26.0", + "anchor-derive-accounts 0.26.0", "arrayref", "base64 0.13.0", "bincode", @@ -245,6 +387,25 @@ dependencies = [ "thiserror", ] +[[package]] +name = "anchor-syn" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0418bcb5daac3b8cb1b60d8fdb1d468ca36f5509f31fb51179326fae1028fdcc" +dependencies = [ + "anyhow", + "bs58 0.3.1", + "heck 0.3.3", + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "serde", + "serde_json", + "sha2 0.9.9", + "syn 1.0.107", + "thiserror", +] + [[package]] name = "android_system_properties" version = "0.1.5" @@ -559,10 +720,10 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blockbuster" -version = "0.7.3" -source = "git+https://github.com/metaplex-foundation/blockbuster?branch=1.14#e855eeb1f53030122afc9e3dd1b1124c818c64d6" +version = "0.7.4" +source = "git+https://github.com/rpcpool/blockbuster#409e1affd7248339c3a17c4a70788f8a019bad1c" dependencies = [ - "anchor-lang", + "anchor-lang 0.26.0", "async-trait", "borsh", "bs58 0.4.0", @@ -570,8 +731,8 @@ dependencies = [ "lazy_static", "mpl-bubblegum", "mpl-candy-guard", - "mpl-candy-machine-core", - "mpl-token-metadata", + "mpl-candy-machine-core 0.1.4", + "mpl-token-metadata 1.13.0", "plerkle_serialization", "solana-sdk", "spl-account-compression", @@ -720,27 +881,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" -[[package]] -name = "bzip2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - [[package]] name = "cache-padded" version = "1.2.0" @@ -1111,17 +1251,6 @@ dependencies = [ "syn 1.0.107", ] -[[package]] -name = "dashmap" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" -dependencies = [ - "cfg-if", - "num_cpus", - "rayon", -] - [[package]] name = "derivation-path" version = "0.2.0" @@ -1150,7 +1279,7 @@ dependencies = [ [[package]] name = "digital_asset_types" -version = "0.6.8" +version = "0.7.12" dependencies = [ "blockbuster", "bs58 0.4.0", @@ -1166,15 +1295,6 @@ dependencies = [ "url", ] -[[package]] -name = "dir-diff" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2860407d7d7e2e004bb2128510ad9e8d669e76fa005ccf567977b5d71b8b4a0b" -dependencies = [ - "walkdir", -] - [[package]] name = "dirs" version = "4.0.0" @@ -1300,7 +1420,7 @@ checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.27", ] [[package]] @@ -1337,23 +1457,11 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" -[[package]] -name = "filetime" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "windows-sys 0.36.1", -] - [[package]] name = "flatbuffers" -version = "22.10.26" +version = "23.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ba319fc85cd1d8994d42c95b13cdf051786b35f9e401b1c03bff1c67efd899" +checksum = "4dac53e22462d78c16d64a1cd22371b54cc3fe94aa15e7886a2fa6e5d1ab8640" dependencies = [ "bitflags", "rustc_version", @@ -1809,12 +1917,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "index_list" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9d968042a4902e08810946fc7cd5851eb75e80301342305af755ca06cb82ce" - [[package]] name = "indexmap" version = "1.9.1" @@ -2007,26 +2109,6 @@ dependencies = [ "value-bag", ] -[[package]] -name = "lz4" -version = "1.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1" -dependencies = [ - "libc", - "lz4-sys", -] - -[[package]] -name = "lz4-sys" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "matchers" version = "0.1.0" @@ -2083,7 +2165,7 @@ dependencies = [ [[package]] name = "migration" -version = "0.6.8" +version = "0.7.12" dependencies = [ "async-std", "digital_asset_types", @@ -2134,35 +2216,14 @@ dependencies = [ "windows-sys 0.36.1", ] -[[package]] -name = "modular-bitfield" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53d79ba8304ac1c4f9eb3b9d281f21f7be9d4626f72ce7df4ad8fbde4f38a74" -dependencies = [ - "modular-bitfield-impl", - "static_assertions", -] - -[[package]] -name = "modular-bitfield-impl" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - [[package]] name = "mpl-bubblegum" version = "0.7.0" source = "git+https://github.com/metaplex-foundation/metaplex-program-library?branch=update-deps#94b06af274ba7eff1f02546b35dd922912d0136b" dependencies = [ - "anchor-lang", + "anchor-lang 0.25.0", "bytemuck", - "mpl-token-metadata", + "mpl-token-metadata 1.7.0", "solana-program", "spl-account-compression", "spl-associated-token-account", @@ -2174,11 +2235,11 @@ name = "mpl-candy-guard" version = "0.3.0" source = "git+https://github.com/metaplex-foundation/mpl-candy-guard?branch=update-deps#7abc0b7640b807640850131d14214edbf12248bc" dependencies = [ - "anchor-lang", + "anchor-lang 0.25.0", "arrayref", "mpl-candy-guard-derive", - "mpl-candy-machine-core", - "mpl-token-metadata", + "mpl-candy-machine-core 0.2.0", + "mpl-token-metadata 1.7.0", "solana-gateway", "solana-program", "spl-associated-token-account", @@ -2194,20 +2255,53 @@ dependencies = [ "syn 1.0.107", ] +[[package]] +name = "mpl-candy-machine-core" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "979975275820465e1ae68742c2ca86af143d07097a0b174ed6f7687be697d8f3" +dependencies = [ + "anchor-lang 0.26.0", + "arrayref", + "mpl-token-metadata 1.13.0", + "solana-program", + "spl-associated-token-account", + "spl-token", +] + [[package]] name = "mpl-candy-machine-core" version = "0.2.0" source = "git+https://github.com/metaplex-foundation/metaplex-program-library?branch=update-deps#94b06af274ba7eff1f02546b35dd922912d0136b" dependencies = [ - "anchor-lang", + "anchor-lang 0.25.0", "arrayref", - "mpl-token-metadata", - "mpl-utils", + "mpl-token-metadata 1.7.0", + "mpl-utils 0.0.5", "solana-program", "spl-associated-token-account", "spl-token", ] +[[package]] +name = "mpl-token-auth-rules" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c376f2cc7dae80e2949cd6ca8a2420b3c61c1ecb7a275c6433d9a4d2d24f994d" +dependencies = [ + "borsh", + "bytemuck", + "mpl-token-metadata-context-derive", + "num-derive", + "num-traits", + "rmp-serde", + "serde", + "shank", + "solana-program", + "solana-zk-token-sdk", + "thiserror", +] + [[package]] name = "mpl-token-metadata" version = "1.7.0" @@ -2215,7 +2309,27 @@ source = "git+https://github.com/metaplex-foundation/metaplex-program-library?br dependencies = [ "arrayref", "borsh", - "mpl-utils", + "mpl-utils 0.0.5", + "num-derive", + "num-traits", + "shank", + "solana-program", + "spl-associated-token-account", + "spl-token", + "thiserror", +] + +[[package]] +name = "mpl-token-metadata" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "803d414222c1b648d14559d6d1aaa5fa6f7dfdde3a26c76c331a87d6124aeb5e" +dependencies = [ + "arrayref", + "borsh", + "mpl-token-auth-rules", + "mpl-token-metadata-context-derive", + "mpl-utils 0.2.0", "num-derive", "num-traits", "serde", @@ -2227,6 +2341,16 @@ dependencies = [ "thiserror", ] +[[package]] +name = "mpl-token-metadata-context-derive" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12989bc45715b0ee91944855130131479f9c772e198a910c3eb0ea327d5bffc3" +dependencies = [ + "quote", + "syn 1.0.107", +] + [[package]] name = "mpl-utils" version = "0.0.5" @@ -2239,6 +2363,18 @@ dependencies = [ "spl-token", ] +[[package]] +name = "mpl-utils" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "822133b6cba8f9a43e5e0e189813be63dd795858f54155c729833be472ffdb51" +dependencies = [ + "arrayref", + "borsh", + "solana-program", + "spl-token", +] + [[package]] name = "nom" version = "7.1.1" @@ -2483,23 +2619,19 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkg-config" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" - [[package]] name = "plerkle_serialization" -version = "1.1.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c275cbc142157beecb6b332d9fd5dcef2b69c7355a48e168fed1f19dd9932f91" +checksum = "b468c4528b0e3d4f7db608e08bfcfb5893892f8cd6fd7a427458eb537bdc0311" dependencies = [ + "bs58 0.4.0", "chrono", "flatbuffers", "serde", - "solana-geyser-plugin-interface", - "solana-runtime", + "solana-sdk", + "solana-transaction-status", + "thiserror", ] [[package]] @@ -2580,9 +2712,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -2611,9 +2743,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -2768,15 +2900,6 @@ version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - [[package]] name = "reqwest" version = "0.11.13" @@ -2833,6 +2956,28 @@ dependencies = [ "winapi", ] +[[package]] +name = "rmp" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmp-serde" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + [[package]] name = "rust_decimal" version = "1.26.1" @@ -2892,15 +3037,6 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - [[package]] name = "schemars" version = "0.8.11" @@ -3355,9 +3491,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.14.11" +version = "1.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "701ca0143761d40eb6e2933e8854d1c0a2918ede7419264b71bd142980c5fb32" +checksum = "ec36d5c2ec5469dacc4fd2bdfcaaf4b253a4814d86d88686d50fd407cf7b3330" dependencies = [ "Inflector", "base64 0.13.0", @@ -3380,9 +3516,9 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.14.11" +version = "1.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03f403a837de4e5d6135bb8100b7aa982a1e5ecc166386258ce3583cd12e2d7c" +checksum = "bf23fb5a4ff0e902bf94fbc63ba51b10b1f86c6bca18574b583ec3baf6383a0b" dependencies = [ "bincode", "bytemuck", @@ -3399,36 +3535,11 @@ dependencies = [ "thiserror", ] -[[package]] -name = "solana-bucket-map" -version = "1.14.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9df2cd8e820633da71a0167054a42d191bc829a00636d994cf92dec0a045445f" -dependencies = [ - "log", - "memmap2", - "modular-bitfield", - "rand 0.7.3", - "solana-measure", - "solana-sdk", - "tempfile", -] - -[[package]] -name = "solana-compute-budget-program" -version = "1.14.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abbbf355bee3a5ce0ac65d34ab892b866f064af0f84cfbbd9ae2316488a03fa9" -dependencies = [ - "solana-program-runtime", - "solana-sdk", -] - [[package]] name = "solana-config-program" -version = "1.14.11" +version = "1.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16219e0c1b2f0c919f238c8951078b45b9c6c00b18acec547eebe2821d2db916" +checksum = "645c2d438fdfa4f5774c70fb0eeb2325caa073c838a229ef6a876c65c8703294" dependencies = [ "bincode", "chrono", @@ -3440,9 +3551,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.14.11" +version = "1.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5a383f43792311db749bbed4e7794222c9f118b609bc8252b4ea3ad88b4188" +checksum = "23b4953578272ac0fadec245e85e83ae86454611f0c0a7fff7d906835124bdcf" dependencies = [ "ahash", "blake3", @@ -3474,9 +3585,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.14.11" +version = "1.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062e282539e770967500945cd2fdb78170a1ea45aff7ad1b4ce4e2cc0b557db8" +checksum = "57892538250428ad3dc3cbe05f6cd75ad14f4f16734fcb91bc7cd5fbb63d6315" dependencies = [ "proc-macro2", "quote", @@ -3499,23 +3610,11 @@ dependencies = [ "thiserror", ] -[[package]] -name = "solana-geyser-plugin-interface" -version = "1.14.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63c520547921d3049b898a6c0177ce20b4244d744a75f9c7ba182c7ba9541b8f" -dependencies = [ - "log", - "solana-sdk", - "solana-transaction-status", - "thiserror", -] - [[package]] name = "solana-logger" -version = "1.14.11" +version = "1.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2bcbaba2c683e7bf80ff4f3a3cdcdaabdb0b21333e8d89aed06be136193d39" +checksum = "06aa701c49493e93085dd1e800c05475baca15a9d4d527b59794f2ed0b66e055" dependencies = [ "env_logger", "lazy_static", @@ -3524,9 +3623,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.14.11" +version = "1.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33bbb0e7ee37cdfd18f2636e687cfafcc2e85a7768e283941fd08da022bd0f66" +checksum = "f7300180957635b33c88bd6844a5dff4f1f5c6352d0861ee7845eab84185aa6a" dependencies = [ "log", "solana-sdk", @@ -3534,9 +3633,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.14.11" +version = "1.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f77f7044d57975f001a2c8f3756e4a04f10ca886c69eb8ce0b1786aad52c663d" +checksum = "2960981c4bbe9177dafe986542ba11a10afcae320f4201aa809cd5b650e202e1" dependencies = [ "crossbeam-channel", "gethostname", @@ -3548,9 +3647,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.14.11" +version = "1.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75602376f2cea17ac301292a3ded6db73e968310ac482857237d95a34473b62a" +checksum = "3f99052873619df68913cb8e92e28ff251a5483828925e87fa97ba15a9cbad51" dependencies = [ "base64 0.13.0", "bincode", @@ -3597,9 +3696,9 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.14.11" +version = "1.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb4a1b61c005eb9c0767b215e428c51adfa6e0023691d37f05653a4cd29bce2b" +checksum = "4d57d0b6ef85b50f9ad6b9a75fc9d5051dc26f8b1a4ddf03656e3d603e139eb3" dependencies = [ "base64 0.13.0", "bincode", @@ -3622,81 +3721,11 @@ dependencies = [ "thiserror", ] -[[package]] -name = "solana-rayon-threadlimit" -version = "1.14.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7091fe2ae498f482f549450e9c5c04e89867dd8622612c742e7c1586b11cc2c1" -dependencies = [ - "lazy_static", - "num_cpus", -] - -[[package]] -name = "solana-runtime" -version = "1.14.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c023c21c8c5015113a33b1ec3644d913db2a591e06e6cca9a647bc9a0f58c0" -dependencies = [ - "arrayref", - "bincode", - "blake3", - "bv", - "bytemuck", - "byteorder", - "bzip2", - "crossbeam-channel", - "dashmap", - "dir-diff", - "flate2", - "fnv", - "im", - "index_list", - "itertools", - "lazy_static", - "log", - "lz4", - "memmap2", - "num-derive", - "num-traits", - "num_cpus", - "once_cell", - "ouroboros", - "rand 0.7.3", - "rayon", - "regex", - "rustc_version", - "serde", - "serde_derive", - "solana-address-lookup-table-program", - "solana-bucket-map", - "solana-compute-budget-program", - "solana-config-program", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-measure", - "solana-metrics", - "solana-program-runtime", - "solana-rayon-threadlimit", - "solana-sdk", - "solana-stake-program", - "solana-vote-program", - "solana-zk-token-proof-program", - "solana-zk-token-sdk", - "strum", - "strum_macros", - "symlink", - "tar", - "tempfile", - "thiserror", - "zstd", -] - [[package]] name = "solana-sdk" -version = "1.14.11" +version = "1.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a46085d2548bb943e7210b28b09378e361350577b391a94457ad78af1a9f75ef" +checksum = "edb47da3e18cb669f6ace0b40cee0610e278903783e0c9f7fce1e1beb881a1b7" dependencies = [ "assert_matches", "base64 0.13.0", @@ -3745,9 +3774,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.14.11" +version = "1.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa38323e649c70b698e49f1ded17849a9b5da2e0821a38ad08327307009e274" +checksum = "7d41a09b9cecd0a4df63c78a192adee99ebf2d3757c19713a68246e1d9789c7c" dependencies = [ "bs58 0.4.0", "proc-macro2", @@ -3756,34 +3785,11 @@ dependencies = [ "syn 1.0.107", ] -[[package]] -name = "solana-stake-program" -version = "1.14.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c2463c564273fdabc6eb5d8aeacf4440aad54fcebf3b1bd57c12b5af81c299c" -dependencies = [ - "bincode", - "log", - "num-derive", - "num-traits", - "rustc_version", - "serde", - "serde_derive", - "solana-config-program", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-metrics", - "solana-program-runtime", - "solana-sdk", - "solana-vote-program", - "thiserror", -] - [[package]] name = "solana-transaction-status" -version = "1.14.11" +version = "1.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72d3da9fd5d3d7b7c0bc8c071e614c15f73d75612b1a724a4ebf3139458cbb24" +checksum = "df1a6ee396d436ae4ee36350043c3cb34ad66b7515f045c1e5006695559d88ac" dependencies = [ "Inflector", "base64 0.13.0", @@ -3810,9 +3816,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.14.11" +version = "1.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eddab05371499a937a222f101fd9e2b708b87c575ca3cf01e0c012e14aff79d" +checksum = "6280815d28c90ea8f51c8eb2026258e8693cab5a8456ee7b207a791b20f9c576" dependencies = [ "bincode", "log", @@ -3829,26 +3835,11 @@ dependencies = [ "thiserror", ] -[[package]] -name = "solana-zk-token-proof-program" -version = "1.14.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82ca75686a92656caf2aa29c66020dc1b2e1b1cc7ffce6ada8a6f89201d84d54" -dependencies = [ - "bytemuck", - "getrandom 0.1.16", - "num-derive", - "num-traits", - "solana-program-runtime", - "solana-sdk", - "solana-zk-token-sdk", -] - [[package]] name = "solana-zk-token-sdk" -version = "1.14.11" +version = "1.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d81faf1b8f5c550923f01e9b2c41aec8f646cceff7fd72ca6712d10a4022f163" +checksum = "7ab38abd096769f79fd8e3fe8465070f04742395db724606a5263c8ebc215567" dependencies = [ "aes-gcm-siv", "arrayref", @@ -3887,7 +3878,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f7d92234d687ea747283907e0e89eca8f3679a5408d9a3f01b7e0763b720aea" dependencies = [ - "anchor-lang", + "anchor-lang 0.25.0", "bytemuck", "spl-concurrent-merkle-tree", "spl-noop", @@ -4081,12 +4072,6 @@ dependencies = [ "tokio-rustls", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "stringprep" version = "0.1.2" @@ -4103,40 +4088,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -[[package]] -name = "strum" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck 0.4.0", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.107", -] - [[package]] name = "subtle" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" -[[package]] -name = "symlink" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a" - [[package]] name = "syn" version = "1.0.107" @@ -4150,9 +4107,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ "proc-macro2", "quote", @@ -4171,31 +4128,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "tar" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", -] - [[package]] name = "termcolor" version = "1.1.3" @@ -4213,22 +4145,22 @@ checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.27", ] [[package]] @@ -4588,17 +4520,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi", - "winapi-util", -] - [[package]] name = "want" version = "0.3.0" @@ -4882,15 +4803,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "xattr" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" -dependencies = [ - "libc", -] - [[package]] name = "yansi" version = "0.5.1" diff --git a/migration/Cargo.toml b/migration/Cargo.toml index cd30deee8..9fbb2ef96 100644 --- a/migration/Cargo.toml +++ b/migration/Cargo.toml @@ -16,7 +16,7 @@ sea-orm-migration = { version = "0.10.6", features = ["runtime-tokio-rustls", "s [patch.crates-io] anchor-lang = { git = "https://github.com/metaplex-foundation/anchor" } -blockbuster = { git = "https://github.com/metaplex-foundation/blockbuster", branch = "1.14" } +blockbuster = { git = "https://github.com/rpcpool/blockbuster" } mpl-bubblegum = { git = "https://github.com/metaplex-foundation/metaplex-program-library", branch = "update-deps" } mpl-candy-guard = { git = "https://github.com/metaplex-foundation/mpl-candy-guard", branch = "update-deps" } mpl-candy-machine-core = { git = "https://github.com/metaplex-foundation/metaplex-program-library", branch = "update-deps" } diff --git a/nft_ingester/Cargo.toml b/nft_ingester/Cargo.toml index bd35aacab..1ca1c623f 100644 --- a/nft_ingester/Cargo.toml +++ b/nft_ingester/Cargo.toml @@ -8,7 +8,7 @@ publish = false anyhow = "1.0.70" async-trait = "0.1.53" base64 = "0.21.0" -blockbuster = "0.7.3" +blockbuster = "0.7.4" borsh = "0.9.1" bs58 = "0.4.0" cadence = "0.29.0" diff --git a/nft_ingester/src/program_transformers/bubblegum/creator_verification.rs b/nft_ingester/src/program_transformers/bubblegum/creator_verification.rs index e70134150..6f7c83da9 100644 --- a/nft_ingester/src/program_transformers/bubblegum/creator_verification.rs +++ b/nft_ingester/src/program_transformers/bubblegum/creator_verification.rs @@ -3,6 +3,11 @@ use blockbuster::{ programs::bubblegum::{BubblegumInstruction, LeafSchema, Payload}, }; use digital_asset_types::dao::{asset, asset_creators}; +use log::{debug, info}; +use mpl_bubblegum::{ + hash_creators, hash_metadata, + state::metaplex_adapter::{Creator, MetadataArgs}, +}; use sea_orm::{ConnectionTrait, Set, TransactionTrait, Unchanged}; use crate::{ @@ -21,21 +26,60 @@ pub async fn process<'c, T>( where T: ConnectionTrait + TransactionTrait, { - let maybe_creator = match parsing_result.payload { - Some(Payload::VerifyCreator { creator }) => Some(creator), - Some(Payload::UnverifyCreator { creator }) => Some(creator), - _ => None, - }; - - if let (Some(le), Some(cl), Some(creator)) = ( + if let (Some(le), Some(cl), Some(payload)) = ( &parsing_result.leaf_update, &parsing_result.tree_update, - maybe_creator, + &parsing_result.payload, ) { - // Do we need to update the `slot_updated` field as well as part of the table - // updates below? - + let (creator, verify, creator_hash, data_hash, metadata) = match payload { + Payload::CreatorVerification { + creator, + verify, + creator_hash, + data_hash, + args, + } => (creator, verify, creator_hash, data_hash, args), + _ => { + return Err(IngesterError::ParsingError( + "Ix not parsed correctly".to_string(), + )); + } + }; + debug!( + "Handling creator verification event for creator {} (verify: {}): {}", + creator, verify, bundle.txn_id + ); let seq = save_changelog_event(cl, bundle.slot, bundle.txn_id, txn).await?; + + let updated_creators = metadata + .creators + .iter() + .map(|c| { + let verified = if c.address == creator.clone() { + verify.clone() + } else { + c.verified + }; + Creator { + address: c.address, + verified, + share: c.share, + } + }) + .collect::>(); + let mut updated_metadata = metadata.clone(); + updated_metadata.creators = updated_creators; + let updated_data_hash = hash_metadata(&updated_metadata) + .map(|e| bs58::encode(e).into_string()) + .unwrap_or("".to_string()) + .trim() + .to_string(); + let updated_creator_hash = hash_creators(&updated_metadata.creators) + .map(|e| bs58::encode(e).into_string()) + .unwrap_or("".to_string()) + .trim() + .to_string(); + let asset_id_bytes = match le.schema { LeafSchema::V1 { id, .. } => { let id_bytes = id.to_bytes().to_vec(); @@ -43,6 +87,8 @@ where id: Unchanged(id_bytes.clone()), leaf: Set(Some(le.leaf_hash.to_vec())), seq: Set(seq as i64), + data_hash: Set(Some(updated_data_hash)), + creator_hash: Set(Some(updated_creator_hash)), ..Default::default() }; diff --git a/nft_ingester/src/program_transformers/bubblegum/mint_v1.rs b/nft_ingester/src/program_transformers/bubblegum/mint_v1.rs index 9d83c20a1..309118b7e 100644 --- a/nft_ingester/src/program_transformers/bubblegum/mint_v1.rs +++ b/nft_ingester/src/program_transformers/bubblegum/mint_v1.rs @@ -20,6 +20,7 @@ use digital_asset_types::{ }, json::ChainDataV1, }; +use log::info; use num_traits::FromPrimitive; use sea_orm::{ entity::*, query::*, sea_query::OnConflict, ConnectionTrait, DbBackend, EntityTrait, JsonValue,