From 2d402e9401bade4bfbdaddc0313ffb67b2be31e7 Mon Sep 17 00:00:00 2001 From: Andrei Silviu Dragnea Date: Wed, 30 Aug 2023 14:19:40 +0300 Subject: [PATCH 1/3] Upgrade Solana to v1.16.11 --- .github/workflows/deploy.py | 4 +- Dockerfile | 19 +- evm_loader/Cargo.lock | 1166 ++++++++++++----- evm_loader/api/Cargo.toml | 2 +- evm_loader/cli/Cargo.toml | 8 +- evm_loader/lib/Cargo.toml | 12 +- evm_loader/program/Cargo.toml | 4 +- .../program/src/external_programs/metaplex.rs | 15 +- rust-toolchain.toml | 2 +- 9 files changed, 861 insertions(+), 371 deletions(-) diff --git a/.github/workflows/deploy.py b/.github/workflows/deploy.py index 08fdbd02d..45e365b9e 100644 --- a/.github/workflows/deploy.py +++ b/.github/workflows/deploy.py @@ -30,8 +30,8 @@ DOCKER_USER = os.environ.get("DHUBU") DOCKER_PASSWORD = os.environ.get("DHUBP") IMAGE_NAME = 'neonlabsorg/evm_loader' -SOLANA_NODE_VERSION = 'v1.14.20' -SOLANA_BPF_VERSION = 'v1.14.20' +SOLANA_NODE_VERSION = 'v1.16.11' +SOLANA_BPF_VERSION = 'v1.16.11' VERSION_BRANCH_TEMPLATE = r"[vt]{1}\d{1,2}\.\d{1,2}\.x.*" docker_client = docker.APIClient() diff --git a/Dockerfile b/Dockerfile index 84c753576..b353cd3b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ ARG SOLANA_IMAGE # Install BPF SDK -FROM solanalabs/rust:1.64.0 AS builder +FROM solanalabs/rust:1.69.0 AS builder RUN cargo install rustfilt WORKDIR /opt ARG SOLANA_BPF_VERSION -RUN sh -c "$(curl -sSfL https://release.solana.com/"${SOLANA_BPF_VERSION}"/install)" && \ - /root/.local/share/solana/install/active_release/bin/sdk/bpf/scripts/install.sh +RUN sh -c "$(curl -sSfL https://release.solana.com/"${SOLANA_BPF_VERSION}"/install)" ENV PATH=/root/.local/share/solana/install/active_release/bin:/usr/local/cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin @@ -18,13 +17,13 @@ ENV NEON_REVISION=${REVISION} RUN cargo fmt --check && \ cargo clippy --release && \ cargo build --release && \ - cargo build-sbf --arch bpf --features devnet && cp target/deploy/evm_loader.so target/deploy/evm_loader-devnet.so && \ - cargo build-sbf --arch bpf --features testnet && cp target/deploy/evm_loader.so target/deploy/evm_loader-testnet.so && \ - cargo build-sbf --arch bpf --features govertest && cp target/deploy/evm_loader.so target/deploy/evm_loader-govertest.so && \ - cargo build-sbf --arch bpf --features govertest,emergency && cp target/deploy/evm_loader.so target/deploy/evm_loader-govertest-emergency.so && \ - cargo build-sbf --arch bpf --features mainnet && cp target/deploy/evm_loader.so target/deploy/evm_loader-mainnet.so && \ - cargo build-sbf --arch bpf --features mainnet,emergency && cp target/deploy/evm_loader.so target/deploy/evm_loader-mainnet-emergency.so && \ - cargo build-sbf --arch bpf --features ci --dump + cargo build-bpf --features devnet && cp target/deploy/evm_loader.so target/deploy/evm_loader-devnet.so && \ + cargo build-bpf --features testnet && cp target/deploy/evm_loader.so target/deploy/evm_loader-testnet.so && \ + cargo build-bpf --features govertest && cp target/deploy/evm_loader.so target/deploy/evm_loader-govertest.so && \ + cargo build-bpf --features govertest,emergency && cp target/deploy/evm_loader.so target/deploy/evm_loader-govertest-emergency.so && \ + cargo build-bpf --features mainnet && cp target/deploy/evm_loader.so target/deploy/evm_loader-mainnet.so && \ + cargo build-bpf --features mainnet,emergency && cp target/deploy/evm_loader.so target/deploy/evm_loader-mainnet-emergency.so && \ + cargo build-bpf --features ci --dump # Build Solidity contracts FROM ethereum/solc:0.8.0 AS solc diff --git a/evm_loader/Cargo.lock b/evm_loader/Cargo.lock index 68eb73a2a..c12d51345 100644 --- a/evm_loader/Cargo.lock +++ b/evm_loader/Cargo.lock @@ -34,7 +34,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher 0.3.0", + "cipher", "cpufeatures", "opaque-debug", ] @@ -47,7 +47,7 @@ checksum = "589c637f0e68c877bbd59a4599bbe849cac8e5f3e4b5a3ebae8f528cd218dcdc" dependencies = [ "aead", "aes", - "cipher 0.3.0", + "cipher", "ctr", "polyval", "subtle", @@ -65,6 +65,18 @@ dependencies = [ "version_check", ] +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "getrandom 0.2.9", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" version = "0.7.20" @@ -113,6 +125,129 @@ version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +[[package]] +name = "ark-bn254" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-ec" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" +dependencies = [ + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", + "itertools", + "num-traits", + "zeroize", +] + +[[package]] +name = "ark-ff" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" +dependencies = [ + "ark-ff-asm", + "ark-ff-macros", + "ark-serialize", + "ark-std", + "derivative", + "digest 0.10.7", + "itertools", + "num-bigint 0.4.3", + "num-traits", + "paste", + "rustc_version", + "zeroize", +] + +[[package]] +name = "ark-ff-asm" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" +dependencies = [ + "quote 1.0.32", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" +dependencies = [ + "num-bigint 0.4.3", + "num-traits", + "proc-macro2 1.0.66", + "quote 1.0.32", + "syn 1.0.109", +] + +[[package]] +name = "ark-poly" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", +] + +[[package]] +name = "ark-serialize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" +dependencies = [ + "ark-serialize-derive", + "ark-std", + "digest 0.10.7", + "num-bigint 0.4.3", +] + +[[package]] +name = "ark-serialize-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" +dependencies = [ + "proc-macro2 1.0.66", + "quote 1.0.32", + "syn 1.0.109", +] + +[[package]] +name = "ark-std" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + +[[package]] +name = "array-bytes" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ad284aeb45c13f2fb4f084de4a420ebf447423bdf9386c0540ce33cb3ef4b8c" + [[package]] name = "array-init" version = "2.1.0" @@ -182,11 +317,22 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + [[package]] name = "async-compression" -version = "0.3.15" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +checksum = "d495b6dc0184693324491a5ac05f559acc97bf937ab31d7a1c33dd0016be6d2b" dependencies = [ "brotli", "flate2", @@ -296,9 +442,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "base64ct" @@ -332,16 +478,16 @@ dependencies = [ [[package]] name = "blake3" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" +checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -375,18 +521,41 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" dependencies = [ - "borsh-derive", + "borsh-derive 0.9.3", "hashbrown 0.11.2", ] +[[package]] +name = "borsh" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" +dependencies = [ + "borsh-derive 0.10.3", + "hashbrown 0.13.2", +] + [[package]] name = "borsh-derive" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", + "borsh-derive-internal 0.9.3", + "borsh-schema-derive-internal 0.9.3", + "proc-macro-crate 0.1.5", + "proc-macro2 1.0.66", + "syn 1.0.109", +] + +[[package]] +name = "borsh-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" +dependencies = [ + "borsh-derive-internal 0.10.3", + "borsh-schema-derive-internal 0.10.3", "proc-macro-crate 0.1.5", "proc-macro2 1.0.66", "syn 1.0.109", @@ -403,6 +572,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "borsh-derive-internal" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" +dependencies = [ + "proc-macro2 1.0.66", + "quote 1.0.32", + "syn 1.0.109", +] + [[package]] name = "borsh-schema-derive-internal" version = "0.9.3" @@ -414,6 +594,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "borsh-schema-derive-internal" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" +dependencies = [ + "proc-macro2 1.0.66", + "quote 1.0.32", + "syn 1.0.109", +] + [[package]] name = "brotli" version = "3.3.4" @@ -557,16 +748,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - [[package]] name = "clap" version = "2.34.0" @@ -591,7 +772,7 @@ dependencies = [ "atty", "bitflags", "clap_lex", - "indexmap", + "indexmap 1.9.3", "once_cell", "strsim 0.10.0", "termcolor", @@ -673,17 +854,26 @@ dependencies = [ "unreachable", ] +[[package]] +name = "concurrent-queue" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "console" -version = "0.15.5" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -734,9 +924,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" @@ -860,17 +1050,17 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher 0.3.0", + "cipher", ] [[package]] name = "ctrlc" -version = "3.2.5" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbcf33c2a618cbe41ee43ae6e9f2e48368cd9f9db2896f10167d8d762679f639" +checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e" dependencies = [ - "nix 0.26.2", - "windows-sys 0.45.0", + "nix", + "windows-sys 0.48.0", ] [[package]] @@ -931,6 +1121,41 @@ dependencies = [ "syn 2.0.28", ] +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2 1.0.66", + "quote 1.0.32", + "strsim 0.10.0", + "syn 2.0.28", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core", + "quote 1.0.32", + "syn 2.0.28", +] + [[package]] name = "data-encoding" version = "2.3.3" @@ -966,6 +1191,17 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0" +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2 1.0.66", + "quote 1.0.32", + "syn 1.0.109", +] + [[package]] name = "dialoguer" version = "0.10.4" @@ -989,9 +1225,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", "crypto-common", @@ -1117,34 +1353,22 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "0.8.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2953d1df47ac0eb70086ccabf0275aa8da8591a28bd358ee2b52bd9f9e3ff9e9" +checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8958699f9359f0b04e691a13850d48b7de329138023876d07cbd024c2c820598" -dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.32", - "syn 1.0.109", -] - -[[package]] -name = "enum_dispatch" -version = "0.3.11" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" +checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" dependencies = [ - "once_cell", "proc-macro2 1.0.66", "quote 1.0.32", - "syn 1.0.109", + "syn 2.0.28", ] [[package]] @@ -1160,6 +1384,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" @@ -1202,7 +1432,7 @@ version = "1.3.0-dev" dependencies = [ "arrayref", "bincode", - "borsh", + "borsh 0.9.3", "cfg-if", "const_format", "ethnum", @@ -1400,15 +1630,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -1490,7 +1711,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -1512,7 +1733,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash", + "ahash 0.7.6", ] [[package]] @@ -1520,10 +1741,22 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash", + "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.3.3" @@ -1565,9 +1798,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hidapi" -version = "1.5.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "798154e4b6570af74899d71155fb0072d5b17e6aa12f39c8ef22c60fb8ec99e7" +checksum = "723777263b0dcc5730aec947496bd8c3940ba63c15f5633b288cc615f4f6af79" dependencies = [ "cc", "libc", @@ -1597,7 +1830,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -1677,15 +1910,16 @@ 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", + "rustls 0.21.7", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", ] [[package]] @@ -1725,6 +1959,12 @@ dependencies = [ "cxx-build", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "0.3.0" @@ -1762,24 +2002,26 @@ dependencies = [ ] [[package]] -name = "indicatif" -version = "0.16.2" +name = "indexmap" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ - "console", - "lazy_static", - "number_prefix", - "regex", + "equivalent", + "hashbrown 0.14.0", ] [[package]] -name = "inout" -version = "0.1.3" +name = "indicatif" +version = "0.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" dependencies = [ - "generic-array", + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", ] [[package]] @@ -1834,9 +2076,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -1873,19 +2115,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.142" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libsecp256k1" @@ -1944,12 +2176,6 @@ dependencies = [ "cc", ] -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - [[package]] name = "linked_list_allocator" version = "0.10.5" @@ -2022,7 +2248,7 @@ version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -2042,9 +2268,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.6.5" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ "autocfg", ] @@ -2058,6 +2284,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + [[package]] name = "merlin" version = "3.0.0" @@ -2105,13 +2340,13 @@ dependencies = [ [[package]] name = "mpl-token-auth-rules" -version = "1.4.1" +version = "1.4.3-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c376f2cc7dae80e2949cd6ca8a2420b3c61c1ecb7a275c6433d9a4d2d24f994d" +checksum = "81a34d740606a10a9dac7507d0c9025d72e0ce311c68ae85b6634982cf69a9c6" dependencies = [ - "borsh", + "borsh 0.9.3", "bytemuck", - "mpl-token-metadata-context-derive", + "mpl-token-metadata-context-derive 0.2.1", "num-derive", "num-traits", "rmp-serde", @@ -2124,14 +2359,14 @@ dependencies = [ [[package]] name = "mpl-token-metadata" -version = "1.12.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f661ff8c1d64c48cf207c0d259783d411a4249058c1b861fabd8bb6ce30ae4d8" +checksum = "654976568c99887549e1291e7b7e55ae31a70732e56ebb25cb1cdfc08c018333" dependencies = [ "arrayref", - "borsh", + "borsh 0.9.3", "mpl-token-auth-rules", - "mpl-token-metadata-context-derive", + "mpl-token-metadata-context-derive 0.3.0", "mpl-utils", "num-derive", "num-traits", @@ -2152,16 +2387,25 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "mpl-token-metadata-context-derive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5a739019e11d93661a64ef5fe108ab17c79b35961e944442ff6efdd460ad01a" +dependencies = [ + "quote 1.0.32", + "syn 1.0.109", +] + [[package]] name = "mpl-utils" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822133b6cba8f9a43e5e0e189813be63dd795858f54155c729833be472ffdb51" +checksum = "3f2e4f92aec317d5853c0cc4c03c55f5178511c45bb3dbb441aea63117bf3dc9" dependencies = [ "arrayref", - "borsh", "solana-program", - "spl-token", + "spl-token-2022", ] [[package]] @@ -2255,18 +2499,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - [[package]] name = "nix" version = "0.26.2" @@ -2276,6 +2508,8 @@ dependencies = [ "bitflags", "cfg-if", "libc", + "memoffset 0.7.1", + "pin-utils", "static_assertions", ] @@ -2414,7 +2648,16 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" +dependencies = [ + "num_enum_derive 0.6.1", ] [[package]] @@ -2429,6 +2672,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num_enum_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2 1.0.66", + "quote 1.0.32", + "syn 2.0.28", +] + [[package]] name = "number_prefix" version = "0.4.0" @@ -2556,7 +2811,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -2668,6 +2923,12 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "portable-atomic" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" + [[package]] name = "postgres" version = "0.19.5" @@ -2688,7 +2949,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b7fa9f396f51dffd61546fd8573ee20592287996568e6175ceb0f8699ad75d" dependencies = [ - "base64 0.21.0", + "base64 0.21.3", "byteorder", "bytes", "fallible-iterator", @@ -2774,17 +3035,16 @@ dependencies = [ [[package]] name = "quinn" -version = "0.8.5" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b435e71d9bfa0d8889927231970c51fb89c58fa63bffcab117c9c7a41e5ef8f" +checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" dependencies = [ "bytes", - "futures-channel", - "futures-util", - "fxhash", + "pin-project-lite", "quinn-proto", "quinn-udp", - "rustls", + "rustc-hash", + "rustls 0.20.8", "thiserror", "tokio", "tracing", @@ -2793,17 +3053,16 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.8.4" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fce546b9688f767a57530652488420d419a8b1f44a478b451c3d1ab6d992a55" +checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9" dependencies = [ "bytes", - "fxhash", "rand 0.8.5", "ring", - "rustls", + "rustc-hash", + "rustls 0.20.8", "rustls-native-certs", - "rustls-pemfile 0.2.1", "slab", "thiserror", "tinyvec", @@ -2813,16 +3072,15 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.1.4" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07946277141531aea269befd949ed16b2c85a780ba1043244eda0969e538e54" +checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" dependencies = [ - "futures-util", "libc", "quinn-proto", "socket2 0.4.9", - "tokio", "tracing", + "windows-sys 0.42.0", ] [[package]] @@ -2975,9 +3233,9 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" +checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring", @@ -3051,12 +3309,12 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "reqwest" -version = "0.11.16" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ "async-compression", - "base64 0.21.0", + "base64 0.21.3", "bytes", "encoding_rs", "futures-core", @@ -3073,20 +3331,20 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", - "rustls-pemfile 1.0.2", + "rustls 0.21.7", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", + "webpki-roots 0.25.2", "winreg", ] @@ -3111,7 +3369,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -3148,13 +3406,22 @@ dependencies = [ [[package]] name = "rpassword" -version = "6.0.1" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf099a1888612545b683d2661a1940089f6c2e5a8e38979b2159da876bfd956" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +dependencies = [ + "libc", + "rtoolbox", + "winapi", +] + +[[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" dependencies = [ "libc", - "serde", - "serde_json", "winapi", ] @@ -3220,6 +3487,18 @@ dependencies = [ "webpki", ] +[[package]] +name = "rustls" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + [[package]] name = "rustls-native-certs" version = "0.6.2" @@ -3227,27 +3506,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.2", + "rustls-pemfile", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "0.2.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64 0.13.1", + "base64 0.21.3", ] [[package]] -name = "rustls-pemfile" -version = "1.0.2" +name = "rustls-webpki" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ - "base64 0.21.0", + "ring", + "untrusted", ] [[package]] @@ -3426,16 +3706,39 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +dependencies = [ + "serde", + "serde_with_macros", +] + +[[package]] +name = "serde_with_macros" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +dependencies = [ + "darling", + "proc-macro2 1.0.66", + "quote 1.0.32", + "syn 2.0.28", +] + [[package]] name = "serde_yaml" -version = "0.8.26" +version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap", + "indexmap 2.0.0", + "itoa", "ryu", "serde", - "yaml-rust", + "unsafe-libyaml", ] [[package]] @@ -3446,7 +3749,7 @@ checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -3470,7 +3773,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -3491,7 +3794,7 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54c2bb1a323307527314a36bfb73f24febb08ce2b8a554bf4ffd6f51ad15198c" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "keccak", ] @@ -3612,12 +3915,12 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e4e7166dc87b235d087997fd89724d82d0b83f75551fbb1d3d692a47ac237f" +checksum = "85385036e01ee2912cf362976b9da182147041a133ef7594ee9b0e77d8244a49" dependencies = [ "Inflector", - "base64 0.13.1", + "base64 0.21.3", "bincode", "bs58", "bv", @@ -3628,7 +3931,6 @@ dependencies = [ "solana-address-lookup-table-program", "solana-config-program", "solana-sdk", - "solana-vote-program", "spl-token", "spl-token-2022", "thiserror", @@ -3637,9 +3939,9 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8669314c1bab81668baff87db9e81fcf72e15f61d9904e423f13911d8e3949cc" +checksum = "3d00758171301d4c42e12630e0df681dad4d9e34ce09225d5c2a86989cf7b6c9" dependencies = [ "bincode", "bytemuck", @@ -3658,16 +3960,16 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9492c78a61eb825fee7e2e632037b89ff6e09023a5d37ee6639318316fa071d2" +checksum = "6d88eb589b7310d56cb3b99b496a113b4cc977667bd64fc2c19cea782a8dcbc7" dependencies = [ "bincode", "byteorder", "libsecp256k1", "log", + "rand 0.7.3", "solana-measure", - "solana-metrics", "solana-program-runtime", "solana-sdk", "solana-zk-token-sdk", @@ -3677,9 +3979,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d294b68c3a9f67aedde39c799fed85139d779a332280094054446f5b55a2edad" +checksum = "be4d514d9fd7475d16eb993842e3acaa76193fb202adbc232a97f3e5e9d08f77" dependencies = [ "chrono", "clap 2.34.0", @@ -3695,9 +3997,9 @@ dependencies = [ [[package]] name = "solana-cli" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e21daca34f4f0462c54931193e6e613c589bb3c312ee79f35dc0994c8fe8bd9f" +checksum = "81751d8492f07ec17e737070b7291f3484aca7dd711a154bf699cf410f2b70d5" dependencies = [ "bincode", "bs58", @@ -3707,6 +4009,7 @@ dependencies = [ "criterion-stats", "crossbeam-channel", "ctrlc", + "hex", "humantime", "log", "num-traits", @@ -3727,8 +4030,13 @@ dependencies = [ "solana-faucet", "solana-logger", "solana-program-runtime", + "solana-pubsub-client", "solana-remote-wallet", + "solana-rpc-client", + "solana-rpc-client-api", + "solana-rpc-client-nonce-utils", "solana-sdk", + "solana-tpu-client", "solana-transaction-status", "solana-version", "solana-vote-program", @@ -3740,9 +4048,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "073a01cadf661c50373549add14d21436dcfed0fbc88022817481c6a18340fc8" +checksum = "8583534dbe597abc94799010f372a7e88a7ccf15e320adaf235a8181eacfce72" dependencies = [ "dirs-next", "lazy_static", @@ -3756,12 +4064,12 @@ dependencies = [ [[package]] name = "solana-cli-output" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953484f2c794afb2643907158f3433c209becd12e3943449d281ef6c1b68c69e" +checksum = "2fe179de5911cf6ef78ea99f856012a31df7d307122ac5a12ce3ef5a543d38bb" dependencies = [ "Inflector", - "base64 0.13.1", + "base64 0.21.3", "chrono", "clap 2.34.0", "console", @@ -3774,7 +4082,7 @@ dependencies = [ "solana-account-decoder", "solana-clap-utils", "solana-cli-config", - "solana-client", + "solana-rpc-client-api", "solana-sdk", "solana-transaction-status", "solana-vote-program", @@ -3783,63 +4091,42 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3c55fbbc68dbf7b2df2ba01038d6d2a65522deec3db9c7b15e9c8c1d9dc526" +checksum = "1f22befc95f07d6c832ad50fc7e62b2b9e2b64a5b4e188481ab74aa8ddfbe08b" dependencies = [ - "async-mutex", "async-trait", - "base64 0.13.1", "bincode", - "bs58", - "bytes", - "clap 2.34.0", - "crossbeam-channel", - "enum_dispatch", "futures", "futures-util", - "indexmap", + "indexmap 1.9.3", "indicatif", - "itertools", - "jsonrpc-core", - "lazy_static", "log", "quinn", - "quinn-proto", "rand 0.7.3", - "rand_chacha 0.2.2", "rayon", - "reqwest", - "rustls", - "semver", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-clap-utils", - "solana-faucet", + "solana-connection-cache", "solana-measure", "solana-metrics", - "solana-net-utils", + "solana-pubsub-client", + "solana-quic-client", + "solana-rpc-client", + "solana-rpc-client-api", + "solana-rpc-client-nonce-utils", "solana-sdk", "solana-streamer", - "solana-transaction-status", - "solana-version", - "solana-vote-program", - "spl-token-2022", + "solana-thin-client", + "solana-tpu-client", + "solana-udp-client", "thiserror", "tokio", - "tokio-stream", - "tokio-tungstenite", - "tungstenite", - "url", ] [[package]] name = "solana-config-program" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6faa5fbf80687e39850c3139561b38d35f9d35e248adaccc4b6379ee41846638" +checksum = "285384cd2412125c6c1843334e02d1d22b1bab5099d8e767fb000d746da03c40" dependencies = [ "bincode", "chrono", @@ -3849,11 +4136,32 @@ dependencies = [ "solana-sdk", ] +[[package]] +name = "solana-connection-cache" +version = "1.16.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29fc775fefc381ef601c9179474b1d8a9b5c5788b4e3e22a1bbb3505884ad05c" +dependencies = [ + "async-trait", + "bincode", + "futures-util", + "indexmap 1.9.3", + "log", + "rand 0.7.3", + "rayon", + "rcgen", + "solana-measure", + "solana-metrics", + "solana-sdk", + "thiserror", + "tokio", +] + [[package]] name = "solana-faucet" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3084d18786564211573d5043550ea2750c049eaf3c75ae35ed8e9e845a0dda" +checksum = "df81f826db6a21fe184db44d61b57e38101247137ba50074d1b36ca7c44869a2" dependencies = [ "bincode", "byteorder", @@ -3875,13 +4183,13 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a100b7fa8198c20354eb7256c0d9789107d8a62280221f3efe15f7c9dc4cec" +checksum = "a5bea7d4af435e9dea1399e89cb1318d733abae64a5d5982cff6391d9c486a5d" dependencies = [ - "ahash", + "ahash 0.8.3", "blake3", - "block-buffer 0.9.0", + "block-buffer 0.10.4", "bs58", "bv", "byteorder", @@ -3889,7 +4197,6 @@ dependencies = [ "either", "generic-array", "getrandom 0.1.16", - "hashbrown 0.12.3", "im", "lazy_static", "log", @@ -3909,21 +4216,21 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f527f44601b35dd67d11bc72f2f7512976a466f9304ef574b87dac83ced8a42" +checksum = "86c30e992a5ac91b85c07a64bfb5c70e7bf734cb6494289ca59963d03e788e7d" dependencies = [ "proc-macro2 1.0.66", "quote 1.0.32", "rustc_version", - "syn 1.0.109", + "syn 2.0.28", ] [[package]] name = "solana-logger" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8632c8bc480bb5615b70a18b807ede73024aebc7761503ff86a70b7f4906ae47" +checksum = "dee8421b323150e02409c3588da5796a853bba131df17e9ec1073818158e278f" dependencies = [ "env_logger", "lazy_static", @@ -3932,9 +4239,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a3d09e890127454f43ffc37a6e23a375fe86c5159c4e5d4767d446ddb7e93a3" +checksum = "416490db2eaaa7ff2752684f65a20eed25234d959d08da4b76488ccde8948ed1" dependencies = [ "log", "solana-sdk", @@ -3942,9 +4249,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185128a041b4c1eaeec7f2034673ce89f99ee364fcb4405313edb1bc26ac95dd" +checksum = "957c64cccf5e829f2a604953c15ab338c9da46a45b46d5e5e08460f5b78672ad" dependencies = [ "crossbeam-channel", "gethostname", @@ -3956,15 +4263,15 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16497e2cc753a0a35fb34c73846495fa21ba04a4e64cb92d818c4cb31c935fcc" +checksum = "502144475808f08f5c980d628a86f223f0a117f66ebf6ef93217b6b2257fc477" dependencies = [ "bincode", "clap 3.2.23", "crossbeam-channel", "log", - "nix 0.24.3", + "nix", "rand 0.7.3", "serde", "serde_derive", @@ -3978,11 +4285,11 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc65488c030174215a0176e44f889aed937c172ea1886c878f25ad7ce63f189" +checksum = "1d1b0b4344b5ddc73ea2185cf7b3b6ee886a30b7fcd9beb634758f78e9828b35" dependencies = [ - "ahash", + "ahash 0.8.3", "bincode", "bv", "caps", @@ -3993,7 +4300,7 @@ dependencies = [ "lazy_static", "libc", "log", - "nix 0.24.3", + "nix", "rand 0.7.3", "rayon", "serde", @@ -4005,16 +4312,21 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ad5f48743ce505f6139a07e20aecdc689def12da7230fed661c2073ab97df8" +checksum = "ad831bc4fa40b061daf6f189c8764e8b1e0e340ea16e189166ef8f6b530c3679" dependencies = [ - "base64 0.13.1", + "ark-bn254", + "ark-ec", + "ark-ff", + "ark-serialize", + "array-bytes", + "base64 0.21.3", "bincode", "bitflags", "blake3", - "borsh", - "borsh-derive", + "borsh 0.10.3", + "borsh 0.9.3", "bs58", "bv", "bytemuck", @@ -4029,7 +4341,8 @@ dependencies = [ "libc", "libsecp256k1", "log", - "memoffset 0.6.5", + "memoffset 0.9.0", + "num-bigint 0.4.3", "num-derive", "num-traits", "parking_lot", @@ -4054,20 +4367,20 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e837e539fee15e553bfc6e041bcfbc1113db6e437c21f0319536c4ea1621b884" +checksum = "d47fecc63f394e9498c737f6ccccbdebeb6782eddc2309953ab7040317aa91c7" dependencies = [ - "base64 0.13.1", + "base64 0.21.3", "bincode", "eager", "enum-iterator", "itertools", "libc", - "libloading", "log", "num-derive", "num-traits", + "percentage", "rand 0.7.3", "rustc_version", "serde", @@ -4076,14 +4389,68 @@ dependencies = [ "solana-measure", "solana-metrics", "solana-sdk", + "solana_rbpf", + "thiserror", +] + +[[package]] +name = "solana-pubsub-client" +version = "1.16.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a642c6066f07a0915dd5849dd5ad71b4bb6d180930d0a1049de07161b7f4ec5" +dependencies = [ + "crossbeam-channel", + "futures-util", + "log", + "reqwest", + "semver", + "serde", + "serde_derive", + "serde_json", + "solana-account-decoder", + "solana-rpc-client-api", + "solana-sdk", + "thiserror", + "tokio", + "tokio-stream", + "tokio-tungstenite", + "tungstenite", + "url", +] + +[[package]] +name = "solana-quic-client" +version = "1.16.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e2d3e51391139ffb2568e96617ca973a19306daff21899a64efd6afc2c62b61" +dependencies = [ + "async-mutex", + "async-trait", + "futures", + "itertools", + "lazy_static", + "log", + "quinn", + "quinn-proto", + "quinn-udp", + "rcgen", + "rustls 0.20.8", + "solana-connection-cache", + "solana-measure", + "solana-metrics", + "solana-net-utils", + "solana-rpc-client-api", + "solana-sdk", + "solana-streamer", "thiserror", + "tokio", ] [[package]] name = "solana-rayon-threadlimit" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa7a1bc3d3e611952e10c9447094f5c2816b5bb8122c6710a6f28395595a671" +checksum = "f9e7173b6afdfd0c3cfd1d4d77822f69d92598ef76dee5d466c1758af3ffb29a" dependencies = [ "lazy_static", "num_cpus", @@ -4091,9 +4458,9 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e4fb5902f71b3965b75a6418874f1d2bff525e4e49108e5f2ea174a5213b66" +checksum = "61701c9e79da4324979d06adc665664f4c291d6f6687fa3fd17a8746b468af97" dependencies = [ "console", "dialoguer", @@ -4109,23 +4476,84 @@ dependencies = [ "uriparse", ] +[[package]] +name = "solana-rpc-client" +version = "1.16.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e3bb54561c87739e41a71d2fd03ce8889c68508123d1d22884ff2083edd17ef" +dependencies = [ + "async-trait", + "base64 0.21.3", + "bincode", + "bs58", + "indicatif", + "log", + "reqwest", + "semver", + "serde", + "serde_derive", + "serde_json", + "solana-account-decoder", + "solana-rpc-client-api", + "solana-sdk", + "solana-transaction-status", + "solana-version", + "solana-vote-program", + "tokio", +] + +[[package]] +name = "solana-rpc-client-api" +version = "1.16.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc45afb14e7097d88c1cf7e1b78a553d810b8733982c34f2a27739017d128efd" +dependencies = [ + "base64 0.21.3", + "bs58", + "jsonrpc-core", + "reqwest", + "semver", + "serde", + "serde_derive", + "serde_json", + "solana-account-decoder", + "solana-sdk", + "solana-transaction-status", + "solana-version", + "spl-token-2022", + "thiserror", +] + +[[package]] +name = "solana-rpc-client-nonce-utils" +version = "1.16.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a32797c6ddaa798057632f22694fd4fd523c73d34816f282dc1b3b26678679d7" +dependencies = [ + "clap 2.34.0", + "solana-clap-utils", + "solana-rpc-client", + "solana-sdk", + "thiserror", +] + [[package]] name = "solana-sdk" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c515a5a5a5cdc115044c33959eb4d091680f5e7ca8be9eb5218fb0c21bf3568" +checksum = "52dcc5c27c8bc49051ea413b75eb1a966e767a46988bd951eaf27552e9ca6e45" dependencies = [ "assert_matches", - "base64 0.13.1", + "base64 0.21.3", "bincode", "bitflags", - "borsh", + "borsh 0.10.3", "bs58", "bytemuck", "byteorder", "chrono", "derivation-path", - "digest 0.10.6", + "digest 0.10.7", "ed25519-dalek", "ed25519-dalek-bip32", "generic-array", @@ -4138,6 +4566,7 @@ dependencies = [ "memmap2", "num-derive", "num-traits", + "num_enum 0.6.1", "pbkdf2 0.11.0", "qstring", "rand 0.7.3", @@ -4148,6 +4577,7 @@ dependencies = [ "serde_bytes", "serde_derive", "serde_json", + "serde_with", "sha2 0.10.6", "sha3 0.10.7", "solana-frozen-abi", @@ -4162,38 +4592,42 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bbc3ab3070c090e1a18fd5a0a07d729d0db2bc8524414dc3e16504286d38049" +checksum = "691874c5e3ca1cc172421b8266b1bf96bfdb6d7e2685543e7604aa4de2fd07f3" dependencies = [ "bs58", "proc-macro2 1.0.66", "quote 1.0.32", "rustversion", - "syn 1.0.109", + "syn 2.0.28", ] [[package]] name = "solana-streamer" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54279b5018a6e9a98e4b4e5dad87953e64359a6f9ce3715ffcdee0691885b88" +checksum = "727684847d48c555856f8ccc4bee61166e60120d886f7bd7fd6ae2bca4a7c15b" dependencies = [ + "async-channel", + "bytes", "crossbeam-channel", "futures-util", "histogram", - "indexmap", + "indexmap 1.9.3", "itertools", "libc", "log", - "nix 0.24.3", + "nix", "pem", "percentage", "pkcs8", "quinn", + "quinn-proto", + "quinn-udp", "rand 0.7.3", "rcgen", - "rustls", + "rustls 0.20.8", "solana-metrics", "solana-perf", "solana-sdk", @@ -4202,16 +4636,56 @@ dependencies = [ "x509-parser", ] +[[package]] +name = "solana-thin-client" +version = "1.16.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9561ab3569d61f606271aa664b124ade1d612d34d73deb7e914d66d7aa174d8d" +dependencies = [ + "bincode", + "log", + "rayon", + "solana-connection-cache", + "solana-rpc-client", + "solana-rpc-client-api", + "solana-sdk", +] + +[[package]] +name = "solana-tpu-client" +version = "1.16.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "946ca90686de9ea7f39f8d253a6a5720df433d2ac5d85864514d036c2c2e7204" +dependencies = [ + "async-trait", + "bincode", + "futures-util", + "indexmap 1.9.3", + "indicatif", + "log", + "rand 0.7.3", + "rayon", + "solana-connection-cache", + "solana-measure", + "solana-metrics", + "solana-pubsub-client", + "solana-rpc-client", + "solana-rpc-client-api", + "solana-sdk", + "thiserror", + "tokio", +] + [[package]] name = "solana-transaction-status" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6fbba26070920a1d25be8b3a2835df337ddcb5df1e65e4bbed48a019604377" +checksum = "1b6d4b2c18cb19d4e0247d0ae64291fea535fe18c47a3f5d7bcfcfb52ed641b1" dependencies = [ "Inflector", - "base64 0.13.1", + "base64 0.21.3", "bincode", - "borsh", + "borsh 0.9.3", "bs58", "lazy_static", "log", @@ -4220,10 +4694,7 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-address-lookup-table-program", - "solana-measure", - "solana-metrics", "solana-sdk", - "solana-vote-program", "spl-associated-token-account", "spl-memo", "spl-token", @@ -4231,11 +4702,26 @@ dependencies = [ "thiserror", ] +[[package]] +name = "solana-udp-client" +version = "1.16.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b0d096dd071c9680221b20317bdd47fcd571dbfb1c740adbaaae223871c6fa1" +dependencies = [ + "async-trait", + "solana-connection-cache", + "solana-net-utils", + "solana-sdk", + "solana-streamer", + "thiserror", + "tokio", +] + [[package]] name = "solana-version" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122eccec6f9124b9234fde0ba6da263198f8e403f58e6535cd342f5fd3bd6c76" +checksum = "1da32fc3ba69d9ce3c691422654089d72f937c8f35298fbb55229c02ac952cc6" dependencies = [ "log", "rustc_version", @@ -4249,9 +4735,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3edcb5a3ff3a8e78441badd1f21d2d6244e33497ee341b1bcafea768c6b501e6" +checksum = "6dfcd5100d3f0c365c2ab620f28df8a0ac26f4ee466bba3fd520a198b6debcd7" dependencies = [ "bincode", "log", @@ -4263,6 +4749,7 @@ dependencies = [ "solana-frozen-abi", "solana-frozen-abi-macro", "solana-metrics", + "solana-program", "solana-program-runtime", "solana-sdk", "thiserror", @@ -4270,17 +4757,15 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.14.20" +version = "1.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d51d131cdefcb621a8034321ce487c4f788e813f81ce81e4f65eed8d4b4f2aa" +checksum = "c69f98436696bc906c366a46394819c79f33731b1148d22080204a0b714c05b3" dependencies = [ "aes-gcm-siv", - "arrayref", - "base64 0.13.1", + "base64 0.21.3", "bincode", "bytemuck", "byteorder", - "cipher 0.4.4", "curve25519-dalek", "getrandom 0.1.16", "itertools", @@ -4301,9 +4786,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.2.31" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80a28c5dfe7e8af38daa39d6561c8e8b9ed7a2f900951ebe7362ad6348d36c73" +checksum = "b3082ec3a1d4ef7879eb5b84916d5acde057abd59733eec3647e0ab8885283ef" dependencies = [ "byteorder", "combine", @@ -4315,6 +4800,7 @@ dependencies = [ "rustc-demangle", "scroll", "thiserror", + "winapi", ] [[package]] @@ -4340,7 +4826,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978dba3bcbe88d0c2c58366c254d9ea41c5f73357e72fc0bdee4d6b5fc99c8f4" dependencies = [ "assert_matches", - "borsh", + "borsh 0.9.3", "num-derive", "num-traits", "solana-program", @@ -4368,7 +4854,7 @@ dependencies = [ "bytemuck", "num-derive", "num-traits", - "num_enum", + "num_enum 0.5.11", "solana-program", "thiserror", ] @@ -4383,7 +4869,7 @@ dependencies = [ "bytemuck", "num-derive", "num-traits", - "num_enum", + "num_enum 0.5.11", "solana-program", "solana-zk-token-sdk", "spl-memo", @@ -4691,11 +5177,21 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls", + "rustls 0.20.8", "tokio", "webpki", ] +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.7", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.12" @@ -4715,12 +5211,12 @@ checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" dependencies = [ "futures-util", "log", - "rustls", + "rustls 0.20.8", "tokio", - "tokio-rustls", + "tokio-rustls 0.23.4", "tungstenite", "webpki", - "webpki-roots", + "webpki-roots 0.22.6", ] [[package]] @@ -4758,7 +5254,7 @@ version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ - "indexmap", + "indexmap 1.9.3", "toml_datetime", "winnow", ] @@ -4884,13 +5380,13 @@ dependencies = [ "httparse", "log", "rand 0.8.5", - "rustls", + "rustls 0.20.8", "sha-1", "thiserror", "url", "utf-8", "webpki", - "webpki-roots", + "webpki-roots 0.22.6", ] [[package]] @@ -4963,6 +5459,12 @@ dependencies = [ "void", ] +[[package]] +name = "unsafe-libyaml" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" + [[package]] name = "untrusted" version = "0.7.1" @@ -5062,9 +5564,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5072,16 +5574,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2 1.0.66", "quote 1.0.32", - "syn 1.0.109", + "syn 2.0.28", "wasm-bindgen-shared", ] @@ -5099,9 +5601,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote 1.0.32", "wasm-bindgen-macro-support", @@ -5109,22 +5611,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2 1.0.66", "quote 1.0.32", - "syn 1.0.109", + "syn 2.0.28", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" @@ -5155,6 +5657,12 @@ dependencies = [ "webpki", ] +[[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" @@ -5353,11 +5861,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]] @@ -5378,15 +5887,6 @@ dependencies = [ "time 0.3.20", ] -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "yasna" version = "0.5.2" diff --git a/evm_loader/api/Cargo.toml b/evm_loader/api/Cargo.toml index 464d8a992..70af0345a 100644 --- a/evm_loader/api/Cargo.toml +++ b/evm_loader/api/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] clap = "2.33.3" evm-loader = { path = "../program", default_features = false, features = ["log"] } -solana-sdk = "=1.14.20" +solana-sdk = "=1.16.11" serde = "1.0.186" serde_json = "1.0.85" ethnum = { version = "1", default_features = false, features = ["serde"] } diff --git a/evm_loader/cli/Cargo.toml b/evm_loader/cli/Cargo.toml index 791c9d192..1b2995f26 100644 --- a/evm_loader/cli/Cargo.toml +++ b/evm_loader/cli/Cargo.toml @@ -8,10 +8,10 @@ edition = "2021" [dependencies] clap = "2.33.3" evm-loader = { path = "../program", default_features = false, features = ["log"] } -solana-sdk = "=1.14.20" -solana-client = "=1.14.20" -solana-clap-utils = "=1.14.20" -solana-cli-config = "=1.14.20" +solana-sdk = "=1.16.11" +solana-client = "=1.16.11" +solana-clap-utils = "=1.16.11" +solana-cli-config = "=1.16.11" hex = "0.4.2" serde = "1.0.186" serde_json = "1.0.85" diff --git a/evm_loader/lib/Cargo.toml b/evm_loader/lib/Cargo.toml index 87ae35a45..abdedea92 100644 --- a/evm_loader/lib/Cargo.toml +++ b/evm_loader/lib/Cargo.toml @@ -9,12 +9,12 @@ edition = "2021" thiserror = "1.0" bincode = "1.3.1" evm-loader = { path = "../program", default_features = false, features = ["log", "tracing"] } -solana-sdk = "=1.14.20" -solana-client = "=1.14.20" -solana-clap-utils = "=1.14.20" -solana-cli-config = "=1.14.20" -solana-cli = "=1.14.20" -solana-transaction-status = "=1.14.20" +solana-sdk = "=1.16.11" +solana-client = "=1.16.11" +solana-clap-utils = "=1.16.11" +solana-cli-config = "=1.16.11" +solana-cli = "=1.16.11" +solana-transaction-status = "=1.16.11" spl-token = { version = "~3.5", default_features = false, features = ["no-entrypoint"] } spl-associated-token-account = { version = "~1.1", default_features = false, features = ["no-entrypoint"] } bs58 = "0.4.0" diff --git a/evm_loader/program/Cargo.toml b/evm_loader/program/Cargo.toml index 94fb50cbe..7c96e304e 100644 --- a/evm_loader/program/Cargo.toml +++ b/evm_loader/program/Cargo.toml @@ -39,10 +39,10 @@ tracing = ["serde_json"] [dependencies] linked_list_allocator = { version = "0.10", default_features = false } evm-loader-macro = { path = "../program-macro" } -solana-program = { version = "=1.14.20", default_features = false } +solana-program = { version = "=1.16.11", default_features = false } spl-token = { version = "~3.5", default_features = false, features = ["no-entrypoint"] } spl-associated-token-account = { version = "~1.1", default_features = false, features = ["no-entrypoint"] } -mpl-token-metadata = { version = "1.12", default_features = false, features = ["no-entrypoint"] } +mpl-token-metadata = { version = "1.13.2", default_features = false, features = ["no-entrypoint"] } thiserror = "1.0" arrayref = "0.3.6" hex = "0.4.2" diff --git a/evm_loader/program/src/external_programs/metaplex.rs b/evm_loader/program/src/external_programs/metaplex.rs index 8176d81a5..0f2c513ad 100644 --- a/evm_loader/program/src/external_programs/metaplex.rs +++ b/evm_loader/program/src/external_programs/metaplex.rs @@ -15,8 +15,8 @@ use mpl_token_metadata::instruction::{ CreateMasterEditionArgs, CreateMetadataAccountArgsV3, MetadataInstruction, }; use mpl_token_metadata::state::{ - CollectionDetails, Key, MasterEditionV2, Metadata, TokenMetadataAccount, TokenStandard, - MAX_MASTER_EDITION_LEN, MAX_METADATA_LEN, + Key, MasterEditionV2, Metadata, TokenMetadataAccount, TokenStandard, MAX_MASTER_EDITION_LEN, + MAX_METADATA_LEN, }; use solana_program::{ entrypoint::ProgramResult, program_error::ProgramError, program_pack::Pack, pubkey::Pubkey, @@ -90,16 +90,7 @@ fn create_metadata_accounts_v3( assert_collection_update_is_valid(false, &None, &args.data.collection)?; metadata.collection = args.data.collection.clone(); - - if let Some(details) = &args.collection_details { - match details { - CollectionDetails::V1 { size: _size } => { - metadata.collection_details = Some(CollectionDetails::V1 { size: 0 }); - } - } - } else { - metadata.collection_details = None; - } + metadata.collection_details = None; let token_standard = if mint.decimals == 0 { TokenStandard::FungibleAsset diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 10add70bb..f2415f831 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.64.0" +channel = "1.69.0" From 9701481a8c08d6433bcce0810daa9ea8f759211e Mon Sep 17 00:00:00 2001 From: Andrei Silviu Dragnea Date: Wed, 30 Aug 2023 14:21:12 +0300 Subject: [PATCH 2/3] cargo clippy --- evm_loader/cli/src/config.rs | 4 +--- evm_loader/lib/src/commands/get_storage_at.rs | 2 +- evm_loader/lib/src/types/tracer_ch_db.rs | 2 +- evm_loader/program/src/evm/precompile/ecrecover.rs | 5 +---- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/evm_loader/cli/src/config.rs b/evm_loader/cli/src/config.rs index 4e81ee87e..c9ae0d5a7 100644 --- a/evm_loader/cli/src/config.rs +++ b/evm_loader/cli/src/config.rs @@ -28,9 +28,7 @@ pub fn create(options: &ArgMatches) -> Result { .unwrap_or(&solana_cli_config.json_rpc_url), ); - let evm_loader = if let Some(value) = pubkey_of(options, "evm_loader") { - value - } else { + let Some(evm_loader) = pubkey_of(options, "evm_loader") else { return Err(NeonError::EvmLoaderNotSpecified); }; diff --git a/evm_loader/lib/src/commands/get_storage_at.rs b/evm_loader/lib/src/commands/get_storage_at.rs index 7a33b3117..44261324d 100644 --- a/evm_loader/lib/src/commands/get_storage_at.rs +++ b/evm_loader/lib/src/commands/get_storage_at.rs @@ -24,7 +24,7 @@ pub struct GetStorageAtReturn(pub [u8; 32]); impl Display for GetStorageAtReturn { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { - write!(f, "0x{}", hex::encode(&self.0)) + write!(f, "0x{}", hex::encode(self.0)) } } diff --git a/evm_loader/lib/src/types/tracer_ch_db.rs b/evm_loader/lib/src/types/tracer_ch_db.rs index d3596d561..d13bce995 100644 --- a/evm_loader/lib/src/types/tracer_ch_db.rs +++ b/evm_loader/lib/src/types/tracer_ch_db.rs @@ -300,7 +300,7 @@ impl ClickHouseDb { self.client .query(query) .bind(pubkey_str.clone()) - .bind(&branch.as_slice()) + .bind(branch.as_slice()) .fetch_one::() .await, ) diff --git a/evm_loader/program/src/evm/precompile/ecrecover.rs b/evm_loader/program/src/evm/precompile/ecrecover.rs index 6bebfd162..c45186e20 100644 --- a/evm_loader/program/src/evm/precompile/ecrecover.rs +++ b/evm_loader/program/src/evm/precompile/ecrecover.rs @@ -25,10 +25,7 @@ pub fn ecrecover(input: &[u8]) -> Vec { let recovery_id = v.as_u8() - 27; - let public_key = match secp256k1_recover(&msg[..], recovery_id, &sig[..]) { - Ok(key) => key, - Err(_) => return vec![], - }; + let Ok(public_key) = secp256k1_recover(&msg[..], recovery_id, &sig[..]) else { return vec![] }; let mut address = keccak::hash(&public_key.to_bytes()).to_bytes(); address[0..12].fill(0); From 0e60947dde34557795718950ac5913c92032e1cf Mon Sep 17 00:00:00 2001 From: Andrei Silviu Dragnea Date: Thu, 31 Aug 2023 09:36:30 +0300 Subject: [PATCH 3/3] Use neon-evm-1 label --- .github/workflows/pipeline.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 1eed8e3c1..6707a785f 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -20,7 +20,7 @@ concurrency: cancel-in-progress: true jobs: build-neon-evm: - runs-on: build-runner + runs-on: neon-evm-1 steps: - uses: actions/checkout@v3 with: @@ -36,7 +36,7 @@ jobs: python3 ./.github/workflows/deploy.py publish_image \ --github_sha=${GITHUB_SHA} run-neon-evm-tests: - runs-on: test-runner + runs-on: neon-evm-1 needs: - build-neon-evm steps: @@ -48,7 +48,7 @@ jobs: python3 ./.github/workflows/deploy.py run_tests \ --github_sha=${GITHUB_SHA} trigger-proxy-tests: - runs-on: trigger-runner + runs-on: neon-evm-1 needs: - build-neon-evm steps: @@ -66,7 +66,7 @@ jobs: --is_draft=${{github.event.pull_request.draft}} \ --labels='${{ toJson(github.event.pull_request.labels.*.name) }}' finalize-image: - runs-on: build-runner + runs-on: neon-evm-1 needs: - trigger-proxy-tests - run-neon-evm-tests