diff --git a/Cargo.lock b/Cargo.lock index 3f5b5b9233..8b89db3c61 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -56,18 +56,41 @@ dependencies = [ [[package]] name = "agave-feature-set" -version = "2.3.13" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a2c365c0245cbb8959de725fc2b44c754b673fdf34c9a7f9d4a25c35a7bf1" +checksum = "46d1952a88b05452abceefc1a29de30328b0fc7945c3bc76a616ef5a6aced9b7" dependencies = [ "ahash", - "solana-epoch-schedule 2.2.1", - "solana-hash 2.3.0", - "solana-pubkey 2.4.0", - "solana-sha256-hasher 2.3.0", + "solana-epoch-schedule", + "solana-hash", + "solana-pubkey 3.0.0", + "solana-sha256-hasher", "solana-svm-feature-set", ] +[[package]] +name = "agave-logger" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a88369b551764e076b65506dd62b77432041b2ccab7f709bce54a724e9532464" +dependencies = [ + "env_logger", + "libc", + "log", + "signal-hook", +] + +[[package]] +name = "agave-reserved-account-keys" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "817aa62f6e6cdb4d9a40278b522f3f014ae8183f4c266ab22cb71455ecd62c55" +dependencies = [ + "agave-feature-set", + "solana-pubkey 3.0.0", + "solana-sdk-ids", +] + [[package]] name = "ahash" version = "0.8.11" @@ -195,10 +218,18 @@ dependencies = [ "serde_json", "shellexpand", "solana-cli-config", + "solana-clock", + "solana-commitment-config", + "solana-compute-budget-interface", "solana-faucet", + "solana-instruction", + "solana-keypair", + "solana-pubkey 4.0.0", "solana-rpc-client", - "solana-sdk", + "solana-signature", "solana-signer", + "solana-system-interface", + "solana-transaction", "syn 1.0.109", "tar", "toml 0.7.8", @@ -216,11 +247,15 @@ dependencies = [ "serde", "solana-account", "solana-account-decoder", + "solana-commitment-config", + "solana-instruction", + "solana-program", "solana-pubsub-client", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk", + "solana-signature", "solana-signer", + "solana-transaction", "thiserror 1.0.66", "tokio", "url", @@ -273,26 +308,27 @@ dependencies = [ "borsh 1.5.7", "bytemuck", "const-crypto", - "solana-account-info 2.3.0", - "solana-clock 2.2.2", - "solana-cpi 2.2.1", - "solana-define-syscall 2.3.0", + "solana-account-info", + "solana-clock", + "solana-cpi", + "solana-define-syscall 3.0.0", "solana-feature-gate-interface", - "solana-instruction 2.3.0", - "solana-instructions-sysvar 2.2.2", + "solana-instruction", + "solana-instructions-sysvar", "solana-invoke", - "solana-loader-v3-interface 3.0.0", - "solana-msg 2.2.1", - "solana-program-entrypoint 2.3.0", - "solana-program-error 2.2.2", - "solana-program-memory 2.3.1", - "solana-program-option 2.2.1", - "solana-program-pack 2.2.1", - "solana-pubkey 2.4.0", - "solana-sdk-ids 2.2.1", - "solana-system-interface 1.0.0", - "solana-sysvar 2.3.0", - "solana-sysvar-id 2.2.1", + "solana-loader-v3-interface", + "solana-msg", + "solana-program-entrypoint", + "solana-program-error", + "solana-program-memory", + "solana-program-option", + "solana-program-pack", + "solana-pubkey 4.0.0", + "solana-sdk-ids", + "solana-stake-interface", + "solana-system-interface", + "solana-sysvar", + "solana-sysvar-id", "thiserror 1.0.66", ] @@ -306,7 +342,7 @@ dependencies = [ "regex", "serde", "serde_json", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -322,14 +358,17 @@ name = "anchor-spl" version = "0.32.1" dependencies = [ "anchor-lang", + "base64ct", "borsh 1.5.7", "mpl-token-metadata", - "spl-associated-token-account", - "spl-memo", + "solana-stake-interface", + "solana-sysvar", + "spl-associated-token-account-interface", + "spl-memo-interface", "spl-pod", - "spl-token", - "spl-token-2022", + "spl-token-2022-interface", "spl-token-group-interface", + "spl-token-interface", "spl-token-metadata-interface", ] @@ -345,7 +384,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "syn 1.0.109", "thiserror 1.0.66", ] @@ -423,123 +462,6 @@ version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" -[[package]] -name = "ark-bn254" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f" -dependencies = [ - "ark-ec", - "ark-ff", - "ark-std", -] - -[[package]] -name = "ark-ec" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" -dependencies = [ - "ark-ff", - "ark-poly", - "ark-serialize", - "ark-std", - "derivative", - "hashbrown 0.13.2", - "itertools 0.10.5", - "num-traits", - "zeroize", -] - -[[package]] -name = "ark-ff" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" -dependencies = [ - "ark-ff-asm", - "ark-ff-macros", - "ark-serialize", - "ark-std", - "derivative", - "digest 0.10.7", - "itertools 0.10.5", - "num-bigint", - "num-traits", - "paste", - "rustc_version", - "zeroize", -] - -[[package]] -name = "ark-ff-asm" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ark-ff-macros" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" -dependencies = [ - "num-bigint", - "num-traits", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ark-poly" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" -dependencies = [ - "ark-ff", - "ark-serialize", - "ark-std", - "derivative", - "hashbrown 0.13.2", -] - -[[package]] -name = "ark-serialize" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" -dependencies = [ - "ark-serialize-derive", - "ark-std", - "digest 0.10.7", - "num-bigint", -] - -[[package]] -name = "ark-serialize-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ark-std" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" -dependencies = [ - "num-traits", - "rand 0.8.5", -] - [[package]] name = "arrayref" version = "0.3.9" @@ -552,6 +474,12 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "ascii" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" + [[package]] name = "async-compression" version = "0.4.3" @@ -589,7 +517,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -623,12 +551,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - [[package]] name = "base64" version = "0.21.7" @@ -643,9 +565,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" -version = "1.8.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" +checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3" [[package]] name = "bincode" @@ -667,8 +589,17 @@ name = "bitflags" version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ - "serde_core", + "funty", + "radium", + "tap", + "wyz", ] [[package]] @@ -682,25 +613,44 @@ dependencies = [ "cc", "cfg-if", "constant_time_eq", - "digest 0.10.7", + "digest", ] [[package]] name = "block-buffer" -version = "0.9.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] [[package]] -name = "block-buffer" -version = "0.10.4" +name = "blst" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +checksum = "dcdb4c7013139a150f9fc55d123186dbfaba0d912817466282c73ac49e71fb45" dependencies = [ - "generic-array", + "cc", + "glob", + "threadpool", + "zeroize", +] + +[[package]] +name = "blstrs" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a8a8ed6fefbeef4a8c7b460e4110e12c5e22a5b7cf32621aae6ad650c4dcf29" +dependencies = [ + "blst", + "byte-slice-cast", + "ff", + "group", + "pairing", + "rand_core 0.6.4", + "serde", + "subtle", ] [[package]] @@ -817,6 +767,12 @@ dependencies = [ "serde", ] +[[package]] +name = "byte-slice-cast" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7575182f7272186991736b70173b0ea045398f984bf5ebbb3804736ce1330c9d" + [[package]] name = "bytemuck" version = "1.24.0" @@ -845,9 +801,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" [[package]] name = "cargo_toml" @@ -872,9 +828,9 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg_aliases" @@ -902,6 +858,7 @@ dependencies = [ "iana-time-zone", "js-sys", "num-traits", + "serde", "wasm-bindgen", "windows-link", ] @@ -986,6 +943,19 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +[[package]] +name = "combine" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" +dependencies = [ + "ascii", + "byteorder", + "either", + "memchr", + "unreachable", +] + [[package]] name = "console" version = "0.15.11" @@ -1000,23 +970,16 @@ dependencies = [ ] [[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] - -[[package]] -name = "console_log" -version = "0.2.2" +name = "console" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89f72f65e8501878b8a004d5a1afb780987e2ce2b4532c562e367a72c57499f" +checksum = "b430743a6eb14e9764d4260d4c0d8123087d504eeb9c48f2b2a5e810dd369df4" dependencies = [ - "log", - "web-sys", + "encode_unicode", + "libc", + "once_cell", + "unicode-width 0.2.2", + "windows-sys 0.61.2", ] [[package]] @@ -1090,12 +1053,6 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - [[package]] name = "crypto-bigint" version = "0.5.5" @@ -1119,16 +1076,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "crypto-mac" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" -dependencies = [ - "generic-array", - "subtle", -] - [[package]] name = "ctr" version = "0.9.2" @@ -1138,19 +1085,6 @@ dependencies = [ "cipher", ] -[[package]] -name = "curve25519-dalek" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" -dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", - "subtle", - "zeroize", -] - [[package]] name = "curve25519-dalek" version = "4.1.3" @@ -1160,7 +1094,7 @@ dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", - "digest 0.10.7", + "digest", "fiat-crypto", "rand_core 0.6.4", "rustc_version", @@ -1215,6 +1149,19 @@ dependencies = [ "syn 2.0.107", ] +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + [[package]] name = "data-encoding" version = "2.4.0" @@ -1237,45 +1184,25 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0" -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "dialoguer" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" dependencies = [ - "console", + "console 0.15.11", "shell-words", "tempfile", "zeroize", ] -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - [[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "const-oid", "crypto-common", "subtle", @@ -1333,6 +1260,12 @@ dependencies = [ "syn 2.0.107", ] +[[package]] +name = "eager" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abe71d579d1812060163dff96056261deb5bf6729b100fa2e36a68b9649ba3d3" + [[package]] name = "ecdsa" version = "0.16.9" @@ -1340,46 +1273,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ "der", - "digest 0.10.7", + "digest", "elliptic-curve", "rfc6979", - "signature 2.2.0", + "signature", "spki", ] [[package]] name = "ed25519" -version = "1.5.3" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ - "signature 1.6.4", + "pkcs8", + "signature", ] [[package]] name = "ed25519-dalek" -version = "1.0.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" dependencies = [ - "curve25519-dalek 3.2.0", + "curve25519-dalek", "ed25519", - "rand 0.7.3", + "rand_core 0.6.4", "serde", - "sha2 0.9.9", + "sha2", + "subtle", "zeroize", ] [[package]] name = "ed25519-dalek-bip32" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2be62a4061b872c8c0873ee4fc6f101ce7b889d039f019c5fa2af471a59908" +checksum = "6b49a684b133c4980d7ee783936af771516011c8cd15f429dbda77245e282f03" dependencies = [ "derivation-path", "ed25519-dalek", - "hmac 0.12.1", - "sha2 0.10.8", + "hmac", + "sha2", ] [[package]] @@ -1396,7 +1331,7 @@ checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct", "crypto-bigint", - "digest 0.10.7", + "digest", "ff", "generic-array", "group", @@ -1423,16 +1358,46 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.9.3" +name = "enum-iterator" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94" +dependencies = [ + "enum-iterator-derive", +] + +[[package]] +name = "enum-iterator-derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685adfa4d6f3d765a26bc5dbc936577de9abf756c1feeb3089b01dd395034842" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.107", +] + +[[package]] +name = "env_filter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2" dependencies = [ - "atty", - "humantime", "log", "regex", - "termcolor", +] + +[[package]] +name = "env_logger" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "jiff", + "log", ] [[package]] @@ -1480,6 +1445,7 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" dependencies = [ + "bitvec", "rand_core 0.6.4", "subtle", ] @@ -1512,10 +1478,19 @@ dependencies = [ ] [[package]] -name = "five8_const" -version = "0.1.3" +name = "five8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23f76610e969fa1784327ded240f1e28a3fd9520c9cec93b636fcf62dd37f772" +dependencies = [ + "five8_core", +] + +[[package]] +name = "five8_const" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b4f62f0f8ca357f93ae90c8c2dd1041a1f665fde2f889ea9b1787903829015" +checksum = "1a0f1728185f277989ca573a402716ae0beaaea3f76a8ff87ef9dd8fb19436c5" dependencies = [ "five8_core", ] @@ -1543,28 +1518,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "foreign-types" -version = "0.3.2" +name = "form_urlencoded" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" dependencies = [ - "foreign-types-shared", + "percent-encoding", ] [[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" +name = "funty" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" @@ -1678,30 +1644,35 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.2.10" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", - "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", + "r-efi", + "wasip2", ] +[[package]] +name = "glob" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" + [[package]] name = "group" version = "0.13.0" @@ -1709,7 +1680,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", + "rand 0.8.5", "rand_core 0.6.4", + "rand_xorshift", "subtle", ] @@ -1732,6 +1705,15 @@ dependencies = [ "tracing", ] +[[package]] +name = "hash32" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -1747,6 +1729,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + [[package]] name = "hashbrown" version = "0.15.0" @@ -1784,27 +1772,10 @@ dependencies = [ ] [[package]] -name = "hidapi" -version = "2.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b876ecf37e86b359573c16c8366bc3eba52b689884a0fc42ba3f67203d2a8b" -dependencies = [ - "cc", - "cfg-if", - "libc", - "pkg-config", - "windows-sys 0.48.0", -] - -[[package]] -name = "hmac" -version = "0.8.1" +name = "hermit-abi" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" -dependencies = [ - "crypto-mac", - "digest 0.9.0", -] +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" [[package]] name = "hmac" @@ -1812,18 +1783,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.7", -] - -[[package]] -name = "hmac-drbg" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" -dependencies = [ - "digest 0.9.0", - "generic-array", - "hmac 0.8.1", + "digest", ] [[package]] @@ -1896,9 +1856,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" [[package]] name = "hyper" @@ -2158,14 +2118,14 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.11" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" +checksum = "9375e112e4b463ec1b1c6c011953545c65a30164fbab5b581df32b3abf0dcb88" dependencies = [ - "console", - "number_prefix", + "console 0.16.1", "portable-atomic", "unicode-width 0.2.2", + "unit-prefix", "web-time", ] @@ -2200,15 +2160,6 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.12.1" @@ -2224,6 +2175,30 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +[[package]] +name = "jiff" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49cce2b81f2098e7e3efc35bc2e0a6b7abec9d34128283d7a26fa8f32a6dbb35" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde_core", +] + +[[package]] +name = "jiff-static" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "980af8b43c3ad5d8d349ace167ec8170839f753a42d233ba19e08afe1850fa69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.107", +] + [[package]] name = "jobserver" version = "0.1.32" @@ -2268,18 +2243,17 @@ dependencies = [ "ecdsa", "elliptic-curve", "once_cell", - "sha2 0.10.8", - "signature 2.2.0", + "sha2", + "signature", ] [[package]] name = "kaigan" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ba15de5aeb137f0f65aa3bf82187647f1285abfe5b20c80c2c37f7007ad519a" +checksum = "4f25ded719a2354f6b1a51d0c0741c25bc7afe038617664eb37f6418439eb084" dependencies = [ "borsh 0.10.3", - "serde", ] [[package]] @@ -2309,54 +2283,6 @@ version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" -[[package]] -name = "libsecp256k1" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d220bc1feda2ac231cb78c3d26f27676b8cf82c96971f7aeef3d0cf2797c73" -dependencies = [ - "arrayref", - "base64 0.12.3", - "digest 0.9.0", - "hmac-drbg", - "libsecp256k1-core", - "libsecp256k1-gen-ecmult", - "libsecp256k1-gen-genmult", - "rand 0.7.3", - "serde", - "sha2 0.9.9", - "typenum", -] - -[[package]] -name = "libsecp256k1-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80" -dependencies = [ - "crunchy", - "digest 0.9.0", - "subtle", -] - -[[package]] -name = "libsecp256k1-gen-ecmult" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccab96b584d38fac86a83f07e659f0deafd0253dc096dab5a36d53efe653c5c3" -dependencies = [ - "libsecp256k1-core", -] - -[[package]] -name = "libsecp256k1-gen-genmult" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67abfe149395e3aa1c48a2beb32b068e2334402df8181f818d3aee2b304c4f5d" -dependencies = [ - "libsecp256k1-core", -] - [[package]] name = "linux-raw-sys" version = "0.4.8" @@ -2391,15 +2317,6 @@ version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - [[package]] name = "memoffset" version = "0.9.0" @@ -2453,23 +2370,63 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.61.2", ] [[package]] name = "mpl-token-metadata" -version = "5.1.0" +version = "5.1.2-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989e6a3000e761d3b2d685662a3a9ee99826f9369fb033bd1bc7011b1cf02ed9" +checksum = "301a652c73320ef9778645a831a99b00e3222307c0426d32c5c91ea50705bde0" dependencies = [ - "borsh 0.10.3", + "borsh 1.5.7", + "kaigan", "num-derive 0.3.3", "num-traits", - "solana-program 3.0.0", + "solana-program", + "solana-program-error", "thiserror 1.0.66", ] +[[package]] +name = "nix" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" +dependencies = [ + "bitflags 2.10.0", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset", +] + +[[package]] +name = "num" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" +dependencies = [ + "num-bigint 0.2.6", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-bigint" version = "0.4.6" @@ -2480,6 +2437,16 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-complex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" +dependencies = [ + "autocfg", + "num-traits", +] + [[package]] name = "num-derive" version = "0.3.3" @@ -2511,6 +2478,29 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" +dependencies = [ + "autocfg", + "num-bigint 0.2.6", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -2520,20 +2510,31 @@ dependencies = [ "autocfg", ] +[[package]] +name = "num_cpus" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b" +dependencies = [ + "hermit-abi 0.5.2", + "libc", +] + [[package]] name = "num_enum" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c" dependencies = [ "num_enum_derive", + "rustversion", ] [[package]] name = "num_enum_derive" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -2541,12 +2542,6 @@ dependencies = [ "syn 2.0.107", ] -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - [[package]] name = "once_cell" version = "1.20.2" @@ -2560,41 +2555,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] -name = "openssl" -version = "0.10.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ad14dd45412269e1a30f52ad8f0664f0f4f4a89ee8fe28c3b3527021ebb654" -dependencies = [ - "bitflags 2.10.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.107", -] - -[[package]] -name = "openssl-sys" -version = "0.9.110" +name = "pairing" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a9f0075ba3c21b09f8e8b2026584b1d18d49388648f2fbbf3c97ea8deced8e2" +checksum = "81fec4625e73cf41ef4bb6846cafa6d44736525f442ba45e407c4a000a13996f" dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", + "group", ] [[package]] @@ -2620,12 +2586,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - [[package]] name = "pathdiff" version = "0.2.1" @@ -2634,27 +2594,37 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pbkdf2" -version = "0.4.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "crypto-mac", + "digest", ] [[package]] name = "pbkdf2" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ - "digest 0.10.7", + "digest", + "hmac", ] [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" + +[[package]] +name = "percentage" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "2fd23b938276f14057220b707937bcb42fa76dda7560e57a2da30cb52d557937" +dependencies = [ + "num", +] [[package]] name = "pin-project-lite" @@ -2698,9 +2668,18 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.9.0" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" + +[[package]] +name = "portable-atomic-util" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] [[package]] name = "portpicker" @@ -2726,6 +2705,12 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "pretty-hex" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" + [[package]] name = "proc-macro-crate" version = "0.1.5" @@ -2808,30 +2793,29 @@ dependencies = [ "once_cell", "socket2 0.5.7", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] [[package]] -name = "rand" -version = "0.7.3" +name = "r-efi" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" @@ -2845,13 +2829,13 @@ dependencies = [ ] [[package]] -name = "rand_chacha" -version = "0.2.2" +name = "rand" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha 0.9.0", + "rand_core 0.9.3", ] [[package]] @@ -2865,12 +2849,13 @@ dependencies = [ ] [[package]] -name = "rand_core" -version = "0.5.1" +name = "rand_chacha" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ - "getrandom 0.1.16", + "ppv-lite86", + "rand_core 0.9.3", ] [[package]] @@ -2883,12 +2868,21 @@ dependencies = [ ] [[package]] -name = "rand_hc" -version = "0.2.0" +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +dependencies = [ + "getrandom 0.3.4", +] + +[[package]] +name = "rand_xorshift" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core 0.5.1", + "rand_core 0.6.4", ] [[package]] @@ -3054,7 +3048,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ - "hmac 0.12.1", + "hmac", "subtle", ] @@ -3109,6 +3103,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "rustc-demangle" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" + [[package]] name = "rustc-hash" version = "1.1.0" @@ -3387,20 +3387,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", + "digest", ] [[package]] @@ -3411,7 +3398,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -3426,7 +3413,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest 0.10.7", + "digest", "keccak", ] @@ -3470,28 +3457,16 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" - [[package]] name = "signature" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ - "digest 0.10.7", + "digest", "rand_core 0.6.4", ] -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - [[package]] name = "slab" version = "0.4.9" @@ -3539,27 +3514,27 @@ dependencies = [ [[package]] name = "solana-account" -version = "2.2.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f949fe4edaeaea78c844023bfc1c898e0b1f5a100f8a8d2d0f85d0a7b090258" +checksum = "014dcb9293341241dd153b35f89ea906e4170914f4a347a95e7fb07ade47cd6f" dependencies = [ "bincode", "serde", "serde_bytes", "serde_derive", - "solana-account-info 2.3.0", - "solana-clock 2.2.2", - "solana-instruction 2.3.0", - "solana-pubkey 2.4.0", - "solana-sdk-ids 2.2.1", - "solana-sysvar 2.3.0", + "solana-account-info", + "solana-clock", + "solana-instruction-error", + "solana-pubkey 3.0.0", + "solana-sdk-ids", + "solana-sysvar", ] [[package]] name = "solana-account-decoder" -version = "2.3.13" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba71c97fa4d85ce4a1e0e79044ad0406c419382be598c800202903a7688ce71a" +checksum = "51ad2a25dbfbed06ed34c4fa295a7598e0c7edd6e4381d51fb5276720c7ce7fd" dependencies = [ "Inflector", "base64 0.22.1", @@ -3567,32 +3542,31 @@ dependencies = [ "bs58", "bv", "serde", - "serde_derive", "serde_json", "solana-account", "solana-account-decoder-client-types", - "solana-address-lookup-table-interface 2.2.2", - "solana-clock 2.2.2", - "solana-config-program-client", - "solana-epoch-schedule 2.2.1", - "solana-fee-calculator 2.2.1", - "solana-instruction 2.3.0", - "solana-loader-v3-interface 5.0.0", - "solana-nonce 2.2.1", - "solana-program-option 2.2.1", - "solana-program-pack 2.2.1", - "solana-pubkey 2.4.0", - "solana-rent 2.2.1", - "solana-sdk-ids 2.2.1", - "solana-slot-hashes 2.2.1", - "solana-slot-history 2.2.1", + "solana-address-lookup-table-interface", + "solana-clock", + "solana-config-interface", + "solana-epoch-schedule", + "solana-fee-calculator", + "solana-instruction", + "solana-loader-v3-interface", + "solana-nonce", + "solana-program-option", + "solana-program-pack", + "solana-pubkey 3.0.0", + "solana-rent", + "solana-sdk-ids", + "solana-slot-hashes", + "solana-slot-history", "solana-stake-interface", - "solana-sysvar 2.3.0", + "solana-sysvar", "solana-vote-interface", "spl-generic-token", - "spl-token", - "spl-token-2022", + "spl-token-2022-interface", "spl-token-group-interface", + "spl-token-interface", "spl-token-metadata-interface", "thiserror 2.0.17", "zstd", @@ -3600,103 +3574,79 @@ dependencies = [ [[package]] name = "solana-account-decoder-client-types" -version = "2.3.13" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5519e8343325b707f17fbed54fcefb325131b692506d0af9e08a539d15e4f8cf" +checksum = "ee50e2ac4e0d0d8578e28768836140551614e5fc35b916a81280d5fdf7cf1396" dependencies = [ "base64 0.22.1", "bs58", "serde", - "serde_derive", "serde_json", "solana-account", - "solana-pubkey 2.4.0", + "solana-pubkey 3.0.0", "zstd", ] [[package]] name = "solana-account-info" -version = "2.3.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8f5152a288ef1912300fc6efa6c2d1f9bb55d9398eb6c72326360b8063987da" +checksum = "82f4691b69b172c687d218dd2f1f23fc7ea5e9aa79df9ac26dab3d8dd829ce48" dependencies = [ "bincode", "serde", - "solana-program-error 2.2.2", - "solana-program-memory 2.3.1", - "solana-pubkey 2.4.0", + "solana-program-error", + "solana-program-memory", + "solana-pubkey 3.0.0", ] [[package]] -name = "solana-account-info" -version = "3.0.0" +name = "solana-address" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82f4691b69b172c687d218dd2f1f23fc7ea5e9aa79df9ac26dab3d8dd829ce48" +checksum = "a2ecac8e1b7f74c2baa9e774c42817e3e75b20787134b76cc4d45e8a604488f5" dependencies = [ - "bincode", - "serde", - "solana-program-error 3.0.0", - "solana-program-memory 3.0.0", - "solana-pubkey 3.0.0", + "solana-address 2.0.0", ] [[package]] name = "solana-address" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a7a457086457ea9db9a5199d719dc8734dc2d0342fad0d8f77633c31eb62f19" +checksum = "e37320fd2945c5d654b2c6210624a52d66c3f1f73b653ed211ab91a703b35bdd" dependencies = [ "borsh 1.5.7", "bytemuck", "bytemuck_derive", - "curve25519-dalek 4.1.3", - "five8", + "curve25519-dalek", + "five8 1.0.0", "five8_const", + "rand 0.8.5", "serde", "serde_derive", - "solana-atomic-u64 3.0.0", - "solana-define-syscall 3.0.0", - "solana-program-error 3.0.0", - "solana-sanitize 3.0.1", - "solana-sha256-hasher 3.0.0", + "solana-atomic-u64", + "solana-define-syscall 4.0.1", + "solana-program-error", + "solana-sanitize", + "solana-sha256-hasher", ] [[package]] name = "solana-address-lookup-table-interface" -version = "2.2.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1673f67efe870b64a65cb39e6194be5b26527691ce5922909939961a6e6b395" +checksum = "e2f56cac5e70517a2f27d05e5100b20de7182473ffd0035b23ea273307905987" dependencies = [ "bincode", "bytemuck", "serde", "serde_derive", - "solana-clock 2.2.2", - "solana-instruction 2.3.0", - "solana-pubkey 2.4.0", - "solana-sdk-ids 2.2.1", - "solana-slot-hashes 2.2.1", -] - -[[package]] -name = "solana-address-lookup-table-interface" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2f56cac5e70517a2f27d05e5100b20de7182473ffd0035b23ea273307905987" -dependencies = [ - "solana-clock 3.0.0", + "solana-clock", + "solana-instruction", + "solana-instruction-error", "solana-pubkey 3.0.0", - "solana-sdk-ids 3.0.0", - "solana-slot-hashes 3.0.0", -] - -[[package]] -name = "solana-atomic-u64" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52e52720efe60465b052b9e7445a01c17550666beec855cce66f44766697bc2" -dependencies = [ - "parking_lot", + "solana-sdk-ids", + "solana-slot-hashes", ] [[package]] @@ -3708,49 +3658,26 @@ dependencies = [ "parking_lot", ] -[[package]] -name = "solana-big-mod-exp" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75db7f2bbac3e62cfd139065d15bcda9e2428883ba61fc8d27ccb251081e7567" -dependencies = [ - "num-bigint", - "num-traits", - "solana-define-syscall 2.3.0", -] - [[package]] name = "solana-big-mod-exp" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30c80fb6d791b3925d5ec4bf23a7c169ef5090c013059ec3ed7d0b2c04efa085" dependencies = [ - "num-bigint", + "num-bigint 0.4.6", "num-traits", "solana-define-syscall 3.0.0", ] [[package]] name = "solana-bincode" -version = "2.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a3787b8cf9c9fe3dd360800e8b70982b9e5a8af9e11c354b6665dd4a003adc" +checksum = "278a1a5bad62cd9da89ac8d4b7ec444e83caa8ae96aa656dfc27684b28d49a5d" dependencies = [ "bincode", - "serde", - "solana-instruction 2.3.0", -] - -[[package]] -name = "solana-blake3-hasher" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0801e25a1b31a14494fc80882a036be0ffd290efc4c2d640bfcca120a4672" -dependencies = [ - "blake3", - "solana-define-syscall 2.3.0", - "solana-hash 2.3.0", - "solana-sanitize 2.2.1", + "serde_core", + "solana-instruction-error", ] [[package]] @@ -3761,34 +3688,29 @@ checksum = "ffa2e3bdac3339c6d0423275e45dafc5ac25f4d43bf344d026a3cc9a85e244a6" dependencies = [ "blake3", "solana-define-syscall 3.0.0", - "solana-hash 3.0.0", + "solana-hash", ] [[package]] -name = "solana-bn254" -version = "2.2.2" +name = "solana-bls-signatures" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4420f125118732833f36facf96a27e7b78314b2d642ba07fa9ffdacd8d79e243" +checksum = "61c75573697bbb148afa8209aa3ce228ca0754584c9a8a91e818db0f706ae4fb" dependencies = [ - "ark-bn254", - "ark-ec", - "ark-ff", - "ark-serialize", - "bytemuck", - "solana-define-syscall 2.3.0", + "base64 0.22.1", + "blst", + "blstrs", + "cfg_eval", + "ff", + "group", + "pairing", + "rand 0.8.5", + "serde", + "serde_json", + "serde_with", "thiserror 2.0.17", ] -[[package]] -name = "solana-borsh" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718333bcd0a1a7aed6655aa66bef8d7fb047944922b2d3a18f49cbc13e73d004" -dependencies = [ - "borsh 0.10.3", - "borsh 1.5.7", -] - [[package]] name = "solana-borsh" version = "3.0.0" @@ -3800,23 +3722,24 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "2.3.13" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82129ae5aaddbc61a36b917d65ffd2c0cac32e0f12bc2ac0ae87634ef5891c05" +checksum = "572ff06446b1284af132f34f7db8f324c5ead70d5b1a51f8f4ab8c1509ed4561" dependencies = [ "chrono", "clap 2.34.0", "rpassword", - "solana-clock 2.2.2", + "solana-bls-signatures", + "solana-clock", "solana-cluster-type", "solana-commitment-config", "solana-derivation-path", - "solana-hash 2.3.0", + "solana-hash", "solana-keypair", - "solana-message 2.4.0", - "solana-native-token 2.2.2", + "solana-message", + "solana-native-token", "solana-presigner", - "solana-pubkey 2.4.0", + "solana-pubkey 3.0.0", "solana-remote-wallet", "solana-seed-phrase", "solana-signature", @@ -3829,13 +3752,12 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "2.3.13" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239f68bfb6aff6e8b24dc94e871a3cf41daac4ffd82d296e8ed8fb552b89a30e" +checksum = "0c5b399e85951b763a8a95dc602f4f5dcaac0b4a794a258d8c15a5ee945f017a" dependencies = [ "dirs-next", "serde", - "serde_derive", "serde_yaml", "solana-clap-utils", "solana-commitment-config", @@ -3843,37 +3765,45 @@ dependencies = [ ] [[package]] -name = "solana-client-traits" -version = "2.2.1" +name = "solana-cli-output" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83f0071874e629f29e0eb3dab8a863e98502ac7aba55b7e0df1803fc5cac72a7" +checksum = "b298b566ae8243a9dabbb694787c33517039f85c404515f5364505d419cbf0cf" dependencies = [ + "Inflector", + "agave-reserved-account-keys", + "base64 0.22.1", + "chrono", + "clap 2.34.0", + "console 0.16.1", + "humantime", + "indicatif", + "pretty-hex", + "semver", + "serde", + "serde_json", "solana-account", - "solana-commitment-config", + "solana-account-decoder", + "solana-bincode", + "solana-clap-utils", + "solana-cli-config", + "solana-clock", "solana-epoch-info", - "solana-hash 2.3.0", - "solana-instruction 2.3.0", - "solana-keypair", - "solana-message 2.4.0", - "solana-pubkey 2.4.0", + "solana-hash", + "solana-message", + "solana-packet", + "solana-pubkey 3.0.0", + "solana-rpc-client-api", + "solana-sdk-ids", "solana-signature", - "solana-signer", - "solana-system-interface 1.0.0", + "solana-stake-interface", + "solana-system-interface", "solana-transaction", - "solana-transaction-error 2.2.1", -] - -[[package]] -name = "solana-clock" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb482ab70fced82ad3d7d3d87be33d466a3498eb8aa856434ff3c0dfc2e2e31" -dependencies = [ - "serde", - "serde_derive", - "solana-sdk-ids 2.2.1", - "solana-sdk-macro 2.2.1", - "solana-sysvar-id 2.2.1", + "solana-transaction-error", + "solana-transaction-status", + "solana-transaction-status-client-types", + "solana-vote-program", + "spl-memo-interface", ] [[package]] @@ -3884,27 +3814,25 @@ checksum = "fb62e9381182459a4520b5fe7fb22d423cae736239a6427fc398a88743d0ed59" dependencies = [ "serde", "serde_derive", - "solana-sdk-ids 3.0.0", - "solana-sdk-macro 3.0.0", - "solana-sysvar-id 3.0.0", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", ] [[package]] name = "solana-cluster-type" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ace9fea2daa28354d107ea879cff107181d85cd4e0f78a2bedb10e1a428c97e" +checksum = "eb7692fa6bf10a1a86b450c4775526f56d7e0e2116a53313f2533b5694abea64" dependencies = [ - "serde", - "serde_derive", - "solana-hash 2.3.0", + "solana-hash", ] [[package]] name = "solana-commitment-config" -version = "2.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac49c4dde3edfa832de1697e9bcdb7c3b3f7cb7a1981b7c62526c8bb6700fb73" +checksum = "2e41a3917076a8b5375809078ae3a6fb76a53e364b596ef8c4265e7f410876f3" dependencies = [ "serde", "serde_derive", @@ -3912,42 +3840,29 @@ dependencies = [ [[package]] name = "solana-compute-budget-interface" -version = "2.2.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8432d2c4c22d0499aa06d62e4f7e333f81777b3d7c96050ae9e5cb71a8c3aee4" +checksum = "8292c436b269ad23cecc8b24f7da3ab07ca111661e25e00ce0e1d22771951ab9" dependencies = [ - "borsh 1.5.7", - "serde", - "serde_derive", - "solana-instruction 2.3.0", - "solana-sdk-ids 2.2.1", + "solana-instruction", + "solana-sdk-ids", ] [[package]] -name = "solana-config-program-client" -version = "0.0.2" +name = "solana-config-interface" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53aceac36f105fd4922e29b4f0c1f785b69d7b3e7e387e384b8985c8e0c3595e" +checksum = "63e401ae56aed512821cc7a0adaa412ff97fecd2dff4602be7b1330d2daec0c4" dependencies = [ "bincode", - "borsh 0.10.3", - "kaigan", "serde", - "solana-program 2.3.0", -] - -[[package]] -name = "solana-cpi" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dc71126edddc2ba014622fc32d0f5e2e78ec6c5a1e0eb511b85618c09e9ea11" -dependencies = [ - "solana-account-info 2.3.0", - "solana-define-syscall 2.3.0", - "solana-instruction 2.3.0", - "solana-program-error 2.2.2", - "solana-pubkey 2.4.0", - "solana-stable-layout 2.2.1", + "serde_derive", + "solana-account", + "solana-instruction", + "solana-pubkey 3.0.0", + "solana-sdk-ids", + "solana-short-vec", + "solana-system-interface", ] [[package]] @@ -3956,97 +3871,59 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16238feb63d1cbdf915fb287f29ef7a7ebf81469bd6214f8b72a53866b593f8f" dependencies = [ - "solana-account-info 3.0.0", + "solana-account-info", "solana-define-syscall 3.0.0", - "solana-instruction 3.0.0", - "solana-program-error 3.0.0", + "solana-instruction", + "solana-program-error", "solana-pubkey 3.0.0", - "solana-stable-layout 3.0.0", + "solana-stable-layout", ] [[package]] name = "solana-curve25519" -version = "2.3.13" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae4261b9a8613d10e77ac831a8fa60b6fa52b9b103df46d641deff9f9812a23" +checksum = "134f67bd3031223df4aba035c503e4d14acacfc4cf19af10d10ec9c2605bb84f" dependencies = [ "bytemuck", "bytemuck_derive", - "curve25519-dalek 4.1.3", - "solana-define-syscall 2.3.0", + "curve25519-dalek", + "solana-define-syscall 3.0.0", "subtle", "thiserror 2.0.17", ] -[[package]] -name = "solana-decode-error" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c781686a18db2f942e70913f7ca15dc120ec38dcab42ff7557db2c70c625a35" -dependencies = [ - "num-traits", -] - [[package]] name = "solana-define-syscall" -version = "2.3.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae3e2abcf541c8122eafe9a625d4d194b4023c20adde1e251f94e056bb1aee2" +checksum = "f9697086a4e102d28a156b8d6b521730335d6951bd39a5e766512bbe09007cee" [[package]] name = "solana-define-syscall" -version = "3.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9697086a4e102d28a156b8d6b521730335d6951bd39a5e766512bbe09007cee" +checksum = "57e5b1c0bc1d4a4d10c88a4100499d954c09d3fecfae4912c1a074dff68b1738" [[package]] name = "solana-derivation-path" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "939756d798b25c5ec3cca10e06212bdca3b1443cb9bb740a38124f58b258737b" +checksum = "ff71743072690fdbdfcdc37700ae1cb77485aaad49019473a81aee099b1e0b8c" dependencies = [ "derivation-path", "qstring", "uriparse", ] -[[package]] -name = "solana-ed25519-program" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feafa1691ea3ae588f99056f4bdd1293212c7ece28243d7da257c443e84753" -dependencies = [ - "bytemuck", - "bytemuck_derive", - "ed25519-dalek", - "solana-feature-set", - "solana-instruction 2.3.0", - "solana-precompile-error", - "solana-sdk-ids 2.2.1", -] - [[package]] name = "solana-epoch-info" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ef6f0b449290b0b9f32973eefd95af35b01c5c0c34c569f936c34c5b20d77b" -dependencies = [ - "serde", - "serde_derive", -] - -[[package]] -name = "solana-epoch-rewards" -version = "2.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b575d3dd323b9ea10bb6fe89bf6bf93e249b215ba8ed7f68f1a3633f384db7" +checksum = "e093c84f6ece620a6b10cd036574b0cd51944231ab32d81f80f76d54aba833e6" dependencies = [ "serde", "serde_derive", - "solana-hash 2.3.0", - "solana-sdk-ids 2.2.1", - "solana-sdk-macro 2.2.1", - "solana-sysvar-id 2.2.1", ] [[package]] @@ -4057,34 +3934,10 @@ checksum = "b319a4ed70390af911090c020571f0ff1f4ec432522d05ab89f5c08080381995" dependencies = [ "serde", "serde_derive", - "solana-hash 3.0.0", - "solana-sdk-ids 3.0.0", - "solana-sdk-macro 3.0.0", - "solana-sysvar-id 3.0.0", -] - -[[package]] -name = "solana-epoch-rewards-hasher" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c5fd2662ae7574810904585fd443545ed2b568dbd304b25a31e79ccc76e81b" -dependencies = [ - "siphasher", - "solana-hash 2.3.0", - "solana-pubkey 2.4.0", -] - -[[package]] -name = "solana-epoch-schedule" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fce071fbddecc55d727b1d7ed16a629afe4f6e4c217bc8d00af3b785f6f67ed" -dependencies = [ - "serde", - "serde_derive", - "solana-sdk-ids 2.2.1", - "solana-sdk-macro 2.2.1", - "solana-sysvar-id 2.2.1", + "solana-hash", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", ] [[package]] @@ -4095,9 +3948,9 @@ checksum = "6e5481e72cc4d52c169db73e4c0cd16de8bc943078aac587ec4817a75cc6388f" dependencies = [ "serde", "serde_derive", - "solana-sdk-ids 3.0.0", - "solana-sdk-macro 3.0.0", - "solana-sysvar-id 3.0.0", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", ] [[package]] @@ -4110,27 +3963,6 @@ dependencies = [ "solana-pubkey 3.0.0", ] -[[package]] -name = "solana-example-mocks" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84461d56cbb8bb8d539347151e0525b53910102e4bced875d49d5139708e39d3" -dependencies = [ - "serde", - "serde_derive", - "solana-address-lookup-table-interface 2.2.2", - "solana-clock 2.2.2", - "solana-hash 2.3.0", - "solana-instruction 2.3.0", - "solana-keccak-hasher 2.2.1", - "solana-message 2.4.0", - "solana-nonce 2.2.1", - "solana-pubkey 2.4.0", - "solana-sdk-ids 2.2.1", - "solana-system-interface 1.0.0", - "thiserror 2.0.17", -] - [[package]] name = "solana-example-mocks" version = "3.0.0" @@ -4139,90 +3971,70 @@ checksum = "978855d164845c1b0235d4b4d101cadc55373fffaf0b5b6cfa2194d25b2ed658" dependencies = [ "serde", "serde_derive", - "solana-address-lookup-table-interface 3.0.0", - "solana-clock 3.0.0", - "solana-hash 3.0.0", - "solana-instruction 3.0.0", - "solana-keccak-hasher 3.0.0", - "solana-message 3.0.1", - "solana-nonce 3.0.0", + "solana-address-lookup-table-interface", + "solana-clock", + "solana-hash", + "solana-instruction", + "solana-keccak-hasher", + "solana-message", + "solana-nonce", "solana-pubkey 3.0.0", - "solana-sdk-ids 3.0.0", - "solana-system-interface 2.0.0", + "solana-sdk-ids", + "solana-system-interface", "thiserror 2.0.17", ] [[package]] name = "solana-faucet" -version = "2.3.13" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47dc1a523a416877264515915badd47d79fdf245e76e81bcea695f464e77c747" +checksum = "256a7d834ec0657727ad6ebaa6accaf49e457440cf9006c93a625d78d4a44926" dependencies = [ + "agave-logger", "bincode", "clap 2.34.0", "crossbeam-channel", "log", "serde", - "serde_derive", "solana-clap-utils", "solana-cli-config", - "solana-hash 2.3.0", - "solana-instruction 2.3.0", + "solana-cli-output", + "solana-hash", + "solana-instruction", "solana-keypair", - "solana-logger", - "solana-message 2.4.0", + "solana-message", "solana-metrics", - "solana-native-token 2.2.2", + "solana-net-utils", "solana-packet", - "solana-pubkey 2.4.0", + "solana-pubkey 3.0.0", "solana-signer", - "solana-system-interface 1.0.0", + "solana-system-interface", "solana-system-transaction", "solana-transaction", "solana-version", - "spl-memo", + "spl-memo-interface", "thiserror 2.0.17", "tokio", ] [[package]] name = "solana-feature-gate-interface" -version = "2.2.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f5c5382b449e8e4e3016fb05e418c53d57782d8b5c30aa372fc265654b956d" +checksum = "7347ab62e6d47a82e340c865133795b394feea7c2b2771d293f57691c6544c3f" dependencies = [ - "bincode", "serde", "serde_derive", - "solana-account", - "solana-account-info 2.3.0", - "solana-instruction 2.3.0", - "solana-program-error 2.2.2", - "solana-pubkey 2.4.0", - "solana-rent 2.2.1", - "solana-sdk-ids 2.2.1", - "solana-system-interface 1.0.0", -] - -[[package]] -name = "solana-feature-set" -version = "2.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93b93971e289d6425f88e6e3cb6668c4b05df78b3c518c249be55ced8efd6b6d" -dependencies = [ - "ahash", - "lazy_static", - "solana-epoch-schedule 2.2.1", - "solana-hash 2.3.0", - "solana-pubkey 2.4.0", - "solana-sha256-hasher 2.3.0", + "solana-program-error", + "solana-pubkey 3.0.0", + "solana-sdk-ids", ] [[package]] name = "solana-fee-calculator" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89bc408da0fb3812bc3008189d148b4d3e08252c79ad810b245482a3f70cd8d" +checksum = "2a73cc03ca4bed871ca174558108835f8323e85917bb38b9c81c7af2ab853efe" dependencies = [ "log", "serde", @@ -4230,129 +4042,32 @@ dependencies = [ ] [[package]] -name = "solana-fee-calculator" +name = "solana-fee-structure" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a73cc03ca4bed871ca174558108835f8323e85917bb38b9c81c7af2ab853efe" -dependencies = [ - "log", - "serde", - "serde_derive", -] +checksum = "5e2abdb1223eea8ec64136f39cb1ffcf257e00f915c957c35c0dd9e3f4e700b0" [[package]] -name = "solana-fee-structure" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33adf673581c38e810bf618f745bf31b683a0a4a4377682e6aaac5d9a058dd4e" -dependencies = [ - "serde", - "serde_derive", - "solana-message 2.4.0", - "solana-native-token 2.2.2", -] - -[[package]] -name = "solana-genesis-config" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3725085d47b96d37fef07a29d78d2787fc89a0b9004c66eed7753d1e554989f" -dependencies = [ - "bincode", - "chrono", - "memmap2", - "serde", - "serde_derive", - "solana-account", - "solana-clock 2.2.2", - "solana-cluster-type", - "solana-epoch-schedule 2.2.1", - "solana-fee-calculator 2.2.1", - "solana-hash 2.3.0", - "solana-inflation", - "solana-keypair", - "solana-logger", - "solana-poh-config", - "solana-pubkey 2.4.0", - "solana-rent 2.2.1", - "solana-sdk-ids 2.2.1", - "solana-sha256-hasher 2.3.0", - "solana-shred-version", - "solana-signer", - "solana-time-utils", -] - -[[package]] -name = "solana-hard-forks" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c28371f878e2ead55611d8ba1b5fb879847156d04edea13693700ad1a28baf" -dependencies = [ - "serde", - "serde_derive", -] - -[[package]] -name = "solana-hash" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b96e9f0300fa287b545613f007dfe20043d7812bee255f418c1eb649c93b63" -dependencies = [ - "borsh 1.5.7", - "bytemuck", - "bytemuck_derive", - "five8", - "js-sys", - "serde", - "serde_derive", - "solana-atomic-u64 2.2.1", - "solana-sanitize 2.2.1", - "wasm-bindgen", -] - -[[package]] -name = "solana-hash" -version = "3.0.0" +name = "solana-hash" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a063723b9e84c14d8c0d2cdf0268207dc7adecf546e31251f9e07c7b00b566c" dependencies = [ "borsh 1.5.7", "bytemuck", "bytemuck_derive", - "five8", + "five8 0.2.1", "serde", "serde_derive", - "solana-atomic-u64 3.0.0", - "solana-sanitize 3.0.1", + "solana-atomic-u64", + "solana-sanitize", ] [[package]] name = "solana-inflation" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23eef6a09eb8e568ce6839573e4966850e85e9ce71e6ae1a6c930c1c43947de3" -dependencies = [ - "serde", - "serde_derive", -] - -[[package]] -name = "solana-instruction" -version = "2.3.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47298e2ce82876b64f71e9d13a46bc4b9056194e7f9937ad3084385befa50885" -dependencies = [ - "bincode", - "borsh 1.5.7", - "getrandom 0.2.10", - "js-sys", - "num-traits", - "serde", - "serde_derive", - "solana-define-syscall 2.3.0", - "solana-pubkey 2.4.0", - "wasm-bindgen", -] +checksum = "e92f37a14e7c660628752833250dd3dcd8e95309876aee751d7f8769a27947c6" [[package]] name = "solana-instruction" @@ -4376,24 +4091,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1f0d483b8ae387178d9210e0575b666b05cdd4bd0f2f188128249f6e454d39d" dependencies = [ "num-traits", - "solana-program-error 3.0.0", -] - -[[package]] -name = "solana-instructions-sysvar" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0e85a6fad5c2d0c4f5b91d34b8ca47118fc593af706e523cdbedf846a954f57" -dependencies = [ - "bitflags 2.10.0", - "solana-account-info 2.3.0", - "solana-instruction 2.3.0", - "solana-program-error 2.2.2", - "solana-pubkey 2.4.0", - "solana-sanitize 2.2.1", - "solana-sdk-ids 2.2.1", - "solana-serialize-utils 2.2.1", - "solana-sysvar-id 2.2.1", + "serde", + "serde_derive", + "solana-program-error", ] [[package]] @@ -4403,40 +4103,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ddf67876c541aa1e21ee1acae35c95c6fbc61119814bfef70579317a5e26955" dependencies = [ "bitflags 2.10.0", - "solana-account-info 3.0.0", - "solana-instruction 3.0.0", + "solana-account-info", + "solana-instruction", "solana-instruction-error", - "solana-program-error 3.0.0", + "solana-program-error", "solana-pubkey 3.0.0", - "solana-sanitize 3.0.1", - "solana-sdk-ids 3.0.0", - "solana-serialize-utils 3.1.0", - "solana-sysvar-id 3.0.0", + "solana-sanitize", + "solana-sdk-ids", + "solana-serialize-utils", + "solana-sysvar-id", ] [[package]] name = "solana-invoke" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f5693c6de226b3626658377168b0184e94e8292ff16e3d31d4766e65627565" -dependencies = [ - "solana-account-info 2.3.0", - "solana-define-syscall 2.3.0", - "solana-instruction 2.3.0", - "solana-program-entrypoint 2.3.0", - "solana-stable-layout 2.2.1", -] - -[[package]] -name = "solana-keccak-hasher" -version = "2.2.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7aeb957fbd42a451b99235df4942d96db7ef678e8d5061ef34c9b34cae12f79" +checksum = "4065031f5c7dd29ef5f5003c1a353011eeabbafa6c5a5033da0cedbfca824b94" dependencies = [ - "sha3", - "solana-define-syscall 2.3.0", - "solana-hash 2.3.0", - "solana-sanitize 2.2.1", + "solana-account-info", + "solana-define-syscall 3.0.0", + "solana-instruction", + "solana-program-entrypoint", + "solana-stable-layout", ] [[package]] @@ -4447,39 +4135,25 @@ checksum = "57eebd3012946913c8c1b8b43cdf8a6249edb09c0b6be3604ae910332a3acd97" dependencies = [ "sha3", "solana-define-syscall 3.0.0", - "solana-hash 3.0.0", + "solana-hash", ] [[package]] name = "solana-keypair" -version = "2.2.1" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dbb7042c2e0c561afa07242b2099d55c57bd1b1da3b6476932197d84e15e3e4" +checksum = "952ed9074c12edd2060cb09c2a8c664303f4ab7f7056a407ac37dd1da7bdaa3e" dependencies = [ - "bs58", "ed25519-dalek", "ed25519-dalek-bip32", - "rand 0.7.3", + "five8 0.2.1", + "rand 0.8.5", "solana-derivation-path", - "solana-pubkey 2.4.0", + "solana-pubkey 3.0.0", "solana-seed-derivable", "solana-seed-phrase", "solana-signature", "solana-signer", - "wasm-bindgen", -] - -[[package]] -name = "solana-last-restart-slot" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6360ac2fdc72e7463565cd256eedcf10d7ef0c28a1249d261ec168c1b55cdd" -dependencies = [ - "serde", - "serde_derive", - "solana-sdk-ids 2.2.1", - "solana-sdk-macro 2.2.1", - "solana-sysvar-id 2.2.1", ] [[package]] @@ -4490,104 +4164,38 @@ checksum = "dcda154ec827f5fc1e4da0af3417951b7e9b8157540f81f936c4a8b1156134d0" dependencies = [ "serde", "serde_derive", - "solana-sdk-ids 3.0.0", - "solana-sdk-macro 3.0.0", - "solana-sysvar-id 3.0.0", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", ] [[package]] name = "solana-loader-v2-interface" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8ab08006dad78ae7cd30df8eea0539e207d08d91eaefb3e1d49a446e1c49654" -dependencies = [ - "serde", - "serde_bytes", - "serde_derive", - "solana-instruction 2.3.0", - "solana-pubkey 2.4.0", - "solana-sdk-ids 2.2.1", -] - -[[package]] -name = "solana-loader-v3-interface" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4be76cfa9afd84ca2f35ebc09f0da0f0092935ccdac0595d98447f259538c2" +checksum = "1e4a6f0ad4fd9c30679bfee2ce3ea6a449cac38049f210480b751f65676dfe82" dependencies = [ "serde", "serde_bytes", "serde_derive", - "solana-instruction 2.3.0", - "solana-pubkey 2.4.0", - "solana-sdk-ids 2.2.1", - "solana-system-interface 1.0.0", + "solana-instruction", + "solana-pubkey 3.0.0", + "solana-sdk-ids", ] [[package]] name = "solana-loader-v3-interface" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f7162a05b8b0773156b443bccd674ea78bb9aa406325b467ea78c06c99a63a2" -dependencies = [ - "serde", - "serde_bytes", - "serde_derive", - "solana-instruction 2.3.0", - "solana-pubkey 2.4.0", - "solana-sdk-ids 2.2.1", - "solana-system-interface 1.0.0", -] - -[[package]] -name = "solana-loader-v4-interface" -version = "2.2.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "706a777242f1f39a83e2a96a2a6cb034cb41169c6ecbee2cf09cb873d9659e7e" +checksum = "dee44c9b1328c5c712c68966fb8de07b47f3e7bac006e74ddd1bb053d3e46e5d" dependencies = [ "serde", "serde_bytes", "serde_derive", - "solana-instruction 2.3.0", - "solana-pubkey 2.4.0", - "solana-sdk-ids 2.2.1", - "solana-system-interface 1.0.0", -] - -[[package]] -name = "solana-logger" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8e777ec1afd733939b532a42492d888ec7c88d8b4127a5d867eb45c6eb5cd5" -dependencies = [ - "env_logger", - "lazy_static", - "libc", - "log", - "signal-hook", -] - -[[package]] -name = "solana-message" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1796aabce376ff74bf89b78d268fa5e683d7d7a96a0a4e4813ec34de49d5314b" -dependencies = [ - "bincode", - "blake3", - "lazy_static", - "serde", - "serde_derive", - "solana-bincode", - "solana-hash 2.3.0", - "solana-instruction 2.3.0", - "solana-pubkey 2.4.0", - "solana-sanitize 2.2.1", - "solana-sdk-ids 2.2.1", - "solana-short-vec 2.2.1", - "solana-system-interface 1.0.0", - "solana-transaction-error 2.2.1", - "wasm-bindgen", + "solana-instruction", + "solana-pubkey 3.0.0", + "solana-sdk-ids", + "solana-system-interface", ] [[package]] @@ -4596,43 +4204,36 @@ version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85666605c9fd727f865ed381665db0a8fc29f984a030ecc1e40f43bfb2541623" dependencies = [ + "bincode", + "blake3", "lazy_static", "serde", "serde_derive", - "solana-address", - "solana-hash 3.0.0", - "solana-instruction 3.0.0", - "solana-sanitize 3.0.1", - "solana-sdk-ids 3.0.0", - "solana-short-vec 3.0.0", - "solana-transaction-error 3.0.0", + "solana-address 1.1.0", + "solana-hash", + "solana-instruction", + "solana-sanitize", + "solana-sdk-ids", + "solana-short-vec", + "solana-transaction-error", ] [[package]] name = "solana-metrics" -version = "2.3.13" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0375159d8460f423d39e5103dcff6e07796a5ec1850ee1fcfacfd2482a8f34b5" +checksum = "fa4dc83951fb6673a19490edff659fc9d2c75fd2e1b14c5e7876e88addaee019" dependencies = [ "crossbeam-channel", "gethostname", "log", "reqwest 0.12.24", "solana-cluster-type", - "solana-sha256-hasher 2.3.0", + "solana-sha256-hasher", "solana-time-utils", "thiserror 2.0.17", ] -[[package]] -name = "solana-msg" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36a1a14399afaabc2781a1db09cb14ee4cc4ee5c7a5a3cfcc601811379a8092" -dependencies = [ - "solana-define-syscall 2.3.0", -] - [[package]] name = "solana-msg" version = "3.0.0" @@ -4642,12 +4243,6 @@ dependencies = [ "solana-define-syscall 3.0.0", ] -[[package]] -name = "solana-native-token" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307fb2f78060995979e9b4f68f833623565ed4e55d3725f100454ce78a99a1a3" - [[package]] name = "solana-native-token" version = "3.0.0" @@ -4655,17 +4250,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae8dd4c280dca9d046139eb5b7a5ac9ad10403fbd64964c7d7571214950d758f" [[package]] -name = "solana-nonce" -version = "2.2.1" +name = "solana-net-utils" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703e22eb185537e06204a5bd9d509b948f0066f2d1d814a6f475dafb3ddf1325" +checksum = "1224e99e2a686122b8faf2b20ccc6baf36430d000b3e6729c648673a6c06b6cb" dependencies = [ + "anyhow", + "bincode", + "bytes", + "cfg-if", + "dashmap", + "itertools", + "log", + "nix", + "rand 0.8.5", "serde", - "serde_derive", - "solana-fee-calculator 2.2.1", - "solana-hash 2.3.0", - "solana-pubkey 2.4.0", - "solana-sha256-hasher 2.3.0", + "socket2 0.6.1", + "solana-serde", + "solana-svm-type-overrides", + "tokio", + "url", ] [[package]] @@ -4674,182 +4278,58 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abbdc6c8caf1c08db9f36a50967539d0f72b9f1d4aea04fec5430f532e5afadc" dependencies = [ - "solana-fee-calculator 3.0.0", - "solana-hash 3.0.0", + "serde", + "serde_derive", + "solana-fee-calculator", + "solana-hash", "solana-pubkey 3.0.0", - "solana-sha256-hasher 3.0.0", -] - -[[package]] -name = "solana-nonce-account" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde971a20b8dbf60144d6a84439dda86b5466e00e2843091fe731083cda614da" -dependencies = [ - "solana-account", - "solana-hash 2.3.0", - "solana-nonce 2.2.1", - "solana-sdk-ids 2.2.1", + "solana-sha256-hasher", ] [[package]] name = "solana-offchain-message" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b526398ade5dea37f1f147ce55dae49aa017a5d7326606359b0445ca8d946581" +checksum = "f6e2a1141a673f72a05cf406b99e4b2b8a457792b7c01afa07b3f00d4e2de393" dependencies = [ "num_enum", - "solana-hash 2.3.0", + "solana-hash", "solana-packet", - "solana-pubkey 2.4.0", - "solana-sanitize 2.2.1", - "solana-sha256-hasher 2.3.0", + "solana-sanitize", + "solana-sha256-hasher", "solana-signature", "solana-signer", ] [[package]] name = "solana-packet" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "004f2d2daf407b3ec1a1ca5ec34b3ccdfd6866dd2d3c7d0715004a96e4b6d127" +checksum = "6edf2f25743c95229ac0fdc32f8f5893ef738dbf332c669e9861d33ddb0f469d" dependencies = [ - "bincode", "bitflags 2.10.0", - "cfg_eval", - "serde", - "serde_derive", - "serde_with", -] - -[[package]] -name = "solana-poh-config" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d650c3b4b9060082ac6b0efbbb66865089c58405bfb45de449f3f2b91eccee75" -dependencies = [ - "serde", - "serde_derive", ] [[package]] name = "solana-precompile-error" -version = "2.2.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d87b2c1f5de77dfe2b175ee8dd318d196aaca4d0f66f02842f80c852811f9f8" +checksum = "cafcd950de74c6c39d55dc8ca108bbb007799842ab370ef26cf45a34453c31e1" dependencies = [ "num-traits", - "solana-decode-error", -] - -[[package]] -name = "solana-precompiles" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36e92768a57c652edb0f5d1b30a7d0bc64192139c517967c18600debe9ae3832" -dependencies = [ - "lazy_static", - "solana-ed25519-program", - "solana-feature-set", - "solana-message 2.4.0", - "solana-precompile-error", - "solana-pubkey 2.4.0", - "solana-sdk-ids 2.2.1", - "solana-secp256k1-program", - "solana-secp256r1-program", ] [[package]] name = "solana-presigner" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a57a24e6a4125fc69510b6774cd93402b943191b6cddad05de7281491c90fe" +checksum = "0f704eaf825be3180832445b9e4983b875340696e8e7239bf2d535b0f86c14a2" dependencies = [ - "solana-pubkey 2.4.0", + "solana-pubkey 3.0.0", "solana-signature", "solana-signer", ] -[[package]] -name = "solana-program" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98eca145bd3545e2fbb07166e895370576e47a00a7d824e325390d33bf467210" -dependencies = [ - "bincode", - "blake3", - "borsh 0.10.3", - "borsh 1.5.7", - "bs58", - "bytemuck", - "console_error_panic_hook", - "console_log", - "getrandom 0.2.10", - "lazy_static", - "log", - "memoffset", - "num-bigint", - "num-derive 0.4.0", - "num-traits", - "rand 0.8.5", - "serde", - "serde_bytes", - "serde_derive", - "solana-account-info 2.3.0", - "solana-address-lookup-table-interface 2.2.2", - "solana-atomic-u64 2.2.1", - "solana-big-mod-exp 2.2.1", - "solana-bincode", - "solana-blake3-hasher 2.2.1", - "solana-borsh 2.2.1", - "solana-clock 2.2.2", - "solana-cpi 2.2.1", - "solana-decode-error", - "solana-define-syscall 2.3.0", - "solana-epoch-rewards 2.2.1", - "solana-epoch-schedule 2.2.1", - "solana-example-mocks 2.2.1", - "solana-feature-gate-interface", - "solana-fee-calculator 2.2.1", - "solana-hash 2.3.0", - "solana-instruction 2.3.0", - "solana-instructions-sysvar 2.2.2", - "solana-keccak-hasher 2.2.1", - "solana-last-restart-slot 2.2.1", - "solana-loader-v2-interface", - "solana-loader-v3-interface 5.0.0", - "solana-loader-v4-interface", - "solana-message 2.4.0", - "solana-msg 2.2.1", - "solana-native-token 2.2.2", - "solana-nonce 2.2.1", - "solana-program-entrypoint 2.3.0", - "solana-program-error 2.2.2", - "solana-program-memory 2.3.1", - "solana-program-option 2.2.1", - "solana-program-pack 2.2.1", - "solana-pubkey 2.4.0", - "solana-rent 2.2.1", - "solana-sanitize 2.2.1", - "solana-sdk-ids 2.2.1", - "solana-sdk-macro 2.2.1", - "solana-secp256k1-recover 2.2.1", - "solana-serde-varint 2.2.2", - "solana-serialize-utils 2.2.1", - "solana-sha256-hasher 2.3.0", - "solana-short-vec 2.2.1", - "solana-slot-hashes 2.2.1", - "solana-slot-history 2.2.1", - "solana-stable-layout 2.2.1", - "solana-stake-interface", - "solana-system-interface 1.0.0", - "solana-sysvar 2.3.0", - "solana-sysvar-id 2.2.1", - "solana-vote-interface", - "thiserror 2.0.17", - "wasm-bindgen", -] - [[package]] name = "solana-program" version = "3.0.0" @@ -4857,56 +4337,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91b12305dd81045d705f427acd0435a2e46444b65367d7179d7bdcfc3bc5f5eb" dependencies = [ "memoffset", - "solana-account-info 3.0.0", - "solana-big-mod-exp 3.0.0", - "solana-blake3-hasher 3.0.0", - "solana-borsh 3.0.0", - "solana-clock 3.0.0", - "solana-cpi 3.0.0", + "solana-account-info", + "solana-big-mod-exp", + "solana-blake3-hasher", + "solana-borsh", + "solana-clock", + "solana-cpi", "solana-define-syscall 3.0.0", - "solana-epoch-rewards 3.0.0", - "solana-epoch-schedule 3.0.0", + "solana-epoch-rewards", + "solana-epoch-schedule", "solana-epoch-stake", - "solana-example-mocks 3.0.0", - "solana-fee-calculator 3.0.0", - "solana-hash 3.0.0", - "solana-instruction 3.0.0", + "solana-example-mocks", + "solana-fee-calculator", + "solana-hash", + "solana-instruction", "solana-instruction-error", - "solana-instructions-sysvar 3.0.0", - "solana-keccak-hasher 3.0.0", - "solana-last-restart-slot 3.0.0", - "solana-msg 3.0.0", - "solana-native-token 3.0.0", - "solana-program-entrypoint 3.1.0", - "solana-program-error 3.0.0", - "solana-program-memory 3.0.0", - "solana-program-option 3.0.0", - "solana-program-pack 3.0.0", + "solana-instructions-sysvar", + "solana-keccak-hasher", + "solana-last-restart-slot", + "solana-msg", + "solana-native-token", + "solana-program-entrypoint", + "solana-program-error", + "solana-program-memory", + "solana-program-option", + "solana-program-pack", "solana-pubkey 3.0.0", - "solana-rent 3.0.0", - "solana-sdk-ids 3.0.0", - "solana-secp256k1-recover 3.0.0", - "solana-serde-varint 3.0.0", - "solana-serialize-utils 3.1.0", - "solana-sha256-hasher 3.0.0", - "solana-short-vec 3.0.0", - "solana-slot-hashes 3.0.0", - "solana-slot-history 3.0.0", - "solana-stable-layout 3.0.0", - "solana-sysvar 3.0.0", - "solana-sysvar-id 3.0.0", -] - -[[package]] -name = "solana-program-entrypoint" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ce041b1a0ed275290a5008ee1a4a6c48f5054c8a3d78d313c08958a06aedbd" -dependencies = [ - "solana-account-info 2.3.0", - "solana-msg 2.2.1", - "solana-program-error 2.2.2", - "solana-pubkey 2.4.0", + "solana-rent", + "solana-sdk-ids", + "solana-secp256k1-recover", + "solana-serde-varint", + "solana-serialize-utils", + "solana-sha256-hasher", + "solana-short-vec", + "solana-slot-hashes", + "solana-slot-history", + "solana-stable-layout", + "solana-sysvar", + "solana-sysvar-id", ] [[package]] @@ -4915,29 +4383,13 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6557cf5b5e91745d1667447438a1baa7823c6086e4ece67f8e6ebfa7a8f72660" dependencies = [ - "solana-account-info 3.0.0", + "solana-account-info", "solana-define-syscall 3.0.0", - "solana-msg 3.0.0", - "solana-program-error 3.0.0", + "solana-msg", + "solana-program-error", "solana-pubkey 3.0.0", ] -[[package]] -name = "solana-program-error" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee2e0217d642e2ea4bee237f37bd61bb02aec60da3647c48ff88f6556ade775" -dependencies = [ - "borsh 1.5.7", - "num-traits", - "serde", - "serde_derive", - "solana-decode-error", - "solana-instruction 2.3.0", - "solana-msg 2.2.1", - "solana-pubkey 2.4.0", -] - [[package]] name = "solana-program-error" version = "3.0.0" @@ -4949,15 +4401,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "solana-program-memory" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a5426090c6f3fd6cfdc10685322fede9ca8e5af43cd6a59e98bfe4e91671712" -dependencies = [ - "solana-define-syscall 2.3.0", -] - [[package]] name = "solana-program-memory" version = "3.0.0" @@ -4967,12 +4410,6 @@ dependencies = [ "solana-define-syscall 3.0.0", ] -[[package]] -name = "solana-program-option" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc677a2e9bc616eda6dbdab834d463372b92848b2bfe4a1ed4e4b4adba3397d0" - [[package]] name = "solana-program-option" version = "3.0.0" @@ -4981,63 +4418,82 @@ checksum = "8e7b4ddb464f274deb4a497712664c3b612e3f5f82471d4e47710fc4ab1c3095" [[package]] name = "solana-program-pack" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "319f0ef15e6e12dc37c597faccb7d62525a509fec5f6975ecb9419efddeb277b" +checksum = "c169359de21f6034a63ebf96d6b380980307df17a8d371344ff04a883ec4e9d0" dependencies = [ - "solana-program-error 2.2.2", + "solana-program-error", ] [[package]] -name = "solana-program-pack" -version = "3.0.0" +name = "solana-program-runtime" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c169359de21f6034a63ebf96d6b380980307df17a8d371344ff04a883ec4e9d0" +checksum = "e26b2116695ece7bea5cb443dbbaf1fe6d1679052e16e0e83ae6150e2a9c524e" dependencies = [ - "solana-program-error 3.0.0", + "base64 0.22.1", + "bincode", + "itertools", + "log", + "percentage", + "rand 0.8.5", + "serde", + "solana-account", + "solana-account-info", + "solana-clock", + "solana-epoch-rewards", + "solana-epoch-schedule", + "solana-fee-structure", + "solana-hash", + "solana-instruction", + "solana-last-restart-slot", + "solana-loader-v3-interface", + "solana-program-entrypoint", + "solana-pubkey 3.0.0", + "solana-rent", + "solana-sbpf", + "solana-sdk-ids", + "solana-slot-hashes", + "solana-stable-layout", + "solana-stake-interface", + "solana-svm-callback", + "solana-svm-feature-set", + "solana-svm-log-collector", + "solana-svm-measure", + "solana-svm-timings", + "solana-svm-transaction", + "solana-svm-type-overrides", + "solana-system-interface", + "solana-sysvar", + "solana-sysvar-id", + "solana-transaction-context", + "thiserror 2.0.17", ] [[package]] name = "solana-pubkey" -version = "2.4.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b62adb9c3261a052ca1f999398c388f1daf558a1b492f60a6d9e64857db4ff1" +checksum = "8909d399deb0851aa524420beeb5646b115fd253ef446e35fe4504c904da3941" dependencies = [ - "borsh 0.10.3", - "borsh 1.5.7", - "bytemuck", - "bytemuck_derive", - "curve25519-dalek 4.1.3", - "five8", - "five8_const", - "getrandom 0.2.10", - "js-sys", - "num-traits", "rand 0.8.5", - "serde", - "serde_derive", - "solana-atomic-u64 2.2.1", - "solana-decode-error", - "solana-define-syscall 2.3.0", - "solana-sanitize 2.2.1", - "solana-sha256-hasher 2.3.0", - "wasm-bindgen", + "solana-address 1.1.0", ] [[package]] name = "solana-pubkey" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8909d399deb0851aa524420beeb5646b115fd253ef446e35fe4504c904da3941" +checksum = "a6f7104d456b58e1418c21a8581e89810278d1190f70f27ece7fc0b2c9282a57" dependencies = [ - "solana-address", + "solana-address 2.0.0", ] [[package]] name = "solana-pubsub-client" -version = "2.3.13" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d18a7476e1d2e8df5093816afd8fffee94fbb6e442d9be8e6bd3e85f88ce8d5c" +checksum = "6264a9e448706de5604659ba9dc28935268d662181689139e76be85d379a52b3" dependencies = [ "crossbeam-channel", "futures-util", @@ -5045,124 +4501,61 @@ dependencies = [ "log", "semver", "serde", - "serde_derive", "serde_json", "solana-account-decoder-client-types", - "solana-clock 2.2.2", - "solana-pubkey 2.4.0", + "solana-clock", + "solana-pubkey 3.0.0", "solana-rpc-client-types", "solana-signature", - "thiserror 2.0.17", - "tokio", - "tokio-stream", - "tokio-tungstenite", - "tungstenite", - "url", -] - -[[package]] -name = "solana-quic-definitions" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf0d4d5b049eb1d0c35f7b18f305a27c8986fc5c0c9b383e97adaa35334379e" -dependencies = [ - "solana-keypair", -] - -[[package]] -name = "solana-remote-wallet" -version = "2.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f42662ecdff5cc2db0116730c83a6d6218db01f29750467ce2161675415acad6" -dependencies = [ - "console", - "dialoguer", - "hidapi", - "log", - "num-derive 0.4.0", - "num-traits", - "parking_lot", - "qstring", - "semver", - "solana-derivation-path", - "solana-offchain-message", - "solana-pubkey 2.4.0", - "solana-signature", - "solana-signer", - "thiserror 2.0.17", - "uriparse", -] - -[[package]] -name = "solana-rent" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1aea8fdea9de98ca6e8c2da5827707fb3842833521b528a713810ca685d2480" -dependencies = [ - "serde", - "serde_derive", - "solana-sdk-ids 2.2.1", - "solana-sdk-macro 2.2.1", - "solana-sysvar-id 2.2.1", -] - -[[package]] -name = "solana-rent" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b702d8c43711e3c8a9284a4f1bbc6a3de2553deb25b0c8142f9a44ef0ce5ddc1" -dependencies = [ - "serde", - "serde_derive", - "solana-sdk-ids 3.0.0", - "solana-sdk-macro 3.0.0", - "solana-sysvar-id 3.0.0", -] - -[[package]] -name = "solana-rent-collector" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "127e6dfa51e8c8ae3aa646d8b2672bc4ac901972a338a9e1cd249e030564fb9d" -dependencies = [ - "serde", - "serde_derive", - "solana-account", - "solana-clock 2.2.2", - "solana-epoch-schedule 2.2.1", - "solana-genesis-config", - "solana-pubkey 2.4.0", - "solana-rent 2.2.1", - "solana-sdk-ids 2.2.1", + "thiserror 2.0.17", + "tokio", + "tokio-stream", + "tokio-tungstenite", + "tungstenite", + "url", ] [[package]] -name = "solana-rent-debits" -version = "2.2.1" +name = "solana-remote-wallet" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6f9113c6003492e74438d1288e30cffa8ccfdc2ef7b49b9e816d8034da18cd" +checksum = "70a075e5c9de95448ca1c8609f42182f128d8b2b4df96e2c79be52a0511dbda8" dependencies = [ - "solana-pubkey 2.4.0", - "solana-reward-info", + "console 0.16.1", + "dialoguer", + "log", + "num-derive 0.4.0", + "num-traits", + "parking_lot", + "qstring", + "semver", + "solana-derivation-path", + "solana-offchain-message", + "solana-pubkey 3.0.0", + "solana-signature", + "solana-signer", + "thiserror 2.0.17", + "uriparse", ] [[package]] -name = "solana-reserved-account-keys" -version = "2.2.2" +name = "solana-rent" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4b22ea19ca2a3f28af7cd047c914abf833486bf7a7c4a10fc652fff09b385b1" +checksum = "b702d8c43711e3c8a9284a4f1bbc6a3de2553deb25b0c8142f9a44ef0ce5ddc1" dependencies = [ - "lazy_static", - "solana-feature-set", - "solana-pubkey 2.4.0", - "solana-sdk-ids 2.2.1", + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", ] [[package]] name = "solana-reward-info" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18205b69139b1ae0ab8f6e11cdcb627328c0814422ad2482000fa2ca54ae4a2f" +checksum = "82be7946105c2ee6be9f9ee7bd18a068b558389221d29efa92b906476102bfcc" dependencies = [ "serde", "serde_derive", @@ -5170,9 +4563,9 @@ dependencies = [ [[package]] name = "solana-rpc-client" -version = "2.3.13" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8d3161ac0918178e674c1f7f1bfac40de3e7ed0383bd65747d63113c156eaeb" +checksum = "e5a6c70a2e83dcbf6077b9d72a3e3a495d3b2f1e4aa649007bf3ba058eabcf25" dependencies = [ "async-trait", "base64 0.22.1", @@ -5185,23 +4578,23 @@ dependencies = [ "reqwest-middleware", "semver", "serde", - "serde_derive", "serde_json", "solana-account", + "solana-account-decoder", "solana-account-decoder-client-types", - "solana-clock 2.2.2", + "solana-clock", "solana-commitment-config", "solana-epoch-info", - "solana-epoch-schedule 2.2.1", + "solana-epoch-schedule", "solana-feature-gate-interface", - "solana-hash 2.3.0", - "solana-instruction 2.3.0", - "solana-message 2.4.0", - "solana-pubkey 2.4.0", + "solana-hash", + "solana-instruction", + "solana-message", + "solana-pubkey 3.0.0", "solana-rpc-client-api", "solana-signature", "solana-transaction", - "solana-transaction-error 2.2.1", + "solana-transaction-error", "solana-transaction-status-client-types", "solana-version", "solana-vote-interface", @@ -5210,58 +4603,52 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "2.3.13" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dbc138685c79d88a766a8fd825057a74ea7a21e1dd7f8de275ada899540fff7" +checksum = "827acef810c1cf0eff0b0d7217d6f24726aeace5a32eb1b589200b1f2694dae0" dependencies = [ "anyhow", "jsonrpc-core", "reqwest 0.12.24", "reqwest-middleware", "serde", - "serde_derive", "serde_json", "solana-account-decoder-client-types", - "solana-clock 2.2.2", + "solana-clock", "solana-rpc-client-types", "solana-signer", - "solana-transaction-error 2.2.1", + "solana-transaction-error", "solana-transaction-status-client-types", "thiserror 2.0.17", ] [[package]] name = "solana-rpc-client-types" -version = "2.3.13" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea428a81729255d895ea47fba9b30fd4dacbfe571a080448121bd0592751676" +checksum = "05dd4eeca973be9d059668f216a9c81b49a1c02e2b1a243622b6d251eec9a278" dependencies = [ "base64 0.22.1", "bs58", "semver", "serde", - "serde_derive", "serde_json", "solana-account", "solana-account-decoder-client-types", - "solana-clock 2.2.2", + "solana-address 1.1.0", + "solana-clock", "solana-commitment-config", - "solana-fee-calculator 2.2.1", + "solana-fee-calculator", "solana-inflation", - "solana-pubkey 2.4.0", - "solana-transaction-error 2.2.1", + "solana-reward-info", + "solana-transaction", + "solana-transaction-error", "solana-transaction-status-client-types", "solana-version", "spl-generic-token", "thiserror 2.0.17", ] -[[package]] -name = "solana-sanitize" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f1bc1357b8188d9c4a3af3fc55276e56987265eb7ad073ae6f8180ee54cecf" - [[package]] name = "solana-sanitize" version = "3.0.1" @@ -5269,83 +4656,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf09694a0fc14e5ffb18f9b7b7c0f15ecb6eac5b5610bf76a1853459d19daf9" [[package]] -name = "solana-sdk" -version = "2.3.1" +name = "solana-sbpf" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc0e4a7635b902791c44b6581bfb82f3ada32c5bc0929a64f39fe4bb384c86a" +checksum = "b15b079e08471a9dbfe1e48b2c7439c85aa2a055cbd54eddd8bd257b0a7dbb29" dependencies = [ - "bincode", - "bs58", - "getrandom 0.1.16", - "js-sys", - "serde", - "serde_json", - "solana-account", - "solana-bn254", - "solana-client-traits", - "solana-cluster-type", - "solana-commitment-config", - "solana-compute-budget-interface", - "solana-decode-error", - "solana-derivation-path", - "solana-ed25519-program", - "solana-epoch-info", - "solana-epoch-rewards-hasher", - "solana-feature-set", - "solana-fee-structure", - "solana-genesis-config", - "solana-hard-forks", - "solana-inflation", - "solana-instruction 2.3.0", - "solana-keypair", - "solana-message 2.4.0", - "solana-native-token 2.2.2", - "solana-nonce-account", - "solana-offchain-message", - "solana-packet", - "solana-poh-config", - "solana-precompile-error", - "solana-precompiles", - "solana-presigner", - "solana-program 2.3.0", - "solana-program-memory 2.3.1", - "solana-pubkey 2.4.0", - "solana-quic-definitions", - "solana-rent-collector", - "solana-rent-debits", - "solana-reserved-account-keys", - "solana-reward-info", - "solana-sanitize 2.2.1", - "solana-sdk-ids 2.2.1", - "solana-sdk-macro 2.2.1", - "solana-secp256k1-program", - "solana-secp256k1-recover 2.2.1", - "solana-secp256r1-program", - "solana-seed-derivable", - "solana-seed-phrase", - "solana-serde", - "solana-serde-varint 2.2.2", - "solana-short-vec 2.2.1", - "solana-shred-version", - "solana-signature", - "solana-signer", - "solana-system-transaction", - "solana-time-utils", - "solana-transaction", - "solana-transaction-context", - "solana-transaction-error 2.2.1", - "solana-validator-exit", + "byteorder", + "combine", + "hash32", + "libc", + "log", + "rand 0.8.5", + "rustc-demangle", "thiserror 2.0.17", - "wasm-bindgen", -] - -[[package]] -name = "solana-sdk-ids" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5d8b9cc68d5c88b062a33e23a6466722467dde0035152d8fb1afbcdf350a5f" -dependencies = [ - "solana-pubkey 2.4.0", + "winapi", ] [[package]] @@ -5357,18 +4681,6 @@ dependencies = [ "solana-pubkey 3.0.0", ] -[[package]] -name = "solana-sdk-macro" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86280da8b99d03560f6ab5aca9de2e38805681df34e0bb8f238e69b29433b9df" -dependencies = [ - "bs58", - "proc-macro2", - "quote", - "syn 2.0.107", -] - [[package]] name = "solana-sdk-macro" version = "3.0.0" @@ -5381,37 +4693,6 @@ dependencies = [ "syn 2.0.107", ] -[[package]] -name = "solana-secp256k1-program" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f19833e4bc21558fe9ec61f239553abe7d05224347b57d65c2218aeeb82d6149" -dependencies = [ - "bincode", - "digest 0.10.7", - "libsecp256k1", - "serde", - "serde_derive", - "sha3", - "solana-feature-set", - "solana-instruction 2.3.0", - "solana-precompile-error", - "solana-sdk-ids 2.2.1", - "solana-signature", -] - -[[package]] -name = "solana-secp256k1-recover" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baa3120b6cdaa270f39444f5093a90a7b03d296d362878f7a6991d6de3bbe496" -dependencies = [ - "borsh 1.5.7", - "libsecp256k1", - "solana-define-syscall 2.3.0", - "thiserror 2.0.17", -] - [[package]] name = "solana-secp256k1-recover" version = "3.0.0" @@ -5423,60 +4704,31 @@ dependencies = [ "thiserror 2.0.17", ] -[[package]] -name = "solana-secp256r1-program" -version = "2.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce0ae46da3071a900f02d367d99b2f3058fe2e90c5062ac50c4f20cfedad8f0f" -dependencies = [ - "bytemuck", - "openssl", - "solana-feature-set", - "solana-instruction 2.3.0", - "solana-precompile-error", - "solana-sdk-ids 2.2.1", -] - -[[package]] -name = "solana-security-txt" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" - [[package]] name = "solana-seed-derivable" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3beb82b5adb266c6ea90e5cf3967235644848eac476c5a1f2f9283a143b7c97f" +checksum = "ff7bdb72758e3bec33ed0e2658a920f1f35dfb9ed576b951d20d63cb61ecd95c" dependencies = [ "solana-derivation-path", ] [[package]] name = "solana-seed-phrase" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36187af2324f079f65a675ec22b31c24919cb4ac22c79472e85d819db9bbbc15" +checksum = "dc905b200a95f2ea9146e43f2a7181e3aeb55de6bc12afb36462d00a3c7310de" dependencies = [ - "hmac 0.12.1", + "hmac", "pbkdf2 0.11.0", - "sha2 0.10.8", + "sha2", ] [[package]] name = "solana-serde" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1931484a408af466e14171556a47adaa215953c7f48b24e5f6b0282763818b04" -dependencies = [ - "serde", -] - -[[package]] -name = "solana-serde-varint" -version = "2.2.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a7e155eba458ecfb0107b98236088c3764a09ddf0201ec29e52a0be40857113" +checksum = "709a93cab694c70f40b279d497639788fc2ccbcf9b4aa32273d4b361322c02dd" dependencies = [ "serde", ] @@ -5490,17 +4742,6 @@ dependencies = [ "serde", ] -[[package]] -name = "solana-serialize-utils" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "817a284b63197d2b27afdba829c5ab34231da4a9b4e763466a003c40ca4f535e" -dependencies = [ - "solana-instruction 2.3.0", - "solana-pubkey 2.4.0", - "solana-sanitize 2.2.1", -] - [[package]] name = "solana-serialize-utils" version = "3.1.0" @@ -5509,18 +4750,7 @@ checksum = "56e41dd8feea239516c623a02f0a81c2367f4b604d7965237fed0751aeec33ed" dependencies = [ "solana-instruction-error", "solana-pubkey 3.0.0", - "solana-sanitize 3.0.1", -] - -[[package]] -name = "solana-sha256-hasher" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa3feb32c28765f6aa1ce8f3feac30936f16c5c3f7eb73d63a5b8f6f8ecdc44" -dependencies = [ - "sha2 0.10.8", - "solana-define-syscall 2.3.0", - "solana-hash 2.3.0", + "solana-sanitize", ] [[package]] @@ -5529,18 +4759,9 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9b912ba6f71cb202c0c3773ec77bf898fa9fe0c78691a2d6859b3b5b8954719" dependencies = [ - "sha2 0.10.8", + "sha2", "solana-define-syscall 3.0.0", - "solana-hash 3.0.0", -] - -[[package]] -name = "solana-short-vec" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c54c66f19b9766a56fa0057d060de8378676cb64987533fa088861858fc5a69" -dependencies = [ - "serde", + "solana-hash", ] [[package]] @@ -5552,156 +4773,152 @@ dependencies = [ "serde", ] -[[package]] -name = "solana-shred-version" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afd3db0461089d1ad1a78d9ba3f15b563899ca2386351d38428faa5350c60a98" -dependencies = [ - "solana-hard-forks", - "solana-hash 2.3.0", - "solana-sha256-hasher 2.3.0", -] - [[package]] name = "solana-signature" -version = "2.3.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c8ec8e657aecfc187522fc67495142c12f35e55ddeca8698edbb738b8dbd8c" +checksum = "4bb8057cc0e9f7b5e89883d49de6f407df655bb6f3a71d0b7baf9986a2218fd9" dependencies = [ "ed25519-dalek", - "five8", - "rand 0.8.5", + "five8 0.2.1", "serde", "serde-big-array", "serde_derive", - "solana-sanitize 2.2.1", + "solana-sanitize", ] [[package]] name = "solana-signer" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c41991508a4b02f021c1342ba00bcfa098630b213726ceadc7cb032e051975b" +checksum = "5bfea97951fee8bae0d6038f39a5efcb6230ecdfe33425ac75196d1a1e3e3235" dependencies = [ - "solana-pubkey 2.4.0", + "solana-pubkey 3.0.0", "solana-signature", - "solana-transaction-error 2.2.1", + "solana-transaction-error", ] [[package]] name = "solana-slot-hashes" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c8691982114513763e88d04094c9caa0376b867a29577939011331134c301ce" +checksum = "80a293f952293281443c04f4d96afd9d547721923d596e92b4377ed2360f1746" dependencies = [ "serde", "serde_derive", - "solana-hash 2.3.0", - "solana-sdk-ids 2.2.1", - "solana-sysvar-id 2.2.1", + "solana-hash", + "solana-sdk-ids", + "solana-sysvar-id", ] [[package]] -name = "solana-slot-hashes" +name = "solana-slot-history" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80a293f952293281443c04f4d96afd9d547721923d596e92b4377ed2360f1746" +checksum = "f914f6b108f5bba14a280b458d023e3621c9973f27f015a4d755b50e88d89e97" dependencies = [ + "bv", "serde", "serde_derive", - "solana-hash 3.0.0", - "solana-sdk-ids 3.0.0", - "solana-sysvar-id 3.0.0", + "solana-sdk-ids", + "solana-sysvar-id", ] [[package]] -name = "solana-slot-history" -version = "2.2.1" +name = "solana-stable-layout" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ccc1b2067ca22754d5283afb2b0126d61eae734fc616d23871b0943b0d935e" +checksum = "1da74507795b6e8fb60b7c7306c0c36e2c315805d16eaaf479452661234685ac" dependencies = [ - "bv", - "serde", - "serde_derive", - "solana-sdk-ids 2.2.1", - "solana-sysvar-id 2.2.1", + "solana-instruction", + "solana-pubkey 3.0.0", ] [[package]] -name = "solana-slot-history" -version = "3.0.0" +name = "solana-stake-interface" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f914f6b108f5bba14a280b458d023e3621c9973f27f015a4d755b50e88d89e97" +checksum = "f6f912ae679b683365348dea482dbd9468d22ff258b554fd36e3d3683c2122e3" dependencies = [ - "bv", + "borsh 1.5.7", + "num-traits", "serde", "serde_derive", - "solana-sdk-ids 3.0.0", - "solana-sysvar-id 3.0.0", + "solana-clock", + "solana-cpi", + "solana-instruction", + "solana-program-error", + "solana-pubkey 3.0.0", + "solana-system-interface", + "solana-sysvar", + "solana-sysvar-id", ] [[package]] -name = "solana-stable-layout" -version = "2.2.1" +name = "solana-svm-callback" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f14f7d02af8f2bc1b5efeeae71bc1c2b7f0f65cd75bcc7d8180f2c762a57f54" +checksum = "fb5a52d888257a0a7b6a82874f060877e5d885cf6121fe678f3f63aba2bd0ec0" dependencies = [ - "solana-instruction 2.3.0", - "solana-pubkey 2.4.0", + "solana-account", + "solana-clock", + "solana-precompile-error", + "solana-pubkey 3.0.0", ] [[package]] -name = "solana-stable-layout" -version = "3.0.0" +name = "solana-svm-feature-set" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1da74507795b6e8fb60b7c7306c0c36e2c315805d16eaaf479452661234685ac" +checksum = "d723e2eb4bf1e951778ed4d05adcd612c7680d56c8f3077dff6f4398fcd62a51" + +[[package]] +name = "solana-svm-log-collector" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90b3f76f5334da5ddb43a237ea37b35fd90b881dfa6937d818a1fbbe111439fc" dependencies = [ - "solana-instruction 3.0.0", - "solana-pubkey 3.0.0", + "log", ] [[package]] -name = "solana-stake-interface" -version = "1.2.1" +name = "solana-svm-measure" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a822b4f1e07d06d06bcfa0c1653fbe062bf61ea55cb1c848c94ad2b52e78de9e" + +[[package]] +name = "solana-svm-timings" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5269e89fde216b4d7e1d1739cf5303f8398a1ff372a81232abbee80e554a838c" +checksum = "0a93b94e8dd07570927f758816a320987b58db6cadbafde2c733db6bd56baab4" dependencies = [ - "borsh 0.10.3", - "borsh 1.5.7", - "num-traits", - "serde", - "serde_derive", - "solana-clock 2.2.2", - "solana-cpi 2.2.1", - "solana-decode-error", - "solana-instruction 2.3.0", - "solana-program-error 2.2.2", - "solana-pubkey 2.4.0", - "solana-system-interface 1.0.0", - "solana-sysvar-id 2.2.1", + "eager", + "enum-iterator", + "solana-pubkey 3.0.0", ] [[package]] -name = "solana-svm-feature-set" -version = "2.3.13" +name = "solana-svm-transaction" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f24b836eb4d74ec255217bdbe0f24f64a07adeac31aca61f334f91cd4a3b1d5" +checksum = "5e0da1bfb99d4e5ca2becb007958010ea3f435c63931bd1e2003fcc4e0d023b4" +dependencies = [ + "solana-hash", + "solana-message", + "solana-pubkey 3.0.0", + "solana-sdk-ids", + "solana-signature", + "solana-transaction", +] [[package]] -name = "solana-system-interface" -version = "1.0.0" +name = "solana-svm-type-overrides" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7c18cb1a91c6be5f5a8ac9276a1d7c737e39a21beba9ea710ab4b9c63bc90" +checksum = "96133b2a3a87f2b028a06b260b288611873433c709402309fef13647ac655268" dependencies = [ - "js-sys", - "num-traits", - "serde", - "serde_derive", - "solana-decode-error", - "solana-instruction 2.3.0", - "solana-pubkey 2.4.0", - "wasm-bindgen", + "rand 0.8.5", ] [[package]] @@ -5711,63 +4928,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e1790547bfc3061f1ee68ea9d8dc6c973c02a163697b24263a8e9f2e6d4afa2" dependencies = [ "num-traits", - "solana-msg 3.0.0", - "solana-program-error 3.0.0", + "serde", + "serde_derive", + "solana-instruction", + "solana-msg", + "solana-program-error", "solana-pubkey 3.0.0", ] [[package]] name = "solana-system-transaction" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd98a25e5bcba8b6be8bcbb7b84b24c2a6a8178d7fb0e3077a916855ceba91a" +checksum = "a31b5699ec533621515e714f1533ee6b3b0e71c463301d919eb59b8c1e249d30" dependencies = [ - "solana-hash 2.3.0", + "solana-hash", "solana-keypair", - "solana-message 2.4.0", - "solana-pubkey 2.4.0", + "solana-message", + "solana-pubkey 3.0.0", "solana-signer", - "solana-system-interface 1.0.0", + "solana-system-interface", "solana-transaction", ] -[[package]] -name = "solana-sysvar" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8c3595f95069f3d90f275bb9bd235a1973c4d059028b0a7f81baca2703815db" -dependencies = [ - "base64 0.22.1", - "bincode", - "bytemuck", - "bytemuck_derive", - "lazy_static", - "serde", - "serde_derive", - "solana-account-info 2.3.0", - "solana-clock 2.2.2", - "solana-define-syscall 2.3.0", - "solana-epoch-rewards 2.2.1", - "solana-epoch-schedule 2.2.1", - "solana-fee-calculator 2.2.1", - "solana-hash 2.3.0", - "solana-instruction 2.3.0", - "solana-instructions-sysvar 2.2.2", - "solana-last-restart-slot 2.2.1", - "solana-program-entrypoint 2.3.0", - "solana-program-error 2.2.2", - "solana-program-memory 2.3.1", - "solana-pubkey 2.4.0", - "solana-rent 2.2.1", - "solana-sanitize 2.2.1", - "solana-sdk-ids 2.2.1", - "solana-sdk-macro 2.2.1", - "solana-slot-hashes 2.2.1", - "solana-slot-history 2.2.1", - "solana-stake-interface", - "solana-sysvar-id 2.2.1", -] - [[package]] name = "solana-sysvar" version = "3.0.0" @@ -5781,35 +4964,25 @@ dependencies = [ "lazy_static", "serde", "serde_derive", - "solana-account-info 3.0.0", - "solana-clock 3.0.0", + "solana-account-info", + "solana-clock", "solana-define-syscall 3.0.0", - "solana-epoch-rewards 3.0.0", - "solana-epoch-schedule 3.0.0", - "solana-fee-calculator 3.0.0", - "solana-hash 3.0.0", - "solana-instruction 3.0.0", - "solana-last-restart-slot 3.0.0", - "solana-program-entrypoint 3.1.0", - "solana-program-error 3.0.0", - "solana-program-memory 3.0.0", + "solana-epoch-rewards", + "solana-epoch-schedule", + "solana-fee-calculator", + "solana-hash", + "solana-instruction", + "solana-last-restart-slot", + "solana-program-entrypoint", + "solana-program-error", + "solana-program-memory", "solana-pubkey 3.0.0", - "solana-rent 3.0.0", - "solana-sdk-ids 3.0.0", - "solana-sdk-macro 3.0.0", - "solana-slot-hashes 3.0.0", - "solana-slot-history 3.0.0", - "solana-sysvar-id 3.0.0", -] - -[[package]] -name = "solana-sysvar-id" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5762b273d3325b047cfda250787f8d796d781746860d5d0a746ee29f3e8812c1" -dependencies = [ - "solana-pubkey 2.4.0", - "solana-sdk-ids 2.2.1", + "solana-rent", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-slot-hashes", + "solana-slot-history", + "solana-sysvar-id", ] [[package]] @@ -5819,162 +4992,219 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5051bc1a16d5d96a96bc33b5b2ec707495c48fe978097bdaba68d3c47987eb32" dependencies = [ "solana-pubkey 3.0.0", - "solana-sdk-ids 3.0.0", + "solana-sdk-ids", ] [[package]] name = "solana-time-utils" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af261afb0e8c39252a04d026e3ea9c405342b08c871a2ad8aa5448e068c784c" +checksum = "0ced92c60aa76ec4780a9d93f3bd64dfa916e1b998eacc6f1c110f3f444f02c9" [[package]] name = "solana-transaction" -version = "2.2.2" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abec848d081beb15a324c633cd0e0ab33033318063230389895cae503ec9b544" +checksum = "64928e6af3058dcddd6da6680cbe08324b4e071ad73115738235bbaa9e9f72a5" dependencies = [ "bincode", "serde", "serde_derive", - "solana-bincode", - "solana-feature-set", - "solana-hash 2.3.0", - "solana-instruction 2.3.0", - "solana-keypair", - "solana-message 2.4.0", - "solana-precompiles", - "solana-pubkey 2.4.0", - "solana-sanitize 2.2.1", - "solana-sdk-ids 2.2.1", - "solana-short-vec 2.2.1", + "solana-address 1.1.0", + "solana-hash", + "solana-instruction", + "solana-instruction-error", + "solana-message", + "solana-sanitize", + "solana-sdk-ids", + "solana-short-vec", "solana-signature", "solana-signer", - "solana-system-interface 1.0.0", - "solana-transaction-error 2.2.1", - "wasm-bindgen", + "solana-transaction-error", ] [[package]] name = "solana-transaction-context" -version = "2.3.13" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a312304361987a85b2ef2293920558e6612876a639dd1309daf6d0d59ef2fe" +checksum = "4cbaa5fe13d93f94e8155fc24d13a36fa574665ef7f8e5909d602e9d6ae39434" dependencies = [ "bincode", "serde", - "serde_derive", "solana-account", - "solana-instruction 2.3.0", - "solana-instructions-sysvar 2.2.2", - "solana-pubkey 2.4.0", - "solana-rent 2.2.1", - "solana-sdk-ids 2.2.1", + "solana-instruction", + "solana-instructions-sysvar", + "solana-pubkey 3.0.0", + "solana-rent", + "solana-sbpf", + "solana-sdk-ids", ] [[package]] name = "solana-transaction-error" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a9dc8fdb61c6088baab34fc3a8b8473a03a7a5fd404ed8dd502fa79b67cb1" +checksum = "4222065402340d7e6aec9dc3e54d22992ddcf923d91edcd815443c2bfca3144a" dependencies = [ "serde", "serde_derive", - "solana-instruction 2.3.0", - "solana-sanitize 2.2.1", + "solana-instruction-error", + "solana-sanitize", ] [[package]] -name = "solana-transaction-error" -version = "3.0.0" +name = "solana-transaction-status" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4222065402340d7e6aec9dc3e54d22992ddcf923d91edcd815443c2bfca3144a" +checksum = "fdc8749575ac8d70894ca92e5cba4894f3b19fbbf7682bf53b83ef34947632b8" dependencies = [ - "solana-instruction-error", - "solana-sanitize 3.0.1", + "Inflector", + "agave-reserved-account-keys", + "base64 0.22.1", + "bincode", + "borsh 1.5.7", + "bs58", + "log", + "serde", + "serde_json", + "solana-account-decoder", + "solana-address-lookup-table-interface", + "solana-clock", + "solana-hash", + "solana-instruction", + "solana-loader-v2-interface", + "solana-loader-v3-interface", + "solana-message", + "solana-program-option", + "solana-pubkey 3.0.0", + "solana-reward-info", + "solana-sdk-ids", + "solana-signature", + "solana-stake-interface", + "solana-system-interface", + "solana-transaction", + "solana-transaction-error", + "solana-transaction-status-client-types", + "solana-vote-interface", + "spl-associated-token-account-interface", + "spl-memo-interface", + "spl-token-2022-interface", + "spl-token-group-interface", + "spl-token-interface", + "spl-token-metadata-interface", + "thiserror 2.0.17", ] [[package]] name = "solana-transaction-status-client-types" -version = "2.3.13" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f1d7c2387c35850848212244d2b225847666cb52d3bd59a5c409d2c300303d" +checksum = "877eb23fb367968e5d33cef9bbeba0cd30bfd6235174ff9f6756cfa5e8d3d9af" dependencies = [ "base64 0.22.1", "bincode", "bs58", "serde", - "serde_derive", "serde_json", "solana-account-decoder-client-types", "solana-commitment-config", - "solana-message 2.4.0", + "solana-instruction", + "solana-message", + "solana-pubkey 3.0.0", "solana-reward-info", "solana-signature", "solana-transaction", "solana-transaction-context", - "solana-transaction-error 2.2.1", + "solana-transaction-error", "thiserror 2.0.17", ] -[[package]] -name = "solana-validator-exit" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bbf6d7a3c0b28dd5335c52c0e9eae49d0ae489a8f324917faf0ded65a812c1d" - [[package]] name = "solana-version" -version = "2.3.13" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3324d46c7f7b7f5d34bf7dc71a2883bdc072c7b28ca81d0b2167ecec4cf8da9f" +checksum = "beffc235fc91b4991856a9309e2d660c3213b9e74ca030753386052d1d3cb47e" dependencies = [ "agave-feature-set", "rand 0.8.5", "semver", "serde", - "serde_derive", - "solana-sanitize 2.2.1", - "solana-serde-varint 2.2.2", + "solana-sanitize", + "solana-serde-varint", ] [[package]] name = "solana-vote-interface" -version = "2.2.6" +version = "4.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b80d57478d6599d30acc31cc5ae7f93ec2361a06aefe8ea79bc81739a08af4c3" +checksum = "db6e123e16bfdd7a81d71b4c4699e0b29580b619f4cd2ef5b6aae1eb85e8979f" dependencies = [ "bincode", + "cfg_eval", "num-derive 0.4.0", "num-traits", "serde", "serde_derive", - "solana-clock 2.2.2", - "solana-decode-error", - "solana-hash 2.3.0", - "solana-instruction 2.3.0", - "solana-pubkey 2.4.0", - "solana-rent 2.2.1", - "solana-sdk-ids 2.2.1", - "solana-serde-varint 2.2.2", - "solana-serialize-utils 2.2.1", - "solana-short-vec 2.2.1", - "solana-system-interface 1.0.0", + "serde_with", + "solana-clock", + "solana-hash", + "solana-instruction", + "solana-instruction-error", + "solana-pubkey 3.0.0", + "solana-rent", + "solana-sdk-ids", + "solana-serde-varint", + "solana-serialize-utils", + "solana-short-vec", + "solana-system-interface", +] + +[[package]] +name = "solana-vote-program" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6a314cbf3833a54ee2f5db9b7dc95e999f0937e98727cac1c4f86f1a2dd550" +dependencies = [ + "agave-feature-set", + "bincode", + "log", + "num-derive 0.4.0", + "num-traits", + "serde", + "solana-account", + "solana-bincode", + "solana-clock", + "solana-epoch-schedule", + "solana-hash", + "solana-instruction", + "solana-keypair", + "solana-packet", + "solana-program-runtime", + "solana-pubkey 3.0.0", + "solana-rent", + "solana-sdk-ids", + "solana-signer", + "solana-slot-hashes", + "solana-transaction", + "solana-transaction-context", + "solana-vote-interface", + "thiserror 2.0.17", ] [[package]] name = "solana-zk-sdk" -version = "2.3.13" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b9fc6ec37d16d0dccff708ed1dd6ea9ba61796700c3bb7c3b401973f10f63b" +checksum = "9602bcb1f7af15caef92b91132ec2347e1c51a72ecdbefdaefa3eac4b8711475" dependencies = [ "aes-gcm-siv", "base64 0.22.1", "bincode", "bytemuck", "bytemuck_derive", - "curve25519-dalek 4.1.3", - "itertools 0.12.1", + "curve25519-dalek", + "getrandom 0.2.10", + "itertools", "js-sys", "merlin", "num-derive 0.4.0", @@ -5985,9 +5215,9 @@ dependencies = [ "serde_json", "sha3", "solana-derivation-path", - "solana-instruction 2.3.0", - "solana-pubkey 2.4.0", - "solana-sdk-ids 2.2.1", + "solana-instruction", + "solana-pubkey 3.0.0", + "solana-sdk-ids", "solana-seed-derivable", "solana-seed-phrase", "solana-signature", @@ -6021,40 +5251,25 @@ dependencies = [ ] [[package]] -name = "spl-associated-token-account" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae179d4a26b3c7a20c839898e6aed84cb4477adf108a366c95532f058aea041b" -dependencies = [ - "borsh 1.5.7", - "num-derive 0.4.0", - "num-traits", - "solana-program 2.3.0", - "spl-associated-token-account-client", - "spl-token", - "spl-token-2022", - "thiserror 2.0.17", -] - -[[package]] -name = "spl-associated-token-account-client" +name = "spl-associated-token-account-interface" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f8349dbcbe575f354f9a533a21f272f3eb3808a49e2fdc1c34393b88ba76cb" +checksum = "e6433917b60441d68d99a17e121d9db0ea15a9a69c0e5afa34649cf5ba12612f" dependencies = [ - "solana-instruction 2.3.0", - "solana-pubkey 2.4.0", + "borsh 1.5.7", + "solana-instruction", + "solana-pubkey 3.0.0", ] [[package]] name = "spl-discriminator" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a20542d4c8264856d205c0090512f374dbf7b3124479a3d93ab6184ae3631aa" +checksum = "d48cc11459e265d5b501534144266620289720b4c44522a47bc6b63cd295d2f3" dependencies = [ "bytemuck", - "solana-program-error 2.2.2", - "solana-sha256-hasher 2.3.0", + "solana-program-error", + "solana-sha256-hasher", "spl-discriminator-derive", ] @@ -6077,226 +5292,93 @@ checksum = "8c1f05593b7ca9eac7caca309720f2eafb96355e037e6d373b909a80fe7b69b9" dependencies = [ "proc-macro2", "quote", - "sha2 0.10.8", + "sha2", "syn 2.0.107", "thiserror 1.0.66", ] -[[package]] -name = "spl-elgamal-registry" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65edfeed09cd4231e595616aa96022214f9c9d2be02dea62c2b30d5695a6833a" -dependencies = [ - "bytemuck", - "solana-account-info 2.3.0", - "solana-cpi 2.2.1", - "solana-instruction 2.3.0", - "solana-msg 2.2.1", - "solana-program-entrypoint 2.3.0", - "solana-program-error 2.2.2", - "solana-pubkey 2.4.0", - "solana-rent 2.2.1", - "solana-sdk-ids 2.2.1", - "solana-system-interface 1.0.0", - "solana-sysvar 2.3.0", - "solana-zk-sdk", - "spl-pod", - "spl-token-confidential-transfer-proof-extraction", -] - [[package]] name = "spl-generic-token" -version = "1.0.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "741a62a566d97c58d33f9ed32337ceedd4e35109a686e31b1866c5dfa56abddc" +checksum = "233df81b75ab99b42f002b5cdd6e65a7505ffa930624f7096a7580a56765e9cf" dependencies = [ "bytemuck", - "solana-pubkey 2.4.0", + "solana-pubkey 3.0.0", ] [[package]] -name = "spl-memo" -version = "6.0.0" +name = "spl-memo-interface" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f09647c0974e33366efeb83b8e2daebb329f0420149e74d3a4bd2c08cf9f7cb" +checksum = "3d4e2aedd58f858337fa609af5ad7100d4a243fdaf6a40d6eb4c28c5f19505d3" dependencies = [ - "solana-account-info 2.3.0", - "solana-instruction 2.3.0", - "solana-msg 2.2.1", - "solana-program-entrypoint 2.3.0", - "solana-program-error 2.2.2", - "solana-pubkey 2.4.0", + "solana-instruction", + "solana-pubkey 3.0.0", ] [[package]] name = "spl-pod" -version = "0.5.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d994afaf86b779104b4a95ba9ca75b8ced3fdb17ee934e38cb69e72afbe17799" +checksum = "b1233fdecd7461611d69bb87bc2e95af742df47291975d21232a0be8217da9de" dependencies = [ "borsh 1.5.7", "bytemuck", "bytemuck_derive", "num-derive 0.4.0", "num-traits", - "solana-decode-error", - "solana-msg 2.2.1", - "solana-program-error 2.2.2", - "solana-program-option 2.2.1", - "solana-pubkey 2.4.0", - "solana-zk-sdk", - "thiserror 2.0.17", -] - -[[package]] -name = "spl-program-error" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdebc8b42553070b75aa5106f071fef2eb798c64a7ec63375da4b1f058688c6" -dependencies = [ - "num-derive 0.4.0", - "num-traits", - "solana-decode-error", - "solana-msg 2.2.1", - "solana-program-error 2.2.2", - "spl-program-error-derive", - "thiserror 2.0.17", -] - -[[package]] -name = "spl-program-error-derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2539e259c66910d78593475540e8072f0b10f0f61d7607bbf7593899ed52d0" -dependencies = [ - "proc-macro2", - "quote", - "sha2 0.10.8", - "syn 2.0.107", -] - -[[package]] -name = "spl-tlv-account-resolution" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1408e961215688715d5a1063cbdcf982de225c45f99c82b4f7d7e1dd22b998d7" -dependencies = [ - "bytemuck", - "num-derive 0.4.0", - "num-traits", - "solana-account-info 2.3.0", - "solana-decode-error", - "solana-instruction 2.3.0", - "solana-msg 2.2.1", - "solana-program-error 2.2.2", - "solana-pubkey 2.4.0", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-type-length-value", - "thiserror 2.0.17", -] - -[[package]] -name = "spl-token" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053067c6a82c705004f91dae058b11b4780407e9ccd6799dc9e7d0fab5f242da" -dependencies = [ - "arrayref", - "bytemuck", - "num-derive 0.4.0", - "num-traits", "num_enum", - "solana-account-info 2.3.0", - "solana-cpi 2.2.1", - "solana-decode-error", - "solana-instruction 2.3.0", - "solana-msg 2.2.1", - "solana-program-entrypoint 2.3.0", - "solana-program-error 2.2.2", - "solana-program-memory 2.3.1", - "solana-program-option 2.2.1", - "solana-program-pack 2.2.1", - "solana-pubkey 2.4.0", - "solana-rent 2.2.1", - "solana-sdk-ids 2.2.1", - "solana-sysvar 2.3.0", + "solana-program-error", + "solana-program-option", + "solana-pubkey 3.0.0", + "solana-zk-sdk", "thiserror 2.0.17", ] [[package]] -name = "spl-token-2022" -version = "8.0.1" +name = "spl-token-2022-interface" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f0dfbb079eebaee55e793e92ca5f433744f4b71ee04880bfd6beefba5973e5" +checksum = "2fcd81188211f4b3c8a5eba7fd534c7142f9dd026123b3472492782cc72f4dc6" dependencies = [ "arrayref", "bytemuck", "num-derive 0.4.0", "num-traits", "num_enum", - "solana-account-info 2.3.0", - "solana-clock 2.2.2", - "solana-cpi 2.2.1", - "solana-decode-error", - "solana-instruction 2.3.0", - "solana-msg 2.2.1", - "solana-native-token 2.2.2", - "solana-program-entrypoint 2.3.0", - "solana-program-error 2.2.2", - "solana-program-memory 2.3.1", - "solana-program-option 2.2.1", - "solana-program-pack 2.2.1", - "solana-pubkey 2.4.0", - "solana-rent 2.2.1", - "solana-sdk-ids 2.2.1", - "solana-security-txt", - "solana-system-interface 1.0.0", - "solana-sysvar 2.3.0", + "solana-account-info", + "solana-instruction", + "solana-program-error", + "solana-program-option", + "solana-program-pack", + "solana-pubkey 3.0.0", + "solana-sdk-ids", "solana-zk-sdk", - "spl-elgamal-registry", - "spl-memo", "spl-pod", - "spl-token", - "spl-token-confidential-transfer-ciphertext-arithmetic", "spl-token-confidential-transfer-proof-extraction", "spl-token-confidential-transfer-proof-generation", "spl-token-group-interface", "spl-token-metadata-interface", - "spl-transfer-hook-interface", "spl-type-length-value", "thiserror 2.0.17", ] -[[package]] -name = "spl-token-confidential-transfer-ciphertext-arithmetic" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cddd52bfc0f1c677b41493dafa3f2dbbb4b47cf0990f08905429e19dc8289b35" -dependencies = [ - "base64 0.22.1", - "bytemuck", - "solana-curve25519", - "solana-zk-sdk", -] - [[package]] name = "spl-token-confidential-transfer-proof-extraction" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe2629860ff04c17bafa9ba4bed8850a404ecac81074113e1f840dbd0ebb7bd6" +checksum = "879a9ebad0d77383d3ea71e7de50503554961ff0f4ef6cbca39ad126e6f6da3a" dependencies = [ "bytemuck", - "solana-account-info 2.3.0", + "solana-account-info", "solana-curve25519", - "solana-instruction 2.3.0", - "solana-instructions-sysvar 2.2.2", - "solana-msg 2.2.1", - "solana-program-error 2.2.2", - "solana-pubkey 2.4.0", - "solana-sdk-ids 2.2.1", + "solana-instruction", + "solana-instructions-sysvar", + "solana-msg", + "solana-program-error", + "solana-pubkey 3.0.0", + "solana-sdk-ids", "solana-zk-sdk", "spl-pod", "thiserror 2.0.17", @@ -6304,93 +5386,85 @@ dependencies = [ [[package]] name = "spl-token-confidential-transfer-proof-generation" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa27b9174bea869a7ebf31e0be6890bce90b1a4288bc2bbf24bd413f80ae3fde" +checksum = "a0cd59fce3dc00f563c6fa364d67c3f200d278eae681f4dc250240afcfe044b1" dependencies = [ - "curve25519-dalek 4.1.3", + "curve25519-dalek", "solana-zk-sdk", "thiserror 2.0.17", ] [[package]] name = "spl-token-group-interface" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5597b4cd76f85ce7cd206045b7dc22da8c25516573d42d267c8d1fd128db5129" +checksum = "452d0f758af20caaa10d9a6f7608232e000d4c74462f248540b3d2ddfa419776" dependencies = [ "bytemuck", "num-derive 0.4.0", "num-traits", - "solana-decode-error", - "solana-instruction 2.3.0", - "solana-msg 2.2.1", - "solana-program-error 2.2.2", - "solana-pubkey 2.4.0", + "num_enum", + "solana-instruction", + "solana-program-error", + "solana-pubkey 3.0.0", "spl-discriminator", "spl-pod", "thiserror 2.0.17", ] [[package]] -name = "spl-token-metadata-interface" -version = "0.7.0" +name = "spl-token-interface" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "304d6e06f0de0c13a621464b1fd5d4b1bebf60d15ca71a44d3839958e0da16ee" +checksum = "8c564ac05a7c8d8b12e988a37d82695b5ba4db376d07ea98bc4882c81f96c7f3" dependencies = [ - "borsh 1.5.7", + "arrayref", + "bytemuck", "num-derive 0.4.0", "num-traits", - "solana-borsh 2.2.1", - "solana-decode-error", - "solana-instruction 2.3.0", - "solana-msg 2.2.1", - "solana-program-error 2.2.2", - "solana-pubkey 2.4.0", - "spl-discriminator", - "spl-pod", - "spl-type-length-value", + "num_enum", + "solana-instruction", + "solana-program-error", + "solana-program-option", + "solana-program-pack", + "solana-pubkey 3.0.0", + "solana-sdk-ids", "thiserror 2.0.17", ] [[package]] -name = "spl-transfer-hook-interface" -version = "0.10.0" +name = "spl-token-metadata-interface" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e905b849b6aba63bde8c4badac944ebb6c8e6e14817029cbe1bc16829133bd" +checksum = "9c467c7c3bd056f8fe60119e7ec34ddd6f23052c2fa8f1f51999098063b72676" dependencies = [ - "arrayref", - "bytemuck", + "borsh 1.5.7", "num-derive 0.4.0", "num-traits", - "solana-account-info 2.3.0", - "solana-cpi 2.2.1", - "solana-decode-error", - "solana-instruction 2.3.0", - "solana-msg 2.2.1", - "solana-program-error 2.2.2", - "solana-pubkey 2.4.0", + "solana-borsh", + "solana-instruction", + "solana-program-error", + "solana-pubkey 3.0.0", "spl-discriminator", "spl-pod", - "spl-program-error", - "spl-tlv-account-resolution", "spl-type-length-value", "thiserror 2.0.17", ] [[package]] name = "spl-type-length-value" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d417eb548214fa822d93f84444024b4e57c13ed6719d4dcc68eec24fb481e9f5" +checksum = "ca20a1a19f4507a98ca4b28ff5ed54cac9b9d34ed27863e2bde50a3238f9a6ac" dependencies = [ "bytemuck", "num-derive 0.4.0", "num-traits", - "solana-account-info 2.3.0", - "solana-decode-error", - "solana-msg 2.2.1", - "solana-program-error 2.2.2", + "num_enum", + "solana-account-info", + "solana-msg", + "solana-program-error", "spl-discriminator", "spl-pod", "thiserror 2.0.17", @@ -6489,6 +5563,12 @@ dependencies = [ "libc", ] +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "tar" version = "0.4.40" @@ -6513,15 +5593,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "termcolor" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" -dependencies = [ - "winapi-util", -] - [[package]] name = "textwrap" version = "0.11.0" @@ -6571,19 +5642,26 @@ dependencies = [ "syn 2.0.107", ] +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + [[package]] name = "tiny-bip39" -version = "0.8.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" +checksum = "a30fd743a02bf35236f6faf99adb03089bb77e91c998dac2c2ad76bb424f668c" dependencies = [ - "anyhow", - "hmac 0.8.1", "once_cell", - "pbkdf2 0.4.0", - "rand 0.7.3", + "pbkdf2 0.12.2", + "rand 0.8.5", "rustc-hash 1.1.0", - "sha2 0.9.9", + "sha2", "thiserror 1.0.66", "unicode-normalization", "wasm-bindgen", @@ -6676,17 +5754,18 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.20.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857" dependencies = [ "futures-util", "log", - "rustls 0.21.12", + "rustls 0.23.23", + "rustls-pki-types", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls 0.26.2", "tungstenite", - "webpki-roots 0.25.2", + "webpki-roots 0.26.11", ] [[package]] @@ -6855,23 +5934,22 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tungstenite" -version = "0.20.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442" dependencies = [ - "byteorder", "bytes", "data-encoding", - "http 0.2.12", + "http 1.3.1", "httparse", "log", - "rand 0.8.5", - "rustls 0.21.12", + "rand 0.9.2", + "rustls 0.23.23", + "rustls-pki-types", "sha1", - "thiserror 1.0.66", - "url", + "thiserror 2.0.17", "utf-8", - "webpki-roots 0.24.0", + "webpki-roots 0.26.11", ] [[package]] @@ -6922,6 +6000,12 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" +[[package]] +name = "unit-prefix" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81e544489bf3d8ef66c953931f56617f423cd4b5494be343d9b9d3dda037b9a3" + [[package]] name = "universal-hash" version = "0.5.1" @@ -6932,6 +6016,15 @@ dependencies = [ "subtle", ] +[[package]] +name = "unreachable" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" +dependencies = [ + "void", +] + [[package]] name = "unsafe-libyaml" version = "0.2.11" @@ -6962,13 +6055,14 @@ dependencies = [ [[package]] name = "url" -version = "2.5.4" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] @@ -6989,12 +6083,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "vec_map" version = "0.8.2" @@ -7007,6 +6095,12 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + [[package]] name = "walkdir" version = "2.4.0" @@ -7028,15 +6122,18 @@ dependencies = [ [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +name = "wasip2" +version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +dependencies = [ + "wit-bindgen", +] [[package]] name = "wasm-bindgen" @@ -7131,18 +6228,18 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.24.0" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" -dependencies = [ - "rustls-webpki 0.101.7", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" +dependencies = [ + "webpki-roots 1.0.3", +] [[package]] name = "webpki-roots" @@ -7449,12 +6546,27 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "wit-bindgen" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" + [[package]] name = "writeable" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + [[package]] name = "xattr" version = "1.0.1" diff --git a/Cargo.toml b/Cargo.toml index ada2dab70c..890ecff98b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,3 @@ - [workspace] members = [ "avm", @@ -13,11 +12,47 @@ members = [ ] exclude = ["tests/cfo/deps/openbook-dex", "tests/swap/deps/openbook-dex"] resolver = "2" -[profile.release] -lto = true [workspace.dependencies] -solana-signer = "2" +solana-account = "3.0.0" +solana-account-decoder = "3.0.0" +solana-account-info = "3.0.0" +solana-cli-config = "3.0.0" +solana-clock = "3.0.0" +solana-commitment-config = "3.0.0" +solana-compute-budget-interface = "3.0.0" +solana-cpi = "3.0.0" +solana-define-syscall = "3.0.0" +solana-faucet = "3.0.0" +solana-feature-gate-interface = "3.0.0" +solana-instruction = "3.0.0" +solana-instructions-sysvar = "3.0.0" +solana-invoke = "0.5.0" +solana-keypair = "3.0.0" +solana-loader-v3-interface = "6.0.0" +solana-msg = "3.0.0" +solana-program = "3.0.0" +solana-program-entrypoint = "3.0.0" +solana-program-error = "3.0.0" +solana-program-memory = "3.0.0" +solana-program-option = "3.0.0" +solana-program-pack = "3.0.0" +solana-pubkey = "4.0.0" +solana-pubsub-client = "3.0.0" +solana-rpc-client = "3.0.0" +solana-rpc-client-api = "3.0.0" +solana-sdk-ids = "3.0.0" +solana-signature = "3.0.0" +solana-signer = "3.0.0" +solana-stake-interface = "2.0.0" +solana-system-interface = "2.0.0" +# FIXME: solana-sysvar 3.1.x contains breaking changes to sysvar retrieval +solana-sysvar = "~3.0.0" +solana-sysvar-id = "3.0.0" +solana-transaction = "3.0.0" + +[profile.release] +lto = true [profile.release.package.anchor-cli] codegen-units = 1 diff --git a/bench/BINARY_SIZE.md b/bench/BINARY_SIZE.md index a61c119f9c..d0ee5eaa57 100644 --- a/bench/BINARY_SIZE.md +++ b/bench/BINARY_SIZE.md @@ -28,8 +28,8 @@ Solana version: 2.3.0 Solana version: 2.3.0 -| Program | Binary Size | - | -| ------- | ----------- | ----------------------- | +| Program | Binary Size | - | +| ------- | ----------- | ------------------------ | | bench | 1,126,840 | 🔴 **+181,272 (19.17%)** | ### Notable changes @@ -42,8 +42,8 @@ Solana version: 2.3.0 Solana version: 2.1.0 -| Program | Binary Size | - | -| ------- | ----------- | --------------------- | +| Program | Binary Size | - | +| ------- | ----------- | ---------------------- | | bench | 945,568 | 🟢 **-96,360 (9.25%)** | ### Notable changes @@ -66,8 +66,8 @@ Solana version: 2.1.0 Solana version: 2.1.0 -| Program | Binary Size | - | -| ------- | ----------- | ----------------------- | +| Program | Binary Size | - | +| ------- | ----------- | ------------------------ | | bench | 1,041,928 | 🔴 **+250,920 (31.72%)** | ### Notable changes @@ -93,8 +93,8 @@ Solana version: 1.18.17 Solana version: 1.18.8 -| Program | Binary Size | - | -| ------- | ----------- | --------------------- | +| Program | Binary Size | - | +| ------- | ----------- | ---------------------- | | bench | 791,008 | 🔴 **+47,952 (6.45%)** | ### Notable changes @@ -107,8 +107,8 @@ Solana version: 1.18.8 Solana version: 1.17.0 -| Program | Binary Size | +/- | -| ------- | ----------- | ----------------------- | +| Program | Binary Size | +/- | +| ------- | ----------- | ------------------------ | | bench | 743,056 | 🟢 **-417,904 (36.00%)** | ### Notable changes @@ -123,8 +123,8 @@ Solana version: 1.17.0 Solana version: 1.16.0 -| Program | Binary Size | +/- | -| ------- | ----------- | --------------------- | +| Program | Binary Size | +/- | +| ------- | ----------- | ---------------------- | | bench | 1,160,960 | 🔴 **+23,272 (2.05%)** | ### Notable changes @@ -141,4 +141,4 @@ Solana version: 1.14.16 | ------- | ----------- | --- | | bench | 1,137,688 | N/A | ---- \ No newline at end of file +--- diff --git a/bench/COMPUTE_UNITS.md b/bench/COMPUTE_UNITS.md index 56c3a6f8ae..319f58017a 100644 --- a/bench/COMPUTE_UNITS.md +++ b/bench/COMPUTE_UNITS.md @@ -16,95 +16,95 @@ The programs and their tests are located in [/tests/bench](https://github.com/co Solana version: 2.3.0 -| Instruction | Compute Units | - | -| --------------------------- | ------------- | ------------------- | -| accountInfo1 | 685 | - | -| accountInfo2 | 1,053 | - | -| accountInfo4 | 1,750 | - | -| accountInfo8 | 3,135 | - | -| accountEmptyInit1 | 4,915 | - | -| accountEmpty1 | 774 | - | -| accountEmptyInit2 | 8,793 | - | -| accountEmpty2 | 1,174 | - | -| accountEmptyInit4 | 16,495 | 🟢 **-253 (1.51%)** | -| accountEmpty4 | 1,962 | - | -| accountEmptyInit8 | 31,997 | 🟢 **-360 (1.11%)** | -| accountEmpty8 | 3,548 | - | -| accountSizedInit1 | 5,019 | - | -| accountSized1 | 813 | 🟢 **-9 (1.09%)** | -| accountSizedInit2 | 8,981 | - | -| accountSized2 | 1,222 | 🟢 **-18 (1.45%)** | -| accountSizedInit4 | 16,850 | 🟢 **-304 (1.77%)** | -| accountSized4 | 2,046 | 🟢 **-36 (1.73%)** | -| accountSizedInit8 | 32,653 | 🟢 **-360 (1.09%)** | -| accountSized8 | 3,690 | 🟢 **-72 (1.91%)** | -| accountUnsizedInit1 | 5,127 | - | -| accountUnsized1 | 853 | 🟢 **-21 (2.40%)** | -| accountUnsizedInit2 | 9,131 | 🟢 **-120 (1.30%)** | -| accountUnsized2 | 1,284 | 🟢 **-42 (3.17%)** | -| accountUnsizedInit4 | 17,198 | 🟢 **-180 (1.04%)** | -| accountUnsized4 | 2,147 | 🟢 **-84 (3.77%)** | -| accountUnsizedInit8 | 33,324 | 🟢 **-637 (1.88%)** | -| accountUnsized8 | 3,867 | 🟢 **-168 (4.16%)** | -| boxedAccountEmptyInit1 | 5,007 | - | -| boxedAccountEmpty1 | 864 | - | -| boxedAccountEmptyInit2 | 8,906 | - | -| boxedAccountEmpty2 | 1,286 | - | -| boxedAccountEmptyInit4 | 16,648 | 🟢 **-254 (1.50%)** | -| boxedAccountEmpty4 | 2,115 | - | -| boxedAccountEmptyInit8 | 32,231 | 🟢 **-360 (1.10%)** | -| boxedAccountEmpty8 | 3,801 | - | -| boxedAccountSizedInit1 | 5,103 | - | -| boxedAccountSized1 | 912 | - | -| boxedAccountSizedInit2 | 9,075 | - | -| boxedAccountSized2 | 1,337 | 🟢 **-18 (1.33%)** | -| boxedAccountSizedInit4 | 16,960 | 🟢 **-254 (1.48%)** | -| boxedAccountSized4 | 2,195 | 🟢 **-36 (1.61%)** | -| boxedAccountSizedInit8 | 32,831 | 🟢 **-690 (2.06%)** | -| boxedAccountSized8 | 3,935 | 🟢 **-72 (1.80%)** | -| boxedAccountUnsizedInit1 | 5,202 | - | -| boxedAccountUnsized1 | 943 | 🟢 **-21 (2.18%)** | -| boxedAccountUnsizedInit2 | 9,251 | - | -| boxedAccountUnsized2 | 1,392 | 🟢 **-42 (2.93%)** | -| boxedAccountUnsizedInit4 | 17,284 | 🟢 **-258 (1.47%)** | -| boxedAccountUnsized4 | 2,283 | 🟢 **-84 (3.55%)** | -| boxedAccountUnsizedInit8 | 33,455 | 🟢 **-698 (2.04%)** | -| boxedAccountUnsized8 | 4,089 | 🟢 **-168 (3.95%)** | -| boxedInterfaceAccountMint1 | 1,110 | - | -| boxedInterfaceAccountMint2 | 1,534 | - | -| boxedInterfaceAccountMint4 | 2,370 | - | -| boxedInterfaceAccountMint8 | 4,064 | - | -| boxedInterfaceAccountToken1 | 1,246 | - | -| boxedInterfaceAccountToken2 | 1,794 | - | -| boxedInterfaceAccountToken4 | 2,878 | - | -| boxedInterfaceAccountToken8 | 5,068 | - | -| interfaceAccountMint1 | 1,126 | - | -| interfaceAccountMint2 | 1,562 | - | -| interfaceAccountMint4 | 2,432 | - | -| interfaceAccountMint8 | 4,163 | - | -| interfaceAccountToken1 | 1,268 | - | -| interfaceAccountToken2 | 1,849 | - | -| interfaceAccountToken4 | 2,997 | - | -| interface1 | 878 | - | -| interface2 | 1,023 | - | -| interface4 | 1,301 | - | -| interface8 | 1,867 | - | -| program1 | 890 | - | -| program2 | 1,035 | - | -| program4 | 1,313 | - | -| program8 | 1,879 | - | -| signer1 | 874 | - | -| signer2 | 1,173 | - | -| signer4 | 1,759 | - | -| signer8 | 2,941 | - | -| systemAccount1 | 911 | - | -| systemAccount2 | 1,235 | - | -| systemAccount4 | 1,871 | - | -| systemAccount8 | 3,153 | - | -| uncheckedAccount1 | 882 | - | -| uncheckedAccount2 | 1,162 | - | -| uncheckedAccount4 | 1,716 | - | -| uncheckedAccount8 | 2,833 | - | +| Instruction | Compute Units | - | +| --------------------------- | ------------- | -------------------- | +| accountInfo1 | 719 | 🔴 **+34 (4.96%)** | +| accountInfo2 | 1,124 | 🔴 **+71 (6.74%)** | +| accountInfo4 | 1,895 | 🔴 **+145 (8.29%)** | +| accountInfo8 | 3,428 | 🔴 **+293 (9.35%)** | +| accountEmptyInit1 | 4,996 | 🔴 **+81 (1.65%)** | +| accountEmpty1 | 803 | 🔴 **+29 (3.75%)** | +| accountEmptyInit2 | 8,919 | 🔴 **+126 (1.43%)** | +| accountEmpty2 | 1,235 | 🔴 **+61 (5.20%)** | +| accountEmptyInit4 | 16,759 | 🔴 **+11 (0.07%)** | +| accountEmpty4 | 2,087 | 🔴 **+125 (6.37%)** | +| accountEmptyInit8 | 32,446 | 🔴 **+89 (0.28%)** | +| accountEmpty8 | 3,801 | 🔴 **+253 (7.13%)** | +| accountSizedInit1 | 5,097 | 🔴 **+78 (1.55%)** | +| accountSized1 | 842 | 🔴 **+20 (2.43%)** | +| accountSizedInit2 | 9,098 | 🔴 **+117 (1.30%)** | +| accountSized2 | 1,283 | 🔴 **+43 (3.47%)** | +| accountSizedInit4 | 17,102 | 🟢 **-52 (0.30%)** | +| accountSized4 | 2,171 | 🔴 **+89 (4.27%)** | +| accountSizedInit8 | 33,078 | 🔴 **+65 (0.20%)** | +| accountSized8 | 3,943 | 🔴 **+181 (4.81%)** | +| accountUnsizedInit1 | 5,199 | 🔴 **+72 (1.40%)** | +| accountUnsized1 | 882 | 🔴 **+8 (0.92%)** | +| accountUnsizedInit2 | 9,285 | 🔴 **+34 (0.37%)** | +| accountUnsized2 | 1,345 | 🔴 **+19 (1.43%)** | +| accountUnsizedInit4 | 17,426 | 🔴 **+48 (0.28%)** | +| accountUnsized4 | 2,272 | 🔴 **+41 (1.84%)** | +| accountUnsizedInit8 | 33,700 | 🟢 **-261 (0.77%)** | +| accountUnsized8 | 4,120 | 🔴 **+85 (2.11%)** | +| boxedAccountEmptyInit1 | 5,088 | 🔴 **+81 (1.62%)** | +| boxedAccountEmpty1 | 893 | 🔴 **+29 (3.36%)** | +| boxedAccountEmptyInit2 | 9,032 | 🔴 **+126 (1.41%)** | +| boxedAccountEmpty2 | 1,347 | 🔴 **+61 (4.74%)** | +| boxedAccountEmptyInit4 | 16,912 | 🔴 **+10 (0.06%)** | +| boxedAccountEmpty4 | 2,240 | 🔴 **+125 (5.91%)** | +| boxedAccountEmptyInit8 | 32,679 | 🔴 **+88 (0.27%)** | +| boxedAccountEmpty8 | 4,054 | 🔴 **+253 (6.66%)** | +| boxedAccountSizedInit1 | 5,181 | 🔴 **+78 (1.53%)** | +| boxedAccountSized1 | 932 | 🔴 **+20 (2.19%)** | +| boxedAccountSizedInit2 | 9,194 | 🔴 **+119 (1.31%)** | +| boxedAccountSized2 | 1,398 | 🔴 **+43 (3.17%)** | +| boxedAccountSizedInit4 | 17,212 | 🟢 **-2 (0.01%)** | +| boxedAccountSized4 | 2,320 | 🔴 **+89 (3.99%)** | +| boxedAccountSizedInit8 | 33,255 | 🟢 **-266 (0.79%)** | +| boxedAccountSized8 | 4,188 | 🔴 **+181 (4.52%)** | +| boxedAccountUnsizedInit1 | 5,274 | 🔴 **+72 (1.38%)** | +| boxedAccountUnsized1 | 972 | 🔴 **+8 (0.83%)** | +| boxedAccountUnsizedInit2 | 9,356 | 🔴 **+105 (1.14%)** | +| boxedAccountUnsized2 | 1,453 | 🔴 **+19 (1.32%)** | +| boxedAccountUnsizedInit4 | 17,512 | 🟢 **-30 (0.17%)** | +| boxedAccountUnsized4 | 2,408 | 🔴 **+41 (1.73%)** | +| boxedAccountUnsizedInit8 | 33,831 | 🟢 **-322 (0.94%)** | +| boxedAccountUnsized8 | 4,342 | 🔴 **+85 (2.00%)** | +| boxedInterfaceAccountMint1 | 1,153 | 🔴 **+43 (3.87%)** | +| boxedInterfaceAccountMint2 | 1,584 | 🔴 **+50 (3.26%)** | +| boxedInterfaceAccountMint4 | 2,434 | 🔴 **+64 (2.70%)** | +| boxedInterfaceAccountMint8 | 4,156 | 🔴 **+92 (2.26%)** | +| boxedInterfaceAccountToken1 | 1,278 | 🔴 **+32 (2.57%)** | +| boxedInterfaceAccountToken2 | 1,822 | 🔴 **+28 (1.56%)** | +| boxedInterfaceAccountToken4 | 2,878 | - | +| boxedInterfaceAccountToken8 | 5,068 | - | +| interfaceAccountMint1 | 1,169 | 🔴 **+43 (3.82%)** | +| interfaceAccountMint2 | 1,612 | 🔴 **+50 (3.20%)** | +| interfaceAccountMint4 | 2,496 | 🔴 **+64 (2.63%)** | +| interfaceAccountMint8 | 4,255 | 🔴 **+92 (2.21%)** | +| interfaceAccountToken1 | 1,300 | 🔴 **+32 (2.52%)** | +| interfaceAccountToken2 | 1,877 | 🔴 **+28 (1.51%)** | +| interfaceAccountToken4 | 2,997 | - | +| interface1 | 912 | 🔴 **+34 (3.87%)** | +| interface2 | 1,055 | 🔴 **+32 (3.13%)** | +| interface4 | 1,329 | 🔴 **+28 (2.15%)** | +| interface8 | 1,887 | 🔴 **+20 (1.07%)** | +| program1 | 932 | 🔴 **+42 (4.72%)** | +| program2 | 1,083 | 🔴 **+48 (4.64%)** | +| program4 | 1,373 | 🔴 **+60 (4.57%)** | +| program8 | 1,963 | 🔴 **+84 (4.47%)** | +| signer1 | 908 | 🔴 **+34 (3.89%)** | +| signer2 | 1,244 | 🔴 **+71 (6.05%)** | +| signer4 | 1,904 | 🔴 **+145 (8.24%)** | +| signer8 | 3,234 | 🔴 **+293 (9.96%)** | +| systemAccount1 | 945 | 🔴 **+34 (3.73%)** | +| systemAccount2 | 1,306 | 🔴 **+71 (5.75%)** | +| systemAccount4 | 2,016 | 🔴 **+145 (7.75%)** | +| systemAccount8 | 3,446 | 🔴 **+293 (9.29%)** | +| uncheckedAccount1 | 916 | 🔴 **+34 (3.85%)** | +| uncheckedAccount2 | 1,233 | 🔴 **+71 (6.11%)** | +| uncheckedAccount4 | 1,861 | 🔴 **+145 (8.45%)** | +| uncheckedAccount8 | 3,126 | 🔴 **+293 (10.34%)** | ### Notable changes @@ -114,95 +114,95 @@ Solana version: 2.3.0 Solana version: 2.3.0 -| Instruction | Compute Units | - | -|------------------------------|---------------|------------------------| -| accountInfo1 | 685 | 🔴 **+114 (19.96%)** | -| accountInfo2 | 1,053 | 🔴 **+158 (17.65%)** | -| accountInfo4 | 1,750 | 🔴 **+197 (12.69%)** | -| accountInfo8 | 3,135 | 🔴 **+212 (7.25%)** | -| accountEmptyInit1 | 4,915 | 🔴 **+131 (2.74%)** | -| accountEmpty1 | 774 | 🔴 **+129 (20.00%)** | -| accountEmptyInit2 | 8,793 | 🔴 **+124 (1.43%)** | -| accountEmpty2 | 1,174 | 🔴 **+167 (16.58%)** | -| accountEmptyInit4 | 16,748 | 🔴 **+248 (1.50%)** | -| accountEmpty4 | 1,962 | 🔴 **+238 (13.81%)** | -| accountEmptyInit8 | 32,357 | 🔴 **+26 (0.08%)** | -| accountEmpty8 | 3,548 | 🔴 **+385 (12.17%)** | -| accountSizedInit1 | 5,019 | 🔴 **+126 (2.58%)** | -| accountSized1 | 822 | 🔴 **+129 (18.61%)** | -| accountSizedInit2 | 8,981 | 🔴 **+124 (1.40%)** | -| accountSized2 | 1,240 | 🔴 **+165 (15.35%)** | -| accountSizedInit4 | 17,154 | 🔴 **+248 (1.47%)** | -| accountSized4 | 2,082 | 🔴 **+234 (12.66%)** | -| accountSizedInit8 | 33,013 | 🟢 **-28 (0.08%)** | -| accountSized8 | 3,762 | 🔴 **+375 (11.07%)** | -| accountUnsizedInit1 | 5,127 | 🔴 **+121 (2.42%)** | -| accountUnsized1 | 874 | 🔴 **+128 (17.16%)** | -| accountUnsizedInit2 | 9,251 | 🔴 **+124 (1.36%)** | -| accountUnsized2 | 1,326 | 🔴 **+163 (14.02%)** | -| accountUnsizedInit4 | 17,378 | 🟢 **-29 (0.17%)** | -| accountUnsized4 | 2,231 | 🔴 **+229 (11.44%)** | -| accountUnsizedInit8 | 33,961 | 🔴 **+496 (1.48%)** | -| accountUnsized8 | 4,035 | 🔴 **+362 (9.86%)** | -| boxedAccountEmptyInit1 | 5,007 | 🔴 **+131 (2.69%)** | -| boxedAccountEmpty1 | 864 | 🔴 **+130 (17.71%)** | -| boxedAccountEmptyInit2 | 8,906 | 🔴 **+123 (1.40%)** | -| boxedAccountEmpty2 | 1,286 | 🔴 **+170 (15.23%)** | -| boxedAccountEmptyInit4 | 16,902 | 🔴 **+247 (1.48%)** | -| boxedAccountEmpty4 | 2,115 | 🔴 **+243 (12.98%)** | -| boxedAccountEmptyInit8 | 32,591 | 🔴 **+30 (0.09%)** | -| boxedAccountEmpty8 | 3,801 | 🔴 **+400 (11.76%)** | -| boxedAccountSizedInit1 | 5,103 | 🔴 **+131 (2.63%)** | -| boxedAccountSized1 | 912 | 🔴 **+129 (16.48%)** | -| boxedAccountSizedInit2 | 9,075 | 🔴 **+123 (1.37%)** | -| boxedAccountSized2 | 1,355 | 🔴 **+165 (13.87%)** | -| boxedAccountSizedInit4 | 17,214 | 🔴 **+247 (1.46%)** | -| boxedAccountSized4 | 2,231 | 🔴 **+235 (11.77%)** | -| boxedAccountSizedInit8 | 33,521 | 🔴 **+360 (1.09%)** | -| boxedAccountSized8 | 4,007 | 🔴 **+379 (10.45%)** | -| boxedAccountUnsizedInit1 | 5,202 | 🔴 **+130 (2.56%)** | -| boxedAccountUnsized1 | 964 | 🔴 **+128 (15.31%)** | -| boxedAccountUnsizedInit2 | 9,251 | 🔴 **+123 (1.35%)** | -| boxedAccountUnsized2 | 1,434 | 🔴 **+164 (12.91%)** | -| boxedAccountUnsizedInit4 | 17,542 | 🔴 **+247 (1.43%)** | -| boxedAccountUnsized4 | 2,367 | 🔴 **+235 (11.02%)** | -| boxedAccountUnsizedInit8 | 34,153 | 🔴 **+360 (1.07%)** | -| boxedAccountUnsized8 | 4,257 | 🔴 **+376 (9.69%)** | -| boxedInterfaceAccountMint1 | 1,110 | 🟢 **-241 (17.84%)** | -| boxedInterfaceAccountMint2 | 1,534 | 🟢 **-589 (27.74%)** | -| boxedInterfaceAccountMint4 | 2,370 | 🟢 **-1,286 (35.18%)** | -| boxedInterfaceAccountMint8 | 4,064 | 🟢 **-2,674 (39.69%)** | -| boxedInterfaceAccountToken1 | 1,246 | 🟢 **-765 (38.04%)** | -| boxedInterfaceAccountToken2 | 1,794 | 🟢 **-1,637 (47.71%)** | -| boxedInterfaceAccountToken4 | 2,878 | 🟢 **-3,382 (54.03%)** | -| boxedInterfaceAccountToken8 | 5,068 | 🟢 **-6,866 (57.53%)** | -| interfaceAccountMint1 | 1,126 | 🟢 **-350 (23.71%)** | -| interfaceAccountMint2 | 1,562 | 🟢 **-927 (37.24%)** | -| interfaceAccountMint4 | 2,432 | 🟢 **-2,079 (46.09%)** | -| interfaceAccountMint8 | 4,163 | 🟢 **-4,387 (51.31%)** | -| interfaceAccountToken1 | 1,268 | 🟢 **-843 (39.93%)** | -| interfaceAccountToken2 | 1,849 | 🟢 **-1,880 (50.42%)** | -| interfaceAccountToken4 | 2,997 | 🟢 **-3,958 (56.91%)** | -| interface1 | 878 | 🔴 **+109 (14.17%)** | -| interface2 | 1,023 | 🔴 **+111 (12.17%)** | -| interface4 | 1,301 | 🔴 **+112 (9.42%)** | -| interface8 | 1,867 | 🔴 **+119 (6.81%)** | -| program1 | 890 | 🔴 **+111 (14.25%)** | -| program2 | 1,035 | 🔴 **+115 (12.50%)** | -| program4 | 1,313 | 🔴 **+120 (10.06%)** | -| program8 | 1,879 | 🔴 **+135 (7.74%)** | -| signer1 | 874 | 🔴 **+100 (12.92%)** | -| signer2 | 1,173 | 🔴 **+109 (10.24%)** | -| signer4 | 1,759 | 🔴 **+122 (7.45%)** | -| signer8 | 2,941 | 🔴 **+153 (5.49%)** | -| systemAccount1 | 911 | 🔴 **+115 (14.45%)** | -| systemAccount2 | 1,235 | 🔴 **+139 (12.68%)** | -| systemAccount4 | 1,871 | 🔴 **+182 (10.78%)** | -| systemAccount8 | 3,153 | 🔴 **+273 (9.48%)** | -| uncheckedAccount1 | 882 | 🔴 **+99 (12.64%)** | -| uncheckedAccount2 | 1,162 | 🔴 **+106 (10.04%)** | -| uncheckedAccount4 | 1,716 | 🔴 **+122 (7.65%)** | -| uncheckedAccount8 | 2,833 | 🔴 **+154 (5.75%)** | +| Instruction | Compute Units | - | +| --------------------------- | ------------- | ---------------------- | +| accountInfo1 | 685 | 🔴 **+114 (19.96%)** | +| accountInfo2 | 1,053 | 🔴 **+158 (17.65%)** | +| accountInfo4 | 1,750 | 🔴 **+197 (12.69%)** | +| accountInfo8 | 3,135 | 🔴 **+212 (7.25%)** | +| accountEmptyInit1 | 4,915 | 🔴 **+131 (2.74%)** | +| accountEmpty1 | 774 | 🔴 **+129 (20.00%)** | +| accountEmptyInit2 | 8,793 | 🔴 **+124 (1.43%)** | +| accountEmpty2 | 1,174 | 🔴 **+167 (16.58%)** | +| accountEmptyInit4 | 16,748 | 🔴 **+248 (1.50%)** | +| accountEmpty4 | 1,962 | 🔴 **+238 (13.81%)** | +| accountEmptyInit8 | 32,357 | 🔴 **+26 (0.08%)** | +| accountEmpty8 | 3,548 | 🔴 **+385 (12.17%)** | +| accountSizedInit1 | 5,019 | 🔴 **+126 (2.58%)** | +| accountSized1 | 822 | 🔴 **+129 (18.61%)** | +| accountSizedInit2 | 8,981 | 🔴 **+124 (1.40%)** | +| accountSized2 | 1,240 | 🔴 **+165 (15.35%)** | +| accountSizedInit4 | 17,154 | 🔴 **+248 (1.47%)** | +| accountSized4 | 2,082 | 🔴 **+234 (12.66%)** | +| accountSizedInit8 | 33,013 | 🟢 **-28 (0.08%)** | +| accountSized8 | 3,762 | 🔴 **+375 (11.07%)** | +| accountUnsizedInit1 | 5,127 | 🔴 **+121 (2.42%)** | +| accountUnsized1 | 874 | 🔴 **+128 (17.16%)** | +| accountUnsizedInit2 | 9,251 | 🔴 **+124 (1.36%)** | +| accountUnsized2 | 1,326 | 🔴 **+163 (14.02%)** | +| accountUnsizedInit4 | 17,378 | 🟢 **-29 (0.17%)** | +| accountUnsized4 | 2,231 | 🔴 **+229 (11.44%)** | +| accountUnsizedInit8 | 33,961 | 🔴 **+496 (1.48%)** | +| accountUnsized8 | 4,035 | 🔴 **+362 (9.86%)** | +| boxedAccountEmptyInit1 | 5,007 | 🔴 **+131 (2.69%)** | +| boxedAccountEmpty1 | 864 | 🔴 **+130 (17.71%)** | +| boxedAccountEmptyInit2 | 8,906 | 🔴 **+123 (1.40%)** | +| boxedAccountEmpty2 | 1,286 | 🔴 **+170 (15.23%)** | +| boxedAccountEmptyInit4 | 16,902 | 🔴 **+247 (1.48%)** | +| boxedAccountEmpty4 | 2,115 | 🔴 **+243 (12.98%)** | +| boxedAccountEmptyInit8 | 32,591 | 🔴 **+30 (0.09%)** | +| boxedAccountEmpty8 | 3,801 | 🔴 **+400 (11.76%)** | +| boxedAccountSizedInit1 | 5,103 | 🔴 **+131 (2.63%)** | +| boxedAccountSized1 | 912 | 🔴 **+129 (16.48%)** | +| boxedAccountSizedInit2 | 9,075 | 🔴 **+123 (1.37%)** | +| boxedAccountSized2 | 1,355 | 🔴 **+165 (13.87%)** | +| boxedAccountSizedInit4 | 17,214 | 🔴 **+247 (1.46%)** | +| boxedAccountSized4 | 2,231 | 🔴 **+235 (11.77%)** | +| boxedAccountSizedInit8 | 33,521 | 🔴 **+360 (1.09%)** | +| boxedAccountSized8 | 4,007 | 🔴 **+379 (10.45%)** | +| boxedAccountUnsizedInit1 | 5,202 | 🔴 **+130 (2.56%)** | +| boxedAccountUnsized1 | 964 | 🔴 **+128 (15.31%)** | +| boxedAccountUnsizedInit2 | 9,251 | 🔴 **+123 (1.35%)** | +| boxedAccountUnsized2 | 1,434 | 🔴 **+164 (12.91%)** | +| boxedAccountUnsizedInit4 | 17,542 | 🔴 **+247 (1.43%)** | +| boxedAccountUnsized4 | 2,367 | 🔴 **+235 (11.02%)** | +| boxedAccountUnsizedInit8 | 34,153 | 🔴 **+360 (1.07%)** | +| boxedAccountUnsized8 | 4,257 | 🔴 **+376 (9.69%)** | +| boxedInterfaceAccountMint1 | 1,110 | 🟢 **-241 (17.84%)** | +| boxedInterfaceAccountMint2 | 1,534 | 🟢 **-589 (27.74%)** | +| boxedInterfaceAccountMint4 | 2,370 | 🟢 **-1,286 (35.18%)** | +| boxedInterfaceAccountMint8 | 4,064 | 🟢 **-2,674 (39.69%)** | +| boxedInterfaceAccountToken1 | 1,246 | 🟢 **-765 (38.04%)** | +| boxedInterfaceAccountToken2 | 1,794 | 🟢 **-1,637 (47.71%)** | +| boxedInterfaceAccountToken4 | 2,878 | 🟢 **-3,382 (54.03%)** | +| boxedInterfaceAccountToken8 | 5,068 | 🟢 **-6,866 (57.53%)** | +| interfaceAccountMint1 | 1,126 | 🟢 **-350 (23.71%)** | +| interfaceAccountMint2 | 1,562 | 🟢 **-927 (37.24%)** | +| interfaceAccountMint4 | 2,432 | 🟢 **-2,079 (46.09%)** | +| interfaceAccountMint8 | 4,163 | 🟢 **-4,387 (51.31%)** | +| interfaceAccountToken1 | 1,268 | 🟢 **-843 (39.93%)** | +| interfaceAccountToken2 | 1,849 | 🟢 **-1,880 (50.42%)** | +| interfaceAccountToken4 | 2,997 | 🟢 **-3,958 (56.91%)** | +| interface1 | 878 | 🔴 **+109 (14.17%)** | +| interface2 | 1,023 | 🔴 **+111 (12.17%)** | +| interface4 | 1,301 | 🔴 **+112 (9.42%)** | +| interface8 | 1,867 | 🔴 **+119 (6.81%)** | +| program1 | 890 | 🔴 **+111 (14.25%)** | +| program2 | 1,035 | 🔴 **+101 (10.81%)** | +| program4 | 1,313 | 🔴 **+92 (7.53%)** | +| program8 | 1,879 | 🔴 **+79 (4.39%)** | +| signer1 | 874 | 🔴 **+100 (12.92%)** | +| signer2 | 1,173 | 🔴 **+109 (10.24%)** | +| signer4 | 1,759 | 🔴 **+122 (7.45%)** | +| signer8 | 2,941 | 🔴 **+153 (5.49%)** | +| systemAccount1 | 911 | 🔴 **+115 (14.45%)** | +| systemAccount2 | 1,235 | 🔴 **+139 (12.68%)** | +| systemAccount4 | 1,871 | 🔴 **+182 (10.78%)** | +| systemAccount8 | 3,153 | 🔴 **+273 (9.48%)** | +| uncheckedAccount1 | 882 | 🔴 **+99 (12.64%)** | +| uncheckedAccount2 | 1,162 | 🔴 **+106 (10.04%)** | +| uncheckedAccount4 | 1,716 | 🔴 **+122 (7.65%)** | +| uncheckedAccount8 | 2,833 | 🔴 **+154 (5.75%)** | ### Notable changes @@ -212,95 +212,95 @@ Solana version: 2.3.0 Solana version: 2.1.0 -| Instruction | Compute Units | - | -|------------------------------|---------------|-----------------------| -| accountInfo1 | 571 | - | -| accountInfo2 | 895 | - | -| accountInfo4 | 1,553 | - | -| accountInfo8 | 2,923 | - | -| accountEmptyInit1 | 4,784 | 🟢 **-299 (5.88%)** | -| accountEmpty1 | 645 | - | -| accountEmptyInit2 | 8,669 | 🟢 **-632 (6.79%)** | -| accountEmpty2 | 1,007 | - | -| accountEmptyInit4 | 16,500 | 🟢 **-1,264 (7.12%)** | -| accountEmpty4 | 1,724 | - | -| accountEmptyInit8 | 32,331 | 🟢 **-2,392 (6.89%)** | -| accountEmpty8 | 3,163 | - | -| accountSizedInit1 | 4,893 | 🟢 **-299 (5.76%)** | -| accountSized1 | 693 | - | -| accountSizedInit2 | 8,857 | 🟢 **-632 (6.66%)** | -| accountSized2 | 1,075 | - | -| accountSizedInit4 | 16,906 | 🟢 **-1,264 (6.96%)** | -| accountSized4 | 1,848 | - | -| accountSizedInit8 | 33,041 | 🟢 **-2,392 (6.75%)** | -| accountSized8 | 3,387 | - | -| accountUnsizedInit1 | 5,006 | 🟢 **-299 (5.64%)** | -| accountUnsized1 | 746 | - | -| accountUnsizedInit2 | 9,127 | 🟢 **-632 (6.48%)** | -| accountUnsized2 | 1,163 | - | -| accountUnsizedInit4 | 17,407 | 🟢 **-1,196 (6.43%)** | -| accountUnsized4 | 2,002 | - | -| accountUnsizedInit8 | 33,465 | 🟢 **-2,528 (7.02%)** | -| accountUnsized8 | 3,673 | - | -| boxedAccountEmptyInit1 | 4,876 | 🟢 **-299 (5.78%)** | -| boxedAccountEmpty1 | 734 | - | -| boxedAccountEmptyInit2 | 8,783 | 🟢 **-631 (6.70%)** | -| boxedAccountEmpty2 | 1,116 | - | -| boxedAccountEmptyInit4 | 16,655 | 🟢 **-1,263 (7.05%)** | -| boxedAccountEmpty4 | 1,872 | - | -| boxedAccountEmptyInit8 | 32,561 | 🟢 **-2,392 (6.84%)** | -| boxedAccountEmpty8 | 3,401 | - | -| boxedAccountSizedInit1 | 4,972 | 🟢 **-299 (5.67%)** | -| boxedAccountSized1 | 783 | - | -| boxedAccountSizedInit2 | 8,952 | 🟢 **-631 (6.58%)** | -| boxedAccountSized2 | 1,190 | - | -| boxedAccountSizedInit4 | 16,967 | 🟢 **-1,263 (6.93%)** | -| boxedAccountSized4 | 1,996 | - | -| boxedAccountSizedInit8 | 33,161 | 🟢 **-2,392 (6.73%)** | -| boxedAccountSized8 | 3,628 | - | -| boxedAccountUnsizedInit1 | 5,072 | 🟢 **-299 (5.57%)** | -| boxedAccountUnsized1 | 836 | - | -| boxedAccountUnsizedInit2 | 9,128 | 🟢 **-631 (6.47%)** | -| boxedAccountUnsized2 | 1,270 | - | -| boxedAccountUnsizedInit4 | 17,295 | 🟢 **-1,263 (6.81%)** | -| boxedAccountUnsized4 | 2,132 | - | -| boxedAccountUnsizedInit8 | 33,793 | 🟢 **-2,392 (6.61%)** | -| boxedAccountUnsized8 | 3,881 | - | -| boxedInterfaceAccountMint1 | 1,351 | - | -| boxedInterfaceAccountMint2 | 2,123 | - | -| boxedInterfaceAccountMint4 | 3,656 | - | -| boxedInterfaceAccountMint8 | 6,738 | - | -| boxedInterfaceAccountToken1 | 2,011 | - | -| boxedInterfaceAccountToken2 | 3,431 | - | -| boxedInterfaceAccountToken4 | 6,260 | - | -| boxedInterfaceAccountToken8 | 11,934 | - | -| interfaceAccountMint1 | 1,476 | - | -| interfaceAccountMint2 | 2,489 | - | -| interfaceAccountMint4 | 4,511 | - | -| interfaceAccountMint8 | 8,550 | - | -| interfaceAccountToken1 | 2,111 | - | -| interfaceAccountToken2 | 3,729 | - | -| interfaceAccountToken4 | 6,955 | - | -| interface1 | 769 | - | -| interface2 | 912 | - | -| interface4 | 1,189 | - | -| interface8 | 1,748 | - | -| program1 | 779 | - | -| program2 | 934 | 🔴 **+14 (1.52%)** | -| program4 | 1,221 | 🔴 **+28 (2.35%)** | -| program8 | 1,800 | 🔴 **+56 (3.21%)** | -| signer1 | 774 | - | -| signer2 | 1,064 | - | -| signer4 | 1,637 | - | -| signer8 | 2,788 | - | -| systemAccount1 | 796 | - | -| systemAccount2 | 1,096 | - | -| systemAccount4 | 1,689 | - | -| systemAccount8 | 2,880 | - | -| uncheckedAccount1 | 783 | - | -| uncheckedAccount2 | 1,056 | - | -| uncheckedAccount4 | 1,594 | - | -| uncheckedAccount8 | 2,679 | - | +| Instruction | Compute Units | - | +| --------------------------- | ------------- | --------------------- | +| accountInfo1 | 571 | - | +| accountInfo2 | 895 | - | +| accountInfo4 | 1,553 | - | +| accountInfo8 | 2,923 | - | +| accountEmptyInit1 | 4,784 | 🟢 **-299 (5.88%)** | +| accountEmpty1 | 645 | - | +| accountEmptyInit2 | 8,669 | 🟢 **-632 (6.79%)** | +| accountEmpty2 | 1,007 | - | +| accountEmptyInit4 | 16,500 | 🟢 **-1,264 (7.12%)** | +| accountEmpty4 | 1,724 | - | +| accountEmptyInit8 | 32,331 | 🟢 **-2,392 (6.89%)** | +| accountEmpty8 | 3,163 | - | +| accountSizedInit1 | 4,893 | 🟢 **-299 (5.76%)** | +| accountSized1 | 693 | - | +| accountSizedInit2 | 8,857 | 🟢 **-632 (6.66%)** | +| accountSized2 | 1,075 | - | +| accountSizedInit4 | 16,906 | 🟢 **-1,264 (6.96%)** | +| accountSized4 | 1,848 | - | +| accountSizedInit8 | 33,041 | 🟢 **-2,392 (6.75%)** | +| accountSized8 | 3,387 | - | +| accountUnsizedInit1 | 5,006 | 🟢 **-299 (5.64%)** | +| accountUnsized1 | 746 | - | +| accountUnsizedInit2 | 9,127 | 🟢 **-632 (6.48%)** | +| accountUnsized2 | 1,163 | - | +| accountUnsizedInit4 | 17,407 | 🟢 **-1,196 (6.43%)** | +| accountUnsized4 | 2,002 | - | +| accountUnsizedInit8 | 33,465 | 🟢 **-2,528 (7.02%)** | +| accountUnsized8 | 3,673 | - | +| boxedAccountEmptyInit1 | 4,876 | 🟢 **-299 (5.78%)** | +| boxedAccountEmpty1 | 734 | - | +| boxedAccountEmptyInit2 | 8,783 | 🟢 **-631 (6.70%)** | +| boxedAccountEmpty2 | 1,116 | - | +| boxedAccountEmptyInit4 | 16,655 | 🟢 **-1,263 (7.05%)** | +| boxedAccountEmpty4 | 1,872 | - | +| boxedAccountEmptyInit8 | 32,561 | 🟢 **-2,392 (6.84%)** | +| boxedAccountEmpty8 | 3,401 | - | +| boxedAccountSizedInit1 | 4,972 | 🟢 **-299 (5.67%)** | +| boxedAccountSized1 | 783 | - | +| boxedAccountSizedInit2 | 8,952 | 🟢 **-631 (6.58%)** | +| boxedAccountSized2 | 1,190 | - | +| boxedAccountSizedInit4 | 16,967 | 🟢 **-1,263 (6.93%)** | +| boxedAccountSized4 | 1,996 | - | +| boxedAccountSizedInit8 | 33,161 | 🟢 **-2,392 (6.73%)** | +| boxedAccountSized8 | 3,628 | - | +| boxedAccountUnsizedInit1 | 5,072 | 🟢 **-299 (5.57%)** | +| boxedAccountUnsized1 | 836 | - | +| boxedAccountUnsizedInit2 | 9,128 | 🟢 **-631 (6.47%)** | +| boxedAccountUnsized2 | 1,270 | - | +| boxedAccountUnsizedInit4 | 17,295 | 🟢 **-1,263 (6.81%)** | +| boxedAccountUnsized4 | 2,132 | - | +| boxedAccountUnsizedInit8 | 33,793 | 🟢 **-2,392 (6.61%)** | +| boxedAccountUnsized8 | 3,881 | - | +| boxedInterfaceAccountMint1 | 1,351 | - | +| boxedInterfaceAccountMint2 | 2,123 | - | +| boxedInterfaceAccountMint4 | 3,656 | - | +| boxedInterfaceAccountMint8 | 6,738 | - | +| boxedInterfaceAccountToken1 | 2,011 | - | +| boxedInterfaceAccountToken2 | 3,431 | - | +| boxedInterfaceAccountToken4 | 6,260 | - | +| boxedInterfaceAccountToken8 | 11,934 | - | +| interfaceAccountMint1 | 1,476 | - | +| interfaceAccountMint2 | 2,489 | - | +| interfaceAccountMint4 | 4,511 | - | +| interfaceAccountMint8 | 8,550 | - | +| interfaceAccountToken1 | 2,111 | - | +| interfaceAccountToken2 | 3,729 | - | +| interfaceAccountToken4 | 6,955 | - | +| interface1 | 769 | - | +| interface2 | 912 | - | +| interface4 | 1,189 | - | +| interface8 | 1,748 | - | +| program1 | 779 | - | +| program2 | 934 | 🔴 **+14 (1.52%)** | +| program4 | 1,221 | 🔴 **+28 (2.35%)** | +| program8 | 1,800 | 🔴 **+56 (3.21%)** | +| signer1 | 774 | - | +| signer2 | 1,064 | - | +| signer4 | 1,637 | - | +| signer8 | 2,788 | - | +| systemAccount1 | 796 | - | +| systemAccount2 | 1,096 | - | +| systemAccount4 | 1,689 | - | +| systemAccount8 | 2,880 | - | +| uncheckedAccount1 | 783 | - | +| uncheckedAccount2 | 1,056 | - | +| uncheckedAccount4 | 1,594 | - | +| uncheckedAccount8 | 2,679 | - | ### Notable changes diff --git a/cli/Cargo.toml b/cli/Cargo.toml index be28b97b4a..fd24d10684 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -36,11 +36,19 @@ semver = "1.0.4" serde = { version = "1.0.130", features = ["derive"] } serde_json = "1.0" shellexpand = "2.1.0" -solana-cli-config = "2" -solana-faucet = "2" -solana-rpc-client = "2" -solana-sdk = "2" +solana-cli-config.workspace = true +solana-clock.workspace = true +solana-commitment-config.workspace = true +solana-compute-budget-interface.workspace = true +solana-faucet = { workspace = true, features = ["agave-unstable-api"] } +solana-instruction.workspace = true +solana-keypair.workspace = true +solana-pubkey.workspace = true +solana-signature.workspace = true solana-signer.workspace = true +solana-system-interface.workspace = true +solana-transaction.workspace = true +solana-rpc-client.workspace = true syn = { version = "1.0.60", features = ["full", "extra-traits"] } tar = "0.4.35" toml = "0.7.6" diff --git a/cli/src/config.rs b/cli/src/config.rs index 05b8929a2b..b5ba885ae2 100644 --- a/cli/src/config.rs +++ b/cli/src/config.rs @@ -10,9 +10,9 @@ use serde::de::{self, MapAccess, Visitor}; use serde::ser::SerializeMap; use serde::{Deserialize, Deserializer, Serialize, Serializer}; use solana_cli_config::{Config as SolanaConfig, CONFIG_FILE}; -use solana_sdk::clock::Slot; -use solana_sdk::pubkey::Pubkey; -use solana_sdk::signature::Keypair; +use solana_clock::Slot; +use solana_keypair::Keypair; +use solana_pubkey::Pubkey; use solana_signer::Signer; use std::collections::{BTreeMap, HashMap}; use std::convert::TryFrom; diff --git a/cli/src/lib.rs b/cli/src/lib.rs index 3208f73f35..5bbf69c131 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -18,11 +18,11 @@ use regex::{Regex, RegexBuilder}; use rust_template::{ProgramTemplate, TestTemplate}; use semver::{Version, VersionReq}; use serde_json::{json, Map, Value as JsonValue}; +use solana_commitment_config::CommitmentConfig; +use solana_keypair::Keypair; +use solana_pubkey::Pubkey; use solana_rpc_client::rpc_client::RpcClient; -use solana_sdk::commitment_config::CommitmentConfig; -use solana_sdk::pubkey::Pubkey; -use solana_sdk::signature::{Keypair, Signer}; -use solana_signer::EncodableKey; +use solana_signer::{EncodableKey, Signer}; use std::collections::BTreeMap; use std::collections::HashMap; use std::collections::HashSet; @@ -31,7 +31,6 @@ use std::fs::{self, File}; use std::io::prelude::*; use std::path::{Path, PathBuf}; use std::process::{Child, Command as ProcessCommand, Stdio}; -use std::str::FromStr; use std::string::ToString; use std::sync::LazyLock; @@ -487,7 +486,7 @@ pub enum ClusterCommand { } fn get_keypair(path: &str) -> Result { - solana_sdk::signature::read_keypair_file(path) + solana_keypair::read_keypair_file(path) .map_err(|_| anyhow!("Unable to read keypair file ({path})")) } @@ -2402,7 +2401,7 @@ fn idl_ts(idl: &Idl) -> Result { let name = cur.get(1).unwrap().as_str(); // Do not modify pubkeys - if Pubkey::from_str(name).is_ok() { + if Pubkey::try_from(name).is_ok() { return acc; } @@ -3032,7 +3031,7 @@ fn validator_flags( .iter() .map(|entry| { let address = entry["address"].as_str().unwrap(); - Pubkey::from_str(address) + Pubkey::try_from(address) .map_err(|_| anyhow!("Invalid pubkey {}", address)) }) .collect::>>()? @@ -3070,7 +3069,7 @@ fn validator_flags( .iter() .map(|entry| { let feature_flag = entry.as_str().unwrap(); - Pubkey::from_str(feature_flag).map_err(|_| { + Pubkey::try_from(feature_flag).map_err(|_| { anyhow!("Invalid pubkey (feature flag) {}", feature_flag) }) }) @@ -3808,7 +3807,7 @@ fn keys_sync(cfg_override: &ConfigOverride, program_name: Option) -> Res println!("Found incorrect program id declaration in Anchor.toml for the program `{name}`"); // Update the program id - deployment.address = Pubkey::from_str(&actual_program_id).unwrap(); + deployment.address = Pubkey::try_from(actual_program_id.as_str()).unwrap(); fs::write(cfg.path(), cfg.to_string())?; println!("Updated to {actual_program_id}\n"); diff --git a/cli/src/rust_template.rs b/cli/src/rust_template.rs index c5005b81b0..fb8e48c620 100644 --- a/cli/src/rust_template.rs +++ b/cli/src/rust_template.rs @@ -5,10 +5,8 @@ use crate::{ use anyhow::Result; use clap::{Parser, ValueEnum}; use heck::{ToLowerCamelCase, ToPascalCase, ToSnakeCase}; -use solana_sdk::{ - pubkey::Pubkey, - signature::{read_keypair_file, write_keypair_file, Keypair}, -}; +use solana_keypair::{read_keypair_file, write_keypair_file, Keypair}; +use solana_pubkey::Pubkey; use solana_signer::Signer; use std::{ fmt::Write as _, @@ -792,7 +790,7 @@ fn test_initialize() {{ let payer = read_keypair_file(&anchor_wallet).unwrap(); let client = Client::new_with_options(Cluster::Localnet, &payer, CommitmentConfig::confirmed()); - let program_id = Pubkey::from_str(program_id).unwrap(); + let program_id = Pubkey::try_from(program_id).unwrap(); let program = client.program(program_id).unwrap(); let tx = program diff --git a/client/Cargo.toml b/client/Cargo.toml index 8658158bdf..229f197b54 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -21,13 +21,17 @@ anyhow = "1" futures = "0.3" regex = "1" serde = { version = "1", features = ["derive"] } -solana-account = "2" -solana-account-decoder = "2" -solana-pubsub-client = "2" -solana-rpc-client = "2" -solana-rpc-client-api = "2" -solana-sdk = "2" +solana-account.workspace = true +solana-account-decoder.workspace = true +solana-commitment-config.workspace = true +solana-instruction.workspace = true +solana-program.workspace = true +solana-pubsub-client.workspace = true +solana-rpc-client.workspace = true +solana-rpc-client-api.workspace = true +solana-signature.workspace = true solana-signer.workspace = true +solana-transaction.workspace = true thiserror = "1" tokio = { version = "1", features = ["rt", "sync"] } url = "2" diff --git a/client/example/Cargo.toml b/client/example/Cargo.toml index d6fbd6cca1..d4e0436b76 100644 --- a/client/example/Cargo.toml +++ b/client/example/Cargo.toml @@ -19,6 +19,8 @@ events = { path = "../../tests/events/programs/events", features = ["no-entrypoi anyhow = "1.0.32" clap = { version = "4.2.4", features = ["derive"] } shellexpand = "2.1.0" -solana-sdk = "2" +solana-commitment-config = "3.0.0" +solana-sdk = "3.0.0" +solana-signer = "3.0.0" +solana-system-interface = "2.0.0" tokio = { version = "1", features = ["full"] } -solana-signer = "2" \ No newline at end of file diff --git a/client/example/src/blocking.rs b/client/example/src/blocking.rs index 25af63408e..de77d90d57 100644 --- a/client/example/src/blocking.rs +++ b/client/example/src/blocking.rs @@ -1,13 +1,12 @@ -use anchor_client::solana_sdk::pubkey::Pubkey; -use anchor_client::solana_sdk::signature::Keypair; -use anchor_client::solana_sdk::system_instruction; use anchor_client::{Client, Cluster}; use anyhow::Result; use clap::Parser; -use solana_sdk::commitment_config::CommitmentConfig; +use solana_commitment_config::CommitmentConfig; +use solana_sdk::pubkey::Pubkey; use solana_sdk::signature::read_keypair_file; -use solana_sdk::system_program; -use solana_signer::Signer; +use solana_sdk::signature::{Keypair, Signer}; +use solana_system_interface::instruction as system_instruction; +use solana_system_interface::program as system_program; // The `accounts` and `instructions` modules are generated by the framework. use basic_2::accounts as basic_2_accounts; use basic_2::instruction as basic_2_instruction; diff --git a/client/example/src/main.rs b/client/example/src/main.rs index f13e76c7d1..abc0048558 100644 --- a/client/example/src/main.rs +++ b/client/example/src/main.rs @@ -1,6 +1,6 @@ -use anchor_client::solana_sdk::pubkey::Pubkey; use anyhow::Result; use clap::Parser; +use solana_sdk::pubkey::Pubkey; #[cfg(not(feature = "async"))] mod blocking; diff --git a/client/example/src/nonblocking.rs b/client/example/src/nonblocking.rs index ba40e071fc..535146e18e 100644 --- a/client/example/src/nonblocking.rs +++ b/client/example/src/nonblocking.rs @@ -1,13 +1,12 @@ -use anchor_client::solana_sdk::pubkey::Pubkey; -use anchor_client::solana_sdk::signature::Keypair; -use anchor_client::solana_sdk::system_instruction; use anchor_client::{Client, Cluster}; use anyhow::Result; use clap::Parser; -use solana_sdk::commitment_config::CommitmentConfig; +use solana_commitment_config::CommitmentConfig; +use solana_sdk::pubkey::Pubkey; use solana_sdk::signature::read_keypair_file; -use solana_sdk::system_program; -use solana_signer::Signer; +use solana_sdk::signature::{Keypair, Signer}; +use solana_system_interface::instruction as system_instruction; +use solana_system_interface::program as system_program; // The `accounts` and `instructions` modules are generated by the framework. use basic_2::accounts as basic_2_accounts; use basic_2::instruction as basic_2_instruction; diff --git a/client/src/blocking.rs b/client/src/blocking.rs index 2529be4d75..24236a2719 100644 --- a/client/src/blocking.rs +++ b/client/src/blocking.rs @@ -3,14 +3,15 @@ use crate::{ RequestBuilder, }; use anchor_lang::{prelude::Pubkey, AccountDeserialize, Discriminator}; +use solana_commitment_config::CommitmentConfig; use solana_rpc_client::nonblocking::rpc_client::RpcClient as AsyncRpcClient; #[cfg(not(feature = "mock"))] use solana_rpc_client::rpc_client::RpcClient; use solana_rpc_client_api::{config::RpcSendTransactionConfig, filter::RpcFilterType}; -use solana_sdk::{ - commitment_config::CommitmentConfig, signature::Signature, transaction::Transaction, -}; +use solana_signature::Signature; use solana_signer::Signer; +use solana_transaction::Transaction; + use std::{marker::PhantomData, ops::Deref, sync::Arc}; use tokio::{ runtime::{Builder, Handle}, diff --git a/client/src/lib.rs b/client/src/lib.rs index 7695e1bd87..319a221ff1 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -74,8 +74,10 @@ use anchor_lang::solana_program::pubkey::Pubkey; use anchor_lang::{AccountDeserialize, Discriminator, InstructionData, ToAccountMetas}; use futures::{Future, StreamExt}; use regex::Regex; -use solana_account::Account; -use solana_account_decoder::UiAccountEncoding; +use solana_account_decoder::{UiAccount, UiAccountEncoding}; +use solana_commitment_config::CommitmentConfig; +use solana_instruction::{AccountMeta, Instruction}; +use solana_program::hash::Hash; use solana_pubsub_client::nonblocking::pubsub_client::{PubsubClient, PubsubClientError}; use solana_rpc_client::nonblocking::rpc_client::RpcClient as AsyncRpcClient; use solana_rpc_client_api::{ @@ -87,12 +89,9 @@ use solana_rpc_client_api::{ filter::{Memcmp, RpcFilterType}, response::{Response as RpcResponse, RpcLogsResponse}, }; -use solana_sdk::commitment_config::CommitmentConfig; -use solana_sdk::hash::Hash; -use solana_sdk::instruction::{AccountMeta, Instruction}; -use solana_sdk::signature::Signature; -use solana_sdk::transaction::Transaction; +use solana_signature::Signature; use solana_signer::{Signer, SignerError}; +use solana_transaction::Transaction; use std::iter::Map; use std::marker::PhantomData; use std::ops::Deref; @@ -114,7 +113,6 @@ pub use cluster::Cluster; #[cfg(feature = "async")] pub use nonblocking::ThreadSafeSigner; pub use solana_account_decoder; -pub use solana_sdk; mod cluster; @@ -189,14 +187,11 @@ impl Signer for DynSigner { self.0.try_pubkey() } - fn sign_message(&self, message: &[u8]) -> solana_sdk::signature::Signature { + fn sign_message(&self, message: &[u8]) -> Signature { self.0.sign_message(message) } - fn try_sign_message( - &self, - message: &[u8], - ) -> Result { + fn try_sign_message(&self, message: &[u8]) -> Result { self.0.try_sign_message(message) } @@ -288,12 +283,16 @@ impl + Clone> Program { Ok(ProgramAccountsIterator { inner: self .internal_rpc_client - .get_program_accounts_with_config(&self.id(), config) + .get_program_ui_accounts_with_config(&self.id(), config) .await .map_err(Box::new)? .into_iter() .map(|(key, account)| { - Ok((key, T::try_deserialize(&mut (&account.data as &[u8]))?)) + let data = account + .data + .decode() + .expect("account was fetched with binary encoding"); + Ok((key, T::try_deserialize(&mut data.as_slice())?)) }), }) } @@ -369,11 +368,11 @@ impl + Clone> Program { /// Iterator with items of type (Pubkey, T). Used to lazily deserialize account structs. /// Wrapper type hides the inner type from usages so the implementation can be changed. pub struct ProgramAccountsIterator { - inner: Map, AccountConverterFunction>, + inner: Map, AccountConverterFunction>, } /// Function type that accepts solana accounts and returns deserialized anchor accounts -type AccountConverterFunction = fn((Pubkey, Account)) -> Result<(Pubkey, T), ClientError>; +type AccountConverterFunction = fn((Pubkey, UiAccount)) -> Result<(Pubkey, T), ClientError>; impl Iterator for ProgramAccountsIterator { type Item = Result<(Pubkey, T), ClientError>; diff --git a/client/src/nonblocking.rs b/client/src/nonblocking.rs index 81f4d5c95d..14ef47b562 100644 --- a/client/src/nonblocking.rs +++ b/client/src/nonblocking.rs @@ -3,12 +3,12 @@ use crate::{ ProgramAccountsIterator, RequestBuilder, }; use anchor_lang::{prelude::Pubkey, AccountDeserialize, Discriminator}; +use solana_commitment_config::CommitmentConfig; use solana_rpc_client::nonblocking::rpc_client::RpcClient as AsyncRpcClient; use solana_rpc_client_api::{config::RpcSendTransactionConfig, filter::RpcFilterType}; -use solana_sdk::{ - commitment_config::CommitmentConfig, signature::Signature, transaction::Transaction, -}; +use solana_signature::Signature; use solana_signer::Signer; +use solana_transaction::Transaction; use std::{marker::PhantomData, ops::Deref, sync::Arc}; use tokio::sync::RwLock; @@ -108,7 +108,7 @@ impl + Clone> Program { pub async fn on( &self, f: impl Fn(&EventContext, T) + Send + 'static, - ) -> Result { + ) -> Result, ClientError> { let (handle, rx) = self.on_internal(f).await?; Ok(EventUnsubscriber { diff --git a/lang/Cargo.toml b/lang/Cargo.toml index f2f54cbab5..a2f0f4dfc0 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -23,7 +23,10 @@ anchor-debug = [ "anchor-derive-accounts/anchor-debug", ] derive = [] -event-cpi = ["anchor-attribute-event/event-cpi", "anchor-attribute-account/event-cpi"] +event-cpi = [ + "anchor-attribute-event/event-cpi", + "anchor-attribute-account/event-cpi", +] idl-build = [ "anchor-attribute-account/idl-build", "anchor-attribute-constant/idl-build", @@ -36,7 +39,10 @@ idl-build = [ ] init-if-needed = ["anchor-derive-accounts/init-if-needed"] interface-instructions = ["anchor-attribute-program/interface-instructions"] -lazy-account = ["anchor-attribute-account/lazy-account", "anchor-derive-serde/lazy-account"] +lazy-account = [ + "anchor-attribute-account/lazy-account", + "anchor-derive-serde/lazy-account", +] [dependencies] anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.32.1" } @@ -57,28 +63,31 @@ bincode = "1" borsh = "1.5.7" bytemuck = { version = "1", features = ["derive"] } const-crypto = "0.3.0" -solana-account-info = "2" -solana-clock = "2" -solana-cpi = "2" -solana-define-syscall = "2" -solana-feature-gate-interface = "2" -solana-instruction = "2" -solana-instructions-sysvar = "2" -solana-invoke = "0.4.0" -solana-loader-v3-interface = { version = "3", features = ["bincode"] } -solana-msg = "2" -solana-program-entrypoint = "2" -solana-program-error = { version = "2", features = ["borsh"] } -solana-program-memory = "2" -solana-program-option = "2" -solana-program-pack = "2" -solana-pubkey = { version = "2", features = ["borsh", "bytemuck", "serde"] } -solana-sdk-ids = "2" -solana-system-interface = "1" -solana-sysvar = { version = "2", features = ["bincode"] } -solana-sysvar-id = "2" + +solana-account-info.workspace = true +solana-clock.workspace = true +solana-cpi.workspace = true +solana-define-syscall.workspace = true +solana-feature-gate-interface.workspace = true +solana-instruction.workspace = true +solana-instructions-sysvar.workspace = true +solana-invoke.workspace = true +solana-loader-v3-interface = { workspace = true, features = ["bincode"] } +solana-msg.workspace = true +solana-program-entrypoint.workspace = true +solana-program-error = { workspace = true, features = ["borsh"] } +solana-program-memory.workspace = true +solana-program-option.workspace = true +solana-program-pack.workspace = true +solana-pubkey = { workspace = true, features = ["borsh", "bytemuck", "serde"] } +solana-sdk-ids.workspace = true +solana-stake-interface = { workspace = true, features = ["sysvar", "bincode"] } +solana-system-interface.workspace = true +solana-sysvar = { workspace = true, features = ["bincode"] } +solana-sysvar-id.workspace = true + thiserror = "1" [lints.rust.unexpected_cfgs] - level = "warn" - check-cfg = ['cfg(target_os, values("solana"))'] +level = "warn" +check-cfg = ['cfg(target_os, values("solana"))'] diff --git a/lang/src/accounts/account.rs b/lang/src/accounts/account.rs index e72916ac37..5277928f82 100644 --- a/lang/src/accounts/account.rs +++ b/lang/src/accounts/account.rs @@ -420,7 +420,7 @@ impl DerefMut for Account<'_, fn deref_mut(&mut self) -> &mut Self::Target { #[cfg(feature = "anchor-debug")] if !self.info.is_writable { - solana_program::msg!("The given Account is not mutable"); + crate::solana_program::msg!("The given Account is not mutable"); panic!(); } &mut self.account diff --git a/lang/src/accounts/sysvar.rs b/lang/src/accounts/sysvar.rs index e7cd257389..50054b629b 100644 --- a/lang/src/accounts/sysvar.rs +++ b/lang/src/accounts/sysvar.rs @@ -5,6 +5,7 @@ use crate::solana_program::account_info::AccountInfo; use crate::solana_program::instruction::AccountMeta; use crate::solana_program::pubkey::Pubkey; use crate::{Accounts, AccountsExit, Key, Result, ToAccountInfos, ToAccountMetas}; +use solana_sysvar::{Sysvar as SolanaSysvar, SysvarSerialize as SolanaSysvarSerialize}; use std::collections::BTreeSet; use std::fmt; use std::ops::{Deref, DerefMut}; @@ -30,12 +31,12 @@ use std::ops::{Deref, DerefMut}; /// let clock = Clock::get()?; /// } /// ``` -pub struct Sysvar<'info, T: crate::solana_program::sysvar::Sysvar> { +pub struct Sysvar<'info, T: SolanaSysvar> { info: &'info AccountInfo<'info>, account: T, } -impl fmt::Debug for Sysvar<'_, T> { +impl fmt::Debug for Sysvar<'_, T> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { f.debug_struct("Sysvar") .field("info", &self.info) @@ -44,7 +45,7 @@ impl fmt::Debug for Sysva } } -impl<'info, T: crate::solana_program::sysvar::Sysvar> Sysvar<'info, T> { +impl<'info, T: SolanaSysvarSerialize> Sysvar<'info, T> { pub fn from_account_info(acc_info: &'info AccountInfo<'info>) -> Result> { match T::from_account_info(acc_info) { Ok(val) => Ok(Sysvar { @@ -56,7 +57,7 @@ impl<'info, T: crate::solana_program::sysvar::Sysvar> Sysvar<'info, T> { } } -impl Clone for Sysvar<'_, T> { +impl Clone for Sysvar<'_, T> { fn clone(&self) -> Self { Self { info: self.info, @@ -65,7 +66,7 @@ impl Clone for Sysvar<'_, T> { } } -impl<'info, B, T: crate::solana_program::sysvar::Sysvar> Accounts<'info, B> for Sysvar<'info, T> { +impl<'info, B, T: SolanaSysvarSerialize> Accounts<'info, B> for Sysvar<'info, T> { fn try_accounts( _program_id: &Pubkey, accounts: &mut &'info [AccountInfo<'info>], @@ -82,27 +83,25 @@ impl<'info, B, T: crate::solana_program::sysvar::Sysvar> Accounts<'info, B> for } } -impl ToAccountMetas for Sysvar<'_, T> { +impl ToAccountMetas for Sysvar<'_, T> { fn to_account_metas(&self, _is_signer: Option) -> Vec { vec![AccountMeta::new_readonly(*self.info.key, false)] } } -impl<'info, T: crate::solana_program::sysvar::Sysvar> ToAccountInfos<'info> for Sysvar<'info, T> { +impl<'info, T: SolanaSysvarSerialize> ToAccountInfos<'info> for Sysvar<'info, T> { fn to_account_infos(&self) -> Vec> { vec![self.info.clone()] } } -impl<'info, T: crate::solana_program::sysvar::Sysvar> AsRef> - for Sysvar<'info, T> -{ +impl<'info, T: SolanaSysvarSerialize> AsRef> for Sysvar<'info, T> { fn as_ref(&self) -> &AccountInfo<'info> { self.info } } -impl Deref for Sysvar<'_, T> { +impl Deref for Sysvar<'_, T> { type Target = T; fn deref(&self) -> &Self::Target { @@ -110,15 +109,15 @@ impl Deref for Sysvar<'_, T> { } } -impl DerefMut for Sysvar<'_, T> { +impl DerefMut for Sysvar<'_, T> { fn deref_mut(&mut self) -> &mut Self::Target { &mut self.account } } -impl<'info, T: crate::solana_program::sysvar::Sysvar> AccountsExit<'info> for Sysvar<'info, T> {} +impl<'info, T: SolanaSysvarSerialize> AccountsExit<'info> for Sysvar<'info, T> {} -impl Key for Sysvar<'_, T> { +impl Key for Sysvar<'_, T> { fn key(&self) -> Pubkey { *self.info.key } diff --git a/lang/src/bpf_writer.rs b/lang/src/bpf_writer.rs index 4fd7b95b38..f97b4bcc1a 100644 --- a/lang/src/bpf_writer.rs +++ b/lang/src/bpf_writer.rs @@ -16,15 +16,16 @@ impl BpfWriter { impl Write for BpfWriter<&mut [u8]> { fn write(&mut self, buf: &[u8]) -> io::Result { - if self.pos >= self.inner.len() as u64 { - return Ok(0); - } + let remaining_inner = match self.inner.get_mut(self.pos as usize..) { + Some(buf) if !buf.is_empty() => buf, + _ => return Ok(0), + }; - let amt = cmp::min( - self.inner.len().saturating_sub(self.pos as usize), - buf.len(), - ); - sol_memcpy(&mut self.inner[(self.pos as usize)..], buf, amt); + let amt = cmp::min(remaining_inner.len(), buf.len()); + // SAFETY: `amt` is guarenteed by the above line to be in bounds for both slices + unsafe { + sol_memcpy(remaining_inner, buf, amt); + } self.pos += amt as u64; Ok(amt) } diff --git a/lang/src/lazy.rs b/lang/src/lazy.rs index 14c67e795d..afe2146e57 100644 --- a/lang/src/lazy.rs +++ b/lang/src/lazy.rs @@ -201,7 +201,7 @@ mod tests { #[test] fn generic() { #[derive(AnchorSerialize, AnchorDeserialize)] - struct GenericStruct { + struct GenericStruct { t: T, } diff --git a/lang/src/lib.rs b/lang/src/lib.rs index fd54b6b2e3..7c216c65d5 100644 --- a/lang/src/lib.rs +++ b/lang/src/lib.rs @@ -135,30 +135,10 @@ pub mod solana_program { } pub mod sysvar { pub use solana_sysvar_id::{declare_deprecated_sysvar_id, declare_sysvar_id, SysvarId}; - #[deprecated(since = "2.2.0", note = "Use `solana-sysvar` crate instead")] - #[allow(deprecated)] - pub use { - solana_sdk_ids::sysvar::{check_id, id, ID}, - solana_sysvar::{ - clock, epoch_rewards, epoch_schedule, fees, is_sysvar_id, last_restart_slot, - recent_blockhashes, rent, rewards, slot_hashes, slot_history, stake_history, - Sysvar, ALL_IDS, - }, - }; pub mod instructions { pub use solana_instruction::{BorrowedAccountMeta, BorrowedInstruction}; #[cfg(not(target_os = "solana"))] pub use solana_instructions_sysvar::construct_instructions_data; - #[deprecated( - since = "2.2.0", - note = "Use solana-instructions-sysvar crate instead" - )] - pub use solana_instructions_sysvar::{ - get_instruction_relative, load_current_index_checked, load_instruction_at_checked, - store_current_index_checked, Instructions, - }; - #[deprecated(since = "2.2.0", note = "Use solana-sdk-ids crate instead")] - pub use solana_sdk_ids::sysvar::instructions::{check_id, id, ID}; } } } @@ -524,19 +504,19 @@ pub mod prelude { pub use crate::solana_program::instruction::AccountMeta; pub use crate::solana_program::program_error::ProgramError; pub use crate::solana_program::pubkey::Pubkey; - pub use crate::solana_program::sysvar::clock::Clock; - pub use crate::solana_program::sysvar::epoch_schedule::EpochSchedule; - pub use crate::solana_program::sysvar::instructions::Instructions; - pub use crate::solana_program::sysvar::rent::Rent; - pub use crate::solana_program::sysvar::rewards::Rewards; - pub use crate::solana_program::sysvar::slot_hashes::SlotHashes; - pub use crate::solana_program::sysvar::slot_history::SlotHistory; - pub use crate::solana_program::sysvar::stake_history::StakeHistory; - pub use crate::solana_program::sysvar::Sysvar as SolanaSysvar; pub use crate::solana_program::*; pub use anchor_attribute_error::*; pub use borsh; pub use error::*; + pub use solana_clock::Clock; + pub use solana_instructions_sysvar::Instructions; + pub use solana_stake_interface::stake_history::StakeHistory; + pub use solana_sysvar::epoch_schedule::EpochSchedule; + pub use solana_sysvar::rent::Rent; + pub use solana_sysvar::rewards::Rewards; + pub use solana_sysvar::slot_hashes::SlotHashes; + pub use solana_sysvar::slot_history::SlotHistory; + pub use solana_sysvar::Sysvar as SolanaSysvar; pub use thiserror; #[cfg(feature = "event-cpi")] diff --git a/lang/src/signature_verification/mod.rs b/lang/src/signature_verification/mod.rs index cd2a9d8d17..0303f2f5ab 100644 --- a/lang/src/signature_verification/mod.rs +++ b/lang/src/signature_verification/mod.rs @@ -1,9 +1,7 @@ use crate::prelude::*; use crate::solana_program::instruction::Instruction; -use crate::solana_program::sysvar::instructions::{ - load_current_index_checked, load_instruction_at_checked, -}; use core::convert::TryFrom; +use solana_instructions_sysvar::{load_current_index_checked, load_instruction_at_checked}; mod ed25519; mod secp256k1; diff --git a/lang/src/vec.rs b/lang/src/vec.rs index 9d6da8d355..ed49bb11cd 100644 --- a/lang/src/vec.rs +++ b/lang/src/vec.rs @@ -39,7 +39,6 @@ impl<'info, B, T: Accounts<'info, B>> Accounts<'info, B> for Vec { #[cfg(test)] mod tests { - use crate::solana_program::clock::Epoch; use crate::solana_program::pubkey::Pubkey; use super::*; @@ -58,29 +57,13 @@ mod tests { let mut lamports1 = 0; let mut data1 = vec![0; 10]; let owner = Pubkey::default(); - let account1 = AccountInfo::new( - &key, - true, - true, - &mut lamports1, - &mut data1, - &owner, - false, - Epoch::default(), - ); + let account1 = + AccountInfo::new(&key, true, true, &mut lamports1, &mut data1, &owner, false); let mut lamports2 = 0; let mut data2 = vec![0; 10]; - let account2 = AccountInfo::new( - &key, - true, - true, - &mut lamports2, - &mut data2, - &owner, - false, - Epoch::default(), - ); + let account2 = + AccountInfo::new(&key, true, true, &mut lamports2, &mut data2, &owner, false); let mut bumps = TestBumps::default(); let mut reallocs = std::collections::BTreeSet::new(); let mut accounts = &[account1, account2][..]; diff --git a/lang/syn/src/codegen/accounts/try_accounts.rs b/lang/syn/src/codegen/accounts/try_accounts.rs index 33f1a0f882..30721f4000 100644 --- a/lang/syn/src/codegen/accounts/try_accounts.rs +++ b/lang/syn/src/codegen/accounts/try_accounts.rs @@ -24,7 +24,7 @@ pub fn generate(accs: &AccountsStruct) -> proc_macro2::TokenStream { let ty = &s.raw_field.ty; quote! { #[cfg(feature = "anchor-debug")] - ::solana_program::log::sol_log(stringify!(#name)); + ::anchor_lang::solana_program::log::sol_log(stringify!(#name)); let #name: #ty = anchor_lang::Accounts::try_accounts(__program_id, __accounts, __ix_data, &mut __bumps.#name, __reallocs)?; } } @@ -79,7 +79,7 @@ pub fn generate(accs: &AccountsStruct) -> proc_macro2::TokenStream { }; quote! { #[cfg(feature = "anchor-debug")] - ::solana_program::log::sol_log(stringify!(#typed_name)); + ::anchor_lang::solana_program::log::sol_log(stringify!(#typed_name)); let #typed_name = anchor_lang::Accounts::try_accounts(__program_id, __accounts, __ix_data, __bumps, __reallocs) .map_err(|e| e.with_account_name(#name))?; #warning diff --git a/lang/syn/src/idl/accounts.rs b/lang/syn/src/idl/accounts.rs index b481281f46..39148bdb30 100644 --- a/lang/syn/src/idl/accounts.rs +++ b/lang/syn/src/idl/accounts.rs @@ -128,7 +128,7 @@ pub fn gen_idl_build_impl_accounts_struct(accounts: &AccountsStruct) -> TokenStr if let Some(ty) = <#defined>::create_type() { let account = #idl::IdlAccount { name: ty.name.clone(), - discriminator: #defined::DISCRIMINATOR.into(), + discriminator: <#defined>::DISCRIMINATOR.into(), }; accounts.insert(account.name.clone(), account); types.insert(ty.name.clone(), ty); diff --git a/lang/tests/account_reload.rs b/lang/tests/account_reload.rs index bdeeedc7ab..b3a9879565 100644 --- a/lang/tests/account_reload.rs +++ b/lang/tests/account_reload.rs @@ -1,5 +1,4 @@ use anchor_lang::prelude::*; -use anchor_lang::solana_program::clock::Epoch; declare_id!("Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS"); @@ -35,16 +34,8 @@ fn reload_owner_unchanged_updates_data() { let owner: Pubkey = crate::ID; let key: Pubkey = Pubkey::new_unique(); - let acc_info: AccountInfo<'_> = AccountInfo::new( - &key, - false, - true, - &mut lamports, - &mut data, - &owner, - false, - Epoch::default(), - ); + let acc_info: AccountInfo<'_> = + AccountInfo::new(&key, false, true, &mut lamports, &mut data, &owner, false); // Wrap in Account. let mut acc: Account<'_, Dummy> = Account::::try_from(&acc_info).unwrap(); @@ -73,16 +64,8 @@ fn reload_owner_changed_fails() { let owner_ptr: *mut Pubkey = &mut owner; let key: Pubkey = Pubkey::new_unique(); - let acc_info: AccountInfo<'_> = AccountInfo::new( - &key, - false, - true, - &mut lamports, - &mut data, - &owner, - false, - Epoch::default(), - ); + let acc_info: AccountInfo<'_> = + AccountInfo::new(&key, false, true, &mut lamports, &mut data, &owner, false); let mut acc: Account<'_, Dummy> = Account::::try_from(&acc_info).unwrap(); @@ -108,16 +91,8 @@ fn interface_reload_owner_unchanged_updates_data() { let owner: Pubkey = crate::ID; let key: Pubkey = Pubkey::new_unique(); - let acc_info: AccountInfo<'_> = AccountInfo::new( - &key, - false, - true, - &mut lamports, - &mut data, - &owner, - false, - Epoch::default(), - ); + let acc_info: AccountInfo<'_> = + AccountInfo::new(&key, false, true, &mut lamports, &mut data, &owner, false); let mut i_face: InterfaceAccount<'_, Dummy> = InterfaceAccount::::try_from(&acc_info).unwrap(); @@ -143,16 +118,8 @@ fn reload_error_does_not_mutate_cached_state() { let owner_ptr: *mut Pubkey = &mut owner; let key: Pubkey = Pubkey::new_unique(); - let acc_info: AccountInfo<'_> = AccountInfo::new( - &key, - false, - true, - &mut lamports, - &mut data, - &owner, - false, - Epoch::default(), - ); + let acc_info: AccountInfo<'_> = + AccountInfo::new(&key, false, true, &mut lamports, &mut data, &owner, false); let mut acc: Account<'_, Dummy> = Account::::try_from(&acc_info).unwrap(); assert_eq!(acc.val, 7); diff --git a/spl/Cargo.toml b/spl/Cargo.toml index e7f2ef7640..b7f55d7743 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -13,18 +13,18 @@ rustdoc-args = ["--cfg", "docsrs"] [features] default = ["associated_token", "mint", "token", "token_2022", "token_2022_extensions"] anchor-debug = ["anchor-lang/anchor-debug"] -associated_token = ["spl-associated-token-account"] +associated_token = ["spl-associated-token-account-interface"] devnet = [] governance = [] idl-build = ["anchor-lang/idl-build"] -memo = ["spl-memo"] -metadata = ["mpl-token-metadata"] +memo = ["spl-memo-interface"] +metadata = ["mpl-token-metadata", "dep:solana-sysvar", "dep:base64ct"] mint = [] -stake = ["borsh"] -token = ["spl-token"] -token_2022 = ["spl-token-2022"] +stake = ["dep:borsh", "dep:solana-stake-interface"] +token = ["spl-token-interface"] +token_2022 = ["spl-token-2022-interface"] token_2022_extensions = [ - "spl-token-2022", + "spl-token-2022-interface", "spl-token-group-interface", "spl-token-metadata-interface", "spl-pod", @@ -32,12 +32,17 @@ token_2022_extensions = [ [dependencies] anchor-lang = { path = "../lang", version = "0.32.1", features = ["derive"] } +# FIXME(edition2024): Not used directly, but upstream crates resolve to this version, +# which uses Edition 2024 +base64ct = { version = "<1.8.0", optional = true } borsh = { version = "1.5.7", optional = true } -mpl-token-metadata = { version = "5", optional = true } -spl-associated-token-account = { version = "7", features = ["no-entrypoint"], optional = true } -spl-memo = { version = "6", features = ["no-entrypoint"], optional = true } -spl-pod = { version = "0.5", optional = true } -spl-token = { version = "8", features = ["no-entrypoint"], optional = true } -spl-token-2022 = { version = "8", features = ["no-entrypoint"], optional = true } -spl-token-group-interface = { version = "0.6", optional = true } -spl-token-metadata-interface = { version = "0.7", optional = true } +mpl-token-metadata = { version = "=5.1.2-alpha.1", optional = true } +solana-stake-interface = { workspace = true, features = ["borsh"], optional = true } +solana-sysvar = { version = "3", optional = true } +spl-associated-token-account-interface = { version = "2", optional = true } +spl-memo-interface = { version = "2", optional = true } +spl-pod = { version = "0.7", optional = true } +spl-token-interface = { version = "2", optional = true } +spl-token-2022-interface = { version = "2", optional = true } +spl-token-group-interface = { version = "0.7", optional = true } +spl-token-metadata-interface = { version = "0.8", optional = true } diff --git a/spl/src/associated_token.rs b/spl/src/associated_token.rs index f95f4cc0ac..6c1da8cd69 100644 --- a/spl/src/associated_token.rs +++ b/spl/src/associated_token.rs @@ -5,9 +5,10 @@ use anchor_lang::solana_program::pubkey::Pubkey; use anchor_lang::Result; use anchor_lang::{context::CpiContext, Accounts}; -pub use spl_associated_token_account; -pub use spl_associated_token_account::{ - get_associated_token_address, get_associated_token_address_with_program_id, ID, +pub use ::spl_associated_token_account_interface as spl_associated_token_account; +pub use ::spl_associated_token_account_interface::{ + address::{get_associated_token_address, get_associated_token_address_with_program_id}, + program::ID, }; pub fn create<'info>(ctx: CpiContext<'_, '_, '_, 'info, Create<'info>>) -> Result<()> { diff --git a/spl/src/memo.rs b/spl/src/memo.rs index fceabca7a8..a758d2da72 100644 --- a/spl/src/memo.rs +++ b/spl/src/memo.rs @@ -2,11 +2,12 @@ use anchor_lang::solana_program::pubkey::Pubkey; use anchor_lang::Result; use anchor_lang::{context::CpiContext, Accounts}; -pub use spl_memo; -pub use spl_memo::ID; +pub use spl_memo_interface::instruction as spl_memo; +pub use spl_memo_interface::v3::ID; pub fn build_memo<'info>(ctx: CpiContext<'_, '_, '_, 'info, BuildMemo>, memo: &[u8]) -> Result<()> { let ix = spl_memo::build_memo( + &ID, memo, &ctx.remaining_accounts .iter() diff --git a/spl/src/metadata.rs b/spl/src/metadata.rs index 394b08cb8c..de8aeadf95 100644 --- a/spl/src/metadata.rs +++ b/spl/src/metadata.rs @@ -2,7 +2,6 @@ use anchor_lang::context::CpiContext; use anchor_lang::error::ErrorCode; use anchor_lang::solana_program::account_info::AccountInfo; use anchor_lang::solana_program::pubkey::Pubkey; -use anchor_lang::solana_program::sysvar; use anchor_lang::{system_program, Accounts, Result, ToAccountInfos}; use std::ops::Deref; @@ -190,7 +189,7 @@ pub fn create_master_edition_v3<'info>( payer: *ctx.accounts.payer.key, rent: None, system_program: system_program::ID, - token_program: spl_token::ID, + token_program: spl_token_interface::ID, update_authority: *ctx.accounts.update_authority.key, } .instruction( @@ -222,7 +221,7 @@ pub fn mint_new_edition_from_master_edition_via_token<'info>( system_program: system_program::ID, token_account: *ctx.accounts.token_account.key, token_account_owner: *ctx.accounts.token_account_owner.key, - token_program: spl_token::ID, + token_program: spl_token_interface::ID, } .instruction( mpl_token_metadata::instructions::MintNewEditionFromMasterEditionViaTokenInstructionArgs { @@ -482,15 +481,15 @@ pub fn utilize<'info>( number_of_uses: u64, ) -> Result<()> { let ix = mpl_token_metadata::instructions::Utilize { - ata_program: spl_associated_token_account::ID, + ata_program: spl_associated_token_account_interface::program::ID, burner, metadata: *ctx.accounts.metadata.key, mint: *ctx.accounts.mint.key, owner: *ctx.accounts.owner.key, - rent: sysvar::rent::ID, + rent: solana_sysvar::rent::ID, system_program: system_program::ID, token_account: *ctx.accounts.token_account.key, - token_program: spl_token::ID, + token_program: spl_token_interface::ID, use_authority: *ctx.accounts.use_authority.key, use_authority_record, } diff --git a/spl/src/stake.rs b/spl/src/stake.rs index c776974da7..aa7ce7404e 100644 --- a/spl/src/stake.rs +++ b/spl/src/stake.rs @@ -1,17 +1,14 @@ use anchor_lang::{ context::CpiContext, - solana_program::{ - account_info::AccountInfo, - pubkey::Pubkey, - stake::{ - self, - program::ID, - state::{StakeAuthorize, StakeState}, - }, - }, + solana_program::{account_info::AccountInfo, pubkey::Pubkey}, Accounts, Result, }; use borsh::BorshDeserialize; +use solana_stake_interface::{ + self as stake, + program::ID, + state::{StakeAuthorize, StakeStateV2}, +}; use std::ops::Deref; // CPI functions @@ -128,7 +125,7 @@ pub struct DeactivateStake<'info> { // State #[derive(Clone)] -pub struct StakeAccount(StakeState); +pub struct StakeAccount(StakeStateV2); impl anchor_lang::AccountDeserialize for StakeAccount { fn try_deserialize(buf: &mut &[u8]) -> anchor_lang::Result { @@ -136,7 +133,7 @@ impl anchor_lang::AccountDeserialize for StakeAccount { } fn try_deserialize_unchecked(buf: &mut &[u8]) -> anchor_lang::Result { - StakeState::deserialize(buf).map(Self).map_err(Into::into) + StakeStateV2::deserialize(buf).map(Self).map_err(Into::into) } } @@ -149,7 +146,7 @@ impl anchor_lang::Owner for StakeAccount { } impl Deref for StakeAccount { - type Target = StakeState; + type Target = StakeStateV2; fn deref(&self) -> &Self::Target { &self.0 diff --git a/spl/src/token.rs b/spl/src/token.rs index c15cddf07a..fd7d2a1516 100644 --- a/spl/src/token.rs +++ b/spl/src/token.rs @@ -7,8 +7,8 @@ use anchor_lang::Result; use anchor_lang::{context::CpiContext, Accounts}; use std::ops::Deref; -pub use spl_token; pub use spl_token::ID; +pub use spl_token_interface as spl_token; pub fn transfer<'info>( ctx: CpiContext<'_, '_, '_, 'info, Transfer<'info>>, diff --git a/spl/src/token_2022.rs b/spl/src/token_2022.rs index 0cc205f971..766b4d0883 100644 --- a/spl/src/token_2022.rs +++ b/spl/src/token_2022.rs @@ -5,8 +5,8 @@ use anchor_lang::solana_program::pubkey::Pubkey; use anchor_lang::Result; use anchor_lang::{context::CpiContext, Accounts}; -pub use spl_token_2022; pub use spl_token_2022::ID; +pub use spl_token_2022_interface as spl_token_2022; #[deprecated( since = "0.28.0", diff --git a/spl/src/token_2022_extensions/cpi_guard.rs b/spl/src/token_2022_extensions/cpi_guard.rs index ee096a10be..35a794c330 100644 --- a/spl/src/token_2022_extensions/cpi_guard.rs +++ b/spl/src/token_2022_extensions/cpi_guard.rs @@ -4,6 +4,7 @@ use anchor_lang::solana_program::account_info::AccountInfo; use anchor_lang::solana_program::pubkey::Pubkey; use anchor_lang::Result; use anchor_lang::{context::CpiContext, Accounts}; +use spl_token_2022_interface as spl_token_2022; pub fn cpi_guard_enable<'info>(ctx: CpiContext<'_, '_, '_, 'info, CpiGuard<'info>>) -> Result<()> { let ix = spl_token_2022::extension::cpi_guard::instruction::enable_cpi_guard( diff --git a/spl/src/token_2022_extensions/default_account_state.rs b/spl/src/token_2022_extensions/default_account_state.rs index 6b98fdf5a7..e424dda5f6 100644 --- a/spl/src/token_2022_extensions/default_account_state.rs +++ b/spl/src/token_2022_extensions/default_account_state.rs @@ -5,6 +5,7 @@ use anchor_lang::solana_program::pubkey::Pubkey; use anchor_lang::Result; use anchor_lang::{context::CpiContext, Accounts}; use spl_token_2022::state::AccountState; +use spl_token_2022_interface as spl_token_2022; pub fn default_account_state_initialize<'info>( ctx: CpiContext<'_, '_, '_, 'info, DefaultAccountStateInitialize<'info>>, diff --git a/spl/src/token_2022_extensions/group_member_pointer.rs b/spl/src/token_2022_extensions/group_member_pointer.rs index f76f5ea771..41487563de 100644 --- a/spl/src/token_2022_extensions/group_member_pointer.rs +++ b/spl/src/token_2022_extensions/group_member_pointer.rs @@ -4,6 +4,7 @@ use anchor_lang::solana_program::account_info::AccountInfo; use anchor_lang::solana_program::pubkey::Pubkey; use anchor_lang::Result; use anchor_lang::{context::CpiContext, Accounts}; +use spl_token_2022_interface as spl_token_2022; pub fn group_member_pointer_initialize<'info>( ctx: CpiContext<'_, '_, '_, 'info, GroupMemberPointerInitialize<'info>>, diff --git a/spl/src/token_2022_extensions/group_pointer.rs b/spl/src/token_2022_extensions/group_pointer.rs index 3c925e3a31..3932bbbbfd 100644 --- a/spl/src/token_2022_extensions/group_pointer.rs +++ b/spl/src/token_2022_extensions/group_pointer.rs @@ -4,6 +4,7 @@ use anchor_lang::solana_program::account_info::AccountInfo; use anchor_lang::solana_program::pubkey::Pubkey; use anchor_lang::Result; use anchor_lang::{context::CpiContext, Accounts}; +use spl_token_2022_interface as spl_token_2022; pub fn group_pointer_initialize<'info>( ctx: CpiContext<'_, '_, '_, 'info, GroupPointerInitialize<'info>>, diff --git a/spl/src/token_2022_extensions/immutable_owner.rs b/spl/src/token_2022_extensions/immutable_owner.rs index d9e58f56bc..be3528e5ec 100644 --- a/spl/src/token_2022_extensions/immutable_owner.rs +++ b/spl/src/token_2022_extensions/immutable_owner.rs @@ -4,6 +4,7 @@ use anchor_lang::solana_program::account_info::AccountInfo; use anchor_lang::solana_program::pubkey::Pubkey; use anchor_lang::Result; use anchor_lang::{context::CpiContext, Accounts}; +use spl_token_2022_interface as spl_token_2022; pub fn immutable_owner_initialize<'info>( ctx: CpiContext<'_, '_, '_, 'info, ImmutableOwnerInitialize<'info>>, diff --git a/spl/src/token_2022_extensions/interest_bearing_mint.rs b/spl/src/token_2022_extensions/interest_bearing_mint.rs index 3c66c16a0b..d50d69b031 100644 --- a/spl/src/token_2022_extensions/interest_bearing_mint.rs +++ b/spl/src/token_2022_extensions/interest_bearing_mint.rs @@ -4,6 +4,7 @@ use anchor_lang::solana_program::account_info::AccountInfo; use anchor_lang::solana_program::pubkey::Pubkey; use anchor_lang::Result; use anchor_lang::{context::CpiContext, Accounts}; +use spl_token_2022_interface as spl_token_2022; pub fn interest_bearing_mint_initialize<'info>( ctx: CpiContext<'_, '_, '_, 'info, InterestBearingMintInitialize<'info>>, diff --git a/spl/src/token_2022_extensions/memo_transfer.rs b/spl/src/token_2022_extensions/memo_transfer.rs index 3f2a932107..e53b752640 100644 --- a/spl/src/token_2022_extensions/memo_transfer.rs +++ b/spl/src/token_2022_extensions/memo_transfer.rs @@ -4,6 +4,7 @@ use anchor_lang::solana_program::account_info::AccountInfo; use anchor_lang::solana_program::pubkey::Pubkey; use anchor_lang::Result; use anchor_lang::{context::CpiContext, Accounts}; +use spl_token_2022_interface as spl_token_2022; pub fn memo_transfer_initialize<'info>( ctx: CpiContext<'_, '_, '_, 'info, MemoTransfer<'info>>, diff --git a/spl/src/token_2022_extensions/metadata_pointer.rs b/spl/src/token_2022_extensions/metadata_pointer.rs index 79c5f5431e..e91be5bf10 100644 --- a/spl/src/token_2022_extensions/metadata_pointer.rs +++ b/spl/src/token_2022_extensions/metadata_pointer.rs @@ -4,6 +4,7 @@ use anchor_lang::solana_program::account_info::AccountInfo; use anchor_lang::solana_program::pubkey::Pubkey; use anchor_lang::Result; use anchor_lang::{context::CpiContext, Accounts}; +use spl_token_2022_interface as spl_token_2022; pub fn metadata_pointer_initialize<'info>( ctx: CpiContext<'_, '_, '_, 'info, MetadataPointerInitialize<'info>>, diff --git a/spl/src/token_2022_extensions/mint_close_authority.rs b/spl/src/token_2022_extensions/mint_close_authority.rs index 9a42ec72b6..2f770439aa 100644 --- a/spl/src/token_2022_extensions/mint_close_authority.rs +++ b/spl/src/token_2022_extensions/mint_close_authority.rs @@ -4,6 +4,7 @@ use anchor_lang::solana_program::account_info::AccountInfo; use anchor_lang::solana_program::pubkey::Pubkey; use anchor_lang::Result; use anchor_lang::{context::CpiContext, Accounts}; +use spl_token_2022_interface as spl_token_2022; pub fn mint_close_authority_initialize<'info>( ctx: CpiContext<'_, '_, '_, 'info, MintCloseAuthorityInitialize<'info>>, diff --git a/spl/src/token_2022_extensions/non_transferable.rs b/spl/src/token_2022_extensions/non_transferable.rs index dacbd29640..a8587d265a 100644 --- a/spl/src/token_2022_extensions/non_transferable.rs +++ b/spl/src/token_2022_extensions/non_transferable.rs @@ -4,6 +4,7 @@ use anchor_lang::solana_program::account_info::AccountInfo; use anchor_lang::solana_program::pubkey::Pubkey; use anchor_lang::Result; use anchor_lang::{context::CpiContext, Accounts}; +use spl_token_2022_interface as spl_token_2022; pub fn non_transferable_mint_initialize<'info>( ctx: CpiContext<'_, '_, '_, 'info, NonTransferableMintInitialize<'info>>, diff --git a/spl/src/token_2022_extensions/permanent_delegate.rs b/spl/src/token_2022_extensions/permanent_delegate.rs index bf8012db68..1f2912e356 100644 --- a/spl/src/token_2022_extensions/permanent_delegate.rs +++ b/spl/src/token_2022_extensions/permanent_delegate.rs @@ -4,6 +4,7 @@ use anchor_lang::solana_program::account_info::AccountInfo; use anchor_lang::solana_program::pubkey::Pubkey; use anchor_lang::Result; use anchor_lang::{context::CpiContext, Accounts}; +use spl_token_2022_interface as spl_token_2022; pub fn permanent_delegate_initialize<'info>( ctx: CpiContext<'_, '_, '_, 'info, PermanentDelegateInitialize<'info>>, diff --git a/spl/src/token_2022_extensions/transfer_fee.rs b/spl/src/token_2022_extensions/transfer_fee.rs index 0282da5c1e..4c489fc8e4 100644 --- a/spl/src/token_2022_extensions/transfer_fee.rs +++ b/spl/src/token_2022_extensions/transfer_fee.rs @@ -4,6 +4,7 @@ use anchor_lang::solana_program::account_info::AccountInfo; use anchor_lang::solana_program::pubkey::Pubkey; use anchor_lang::Result; use anchor_lang::{context::CpiContext, Accounts}; +use spl_token_2022_interface as spl_token_2022; pub fn transfer_fee_initialize<'info>( ctx: CpiContext<'_, '_, '_, 'info, TransferFeeInitialize<'info>>, diff --git a/spl/src/token_2022_extensions/transfer_hook.rs b/spl/src/token_2022_extensions/transfer_hook.rs index 6d20790acb..1b698d5703 100644 --- a/spl/src/token_2022_extensions/transfer_hook.rs +++ b/spl/src/token_2022_extensions/transfer_hook.rs @@ -4,6 +4,7 @@ use anchor_lang::solana_program::account_info::AccountInfo; use anchor_lang::solana_program::pubkey::Pubkey; use anchor_lang::Result; use anchor_lang::{context::CpiContext, Accounts}; +use spl_token_2022_interface as spl_token_2022; pub fn transfer_hook_initialize<'info>( ctx: CpiContext<'_, '_, '_, 'info, TransferHookInitialize<'info>>, diff --git a/spl/src/token_interface.rs b/spl/src/token_interface.rs index 6e6047cd4e..54f5884aab 100644 --- a/spl/src/token_interface.rs +++ b/spl/src/token_interface.rs @@ -9,7 +9,7 @@ pub use crate::token_2022::*; #[cfg(feature = "token_2022_extensions")] pub use crate::token_2022_extensions::*; -static IDS: [Pubkey; 2] = [spl_token::ID, spl_token_2022::ID]; +static IDS: [Pubkey; 2] = [spl_token_interface::ID, spl_token_2022_interface::ID]; #[derive(Clone, Debug, Default, PartialEq, Copy)] pub struct TokenAccount(spl_token_2022::state::Account); diff --git a/tests/auction-house/Cargo.lock b/tests/auction-house/Cargo.lock index be81f02f21..afae99898c 100644 --- a/tests/auction-house/Cargo.lock +++ b/tests/auction-house/Cargo.lock @@ -173,20 +173,21 @@ dependencies = [ "solana-account-info", "solana-clock", "solana-cpi", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "solana-feature-gate-interface", "solana-instruction", "solana-instructions-sysvar", "solana-invoke", - "solana-loader-v3-interface 3.0.0", + "solana-loader-v3-interface", "solana-msg", "solana-program-entrypoint", "solana-program-error", "solana-program-memory", "solana-program-option", "solana-program-pack", - "solana-pubkey", + "solana-pubkey 4.0.0", "solana-sdk-ids", + "solana-stake-interface", "solana-system-interface", "solana-sysvar", "solana-sysvar-id", @@ -203,7 +204,7 @@ dependencies = [ "regex", "serde", "serde_json", - "sha2 0.10.9", + "sha2", ] [[package]] @@ -219,12 +220,14 @@ name = "anchor-spl" version = "0.32.1" dependencies = [ "anchor-lang", + "base64ct", "mpl-token-metadata", - "spl-associated-token-account", + "solana-sysvar", + "spl-associated-token-account-interface", "spl-pod", - "spl-token", - "spl-token-2022", + "spl-token-2022-interface", "spl-token-group-interface", + "spl-token-interface", "spl-token-metadata-interface", ] @@ -240,7 +243,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.10.9", + "sha2", "syn 1.0.109", "thiserror 1.0.69", ] @@ -270,6 +273,7 @@ dependencies = [ "anchor-lang", "anchor-spl", "arrayref", + "solana-sysvar", "thiserror 1.0.69", ] @@ -280,10 +284,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] -name = "base64" -version = "0.12.3" +name = "base16ct" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" @@ -297,6 +301,12 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64ct" +version = "1.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3" + [[package]] name = "bincode" version = "1.3.3" @@ -323,16 +333,6 @@ dependencies = [ "cc", "cfg-if", "constant_time_eq", - "digest 0.10.7", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", ] [[package]] @@ -439,18 +439,18 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.23.2" +version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677" +checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.10.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f154e572231cb6ba2bd1176980827e3d5dc04cc183a75dea38109fbdd672d29" +checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", @@ -504,26 +504,6 @@ dependencies = [ "inout", ] -[[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] - -[[package]] -name = "console_log" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89f72f65e8501878b8a004d5a1afb780987e2ce2b4532c562e367a72c57499f" -dependencies = [ - "log", - "web-sys", -] - [[package]] name = "const-crypto" version = "0.3.0" @@ -534,6 +514,12 @@ dependencies = [ "sha2-const-stable", ] +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "constant_time_eq" version = "0.3.1" @@ -550,10 +536,16 @@ dependencies = [ ] [[package]] -name = "crunchy" -version = "0.2.4" +name = "crypto-bigint" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] [[package]] name = "crypto-common" @@ -562,7 +554,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "typenum", ] @@ -584,9 +576,9 @@ dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", - "digest 0.10.7", + "digest", "fiat-crypto", - "rand_core 0.6.4", + "rand_core", "rustc_version", "serde", "subtle", @@ -604,6 +596,16 @@ dependencies = [ "syn 2.0.105", ] +[[package]] +name = "der" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" +dependencies = [ + "const-oid", + "zeroize", +] + [[package]] name = "derivation-path" version = "0.2.0" @@ -612,22 +614,28 @@ checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0" [[package]] name = "digest" -version = "0.9.0" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "generic-array", + "block-buffer", + "const-oid", + "crypto-common", + "subtle", ] [[package]] -name = "digest" -version = "0.10.7" +name = "ecdsa" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ - "block-buffer 0.10.4", - "crypto-common", - "subtle", + "der", + "digest", + "elliptic-curve", + "rfc6979", + "signature", + "spki", ] [[package]] @@ -636,6 +644,25 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + [[package]] name = "equivalent" version = "1.0.2" @@ -648,6 +675,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" +[[package]] +name = "ff" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" +dependencies = [ + "rand_core", + "subtle", +] + [[package]] name = "fiat-crypto" version = "0.2.9" @@ -663,11 +700,20 @@ dependencies = [ "five8_core", ] +[[package]] +name = "five8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23f76610e969fa1784327ded240f1e28a3fd9520c9cec93b636fcf62dd37f772" +dependencies = [ + "five8_core", +] + [[package]] name = "five8_const" -version = "0.1.4" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26dec3da8bc3ef08f2c04f61eab298c3ab334523e55f076354d6d6f613799a7b" +checksum = "1a0f1728185f277989ca573a402716ae0beaaea3f76a8ff87ef9dd8fb19436c5" dependencies = [ "five8_core", ] @@ -692,30 +738,31 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", + "js-sys", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", + "wasi", + "wasm-bindgen", ] [[package]] -name = "getrandom" -version = "0.2.16" +name = "group" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.11.1+wasi-snapshot-preview1", - "wasm-bindgen", + "ff", + "rand_core", + "subtle", ] [[package]] @@ -748,7 +795,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -795,6 +842,29 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "k256" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" +dependencies = [ + "cfg-if", + "ecdsa", + "elliptic-curve", + "once_cell", + "sha2", + "signature", +] + +[[package]] +name = "kaigan" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f25ded719a2354f6b1a51d0c0741c25bc7afe038617664eb37f6418439eb084" +dependencies = [ + "borsh 0.10.4", +] + [[package]] name = "keccak" version = "0.1.5" @@ -822,52 +892,6 @@ version = "0.2.175" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" -[[package]] -name = "libsecp256k1" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d220bc1feda2ac231cb78c3d26f27676b8cf82c96971f7aeef3d0cf2797c73" -dependencies = [ - "arrayref", - "base64 0.12.3", - "digest 0.9.0", - "libsecp256k1-core", - "libsecp256k1-gen-ecmult", - "libsecp256k1-gen-genmult", - "rand 0.7.3", - "serde", - "sha2 0.9.9", -] - -[[package]] -name = "libsecp256k1-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80" -dependencies = [ - "crunchy", - "digest 0.9.0", - "subtle", -] - -[[package]] -name = "libsecp256k1-gen-ecmult" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccab96b584d38fac86a83f07e659f0deafd0253dc096dab5a36d53efe653c5c3" -dependencies = [ - "libsecp256k1-core", -] - -[[package]] -name = "libsecp256k1-gen-genmult" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67abfe149395e3aa1c48a2beb32b068e2334402df8181f818d3aee2b304c4f5d" -dependencies = [ - "libsecp256k1-core", -] - [[package]] name = "lock_api" version = "0.4.13" @@ -907,20 +931,22 @@ checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" dependencies = [ "byteorder", "keccak", - "rand_core 0.6.4", + "rand_core", "zeroize", ] [[package]] name = "mpl-token-metadata" -version = "5.1.0" +version = "5.1.2-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989e6a3000e761d3b2d685662a3a9ee99826f9369fb033bd1bc7011b1cf02ed9" +checksum = "301a652c73320ef9778645a831a99b00e3222307c0426d32c5c91ea50705bde0" dependencies = [ - "borsh 0.10.4", + "borsh 1.5.7", + "kaigan", "num-derive 0.3.3", "num-traits", "solana-program", + "solana-program-error", "thiserror 1.0.69", ] @@ -976,9 +1002,9 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a" +checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c" dependencies = [ "num_enum_derive", "rustversion", @@ -986,9 +1012,9 @@ dependencies = [ [[package]] name = "num_enum_derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" +checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" dependencies = [ "proc-macro-crate 3.3.0", "proc-macro2", @@ -1037,7 +1063,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -1046,6 +1072,16 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + [[package]] name = "polyval" version = "0.6.2" @@ -1112,19 +1148,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -1132,18 +1155,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -1153,16 +1166,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -1171,16 +1175,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.16", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -1221,6 +1216,16 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + [[package]] name = "rustc_version" version = "0.4.1" @@ -1248,6 +1253,20 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + [[package]] name = "semver" version = "1.0.26" @@ -1256,10 +1275,11 @@ checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] @@ -1272,11 +1292,20 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1304,19 +1333,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "sha2" version = "0.10.9" @@ -1325,7 +1341,7 @@ checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -1340,7 +1356,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest 0.10.7", + "digest", "keccak", ] @@ -1350,6 +1366,16 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + [[package]] name = "smallvec" version = "1.15.1" @@ -1357,106 +1383,105 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] -name = "solana-account" -version = "2.2.1" +name = "solana-account-info" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f949fe4edaeaea78c844023bfc1c898e0b1f5a100f8a8d2d0f85d0a7b090258" +checksum = "fc3397241392f5756925029acaa8515dc70fcbe3d8059d4885d7d6533baf64fd" dependencies = [ - "solana-account-info", - "solana-clock", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", + "bincode", + "serde_core", + "solana-address 2.0.0", + "solana-program-error", + "solana-program-memory", ] [[package]] -name = "solana-account-info" -version = "2.3.0" +name = "solana-address" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8f5152a288ef1912300fc6efa6c2d1f9bb55d9398eb6c72326360b8063987da" +checksum = "a2ecac8e1b7f74c2baa9e774c42817e3e75b20787134b76cc4d45e8a604488f5" dependencies = [ - "bincode", - "serde", - "solana-program-error", - "solana-program-memory", - "solana-pubkey", + "solana-address 2.0.0", ] [[package]] -name = "solana-address-lookup-table-interface" -version = "2.2.2" +name = "solana-address" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1673f67efe870b64a65cb39e6194be5b26527691ce5922909939961a6e6b395" +checksum = "e37320fd2945c5d654b2c6210624a52d66c3f1f73b653ed211ab91a703b35bdd" dependencies = [ - "bincode", + "borsh 1.5.7", "bytemuck", + "bytemuck_derive", + "curve25519-dalek", + "five8 1.0.0", + "five8_const", "serde", "serde_derive", + "solana-atomic-u64", + "solana-define-syscall 4.0.1", + "solana-program-error", + "solana-sanitize", + "solana-sha256-hasher", +] + +[[package]] +name = "solana-address-lookup-table-interface" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2f56cac5e70517a2f27d05e5100b20de7182473ffd0035b23ea273307905987" +dependencies = [ "solana-clock", - "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "solana-slot-hashes", ] [[package]] name = "solana-atomic-u64" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52e52720efe60465b052b9e7445a01c17550666beec855cce66f44766697bc2" +checksum = "a933ff1e50aff72d02173cfcd7511bd8540b027ee720b75f353f594f834216d0" dependencies = [ "parking_lot", ] [[package]] name = "solana-big-mod-exp" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75db7f2bbac3e62cfd139065d15bcda9e2428883ba61fc8d27ccb251081e7567" +checksum = "30c80fb6d791b3925d5ec4bf23a7c169ef5090c013059ec3ed7d0b2c04efa085" dependencies = [ "num-bigint", "num-traits", - "solana-define-syscall", -] - -[[package]] -name = "solana-bincode" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a3787b8cf9c9fe3dd360800e8b70982b9e5a8af9e11c354b6665dd4a003adc" -dependencies = [ - "bincode", - "serde", - "solana-instruction", + "solana-define-syscall 3.0.0", ] [[package]] name = "solana-blake3-hasher" -version = "2.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0801e25a1b31a14494fc80882a036be0ffd290efc4c2d640bfcca120a4672" +checksum = "7116e1d942a2432ca3f514625104757ab8a56233787e95144c93950029e31176" dependencies = [ "blake3", - "solana-define-syscall", - "solana-hash", - "solana-sanitize", + "solana-define-syscall 4.0.1", + "solana-hash 4.0.1", ] [[package]] name = "solana-borsh" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718333bcd0a1a7aed6655aa66bef8d7fb047944922b2d3a18f49cbc13e73d004" +checksum = "dc402b16657abbfa9991cd5cbfac5a11d809f7e7d28d3bb291baeb088b39060e" dependencies = [ - "borsh 0.10.4", "borsh 1.5.7", ] [[package]] name = "solana-clock" -version = "2.2.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb482ab70fced82ad3d7d3d87be33d466a3498eb8aa856434ff3c0dfc2e2e31" +checksum = "fb62e9381182459a4520b5fe7fb22d423cae736239a6427fc398a88743d0ed59" dependencies = [ "serde", "serde_derive", @@ -1467,52 +1492,49 @@ dependencies = [ [[package]] name = "solana-cpi" -version = "2.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dc71126edddc2ba014622fc32d0f5e2e78ec6c5a1e0eb511b85618c09e9ea11" +checksum = "4dea26709d867aada85d0d3617db0944215c8bb28d3745b912de7db13a23280c" dependencies = [ "solana-account-info", - "solana-define-syscall", + "solana-define-syscall 4.0.1", "solana-instruction", "solana-program-error", - "solana-pubkey", + "solana-pubkey 4.0.0", "solana-stable-layout", ] [[package]] name = "solana-curve25519" -version = "2.3.7" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b162f50499b391b785d57b2f2c73e3b9754d88fd4894bef444960b00bda8dcca" +checksum = "134f67bd3031223df4aba035c503e4d14acacfc4cf19af10d10ec9c2605bb84f" dependencies = [ "bytemuck", "bytemuck_derive", "curve25519-dalek", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "subtle", - "thiserror 2.0.14", + "thiserror 2.0.17", ] [[package]] -name = "solana-decode-error" -version = "2.3.0" +name = "solana-define-syscall" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c781686a18db2f942e70913f7ca15dc120ec38dcab42ff7557db2c70c625a35" -dependencies = [ - "num-traits", -] +checksum = "f9697086a4e102d28a156b8d6b521730335d6951bd39a5e766512bbe09007cee" [[package]] name = "solana-define-syscall" -version = "2.3.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae3e2abcf541c8122eafe9a625d4d194b4023c20adde1e251f94e056bb1aee2" +checksum = "57e5b1c0bc1d4a4d10c88a4100499d954c09d3fecfae4912c1a074dff68b1738" [[package]] name = "solana-derivation-path" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "939756d798b25c5ec3cca10e06212bdca3b1443cb9bb740a38124f58b258737b" +checksum = "ff71743072690fdbdfcdc37700ae1cb77485aaad49019473a81aee099b1e0b8c" dependencies = [ "derivation-path", "qstring", @@ -1521,13 +1543,13 @@ dependencies = [ [[package]] name = "solana-epoch-rewards" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b575d3dd323b9ea10bb6fe89bf6bf93e249b215ba8ed7f68f1a3633f384db7" +checksum = "b319a4ed70390af911090c020571f0ff1f4ec432522d05ab89f5c08080381995" dependencies = [ "serde", "serde_derive", - "solana-hash", + "solana-hash 3.1.0", "solana-sdk-ids", "solana-sdk-macro", "solana-sysvar-id", @@ -1535,9 +1557,9 @@ dependencies = [ [[package]] name = "solana-epoch-schedule" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fce071fbddecc55d727b1d7ed16a629afe4f6e4c217bc8d00af3b785f6f67ed" +checksum = "6e5481e72cc4d52c169db73e4c0cd16de8bc943078aac587ec4817a75cc6388f" dependencies = [ "serde", "serde_derive", @@ -1546,51 +1568,53 @@ dependencies = [ "solana-sysvar-id", ] +[[package]] +name = "solana-epoch-stake" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc6693d0ea833b880514b9b88d95afb80b42762dca98b0712465d1fcbbcb89e" +dependencies = [ + "solana-define-syscall 3.0.0", + "solana-pubkey 3.0.0", +] + [[package]] name = "solana-example-mocks" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84461d56cbb8bb8d539347151e0525b53910102e4bced875d49d5139708e39d3" +checksum = "978855d164845c1b0235d4b4d101cadc55373fffaf0b5b6cfa2194d25b2ed658" dependencies = [ "serde", "serde_derive", "solana-address-lookup-table-interface", "solana-clock", - "solana-hash", + "solana-hash 3.1.0", "solana-instruction", "solana-keccak-hasher", "solana-message", "solana-nonce", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "solana-system-interface", - "thiserror 2.0.14", + "thiserror 2.0.17", ] [[package]] name = "solana-feature-gate-interface" -version = "2.2.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f5c5382b449e8e4e3016fb05e418c53d57782d8b5c30aa372fc265654b956d" +checksum = "7347ab62e6d47a82e340c865133795b394feea7c2b2771d293f57691c6544c3f" dependencies = [ - "bincode", - "serde", - "serde_derive", - "solana-account", - "solana-account-info", - "solana-instruction", "solana-program-error", - "solana-pubkey", - "solana-rent", + "solana-pubkey 3.0.0", "solana-sdk-ids", - "solana-system-interface", ] [[package]] name = "solana-fee-calculator" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89bc408da0fb3812bc3008189d148b4d3e08252c79ad810b245482a3f70cd8d" +checksum = "2a73cc03ca4bed871ca174558108835f8323e85917bb38b9c81c7af2ab853efe" dependencies = [ "log", "serde", @@ -1599,51 +1623,66 @@ dependencies = [ [[package]] name = "solana-hash" -version = "2.3.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b96e9f0300fa287b545613f007dfe20043d7812bee255f418c1eb649c93b63" +checksum = "337c246447142f660f778cf6cb582beba8e28deb05b3b24bfb9ffd7c562e5f41" +dependencies = [ + "solana-hash 4.0.1", +] + +[[package]] +name = "solana-hash" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a5d48a6ee7b91fc7b998944ab026ed7b3e2fc8ee3bc58452644a86c2648152f" dependencies = [ "borsh 1.5.7", "bytemuck", "bytemuck_derive", - "five8", - "js-sys", + "five8 1.0.0", "serde", "serde_derive", "solana-atomic-u64", "solana-sanitize", - "wasm-bindgen", ] [[package]] name = "solana-instruction" -version = "2.3.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47298e2ce82876b64f71e9d13a46bc4b9056194e7f9937ad3084385befa50885" +checksum = "ee1b699a2c1518028a9982e255e0eca10c44d90006542d9d7f9f40dbce3f7c78" dependencies = [ "bincode", "borsh 1.5.7", - "getrandom 0.2.16", - "js-sys", - "num-traits", "serde", "serde_derive", - "solana-define-syscall", - "solana-pubkey", - "wasm-bindgen", + "solana-define-syscall 4.0.1", + "solana-instruction-error", + "solana-pubkey 4.0.0", +] + +[[package]] +name = "solana-instruction-error" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b04259e03c05faf38a8c24217b5cfe4c90572ae6184ab49cddb1584fdd756d3f" +dependencies = [ + "num-traits", + "solana-program-error", ] [[package]] name = "solana-instructions-sysvar" -version = "2.2.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0e85a6fad5c2d0c4f5b91d34b8ca47118fc593af706e523cdbedf846a954f57" +checksum = "7ddf67876c541aa1e21ee1acae35c95c6fbc61119814bfef70579317a5e26955" dependencies = [ "bitflags", "solana-account-info", "solana-instruction", + "solana-instruction-error", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sanitize", "solana-sdk-ids", "solana-serialize-utils", @@ -1652,12 +1691,12 @@ dependencies = [ [[package]] name = "solana-invoke" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f5693c6de226b3626658377168b0184e94e8292ff16e3d31d4766e65627565" +checksum = "4065031f5c7dd29ef5f5003c1a353011eeabbafa6c5a5033da0cedbfca824b94" dependencies = [ "solana-account-info", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "solana-instruction", "solana-program-entrypoint", "solana-stable-layout", @@ -1665,21 +1704,20 @@ dependencies = [ [[package]] name = "solana-keccak-hasher" -version = "2.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7aeb957fbd42a451b99235df4942d96db7ef678e8d5061ef34c9b34cae12f79" +checksum = "ed1c0d16d6fdeba12291a1f068cdf0d479d9bff1141bf44afd7aa9d485f65ef8" dependencies = [ "sha3", - "solana-define-syscall", - "solana-hash", - "solana-sanitize", + "solana-define-syscall 4.0.1", + "solana-hash 4.0.1", ] [[package]] name = "solana-last-restart-slot" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6360ac2fdc72e7463565cd256eedcf10d7ef0c28a1249d261ec168c1b55cdd" +checksum = "dcda154ec827f5fc1e4da0af3417951b7e9b8157540f81f936c4a8b1156134d0" dependencies = [ "serde", "serde_derive", @@ -1688,180 +1726,101 @@ dependencies = [ "solana-sysvar-id", ] -[[package]] -name = "solana-loader-v2-interface" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8ab08006dad78ae7cd30df8eea0539e207d08d91eaefb3e1d49a446e1c49654" -dependencies = [ - "serde", - "serde_bytes", - "serde_derive", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", -] - -[[package]] -name = "solana-loader-v3-interface" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4be76cfa9afd84ca2f35ebc09f0da0f0092935ccdac0595d98447f259538c2" -dependencies = [ - "serde", - "serde_bytes", - "serde_derive", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", - "solana-system-interface", -] - [[package]] name = "solana-loader-v3-interface" -version = "5.0.0" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f7162a05b8b0773156b443bccd674ea78bb9aa406325b467ea78c06c99a63a2" +checksum = "dee44c9b1328c5c712c68966fb8de07b47f3e7bac006e74ddd1bb053d3e46e5d" dependencies = [ "serde", "serde_bytes", "serde_derive", "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", - "solana-system-interface", -] - -[[package]] -name = "solana-loader-v4-interface" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "706a777242f1f39a83e2a96a2a6cb034cb41169c6ecbee2cf09cb873d9659e7e" -dependencies = [ - "serde", - "serde_bytes", - "serde_derive", - "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "solana-system-interface", ] [[package]] name = "solana-message" -version = "2.4.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1796aabce376ff74bf89b78d268fa5e683d7d7a96a0a4e4813ec34de49d5314b" +checksum = "85666605c9fd727f865ed381665db0a8fc29f984a030ecc1e40f43bfb2541623" dependencies = [ - "bincode", - "blake3", "lazy_static", "serde", "serde_derive", - "solana-bincode", - "solana-hash", + "solana-address 1.1.0", + "solana-hash 3.1.0", "solana-instruction", - "solana-pubkey", "solana-sanitize", "solana-sdk-ids", "solana-short-vec", - "solana-system-interface", "solana-transaction-error", - "wasm-bindgen", ] [[package]] name = "solana-msg" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36a1a14399afaabc2781a1db09cb14ee4cc4ee5c7a5a3cfcc601811379a8092" +checksum = "264275c556ea7e22b9d3f87d56305546a38d4eee8ec884f3b126236cb7dcbbb4" dependencies = [ - "solana-define-syscall", + "solana-define-syscall 3.0.0", ] [[package]] name = "solana-native-token" -version = "2.3.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61515b880c36974053dd499c0510066783f0cc6ac17def0c7ef2a244874cf4a9" +checksum = "ae8dd4c280dca9d046139eb5b7a5ac9ad10403fbd64964c7d7571214950d758f" [[package]] name = "solana-nonce" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703e22eb185537e06204a5bd9d509b948f0066f2d1d814a6f475dafb3ddf1325" +checksum = "abbdc6c8caf1c08db9f36a50967539d0f72b9f1d4aea04fec5430f532e5afadc" dependencies = [ - "serde", - "serde_derive", "solana-fee-calculator", - "solana-hash", - "solana-pubkey", + "solana-hash 3.1.0", + "solana-pubkey 3.0.0", "solana-sha256-hasher", ] [[package]] name = "solana-program" -version = "2.3.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98eca145bd3545e2fbb07166e895370576e47a00a7d824e325390d33bf467210" +checksum = "91b12305dd81045d705f427acd0435a2e46444b65367d7179d7bdcfc3bc5f5eb" dependencies = [ - "bincode", - "blake3", - "borsh 0.10.4", - "borsh 1.5.7", - "bs58", - "bytemuck", - "console_error_panic_hook", - "console_log", - "getrandom 0.2.16", - "lazy_static", - "log", "memoffset", - "num-bigint", - "num-derive 0.4.2", - "num-traits", - "rand 0.8.5", - "serde", - "serde_bytes", - "serde_derive", "solana-account-info", - "solana-address-lookup-table-interface", - "solana-atomic-u64", "solana-big-mod-exp", - "solana-bincode", "solana-blake3-hasher", "solana-borsh", "solana-clock", "solana-cpi", - "solana-decode-error", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "solana-epoch-rewards", "solana-epoch-schedule", + "solana-epoch-stake", "solana-example-mocks", - "solana-feature-gate-interface", "solana-fee-calculator", - "solana-hash", + "solana-hash 3.1.0", "solana-instruction", + "solana-instruction-error", "solana-instructions-sysvar", "solana-keccak-hasher", "solana-last-restart-slot", - "solana-loader-v2-interface", - "solana-loader-v3-interface 5.0.0", - "solana-loader-v4-interface", - "solana-message", "solana-msg", "solana-native-token", - "solana-nonce", "solana-program-entrypoint", "solana-program-error", "solana-program-memory", "solana-program-option", "solana-program-pack", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-rent", - "solana-sanitize", "solana-sdk-ids", - "solana-sdk-macro", "solana-secp256k1-recover", "solana-serde-varint", "solana-serialize-utils", @@ -1870,98 +1829,80 @@ dependencies = [ "solana-slot-hashes", "solana-slot-history", "solana-stable-layout", - "solana-stake-interface", - "solana-system-interface", "solana-sysvar", "solana-sysvar-id", - "solana-vote-interface", - "thiserror 2.0.14", - "wasm-bindgen", ] [[package]] name = "solana-program-entrypoint" -version = "2.3.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ce041b1a0ed275290a5008ee1a4a6c48f5054c8a3d78d313c08958a06aedbd" +checksum = "84c9b0a1ff494e05f503a08b3d51150b73aa639544631e510279d6375f290997" dependencies = [ "solana-account-info", - "solana-msg", + "solana-define-syscall 4.0.1", "solana-program-error", - "solana-pubkey", + "solana-pubkey 4.0.0", ] [[package]] name = "solana-program-error" -version = "2.2.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee2e0217d642e2ea4bee237f37bd61bb02aec60da3647c48ff88f6556ade775" +checksum = "a1af32c995a7b692a915bb7414d5f8e838450cf7c70414e763d8abcae7b51f28" dependencies = [ "borsh 1.5.7", - "num-traits", "serde", "serde_derive", - "solana-decode-error", - "solana-instruction", - "solana-msg", - "solana-pubkey", ] [[package]] name = "solana-program-memory" -version = "2.3.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a5426090c6f3fd6cfdc10685322fede9ca8e5af43cd6a59e98bfe4e91671712" +checksum = "4068648649653c2c50546e9a7fb761791b5ab0cda054c771bb5808d3a4b9eb52" dependencies = [ - "solana-define-syscall", + "solana-define-syscall 4.0.1", ] [[package]] name = "solana-program-option" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc677a2e9bc616eda6dbdab834d463372b92848b2bfe4a1ed4e4b4adba3397d0" +checksum = "8e7b4ddb464f274deb4a497712664c3b612e3f5f82471d4e47710fc4ab1c3095" [[package]] name = "solana-program-pack" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "319f0ef15e6e12dc37c597faccb7d62525a509fec5f6975ecb9419efddeb277b" +checksum = "c169359de21f6034a63ebf96d6b380980307df17a8d371344ff04a883ec4e9d0" dependencies = [ "solana-program-error", ] [[package]] name = "solana-pubkey" -version = "2.4.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b62adb9c3261a052ca1f999398c388f1daf558a1b492f60a6d9e64857db4ff1" +checksum = "8909d399deb0851aa524420beeb5646b115fd253ef446e35fe4504c904da3941" dependencies = [ - "borsh 0.10.4", - "borsh 1.5.7", - "bytemuck", - "bytemuck_derive", - "curve25519-dalek", - "five8", - "five8_const", - "getrandom 0.2.16", - "js-sys", - "num-traits", - "serde", - "serde_derive", - "solana-atomic-u64", - "solana-decode-error", - "solana-define-syscall", - "solana-sanitize", - "solana-sha256-hasher", - "wasm-bindgen", + "solana-address 1.1.0", +] + +[[package]] +name = "solana-pubkey" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6f7104d456b58e1418c21a8581e89810278d1190f70f27ece7fc0b2c9282a57" +dependencies = [ + "solana-address 2.0.0", ] [[package]] name = "solana-rent" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1aea8fdea9de98ca6e8c2da5827707fb3842833521b528a713810ca685d2480" +checksum = "b702d8c43711e3c8a9284a4f1bbc6a3de2553deb25b0c8142f9a44ef0ce5ddc1" dependencies = [ "serde", "serde_derive", @@ -1972,24 +1913,24 @@ dependencies = [ [[package]] name = "solana-sanitize" -version = "2.2.1" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f1bc1357b8188d9c4a3af3fc55276e56987265eb7ad073ae6f8180ee54cecf" +checksum = "dcf09694a0fc14e5ffb18f9b7b7c0f15ecb6eac5b5610bf76a1853459d19daf9" [[package]] name = "solana-sdk-ids" -version = "2.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5d8b9cc68d5c88b062a33e23a6466722467dde0035152d8fb1afbcdf350a5f" +checksum = "def234c1956ff616d46c9dd953f251fa7096ddbaa6d52b165218de97882b7280" dependencies = [ - "solana-pubkey", + "solana-address 2.0.0", ] [[package]] name = "solana-sdk-macro" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86280da8b99d03560f6ab5aca9de2e38805681df34e0bb8f238e69b29433b9df" +checksum = "d6430000e97083460b71d9fbadc52a2ab2f88f53b3a4c5e58c5ae3640a0e8c00" dependencies = [ "bs58", "proc-macro2", @@ -1999,120 +1940,114 @@ dependencies = [ [[package]] name = "solana-secp256k1-recover" -version = "2.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baa3120b6cdaa270f39444f5093a90a7b03d296d362878f7a6991d6de3bbe496" +checksum = "9de18cfdab99eeb940fbedd8c981fa130c0d76252da75d05446f22fae8b51932" dependencies = [ - "libsecp256k1", - "solana-define-syscall", - "thiserror 2.0.14", + "k256", + "solana-define-syscall 4.0.1", + "thiserror 2.0.17", ] -[[package]] -name = "solana-security-txt" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" - [[package]] name = "solana-seed-derivable" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3beb82b5adb266c6ea90e5cf3967235644848eac476c5a1f2f9283a143b7c97f" +checksum = "ff7bdb72758e3bec33ed0e2658a920f1f35dfb9ed576b951d20d63cb61ecd95c" dependencies = [ "solana-derivation-path", ] [[package]] name = "solana-seed-phrase" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36187af2324f079f65a675ec22b31c24919cb4ac22c79472e85d819db9bbbc15" +checksum = "dc905b200a95f2ea9146e43f2a7181e3aeb55de6bc12afb36462d00a3c7310de" dependencies = [ "hmac", "pbkdf2", - "sha2 0.10.9", + "sha2", ] [[package]] name = "solana-serde-varint" -version = "2.2.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a7e155eba458ecfb0107b98236088c3764a09ddf0201ec29e52a0be40857113" +checksum = "3e5174c57d5ff3c1995f274d17156964664566e2cde18a07bba1586d35a70d3b" dependencies = [ "serde", ] [[package]] name = "solana-serialize-utils" -version = "2.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "817a284b63197d2b27afdba829c5ab34231da4a9b4e763466a003c40ca4f535e" +checksum = "56e41dd8feea239516c623a02f0a81c2367f4b604d7965237fed0751aeec33ed" dependencies = [ - "solana-instruction", - "solana-pubkey", + "solana-instruction-error", + "solana-pubkey 3.0.0", "solana-sanitize", ] [[package]] name = "solana-sha256-hasher" -version = "2.3.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa3feb32c28765f6aa1ce8f3feac30936f16c5c3f7eb73d63a5b8f6f8ecdc44" +checksum = "db7dc3011ea4c0334aaaa7e7128cb390ecf546b28d412e9bf2064680f57f588f" dependencies = [ - "sha2 0.10.9", - "solana-define-syscall", - "solana-hash", + "sha2", + "solana-define-syscall 4.0.1", + "solana-hash 4.0.1", ] [[package]] name = "solana-short-vec" -version = "2.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c54c66f19b9766a56fa0057d060de8378676cb64987533fa088861858fc5a69" +checksum = "79fb1809a32cfcf7d9c47b7070a92fa17cdb620ab5829e9a8a9ff9d138a7a175" dependencies = [ - "serde", + "serde_core", ] [[package]] name = "solana-signature" -version = "2.3.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c8ec8e657aecfc187522fc67495142c12f35e55ddeca8698edbb738b8dbd8c" +checksum = "4bb8057cc0e9f7b5e89883d49de6f407df655bb6f3a71d0b7baf9986a2218fd9" dependencies = [ - "five8", + "five8 0.2.1", "solana-sanitize", ] [[package]] name = "solana-signer" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c41991508a4b02f021c1342ba00bcfa098630b213726ceadc7cb032e051975b" +checksum = "5bfea97951fee8bae0d6038f39a5efcb6230ecdfe33425ac75196d1a1e3e3235" dependencies = [ - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-signature", "solana-transaction-error", ] [[package]] name = "solana-slot-hashes" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c8691982114513763e88d04094c9caa0376b867a29577939011331134c301ce" +checksum = "80a293f952293281443c04f4d96afd9d547721923d596e92b4377ed2360f1746" dependencies = [ "serde", "serde_derive", - "solana-hash", + "solana-hash 3.1.0", "solana-sdk-ids", "solana-sysvar-id", ] [[package]] name = "solana-slot-history" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ccc1b2067ca22754d5283afb2b0126d61eae734fc616d23871b0943b0d935e" +checksum = "f914f6b108f5bba14a280b458d023e3621c9973f27f015a4d755b50e88d89e97" dependencies = [ "bv", "serde", @@ -2123,56 +2058,53 @@ dependencies = [ [[package]] name = "solana-stable-layout" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f14f7d02af8f2bc1b5efeeae71bc1c2b7f0f65cd75bcc7d8180f2c762a57f54" +checksum = "1da74507795b6e8fb60b7c7306c0c36e2c315805d16eaaf479452661234685ac" dependencies = [ "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", ] [[package]] name = "solana-stake-interface" -version = "1.2.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5269e89fde216b4d7e1d1739cf5303f8398a1ff372a81232abbee80e554a838c" +checksum = "f6f912ae679b683365348dea482dbd9468d22ff258b554fd36e3d3683c2122e3" dependencies = [ - "borsh 0.10.4", - "borsh 1.5.7", "num-traits", "serde", "serde_derive", "solana-clock", "solana-cpi", - "solana-decode-error", "solana-instruction", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-system-interface", + "solana-sysvar", "solana-sysvar-id", ] [[package]] name = "solana-system-interface" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7c18cb1a91c6be5f5a8ac9276a1d7c737e39a21beba9ea710ab4b9c63bc90" +checksum = "4e1790547bfc3061f1ee68ea9d8dc6c973c02a163697b24263a8e9f2e6d4afa2" dependencies = [ - "js-sys", "num-traits", "serde", "serde_derive", - "solana-decode-error", "solana-instruction", - "solana-pubkey", - "wasm-bindgen", + "solana-msg", + "solana-program-error", + "solana-pubkey 3.0.0", ] [[package]] name = "solana-sysvar" -version = "2.3.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8c3595f95069f3d90f275bb9bd235a1973c4d059028b0a7f81baca2703815db" +checksum = "63205e68d680bcc315337dec311b616ab32fea0a612db3b883ce4de02e0953f9" dependencies = [ "base64 0.22.1", "bincode", @@ -2183,77 +2115,50 @@ dependencies = [ "serde_derive", "solana-account-info", "solana-clock", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "solana-epoch-rewards", "solana-epoch-schedule", "solana-fee-calculator", - "solana-hash", + "solana-hash 3.1.0", "solana-instruction", - "solana-instructions-sysvar", "solana-last-restart-slot", "solana-program-entrypoint", "solana-program-error", "solana-program-memory", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-rent", - "solana-sanitize", "solana-sdk-ids", "solana-sdk-macro", "solana-slot-hashes", "solana-slot-history", - "solana-stake-interface", "solana-sysvar-id", ] [[package]] name = "solana-sysvar-id" -version = "2.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5762b273d3325b047cfda250787f8d796d781746860d5d0a746ee29f3e8812c1" +checksum = "17358d1e9a13e5b9c2264d301102126cf11a47fd394cdf3dec174fe7bc96e1de" dependencies = [ - "solana-pubkey", + "solana-address 2.0.0", "solana-sdk-ids", ] [[package]] name = "solana-transaction-error" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a9dc8fdb61c6088baab34fc3a8b8473a03a7a5fd404ed8dd502fa79b67cb1" +checksum = "4222065402340d7e6aec9dc3e54d22992ddcf923d91edcd815443c2bfca3144a" dependencies = [ - "solana-instruction", + "solana-instruction-error", "solana-sanitize", ] -[[package]] -name = "solana-vote-interface" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b80d57478d6599d30acc31cc5ae7f93ec2361a06aefe8ea79bc81739a08af4c3" -dependencies = [ - "bincode", - "num-derive 0.4.2", - "num-traits", - "serde", - "serde_derive", - "solana-clock", - "solana-decode-error", - "solana-hash", - "solana-instruction", - "solana-pubkey", - "solana-rent", - "solana-sdk-ids", - "solana-serde-varint", - "solana-serialize-utils", - "solana-short-vec", - "solana-system-interface", -] - [[package]] name = "solana-zk-sdk" -version = "2.3.7" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bb171c0f76c420a7cb6aabbe5fa85a1a009d5bb4009189c43e1a03aff9446d7" +checksum = "9602bcb1f7af15caef92b91132ec2347e1c51a72ecdbefdaefa3eac4b8711475" dependencies = [ "aes-gcm-siv", "base64 0.22.1", @@ -2261,61 +2166,56 @@ dependencies = [ "bytemuck", "bytemuck_derive", "curve25519-dalek", + "getrandom", "itertools", "js-sys", "merlin", "num-derive 0.4.2", "num-traits", - "rand 0.8.5", + "rand", "serde", "serde_derive", "serde_json", "sha3", "solana-derivation-path", "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "solana-seed-derivable", "solana-seed-phrase", "solana-signature", "solana-signer", "subtle", - "thiserror 2.0.14", + "thiserror 2.0.17", "wasm-bindgen", "zeroize", ] [[package]] -name = "spl-associated-token-account" -version = "7.0.0" +name = "spki" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae179d4a26b3c7a20c839898e6aed84cb4477adf108a366c95532f058aea041b" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ - "borsh 1.5.7", - "num-derive 0.4.2", - "num-traits", - "solana-program", - "spl-associated-token-account-client", - "spl-token", - "spl-token-2022", - "thiserror 2.0.14", + "base64ct", + "der", ] [[package]] -name = "spl-associated-token-account-client" +name = "spl-associated-token-account-interface" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f8349dbcbe575f354f9a533a21f272f3eb3808a49e2fdc1c34393b88ba76cb" +checksum = "e6433917b60441d68d99a17e121d9db0ea15a9a69c0e5afa34649cf5ba12612f" dependencies = [ "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", ] [[package]] name = "spl-discriminator" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7398da23554a31660f17718164e31d31900956054f54f52d5ec1be51cb4f4b3" +checksum = "d48cc11459e265d5b501534144266620289720b4c44522a47bc6b63cd295d2f3" dependencies = [ "bytemuck", "solana-program-error", @@ -2342,150 +2242,35 @@ checksum = "5d1dbc82ab91422345b6df40a79e2b78c7bce1ebb366da323572dd60b7076b67" dependencies = [ "proc-macro2", "quote", - "sha2 0.10.9", + "sha2", "syn 2.0.105", "thiserror 1.0.69", ] -[[package]] -name = "spl-elgamal-registry" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65edfeed09cd4231e595616aa96022214f9c9d2be02dea62c2b30d5695a6833a" -dependencies = [ - "bytemuck", - "solana-account-info", - "solana-cpi", - "solana-instruction", - "solana-msg", - "solana-program-entrypoint", - "solana-program-error", - "solana-pubkey", - "solana-rent", - "solana-sdk-ids", - "solana-system-interface", - "solana-sysvar", - "solana-zk-sdk", - "spl-pod", - "spl-token-confidential-transfer-proof-extraction", -] - -[[package]] -name = "spl-memo" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f09647c0974e33366efeb83b8e2daebb329f0420149e74d3a4bd2c08cf9f7cb" -dependencies = [ - "solana-account-info", - "solana-instruction", - "solana-msg", - "solana-program-entrypoint", - "solana-program-error", - "solana-pubkey", -] - [[package]] name = "spl-pod" -version = "0.5.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d994afaf86b779104b4a95ba9ca75b8ced3fdb17ee934e38cb69e72afbe17799" +checksum = "b1233fdecd7461611d69bb87bc2e95af742df47291975d21232a0be8217da9de" dependencies = [ "borsh 1.5.7", "bytemuck", "bytemuck_derive", "num-derive 0.4.2", "num-traits", - "solana-decode-error", - "solana-msg", - "solana-program-error", - "solana-program-option", - "solana-pubkey", - "solana-zk-sdk", - "thiserror 2.0.14", -] - -[[package]] -name = "spl-program-error" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdebc8b42553070b75aa5106f071fef2eb798c64a7ec63375da4b1f058688c6" -dependencies = [ - "num-derive 0.4.2", - "num-traits", - "solana-decode-error", - "solana-msg", - "solana-program-error", - "spl-program-error-derive", - "thiserror 2.0.14", -] - -[[package]] -name = "spl-program-error-derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2539e259c66910d78593475540e8072f0b10f0f61d7607bbf7593899ed52d0" -dependencies = [ - "proc-macro2", - "quote", - "sha2 0.10.9", - "syn 2.0.105", -] - -[[package]] -name = "spl-tlv-account-resolution" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1408e961215688715d5a1063cbdcf982de225c45f99c82b4f7d7e1dd22b998d7" -dependencies = [ - "bytemuck", - "num-derive 0.4.2", - "num-traits", - "solana-account-info", - "solana-decode-error", - "solana-instruction", - "solana-msg", - "solana-program-error", - "solana-pubkey", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-type-length-value", - "thiserror 2.0.14", -] - -[[package]] -name = "spl-token" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053067c6a82c705004f91dae058b11b4780407e9ccd6799dc9e7d0fab5f242da" -dependencies = [ - "arrayref", - "bytemuck", - "num-derive 0.4.2", - "num-traits", "num_enum", - "solana-account-info", - "solana-cpi", - "solana-decode-error", - "solana-instruction", - "solana-msg", - "solana-program-entrypoint", "solana-program-error", - "solana-program-memory", "solana-program-option", - "solana-program-pack", - "solana-pubkey", - "solana-rent", - "solana-sdk-ids", - "solana-sysvar", - "thiserror 2.0.14", + "solana-pubkey 3.0.0", + "solana-zk-sdk", + "thiserror 2.0.17", ] [[package]] -name = "spl-token-2022" -version = "8.0.1" +name = "spl-token-2022-interface" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f0dfbb079eebaee55e793e92ca5f433744f4b71ee04880bfd6beefba5973e5" +checksum = "2fcd81188211f4b3c8a5eba7fd534c7142f9dd026123b3472492782cc72f4dc6" dependencies = [ "arrayref", "bytemuck", @@ -2493,55 +2278,27 @@ dependencies = [ "num-traits", "num_enum", "solana-account-info", - "solana-clock", - "solana-cpi", - "solana-decode-error", "solana-instruction", - "solana-msg", - "solana-native-token", - "solana-program-entrypoint", "solana-program-error", - "solana-program-memory", "solana-program-option", "solana-program-pack", - "solana-pubkey", - "solana-rent", + "solana-pubkey 3.0.0", "solana-sdk-ids", - "solana-security-txt", - "solana-system-interface", - "solana-sysvar", "solana-zk-sdk", - "spl-elgamal-registry", - "spl-memo", "spl-pod", - "spl-token", - "spl-token-confidential-transfer-ciphertext-arithmetic", "spl-token-confidential-transfer-proof-extraction", "spl-token-confidential-transfer-proof-generation", "spl-token-group-interface", "spl-token-metadata-interface", - "spl-transfer-hook-interface", "spl-type-length-value", - "thiserror 2.0.14", -] - -[[package]] -name = "spl-token-confidential-transfer-ciphertext-arithmetic" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cddd52bfc0f1c677b41493dafa3f2dbbb4b47cf0990f08905429e19dc8289b35" -dependencies = [ - "base64 0.22.1", - "bytemuck", - "solana-curve25519", - "solana-zk-sdk", + "thiserror 2.0.17", ] [[package]] name = "spl-token-confidential-transfer-proof-extraction" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe2629860ff04c17bafa9ba4bed8850a404ecac81074113e1f840dbd0ebb7bd6" +checksum = "879a9ebad0d77383d3ea71e7de50503554961ff0f4ef6cbca39ad126e6f6da3a" dependencies = [ "bytemuck", "solana-account-info", @@ -2550,105 +2307,97 @@ dependencies = [ "solana-instructions-sysvar", "solana-msg", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "solana-zk-sdk", "spl-pod", - "thiserror 2.0.14", + "thiserror 2.0.17", ] [[package]] name = "spl-token-confidential-transfer-proof-generation" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa27b9174bea869a7ebf31e0be6890bce90b1a4288bc2bbf24bd413f80ae3fde" +checksum = "a0cd59fce3dc00f563c6fa364d67c3f200d278eae681f4dc250240afcfe044b1" dependencies = [ "curve25519-dalek", "solana-zk-sdk", - "thiserror 2.0.14", + "thiserror 2.0.17", ] [[package]] name = "spl-token-group-interface" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5597b4cd76f85ce7cd206045b7dc22da8c25516573d42d267c8d1fd128db5129" +checksum = "452d0f758af20caaa10d9a6f7608232e000d4c74462f248540b3d2ddfa419776" dependencies = [ "bytemuck", "num-derive 0.4.2", "num-traits", - "solana-decode-error", + "num_enum", "solana-instruction", - "solana-msg", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "spl-discriminator", "spl-pod", - "thiserror 2.0.14", + "thiserror 2.0.17", ] [[package]] -name = "spl-token-metadata-interface" -version = "0.7.0" +name = "spl-token-interface" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "304d6e06f0de0c13a621464b1fd5d4b1bebf60d15ca71a44d3839958e0da16ee" +checksum = "8c564ac05a7c8d8b12e988a37d82695b5ba4db376d07ea98bc4882c81f96c7f3" dependencies = [ - "borsh 1.5.7", + "arrayref", + "bytemuck", "num-derive 0.4.2", "num-traits", - "solana-borsh", - "solana-decode-error", + "num_enum", "solana-instruction", - "solana-msg", "solana-program-error", - "solana-pubkey", - "spl-discriminator", - "spl-pod", - "spl-type-length-value", - "thiserror 2.0.14", + "solana-program-option", + "solana-program-pack", + "solana-pubkey 3.0.0", + "solana-sdk-ids", + "thiserror 2.0.17", ] [[package]] -name = "spl-transfer-hook-interface" -version = "0.10.0" +name = "spl-token-metadata-interface" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e905b849b6aba63bde8c4badac944ebb6c8e6e14817029cbe1bc16829133bd" +checksum = "9c467c7c3bd056f8fe60119e7ec34ddd6f23052c2fa8f1f51999098063b72676" dependencies = [ - "arrayref", - "bytemuck", + "borsh 1.5.7", "num-derive 0.4.2", "num-traits", - "solana-account-info", - "solana-cpi", - "solana-decode-error", + "solana-borsh", "solana-instruction", - "solana-msg", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "spl-discriminator", "spl-pod", - "spl-program-error", - "spl-tlv-account-resolution", "spl-type-length-value", - "thiserror 2.0.14", + "thiserror 2.0.17", ] [[package]] name = "spl-type-length-value" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d417eb548214fa822d93f84444024b4e57c13ed6719d4dcc68eec24fb481e9f5" +checksum = "ca20a1a19f4507a98ca4b28ff5ed54cac9b9d34ed27863e2bde50a3238f9a6ac" dependencies = [ "bytemuck", "num-derive 0.4.2", "num-traits", + "num_enum", "solana-account-info", - "solana-decode-error", "solana-msg", "solana-program-error", "spl-discriminator", "spl-pod", - "thiserror 2.0.14", + "thiserror 2.0.17", ] [[package]] @@ -2690,11 +2439,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.14" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0949c3a6c842cbde3f1686d6eea5a010516deb7085f79db747562d4102f41e" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ - "thiserror-impl 2.0.14", + "thiserror-impl 2.0.17", ] [[package]] @@ -2710,9 +2459,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.14" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc5b44b4ab9c2fdd0e0512e6bece8388e214c0749f5862b114cc5b7a25daf227" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", @@ -2828,12 +2577,6 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.1+wasi-snapshot-preview1" @@ -2898,16 +2641,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "web-sys" -version = "0.3.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - [[package]] name = "windows-targets" version = "0.52.6" diff --git a/tests/auction-house/programs/auction-house/Cargo.toml b/tests/auction-house/programs/auction-house/Cargo.toml index c6b9cf11cd..2be17f0584 100644 --- a/tests/auction-house/programs/auction-house/Cargo.toml +++ b/tests/auction-house/programs/auction-house/Cargo.toml @@ -19,6 +19,7 @@ idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] anchor-lang = { path = "../../../../lang" } anchor-spl = { path = "../../../../spl", features = ["metadata"] } +solana-sysvar = "3" thiserror = "1.0" arrayref = "0.3.6" # FIXME: We transitively depend on base64ct, which switched to edition 2024 in 1.8.0 diff --git a/tests/auction-house/programs/auction-house/src/utils.rs b/tests/auction-house/programs/auction-house/src/utils.rs index 497f6415cb..8006a775bf 100644 --- a/tests/auction-house/programs/auction-house/src/utils.rs +++ b/tests/auction-house/programs/auction-house/src/utils.rs @@ -11,7 +11,7 @@ use { }, anchor_spl::{ associated_token::spl_associated_token_account::{ - create_associated_token_account, get_associated_token_address, + address::get_associated_token_address, instruction::create_associated_token_account, }, metadata::mpl_token_metadata, token::{ @@ -20,6 +20,7 @@ use { }, }, arrayref::array_ref, + solana_sysvar::SysvarSerialize, std::{convert::TryInto, slice::Iter}, }; pub fn assert_is_ata(ata: &AccountInfo, wallet: &Pubkey, mint: &Pubkey) -> Result { @@ -50,7 +51,7 @@ pub fn make_ata<'a>( } invoke_signed( - &create_associated_token_account(&fee_payer.key, &wallet.key, &mint.key), + &create_associated_token_account(&fee_payer.key, &wallet.key, &mint.key, &spl_token::ID), &[ ata, wallet, diff --git a/tests/bench/bench.json b/tests/bench/bench.json index c1cdd9ae23..194b3d51c2 100644 --- a/tests/bench/bench.json +++ b/tests/bench/bench.json @@ -1680,93 +1680,93 @@ "bench": 966096 }, "computeUnits": { - "accountInfo1": 685, - "accountInfo2": 1053, - "accountInfo4": 1750, - "accountInfo8": 3135, - "accountEmptyInit1": 4915, - "accountEmpty1": 774, - "accountEmptyInit2": 8793, - "accountEmpty2": 1174, - "accountEmptyInit4": 16495, - "accountEmpty4": 1962, - "accountEmptyInit8": 31997, - "accountEmpty8": 3548, - "accountSizedInit1": 5019, - "accountSized1": 813, - "accountSizedInit2": 8981, - "accountSized2": 1222, - "accountSizedInit4": 16850, - "accountSized4": 2046, - "accountSizedInit8": 32653, - "accountSized8": 3690, - "accountUnsizedInit1": 5127, - "accountUnsized1": 853, - "accountUnsizedInit2": 9131, - "accountUnsized2": 1284, - "accountUnsizedInit4": 17198, - "accountUnsized4": 2147, - "accountUnsizedInit8": 33324, - "accountUnsized8": 3867, - "boxedAccountEmptyInit1": 5007, - "boxedAccountEmpty1": 864, - "boxedAccountEmptyInit2": 8906, - "boxedAccountEmpty2": 1286, - "boxedAccountEmptyInit4": 16648, - "boxedAccountEmpty4": 2115, - "boxedAccountEmptyInit8": 32231, - "boxedAccountEmpty8": 3801, - "boxedAccountSizedInit1": 5103, - "boxedAccountSized1": 912, - "boxedAccountSizedInit2": 9075, - "boxedAccountSized2": 1337, - "boxedAccountSizedInit4": 16960, - "boxedAccountSized4": 2195, - "boxedAccountSizedInit8": 32831, - "boxedAccountSized8": 3935, - "boxedAccountUnsizedInit1": 5202, - "boxedAccountUnsized1": 943, - "boxedAccountUnsizedInit2": 9251, - "boxedAccountUnsized2": 1392, - "boxedAccountUnsizedInit4": 17284, - "boxedAccountUnsized4": 2283, - "boxedAccountUnsizedInit8": 33455, - "boxedAccountUnsized8": 4089, - "boxedInterfaceAccountMint1": 1110, - "boxedInterfaceAccountMint2": 1534, - "boxedInterfaceAccountMint4": 2370, - "boxedInterfaceAccountMint8": 4064, - "boxedInterfaceAccountToken1": 1246, - "boxedInterfaceAccountToken2": 1794, + "accountInfo1": 719, + "accountInfo2": 1124, + "accountInfo4": 1895, + "accountInfo8": 3428, + "accountEmptyInit1": 4996, + "accountEmpty1": 803, + "accountEmptyInit2": 8919, + "accountEmpty2": 1235, + "accountEmptyInit4": 16759, + "accountEmpty4": 2087, + "accountEmptyInit8": 32446, + "accountEmpty8": 3801, + "accountSizedInit1": 5097, + "accountSized1": 842, + "accountSizedInit2": 9098, + "accountSized2": 1283, + "accountSizedInit4": 17102, + "accountSized4": 2171, + "accountSizedInit8": 33078, + "accountSized8": 3943, + "accountUnsizedInit1": 5199, + "accountUnsized1": 882, + "accountUnsizedInit2": 9285, + "accountUnsized2": 1345, + "accountUnsizedInit4": 17426, + "accountUnsized4": 2272, + "accountUnsizedInit8": 33700, + "accountUnsized8": 4120, + "boxedAccountEmptyInit1": 5088, + "boxedAccountEmpty1": 893, + "boxedAccountEmptyInit2": 9032, + "boxedAccountEmpty2": 1347, + "boxedAccountEmptyInit4": 16912, + "boxedAccountEmpty4": 2240, + "boxedAccountEmptyInit8": 32679, + "boxedAccountEmpty8": 4054, + "boxedAccountSizedInit1": 5181, + "boxedAccountSized1": 932, + "boxedAccountSizedInit2": 9194, + "boxedAccountSized2": 1398, + "boxedAccountSizedInit4": 17212, + "boxedAccountSized4": 2320, + "boxedAccountSizedInit8": 33255, + "boxedAccountSized8": 4188, + "boxedAccountUnsizedInit1": 5274, + "boxedAccountUnsized1": 972, + "boxedAccountUnsizedInit2": 9356, + "boxedAccountUnsized2": 1453, + "boxedAccountUnsizedInit4": 17512, + "boxedAccountUnsized4": 2408, + "boxedAccountUnsizedInit8": 33831, + "boxedAccountUnsized8": 4342, + "boxedInterfaceAccountMint1": 1153, + "boxedInterfaceAccountMint2": 1584, + "boxedInterfaceAccountMint4": 2434, + "boxedInterfaceAccountMint8": 4156, + "boxedInterfaceAccountToken1": 1278, + "boxedInterfaceAccountToken2": 1822, "boxedInterfaceAccountToken4": 2878, "boxedInterfaceAccountToken8": 5068, - "interfaceAccountMint1": 1126, - "interfaceAccountMint2": 1562, - "interfaceAccountMint4": 2432, - "interfaceAccountMint8": 4163, - "interfaceAccountToken1": 1268, - "interfaceAccountToken2": 1849, + "interfaceAccountMint1": 1169, + "interfaceAccountMint2": 1612, + "interfaceAccountMint4": 2496, + "interfaceAccountMint8": 4255, + "interfaceAccountToken1": 1300, + "interfaceAccountToken2": 1877, "interfaceAccountToken4": 2997, - "interface1": 878, - "interface2": 1023, - "interface4": 1301, - "interface8": 1867, - "program1": 890, - "program2": 1051, - "program4": 1345, - "program8": 1943, - "signer1": 874, - "signer2": 1173, - "signer4": 1759, - "signer8": 2941, - "systemAccount1": 911, - "systemAccount2": 1235, - "systemAccount4": 1871, - "systemAccount8": 3153, - "uncheckedAccount1": 882, - "uncheckedAccount2": 1162, - "uncheckedAccount4": 1716, - "uncheckedAccount8": 2833 + "interface1": 912, + "interface2": 1055, + "interface4": 1329, + "interface8": 1887, + "program1": 932, + "program2": 1083, + "program4": 1373, + "program8": 1963, + "signer1": 908, + "signer2": 1244, + "signer4": 1904, + "signer8": 3234, + "systemAccount1": 945, + "systemAccount2": 1306, + "systemAccount4": 2016, + "systemAccount8": 3446, + "uncheckedAccount1": 916, + "uncheckedAccount2": 1233, + "uncheckedAccount4": 1861, + "uncheckedAccount8": 3126 }, "stackMemory": { "account_info1": 46, diff --git a/tests/signature-verification/programs/signature-verification-test/Cargo.toml b/tests/signature-verification/programs/signature-verification-test/Cargo.toml index 68bf649926..347be4e12e 100644 --- a/tests/signature-verification/programs/signature-verification-test/Cargo.toml +++ b/tests/signature-verification/programs/signature-verification-test/Cargo.toml @@ -15,3 +15,4 @@ idl-build = ["anchor-lang/idl-build"] [dependencies] anchor-lang = { path = "../../../../lang" } +solana-sdk-ids = "3" diff --git a/tests/signature-verification/programs/signature-verification-test/src/lib.rs b/tests/signature-verification/programs/signature-verification-test/src/lib.rs index 51265b9172..22da669aad 100644 --- a/tests/signature-verification/programs/signature-verification-test/src/lib.rs +++ b/tests/signature-verification/programs/signature-verification-test/src/lib.rs @@ -56,13 +56,13 @@ pub struct VerifyEd25519Signature<'info> { /// CHECK: Signer account pub signer: AccountInfo<'info>, /// CHECK: Instructions sysvar account - #[account(address = anchor_lang::solana_program::sysvar::instructions::ID)] + #[account(address = solana_sdk_ids::sysvar::instructions::ID)] pub ix_sysvar: AccountInfo<'info>, } #[derive(Accounts)] pub struct VerifySecp256k1Signature<'info> { /// CHECK: Instructions sysvar account - #[account(address = anchor_lang::solana_program::sysvar::instructions::ID)] + #[account(address = solana_sdk_ids::sysvar::instructions::ID)] pub ix_sysvar: AccountInfo<'info>, } diff --git a/tests/spl/metadata/Cargo.lock b/tests/spl/metadata/Cargo.lock index c792c2211a..7b88441d6a 100644 --- a/tests/spl/metadata/Cargo.lock +++ b/tests/spl/metadata/Cargo.lock @@ -173,20 +173,21 @@ dependencies = [ "solana-account-info", "solana-clock", "solana-cpi", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "solana-feature-gate-interface", "solana-instruction", "solana-instructions-sysvar", "solana-invoke", - "solana-loader-v3-interface 3.0.0", + "solana-loader-v3-interface", "solana-msg", "solana-program-entrypoint", "solana-program-error", "solana-program-memory", "solana-program-option", "solana-program-pack", - "solana-pubkey", + "solana-pubkey 4.0.0", "solana-sdk-ids", + "solana-stake-interface", "solana-system-interface", "solana-sysvar", "solana-sysvar-id", @@ -203,7 +204,7 @@ dependencies = [ "regex", "serde", "serde_json", - "sha2 0.10.9", + "sha2", ] [[package]] @@ -219,12 +220,14 @@ name = "anchor-spl" version = "0.32.1" dependencies = [ "anchor-lang", + "base64ct", "mpl-token-metadata", - "spl-associated-token-account", + "solana-sysvar", + "spl-associated-token-account-interface", "spl-pod", - "spl-token", - "spl-token-2022", + "spl-token-2022-interface", "spl-token-group-interface", + "spl-token-interface", "spl-token-metadata-interface", ] @@ -240,7 +243,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.10.9", + "sha2", "syn 1.0.109", "thiserror 1.0.69", ] @@ -270,10 +273,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] -name = "base64" -version = "0.12.3" +name = "base16ct" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" @@ -287,6 +290,12 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64ct" +version = "1.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3" + [[package]] name = "bincode" version = "1.3.3" @@ -313,16 +322,6 @@ dependencies = [ "cc", "cfg-if", "constant_time_eq", - "digest 0.10.7", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", ] [[package]] @@ -429,18 +428,18 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.23.2" +version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677" +checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.10.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f154e572231cb6ba2bd1176980827e3d5dc04cc183a75dea38109fbdd672d29" +checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", @@ -494,26 +493,6 @@ dependencies = [ "inout", ] -[[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] - -[[package]] -name = "console_log" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89f72f65e8501878b8a004d5a1afb780987e2ce2b4532c562e367a72c57499f" -dependencies = [ - "log", - "web-sys", -] - [[package]] name = "const-crypto" version = "0.3.0" @@ -524,6 +503,12 @@ dependencies = [ "sha2-const-stable", ] +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "constant_time_eq" version = "0.3.1" @@ -540,10 +525,16 @@ dependencies = [ ] [[package]] -name = "crunchy" -version = "0.2.4" +name = "crypto-bigint" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] [[package]] name = "crypto-common" @@ -552,7 +543,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "typenum", ] @@ -574,9 +565,9 @@ dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", - "digest 0.10.7", + "digest", "fiat-crypto", - "rand_core 0.6.4", + "rand_core", "rustc_version", "serde", "subtle", @@ -594,6 +585,16 @@ dependencies = [ "syn 2.0.105", ] +[[package]] +name = "der" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" +dependencies = [ + "const-oid", + "zeroize", +] + [[package]] name = "derivation-path" version = "0.2.0" @@ -602,22 +603,28 @@ checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0" [[package]] name = "digest" -version = "0.9.0" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "generic-array", + "block-buffer", + "const-oid", + "crypto-common", + "subtle", ] [[package]] -name = "digest" -version = "0.10.7" +name = "ecdsa" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ - "block-buffer 0.10.4", - "crypto-common", - "subtle", + "der", + "digest", + "elliptic-curve", + "rfc6979", + "signature", + "spki", ] [[package]] @@ -626,6 +633,25 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + [[package]] name = "equivalent" version = "1.0.2" @@ -638,6 +664,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" +[[package]] +name = "ff" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" +dependencies = [ + "rand_core", + "subtle", +] + [[package]] name = "fiat-crypto" version = "0.2.9" @@ -653,11 +689,20 @@ dependencies = [ "five8_core", ] +[[package]] +name = "five8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23f76610e969fa1784327ded240f1e28a3fd9520c9cec93b636fcf62dd37f772" +dependencies = [ + "five8_core", +] + [[package]] name = "five8_const" -version = "0.1.4" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26dec3da8bc3ef08f2c04f61eab298c3ab334523e55f076354d6d6f613799a7b" +checksum = "1a0f1728185f277989ca573a402716ae0beaaea3f76a8ff87ef9dd8fb19436c5" dependencies = [ "five8_core", ] @@ -682,30 +727,31 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", + "js-sys", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", + "wasi", + "wasm-bindgen", ] [[package]] -name = "getrandom" -version = "0.2.16" +name = "group" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.11.1+wasi-snapshot-preview1", - "wasm-bindgen", + "ff", + "rand_core", + "subtle", ] [[package]] @@ -738,7 +784,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -785,6 +831,29 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "k256" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" +dependencies = [ + "cfg-if", + "ecdsa", + "elliptic-curve", + "once_cell", + "sha2", + "signature", +] + +[[package]] +name = "kaigan" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f25ded719a2354f6b1a51d0c0741c25bc7afe038617664eb37f6418439eb084" +dependencies = [ + "borsh 0.10.4", +] + [[package]] name = "keccak" version = "0.1.5" @@ -812,52 +881,6 @@ version = "0.2.175" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" -[[package]] -name = "libsecp256k1" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d220bc1feda2ac231cb78c3d26f27676b8cf82c96971f7aeef3d0cf2797c73" -dependencies = [ - "arrayref", - "base64 0.12.3", - "digest 0.9.0", - "libsecp256k1-core", - "libsecp256k1-gen-ecmult", - "libsecp256k1-gen-genmult", - "rand 0.7.3", - "serde", - "sha2 0.9.9", -] - -[[package]] -name = "libsecp256k1-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80" -dependencies = [ - "crunchy", - "digest 0.9.0", - "subtle", -] - -[[package]] -name = "libsecp256k1-gen-ecmult" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccab96b584d38fac86a83f07e659f0deafd0253dc096dab5a36d53efe653c5c3" -dependencies = [ - "libsecp256k1-core", -] - -[[package]] -name = "libsecp256k1-gen-genmult" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67abfe149395e3aa1c48a2beb32b068e2334402df8181f818d3aee2b304c4f5d" -dependencies = [ - "libsecp256k1-core", -] - [[package]] name = "lock_api" version = "0.4.13" @@ -897,7 +920,7 @@ checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" dependencies = [ "byteorder", "keccak", - "rand_core 0.6.4", + "rand_core", "zeroize", ] @@ -911,14 +934,16 @@ dependencies = [ [[package]] name = "mpl-token-metadata" -version = "5.1.0" +version = "5.1.2-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989e6a3000e761d3b2d685662a3a9ee99826f9369fb033bd1bc7011b1cf02ed9" +checksum = "301a652c73320ef9778645a831a99b00e3222307c0426d32c5c91ea50705bde0" dependencies = [ - "borsh 0.10.4", + "borsh 1.5.7", + "kaigan", "num-derive 0.3.3", "num-traits", "solana-program", + "solana-program-error", "thiserror 1.0.69", ] @@ -974,9 +999,9 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a" +checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c" dependencies = [ "num_enum_derive", "rustversion", @@ -984,9 +1009,9 @@ dependencies = [ [[package]] name = "num_enum_derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" +checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" dependencies = [ "proc-macro-crate 3.3.0", "proc-macro2", @@ -1035,7 +1060,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -1044,6 +1069,16 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + [[package]] name = "polyval" version = "0.6.2" @@ -1110,19 +1145,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -1130,18 +1152,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -1151,16 +1163,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -1169,16 +1172,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.16", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -1219,6 +1213,16 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + [[package]] name = "rustc_version" version = "0.4.1" @@ -1246,6 +1250,20 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + [[package]] name = "semver" version = "1.0.26" @@ -1254,10 +1272,11 @@ checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] @@ -1270,11 +1289,20 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1302,19 +1330,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "sha2" version = "0.10.9" @@ -1323,7 +1338,7 @@ checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -1338,7 +1353,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest 0.10.7", + "digest", "keccak", ] @@ -1348,6 +1363,16 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + [[package]] name = "smallvec" version = "1.15.1" @@ -1355,106 +1380,105 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] -name = "solana-account" -version = "2.2.1" +name = "solana-account-info" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f949fe4edaeaea78c844023bfc1c898e0b1f5a100f8a8d2d0f85d0a7b090258" +checksum = "fc3397241392f5756925029acaa8515dc70fcbe3d8059d4885d7d6533baf64fd" dependencies = [ - "solana-account-info", - "solana-clock", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", + "bincode", + "serde_core", + "solana-address 2.0.0", + "solana-program-error", + "solana-program-memory", ] [[package]] -name = "solana-account-info" -version = "2.3.0" +name = "solana-address" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8f5152a288ef1912300fc6efa6c2d1f9bb55d9398eb6c72326360b8063987da" +checksum = "a2ecac8e1b7f74c2baa9e774c42817e3e75b20787134b76cc4d45e8a604488f5" dependencies = [ - "bincode", - "serde", - "solana-program-error", - "solana-program-memory", - "solana-pubkey", + "solana-address 2.0.0", ] [[package]] -name = "solana-address-lookup-table-interface" -version = "2.2.2" +name = "solana-address" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1673f67efe870b64a65cb39e6194be5b26527691ce5922909939961a6e6b395" +checksum = "e37320fd2945c5d654b2c6210624a52d66c3f1f73b653ed211ab91a703b35bdd" dependencies = [ - "bincode", + "borsh 1.5.7", "bytemuck", + "bytemuck_derive", + "curve25519-dalek", + "five8 1.0.0", + "five8_const", "serde", "serde_derive", + "solana-atomic-u64", + "solana-define-syscall 4.0.1", + "solana-program-error", + "solana-sanitize", + "solana-sha256-hasher", +] + +[[package]] +name = "solana-address-lookup-table-interface" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2f56cac5e70517a2f27d05e5100b20de7182473ffd0035b23ea273307905987" +dependencies = [ "solana-clock", - "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "solana-slot-hashes", ] [[package]] name = "solana-atomic-u64" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52e52720efe60465b052b9e7445a01c17550666beec855cce66f44766697bc2" +checksum = "a933ff1e50aff72d02173cfcd7511bd8540b027ee720b75f353f594f834216d0" dependencies = [ "parking_lot", ] [[package]] name = "solana-big-mod-exp" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75db7f2bbac3e62cfd139065d15bcda9e2428883ba61fc8d27ccb251081e7567" +checksum = "30c80fb6d791b3925d5ec4bf23a7c169ef5090c013059ec3ed7d0b2c04efa085" dependencies = [ "num-bigint", "num-traits", - "solana-define-syscall", -] - -[[package]] -name = "solana-bincode" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a3787b8cf9c9fe3dd360800e8b70982b9e5a8af9e11c354b6665dd4a003adc" -dependencies = [ - "bincode", - "serde", - "solana-instruction", + "solana-define-syscall 3.0.0", ] [[package]] name = "solana-blake3-hasher" -version = "2.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0801e25a1b31a14494fc80882a036be0ffd290efc4c2d640bfcca120a4672" +checksum = "7116e1d942a2432ca3f514625104757ab8a56233787e95144c93950029e31176" dependencies = [ "blake3", - "solana-define-syscall", - "solana-hash", - "solana-sanitize", + "solana-define-syscall 4.0.1", + "solana-hash 4.0.1", ] [[package]] name = "solana-borsh" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718333bcd0a1a7aed6655aa66bef8d7fb047944922b2d3a18f49cbc13e73d004" +checksum = "dc402b16657abbfa9991cd5cbfac5a11d809f7e7d28d3bb291baeb088b39060e" dependencies = [ - "borsh 0.10.4", "borsh 1.5.7", ] [[package]] name = "solana-clock" -version = "2.2.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb482ab70fced82ad3d7d3d87be33d466a3498eb8aa856434ff3c0dfc2e2e31" +checksum = "fb62e9381182459a4520b5fe7fb22d423cae736239a6427fc398a88743d0ed59" dependencies = [ "serde", "serde_derive", @@ -1465,52 +1489,49 @@ dependencies = [ [[package]] name = "solana-cpi" -version = "2.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dc71126edddc2ba014622fc32d0f5e2e78ec6c5a1e0eb511b85618c09e9ea11" +checksum = "4dea26709d867aada85d0d3617db0944215c8bb28d3745b912de7db13a23280c" dependencies = [ "solana-account-info", - "solana-define-syscall", + "solana-define-syscall 4.0.1", "solana-instruction", "solana-program-error", - "solana-pubkey", + "solana-pubkey 4.0.0", "solana-stable-layout", ] [[package]] name = "solana-curve25519" -version = "2.3.7" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b162f50499b391b785d57b2f2c73e3b9754d88fd4894bef444960b00bda8dcca" +checksum = "134f67bd3031223df4aba035c503e4d14acacfc4cf19af10d10ec9c2605bb84f" dependencies = [ "bytemuck", "bytemuck_derive", "curve25519-dalek", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "subtle", - "thiserror 2.0.14", + "thiserror 2.0.17", ] [[package]] -name = "solana-decode-error" -version = "2.3.0" +name = "solana-define-syscall" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c781686a18db2f942e70913f7ca15dc120ec38dcab42ff7557db2c70c625a35" -dependencies = [ - "num-traits", -] +checksum = "f9697086a4e102d28a156b8d6b521730335d6951bd39a5e766512bbe09007cee" [[package]] name = "solana-define-syscall" -version = "2.3.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae3e2abcf541c8122eafe9a625d4d194b4023c20adde1e251f94e056bb1aee2" +checksum = "57e5b1c0bc1d4a4d10c88a4100499d954c09d3fecfae4912c1a074dff68b1738" [[package]] name = "solana-derivation-path" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "939756d798b25c5ec3cca10e06212bdca3b1443cb9bb740a38124f58b258737b" +checksum = "ff71743072690fdbdfcdc37700ae1cb77485aaad49019473a81aee099b1e0b8c" dependencies = [ "derivation-path", "qstring", @@ -1519,13 +1540,13 @@ dependencies = [ [[package]] name = "solana-epoch-rewards" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b575d3dd323b9ea10bb6fe89bf6bf93e249b215ba8ed7f68f1a3633f384db7" +checksum = "b319a4ed70390af911090c020571f0ff1f4ec432522d05ab89f5c08080381995" dependencies = [ "serde", "serde_derive", - "solana-hash", + "solana-hash 3.1.0", "solana-sdk-ids", "solana-sdk-macro", "solana-sysvar-id", @@ -1533,9 +1554,9 @@ dependencies = [ [[package]] name = "solana-epoch-schedule" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fce071fbddecc55d727b1d7ed16a629afe4f6e4c217bc8d00af3b785f6f67ed" +checksum = "6e5481e72cc4d52c169db73e4c0cd16de8bc943078aac587ec4817a75cc6388f" dependencies = [ "serde", "serde_derive", @@ -1544,51 +1565,53 @@ dependencies = [ "solana-sysvar-id", ] +[[package]] +name = "solana-epoch-stake" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc6693d0ea833b880514b9b88d95afb80b42762dca98b0712465d1fcbbcb89e" +dependencies = [ + "solana-define-syscall 3.0.0", + "solana-pubkey 3.0.0", +] + [[package]] name = "solana-example-mocks" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84461d56cbb8bb8d539347151e0525b53910102e4bced875d49d5139708e39d3" +checksum = "978855d164845c1b0235d4b4d101cadc55373fffaf0b5b6cfa2194d25b2ed658" dependencies = [ "serde", "serde_derive", "solana-address-lookup-table-interface", "solana-clock", - "solana-hash", + "solana-hash 3.1.0", "solana-instruction", "solana-keccak-hasher", "solana-message", "solana-nonce", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "solana-system-interface", - "thiserror 2.0.14", + "thiserror 2.0.17", ] [[package]] name = "solana-feature-gate-interface" -version = "2.2.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f5c5382b449e8e4e3016fb05e418c53d57782d8b5c30aa372fc265654b956d" +checksum = "7347ab62e6d47a82e340c865133795b394feea7c2b2771d293f57691c6544c3f" dependencies = [ - "bincode", - "serde", - "serde_derive", - "solana-account", - "solana-account-info", - "solana-instruction", "solana-program-error", - "solana-pubkey", - "solana-rent", + "solana-pubkey 3.0.0", "solana-sdk-ids", - "solana-system-interface", ] [[package]] name = "solana-fee-calculator" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89bc408da0fb3812bc3008189d148b4d3e08252c79ad810b245482a3f70cd8d" +checksum = "2a73cc03ca4bed871ca174558108835f8323e85917bb38b9c81c7af2ab853efe" dependencies = [ "log", "serde", @@ -1597,51 +1620,66 @@ dependencies = [ [[package]] name = "solana-hash" -version = "2.3.0" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "337c246447142f660f778cf6cb582beba8e28deb05b3b24bfb9ffd7c562e5f41" +dependencies = [ + "solana-hash 4.0.1", +] + +[[package]] +name = "solana-hash" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b96e9f0300fa287b545613f007dfe20043d7812bee255f418c1eb649c93b63" +checksum = "6a5d48a6ee7b91fc7b998944ab026ed7b3e2fc8ee3bc58452644a86c2648152f" dependencies = [ "borsh 1.5.7", "bytemuck", "bytemuck_derive", - "five8", - "js-sys", + "five8 1.0.0", "serde", "serde_derive", "solana-atomic-u64", "solana-sanitize", - "wasm-bindgen", ] [[package]] name = "solana-instruction" -version = "2.3.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47298e2ce82876b64f71e9d13a46bc4b9056194e7f9937ad3084385befa50885" +checksum = "ee1b699a2c1518028a9982e255e0eca10c44d90006542d9d7f9f40dbce3f7c78" dependencies = [ "bincode", "borsh 1.5.7", - "getrandom 0.2.16", - "js-sys", - "num-traits", "serde", "serde_derive", - "solana-define-syscall", - "solana-pubkey", - "wasm-bindgen", + "solana-define-syscall 4.0.1", + "solana-instruction-error", + "solana-pubkey 4.0.0", +] + +[[package]] +name = "solana-instruction-error" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b04259e03c05faf38a8c24217b5cfe4c90572ae6184ab49cddb1584fdd756d3f" +dependencies = [ + "num-traits", + "solana-program-error", ] [[package]] name = "solana-instructions-sysvar" -version = "2.2.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0e85a6fad5c2d0c4f5b91d34b8ca47118fc593af706e523cdbedf846a954f57" +checksum = "7ddf67876c541aa1e21ee1acae35c95c6fbc61119814bfef70579317a5e26955" dependencies = [ "bitflags", "solana-account-info", "solana-instruction", + "solana-instruction-error", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sanitize", "solana-sdk-ids", "solana-serialize-utils", @@ -1650,12 +1688,12 @@ dependencies = [ [[package]] name = "solana-invoke" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f5693c6de226b3626658377168b0184e94e8292ff16e3d31d4766e65627565" +checksum = "4065031f5c7dd29ef5f5003c1a353011eeabbafa6c5a5033da0cedbfca824b94" dependencies = [ "solana-account-info", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "solana-instruction", "solana-program-entrypoint", "solana-stable-layout", @@ -1663,21 +1701,20 @@ dependencies = [ [[package]] name = "solana-keccak-hasher" -version = "2.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7aeb957fbd42a451b99235df4942d96db7ef678e8d5061ef34c9b34cae12f79" +checksum = "ed1c0d16d6fdeba12291a1f068cdf0d479d9bff1141bf44afd7aa9d485f65ef8" dependencies = [ "sha3", - "solana-define-syscall", - "solana-hash", - "solana-sanitize", + "solana-define-syscall 4.0.1", + "solana-hash 4.0.1", ] [[package]] name = "solana-last-restart-slot" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6360ac2fdc72e7463565cd256eedcf10d7ef0c28a1249d261ec168c1b55cdd" +checksum = "dcda154ec827f5fc1e4da0af3417951b7e9b8157540f81f936c4a8b1156134d0" dependencies = [ "serde", "serde_derive", @@ -1686,180 +1723,101 @@ dependencies = [ "solana-sysvar-id", ] -[[package]] -name = "solana-loader-v2-interface" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8ab08006dad78ae7cd30df8eea0539e207d08d91eaefb3e1d49a446e1c49654" -dependencies = [ - "serde", - "serde_bytes", - "serde_derive", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", -] - -[[package]] -name = "solana-loader-v3-interface" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4be76cfa9afd84ca2f35ebc09f0da0f0092935ccdac0595d98447f259538c2" -dependencies = [ - "serde", - "serde_bytes", - "serde_derive", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", - "solana-system-interface", -] - [[package]] name = "solana-loader-v3-interface" -version = "5.0.0" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f7162a05b8b0773156b443bccd674ea78bb9aa406325b467ea78c06c99a63a2" +checksum = "dee44c9b1328c5c712c68966fb8de07b47f3e7bac006e74ddd1bb053d3e46e5d" dependencies = [ "serde", "serde_bytes", "serde_derive", "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", - "solana-system-interface", -] - -[[package]] -name = "solana-loader-v4-interface" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "706a777242f1f39a83e2a96a2a6cb034cb41169c6ecbee2cf09cb873d9659e7e" -dependencies = [ - "serde", - "serde_bytes", - "serde_derive", - "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "solana-system-interface", ] [[package]] name = "solana-message" -version = "2.4.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1796aabce376ff74bf89b78d268fa5e683d7d7a96a0a4e4813ec34de49d5314b" +checksum = "85666605c9fd727f865ed381665db0a8fc29f984a030ecc1e40f43bfb2541623" dependencies = [ - "bincode", - "blake3", "lazy_static", "serde", "serde_derive", - "solana-bincode", - "solana-hash", + "solana-address 1.1.0", + "solana-hash 3.1.0", "solana-instruction", - "solana-pubkey", "solana-sanitize", "solana-sdk-ids", "solana-short-vec", - "solana-system-interface", "solana-transaction-error", - "wasm-bindgen", ] [[package]] name = "solana-msg" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36a1a14399afaabc2781a1db09cb14ee4cc4ee5c7a5a3cfcc601811379a8092" +checksum = "264275c556ea7e22b9d3f87d56305546a38d4eee8ec884f3b126236cb7dcbbb4" dependencies = [ - "solana-define-syscall", + "solana-define-syscall 3.0.0", ] [[package]] name = "solana-native-token" -version = "2.3.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61515b880c36974053dd499c0510066783f0cc6ac17def0c7ef2a244874cf4a9" +checksum = "ae8dd4c280dca9d046139eb5b7a5ac9ad10403fbd64964c7d7571214950d758f" [[package]] name = "solana-nonce" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703e22eb185537e06204a5bd9d509b948f0066f2d1d814a6f475dafb3ddf1325" +checksum = "abbdc6c8caf1c08db9f36a50967539d0f72b9f1d4aea04fec5430f532e5afadc" dependencies = [ - "serde", - "serde_derive", "solana-fee-calculator", - "solana-hash", - "solana-pubkey", + "solana-hash 3.1.0", + "solana-pubkey 3.0.0", "solana-sha256-hasher", ] [[package]] name = "solana-program" -version = "2.3.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98eca145bd3545e2fbb07166e895370576e47a00a7d824e325390d33bf467210" +checksum = "91b12305dd81045d705f427acd0435a2e46444b65367d7179d7bdcfc3bc5f5eb" dependencies = [ - "bincode", - "blake3", - "borsh 0.10.4", - "borsh 1.5.7", - "bs58", - "bytemuck", - "console_error_panic_hook", - "console_log", - "getrandom 0.2.16", - "lazy_static", - "log", "memoffset", - "num-bigint", - "num-derive 0.4.2", - "num-traits", - "rand 0.8.5", - "serde", - "serde_bytes", - "serde_derive", "solana-account-info", - "solana-address-lookup-table-interface", - "solana-atomic-u64", "solana-big-mod-exp", - "solana-bincode", "solana-blake3-hasher", "solana-borsh", "solana-clock", "solana-cpi", - "solana-decode-error", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "solana-epoch-rewards", "solana-epoch-schedule", + "solana-epoch-stake", "solana-example-mocks", - "solana-feature-gate-interface", "solana-fee-calculator", - "solana-hash", + "solana-hash 3.1.0", "solana-instruction", + "solana-instruction-error", "solana-instructions-sysvar", "solana-keccak-hasher", "solana-last-restart-slot", - "solana-loader-v2-interface", - "solana-loader-v3-interface 5.0.0", - "solana-loader-v4-interface", - "solana-message", "solana-msg", "solana-native-token", - "solana-nonce", "solana-program-entrypoint", "solana-program-error", "solana-program-memory", "solana-program-option", "solana-program-pack", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-rent", - "solana-sanitize", "solana-sdk-ids", - "solana-sdk-macro", "solana-secp256k1-recover", "solana-serde-varint", "solana-serialize-utils", @@ -1868,98 +1826,80 @@ dependencies = [ "solana-slot-hashes", "solana-slot-history", "solana-stable-layout", - "solana-stake-interface", - "solana-system-interface", "solana-sysvar", "solana-sysvar-id", - "solana-vote-interface", - "thiserror 2.0.14", - "wasm-bindgen", ] [[package]] name = "solana-program-entrypoint" -version = "2.3.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ce041b1a0ed275290a5008ee1a4a6c48f5054c8a3d78d313c08958a06aedbd" +checksum = "84c9b0a1ff494e05f503a08b3d51150b73aa639544631e510279d6375f290997" dependencies = [ "solana-account-info", - "solana-msg", + "solana-define-syscall 4.0.1", "solana-program-error", - "solana-pubkey", + "solana-pubkey 4.0.0", ] [[package]] name = "solana-program-error" -version = "2.2.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee2e0217d642e2ea4bee237f37bd61bb02aec60da3647c48ff88f6556ade775" +checksum = "a1af32c995a7b692a915bb7414d5f8e838450cf7c70414e763d8abcae7b51f28" dependencies = [ "borsh 1.5.7", - "num-traits", "serde", "serde_derive", - "solana-decode-error", - "solana-instruction", - "solana-msg", - "solana-pubkey", ] [[package]] name = "solana-program-memory" -version = "2.3.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a5426090c6f3fd6cfdc10685322fede9ca8e5af43cd6a59e98bfe4e91671712" +checksum = "4068648649653c2c50546e9a7fb761791b5ab0cda054c771bb5808d3a4b9eb52" dependencies = [ - "solana-define-syscall", + "solana-define-syscall 4.0.1", ] [[package]] name = "solana-program-option" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc677a2e9bc616eda6dbdab834d463372b92848b2bfe4a1ed4e4b4adba3397d0" +checksum = "8e7b4ddb464f274deb4a497712664c3b612e3f5f82471d4e47710fc4ab1c3095" [[package]] name = "solana-program-pack" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "319f0ef15e6e12dc37c597faccb7d62525a509fec5f6975ecb9419efddeb277b" +checksum = "c169359de21f6034a63ebf96d6b380980307df17a8d371344ff04a883ec4e9d0" dependencies = [ "solana-program-error", ] [[package]] name = "solana-pubkey" -version = "2.4.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b62adb9c3261a052ca1f999398c388f1daf558a1b492f60a6d9e64857db4ff1" +checksum = "8909d399deb0851aa524420beeb5646b115fd253ef446e35fe4504c904da3941" dependencies = [ - "borsh 0.10.4", - "borsh 1.5.7", - "bytemuck", - "bytemuck_derive", - "curve25519-dalek", - "five8", - "five8_const", - "getrandom 0.2.16", - "js-sys", - "num-traits", - "serde", - "serde_derive", - "solana-atomic-u64", - "solana-decode-error", - "solana-define-syscall", - "solana-sanitize", - "solana-sha256-hasher", - "wasm-bindgen", + "solana-address 1.1.0", +] + +[[package]] +name = "solana-pubkey" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6f7104d456b58e1418c21a8581e89810278d1190f70f27ece7fc0b2c9282a57" +dependencies = [ + "solana-address 2.0.0", ] [[package]] name = "solana-rent" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1aea8fdea9de98ca6e8c2da5827707fb3842833521b528a713810ca685d2480" +checksum = "b702d8c43711e3c8a9284a4f1bbc6a3de2553deb25b0c8142f9a44ef0ce5ddc1" dependencies = [ "serde", "serde_derive", @@ -1970,24 +1910,24 @@ dependencies = [ [[package]] name = "solana-sanitize" -version = "2.2.1" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f1bc1357b8188d9c4a3af3fc55276e56987265eb7ad073ae6f8180ee54cecf" +checksum = "dcf09694a0fc14e5ffb18f9b7b7c0f15ecb6eac5b5610bf76a1853459d19daf9" [[package]] name = "solana-sdk-ids" -version = "2.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5d8b9cc68d5c88b062a33e23a6466722467dde0035152d8fb1afbcdf350a5f" +checksum = "def234c1956ff616d46c9dd953f251fa7096ddbaa6d52b165218de97882b7280" dependencies = [ - "solana-pubkey", + "solana-address 2.0.0", ] [[package]] name = "solana-sdk-macro" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86280da8b99d03560f6ab5aca9de2e38805681df34e0bb8f238e69b29433b9df" +checksum = "d6430000e97083460b71d9fbadc52a2ab2f88f53b3a4c5e58c5ae3640a0e8c00" dependencies = [ "bs58", "proc-macro2", @@ -1997,120 +1937,114 @@ dependencies = [ [[package]] name = "solana-secp256k1-recover" -version = "2.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baa3120b6cdaa270f39444f5093a90a7b03d296d362878f7a6991d6de3bbe496" +checksum = "9de18cfdab99eeb940fbedd8c981fa130c0d76252da75d05446f22fae8b51932" dependencies = [ - "libsecp256k1", - "solana-define-syscall", - "thiserror 2.0.14", + "k256", + "solana-define-syscall 4.0.1", + "thiserror 2.0.17", ] -[[package]] -name = "solana-security-txt" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" - [[package]] name = "solana-seed-derivable" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3beb82b5adb266c6ea90e5cf3967235644848eac476c5a1f2f9283a143b7c97f" +checksum = "ff7bdb72758e3bec33ed0e2658a920f1f35dfb9ed576b951d20d63cb61ecd95c" dependencies = [ "solana-derivation-path", ] [[package]] name = "solana-seed-phrase" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36187af2324f079f65a675ec22b31c24919cb4ac22c79472e85d819db9bbbc15" +checksum = "dc905b200a95f2ea9146e43f2a7181e3aeb55de6bc12afb36462d00a3c7310de" dependencies = [ "hmac", "pbkdf2", - "sha2 0.10.9", + "sha2", ] [[package]] name = "solana-serde-varint" -version = "2.2.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a7e155eba458ecfb0107b98236088c3764a09ddf0201ec29e52a0be40857113" +checksum = "3e5174c57d5ff3c1995f274d17156964664566e2cde18a07bba1586d35a70d3b" dependencies = [ "serde", ] [[package]] name = "solana-serialize-utils" -version = "2.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "817a284b63197d2b27afdba829c5ab34231da4a9b4e763466a003c40ca4f535e" +checksum = "56e41dd8feea239516c623a02f0a81c2367f4b604d7965237fed0751aeec33ed" dependencies = [ - "solana-instruction", - "solana-pubkey", + "solana-instruction-error", + "solana-pubkey 3.0.0", "solana-sanitize", ] [[package]] name = "solana-sha256-hasher" -version = "2.3.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa3feb32c28765f6aa1ce8f3feac30936f16c5c3f7eb73d63a5b8f6f8ecdc44" +checksum = "db7dc3011ea4c0334aaaa7e7128cb390ecf546b28d412e9bf2064680f57f588f" dependencies = [ - "sha2 0.10.9", - "solana-define-syscall", - "solana-hash", + "sha2", + "solana-define-syscall 4.0.1", + "solana-hash 4.0.1", ] [[package]] name = "solana-short-vec" -version = "2.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c54c66f19b9766a56fa0057d060de8378676cb64987533fa088861858fc5a69" +checksum = "79fb1809a32cfcf7d9c47b7070a92fa17cdb620ab5829e9a8a9ff9d138a7a175" dependencies = [ - "serde", + "serde_core", ] [[package]] name = "solana-signature" -version = "2.3.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c8ec8e657aecfc187522fc67495142c12f35e55ddeca8698edbb738b8dbd8c" +checksum = "4bb8057cc0e9f7b5e89883d49de6f407df655bb6f3a71d0b7baf9986a2218fd9" dependencies = [ - "five8", + "five8 0.2.1", "solana-sanitize", ] [[package]] name = "solana-signer" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c41991508a4b02f021c1342ba00bcfa098630b213726ceadc7cb032e051975b" +checksum = "5bfea97951fee8bae0d6038f39a5efcb6230ecdfe33425ac75196d1a1e3e3235" dependencies = [ - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-signature", "solana-transaction-error", ] [[package]] name = "solana-slot-hashes" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c8691982114513763e88d04094c9caa0376b867a29577939011331134c301ce" +checksum = "80a293f952293281443c04f4d96afd9d547721923d596e92b4377ed2360f1746" dependencies = [ "serde", "serde_derive", - "solana-hash", + "solana-hash 3.1.0", "solana-sdk-ids", "solana-sysvar-id", ] [[package]] name = "solana-slot-history" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ccc1b2067ca22754d5283afb2b0126d61eae734fc616d23871b0943b0d935e" +checksum = "f914f6b108f5bba14a280b458d023e3621c9973f27f015a4d755b50e88d89e97" dependencies = [ "bv", "serde", @@ -2121,56 +2055,53 @@ dependencies = [ [[package]] name = "solana-stable-layout" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f14f7d02af8f2bc1b5efeeae71bc1c2b7f0f65cd75bcc7d8180f2c762a57f54" +checksum = "1da74507795b6e8fb60b7c7306c0c36e2c315805d16eaaf479452661234685ac" dependencies = [ "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", ] [[package]] name = "solana-stake-interface" -version = "1.2.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5269e89fde216b4d7e1d1739cf5303f8398a1ff372a81232abbee80e554a838c" +checksum = "f6f912ae679b683365348dea482dbd9468d22ff258b554fd36e3d3683c2122e3" dependencies = [ - "borsh 0.10.4", - "borsh 1.5.7", "num-traits", "serde", "serde_derive", "solana-clock", "solana-cpi", - "solana-decode-error", "solana-instruction", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-system-interface", + "solana-sysvar", "solana-sysvar-id", ] [[package]] name = "solana-system-interface" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7c18cb1a91c6be5f5a8ac9276a1d7c737e39a21beba9ea710ab4b9c63bc90" +checksum = "4e1790547bfc3061f1ee68ea9d8dc6c973c02a163697b24263a8e9f2e6d4afa2" dependencies = [ - "js-sys", "num-traits", "serde", "serde_derive", - "solana-decode-error", "solana-instruction", - "solana-pubkey", - "wasm-bindgen", + "solana-msg", + "solana-program-error", + "solana-pubkey 3.0.0", ] [[package]] name = "solana-sysvar" -version = "2.3.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8c3595f95069f3d90f275bb9bd235a1973c4d059028b0a7f81baca2703815db" +checksum = "63205e68d680bcc315337dec311b616ab32fea0a612db3b883ce4de02e0953f9" dependencies = [ "base64 0.22.1", "bincode", @@ -2181,77 +2112,50 @@ dependencies = [ "serde_derive", "solana-account-info", "solana-clock", - "solana-define-syscall", + "solana-define-syscall 3.0.0", "solana-epoch-rewards", "solana-epoch-schedule", "solana-fee-calculator", - "solana-hash", + "solana-hash 3.1.0", "solana-instruction", - "solana-instructions-sysvar", "solana-last-restart-slot", "solana-program-entrypoint", "solana-program-error", "solana-program-memory", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-rent", - "solana-sanitize", "solana-sdk-ids", "solana-sdk-macro", "solana-slot-hashes", "solana-slot-history", - "solana-stake-interface", "solana-sysvar-id", ] [[package]] name = "solana-sysvar-id" -version = "2.2.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5762b273d3325b047cfda250787f8d796d781746860d5d0a746ee29f3e8812c1" +checksum = "17358d1e9a13e5b9c2264d301102126cf11a47fd394cdf3dec174fe7bc96e1de" dependencies = [ - "solana-pubkey", + "solana-address 2.0.0", "solana-sdk-ids", ] [[package]] name = "solana-transaction-error" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a9dc8fdb61c6088baab34fc3a8b8473a03a7a5fd404ed8dd502fa79b67cb1" +checksum = "4222065402340d7e6aec9dc3e54d22992ddcf923d91edcd815443c2bfca3144a" dependencies = [ - "solana-instruction", + "solana-instruction-error", "solana-sanitize", ] -[[package]] -name = "solana-vote-interface" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b80d57478d6599d30acc31cc5ae7f93ec2361a06aefe8ea79bc81739a08af4c3" -dependencies = [ - "bincode", - "num-derive 0.4.2", - "num-traits", - "serde", - "serde_derive", - "solana-clock", - "solana-decode-error", - "solana-hash", - "solana-instruction", - "solana-pubkey", - "solana-rent", - "solana-sdk-ids", - "solana-serde-varint", - "solana-serialize-utils", - "solana-short-vec", - "solana-system-interface", -] - [[package]] name = "solana-zk-sdk" -version = "2.3.7" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bb171c0f76c420a7cb6aabbe5fa85a1a009d5bb4009189c43e1a03aff9446d7" +checksum = "9602bcb1f7af15caef92b91132ec2347e1c51a72ecdbefdaefa3eac4b8711475" dependencies = [ "aes-gcm-siv", "base64 0.22.1", @@ -2259,61 +2163,56 @@ dependencies = [ "bytemuck", "bytemuck_derive", "curve25519-dalek", + "getrandom", "itertools", "js-sys", "merlin", "num-derive 0.4.2", "num-traits", - "rand 0.8.5", + "rand", "serde", "serde_derive", "serde_json", "sha3", "solana-derivation-path", "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "solana-seed-derivable", "solana-seed-phrase", "solana-signature", "solana-signer", "subtle", - "thiserror 2.0.14", + "thiserror 2.0.17", "wasm-bindgen", "zeroize", ] [[package]] -name = "spl-associated-token-account" -version = "7.0.0" +name = "spki" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae179d4a26b3c7a20c839898e6aed84cb4477adf108a366c95532f058aea041b" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ - "borsh 1.5.7", - "num-derive 0.4.2", - "num-traits", - "solana-program", - "spl-associated-token-account-client", - "spl-token", - "spl-token-2022", - "thiserror 2.0.14", + "base64ct", + "der", ] [[package]] -name = "spl-associated-token-account-client" +name = "spl-associated-token-account-interface" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f8349dbcbe575f354f9a533a21f272f3eb3808a49e2fdc1c34393b88ba76cb" +checksum = "e6433917b60441d68d99a17e121d9db0ea15a9a69c0e5afa34649cf5ba12612f" dependencies = [ "solana-instruction", - "solana-pubkey", + "solana-pubkey 3.0.0", ] [[package]] name = "spl-discriminator" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7398da23554a31660f17718164e31d31900956054f54f52d5ec1be51cb4f4b3" +checksum = "d48cc11459e265d5b501534144266620289720b4c44522a47bc6b63cd295d2f3" dependencies = [ "bytemuck", "solana-program-error", @@ -2340,150 +2239,35 @@ checksum = "5d1dbc82ab91422345b6df40a79e2b78c7bce1ebb366da323572dd60b7076b67" dependencies = [ "proc-macro2", "quote", - "sha2 0.10.9", + "sha2", "syn 2.0.105", "thiserror 1.0.69", ] -[[package]] -name = "spl-elgamal-registry" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65edfeed09cd4231e595616aa96022214f9c9d2be02dea62c2b30d5695a6833a" -dependencies = [ - "bytemuck", - "solana-account-info", - "solana-cpi", - "solana-instruction", - "solana-msg", - "solana-program-entrypoint", - "solana-program-error", - "solana-pubkey", - "solana-rent", - "solana-sdk-ids", - "solana-system-interface", - "solana-sysvar", - "solana-zk-sdk", - "spl-pod", - "spl-token-confidential-transfer-proof-extraction", -] - -[[package]] -name = "spl-memo" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f09647c0974e33366efeb83b8e2daebb329f0420149e74d3a4bd2c08cf9f7cb" -dependencies = [ - "solana-account-info", - "solana-instruction", - "solana-msg", - "solana-program-entrypoint", - "solana-program-error", - "solana-pubkey", -] - [[package]] name = "spl-pod" -version = "0.5.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d994afaf86b779104b4a95ba9ca75b8ced3fdb17ee934e38cb69e72afbe17799" +checksum = "b1233fdecd7461611d69bb87bc2e95af742df47291975d21232a0be8217da9de" dependencies = [ "borsh 1.5.7", "bytemuck", "bytemuck_derive", "num-derive 0.4.2", "num-traits", - "solana-decode-error", - "solana-msg", - "solana-program-error", - "solana-program-option", - "solana-pubkey", - "solana-zk-sdk", - "thiserror 2.0.14", -] - -[[package]] -name = "spl-program-error" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdebc8b42553070b75aa5106f071fef2eb798c64a7ec63375da4b1f058688c6" -dependencies = [ - "num-derive 0.4.2", - "num-traits", - "solana-decode-error", - "solana-msg", - "solana-program-error", - "spl-program-error-derive", - "thiserror 2.0.14", -] - -[[package]] -name = "spl-program-error-derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2539e259c66910d78593475540e8072f0b10f0f61d7607bbf7593899ed52d0" -dependencies = [ - "proc-macro2", - "quote", - "sha2 0.10.9", - "syn 2.0.105", -] - -[[package]] -name = "spl-tlv-account-resolution" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1408e961215688715d5a1063cbdcf982de225c45f99c82b4f7d7e1dd22b998d7" -dependencies = [ - "bytemuck", - "num-derive 0.4.2", - "num-traits", - "solana-account-info", - "solana-decode-error", - "solana-instruction", - "solana-msg", - "solana-program-error", - "solana-pubkey", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-type-length-value", - "thiserror 2.0.14", -] - -[[package]] -name = "spl-token" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053067c6a82c705004f91dae058b11b4780407e9ccd6799dc9e7d0fab5f242da" -dependencies = [ - "arrayref", - "bytemuck", - "num-derive 0.4.2", - "num-traits", "num_enum", - "solana-account-info", - "solana-cpi", - "solana-decode-error", - "solana-instruction", - "solana-msg", - "solana-program-entrypoint", "solana-program-error", - "solana-program-memory", "solana-program-option", - "solana-program-pack", - "solana-pubkey", - "solana-rent", - "solana-sdk-ids", - "solana-sysvar", - "thiserror 2.0.14", + "solana-pubkey 3.0.0", + "solana-zk-sdk", + "thiserror 2.0.17", ] [[package]] -name = "spl-token-2022" -version = "8.0.1" +name = "spl-token-2022-interface" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f0dfbb079eebaee55e793e92ca5f433744f4b71ee04880bfd6beefba5973e5" +checksum = "2fcd81188211f4b3c8a5eba7fd534c7142f9dd026123b3472492782cc72f4dc6" dependencies = [ "arrayref", "bytemuck", @@ -2491,55 +2275,27 @@ dependencies = [ "num-traits", "num_enum", "solana-account-info", - "solana-clock", - "solana-cpi", - "solana-decode-error", "solana-instruction", - "solana-msg", - "solana-native-token", - "solana-program-entrypoint", "solana-program-error", - "solana-program-memory", "solana-program-option", "solana-program-pack", - "solana-pubkey", - "solana-rent", + "solana-pubkey 3.0.0", "solana-sdk-ids", - "solana-security-txt", - "solana-system-interface", - "solana-sysvar", "solana-zk-sdk", - "spl-elgamal-registry", - "spl-memo", "spl-pod", - "spl-token", - "spl-token-confidential-transfer-ciphertext-arithmetic", "spl-token-confidential-transfer-proof-extraction", "spl-token-confidential-transfer-proof-generation", "spl-token-group-interface", "spl-token-metadata-interface", - "spl-transfer-hook-interface", "spl-type-length-value", - "thiserror 2.0.14", -] - -[[package]] -name = "spl-token-confidential-transfer-ciphertext-arithmetic" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cddd52bfc0f1c677b41493dafa3f2dbbb4b47cf0990f08905429e19dc8289b35" -dependencies = [ - "base64 0.22.1", - "bytemuck", - "solana-curve25519", - "solana-zk-sdk", + "thiserror 2.0.17", ] [[package]] name = "spl-token-confidential-transfer-proof-extraction" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe2629860ff04c17bafa9ba4bed8850a404ecac81074113e1f840dbd0ebb7bd6" +checksum = "879a9ebad0d77383d3ea71e7de50503554961ff0f4ef6cbca39ad126e6f6da3a" dependencies = [ "bytemuck", "solana-account-info", @@ -2548,105 +2304,97 @@ dependencies = [ "solana-instructions-sysvar", "solana-msg", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "solana-sdk-ids", "solana-zk-sdk", "spl-pod", - "thiserror 2.0.14", + "thiserror 2.0.17", ] [[package]] name = "spl-token-confidential-transfer-proof-generation" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa27b9174bea869a7ebf31e0be6890bce90b1a4288bc2bbf24bd413f80ae3fde" +checksum = "a0cd59fce3dc00f563c6fa364d67c3f200d278eae681f4dc250240afcfe044b1" dependencies = [ "curve25519-dalek", "solana-zk-sdk", - "thiserror 2.0.14", + "thiserror 2.0.17", ] [[package]] name = "spl-token-group-interface" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5597b4cd76f85ce7cd206045b7dc22da8c25516573d42d267c8d1fd128db5129" +checksum = "452d0f758af20caaa10d9a6f7608232e000d4c74462f248540b3d2ddfa419776" dependencies = [ "bytemuck", "num-derive 0.4.2", "num-traits", - "solana-decode-error", + "num_enum", "solana-instruction", - "solana-msg", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "spl-discriminator", "spl-pod", - "thiserror 2.0.14", + "thiserror 2.0.17", ] [[package]] -name = "spl-token-metadata-interface" -version = "0.7.0" +name = "spl-token-interface" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "304d6e06f0de0c13a621464b1fd5d4b1bebf60d15ca71a44d3839958e0da16ee" +checksum = "8c564ac05a7c8d8b12e988a37d82695b5ba4db376d07ea98bc4882c81f96c7f3" dependencies = [ - "borsh 1.5.7", + "arrayref", + "bytemuck", "num-derive 0.4.2", "num-traits", - "solana-borsh", - "solana-decode-error", + "num_enum", "solana-instruction", - "solana-msg", "solana-program-error", - "solana-pubkey", - "spl-discriminator", - "spl-pod", - "spl-type-length-value", - "thiserror 2.0.14", + "solana-program-option", + "solana-program-pack", + "solana-pubkey 3.0.0", + "solana-sdk-ids", + "thiserror 2.0.17", ] [[package]] -name = "spl-transfer-hook-interface" -version = "0.10.0" +name = "spl-token-metadata-interface" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e905b849b6aba63bde8c4badac944ebb6c8e6e14817029cbe1bc16829133bd" +checksum = "9c467c7c3bd056f8fe60119e7ec34ddd6f23052c2fa8f1f51999098063b72676" dependencies = [ - "arrayref", - "bytemuck", + "borsh 1.5.7", "num-derive 0.4.2", "num-traits", - "solana-account-info", - "solana-cpi", - "solana-decode-error", + "solana-borsh", "solana-instruction", - "solana-msg", "solana-program-error", - "solana-pubkey", + "solana-pubkey 3.0.0", "spl-discriminator", "spl-pod", - "spl-program-error", - "spl-tlv-account-resolution", "spl-type-length-value", - "thiserror 2.0.14", + "thiserror 2.0.17", ] [[package]] name = "spl-type-length-value" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d417eb548214fa822d93f84444024b4e57c13ed6719d4dcc68eec24fb481e9f5" +checksum = "ca20a1a19f4507a98ca4b28ff5ed54cac9b9d34ed27863e2bde50a3238f9a6ac" dependencies = [ "bytemuck", "num-derive 0.4.2", "num-traits", + "num_enum", "solana-account-info", - "solana-decode-error", "solana-msg", "solana-program-error", "spl-discriminator", "spl-pod", - "thiserror 2.0.14", + "thiserror 2.0.17", ] [[package]] @@ -2688,11 +2436,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.14" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0949c3a6c842cbde3f1686d6eea5a010516deb7085f79db747562d4102f41e" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ - "thiserror-impl 2.0.14", + "thiserror-impl 2.0.17", ] [[package]] @@ -2708,9 +2456,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.14" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc5b44b4ab9c2fdd0e0512e6bece8388e214c0749f5862b114cc5b7a25daf227" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", @@ -2826,12 +2574,6 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.1+wasi-snapshot-preview1" @@ -2896,16 +2638,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "web-sys" -version = "0.3.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - [[package]] name = "windows-targets" version = "0.52.6" diff --git a/tests/spl/token-extensions/programs/token-extensions/Cargo.toml b/tests/spl/token-extensions/programs/token-extensions/Cargo.toml index 903a4d3eeb..e4180796ca 100644 --- a/tests/spl/token-extensions/programs/token-extensions/Cargo.toml +++ b/tests/spl/token-extensions/programs/token-extensions/Cargo.toml @@ -18,7 +18,8 @@ idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] anchor-lang = { path = "../../../../../lang", features = ["init-if-needed"] } anchor-spl = { path = "../../../../../spl" } +solana-sysvar = "3" spl-tlv-account-resolution = "0.10.0" spl-transfer-hook-interface = "0.10.0" -spl-type-length-value = "0.8.0" -spl-pod = "0.5" +spl-type-length-value = "0.9" +spl-pod = "0.7" diff --git a/tests/spl/token-extensions/programs/token-extensions/src/utils.rs b/tests/spl/token-extensions/programs/token-extensions/src/utils.rs index da3be3a8aa..fcc6063d85 100644 --- a/tests/spl/token-extensions/programs/token-extensions/src/utils.rs +++ b/tests/spl/token-extensions/programs/token-extensions/src/utils.rs @@ -7,7 +7,6 @@ use anchor_lang::{ pubkey::Pubkey, rent::Rent, system_instruction::transfer, - sysvar::Sysvar, }, Lamports, }; @@ -15,6 +14,7 @@ use anchor_spl::token_interface::spl_token_2022::{ extension::{BaseStateWithExtensions, Extension, StateWithExtensions}, state::Mint, }; +use solana_sysvar::Sysvar; use spl_tlv_account_resolution::{account::ExtraAccountMeta, state::ExtraAccountMetaList}; use spl_type_length_value::variable_len_pack::VariableLenPack; diff --git a/tests/spl/transfer-hook/programs/transfer-hook/Cargo.toml b/tests/spl/transfer-hook/programs/transfer-hook/Cargo.toml index d89fb783ea..66b283bbd9 100644 --- a/tests/spl/transfer-hook/programs/transfer-hook/Cargo.toml +++ b/tests/spl/transfer-hook/programs/transfer-hook/Cargo.toml @@ -18,6 +18,6 @@ idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] anchor-lang = { path = "../../../../../lang", features = ["interface-instructions"] } anchor-spl = { path = "../../../../../spl" } -spl-discriminator = "0.4" -spl-tlv-account-resolution = "0.10.0" -spl-transfer-hook-interface = "0.10.0" +spl-discriminator = "0.5" +spl-tlv-account-resolution = "0.11" +spl-transfer-hook-interface = "2"