From 9f2bfcfcb98e35837abbb56b1508fb9781ee44d8 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Wed, 13 Sep 2023 04:48:42 +0400 Subject: [PATCH 01/15] upgrade to solana 1.16.3 --- Cargo.lock | 194 ++++++++++++++++++------------------ Cargo.toml | 14 +-- crates/signature/src/lib.rs | 4 +- crates/token/src/lib.rs | 4 +- 4 files changed, 109 insertions(+), 107 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f62a7df0..ded39009 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2803,9 +2803,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445cbfe2382fa023c4f2f3c7e1c95c03dcc1df2bf23cebcb2b13e1402c4394d1" +checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" dependencies = [ "bytes", "pin-project-lite", @@ -2821,9 +2821,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c" +checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9" dependencies = [ "bytes", "rand 0.8.5", @@ -3513,9 +3513,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579f978391c966b0a8f94467e446fd8155ed668e9d074c614329d4bad47134ac" +checksum = "b83daa56035885dac1a47f5bd3d4e02379e3fc5915b2c3ce978a9af9eeecf07d" dependencies = [ "Inflector", "base64 0.21.2", @@ -3537,9 +3537,9 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b73818e763f0f23ff538c5e42a07b1a76d556ff5719780a897147fe2958d345a" +checksum = "2dd3f3e85d67e559985fbdc6b5b4d5dd9c8462b78e6079c3b465496c1f3c55d6" dependencies = [ "bincode", "bytemuck", @@ -3558,9 +3558,9 @@ dependencies = [ [[package]] name = "solana-banks-client" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fd69727e3c42db86f567dd86dbb8d05a77952d89317d708558c1383afcca598" +checksum = "e7703026aea6e6fc89cdd77e9d7e08e3890bdddc4177efbf971da75284a353c5" dependencies = [ "borsh 0.10.3", "futures", @@ -3575,9 +3575,9 @@ dependencies = [ [[package]] name = "solana-banks-interface" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0063a8fec76567ebee333e8535844c6ca5260a3504d47d2044a2c67edee4d6ca" +checksum = "2cea685028231e10a02c6f021ca6cd1d0446a7ecb199b8c9e939d5cccb57ec9d" dependencies = [ "serde", "solana-sdk", @@ -3586,9 +3586,9 @@ dependencies = [ [[package]] name = "solana-banks-server" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95076d2143674af70478e32850e6a9c93493b4889240a4e32e0146f083dfb5f6" +checksum = "49a1c4d902adb2c19a65caf025307e76e6bae92415ed8adeb68aaf6b5034b2bc" dependencies = [ "bincode", "crossbeam-channel", @@ -3605,9 +3605,9 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfc5cb9f48c3a6adb8458d54cdfb9a28f2b5140961c862339dbe34ff63b1d086" +checksum = "3da230f2ff22007e2ca60507346488a65ec274fbb2486bdd2d10948eef2c03d8" dependencies = [ "bincode", "byteorder", @@ -3624,9 +3624,9 @@ dependencies = [ [[package]] name = "solana-bucket-map" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1289d1c2c80058fd10d2cf1b75c74ff204e4e41010034d53fa3e64241c672e" +checksum = "89e8716aa59039a8eeac13a5d090561ae11a252d674e9b41d97fe382a70545b9" dependencies = [ "bv", "log", @@ -3641,9 +3641,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770e68ef834e2835687facdf7e706f12e7f5c0e17044c0b956f068f6297a1685" +checksum = "3669a399b8ef60642471e68e1f93d3f3050248a4fa1436341596cfcb2a484e8b" dependencies = [ "chrono", "clap 2.34.0", @@ -3659,9 +3659,9 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3059c513c25718282bc53432f7d8b0a06748161d6dcbdf67ecc6fa2bcec520" +checksum = "e96d8a28ca30cd385f7c2c4a7f93edc32c18bc041baa0e8b25bd56cd28c51cbb" dependencies = [ "async-trait", "bincode", @@ -3692,9 +3692,9 @@ dependencies = [ [[package]] name = "solana-compute-budget-program" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498c017e65a1eae01412661d4e854bf716ef237efaba1dd4fcb37f333f3c33cc" +checksum = "552f79e747bd8bb7baa229007f5ff54971f67ec6f0f9d2a06a95adfaabe3f19c" dependencies = [ "solana-program-runtime", "solana-sdk", @@ -3702,9 +3702,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daad46dde420f68e4064ccba14e604f8ac97a88553234bcd2a087c1030b3f522" +checksum = "0a35e4cc9f2996a2ef95aac398443fc4a110ef585521e11a7685b3591648b7cf" dependencies = [ "bincode", "chrono", @@ -3716,9 +3716,9 @@ dependencies = [ [[package]] name = "solana-connection-cache" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea40235b2b75e6a125f95c14d91884516e7229fb0505930b1ae38d05b3ad32b3" +checksum = "5ecb12464ee1322a02635345522839958d78a2bacff18298991cacf298178f64" dependencies = [ "async-trait", "bincode", @@ -3737,9 +3737,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ec1a23136ef6072f3c6e3eabf6349dc0219ae23129c44754a4f9f8506941cd" +checksum = "35b9e2169fd13394af838b13f047067c35ce69372aea0fb46e026405b5e931f9" dependencies = [ "ahash 0.8.3", "blake3", @@ -3770,9 +3770,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89744bbdcb6dc87805bf50f3db4520adf56b9fdd2a55b80b8de3b4c97b5c4bc8" +checksum = "db08ab0af4007dc0954b900aa5febc0c0ae50d9f9f598be27263c3195d90240b" dependencies = [ "proc-macro2 1.0.59", "quote 1.0.28", @@ -3782,9 +3782,9 @@ dependencies = [ [[package]] name = "solana-loader-v4-program" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73523393ff8d67770fc22e545d8def006608b3d80c71e6dab31cb38f7326fbaf" +checksum = "e84811758fce4dcfd9617a7c3178effe9e59480d43c1e862bb3c8daccfcfd61d" dependencies = [ "log", "rand 0.7.3", @@ -3796,9 +3796,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc342d61b86066ca7bb72ab4ba17f677b8c2c3a3e71fb9286a57097f3b36b85" +checksum = "bf8a48e734f78a44399516f7c130c114b455911e351f001abc0d96e7c5694efa" dependencies = [ "env_logger", "lazy_static", @@ -3807,9 +3807,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea333a383efa6ddab7f4ba48273502af563abeb392f5731a00b22b9f45c15491" +checksum = "d3529d2ff63ceedd3707c51188aacb9e3c142118de3f55447c40584a78223ffd" dependencies = [ "log", "solana-sdk", @@ -3817,9 +3817,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7cced7756637c9d9b46aa52dca715bd0efb396f29aade27ecbd336787174fd" +checksum = "4792f29de5378a13c51be3fa9fdd526a20550b5ffabd7d1a57a4e49468e17d90" dependencies = [ "crossbeam-channel", "gethostname", @@ -3831,9 +3831,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a17ef4a81db76c9604037cadecdbd83c0b82cce3576a275e48327b4d06a98d7" +checksum = "7ed75beb465e211c79d31ae2049cb85974203e5ac21ae89396378d5a2fe71962" dependencies = [ "bincode", "clap 3.2.23", @@ -3853,9 +3853,9 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4bcf9dd10dffe2707c1dfd91b695c2dc3cb9585a7cbb17ed24c7d98a4103e9" +checksum = "9218d9c823b22a465f91c966e8254a5f57b6817e0121ec6d4bf9a5ddc8307f18" dependencies = [ "ahash 0.8.3", "bincode", @@ -3880,9 +3880,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf210d64911289b4a76cbd1fd0bfc6ab1d08e9d568a2dd021d03835d2e7efb6" +checksum = "2f17a1fbcf1e94e282db16153d323b446d6386ac99f597f78e76332265829336" dependencies = [ "ark-bn254", "ark-ec", @@ -3894,6 +3894,7 @@ dependencies = [ "bitflags", "blake3", "borsh 0.10.3", + "borsh 0.9.3", "bs58", "bv", "bytemuck", @@ -3934,9 +3935,9 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2dbb6d2286cb5bae6e480b0d9acae38c6618e3ff858319b64c455e6039661b1" +checksum = "2ff9f0c8043b2e7921e25a3fee88fa253b8cb5dbab1e521a4d83e78e8874c551" dependencies = [ "base64 0.21.2", "bincode", @@ -3962,9 +3963,9 @@ dependencies = [ [[package]] name = "solana-program-test" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa10eefd9e45d0e1c770775c97b4bf4618ba309bf86731b16aee5cc2f67c5e2" +checksum = "ed844e7d13e497e86c853ad19181724119100818673df931f8404a3e280c1828" dependencies = [ "assert_matches", "async-trait", @@ -3989,9 +3990,9 @@ dependencies = [ [[package]] name = "solana-pubsub-client" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4313ba746070ee268076535b36ed5e4dcf584e5ec815ca04d714af5d485d765" +checksum = "6e0659db803f68fb440c87f43a603e2da7adb3dd11d68e119c3209ed3ca02073" dependencies = [ "crossbeam-channel", "futures-util", @@ -4014,9 +4015,9 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a57937b9919152f3f2b1a5c9874113edf82e267be1c1f2448780e515ce115bb" +checksum = "fd4e0689f7b3b2e98e73089bf3aa6b3290cb8a2cbff97fca2ee579cc3ca2717e" dependencies = [ "async-mutex", "async-trait", @@ -4042,9 +4043,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49e5674c5786d04e4c1766e580827a417e7a523d724b4c1e8bb6c1842097ff3c" +checksum = "ab3c3996bd418c45a540ee2c2d23e9796c244d3e5c9f135a86aa8501e1afea19" dependencies = [ "lazy_static", "num_cpus", @@ -4052,9 +4053,9 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "123151e4cba3be5e887c333e430c43316d3b882e9a364f3368a6ac448bcfd1bb" +checksum = "40927d4df440e354f618cbf9e5eb81e02cf4563ef8360782b5493f395b63f61a" dependencies = [ "console", "dialoguer", @@ -4071,9 +4072,9 @@ dependencies = [ [[package]] name = "solana-rpc-client" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d81847cc7339aec68c34819e6223ce5782ca62b4b402ec7976ba9af0ff82f400" +checksum = "871cf6d60098c556755a3a7dbd1742201718220a13b988d012f0658eddaad674" dependencies = [ "async-trait", "base64 0.21.2", @@ -4097,9 +4098,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41df84c31b89e75b0b47bf3ef265042fd3c806f4c0d8d928c7f7f7a04b67472d" +checksum = "3214d68e3b661ddfd960271f67eb8042298ac7d90d9bd86d330200c3a5518404" dependencies = [ "base64 0.21.2", "bs58", @@ -4119,9 +4120,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-nonce-utils" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c96a92be32409c7fd101169e34a0c4be17bd336a5bf4b22e52880ffda599126" +checksum = "bcf08c480fb3d0d861abe10a0517990edea8151529ccf537c0a833233f1381d8" dependencies = [ "clap 2.34.0", "solana-clap-utils", @@ -4132,9 +4133,9 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08300653b26d709b153a5bd617b0cfd8062ebb36e4c1f8acee91dec14b524f8a" +checksum = "e63ab2fb3bb128fe84bd43dedfdb5b3e03501a2f4e2121ae22a1b91106d1ca42" dependencies = [ "arrayref", "bincode", @@ -4201,9 +4202,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a43b1c03aa69e1410ada4b5b2971ab948806c188015ac54684deec67d2739a" +checksum = "74a01f25b9f4022fc222c21c589ef7943027fb0fa2b9f6ae943fc4a65c2c01a2" dependencies = [ "assert_matches", "base64 0.21.2", @@ -4254,9 +4255,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aec66b2d42de3e7a90086ca6ec16f66ac0019bfc3a6ca44ade2404a9dc8c128a" +checksum = "a75b33716470fa4a65a23ddc2d4abcb8d28532c6e3ae3f04f4fe79b5e1f8c247" dependencies = [ "bs58", "proc-macro2 1.0.59", @@ -4267,9 +4268,9 @@ dependencies = [ [[package]] name = "solana-send-transaction-service" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "005c40536b31e874c954ee0c99965a8e43ef486936081f1a2361f92cfc1f385d" +checksum = "dd9b33ec9f7bba86dc7bced3323b31de776984f674b10316fe983c0dcc052f62" dependencies = [ "crossbeam-channel", "log", @@ -4283,9 +4284,9 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b25a5f56b43a160b96d13c1223aa92e0177706af79b3c427eff218b8b1edc619" +checksum = "aa54eeb4f5cd2bcac1e593bb1907c3d0134a367dcbce0daf8c81bdd431b5f8e4" dependencies = [ "bincode", "log", @@ -4298,9 +4299,9 @@ dependencies = [ [[package]] name = "solana-streamer" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be763578e5c6719e543e9d86d9517d3b2dde6581db76b942b4bd4a1c3ed19256" +checksum = "705ef2b2649c4162061a74aaf12f02b244828ed847ad981581e3e51155279ca5" dependencies = [ "async-channel", "bytes", @@ -4331,9 +4332,9 @@ dependencies = [ [[package]] name = "solana-system-program" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf3fc3f7e1724394b77d6ae88563f1eab80971cdd426e89ad1384fed0c1338e" +checksum = "554ef3c25bd7c848f42bfa04b7ddfcb4f32796960ba284fd819f132b185b7b01" dependencies = [ "bincode", "log", @@ -4345,9 +4346,9 @@ dependencies = [ [[package]] name = "solana-thin-client" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8baffff86187a65ef4cfa190019108c4c3b1738ecfd51b862eeac19a8f8caf98" +checksum = "dc8a9f9c101395d314c4e5e1b19801dd54f4cd501e40b8c2d7d8b896cd2e0980" dependencies = [ "bincode", "log", @@ -4360,9 +4361,9 @@ dependencies = [ [[package]] name = "solana-tpu-client" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d068ff8db750b4cc3a0a2bce228370bc3f4b7883c53fab64a862a7ba1e7343b" +checksum = "18a8a4d90f74e666cd2a5f7ac9ed230ca186d8f7351a927f061801b3ba4e8f2f" dependencies = [ "async-trait", "bincode", @@ -4385,9 +4386,9 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb0138e64aa7a6c2630c26d450bcdc296a57a399fb256fe85707aec10ac978ee" +checksum = "c9266f75afa4163c9a5f29f1066f907e87482858749942380d6538af567b44c7" dependencies = [ "Inflector", "base64 0.21.2", @@ -4411,9 +4412,9 @@ dependencies = [ [[package]] name = "solana-udp-client" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e61134203fd0598b31cd24fd2f2d5866419911e4dbdb93fe9ad53404f6d79819" +checksum = "e0f475a0a0faa55f7783084258c1e88be39ed3ea5c4f945bf728b7ca8c7a3262" dependencies = [ "async-trait", "solana-connection-cache", @@ -4426,9 +4427,9 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0869902287377b9fd67fe6d1135ef612a9983f74cbee0e99fc5faf6df095dc15" +checksum = "886a0c01be1e2b3a7ec3bed63f2112cd7f80c4b8182e95fa98b7ab7e37faf90a" dependencies = [ "log", "rustc_version", @@ -4442,9 +4443,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5764f7601a524e52d3ef70d314c68678ef623f8e1f7e48b3ccc3dec09d80503" +checksum = "01b1102b13ca7c760439545dba83588419d208b500a93eb61f6565be26bef490" dependencies = [ "bincode", "log", @@ -4464,9 +4465,9 @@ dependencies = [ [[package]] name = "solana-zk-token-proof-program" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbd16baa124926abe5d618961f723b8bf6780f93ba032e3d764b016640ae48c4" +checksum = "d33a2ae4ae1f394fced36c7f1170ecf3e597cf68eb8989877d805a384ce65a9e" dependencies = [ "bytemuck", "getrandom 0.1.16", @@ -4479,12 +4480,11 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.16.0" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34a565bea0147718f57ee8bbd79438341769acd53f634d665c34114040ea7c26" +checksum = "1669c9d223d850cd96cad69d3ba1a4234bc3e2f83ac837fbdbc0ce774dac7b92" dependencies = [ "aes-gcm-siv", - "arrayref", "base64 0.21.2", "bincode", "bytemuck", @@ -4509,9 +4509,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0820fa96c8e644159a308b338465d2a6314b0a71abc92ed3ecf9ad61c906e3" +checksum = "b3082ec3a1d4ef7879eb5b84916d5acde057abd59733eec3647e0ab8885283ef" dependencies = [ "byteorder", "combine", diff --git a/Cargo.toml b/Cargo.toml index a86fb5e0..cad22914 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -118,19 +118,19 @@ solders-transaction-error = { path = "./crates/transaction-error", version = "=0 solders-account = { path = "./crates/account", version = "=0.18.1" } solders-hash = { path = "./crates/hash", version = "=0.18.1" } serde_with = { version = "^1.14.0", features = ["base64"] } -solana-sdk = "1.16.0" -solana-account-decoder = "1.16.0" -solana-transaction-status = "1.16.0" -solana-rpc-client-api = "1.16.0" -solana-program = "1.16.0" +solana-sdk = "1.16.3" +solana-account-decoder = "1.16.3" +solana-transaction-status = "1.16.3" +solana-rpc-client-api = "1.16.3" +solana-program = "1.16.3" bincode = "1.3.3" base64 = "0.13.0" serde = "^1.0.136" serde_json = "^1.0.59" serde_cbor = "^0.11.2" derive_more = "0.99.17" -solana-program-test = "1.16.0" -solana-banks-client = "1.16.0" +solana-program-test = "1.16.3" +solana-banks-client = "1.16.3" pythonize = "0.19.0" bs58 = "0.4.0" thiserror = "^1.0.31" diff --git a/crates/signature/src/lib.rs b/crates/signature/src/lib.rs index 9dbdf1fc..cb9115f0 100644 --- a/crates/signature/src/lib.rs +++ b/crates/signature/src/lib.rs @@ -46,7 +46,7 @@ impl Signature { #[new] pub fn new(signature_bytes: [u8; Self::LENGTH]) -> Self { - SignatureOriginal::new(&signature_bytes).into() + SignatureOriginal::from(signature_bytes).into() } #[staticmethod] @@ -149,7 +149,7 @@ impl Signature { impl PyHash for Signature {} impl PyFromBytesGeneral for Signature { fn py_from_bytes_general(raw: &[u8]) -> PyResult { - Ok(SignatureOriginal::new(raw).into()) + Ok(SignatureOriginal::try_from(raw).unwrap().into()) } } solders_traits_core::common_methods_default!(Signature); diff --git a/crates/token/src/lib.rs b/crates/token/src/lib.rs index 8253da35..de7a18fb 100644 --- a/crates/token/src/lib.rs +++ b/crates/token/src/lib.rs @@ -18,6 +18,8 @@ pub fn create_token_mod(py: Python<'_>) -> PyResult<&PyModule> { for submod in submodules { token_mod.add_submodule(submod)?; } - token_mod.add("ID", solders_pubkey::Pubkey(spl_token::ID)).unwrap(); + token_mod + .add("ID", solders_pubkey::Pubkey(spl_token::ID)) + .unwrap(); Ok(token_mod) } From 4112ae01a46836a3917d2469ecc71c5fcc4fab49 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Wed, 13 Sep 2023 05:09:17 +0400 Subject: [PATCH 02/15] upgrade to master --- Cargo.lock | 1740 ++++++++++++++----------- Cargo.toml | 18 +- crates/message/src/lib.rs | 4 +- crates/transaction-error/src/lib.rs | 29 + python/solders/message.pyi | 2 +- python/solders/transaction_status.pyi | 18 + rust-toolchain.toml | 2 +- 7 files changed, 1073 insertions(+), 740 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ded39009..e26eb1d0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,6 +12,15 @@ dependencies = [ "regex", ] +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + [[package]] name = "adler" version = "1.0.2" @@ -60,7 +69,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", "once_cell", "version_check", ] @@ -72,7 +81,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if", - "getrandom 0.2.8", + "getrandom 0.2.10", "once_cell", "version_check", ] @@ -178,7 +187,7 @@ dependencies = [ "derivative", "digest 0.10.7", "itertools", - "num-bigint 0.4.3", + "num-bigint 0.4.4", "num-traits", "paste", "rustc_version", @@ -191,7 +200,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" dependencies = [ - "quote 1.0.28", + "quote", "syn 1.0.107", ] @@ -201,10 +210,10 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ - "num-bigint 0.4.3", + "num-bigint 0.4.4", "num-traits", - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] @@ -230,7 +239,7 @@ dependencies = [ "ark-serialize-derive", "ark-std", "digest 0.10.7", - "num-bigint 0.4.3", + "num-bigint 0.4.4", ] [[package]] @@ -239,8 +248,8 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] @@ -291,7 +300,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.19", + "time", ] [[package]] @@ -300,8 +309,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", "synstructure", ] @@ -312,8 +321,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] @@ -325,9 +334,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -336,9 +345,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.3.15" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c" dependencies = [ "brotli", "flate2", @@ -359,13 +368,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.32", ] [[package]] @@ -385,6 +394,21 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + [[package]] name = "base64" version = "0.12.3" @@ -399,9 +423,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64ct" @@ -424,6 +448,15 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +dependencies = [ + "serde", +] + [[package]] name = "bitmaps" version = "2.1.0" @@ -435,9 +468,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.3.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" dependencies = [ "arrayref", "arrayvec", @@ -501,7 +534,7 @@ dependencies = [ "borsh-derive-internal 0.9.3", "borsh-schema-derive-internal 0.9.3", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.59", + "proc-macro2", "syn 1.0.107", ] @@ -514,7 +547,7 @@ dependencies = [ "borsh-derive-internal 0.10.3", "borsh-schema-derive-internal 0.10.3", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.59", + "proc-macro2", "syn 1.0.107", ] @@ -524,8 +557,8 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] @@ -535,8 +568,8 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] @@ -546,8 +579,8 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] @@ -557,8 +590,8 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] @@ -607,9 +640,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" dependencies = [ "bytemuck_derive", ] @@ -620,8 +653,8 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] @@ -633,9 +666,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bzip2" @@ -676,11 +709,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -691,25 +725,24 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.48.0", ] [[package]] name = "chrono-humanize" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32dce1ea1988dbdf9f9815ff11425828523bd2a134ec0805d2ac8af26ee6096e" +checksum = "799627e6b4d27827a814e837b9d8a504832086081806d45b1afa34dc982b023b" dependencies = [ "chrono", ] @@ -731,7 +764,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap 0.11.0", "unicode-width", @@ -745,9 +778,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "clap_lex", - "indexmap", + "indexmap 1.9.3", "once_cell", "strsim 0.10.0", "termcolor", @@ -836,9 +869,9 @@ checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" [[package]] name = "constant_time_eq" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convert_case" @@ -993,8 +1026,8 @@ dependencies = [ "cc", "codespan-reporting", "once_cell", - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "scratch", "syn 1.0.107", ] @@ -1011,8 +1044,8 @@ version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] @@ -1044,8 +1077,8 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "strsim 0.10.0", "syn 1.0.107", ] @@ -1058,10 +1091,10 @@ checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "strsim 0.10.0", - "syn 2.0.18", + "syn 2.0.32", ] [[package]] @@ -1071,7 +1104,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core 0.13.4", - "quote 1.0.28", + "quote", "syn 1.0.107", ] @@ -1082,8 +1115,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ "darling_core 0.20.1", - "quote 1.0.28", - "syn 2.0.18", + "quote", + "syn 2.0.32", ] [[package]] @@ -1121,7 +1154,7 @@ dependencies = [ "asn1-rs", "displaydoc", "nom", - "num-bigint 0.4.3", + "num-bigint 0.4.4", "num-traits", "rusticata-macros", ] @@ -1138,8 +1171,8 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] @@ -1150,8 +1183,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "rustc_version", "syn 1.0.107", ] @@ -1174,8 +1207,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6207f46b33b2bf00858b0edb03d188d31a46fedfde4aa53a27d69fe25acd80cf" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] @@ -1214,32 +1247,32 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] [[package]] -name = "dlopen" -version = "0.1.8" +name = "dlopen2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e80ad39f814a9abe68583cd50a2d45c8a67561c3361ab8da240587dda80937" +checksum = "09b4f5f101177ff01b8ec4ecc81eead416a8aa42819a2869311b3420fa114ffa" dependencies = [ - "dlopen_derive", - "lazy_static", + "dlopen2_derive", "libc", + "once_cell", "winapi", ] [[package]] -name = "dlopen_derive" -version = "0.1.4" +name = "dlopen2_derive" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f236d9e1b1fbd81cea0f9cbdc8dcc7e8ebcd80e6659cd7cb2ad5f6c05946c581" +checksum = "a6cbae11b3de8fce2a456e8ea3dada226b35fe791f0dc1d360c0941f0bb681f3" dependencies = [ - "libc", - "quote 0.6.13", - "syn 0.15.44", + "proc-macro2", + "quote", + "syn 2.0.32", ] [[package]] @@ -1280,7 +1313,7 @@ dependencies = [ "derivation-path", "ed25519-dalek", "hmac 0.12.1", - "sha2 0.10.6", + "sha2 0.10.7", ] [[package]] @@ -1290,16 +1323,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0188e3c3ba8df5753894d54461f0e39bc91741dc5b22e1c46999ec2c71f4e4" dependencies = [ "enum-ordinalize", - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encode_unicode" @@ -1331,9 +1364,9 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.32", ] [[package]] @@ -1342,10 +1375,10 @@ version = "3.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a62bb1df8b45ecb7ffa78dca1c17a438fb193eb083db0b1b494d2a61bcb5096a" dependencies = [ - "num-bigint 0.4.3", + "num-bigint 0.4.4", "num-traits", - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "rustc_version", "syn 1.0.107", ] @@ -1363,6 +1396,12 @@ dependencies = [ "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.3.1" @@ -1392,12 +1431,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "feature-probe" @@ -1419,9 +1455,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -1435,13 +1471,19 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] +[[package]] +name = "fs-err" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" + [[package]] name = "futures" version = "0.3.28" @@ -1496,9 +1538,9 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.32", ] [[package]] @@ -1567,9 +1609,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", @@ -1578,6 +1620,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + [[package]] name = "goblin" version = "0.5.4" @@ -1601,7 +1649,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util 0.7.2", @@ -1650,6 +1698,12 @@ dependencies = [ "ahash 0.8.3", ] +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + [[package]] name = "heck" version = "0.4.1" @@ -1665,15 +1719,6 @@ dependencies = [ "libc", ] -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.1" @@ -1773,7 +1818,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1782,10 +1827,11 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ + "futures-util", "http", "hyper", "rustls", @@ -1825,9 +1871,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1865,11 +1911,21 @@ dependencies = [ "hashbrown 0.12.3", ] +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + [[package]] name = "indicatif" -version = "0.17.4" +version = "0.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db45317f37ef454e6519b6c3ed7d377e5f23346f0823f86e65ca36912d1d0ef8" +checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" dependencies = [ "console", "instant", @@ -1893,17 +1949,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" version = "2.7.1" @@ -1936,9 +1981,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -1975,9 +2020,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.144" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libsecp256k1" @@ -2027,6 +2072,17 @@ dependencies = [ "libsecp256k1-core", ] +[[package]] +name = "light-poseidon" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "949bdd22e4ed93481d45e9a6badb34b99132bcad0c8a8d4f05c42f7dcc7b90bc" +dependencies = [ + "ark-bn254", + "ark-ff", + "thiserror", +] + [[package]] name = "link-cplusplus" version = "1.0.8" @@ -2038,9 +2094,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "lock_api" @@ -2054,12 +2110,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" @@ -2092,9 +2145,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memmap2" @@ -2158,24 +2211,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.14" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", - "miow", - "ntapi", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", ] [[package]] @@ -2194,23 +2236,22 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] [[package]] name = "nix" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.7.1", "pin-utils", - "static_assertions", ] [[package]] @@ -2232,15 +2273,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - [[package]] name = "num" version = "0.2.1" @@ -2268,9 +2300,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -2293,8 +2325,8 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] @@ -2333,20 +2365,20 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.1", "libc", ] @@ -2375,8 +2407,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0629cbd6b897944899b1f10496d9c4a7ac5878d45fd61bc22e9e79bfbbc29597" dependencies = [ "proc-macro-crate 1.3.0", - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] @@ -2387,9 +2419,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ "proc-macro-crate 1.3.0", - "proc-macro2 1.0.59", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.32", ] [[package]] @@ -2398,6 +2430,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + [[package]] name = "oid-registry" version = "0.6.1" @@ -2409,9 +2450,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opaque-debug" @@ -2468,22 +2509,11 @@ checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" dependencies = [ "Inflector", "proc-macro-error", - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -2491,21 +2521,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.7", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -2556,9 +2572,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "percentage" @@ -2584,16 +2600,16 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2674,8 +2690,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", "version_check", ] @@ -2686,25 +2702,16 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "version_check", ] [[package]] name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.59" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -2719,7 +2726,7 @@ dependencies = [ "indoc", "libc", "memoffset 0.9.0", - "parking_lot 0.12.1", + "parking_lot", "pyo3-build-config", "pyo3-ffi", "pyo3-macros", @@ -2765,9 +2772,9 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1" dependencies = [ - "proc-macro2 1.0.59", + "proc-macro2", "pyo3-macros-backend", - "quote 1.0.28", + "quote", "syn 1.0.107", ] @@ -2777,8 +2784,8 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] @@ -2801,11 +2808,22 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "qualifier_attr" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + [[package]] name = "quinn" -version = "0.9.4" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" +checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" dependencies = [ "bytes", "pin-project-lite", @@ -2816,14 +2834,13 @@ dependencies = [ "thiserror", "tokio", "tracing", - "webpki", ] [[package]] name = "quinn-proto" -version = "0.9.4" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9" +checksum = "e13f81c9a9d574310b8351f8666f5a93ac3b0069c45c28ad52c10291389a7cf9" dependencies = [ "bytes", "rand 0.8.5", @@ -2835,38 +2852,28 @@ dependencies = [ "thiserror", "tinyvec", "tracing", - "webpki", ] [[package]] name = "quinn-udp" -version = "0.3.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" +checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" dependencies = [ + "bytes", "libc", - "quinn-proto", - "socket2", + "socket2 0.5.4", "tracing", - "windows-sys 0.42.0", -] - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", + "windows-sys 0.48.0", ] [[package]] name = "quote" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ - "proc-macro2 1.0.59", + "proc-macro2", ] [[package]] @@ -2928,7 +2935,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", ] [[package]] @@ -2979,7 +2986,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring", - "time 0.3.19", + "time", "yasna", ] @@ -2989,7 +2996,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2998,14 +3005,26 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.8.3" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -3014,18 +3033,18 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.17" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ "async-compression", - "base64 0.21.2", + "base64 0.21.4", "bytes", "encoding_rs", "futures-core", @@ -3055,7 +3074,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", + "webpki-roots 0.25.2", "winreg", ] @@ -3127,13 +3146,12 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ - "bitflags", + "bitflags 2.4.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", "windows-sys 0.48.0", @@ -3141,14 +3159,14 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", + "rustls-webpki 0.101.5", "sct", - "webpki", ] [[package]] @@ -3169,14 +3187,34 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" +dependencies = [ + "ring", + "untrusted", ] [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" @@ -3204,9 +3242,9 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scratch" @@ -3229,8 +3267,8 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] @@ -3250,7 +3288,7 @@ version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -3269,24 +3307,24 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.163" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.9" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] @@ -3303,20 +3341,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.32", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" dependencies = [ "itoa", "ryu", @@ -3372,8 +3410,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ "darling 0.13.4", - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] @@ -3384,16 +3422,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ "darling 0.20.1", - "proc-macro2 1.0.59", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.32", ] [[package]] -name = "sha-1" -version = "0.10.1" +name = "sha1" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", @@ -3415,9 +3453,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -3476,6 +3514,12 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + [[package]] name = "sized-chunks" version = "0.6.5" @@ -3512,13 +3556,22 @@ dependencies = [ ] [[package]] -name = "solana-account-decoder" -version = "1.16.13" +name = "socket2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b83daa56035885dac1a47f5bd3d4e02379e3fc5915b2c3ce978a9af9eeecf07d" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "solana-account-decoder" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "Inflector", - "base64 0.21.2", + "base64 0.21.4", "bincode", "bs58", "bv", @@ -3526,9 +3579,8 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "solana-address-lookup-table-program", "solana-config-program", - "solana-sdk", + "solana-sdk 1.17.0", "spl-token", "spl-token-2022", "thiserror", @@ -3536,37 +3588,105 @@ dependencies = [ ] [[package]] -name = "solana-address-lookup-table-program" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dd3f3e85d67e559985fbdc6b5b4d5dd9c8462b78e6079c3b465496c1f3c55d6" +name = "solana-accounts-db" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ + "arrayref", "bincode", + "blake3", + "bv", "bytemuck", + "byteorder", + "bzip2", + "crossbeam-channel", + "dashmap", + "dir-diff", + "flate2", + "fnv", + "fs-err", + "im", + "index_list", + "itertools", + "lazy_static", "log", - "num-derive", - "num-traits", - "rustc_version", + "lru", + "lz4", + "memmap2", + "modular-bitfield", + "num-derive", + "num-traits", + "num_cpus", + "num_enum 0.6.1", + "ouroboros", + "percentage", + "qualifier_attr", + "rand 0.8.5", + "rayon", + "regex", + "rustc_version", "serde", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-program", + "serde_derive", + "siphasher", + "solana-bpf-loader-program", + "solana-bucket-map", + "solana-compute-budget-program", + "solana-config-program", + "solana-cost-model", + "solana-frozen-abi 1.17.0", + "solana-frozen-abi-macro 1.17.0", + "solana-loader-v4-program", + "solana-measure", + "solana-metrics", + "solana-perf", "solana-program-runtime", - "solana-sdk", + "solana-rayon-threadlimit", + "solana-sdk 1.17.0", + "solana-stake-program", + "solana-system-program", + "solana-vote-program", + "solana-zk-token-proof-program", + "solana-zk-token-sdk 1.17.0", + "static_assertions", + "strum", + "strum_macros", + "symlink", + "tar", + "tempfile", + "thiserror", + "zstd", +] + +[[package]] +name = "solana-address-lookup-table-program" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +dependencies = [ + "bincode", + "bytemuck", + "log", + "num-derive", + "num-traits", + "rustc_version", + "serde", + "solana-frozen-abi 1.17.0", + "solana-frozen-abi-macro 1.17.0", + "solana-program 1.17.0", + "solana-program-runtime", + "solana-sdk 1.17.0", "thiserror", ] [[package]] name = "solana-banks-client" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7703026aea6e6fc89cdd77e9d7e08e3890bdddc4177efbf971da75284a353c5" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "borsh 0.10.3", "futures", - "solana-banks-interface", - "solana-program", - "solana-sdk", + "solana-banks-interface 1.17.0", + "solana-program 1.17.0", + "solana-sdk 1.17.0", "tarpc", "thiserror", "tokio", @@ -3580,23 +3700,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2cea685028231e10a02c6f021ca6cd1d0446a7ecb199b8c9e939d5cccb57ec9d" dependencies = [ "serde", - "solana-sdk", + "solana-sdk 1.16.13", + "tarpc", +] + +[[package]] +name = "solana-banks-interface" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +dependencies = [ + "serde", + "solana-sdk 1.17.0", "tarpc", ] [[package]] name = "solana-banks-server" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a1c4d902adb2c19a65caf025307e76e6bae92415ed8adeb68aaf6b5034b2bc" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "bincode", "crossbeam-channel", "futures", - "solana-banks-interface", + "solana-accounts-db", + "solana-banks-interface 1.17.0", "solana-client", "solana-runtime", - "solana-sdk", + "solana-sdk 1.17.0", "solana-send-transaction-service", "tarpc", "tokio", @@ -3605,52 +3735,48 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da230f2ff22007e2ca60507346488a65ec274fbb2486bdd2d10948eef2c03d8" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "bincode", "byteorder", "libsecp256k1", "log", - "rand 0.7.3", + "scopeguard", "solana-measure", "solana-program-runtime", - "solana-sdk", - "solana-zk-token-sdk", + "solana-sdk 1.17.0", + "solana-zk-token-sdk 1.17.0", "solana_rbpf", "thiserror", ] [[package]] name = "solana-bucket-map" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e8716aa59039a8eeac13a5d090561ae11a252d674e9b41d97fe382a70545b9" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "bv", "log", "memmap2", "modular-bitfield", "num_enum 0.6.1", - "rand 0.7.3", + "rand 0.8.5", "solana-measure", - "solana-sdk", + "solana-sdk 1.17.0", "tempfile", ] [[package]] name = "solana-clap-utils" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3669a399b8ef60642471e68e1f93d3f3050248a4fa1436341596cfcb2a484e8b" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "chrono", "clap 2.34.0", "rpassword", - "solana-perf", "solana-remote-wallet", - "solana-sdk", + "solana-sdk 1.17.0", "thiserror", "tiny-bip39", "uriparse", @@ -3659,19 +3785,18 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96d8a28ca30cd385f7c2c4a7f93edc32c18bc041baa0e8b25bd56cd28c51cbb" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "async-trait", "bincode", + "dashmap", "futures", "futures-util", - "indexmap", + "indexmap 2.0.0", "indicatif", "log", "quinn", - "rand 0.7.3", "rayon", "solana-connection-cache", "solana-measure", @@ -3681,7 +3806,7 @@ dependencies = [ "solana-rpc-client", "solana-rpc-client-api", "solana-rpc-client-nonce-utils", - "solana-sdk", + "solana-sdk 1.17.0", "solana-streamer", "solana-thin-client", "solana-tpu-client", @@ -3692,49 +3817,69 @@ dependencies = [ [[package]] name = "solana-compute-budget-program" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552f79e747bd8bb7baa229007f5ff54971f67ec6f0f9d2a06a95adfaabe3f19c" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "solana-program-runtime", - "solana-sdk", + "solana-sdk 1.17.0", ] [[package]] name = "solana-config-program" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a35e4cc9f2996a2ef95aac398443fc4a110ef585521e11a7685b3591648b7cf" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "bincode", "chrono", "serde", "serde_derive", "solana-program-runtime", - "solana-sdk", + "solana-sdk 1.17.0", ] [[package]] name = "solana-connection-cache" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ecb12464ee1322a02635345522839958d78a2bacff18298991cacf298178f64" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "async-trait", "bincode", "futures-util", - "indexmap", + "indexmap 2.0.0", "log", - "rand 0.7.3", + "rand 0.8.5", "rayon", "rcgen", "solana-measure", "solana-metrics", - "solana-sdk", + "solana-sdk 1.17.0", "thiserror", "tokio", ] +[[package]] +name = "solana-cost-model" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +dependencies = [ + "lazy_static", + "log", + "rustc_version", + "solana-address-lookup-table-program", + "solana-bpf-loader-program", + "solana-compute-budget-program", + "solana-config-program", + "solana-frozen-abi 1.17.0", + "solana-frozen-abi-macro 1.17.0", + "solana-loader-v4-program", + "solana-metrics", + "solana-program-runtime", + "solana-sdk 1.17.0", + "solana-stake-program", + "solana-system-program", + "solana-vote-program", +] + [[package]] name = "solana-frozen-abi" version = "1.16.13" @@ -3762,8 +3907,37 @@ dependencies = [ "serde_bytes", "serde_derive", "serde_json", - "sha2 0.10.6", - "solana-frozen-abi-macro", + "sha2 0.10.7", + "solana-frozen-abi-macro 1.16.13", + "subtle", + "thiserror", +] + +[[package]] +name = "solana-frozen-abi" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +dependencies = [ + "ahash 0.8.3", + "blake3", + "block-buffer 0.10.4", + "bs58", + "bv", + "byteorder", + "cc", + "either", + "generic-array", + "im", + "lazy_static", + "log", + "memmap2", + "rustc_version", + "serde", + "serde_bytes", + "serde_derive", + "serde_json", + "sha2 0.10.7", + "solana-frozen-abi-macro 1.17.0", "subtle", "thiserror", ] @@ -3774,23 +3948,32 @@ version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db08ab0af4007dc0954b900aa5febc0c0ae50d9f9f598be27263c3195d90240b" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", + "rustc_version", + "syn 2.0.32", +] + +[[package]] +name = "solana-frozen-abi-macro" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +dependencies = [ + "proc-macro2", + "quote", "rustc_version", - "syn 2.0.18", + "syn 2.0.32", ] [[package]] name = "solana-loader-v4-program" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e84811758fce4dcfd9617a7c3178effe9e59480d43c1e862bb3c8daccfcfd61d" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "log", - "rand 0.7.3", "solana-measure", "solana-program-runtime", - "solana-sdk", + "solana-sdk 1.17.0", "solana_rbpf", ] @@ -3805,47 +3988,55 @@ dependencies = [ "log", ] +[[package]] +name = "solana-logger" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +dependencies = [ + "env_logger", + "lazy_static", + "log", +] + [[package]] name = "solana-measure" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3529d2ff63ceedd3707c51188aacb9e3c142118de3f55447c40584a78223ffd" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "log", - "solana-sdk", + "solana-sdk 1.17.0", ] [[package]] name = "solana-metrics" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4792f29de5378a13c51be3fa9fdd526a20550b5ffabd7d1a57a4e49468e17d90" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "crossbeam-channel", "gethostname", "lazy_static", "log", "reqwest", - "solana-sdk", + "solana-sdk 1.17.0", + "thiserror", ] [[package]] name = "solana-net-utils" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ed75beb465e211c79d31ae2049cb85974203e5ac21ae89396378d5a2fe71962" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "bincode", "clap 3.2.23", "crossbeam-channel", "log", "nix", - "rand 0.7.3", + "rand 0.8.5", "serde", "serde_derive", - "socket2", - "solana-logger", - "solana-sdk", + "socket2 0.5.4", + "solana-logger 1.17.0", + "solana-sdk 1.17.0", "solana-version", "tokio", "url", @@ -3853,28 +4044,26 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9218d9c823b22a465f91c966e8254a5f57b6817e0121ec6d4bf9a5ddc8307f18" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "ahash 0.8.3", "bincode", "bv", "caps", "curve25519-dalek", - "dlopen", - "dlopen_derive", + "dlopen2", "fnv", "lazy_static", "libc", "log", "nix", - "rand 0.7.3", + "rand 0.8.5", "rayon", "serde", "solana-metrics", "solana-rayon-threadlimit", - "solana-sdk", + "solana-sdk 1.17.0", "solana-vote-program", ] @@ -3889,9 +4078,9 @@ dependencies = [ "ark-ff", "ark-serialize", "array-bytes", - "base64 0.21.2", + "base64 0.21.4", "bincode", - "bitflags", + "bitflags 1.3.2", "blake3", "borsh 0.10.3", "borsh 0.9.3", @@ -3902,7 +4091,7 @@ dependencies = [ "console_error_panic_hook", "console_log", "curve25519-dalek", - "getrandom 0.2.8", + "getrandom 0.2.10", "itertools", "js-sys", "lazy_static", @@ -3910,10 +4099,10 @@ dependencies = [ "libsecp256k1", "log", "memoffset 0.9.0", - "num-bigint 0.4.3", + "num-bigint 0.4.4", "num-derive", "num-traits", - "parking_lot 0.12.1", + "parking_lot", "rand 0.7.3", "rand_chacha 0.2.2", "rustc_version", @@ -3922,11 +4111,65 @@ dependencies = [ "serde_bytes", "serde_derive", "serde_json", - "sha2 0.10.6", + "sha2 0.10.7", "sha3 0.10.6", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-sdk-macro", + "solana-frozen-abi 1.16.13", + "solana-frozen-abi-macro 1.16.13", + "solana-sdk-macro 1.16.13", + "thiserror", + "tiny-bip39", + "wasm-bindgen", + "zeroize", +] + +[[package]] +name = "solana-program" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +dependencies = [ + "ark-bn254", + "ark-ec", + "ark-ff", + "ark-serialize", + "array-bytes", + "base64 0.21.4", + "bincode", + "bitflags 2.4.0", + "blake3", + "borsh 0.10.3", + "borsh 0.9.3", + "bs58", + "bv", + "bytemuck", + "cc", + "console_error_panic_hook", + "console_log", + "curve25519-dalek", + "getrandom 0.2.10", + "itertools", + "js-sys", + "lazy_static", + "libc", + "libsecp256k1", + "light-poseidon", + "log", + "memoffset 0.9.0", + "num-bigint 0.4.4", + "num-derive", + "num-traits", + "parking_lot", + "rand 0.8.5", + "rustc_version", + "rustversion", + "serde", + "serde_bytes", + "serde_derive", + "serde_json", + "sha2 0.10.7", + "sha3 0.10.6", + "solana-frozen-abi 1.17.0", + "solana-frozen-abi-macro 1.17.0", + "solana-sdk-macro 1.17.0", "thiserror", "tiny-bip39", "wasm-bindgen", @@ -3935,11 +4178,10 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ff9f0c8043b2e7921e25a3fee88fa253b8cb5dbab1e521a4d83e78e8874c551" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", "bincode", "eager", "enum-iterator", @@ -3949,40 +4191,40 @@ dependencies = [ "num-derive", "num-traits", "percentage", - "rand 0.7.3", + "rand 0.8.5", "rustc_version", "serde", - "solana-frozen-abi", - "solana-frozen-abi-macro", + "solana-frozen-abi 1.17.0", + "solana-frozen-abi-macro 1.17.0", "solana-measure", "solana-metrics", - "solana-sdk", + "solana-sdk 1.17.0", "solana_rbpf", "thiserror", ] [[package]] name = "solana-program-test" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed844e7d13e497e86c853ad19181724119100818673df931f8404a3e280c1828" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "assert_matches", "async-trait", - "base64 0.21.2", + "base64 0.21.4", "bincode", "chrono-humanize", "crossbeam-channel", "log", "serde", + "solana-accounts-db", "solana-banks-client", - "solana-banks-interface", + "solana-banks-interface 1.17.0", "solana-banks-server", "solana-bpf-loader-program", - "solana-logger", + "solana-logger 1.17.0", "solana-program-runtime", "solana-runtime", - "solana-sdk", + "solana-sdk 1.17.0", "solana-vote-program", "thiserror", "tokio", @@ -3990,9 +4232,8 @@ dependencies = [ [[package]] name = "solana-pubsub-client" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0659db803f68fb440c87f43a603e2da7adb3dd11d68e119c3209ed3ca02073" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "crossbeam-channel", "futures-util", @@ -4004,7 +4245,7 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk", + "solana-sdk 1.17.0", "thiserror", "tokio", "tokio-stream", @@ -4015,9 +4256,8 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4e0689f7b3b2e98e73089bf3aa6b3290cb8a2cbff97fca2ee579cc3ca2717e" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "async-mutex", "async-trait", @@ -4027,7 +4267,6 @@ dependencies = [ "log", "quinn", "quinn-proto", - "quinn-udp", "rcgen", "rustls", "solana-connection-cache", @@ -4035,7 +4274,7 @@ dependencies = [ "solana-metrics", "solana-net-utils", "solana-rpc-client-api", - "solana-sdk", + "solana-sdk 1.17.0", "solana-streamer", "thiserror", "tokio", @@ -4043,9 +4282,8 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3c3996bd418c45a540ee2c2d23e9796c244d3e5c9f135a86aa8501e1afea19" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "lazy_static", "num_cpus", @@ -4053,31 +4291,29 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40927d4df440e354f618cbf9e5eb81e02cf4563ef8360782b5493f395b63f61a" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "console", "dialoguer", "log", "num-derive", "num-traits", - "parking_lot 0.12.1", + "parking_lot", "qstring", "semver", - "solana-sdk", + "solana-sdk 1.17.0", "thiserror", "uriparse", ] [[package]] name = "solana-rpc-client" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871cf6d60098c556755a3a7dbd1742201718220a13b988d012f0658eddaad674" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "async-trait", - "base64 0.21.2", + "base64 0.21.4", "bincode", "bs58", "indicatif", @@ -4089,7 +4325,7 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk", + "solana-sdk 1.17.0", "solana-transaction-status", "solana-version", "solana-vote-program", @@ -4098,11 +4334,10 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3214d68e3b661ddfd960271f67eb8042298ac7d90d9bd86d330200c3a5518404" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", "bs58", "jsonrpc-core", "reqwest", @@ -4111,7 +4346,7 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder", - "solana-sdk", + "solana-sdk 1.17.0", "solana-transaction-status", "solana-version", "spl-token-2022", @@ -4120,24 +4355,23 @@ dependencies = [ [[package]] name = "solana-rpc-client-nonce-utils" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf08c480fb3d0d861abe10a0517990edea8151529ccf537c0a833233f1381d8" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "clap 2.34.0", "solana-clap-utils", "solana-rpc-client", - "solana-sdk", + "solana-sdk 1.17.0", "thiserror", ] [[package]] name = "solana-runtime" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63ab2fb3bb128fe84bd43dedfdb5b3e03501a2f4e2121ae22a1b91106d1ca42" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "arrayref", + "base64 0.21.4", "bincode", "blake3", "bv", @@ -4149,6 +4383,7 @@ dependencies = [ "dir-diff", "flate2", "fnv", + "fs-err", "im", "index_list", "itertools", @@ -4162,34 +4397,39 @@ dependencies = [ "num-traits", "num_cpus", "num_enum 0.6.1", - "once_cell", "ouroboros", "percentage", - "rand 0.7.3", + "qualifier_attr", + "rand 0.8.5", "rayon", "regex", "rustc_version", "serde", "serde_derive", + "serde_json", + "siphasher", + "solana-accounts-db", "solana-address-lookup-table-program", "solana-bpf-loader-program", "solana-bucket-map", "solana-compute-budget-program", "solana-config-program", - "solana-frozen-abi", - "solana-frozen-abi-macro", + "solana-cost-model", + "solana-frozen-abi 1.17.0", + "solana-frozen-abi-macro 1.17.0", "solana-loader-v4-program", "solana-measure", "solana-metrics", "solana-perf", "solana-program-runtime", "solana-rayon-threadlimit", - "solana-sdk", + "solana-sdk 1.17.0", "solana-stake-program", "solana-system-program", + "solana-version", "solana-vote-program", "solana-zk-token-proof-program", - "solana-zk-token-sdk", + "solana-zk-token-sdk 1.17.0", "static_assertions", "strum", "strum_macros", @@ -4207,9 +4447,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74a01f25b9f4022fc222c21c589ef7943027fb0fa2b9f6ae943fc4a65c2c01a2" dependencies = [ "assert_matches", - "base64 0.21.2", + "base64 0.21.4", "bincode", - "bitflags", + "bitflags 1.3.2", "borsh 0.10.3", "bs58", "bytemuck", @@ -4241,13 +4481,66 @@ dependencies = [ "serde_derive", "serde_json", "serde_with 2.3.3", - "sha2 0.10.6", + "sha2 0.10.7", "sha3 0.10.6", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-logger", - "solana-program", - "solana-sdk-macro", + "solana-frozen-abi 1.16.13", + "solana-frozen-abi-macro 1.16.13", + "solana-logger 1.16.13", + "solana-program 1.16.13", + "solana-sdk-macro 1.16.13", + "thiserror", + "uriparse", + "wasm-bindgen", +] + +[[package]] +name = "solana-sdk" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +dependencies = [ + "assert_matches", + "base64 0.21.4", + "bincode", + "bitflags 2.4.0", + "borsh 0.10.3", + "bs58", + "bytemuck", + "byteorder", + "chrono", + "derivation-path", + "digest 0.10.7", + "ed25519-dalek", + "ed25519-dalek-bip32", + "generic-array", + "hmac 0.12.1", + "itertools", + "js-sys", + "lazy_static", + "libsecp256k1", + "log", + "memmap2", + "num-derive", + "num-traits", + "num_enum 0.6.1", + "pbkdf2 0.11.0", + "qstring", + "qualifier_attr", + "rand 0.7.3", + "rand 0.8.5", + "rustc_version", + "rustversion", + "serde", + "serde_bytes", + "serde_derive", + "serde_json", + "serde_with 2.3.3", + "sha2 0.10.7", + "sha3 0.10.6", + "solana-frozen-abi 1.17.0", + "solana-frozen-abi-macro 1.17.0", + "solana-logger 1.17.0", + "solana-program 1.17.0", + "solana-sdk-macro 1.17.0", "thiserror", "uriparse", "wasm-bindgen", @@ -4260,17 +4553,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75b33716470fa4a65a23ddc2d4abcb8d28532c6e3ae3f04f4fe79b5e1f8c247" dependencies = [ "bs58", - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.32", +] + +[[package]] +name = "solana-sdk-macro" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +dependencies = [ + "bs58", + "proc-macro2", + "quote", "rustversion", - "syn 2.0.18", + "syn 2.0.32", ] [[package]] name = "solana-send-transaction-service" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd9b33ec9f7bba86dc7bced3323b31de776984f674b10316fe983c0dcc052f62" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "crossbeam-channel", "log", @@ -4278,37 +4582,35 @@ dependencies = [ "solana-measure", "solana-metrics", "solana-runtime", - "solana-sdk", + "solana-sdk 1.17.0", "solana-tpu-client", ] [[package]] name = "solana-stake-program" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa54eeb4f5cd2bcac1e593bb1907c3d0134a367dcbce0daf8c81bdd431b5f8e4" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "bincode", "log", "rustc_version", "solana-config-program", "solana-program-runtime", - "solana-sdk", + "solana-sdk 1.17.0", "solana-vote-program", ] [[package]] name = "solana-streamer" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705ef2b2649c4162061a74aaf12f02b244828ed847ad981581e3e51155279ca5" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "async-channel", "bytes", "crossbeam-channel", "futures-util", "histogram", - "indexmap", + "indexmap 2.0.0", "itertools", "libc", "log", @@ -4318,13 +4620,12 @@ dependencies = [ "pkcs8", "quinn", "quinn-proto", - "quinn-udp", - "rand 0.7.3", + "rand 0.8.5", "rcgen", "rustls", "solana-metrics", "solana-perf", - "solana-sdk", + "solana-sdk 1.17.0", "thiserror", "tokio", "x509-parser", @@ -4332,23 +4633,21 @@ dependencies = [ [[package]] name = "solana-system-program" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "554ef3c25bd7c848f42bfa04b7ddfcb4f32796960ba284fd819f132b185b7b01" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "bincode", "log", "serde", "serde_derive", "solana-program-runtime", - "solana-sdk", + "solana-sdk 1.17.0", ] [[package]] name = "solana-thin-client" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc8a9f9c101395d314c4e5e1b19801dd54f4cd501e40b8c2d7d8b896cd2e0980" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "bincode", "log", @@ -4356,22 +4655,20 @@ dependencies = [ "solana-connection-cache", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk", + "solana-sdk 1.17.0", ] [[package]] name = "solana-tpu-client" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a8a4d90f74e666cd2a5f7ac9ed230ca186d8f7351a927f061801b3ba4e8f2f" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "async-trait", "bincode", "futures-util", - "indexmap", + "indexmap 2.0.0", "indicatif", "log", - "rand 0.7.3", "rayon", "solana-connection-cache", "solana-measure", @@ -4379,19 +4676,18 @@ dependencies = [ "solana-pubsub-client", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk", + "solana-sdk 1.17.0", "thiserror", "tokio", ] [[package]] name = "solana-transaction-status" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9266f75afa4163c9a5f29f1066f907e87482858749942380d6538af567b44c7" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "Inflector", - "base64 0.21.2", + "base64 0.21.4", "bincode", "borsh 0.9.3", "bs58", @@ -4401,8 +4697,7 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder", - "solana-address-lookup-table-program", - "solana-sdk", + "solana-sdk 1.17.0", "spl-associated-token-account", "spl-memo", "spl-token", @@ -4412,14 +4707,13 @@ dependencies = [ [[package]] name = "solana-udp-client" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f475a0a0faa55f7783084258c1e88be39ed3ea5c4f945bf728b7ca8c7a3262" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "async-trait", "solana-connection-cache", "solana-net-utils", - "solana-sdk", + "solana-sdk 1.17.0", "solana-streamer", "thiserror", "tokio", @@ -4427,25 +4721,23 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "886a0c01be1e2b3a7ec3bed63f2112cd7f80c4b8182e95fa98b7ab7e37faf90a" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "log", "rustc_version", "semver", "serde", "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-sdk", + "solana-frozen-abi 1.17.0", + "solana-frozen-abi-macro 1.17.0", + "solana-sdk 1.17.0", ] [[package]] name = "solana-vote-program" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b1102b13ca7c760439545dba83588419d208b500a93eb61f6565be26bef490" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "bincode", "log", @@ -4454,28 +4746,26 @@ dependencies = [ "rustc_version", "serde", "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", + "solana-frozen-abi 1.17.0", + "solana-frozen-abi-macro 1.17.0", "solana-metrics", - "solana-program", + "solana-program 1.17.0", "solana-program-runtime", - "solana-sdk", + "solana-sdk 1.17.0", "thiserror", ] [[package]] name = "solana-zk-token-proof-program" -version = "1.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d33a2ae4ae1f394fced36c7f1170ecf3e597cf68eb8989877d805a384ce65a9e" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" dependencies = [ "bytemuck", - "getrandom 0.1.16", "num-derive", "num-traits", "solana-program-runtime", - "solana-sdk", - "solana-zk-token-sdk", + "solana-sdk 1.17.0", + "solana-zk-token-sdk 1.17.0", ] [[package]] @@ -4485,7 +4775,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1669c9d223d850cd96cad69d3ba1a4234bc3e2f83ac837fbdbc0ce774dac7b92" dependencies = [ "aes-gcm-siv", - "base64 0.21.2", + "base64 0.21.4", "bincode", "bytemuck", "byteorder", @@ -4500,8 +4790,36 @@ dependencies = [ "serde", "serde_json", "sha3 0.9.1", - "solana-program", - "solana-sdk", + "solana-program 1.16.13", + "solana-sdk 1.16.13", + "subtle", + "thiserror", + "zeroize", +] + +[[package]] +name = "solana-zk-token-sdk" +version = "1.17.0" +source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +dependencies = [ + "aes-gcm-siv", + "base64 0.21.4", + "bincode", + "bytemuck", + "byteorder", + "curve25519-dalek", + "getrandom 0.1.16", + "itertools", + "lazy_static", + "merlin", + "num-derive", + "num-traits", + "rand 0.7.3", + "serde", + "serde_json", + "sha3 0.9.1", + "solana-program 1.17.0", + "solana-sdk 1.17.0", "subtle", "thiserror", "zeroize", @@ -4509,9 +4827,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3082ec3a1d4ef7879eb5b84916d5acde057abd59733eec3647e0ab8885283ef" +checksum = "d08e812351a5c726e51fa6aaae8687c661acfeb9a8b651bd58fc413a58701a58" dependencies = [ "byteorder", "combine", @@ -4534,7 +4852,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk", + "solana-sdk 1.17.0", "solders-account", "solders-account-decoder", "solders-address-lookup-table-account", @@ -4570,7 +4888,7 @@ dependencies = [ "pyo3", "serde", "solana-account-decoder", - "solana-sdk", + "solana-sdk 1.17.0", "solders-account-decoder", "solders-macros", "solders-pubkey", @@ -4589,7 +4907,7 @@ dependencies = [ "serde", "serde_json", "solana-account-decoder", - "solana-sdk", + "solana-sdk 1.17.0", "solders-macros", "solders-traits-core", "zstd", @@ -4602,7 +4920,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program", + "solana-program 1.17.0", "solders-macros", "solders-pubkey", "solders-traits-core", @@ -4617,7 +4935,7 @@ dependencies = [ "pyo3-asyncio", "solana-banks-client", "solana-program-test", - "solana-sdk", + "solana-sdk 1.17.0", "solders-account", "solders-banks-interface", "solders-commitment-config", @@ -4643,7 +4961,7 @@ dependencies = [ "pyo3", "serde", "solana-banks-client", - "solana-banks-interface", + "solana-banks-interface 1.16.13", "solders-macros", "solders-traits-core", "solders-transaction-confirmation-status", @@ -4659,7 +4977,7 @@ dependencies = [ "base64 0.13.1", "bincode", "serde", - "solana-sdk", + "solana-sdk 1.17.0", "solders-message", "solders-transaction", ] @@ -4668,7 +4986,7 @@ dependencies = [ name = "solders-clock-example" version = "0.0.0" dependencies = [ - "solana-program", + "solana-program 1.17.0", ] [[package]] @@ -4678,7 +4996,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk", + "solana-sdk 1.17.0", "solders-traits", ] @@ -4687,7 +5005,7 @@ name = "solders-compute-budget" version = "0.18.1" dependencies = [ "pyo3", - "solana-sdk", + "solana-sdk 1.17.0", "solders-instruction", "solders-pubkey", ] @@ -4699,8 +5017,8 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program", - "solana-sdk", + "solana-program 1.17.0", + "solana-sdk 1.17.0", "solders-macros", "solders-traits-core", ] @@ -4712,7 +5030,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program", + "solana-program 1.17.0", "solders-macros", "solders-traits", "solders-traits-core", @@ -4725,7 +5043,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program", + "solana-program 1.17.0", "solders-macros", "solders-pubkey", "solders-traits-core", @@ -4738,7 +5056,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk", + "solana-sdk 1.17.0", "solders-macros", "solders-pubkey", "solders-signature", @@ -4750,8 +5068,8 @@ dependencies = [ name = "solders-macros" version = "0.18.1" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] @@ -4763,7 +5081,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program", + "solana-program 1.17.0", "solders-address-lookup-table-account", "solders-hash", "solders-instruction", @@ -4781,7 +5099,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program", + "solana-program 1.17.0", "solders-macros", "solders-traits-core", ] @@ -4793,7 +5111,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program", + "solana-program 1.17.0", "solders-macros", "solders-traits", "solders-traits-core", @@ -4861,7 +5179,7 @@ dependencies = [ "serde", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk", + "solana-sdk 1.17.0", "solders-commitment-config", "solders-macros", "solders-pubkey", @@ -5051,7 +5369,7 @@ dependencies = [ "serde_with 1.14.0", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk", + "solana-sdk 1.17.0", "solana-transaction-status", "solders-account", "solders-account-decoder", @@ -5087,7 +5405,7 @@ dependencies = [ "serde_with 1.14.0", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk", + "solana-sdk 1.17.0", "solders-account", "solders-account-decoder", "solders-hash", @@ -5122,7 +5440,7 @@ dependencies = [ "pyo3", "serde", "solana-rpc-client-api", - "solana-sdk", + "solana-sdk 1.17.0", "solana-transaction-status", "solders-commitment-config", "solders-macros", @@ -5201,7 +5519,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk", + "solana-sdk 1.17.0", "solders-macros", "solders-pubkey", "solders-traits-core", @@ -5216,8 +5534,8 @@ dependencies = [ "dict_derive", "pyo3", "serde", - "solana-program", - "solana-sdk", + "solana-program 1.17.0", + "solana-sdk 1.17.0", "solders-instruction", "solders-macros", "solders-pubkey", @@ -5232,7 +5550,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program", + "solana-program 1.17.0", "solders-macros", "solders-pubkey", "solders-traits-core", @@ -5249,7 +5567,7 @@ dependencies = [ "serde_cbor", "serde_json", "solana-banks-client", - "solana-sdk", + "solana-sdk 1.17.0", "solders-traits-core", ] @@ -5271,7 +5589,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk", + "solana-sdk 1.17.0", "solders-hash", "solders-instruction", "solders-keypair", @@ -5300,7 +5618,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk", + "solana-sdk 1.17.0", "solders-macros", "solders-traits-core", ] @@ -5313,7 +5631,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk", + "solana-sdk 1.17.0", "solana-transaction-status", "solders-macros", "solders-pubkey", @@ -5333,7 +5651,7 @@ dependencies = [ "serde", "serde_json", "solana-account-decoder", - "solana-sdk", + "solana-sdk 1.17.0", "solana-transaction-status", "solders-account-decoder", "solders-hash", @@ -5401,7 +5719,7 @@ dependencies = [ "borsh 0.9.3", "num-derive", "num-traits", - "solana-program", + "solana-program 1.16.13", "spl-token", "spl-token-2022", "thiserror", @@ -5413,7 +5731,7 @@ version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325" dependencies = [ - "solana-program", + "solana-program 1.16.13", ] [[package]] @@ -5427,7 +5745,7 @@ dependencies = [ "num-derive", "num-traits", "num_enum 0.5.10", - "solana-program", + "solana-program 1.16.13", "thiserror", ] @@ -5442,8 +5760,8 @@ dependencies = [ "num-derive", "num-traits", "num_enum 0.5.10", - "solana-program", - "solana-zk-token-sdk", + "solana-program 1.16.13", + "solana-zk-token-sdk 1.16.13", "spl-memo", "spl-token", "thiserror", @@ -5483,8 +5801,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck", - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "rustversion", "syn 1.0.107", ] @@ -5501,36 +5819,25 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a" -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - [[package]] name = "syn" version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.18" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "unicode-ident", ] @@ -5540,17 +5847,17 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", - "unicode-xid 0.2.4", + "unicode-xid", ] [[package]] name = "tar" -version = "0.4.38" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -5593,22 +5900,22 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] [[package]] name = "tempfile" -version = "3.5.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", "rustix", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -5637,22 +5944,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.32", ] [[package]] @@ -5665,17 +5972,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "time" version = "0.3.19" @@ -5739,44 +6035,42 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.14.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d0183f6f6001549ab68f8c7585093bb732beefbcf6d23a10b9b95c73a1dd49" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", - "memchr", "mio", "num_cpus", - "once_cell", - "parking_lot 0.11.2", + "parking_lot", "pin-project-lite", "signal-hook-registry", + "socket2 0.5.4", "tokio-macros", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", - "syn 1.0.107", + "proc-macro2", + "quote", + "syn 2.0.32", ] [[package]] name = "tokio-rustls" -version = "0.23.4" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ "rustls", "tokio", - "webpki", ] [[package]] @@ -5797,9 +6091,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", "pin-project-lite", @@ -5808,9 +6102,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.17.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" +checksum = "2b2dbec703c26b00d74844519606ef15d09a7d6857860f84ad223dec002ddea2" dependencies = [ "futures-util", "log", @@ -5818,8 +6112,7 @@ dependencies = [ "tokio", "tokio-rustls", "tungstenite", - "webpki", - "webpki-roots", + "webpki-roots 0.23.1", ] [[package]] @@ -5893,7 +6186,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" dependencies = [ - "indexmap", + "indexmap 1.9.3", "nom8", "toml_datetime 0.5.1", ] @@ -5904,7 +6197,7 @@ version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ - "indexmap", + "indexmap 1.9.3", "serde", "serde_spanned", "toml_datetime 0.6.1", @@ -5936,8 +6229,8 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", ] @@ -5983,24 +6276,23 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tungstenite" -version = "0.17.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" +checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649" dependencies = [ - "base64 0.13.1", "byteorder", "bytes", + "data-encoding", "http", "httparse", "log", "rand 0.8.5", "rustls", - "sha-1", + "sha1", "thiserror", "url", "utf-8", - "webpki", - "webpki-roots", + "webpki-roots 0.24.0", ] [[package]] @@ -6036,12 +6328,6 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - [[package]] name = "unicode-xid" version = "0.2.4" @@ -6091,9 +6377,9 @@ dependencies = [ [[package]] name = "url" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -6157,12 +6443,6 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -6171,9 +6451,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -6181,16 +6461,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.59", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.32", "wasm-bindgen-shared", ] @@ -6208,32 +6488,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ - "quote 1.0.28", + "quote", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.32", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" @@ -6246,24 +6526,29 @@ dependencies = [ ] [[package]] -name = "webpki" -version = "0.22.0" +name = "webpki-roots" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ - "ring", - "untrusted", + "rustls-webpki 0.100.3", ] [[package]] name = "webpki-roots" -version = "0.22.6" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "webpki", + "rustls-webpki 0.101.5", ] +[[package]] +name = "webpki-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + [[package]] name = "winapi" version = "0.3.9" @@ -6453,11 +6738,12 @@ dependencies = [ [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if", + "windows-sys 0.48.0", ] [[package]] @@ -6475,14 +6761,14 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.19", + "time", ] [[package]] name = "xattr" -version = "0.2.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] @@ -6493,7 +6779,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" dependencies = [ - "time 0.3.19", + "time", ] [[package]] @@ -6511,8 +6797,8 @@ version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ - "proc-macro2 1.0.59", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.107", "synstructure", ] diff --git a/Cargo.toml b/Cargo.toml index cad22914..f77b92e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -118,19 +118,19 @@ solders-transaction-error = { path = "./crates/transaction-error", version = "=0 solders-account = { path = "./crates/account", version = "=0.18.1" } solders-hash = { path = "./crates/hash", version = "=0.18.1" } serde_with = { version = "^1.14.0", features = ["base64"] } -solana-sdk = "1.16.3" -solana-account-decoder = "1.16.3" -solana-transaction-status = "1.16.3" -solana-rpc-client-api = "1.16.3" -solana-program = "1.16.3" +solana-sdk = { git = "https://github.com/solana-labs/solana", rev = "3ffd78f" } +solana-account-decoder = { git = "https://github.com/solana-labs/solana", rev = "3ffd78f" } +solana-transaction-status = { git = "https://github.com/solana-labs/solana", rev = "3ffd78f" } +solana-rpc-client-api = { git = "https://github.com/solana-labs/solana", rev = "3ffd78f" } +solana-program = { git = "https://github.com/solana-labs/solana", rev = "3ffd78f" } bincode = "1.3.3" base64 = "0.13.0" -serde = "^1.0.136" -serde_json = "^1.0.59" +serde = "^1.0.188" +serde_json = "^1.0.106" serde_cbor = "^0.11.2" derive_more = "0.99.17" -solana-program-test = "1.16.3" -solana-banks-client = "1.16.3" +solana-program-test = { git = "https://github.com/solana-labs/solana", rev = "3ffd78f" } +solana-banks-client = { git = "https://github.com/solana-labs/solana", rev = "3ffd78f" } pythonize = "0.19.0" bs58 = "0.4.0" thiserror = "^1.0.31" diff --git a/crates/message/src/lib.rs b/crates/message/src/lib.rs index cc4587e1..6bee7c6b 100644 --- a/crates/message/src/lib.rs +++ b/crates/message/src/lib.rs @@ -766,8 +766,8 @@ impl MessageV0 { } /// Sanitize message fields and compiled instruction indexes. - pub fn sanitize(&self, reject_dynamic_program_ids: bool) -> PyResult<()> { - handle_py_err(self.0.sanitize(reject_dynamic_program_ids)) + pub fn sanitize(&self) -> PyResult<()> { + handle_py_err(self.0.sanitize()) } /// Returns true if the account at the specified index is called as a program by an instruction diff --git a/crates/transaction-error/src/lib.rs b/crates/transaction-error/src/lib.rs index 0938ef88..c1eb5e7a 100644 --- a/crates/transaction-error/src/lib.rs +++ b/crates/transaction-error/src/lib.rs @@ -446,6 +446,24 @@ impl TransactionErrorInsufficientFundsForRent { } } +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, From, Into)] +#[pyclass(module = "solders.transaction_status", subclass)] +pub struct TransactionErrorProgramExecutionTemporarilyRestricted { + #[pyo3(get)] + account_index: u8, +} +transaction_status_boilerplate!(TransactionErrorProgramExecutionTemporarilyRestricted); + +#[richcmp_eq_only] +#[common_methods] +#[pymethods] +impl TransactionErrorProgramExecutionTemporarilyRestricted { + #[new] + pub fn new(account_index: u8) -> Self { + Self { account_index } + } +} + #[pyclass(module = "solders.transaction_status")] #[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq, Hash)] pub enum TransactionErrorFieldless { @@ -488,6 +506,7 @@ pub enum TransactionErrorTypeTagged { InstructionError(TransactionErrorInstructionError), DuplicateInstruction(TransactionErrorDuplicateInstruction), InsufficientFundsForRent(TransactionErrorInsufficientFundsForRent), + ProgramExecutionTemporarilyRestricted(TransactionErrorProgramExecutionTemporarilyRestricted) } #[derive(FromPyObject, Clone, PartialEq, Eq, Serialize, Deserialize, Debug, EnumIntoPy)] @@ -518,6 +537,11 @@ impl From for TransactionErrorOriginal { account_index: e.account_index, } } + TransactionErrorTypeTagged::ProgramExecutionTemporarilyRestricted(e) => { + Self::ProgramExecutionTemporarilyRestricted { + account_index: e.account_index, + } + } }, TransactionErrorType::Fieldless(f) => match f { TransactionErrorFieldless::AccountInUse => Self::AccountInUse, @@ -603,6 +627,11 @@ impl From for TransactionErrorType { TransactionErrorInsufficientFundsForRent { account_index }, )) } + TransactionErrorOriginal::ProgramExecutionTemporarilyRestricted { account_index } => { + Self::Tagged(TransactionErrorTypeTagged::ProgramExecutionTemporarilyRestricted( + TransactionErrorProgramExecutionTemporarilyRestricted { account_index }, + )) + } TransactionErrorOriginal::AccountInUse => { Self::Fieldless(TransactionErrorFieldless::AccountInUse) } diff --git a/python/solders/message.pyi b/python/solders/message.pyi index a6df3b32..691ff324 100644 --- a/python/solders/message.pyi +++ b/python/solders/message.pyi @@ -139,7 +139,7 @@ class MessageV0: def instructions(self) -> List[CompiledInstruction]: ... @property def address_table_lookups(self) -> List[MessageAddressTableLookup]: ... - def sanitize(self, reject_dynamic_program_ids: bool) -> None: ... + def sanitize(self) -> None: ... def hash(self) -> Hash: ... @staticmethod def hash_raw_message(message_bytes: bytes) -> Hash: ... diff --git a/python/solders/transaction_status.pyi b/python/solders/transaction_status.pyi index afdb3422..7d5cf2ef 100644 --- a/python/solders/transaction_status.pyi +++ b/python/solders/transaction_status.pyi @@ -632,6 +632,23 @@ class TransactionErrorInsufficientFundsForRent: @staticmethod def from_json(raw: str) -> "TransactionErrorInsufficientFundsForRent": ... +class TransactionErrorProgramExecutionTemporarilyRestricted: + account_index: int + def __init__(self, account_index: int) -> None: ... + def __str__(self) -> str: ... + def __repr__(self) -> str: ... + def __bytes__(self) -> bytes: ... + def __eq__( + self, + other: object, + ) -> bool: ... + def __hash__(self) -> int: ... + @staticmethod + def from_bytes(raw: bytes) -> "TransactionErrorProgramExecutionTemporarilyRestricted": ... + def to_json(self) -> str: ... + @staticmethod + def from_json(raw: str) -> "TransactionErrorProgramExecutionTemporarilyRestricted": ... + class TransactionErrorFieldless: AccountInUse: "TransactionErrorFieldless" AccountLoadedTwice: "TransactionErrorFieldless" @@ -682,6 +699,7 @@ TransactionErrorType = Union[ TransactionErrorInstructionError, TransactionErrorDuplicateInstruction, TransactionErrorInsufficientFundsForRent, + TransactionErrorProgramExecutionTemporarilyRestricted ] class Reward: diff --git a/rust-toolchain.toml b/rust-toolchain.toml index d580b38d..f29634cd 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.68.0" +channel = "1.72.0" components = [ "clippy"] From 1e1722a2564602737434b23012a9c4b821226451 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Sat, 21 Oct 2023 17:16:05 +0400 Subject: [PATCH 03/15] update to solana 1.17.2 --- Cargo.lock | 1125 +++++++++++++------------ Cargo.toml | 14 +- crates/keypair/src/lib.rs | 8 +- crates/keypair/src/presigner.rs | 2 +- crates/transaction-error/src/lib.rs | 7 + crates/transaction/src/lib.rs | 4 +- python/solders/transaction_status.pyi | 3 + tests/test_keypair.py | 6 +- tests/test_transaction.py | 290 +------ tests/test_versioned_message.py | 31 +- 10 files changed, 658 insertions(+), 832 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e26eb1d0..382d65c0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -263,12 +263,6 @@ dependencies = [ "rand 0.8.5", ] -[[package]] -name = "array-bytes" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad284aeb45c13f2fb4f084de4a420ebf447423bdf9386c0540ce33cb3ef4b8c" - [[package]] name = "arrayref" version = "0.3.7" @@ -277,9 +271,9 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ascii" @@ -468,9 +462,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" dependencies = [ "arrayref", "arrayvec", @@ -725,9 +719,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.30" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1700,9 +1694,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" [[package]] name = "heck" @@ -1913,19 +1907,19 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.1", ] [[package]] name = "indicatif" -version = "0.17.6" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" dependencies = [ "console", "instant", @@ -2020,9 +2014,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libsecp256k1" @@ -2330,6 +2324,17 @@ dependencies = [ "syn 1.0.107", ] +[[package]] +name = "num-derive" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -2400,6 +2405,15 @@ dependencies = [ "num_enum_derive 0.6.1", ] +[[package]] +name = "num_enum" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb" +dependencies = [ + "num_enum_derive 0.7.0", +] + [[package]] name = "num_enum_derive" version = "0.5.10" @@ -2424,6 +2438,18 @@ dependencies = [ "syn 2.0.32", ] +[[package]] +name = "num_enum_derive" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597" +dependencies = [ + "proc-macro-crate 1.3.0", + "proc-macro2", + "quote", + "syn 2.0.32", +] + [[package]] name = "number_prefix" version = "0.4.0" @@ -2709,9 +2735,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -2838,9 +2864,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13f81c9a9d574310b8351f8666f5a93ac3b0069c45c28ad52c10291389a7cf9" +checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1" dependencies = [ "bytes", "rand 0.8.5", @@ -3010,9 +3036,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -3022,9 +3048,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -3033,9 +3059,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" @@ -3165,7 +3191,7 @@ checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", - "rustls-webpki 0.101.5", + "rustls-webpki", "sct", ] @@ -3190,16 +3216,6 @@ dependencies = [ "base64 0.21.4", ] -[[package]] -name = "rustls-webpki" -version = "0.100.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "rustls-webpki" version = "0.101.5" @@ -3307,9 +3323,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" @@ -3352,9 +3368,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.106" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -3567,8 +3583,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea108fb41a4d6c3bafaf7d78fa94a6c2c6e863dc4e773c8e57dec22161be42b0" dependencies = [ "Inflector", "base64 0.21.4", @@ -3580,17 +3597,19 @@ dependencies = [ "serde_derive", "serde_json", "solana-config-program", - "solana-sdk 1.17.0", - "spl-token", - "spl-token-2022", + "solana-sdk", + "spl-token 4.0.0", + "spl-token-2022 0.9.0", + "spl-token-metadata-interface", "thiserror", "zstd", ] [[package]] name = "solana-accounts-db" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f1667ba2a54bf033667d17eaf3b12a7aee362b7b55725a6b594b67cb8e8fc7f" dependencies = [ "arrayref", "bincode", @@ -3601,7 +3620,6 @@ dependencies = [ "bzip2", "crossbeam-channel", "dashmap", - "dir-diff", "flate2", "fnv", "fs-err", @@ -3610,11 +3628,10 @@ dependencies = [ "itertools", "lazy_static", "log", - "lru", "lz4", "memmap2", "modular-bitfield", - "num-derive", + "num-derive 0.3.3", "num-traits", "num_cpus", "num_enum 0.6.1", @@ -3627,66 +3644,58 @@ dependencies = [ "rustc_version", "serde", "serde_derive", - "siphasher", - "solana-bpf-loader-program", "solana-bucket-map", - "solana-compute-budget-program", "solana-config-program", - "solana-cost-model", - "solana-frozen-abi 1.17.0", - "solana-frozen-abi-macro 1.17.0", - "solana-loader-v4-program", + "solana-frozen-abi", + "solana-frozen-abi-macro", "solana-measure", "solana-metrics", - "solana-perf", "solana-program-runtime", "solana-rayon-threadlimit", - "solana-sdk 1.17.0", + "solana-sdk", "solana-stake-program", "solana-system-program", "solana-vote-program", - "solana-zk-token-proof-program", - "solana-zk-token-sdk 1.17.0", "static_assertions", "strum", "strum_macros", - "symlink", "tar", "tempfile", "thiserror", - "zstd", ] [[package]] name = "solana-address-lookup-table-program" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ee56e31d9b1733f874bfe5b54abef43fb49810f7291deccbdf713527b44b6f" dependencies = [ "bincode", "bytemuck", "log", - "num-derive", + "num-derive 0.3.3", "num-traits", "rustc_version", "serde", - "solana-frozen-abi 1.17.0", - "solana-frozen-abi-macro 1.17.0", - "solana-program 1.17.0", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-program", "solana-program-runtime", - "solana-sdk 1.17.0", + "solana-sdk", "thiserror", ] [[package]] name = "solana-banks-client" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4118d1d75cecd79defb0f8de61e428d186fb873d17641e817f80caed202a5647" dependencies = [ "borsh 0.10.3", "futures", - "solana-banks-interface 1.17.0", - "solana-program 1.17.0", - "solana-sdk 1.17.0", + "solana-banks-interface", + "solana-program", + "solana-sdk", "tarpc", "thiserror", "tokio", @@ -3695,38 +3704,29 @@ dependencies = [ [[package]] name = "solana-banks-interface" -version = "1.16.13" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cea685028231e10a02c6f021ca6cd1d0446a7ecb199b8c9e939d5cccb57ec9d" +checksum = "1fdea91839646ec597a1dd6f5e884cb5c30d574db21970fcc20b04deb4747d96" dependencies = [ "serde", - "solana-sdk 1.16.13", - "tarpc", -] - -[[package]] -name = "solana-banks-interface" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" -dependencies = [ - "serde", - "solana-sdk 1.17.0", + "solana-sdk", "tarpc", ] [[package]] name = "solana-banks-server" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faa79d64545dcb21680e6939ed63bd9e88425f55a098492d96c9407c7a5b4990" dependencies = [ "bincode", "crossbeam-channel", "futures", "solana-accounts-db", - "solana-banks-interface 1.17.0", + "solana-banks-interface", "solana-client", "solana-runtime", - "solana-sdk 1.17.0", + "solana-sdk", "solana-send-transaction-service", "tarpc", "tokio", @@ -3735,8 +3735,9 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91dc36edd5b4d37b852accbed3bf41dde302954d7716565700e0fd81e0f5dced" dependencies = [ "bincode", "byteorder", @@ -3745,38 +3746,41 @@ dependencies = [ "scopeguard", "solana-measure", "solana-program-runtime", - "solana-sdk 1.17.0", - "solana-zk-token-sdk 1.17.0", + "solana-sdk", + "solana-zk-token-sdk", "solana_rbpf", "thiserror", ] [[package]] name = "solana-bucket-map" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36bf733cdfccac6bf2cb1e74f3bd247bd59c2024fc72760cf3ac4cb334e6b86d" dependencies = [ "bv", + "bytemuck", "log", "memmap2", "modular-bitfield", "num_enum 0.6.1", "rand 0.8.5", "solana-measure", - "solana-sdk 1.17.0", + "solana-sdk", "tempfile", ] [[package]] name = "solana-clap-utils" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1114079301af35bed62dba298beaad478a3788cbc376def9a56b8e9d26fc1b8f" dependencies = [ "chrono", "clap 2.34.0", "rpassword", "solana-remote-wallet", - "solana-sdk 1.17.0", + "solana-sdk", "thiserror", "tiny-bip39", "uriparse", @@ -3785,15 +3789,16 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc2d00016dc7975d866dd9ef3ffdd7c6dffec972495645953c07e587330e135" dependencies = [ "async-trait", "bincode", "dashmap", "futures", "futures-util", - "indexmap 2.0.0", + "indexmap 2.0.2", "indicatif", "log", "quinn", @@ -3806,7 +3811,7 @@ dependencies = [ "solana-rpc-client", "solana-rpc-client-api", "solana-rpc-client-nonce-utils", - "solana-sdk 1.17.0", + "solana-sdk", "solana-streamer", "solana-thin-client", "solana-tpu-client", @@ -3817,50 +3822,55 @@ dependencies = [ [[package]] name = "solana-compute-budget-program" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33e650787669f715616444f32bafabf1fe17240d9154e182f83c3949bdd3d627" dependencies = [ "solana-program-runtime", - "solana-sdk 1.17.0", + "solana-sdk", ] [[package]] name = "solana-config-program" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a1f220474e7b9ed04cf450b13fa5ff4d03e7b7acefd36edfbe3d4c8d3f4ebb" dependencies = [ "bincode", "chrono", "serde", "serde_derive", "solana-program-runtime", - "solana-sdk 1.17.0", + "solana-sdk", ] [[package]] name = "solana-connection-cache" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ac0b83f1486f474424f77d2af10608305cac2e1184fde39a13c2a4a8e4c7cc8" dependencies = [ "async-trait", "bincode", + "crossbeam-channel", "futures-util", - "indexmap 2.0.0", + "indexmap 2.0.2", "log", "rand 0.8.5", "rayon", "rcgen", "solana-measure", "solana-metrics", - "solana-sdk 1.17.0", + "solana-sdk", "thiserror", "tokio", ] [[package]] name = "solana-cost-model" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77597dfb4f40a753218811c06647d6bf63d31060f67336212acff6c1282efb8e" dependencies = [ "lazy_static", "log", @@ -3869,12 +3879,12 @@ dependencies = [ "solana-bpf-loader-program", "solana-compute-budget-program", "solana-config-program", - "solana-frozen-abi 1.17.0", - "solana-frozen-abi-macro 1.17.0", + "solana-frozen-abi", + "solana-frozen-abi-macro", "solana-loader-v4-program", "solana-metrics", "solana-program-runtime", - "solana-sdk 1.17.0", + "solana-sdk", "solana-stake-program", "solana-system-program", "solana-vote-program", @@ -3882,41 +3892,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.16.13" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b9e2169fd13394af838b13f047067c35ce69372aea0fb46e026405b5e931f9" -dependencies = [ - "ahash 0.8.3", - "blake3", - "block-buffer 0.10.4", - "bs58", - "bv", - "byteorder", - "cc", - "either", - "generic-array", - "getrandom 0.1.16", - "im", - "lazy_static", - "log", - "memmap2", - "once_cell", - "rand_core 0.6.4", - "rustc_version", - "serde", - "serde_bytes", - "serde_derive", - "serde_json", - "sha2 0.10.7", - "solana-frozen-abi-macro 1.16.13", - "subtle", - "thiserror", -] - -[[package]] -name = "solana-frozen-abi" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +checksum = "098378043a888c680de07eee987bf927e23e0720b472ba61c753d7b3757e6b3e" dependencies = [ "ahash 0.8.3", "blake3", @@ -3937,27 +3915,16 @@ dependencies = [ "serde_derive", "serde_json", "sha2 0.10.7", - "solana-frozen-abi-macro 1.17.0", + "solana-frozen-abi-macro", "subtle", "thiserror", ] [[package]] name = "solana-frozen-abi-macro" -version = "1.16.13" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db08ab0af4007dc0954b900aa5febc0c0ae50d9f9f598be27263c3195d90240b" -dependencies = [ - "proc-macro2", - "quote", - "rustc_version", - "syn 2.0.32", -] - -[[package]] -name = "solana-frozen-abi-macro" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +checksum = "c5f48c89a8a3a12f6a409a45fef50dae642211eae0207a91f01211aebb270026" dependencies = [ "proc-macro2", "quote", @@ -3967,31 +3934,22 @@ dependencies = [ [[package]] name = "solana-loader-v4-program" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a86dfb559013436f20bbf6ae56323630319d853c82836e1a9a3dcae1180b9497" dependencies = [ "log", "solana-measure", "solana-program-runtime", - "solana-sdk 1.17.0", + "solana-sdk", "solana_rbpf", ] [[package]] name = "solana-logger" -version = "1.16.13" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf8a48e734f78a44399516f7c130c114b455911e351f001abc0d96e7c5694efa" -dependencies = [ - "env_logger", - "lazy_static", - "log", -] - -[[package]] -name = "solana-logger" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +checksum = "d7fa5daba09e7c2bc579b0d3151f649496f148a0ac2054bb042915fbfe9c1678" dependencies = [ "env_logger", "lazy_static", @@ -4000,31 +3958,34 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e87403b9fb2abd9f2f2b2879ca9e56e14b5ae58f145466e3e893a7810bcbceff" dependencies = [ "log", - "solana-sdk 1.17.0", + "solana-sdk", ] [[package]] name = "solana-metrics" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4b504a682911c4bf85b21278720870555f5996e2991daf54ea4ce300012e93e" dependencies = [ "crossbeam-channel", "gethostname", "lazy_static", "log", "reqwest", - "solana-sdk 1.17.0", + "solana-sdk", "thiserror", ] [[package]] name = "solana-net-utils" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a573d966fd61609501401dc1350b6ba1d0dee91c166453ec77b2fb312e8072b1" dependencies = [ "bincode", "clap 3.2.23", @@ -4035,8 +3996,8 @@ dependencies = [ "serde", "serde_derive", "socket2 0.5.4", - "solana-logger 1.17.0", - "solana-sdk 1.17.0", + "solana-logger", + "solana-sdk", "solana-version", "tokio", "url", @@ -4044,8 +4005,9 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcffede3b37ccdddbd57f93e4228b268f05c0a5cb44cb6e382ed8a31a15f5573" dependencies = [ "ahash 0.8.3", "bincode", @@ -4063,75 +4025,20 @@ dependencies = [ "serde", "solana-metrics", "solana-rayon-threadlimit", - "solana-sdk 1.17.0", + "solana-sdk", "solana-vote-program", ] [[package]] name = "solana-program" -version = "1.16.13" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f17a1fbcf1e94e282db16153d323b446d6386ac99f597f78e76332265829336" +checksum = "6e8834ffcd3773375e7fce4b261efefebbb64409da78e1627cbc4c2632139921" dependencies = [ "ark-bn254", "ark-ec", "ark-ff", "ark-serialize", - "array-bytes", - "base64 0.21.4", - "bincode", - "bitflags 1.3.2", - "blake3", - "borsh 0.10.3", - "borsh 0.9.3", - "bs58", - "bv", - "bytemuck", - "cc", - "console_error_panic_hook", - "console_log", - "curve25519-dalek", - "getrandom 0.2.10", - "itertools", - "js-sys", - "lazy_static", - "libc", - "libsecp256k1", - "log", - "memoffset 0.9.0", - "num-bigint 0.4.4", - "num-derive", - "num-traits", - "parking_lot", - "rand 0.7.3", - "rand_chacha 0.2.2", - "rustc_version", - "rustversion", - "serde", - "serde_bytes", - "serde_derive", - "serde_json", - "sha2 0.10.7", - "sha3 0.10.6", - "solana-frozen-abi 1.16.13", - "solana-frozen-abi-macro 1.16.13", - "solana-sdk-macro 1.16.13", - "thiserror", - "tiny-bip39", - "wasm-bindgen", - "zeroize", -] - -[[package]] -name = "solana-program" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" -dependencies = [ - "ark-bn254", - "ark-ec", - "ark-ff", - "ark-serialize", - "array-bytes", "base64 0.21.4", "bincode", "bitflags 2.4.0", @@ -4155,7 +4062,7 @@ dependencies = [ "log", "memoffset 0.9.0", "num-bigint 0.4.4", - "num-derive", + "num-derive 0.3.3", "num-traits", "parking_lot", "rand 0.8.5", @@ -4167,9 +4074,9 @@ dependencies = [ "serde_json", "sha2 0.10.7", "sha3 0.10.6", - "solana-frozen-abi 1.17.0", - "solana-frozen-abi-macro 1.17.0", - "solana-sdk-macro 1.17.0", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-sdk-macro", "thiserror", "tiny-bip39", "wasm-bindgen", @@ -4178,8 +4085,9 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99127d74ad7a383b7f3dae2ecaebfc7926250fb7cef19b67fb344811d020dc14" dependencies = [ "base64 0.21.4", "bincode", @@ -4188,25 +4096,26 @@ dependencies = [ "itertools", "libc", "log", - "num-derive", + "num-derive 0.3.3", "num-traits", "percentage", "rand 0.8.5", "rustc_version", "serde", - "solana-frozen-abi 1.17.0", - "solana-frozen-abi-macro 1.17.0", + "solana-frozen-abi", + "solana-frozen-abi-macro", "solana-measure", "solana-metrics", - "solana-sdk 1.17.0", + "solana-sdk", "solana_rbpf", "thiserror", ] [[package]] name = "solana-program-test" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "444889fcaf4588b2aa7733aa2f726b80c126026d60d79f882064b06f70fea05b" dependencies = [ "assert_matches", "async-trait", @@ -4218,22 +4127,24 @@ dependencies = [ "serde", "solana-accounts-db", "solana-banks-client", - "solana-banks-interface 1.17.0", + "solana-banks-interface", "solana-banks-server", "solana-bpf-loader-program", - "solana-logger 1.17.0", + "solana-logger", "solana-program-runtime", "solana-runtime", - "solana-sdk 1.17.0", + "solana-sdk", "solana-vote-program", + "test-case", "thiserror", "tokio", ] [[package]] name = "solana-pubsub-client" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f271c0f60d010af98f03a595552891ca3f497e7074e2225131c5bb24fadca9b8" dependencies = [ "crossbeam-channel", "futures-util", @@ -4245,7 +4156,7 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk 1.17.0", + "solana-sdk", "thiserror", "tokio", "tokio-stream", @@ -4256,8 +4167,9 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09e9e5f5bea29716b4c14d319058b4e01c5837d68bd29acbdfaccbeebddac68d" dependencies = [ "async-mutex", "async-trait", @@ -4274,7 +4186,7 @@ dependencies = [ "solana-metrics", "solana-net-utils", "solana-rpc-client-api", - "solana-sdk 1.17.0", + "solana-sdk", "solana-streamer", "thiserror", "tokio", @@ -4282,8 +4194,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e864b2647831d5cad75bafa9234590821a97eba780c131fc12dc3bc45c1d9916" dependencies = [ "lazy_static", "num_cpus", @@ -4291,26 +4204,28 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d2ac9610026a977828af8b73984fdb2bac21f48bcf6b1f37767df31ca1cb0db" dependencies = [ "console", "dialoguer", "log", - "num-derive", + "num-derive 0.3.3", "num-traits", "parking_lot", "qstring", "semver", - "solana-sdk 1.17.0", + "solana-sdk", "thiserror", "uriparse", ] [[package]] name = "solana-rpc-client" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54b9bdf8cf0b55be95bd4198d2706a6536ff30957b8c939a2fdee0627343793b" dependencies = [ "async-trait", "base64 0.21.4", @@ -4325,7 +4240,7 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk 1.17.0", + "solana-sdk", "solana-transaction-status", "solana-version", "solana-vote-program", @@ -4334,8 +4249,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d219157e9a0cf86a96b1d5601751df75340e2add88eca5ab1b0941a42307f2f1" dependencies = [ "base64 0.21.4", "bs58", @@ -4346,29 +4262,31 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder", - "solana-sdk 1.17.0", + "solana-sdk", "solana-transaction-status", "solana-version", - "spl-token-2022", + "spl-token-2022 0.9.0", "thiserror", ] [[package]] name = "solana-rpc-client-nonce-utils" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01995b2fea7b6d2623fd3ad00a4af6426f7eb225f8d529acf2397ea8cb6d3f10" dependencies = [ "clap 2.34.0", "solana-clap-utils", "solana-rpc-client", - "solana-sdk 1.17.0", + "solana-sdk", "thiserror", ] [[package]] name = "solana-runtime" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebf7b2d9c9ae6301651ad601219e9c9ca879d9f11f86673c2eea6197aca4aafa" dependencies = [ "arrayref", "base64 0.21.4", @@ -4393,7 +4311,7 @@ dependencies = [ "lz4", "memmap2", "modular-bitfield", - "num-derive", + "num-derive 0.3.3", "num-traits", "num_cpus", "num_enum 0.6.1", @@ -4415,21 +4333,22 @@ dependencies = [ "solana-compute-budget-program", "solana-config-program", "solana-cost-model", - "solana-frozen-abi 1.17.0", - "solana-frozen-abi-macro 1.17.0", + "solana-frozen-abi", + "solana-frozen-abi-macro", "solana-loader-v4-program", "solana-measure", "solana-metrics", "solana-perf", "solana-program-runtime", "solana-rayon-threadlimit", - "solana-sdk 1.17.0", + "solana-sdk", "solana-stake-program", "solana-system-program", "solana-version", + "solana-vote", "solana-vote-program", "solana-zk-token-proof-program", - "solana-zk-token-sdk 1.17.0", + "solana-zk-token-sdk", "static_assertions", "strum", "strum_macros", @@ -4442,61 +4361,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.16.13" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74a01f25b9f4022fc222c21c589ef7943027fb0fa2b9f6ae943fc4a65c2c01a2" -dependencies = [ - "assert_matches", - "base64 0.21.4", - "bincode", - "bitflags 1.3.2", - "borsh 0.10.3", - "bs58", - "bytemuck", - "byteorder", - "chrono", - "derivation-path", - "digest 0.10.7", - "ed25519-dalek", - "ed25519-dalek-bip32", - "generic-array", - "hmac 0.12.1", - "itertools", - "js-sys", - "lazy_static", - "libsecp256k1", - "log", - "memmap2", - "num-derive", - "num-traits", - "num_enum 0.6.1", - "pbkdf2 0.11.0", - "qstring", - "rand 0.7.3", - "rand_chacha 0.2.2", - "rustc_version", - "rustversion", - "serde", - "serde_bytes", - "serde_derive", - "serde_json", - "serde_with 2.3.3", - "sha2 0.10.7", - "sha3 0.10.6", - "solana-frozen-abi 1.16.13", - "solana-frozen-abi-macro 1.16.13", - "solana-logger 1.16.13", - "solana-program 1.16.13", - "solana-sdk-macro 1.16.13", - "thiserror", - "uriparse", - "wasm-bindgen", -] - -[[package]] -name = "solana-sdk" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +checksum = "dd1d4bf7b8f6a0350b8a1a81346a5819d9bd5c93096c2bf079f01b905dfe0443" dependencies = [ "assert_matches", "base64 0.21.4", @@ -4519,7 +4386,7 @@ dependencies = [ "libsecp256k1", "log", "memmap2", - "num-derive", + "num-derive 0.3.3", "num-traits", "num_enum 0.6.1", "pbkdf2 0.11.0", @@ -4536,11 +4403,11 @@ dependencies = [ "serde_with 2.3.3", "sha2 0.10.7", "sha3 0.10.6", - "solana-frozen-abi 1.17.0", - "solana-frozen-abi-macro 1.17.0", - "solana-logger 1.17.0", - "solana-program 1.17.0", - "solana-sdk-macro 1.17.0", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-logger", + "solana-program", + "solana-sdk-macro", "thiserror", "uriparse", "wasm-bindgen", @@ -4548,21 +4415,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.16.13" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75b33716470fa4a65a23ddc2d4abcb8d28532c6e3ae3f04f4fe79b5e1f8c247" -dependencies = [ - "bs58", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.32", -] - -[[package]] -name = "solana-sdk-macro" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +checksum = "170f3c87d862ba5c74c03fa37a2867c10aa68e7b210bdf004c7a8b330284c789" dependencies = [ "bs58", "proc-macro2", @@ -4573,8 +4428,9 @@ dependencies = [ [[package]] name = "solana-send-transaction-service" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d4d5c756cd87641dd720dc7874182149d106f6753b0ba758023f1f1523fb8d9" dependencies = [ "crossbeam-channel", "log", @@ -4582,35 +4438,37 @@ dependencies = [ "solana-measure", "solana-metrics", "solana-runtime", - "solana-sdk 1.17.0", + "solana-sdk", "solana-tpu-client", ] [[package]] name = "solana-stake-program" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea1b3f9e4a288970a308f47f25308ebba071100eae72f374fdcd777647315c9" dependencies = [ "bincode", "log", "rustc_version", "solana-config-program", "solana-program-runtime", - "solana-sdk 1.17.0", + "solana-sdk", "solana-vote-program", ] [[package]] name = "solana-streamer" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca08a69ae2ac103925bf367020e646dcdbb778ead2ce8685d962ca15616f0fc5" dependencies = [ "async-channel", "bytes", "crossbeam-channel", "futures-util", "histogram", - "indexmap 2.0.0", + "indexmap 2.0.2", "itertools", "libc", "log", @@ -4625,7 +4483,7 @@ dependencies = [ "rustls", "solana-metrics", "solana-perf", - "solana-sdk 1.17.0", + "solana-sdk", "thiserror", "tokio", "x509-parser", @@ -4633,21 +4491,23 @@ dependencies = [ [[package]] name = "solana-system-program" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcda9bf5b7e7b8726c6ddc7f06fc9110875e688e197e0602721b1b425cfc5cc2" dependencies = [ "bincode", "log", "serde", "serde_derive", "solana-program-runtime", - "solana-sdk 1.17.0", + "solana-sdk", ] [[package]] name = "solana-thin-client" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2c780ce4d234abbde57ed94342e882c0170c6ebe7d8f1f02763f6cb88a925d" dependencies = [ "bincode", "log", @@ -4655,18 +4515,19 @@ dependencies = [ "solana-connection-cache", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk 1.17.0", + "solana-sdk", ] [[package]] name = "solana-tpu-client" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e00eb9926169f8d4f9f6af95410decc01545a9ce991e12781cb8ae1515ab833f" dependencies = [ "async-trait", "bincode", "futures-util", - "indexmap 2.0.0", + "indexmap 2.0.2", "indicatif", "log", "rayon", @@ -4676,20 +4537,21 @@ dependencies = [ "solana-pubsub-client", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk 1.17.0", + "solana-sdk", "thiserror", "tokio", ] [[package]] name = "solana-transaction-status" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f8af464b440c000a3e5306509f02240150b5311fffc4534738e1bdfdb604604" dependencies = [ "Inflector", "base64 0.21.4", "bincode", - "borsh 0.9.3", + "borsh 0.10.3", "bs58", "lazy_static", "log", @@ -4697,23 +4559,24 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder", - "solana-sdk 1.17.0", - "spl-associated-token-account", - "spl-memo", - "spl-token", - "spl-token-2022", + "solana-sdk", + "spl-associated-token-account 2.2.0", + "spl-memo 4.0.0", + "spl-token 4.0.0", + "spl-token-2022 0.9.0", "thiserror", ] [[package]] name = "solana-udp-client" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2763ee4af6d7a92cd5b70679a8b46ea13f167e59a8f5f294041905b5258d9ae" dependencies = [ "async-trait", "solana-connection-cache", "solana-net-utils", - "solana-sdk 1.17.0", + "solana-sdk", "solana-streamer", "thiserror", "tokio", @@ -4721,86 +4584,80 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d133bdd437accc92171e40d76cd5cd76cba59d58f6a2f89b02c8621ffab3b5d" dependencies = [ "log", "rustc_version", "semver", "serde", "serde_derive", - "solana-frozen-abi 1.17.0", - "solana-frozen-abi-macro 1.17.0", - "solana-sdk 1.17.0", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-sdk", +] + +[[package]] +name = "solana-vote" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "840a57075b446db53d5591e107b32b46afeff7c5e1172c2ff90ed30067b8650a" +dependencies = [ + "crossbeam-channel", + "itertools", + "log", + "rustc_version", + "serde", + "serde_derive", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-sdk", + "solana-vote-program", + "thiserror", ] [[package]] name = "solana-vote-program" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "733573c6e800f04d8721bd4b861165c17db94026e2c9da28d6a3553e095efacb" dependencies = [ "bincode", "log", - "num-derive", + "num-derive 0.3.3", "num-traits", "rustc_version", "serde", "serde_derive", - "solana-frozen-abi 1.17.0", - "solana-frozen-abi-macro 1.17.0", + "solana-frozen-abi", + "solana-frozen-abi-macro", "solana-metrics", - "solana-program 1.17.0", + "solana-program", "solana-program-runtime", - "solana-sdk 1.17.0", + "solana-sdk", "thiserror", ] [[package]] name = "solana-zk-token-proof-program" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +version = "1.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d2aa189efb2af7b1cf2339808b9bc236addeb776e62e5b5527947d2a68c699d" dependencies = [ "bytemuck", - "num-derive", + "num-derive 0.3.3", "num-traits", "solana-program-runtime", - "solana-sdk 1.17.0", - "solana-zk-token-sdk 1.17.0", + "solana-sdk", + "solana-zk-token-sdk", ] [[package]] name = "solana-zk-token-sdk" -version = "1.16.13" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1669c9d223d850cd96cad69d3ba1a4234bc3e2f83ac837fbdbc0ce774dac7b92" -dependencies = [ - "aes-gcm-siv", - "base64 0.21.4", - "bincode", - "bytemuck", - "byteorder", - "curve25519-dalek", - "getrandom 0.1.16", - "itertools", - "lazy_static", - "merlin", - "num-derive", - "num-traits", - "rand 0.7.3", - "serde", - "serde_json", - "sha3 0.9.1", - "solana-program 1.16.13", - "solana-sdk 1.16.13", - "subtle", - "thiserror", - "zeroize", -] - -[[package]] -name = "solana-zk-token-sdk" -version = "1.17.0" -source = "git+https://github.com/solana-labs/solana?rev=3ffd78f#3ffd78f2d79d451560d0e09432713417a65e8dda" +checksum = "34f2a9ce880cac8d1f7f0cbfaaac07fb84e163e7f616125f4980c13a21b17727" dependencies = [ "aes-gcm-siv", "base64 0.21.4", @@ -4812,14 +4669,14 @@ dependencies = [ "itertools", "lazy_static", "merlin", - "num-derive", + "num-derive 0.3.3", "num-traits", "rand 0.7.3", "serde", "serde_json", "sha3 0.9.1", - "solana-program 1.17.0", - "solana-sdk 1.17.0", + "solana-program", + "solana-sdk", "subtle", "thiserror", "zeroize", @@ -4827,9 +4684,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d08e812351a5c726e51fa6aaae8687c661acfeb9a8b651bd58fc413a58701a58" +checksum = "103318aa365ff7caa8cf534f2246b5eb7e5b34668736d52b1266b143f7a21196" dependencies = [ "byteorder", "combine", @@ -4852,7 +4709,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk 1.17.0", + "solana-sdk", "solders-account", "solders-account-decoder", "solders-address-lookup-table-account", @@ -4888,7 +4745,7 @@ dependencies = [ "pyo3", "serde", "solana-account-decoder", - "solana-sdk 1.17.0", + "solana-sdk", "solders-account-decoder", "solders-macros", "solders-pubkey", @@ -4907,7 +4764,7 @@ dependencies = [ "serde", "serde_json", "solana-account-decoder", - "solana-sdk 1.17.0", + "solana-sdk", "solders-macros", "solders-traits-core", "zstd", @@ -4920,7 +4777,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program 1.17.0", + "solana-program", "solders-macros", "solders-pubkey", "solders-traits-core", @@ -4935,7 +4792,7 @@ dependencies = [ "pyo3-asyncio", "solana-banks-client", "solana-program-test", - "solana-sdk 1.17.0", + "solana-sdk", "solders-account", "solders-banks-interface", "solders-commitment-config", @@ -4961,7 +4818,7 @@ dependencies = [ "pyo3", "serde", "solana-banks-client", - "solana-banks-interface 1.16.13", + "solana-banks-interface", "solders-macros", "solders-traits-core", "solders-transaction-confirmation-status", @@ -4977,7 +4834,7 @@ dependencies = [ "base64 0.13.1", "bincode", "serde", - "solana-sdk 1.17.0", + "solana-sdk", "solders-message", "solders-transaction", ] @@ -4986,7 +4843,7 @@ dependencies = [ name = "solders-clock-example" version = "0.0.0" dependencies = [ - "solana-program 1.17.0", + "solana-program", ] [[package]] @@ -4996,7 +4853,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk 1.17.0", + "solana-sdk", "solders-traits", ] @@ -5005,7 +4862,7 @@ name = "solders-compute-budget" version = "0.18.1" dependencies = [ "pyo3", - "solana-sdk 1.17.0", + "solana-sdk", "solders-instruction", "solders-pubkey", ] @@ -5017,8 +4874,8 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program 1.17.0", - "solana-sdk 1.17.0", + "solana-program", + "solana-sdk", "solders-macros", "solders-traits-core", ] @@ -5030,7 +4887,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program 1.17.0", + "solana-program", "solders-macros", "solders-traits", "solders-traits-core", @@ -5043,7 +4900,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program 1.17.0", + "solana-program", "solders-macros", "solders-pubkey", "solders-traits-core", @@ -5056,7 +4913,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk 1.17.0", + "solana-sdk", "solders-macros", "solders-pubkey", "solders-signature", @@ -5081,7 +4938,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program 1.17.0", + "solana-program", "solders-address-lookup-table-account", "solders-hash", "solders-instruction", @@ -5099,7 +4956,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program 1.17.0", + "solana-program", "solders-macros", "solders-traits-core", ] @@ -5111,7 +4968,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program 1.17.0", + "solana-program", "solders-macros", "solders-traits", "solders-traits-core", @@ -5179,7 +5036,7 @@ dependencies = [ "serde", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk 1.17.0", + "solana-sdk", "solders-commitment-config", "solders-macros", "solders-pubkey", @@ -5369,7 +5226,7 @@ dependencies = [ "serde_with 1.14.0", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk 1.17.0", + "solana-sdk", "solana-transaction-status", "solders-account", "solders-account-decoder", @@ -5405,7 +5262,7 @@ dependencies = [ "serde_with 1.14.0", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk 1.17.0", + "solana-sdk", "solders-account", "solders-account-decoder", "solders-hash", @@ -5440,7 +5297,7 @@ dependencies = [ "pyo3", "serde", "solana-rpc-client-api", - "solana-sdk 1.17.0", + "solana-sdk", "solana-transaction-status", "solders-commitment-config", "solders-macros", @@ -5519,7 +5376,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk 1.17.0", + "solana-sdk", "solders-macros", "solders-pubkey", "solders-traits-core", @@ -5534,8 +5391,8 @@ dependencies = [ "dict_derive", "pyo3", "serde", - "solana-program 1.17.0", - "solana-sdk 1.17.0", + "solana-program", + "solana-sdk", "solders-instruction", "solders-macros", "solders-pubkey", @@ -5550,12 +5407,12 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-program 1.17.0", + "solana-program", "solders-macros", "solders-pubkey", "solders-traits-core", - "spl-associated-token-account", - "spl-token", + "spl-associated-token-account 1.1.3", + "spl-token 3.5.0", ] [[package]] @@ -5567,7 +5424,7 @@ dependencies = [ "serde_cbor", "serde_json", "solana-banks-client", - "solana-sdk 1.17.0", + "solana-sdk", "solders-traits-core", ] @@ -5589,7 +5446,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk 1.17.0", + "solana-sdk", "solders-hash", "solders-instruction", "solders-keypair", @@ -5618,7 +5475,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk 1.17.0", + "solana-sdk", "solders-macros", "solders-traits-core", ] @@ -5631,7 +5488,7 @@ dependencies = [ "derive_more", "pyo3", "serde", - "solana-sdk 1.17.0", + "solana-sdk", "solana-transaction-status", "solders-macros", "solders-pubkey", @@ -5651,7 +5508,7 @@ dependencies = [ "serde", "serde_json", "solana-account-decoder", - "solana-sdk 1.17.0", + "solana-sdk", "solana-transaction-status", "solders-account-decoder", "solders-hash", @@ -5717,11 +5574,62 @@ checksum = "978dba3bcbe88d0c2c58366c254d9ea41c5f73357e72fc0bdee4d6b5fc99c8f4" dependencies = [ "assert_matches", "borsh 0.9.3", - "num-derive", + "num-derive 0.3.3", "num-traits", - "solana-program 1.16.13", - "spl-token", - "spl-token-2022", + "solana-program", + "spl-token 3.5.0", + "spl-token-2022 0.6.1", + "thiserror", +] + +[[package]] +name = "spl-associated-token-account" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "385e31c29981488f2820b2022d8e731aae3b02e6e18e2fd854e4c9a94dc44fc3" +dependencies = [ + "assert_matches", + "borsh 0.10.3", + "num-derive 0.4.1", + "num-traits", + "solana-program", + "spl-token 4.0.0", + "spl-token-2022 0.9.0", + "thiserror", +] + +[[package]] +name = "spl-discriminator" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator-derive", +] + +[[package]] +name = "spl-discriminator-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fadbefec4f3c678215ca72bd71862697bb06b41fd77c0088902dd3203354387b" +dependencies = [ + "quote", + "spl-discriminator-syn", + "syn 2.0.32", +] + +[[package]] +name = "spl-discriminator-syn" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e5f2044ca42c8938d54d1255ce599c79a1ffd86b677dfab695caa20f9ffc3f2" +dependencies = [ + "proc-macro2", + "quote", + "sha2 0.10.7", + "syn 2.0.32", "thiserror", ] @@ -5731,7 +5639,68 @@ version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325" dependencies = [ - "solana-program 1.16.13", + "solana-program", +] + +[[package]] +name = "spl-memo" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f180b03318c3dbab3ef4e1e4d46d5211ae3c780940dd0a28695aba4b59a75a" +dependencies = [ + "solana-program", +] + +[[package]] +name = "spl-pod" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079" +dependencies = [ + "borsh 0.10.3", + "bytemuck", + "solana-program", + "solana-zk-token-sdk", + "spl-program-error", +] + +[[package]] +name = "spl-program-error" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c" +dependencies = [ + "num-derive 0.4.1", + "num-traits", + "solana-program", + "spl-program-error-derive", + "thiserror", +] + +[[package]] +name = "spl-program-error-derive" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5269c8e868da17b6552ef35a51355a017bd8e0eae269c201fef830d35fa52c" +dependencies = [ + "proc-macro2", + "quote", + "sha2 0.10.7", + "syn 2.0.32", +] + +[[package]] +name = "spl-tlv-account-resolution" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "062e148d3eab7b165582757453632ffeef490c02c86a48bfdb4988f63eefb3b9" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-type-length-value", ] [[package]] @@ -5742,10 +5711,25 @@ checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d" dependencies = [ "arrayref", "bytemuck", - "num-derive", + "num-derive 0.3.3", "num-traits", "num_enum 0.5.10", - "solana-program 1.16.13", + "solana-program", + "thiserror", +] + +[[package]] +name = "spl-token" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08459ba1b8f7c1020b4582c4edf0f5c7511a5e099a7a97570c9698d4f2337060" +dependencies = [ + "arrayref", + "bytemuck", + "num-derive 0.3.3", + "num-traits", + "num_enum 0.6.1", + "solana-program", "thiserror", ] @@ -5757,16 +5741,81 @@ checksum = "0043b590232c400bad5ee9eb983ced003d15163c4c5d56b090ac6d9a57457b47" dependencies = [ "arrayref", "bytemuck", - "num-derive", + "num-derive 0.3.3", "num-traits", "num_enum 0.5.10", - "solana-program 1.16.13", - "solana-zk-token-sdk 1.16.13", - "spl-memo", - "spl-token", + "solana-program", + "solana-zk-token-sdk", + "spl-memo 3.0.1", + "spl-token 3.5.0", + "thiserror", +] + +[[package]] +name = "spl-token-2022" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4abf34a65ba420584a0c35f3903f8d727d1f13ababbdc3f714c6b065a686e86" +dependencies = [ + "arrayref", + "bytemuck", + "num-derive 0.4.1", + "num-traits", + "num_enum 0.7.0", + "solana-program", + "solana-zk-token-sdk", + "spl-memo 4.0.0", + "spl-pod", + "spl-token 4.0.0", + "spl-token-metadata-interface", + "spl-transfer-hook-interface", + "spl-type-length-value", "thiserror", ] +[[package]] +name = "spl-token-metadata-interface" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f" +dependencies = [ + "borsh 0.10.3", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-type-length-value", +] + +[[package]] +name = "spl-transfer-hook-interface" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051d31803f873cabe71aec3c1b849f35248beae5d19a347d93a5c9cccc5d5a9b" +dependencies = [ + "arrayref", + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-tlv-account-resolution", + "spl-type-length-value", +] + +[[package]] +name = "spl-type-length-value" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -5927,6 +5976,41 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "test-case" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425" +dependencies = [ + "test-case-macros", +] + +[[package]] +name = "test-case-core" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462" +dependencies = [ + "cfg-if", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "test-case-macros" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.32", + "test-case-core", +] + [[package]] name = "textwrap" version = "0.11.0" @@ -5944,18 +6028,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", @@ -6102,9 +6186,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2dbec703c26b00d74844519606ef15d09a7d6857860f84ad223dec002ddea2" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", @@ -6112,7 +6196,7 @@ dependencies = [ "tokio", "tokio-rustls", "tungstenite", - "webpki-roots 0.23.1", + "webpki-roots 0.25.2", ] [[package]] @@ -6276,9 +6360,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tungstenite" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ "byteorder", "bytes", @@ -6525,22 +6609,13 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.3", -] - [[package]] name = "webpki-roots" version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "rustls-webpki 0.101.5", + "rustls-webpki", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index f77b92e1..ed5e5aa1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -118,19 +118,19 @@ solders-transaction-error = { path = "./crates/transaction-error", version = "=0 solders-account = { path = "./crates/account", version = "=0.18.1" } solders-hash = { path = "./crates/hash", version = "=0.18.1" } serde_with = { version = "^1.14.0", features = ["base64"] } -solana-sdk = { git = "https://github.com/solana-labs/solana", rev = "3ffd78f" } -solana-account-decoder = { git = "https://github.com/solana-labs/solana", rev = "3ffd78f" } -solana-transaction-status = { git = "https://github.com/solana-labs/solana", rev = "3ffd78f" } -solana-rpc-client-api = { git = "https://github.com/solana-labs/solana", rev = "3ffd78f" } -solana-program = { git = "https://github.com/solana-labs/solana", rev = "3ffd78f" } +solana-sdk = "1.17.2" +solana-account-decoder = "1.17.2" +solana-transaction-status = "1.17.2" +solana-rpc-client-api = "1.17.2" +solana-program = "1.17.2" bincode = "1.3.3" base64 = "0.13.0" serde = "^1.0.188" serde_json = "^1.0.106" serde_cbor = "^0.11.2" derive_more = "0.99.17" -solana-program-test = { git = "https://github.com/solana-labs/solana", rev = "3ffd78f" } -solana-banks-client = { git = "https://github.com/solana-labs/solana", rev = "3ffd78f" } +solana-program-test = "1.17.2" +solana-banks-client = "1.17.2" pythonize = "0.19.0" bs58 = "0.4.0" thiserror = "^1.0.31" diff --git a/crates/keypair/src/lib.rs b/crates/keypair/src/lib.rs index fe488142..53856fdb 100644 --- a/crates/keypair/src/lib.rs +++ b/crates/keypair/src/lib.rs @@ -92,7 +92,7 @@ impl Keypair { /// /// Example: /// >>> from solders.keypair import Keypair - /// >>> raw_bytes = bytes([1] * 64) + /// >>> raw_bytes = b'\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x8a\x88\xe3\xddt\t\xf1\x95\xfdR\xdb-<\xba]r\xcag\t\xbf\x1d\x94\x12\x1b\xf3t\x88\x01\xb4\x0fo\\' /// >>> assert Keypair.from_bytes(raw_bytes).to_bytes_array() == list(raw_bytes) /// pub fn to_bytes_array(&self) -> [u8; Self::LENGTH] { @@ -110,8 +110,8 @@ impl Keypair { /// /// Example: /// >>> from solders.keypair import Keypair - /// >>> raw_bytes = bytes([0] * 64) - /// >>> base58_str = "1" * 64 + /// >>> raw_bytes = b'\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x8a\x88\xe3\xddt\t\xf1\x95\xfdR\xdb-<\xba]r\xcag\t\xbf\x1d\x94\x12\x1b\xf3t\x88\x01\xb4\x0fo\\' + /// >>> base58_str = "2AXDGYSE4f2sz7tvMMzyHvUfcoJmxudvdhBcmiUSo6iuCXagjUCKEQF21awZnUGxmwD4m9vGXuC3qieHXJQHAcT" /// >>> kp = Keypair.from_base58_string(base58_str) /// >>> assert kp == Keypair.from_bytes(raw_bytes) /// >>> assert str(kp) == base58_str @@ -143,7 +143,7 @@ impl Keypair { /// >>> from solders.keypair import Keypair /// >>> from solders.pubkey import Pubkey /// >>> seed_bytes = bytes([0] * 32) - /// >>> pubkey_bytes = bytes([1] * 32) + /// >>> pubkey_bytes = b";j'\xbc\xce\xb6\xa4-b\xa3\xa8\xd0*o\rse2\x15w\x1d\xe2C\xa6:\xc0H\xa1\x8bY\xda)" /// >>> kp = Keypair.from_bytes(seed_bytes + pubkey_bytes) /// >>> assert kp.pubkey() == Pubkey(pubkey_bytes) /// diff --git a/crates/keypair/src/presigner.rs b/crates/keypair/src/presigner.rs index 1cf700d1..78c5ec64 100644 --- a/crates/keypair/src/presigner.rs +++ b/crates/keypair/src/presigner.rs @@ -41,7 +41,7 @@ impl Presigner { /// >>> from solders.keypair import Keypair /// >>> from solders.pubkey import Pubkey /// >>> seed_bytes = bytes([0] * 32) - /// >>> pubkey_bytes = bytes([1] * 32) + /// >>> pubkey_bytes = b";j'\xbc\xce\xb6\xa4-b\xa3\xa8\xd0*o\rse2\x15w\x1d\xe2C\xa6:\xc0H\xa1\x8bY\xda)" /// >>> kp = Keypair.from_bytes(seed_bytes + pubkey_bytes) /// >>> assert kp.pubkey() == Pubkey(pubkey_bytes) /// diff --git a/crates/transaction-error/src/lib.rs b/crates/transaction-error/src/lib.rs index c1eb5e7a..1c6a8fd1 100644 --- a/crates/transaction-error/src/lib.rs +++ b/crates/transaction-error/src/lib.rs @@ -499,6 +499,7 @@ pub enum TransactionErrorFieldless { MaxLoadedAccountsDataSizeExceeded, ResanitizationNeeded, InvalidLoadedAccountsDataSizeLimit, + UnbalancedTransaction } #[derive(FromPyObject, Clone, PartialEq, Eq, Serialize, Deserialize, Debug, EnumIntoPy)] @@ -604,6 +605,9 @@ impl From for TransactionErrorOriginal { TransactionErrorFieldless::InvalidLoadedAccountsDataSizeLimit => { Self::InvalidLoadedAccountsDataSizeLimit } + TransactionErrorFieldless::UnbalancedTransaction => { + Self::UnbalancedTransaction + } }, } } @@ -728,6 +732,9 @@ impl From for TransactionErrorType { TransactionErrorOriginal::InvalidLoadedAccountsDataSizeLimit => { Self::Fieldless(TransactionErrorFieldless::InvalidLoadedAccountsDataSizeLimit) } + TransactionErrorOriginal::UnbalancedTransaction => { + Self::Fieldless(TransactionErrorFieldless::UnbalancedTransaction) + } } } } diff --git a/crates/transaction/src/lib.rs b/crates/transaction/src/lib.rs index 6f8ebf46..bee142f2 100644 --- a/crates/transaction/src/lib.rs +++ b/crates/transaction/src/lib.rs @@ -114,8 +114,8 @@ impl VersionedTransaction { } /// Sanity checks the Transaction properties. - pub fn sanitize(&self, require_static_program_ids: bool) -> PyResult<()> { - handle_py_err(self.0.sanitize(require_static_program_ids)) + pub fn sanitize(&self) -> PyResult<()> { + handle_py_err(self.0.sanitize()) } /// Returns the version of the transaction. diff --git a/python/solders/transaction_status.pyi b/python/solders/transaction_status.pyi index 7d5cf2ef..05f856cc 100644 --- a/python/solders/transaction_status.pyi +++ b/python/solders/transaction_status.pyi @@ -680,6 +680,9 @@ class TransactionErrorFieldless: WouldExceedMaxVotefCostLimit: "TransactionErrorFieldless" WouldExceedAccountDataTotalLimit: "TransactionErrorFieldless" MaxLoadedAccountsDataSizeExceeded: "TransactionErrorFieldless" + ResanitizationNeeded: "TransactionErrorFieldless" + InvalidLoadedAccountsDataSizeLimit: "TransactionErrorFieldless" + UnbalancedTransaction: "TransactionErrorFieldless" def __int__(self) -> int: ... def __str__(self) -> str: ... def __repr__(self) -> str: ... diff --git a/tests/test_keypair.py b/tests/test_keypair.py index d2529311..4932c200 100644 --- a/tests/test_keypair.py +++ b/tests/test_keypair.py @@ -23,10 +23,10 @@ def test_to_bytes_array() -> None: def test_str() -> None: expected = ( - "2AXDGYSE4f2sz7tvMMzyHvUfcoJmxudvdhBcmiUSo6ij" - "wfYmfZYsKRxboQMPh3R4kUhXRVdtSXFXMheka4Rc4P2" + "2AXDGYSE4f2sz7tvMMzyHvUfcoJmxudvdhBcmiUSo6iu" + "CXagjUCKEQF21awZnUGxmwD4m9vGXuC3qieHXJQHAcT" ) - kp = Keypair.from_bytes([1] * 64) + kp = Keypair.from_seed([1] * 32) assert str(kp) == expected assert Keypair.from_base58_string(expected) == kp diff --git a/tests/test_transaction.py b/tests/test_transaction.py index a712fe7d..22861f2d 100644 --- a/tests/test_transaction.py +++ b/tests/test_transaction.py @@ -249,70 +249,10 @@ def test_sanitize_txs() -> None: def create_sample_transaction() -> Transaction: keypair = Keypair.from_bytes( [ - 48, - 83, - 2, - 1, - 1, - 48, - 5, - 6, - 3, - 43, - 101, - 112, - 4, - 34, - 4, - 32, - 255, - 101, - 36, - 24, - 124, - 23, - 167, - 21, - 132, - 204, - 155, - 5, - 185, - 58, - 121, - 75, - 156, - 227, - 116, - 193, - 215, - 38, - 142, - 22, - 8, - 14, - 229, - 239, - 119, - 93, - 5, - 218, - 161, - 35, - 3, - 33, - 0, - 36, - 100, - 158, - 252, - 33, - 161, - 97, - 185, - 62, - 89, - 99, + 255, 101, 36, 24, 124, 23, 167, 21, 132, 204, 155, 5, 185, 58, 121, 75, 156, 227, 116, + 193, 215, 38, 142, 22, 8, 14, 229, 239, 119, 93, 5, 218, 36, 100, 158, 252, 33, 161, + 97, 185, 62, 89, 99, 195, 250, 249, 187, 189, 171, 118, 241, 90, 248, 14, 68, 219, 231, + 62, 157, 5, 142, 27, 210, 117, ] ) @@ -464,216 +404,18 @@ def test_transaction_minimum_serialized_size() -> None: def test_sdk_serialize() -> None: - assert bytes(create_sample_transaction()) == bytes( - [ - 1, - 71, - 59, - 9, - 187, - 190, - 129, - 150, - 165, - 21, - 33, - 158, - 72, - 87, - 110, - 144, - 120, - 79, - 238, - 132, - 134, - 105, - 39, - 102, - 116, - 209, - 29, - 229, - 154, - 36, - 105, - 44, - 172, - 118, - 131, - 22, - 124, - 131, - 179, - 142, - 176, - 27, - 117, - 160, - 89, - 102, - 224, - 204, - 1, - 252, - 141, - 2, - 136, - 0, - 37, - 218, - 225, - 129, - 92, - 154, - 250, - 59, - 97, - 178, - 10, - 1, - 0, - 1, - 3, - 156, - 227, - 116, - 193, - 215, - 38, - 142, - 22, - 8, - 14, - 229, - 239, - 119, - 93, - 5, - 218, - 161, - 35, - 3, - 33, - 0, - 36, - 100, - 158, - 252, - 33, - 161, - 97, - 185, - 62, - 89, - 99, - 1, - 1, - 1, - 4, - 5, - 6, - 7, - 8, - 9, - 9, - 9, - 9, - 9, - 9, - 9, - 9, - 9, - 9, - 9, - 9, - 9, - 9, - 9, - 9, - 8, - 7, - 6, - 5, - 4, - 1, - 1, - 1, - 2, - 2, - 2, - 4, - 5, - 6, - 7, - 8, - 9, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 9, - 8, - 7, - 6, - 5, - 4, - 2, - 2, - 2, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 2, - 2, - 0, - 1, - 3, - 1, - 2, - 3, - ] - ) + assert bytes(create_sample_transaction()) == bytes([ + 1, 120, 138, 162, 185, 59, 209, 241, 157, 71, 157, 74, 131, 4, 87, 54, 28, 38, 180, + 222, 82, 64, 62, 61, 62, 22, 46, 17, 203, 187, 136, 62, 43, 11, 38, 235, 17, 239, + 82, 240, 139, 130, 217, 227, 214, 9, 242, 141, 223, 94, 29, 184, 110, 62, 32, 87, + 137, 63, 139, 100, 221, 20, 137, 4, 5, 1, 0, 1, 3, 36, 100, 158, 252, 33, 161, 97, + 185, 62, 89, 99, 195, 250, 249, 187, 189, 171, 118, 241, 90, 248, 14, 68, 219, 231, + 62, 157, 5, 142, 27, 210, 117, 1, 1, 1, 4, 5, 6, 7, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 8, 7, 6, 5, 4, 1, 1, 1, 2, 2, 2, 4, 5, 6, 7, 8, 9, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 8, 7, 6, 5, 4, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 0, 1, + 3, 1, 2, 3 + ]) def test_transaction_missing_key() -> None: diff --git a/tests/test_versioned_message.py b/tests/test_versioned_message.py index a0cd4858..d6c9e112 100644 --- a/tests/test_versioned_message.py +++ b/tests/test_versioned_message.py @@ -31,7 +31,7 @@ def test_sanitize( recent_blockhash=default_message.recent_blockhash, instructions=default_message.instructions, address_table_lookups=default_message.address_table_lookups, - ).sanitize(True) + ).sanitize() def test_sanitize_with_instruction( @@ -45,7 +45,7 @@ def test_sanitize_with_instruction( ], recent_blockhash=default_message.recent_blockhash, address_table_lookups=default_message.address_table_lookups, - ).sanitize(True) + ).sanitize() def test_sanitize_with_table_lookup( @@ -63,7 +63,7 @@ def test_sanitize_with_table_lookup( ], recent_blockhash=default_message.recent_blockhash, instructions=default_message.instructions, - ).sanitize(True) + ).sanitize() def test_sanitize_with_table_lookup_and_ix_with_dynamic_program_id( @@ -88,9 +88,8 @@ def test_sanitize_with_table_lookup_and_ix_with_dynamic_program_id( ], recent_blockhash=default_message.recent_blockhash, ) - message.sanitize(False) with raises(SanitizeError): - message.sanitize(True) + message.sanitize() def test_sanitize_with_table_lookup_and_ix_with_static_program_id( @@ -112,7 +111,7 @@ def test_sanitize_with_table_lookup_and_ix_with_static_program_id( ) ], recent_blockhash=default_message.recent_blockhash, - ).sanitize(True) + ).sanitize() def test_sanitize_without_signer( @@ -126,7 +125,7 @@ def test_sanitize_without_signer( address_table_lookups=default_message.address_table_lookups, ) with raises(SanitizeError): - msg.sanitize(True) + msg.sanitize() def test_sanitize_without_writable_signer( @@ -144,7 +143,7 @@ def test_sanitize_without_writable_signer( address_table_lookups=default_message.address_table_lookups, ) with raises(SanitizeError): - msg.sanitize(True) + msg.sanitize() def test_sanitize_with_empty_table_lookup( @@ -164,7 +163,7 @@ def test_sanitize_with_empty_table_lookup( instructions=default_message.instructions, ) with raises(SanitizeError): - msg.sanitize(True) + msg.sanitize() def test_sanitize_with_max_account_keys( @@ -177,7 +176,7 @@ def test_sanitize_with_max_account_keys( recent_blockhash=default_message.recent_blockhash, instructions=default_message.instructions, address_table_lookups=default_message.address_table_lookups, - ).sanitize(True) + ).sanitize() def test_sanitize_with_too_many_account_keys( @@ -191,7 +190,7 @@ def test_sanitize_with_too_many_account_keys( address_table_lookups=default_message.address_table_lookups, ) with raises(SanitizeError): - message.sanitize(True) + message.sanitize() def test_sanitize_with_max_table_loaded_keys( @@ -209,7 +208,7 @@ def test_sanitize_with_max_table_loaded_keys( ], recent_blockhash=default_message.recent_blockhash, instructions=default_message.instructions, - ).sanitize(True) + ).sanitize() def test_sanitize_with_too_many_table_loaded_keys( @@ -229,7 +228,7 @@ def test_sanitize_with_too_many_table_loaded_keys( instructions=default_message.instructions, ) with raises(SanitizeError): - message.sanitize(True) + message.sanitize() def test_sanitize_with_invalid_ix_program_id( @@ -255,9 +254,9 @@ def test_sanitize_with_invalid_ix_program_id( recent_blockhash=default_message.recent_blockhash, ) with raises(SanitizeError): - message.sanitize(True) + message.sanitize() with raises(SanitizeError): - message.sanitize(False) + message.sanitize() def test_sanitize_with_invalid_ix_account( @@ -279,7 +278,7 @@ def test_sanitize_with_invalid_ix_account( recent_blockhash=default_message.recent_blockhash, ) with raises(SanitizeError): - message.sanitize(True) + message.sanitize() def test_try_compile() -> None: From 0b88c8adb44cda0ee86b090a7f55e060bc4e8abc Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Sat, 21 Oct 2023 17:16:14 +0400 Subject: [PATCH 04/15] fmt --- crates/transaction-error/src/lib.rs | 16 +- python/solders/transaction_status.pyi | 10 +- tests/test_transaction.py | 290 ++++++++++++++++++++++++-- 3 files changed, 289 insertions(+), 27 deletions(-) diff --git a/crates/transaction-error/src/lib.rs b/crates/transaction-error/src/lib.rs index 1c6a8fd1..c8307146 100644 --- a/crates/transaction-error/src/lib.rs +++ b/crates/transaction-error/src/lib.rs @@ -499,7 +499,7 @@ pub enum TransactionErrorFieldless { MaxLoadedAccountsDataSizeExceeded, ResanitizationNeeded, InvalidLoadedAccountsDataSizeLimit, - UnbalancedTransaction + UnbalancedTransaction, } #[derive(FromPyObject, Clone, PartialEq, Eq, Serialize, Deserialize, Debug, EnumIntoPy)] @@ -507,7 +507,7 @@ pub enum TransactionErrorTypeTagged { InstructionError(TransactionErrorInstructionError), DuplicateInstruction(TransactionErrorDuplicateInstruction), InsufficientFundsForRent(TransactionErrorInsufficientFundsForRent), - ProgramExecutionTemporarilyRestricted(TransactionErrorProgramExecutionTemporarilyRestricted) + ProgramExecutionTemporarilyRestricted(TransactionErrorProgramExecutionTemporarilyRestricted), } #[derive(FromPyObject, Clone, PartialEq, Eq, Serialize, Deserialize, Debug, EnumIntoPy)] @@ -605,9 +605,7 @@ impl From for TransactionErrorOriginal { TransactionErrorFieldless::InvalidLoadedAccountsDataSizeLimit => { Self::InvalidLoadedAccountsDataSizeLimit } - TransactionErrorFieldless::UnbalancedTransaction => { - Self::UnbalancedTransaction - } + TransactionErrorFieldless::UnbalancedTransaction => Self::UnbalancedTransaction, }, } } @@ -632,9 +630,11 @@ impl From for TransactionErrorType { )) } TransactionErrorOriginal::ProgramExecutionTemporarilyRestricted { account_index } => { - Self::Tagged(TransactionErrorTypeTagged::ProgramExecutionTemporarilyRestricted( - TransactionErrorProgramExecutionTemporarilyRestricted { account_index }, - )) + Self::Tagged( + TransactionErrorTypeTagged::ProgramExecutionTemporarilyRestricted( + TransactionErrorProgramExecutionTemporarilyRestricted { account_index }, + ), + ) } TransactionErrorOriginal::AccountInUse => { Self::Fieldless(TransactionErrorFieldless::AccountInUse) diff --git a/python/solders/transaction_status.pyi b/python/solders/transaction_status.pyi index 05f856cc..1c9cb88b 100644 --- a/python/solders/transaction_status.pyi +++ b/python/solders/transaction_status.pyi @@ -644,10 +644,14 @@ class TransactionErrorProgramExecutionTemporarilyRestricted: ) -> bool: ... def __hash__(self) -> int: ... @staticmethod - def from_bytes(raw: bytes) -> "TransactionErrorProgramExecutionTemporarilyRestricted": ... + def from_bytes( + raw: bytes, + ) -> "TransactionErrorProgramExecutionTemporarilyRestricted": ... def to_json(self) -> str: ... @staticmethod - def from_json(raw: str) -> "TransactionErrorProgramExecutionTemporarilyRestricted": ... + def from_json( + raw: str, + ) -> "TransactionErrorProgramExecutionTemporarilyRestricted": ... class TransactionErrorFieldless: AccountInUse: "TransactionErrorFieldless" @@ -702,7 +706,7 @@ TransactionErrorType = Union[ TransactionErrorInstructionError, TransactionErrorDuplicateInstruction, TransactionErrorInsufficientFundsForRent, - TransactionErrorProgramExecutionTemporarilyRestricted + TransactionErrorProgramExecutionTemporarilyRestricted, ] class Reward: diff --git a/tests/test_transaction.py b/tests/test_transaction.py index 22861f2d..86493691 100644 --- a/tests/test_transaction.py +++ b/tests/test_transaction.py @@ -249,10 +249,70 @@ def test_sanitize_txs() -> None: def create_sample_transaction() -> Transaction: keypair = Keypair.from_bytes( [ - 255, 101, 36, 24, 124, 23, 167, 21, 132, 204, 155, 5, 185, 58, 121, 75, 156, 227, 116, - 193, 215, 38, 142, 22, 8, 14, 229, 239, 119, 93, 5, 218, 36, 100, 158, 252, 33, 161, - 97, 185, 62, 89, 99, 195, 250, 249, 187, 189, 171, 118, 241, 90, 248, 14, 68, 219, 231, - 62, 157, 5, 142, 27, 210, 117, + 255, + 101, + 36, + 24, + 124, + 23, + 167, + 21, + 132, + 204, + 155, + 5, + 185, + 58, + 121, + 75, + 156, + 227, + 116, + 193, + 215, + 38, + 142, + 22, + 8, + 14, + 229, + 239, + 119, + 93, + 5, + 218, + 36, + 100, + 158, + 252, + 33, + 161, + 97, + 185, + 62, + 89, + 99, + 195, + 250, + 249, + 187, + 189, + 171, + 118, + 241, + 90, + 248, + 14, + 68, + 219, + 231, + 62, + 157, + 5, + 142, + 27, + 210, + 117, ] ) @@ -404,18 +464,216 @@ def test_transaction_minimum_serialized_size() -> None: def test_sdk_serialize() -> None: - assert bytes(create_sample_transaction()) == bytes([ - 1, 120, 138, 162, 185, 59, 209, 241, 157, 71, 157, 74, 131, 4, 87, 54, 28, 38, 180, - 222, 82, 64, 62, 61, 62, 22, 46, 17, 203, 187, 136, 62, 43, 11, 38, 235, 17, 239, - 82, 240, 139, 130, 217, 227, 214, 9, 242, 141, 223, 94, 29, 184, 110, 62, 32, 87, - 137, 63, 139, 100, 221, 20, 137, 4, 5, 1, 0, 1, 3, 36, 100, 158, 252, 33, 161, 97, - 185, 62, 89, 99, 195, 250, 249, 187, 189, 171, 118, 241, 90, 248, 14, 68, 219, 231, - 62, 157, 5, 142, 27, 210, 117, 1, 1, 1, 4, 5, 6, 7, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 8, 7, 6, 5, 4, 1, 1, 1, 2, 2, 2, 4, 5, 6, 7, 8, 9, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 8, 7, 6, 5, 4, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 0, 1, - 3, 1, 2, 3 - ]) + assert bytes(create_sample_transaction()) == bytes( + [ + 1, + 120, + 138, + 162, + 185, + 59, + 209, + 241, + 157, + 71, + 157, + 74, + 131, + 4, + 87, + 54, + 28, + 38, + 180, + 222, + 82, + 64, + 62, + 61, + 62, + 22, + 46, + 17, + 203, + 187, + 136, + 62, + 43, + 11, + 38, + 235, + 17, + 239, + 82, + 240, + 139, + 130, + 217, + 227, + 214, + 9, + 242, + 141, + 223, + 94, + 29, + 184, + 110, + 62, + 32, + 87, + 137, + 63, + 139, + 100, + 221, + 20, + 137, + 4, + 5, + 1, + 0, + 1, + 3, + 36, + 100, + 158, + 252, + 33, + 161, + 97, + 185, + 62, + 89, + 99, + 195, + 250, + 249, + 187, + 189, + 171, + 118, + 241, + 90, + 248, + 14, + 68, + 219, + 231, + 62, + 157, + 5, + 142, + 27, + 210, + 117, + 1, + 1, + 1, + 4, + 5, + 6, + 7, + 8, + 9, + 9, + 9, + 9, + 9, + 9, + 9, + 9, + 9, + 9, + 9, + 9, + 9, + 9, + 9, + 9, + 8, + 7, + 6, + 5, + 4, + 1, + 1, + 1, + 2, + 2, + 2, + 4, + 5, + 6, + 7, + 8, + 9, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 9, + 8, + 7, + 6, + 5, + 4, + 2, + 2, + 2, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 2, + 2, + 0, + 1, + 3, + 1, + 2, + 3, + ] + ) def test_transaction_missing_key() -> None: From 64932830a3ff31261f01214d20b168d13e34982c Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Sat, 21 Oct 2023 17:18:21 +0400 Subject: [PATCH 05/15] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85466dc1..8f952321 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Changed - Use PyO3 v0.19.2 [(#64)](https://github.com/kevinheavey/solders/pull/64) +- Upgrade to Solana 1.17.2 [(#65)](https://github.com/kevinheavey/solders/pull/65) ## [0.19.0] - 2023-07-31 From 774d5edd438fc994e1924463fcb6a9e3d1e36eb9 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Sat, 25 Nov 2023 14:13:52 +0400 Subject: [PATCH 06/15] use solana 1.17.6 --- Cargo.lock | 200 +++++++++++++++++++++++++++-------------------------- Cargo.toml | 14 ++-- 2 files changed, 109 insertions(+), 105 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 382d65c0..33be3aa9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3583,9 +3583,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea108fb41a4d6c3bafaf7d78fa94a6c2c6e863dc4e773c8e57dec22161be42b0" +checksum = "df7138257d4e2cdc6349a6385825a51d20ab1a458661df7ca1d31e3436165a40" dependencies = [ "Inflector", "base64 0.21.4", @@ -3607,9 +3607,9 @@ dependencies = [ [[package]] name = "solana-accounts-db" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1667ba2a54bf033667d17eaf3b12a7aee362b7b55725a6b594b67cb8e8fc7f" +checksum = "5ac9a43038ed52dd4a99f6343a0216fb8ce2a4ae205d92f377caaf65e3d437e1" dependencies = [ "arrayref", "bincode", @@ -3666,9 +3666,9 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ee56e31d9b1733f874bfe5b54abef43fb49810f7291deccbdf713527b44b6f" +checksum = "0209bbb9e62330a4850ede86fc5e808a7e78d235963f60732041f96fe911e9f3" dependencies = [ "bincode", "bytemuck", @@ -3687,9 +3687,9 @@ dependencies = [ [[package]] name = "solana-banks-client" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4118d1d75cecd79defb0f8de61e428d186fb873d17641e817f80caed202a5647" +checksum = "2a0718a3dffd9edc8d07d94fa5b8a115f49ac7b38f381f8d274c5dd54823c975" dependencies = [ "borsh 0.10.3", "futures", @@ -3704,9 +3704,9 @@ dependencies = [ [[package]] name = "solana-banks-interface" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fdea91839646ec597a1dd6f5e884cb5c30d574db21970fcc20b04deb4747d96" +checksum = "c03edfe080a6f081e1b27e4ad20f19c31ede66fa95b046138119d4695b8916c9" dependencies = [ "serde", "solana-sdk", @@ -3715,9 +3715,9 @@ dependencies = [ [[package]] name = "solana-banks-server" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa79d64545dcb21680e6939ed63bd9e88425f55a098492d96c9407c7a5b4990" +checksum = "330e59c5e46ec0788986115c1a58be475cddae6e6d46afa239cd06ccd714feea" dependencies = [ "bincode", "crossbeam-channel", @@ -3735,9 +3735,9 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91dc36edd5b4d37b852accbed3bf41dde302954d7716565700e0fd81e0f5dced" +checksum = "536313ac32a79e301773fc06259a13f1992f68d65929464d503a60f749be8629" dependencies = [ "bincode", "byteorder", @@ -3754,9 +3754,9 @@ dependencies = [ [[package]] name = "solana-bucket-map" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36bf733cdfccac6bf2cb1e74f3bd247bd59c2024fc72760cf3ac4cb334e6b86d" +checksum = "0b28fc5aa5b11f644b1b3852649c91c68de2d15779743542621847c9889dd5b2" dependencies = [ "bv", "bytemuck", @@ -3772,9 +3772,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1114079301af35bed62dba298beaad478a3788cbc376def9a56b8e9d26fc1b8f" +checksum = "a438d68cf354e0eb57e565569c735ddcd65414b1ff37c624329714be603aae76" dependencies = [ "chrono", "clap 2.34.0", @@ -3789,9 +3789,9 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc2d00016dc7975d866dd9ef3ffdd7c6dffec972495645953c07e587330e135" +checksum = "ca40e627a0eb0ecd2e194279f4a5f636414f6d7623095583822ecef5980e61fa" dependencies = [ "async-trait", "bincode", @@ -3822,9 +3822,9 @@ dependencies = [ [[package]] name = "solana-compute-budget-program" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33e650787669f715616444f32bafabf1fe17240d9154e182f83c3949bdd3d627" +checksum = "b05fb9ef78a41b04d34f948e43397bafe9dc8258772babdd02332eb36883f558" dependencies = [ "solana-program-runtime", "solana-sdk", @@ -3832,9 +3832,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a1f220474e7b9ed04cf450b13fa5ff4d03e7b7acefd36edfbe3d4c8d3f4ebb" +checksum = "46661da639413c3e78f2658ce17faf2090d77a67800eafe7cc46645710f05bb4" dependencies = [ "bincode", "chrono", @@ -3846,9 +3846,9 @@ dependencies = [ [[package]] name = "solana-connection-cache" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0b83f1486f474424f77d2af10608305cac2e1184fde39a13c2a4a8e4c7cc8" +checksum = "10572a990a087daed7909a8b8e2436cd2e2d810903cc73efdcd31a36f80ad402" dependencies = [ "async-trait", "bincode", @@ -3868,9 +3868,9 @@ dependencies = [ [[package]] name = "solana-cost-model" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77597dfb4f40a753218811c06647d6bf63d31060f67336212acff6c1282efb8e" +checksum = "56c977874c3dc053064212f153b840392d82e62a4fea79d9e196e6ed6a37e712" dependencies = [ "lazy_static", "log", @@ -3892,9 +3892,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "098378043a888c680de07eee987bf927e23e0720b472ba61c753d7b3757e6b3e" +checksum = "06e33cbcaa4fb22729560b1f5078d809a81a7d54e8b4a0d8c0484cc419d1fc2f" dependencies = [ "ahash 0.8.3", "blake3", @@ -3922,9 +3922,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f48c89a8a3a12f6a409a45fef50dae642211eae0207a91f01211aebb270026" +checksum = "29b21f4329e2ee2d0a3f948ba300407b8bf2055308ccc0c9afb2eca44cb1a322" dependencies = [ "proc-macro2", "quote", @@ -3934,9 +3934,9 @@ dependencies = [ [[package]] name = "solana-loader-v4-program" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a86dfb559013436f20bbf6ae56323630319d853c82836e1a9a3dcae1180b9497" +checksum = "828d31d6d4f4559299410a1057e2a52617018e6d4754089941d6ccbba825c2f0" dependencies = [ "log", "solana-measure", @@ -3947,9 +3947,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fa5daba09e7c2bc579b0d3151f649496f148a0ac2054bb042915fbfe9c1678" +checksum = "cf2142caa78bdc817e6f6b2a3d36a1d4e0338429b127c5fd4c184925c5e13991" dependencies = [ "env_logger", "lazy_static", @@ -3958,9 +3958,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87403b9fb2abd9f2f2b2879ca9e56e14b5ae58f145466e3e893a7810bcbceff" +checksum = "b58887fd41f5de288397729d9f1875ba1fa7accf10a07e15df7179b39a38bd5f" dependencies = [ "log", "solana-sdk", @@ -3968,9 +3968,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4b504a682911c4bf85b21278720870555f5996e2991daf54ea4ce300012e93e" +checksum = "b4bfaebf0b74b9b7eb49bffd9517a0bad107eaa5bc40156b9fffa2ae49ef20d7" dependencies = [ "crossbeam-channel", "gethostname", @@ -3983,9 +3983,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a573d966fd61609501401dc1350b6ba1d0dee91c166453ec77b2fb312e8072b1" +checksum = "63992924212096f9806e4a64f212186412dd38e179f76f7d98505476e404e4c5" dependencies = [ "bincode", "clap 3.2.23", @@ -4005,9 +4005,9 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcffede3b37ccdddbd57f93e4228b268f05c0a5cb44cb6e382ed8a31a15f5573" +checksum = "9ba6b7178ef92f0778e6a83b3df7478c2988c193d3086666fd0dcc6686cc3202" dependencies = [ "ahash 0.8.3", "bincode", @@ -4022,7 +4022,10 @@ dependencies = [ "nix", "rand 0.8.5", "rayon", + "rustc_version", "serde", + "solana-frozen-abi", + "solana-frozen-abi-macro", "solana-metrics", "solana-rayon-threadlimit", "solana-sdk", @@ -4031,9 +4034,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e8834ffcd3773375e7fce4b261efefebbb64409da78e1627cbc4c2632139921" +checksum = "71109871717258d6138b8e344e54958c768f14fe35153a963bd817b1c142fa79" dependencies = [ "ark-bn254", "ark-ec", @@ -4085,9 +4088,9 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99127d74ad7a383b7f3dae2ecaebfc7926250fb7cef19b67fb344811d020dc14" +checksum = "4a9218a980dd08e26c7663b2ce584046f754f65b468a7429543c9ac48e9ffeef" dependencies = [ "base64 0.21.4", "bincode", @@ -4113,9 +4116,9 @@ dependencies = [ [[package]] name = "solana-program-test" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444889fcaf4588b2aa7733aa2f726b80c126026d60d79f882064b06f70fea05b" +checksum = "e972cb9918dceb671aeb8cc0172a64ce9fcab4e24b3bcaf0c4311b12949ac08b" dependencies = [ "assert_matches", "async-trait", @@ -4135,6 +4138,7 @@ dependencies = [ "solana-runtime", "solana-sdk", "solana-vote-program", + "solana_rbpf", "test-case", "thiserror", "tokio", @@ -4142,9 +4146,9 @@ dependencies = [ [[package]] name = "solana-pubsub-client" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f271c0f60d010af98f03a595552891ca3f497e7074e2225131c5bb24fadca9b8" +checksum = "9ea47d1cd7eec32567c2dbcb1882aaa5882d1fb78383aab3363b847a60409210" dependencies = [ "crossbeam-channel", "futures-util", @@ -4167,9 +4171,9 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09e9e5f5bea29716b4c14d319058b4e01c5837d68bd29acbdfaccbeebddac68d" +checksum = "8954617a09b28ab0955e207788b5d8638dcfc763e2cd617d977e9147517b682d" dependencies = [ "async-mutex", "async-trait", @@ -4194,9 +4198,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e864b2647831d5cad75bafa9234590821a97eba780c131fc12dc3bc45c1d9916" +checksum = "91f84e78a2db79215c3d990c8d26ddcb9aed3af0a1cdd361816b67acaf64a979" dependencies = [ "lazy_static", "num_cpus", @@ -4204,9 +4208,9 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d2ac9610026a977828af8b73984fdb2bac21f48bcf6b1f37767df31ca1cb0db" +checksum = "bdd33ec995f43a813d5e3598f6d713eea754900f32db6c7a5966e78c074b039a" dependencies = [ "console", "dialoguer", @@ -4223,9 +4227,9 @@ dependencies = [ [[package]] name = "solana-rpc-client" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b9bdf8cf0b55be95bd4198d2706a6536ff30957b8c939a2fdee0627343793b" +checksum = "0c2b5de95f647b2019adeb6624c75df343d659ee85256e7996adddb64400df75" dependencies = [ "async-trait", "base64 0.21.4", @@ -4249,9 +4253,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d219157e9a0cf86a96b1d5601751df75340e2add88eca5ab1b0941a42307f2f1" +checksum = "8f29f7871d826499cd1a021c3257f7bcc409a6b71e9f6e7064c9b1d8c698ec78" dependencies = [ "base64 0.21.4", "bs58", @@ -4271,9 +4275,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-nonce-utils" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01995b2fea7b6d2623fd3ad00a4af6426f7eb225f8d529acf2397ea8cb6d3f10" +checksum = "c0c4b897989a5e30830c0d2d22a33980d6f6a4156fc4a63d52d6e99feb44c836" dependencies = [ "clap 2.34.0", "solana-clap-utils", @@ -4284,9 +4288,9 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebf7b2d9c9ae6301651ad601219e9c9ca879d9f11f86673c2eea6197aca4aafa" +checksum = "ba5766627c68b40e71afe3de08195b7b5a78c4ed848c74e5e3e85995d97aef9b" dependencies = [ "arrayref", "base64 0.21.4", @@ -4361,9 +4365,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1d4bf7b8f6a0350b8a1a81346a5819d9bd5c93096c2bf079f01b905dfe0443" +checksum = "fa9856edf27de2d32b91dc4faf08852e2231cc6b127337d71b34c43f248bf832" dependencies = [ "assert_matches", "base64 0.21.4", @@ -4415,9 +4419,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170f3c87d862ba5c74c03fa37a2867c10aa68e7b210bdf004c7a8b330284c789" +checksum = "7cce3b1aceaaf92c82d9ea3e7326d1c7dce4dd7bc45421be8d3834f275ab464f" dependencies = [ "bs58", "proc-macro2", @@ -4428,9 +4432,9 @@ dependencies = [ [[package]] name = "solana-send-transaction-service" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4d5c756cd87641dd720dc7874182149d106f6753b0ba758023f1f1523fb8d9" +checksum = "3e0053a052abc9ce4a7a2bcec61a9edb798c2aaf38b0e6dd308039aa0f0bb1d1" dependencies = [ "crossbeam-channel", "log", @@ -4444,9 +4448,9 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea1b3f9e4a288970a308f47f25308ebba071100eae72f374fdcd777647315c9" +checksum = "419cdb62addd653c76d3d3ef3ce9e6cb4d491c2d6f59680afb0d108b34d59260" dependencies = [ "bincode", "log", @@ -4459,9 +4463,9 @@ dependencies = [ [[package]] name = "solana-streamer" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca08a69ae2ac103925bf367020e646dcdbb778ead2ce8685d962ca15616f0fc5" +checksum = "9e3371a51b49a2d7bd55ea345c5c67122282e34b2ed744e7062e4acf94075e75" dependencies = [ "async-channel", "bytes", @@ -4491,9 +4495,9 @@ dependencies = [ [[package]] name = "solana-system-program" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcda9bf5b7e7b8726c6ddc7f06fc9110875e688e197e0602721b1b425cfc5cc2" +checksum = "c0f1b312f1f3638e76b1150f4a019f310711cfe5387364821db61ef1ad215e2e" dependencies = [ "bincode", "log", @@ -4505,9 +4509,9 @@ dependencies = [ [[package]] name = "solana-thin-client" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2c780ce4d234abbde57ed94342e882c0170c6ebe7d8f1f02763f6cb88a925d" +checksum = "7b524e0bdae28ef6d3890a6e046a9492e19347e2497c6418eb5dc2e0f25ee7bf" dependencies = [ "bincode", "log", @@ -4520,9 +4524,9 @@ dependencies = [ [[package]] name = "solana-tpu-client" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e00eb9926169f8d4f9f6af95410decc01545a9ce991e12781cb8ae1515ab833f" +checksum = "ec71f775779f1be75e2a341d4de2b0732dc314904c0b7a6c73abcbbe456032d1" dependencies = [ "async-trait", "bincode", @@ -4544,9 +4548,9 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f8af464b440c000a3e5306509f02240150b5311fffc4534738e1bdfdb604604" +checksum = "4a0b68e5d2103184b34ed047e7424c564459fcf0ddad1e6b74eaefd44f341626" dependencies = [ "Inflector", "base64 0.21.4", @@ -4569,9 +4573,9 @@ dependencies = [ [[package]] name = "solana-udp-client" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2763ee4af6d7a92cd5b70679a8b46ea13f167e59a8f5f294041905b5258d9ae" +checksum = "58f7f914502ccf4b4336bab86b6ce104344489917001c46cbb9c3367d18635f4" dependencies = [ "async-trait", "solana-connection-cache", @@ -4584,9 +4588,9 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d133bdd437accc92171e40d76cd5cd76cba59d58f6a2f89b02c8621ffab3b5d" +checksum = "bc97ed56e360a52a800126d2bfb7cf1f2bf3b30fc3d8f15988f4560ddba58c2a" dependencies = [ "log", "rustc_version", @@ -4600,9 +4604,9 @@ dependencies = [ [[package]] name = "solana-vote" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "840a57075b446db53d5591e107b32b46afeff7c5e1172c2ff90ed30067b8650a" +checksum = "30cce9071d89159a0c6bf1e66a481ae948b0e13d43e5f0147d6dd30fea0998e7" dependencies = [ "crossbeam-channel", "itertools", @@ -4619,9 +4623,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733573c6e800f04d8721bd4b861165c17db94026e2c9da28d6a3553e095efacb" +checksum = "1a04868ec04dd8fac5ed4100a11b9ac616e0f5230a6678118bac685b85fecc1e" dependencies = [ "bincode", "log", @@ -4641,9 +4645,9 @@ dependencies = [ [[package]] name = "solana-zk-token-proof-program" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d2aa189efb2af7b1cf2339808b9bc236addeb776e62e5b5527947d2a68c699d" +checksum = "53c122ae88f9aac95fb387c16c7cec90ce9963d9db17c667dd654ae344f58bad" dependencies = [ "bytemuck", "num-derive 0.3.3", @@ -4655,9 +4659,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.17.2" +version = "1.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34f2a9ce880cac8d1f7f0cbfaaac07fb84e163e7f616125f4980c13a21b17727" +checksum = "ac110323e0eaf7b2d1764ab35efbb8c17d40fbcfaecbd0829c025e357a6318f6" dependencies = [ "aes-gcm-siv", "base64 0.21.4", @@ -4684,9 +4688,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "103318aa365ff7caa8cf534f2246b5eb7e5b34668736d52b1266b143f7a21196" +checksum = "3d457cc2ba742c120492a64b7fa60e22c575e891f6b55039f4d736568fb112a3" dependencies = [ "byteorder", "combine", diff --git a/Cargo.toml b/Cargo.toml index ed5e5aa1..203f009a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -118,19 +118,19 @@ solders-transaction-error = { path = "./crates/transaction-error", version = "=0 solders-account = { path = "./crates/account", version = "=0.18.1" } solders-hash = { path = "./crates/hash", version = "=0.18.1" } serde_with = { version = "^1.14.0", features = ["base64"] } -solana-sdk = "1.17.2" -solana-account-decoder = "1.17.2" -solana-transaction-status = "1.17.2" -solana-rpc-client-api = "1.17.2" -solana-program = "1.17.2" +solana-sdk = "1.17.6" +solana-account-decoder = "1.17.6" +solana-transaction-status = "1.17.6" +solana-rpc-client-api = "1.17.6" +solana-program = "1.17.6" bincode = "1.3.3" base64 = "0.13.0" serde = "^1.0.188" serde_json = "^1.0.106" serde_cbor = "^0.11.2" derive_more = "0.99.17" -solana-program-test = "1.17.2" -solana-banks-client = "1.17.2" +solana-program-test = "1.17.6" +solana-banks-client = "1.17.6" pythonize = "0.19.0" bs58 = "0.4.0" thiserror = "^1.0.31" From 75d32575771d50895f8a0818a76627e89aa3a374 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Sat, 25 Nov 2023 14:24:27 +0400 Subject: [PATCH 07/15] lint --- pyproject.toml | 3 +-- python/solders/__init__.py | 2 +- tests/test_system_program.py | 6 +++--- tests/test_transaction.py | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2445d163..7f958ab0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,9 +56,8 @@ reportMissingModuleSource = false [tool.ruff] line-length = 120 - select = ["A", "B", "D", "E", "F", "I", "ARG", "BLE", "C4", "SIM", "PLC", "PLE", "PLR", "PLW", "RUF"] -ignore = ["D203"] +ignore = ["D203", "PLR0913"] # Exclude a variety of commonly ignored directories. exclude = [ diff --git a/python/solders/__init__.py b/python/solders/__init__.py index 39321325..7468f193 100644 --- a/python/solders/__init__.py +++ b/python/solders/__init__.py @@ -56,6 +56,6 @@ "system_program", ] -__all__ = [*__all_core, "bankrun"] if __has_bankrun else __all_core +__all__ = [*__all_core, "bankrun"] if __has_bankrun else __all_core # noqa: PLE0605 __version__: str = _version_untyped diff --git a/tests/test_system_program.py b/tests/test_system_program.py index b8aee08c..8dc7beda 100644 --- a/tests/test_system_program.py +++ b/tests/test_system_program.py @@ -12,7 +12,7 @@ def test_id() -> None: - assert sp.ID == Pubkey.from_string("11111111111111111111111111111111") + assert Pubkey.from_string("11111111111111111111111111111111") == sp.ID def get_keys(instruction: Instruction) -> List[Pubkey]: @@ -324,7 +324,7 @@ def test_create_nonce_account2() -> None: b"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAwECAyQGAAAAOoXlJ9RH/kj2LaCcgccSvTWPYki2akUdJpF3vg1pnXA=" ) js_wire_txn = base64.b64decode( - b"AkBAiPTJfOYZRLOZUpH7vIxyJQovMxO7X8FxXyRzae8CECBZ9LS5G8hxZVMdVL6uSIzLHb/0aLYhO5FEVmfhwguY5ZtOCOGqjwyAOVr8L2eBXgX482L/rcmF6ELORIcD1GdAFBQ/1Hc/LByer9TbJfNqzjesdzTJEHohnStduU4OAgADBTqF5SfUR/5I9i2gnIHHEr01j2JItmpFHSaRd74NaZ1wvICzr4gFWblct6+DODXkCxQiipQzG81MS5S4IkqB7uEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAan1RcZLFaO4IqEX3PSl4jPA1wxRbIas0TYBi6pQAAABqfVFxksXFEhjMlMPUrxf1ja7gibof1E49vZigAAAABXbYHxIfw3Z5Qq1LH8aj6Sj6LuqbCuwFhAmo21XevlfwICAgABNAAAAACAhB4AAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAwEDBCQGAAAAOoXlJ9RH/kj2LaCcgccSvTWPYki2akUdJpF3vg1pnXA=" # noqa: E501 pylint: disable=line-too-long + b"AkBAiPTJfOYZRLOZUpH7vIxyJQovMxO7X8FxXyRzae8CECBZ9LS5G8hxZVMdVL6uSIzLHb/0aLYhO5FEVmfhwguY5ZtOCOGqjwyAOVr8L2eBXgX482L/rcmF6ELORIcD1GdAFBQ/1Hc/LByer9TbJfNqzjesdzTJEHohnStduU4OAgADBTqF5SfUR/5I9i2gnIHHEr01j2JItmpFHSaRd74NaZ1wvICzr4gFWblct6+DODXkCxQiipQzG81MS5S4IkqB7uEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAan1RcZLFaO4IqEX3PSl4jPA1wxRbIas0TYBi6pQAAABqfVFxksXFEhjMlMPUrxf1ja7gibof1E49vZigAAAABXbYHxIfw3Z5Qq1LH8aj6Sj6LuqbCuwFhAmo21XevlfwICAgABNAAAAACAhB4AAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAwEDBCQGAAAAOoXlJ9RH/kj2LaCcgccSvTWPYki2akUdJpF3vg1pnXA=" ) cli_expected_txn = Transaction.from_bytes(cli_wire_txn) # noqa: F841 js_expected_txn = Transaction.from_bytes(js_wire_txn) @@ -610,7 +610,7 @@ def test_advance_nonce_and_transfer() -> None: b"AA==" ) js_wire_txn = base64.b64decode( - b"Af67rLfP5WxsOgvZWndq34S2KbQq++x03eZkZagzbVQ2tRyfFyn6OWByp8q3P2a03HDeVtpUWhq1y1a6R0DcPAIBAAIFOoXlJ9RH/kj2LaCcgccSvTWPYki2akUdJpF3vg1pnXC8gLOviAVZuVy3r4M4NeQLFCKKlDMbzUxLlLgiSoHu4fx8NgMSbd8b4Rw7yjH49BGlIWU72U/q2ftVCQYoAN0KAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGp9UXGSxWjuCKhF9z0peIzwNcMUWyGrNE2AYuqUAAAE13Mu8zaQSpG0zzGHpG62nK56DbGhuS4kXMF/ChHY1jAgMDAQQABAQAAAADAgACDAIAAACAhB4AAAAAAA==" # noqa: E501 pylint: disable=line-too-long + b"Af67rLfP5WxsOgvZWndq34S2KbQq++x03eZkZagzbVQ2tRyfFyn6OWByp8q3P2a03HDeVtpUWhq1y1a6R0DcPAIBAAIFOoXlJ9RH/kj2LaCcgccSvTWPYki2akUdJpF3vg1pnXC8gLOviAVZuVy3r4M4NeQLFCKKlDMbzUxLlLgiSoHu4fx8NgMSbd8b4Rw7yjH49BGlIWU72U/q2ftVCQYoAN0KAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGp9UXGSxWjuCKhF9z0peIzwNcMUWyGrNE2AYuqUAAAE13Mu8zaQSpG0zzGHpG62nK56DbGhuS4kXMF/ChHY1jAgMDAQQABAQAAAADAgACDAIAAACAhB4AAAAAAA==" ) cli_expected_txn = Transaction.from_bytes(cli_wire_txn) # noqa: F841 diff --git a/tests/test_transaction.py b/tests/test_transaction.py index 86493691..7c5d94a5 100644 --- a/tests/test_transaction.py +++ b/tests/test_transaction.py @@ -1385,7 +1385,7 @@ def test_sort_account_metas() -> None: txn = Transaction.new_unsigned(message) tx_msg = txn.message - js_msg_b64_check = b"AwABBwZtbiRMvgQjcE2kVx9yon8XqPSO5hwc2ApflnOZMu0Qo9G5/xbhB0sp8/03Rv9x4MKSkQ+k4LB6lNLvCgKZ/ju/aw+EyQpTObVa3Xm+NA1gSTzutgFCTfkDto/0KtuIHHAMpKRb92NImxKeWQJ2/291j6nTzFj1D6nW25p7TofHmVsGt8uFnTv7+8vsWZ0uN7azdxa+jCIIm4WzKK+4uKfX39t5UA7S1soBQaJkTGOQkSbBo39gIjDkbW0TrevslgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxJrndgN4IFTxep3s6kO0ROug7bEsbx0xxuDkqEvwUusDBgIABAwCAAAAgIQeAAAAAAAGAgIFDAIAAACAhB4AAAAAAAYCAQMMAgAAAICEHgAAAAAA" # noqa: E501 pylint: disable=line-too-long + js_msg_b64_check = b"AwABBwZtbiRMvgQjcE2kVx9yon8XqPSO5hwc2ApflnOZMu0Qo9G5/xbhB0sp8/03Rv9x4MKSkQ+k4LB6lNLvCgKZ/ju/aw+EyQpTObVa3Xm+NA1gSTzutgFCTfkDto/0KtuIHHAMpKRb92NImxKeWQJ2/291j6nTzFj1D6nW25p7TofHmVsGt8uFnTv7+8vsWZ0uN7azdxa+jCIIm4WzKK+4uKfX39t5UA7S1soBQaJkTGOQkSbBo39gIjDkbW0TrevslgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxJrndgN4IFTxep3s6kO0ROug7bEsbx0xxuDkqEvwUusDBgIABAwCAAAAgIQeAAAAAAAGAgIFDAIAAACAhB4AAAAAAAYCAQMMAgAAAICEHgAAAAAA" assert b64encode(bytes(tx_msg)) == js_msg_b64_check From 635742488788ffe3999625fbc436300860e2d824 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Sat, 25 Nov 2023 14:26:04 +0400 Subject: [PATCH 08/15] update ruff --- poetry.lock | 599 +++++++++++++++++++++++++------------------------ pyproject.toml | 2 +- 2 files changed, 302 insertions(+), 299 deletions(-) diff --git a/poetry.lock b/poetry.lock index 212d8686..76d8c863 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,10 +1,9 @@ -# This file is automatically @generated by Poetry and should not be changed by hand. +# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. [[package]] name = "alabaster" version = "0.7.13" description = "A configurable sidebar-enabled Sphinx theme" -category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -16,7 +15,6 @@ files = [ name = "attrs" version = "23.1.0" description = "Classes Without Boilerplate" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -33,24 +31,26 @@ tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pyte [[package]] name = "babel" -version = "2.12.1" +version = "2.13.1" description = "Internationalization utilities" -category = "dev" optional = false python-versions = ">=3.7" files = [ - {file = "Babel-2.12.1-py3-none-any.whl", hash = "sha256:b4246fb7677d3b98f501a39d43396d3cafdc8eadb045f4a31be01863f655c610"}, - {file = "Babel-2.12.1.tar.gz", hash = "sha256:cc2d99999cd01d44420ae725a21c9e3711b3aadc7976d6147f622d8581963455"}, + {file = "Babel-2.13.1-py3-none-any.whl", hash = "sha256:7077a4984b02b6727ac10f1f7294484f737443d7e2e66c5e4380e41a3ae0b4ed"}, + {file = "Babel-2.13.1.tar.gz", hash = "sha256:33e0952d7dd6374af8dbf6768cc4ddf3ccfefc244f9986d4074704f2fbd18900"}, ] [package.dependencies] pytz = {version = ">=2015.7", markers = "python_version < \"3.9\""} +setuptools = {version = "*", markers = "python_version >= \"3.12\""} + +[package.extras] +dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] [[package]] name = "based58" version = "0.1.1" description = "A fast Python library for Base58 and Base58Check" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -76,7 +76,6 @@ files = [ name = "black" version = "22.12.0" description = "The uncompromising code formatter." -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -112,7 +111,6 @@ uvloop = ["uvloop (>=0.15.2)"] name = "bump2version" version = "1.0.1" description = "Version-bump your software with a single command!" -category = "dev" optional = false python-versions = ">=3.5" files = [ @@ -124,7 +122,6 @@ files = [ name = "bumpversion" version = "0.6.0" description = "Version-bump your software with a single command!" -category = "dev" optional = false python-versions = "*" files = [ @@ -137,111 +134,123 @@ bump2version = "*" [[package]] name = "certifi" -version = "2023.5.7" +version = "2023.11.17" description = "Python package for providing Mozilla's CA Bundle." -category = "dev" optional = false python-versions = ">=3.6" files = [ - {file = "certifi-2023.5.7-py3-none-any.whl", hash = "sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716"}, - {file = "certifi-2023.5.7.tar.gz", hash = "sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7"}, + {file = "certifi-2023.11.17-py3-none-any.whl", hash = "sha256:e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474"}, + {file = "certifi-2023.11.17.tar.gz", hash = "sha256:9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1"}, ] [[package]] name = "charset-normalizer" -version = "3.1.0" +version = "3.3.2" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." -category = "dev" optional = false python-versions = ">=3.7.0" files = [ - {file = "charset-normalizer-3.1.0.tar.gz", hash = "sha256:34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e0ac8959c929593fee38da1c2b64ee9778733cdf03c482c9ff1d508b6b593b2b"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d7fc3fca01da18fbabe4625d64bb612b533533ed10045a2ac3dd194bfa656b60"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:04eefcee095f58eaabe6dc3cc2262f3bcd776d2c67005880894f447b3f2cb9c1"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20064ead0717cf9a73a6d1e779b23d149b53daf971169289ed2ed43a71e8d3b0"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1435ae15108b1cb6fffbcea2af3d468683b7afed0169ad718451f8db5d1aff6f"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c84132a54c750fda57729d1e2599bb598f5fa0344085dbde5003ba429a4798c0"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75f2568b4189dda1c567339b48cba4ac7384accb9c2a7ed655cd86b04055c795"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:11d3bcb7be35e7b1bba2c23beedac81ee893ac9871d0ba79effc7fc01167db6c"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:891cf9b48776b5c61c700b55a598621fdb7b1e301a550365571e9624f270c203"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5f008525e02908b20e04707a4f704cd286d94718f48bb33edddc7d7b584dddc1"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:b06f0d3bf045158d2fb8837c5785fe9ff9b8c93358be64461a1089f5da983137"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:49919f8400b5e49e961f320c735388ee686a62327e773fa5b3ce6721f7e785ce"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:22908891a380d50738e1f978667536f6c6b526a2064156203d418f4856d6e86a"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-win32.whl", hash = "sha256:12d1a39aa6b8c6f6248bb54550efcc1c38ce0d8096a146638fd4738e42284448"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:65ed923f84a6844de5fd29726b888e58c62820e0769b76565480e1fdc3d062f8"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9a3267620866c9d17b959a84dd0bd2d45719b817245e49371ead79ed4f710d19"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6734e606355834f13445b6adc38b53c0fd45f1a56a9ba06c2058f86893ae8017"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f8303414c7b03f794347ad062c0516cee0e15f7a612abd0ce1e25caf6ceb47df"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aaf53a6cebad0eae578f062c7d462155eada9c172bd8c4d250b8c1d8eb7f916a"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3dc5b6a8ecfdc5748a7e429782598e4f17ef378e3e272eeb1340ea57c9109f41"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e1b25e3ad6c909f398df8921780d6a3d120d8c09466720226fc621605b6f92b1"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ca564606d2caafb0abe6d1b5311c2649e8071eb241b2d64e75a0d0065107e62"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b82fab78e0b1329e183a65260581de4375f619167478dddab510c6c6fb04d9b6"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:bd7163182133c0c7701b25e604cf1611c0d87712e56e88e7ee5d72deab3e76b5"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:11d117e6c63e8f495412d37e7dc2e2fff09c34b2d09dbe2bee3c6229577818be"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:cf6511efa4801b9b38dc5546d7547d5b5c6ef4b081c60b23e4d941d0eba9cbeb"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:abc1185d79f47c0a7aaf7e2412a0eb2c03b724581139193d2d82b3ad8cbb00ac"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cb7b2ab0188829593b9de646545175547a70d9a6e2b63bf2cd87a0a391599324"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-win32.whl", hash = "sha256:c36bcbc0d5174a80d6cccf43a0ecaca44e81d25be4b7f90f0ed7bcfbb5a00909"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:cca4def576f47a09a943666b8f829606bcb17e2bc2d5911a46c8f8da45f56755"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0c95f12b74681e9ae127728f7e5409cbbef9cd914d5896ef238cc779b8152373"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fca62a8301b605b954ad2e9c3666f9d97f63872aa4efcae5492baca2056b74ab"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ac0aa6cd53ab9a31d397f8303f92c42f534693528fafbdb997c82bae6e477ad9"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c3af8e0f07399d3176b179f2e2634c3ce9c1301379a6b8c9c9aeecd481da494f"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a5fc78f9e3f501a1614a98f7c54d3969f3ad9bba8ba3d9b438c3bc5d047dd28"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:628c985afb2c7d27a4800bfb609e03985aaecb42f955049957814e0491d4006d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:74db0052d985cf37fa111828d0dd230776ac99c740e1a758ad99094be4f1803d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:1e8fcdd8f672a1c4fc8d0bd3a2b576b152d2a349782d1eb0f6b8e52e9954731d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:04afa6387e2b282cf78ff3dbce20f0cc071c12dc8f685bd40960cc68644cfea6"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:dd5653e67b149503c68c4018bf07e42eeed6b4e956b24c00ccdf93ac79cdff84"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d2686f91611f9e17f4548dbf050e75b079bbc2a82be565832bc8ea9047b61c8c"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-win32.whl", hash = "sha256:4155b51ae05ed47199dc5b2a4e62abccb274cee6b01da5b895099b61b1982974"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:322102cdf1ab682ecc7d9b1c5eed4ec59657a65e1c146a0da342b78f4112db23"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e633940f28c1e913615fd624fcdd72fdba807bf53ea6925d6a588e84e1151531"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:3a06f32c9634a8705f4ca9946d667609f52cf130d5548881401f1eb2c39b1e2c"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7381c66e0561c5757ffe616af869b916c8b4e42b367ab29fedc98481d1e74e14"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3573d376454d956553c356df45bb824262c397c6e26ce43e8203c4c540ee0acb"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e89df2958e5159b811af9ff0f92614dabf4ff617c03a4c1c6ff53bf1c399e0e1"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:78cacd03e79d009d95635e7d6ff12c21eb89b894c354bd2b2ed0b4763373693b"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:de5695a6f1d8340b12a5d6d4484290ee74d61e467c39ff03b39e30df62cf83a0"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c60b9c202d00052183c9be85e5eaf18a4ada0a47d188a83c8f5c5b23252f649"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f645caaf0008bacf349875a974220f1f1da349c5dbe7c4ec93048cdc785a3326"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ea9f9c6034ea2d93d9147818f17c2a0860d41b71c38b9ce4d55f21b6f9165a11"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:80d1543d58bd3d6c271b66abf454d437a438dff01c3e62fdbcd68f2a11310d4b"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:73dc03a6a7e30b7edc5b01b601e53e7fc924b04e1835e8e407c12c037e81adbd"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6f5c2e7bc8a4bf7c426599765b1bd33217ec84023033672c1e9a8b35eaeaaaf8"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-win32.whl", hash = "sha256:12a2b561af122e3d94cdb97fe6fb2bb2b82cef0cdca131646fdb940a1eda04f0"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:3160a0fd9754aab7d47f95a6b63ab355388d890163eb03b2d2b87ab0a30cfa59"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:38e812a197bf8e71a59fe55b757a84c1f946d0ac114acafaafaf21667a7e169e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6baf0baf0d5d265fa7944feb9f7451cc316bfe30e8df1a61b1bb08577c554f31"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8f25e17ab3039b05f762b0a55ae0b3632b2e073d9c8fc88e89aca31a6198e88f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3747443b6a904001473370d7810aa19c3a180ccd52a7157aacc264a5ac79265e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b116502087ce8a6b7a5f1814568ccbd0e9f6cfd99948aa59b0e241dc57cf739f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d16fd5252f883eb074ca55cb622bc0bee49b979ae4e8639fff6ca3ff44f9f854"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21fa558996782fc226b529fdd2ed7866c2c6ec91cee82735c98a197fae39f706"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6f6c7a8a57e9405cad7485f4c9d3172ae486cfef1344b5ddd8e5239582d7355e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ac3775e3311661d4adace3697a52ac0bab17edd166087d493b52d4f4f553f9f0"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:10c93628d7497c81686e8e5e557aafa78f230cd9e77dd0c40032ef90c18f2230"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:6f4f4668e1831850ebcc2fd0b1cd11721947b6dc7c00bf1c6bd3c929ae14f2c7"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0be65ccf618c1e7ac9b849c315cc2e8a8751d9cfdaa43027d4f6624bd587ab7e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:53d0a3fa5f8af98a1e261de6a3943ca631c526635eb5817a87a59d9a57ebf48f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-win32.whl", hash = "sha256:a04f86f41a8916fe45ac5024ec477f41f886b3c435da2d4e3d2709b22ab02af1"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:830d2948a5ec37c386d3170c483063798d7879037492540f10a475e3fd6f244b"}, - {file = "charset_normalizer-3.1.0-py3-none-any.whl", hash = "sha256:3d9098b479e78c85080c98e1e35ff40b4a31d8953102bb0fd7d1b6f8a2111a3d"}, + {file = "charset-normalizer-3.3.2.tar.gz", hash = "sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-win32.whl", hash = "sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-win32.whl", hash = "sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-win32.whl", hash = "sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-win_amd64.whl", hash = "sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-win32.whl", hash = "sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-win_amd64.whl", hash = "sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-win32.whl", hash = "sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-win32.whl", hash = "sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d"}, + {file = "charset_normalizer-3.3.2-py3-none-any.whl", hash = "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc"}, ] [[package]] name = "click" -version = "8.1.3" +version = "8.1.7" description = "Composable command line interface toolkit" -category = "dev" optional = false python-versions = ">=3.7" files = [ - {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"}, - {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"}, + {file = "click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"}, + {file = "click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"}, ] [package.dependencies] @@ -251,7 +260,6 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""} name = "colorama" version = "0.4.6" description = "Cross-platform colored terminal text." -category = "dev" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" files = [ @@ -263,7 +271,6 @@ files = [ name = "docutils" version = "0.18.1" description = "Docutils -- Python Documentation Utilities" -category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" files = [ @@ -273,14 +280,13 @@ files = [ [[package]] name = "exceptiongroup" -version = "1.1.1" +version = "1.2.0" description = "Backport of PEP 654 (exception groups)" -category = "dev" optional = false python-versions = ">=3.7" files = [ - {file = "exceptiongroup-1.1.1-py3-none-any.whl", hash = "sha256:232c37c63e4f682982c8b6459f33a8981039e5fb8756b2074364e5055c498c9e"}, - {file = "exceptiongroup-1.1.1.tar.gz", hash = "sha256:d484c3090ba2889ae2928419117447a14daf3c1231d5e30d0aae34f354f01785"}, + {file = "exceptiongroup-1.2.0-py3-none-any.whl", hash = "sha256:4bfd3996ac73b41e9b9628b04e079f193850720ea5945fc96a08633c66912f14"}, + {file = "exceptiongroup-1.2.0.tar.gz", hash = "sha256:91f5c769735f051a4290d52edd0858999b57e5876e9f85937691bd4c9fa3ed68"}, ] [package.extras] @@ -288,21 +294,19 @@ test = ["pytest (>=6)"] [[package]] name = "idna" -version = "3.4" +version = "3.5" description = "Internationalized Domain Names in Applications (IDNA)" -category = "dev" optional = false python-versions = ">=3.5" files = [ - {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"}, - {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"}, + {file = "idna-3.5-py3-none-any.whl", hash = "sha256:79b8f0ac92d2351be5f6122356c9a592c96d81c9a79e4b488bf2a6a15f88057a"}, + {file = "idna-3.5.tar.gz", hash = "sha256:27009fe2735bf8723353582d48575b23c533cc2c2de7b5a68908d91b5eb18d08"}, ] [[package]] name = "imagesize" version = "1.4.1" description = "Getting image size from png/jpeg/jpeg2000/gif file" -category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" files = [ @@ -312,14 +316,13 @@ files = [ [[package]] name = "importlib-metadata" -version = "6.6.0" +version = "6.8.0" description = "Read metadata from Python packages" -category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "importlib_metadata-6.6.0-py3-none-any.whl", hash = "sha256:43dd286a2cd8995d5eaef7fee2066340423b818ed3fd70adf0bad5f1fac53fed"}, - {file = "importlib_metadata-6.6.0.tar.gz", hash = "sha256:92501cdf9cc66ebd3e612f1b4f0c0765dfa42f0fa38ffb319b6bd84dd675d705"}, + {file = "importlib_metadata-6.8.0-py3-none-any.whl", hash = "sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb"}, + {file = "importlib_metadata-6.8.0.tar.gz", hash = "sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743"}, ] [package.dependencies] @@ -328,13 +331,12 @@ zipp = ">=0.5" [package.extras] docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] perf = ["ipython"] -testing = ["flake8 (<5)", "flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)"] +testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)", "pytest-ruff"] [[package]] name = "iniconfig" version = "2.0.0" description = "brain-dead simple config-ini parsing" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -346,7 +348,6 @@ files = [ name = "jinja2" version = "3.1.2" description = "A very fast and expressive template engine." -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -364,7 +365,6 @@ i18n = ["Babel (>=2.7)"] name = "jsonalias" version = "0.1.1" description = "A microlibrary that defines a Json type alias for Python." -category = "dev" optional = false python-versions = ">=3.7,<4.0" files = [ @@ -376,7 +376,6 @@ files = [ name = "markdown-it-py" version = "2.2.0" description = "Python port of markdown-it. Markdown parsing, done right!" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -399,69 +398,77 @@ testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"] [[package]] name = "markupsafe" -version = "2.1.2" +version = "2.1.3" description = "Safely add untrusted strings to HTML/XML markup." -category = "dev" optional = false python-versions = ">=3.7" files = [ - {file = "MarkupSafe-2.1.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:665a36ae6f8f20a4676b53224e33d456a6f5a72657d9c83c2aa00765072f31f7"}, - {file = "MarkupSafe-2.1.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:340bea174e9761308703ae988e982005aedf427de816d1afe98147668cc03036"}, - {file = "MarkupSafe-2.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:22152d00bf4a9c7c83960521fc558f55a1adbc0631fbb00a9471e097b19d72e1"}, - {file = "MarkupSafe-2.1.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:28057e985dace2f478e042eaa15606c7efccb700797660629da387eb289b9323"}, - {file = "MarkupSafe-2.1.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ca244fa73f50a800cf8c3ebf7fd93149ec37f5cb9596aa8873ae2c1d23498601"}, - {file = "MarkupSafe-2.1.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d9d971ec1e79906046aa3ca266de79eac42f1dbf3612a05dc9368125952bd1a1"}, - {file = "MarkupSafe-2.1.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:7e007132af78ea9df29495dbf7b5824cb71648d7133cf7848a2a5dd00d36f9ff"}, - {file = "MarkupSafe-2.1.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:7313ce6a199651c4ed9d7e4cfb4aa56fe923b1adf9af3b420ee14e6d9a73df65"}, - {file = "MarkupSafe-2.1.2-cp310-cp310-win32.whl", hash = "sha256:c4a549890a45f57f1ebf99c067a4ad0cb423a05544accaf2b065246827ed9603"}, - {file = "MarkupSafe-2.1.2-cp310-cp310-win_amd64.whl", hash = "sha256:835fb5e38fd89328e9c81067fd642b3593c33e1e17e2fdbf77f5676abb14a156"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:2ec4f2d48ae59bbb9d1f9d7efb9236ab81429a764dedca114f5fdabbc3788013"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:608e7073dfa9e38a85d38474c082d4281f4ce276ac0010224eaba11e929dd53a"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:65608c35bfb8a76763f37036547f7adfd09270fbdbf96608be2bead319728fcd"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f2bfb563d0211ce16b63c7cb9395d2c682a23187f54c3d79bfec33e6705473c6"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:da25303d91526aac3672ee6d49a2f3db2d9502a4a60b55519feb1a4c7714e07d"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:9cad97ab29dfc3f0249b483412c85c8ef4766d96cdf9dcf5a1e3caa3f3661cf1"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:085fd3201e7b12809f9e6e9bc1e5c96a368c8523fad5afb02afe3c051ae4afcc"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1bea30e9bf331f3fef67e0a3877b2288593c98a21ccb2cf29b74c581a4eb3af0"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-win32.whl", hash = "sha256:7df70907e00c970c60b9ef2938d894a9381f38e6b9db73c5be35e59d92e06625"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-win_amd64.whl", hash = "sha256:e55e40ff0cc8cc5c07996915ad367fa47da6b3fc091fdadca7f5403239c5fec3"}, - {file = "MarkupSafe-2.1.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a6e40afa7f45939ca356f348c8e23048e02cb109ced1eb8420961b2f40fb373a"}, - {file = "MarkupSafe-2.1.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cf877ab4ed6e302ec1d04952ca358b381a882fbd9d1b07cccbfd61783561f98a"}, - {file = "MarkupSafe-2.1.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:63ba06c9941e46fa389d389644e2d8225e0e3e5ebcc4ff1ea8506dce646f8c8a"}, - {file = "MarkupSafe-2.1.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f1cd098434e83e656abf198f103a8207a8187c0fc110306691a2e94a78d0abb2"}, - {file = "MarkupSafe-2.1.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:55f44b440d491028addb3b88f72207d71eeebfb7b5dbf0643f7c023ae1fba619"}, - {file = "MarkupSafe-2.1.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:a6f2fcca746e8d5910e18782f976489939d54a91f9411c32051b4aab2bd7c513"}, - {file = "MarkupSafe-2.1.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:0b462104ba25f1ac006fdab8b6a01ebbfbce9ed37fd37fd4acd70c67c973e460"}, - {file = "MarkupSafe-2.1.2-cp37-cp37m-win32.whl", hash = "sha256:7668b52e102d0ed87cb082380a7e2e1e78737ddecdde129acadb0eccc5423859"}, - {file = "MarkupSafe-2.1.2-cp37-cp37m-win_amd64.whl", hash = "sha256:6d6607f98fcf17e534162f0709aaad3ab7a96032723d8ac8750ffe17ae5a0666"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:a806db027852538d2ad7555b203300173dd1b77ba116de92da9afbc3a3be3eed"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a4abaec6ca3ad8660690236d11bfe28dfd707778e2442b45addd2f086d6ef094"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f03a532d7dee1bed20bc4884194a16160a2de9ffc6354b3878ec9682bb623c54"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4cf06cdc1dda95223e9d2d3c58d3b178aa5dacb35ee7e3bbac10e4e1faacb419"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:22731d79ed2eb25059ae3df1dfc9cb1546691cc41f4e3130fe6bfbc3ecbbecfa"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f8ffb705ffcf5ddd0e80b65ddf7bed7ee4f5a441ea7d3419e861a12eaf41af58"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8db032bf0ce9022a8e41a22598eefc802314e81b879ae093f36ce9ddf39ab1ba"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2298c859cfc5463f1b64bd55cb3e602528db6fa0f3cfd568d3605c50678f8f03"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-win32.whl", hash = "sha256:50c42830a633fa0cf9e7d27664637532791bfc31c731a87b202d2d8ac40c3ea2"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-win_amd64.whl", hash = "sha256:bb06feb762bade6bf3c8b844462274db0c76acc95c52abe8dbed28ae3d44a147"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:99625a92da8229df6d44335e6fcc558a5037dd0a760e11d84be2260e6f37002f"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8bca7e26c1dd751236cfb0c6c72d4ad61d986e9a41bbf76cb445f69488b2a2bd"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:40627dcf047dadb22cd25ea7ecfe9cbf3bbbad0482ee5920b582f3809c97654f"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:40dfd3fefbef579ee058f139733ac336312663c6706d1163b82b3003fb1925c4"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:090376d812fb6ac5f171e5938e82e7f2d7adc2b629101cec0db8b267815c85e2"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:2e7821bffe00aa6bd07a23913b7f4e01328c3d5cc0b40b36c0bd81d362faeb65"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:c0a33bc9f02c2b17c3ea382f91b4db0e6cde90b63b296422a939886a7a80de1c"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:b8526c6d437855442cdd3d87eede9c425c4445ea011ca38d937db299382e6fa3"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-win32.whl", hash = "sha256:137678c63c977754abe9086a3ec011e8fd985ab90631145dfb9294ad09c102a7"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:0576fe974b40a400449768941d5d0858cc624e3249dfd1e0c33674e5c7ca7aed"}, - {file = "MarkupSafe-2.1.2.tar.gz", hash = "sha256:abcabc8c2b26036d62d4c746381a6f7cf60aafcc653198ad678306986b09450d"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e09031c87a1e51556fdcb46e5bd4f59dfb743061cf93c4d6831bf894f125eb57"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68e78619a61ecf91e76aa3e6e8e33fc4894a2bebe93410754bd28fce0a8a4f9f"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:65c1a9bcdadc6c28eecee2c119465aebff8f7a584dd719facdd9e825ec61ab52"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:525808b8019e36eb524b8c68acdd63a37e75714eac50e988180b169d64480a00"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:962f82a3086483f5e5f64dbad880d31038b698494799b097bc59c2edf392fce6"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:aa7bd130efab1c280bed0f45501b7c8795f9fdbeb02e965371bbef3523627779"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c9c804664ebe8f83a211cace637506669e7890fec1b4195b505c214e50dd4eb7"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-win32.whl", hash = "sha256:10bbfe99883db80bdbaff2dcf681dfc6533a614f700da1287707e8a5d78a8431"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-win_amd64.whl", hash = "sha256:1577735524cdad32f9f694208aa75e422adba74f1baee7551620e43a3141f559"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ad9e82fb8f09ade1c3e1b996a6337afac2b8b9e365f926f5a61aacc71adc5b3c"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3c0fae6c3be832a0a0473ac912810b2877c8cb9d76ca48de1ed31e1c68386575"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b076b6226fb84157e3f7c971a47ff3a679d837cf338547532ab866c57930dbee"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bfce63a9e7834b12b87c64d6b155fdd9b3b96191b6bd334bf37db7ff1fe457f2"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:338ae27d6b8745585f87218a3f23f1512dbf52c26c28e322dbe54bcede54ccb9"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:df0be2b576a7abbf737b1575f048c23fb1d769f267ec4358296f31c2479db8f9"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ca379055a47383d02a5400cb0d110cef0a776fc644cda797db0c5696cfd7e18e"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:b7ff0f54cb4ff66dd38bebd335a38e2c22c41a8ee45aa608efc890ac3e3931bc"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c011a4149cfbcf9f03994ec2edffcb8b1dc2d2aede7ca243746df97a5d41ce48"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:56d9f2ecac662ca1611d183feb03a3fa4406469dafe241673d521dd5ae92a155"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-win32.whl", hash = "sha256:8758846a7e80910096950b67071243da3e5a20ed2546e6392603c096778d48e0"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-win_amd64.whl", hash = "sha256:787003c0ddb00500e49a10f2844fac87aa6ce977b90b0feaaf9de23c22508b24"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:2ef12179d3a291be237280175b542c07a36e7f60718296278d8593d21ca937d4"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2c1b19b3aaacc6e57b7e25710ff571c24d6c3613a45e905b1fde04d691b98ee0"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8afafd99945ead6e075b973fefa56379c5b5c53fd8937dad92c662da5d8fd5ee"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8c41976a29d078bb235fea9b2ecd3da465df42a562910f9022f1a03107bd02be"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d080e0a5eb2529460b30190fcfcc4199bd7f827663f858a226a81bc27beaa97e"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:69c0f17e9f5a7afdf2cc9fb2d1ce6aabdb3bafb7f38017c0b77862bcec2bbad8"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:504b320cd4b7eff6f968eddf81127112db685e81f7e36e75f9f84f0df46041c3"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:42de32b22b6b804f42c5d98be4f7e5e977ecdd9ee9b660fda1a3edf03b11792d"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-win32.whl", hash = "sha256:ceb01949af7121f9fc39f7d27f91be8546f3fb112c608bc4029aef0bab86a2a5"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-win_amd64.whl", hash = "sha256:1b40069d487e7edb2676d3fbdb2b0829ffa2cd63a2ec26c4938b2d34391b4ecc"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:282c2cb35b5b673bbcadb33a585408104df04f14b2d9b01d4c345a3b92861c2c"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ab4a0df41e7c16a1392727727e7998a467472d0ad65f3ad5e6e765015df08636"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7ef3cb2ebbf91e330e3bb937efada0edd9003683db6b57bb108c4001f37a02ea"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-win32.whl", hash = "sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-win_amd64.whl", hash = "sha256:3fd4abcb888d15a94f32b75d8fd18ee162ca0c064f35b11134be77050296d6ba"}, + {file = "MarkupSafe-2.1.3.tar.gz", hash = "sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad"}, ] [[package]] name = "maturin" version = "0.14.10" description = "Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -491,7 +498,6 @@ zig = ["ziglang (>=0.10.0,<0.11.0)"] name = "mdit-py-plugins" version = "0.3.5" description = "Collection of plugins for markdown-it-py" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -511,7 +517,6 @@ testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"] name = "mdurl" version = "0.1.2" description = "Markdown URL utilities" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -523,7 +528,6 @@ files = [ name = "mypy" version = "0.991" description = "Optional static typing for Python" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -574,7 +578,6 @@ reports = ["lxml"] name = "mypy-extensions" version = "1.0.0" description = "Type system extensions for programs checked with the mypy type checker." -category = "dev" optional = false python-versions = ">=3.5" files = [ @@ -586,7 +589,6 @@ files = [ name = "myst-parser" version = "1.0.0" description = "An extended [CommonMark](https://spec.commonmark.org/) compliant parser," -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -611,54 +613,50 @@ testing-docutils = ["pygments", "pytest (>=7,<8)", "pytest-param-files (>=0.3.4, [[package]] name = "packaging" -version = "23.1" +version = "23.2" description = "Core utilities for Python packages" -category = "dev" optional = false python-versions = ">=3.7" files = [ - {file = "packaging-23.1-py3-none-any.whl", hash = "sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61"}, - {file = "packaging-23.1.tar.gz", hash = "sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f"}, + {file = "packaging-23.2-py3-none-any.whl", hash = "sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7"}, + {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"}, ] [[package]] name = "pathspec" -version = "0.11.1" +version = "0.11.2" description = "Utility library for gitignore style pattern matching of file paths." -category = "dev" optional = false python-versions = ">=3.7" files = [ - {file = "pathspec-0.11.1-py3-none-any.whl", hash = "sha256:d8af70af76652554bd134c22b3e8a1cc46ed7d91edcdd721ef1a0c51a84a5293"}, - {file = "pathspec-0.11.1.tar.gz", hash = "sha256:2798de800fa92780e33acca925945e9a19a133b715067cf165b8866c15a31687"}, + {file = "pathspec-0.11.2-py3-none-any.whl", hash = "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20"}, + {file = "pathspec-0.11.2.tar.gz", hash = "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3"}, ] [[package]] name = "platformdirs" -version = "3.5.1" +version = "4.0.0" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." -category = "dev" optional = false python-versions = ">=3.7" files = [ - {file = "platformdirs-3.5.1-py3-none-any.whl", hash = "sha256:e2378146f1964972c03c085bb5662ae80b2b8c06226c54b2ff4aa9483e8a13a5"}, - {file = "platformdirs-3.5.1.tar.gz", hash = "sha256:412dae91f52a6f84830f39a8078cecd0e866cb72294a5c66808e74d5e88d251f"}, + {file = "platformdirs-4.0.0-py3-none-any.whl", hash = "sha256:118c954d7e949b35437270383a3f2531e99dd93cf7ce4dc8340d3356d30f173b"}, + {file = "platformdirs-4.0.0.tar.gz", hash = "sha256:cb633b2bcf10c51af60beb0ab06d2f1d69064b43abf4c185ca6b28865f3f9731"}, ] [package.extras] -docs = ["furo (>=2023.3.27)", "proselint (>=0.13)", "sphinx (>=6.2.1)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"] -test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.3.1)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"] +docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.1)", "sphinx-autodoc-typehints (>=1.24)"] +test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)"] [[package]] name = "pluggy" -version = "1.0.0" +version = "1.3.0" description = "plugin and hook calling mechanisms for python" -category = "dev" optional = false -python-versions = ">=3.6" +python-versions = ">=3.8" files = [ - {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"}, - {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, + {file = "pluggy-1.3.0-py3-none-any.whl", hash = "sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7"}, + {file = "pluggy-1.3.0.tar.gz", hash = "sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12"}, ] [package.extras] @@ -669,7 +667,6 @@ testing = ["pytest", "pytest-benchmark"] name = "pybip39" version = "0.1.0" description = "Python binding to tiny-bip39, the Rust case conversion library" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -693,24 +690,23 @@ files = [ [[package]] name = "pygments" -version = "2.15.1" +version = "2.17.2" description = "Pygments is a syntax highlighting package written in Python." -category = "dev" optional = false python-versions = ">=3.7" files = [ - {file = "Pygments-2.15.1-py3-none-any.whl", hash = "sha256:db2db3deb4b4179f399a09054b023b6a586b76499d36965813c71aa8ed7b5fd1"}, - {file = "Pygments-2.15.1.tar.gz", hash = "sha256:8ace4d3c1dd481894b2005f560ead0f9f19ee64fe983366be1a21e171d12775c"}, + {file = "pygments-2.17.2-py3-none-any.whl", hash = "sha256:b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c"}, + {file = "pygments-2.17.2.tar.gz", hash = "sha256:da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367"}, ] [package.extras] plugins = ["importlib-metadata"] +windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pytest" version = "7.2.1" description = "pytest: simple powerful testing with Python" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -734,7 +730,6 @@ testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2. name = "pytest-asyncio" version = "0.20.3" description = "Pytest support for asyncio" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -751,71 +746,78 @@ testing = ["coverage (>=6.2)", "flaky (>=3.5.0)", "hypothesis (>=5.7.1)", "mypy [[package]] name = "pytz" -version = "2023.3" +version = "2023.3.post1" description = "World timezone definitions, modern and historical" -category = "dev" optional = false python-versions = "*" files = [ - {file = "pytz-2023.3-py2.py3-none-any.whl", hash = "sha256:a151b3abb88eda1d4e34a9814df37de2a80e301e68ba0fd856fb9b46bfbbbffb"}, - {file = "pytz-2023.3.tar.gz", hash = "sha256:1d8ce29db189191fb55338ee6d0387d82ab59f3d00eac103412d64e0ebd0c588"}, + {file = "pytz-2023.3.post1-py2.py3-none-any.whl", hash = "sha256:ce42d816b81b68506614c11e8937d3aa9e41007ceb50bfdcb0749b921bf646c7"}, + {file = "pytz-2023.3.post1.tar.gz", hash = "sha256:7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b"}, ] [[package]] name = "pyyaml" -version = "6.0" +version = "6.0.1" description = "YAML parser and emitter for Python" -category = "dev" optional = false python-versions = ">=3.6" files = [ - {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, - {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, - {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, - {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, - {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"}, - {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"}, - {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"}, - {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"}, - {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"}, - {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"}, - {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"}, - {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"}, - {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"}, - {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"}, - {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"}, - {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"}, - {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"}, - {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"}, - {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"}, - {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"}, - {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"}, - {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, - {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, + {file = "PyYAML-6.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a"}, + {file = "PyYAML-6.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, + {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, + {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, + {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, + {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, + {file = "PyYAML-6.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, + {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, + {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, + {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, + {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, + {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, + {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, + {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd"}, + {file = "PyYAML-6.0.1-cp36-cp36m-win32.whl", hash = "sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585"}, + {file = "PyYAML-6.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa"}, + {file = "PyYAML-6.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3"}, + {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27"}, + {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3"}, + {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c"}, + {file = "PyYAML-6.0.1-cp37-cp37m-win32.whl", hash = "sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba"}, + {file = "PyYAML-6.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867"}, + {file = "PyYAML-6.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, + {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, + {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, + {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, + {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, + {file = "PyYAML-6.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, + {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, + {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, + {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, + {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, ] [[package]] name = "requests" version = "2.31.0" description = "Python HTTP for Humans." -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -835,35 +837,50 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] [[package]] name = "ruff" -version = "0.0.226" -description = "An extremely fast Python linter, written in Rust." -category = "dev" +version = "0.1.6" +description = "An extremely fast Python linter and code formatter, written in Rust." optional = false python-versions = ">=3.7" files = [ - {file = "ruff-0.0.226-py3-none-macosx_10_7_x86_64.whl", hash = "sha256:199afcebc851350f4ab87987c83b1bf489510210700742e15fb129b4750d889a"}, - {file = "ruff-0.0.226-py3-none-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:1baa384e94c42de9750b6e381807ca63c7572a3d283c98344a8347b93a17045d"}, - {file = "ruff-0.0.226-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:80856915feed3786f16cd29a6af32f3e1527b5b16931d92bac01c12400ecc4fe"}, - {file = "ruff-0.0.226-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ebb106e359bd4a686d370ee5726fca7e92ecdfee61611a50e3f4214751829330"}, - {file = "ruff-0.0.226-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:22bb40dc76cff2460efd7d1e81f0604d8905a4e442e45ea7e95ca994a258b84a"}, - {file = "ruff-0.0.226-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:de5089659d977901d7798e4bc67533c208e2be1360799d67df9f55c1e2ce5336"}, - {file = "ruff-0.0.226-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c7bb7f88d6aa0b6525603069949d21faeacd775b83e0d6303bc9dafe133275f7"}, - {file = "ruff-0.0.226-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:32194ee22fc24c54ea5c9d05eaf3991bb6bc1f1ecbfb9372caba3e465b6e0834"}, - {file = "ruff-0.0.226-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:04130c170e2da762b5510ac73683ed80701d7b5efb8124228b374eba78eb465f"}, - {file = "ruff-0.0.226-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:e5c364352ff8fc5d01d0416bed2e38f1b094d0efcff3d4fd18f8825aa69c8d49"}, - {file = "ruff-0.0.226-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:f729a4f68f2f50538b03d4ad6ad753a895ce9256fa8c262bac374a85500ca82f"}, - {file = "ruff-0.0.226-py3-none-musllinux_1_2_i686.whl", hash = "sha256:275b3555662554253b319984380f70e3aa1f42cb2d074b33e4537bf672e83e3a"}, - {file = "ruff-0.0.226-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:5c8cb58c721a35cbd05342943eed14399eae2184c425d39220e4eff2e741aecc"}, - {file = "ruff-0.0.226-py3-none-win32.whl", hash = "sha256:cecc2c291660e5064704e51792c7ef084afcfbb124dc473936b5c233cf21aad3"}, - {file = "ruff-0.0.226-py3-none-win_amd64.whl", hash = "sha256:bd9182fff882e14687eab0997b55b5edbf692a4e17a88902a1404058b142804a"}, - {file = "ruff-0.0.226.tar.gz", hash = "sha256:988334f0ff4a80ef91faf46f447f10292b757f1eb94f5f9cf5d1eef400142c33"}, + {file = "ruff-0.1.6-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:88b8cdf6abf98130991cbc9f6438f35f6e8d41a02622cc5ee130a02a0ed28703"}, + {file = "ruff-0.1.6-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:5c549ed437680b6105a1299d2cd30e4964211606eeb48a0ff7a93ef70b902248"}, + {file = "ruff-0.1.6-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1cf5f701062e294f2167e66d11b092bba7af6a057668ed618a9253e1e90cfd76"}, + {file = "ruff-0.1.6-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:05991ee20d4ac4bb78385360c684e4b417edd971030ab12a4fbd075ff535050e"}, + {file = "ruff-0.1.6-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:87455a0c1f739b3c069e2f4c43b66479a54dea0276dd5d4d67b091265f6fd1dc"}, + {file = "ruff-0.1.6-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:683aa5bdda5a48cb8266fcde8eea2a6af4e5700a392c56ea5fb5f0d4bfdc0240"}, + {file = "ruff-0.1.6-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:137852105586dcbf80c1717facb6781555c4e99f520c9c827bd414fac67ddfb6"}, + {file = "ruff-0.1.6-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:bd98138a98d48a1c36c394fd6b84cd943ac92a08278aa8ac8c0fdefcf7138f35"}, + {file = "ruff-0.1.6-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a0cd909d25f227ac5c36d4e7e681577275fb74ba3b11d288aff7ec47e3ae745"}, + {file = "ruff-0.1.6-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:e8fd1c62a47aa88a02707b5dd20c5ff20d035d634aa74826b42a1da77861b5ff"}, + {file = "ruff-0.1.6-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:fd89b45d374935829134a082617954120d7a1470a9f0ec0e7f3ead983edc48cc"}, + {file = "ruff-0.1.6-py3-none-musllinux_1_2_i686.whl", hash = "sha256:491262006e92f825b145cd1e52948073c56560243b55fb3b4ecb142f6f0e9543"}, + {file = "ruff-0.1.6-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:ea284789861b8b5ca9d5443591a92a397ac183d4351882ab52f6296b4fdd5462"}, + {file = "ruff-0.1.6-py3-none-win32.whl", hash = "sha256:1610e14750826dfc207ccbcdd7331b6bd285607d4181df9c1c6ae26646d6848a"}, + {file = "ruff-0.1.6-py3-none-win_amd64.whl", hash = "sha256:4558b3e178145491e9bc3b2ee3c4b42f19d19384eaa5c59d10acf6e8f8b57e33"}, + {file = "ruff-0.1.6-py3-none-win_arm64.whl", hash = "sha256:03910e81df0d8db0e30050725a5802441c2022ea3ae4fe0609b76081731accbc"}, + {file = "ruff-0.1.6.tar.gz", hash = "sha256:1b09f29b16c6ead5ea6b097ef2764b42372aebe363722f1605ecbcd2b9207184"}, ] +[[package]] +name = "setuptools" +version = "69.0.2" +description = "Easily download, build, install, upgrade, and uninstall Python packages" +optional = false +python-versions = ">=3.8" +files = [ + {file = "setuptools-69.0.2-py3-none-any.whl", hash = "sha256:1e8fdff6797d3865f37397be788a4e3cba233608e9b509382a2777d25ebde7f2"}, + {file = "setuptools-69.0.2.tar.gz", hash = "sha256:735896e78a4742605974de002ac60562d286fa8051a7e2299445e8e8fbb01aa6"}, +] + +[package.extras] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"] +testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-ruff", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] +testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "packaging (>=23.1)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"] + [[package]] name = "snowballstemmer" version = "2.2.0" description = "This package provides 29 stemmers for 28 languages generated from Snowball algorithms." -category = "dev" optional = false python-versions = "*" files = [ @@ -875,7 +892,6 @@ files = [ name = "sphinx" version = "6.2.1" description = "Python documentation generator" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -911,7 +927,6 @@ test = ["cython", "filelock", "html5lib", "pytest (>=4.6)"] name = "sphinx-rtd-theme" version = "1.2.0" description = "Read the Docs theme for Sphinx" -category = "dev" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7" files = [ @@ -931,7 +946,6 @@ dev = ["bump2version", "sphinxcontrib-httpdomain", "transifex-client", "wheel"] name = "sphinxcontrib-applehelp" version = "1.0.4" description = "sphinxcontrib-applehelp is a Sphinx extension which outputs Apple help books" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -947,7 +961,6 @@ test = ["pytest"] name = "sphinxcontrib-devhelp" version = "1.0.2" description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document." -category = "dev" optional = false python-versions = ">=3.5" files = [ @@ -963,7 +976,6 @@ test = ["pytest"] name = "sphinxcontrib-htmlhelp" version = "2.0.1" description = "sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -979,7 +991,6 @@ test = ["html5lib", "pytest"] name = "sphinxcontrib-jquery" version = "4.1" description = "Extension to include jQuery on newer Sphinx releases" -category = "dev" optional = false python-versions = ">=2.7" files = [ @@ -994,7 +1005,6 @@ Sphinx = ">=1.8" name = "sphinxcontrib-jsmath" version = "1.0.1" description = "A sphinx extension which renders display math in HTML via JavaScript" -category = "dev" optional = false python-versions = ">=3.5" files = [ @@ -1009,7 +1019,6 @@ test = ["flake8", "mypy", "pytest"] name = "sphinxcontrib-qthelp" version = "1.0.3" description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document." -category = "dev" optional = false python-versions = ">=3.5" files = [ @@ -1025,7 +1034,6 @@ test = ["pytest"] name = "sphinxcontrib-serializinghtml" version = "1.1.5" description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)." -category = "dev" optional = false python-versions = ">=3.5" files = [ @@ -1041,7 +1049,6 @@ test = ["pytest"] name = "tomli" version = "2.0.1" description = "A lil' TOML parser" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -1051,51 +1058,47 @@ files = [ [[package]] name = "typing-extensions" -version = "4.6.2" -description = "Backported and Experimental Type Hints for Python 3.7+" -category = "dev" +version = "4.8.0" +description = "Backported and Experimental Type Hints for Python 3.8+" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "typing_extensions-4.6.2-py3-none-any.whl", hash = "sha256:3a8b36f13dd5fdc5d1b16fe317f5668545de77fa0b8e02006381fd49d731ab98"}, - {file = "typing_extensions-4.6.2.tar.gz", hash = "sha256:06006244c70ac8ee83fa8282cb188f697b8db25bc8b4df07be1873c43897060c"}, + {file = "typing_extensions-4.8.0-py3-none-any.whl", hash = "sha256:8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0"}, + {file = "typing_extensions-4.8.0.tar.gz", hash = "sha256:df8e4339e9cb77357558cbdbceca33c303714cf861d1eef15e1070055ae8b7ef"}, ] [[package]] name = "urllib3" -version = "2.0.2" +version = "2.1.0" description = "HTTP library with thread-safe connection pooling, file post, and more." -category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "urllib3-2.0.2-py3-none-any.whl", hash = "sha256:d055c2f9d38dc53c808f6fdc8eab7360b6fdbbde02340ed25cfbcd817c62469e"}, - {file = "urllib3-2.0.2.tar.gz", hash = "sha256:61717a1095d7e155cdb737ac7bb2f4324a858a1e2e6466f6d03ff630ca68d3cc"}, + {file = "urllib3-2.1.0-py3-none-any.whl", hash = "sha256:55901e917a5896a349ff771be919f8bd99aff50b79fe58fec595eb37bbc56bb3"}, + {file = "urllib3-2.1.0.tar.gz", hash = "sha256:df7aa8afb0148fa78488e7899b2c59b5f4ffcfa82e6c54ccb9dd37c1d7b52d54"}, ] [package.extras] brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)"] -secure = ["certifi", "cryptography (>=1.9)", "idna (>=2.0.0)", "pyopenssl (>=17.1.0)", "urllib3-secure-extra"] socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"] zstd = ["zstandard (>=0.18.0)"] [[package]] name = "zipp" -version = "3.15.0" +version = "3.17.0" description = "Backport of pathlib-compatible object wrapper for zip files" -category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "zipp-3.15.0-py3-none-any.whl", hash = "sha256:48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556"}, - {file = "zipp-3.15.0.tar.gz", hash = "sha256:112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b"}, + {file = "zipp-3.17.0-py3-none-any.whl", hash = "sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31"}, + {file = "zipp-3.17.0.tar.gz", hash = "sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0"}, ] [package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"] +testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy (>=0.9.1)", "pytest-ruff"] [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "b75783919df3f8b3f1f8c66bf54149778006d3917a505ac7c4d429cb3ed0693b" +content-hash = "de66b41ddf137a1824210a63b90715412423153681ec8e67dac2b9e9d9e477e8" diff --git a/pyproject.toml b/pyproject.toml index 7f958ab0..2f2b5640 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ pybip39 = "0.1.0" based58 = "0.1.1" bumpversion = "0.6.0" "jsonalias" = "0.1.1" -ruff = "0.0.226" +ruff = "0.1.6" black = "22.12.0" mypy = "0.991" pytest = "7.2.1" From 3917785714693b90a6f2174d70aafbdd6db5f196 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Sat, 25 Nov 2023 14:40:23 +0400 Subject: [PATCH 09/15] don't include bankrun on linux-i686 --- .github/workflows/build.yml | 40 +++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 24311542..eb03ba86 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -101,12 +101,8 @@ jobs: name: wheels path: dist - linux: + linux-x86_64: runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - target: [x86_64, i686] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 @@ -122,7 +118,7 @@ jobs: - name: Build Wheels uses: messense/maturin-action@v1 with: - target: ${{ matrix.target }} + target: x86_64 manylinux: auto args: --release --out dist maturin-version: ${{ env.maturin_version }} @@ -138,6 +134,38 @@ jobs: name: wheels path: dist + linux-i686: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: ${{ env.python_version }} + architecture: x64 + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: nightly + profile: minimal + default: true + - name: Build Wheels + uses: messense/maturin-action@v1 + with: + target: i686 + manylinux: auto + args: --release --no-default-features --out dist + maturin-version: ${{ env.maturin_version }} + - name: Install built wheel + run: | + pip install pytest pytest-asyncio based58 pybip39 typing-extensions jsonalias + pip install ${{ env.name }} --no-index --no-dependencies --find-links dist --force-reinstall + pytest + - name: Upload wheels + uses: actions/upload-artifact@v2 + with: + name: wheels + path: dist + musllinux-x86_64: runs-on: ubuntu-latest steps: From a6af7dc2caca570b414c4239063538a20f591ddb Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Sat, 25 Nov 2023 14:43:15 +0400 Subject: [PATCH 10/15] don't include bankrun on linux armv7 --- .github/workflows/build.yml | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eb03ba86..2b2a26ec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -232,12 +232,8 @@ jobs: name: wheels path: dist - linux-cross-bankrun: + linux-aarch64: runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - target: [aarch64, armv7] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 @@ -252,7 +248,7 @@ jobs: - name: Build Wheels uses: messense/maturin-action@v1 with: - target: ${{ matrix.target }} + target: aarch64 manylinux: auto args: --release --out dist maturin-version: ${{ env.maturin_version }} @@ -262,6 +258,32 @@ jobs: name: wheels path: dist + linux-armv7: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: ${{ env.python_version }} + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: nightly + profile: minimal + default: true + - name: Build Wheels + uses: messense/maturin-action@v1 + with: + target: armv7 + manylinux: auto + args: --release --no-default-features --out dist + maturin-version: ${{ env.maturin_version }} + - name: Upload wheels + uses: actions/upload-artifact@v2 + with: + name: wheels + path: dist + sdist: runs-on: ubuntu-latest steps: From 4e475d6582ef5c3cb30826f1bcdc0dc49ef99601 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Sat, 25 Nov 2023 15:03:25 +0400 Subject: [PATCH 11/15] update maturin --- poetry.lock | 30 +++++++++++++++--------------- pyproject.toml | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/poetry.lock b/poetry.lock index 76d8c863..6a916ce6 100644 --- a/poetry.lock +++ b/poetry.lock @@ -467,24 +467,24 @@ files = [ [[package]] name = "maturin" -version = "0.14.10" +version = "1.3.2" description = "Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages" optional = false python-versions = ">=3.7" files = [ - {file = "maturin-0.14.10-py3-none-linux_armv6l.whl", hash = "sha256:ec8269c02cc435893308dfd50f57f14fb1be3554e4e61c5bf49b97363b289775"}, - {file = "maturin-0.14.10-py3-none-macosx_10_7_x86_64.whl", hash = "sha256:e9c19dc0a28109280f7d091ca7b78e25f3fc340fcfac92801829a21198fa20eb"}, - {file = "maturin-0.14.10-py3-none-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:cf950ebfe449a97617b91d75e09766509e21a389ce3f7b6ef15130ad8a95430a"}, - {file = "maturin-0.14.10-py3-none-manylinux_2_12_i686.manylinux2010_i686.musllinux_1_1_i686.whl", hash = "sha256:c0d25e82cb6e5de9f1c028fcf069784be4165b083e79412371edce05010b68f3"}, - {file = "maturin-0.14.10-py3-none-manylinux_2_12_x86_64.manylinux2010_x86_64.musllinux_1_1_x86_64.whl", hash = "sha256:9da98bee0a548ecaaa924cc8cb94e49075d5e71511c62a1633a6962c7831a29b"}, - {file = "maturin-0.14.10-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl", hash = "sha256:2f097a63f3bed20a7da56fc7ce4d44ef8376ee9870604da16b685f2d02c87c79"}, - {file = "maturin-0.14.10-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l.whl", hash = "sha256:4946ad7545ba5fc0ad08bc98bc8e9f6ffabb6ded71db9ed282ad4596b998d42a"}, - {file = "maturin-0.14.10-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.musllinux_1_1_ppc64le.whl", hash = "sha256:98bfed21c3498857b3381efeb041d77e004a93b22261bf9690fe2b9fbb4c210f"}, - {file = "maturin-0.14.10-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b157e2e8a0216d02df1d0451201fcb977baf0dcd223890abfbfbfd01e0b44630"}, - {file = "maturin-0.14.10-py3-none-win32.whl", hash = "sha256:5abf311d4618b673efa30cacdac5ae2d462e49da58db9a5bf0d8bde16d9c16be"}, - {file = "maturin-0.14.10-py3-none-win_amd64.whl", hash = "sha256:11b8550ceba5b81465a18d06f0d3a4cfc1cd6cbf68eda117c253bbf3324b1264"}, - {file = "maturin-0.14.10-py3-none-win_arm64.whl", hash = "sha256:6cc9afb89f28bd591b62f8f3c29736c81c322cffe88f9ab8eb1749377bbc3521"}, - {file = "maturin-0.14.10.tar.gz", hash = "sha256:895c48cbe56ae994c2a1eeeef19475ca4819aa4c6412af727a63a772e8ef2d87"}, + {file = "maturin-1.3.2-py3-none-linux_armv6l.whl", hash = "sha256:34630f6a6223e36198b6039e40724fe27f6465ea892531ac82eeff604cfcbbb0"}, + {file = "maturin-1.3.2-py3-none-macosx_10_7_x86_64.whl", hash = "sha256:61b9dc290663040df4c837aa9e1858d485aaf90a10ec31b822f1d92a85334e2c"}, + {file = "maturin-1.3.2-py3-none-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:5a133d22fa1ad4b687f6a89801cd7a9247164270c2ae639d1b7f53f0701601ab"}, + {file = "maturin-1.3.2-py3-none-manylinux_2_12_i686.manylinux2010_i686.musllinux_1_1_i686.whl", hash = "sha256:1258d380498924626cd87820ff54eeb16b662799ddda10631f54fdfbab780d6a"}, + {file = "maturin-1.3.2-py3-none-manylinux_2_12_x86_64.manylinux2010_x86_64.musllinux_1_1_x86_64.whl", hash = "sha256:8c90336c9bb0cb538bb035f9e5728ab59148c87bb8e76df26359560f8580fef4"}, + {file = "maturin-1.3.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl", hash = "sha256:d4b66635e3933709a67760e886931b087089e484e441b1b6be358da474947cea"}, + {file = "maturin-1.3.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l.whl", hash = "sha256:4b9cc75d7912b1c0512d4ea9dd66b8b401cbc11c69e32a23215b10a9f2bccdf4"}, + {file = "maturin-1.3.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.musllinux_1_1_ppc64le.whl", hash = "sha256:b0b408fb55a7ce037562c44321ab40e2cee0f670b335de44b3b39c2334a0aea1"}, + {file = "maturin-1.3.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a469deffd61dc36ceafa0a74a437f39556c4f3c909d2eeb221b2ef2ca594469f"}, + {file = "maturin-1.3.2-py3-none-win32.whl", hash = "sha256:b67c51d5330d73da03726a4579c56404dc300603709e3f6e8945cc6e3550f885"}, + {file = "maturin-1.3.2-py3-none-win_amd64.whl", hash = "sha256:84d5587d2c0168d6cce0bcf720e62f2b7c87f2a9a9f749bcc7b86bc088a32c93"}, + {file = "maturin-1.3.2-py3-none-win_arm64.whl", hash = "sha256:ff0023a21df192a736726ad9fe55fb083f153d6287832d0add4861dfb35a8e83"}, + {file = "maturin-1.3.2.tar.gz", hash = "sha256:952d458b3dea01e9670582ac2dff3c522a34e491f08ed6376b270655a68c24af"}, ] [package.dependencies] @@ -1101,4 +1101,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "de66b41ddf137a1824210a63b90715412423153681ec8e67dac2b9e9d9e477e8" +content-hash = "80490348fd4f6aa1d3007430c6af8c03522492080c14fddb641feede2d729975" diff --git a/pyproject.toml b/pyproject.toml index 2f2b5640..d4652f2e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ python = "^3.8" [tool.poetry.group.dev.dependencies] sphinx = "6.2.1" sphinx-rtd-theme = "1.2.0" -maturin = "0.14.10" +maturin = "1.3.2" pybip39 = "0.1.0" based58 = "0.1.1" bumpversion = "0.6.0" @@ -24,7 +24,7 @@ pytest-asyncio = "^0.20.3" myst-parser = "^1.0.0" [build-system] -requires = ["maturin>=0.13.2,<0.14"] +requires = ["maturin>=1.3.2,<1.4"] build-backend = "maturin" From 6a056a8f312910bd161bebbdeefc9e4b223ecb89 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Sat, 25 Nov 2023 15:03:49 +0400 Subject: [PATCH 12/15] skip installation step for linux-i686 --- .github/workflows/build.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2b2a26ec..4b9cf99c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -155,11 +155,6 @@ jobs: manylinux: auto args: --release --no-default-features --out dist maturin-version: ${{ env.maturin_version }} - - name: Install built wheel - run: | - pip install pytest pytest-asyncio based58 pybip39 typing-extensions jsonalias - pip install ${{ env.name }} --no-index --no-dependencies --find-links dist --force-reinstall - pytest - name: Upload wheels uses: actions/upload-artifact@v2 with: From 066f89ba885239faaa038b1b793d04ab03f584dc Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Sat, 25 Nov 2023 15:53:42 +0400 Subject: [PATCH 13/15] replace black with ruff format --- Makefile | 2 +- README.md | 1 - poetry.lock | 77 +-------------------------------- pyproject.toml | 3 +- tests/test_versioned_message.py | 1 - 5 files changed, 3 insertions(+), 81 deletions(-) diff --git a/Makefile b/Makefile index c515252e..93aecee3 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ lint: cargo clippy --no-default-features && cargo clippy && ruff python tests && mypy . fmt: - cargo fmt && black . + cargo fmt && ruff format python tests. serve: python -m http.server -d docs/_build/html diff --git a/README.md b/README.md index 2b7f697b..90a66783 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@ Status](https://github.com/kevinheavey/solders/workflows/CI/badge.svg)](https://github.com/kevinheavey/solders/actions?query=workflow%3ACI) [![PyPI version](https://badge.fury.io/py/solders.svg)](https://badge.fury.io/py/solders) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/kevinheavey/solders/blob/main/LICENSE) -[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) # Solders diff --git a/poetry.lock b/poetry.lock index 6a916ce6..843b4ad9 100644 --- a/poetry.lock +++ b/poetry.lock @@ -72,41 +72,6 @@ files = [ {file = "based58-0.1.1.tar.gz", hash = "sha256:80804b346b34196c89dc7a3dc89b6021f910f4cd75aac41d433ca1880b1672dc"}, ] -[[package]] -name = "black" -version = "22.12.0" -description = "The uncompromising code formatter." -optional = false -python-versions = ">=3.7" -files = [ - {file = "black-22.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9eedd20838bd5d75b80c9f5487dbcb06836a43833a37846cf1d8c1cc01cef59d"}, - {file = "black-22.12.0-cp310-cp310-win_amd64.whl", hash = "sha256:159a46a4947f73387b4d83e87ea006dbb2337eab6c879620a3ba52699b1f4351"}, - {file = "black-22.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d30b212bffeb1e252b31dd269dfae69dd17e06d92b87ad26e23890f3efea366f"}, - {file = "black-22.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:7412e75863aa5c5411886804678b7d083c7c28421210180d67dfd8cf1221e1f4"}, - {file = "black-22.12.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c116eed0efb9ff870ded8b62fe9f28dd61ef6e9ddd28d83d7d264a38417dcee2"}, - {file = "black-22.12.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1f58cbe16dfe8c12b7434e50ff889fa479072096d79f0a7f25e4ab8e94cd8350"}, - {file = "black-22.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77d86c9f3db9b1bf6761244bc0b3572a546f5fe37917a044e02f3166d5aafa7d"}, - {file = "black-22.12.0-cp38-cp38-win_amd64.whl", hash = "sha256:82d9fe8fee3401e02e79767016b4907820a7dc28d70d137eb397b92ef3cc5bfc"}, - {file = "black-22.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:101c69b23df9b44247bd88e1d7e90154336ac4992502d4197bdac35dd7ee3320"}, - {file = "black-22.12.0-cp39-cp39-win_amd64.whl", hash = "sha256:559c7a1ba9a006226f09e4916060982fd27334ae1998e7a38b3f33a37f7a2148"}, - {file = "black-22.12.0-py3-none-any.whl", hash = "sha256:436cc9167dd28040ad90d3b404aec22cedf24a6e4d7de221bec2730ec0c97bcf"}, - {file = "black-22.12.0.tar.gz", hash = "sha256:229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f"}, -] - -[package.dependencies] -click = ">=8.0.0" -mypy-extensions = ">=0.4.3" -pathspec = ">=0.9.0" -platformdirs = ">=2" -tomli = {version = ">=1.1.0", markers = "python_full_version < \"3.11.0a7\""} -typing-extensions = {version = ">=3.10.0.0", markers = "python_version < \"3.10\""} - -[package.extras] -colorama = ["colorama (>=0.4.3)"] -d = ["aiohttp (>=3.7.4)"] -jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"] -uvloop = ["uvloop (>=0.15.2)"] - [[package]] name = "bump2version" version = "1.0.1" @@ -242,20 +207,6 @@ files = [ {file = "charset_normalizer-3.3.2-py3-none-any.whl", hash = "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc"}, ] -[[package]] -name = "click" -version = "8.1.7" -description = "Composable command line interface toolkit" -optional = false -python-versions = ">=3.7" -files = [ - {file = "click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"}, - {file = "click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"}, -] - -[package.dependencies] -colorama = {version = "*", markers = "platform_system == \"Windows\""} - [[package]] name = "colorama" version = "0.4.6" @@ -622,32 +573,6 @@ files = [ {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"}, ] -[[package]] -name = "pathspec" -version = "0.11.2" -description = "Utility library for gitignore style pattern matching of file paths." -optional = false -python-versions = ">=3.7" -files = [ - {file = "pathspec-0.11.2-py3-none-any.whl", hash = "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20"}, - {file = "pathspec-0.11.2.tar.gz", hash = "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3"}, -] - -[[package]] -name = "platformdirs" -version = "4.0.0" -description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." -optional = false -python-versions = ">=3.7" -files = [ - {file = "platformdirs-4.0.0-py3-none-any.whl", hash = "sha256:118c954d7e949b35437270383a3f2531e99dd93cf7ce4dc8340d3356d30f173b"}, - {file = "platformdirs-4.0.0.tar.gz", hash = "sha256:cb633b2bcf10c51af60beb0ab06d2f1d69064b43abf4c185ca6b28865f3f9731"}, -] - -[package.extras] -docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.1)", "sphinx-autodoc-typehints (>=1.24)"] -test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)"] - [[package]] name = "pluggy" version = "1.3.0" @@ -1101,4 +1026,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "80490348fd4f6aa1d3007430c6af8c03522492080c14fddb641feede2d729975" +content-hash = "31e801002de89ed6321d745d62e5b519def98466c534666734f1338a74f44cf3" diff --git a/pyproject.toml b/pyproject.toml index d4652f2e..abe450b6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,6 @@ based58 = "0.1.1" bumpversion = "0.6.0" "jsonalias" = "0.1.1" ruff = "0.1.6" -black = "22.12.0" mypy = "0.991" pytest = "7.2.1" pytest-asyncio = "^0.20.3" @@ -55,7 +54,7 @@ python-source = "python" reportMissingModuleSource = false [tool.ruff] -line-length = 120 +line-length = 88 select = ["A", "B", "D", "E", "F", "I", "ARG", "BLE", "C4", "SIM", "PLC", "PLE", "PLR", "PLW", "RUF"] ignore = ["D203", "PLR0913"] diff --git a/tests/test_versioned_message.py b/tests/test_versioned_message.py index d6c9e112..5d67f2a2 100644 --- a/tests/test_versioned_message.py +++ b/tests/test_versioned_message.py @@ -169,7 +169,6 @@ def test_sanitize_with_empty_table_lookup( def test_sanitize_with_max_account_keys( default_header_with_one_req_signature: MessageHeader, default_message: MessageV0 ) -> None: - MessageV0( header=default_header_with_one_req_signature, account_keys=[Pubkey.new_unique() for i in range(256)], From 45277a9f23bf0cf423a02da61cce3330388a16c5 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Sat, 25 Nov 2023 15:55:05 +0400 Subject: [PATCH 14/15] update changelog entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f952321..3eb0ec18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ ### Changed - Use PyO3 v0.19.2 [(#64)](https://github.com/kevinheavey/solders/pull/64) -- Upgrade to Solana 1.17.2 [(#65)](https://github.com/kevinheavey/solders/pull/65) +- Upgrade to Solana 1.17.6 [(#65)](https://github.com/kevinheavey/solders/pull/65) ## [0.19.0] - 2023-07-31 From 34553fc509651a2884033257c5d96d74f883305f Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Sat, 25 Nov 2023 16:00:03 +0400 Subject: [PATCH 15/15] ifx lint --- python/solders/system_program.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/solders/system_program.py b/python/solders/system_program.py index 0db95aa3..7104bf3e 100644 --- a/python/solders/system_program.py +++ b/python/solders/system_program.py @@ -138,7 +138,7 @@ def create_account_with_seed(params: CreateAccountWithSeedParams) -> Instruction Returns: Instruction: The instruction to create the account. - """ + """ # noqa: E501 return _create_account_with_seed(dict(params))