From c6ee837530b98bd7ff0eab1f77381f2813ccfc14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Apr 2022 23:30:09 +0000 Subject: [PATCH] Bump anchor-spl from 0.22.1 to 0.24.2 Bumps anchor-spl from 0.22.1 to 0.24.2. --- updated-dependencies: - dependency-name: anchor-spl dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 411 +++++++++++++++++++++++++-------- programs/save-token/Cargo.toml | 2 +- 2 files changed, 322 insertions(+), 91 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 49087a5..ff24ea6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,7 +28,21 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb45cc9d1ce72e5eda341126de495a2c3810108c2333c6f3b4e09d99605f3f48" dependencies = [ - "anchor-syn", + "anchor-syn 0.22.1", + "anyhow", + "proc-macro2", + "quote", + "regex", + "syn", +] + +[[package]] +name = "anchor-attribute-access-control" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b75d05b6b4ac9d95bb6e3b786b27d3a708c4c5a87c92ffaa25bbe9ae4c5d91" +dependencies = [ + "anchor-syn 0.24.2", "anyhow", "proc-macro2", "quote", @@ -42,7 +56,22 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16406bd1c27ff4ebdca4f5d5b09b7952f4d161f25094243e09355797c6bddaa6" dependencies = [ - "anchor-syn", + "anchor-syn 0.22.1", + "anyhow", + "bs58 0.4.0", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + +[[package]] +name = "anchor-attribute-account" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "485351a6d8157750d10d88c8e256f1bf8339262b2220ae9125aed3471309b5de" +dependencies = [ + "anchor-syn 0.24.2", "anyhow", "bs58 0.4.0", "proc-macro2", @@ -57,7 +86,18 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d347ce462ceba4473d216bab2c9d0d9702a027d25e93b5376d8d8593d9e13de0" dependencies = [ - "anchor-syn", + "anchor-syn 0.22.1", + "proc-macro2", + "syn", +] + +[[package]] +name = "anchor-attribute-constant" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc632c540913dd051a78b00587cc47f57013d303163ddfaf4fa18717f7ccc1e0" +dependencies = [ + "anchor-syn 0.24.2", "proc-macro2", "syn", ] @@ -68,7 +108,19 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "354582d796f8309252d18f787f0e49df8ab6fdfe48f838f059f001ee2f04b5c8" dependencies = [ - "anchor-syn", + "anchor-syn 0.22.1", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "anchor-attribute-error" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b5bd1dcfa7f3bc22dacef233d70a9e0bee269c4ac484510662f257cba2353a1" +dependencies = [ + "anchor-syn 0.24.2", "proc-macro2", "quote", "syn", @@ -80,7 +132,20 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a2e218dd8a446993463e38c00159349ae25aa76076191cde0ba460c9c65a180" dependencies = [ - "anchor-syn", + "anchor-syn 0.22.1", + "anyhow", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "anchor-attribute-event" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c6f9e6ce551ac9a177a45c99a65699a860c9e95fac68675138af1246e2591b0" +dependencies = [ + "anchor-syn 0.24.2", "anyhow", "proc-macro2", "quote", @@ -93,7 +158,21 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e1e536e15b13e3168cf878a90b1bd2dfff1b4c8c9475be4b87f71b20cf8e85d" dependencies = [ - "anchor-syn", + "anchor-syn 0.22.1", + "anyhow", + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "anchor-attribute-interface" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d104aa17418cb329ed7418b227e083d5f326a27f26ce98f5d92e33da62a5f459" +dependencies = [ + "anchor-syn 0.24.2", "anyhow", "heck", "proc-macro2", @@ -107,7 +186,20 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6519b3ac626c1bd9df407fe22ec6a283f4b1067ee7f3be896ca580be510b7196" dependencies = [ - "anchor-syn", + "anchor-syn 0.22.1", + "anyhow", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "anchor-attribute-program" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6831b920b173c004ddf7ae1167d1d25e9f002ffcb1773bbc5c7ce532a4441e1" +dependencies = [ + "anchor-syn 0.24.2", "anyhow", "proc-macro2", "quote", @@ -120,7 +212,20 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88e6a21070bcb053f092a1a9054924e8a1b5afd68f7317d0138327401ac154e1" dependencies = [ - "anchor-syn", + "anchor-syn 0.22.1", + "anyhow", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "anchor-attribute-state" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde147b10c71d95dc679785db0b5f3abac0091f789167aa62ac0135e2f54e8b9" +dependencies = [ + "anchor-syn 0.24.2", "anyhow", "proc-macro2", "quote", @@ -133,7 +238,20 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09a65890c2132f30a3ff160fb83f74e0a0454f904f46f1c9be38d3e94c2d06ed" dependencies = [ - "anchor-syn", + "anchor-syn 0.22.1", + "anyhow", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "anchor-derive-accounts" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cde98a0e1a56046b040ff591dfda391f88917af2b6487d02b45093c05be3514" +dependencies = [ + "anchor-syn 0.24.2", "anyhow", "proc-macro2", "quote", @@ -146,15 +264,39 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef066f4bc0cb4080ff6244b6a66ef31b6077e0302738b365ca894540f5b7dcf8" 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.22.1", + "anchor-attribute-account 0.22.1", + "anchor-attribute-constant 0.22.1", + "anchor-attribute-error 0.22.1", + "anchor-attribute-event 0.22.1", + "anchor-attribute-interface 0.22.1", + "anchor-attribute-program 0.22.1", + "anchor-attribute-state 0.22.1", + "anchor-derive-accounts 0.22.1", + "arrayref", + "base64 0.13.0", + "bincode", + "borsh", + "bytemuck", + "solana-program", + "thiserror", +] + +[[package]] +name = "anchor-lang" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a85dd2c5e29e20c7f4701a43724d6cd5406d0ee5694705522e43da0f26542a84" +dependencies = [ + "anchor-attribute-access-control 0.24.2", + "anchor-attribute-account 0.24.2", + "anchor-attribute-constant 0.24.2", + "anchor-attribute-error 0.24.2", + "anchor-attribute-event 0.24.2", + "anchor-attribute-interface 0.24.2", + "anchor-attribute-program 0.24.2", + "anchor-attribute-state 0.24.2", + "anchor-derive-accounts 0.24.2", "arrayref", "base64 0.13.0", "bincode", @@ -170,7 +312,19 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bcdf03d76450451f6c587098fa0d9775dc7eabf9173c89bd1bb17dd72b49e748" dependencies = [ - "anchor-lang", + "anchor-lang 0.22.1", + "solana-program", + "spl-associated-token-account", + "spl-token", +] + +[[package]] +name = "anchor-spl" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0188c33b4a3c124c4e593f2b440415aaea70a7650fac6ba0772395385d71c003" +dependencies = [ + "anchor-lang 0.24.2", "solana-program", "spl-associated-token-account", "spl-token", @@ -190,7 +344,26 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.9.9", + "sha2", + "syn", + "thiserror", +] + +[[package]] +name = "anchor-syn" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03549dc2eae0b20beba6333b14520e511822a6321cdb1760f841064a69347316" +dependencies = [ + "anyhow", + "bs58 0.3.1", + "heck", + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "serde", + "serde_json", + "sha2", "syn", "thiserror", ] @@ -213,6 +386,17 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + [[package]] name = "autocfg" version = "1.1.0" @@ -266,6 +450,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ + "block-padding", "generic-array", ] @@ -278,6 +463,12 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-padding" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" + [[package]] name = "borsh" version = "0.9.3" @@ -489,6 +680,19 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +[[package]] +name = "env_logger" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + [[package]] name = "feature-probe" version = "0.1.1" @@ -536,8 +740,8 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13faf0a2a2750e55fbd29243615c21ed00f1c3dcec43d8009cc7b97bf16013d9" dependencies = [ - "anchor-lang", - "anchor-spl", + "anchor-lang 0.22.1", + "anchor-spl 0.24.2", "num-traits", "smart-wallet", "vipers", @@ -561,6 +765,15 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + [[package]] name = "hmac" version = "0.8.1" @@ -582,6 +795,21 @@ dependencies = [ "hmac", ] +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + [[package]] name = "itertools" version = "0.10.3" @@ -639,7 +867,7 @@ dependencies = [ "libsecp256k1-gen-genmult", "rand", "serde", - "sha2 0.9.9", + "sha2", "typenum", ] @@ -687,8 +915,8 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60447cebc0c76adc1cb71adaa9bd63b0acc7a6a1b3ae75c8c3242683f28acfbd" dependencies = [ - "anchor-lang", - "anchor-spl", + "anchor-lang 0.22.1", + "anchor-spl 0.24.2", "govern", "num-traits", "vipers", @@ -773,25 +1001,27 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "parking_lot" -version = "0.12.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ + "instant", "lock_api", "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.9.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" +checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ "cfg-if", + "instant", "libc", "redox_syscall", "smallvec", - "windows-sys", + "winapi", ] [[package]] @@ -942,8 +1172,8 @@ checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" name = "save-token" version = "0.1.3" dependencies = [ - "anchor-lang", - "anchor-spl", + "anchor-lang 0.22.1", + "anchor-spl 0.24.2", "locked-voter", "num-traits", "vipers", @@ -1015,25 +1245,16 @@ dependencies = [ "opaque-debug", ] -[[package]] -name = "sha2" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.3", -] - [[package]] name = "sha3" -version = "0.10.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881bf8156c87b6301fc5ca6b27f11eeb2761224c7081e69b409d5a1951a70c86" +checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" dependencies = [ - "digest 0.10.3", + "block-buffer 0.9.0", + "digest 0.9.0", "keccak", + "opaque-debug", ] [[package]] @@ -1048,15 +1269,15 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2105a0791534600f4620cae5c91efc080f7aefa5298b942e13c2177eae57ebef" dependencies = [ - "anchor-lang", + "anchor-lang 0.22.1", "vipers", ] [[package]] name = "solana-frozen-abi" -version = "1.10.0" +version = "1.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f704637b29f1d58b819601efede8eff0998ec10381cb96796dacfe4cfea5581" +checksum = "f0a9783aac947e789852cbd6f4650521f8f6f744cba5fc0524a8bc104fa11e01" dependencies = [ "bs58 0.4.0", "bv", @@ -1066,16 +1287,17 @@ dependencies = [ "rustc_version", "serde", "serde_derive", - "sha2 0.10.2", + "sha2", "solana-frozen-abi-macro", + "solana-logger", "thiserror", ] [[package]] name = "solana-frozen-abi-macro" -version = "1.10.0" +version = "1.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bf045e938c042c59739ba3a77bf1d25cb7cf073bbf3690cc2d56c7cff27ba2" +checksum = "f32ebf882f69105e64e283966d9ce0dd22696aec8b8de9bb6b61ea26c7fc896a" dependencies = [ "proc-macro2", "quote", @@ -1083,11 +1305,22 @@ dependencies = [ "syn", ] +[[package]] +name = "solana-logger" +version = "1.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa8b0587f360598ef3a9444e05dce63e701a5c008c54101f54707b5f5852ec09" +dependencies = [ + "env_logger", + "lazy_static", + "log", +] + [[package]] name = "solana-program" -version = "1.10.0" +version = "1.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "888f50c71dc45a528cb63df960e657601fe6fa3d643159d93ebff1dd1cc00b63" +checksum = "252118d7b708b0bec7e1ec5aeb3397843c8d9dbe8946f04fcebed06c5d3a32c7" dependencies = [ "base64 0.13.0", "bincode", @@ -1116,10 +1349,11 @@ dependencies = [ "serde", "serde_bytes", "serde_derive", - "sha2 0.10.2", + "sha2", "sha3", "solana-frozen-abi", "solana-frozen-abi-macro", + "solana-logger", "solana-sdk-macro", "thiserror", "wasm-bindgen", @@ -1127,9 +1361,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.10.0" +version = "1.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2388e9b1690e83413393f3e20d98551cbebae9d9385397600d25ae9992873736" +checksum = "6340ca326c8a919575e594a3ca71a380c233ae2615f62acd15c7af4f2aafb21d" dependencies = [ "bs58 0.4.0", "proc-macro2", @@ -1179,6 +1413,15 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + [[package]] name = "thiserror" version = "1.0.30" @@ -1238,8 +1481,8 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7fa532cf7883844a9ca02b4b3baf96efd02926f32ec67dc22b2fb3c2349b3dc" dependencies = [ - "anchor-lang", - "anchor-spl", + "anchor-lang 0.22.1", + "anchor-spl 0.22.1", ] [[package]] @@ -1319,47 +1562,35 @@ dependencies = [ ] [[package]] -name = "windows-sys" -version = "0.32.0" +name = "winapi" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", ] [[package]] -name = "windows_aarch64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" - -[[package]] -name = "windows_i686_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" - -[[package]] -name = "windows_i686_msvc" -version = "0.32.0" +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] -name = "windows_x86_64_gnu" -version = "0.32.0" +name = "winapi-util" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] [[package]] -name = "windows_x86_64_msvc" -version = "0.32.0" +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "yansi" @@ -1373,8 +1604,8 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9dd59b1b49e0ca3de5f04452d2017d2e16c1155ea5f8aa1638f57a7b02f3f657" dependencies = [ - "anchor-lang", - "anchor-spl", + "anchor-lang 0.22.1", + "anchor-spl 0.22.1", "num-traits", "vipers", ] diff --git a/programs/save-token/Cargo.toml b/programs/save-token/Cargo.toml index 5244cd7..86f2056 100644 --- a/programs/save-token/Cargo.toml +++ b/programs/save-token/Cargo.toml @@ -22,7 +22,7 @@ default = [] [dependencies] anchor-lang = "^0.22" -anchor-spl = "^0.22" +anchor-spl = "^0.24" locked-voter = { version = "^0.5.1", features = ["cpi"] } num-traits = "0.2" vipers = "^2.0"