From 61c124acf0eaaad7bf6b1c0ec40dd73ef8a57aa7 Mon Sep 17 00:00:00 2001 From: sigaloid <69441971+sigaloid@users.noreply.github.com> Date: Tue, 24 Aug 2021 10:23:41 -0400 Subject: [PATCH] Cargo format, update, clippy fix, fix (#228) * Cargo fmt * Cargo update * cargo +nightly clippy --fix -Z unstable-options * Cargo fix --- rust/Cargo.lock | 699 +++++++++--------- rust/auction/cli/src/main.rs | 20 +- .../program/src/processor/redeem_bid.rs | 2 +- .../token-metadata/program/src/instruction.rs | 13 +- rust/token-metadata/program/src/processor.rs | 20 +- rust/token-metadata/program/src/state.rs | 2 +- rust/token-metadata/program/src/utils.rs | 13 +- .../program/tests/utils/edition_marker.rs | 2 +- rust/token-metadata/test/src/main.rs | 65 +- rust/token-vault/program/src/processor.rs | 10 +- rust/token-vault/program/src/utils.rs | 8 +- rust/token-vault/test/src/main.rs | 20 +- 12 files changed, 443 insertions(+), 431 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index ab7ce4d..99850ef 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -14,9 +14,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.14.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" +checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" dependencies = [ "gimli", ] @@ -59,9 +59,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" +checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf" [[package]] name = "arrayref" @@ -89,13 +89,13 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-trait" -version = "0.1.50" +version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" +checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", ] [[package]] @@ -117,11 +117,12 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.57" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ed203b9ba68b242c62b3fb7480f589dd49829be1edb3fe8fc8b4ffda2dcb8d" +checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01" dependencies = [ "addr2line", + "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", @@ -165,9 +166,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "blake3" @@ -228,7 +229,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18dda7dc709193c0d86a1a51050a926dc3df1cf262ec46a23a25dba421ea1924" dependencies = [ "borsh-derive", - "hashbrown", + "hashbrown 0.9.1", ] [[package]] @@ -239,9 +240,9 @@ checksum = "684155372435f578c0fa1acd13ebbb182cc19d6b38b64ae7901da4393217d264" dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", - "proc-macro-crate", - "proc-macro2 1.0.27", - "syn 1.0.72", + "proc-macro-crate 0.1.5", + "proc-macro2 1.0.28", + "syn 1.0.74", ] [[package]] @@ -250,9 +251,9 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2102f62f8b6d3edeab871830782285b64cc1830168094db05c8e458f209bc5c3" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", ] [[package]] @@ -261,9 +262,9 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "196c978c4c9b0b142d446ef3240690bf5a8a33497074a113ff9a337ccb750483" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", ] [[package]] @@ -335,9 +336,9 @@ dependencies = [ [[package]] name = "bzip2-sys" -version = "0.1.10+1.0.8" +version = "0.1.11+1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17fa3d1ac1ca21c5c4e36a97f3c3eb25084576f6fc47bf0139c1123434216c6c" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" dependencies = [ "cc", "libc", @@ -346,9 +347,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" +checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" dependencies = [ "jobserver", ] @@ -481,9 +482,9 @@ checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" [[package]] name = "cpufeatures" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed00c67cb5d0a7d64a44f6ad2668db7e7530311dd53ea79bcd4fb022c64911c8" +checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" dependencies = [ "libc", ] @@ -519,9 +520,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" +checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" dependencies = [ "crossbeam-epoch 0.8.2", "crossbeam-utils 0.7.2", @@ -530,9 +531,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch 0.9.5", @@ -627,9 +628,9 @@ dependencies = [ [[package]] name = "crypto-mac" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" +checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" dependencies = [ "generic-array 0.14.4", "subtle", @@ -637,9 +638,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434e1720189a637d44fe464f4df1e6eb900b4835255b14354497c78af37d9bb8" +checksum = "4a9b85542f99a2dfa2a1b8e192662741c9859a846b296bef1c92ef9b58b5a216" dependencies = [ "byteorder", "digest 0.8.1", @@ -650,9 +651,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "639891fde0dbea823fc3d798a0fdf9d2f9440a42d64a78ab3488b0ca025117b3" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" dependencies = [ "byteorder", "digest 0.9.0", @@ -687,9 +688,9 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", ] [[package]] @@ -759,9 +760,9 @@ checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" [[package]] name = "ed25519" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d0860415b12243916284c67a9be413e044ee6668247b99ba26d94b2bc06c8f6" +checksum = "4620d40f6d2601794401d6dd95a5cf69b6c157852539470eeda433a99b3c0efc" dependencies = [ "serde", "signature", @@ -773,7 +774,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek 3.1.0", + "curve25519-dalek 3.2.0", "ed25519", "rand 0.7.3", "serde", @@ -797,14 +798,14 @@ dependencies = [ [[package]] name = "educe" -version = "0.4.16" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b6f648515c65974bcb893b286a5c4a35adfdcfbfd03c1bbf1108f40feec65d7" +checksum = "f86b50932a01e7ec5c06160492ab660fb19b6bb2a7878030dd6cd68d21df9d4d" dependencies = [ "enum-ordinalize", - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", ] [[package]] @@ -836,16 +837,16 @@ checksum = "0b166c9e378360dd5a6666a9604bb4f54ae0cac39023ffbac425e917a2a04fef" dependencies = [ "num-bigint", "num-traits", - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", ] [[package]] name = "env_logger" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" dependencies = [ "atty", "humantime", @@ -870,9 +871,9 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", "synstructure", ] @@ -890,13 +891,13 @@ checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" [[package]] name = "filetime" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" +checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.8", + "redox_syscall 0.2.10", "winapi 0.3.9", ] @@ -967,9 +968,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27" +checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b" dependencies = [ "futures-channel", "futures-core", @@ -982,9 +983,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" +checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9" dependencies = [ "futures-core", "futures-sink", @@ -992,15 +993,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" +checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99" [[package]] name = "futures-executor" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" +checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c" dependencies = [ "futures-core", "futures-task", @@ -1009,40 +1010,40 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" +checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582" [[package]] name = "futures-macro" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" +checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57" dependencies = [ "autocfg", "proc-macro-hack", - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", ] [[package]] name = "futures-sink" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" +checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53" [[package]] name = "futures-task" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" +checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2" [[package]] name = "futures-util" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" +checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78" dependencies = [ "autocfg", "futures-channel", @@ -1113,9 +1114,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.23.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" +checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" [[package]] name = "glob" @@ -1148,7 +1149,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 1.6.1", + "tokio 1.10.0", "tokio-util", "tracing", ] @@ -1172,10 +1173,16 @@ dependencies = [ ] [[package]] -name = "hermit-abi" -version = "0.1.18" +name = "hashbrown" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] @@ -1223,7 +1230,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" dependencies = [ - "crypto-mac 0.10.0", + "crypto-mac 0.10.1", "digest 0.9.0", ] @@ -1251,9 +1258,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9" +checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" dependencies = [ "bytes 1.0.1", "http", @@ -1262,9 +1269,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" +checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" [[package]] name = "httpdate" @@ -1280,9 +1287,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.8" +version = "0.14.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3f71a7eea53a3f8257a7b4795373ff886397178cd634430ea94e12d7fe4fe34" +checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11" dependencies = [ "bytes 1.0.1", "futures-channel", @@ -1294,9 +1301,9 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project", - "socket2 0.4.0", - "tokio 1.6.1", + "pin-project-lite", + "socket2 0.4.1", + "tokio 1.10.0", "tower-service", "tracing", "want", @@ -1312,7 +1319,7 @@ dependencies = [ "hyper", "log", "rustls", - "tokio 1.6.1", + "tokio 1.10.0", "tokio-rustls", "webpki", ] @@ -1330,12 +1337,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" +checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.11.2", ] [[package]] @@ -1361,9 +1368,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" dependencies = [ "cfg-if 1.0.0", ] @@ -1379,9 +1386,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135" +checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" [[package]] name = "itertools" @@ -1400,18 +1407,18 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "jobserver" -version = "0.1.22" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd" +checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.51" +version = "0.3.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" +checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d" dependencies = [ "wasm-bindgen", ] @@ -1422,7 +1429,7 @@ version = "17.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4467ab6dfa369b69e52bd0692e480c4d117410538526a57a304a0f2250fd95e" dependencies = [ - "futures 0.3.15", + "futures 0.3.16", "futures-executor", "futures-util", "log", @@ -1458,9 +1465,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.95" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36" +checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" [[package]] name = "libloading" @@ -1555,9 +1562,9 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "maybe-uninit" @@ -1567,9 +1574,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "memmap2" @@ -1635,9 +1642,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.11" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" +checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" dependencies = [ "libc", "log", @@ -1680,9 +1687,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4" +checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" dependencies = [ "lazy_static", "libc", @@ -1745,9 +1752,9 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", ] [[package]] @@ -1781,9 +1788,9 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066" +checksum = "3f9bd055fb730c4f8f4f57d45d35cd6b3f0980535b056dc7ff119cee6a66ed6f" dependencies = [ "derivative", "num_enum_derive", @@ -1791,14 +1798,14 @@ dependencies = [ [[package]] name = "num_enum_derive" -version = "0.5.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e" +checksum = "486ea01961c4a818096de679a8b740b26d9033146ac5291b1c98557658f8cdd9" dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.27", + "proc-macro-crate 1.0.0", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", ] [[package]] @@ -1809,15 +1816,18 @@ checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" [[package]] name = "object" -version = "0.23.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" +checksum = "ee2766204889d09937d00bfbb7fec56bb2a199e2ade963cab19185d8a6104c7c" +dependencies = [ + "memchr", +] [[package]] name = "once_cell" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" dependencies = [ "parking_lot 0.11.1", ] @@ -1836,9 +1846,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.35" +version = "0.10.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" +checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -1856,9 +1866,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-sys" -version = "0.9.65" +version = "0.9.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" +checksum = "1996d2d305e561b70d1ee0c53f1542833f4e1ac6ce9a6708b6ff2738ca67dc82" dependencies = [ "autocfg", "cc", @@ -1886,9 +1896,9 @@ checksum = "f463857a6eb96c0136b1d56e56c718350cef30412ec065b48294799a088bca68" dependencies = [ "Inflector", "proc-macro-error", - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", ] [[package]] @@ -1961,7 +1971,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.8", + "redox_syscall 0.2.10", "smallvec 1.6.1", "winapi 0.3.9", ] @@ -1981,7 +1991,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3b8c0d71734018084da0c0354193a5edfb81b20d2d57a92c5b154aefc554a4a" dependencies = [ - "crypto-mac 0.10.0", + "crypto-mac 0.10.1", ] [[package]] @@ -2001,29 +2011,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4" +checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f" +checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", ] [[package]] name = "pin-project-lite" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" +checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" [[package]] name = "pin-utils" @@ -2058,6 +2068,16 @@ dependencies = [ "toml", ] +[[package]] +name = "proc-macro-crate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" +dependencies = [ + "thiserror", + "toml", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -2065,9 +2085,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", "version_check", ] @@ -2077,7 +2097,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", "version_check", ] @@ -2105,9 +2125,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" +checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" dependencies = [ "unicode-xid 0.2.2", ] @@ -2136,7 +2156,7 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", ] [[package]] @@ -2155,14 +2175,14 @@ dependencies = [ [[package]] name = "rand" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ "libc", - "rand_chacha 0.3.0", - "rand_core 0.6.2", - "rand_hc 0.3.0", + "rand_chacha 0.3.1", + "rand_core 0.6.3", + "rand_hc 0.3.1", ] [[package]] @@ -2177,12 +2197,12 @@ dependencies = [ [[package]] name = "rand_chacha" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.2", + "rand_core 0.6.3", ] [[package]] @@ -2196,9 +2216,9 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ "getrandom 0.2.3", ] @@ -2214,11 +2234,11 @@ dependencies = [ [[package]] name = "rand_hc" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" dependencies = [ - "rand_core 0.6.2", + "rand_core 0.6.3", ] [[package]] @@ -2237,7 +2257,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" dependencies = [ "autocfg", - "crossbeam-deque 0.8.0", + "crossbeam-deque 0.8.1", "either", "rayon-core", ] @@ -2249,7 +2269,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" dependencies = [ "crossbeam-channel 0.5.1", - "crossbeam-deque 0.8.0", + "crossbeam-deque 0.8.1", "crossbeam-utils 0.8.5", "lazy_static", "num_cpus", @@ -2263,9 +2283,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_syscall" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" +checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ "bitflags", ] @@ -2277,7 +2297,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ "getrandom 0.2.3", - "redox_syscall 0.2.8", + "redox_syscall 0.2.10", ] [[package]] @@ -2308,9 +2328,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2296f2fac53979e8ccbc4a1136b25dcefd37be9ed7e4a1f6b05a6029c84ff124" +checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22" dependencies = [ "base64 0.13.0", "bytes 1.0.1", @@ -2332,7 +2352,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "tokio 1.6.1", + "tokio 1.10.0", "tokio-rustls", "url", "wasm-bindgen", @@ -2369,9 +2389,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "410f7acf3cb3a44527c5d9546bad4bf4e6c460915d5f9f2fc524498bfe8f70ce" +checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49" [[package]] name = "rustc-hash" @@ -2453,16 +2473,16 @@ version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", ] [[package]] name = "sct" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" dependencies = [ "ring", "untrusted", @@ -2526,9 +2546,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.126" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" +checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" dependencies = [ "serde_derive", ] @@ -2544,20 +2564,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.126" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" +checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", ] [[package]] name = "serde_json" -version = "1.0.64" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" dependencies = [ "itoa", "ryu", @@ -2578,9 +2598,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.17" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23" +checksum = "039ba818c784248423789eec090aab9fb566c7b94d6ebbfa1814a9fd52c8afb2" dependencies = [ "dtoa", "linked-hash-map", @@ -2636,15 +2656,15 @@ dependencies = [ [[package]] name = "signature" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0242b8e50dd9accdd56170e94ca1ebd223b098eb9c83539a6e367d0f36ae68" +checksum = "c19772be3c4dd2ceaacf03cb41d5885f2a02c4d8804884918e3a258480803335" [[package]] name = "slab" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" +checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" [[package]] name = "smallvec" @@ -2674,9 +2694,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" dependencies = [ "libc", "winapi 0.3.9", @@ -2684,9 +2704,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67e4a537eccc21f8b942f60990d57f76980638db834161747e47cfba4b8f050" +checksum = "e644f9c77d5e59a35aa5fa8cb0a8f186332a3db19abb60f579cf3d750600cf1a" dependencies = [ "Inflector", "base64 0.12.3", @@ -2707,30 +2727,30 @@ dependencies = [ [[package]] name = "solana-banks-client" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a51c83e33eb5fc2a688db5e7e19a8c5b481385e1d9f30b012962e9bcdb002629" +checksum = "e7a79b6ef4ce2ff4e0a6c515a5030dfd75c69089ddf1a85f805b904516a8bf04" dependencies = [ "bincode", "borsh", "borsh-derive", - "futures 0.3.15", - "mio 0.7.11", + "futures 0.3.16", + "mio 0.7.13", "solana-banks-interface", "solana-program", "solana-sdk", "tarpc", - "tokio 1.6.1", + "tokio 1.10.0", "tokio-serde", ] [[package]] name = "solana-banks-interface" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73a34a243df509dfde8fe42129aa34a3db9913e90b7c7eb290f597361016268" +checksum = "70c75f0b27b97c7e27d7f6ba16e766990e9374d9a9ae0f60183619d5126b041e" dependencies = [ - "mio 0.7.11", + "mio 0.7.13", "serde", "solana-sdk", "tarpc", @@ -2738,29 +2758,29 @@ dependencies = [ [[package]] name = "solana-banks-server" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3929ed2f73a4a9c80ddff4b1b49ecc81fa6e8689ca475e9e625034aaebc22516" +checksum = "810298b1760b59356dcccb354f913d059ce12ebf615dcf7bd4520fc991af5f38" dependencies = [ "bincode", - "futures 0.3.15", + "futures 0.3.16", "log", - "mio 0.7.11", + "mio 0.7.13", "solana-banks-interface", "solana-metrics", "solana-runtime", "solana-sdk", "tarpc", - "tokio 1.6.1", + "tokio 1.10.0", "tokio-serde", "tokio-stream", ] [[package]] name = "solana-bpf-loader-program" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d848ee15b984d2703750a52e3cbe23024256184b11426a1677bc98934087f8c7" +checksum = "eb56a6bf09f3502afc77afaf6b1ed888e1a438ba5cd3f4f471dd82f27b7d80bb" dependencies = [ "bincode", "byteorder", @@ -2768,7 +2788,7 @@ dependencies = [ "log", "num-derive", "num-traits", - "rand_core 0.6.2", + "rand_core 0.6.3", "sha3", "solana-measure", "solana-runtime", @@ -2779,9 +2799,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d2792f093f28b0a7403443225494c0d75215253784897a6f8b8e6fb83ce91a" +checksum = "c57b6f6857ecf2c404cfb550419f67350b716eae49ede1f456d5b5de5b043540" dependencies = [ "chrono", "clap", @@ -2796,9 +2816,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c3982b00bf2ac283c86e760aae127d395ab8b610cc3690a0a6ff500ae561e7" +checksum = "e214778deefe3c170c1a33c5367d0594c0517bec4093098025cb7b2c662e9b8c" dependencies = [ "dirs-next", "lazy_static", @@ -2810,9 +2830,9 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "023263a79a3356532549c9e0555c6e1b2a2e94205b5d58c7041703bbd455133d" +checksum = "932b71d73ef7a588700cbaa0244f25aa8bb3ef30fa2840bafa12aa4d0ca21708" dependencies = [ "base64 0.13.0", "bincode", @@ -2837,21 +2857,21 @@ dependencies = [ "solana-version", "solana-vote-program", "thiserror", - "tokio 1.6.1", + "tokio 1.10.0", "tungstenite", "url", ] [[package]] name = "solana-config-program" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b5348055cf52ab01efc1578d4159ec40bb39c3913df4365787c3e1382c101c1" +checksum = "f6e67bbd8b59afa4c1d9adeae9bd4b332e34ee06a0e14bbc6222caeed6951f3c" dependencies = [ "bincode", "chrono", "log", - "rand_core 0.6.2", + "rand_core 0.6.3", "serde", "serde_derive", "solana-sdk", @@ -2859,14 +2879,14 @@ dependencies = [ [[package]] name = "solana-crate-features" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c9b446eea7a5af7d4631ce3fd0625439fdc68eda4557223233f1c6bba3e847a" +checksum = "668eb5b0fd053f35e5664ef6bf3f0da1e3b9bcb5643b8c4aa80cc4433b9d47ce" dependencies = [ "backtrace", "bytes 0.4.12", "cc", - "curve25519-dalek 2.1.2", + "curve25519-dalek 2.1.3", "ed25519-dalek", "either", "lazy_static", @@ -2877,16 +2897,16 @@ dependencies = [ "ring", "serde", "syn 0.15.44", - "syn 1.0.72", + "syn 1.0.74", "tokio 0.1.22", "winapi 0.3.9", ] [[package]] name = "solana-faucet" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d58750a03b49940f486c0dcb5744bb6ee5da82ced6636000a90af7618a67dd1b" +checksum = "dca9b774547ae7eab0e20817c5179892ce9a9e9fa572d951aa31d01c5641bd71" dependencies = [ "bincode", "byteorder", @@ -2902,14 +2922,14 @@ dependencies = [ "solana-version", "spl-memo", "thiserror", - "tokio 1.6.1", + "tokio 1.10.0", ] [[package]] name = "solana-frozen-abi" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c6760c1dd139c202ef6df28bff467c904aa35b1aa1a59be268c47aec8bc6c0" +checksum = "7f5ed8279eb2dca03341ff9ee7a5d9b84a9fc4a4a6d12f112e7ee9ec98ad6cab" dependencies = [ "bs58", "bv", @@ -2927,21 +2947,21 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4dbe296c16dec41e8e6f4e6c2694c6224820d34c0ab11a2d3ff9683f44878ef" +checksum = "888b45e492fdc5216b982437de9ef6bff96423fbe108c01710ecc8769c994a4e" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", "rustc_version", - "syn 1.0.72", + "syn 1.0.74", ] [[package]] name = "solana-logger" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af1959b520c0fc99bc6583ba9d82bfa15b1ac007516795bceeb4a951af77c7" +checksum = "5cd962c3fc95a433cd5e8368161fa54cfc9f216f66be06a71ccf05f8db3cc518" dependencies = [ "env_logger", "lazy_static", @@ -2950,9 +2970,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2915d20f35948b35deffa8624cb189385f13758bd171d8d4a966ae8bf360a4" +checksum = "1b0405692ecd5b0daea7a6ee8d076afa627492c25623a89e3519e6b8f773e790" dependencies = [ "log", "solana-metrics", @@ -2961,9 +2981,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d87867f1f9e399274e08902eb72c9158bef5399e2566161dbe831abeaaa7d14" +checksum = "52b191f80988c11b6be15c33e9fcd48086e0f8d7b64a5215a562b7fefd50858f" dependencies = [ "env_logger", "gethostname", @@ -2975,9 +2995,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7dd877b66b4436b9fcb6d2c2e6055a1dd18b0dcf5938ea1f20efa0b7f09159" +checksum = "f826d57f78d3b40fe6c008813367ce70c44e1b2488270b6c68cc050a75d8bb6b" dependencies = [ "bincode", "clap", @@ -2991,15 +3011,15 @@ dependencies = [ "solana-logger", "solana-sdk", "solana-version", - "tokio 1.6.1", + "tokio 1.10.0", "url", ] [[package]] name = "solana-program" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe5e5dd99d642b5e89eeb20457310c3c23f20dbf44e67c64e473a02fbc50d646" +checksum = "0dd1398350ee06070854399743f4d726b1ea7f71766714b0767cc6133ba18c7b" dependencies = [ "bincode", "blake3", @@ -3007,7 +3027,7 @@ dependencies = [ "borsh-derive", "bs58", "bv", - "curve25519-dalek 2.1.2", + "curve25519-dalek 2.1.3", "hex", "itertools", "lazy_static", @@ -3032,9 +3052,9 @@ dependencies = [ [[package]] name = "solana-program-test" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20a2961354afb2ef3ed35ec477961f1f6f0113291c83b993a30382180c496d96" +checksum = "5f1b0f6563b79f3cbbca0f0a5ce04eca634d82c14fa922d0ed662c1609484161" dependencies = [ "async-trait", "base64 0.12.3", @@ -3042,7 +3062,7 @@ dependencies = [ "chrono", "chrono-humanize", "log", - "mio 0.7.11", + "mio 0.7.13", "serde", "serde_derive", "solana-banks-client", @@ -3053,14 +3073,14 @@ dependencies = [ "solana-sdk", "solana-vote-program", "thiserror", - "tokio 1.6.1", + "tokio 1.10.0", ] [[package]] name = "solana-rayon-threadlimit" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c3a0037afa0b03e0aad9f8fb451d1008d5538023919835cf86c9833bc93103" +checksum = "436c020428e66f511568edbb1e3d2bddee3336c2dadea4d45ecdcd57572c55bf" dependencies = [ "lazy_static", "num_cpus", @@ -3068,9 +3088,9 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "083d31e6510a746ecc4ce8d151a232324056c7a124a218948060947b668d6db8" +checksum = "e8865f453aabda56c7200b54ef463b1dd1aa824e326293ab5d8ce6a858d5e5bd" dependencies = [ "base32", "console 0.14.1", @@ -3089,9 +3109,9 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f047727075c3434f17d33467bd26033fea3b4e71e7c23caa261015507b162581" +checksum = "932185b5b954d3828a39df54487391cd5b982aa994c39c261771b8f8599210bb" dependencies = [ "arrayref", "bincode", @@ -3140,9 +3160,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0048d346fdf3629dca2bccc2ed63320da9d0291c32b816911ed63d34c65286a5" +checksum = "5475909aab00963154a2748cb3ac78eacce511c2a194b28e041c926099c0d286" dependencies = [ "assert_matches", "bincode", @@ -3168,7 +3188,7 @@ dependencies = [ "qstring", "rand 0.7.3", "rand_chacha 0.2.2", - "rand_core 0.6.2", + "rand_core 0.6.3", "rustc_version", "rustversion", "serde", @@ -3189,31 +3209,31 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee909dcddb5b4d349b3e5e1ae92f6660cd2f783dea392ae2e73210776aadc9b" +checksum = "3839bc6b8f3163878e7f1675a0faffa641edf760aec1d9a7a056f71712e94642" dependencies = [ "bs58", - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", "rustversion", - "syn 1.0.72", + "syn 1.0.74", ] [[package]] name = "solana-secp256k1-program" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd4c29c6b269800898610da38de45d28fd56b24cb4030c588ffd6acc11a7443" +checksum = "8dd7e16a637da71fbb12343ea57e107c49b91ee3d3f858ff09eb65b712bfb76a" dependencies = [ "solana-sdk", ] [[package]] name = "solana-stake-program" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c01fa18bedd1773c9abf86fc58b87ed6e1117ce9f42c9a703becc1d351d810d" +checksum = "626a1205b053064cf2824ae09c5660e6b93443591f65ff5976c9dac1bfc1675b" dependencies = [ "bincode", "log", @@ -3233,9 +3253,9 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6ea7cfdeff6ff1fba74096f3bb94688f0fdb780524e08676323108352532dfa" +checksum = "8ef363db47e30b1b0f9a1a8a3d2fec529ff51588b66b385e1f1ee7db9acd48dc" dependencies = [ "Inflector", "base64 0.12.3", @@ -3257,9 +3277,9 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978569fec8c913d798f5e3dad2c8b6d03a6a30e8e04da633ac356ddde832f933" +checksum = "d72405fc6f59f499fbea7f79e6fdd1ed20a76c953670dd7416e3fe4f1c2992cc" dependencies = [ "log", "rustc_version", @@ -3273,9 +3293,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.7.8" +version = "1.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "506df67749a343d9f9a48b7b5566faf2bc43d0611b520467664a58cd78d4b1be" +checksum = "4c338f2c1bb6056380947a5dcfa0b132a2021a1177f944a8d805cccd14a26d29" dependencies = [ "bincode", "log", @@ -3349,7 +3369,7 @@ dependencies = [ "bincode", "borsh", "clap", - "rand 0.8.3", + "rand 0.8.4", "solana-clap-utils", "solana-cli-config", "solana-client", @@ -3501,9 +3521,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "subtle" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "symlink" @@ -3524,32 +3544,32 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.72" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" +checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", "unicode-xid 0.2.2", ] [[package]] name = "synstructure" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" +checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", "unicode-xid 0.2.2", ] [[package]] name = "tar" -version = "0.4.35" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d779dc6aeff029314570f666ec83f19df7280bb36ef338442cfa8c604021b80" +checksum = "d6f5515d3add52e0bbdcad7b83c388bb36ba7b754dda3b5f5bc2d38640cdba5c" dependencies = [ "filetime", "libc", @@ -3564,7 +3584,7 @@ checksum = "e325774dd5b35d979e9f4db2b0f0d7d85dc2ff2b676a3150af56c09eafc14b07" dependencies = [ "anyhow", "fnv", - "futures 0.3.15", + "futures 0.3.16", "humantime", "log", "pin-project", @@ -3572,7 +3592,7 @@ dependencies = [ "serde", "static_assertions", "tarpc-plugins", - "tokio 1.6.1", + "tokio 1.10.0", "tokio-serde", "tokio-util", ] @@ -3583,9 +3603,9 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3240378a22b1195734e085ba71d1d4188d50f034aea82635acc430b7005afb5" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", ] [[package]] @@ -3596,8 +3616,8 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ "cfg-if 1.0.0", "libc", - "rand 0.8.3", - "redox_syscall 0.2.8", + "rand 0.8.4", + "redox_syscall 0.2.10", "remove_dir_all", "winapi 0.3.9", ] @@ -3641,22 +3661,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6" +checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d" +checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", ] [[package]] @@ -3690,9 +3710,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" +checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" dependencies = [ "tinyvec_macros", ] @@ -3729,15 +3749,15 @@ dependencies = [ [[package]] name = "tokio" -version = "1.6.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a38d31d7831c6ed7aad00aa4c12d9375fd225a6dd77da1d25b707346319a975" +checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b" dependencies = [ "autocfg", "bytes 1.0.1", "libc", "memchr", - "mio 0.7.11", + "mio 0.7.13", "num_cpus", "once_cell", "parking_lot 0.11.1", @@ -3802,13 +3822,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c49e3df43841dafb86046472506755d8501c5615673955f6aa17181125d13c37" +checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", ] [[package]] @@ -3837,7 +3857,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ "rustls", - "tokio 1.6.1", + "tokio 1.10.0", "webpki", ] @@ -3859,13 +3879,13 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8864d706fdb3cc0843a49647ac892720dac98a6eeb818b77190592cf4994066" +checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f" dependencies = [ "futures-core", "pin-project-lite", - "tokio 1.6.1", + "tokio 1.10.0", ] [[package]] @@ -3898,7 +3918,7 @@ version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" dependencies = [ - "crossbeam-deque 0.7.3", + "crossbeam-deque 0.7.4", "crossbeam-queue", "crossbeam-utils 0.7.2", "futures 0.1.31", @@ -3965,7 +3985,7 @@ dependencies = [ "futures-sink", "log", "pin-project-lite", - "tokio 1.6.1", + "tokio 1.10.0", ] [[package]] @@ -3996,9 +4016,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052" +checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8" dependencies = [ "lazy_static", ] @@ -4043,12 +4063,9 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" [[package]] name = "unicode-bidi" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" -dependencies = [ - "matches", -] +checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085" [[package]] name = "unicode-normalization" @@ -4179,9 +4196,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.74" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" +checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0" dependencies = [ "cfg-if 1.0.0", "serde", @@ -4191,24 +4208,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.74" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900" +checksum = "cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041" dependencies = [ "bumpalo", "lazy_static", "log", - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.24" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1" +checksum = "95fded345a6559c2cfee778d562300c581f7d4ff3edb9b0d230d69800d213972" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -4218,9 +4235,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.74" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4" +checksum = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef" dependencies = [ "quote 1.0.9", "wasm-bindgen-macro-support", @@ -4228,28 +4245,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.74" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" +checksum = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.74" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" +checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29" [[package]] name = "web-sys" -version = "0.3.51" +version = "0.3.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" +checksum = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c" dependencies = [ "js-sys", "wasm-bindgen", @@ -4257,9 +4274,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.21.2" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f50e1972865d6b1adb54167d1c8ed48606004c2c9d0ea5f1eeb34d95e863ef" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" dependencies = [ "ring", "untrusted", @@ -4356,9 +4373,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +checksum = "377db0846015f7ae377174787dd452e1c5f5a9050bc6f954911d01f116daa0cd" dependencies = [ "zeroize_derive", ] @@ -4369,9 +4386,9 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1" dependencies = [ - "proc-macro2 1.0.27", + "proc-macro2 1.0.28", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.74", "synstructure", ] diff --git a/rust/auction/cli/src/main.rs b/rust/auction/cli/src/main.rs index 01e211a..713df63 100644 --- a/rust/auction/cli/src/main.rs +++ b/rust/auction/cli/src/main.rs @@ -42,7 +42,7 @@ fn create_auction(app_matches: &ArgMatches, payer: Keypair, client: RpcClient) { let mint = read_keypair_file(app_matches.value_of("mint").unwrap()).unwrap(); // Auction seeds. - let seeds = &[PREFIX.as_bytes(), &program_key.as_ref(), &resource.as_ref()]; + let seeds = &[PREFIX.as_bytes(), program_key.as_ref(), resource.as_ref()]; let (auction_pubkey, _) = Pubkey::find_program_address(seeds, &program_key); // Configure a price floor @@ -199,7 +199,7 @@ fn place_bid(app_matches: &ArgMatches, payer: Keypair, client: RpcClient) { let bidder = read_keypair_file(app_matches.value_of("bidder").unwrap()).unwrap(); // Auction seeds. - let seeds = &[PREFIX.as_bytes(), &program_key.as_ref(), &resource.as_ref()]; + let seeds = &[PREFIX.as_bytes(), program_key.as_ref(), resource.as_ref()]; let (auction_pubkey, _) = Pubkey::find_program_address(seeds, &program_key); // Parse CLI amount value, fail if not a number. @@ -342,14 +342,14 @@ fn claim_bid(app_matches: &ArgMatches, payer: Keypair, client: RpcClient) { let destination = read_keypair_file(app_matches.value_of("destination").unwrap()).unwrap(); // Auction seeds. - let seeds = &[PREFIX.as_bytes(), &program_key.as_ref(), &resource.as_ref()]; + let seeds = &[PREFIX.as_bytes(), program_key.as_ref(), resource.as_ref()]; let (auction, _) = Pubkey::find_program_address(seeds, &program_key); let bidder_pubkey = bidder.pubkey(); let seeds = &[ PREFIX.as_bytes(), - &program_key.as_ref(), - &auction.as_ref(), - &bidder_pubkey.as_ref(), + program_key.as_ref(), + auction.as_ref(), + bidder_pubkey.as_ref(), ]; let (bidpot, _) = Pubkey::find_program_address(seeds, &program_key); let bidpot_data = client.get_account(&bidpot).unwrap(); @@ -435,14 +435,14 @@ fn cancel_bid(app_matches: &ArgMatches, payer: Keypair, client: RpcClient) { let bidder = read_keypair_file(app_matches.value_of("bidder").unwrap()).unwrap(); // Load Bidpot data. - let seeds = &[PREFIX.as_bytes(), &program_key.as_ref(), &resource.as_ref()]; + let seeds = &[PREFIX.as_bytes(), program_key.as_ref(), resource.as_ref()]; let (auction, _) = Pubkey::find_program_address(seeds, &program_key); let bidder_pubkey = bidder.pubkey(); let seeds = &[ PREFIX.as_bytes(), - &program_key.as_ref(), - &auction.as_ref(), - &bidder_pubkey.as_ref(), + program_key.as_ref(), + auction.as_ref(), + bidder_pubkey.as_ref(), ]; let (bidpot, _) = Pubkey::find_program_address(seeds, &program_key); let bidpot_data = client.get_account(&bidpot).unwrap(); diff --git a/rust/metaplex/program/src/processor/redeem_bid.rs b/rust/metaplex/program/src/processor/redeem_bid.rs index ea0702f..428c318 100644 --- a/rust/metaplex/program/src/processor/redeem_bid.rs +++ b/rust/metaplex/program/src/processor/redeem_bid.rs @@ -224,7 +224,7 @@ pub fn process_redeem_bid<'a>( { let master_edition_info = match safety_deposit_config_info { Some(val) => val, - None => return Err(ProgramError::NotEnoughAccountKeys) + None => return Err(ProgramError::NotEnoughAccountKeys), }; let reservation_list_info = next_account_info(account_info_iter)?; diff --git a/rust/token-metadata/program/src/instruction.rs b/rust/token-metadata/program/src/instruction.rs index 82fe0a7..653af91 100644 --- a/rust/token-metadata/program/src/instruction.rs +++ b/rust/token-metadata/program/src/instruction.rs @@ -314,18 +314,11 @@ pub fn update_metadata_accounts( } /// puff metadata account instruction -pub fn puff_metadata_account( - program_id: Pubkey, - metadata_account: Pubkey, -) -> Instruction { +pub fn puff_metadata_account(program_id: Pubkey, metadata_account: Pubkey) -> Instruction { Instruction { program_id, - accounts: vec![ - AccountMeta::new(metadata_account, false), - ], - data: MetadataInstruction::PuffMetadata - .try_to_vec() - .unwrap(), + accounts: vec![AccountMeta::new(metadata_account, false)], + data: MetadataInstruction::PuffMetadata.try_to_vec().unwrap(), } } diff --git a/rust/token-metadata/program/src/processor.rs b/rust/token-metadata/program/src/processor.rs index 1f798ad..5193f31 100644 --- a/rust/token-metadata/program/src/processor.rs +++ b/rust/token-metadata/program/src/processor.rs @@ -19,9 +19,9 @@ use { assert_token_program_matches_package, assert_update_authority_is_correct, create_or_allocate_account_raw, get_owner_from_token_account, process_create_metadata_accounts_logic, - process_mint_new_edition_from_master_edition_via_token_logic, transfer_mint_authority, - puff_out_data_fields, - CreateMetadataAccountsLogicArgs, MintNewEditionFromMasterEditionViaTokenLogicArgs, + process_mint_new_edition_from_master_edition_via_token_logic, puff_out_data_fields, + transfer_mint_authority, CreateMetadataAccountsLogicArgs, + MintNewEditionFromMasterEditionViaTokenLogicArgs, }, }, arrayref::array_ref, @@ -132,10 +132,7 @@ pub fn process_instruction<'a>( } MetadataInstruction::PuffMetadata => { msg!("Instruction: Puff Metadata"); - process_puff_metadata_account( - program_id, - accounts - ) + process_puff_metadata_account(program_id, accounts) } } } @@ -592,17 +589,16 @@ pub fn process_puff_metadata_account( assert_owned_by(metadata_account_info, program_id)?; puff_out_data_fields(&mut metadata); - + let edition_seeds = &[ PREFIX.as_bytes(), program_id.as_ref(), metadata.mint.as_ref(), - EDITION.as_bytes() + EDITION.as_bytes(), ]; - let (_, edition_bump_seed) = - Pubkey::find_program_address(edition_seeds, program_id); + let (_, edition_bump_seed) = Pubkey::find_program_address(edition_seeds, program_id); metadata.edition_nonce = Some(edition_bump_seed); metadata.serialize(&mut *metadata_account_info.data.borrow_mut())?; Ok(()) -} \ No newline at end of file +} diff --git a/rust/token-metadata/program/src/state.rs b/rust/token-metadata/program/src/state.rs index 656a5b0..9bd2cb2 100644 --- a/rust/token-metadata/program/src/state.rs +++ b/rust/token-metadata/program/src/state.rs @@ -100,7 +100,7 @@ pub struct Metadata { // Whether or not the data struct is mutable, default is not pub is_mutable: bool, /// nonce for easy calculation of editions, if present - pub edition_nonce: Option + pub edition_nonce: Option, } impl Metadata { diff --git a/rust/token-metadata/program/src/utils.rs b/rust/token-metadata/program/src/utils.rs index a764e58..625452b 100644 --- a/rust/token-metadata/program/src/utils.rs +++ b/rust/token-metadata/program/src/utils.rs @@ -856,12 +856,11 @@ pub fn process_create_metadata_accounts_logic( PREFIX.as_bytes(), program_id.as_ref(), metadata.mint.as_ref(), - EDITION.as_bytes() + EDITION.as_bytes(), ]; - let (_, edition_bump_seed) = - Pubkey::find_program_address(edition_seeds, program_id); + let (_, edition_bump_seed) = Pubkey::find_program_address(edition_seeds, program_id); metadata.edition_nonce = Some(edition_bump_seed); - + metadata.serialize(&mut *metadata_account_info.data.borrow_mut())?; Ok(()) @@ -872,13 +871,15 @@ pub fn puff_out_data_fields(metadata: &mut Metadata) { while array_of_zeroes.len() < MAX_NAME_LENGTH - metadata.data.name.len() { array_of_zeroes.push(0u8); } - metadata.data.name = metadata.data.name.clone() + std::str::from_utf8(&array_of_zeroes).unwrap(); + metadata.data.name = + metadata.data.name.clone() + std::str::from_utf8(&array_of_zeroes).unwrap(); let mut array_of_zeroes = vec![]; while array_of_zeroes.len() < MAX_SYMBOL_LENGTH - metadata.data.symbol.len() { array_of_zeroes.push(0u8); } - metadata.data.symbol = metadata.data.symbol.clone() + std::str::from_utf8(&array_of_zeroes).unwrap(); + metadata.data.symbol = + metadata.data.symbol.clone() + std::str::from_utf8(&array_of_zeroes).unwrap(); let mut array_of_zeroes = vec![]; while array_of_zeroes.len() < MAX_URI_LENGTH - metadata.data.uri.len() { diff --git a/rust/token-metadata/program/tests/utils/edition_marker.rs b/rust/token-metadata/program/tests/utils/edition_marker.rs index 2080b79..fb7ca75 100644 --- a/rust/token-metadata/program/tests/utils/edition_marker.rs +++ b/rust/token-metadata/program/tests/utils/edition_marker.rs @@ -98,7 +98,7 @@ impl EditionMarker { spl_token_vault_id.as_ref(), vault_pubkey.as_ref(), ]; - let (authority, _) = Pubkey::find_program_address(vault_mint_seeds, &spl_token_vault_id); + let (_authority, _) = Pubkey::find_program_address(vault_mint_seeds, &spl_token_vault_id); create_mint(context, &self.mint, &context.payer.pubkey(), None).await?; create_token_account( diff --git a/rust/token-metadata/test/src/main.rs b/rust/token-metadata/test/src/main.rs index 1b757dc..227f46d 100644 --- a/rust/token-metadata/test/src/main.rs +++ b/rust/token-metadata/test/src/main.rs @@ -23,11 +23,12 @@ use { spl_token_metadata::{ instruction::{ create_master_edition, create_metadata_accounts, - mint_new_edition_from_master_edition_via_token, update_metadata_accounts,puff_metadata_account + mint_new_edition_from_master_edition_via_token, puff_metadata_account, + update_metadata_accounts, }, state::{ get_reservation_list, Data, Edition, Key, MasterEditionV1, MasterEditionV2, Metadata, - EDITION, PREFIX,MAX_NAME_LENGTH, MAX_URI_LENGTH, MAX_SYMBOL_LENGTH + EDITION, MAX_NAME_LENGTH, MAX_SYMBOL_LENGTH, MAX_URI_LENGTH, PREFIX, }, }, std::str::FromStr, @@ -35,18 +36,26 @@ use { const TOKEN_PROGRAM_PUBKEY: &str = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"; fn puff_unpuffed_metadata(_app_matches: &ArgMatches, payer: Keypair, client: RpcClient) { - let metadata_accounts = client.get_program_accounts(&spl_token_metadata::id()).unwrap(); + let metadata_accounts = client + .get_program_accounts(&spl_token_metadata::id()) + .unwrap(); let mut needing_puffing = vec![]; for acct in metadata_accounts { if acct.1.data[0] == Key::MetadataV1 as u8 { match try_from_slice_unchecked(&acct.1.data) { Ok(val) => { let account: Metadata = val; - if account.data.name.len() < MAX_NAME_LENGTH || account.data.uri.len() < MAX_URI_LENGTH || account.data.symbol.len() < MAX_SYMBOL_LENGTH || account.edition_nonce.is_none() { + if account.data.name.len() < MAX_NAME_LENGTH + || account.data.uri.len() < MAX_URI_LENGTH + || account.data.symbol.len() < MAX_SYMBOL_LENGTH + || account.edition_nonce.is_none() + { needing_puffing.push(acct.0); } - }, - Err(_) => { println!("Skipping {}", acct.0)}, + } + Err(_) => { + println!("Skipping {}", acct.0) + } }; } } @@ -67,11 +76,11 @@ fn puff_unpuffed_metadata(_app_matches: &ArgMatches, payer: Keypair, client: Rpc println!("Another 20 down. At {} / {}", i, needing_puffing.len()); instructions = vec![]; i += 1; - }, + } Err(_) => { println!("Txn failed. Retry."); std::thread::sleep(std::time::Duration::from_millis(1000)); - }, + } } } else { i += 1; @@ -541,11 +550,7 @@ fn create_metadata_account_call( Some(_val) => pubkey_of(app_matches, "mint").unwrap(), None => new_mint.pubkey(), }; - let metadata_seeds = &[ - PREFIX.as_bytes(), - &program_key.as_ref(), - mint_key.as_ref(), - ]; + let metadata_seeds = &[PREFIX.as_bytes(), &program_key.as_ref(), mint_key.as_ref()]; let (metadata_key, _) = Pubkey::find_program_address(metadata_seeds, &program_key); let mut new_mint_instructions = vec![ @@ -568,22 +573,21 @@ fn create_metadata_account_call( .unwrap(), ]; - let new_metadata_instruction = - create_metadata_accounts( - program_key, - metadata_key, - mint_key, - payer.pubkey(), - payer.pubkey(), - update_authority.pubkey(), - name, - symbol, - uri, - None, - 0, - update_authority.pubkey() != payer.pubkey(), - mutable, - ); + let new_metadata_instruction = create_metadata_accounts( + program_key, + metadata_key, + mint_key, + payer.pubkey(), + payer.pubkey(), + update_authority.pubkey(), + name, + symbol, + uri, + None, + 0, + update_authority.pubkey() != payer.pubkey(), + mutable, + ); let mut instructions = vec![new_metadata_instruction]; @@ -870,7 +874,8 @@ fn main() { ); } ("mint_new_edition_from_master_edition_via_token", Some(arg_matches)) => { - let (edition, edition_key, mint) = mint_edition_via_token_call(arg_matches, payer, client); + let (edition, edition_key, mint) = + mint_edition_via_token_call(arg_matches, payer, client); println!( "New edition: {:?}\nParent edition: {:?}\nEdition number: {:?}\nToken mint: {:?}", edition_key, edition.parent, edition.edition, mint diff --git a/rust/token-vault/program/src/processor.rs b/rust/token-vault/program/src/processor.rs index 335dca8..6e809c9 100644 --- a/rust/token-vault/program/src/processor.rs +++ b/rust/token-vault/program/src/processor.rs @@ -304,8 +304,8 @@ pub fn process_mint_fractional_shares( assert_token_program_matches_package(token_program_info)?; assert_token_matching(&vault, token_program_info)?; assert_owned_by(vault_info, program_id)?; - assert_owned_by(fraction_mint_info, &token_program_info.key)?; - assert_owned_by(fraction_treasury_info, &token_program_info.key)?; + assert_owned_by(fraction_mint_info, token_program_info.key)?; + assert_owned_by(fraction_treasury_info, token_program_info.key)?; assert_vault_authority_correct(&vault, vault_authority_info)?; if vault.state != VaultState::Active { @@ -849,7 +849,7 @@ pub fn process_add_token_to_inactivated_vault( let seeds = &[ PREFIX.as_bytes(), - &program_id.as_ref(), + program_id.as_ref(), vault_info.key.as_ref(), ]; let (authority, _) = Pubkey::find_program_address(seeds, program_id); @@ -964,10 +964,10 @@ pub fn process_init_vault( let seeds = &[ PREFIX.as_bytes(), - &program_id.as_ref(), + program_id.as_ref(), vault_info.key.as_ref(), ]; - let (authority, _) = Pubkey::find_program_address(seeds, &program_id); + let (authority, _) = Pubkey::find_program_address(seeds, program_id); match fraction_mint.mint_authority { solana_program::program_option::COption::None => { diff --git a/rust/token-vault/program/src/utils.rs b/rust/token-vault/program/src/utils.rs index 15b0c24..b329ed7 100644 --- a/rust/token-vault/program/src/utils.rs +++ b/rust/token-vault/program/src/utils.rs @@ -97,7 +97,7 @@ pub fn create_or_allocate_account_raw<'a>( if required_lamports > 0 { msg!("Transfer {} lamports to the new account", required_lamports); invoke( - &system_instruction::transfer(&payer_info.key, new_account_info.key, required_lamports), + &system_instruction::transfer(payer_info.key, new_account_info.key, required_lamports), &[ payer_info.clone(), new_account_info.clone(), @@ -110,14 +110,14 @@ pub fn create_or_allocate_account_raw<'a>( invoke_signed( &system_instruction::allocate(new_account_info.key, size.try_into().unwrap()), &[new_account_info.clone(), system_program_info.clone()], - &[&signer_seeds], + &[signer_seeds], )?; msg!("Assign the account to the owning program"); invoke_signed( &system_instruction::assign(new_account_info.key, &program_id), &[new_account_info.clone(), system_program_info.clone()], - &[&signer_seeds], + &[signer_seeds], )?; msg!("Completed assignation!"); @@ -268,7 +268,7 @@ pub fn assert_derivation( account: &AccountInfo, path: &[&[u8]], ) -> Result { - let (key, bump) = Pubkey::find_program_address(&path, program_id); + let (key, bump) = Pubkey::find_program_address(path, program_id); if key != *account.key { return Err(VaultError::DerivedKeyInvalid.into()); } diff --git a/rust/token-vault/test/src/main.rs b/rust/token-vault/test/src/main.rs index 5bffffe..4570f13 100644 --- a/rust/token-vault/test/src/main.rs +++ b/rust/token-vault/test/src/main.rs @@ -50,7 +50,7 @@ fn initialize_vault(app_matches: &ArgMatches, payer: Keypair, client: RpcClient) let vault = Keypair::new(); let allow_further_share_creation = app_matches.is_present("allow_further_share_creation"); - let seeds = &[PREFIX.as_bytes(), &program_key.as_ref()]; + let seeds = &[PREFIX.as_bytes(), program_key.as_ref()]; let (authority, _) = Pubkey::find_program_address(seeds, &program_key); let instructions = [ @@ -241,11 +241,11 @@ fn add_token_to_vault(app_matches: &ArgMatches, payer: Keypair, client: RpcClien let clone_of_key = token_mint.pubkey().clone(); let seeds = &[ PREFIX.as_bytes(), - &vault_key.as_ref(), - &clone_of_key.as_ref(), + vault_key.as_ref(), + clone_of_key.as_ref(), ]; let (safety_deposit_box, _) = Pubkey::find_program_address(seeds, &program_key); - let seeds = &[PREFIX.as_bytes(), &program_key.as_ref()]; + let seeds = &[PREFIX.as_bytes(), program_key.as_ref()]; let (authority, _) = Pubkey::find_program_address(seeds, &program_key); let instructions = [ @@ -364,7 +364,7 @@ fn activate_vault(app_matches: &ArgMatches, payer: Keypair, client: RpcClient) - let vault_account = client.get_account(&vault_key).unwrap(); let vault: Vault = try_from_slice_unchecked(&vault_account.data).unwrap(); - let seeds = &[PREFIX.as_bytes(), &program_key.as_ref()]; + let seeds = &[PREFIX.as_bytes(), program_key.as_ref()]; let (mint_authority, _) = Pubkey::find_program_address(seeds, &program_key); let instructions = [create_activate_vault_instruction( @@ -422,7 +422,7 @@ fn combine_vault(app_matches: &ArgMatches, payer: Keypair, client: RpcClient) -> try_from_slice_unchecked(&external_price_account.data).unwrap(); let payment_account = Keypair::new(); - let seeds = &[PREFIX.as_bytes(), &program_key.as_ref()]; + let seeds = &[PREFIX.as_bytes(), program_key.as_ref()]; let (uncirculated_burn_authority, _) = Pubkey::find_program_address(seeds, &program_key); let transfer_authority = Keypair::new(); @@ -572,7 +572,7 @@ fn redeem_shares(app_matches: &ArgMatches, payer: Keypair, client: RpcClient) -> let burn_authority = Keypair::new(); let mut signers = vec![&payer, &vault_authority, &burn_authority]; - let seeds = &[PREFIX.as_bytes(), &program_key.as_ref()]; + let seeds = &[PREFIX.as_bytes(), program_key.as_ref()]; let (transfer_authority, _) = Pubkey::find_program_address(seeds, &program_key); let mut instructions = vec![]; @@ -662,7 +662,7 @@ fn withdraw_tokens(app_matches: &ArgMatches, payer: Keypair, client: RpcClient) .unwrap(); let mut signers = vec![&payer, &vault_authority]; - let seeds = &[PREFIX.as_bytes(), &program_key.as_ref()]; + let seeds = &[PREFIX.as_bytes(), program_key.as_ref()]; let (transfer_authority, _) = Pubkey::find_program_address(seeds, &program_key); let mut instructions = vec![]; @@ -725,7 +725,7 @@ fn mint_shares(app_matches: &ArgMatches, payer: Keypair, client: RpcClient) -> P let vault: Vault = try_from_slice_unchecked(&vault_account.data).unwrap(); let signers = vec![&payer, &vault_authority]; - let seeds = &[PREFIX.as_bytes(), &program_key.as_ref()]; + let seeds = &[PREFIX.as_bytes(), program_key.as_ref()]; let (mint_authority, _) = Pubkey::find_program_address(seeds, &program_key); let number_of_shares: u64 = app_matches @@ -774,7 +774,7 @@ fn withdraw_shares(app_matches: &ArgMatches, payer: Keypair, client: RpcClient) .unwrap(); let mut signers = vec![&payer, &vault_authority]; - let seeds = &[PREFIX.as_bytes(), &program_key.as_ref()]; + let seeds = &[PREFIX.as_bytes(), program_key.as_ref()]; let (transfer_authority, _) = Pubkey::find_program_address(seeds, &program_key); let mut instructions = vec![];