diff --git a/Cargo.lock b/Cargo.lock index 48db23164c..902149dc1a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -294,7 +294,7 @@ dependencies = [ "spl-associated-token-account", "spl-memo", "spl-token 4.0.0", - "spl-token-2022", + "spl-token-2022 1.0.0", ] [[package]] @@ -2363,12 +2363,13 @@ dependencies = [ [[package]] name = "light-poseidon" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949bdd22e4ed93481d45e9a6badb34b99132bcad0c8a8d4f05c42f7dcc7b90bc" +checksum = "3c9a85a9752c549ceb7578064b4ed891179d20acd85f27318573b64d2d7ee7ee" dependencies = [ "ark-bn254", "ark-ff", + "num-bigint 0.4.4", "thiserror", ] @@ -2663,11 +2664,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]] @@ -2696,9 +2697,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", @@ -3766,9 +3767,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d67ecc499b9cc79c9f34c1bbae2ba3f102d9bfaa78f48ad49d11f433bc4c7b4" +checksum = "c48541b782c0fbb15ac202f2487353c3649fbf868afacae6ca1c9fe0f7df0b4a" dependencies = [ "Inflector", "base64 0.21.4", @@ -3782,7 +3783,7 @@ dependencies = [ "solana-config-program", "solana-sdk", "spl-token 4.0.0", - "spl-token-2022", + "spl-token-2022 0.9.0", "spl-token-metadata-interface", "thiserror", "zstd", @@ -3790,9 +3791,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26cf9322dc6cad9902a6a5ef77ad9cd9149b64c757c1ffa536c4243bd7136159" +checksum = "c3a78952f057a7d4f87b3a6a5f4a8705cefbb67bbc00ecffc2c75b168a54c931" dependencies = [ "chrono", "clap 2.34.0", @@ -3807,9 +3808,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e3476dc3b63bb2e0da304f10df299b20942ae57054eaed2cc411a5449876bd" +checksum = "679dc3185379986a1cfa8dce737a59a9899b8114a38cb8e184bac228fabb4a04" dependencies = [ "dirs-next", "lazy_static", @@ -3823,9 +3824,9 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df5d23b030f09ea0a3e0d89d22b453849e33f45a89ef0eeae152a21c58752985" +checksum = "4e85b1d68bce244750bd02c4d71ed0df415c9b8d91a4b0f1e7ce6b97748db46c" dependencies = [ "async-trait", "bincode", @@ -3856,9 +3857,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "117a5204fb9e7982f2058373d3f21b7997846aed4ca562cf6e84aef4c729c75b" +checksum = "7c66c9c5bbc148affd42127061af9c0e7e5901b5e5142e951912f165272203c1" dependencies = [ "bincode", "chrono", @@ -3870,9 +3871,9 @@ dependencies = [ [[package]] name = "solana-connection-cache" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c2f6c76632ec5d6e59aae8fe13095d27c3ae2af143f6973684856babdcd2da" +checksum = "4180686b6384013f062242ee9f18ea6ea68268e9b35fa9aa0206c2a622d1773f" dependencies = [ "async-trait", "bincode", @@ -3892,9 +3893,9 @@ dependencies = [ [[package]] name = "solana-faucet" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cd45403c75e5104c79f6875b2326196af76572534c80cfadaed3145ed087aa" +checksum = "13fbc9d1c48031c7fce035bb139e82a2a4fcfcc2bb189dd973fdba158eff1d8c" dependencies = [ "bincode", "byteorder", @@ -3916,9 +3917,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdc9268b1abba206e1a8a234473eb5f7f7af660a86e4d468e7e79b3e5667aa9" +checksum = "174a53486f9e0774680c2b6a53568a15c11ccc5cef1263a7e7d42958bfd61792" dependencies = [ "ahash 0.8.6", "blake3", @@ -3946,9 +3947,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86118cc8437c60d1a474501f6095df880aaac422ab04523a984015c5b7334428" +checksum = "e69b9bc56d9f92bd194569091d655be239a51a934df1db247e0c8bd2a9352909" dependencies = [ "proc-macro2", "quote", @@ -3958,9 +3959,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "060dcc6a1ee83aa2df01126e0319b17a84d13251b7660fa1e69241e110252779" +checksum = "ccb457626944fd2f192285c8281e887081dc346920c181aaf165426dbf081859" dependencies = [ "env_logger", "lazy_static", @@ -3969,9 +3970,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a23bcca30fdb20efb5f2d81d61ad9cf1ec0f0141b3bbc095835140db72930f" +checksum = "0b2a8bb3ec59a415b1c30827001c38af358a0c244e00a3d5280ca0b0ed264036" dependencies = [ "log", "solana-sdk", @@ -3979,9 +3980,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2d29f683e800cbfb836ceec63fdbf5f42388c21fdacb2e16160b10be3b08cd" +checksum = "3c89e3237a73f781e0156fe419831c554f6807eb4f4bffea42535be9627d6fc1" dependencies = [ "crossbeam-channel", "gethostname", @@ -3994,9 +3995,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687c740f5b45166666e016ac43cc1001fa5bf9e8f7b9e24cb0a554c6ce35bfd6" +checksum = "0ec445e2d9dbfab7360bc0d846a676e318c13eb4d1e0359ef199187d07795d02" dependencies = [ "bincode", "clap 3.2.25", @@ -4016,9 +4017,9 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d0b706a083218777c52adbb6138b96c143e06031d41ec9c32cf1da9c352c7c" +checksum = "c7b58cc4a2f4f450361bc8c1a24a94383c659e6212a74e6080a410f7d87e05a6" dependencies = [ "ahash 0.8.6", "bincode", @@ -4033,7 +4034,10 @@ dependencies = [ "nix", "rand 0.8.5", "rayon", + "rustc_version", "serde", + "solana-frozen-abi", + "solana-frozen-abi-macro", "solana-metrics", "solana-rayon-threadlimit", "solana-sdk", @@ -4042,9 +4046,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c940ad70659c2366331fd136d67cc968acadbc1f6ad13cff9ffe7e392aa831" +checksum = "c183d16916dd70ce2b59a4b39088f5094649a592e475fb9ebfc3cfe78b3a192c" dependencies = [ "ark-bn254", "ark-ec", @@ -4096,9 +4100,9 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ffcc34819f5b9da3c5ba4045d572e97a60544b8ed49d604ab0a9cc990f875e2" +checksum = "1fca7d79b03e54e108069f32cf553c863838b647be7f7135644f8a1d2bdcd3a1" dependencies = [ "base64 0.21.4", "bincode", @@ -4124,9 +4128,9 @@ dependencies = [ [[package]] name = "solana-pubsub-client" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076dbe759e2c86aa5c8b57575d2bd593980bde82b59cb6192261b5d6111dfcd1" +checksum = "d90c6e27f0d1e627728f137db688c45accb1b7ae839021b978d1dcceff40d7a3" dependencies = [ "crossbeam-channel", "futures-util", @@ -4149,9 +4153,9 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5bbf483ec8e440a80b02ef4aa37d0cb6dc77403dc8dfd1a72bdba90429539a" +checksum = "f340646d1bdd7b7c8e0c71f1f817a4eaeba35c06f025944c52df8f82bb565c79" dependencies = [ "async-mutex", "async-trait", @@ -4176,9 +4180,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f23c92c4fb6a1036b7910fb86fbfbf213fabcb3f0d143e6472511d312e0091e" +checksum = "7effa9e68a7ab9883f7fb4a91c083970223e8e8e355979eb605279608fafa6b7" dependencies = [ "lazy_static", "num_cpus", @@ -4186,9 +4190,9 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7545aa3e2201494e3a1379bb487caa1081786ddf17959ffb819eef9c9202db" +checksum = "e59fee3edad929473b7178f84ae58dbb3feb004a26873c8ab557b3aecfaa6d87" dependencies = [ "console", "dialoguer", @@ -4205,9 +4209,9 @@ dependencies = [ [[package]] name = "solana-rpc-client" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e24f3f022731f854f97fa88190a4bdf4a6a2e11704999ef4882320d7edc4eb" +checksum = "94ae66b579851b5142ace6133b95192b38f9a72fb4a81ce936f0af92977c062f" dependencies = [ "async-trait", "base64 0.21.4", @@ -4231,9 +4235,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae82221d8d5d447cdc27355caa54f96f52af195a984f70c7e8fa0d8e4a4b0f3" +checksum = "e0a62a61c8c5989f2b5e4b75bda30b4647ad4affbcfe4a2890b1adb05e2b54c8" dependencies = [ "base64 0.21.4", "bs58 0.4.0", @@ -4247,15 +4251,15 @@ dependencies = [ "solana-sdk", "solana-transaction-status", "solana-version", - "spl-token-2022", + "spl-token-2022 0.9.0", "thiserror", ] [[package]] name = "solana-rpc-client-nonce-utils" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0795902effc5404f43a0a54a489f9d84a5c7eb62164234288690a608582ee4a" +checksum = "9db51df524aceb35e305b735086191db052dc163d09b6d5d9be65e216ab7413b" dependencies = [ "clap 2.34.0", "solana-clap-utils", @@ -4266,9 +4270,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db7ae7c80ba537e4b8c1b4655fda680aa1452c8c955113f985b74b235fc3102" +checksum = "284587e20a7256621b6061589a6d7f9fc1c1bcb9f25d183555034f7817ec49a6" dependencies = [ "assert_matches", "base64 0.21.4", @@ -4320,9 +4324,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1da4a7421c09ee4dbf81df06407933d4f68f8990ae87a2feaee6e1b03c97d1d" +checksum = "5fee7090babd8fe6cedd2e377366979464d29fa958bf5fc6554f6c7577b73fd4" dependencies = [ "bs58 0.4.0", "proc-macro2", @@ -4331,11 +4335,17 @@ dependencies = [ "syn 2.0.37", ] +[[package]] +name = "solana-security-txt" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" + [[package]] name = "solana-streamer" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28b4f623d32af2793e7ebdd24bd04f704a77f6a7975cf8204275ebc918d4685" +checksum = "4219f40db983a290ea75212b9e47013a47715eb224ca18e05bd094d86baefc37" dependencies = [ "async-channel", "bytes", @@ -4365,9 +4375,9 @@ dependencies = [ [[package]] name = "solana-thin-client" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ec81c9b19cc3a02e423782758305c63460b664912217e61e273e0105f7dc0b" +checksum = "7f8d9eb19550425cbb6a96fdea18171a2e44529414fe09f8cf7a238a78fd9a37" dependencies = [ "bincode", "log", @@ -4380,9 +4390,9 @@ dependencies = [ [[package]] name = "solana-tpu-client" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf9e6a85761ebc7be477e95b5787f206e6f64d09d297006881edbe30c99106d0" +checksum = "795d4d7e76f87640d7a3d1ab6ebc2376d9b9d76a7c2664653628dc6f4bc64ecc" dependencies = [ "async-trait", "bincode", @@ -4404,9 +4414,9 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2eaba311b1be47ae8a1ed8d082d2c35cd89a39c5daf73514668c735574d4ecd" +checksum = "176b554ca42e29abd21d56f31c01599f9b334e65b22911bcdb691b9b02706636" dependencies = [ "Inflector", "base64 0.21.4", @@ -4423,15 +4433,15 @@ dependencies = [ "spl-associated-token-account", "spl-memo", "spl-token 4.0.0", - "spl-token-2022", + "spl-token-2022 0.9.0", "thiserror", ] [[package]] name = "solana-udp-client" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f3750d7c9218e2a0e5ad73b62e293a71489c6425e64e98d5315dc64939eee6" +checksum = "0a60895d452a9e2de1115d4ebaef537fb608b9a6e206cb7b24c82881a35348e3" dependencies = [ "async-trait", "solana-connection-cache", @@ -4444,9 +4454,9 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19dc9876647351f50ac415afcd9bc8ea3892883a077cd240f84490a0670ab021" +checksum = "572a7a0f49ee43473c2f235432f98b2594c3a4e8cc9a1befd7a085be8192f5bd" dependencies = [ "log", "rustc_version", @@ -4460,9 +4470,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "480b27798516d7065b358f3ec056b2ede79e0dc8406a9697c6028f289a09398d" +checksum = "89cffa52ab296ccc95ced7ae7875534cb4fd1cbb0bd9b8ad20e7ec55f15bcd5d" dependencies = [ "bincode", "log", @@ -4482,9 +4492,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.17.0" +version = "1.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8690fff97c3cb2acfdb49d126f8b958736884f58bd1c7fd2230984f132095f05" +checksum = "a3e8e2f6c0d78bc9eb07efc1fcd034dd0fcc508af8809343ac861096aab84876" dependencies = [ "aes-gcm-siv", "base64 0.21.4", @@ -4511,9 +4521,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "103318aa365ff7caa8cf534f2246b5eb7e5b34668736d52b1266b143f7a21196" +checksum = "3d457cc2ba742c120492a64b7fa60e22c575e891f6b55039f4d736568fb112a3" dependencies = [ "byteorder", "combine", @@ -4570,7 +4580,7 @@ dependencies = [ "num-traits", "solana-program", "spl-token 4.0.0", - "spl-token-2022", + "spl-token-2022 0.9.0", "thiserror", ] @@ -4670,6 +4680,20 @@ dependencies = [ "spl-type-length-value", ] +[[package]] +name = "spl-tlv-account-resolution" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "615d381f48ddd2bb3c57c7f7fb207591a2a05054639b18a62e785117dd7a8683" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-type-length-value", +] + [[package]] name = "spl-token" version = "3.5.0" @@ -4710,18 +4734,55 @@ dependencies = [ "bytemuck", "num-derive 0.4.0", "num-traits", - "num_enum 0.7.0", + "num_enum 0.7.2", "solana-program", "solana-zk-token-sdk", "spl-memo", "spl-pod", "spl-token 4.0.0", "spl-token-metadata-interface", - "spl-transfer-hook-interface", + "spl-transfer-hook-interface 0.3.0", "spl-type-length-value", "thiserror", ] +[[package]] +name = "spl-token-2022" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d697fac19fd74ff472dfcc13f0b442dd71403178ce1de7b5d16f83a33561c059" +dependencies = [ + "arrayref", + "bytemuck", + "num-derive 0.4.0", + "num-traits", + "num_enum 0.7.2", + "solana-program", + "solana-security-txt", + "solana-zk-token-sdk", + "spl-memo", + "spl-pod", + "spl-token 4.0.0", + "spl-token-group-interface", + "spl-token-metadata-interface", + "spl-transfer-hook-interface 0.4.1", + "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" @@ -4748,7 +4809,23 @@ dependencies = [ "spl-discriminator", "spl-pod", "spl-program-error", - "spl-tlv-account-resolution", + "spl-tlv-account-resolution 0.4.0", + "spl-type-length-value", +] + +[[package]] +name = "spl-transfer-hook-interface" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259" +dependencies = [ + "arrayref", + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-tlv-account-resolution 0.5.1", "spl-type-length-value", ] diff --git a/spl/Cargo.toml b/spl/Cargo.toml index 62d7b02722..4daac5382e 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -34,5 +34,5 @@ solana-program = ">=1.16, <1.18" spl-associated-token-account = { version = "2.2", features = ["no-entrypoint"], optional = true } spl-memo = { version = "4", features = ["no-entrypoint"], optional = true } spl-token = { version = "4", features = ["no-entrypoint"], optional = true } -spl-token-2022 = { version = "0.9", features = ["no-entrypoint"], optional = true } +spl-token-2022 = { version = "1", features = ["no-entrypoint"], optional = true }