From 14dfa50d33be6f56628aa4818812e0d4de8e5d2d Mon Sep 17 00:00:00 2001 From: Kirill Fomichev Date: Mon, 8 Jan 2024 15:51:15 -0500 Subject: [PATCH] solana: update to 1.17.15 (#7) --- Cargo.lock | 139 ++++++++++++++++++++----------- Cargo.toml | 4 +- plerkle/Cargo.toml | 10 +-- plerkle_serialization/Cargo.toml | 6 +- 4 files changed, 101 insertions(+), 58 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0f207bc..4a731dc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -67,14 +67,15 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "72832d73be48bac96a5d7944568f305d829ed55b0ce3b483647089dfaf6cf704" dependencies = [ "cfg-if", "getrandom 0.2.11", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -1346,7 +1347,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.4", ] [[package]] @@ -1970,11 +1971,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.7.0", + "num_enum_derive 0.7.2", ] [[package]] @@ -1991,9 +1992,9 @@ dependencies = [ [[package]] name = "num_enum_derive" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", @@ -2175,7 +2176,7 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "plerkle" -version = "1.6.0+solana.1.17.12" +version = "1.6.0+solana.1.17.15" dependencies = [ "async-trait", "base64 0.21.5", @@ -2226,7 +2227,7 @@ dependencies = [ [[package]] name = "plerkle_serialization" -version = "1.6.0+solana.1.17.12" +version = "1.6.0+solana.1.17.15" dependencies = [ "bs58", "chrono", @@ -2902,9 +2903,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.17.12" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47a1bf5f7d91a60b073f5d2b58993a9f44258d4df3304ed11a1e21ba23804a1" +checksum = "22ea4bedfcc8686ae6d01a3d8288f5b9746cd00ec63f0ce9a6415849d35add50" dependencies = [ "Inflector", "base64 0.21.5", @@ -2919,6 +2920,7 @@ dependencies = [ "solana-sdk", "spl-token", "spl-token-2022", + "spl-token-group-interface", "spl-token-metadata-interface", "thiserror", "zstd", @@ -2926,9 +2928,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.17.12" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6237d968bbf6c3cf6b5131523e8f36a9f2f06dde0ae3cb97ba48d7df1c3df2db" +checksum = "8de23cd0dd8673f4590e90bfa47ff19eb629f4b7dc15a3fb173a62d932801d07" dependencies = [ "bincode", "chrono", @@ -2940,11 +2942,11 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.17.12" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40252b49d68e33eedb76498714b4b52f1ee7522a3bb52b8dbd0d6d9bacc5e2b" +checksum = "4090f2ac64149ce1fbabd5277f41e278edc1f38121927fe8f6355e67ead3e199" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.4", "blake3", "block-buffer 0.10.4", "bs58", @@ -2970,9 +2972,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.17.12" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a106613b9d798ca6562cb372a49d62ac2f507bb6a9bfd9afd5d0a7276b08068b" +checksum = "765bcdc1ecc31ea5d3d7ddb680ffa6645809c122b4ffdc223b161850e6ba352b" dependencies = [ "proc-macro2", "quote", @@ -2982,9 +2984,9 @@ dependencies = [ [[package]] name = "solana-geyser-plugin-interface" -version = "1.17.12" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "364844bd48d3ee7d5e0a7a01c2b7f9a5d0d393ec0c55d629fc0b9fd83e13f4f1" +checksum = "d7de64dec75a6b748b7c8592b79710401a40282a345bd28db9ad5557ae190e9a" dependencies = [ "log", "solana-sdk", @@ -2994,9 +2996,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.17.12" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b64e80cdc5c951d68a370a76301059b5ece998b18eb07da536e50b5c082bd7" +checksum = "9c7f3cad088bc5f00569cb5b4c3aaba8d935f8f7cc25c91cc0c55a8a7de2b137" dependencies = [ "env_logger", "lazy_static", @@ -3005,9 +3007,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.17.12" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d0022b8bf1515777be92099d8abdc0c1c19c3a5c612d09f5f5ba64514b0674" +checksum = "2de5041d16120852c0deea047c024e1fad8819e49041491f0cca6c91c243fd5d" dependencies = [ "log", "solana-sdk", @@ -3015,9 +3017,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.17.12" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac21ec9077ad17e4a538f3565bf0fb6b9db71bcced56c7d4ebc153ab534857c" +checksum = "2fd6f25f0076b6eb873f7e2a85e53191ac2affe6782131be1a2867d057307e20" dependencies = [ "crossbeam-channel", "gethostname", @@ -3030,9 +3032,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.17.12" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bdfd6532551b8d8c1ed15e1b6bd7a62f37f8eecc540ae833bda6ff20f24679" +checksum = "c1141d1dffbe68852128f7bbcc3c43a5d2cb715ecffeeb64eb81bb93cbaf80bb" dependencies = [ "ark-bn254", "ark-ec", @@ -3084,9 +3086,9 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.17.12" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65014113fa8dd026351525a317cf8fd756e2be873869230db44a352682839b02" +checksum = "942de577a2865cec28fc174575c9bd6cf7af815832af67fe40ca856075550998" dependencies = [ "base64 0.21.5", "bincode", @@ -3112,9 +3114,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.17.12" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3dcae28fb968bc1987f92c637d66477a337f9e54747596fe5c52d6a00729c99" +checksum = "278a95acb99377dd4585599fdbec23d0a6fcb94ec78285283723fdd365fe885e" dependencies = [ "assert_matches", "base64 0.21.5", @@ -3166,9 +3168,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.17.12" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47a1ff2ebb2fd8d50a592cb109cc6139b790de45bdbbfcfbbe7ecabb3725f7f" +checksum = "92dbaf563210f61828800f2a3d8c188fa2afede91920d364982e280318db2eb5" dependencies = [ "bs58", "proc-macro2", @@ -3177,11 +3179,17 @@ dependencies = [ "syn 2.0.39", ] +[[package]] +name = "solana-security-txt" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" + [[package]] name = "solana-transaction-status" -version = "1.17.12" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a034f949893241b536c76f80472e19555297d5f695a5ddc84c2e29e55cbe5ff7" +checksum = "5e2031070cba17802f7108b53f6db01b82cdfb0360b0a8b9d51c584f2e9dd9e4" dependencies = [ "Inflector", "base64 0.21.5", @@ -3204,9 +3212,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.17.12" +version = "1.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a048ab6c1e3cd38f79aaee339b7ebcc9ecfd81e7434dc59a427eef7aa8d516" +checksum = "ef26fb44734aa940e6648bbbeead677edc68c7e1ec09128e5f16a8924c389a38" dependencies = [ "aes-gcm-siv", "base64 0.21.5", @@ -3264,9 +3272,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "spl-associated-token-account" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385e31c29981488f2820b2022d8e731aae3b02e6e18e2fd854e4c9a94dc44fc3" +checksum = "992d9c64c2564cc8f63a4b508bf3ebcdf2254b0429b13cd1d31adb6162432a5f" dependencies = [ "assert_matches", "borsh 0.10.3", @@ -3362,9 +3370,9 @@ dependencies = [ [[package]] name = "spl-tlv-account-resolution" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062e148d3eab7b165582757453632ffeef490c02c86a48bfdb4988f63eefb3b9" +checksum = "615d381f48ddd2bb3c57c7f7fb207591a2a05054639b18a62e785117dd7a8683" dependencies = [ "bytemuck", "solana-program", @@ -3391,26 +3399,41 @@ dependencies = [ [[package]] name = "spl-token-2022" -version = "0.9.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4abf34a65ba420584a0c35f3903f8d727d1f13ababbdc3f714c6b065a686e86" +checksum = "d697fac19fd74ff472dfcc13f0b442dd71403178ce1de7b5d16f83a33561c059" dependencies = [ "arrayref", "bytemuck", "num-derive 0.4.1", "num-traits", - "num_enum 0.7.0", + "num_enum 0.7.2", "solana-program", + "solana-security-txt", "solana-zk-token-sdk", "spl-memo", "spl-pod", "spl-token", + "spl-token-group-interface", "spl-token-metadata-interface", "spl-transfer-hook-interface", "spl-type-length-value", "thiserror", ] +[[package]] +name = "spl-token-group-interface" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b889509d49fa74a4a033ca5dae6c2307e9e918122d97e58562f5c4ffa795c75d" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", +] + [[package]] name = "spl-token-metadata-interface" version = "0.2.0" @@ -3427,9 +3450,9 @@ dependencies = [ [[package]] name = "spl-transfer-hook-interface" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "051d31803f873cabe71aec3c1b849f35248beae5d19a347d93a5c9cccc5d5a9b" +checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259" dependencies = [ "arrayref", "bytemuck", @@ -4216,6 +4239,26 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + [[package]] name = "zeroize" version = "1.3.0" diff --git a/Cargo.toml b/Cargo.toml index 5af7915..a4d7196 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,8 @@ [workspace] members = [ - "plerkle", # 1.6.0+solana.1.17.12 + "plerkle", # 1.6.0+solana.1.17.15 "plerkle_messenger", # 1.6.6 - "plerkle_serialization", # 1.6.0+solana.1.17.12 + "plerkle_serialization", # 1.6.0+solana.1.17.15 ] [profile.release] diff --git a/plerkle/Cargo.toml b/plerkle/Cargo.toml index 5c7925e..cbe6145 100644 --- a/plerkle/Cargo.toml +++ b/plerkle/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "plerkle" description = "Geyser plugin with dynamic config reloading, message bus agnostic abstractions and a whole lot of fun." -version = "1.6.0+solana.1.17.12" +version = "1.6.0+solana.1.17.15" authors = ["Metaplex Developers "] repository = "https://github.com/metaplex-foundation/digital-asset-validator-plugin" license = "AGPL-3.0" @@ -31,10 +31,10 @@ plerkle_serialization = { path = "../plerkle_serialization", version = "1.6.0" } serde = "1.0.144" serde_derive = "1.0.103" serde_json = "1.0.83" -solana-geyser-plugin-interface = "=1.17.12" -solana-logger = "=1.17.12" -solana-sdk = "=1.17.12" -solana-transaction-status = "=1.17.12" +solana-geyser-plugin-interface = "=1.17.15" +solana-logger = "=1.17.15" +solana-sdk = "=1.17.15" +solana-transaction-status = "=1.17.15" thiserror = "1.0.30" tokio = { version = "1.23.0", features = ["full"] } tracing = "0.1.37" diff --git a/plerkle_serialization/Cargo.toml b/plerkle_serialization/Cargo.toml index bd575f7..af6525c 100644 --- a/plerkle_serialization/Cargo.toml +++ b/plerkle_serialization/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "plerkle_serialization" description = "Metaplex Flatbuffers Plerkle Serialization for Geyser plugin producer/consumer patterns." -version = "1.6.0+solana.1.17.12" +version = "1.6.0+solana.1.17.15" authors = ["Metaplex Developers "] repository = "https://github.com/metaplex-foundation/digital-asset-validator-plugin" license = "AGPL-3.0" @@ -14,8 +14,8 @@ bs58 = "0.4.0" chrono = "0.4.22" flatbuffers = "23.1.21" serde = "1.0.152" -solana-sdk = "=1.17.12" -solana-transaction-status = "=1.17.12" +solana-sdk = "=1.17.15" +solana-transaction-status = "=1.17.15" thiserror = "1.0.32" [package.metadata.docs.rs]