From c5eb21055e19cbf09ff4d5e67322007b07d40f1b Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Sun, 4 Feb 2024 18:17:49 +0400 Subject: [PATCH 01/14] upgrade to solana 1.18.1 --- Cargo.lock | 1090 ++++++++++++------ Cargo.toml | 14 +- crates/rpc-common/Cargo.toml | 2 + crates/rpc-common/src/lib.rs | 6 + crates/rpc-sim-transaction-config/src/lib.rs | 9 +- python/solders/rpc/config.pyi | 3 + python/solders/rpc/responses.pyi | 3 + rust-toolchain.toml | 2 +- 8 files changed, 755 insertions(+), 374 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 92daf708..2d5cb848 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -76,14 +76,15 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", "getrandom 0.2.10", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -146,6 +147,20 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +[[package]] +name = "aquamarine" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760" +dependencies = [ + "include_dir", + "itertools", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.107", +] + [[package]] name = "ark-bn254" version = "0.4.0" @@ -362,13 +377,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -417,9 +432,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -444,9 +459,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" dependencies = [ "serde", ] @@ -519,6 +534,16 @@ dependencies = [ "hashbrown 0.13.2", ] +[[package]] +name = "borsh" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667" +dependencies = [ + "borsh-derive 1.3.1", + "cfg_aliases", +] + [[package]] name = "borsh-derive" version = "0.9.3" @@ -545,6 +570,20 @@ dependencies = [ "syn 1.0.107", ] +[[package]] +name = "borsh-derive" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd" +dependencies = [ + "once_cell", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.48", + "syn_derive", +] + [[package]] name = "borsh-derive-internal" version = "0.9.3" @@ -654,9 +693,9 @@ dependencies = [ [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -717,6 +756,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "chrono" version = "0.4.31" @@ -824,15 +869,15 @@ dependencies = [ [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] @@ -909,11 +954,10 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if", "crossbeam-utils", ] @@ -943,12 +987,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -1088,7 +1129,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -1110,17 +1151,20 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ "darling_core 0.20.1", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] name = "dashmap" -version = "4.0.2" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "num_cpus", + "hashbrown 0.14.1", + "lock_api", + "once_cell", + "parking_lot_core", "rayon", ] @@ -1206,6 +1250,12 @@ dependencies = [ "syn 1.0.107", ] +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + [[package]] name = "digest" version = "0.9.0" @@ -1228,9 +1278,9 @@ dependencies = [ [[package]] name = "dir-diff" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2860407d7d7e2e004bb2128510ad9e8d669e76fa005ccf567977b5d71b8b4a0b" +checksum = "a7ad16bf5f84253b50d6557681c58c3ab67c47c77d39fed9aeb56e947290bd10" dependencies = [ "walkdir", ] @@ -1266,9 +1316,15 @@ checksum = "a6cbae11b3de8fce2a456e8ea3dada226b35fe791f0dc1d360c0941f0bb681f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] +[[package]] +name = "downcast" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" + [[package]] name = "eager" version = "0.1.0" @@ -1307,7 +1363,7 @@ dependencies = [ "derivation-path", "ed25519-dalek", "hmac 0.12.1", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -1345,22 +1401,22 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" +checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" +checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -1398,23 +1454,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -1449,14 +1494,23 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", ] +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + [[package]] name = "fnv" version = "1.0.7" @@ -1465,24 +1519,24 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] -name = "fs-err" -version = "2.9.0" +name = "fragile" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1495,9 +1549,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1505,15 +1559,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1522,38 +1576,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1689,7 +1743,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", ] [[package]] @@ -1865,9 +1919,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1889,11 +1943,30 @@ dependencies = [ "version_check", ] +[[package]] +name = "include_dir" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "index_list" -version = "0.2.7" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9d968042a4902e08810946fc7cd5851eb75e80301342305af755ca06cb82ce" +checksum = "70891286cb8e844fdfcf1178b47569699f9e20b5ecc4b45a6240a64771444638" [[package]] name = "indexmap" @@ -1907,9 +1980,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" dependencies = [ "equivalent", "hashbrown 0.14.1", @@ -1975,9 +2048,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" dependencies = [ "wasm-bindgen", ] @@ -2014,9 +2087,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libsecp256k1" @@ -2089,15 +2162,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2215,6 +2288,33 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mockall" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "lazy_static", + "mockall_derive", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 1.0.107", +] + [[package]] name = "modular-bitfield" version = "0.11.2" @@ -2268,6 +2368,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + [[package]] name = "num" version = "0.2.1" @@ -2333,7 +2439,7 @@ checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -2408,11 +2514,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.7.0", + "num_enum_derive 0.7.2", ] [[package]] @@ -2436,19 +2542,19 @@ dependencies = [ "proc-macro-crate 1.3.0", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] name = "num_enum_derive" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ "proc-macro-crate 1.3.0", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -2553,15 +2659,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.4.1", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.48.0", ] [[package]] @@ -2599,9 +2705,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "percentage" @@ -2691,6 +2797,36 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "predicates" +version = "2.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" +dependencies = [ + "difflib", + "float-cmp", + "itertools", + "normalize-line-endings", + "predicates-core", + "regex", +] + +[[package]] +name = "predicates-core" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" + +[[package]] +name = "predicates-tree" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +dependencies = [ + "predicates-core", + "termtree", +] + [[package]] name = "proc-macro-crate" version = "0.1.5" @@ -2710,6 +2846,15 @@ dependencies = [ "toml_edit 0.18.1", ] +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -2736,9 +2881,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -2843,7 +2988,7 @@ checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -2865,13 +3010,13 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1" +checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" dependencies = [ "bytes", "rand 0.8.5", - "ring", + "ring 0.16.20", "rustc-hash", "rustls", "rustls-native-certs", @@ -2889,16 +3034,16 @@ checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" dependencies = [ "bytes", "libc", - "socket2 0.5.4", + "socket2 0.5.5", "tracing", "windows-sys 0.48.0", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -2985,9 +3130,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -2995,14 +3140,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -3012,7 +3155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring", + "ring 0.16.20", "time", "yasna", ] @@ -3028,18 +3171,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", @@ -3049,9 +3192,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -3066,12 +3209,12 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" dependencies = [ "async-compression", - "base64 0.21.4", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -3093,6 +3236,8 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", + "system-configuration", "tokio", "tokio-rustls", "tokio-util 0.7.2", @@ -3114,21 +3259,35 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", - "untrusted", + "spin 0.5.2", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +dependencies = [ + "cc", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "rpassword" -version = "7.2.0" +version = "7.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" dependencies = [ "libc", "rtoolbox", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -3173,25 +3332,25 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.13" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.2", "errno", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring", + "ring 0.17.7", "rustls-webpki", "sct", ] @@ -3214,17 +3373,17 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", ] [[package]] name = "rustls-webpki" -version = "0.101.5" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "ring 0.17.7", + "untrusted 0.9.0", ] [[package]] @@ -3295,8 +3454,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -3324,24 +3483,33 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" + +[[package]] +name = "seqlock" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5c67b6f14ecc5b86c66fa63d76b5092352678545a8a3cdae80aef5128371910" +dependencies = [ + "parking_lot", +] [[package]] name = "serde" -version = "1.0.188" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.12" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] @@ -3358,20 +3526,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" dependencies = [ "itoa", "ryu", @@ -3441,7 +3609,7 @@ dependencies = [ "darling 0.20.1", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -3470,9 +3638,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -3558,9 +3726,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "socket2" @@ -3574,9 +3742,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys 0.48.0", @@ -3584,12 +3752,12 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47a1bf5f7d91a60b073f5d2b58993a9f44258d4df3304ed11a1e21ba23804a1" +checksum = "06cc3f73c655469ddab1a7b8f9687e674737fc657dc2fa1e23a7abad2ec541fc" dependencies = [ "Inflector", - "base64 0.21.4", + "base64 0.21.7", "bincode", "bs58", "bv", @@ -3600,7 +3768,8 @@ dependencies = [ "solana-config-program", "solana-sdk", "spl-token 4.0.0", - "spl-token-2022 0.9.0", + "spl-token-2022 1.0.0", + "spl-token-group-interface", "spl-token-metadata-interface", "thiserror", "zstd", @@ -3608,9 +3777,9 @@ dependencies = [ [[package]] name = "solana-accounts-db" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b786bc7ebf38e0baac9e6cf764236c3a954b19bbfac82f731d2891873af5847" +checksum = "dd00cd2012983bf916d3379a09ef8e76b28d93da88ba76bca09b4455654c2e05" dependencies = [ "arrayref", "bincode", @@ -3623,7 +3792,6 @@ dependencies = [ "dashmap", "flate2", "fnv", - "fs-err", "im", "index_list", "itertools", @@ -3632,10 +3800,10 @@ dependencies = [ "lz4", "memmap2", "modular-bitfield", - "num-derive 0.3.3", + "num-derive 0.4.1", "num-traits", "num_cpus", - "num_enum 0.6.1", + "num_enum 0.7.2", "ouroboros", "percentage", "qualifier_attr", @@ -3643,14 +3811,17 @@ dependencies = [ "rayon", "regex", "rustc_version", + "seqlock", "serde", "serde_derive", + "smallvec", "solana-bucket-map", "solana-config-program", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-measure", "solana-metrics", + "solana-nohash-hasher", "solana-program-runtime", "solana-rayon-threadlimit", "solana-sdk", @@ -3667,14 +3838,14 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fc311ece92c9cc5b040fd2bb86b66a4e56428d8757b04e30095590101a2345b" +checksum = "cbda589514bd080736ee62ea9631f8372a967273763efa5639667140eb658cad" dependencies = [ "bincode", "bytemuck", "log", - "num-derive 0.3.3", + "num-derive 0.4.1", "num-traits", "rustc_version", "serde", @@ -3688,11 +3859,11 @@ dependencies = [ [[package]] name = "solana-banks-client" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cbf50ff5efe5b0b1b93256b1d9c168dc3b0217c961839c47ecd68c3ed6d21b" +checksum = "7ae95d278edf71ee51f69aec47526b4be24ca48557d25b9d0f23141d4c26ee85" dependencies = [ - "borsh 0.10.3", + "borsh 1.3.1", "futures", "solana-banks-interface", "solana-program", @@ -3705,9 +3876,9 @@ dependencies = [ [[package]] name = "solana-banks-interface" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa9a5e31618726fa332661bcd9da4b3a7871ebb5a3dbf55e3817e6aa61a2ab8" +checksum = "158758371166dc5be729e651bed494b1fb57227425484d87701bdd66d7ec82bd" dependencies = [ "serde", "solana-sdk", @@ -3716,9 +3887,9 @@ dependencies = [ [[package]] name = "solana-banks-server" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdce26a00a2b1f78f74fb469f5dc4e7d292e71e7faf2fbda44ea4a3e93b64b53" +checksum = "d866bc88e9f831e9b46417583949984a130b5304e9cf09e3f46e59f71a9aa6aa" dependencies = [ "bincode", "crossbeam-channel", @@ -3736,9 +3907,9 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf15ae00e1f786c48b1cff77e56eb4614c5d0622fc896eae7bbdeba9bda9409" +checksum = "09be1798b0bae75d0981ff5d978543bed490c0f460adff784bdbdd0dc73f54f3" dependencies = [ "bincode", "byteorder", @@ -3755,16 +3926,16 @@ dependencies = [ [[package]] name = "solana-bucket-map" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f463dda4bee19a51981c6be1bd94fda63c273c912e60467bde70978140049a3" +checksum = "472b99b8e23e7cc4d6cc3da2828168d3fceebbacbd86c7bb3d54a175e96b8643" dependencies = [ "bv", "bytemuck", "log", "memmap2", "modular-bitfield", - "num_enum 0.6.1", + "num_enum 0.7.2", "rand 0.8.5", "solana-measure", "solana-sdk", @@ -3773,9 +3944,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c205d49f0fa0f0ed7cf0fdf89883a60ffaa6110e98a28162633a33e1ca282ef" +checksum = "09392e795b353fa6527f19dc36cb9fa9cd40afb71215027fbafce73a6da63383" dependencies = [ "chrono", "clap 2.34.0", @@ -3790,16 +3961,16 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b17557d9513b011fd6f9746f00c2bb4f0ed95ad894968ec1e96082d61a127f" +checksum = "5515041f760618a2a669f236abc409f8aea9c865400563cdc8030eca5156f979" dependencies = [ "async-trait", "bincode", "dashmap", "futures", "futures-util", - "indexmap 2.0.2", + "indexmap 2.2.2", "indicatif", "log", "quinn", @@ -3823,9 +3994,9 @@ dependencies = [ [[package]] name = "solana-compute-budget-program" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efe306cbf29de145cfea852456750797b242a2e574a0dcef87bc1880e9a3f393" +checksum = "2fa10f166f2e4cd0dc726e2fc364cfafabd8e30d4ea80da6425f61c7f5973386" dependencies = [ "solana-program-runtime", "solana-sdk", @@ -3833,9 +4004,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6237d968bbf6c3cf6b5131523e8f36a9f2f06dde0ae3cb97ba48d7df1c3df2db" +checksum = "17da53f316ec29baa40c8be233418da94d2cfcb79f77b8b0bb96ddd30b919525" dependencies = [ "bincode", "chrono", @@ -3847,15 +4018,15 @@ dependencies = [ [[package]] name = "solana-connection-cache" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94471b0c50509c50321be74093e5ac403d8fb48892400876dffebfcda203fa56" +checksum = "90651b04cc5dd1edd4cecae2db5736ac67fafd1150fa6c8502d5957fbde8fc37" dependencies = [ "async-trait", "bincode", "crossbeam-channel", "futures-util", - "indexmap 2.0.2", + "indexmap 2.2.2", "log", "rand 0.8.5", "rayon", @@ -3869,9 +4040,9 @@ dependencies = [ [[package]] name = "solana-cost-model" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68100d6976f4ac196f930b5d8267d49e57b49d7169b1545b01c3a8304238a611" +checksum = "b4f41dc12f6155ee55c1731b653655d69f34a76b709fcb1ea772fa6534cce6ce" dependencies = [ "lazy_static", "log", @@ -3893,17 +4064,13 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40252b49d68e33eedb76498714b4b52f1ee7522a3bb52b8dbd0d6d9bacc5e2b" +checksum = "b24a0e5179387f145afba79d72b27db817cecf1b9494f7cd55d42aa986ed3141" dependencies = [ - "ahash 0.8.3", - "blake3", "block-buffer 0.10.4", "bs58", "bv", - "byteorder", - "cc", "either", "generic-array", "im", @@ -3914,8 +4081,7 @@ dependencies = [ "serde", "serde_bytes", "serde_derive", - "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "solana-frozen-abi-macro", "subtle", "thiserror", @@ -3923,21 +4089,21 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a106613b9d798ca6562cb372a49d62ac2f507bb6a9bfd9afd5d0a7276b08068b" +checksum = "92970a9898903eb1433d42f53ca4e8f497bc05382b7bc170ea81d4d3c6ff5d58" dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] name = "solana-loader-v4-program" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7223ecc22ec2dc0ff5742f0b1e61f0aec2860fed84b92ec8ec7d28882fa45423" +checksum = "82df2a4889d63972c7ffce63bb48ff69a7819015f9bf7fc11c7c581aa39d04f0" dependencies = [ "log", "solana-measure", @@ -3948,9 +4114,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b64e80cdc5c951d68a370a76301059b5ece998b18eb07da536e50b5c082bd7" +checksum = "dea25cdb22fe3dfed39a9ef59b836153d226fb9e3984a1f5b6134061bfa94528" dependencies = [ "env_logger", "lazy_static", @@ -3959,9 +4125,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d0022b8bf1515777be92099d8abdc0c1c19c3a5c612d09f5f5ba64514b0674" +checksum = "cda9ee9ea9115543ae59f81a45d6329ecd9dca0b96dac4a55be73aab714f7ed4" dependencies = [ "log", "solana-sdk", @@ -3969,9 +4135,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac21ec9077ad17e4a538f3565bf0fb6b9db71bcced56c7d4ebc153ab534857c" +checksum = "0f69472348763363003c51c3af98de759c0153e99a31573a649330351a45f851" dependencies = [ "crossbeam-channel", "gethostname", @@ -3984,9 +4150,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e93866f4c3247de4e96b7c1613ed6e346568dbc79e8e11925270c6980bf24a05" +checksum = "89d35642b3a76cb0920b8d044321ecd945f8d42a1c510b1d730b776ad8352b72" dependencies = [ "bincode", "clap 3.2.23", @@ -3996,7 +4162,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_derive", - "socket2 0.5.4", + "socket2 0.5.5", "solana-logger", "solana-sdk", "solana-version", @@ -4004,13 +4170,19 @@ dependencies = [ "url", ] +[[package]] +name = "solana-nohash-hasher" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b8a731ed60e89177c8a7ab05fe0f1511cedd3e70e773f288f9de33a9cfdc21e" + [[package]] name = "solana-perf" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce85ec2bf05ca24e0348fec8ae5e2f015c39b1308baacb9001e4d4c1f0ccaee9" +checksum = "bbad7e94d4faf1a99b12c70c881d3f241f0e740fb595ee55d61ba0bfeee79b8f" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", "bincode", "bv", "caps", @@ -4035,20 +4207,21 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bdfd6532551b8d8c1ed15e1b6bd7a62f37f8eecc540ae833bda6ff20f24679" +checksum = "f0ce0a1f4487b0b9e5e53610e8c17e558d17069145281aaae9f825bfef84b16e" dependencies = [ "ark-bn254", "ark-ec", "ark-ff", "ark-serialize", - "base64 0.21.4", + "base64 0.21.7", "bincode", - "bitflags 2.4.0", + "bitflags 2.4.2", "blake3", "borsh 0.10.3", "borsh 0.9.3", + "borsh 1.3.1", "bs58", "bv", "bytemuck", @@ -4066,7 +4239,7 @@ dependencies = [ "log", "memoffset 0.9.0", "num-bigint 0.4.4", - "num-derive 0.3.3", + "num-derive 0.4.1", "num-traits", "parking_lot", "rand 0.8.5", @@ -4076,7 +4249,7 @@ dependencies = [ "serde_bytes", "serde_derive", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "sha3 0.10.6", "solana-frozen-abi", "solana-frozen-abi-macro", @@ -4089,18 +4262,18 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65014113fa8dd026351525a317cf8fd756e2be873869230db44a352682839b02" +checksum = "5b89a4eaf965a6d6ab917bcb427997e416e9cf6d23549b713d0fba6f7f861e63" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", "bincode", "eager", "enum-iterator", "itertools", "libc", "log", - "num-derive 0.3.3", + "num-derive 0.4.1", "num-traits", "percentage", "rand 0.8.5", @@ -4117,13 +4290,13 @@ dependencies = [ [[package]] name = "solana-program-test" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fca7ec596658aa595b0c0dcc2b925f82649650713fa55e26e1e449d7ed9172" +checksum = "b616b7154fb779a6feae69e44f50409d745d68cd56172feaaf1462371ef48904" dependencies = [ "assert_matches", "async-trait", - "base64 0.21.4", + "base64 0.21.7", "bincode", "chrono-humanize", "crossbeam-channel", @@ -4147,9 +4320,9 @@ dependencies = [ [[package]] name = "solana-pubsub-client" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "027474b27e0b9a986fcaed23be69cf6224850c92618b9e928578e1e1eb5509b5" +checksum = "e84d25c9d389e243b7ebfd92ed3c7ba539fc95dbc95e09e5b9fc34aa6ef2d658" dependencies = [ "crossbeam-channel", "futures-util", @@ -4172,9 +4345,9 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d475601d3f0ea8786d73e2dc9e618391b024bad186b923989c21d764611b5cea" +checksum = "049cb69a18bc5023ca2adb4f20fdc9e10e97aff0a922d925a7ecb3042e67bcd1" dependencies = [ "async-mutex", "async-trait", @@ -4199,9 +4372,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "381d33c3b8e34fe3212b8a7db05c436196ffbafaf7246251748f7fe7b7d181f6" +checksum = "322615866c372ac1521b41cec073a0a5df6d492794b49418c8ed47eb74114652" dependencies = [ "lazy_static", "num_cpus", @@ -4209,14 +4382,14 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb2c06d7e8e297df08236313df223da061b663073c50a209b8edf3acc0cda94" +checksum = "1239d53b3b544b9c5b27a65dc5d3d1fab77c124626a0aa09277e10b36badf9d3" dependencies = [ "console", "dialoguer", "log", - "num-derive 0.3.3", + "num-derive 0.4.1", "num-traits", "parking_lot", "qstring", @@ -4228,12 +4401,12 @@ dependencies = [ [[package]] name = "solana-rpc-client" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a102bd33bf0353f7fc2e70d9934efc3e63985513058fcb9e2fb7e93c4a524a" +checksum = "b70fe092aac226e94df0289045fce6520025141d3c131e556a19119eaac26c59" dependencies = [ "async-trait", - "base64 0.21.4", + "base64 0.21.7", "bincode", "bs58", "indicatif", @@ -4254,11 +4427,11 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d055c3c51c2d12f3f9b485bdd4273163597869815e698fb4574e3c6fdfc271" +checksum = "6c4d480cff245c3ba367d396da87e908095160cdf57f33efb5d1b08a7763d490" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", "bs58", "jsonrpc-core", "reqwest", @@ -4270,15 +4443,15 @@ dependencies = [ "solana-sdk", "solana-transaction-status", "solana-version", - "spl-token-2022 0.9.0", + "spl-token-2022 1.0.0", "thiserror", ] [[package]] name = "solana-rpc-client-nonce-utils" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16c425c6baf1bed99ee1171a5fb3f8cf7f3c54823ec0c52d0f91bddb5e3eb56e" +checksum = "7fc78ba1bb353500b23983f0f01957c6f37f54607f1275e4a7e4de1a77743cdc" dependencies = [ "clap 2.34.0", "solana-clap-utils", @@ -4289,12 +4462,13 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5898703f438e07c16b5b99a82a4ee4b1063b0a4dbdaee2f2c1b0748a1ce242ed" +checksum = "407a2ee089795479a82fd19bd998e652f91f826fca14a9c7fcdc37376fe80657" dependencies = [ + "aquamarine", "arrayref", - "base64 0.21.4", + "base64 0.21.7", "bincode", "blake3", "bv", @@ -4306,7 +4480,6 @@ dependencies = [ "dir-diff", "flate2", "fnv", - "fs-err", "im", "index_list", "itertools", @@ -4315,11 +4488,12 @@ dependencies = [ "lru", "lz4", "memmap2", + "mockall", "modular-bitfield", - "num-derive 0.3.3", + "num-derive 0.4.1", "num-traits", "num_cpus", - "num_enum 0.6.1", + "num_enum 0.7.2", "ouroboros", "percentage", "qualifier_attr", @@ -4330,7 +4504,6 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "siphasher", "solana-accounts-db", "solana-address-lookup-table-program", "solana-bpf-loader-program", @@ -4366,15 +4539,15 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3dcae28fb968bc1987f92c637d66477a337f9e54747596fe5c52d6a00729c99" +checksum = "90134b382769b2e7a1d87ae97d6242f1b7ce237591e06520641ad6e2df07653c" dependencies = [ "assert_matches", - "base64 0.21.4", + "base64 0.21.7", "bincode", - "bitflags 2.4.0", - "borsh 0.10.3", + "bitflags 2.4.2", + "borsh 1.3.1", "bs58", "bytemuck", "byteorder", @@ -4391,9 +4564,9 @@ dependencies = [ "libsecp256k1", "log", "memmap2", - "num-derive 0.3.3", + "num-derive 0.4.1", "num-traits", - "num_enum 0.6.1", + "num_enum 0.7.2", "pbkdf2 0.11.0", "qstring", "qualifier_attr", @@ -4406,8 +4579,9 @@ dependencies = [ "serde_derive", "serde_json", "serde_with 2.3.3", - "sha2 0.10.7", + "sha2 0.10.8", "sha3 0.10.6", + "siphasher", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-logger", @@ -4420,22 +4594,28 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47a1ff2ebb2fd8d50a592cb109cc6139b790de45bdbbfcfbbe7ecabb3725f7f" +checksum = "a3e3cdf8616a66e99343c3f99c39f311b4dc3e13977a4c96d7bbaa82dffd2fc5" dependencies = [ "bs58", "proc-macro2", "quote", "rustversion", - "syn 2.0.32", + "syn 2.0.48", ] +[[package]] +name = "solana-security-txt" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" + [[package]] name = "solana-send-transaction-service" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa43c85c4133d203bfac16df81ef9b61450bc04de356bbbcbdb2dacc8fbf2c9" +checksum = "ad25c815e37ff91ced26dfeacad438e036d34434d3d825293f96c226e1962a03" dependencies = [ "crossbeam-channel", "log", @@ -4449,9 +4629,9 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bed32467578b5a57cfc80b988d87fadb34f78071c614dfbe97b9bc86c46bbf8" +checksum = "3faf8ea1ea94de12c1bad8bd44fbc8aea31e23bee84452e03143428ff937c0cd" dependencies = [ "bincode", "log", @@ -4464,16 +4644,16 @@ dependencies = [ [[package]] name = "solana-streamer" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9400c2fb66622375b781ecbbba294db74dc98964fd7b5f0ef8b5333908b29d44" +checksum = "d18572dc946c176ff564c353a97c4bd8ce89774a95d98f1a9345c28e223948cd" dependencies = [ "async-channel", "bytes", "crossbeam-channel", "futures-util", "histogram", - "indexmap 2.0.2", + "indexmap 2.2.2", "itertools", "libc", "log", @@ -4496,9 +4676,9 @@ dependencies = [ [[package]] name = "solana-system-program" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "491b712308ab9323e9f5d05c14dbc9d477cffb987cd9ba560b27baa6bd65339c" +checksum = "107fae0f45ef55e8d01a844bdfab1740804e9abf1a0cafb0d7304a9cf40109a7" dependencies = [ "bincode", "log", @@ -4510,9 +4690,9 @@ dependencies = [ [[package]] name = "solana-thin-client" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e28f6a0e663c5d186f6833842a1b162eb8d46230197b7449357e8a832558fc2" +checksum = "994469881eda11c8160b6ad7f42b3eb53125b91cc4328675fcfb784a79a878e4" dependencies = [ "bincode", "log", @@ -4525,14 +4705,14 @@ dependencies = [ [[package]] name = "solana-tpu-client" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e88136236200594f3630e83ae9a3e40e8e931c89a738d6a0ec3b3360153faa9" +checksum = "c6bc1d8362ac84b281a880705faf5c0c4f813c4b335bac2456e89f4fee93aab7" dependencies = [ "async-trait", "bincode", "futures-util", - "indexmap 2.0.2", + "indexmap 2.2.2", "indicatif", "log", "rayon", @@ -4549,12 +4729,12 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a034f949893241b536c76f80472e19555297d5f695a5ddc84c2e29e55cbe5ff7" +checksum = "49b96a0b16e7bba624f778efd7ee532f91b0c540d453e25a02e9a43d590901bb" dependencies = [ "Inflector", - "base64 0.21.4", + "base64 0.21.7", "bincode", "borsh 0.10.3", "bs58", @@ -4565,18 +4745,18 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-sdk", - "spl-associated-token-account 2.2.0", + "spl-associated-token-account 2.3.0", "spl-memo 4.0.0", "spl-token 4.0.0", - "spl-token-2022 0.9.0", + "spl-token-2022 1.0.0", "thiserror", ] [[package]] name = "solana-udp-client" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416de133a871148d5b08788b8e84c61948d60c5ee3f8c99b34a763446b3e7b22" +checksum = "9d0bf02c785bd19e539801a0dd0ac603c6fb268237a21bdd330c3610d0140395" dependencies = [ "async-trait", "solana-connection-cache", @@ -4589,9 +4769,9 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdffe0a5ac4b599c310ebcc6c54021a15ec47dbd7d9be1cae29d17adc5cc1a62" +checksum = "2f184e53aa8f66521fcae40cab29817ff665e86c683f40e2acde9def04e928cb" dependencies = [ "log", "rustc_version", @@ -4605,9 +4785,9 @@ dependencies = [ [[package]] name = "solana-vote" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad503d112832a661529eb5cc5c095d28c137ff1a5a457b2357638cb8f8f6853f" +checksum = "e84336f5550309be2c9b83d8a5b487403cd82b49dc5255ddef7dd1297de9d846" dependencies = [ "crossbeam-channel", "itertools", @@ -4624,13 +4804,13 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9722d6013f6d25e422fbd7ddf2afe92f96fb016a650696d1bcfa24c5ebb69a71" +checksum = "4f1e7878ebcdd5b3c681493e674f53bdfcee7d9a455d32e8813484c602ffd74c" dependencies = [ "bincode", "log", - "num-derive 0.3.3", + "num-derive 0.4.1", "num-traits", "rustc_version", "serde", @@ -4646,12 +4826,12 @@ dependencies = [ [[package]] name = "solana-zk-token-proof-program" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a894473aa223eba4e3d58f34ba0e38eedc465c1dbb2a1b3df391799a18f28692" +checksum = "ba4506c4762f349afe6a0fe2df02613de03341da338220639afab3ab4b0e785f" dependencies = [ "bytemuck", - "num-derive 0.3.3", + "num-derive 0.4.1", "num-traits", "solana-program-runtime", "solana-sdk", @@ -4660,12 +4840,12 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.17.12" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a048ab6c1e3cd38f79aaee339b7ebcc9ecfd81e7434dc59a427eef7aa8d516" +checksum = "29693ea4eac0f076b9beb54db7c11d0220b110620aeee56a32ff2a49a170ebe8" dependencies = [ "aes-gcm-siv", - "base64 0.21.4", + "base64 0.21.7", "bincode", "bytemuck", "byteorder", @@ -4674,7 +4854,7 @@ dependencies = [ "itertools", "lazy_static", "merlin", - "num-derive 0.3.3", + "num-derive 0.4.1", "num-traits", "rand 0.7.3", "serde", @@ -5006,12 +5186,14 @@ dependencies = [ "serde_with 1.14.0", "solana-account-decoder", "solana-rpc-client-api", + "solana-transaction-status", "solders-account", "solders-macros", "solders-rpc-response-data-boilerplate", "solders-traits-core", "solders-transaction-error", "solders-transaction-return-data", + "solders-transaction-status", ] [[package]] @@ -5563,6 +5745,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + [[package]] name = "spki" version = "0.5.4" @@ -5591,9 +5779,9 @@ dependencies = [ [[package]] name = "spl-associated-token-account" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385e31c29981488f2820b2022d8e731aae3b02e6e18e2fd854e4c9a94dc44fc3" +checksum = "992d9c64c2564cc8f63a4b508bf3ebcdf2254b0429b13cd1d31adb6162432a5f" dependencies = [ "assert_matches", "borsh 0.10.3", @@ -5601,7 +5789,7 @@ dependencies = [ "num-traits", "solana-program", "spl-token 4.0.0", - "spl-token-2022 0.9.0", + "spl-token-2022 1.0.0", "thiserror", ] @@ -5624,7 +5812,7 @@ checksum = "fadbefec4f3c678215ca72bd71862697bb06b41fd77c0088902dd3203354387b" dependencies = [ "quote", "spl-discriminator-syn", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -5635,8 +5823,8 @@ checksum = "0e5f2044ca42c8938d54d1255ce599c79a1ffd86b677dfab695caa20f9ffc3f2" dependencies = [ "proc-macro2", "quote", - "sha2 0.10.7", - "syn 2.0.32", + "sha2 0.10.8", + "syn 2.0.48", "thiserror", ] @@ -5692,15 +5880,15 @@ checksum = "ab5269c8e868da17b6552ef35a51355a017bd8e0eae269c201fef830d35fa52c" dependencies = [ "proc-macro2", "quote", - "sha2 0.10.7", - "syn 2.0.32", + "sha2 0.10.8", + "syn 2.0.48", ] [[package]] name = "spl-tlv-account-resolution" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062e148d3eab7b165582757453632ffeef490c02c86a48bfdb4988f63eefb3b9" +checksum = "615d381f48ddd2bb3c57c7f7fb207591a2a05054639b18a62e785117dd7a8683" dependencies = [ "bytemuck", "solana-program", @@ -5760,26 +5948,41 @@ dependencies = [ [[package]] name = "spl-token-2022" -version = "0.9.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4abf34a65ba420584a0c35f3903f8d727d1f13ababbdc3f714c6b065a686e86" +checksum = "d697fac19fd74ff472dfcc13f0b442dd71403178ce1de7b5d16f83a33561c059" dependencies = [ "arrayref", "bytemuck", "num-derive 0.4.1", "num-traits", - "num_enum 0.7.0", + "num_enum 0.7.2", "solana-program", + "solana-security-txt", "solana-zk-token-sdk", "spl-memo 4.0.0", "spl-pod", "spl-token 4.0.0", + "spl-token-group-interface", "spl-token-metadata-interface", "spl-transfer-hook-interface", "spl-type-length-value", "thiserror", ] +[[package]] +name = "spl-token-group-interface" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b889509d49fa74a4a033ca5dae6c2307e9e918122d97e58562f5c4ffa795c75d" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", +] + [[package]] name = "spl-token-metadata-interface" version = "0.2.0" @@ -5796,9 +5999,9 @@ dependencies = [ [[package]] name = "spl-transfer-hook-interface" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "051d31803f873cabe71aec3c1b849f35248beae5d19a347d93a5c9cccc5d5a9b" +checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259" dependencies = [ "arrayref", "bytemuck", @@ -5888,15 +6091,33 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.32" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "synstructure" version = "0.12.6" @@ -5909,6 +6130,27 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tar" version = "0.4.40" @@ -5963,15 +6205,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5983,11 +6225,17 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "termtree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" + [[package]] name = "test-case" -version = "3.2.1" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425" +checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" dependencies = [ "test-case-macros", ] @@ -6002,7 +6250,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -6014,7 +6262,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", "test-case-core", ] @@ -6035,22 +6283,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -6138,7 +6386,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.4", + "socket2 0.5.5", "tokio-macros", "windows-sys 0.48.0", ] @@ -6151,7 +6399,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -6252,7 +6500,7 @@ checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" dependencies = [ "serde", "serde_spanned", - "toml_datetime 0.6.1", + "toml_datetime 0.6.5", "toml_edit 0.19.8", ] @@ -6264,9 +6512,9 @@ checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -6291,8 +6539,19 @@ dependencies = [ "indexmap 1.9.3", "serde", "serde_spanned", - "toml_datetime 0.6.1", - "winnow", + "toml_datetime 0.6.5", + "winnow 0.4.6", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.2", + "toml_datetime 0.6.5", + "winnow 0.5.37", ] [[package]] @@ -6456,6 +6715,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "uriparse" version = "0.6.4" @@ -6468,9 +6733,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -6542,9 +6807,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -6552,16 +6817,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", "wasm-bindgen-shared", ] @@ -6579,9 +6844,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6589,22 +6854,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "web-sys" @@ -6695,6 +6960,15 @@ dependencies = [ "windows-targets 0.48.0", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-targets" version = "0.42.1" @@ -6725,6 +6999,21 @@ dependencies = [ "windows_x86_64_msvc 0.48.0", ] +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.1" @@ -6737,6 +7026,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.42.1" @@ -6749,6 +7044,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.42.1" @@ -6761,6 +7062,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.42.1" @@ -6773,6 +7080,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.42.1" @@ -6785,6 +7098,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.1" @@ -6797,6 +7116,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.42.1" @@ -6809,6 +7134,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "winnow" version = "0.4.6" @@ -6818,6 +7149,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.5.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cad8365489051ae9f054164e459304af2e7e9bb407c958076c8bf4aef52da5" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.50.0" @@ -6864,6 +7204,26 @@ dependencies = [ "time", ] +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "zeroize" version = "1.3.0" diff --git a/Cargo.toml b/Cargo.toml index 4d77e00a..92cd112c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -118,11 +118,11 @@ solders-transaction-error = { path = "./crates/transaction-error", version = "=0 solders-account = { path = "./crates/account", version = "=0.19.0" } solders-hash = { path = "./crates/hash", version = "=0.19.0" } serde_with = { version = "^1.14.0", features = ["base64"] } -solana-sdk = "1.17.12" -solana-account-decoder = "1.17.12" -solana-transaction-status = "1.17.12" -solana-rpc-client-api = "1.17.12" -solana-program = "1.17.12" +solana-sdk = "1.18.1" +solana-account-decoder = "1.18.1" +solana-transaction-status = "1.18.1" +solana-rpc-client-api = "1.18.1" +solana-program = "1.18.1" bincode = "1.3.3" base64 = "0.13.0" serde = "^1.0.188" @@ -130,8 +130,8 @@ serde_bytes = "0.11.12" serde_json = "^1.0.106" serde_cbor = "^0.11.2" derive_more = "0.99.17" -solana-program-test = "1.17.12" -solana-banks-client = "1.17.12" +solana-program-test = "1.18.1" +solana-banks-client = "1.18.1" pythonize = "0.19.0" bs58 = "0.4.0" thiserror = "^1.0.31" diff --git a/crates/rpc-common/Cargo.toml b/crates/rpc-common/Cargo.toml index d1147beb..88ff2c55 100644 --- a/crates/rpc-common/Cargo.toml +++ b/crates/rpc-common/Cargo.toml @@ -15,9 +15,11 @@ derive_more = { workspace = true } solders-macros = { workspace = true } solders-traits-core = { workspace = true } solana-account-decoder = { workspace = true } +solana-transaction-status = { workspace = true } solana-rpc-client-api = { workspace = true } solders-account = { workspace = true } solders-rpc-response-data-boilerplate = { workspace = true } solders-transaction-return-data = { workspace = true } solders-transaction-error = { workspace = true } +solders-transaction-status = { workspace = true } serde_with = { workspace = true } diff --git a/crates/rpc-common/src/lib.rs b/crates/rpc-common/src/lib.rs index 2c537c60..26a92d3e 100644 --- a/crates/rpc-common/src/lib.rs +++ b/crates/rpc-common/src/lib.rs @@ -4,11 +4,13 @@ use serde_with::serde_as; use solana_account_decoder::UiAccount; use solana_rpc_client_api::response::RpcSimulateTransactionResult as RpcSimulateTransactionResultOriginal; +use solana_transaction_status::UiInnerInstructions as UiInnerInstructionsOriginal; use solders_account::Account; use solders_macros::{common_methods, richcmp_eq_only}; use solders_rpc_response_data_boilerplate::response_data_boilerplate; use solders_transaction_error::TransactionErrorType; use solders_transaction_return_data::TransactionReturnData; +use solders_transaction_status::UiInnerInstructions; #[serde_as] #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)] @@ -29,18 +31,22 @@ impl RpcSimulateTransactionResult { accounts: Option>>, units_consumed: Option, return_data: Option, + inner_instructions: Option>, ) -> Self { let accounts_underlying: Option>> = accounts.map(|accs| { accs.into_iter() .map(|maybe_acc| maybe_acc.map(UiAccount::from)) .collect() }); + let inner_instructions_underlying: Option> = + inner_instructions.map(|ixns| ixns.into_iter().map(Into::into).collect()); Self(RpcSimulateTransactionResultOriginal { err: err.map(Into::into), logs, accounts: accounts_underlying, units_consumed, return_data: return_data.map(Into::into), + inner_instructions: inner_instructions_underlying, }) } diff --git a/crates/rpc-sim-transaction-config/src/lib.rs b/crates/rpc-sim-transaction-config/src/lib.rs index ce051850..4bc60832 100644 --- a/crates/rpc-sim-transaction-config/src/lib.rs +++ b/crates/rpc-sim-transaction-config/src/lib.rs @@ -32,13 +32,14 @@ pyclass_boilerplate_with_default!( #[pymethods] impl RpcSimulateTransactionConfig { #[new] - #[pyo3(signature = (sig_verify=false, replace_recent_blockhash=false, commitment=None, accounts=None, min_context_slot=None))] + #[pyo3(signature = (sig_verify=false, replace_recent_blockhash=false, commitment=None, accounts=None, min_context_slot=None, inner_instructions=false))] fn new( sig_verify: bool, replace_recent_blockhash: bool, commitment: Option, accounts: Option, min_context_slot: Option, + inner_instructions: bool, ) -> Self { Self(rpc_config::RpcSimulateTransactionConfig { sig_verify, @@ -47,6 +48,7 @@ impl RpcSimulateTransactionConfig { encoding: Some(UiTransactionEncodingOriginal::Base64), accounts: accounts.map(|a| a.into()), min_context_slot, + inner_instructions, }) } @@ -89,4 +91,9 @@ impl RpcSimulateTransactionConfig { pub fn min_context_slot(&self) -> Option { self.0.min_context_slot } + + #[getter] + pub fn inner_instructions(&self) -> bool { + self.0.inner_instructions + } } diff --git a/python/solders/rpc/config.pyi b/python/solders/rpc/config.pyi index 54f03771..cf7d6298 100644 --- a/python/solders/rpc/config.pyi +++ b/python/solders/rpc/config.pyi @@ -77,6 +77,7 @@ class RpcSimulateTransactionConfig: commitment: Optional[CommitmentLevel] = None, accounts: Optional[RpcSimulateTransactionAccountsConfig] = None, min_context_slot: Optional[int] = None, + inner_instructions: bool = False, ): ... @property def sig_verify(self) -> bool: ... @@ -88,6 +89,8 @@ class RpcSimulateTransactionConfig: def accounts(self) -> Optional[RpcSimulateTransactionAccountsConfig]: ... @property def min_context_slot(self) -> Optional[int]: ... + @property + def inner_instructions(self) -> bool: ... def __bytes__(self) -> bytes: ... def __str__(self) -> str: ... def __repr__(self) -> str: ... diff --git a/python/solders/rpc/responses.pyi b/python/solders/rpc/responses.pyi index 00f29caf..d8138360 100644 --- a/python/solders/rpc/responses.pyi +++ b/python/solders/rpc/responses.pyi @@ -37,6 +37,7 @@ from solders.transaction_status import ( TransactionReturnData, TransactionStatus, UiConfirmedBlock, + UiInnerInstructions, ) class RpcResponseContext: @@ -446,6 +447,7 @@ class RpcSimulateTransactionResult: accounts: Optional[List[Optional[Account]]] units_consumed: Optional[int] return_data: Optional[TransactionReturnData] + inner_instructions: Optional[List[UiInnerInstructions]] def __init__( self, err: Optional[TransactionErrorType] = None, @@ -453,6 +455,7 @@ class RpcSimulateTransactionResult: accounts: Optional[Sequence[Optional[Account]]] = None, units_consumed: Optional[int] = None, return_data: Optional[TransactionReturnData] = None, + inner_instructions: Optional[List[UiInnerInstructions]] = None, ) -> None: ... def to_json(self) -> str: ... @staticmethod diff --git a/rust-toolchain.toml b/rust-toolchain.toml index f29634cd..6d8d7cb8 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.72.0" +channel = "1.75.0" components = [ "clippy"] From 64b513aefbb96e0db8232b08c12e8efb88bf6692 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Sun, 4 Feb 2024 18:32:27 +0400 Subject: [PATCH 02/14] add test_versioned_transaction_json --- tests/test_versioned_transaction.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/test_versioned_transaction.py b/tests/test_versioned_transaction.py index 4c388db1..8c8344f7 100644 --- a/tests/test_versioned_transaction.py +++ b/tests/test_versioned_transaction.py @@ -235,3 +235,12 @@ def test_message_missing_byte() -> None: with raises(TransactionError): signed_tx_populate_bad.verify_and_hash_message() signed_tx_populate_good.verify_and_hash_message() + + +def test_versioned_transaction_json() -> None: + signer = Keypair() + msg = MessageV0.try_compile(signer.pubkey(), [], [], Hash.default()) + tx = VersionedTransaction(msg, [signer]) + json = tx.to_json() + parsed = VersionedTransaction.from_json(json) + assert parsed == tx From cf38014516440043276ce5f82382f9670238f9c9 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Sun, 4 Feb 2024 18:36:50 +0400 Subject: [PATCH 03/14] update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfe9c16b..568a6c19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [0.20.0] - Unreleased + +### Added + +- Upgrade to Solana 1.18.1 [(#80)](https://github.com/kevinheavey/solders/pull/80) + ## [0.19.0] - 2024-01-01 ### Added From 8bff15de789bff61603f37cb75c7b61aae2707b0 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Sun, 4 Feb 2024 19:49:19 +0400 Subject: [PATCH 04/14] don't build bankrun on linux-aarch64 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 049c669b..09a5d0ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -245,7 +245,7 @@ jobs: with: target: aarch64 manylinux: auto - args: --release --out dist + args: --release --no-default-features --out dist maturin-version: ${{ env.maturin_version }} - name: Upload wheels uses: actions/upload-artifact@v2 From 945f705c8846269fc9701fda038d8a9bd83255cb Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Mon, 5 Feb 2024 04:20:26 +0400 Subject: [PATCH 05/14] fix docstrings --- crates/rpc-requests/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/rpc-requests/src/lib.rs b/crates/rpc-requests/src/lib.rs index 8082ace2..f6042d52 100644 --- a/crates/rpc-requests/src/lib.rs +++ b/crates/rpc-requests/src/lib.rs @@ -2286,7 +2286,7 @@ request_boilerplate!(SendRawTransaction); /// >>> commitment = CommitmentLevel.Confirmed /// >>> config = RpcSimulateTransactionConfig(commitment=commitment, accounts=accounts_config) /// >>> SimulateLegacyTransaction(tx, config).to_json() -/// '{"method":"simulateTransaction","jsonrpc":"2.0","id":0,"params":["AaVkKDb3UlpidO/ucBnOcmS+1dY8ZAC4vHxTxiccV8zPBlupuozppRjwrILZJaoKggAcVSD1XlAKstDVEPFOVgwBAAECiojj3XQJ8ZX9UtstPLpdcspnCb8dlBIb83SIAbQPb1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAA2FiYw==",{"sigVerify":false,"replaceRecentBlockhash":false,"commitment":"confirmed","encoding":"base64","accounts":{"encoding":"base64+zstd","addresses":["11111111111111111111111111111111"]},"minContextSlot":null}]}' +/// '{"method":"simulateTransaction","jsonrpc":"2.0","id":0,"params":["AaVkKDb3UlpidO/ucBnOcmS+1dY8ZAC4vHxTxiccV8zPBlupuozppRjwrILZJaoKggAcVSD1XlAKstDVEPFOVgwBAAECiojj3XQJ8ZX9UtstPLpdcspnCb8dlBIb83SIAbQPb1wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEAA2FiYw==",{"sigVerify":false,"replaceRecentBlockhash":false,"commitment":"confirmed","encoding":"base64","accounts":{"encoding":"base64+zstd","addresses":["11111111111111111111111111111111"]},"minContextSlot":null,"innerInstructions":false}]}' /// #[pyclass(module = "solders.rpc.requests")] #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] @@ -2355,7 +2355,7 @@ request_boilerplate!(SimulateLegacyTransaction); /// >>> commitment = CommitmentLevel.Confirmed /// >>> config = RpcSimulateTransactionConfig(commitment=commitment, accounts=accounts_config) /// >>> SimulateVersionedTransaction(tx, config).to_json() -/// '{"method":"simulateTransaction","jsonrpc":"2.0","id":0,"params":["AAEAAQKKiOPddAnxlf1S2y08ul1yymcJvx2UEhvzdIgBtA9vXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQADYWJj",{"sigVerify":false,"replaceRecentBlockhash":false,"commitment":"confirmed","encoding":"base64","accounts":{"encoding":"base64+zstd","addresses":["11111111111111111111111111111111"]},"minContextSlot":null}]}' +/// '{"method":"simulateTransaction","jsonrpc":"2.0","id":0,"params":["AAEAAQKKiOPddAnxlf1S2y08ul1yymcJvx2UEhvzdIgBtA9vXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQADYWJj",{"sigVerify":false,"replaceRecentBlockhash":false,"commitment":"confirmed","encoding":"base64","accounts":{"encoding":"base64+zstd","addresses":["11111111111111111111111111111111"]},"minContextSlot":null,"innerInstructions":false}]}' /// #[pyclass(module = "solders.rpc.requests")] #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)] From 890cd7094bf08f3bfb377b23b86032cd15dd9497 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Mon, 12 Feb 2024 04:07:17 +0400 Subject: [PATCH 06/14] don't use crates that require ring on linux-aarch64 --- .github/workflows/build.yml | 8 ++--- Cargo.toml | 46 ++++++++++++++++---------- crates/rpc-responses-common/src/lib.rs | 2 +- python/solders/__init__.py | 28 +++++++++++----- src/lib.rs | 41 +++++++++++++++-------- 5 files changed, 79 insertions(+), 46 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09a5d0ce..fe310645 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -88,7 +88,7 @@ jobs: uses: messense/maturin-action@v1 with: target: x64 - args: --release --no-default-features --out dist + args: --release -F ring --out dist maturin-version: ${{ env.maturin_version }} - name: Install built wheel run: | @@ -153,7 +153,7 @@ jobs: with: target: i686 manylinux: auto - args: --release --no-default-features --out dist + args: --release -F ring --out dist maturin-version: ${{ env.maturin_version }} - name: Upload wheels uses: actions/upload-artifact@v2 @@ -219,7 +219,7 @@ jobs: with: target: i686-unknown-linux-musl manylinux: musllinux_1_2 - args: --release --no-default-features --out dist + args: --release -F ring --out dist maturin-version: ${{ env.maturin_version }} - name: Upload wheels uses: actions/upload-artifact@v2 @@ -271,7 +271,7 @@ jobs: with: target: armv7 manylinux: auto - args: --release --no-default-features --out dist + args: --release -F ring --out dist maturin-version: ${{ env.maturin_version }} - name: Upload wheels uses: actions/upload-artifact@v2 diff --git a/Cargo.toml b/Cargo.toml index 92cd112c..e16f4fc9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,34 +19,44 @@ solana-sdk = { workspace = true } bincode = { workspace = true } serde = { workspace = true } derive_more = { workspace = true } -solders-traits = { workspace = true } -solders-primitives = { workspace = true } -solders-account = { workspace = true } -solders-account-decoder = { workspace = true } +solders-account = { workspace = true, optional = true } +solders-account-decoder = { workspace = true, optional = true } +solders-address-lookup-table-account = { workspace = true } +solders-bankrun = { workspace = true, optional = true } solders-compute-budget = { workspace = true } solders-commitment-config = { workspace = true } solders-epoch-info = { workspace = true } -solders-rpc-filter = { workspace = true } -solders-rpc-config = { workspace = true } -solders-rpc-errors = { workspace = true } -solders-rpc-requests = { workspace = true } -solders-rpc-responses = { workspace = true } -solders-pubkey = { workspace = true } -solders-system-program = { workspace = true } +solders-hash = { workspace = true } solders-instruction = { workspace = true } +solders-keypair = { workspace = true } solders-message = { workspace = true } -solders-address-lookup-table-account = { workspace = true } +solders-primitives = { workspace = true } +solders-pubkey = { workspace = true } +solders-rpc-config = { workspace = true, optional = true } +solders-rpc-errors = { workspace = true, optional = true } +solders-rpc-filter = { workspace = true, optional = true } +solders-rpc-requests = { workspace = true, optional = true } +solders-rpc-responses = { workspace = true, optional = true } solders-signature = { workspace = true } -solders-transaction-status = { workspace = true } -solders-hash = { workspace = true } -solders-keypair = { workspace = true } -solders-token = { workspace = true } +solders-system-program = { workspace = true } +solders-traits = { workspace = true } solders-transaction = { workspace = true } -solders-bankrun = { workspace = true, optional = true } +solders-transaction-status = { workspace = true, optional = true } +solders-token = { workspace = true } [features] -default = ["bankrun"] +default = ["bankrun", "ring"] bankrun = ["dep:solders-bankrun"] +ring = [ + "dep:solders-account", + "dep:solders-account-decoder", + "dep:solders-rpc-config", + "dep:solders-rpc-errors", + "dep:solders-rpc-filter", + "dep:solders-rpc-requests", + "dep:solders-rpc-responses", + "dep:solders-transaction-status" +] [workspace] members = [ diff --git a/crates/rpc-responses-common/src/lib.rs b/crates/rpc-responses-common/src/lib.rs index 3efd1e7e..f91232e3 100644 --- a/crates/rpc-responses-common/src/lib.rs +++ b/crates/rpc-responses-common/src/lib.rs @@ -383,7 +383,7 @@ impl From for UiAccount { fn from(a: AccountMaybeJSON) -> Self { match a { AccountMaybeJSON::Binary(acc) => Self::from(acc), - AccountMaybeJSON::Parsed(acc) => Self::try_from(acc).unwrap(), + AccountMaybeJSON::Parsed(acc) => Self::from(acc), } } } diff --git a/python/solders/__init__.py b/python/solders/__init__.py index 7468f193..91978b68 100644 --- a/python/solders/__init__.py +++ b/python/solders/__init__.py @@ -2,8 +2,6 @@ from solders.solders import __version__ as _version_untyped # type: ignore from solders.solders import ( - account, - account_decoder, address_lookup_table_account, clock, commitment_config, @@ -19,11 +17,9 @@ presigner, pubkey, rent, - rpc, signature, token, transaction, - transaction_status, ) from . import system_program, sysvar @@ -34,9 +30,16 @@ __has_bankrun = True +__has_ring = False +with __ctxlib.suppress(ImportError): + from solders.solders import account, account_decoder, rpc, transaction_status + + __has_ring = True + + +__ring_modules = ["account", "account_decoder", "rpc", "transaction_status"] __all_core = [ - "account_decoder", "address_lookup_table_account", "commitment_config", "errors", @@ -47,15 +50,22 @@ "null_signer", "presigner", "pubkey", - "rpc", "signature", "token", "transaction", - "transaction_status", - "sysvar", "system_program", + "sysvar", ] -__all__ = [*__all_core, "bankrun"] if __has_bankrun else __all_core # noqa: PLE0605 +__with_ring_modules = [*__all_core, *__ring_modules] + +if __has_ring: + if __has_bankrun: + __all__ = [*__with_ring_modules, "bankrun"] # noqa: PLE0604 + else: + __all__ = __with_ring_modules # noqa: PLE0605 +else: + __all__ = __all_core # noqa: PLE0605 + __version__: str = _version_untyped diff --git a/src/lib.rs b/src/lib.rs index 5a1fc28a..fffae952 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,21 +3,26 @@ //! If you're viewing them on docs.rs, the formatting won't make much sense. use address_lookup_table_account::create_address_lookup_table_account_mod; use pyo3::prelude::*; +#[cfg(feature = "ring")] use rpc::create_rpc_mod; +#[cfg(feature = "ring")] use solders_account::create_account_mod; use solders_instruction::{AccountMeta, CompiledInstruction, Instruction}; use solders_system_program::create_system_program_mod; use solders_token::create_token_mod; use solders_traits::{BincodeError, CborError, ParseHashError, SerdeJSONError, SignerError}; +#[cfg(feature = "ring")] use solders_transaction_status::create_transaction_status_mod; use std::collections::HashMap; use sysvar::create_sysvar_mod; pub mod message; use message::create_message_mod; pub mod transaction; +#[cfg(feature = "ring")] use solders_account_decoder::create_account_decoder_mod; use transaction::create_transaction_mod; pub mod address_lookup_table_account; +#[cfg(feature = "ring")] pub mod rpc; pub mod sysvar; use solders_commitment_config::{CommitmentConfig, CommitmentLevel}; @@ -59,12 +64,16 @@ fn solders(py: Python, m: &PyModule) -> PyResult<()> { errors_mod.add("SignerError", py.get_type::())?; errors_mod.add("CborError", py.get_type::())?; errors_mod.add("SerdeJSONError", py.get_type::())?; + #[cfg(feature = "ring")] let rpc_mod = create_rpc_mod(py)?; let commitment_config_mod = PyModule::new(py, "commitment_config")?; commitment_config_mod.add_class::()?; commitment_config_mod.add_class::()?; + #[cfg(feature = "ring")] let transaction_status_mod = create_transaction_status_mod(py)?; + #[cfg(feature = "ring")] let account_decoder_mod = create_account_decoder_mod(py)?; + #[cfg(feature = "ring")] let account_mod = create_account_mod(py)?; let epoch_schedule_mod = create_epoch_schedule_mod(py)?; let address_lookup_table_account_mod = create_address_lookup_table_account_mod(py)?; @@ -76,6 +85,18 @@ fn solders(py: Python, m: &PyModule) -> PyResult<()> { let compute_budget_mod = create_compute_budget_mod(py)?; let token_mod = create_token_mod(py)?; let submodules = [ + #[cfg(feature = "ring")] + account_mod, + #[cfg(feature = "ring")] + account_decoder_mod, + address_lookup_table_account_mod, + #[cfg(feature = "bankrun")] + bankrun_mod, + clock_mod, + commitment_config_mod, + compute_budget_mod, + epoch_info_mod, + epoch_schedule_mod, errors_mod, hash_mod, instruction_mod, @@ -84,24 +105,16 @@ fn solders(py: Python, m: &PyModule) -> PyResult<()> { null_signer_mod, presigner_mod, pubkey_mod, + rent_mod, + #[cfg(feature = "ring")] + rpc_mod, signature_mod, - transaction_mod, system_program_mod, sysvar_mod, - rpc_mod, - commitment_config_mod, - transaction_status_mod, - account_decoder_mod, - account_mod, - address_lookup_table_account_mod, - epoch_schedule_mod, - #[cfg(feature = "bankrun")] - bankrun_mod, - clock_mod, - rent_mod, - epoch_info_mod, - compute_budget_mod, token_mod, + transaction_mod, + #[cfg(feature = "ring")] + transaction_status_mod, ]; let modules: HashMap = submodules .iter() From 7d9e5cc86bfa5bca8dab4e8d7ef270ff9453758f Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Mon, 12 Feb 2024 04:08:03 +0400 Subject: [PATCH 07/14] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 568a6c19..658b0ca9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Added -- Upgrade to Solana 1.18.1 [(#80)](https://github.com/kevinheavey/solders/pull/80) +- Upgrade to Solana 1.18.1 [(#80)](https://github.com/kevinheavey/solders/pull/80). This also takes out the `ring` dependency (and all crates that use it) for linux-aarch64 builds. ## [0.19.0] - 2024-01-01 From d727b0f04fe055c7d3840a0f28f4585bf35243cb Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Mon, 12 Feb 2024 04:18:35 +0400 Subject: [PATCH 08/14] update lock file --- Cargo.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.lock b/Cargo.lock index 2d5cb848..2d03ceb7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4965,6 +4965,7 @@ dependencies = [ "pyo3", "serde", "solana-program", + "solders-hash", "solders-macros", "solders-pubkey", "solders-traits-core", From 5ee803904269676bce50749e88842130aba455a0 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Mon, 12 Feb 2024 04:18:38 +0400 Subject: [PATCH 09/14] lint --- crates/address-lookup-table-account/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/address-lookup-table-account/src/lib.rs b/crates/address-lookup-table-account/src/lib.rs index 2bc8a512..7f0f3cf3 100644 --- a/crates/address-lookup-table-account/src/lib.rs +++ b/crates/address-lookup-table-account/src/lib.rs @@ -162,7 +162,7 @@ pub struct SlotHashes(SlotHashesOriginal); impl Clone for SlotHashes { fn clone(&self) -> Self { - SlotHashes(SlotHashesOriginal::new(self.0.slot_hashes().clone())) + SlotHashes(SlotHashesOriginal::new(self.0.slot_hashes())) } } From b8d5aa24a1206c80ea58aa9fd0348e7cd3818df4 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Mon, 12 Feb 2024 04:30:54 +0400 Subject: [PATCH 10/14] add back missing --no-default-features --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fe310645..a4b65948 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -88,7 +88,7 @@ jobs: uses: messense/maturin-action@v1 with: target: x64 - args: --release -F ring --out dist + args: --release --no-default-features -F ring --out dist maturin-version: ${{ env.maturin_version }} - name: Install built wheel run: | @@ -153,7 +153,7 @@ jobs: with: target: i686 manylinux: auto - args: --release -F ring --out dist + args: --release --no-default-features -F ring --out dist maturin-version: ${{ env.maturin_version }} - name: Upload wheels uses: actions/upload-artifact@v2 @@ -219,7 +219,7 @@ jobs: with: target: i686-unknown-linux-musl manylinux: musllinux_1_2 - args: --release -F ring --out dist + args: --release --no-default-features -F ring --out dist maturin-version: ${{ env.maturin_version }} - name: Upload wheels uses: actions/upload-artifact@v2 @@ -271,7 +271,7 @@ jobs: with: target: armv7 manylinux: auto - args: --release -F ring --out dist + args: --release --no-default-features -F ring --out dist maturin-version: ${{ env.maturin_version }} - name: Upload wheels uses: actions/upload-artifact@v2 From c2eb190c0dc11f459aca4ba9ce321a5b1b6ba80c Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Mon, 12 Feb 2024 04:48:57 +0400 Subject: [PATCH 11/14] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 658b0ca9..070ffaab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [0.20.0] - Unreleased +## [0.20.0] - 2024-02-12 ### Added From ff7e9c8eb2be492cbbdaa531115dacd333cb9544 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Mon, 12 Feb 2024 04:50:27 +0400 Subject: [PATCH 12/14] more changelog updates --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 070ffaab..9ac662b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ ### Added +- Add address lookup table instructions and state [(#79)](https://github.com/kevinheavey/solders/pull/79) + +### Changed + - Upgrade to Solana 1.18.1 [(#80)](https://github.com/kevinheavey/solders/pull/80). This also takes out the `ring` dependency (and all crates that use it) for linux-aarch64 builds. ## [0.19.0] - 2024-01-01 From f2c24865bca319cc2779f8a2f5e4b42b6a3da242 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Mon, 12 Feb 2024 04:50:45 +0400 Subject: [PATCH 13/14] =?UTF-8?q?Bump=20version:=200.19.0=20=E2=86=92=200.?= =?UTF-8?q?20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- Cargo.toml | 112 +++++++++++++++++++++++------------------------ docs/conf.py | 2 +- pyproject.toml | 4 +- 4 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index a74b6fa7..5ec8a1bf 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.19.0 +current_version = 0.20.0 commit = True tag = False diff --git a/Cargo.toml b/Cargo.toml index e16f4fc9..42a0e951 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,67 +66,67 @@ members = [ ] [workspace.package] -version = "0.19.0" +version = "0.20.0" repository = "https://github.com/kevinheavey/solders" license = "MIT" edition = "2021" [workspace.dependencies] pyo3 = { version = "0.19.2", default-features = false } -solders-macros = { path = "./crates/macros", version = "=0.19.0" } -solders-traits = { path = "./crates/traits", version = "=0.19.0" } -solders-traits-core = { path = "./crates/traits-core", version = "=0.19.0" } -solders-account-decoder = { path = "./crates/account-decoder", version = "=0.19.0" } -solders-bankrun = { path = "./crates/bankrun", version = "=0.19.0" } -solders-banks-interface = { path = "./crates/banks-interface", version = "=0.19.0" } -solders-commitment-config = { path = "./crates/commitment-config", version = "=0.19.0" } -solders-compute-budget = { path = "./crates/compute-budget", version = "=0.19.0" } -solders-epoch-info = { path = "./crates/epoch-info", version = "=0.19.0" } -solders-transaction-confirmation-status = { path = "./crates/transaction-confirmation-status", version = "=0.19.0" } -solders-transaction-return-data = { path = "./crates/transaction-return-data", version = "=0.19.0" } -solders-transaction-status = { path = "./crates/transaction-status", version = "=0.19.0" } -solders-transaction-status-enums = { path = "./crates/transaction-status-enums", version = "=0.19.0" } -solders-transaction-status-struct = { path = "./crates/transaction-status-struct", version = "=0.19.0" } -solders-base64-string = { path = "./crates/base64-string", version = "=0.19.0" } -solders-rpc-filter = { path = "./crates/rpc-filter", version = "=0.19.0" } -solders-rpc-config = { path = "./crates/rpc-config", version = "=0.19.0" } -solders-rpc-config-macros = { path = "./crates/rpc-config-macros", version = "=0.19.0" } -solders-rpc-config-no-filter = { path = "./crates/rpc-config-no-filter", version = "=0.19.0" } -solders-rpc-config-no-rpc-api = { path = "./crates/rpc-config-no-rpc-api", version = "=0.19.0" } -solders-rpc-account-info-config = { path = "./crates/rpc-account-info-config", version = "=0.19.0" } -solders-rpc-program-accounts-config = { path = "./crates/rpc-program-accounts-config", version = "=0.19.0" } -solders-rpc-common = { path = "./crates/rpc-common", version = "=0.19.0" } -solders-rpc-errors = { path = "./crates/rpc-errors", version = "=0.19.0" } -solders-rpc-errors-common = { path = "./crates/rpc-errors-common", version = "=0.19.0" } -solders-rpc-errors-tx-status = { path = "./crates/rpc-errors-tx-status", version = "=0.19.0" } -solders-rpc-errors-no-tx-status = { path = "./crates/rpc-errors-no-tx-status", version = "=0.19.0" } -solders-rpc-request-airdrop-config = { path = "./crates/rpc-request-airdrop-config", version = "=0.19.0" } -solders-rpc-request-params = { path = "./crates/rpc-request-params", version = "=0.19.0" } -solders-rpc-request-params-no-config = { path = "./crates/rpc-request-params-no-config", version = "=0.19.0" } -solders-rpc-requests = { path = "./crates/rpc-requests", version = "=0.19.0" } -solders-rpc-responses = { path = "./crates/rpc-responses", version = "=0.19.0" } -solders-rpc-responses-common = { path = "./crates/rpc-responses-common", version = "=0.19.0" } -solders-rpc-responses-tx-status = { path = "./crates/rpc-responses-tx-status", version = "=0.19.0" } -solders-rpc-response-data-boilerplate = { path = "./crates/rpc-response-data-boilerplate", version = "=0.19.0" } -solders-rpc-send-transaction-config = { path = "./crates/rpc-send-transaction-config", version = "=0.19.0" } -solders-rpc-sig-status-config = { path = "./crates/rpc-sig-status-config", version = "=0.19.0" } -solders-rpc-sigs-for-address-config = { path = "./crates/rpc-sigs-for-address-config", version = "=0.19.0" } -solders-rpc-sim-transaction-config = { path = "./crates/rpc-sim-transaction-config", version = "=0.19.0" } -solders-rpc-simulate-tx-accounts-config = { path = "./crates/rpc-simulate-tx-accounts-config", version = "=0.19.0" } -solders-rpc-version = { path = "./crates/rpc-version", version = "=0.19.0" } -solders-primitives = { path = "./crates/primitives", version = "=0.19.0" } -solders-pubkey = { path = "./crates/pubkey", version = "=0.19.0" } -solders-system-program = { path = "./crates/system-program", version = "=0.19.0" } -solders-instruction = { path = "./crates/instruction", version = "=0.19.0" } -solders-address-lookup-table-account = { path = "./crates/address-lookup-table-account", version = "=0.19.0" } -solders-message = { path = "./crates/message", version = "=0.19.0" } -solders-signature = { path = "./crates/signature", version = "=0.19.0" } -solders-keypair = { path = "./crates/keypair", version = "=0.19.0" } -solders-token = { path = "./crates/token", version = "=0.19.0" } -solders-transaction = { path = "./crates/transaction", version = "=0.19.0" } -solders-transaction-error = { path = "./crates/transaction-error", version = "=0.19.0" } -solders-account = { path = "./crates/account", version = "=0.19.0" } -solders-hash = { path = "./crates/hash", version = "=0.19.0" } +solders-macros = { path = "./crates/macros", version = "=0.20.0" } +solders-traits = { path = "./crates/traits", version = "=0.20.0" } +solders-traits-core = { path = "./crates/traits-core", version = "=0.20.0" } +solders-account-decoder = { path = "./crates/account-decoder", version = "=0.20.0" } +solders-bankrun = { path = "./crates/bankrun", version = "=0.20.0" } +solders-banks-interface = { path = "./crates/banks-interface", version = "=0.20.0" } +solders-commitment-config = { path = "./crates/commitment-config", version = "=0.20.0" } +solders-compute-budget = { path = "./crates/compute-budget", version = "=0.20.0" } +solders-epoch-info = { path = "./crates/epoch-info", version = "=0.20.0" } +solders-transaction-confirmation-status = { path = "./crates/transaction-confirmation-status", version = "=0.20.0" } +solders-transaction-return-data = { path = "./crates/transaction-return-data", version = "=0.20.0" } +solders-transaction-status = { path = "./crates/transaction-status", version = "=0.20.0" } +solders-transaction-status-enums = { path = "./crates/transaction-status-enums", version = "=0.20.0" } +solders-transaction-status-struct = { path = "./crates/transaction-status-struct", version = "=0.20.0" } +solders-base64-string = { path = "./crates/base64-string", version = "=0.20.0" } +solders-rpc-filter = { path = "./crates/rpc-filter", version = "=0.20.0" } +solders-rpc-config = { path = "./crates/rpc-config", version = "=0.20.0" } +solders-rpc-config-macros = { path = "./crates/rpc-config-macros", version = "=0.20.0" } +solders-rpc-config-no-filter = { path = "./crates/rpc-config-no-filter", version = "=0.20.0" } +solders-rpc-config-no-rpc-api = { path = "./crates/rpc-config-no-rpc-api", version = "=0.20.0" } +solders-rpc-account-info-config = { path = "./crates/rpc-account-info-config", version = "=0.20.0" } +solders-rpc-program-accounts-config = { path = "./crates/rpc-program-accounts-config", version = "=0.20.0" } +solders-rpc-common = { path = "./crates/rpc-common", version = "=0.20.0" } +solders-rpc-errors = { path = "./crates/rpc-errors", version = "=0.20.0" } +solders-rpc-errors-common = { path = "./crates/rpc-errors-common", version = "=0.20.0" } +solders-rpc-errors-tx-status = { path = "./crates/rpc-errors-tx-status", version = "=0.20.0" } +solders-rpc-errors-no-tx-status = { path = "./crates/rpc-errors-no-tx-status", version = "=0.20.0" } +solders-rpc-request-airdrop-config = { path = "./crates/rpc-request-airdrop-config", version = "=0.20.0" } +solders-rpc-request-params = { path = "./crates/rpc-request-params", version = "=0.20.0" } +solders-rpc-request-params-no-config = { path = "./crates/rpc-request-params-no-config", version = "=0.20.0" } +solders-rpc-requests = { path = "./crates/rpc-requests", version = "=0.20.0" } +solders-rpc-responses = { path = "./crates/rpc-responses", version = "=0.20.0" } +solders-rpc-responses-common = { path = "./crates/rpc-responses-common", version = "=0.20.0" } +solders-rpc-responses-tx-status = { path = "./crates/rpc-responses-tx-status", version = "=0.20.0" } +solders-rpc-response-data-boilerplate = { path = "./crates/rpc-response-data-boilerplate", version = "=0.20.0" } +solders-rpc-send-transaction-config = { path = "./crates/rpc-send-transaction-config", version = "=0.20.0" } +solders-rpc-sig-status-config = { path = "./crates/rpc-sig-status-config", version = "=0.20.0" } +solders-rpc-sigs-for-address-config = { path = "./crates/rpc-sigs-for-address-config", version = "=0.20.0" } +solders-rpc-sim-transaction-config = { path = "./crates/rpc-sim-transaction-config", version = "=0.20.0" } +solders-rpc-simulate-tx-accounts-config = { path = "./crates/rpc-simulate-tx-accounts-config", version = "=0.20.0" } +solders-rpc-version = { path = "./crates/rpc-version", version = "=0.20.0" } +solders-primitives = { path = "./crates/primitives", version = "=0.20.0" } +solders-pubkey = { path = "./crates/pubkey", version = "=0.20.0" } +solders-system-program = { path = "./crates/system-program", version = "=0.20.0" } +solders-instruction = { path = "./crates/instruction", version = "=0.20.0" } +solders-address-lookup-table-account = { path = "./crates/address-lookup-table-account", version = "=0.20.0" } +solders-message = { path = "./crates/message", version = "=0.20.0" } +solders-signature = { path = "./crates/signature", version = "=0.20.0" } +solders-keypair = { path = "./crates/keypair", version = "=0.20.0" } +solders-token = { path = "./crates/token", version = "=0.20.0" } +solders-transaction = { path = "./crates/transaction", version = "=0.20.0" } +solders-transaction-error = { path = "./crates/transaction-error", version = "=0.20.0" } +solders-account = { path = "./crates/account", version = "=0.20.0" } +solders-hash = { path = "./crates/hash", version = "=0.20.0" } serde_with = { version = "^1.14.0", features = ["base64"] } solana-sdk = "1.18.1" solana-account-decoder = "1.18.1" @@ -142,7 +142,7 @@ serde_cbor = "^0.11.2" derive_more = "0.99.17" solana-program-test = "1.18.1" solana-banks-client = "1.18.1" -pythonize = "0.19.0" +pythonize = "0.20.0" bs58 = "0.4.0" thiserror = "^1.0.31" camelpaste = "0.1.0" diff --git a/docs/conf.py b/docs/conf.py index a9dca0f8..bb6ed33f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -22,7 +22,7 @@ author = "Kevin Heavey" # The full version, including alpha/beta/rc tags -release = "0.19.0" +release = "0.20.0" # -- General configuration --------------------------------------------------- diff --git a/pyproject.toml b/pyproject.toml index af948870..eb3d9144 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "solders" -version = "0.19.0" +version = "0.20.0" description = "Python bindings for Solana Rust tools" authors = ["kevinheavey "] license = "Apache" @@ -30,7 +30,7 @@ build-backend = "maturin" [project] name = "solders" -version = "0.19.0" +version = "0.20.0" description = "Python bindings for Solana Rust tools" authors = [ {name = "kevinheavey", email = "kevinheavey123@gmail.com"} ] license = {file = "LICENSE"} # relative to the package/ directory From 0eb0438728ff1686dcfe357e64d13b667da5e0a3 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Mon, 12 Feb 2024 04:53:54 +0400 Subject: [PATCH 14/14] fix dep and update lock file --- Cargo.lock | 110 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 2 +- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2d03ceb7..a30fbd05 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4888,7 +4888,7 @@ dependencies = [ [[package]] name = "solders" -version = "0.19.0" +version = "0.20.0" dependencies = [ "bincode", "derive_more", @@ -4923,7 +4923,7 @@ dependencies = [ [[package]] name = "solders-account" -version = "0.19.0" +version = "0.20.0" dependencies = [ "base64 0.13.1", "derive_more", @@ -4941,7 +4941,7 @@ dependencies = [ [[package]] name = "solders-account-decoder" -version = "0.19.0" +version = "0.20.0" dependencies = [ "base64 0.13.1", "bs58", @@ -4959,7 +4959,7 @@ dependencies = [ [[package]] name = "solders-address-lookup-table-account" -version = "0.19.0" +version = "0.20.0" dependencies = [ "derive_more", "pyo3", @@ -4973,7 +4973,7 @@ dependencies = [ [[package]] name = "solders-bankrun" -version = "0.19.0" +version = "0.20.0" dependencies = [ "derive_more", "pyo3", @@ -5000,7 +5000,7 @@ dependencies = [ [[package]] name = "solders-banks-interface" -version = "0.19.0" +version = "0.20.0" dependencies = [ "derive_more", "pyo3", @@ -5017,7 +5017,7 @@ dependencies = [ [[package]] name = "solders-base64-string" -version = "0.19.0" +version = "0.20.0" dependencies = [ "base64 0.13.1", "bincode", @@ -5036,7 +5036,7 @@ dependencies = [ [[package]] name = "solders-commitment-config" -version = "0.19.0" +version = "0.20.0" dependencies = [ "derive_more", "pyo3", @@ -5047,7 +5047,7 @@ dependencies = [ [[package]] name = "solders-compute-budget" -version = "0.19.0" +version = "0.20.0" dependencies = [ "pyo3", "solana-sdk", @@ -5057,7 +5057,7 @@ dependencies = [ [[package]] name = "solders-epoch-info" -version = "0.19.0" +version = "0.20.0" dependencies = [ "derive_more", "pyo3", @@ -5070,7 +5070,7 @@ dependencies = [ [[package]] name = "solders-hash" -version = "0.19.0" +version = "0.20.0" dependencies = [ "derive_more", "pyo3", @@ -5083,7 +5083,7 @@ dependencies = [ [[package]] name = "solders-instruction" -version = "0.19.0" +version = "0.20.0" dependencies = [ "derive_more", "pyo3", @@ -5096,7 +5096,7 @@ dependencies = [ [[package]] name = "solders-keypair" -version = "0.19.0" +version = "0.20.0" dependencies = [ "derive_more", "pyo3", @@ -5111,7 +5111,7 @@ dependencies = [ [[package]] name = "solders-macros" -version = "0.19.0" +version = "0.20.0" dependencies = [ "proc-macro2", "quote", @@ -5120,7 +5120,7 @@ dependencies = [ [[package]] name = "solders-message" -version = "0.19.0" +version = "0.20.0" dependencies = [ "bincode", "derive_more", @@ -5138,7 +5138,7 @@ dependencies = [ [[package]] name = "solders-primitives" -version = "0.19.0" +version = "0.20.0" dependencies = [ "bincode", "derive_more", @@ -5151,7 +5151,7 @@ dependencies = [ [[package]] name = "solders-pubkey" -version = "0.19.0" +version = "0.20.0" dependencies = [ "derive_more", "pyo3", @@ -5164,7 +5164,7 @@ dependencies = [ [[package]] name = "solders-rpc-account-info-config" -version = "0.19.0" +version = "0.20.0" dependencies = [ "pyo3", "serde", @@ -5179,7 +5179,7 @@ dependencies = [ [[package]] name = "solders-rpc-common" -version = "0.19.0" +version = "0.20.0" dependencies = [ "derive_more", "pyo3", @@ -5199,7 +5199,7 @@ dependencies = [ [[package]] name = "solders-rpc-config" -version = "0.19.0" +version = "0.20.0" dependencies = [ "pyo3", "solders-rpc-account-info-config", @@ -5216,11 +5216,11 @@ dependencies = [ [[package]] name = "solders-rpc-config-macros" -version = "0.19.0" +version = "0.20.0" [[package]] name = "solders-rpc-config-no-filter" -version = "0.19.0" +version = "0.20.0" dependencies = [ "pyo3", "serde", @@ -5238,7 +5238,7 @@ dependencies = [ [[package]] name = "solders-rpc-config-no-rpc-api" -version = "0.19.0" +version = "0.20.0" dependencies = [ "pyo3", "serde", @@ -5249,7 +5249,7 @@ dependencies = [ [[package]] name = "solders-rpc-errors" -version = "0.19.0" +version = "0.20.0" dependencies = [ "pyo3", "serde", @@ -5260,11 +5260,11 @@ dependencies = [ [[package]] name = "solders-rpc-errors-common" -version = "0.19.0" +version = "0.20.0" [[package]] name = "solders-rpc-errors-no-tx-status" -version = "0.19.0" +version = "0.20.0" dependencies = [ "derive_more", "pyo3", @@ -5277,7 +5277,7 @@ dependencies = [ [[package]] name = "solders-rpc-errors-tx-status" -version = "0.19.0" +version = "0.20.0" dependencies = [ "derive_more", "pyo3", @@ -5291,7 +5291,7 @@ dependencies = [ [[package]] name = "solders-rpc-filter" -version = "0.19.0" +version = "0.20.0" dependencies = [ "base64 0.13.1", "bs58", @@ -5306,7 +5306,7 @@ dependencies = [ [[package]] name = "solders-rpc-program-accounts-config" -version = "0.19.0" +version = "0.20.0" dependencies = [ "pyo3", "serde", @@ -5320,7 +5320,7 @@ dependencies = [ [[package]] name = "solders-rpc-request-airdrop-config" -version = "0.19.0" +version = "0.20.0" dependencies = [ "pyo3", "serde", @@ -5334,7 +5334,7 @@ dependencies = [ [[package]] name = "solders-rpc-request-params" -version = "0.19.0" +version = "0.20.0" dependencies = [ "bincode", "serde", @@ -5357,7 +5357,7 @@ dependencies = [ [[package]] name = "solders-rpc-request-params-no-config" -version = "0.19.0" +version = "0.20.0" dependencies = [ "bincode", "serde", @@ -5371,7 +5371,7 @@ dependencies = [ [[package]] name = "solders-rpc-requests" -version = "0.19.0" +version = "0.20.0" dependencies = [ "camelpaste", "pyo3", @@ -5402,11 +5402,11 @@ dependencies = [ [[package]] name = "solders-rpc-response-data-boilerplate" -version = "0.19.0" +version = "0.20.0" [[package]] name = "solders-rpc-responses" -version = "0.19.0" +version = "0.20.0" dependencies = [ "camelpaste", "derive_more", @@ -5443,7 +5443,7 @@ dependencies = [ [[package]] name = "solders-rpc-responses-common" -version = "0.19.0" +version = "0.20.0" dependencies = [ "camelpaste", "derive_more", @@ -5466,7 +5466,7 @@ dependencies = [ [[package]] name = "solders-rpc-responses-tx-status" -version = "0.19.0" +version = "0.20.0" dependencies = [ "derive_more", "pyo3", @@ -5482,7 +5482,7 @@ dependencies = [ [[package]] name = "solders-rpc-send-transaction-config" -version = "0.19.0" +version = "0.20.0" dependencies = [ "pyo3", "serde", @@ -5498,7 +5498,7 @@ dependencies = [ [[package]] name = "solders-rpc-sig-status-config" -version = "0.19.0" +version = "0.20.0" dependencies = [ "pyo3", "serde", @@ -5510,7 +5510,7 @@ dependencies = [ [[package]] name = "solders-rpc-sigs-for-address-config" -version = "0.19.0" +version = "0.20.0" dependencies = [ "pyo3", "serde", @@ -5524,7 +5524,7 @@ dependencies = [ [[package]] name = "solders-rpc-sim-transaction-config" -version = "0.19.0" +version = "0.20.0" dependencies = [ "pyo3", "serde", @@ -5540,7 +5540,7 @@ dependencies = [ [[package]] name = "solders-rpc-simulate-tx-accounts-config" -version = "0.19.0" +version = "0.20.0" dependencies = [ "pyo3", "serde", @@ -5554,14 +5554,14 @@ dependencies = [ [[package]] name = "solders-rpc-version" -version = "0.19.0" +version = "0.20.0" dependencies = [ "serde", ] [[package]] name = "solders-signature" -version = "0.19.0" +version = "0.20.0" dependencies = [ "derive_more", "pyo3", @@ -5574,7 +5574,7 @@ dependencies = [ [[package]] name = "solders-system-program" -version = "0.19.0" +version = "0.20.0" dependencies = [ "bincode", "derive_more", @@ -5592,7 +5592,7 @@ dependencies = [ [[package]] name = "solders-token" -version = "0.19.0" +version = "0.20.0" dependencies = [ "derive_more", "pyo3", @@ -5607,7 +5607,7 @@ dependencies = [ [[package]] name = "solders-traits" -version = "0.19.0" +version = "0.20.0" dependencies = [ "bincode", "pyo3", @@ -5620,7 +5620,7 @@ dependencies = [ [[package]] name = "solders-traits-core" -version = "0.19.0" +version = "0.20.0" dependencies = [ "bincode", "pyo3", @@ -5631,7 +5631,7 @@ dependencies = [ [[package]] name = "solders-transaction" -version = "0.19.0" +version = "0.20.0" dependencies = [ "derive_more", "pyo3", @@ -5650,7 +5650,7 @@ dependencies = [ [[package]] name = "solders-transaction-confirmation-status" -version = "0.19.0" +version = "0.20.0" dependencies = [ "pyo3", "serde", @@ -5660,7 +5660,7 @@ dependencies = [ [[package]] name = "solders-transaction-error" -version = "0.19.0" +version = "0.20.0" dependencies = [ "derive_more", "pyo3", @@ -5672,7 +5672,7 @@ dependencies = [ [[package]] name = "solders-transaction-return-data" -version = "0.19.0" +version = "0.20.0" dependencies = [ "base64 0.13.1", "derive_more", @@ -5687,7 +5687,7 @@ dependencies = [ [[package]] name = "solders-transaction-status" -version = "0.19.0" +version = "0.20.0" dependencies = [ "base64 0.13.1", "bincode", @@ -5717,7 +5717,7 @@ dependencies = [ [[package]] name = "solders-transaction-status-enums" -version = "0.19.0" +version = "0.20.0" dependencies = [ "pyo3", "serde", @@ -5727,7 +5727,7 @@ dependencies = [ [[package]] name = "solders-transaction-status-struct" -version = "0.19.0" +version = "0.20.0" dependencies = [ "derive_more", "pyo3", diff --git a/Cargo.toml b/Cargo.toml index 42a0e951..7b2ac832 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -142,7 +142,7 @@ serde_cbor = "^0.11.2" derive_more = "0.99.17" solana-program-test = "1.18.1" solana-banks-client = "1.18.1" -pythonize = "0.20.0" +pythonize = "0.19.0" bs58 = "0.4.0" thiserror = "^1.0.31" camelpaste = "0.1.0"